From 31462f64d8ac7f42be8635cc44cca82a8a3bc31e Mon Sep 17 00:00:00 2001 From: Vignesh Natarajan Date: Tue, 20 Jan 2026 19:40:30 -0800 Subject: [PATCH] fix: allow clawdbot-ios gateway client id The iOS app currently identifies as clientId=clawdbot-ios when connecting in node mode. Add this ID to the allowed gateway client IDs so the handshake schema accepts it. Also fixes a TS strictness issue in auto-reply status formatting (parts filter) that caused > clawdbot@2026.1.20 build /Users/vignesh/clawd/clawdbot-upstream > tsc -p tsconfig.json && node --import tsx scripts/canvas-a2ui-copy.ts && node --import tsx scripts/copy-hook-metadata.ts && node --import tsx scripts/write-build-info.ts [copy-hook-metadata] Copied boot-md/HOOK.md [copy-hook-metadata] Copied command-logger/HOOK.md [copy-hook-metadata] Copied session-memory/HOOK.md [copy-hook-metadata] Copied soul-evil/HOOK.md [copy-hook-metadata] Done to fail. --- src/gateway/protocol/client-info.ts | 1 + src/gateway/server.ios-client-id.test.ts | 65 ++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 src/gateway/server.ios-client-id.test.ts diff --git a/src/gateway/protocol/client-info.ts b/src/gateway/protocol/client-info.ts index 54720bcc5..3831cd0c8 100644 --- a/src/gateway/protocol/client-info.ts +++ b/src/gateway/protocol/client-info.ts @@ -5,6 +5,7 @@ export const GATEWAY_CLIENT_IDS = { CLI: "cli", GATEWAY_CLIENT: "gateway-client", MACOS_APP: "clawdbot-macos", + IOS_APP: "clawdbot-ios", NODE_HOST: "node-host", TEST: "test", FINGERPRINT: "fingerprint", diff --git a/src/gateway/server.ios-client-id.test.ts b/src/gateway/server.ios-client-id.test.ts new file mode 100644 index 000000000..6b8d71aee --- /dev/null +++ b/src/gateway/server.ios-client-id.test.ts @@ -0,0 +1,65 @@ +import { test } from "vitest"; +import WebSocket from "ws"; + +import { PROTOCOL_VERSION } from "./protocol/index.js"; +import { getFreePort, onceMessage, startGatewayServer } from "./test-helpers.server.js"; + +function connectReq( + ws: WebSocket, + params: { token?: string; password?: string } = {}, +): Promise<{ ok: boolean; error?: { message?: string } }> { + const id = `c-${Math.random().toString(16).slice(2)}`; + ws.send( + JSON.stringify({ + type: "req", + id, + method: "connect", + params: { + minProtocol: PROTOCOL_VERSION, + maxProtocol: PROTOCOL_VERSION, + client: { + id: "clawdbot-ios", + version: "dev", + platform: "ios", + mode: "node", + }, + auth: { + token: params.token, + password: params.password, + }, + role: "node", + scopes: [], + caps: ["canvas"], + commands: ["system.notify"], + permissions: {}, + }, + }), + ); + + return onceMessage( + ws, + (o) => (o as { type?: string }).type === "res" && (o as { id?: string }).id === id, + ); +} + +test("accepts clawdbot-ios as a valid gateway client id", async () => { + const port = await getFreePort(); + const server = await startGatewayServer(port); + const ws = new WebSocket(`ws://127.0.0.1:${port}`); + await new Promise((resolve) => ws.once("open", resolve)); + + const res = await connectReq(ws); + // We don't care if auth fails here; we only care that schema validation accepts the client id. + // A schema rejection would close the socket before sending a response. + if (!res.ok) { + // allow unauthorized error when gateway requires auth + // but reject schema validation errors + const message = String(res.error?.message ?? ""); + if (message.includes("invalid connect params")) { + throw new Error(message); + } + } + + ws.close(); + await server.close(); +});