* 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>
349 lines
11 KiB
TypeScript
349 lines
11 KiB
TypeScript
import { Command } from "commander";
|
|
import { describe, expect, it, vi } from "vitest";
|
|
|
|
const callGateway = vi.fn(async () => ({ ok: true }));
|
|
const startGatewayServer = vi.fn(async () => ({
|
|
close: vi.fn(async () => {}),
|
|
}));
|
|
const setVerbose = vi.fn();
|
|
const forceFreePortAndWait = vi.fn(async () => ({
|
|
killed: [],
|
|
waitedMs: 0,
|
|
escalatedToSigkill: false,
|
|
}));
|
|
const serviceIsLoaded = vi.fn().mockResolvedValue(true);
|
|
const discoverGatewayBeacons = vi.fn(async () => []);
|
|
const gatewayStatusCommand = vi.fn(async () => {});
|
|
|
|
const runtimeLogs: string[] = [];
|
|
const runtimeErrors: string[] = [];
|
|
const defaultRuntime = {
|
|
log: (msg: string) => runtimeLogs.push(msg),
|
|
error: (msg: string) => runtimeErrors.push(msg),
|
|
exit: (code: number) => {
|
|
throw new Error(`__exit__:${code}`);
|
|
},
|
|
};
|
|
|
|
async function withEnvOverride<T>(
|
|
overrides: Record<string, string | undefined>,
|
|
fn: () => Promise<T>,
|
|
): Promise<T> {
|
|
const saved: Record<string, string | undefined> = {};
|
|
for (const key of Object.keys(overrides)) {
|
|
saved[key] = process.env[key];
|
|
if (overrides[key] === undefined) delete process.env[key];
|
|
else process.env[key] = overrides[key];
|
|
}
|
|
vi.resetModules();
|
|
try {
|
|
return await fn();
|
|
} finally {
|
|
for (const key of Object.keys(saved)) {
|
|
if (saved[key] === undefined) delete process.env[key];
|
|
else process.env[key] = saved[key];
|
|
}
|
|
vi.resetModules();
|
|
}
|
|
}
|
|
|
|
vi.mock("../gateway/call.js", () => ({
|
|
callGateway: (opts: unknown) => callGateway(opts),
|
|
randomIdempotencyKey: () => "rk_test",
|
|
}));
|
|
|
|
vi.mock("../gateway/server.js", () => ({
|
|
startGatewayServer: (port: number, opts?: unknown) =>
|
|
startGatewayServer(port, opts),
|
|
}));
|
|
|
|
vi.mock("../globals.js", () => ({
|
|
info: (msg: string) => msg,
|
|
isVerbose: () => false,
|
|
setVerbose: (enabled: boolean) => setVerbose(enabled),
|
|
}));
|
|
|
|
vi.mock("../runtime.js", () => ({
|
|
defaultRuntime,
|
|
}));
|
|
|
|
vi.mock("./ports.js", () => ({
|
|
forceFreePortAndWait: (port: number) => forceFreePortAndWait(port),
|
|
}));
|
|
|
|
vi.mock("../daemon/service.js", () => ({
|
|
resolveGatewayService: () => ({
|
|
label: "LaunchAgent",
|
|
loadedText: "loaded",
|
|
notLoadedText: "not loaded",
|
|
install: vi.fn(),
|
|
uninstall: vi.fn(),
|
|
stop: vi.fn(),
|
|
restart: vi.fn(),
|
|
isLoaded: serviceIsLoaded,
|
|
readCommand: vi.fn(),
|
|
readRuntime: vi.fn().mockResolvedValue({ status: "running" }),
|
|
}),
|
|
}));
|
|
|
|
vi.mock("../daemon/program-args.js", () => ({
|
|
resolveGatewayProgramArguments: async () => ({
|
|
programArguments: ["/bin/node", "cli", "gateway", "--port", "18789"],
|
|
}),
|
|
}));
|
|
|
|
vi.mock("../infra/bonjour-discovery.js", () => ({
|
|
discoverGatewayBeacons: (opts: unknown) => discoverGatewayBeacons(opts),
|
|
}));
|
|
|
|
vi.mock("../commands/gateway-status.js", () => ({
|
|
gatewayStatusCommand: (opts: unknown) => gatewayStatusCommand(opts),
|
|
}));
|
|
|
|
describe("gateway-cli coverage", () => {
|
|
it("registers call/health commands and routes to callGateway", async () => {
|
|
runtimeLogs.length = 0;
|
|
runtimeErrors.length = 0;
|
|
callGateway.mockClear();
|
|
|
|
const { registerGatewayCli } = await import("./gateway-cli.js");
|
|
const program = new Command();
|
|
program.exitOverride();
|
|
registerGatewayCli(program);
|
|
|
|
await program.parseAsync(
|
|
["gateway", "call", "health", "--params", '{"x":1}', "--json"],
|
|
{ from: "user" },
|
|
);
|
|
|
|
expect(callGateway).toHaveBeenCalledTimes(1);
|
|
expect(runtimeLogs.join("\n")).toContain('"ok": true');
|
|
}, 15_000);
|
|
|
|
it("registers gateway status and routes to gatewayStatusCommand", async () => {
|
|
runtimeLogs.length = 0;
|
|
runtimeErrors.length = 0;
|
|
gatewayStatusCommand.mockClear();
|
|
|
|
const { registerGatewayCli } = await import("./gateway-cli.js");
|
|
const program = new Command();
|
|
program.exitOverride();
|
|
registerGatewayCli(program);
|
|
|
|
await program.parseAsync(["gateway", "status", "--json"], { from: "user" });
|
|
|
|
expect(gatewayStatusCommand).toHaveBeenCalledTimes(1);
|
|
}, 15_000);
|
|
|
|
it("registers gateway discover and prints JSON", async () => {
|
|
runtimeLogs.length = 0;
|
|
runtimeErrors.length = 0;
|
|
discoverGatewayBeacons.mockReset();
|
|
discoverGatewayBeacons.mockResolvedValueOnce([
|
|
{
|
|
instanceName: "Studio (Clawdbot)",
|
|
displayName: "Studio",
|
|
domain: "local.",
|
|
host: "studio.local",
|
|
lanHost: "studio.local",
|
|
tailnetDns: "studio.tailnet.ts.net",
|
|
gatewayPort: 18789,
|
|
bridgePort: 18790,
|
|
sshPort: 22,
|
|
},
|
|
]);
|
|
|
|
const { registerGatewayCli } = await import("./gateway-cli.js");
|
|
const program = new Command();
|
|
program.exitOverride();
|
|
registerGatewayCli(program);
|
|
|
|
await program.parseAsync(["gateway", "discover", "--json"], {
|
|
from: "user",
|
|
});
|
|
|
|
expect(discoverGatewayBeacons).toHaveBeenCalledTimes(1);
|
|
expect(runtimeLogs.join("\n")).toContain('"beacons"');
|
|
expect(runtimeLogs.join("\n")).toContain('"wsUrl"');
|
|
expect(runtimeLogs.join("\n")).toContain("ws://");
|
|
});
|
|
|
|
it("registers gateway discover and prints human output with details on new lines", async () => {
|
|
runtimeLogs.length = 0;
|
|
runtimeErrors.length = 0;
|
|
discoverGatewayBeacons.mockReset();
|
|
discoverGatewayBeacons.mockResolvedValueOnce([
|
|
{
|
|
instanceName: "Studio (Clawdbot)",
|
|
displayName: "Studio",
|
|
domain: "clawdbot.internal.",
|
|
host: "studio.clawdbot.internal",
|
|
lanHost: "studio.local",
|
|
tailnetDns: "studio.tailnet.ts.net",
|
|
gatewayPort: 18789,
|
|
bridgePort: 18790,
|
|
sshPort: 22,
|
|
},
|
|
]);
|
|
|
|
const { registerGatewayCli } = await import("./gateway-cli.js");
|
|
const program = new Command();
|
|
program.exitOverride();
|
|
registerGatewayCli(program);
|
|
|
|
await program.parseAsync(["gateway", "discover", "--timeout", "1"], {
|
|
from: "user",
|
|
});
|
|
|
|
const out = runtimeLogs.join("\n");
|
|
expect(out).toContain("Gateway Discovery");
|
|
expect(out).toContain("Found 1 gateway(s)");
|
|
expect(out).toContain("- Studio clawdbot.internal.");
|
|
expect(out).toContain(" tailnet: studio.tailnet.ts.net");
|
|
expect(out).toContain(" host: studio.clawdbot.internal");
|
|
expect(out).toContain(" ws: ws://studio.tailnet.ts.net:18789");
|
|
});
|
|
|
|
it("validates gateway discover timeout", async () => {
|
|
runtimeLogs.length = 0;
|
|
runtimeErrors.length = 0;
|
|
discoverGatewayBeacons.mockReset();
|
|
|
|
const { registerGatewayCli } = await import("./gateway-cli.js");
|
|
const program = new Command();
|
|
program.exitOverride();
|
|
registerGatewayCli(program);
|
|
|
|
await expect(
|
|
program.parseAsync(["gateway", "discover", "--timeout", "0"], {
|
|
from: "user",
|
|
}),
|
|
).rejects.toThrow("__exit__:1");
|
|
|
|
expect(runtimeErrors.join("\n")).toContain("gateway discover failed:");
|
|
expect(discoverGatewayBeacons).not.toHaveBeenCalled();
|
|
});
|
|
|
|
it("fails gateway call on invalid params JSON", async () => {
|
|
runtimeLogs.length = 0;
|
|
runtimeErrors.length = 0;
|
|
callGateway.mockClear();
|
|
|
|
const { registerGatewayCli } = await import("./gateway-cli.js");
|
|
const program = new Command();
|
|
program.exitOverride();
|
|
registerGatewayCli(program);
|
|
|
|
await expect(
|
|
program.parseAsync(
|
|
["gateway", "call", "status", "--params", "not-json"],
|
|
{ from: "user" },
|
|
),
|
|
).rejects.toThrow("__exit__:1");
|
|
|
|
expect(callGateway).not.toHaveBeenCalled();
|
|
expect(runtimeErrors.join("\n")).toContain("Gateway call failed:");
|
|
});
|
|
|
|
it("validates gateway ports and handles force/start errors", async () => {
|
|
runtimeLogs.length = 0;
|
|
runtimeErrors.length = 0;
|
|
|
|
const { registerGatewayCli } = await import("./gateway-cli.js");
|
|
|
|
// Invalid port
|
|
const programInvalidPort = new Command();
|
|
programInvalidPort.exitOverride();
|
|
registerGatewayCli(programInvalidPort);
|
|
await expect(
|
|
programInvalidPort.parseAsync(["gateway", "--port", "0"], {
|
|
from: "user",
|
|
}),
|
|
).rejects.toThrow("__exit__:1");
|
|
|
|
// Force free failure
|
|
forceFreePortAndWait.mockImplementationOnce(async () => {
|
|
throw new Error("boom");
|
|
});
|
|
const programForceFail = new Command();
|
|
programForceFail.exitOverride();
|
|
registerGatewayCli(programForceFail);
|
|
await expect(
|
|
programForceFail.parseAsync(
|
|
["gateway", "--port", "18789", "--force", "--allow-unconfigured"],
|
|
{ from: "user" },
|
|
),
|
|
).rejects.toThrow("__exit__:1");
|
|
|
|
// Start failure (generic)
|
|
startGatewayServer.mockRejectedValueOnce(new Error("nope"));
|
|
const programStartFail = new Command();
|
|
programStartFail.exitOverride();
|
|
registerGatewayCli(programStartFail);
|
|
const beforeSigterm = new Set(process.listeners("SIGTERM"));
|
|
const beforeSigint = new Set(process.listeners("SIGINT"));
|
|
await expect(
|
|
programStartFail.parseAsync(
|
|
["gateway", "--port", "18789", "--allow-unconfigured"],
|
|
{ from: "user" },
|
|
),
|
|
).rejects.toThrow("__exit__:1");
|
|
for (const listener of process.listeners("SIGTERM")) {
|
|
if (!beforeSigterm.has(listener))
|
|
process.removeListener("SIGTERM", listener);
|
|
}
|
|
for (const listener of process.listeners("SIGINT")) {
|
|
if (!beforeSigint.has(listener))
|
|
process.removeListener("SIGINT", listener);
|
|
}
|
|
});
|
|
|
|
it("prints stop hints on GatewayLockError when service is loaded", async () => {
|
|
runtimeLogs.length = 0;
|
|
runtimeErrors.length = 0;
|
|
serviceIsLoaded.mockResolvedValue(true);
|
|
|
|
const { GatewayLockError } = await import("../infra/gateway-lock.js");
|
|
startGatewayServer.mockRejectedValueOnce(
|
|
new GatewayLockError("another gateway instance is already listening"),
|
|
);
|
|
|
|
const { registerGatewayCli } = await import("./gateway-cli.js");
|
|
const program = new Command();
|
|
program.exitOverride();
|
|
registerGatewayCli(program);
|
|
|
|
await expect(
|
|
program.parseAsync(["gateway", "--allow-unconfigured"], {
|
|
from: "user",
|
|
}),
|
|
).rejects.toThrow("__exit__:1");
|
|
|
|
expect(startGatewayServer).toHaveBeenCalled();
|
|
expect(runtimeErrors.join("\n")).toContain("Gateway failed to start:");
|
|
expect(runtimeErrors.join("\n")).toContain("clawdbot daemon stop");
|
|
});
|
|
|
|
it("uses env/config port when --port is omitted", async () => {
|
|
await withEnvOverride({ CLAWDBOT_GATEWAY_PORT: "19001" }, async () => {
|
|
runtimeLogs.length = 0;
|
|
runtimeErrors.length = 0;
|
|
startGatewayServer.mockClear();
|
|
|
|
const { registerGatewayCli } = await import("./gateway-cli.js");
|
|
const program = new Command();
|
|
program.exitOverride();
|
|
registerGatewayCli(program);
|
|
|
|
startGatewayServer.mockRejectedValueOnce(new Error("nope"));
|
|
await expect(
|
|
program.parseAsync(["gateway", "--allow-unconfigured"], {
|
|
from: "user",
|
|
}),
|
|
).rejects.toThrow("__exit__:1");
|
|
|
|
expect(startGatewayServer).toHaveBeenCalledWith(19001, expect.anything());
|
|
});
|
|
});
|
|
});
|