mirror of
https://github.com/openclaw/openclaw.git
synced 2026-03-17 21:10:54 +00:00
* refactor: introduce provider plugin registry * refactor: move provider CLI to plugins * docs: add provider plugin implementation notes * refactor: shift provider runtime logic into plugins * refactor: add plugin defaults and summaries * docs: update provider plugin notes * feat(commands): add /commands slash list * Auto-reply: tidy help message * Auto-reply: fix status command lint * Tests: align google shared expectations * Auto-reply: tidy help message * Auto-reply: fix status command lint * refactor: move provider routing into plugins * test: align agent routing expectations * docs: update provider plugin notes * refactor: route replies via provider plugins * docs: note route-reply plugin hooks * refactor: extend provider plugin contract * refactor: derive provider status from plugins * refactor: unify gateway provider control * refactor: use plugin metadata in auto-reply * fix: parenthesize cron target selection * refactor: derive gateway methods from plugins * refactor: generalize provider logout * refactor: route provider logout through plugins * refactor: move WhatsApp web login methods into plugin * refactor: generalize provider log prefixes * refactor: centralize default chat provider * refactor: derive provider lists from registry * refactor: move provider reload noops into plugins * refactor: resolve web login provider via alias * refactor: derive CLI provider options from plugins * refactor: derive prompt provider list from plugins * style: apply biome lint fixes * fix: resolve provider routing edge cases * docs: update provider plugin refactor notes * fix(gateway): harden agent provider routing * refactor: move provider routing into plugins * refactor: move provider CLI to plugins * refactor: derive provider lists from registry * fix: restore slash command parsing * refactor: align provider ids for schema * refactor: unify outbound target resolution * fix: keep outbound labels stable * feat: add msteams to cron surfaces * fix: clean up lint build issues * refactor: localize chat provider alias normalization * refactor: drive gateway provider lists from plugins * docs: update provider plugin notes * style: format message-provider * fix: avoid provider registry init cycles * style: sort message-provider imports * fix: relax provider alias map typing * refactor: move provider routing into plugins * refactor: add plugin pairing/config adapters * refactor: route pairing and provider removal via plugins * refactor: align auto-reply provider typing * test: stabilize telegram media mocks * docs: update provider plugin refactor notes * refactor: pluginize outbound targets * refactor: pluginize provider selection * refactor: generalize text chunk limits * docs: update provider plugin notes * refactor: generalize group session/config * fix: normalize provider id for room detection * fix: avoid provider init in system prompt * style: formatting cleanup * refactor: normalize agent delivery targets * test: update outbound delivery labels * chore: fix lint regressions * refactor: extend provider plugin adapters * refactor: move elevated/block streaming defaults to plugins * refactor: defer outbound send deps to plugins * docs: note plugin-driven streaming/elevated defaults * refactor: centralize webchat provider constant * refactor: add provider setup adapters * refactor: delegate provider add config to plugins * docs: document plugin-driven provider add * refactor: add plugin state/binding metadata * refactor: build agent provider status from plugins * docs: note plugin-driven agent bindings * refactor: centralize internal provider constant usage * fix: normalize WhatsApp targets for groups and E.164 (#631) (thanks @imfing) * refactor: centralize default chat provider * refactor: centralize WhatsApp target normalization * refactor: move provider routing into plugins * refactor: normalize agent delivery targets * chore: fix lint regressions * fix: normalize WhatsApp targets for groups and E.164 (#631) (thanks @imfing) * feat: expand provider plugin adapters * refactor: route auto-reply via provider plugins * fix: align WhatsApp target normalization * fix: normalize WhatsApp targets for groups and E.164 (#631) (thanks @imfing) * refactor: centralize WhatsApp target normalization * feat: add /config chat config updates * docs: add /config get alias * feat(commands): add /commands slash list * refactor: centralize default chat provider * style: apply biome lint fixes * chore: fix lint regressions * fix: clean up whatsapp allowlist typing * style: format config command helpers * refactor: pluginize tool threading context * refactor: normalize session announce targets * docs: note new plugin threading and announce hooks * refactor: pluginize message actions * docs: update provider plugin actions notes * fix: align provider action adapters * refactor: centralize webchat checks * style: format message provider helpers * refactor: move provider onboarding into adapters * docs: note onboarding provider adapters * feat: add msteams onboarding adapter * style: organize onboarding imports * fix: normalize msteams allowFrom types * feat: add plugin text chunk limits * refactor: use plugin chunk limit fallbacks * feat: add provider mention stripping hooks * style: organize provider plugin type imports * refactor: generalize health snapshots * refactor: update macOS health snapshot handling * docs: refresh health snapshot notes * style: format health snapshot updates * refactor: drive security warnings via plugins * docs: note provider security adapter * style: format provider security adapters * refactor: centralize provider account defaults * refactor: type gateway client identity constants * chore: regen gateway protocol swift * fix: degrade health on failed provider probe * refactor: centralize pairing approve hint * docs: add plugin CLI command references * refactor: route auth and tool sends through plugins * docs: expand provider plugin hooks * refactor: document provider docking touchpoints * refactor: normalize internal provider defaults * refactor: streamline outbound delivery wiring * refactor: make provider onboarding plugin-owned * refactor: support provider-owned agent tools * refactor: move telegram draft chunking into telegram module * refactor: infer provider tool sends via extractToolSend * fix: repair plugin onboarding imports * refactor: de-dup outbound target normalization * style: tidy plugin and agent imports * refactor: data-drive provider selection line * fix: satisfy lint after provider plugin rebase * test: deflake gateway-cli coverage * style: format gateway-cli coverage test * refactor(provider-plugins): simplify provider ids * test(pairing-cli): avoid provider-specific ternary * style(macos): swiftformat HealthStore * refactor(sandbox): derive provider tool denylist * fix(sandbox): avoid plugin init in defaults * refactor(provider-plugins): centralize provider aliases * style(test): satisfy biome * refactor(protocol): v3 providers.status maps * refactor(ui): adapt to protocol v3 * refactor(macos): adapt to protocol v3 * test: update providers.status v3 fixtures * refactor(gateway): map provider runtime snapshot * test(gateway): update reload runtime snapshot * refactor(whatsapp): normalize heartbeat provider id * docs(refactor): update provider plugin notes * style: satisfy biome after rebase * fix: describe sandboxed elevated in prompt * feat(gateway): add agent image attachments + live probe * refactor: derive CLI provider options from plugins * fix(gateway): harden agent provider routing * fix(gateway): harden agent provider routing * refactor: align provider ids for schema * fix(protocol): keep agent provider string * fix(gateway): harden agent provider routing * fix(protocol): keep agent provider string * refactor: normalize agent delivery targets * refactor: support provider-owned agent tools * refactor(config): provider-keyed elevated allowFrom * style: satisfy biome * fix(gateway): appease provider narrowing * style: satisfy biome * refactor(reply): move group intro hints into plugin * fix(reply): avoid plugin registry init cycle * refactor(providers): add lightweight provider dock * refactor(gateway): use typed client id in connect * refactor(providers): document docks and avoid init cycles * refactor(providers): make media limit helper generic * fix(providers): break plugin registry import cycles * style: satisfy biome * refactor(status-all): build providers table from plugins * refactor(gateway): delegate web login to provider plugin * refactor(provider): drop web alias * refactor(provider): lazy-load monitors * style: satisfy lint/format * style: format status-all providers table * style: swiftformat gateway discovery model * test: make reload plan plugin-driven * fix: avoid token stringification in status-all * refactor: make provider IDs explicit in status * feat: warn on signal/imessage provider runtime errors * test: cover gateway provider runtime warnings in status * fix: add runtime kind to provider status issues * test: cover health degradation on probe failure * fix: keep routeReply lightweight * style: organize routeReply imports * refactor(web): extract auth-store helpers * refactor(whatsapp): lazy login imports * refactor(outbound): route replies via plugin outbound * docs: update provider plugin notes * style: format provider status issues * fix: make sandbox scope warning wrap-safe * refactor: load outbound adapters from provider plugins * docs: update provider plugin outbound notes * style(macos): fix swiftformat lint * docs: changelog for provider plugins * fix(macos): satisfy swiftformat * fix(macos): open settings via menu action * style: format after rebase * fix(macos): open Settings via menu action --------- Co-authored-by: LK <luke@kyohere.com> Co-authored-by: Luke K (pr-0f3t) <2609441+lc0rp@users.noreply.github.com> Co-authored-by: Xin <xin@imfing.com>
497 lines
13 KiB
TypeScript
497 lines
13 KiB
TypeScript
import {
|
|
convertMessages,
|
|
convertTools,
|
|
} from "@mariozechner/pi-ai/dist/providers/google-shared.js";
|
|
import type { Context, Model, Tool } from "@mariozechner/pi-ai/dist/types.js";
|
|
import { describe, expect, it } from "vitest";
|
|
|
|
const asRecord = (value: unknown): Record<string, unknown> => {
|
|
expect(value).toBeTruthy();
|
|
expect(typeof value).toBe("object");
|
|
expect(Array.isArray(value)).toBe(false);
|
|
return value as Record<string, unknown>;
|
|
};
|
|
|
|
const makeModel = (id: string): Model<"google-generative-ai"> =>
|
|
({
|
|
id,
|
|
name: id,
|
|
api: "google-generative-ai",
|
|
provider: "google",
|
|
baseUrl: "https://example.invalid",
|
|
reasoning: false,
|
|
input: ["text"],
|
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
|
contextWindow: 1,
|
|
maxTokens: 1,
|
|
}) as Model<"google-generative-ai">;
|
|
|
|
describe("google-shared convertTools", () => {
|
|
it("preserves parameters when type is missing", () => {
|
|
const tools = [
|
|
{
|
|
name: "noType",
|
|
description: "Tool with properties but no type",
|
|
parameters: {
|
|
properties: {
|
|
action: { type: "string" },
|
|
},
|
|
required: ["action"],
|
|
},
|
|
},
|
|
] as unknown as Tool[];
|
|
|
|
const converted = convertTools(tools);
|
|
const params = asRecord(
|
|
converted?.[0]?.functionDeclarations?.[0]?.parameters,
|
|
);
|
|
|
|
expect(params.type).toBeUndefined();
|
|
expect(params.properties).toBeDefined();
|
|
expect(params.required).toEqual(["action"]);
|
|
});
|
|
|
|
it("keeps unsupported JSON Schema keywords intact", () => {
|
|
const tools = [
|
|
{
|
|
name: "example",
|
|
description: "Example tool",
|
|
parameters: {
|
|
type: "object",
|
|
patternProperties: {
|
|
"^x-": { type: "string" },
|
|
},
|
|
additionalProperties: false,
|
|
properties: {
|
|
mode: {
|
|
type: "string",
|
|
const: "fast",
|
|
},
|
|
options: {
|
|
anyOf: [{ type: "string" }, { type: "number" }],
|
|
},
|
|
list: {
|
|
type: "array",
|
|
items: {
|
|
type: "string",
|
|
const: "item",
|
|
},
|
|
},
|
|
},
|
|
required: ["mode"],
|
|
},
|
|
},
|
|
] as unknown as Tool[];
|
|
|
|
const converted = convertTools(tools);
|
|
const params = asRecord(
|
|
converted?.[0]?.functionDeclarations?.[0]?.parameters,
|
|
);
|
|
const properties = asRecord(params.properties);
|
|
const mode = asRecord(properties.mode);
|
|
const options = asRecord(properties.options);
|
|
const list = asRecord(properties.list);
|
|
const items = asRecord(list.items);
|
|
|
|
expect(params.patternProperties).toEqual({ "^x-": { type: "string" } });
|
|
expect(params.additionalProperties).toBe(false);
|
|
expect(mode.const).toBe("fast");
|
|
expect(options.anyOf).toEqual([{ type: "string" }, { type: "number" }]);
|
|
expect(items.const).toBe("item");
|
|
expect(params.required).toEqual(["mode"]);
|
|
});
|
|
|
|
it("keeps supported schema fields", () => {
|
|
const tools = [
|
|
{
|
|
name: "settings",
|
|
description: "Settings tool",
|
|
parameters: {
|
|
type: "object",
|
|
properties: {
|
|
config: {
|
|
type: "object",
|
|
properties: {
|
|
retries: { type: "number", minimum: 1 },
|
|
tags: {
|
|
type: "array",
|
|
items: { type: "string" },
|
|
},
|
|
},
|
|
required: ["retries"],
|
|
},
|
|
},
|
|
required: ["config"],
|
|
},
|
|
},
|
|
] as unknown as Tool[];
|
|
|
|
const converted = convertTools(tools);
|
|
const params = asRecord(
|
|
converted?.[0]?.functionDeclarations?.[0]?.parameters,
|
|
);
|
|
const config = asRecord(asRecord(params.properties).config);
|
|
const configProps = asRecord(config.properties);
|
|
const retries = asRecord(configProps.retries);
|
|
const tags = asRecord(configProps.tags);
|
|
const items = asRecord(tags.items);
|
|
|
|
expect(params.type).toBe("object");
|
|
expect(config.type).toBe("object");
|
|
expect(retries.minimum).toBe(1);
|
|
expect(tags.type).toBe("array");
|
|
expect(items.type).toBe("string");
|
|
expect(config.required).toEqual(["retries"]);
|
|
expect(params.required).toEqual(["config"]);
|
|
});
|
|
});
|
|
|
|
describe("google-shared convertMessages", () => {
|
|
it("keeps thinking blocks when provider/model match", () => {
|
|
const model = makeModel("gemini-1.5-pro");
|
|
const context = {
|
|
messages: [
|
|
{
|
|
role: "assistant",
|
|
content: [
|
|
{
|
|
type: "thinking",
|
|
thinking: "hidden",
|
|
thinkingSignature: "sig",
|
|
},
|
|
],
|
|
api: "google-generative-ai",
|
|
provider: "google",
|
|
model: "gemini-1.5-pro",
|
|
usage: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
totalTokens: 0,
|
|
cost: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
total: 0,
|
|
},
|
|
},
|
|
stopReason: "stop",
|
|
timestamp: 0,
|
|
},
|
|
],
|
|
} as unknown as Context;
|
|
|
|
const contents = convertMessages(model, context);
|
|
expect(contents).toHaveLength(1);
|
|
expect(contents[0].role).toBe("model");
|
|
expect(contents[0].parts?.[0]).toMatchObject({
|
|
thought: true,
|
|
thoughtSignature: "sig",
|
|
});
|
|
});
|
|
|
|
it("keeps thought signatures for Claude models", () => {
|
|
const model = makeModel("claude-3-opus");
|
|
const context = {
|
|
messages: [
|
|
{
|
|
role: "assistant",
|
|
content: [
|
|
{
|
|
type: "thinking",
|
|
thinking: "structured",
|
|
thinkingSignature: "sig",
|
|
},
|
|
],
|
|
api: "google-generative-ai",
|
|
provider: "google",
|
|
model: "claude-3-opus",
|
|
usage: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
totalTokens: 0,
|
|
cost: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
total: 0,
|
|
},
|
|
},
|
|
stopReason: "stop",
|
|
timestamp: 0,
|
|
},
|
|
],
|
|
} as unknown as Context;
|
|
|
|
const contents = convertMessages(model, context);
|
|
const parts = contents?.[0]?.parts ?? [];
|
|
expect(parts).toHaveLength(1);
|
|
expect(parts[0]).toMatchObject({
|
|
thought: true,
|
|
thoughtSignature: "sig",
|
|
});
|
|
});
|
|
|
|
it("does not merge consecutive user messages for Gemini", () => {
|
|
const model = makeModel("gemini-1.5-pro");
|
|
const context = {
|
|
messages: [
|
|
{
|
|
role: "user",
|
|
content: "Hello",
|
|
},
|
|
{
|
|
role: "user",
|
|
content: "How are you?",
|
|
},
|
|
],
|
|
} as unknown as Context;
|
|
|
|
const contents = convertMessages(model, context);
|
|
expect(contents).toHaveLength(2);
|
|
expect(contents[0].role).toBe("user");
|
|
expect(contents[1].role).toBe("user");
|
|
expect(contents[0].parts).toHaveLength(1);
|
|
expect(contents[1].parts).toHaveLength(1);
|
|
});
|
|
|
|
it("does not merge consecutive user messages for non-Gemini Google models", () => {
|
|
const model = makeModel("claude-3-opus");
|
|
const context = {
|
|
messages: [
|
|
{
|
|
role: "user",
|
|
content: "First",
|
|
},
|
|
{
|
|
role: "user",
|
|
content: "Second",
|
|
},
|
|
],
|
|
} as unknown as Context;
|
|
|
|
const contents = convertMessages(model, context);
|
|
expect(contents).toHaveLength(2);
|
|
expect(contents[0].role).toBe("user");
|
|
expect(contents[1].role).toBe("user");
|
|
expect(contents[0].parts).toHaveLength(1);
|
|
expect(contents[1].parts).toHaveLength(1);
|
|
});
|
|
|
|
it("does not merge consecutive model messages for Gemini", () => {
|
|
const model = makeModel("gemini-1.5-pro");
|
|
const context = {
|
|
messages: [
|
|
{
|
|
role: "user",
|
|
content: "Hello",
|
|
},
|
|
{
|
|
role: "assistant",
|
|
content: [{ type: "text", text: "Hi there!" }],
|
|
api: "google-generative-ai",
|
|
provider: "google",
|
|
model: "gemini-1.5-pro",
|
|
usage: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
totalTokens: 0,
|
|
cost: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
total: 0,
|
|
},
|
|
},
|
|
stopReason: "stop",
|
|
timestamp: 0,
|
|
},
|
|
{
|
|
role: "assistant",
|
|
content: [{ type: "text", text: "How can I help?" }],
|
|
api: "google-generative-ai",
|
|
provider: "google",
|
|
model: "gemini-1.5-pro",
|
|
usage: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
totalTokens: 0,
|
|
cost: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
total: 0,
|
|
},
|
|
},
|
|
stopReason: "stop",
|
|
timestamp: 0,
|
|
},
|
|
],
|
|
} as unknown as Context;
|
|
|
|
const contents = convertMessages(model, context);
|
|
expect(contents).toHaveLength(3);
|
|
expect(contents[0].role).toBe("user");
|
|
expect(contents[1].role).toBe("model");
|
|
expect(contents[2].role).toBe("model");
|
|
expect(contents[1].parts).toHaveLength(1);
|
|
expect(contents[2].parts).toHaveLength(1);
|
|
});
|
|
|
|
it("handles user message after tool result without model response in between", () => {
|
|
const model = makeModel("gemini-1.5-pro");
|
|
const context = {
|
|
messages: [
|
|
{
|
|
role: "user",
|
|
content: "Use a tool",
|
|
},
|
|
{
|
|
role: "assistant",
|
|
content: [
|
|
{
|
|
type: "toolCall",
|
|
id: "call_1",
|
|
name: "myTool",
|
|
arguments: { arg: "value" },
|
|
},
|
|
],
|
|
api: "google-generative-ai",
|
|
provider: "google",
|
|
model: "gemini-1.5-pro",
|
|
usage: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
totalTokens: 0,
|
|
cost: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
total: 0,
|
|
},
|
|
},
|
|
stopReason: "stop",
|
|
timestamp: 0,
|
|
},
|
|
{
|
|
role: "toolResult",
|
|
toolCallId: "call_1",
|
|
toolName: "myTool",
|
|
content: [{ type: "text", text: "Tool result" }],
|
|
isError: false,
|
|
timestamp: 0,
|
|
},
|
|
{
|
|
role: "user",
|
|
content: "Now do something else",
|
|
},
|
|
],
|
|
} as unknown as Context;
|
|
|
|
const contents = convertMessages(model, context);
|
|
expect(contents).toHaveLength(4);
|
|
expect(contents[0].role).toBe("user");
|
|
expect(contents[1].role).toBe("model");
|
|
expect(contents[2].role).toBe("user");
|
|
expect(contents[3].role).toBe("user");
|
|
const toolResponsePart = contents[2].parts?.find(
|
|
(part) =>
|
|
typeof part === "object" && part !== null && "functionResponse" in part,
|
|
);
|
|
const toolResponse = asRecord(toolResponsePart);
|
|
expect(toolResponse.functionResponse).toBeTruthy();
|
|
expect(contents[3].role).toBe("user");
|
|
});
|
|
|
|
it("ensures function call comes after user turn, not after model turn", () => {
|
|
const model = makeModel("gemini-1.5-pro");
|
|
const context = {
|
|
messages: [
|
|
{
|
|
role: "user",
|
|
content: "Hello",
|
|
},
|
|
{
|
|
role: "assistant",
|
|
content: [{ type: "text", text: "Hi!" }],
|
|
api: "google-generative-ai",
|
|
provider: "google",
|
|
model: "gemini-1.5-pro",
|
|
usage: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
totalTokens: 0,
|
|
cost: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
total: 0,
|
|
},
|
|
},
|
|
stopReason: "stop",
|
|
timestamp: 0,
|
|
},
|
|
{
|
|
role: "assistant",
|
|
content: [
|
|
{
|
|
type: "toolCall",
|
|
id: "call_1",
|
|
name: "myTool",
|
|
arguments: {},
|
|
},
|
|
],
|
|
api: "google-generative-ai",
|
|
provider: "google",
|
|
model: "gemini-1.5-pro",
|
|
usage: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
totalTokens: 0,
|
|
cost: {
|
|
input: 0,
|
|
output: 0,
|
|
cacheRead: 0,
|
|
cacheWrite: 0,
|
|
total: 0,
|
|
},
|
|
},
|
|
stopReason: "stop",
|
|
timestamp: 0,
|
|
},
|
|
],
|
|
} as unknown as Context;
|
|
|
|
const contents = convertMessages(model, context);
|
|
expect(contents).toHaveLength(3);
|
|
expect(contents[0].role).toBe("user");
|
|
expect(contents[1].role).toBe("model");
|
|
expect(contents[2].role).toBe("model");
|
|
const toolCallPart = contents[2].parts?.find(
|
|
(part) =>
|
|
typeof part === "object" && part !== null && "functionCall" in part,
|
|
);
|
|
const toolCall = asRecord(toolCallPart);
|
|
expect(toolCall.functionCall).toBeTruthy();
|
|
});
|
|
});
|