xiaotime 0.3.0 → 0.4.0

package/dist/__tests__/legacy_compat.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=legacy_compat.test.d.ts.map

package/dist/__tests__/legacy_compat.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"legacy_compat.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/legacy_compat.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/legacy_compat.test.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * Legacy-compatibility / version-cutover tests.
+ *
+ * SPRINT-TERMINAL-CLIENT-OWNED-DISPATCH-1 (#6565) PR5.
+ *
+ * The hard cutover (decision D2) rejects CLI <0.4.0 at the WS auth
+ * handshake: the CLI sends its `version`, the server gates on it.
+ * These tests guard the CLI half of that contract — the version the
+ * CLI advertises must be its real package version and at/above the
+ * 0.4.0 client-owned-dispatch floor. The server-side rejection logic
+ * is covered by tests/test_terminal_orchestrator_cli_version.py.
+ */
+const vitest_1 = require("vitest");
+const config_js_1 = require("../config.js");
+// `require` (not `import`) so the tsc build doesn't flag package.json
+// as outside rootDir (TS6059); vitest resolves it fine at runtime.
+const pkg = require("../../package.json");
+(0, vitest_1.describe)("CLI version cutover (#6565 PR5)", () => {
+    (0, vitest_1.test)("CLI_VERSION matches package.json — no drift", () => {
+        // The server gates the WS handshake on the version the CLI sends.
+        // If CLI_VERSION drifts from package.json the CLI would advertise
+        // a version it isn't, silently defeating the cutover gate.
+        (0, vitest_1.expect)(config_js_1.CLI_VERSION).toBe(pkg.version);
+    });
+    (0, vitest_1.test)("CLI_VERSION is a 3-part semver at or above the 0.4.0 floor", () => {
+        const parts = config_js_1.CLI_VERSION.split(".").map((p) => Number.parseInt(p, 10));
+        (0, vitest_1.expect)(parts).toHaveLength(3);
+        (0, vitest_1.expect)(parts.every((n) => Number.isInteger(n))).toBe(true);
+        const [major, minor] = parts;
+        // >= 0.4.0 — the client-owned-dispatch cutover floor.
+        (0, vitest_1.expect)(major > 0 || (major === 0 && minor >= 4)).toBe(true);
+    });
+});
+//# sourceMappingURL=legacy_compat.test.js.map

package/dist/__tests__/legacy_compat.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"legacy_compat.test.js","sourceRoot":"","sources":["../../src/__tests__/legacy_compat.test.ts"],"names":[],"mappings":";;AAAA;;;;;;;;;;;GAWG;AACH,mCAAgD;AAChD,4CAA2C;AAE3C,sEAAsE;AACtE,mEAAmE;AACnE,MAAM,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAwB,CAAC;AAEjE,IAAA,iBAAQ,EAAC,iCAAiC,EAAE,GAAG,EAAE;IAC/C,IAAA,aAAI,EAAC,6CAA6C,EAAE,GAAG,EAAE;QACvD,kEAAkE;QAClE,kEAAkE;QAClE,2DAA2D;QAC3D,IAAA,eAAM,EAAC,uBAAW,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,IAAA,aAAI,EAAC,4DAA4D,EAAE,GAAG,EAAE;QACtE,MAAM,KAAK,GAAG,uBAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QACxE,IAAA,eAAM,EAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC9B,IAAA,eAAM,EAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3D,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC;QAC7B,sDAAsD;QACtD,IAAA,eAAM,EAAC,KAAK,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/__tests__/tool_result_client.test.d.ts

@@ -0,0 +1,20 @@
+/**
+ * REST POST client tests.
+ *
+ * SPRINT-TERMINAL-CLIENT-OWNED-DISPATCH-1 (#6565) PR3.
+ *
+ * Verifies the contract between the CLI's drain queue (in ws.ts)
+ * and the server's POST /tool_results endpoint (added in PR1,
+ * consumed by PR2's dispatch refactor):
+ *
+ *   - Happy path: 200 OK returns parsed body (completed,
+ *     all_completed, resume_signaled).
+ *   - Retry policy: 5xx + network errors retry with exponential
+ *     backoff (100ms → 200ms → 400ms, 3 attempts total).
+ *   - 4xx is durable — throws immediately, no retry.
+ *   - Auth header (x-api-key with the cli_token) on every attempt.
+ *   - Request body shape matches the server's PostToolResultsRequest
+ *     Pydantic model.
+ */
+export {};
+//# sourceMappingURL=tool_result_client.test.d.ts.map

package/dist/__tests__/tool_result_client.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool_result_client.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/tool_result_client.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG"}

package/dist/__tests__/tool_result_client.test.js

@@ -0,0 +1,142 @@
+"use strict";
+/**
+ * REST POST client tests.
+ *
+ * SPRINT-TERMINAL-CLIENT-OWNED-DISPATCH-1 (#6565) PR3.
+ *
+ * Verifies the contract between the CLI's drain queue (in ws.ts)
+ * and the server's POST /tool_results endpoint (added in PR1,
+ * consumed by PR2's dispatch refactor):
+ *
+ *   - Happy path: 200 OK returns parsed body (completed,
+ *     all_completed, resume_signaled).
+ *   - Retry policy: 5xx + network errors retry with exponential
+ *     backoff (100ms → 200ms → 400ms, 3 attempts total).
+ *   - 4xx is durable — throws immediately, no retry.
+ *   - Auth header (x-api-key with the cli_token) on every attempt.
+ *   - Request body shape matches the server's PostToolResultsRequest
+ *     Pydantic model.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const tool_result_client_js_1 = require("../tool_result_client.js");
+// Mock the auth module so we don't read a real token from
+// ~/.xiaotime/cli_token.json during tests.
+vitest_1.vi.mock("../auth.js", () => ({
+    getToken: () => "fake-cli-token-for-tests",
+}));
+// Mock the config so the URL is deterministic.
+vitest_1.vi.mock("../config.js", () => ({
+    ORCHESTRATOR_URL: "https://terminal.xiaotime.test",
+}));
+let fetchMock;
+let origFetch;
+(0, vitest_1.beforeEach)(() => {
+    fetchMock = vitest_1.vi.fn();
+    origFetch = globalThis.fetch;
+    globalThis.fetch = fetchMock;
+});
+(0, vitest_1.afterEach)(() => {
+    globalThis.fetch = origFetch;
+    vitest_1.vi.restoreAllMocks();
+});
+function _okResponse(body) {
+    return new Response(JSON.stringify(body), {
+        status: 200,
+        headers: { "content-type": "application/json" },
+    });
+}
+function _errorResponse(status, body) {
+    return new Response(body, { status });
+}
+(0, vitest_1.describe)("postToolResults happy path", () => {
+    (0, vitest_1.test)("posts to correct URL with auth header + JSON body", async () => {
+        fetchMock.mockResolvedValue(_okResponse({ completed: ["toolu_a"], all_completed: true, resume_signaled: true }));
+        const result = await (0, tool_result_client_js_1.postToolResults)("session-abc", [
+            { tool_use_id: "toolu_a", content: "ok", is_error: false },
+        ]);
+        (0, vitest_1.expect)(result).toEqual({
+            completed: ["toolu_a"],
+            all_completed: true,
+            resume_signaled: true,
+        });
+        (0, vitest_1.expect)(fetchMock).toHaveBeenCalledTimes(1);
+        const [url, init] = fetchMock.mock.calls[0];
+        (0, vitest_1.expect)(url).toBe("https://terminal.xiaotime.test/terminal/sessions/session-abc/tool_results");
+        (0, vitest_1.expect)(init.method).toBe("POST");
+        (0, vitest_1.expect)(init.headers["x-api-key"]).toBe("fake-cli-token-for-tests");
+        (0, vitest_1.expect)(init.headers["Content-Type"]).toBe("application/json");
+        const body = JSON.parse(init.body);
+        (0, vitest_1.expect)(body).toEqual({
+            results: [{ tool_use_id: "toolu_a", content: "ok", is_error: false }],
+        });
+    });
+    (0, vitest_1.test)("supports multi-result batches", async () => {
+        fetchMock.mockResolvedValue(_okResponse({
+            completed: ["toolu_a", "toolu_b"],
+            all_completed: false,
+            resume_signaled: false,
+        }));
+        await (0, tool_result_client_js_1.postToolResults)("sess", [
+            { tool_use_id: "toolu_a", content: "1", is_error: false },
+            { tool_use_id: "toolu_b", content: "2", is_error: true },
+        ]);
+        const body = JSON.parse(fetchMock.mock.calls[0][1].body);
+        (0, vitest_1.expect)(body.results).toHaveLength(2);
+        (0, vitest_1.expect)(body.results[1].is_error).toBe(true);
+    });
+});
+(0, vitest_1.describe)("postToolResults retry behavior", () => {
+    (0, vitest_1.test)("4xx error throws immediately without retrying", async () => {
+        // Use mockImplementation (fresh Response per call) instead of
+        // mockResolvedValue (single Response instance) — the latter's
+        // body stream gets consumed on the first .text() read and
+        // subsequent reads fail with "Body is unusable".
+        fetchMock.mockImplementation(() => Promise.resolve(_errorResponse(400, "unknown_tool_use_id")));
+        await (0, vitest_1.expect)((0, tool_result_client_js_1.postToolResults)("sess", [
+            { tool_use_id: "toolu_a", content: "x", is_error: false },
+        ])).rejects.toThrow(/rejected \(400\)/);
+        (0, vitest_1.expect)(fetchMock).toHaveBeenCalledTimes(1);
+    });
+    (0, vitest_1.test)("4xx error includes server body in the thrown message", async () => {
+        fetchMock.mockImplementation(() => Promise.resolve(_errorResponse(400, '{"code":"unknown_tool_use_id","unknown":["toolu_x"]}')));
+        await (0, vitest_1.expect)((0, tool_result_client_js_1.postToolResults)("sess", [
+            { tool_use_id: "toolu_x", content: "x", is_error: false },
+        ])).rejects.toThrow(/unknown_tool_use_id/);
+    });
+    (0, vitest_1.test)("5xx error retries up to 3 attempts then throws", async () => {
+        fetchMock.mockImplementation(() => Promise.resolve(_errorResponse(503, "service unavailable")));
+        await (0, vitest_1.expect)((0, tool_result_client_js_1.postToolResults)("sess", [
+            { tool_use_id: "toolu_a", content: "x", is_error: false },
+        ])).rejects.toThrow(/503/);
+        (0, vitest_1.expect)(fetchMock).toHaveBeenCalledTimes(3);
+    });
+    (0, vitest_1.test)("5xx then success on retry → returns success", async () => {
+        fetchMock
+            .mockResolvedValueOnce(_errorResponse(500, "internal"))
+            .mockResolvedValueOnce(_okResponse({ completed: ["a"], all_completed: true, resume_signaled: true }));
+        const result = await (0, tool_result_client_js_1.postToolResults)("sess", [
+            { tool_use_id: "a", content: "x", is_error: false },
+        ]);
+        (0, vitest_1.expect)(result.all_completed).toBe(true);
+        (0, vitest_1.expect)(fetchMock).toHaveBeenCalledTimes(2);
+    });
+    (0, vitest_1.test)("network error retries up to 3 attempts then throws", async () => {
+        fetchMock.mockRejectedValue(new Error("ECONNRESET"));
+        await (0, vitest_1.expect)((0, tool_result_client_js_1.postToolResults)("sess", [
+            { tool_use_id: "a", content: "x", is_error: false },
+        ])).rejects.toThrow(/ECONNRESET/);
+        (0, vitest_1.expect)(fetchMock).toHaveBeenCalledTimes(3);
+    });
+    (0, vitest_1.test)("network error then success on retry → returns success", async () => {
+        fetchMock
+            .mockRejectedValueOnce(new Error("ECONNRESET"))
+            .mockResolvedValueOnce(_okResponse({ completed: ["a"], all_completed: false, resume_signaled: false }));
+        const result = await (0, tool_result_client_js_1.postToolResults)("sess", [
+            { tool_use_id: "a", content: "x", is_error: false },
+        ]);
+        (0, vitest_1.expect)(result.completed).toEqual(["a"]);
+        (0, vitest_1.expect)(fetchMock).toHaveBeenCalledTimes(2);
+    });
+});
+//# sourceMappingURL=tool_result_client.test.js.map

package/dist/__tests__/tool_result_client.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool_result_client.test.js","sourceRoot":"","sources":["../../src/__tests__/tool_result_client.test.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;GAiBG;;AAEH,mCAA2E;AAC3E,oEAA2D;AAE3D,0DAA0D;AAC1D,2CAA2C;AAC3C,WAAE,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC;IAC3B,QAAQ,EAAE,GAAG,EAAE,CAAC,0BAA0B;CAC3C,CAAC,CAAC,CAAC;AAEJ,+CAA+C;AAC/C,WAAE,CAAC,IAAI,CAAC,cAAc,EAAE,GAAG,EAAE,CAAC,CAAC;IAC7B,gBAAgB,EAAE,gCAAgC;CACnD,CAAC,CAAC,CAAC;AAEJ,IAAI,SAAmC,CAAC;AACxC,IAAI,SAAkC,CAAC;AAEvC,IAAA,mBAAU,EAAC,GAAG,EAAE;IACd,SAAS,GAAG,WAAE,CAAC,EAAE,EAAE,CAAC;IACpB,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC;IAC7B,UAAU,CAAC,KAAK,GAAG,SAA+C,CAAC;AACrE,CAAC,CAAC,CAAC;AAEH,IAAA,kBAAS,EAAC,GAAG,EAAE;IACb,UAAU,CAAC,KAAK,GAAG,SAAS,CAAC;IAC7B,WAAE,CAAC,eAAe,EAAE,CAAC;AACvB,CAAC,CAAC,CAAC;AAEH,SAAS,WAAW,CAAC,IAAY;IAC/B,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;QACxC,MAAM,EAAE,GAAG;QACX,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;KAChD,CAAC,CAAC;AACL,CAAC;AAED,SAAS,cAAc,CAAC,MAAc,EAAE,IAAY;IAClD,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;AACxC,CAAC;AAED,IAAA,iBAAQ,EAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,IAAA,aAAI,EAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;QACnE,SAAS,CAAC,iBAAiB,CACzB,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CACpF,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,IAAA,uCAAe,EAAC,aAAa,EAAE;YAClD,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE;SAC3D,CAAC,CAAC;QACH,IAAA,eAAM,EAAC,MAAM,CAAC,CAAC,OAAO,CAAC;YACrB,SAAS,EAAE,CAAC,SAAS,CAAC;YACtB,aAAa,EAAE,IAAI;YACnB,eAAe,EAAE,IAAI;SACtB,CAAC,CAAC;QACH,IAAA,eAAM,EAAC,SAAS,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC5C,IAAA,eAAM,EAAC,GAAG,CAAC,CAAC,IAAI,CACd,2EAA2E,CAC5E,CAAC;QACF,IAAA,eAAM,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACjC,IAAA,eAAM,EAAE,IAAI,CAAC,OAAkC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAChE,0BAA0B,CAC3B,CAAC;QACF,IAAA,eAAM,EAAE,IAAI,CAAC,OAAkC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,CACnE,kBAAkB,CACnB,CAAC;QACF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAC7C,IAAA,eAAM,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YACnB,OAAO,EAAE,CAAC,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;SACtE,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAA,aAAI,EAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;QAC/C,SAAS,CAAC,iBAAiB,CACzB,WAAW,CAAC;YACV,SAAS,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC;YACjC,aAAa,EAAE,KAAK;YACpB,eAAe,EAAE,KAAK;SACvB,CAAC,CACH,CAAC;QACF,MAAM,IAAA,uCAAe,EAAC,MAAM,EAAE;YAC5B,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE;YACzD,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE;SACzD,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACzD,IAAA,eAAM,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACrC,IAAA,eAAM,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,IAAA,iBAAQ,EAAC,gCAAgC,EAAE,GAAG,EAAE;IAC9C,IAAA,aAAI,EAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC/D,8DAA8D;QAC9D,8DAA8D;QAC9D,0DAA0D;QAC1D,iDAAiD;QACjD,SAAS,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAChC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC,CAC5D,CAAC;QACF,MAAM,IAAA,eAAM,EACV,IAAA,uCAAe,EAAC,MAAM,EAAE;YACtB,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE;SAC1D,CAAC,CACH,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;QACtC,IAAA,eAAM,EAAC,SAAS,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,IAAA,aAAI,EAAC,sDAAsD,EAAE,KAAK,IAAI,EAAE;QACtE,SAAS,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAChC,OAAO,CAAC,OAAO,CACb,cAAc,CAAC,GAAG,EAAE,sDAAsD,CAAC,CAC5E,CACF,CAAC;QACF,MAAM,IAAA,eAAM,EACV,IAAA,uCAAe,EAAC,MAAM,EAAE;YACtB,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE;SAC1D,CAAC,CACH,CAAC,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,IAAA,aAAI,EAAC,gDAAgD,EAAE,KAAK,IAAI,EAAE;QAChE,SAAS,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAChC,OAAO,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAC,CAC5D,CAAC;QACF,MAAM,IAAA,eAAM,EACV,IAAA,uCAAe,EAAC,MAAM,EAAE;YACtB,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE;SAC1D,CAAC,CACH,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACzB,IAAA,eAAM,EAAC,SAAS,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,IAAA,aAAI,EAAC,6CAA6C,EAAE,KAAK,IAAI,EAAE;QAC7D,SAAS;aACN,qBAAqB,CAAC,cAAc,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;aACtD,qBAAqB,CACpB,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAC9E,CAAC;QACJ,MAAM,MAAM,GAAG,MAAM,IAAA,uCAAe,EAAC,MAAM,EAAE;YAC3C,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE;SACpD,CAAC,CAAC;QACH,IAAA,eAAM,EAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxC,IAAA,eAAM,EAAC,SAAS,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,IAAA,aAAI,EAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;QACpE,SAAS,CAAC,iBAAiB,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;QACrD,MAAM,IAAA,eAAM,EACV,IAAA,uCAAe,EAAC,MAAM,EAAE;YACtB,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE;SACpD,CAAC,CACH,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAChC,IAAA,eAAM,EAAC,SAAS,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,IAAA,aAAI,EAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QACvE,SAAS;aACN,qBAAqB,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;aAC9C,qBAAqB,CACpB,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAChF,CAAC;QACJ,MAAM,MAAM,GAAG,MAAM,IAAA,uCAAe,EAAC,MAAM,EAAE;YAC3C,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE;SACpD,CAAC,CAAC;QACH,IAAA,eAAM,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACxC,IAAA,eAAM,EAAC,SAAS,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/config.d.ts

@@ -22,4 +22,11 @@
 export declare const ORCHESTRATOR_URL: string;
 export declare const AUTH_URL: string;
 export declare const WS_URL: string;
+/**
+ * The CLI's own version, sent in the WebSocket auth handshake so the
+ * server can reject pre-0.4.0 clients (#6565 PR5 — the client-owned
+ * dispatch cutover). MUST stay in sync with `version` in package.json;
+ * the drift-guard test in `__tests__/legacy_compat.test.ts` enforces it.
+ */
+export declare const CLI_VERSION = "0.4.0";
 //# sourceMappingURL=config.d.ts.map

package/dist/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAGH,eAAO,MAAM,gBAAgB,QAC4C,CAAC;AAK1E,eAAO,MAAM,QAAQ,QACuC,CAAC;AAQ7D,eAAO,MAAM,MAAM,QAA4B,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAGH,eAAO,MAAM,gBAAgB,QAC4C,CAAC;AAK1E,eAAO,MAAM,QAAQ,QACuC,CAAC;AAQ7D,eAAO,MAAM,MAAM,QAA4B,CAAC;AAEhD;;;;;GAKG;AACH,eAAO,MAAM,WAAW,UAAU,CAAC"}

package/dist/config.js

@@ -21,7 +21,7 @@
  * got 404. Restored in 0.2.1 (#6097 PR2 follow-up).
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WS_URL = exports.AUTH_URL = exports.ORCHESTRATOR_URL = void 0;
+exports.CLI_VERSION = exports.WS_URL = exports.AUTH_URL = exports.ORCHESTRATOR_URL = void 0;
 // Terminal orchestrator — handles dev sessions (WebSocket + REST).
 exports.ORCHESTRATOR_URL = process.env.XIAOTIME_ORCHESTRATOR_URL || "https://terminal.xiaotime.ai";
 // Main orchestrator — handles the OAuth login flow (init + token poll).
@@ -34,4 +34,11 @@ function toWsUrl(url) {
     return parsed.toString().replace(/\/$/, "");
 }
 exports.WS_URL = toWsUrl(exports.ORCHESTRATOR_URL);
+/**
+ * The CLI's own version, sent in the WebSocket auth handshake so the
+ * server can reject pre-0.4.0 clients (#6565 PR5 — the client-owned
+ * dispatch cutover). MUST stay in sync with `version` in package.json;
+ * the drift-guard test in `__tests__/legacy_compat.test.ts` enforces it.
+ */
+exports.CLI_VERSION = "0.4.0";
 //# sourceMappingURL=config.js.map

package/dist/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;;;AAEH,mEAAmE;AACtD,QAAA,gBAAgB,GAC3B,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,8BAA8B,CAAC;AAE1E,wEAAwE;AACxE,6EAA6E;AAC7E,4BAA4B;AACf,QAAA,QAAQ,GACnB,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,yBAAyB,CAAC;AAE7D,SAAS,OAAO,CAAC,GAAW;IAC1B,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IAC5B,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;IAChE,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAC9C,CAAC;AAEY,QAAA,MAAM,GAAG,OAAO,CAAC,wBAAgB,CAAC,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;;;AAEH,mEAAmE;AACtD,QAAA,gBAAgB,GAC3B,OAAO,CAAC,GAAG,CAAC,yBAAyB,IAAI,8BAA8B,CAAC;AAE1E,wEAAwE;AACxE,6EAA6E;AAC7E,4BAA4B;AACf,QAAA,QAAQ,GACnB,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,yBAAyB,CAAC;AAE7D,SAAS,OAAO,CAAC,GAAW;IAC1B,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IAC5B,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;IAChE,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAC9C,CAAC;AAEY,QAAA,MAAM,GAAG,OAAO,CAAC,wBAAgB,CAAC,CAAC;AAEhD;;;;;GAKG;AACU,QAAA,WAAW,GAAG,OAAO,CAAC"}

package/dist/tool_result_client.d.ts

@@ -0,0 +1,72 @@
+/**
+ * REST POST client for tool_result delivery.
+ *
+ * SPRINT-TERMINAL-CLIENT-OWNED-DISPATCH-1 (#6565) PR3.
+ *
+ * Pre-#6565 the CLI sent tool_result back to terminal-orchestrator
+ * over the WebSocket — the server awaited each one inline with a
+ * 120s timeout. Any approval taking >2 min wedged the session
+ * (the wedge class observed live 2026-05-20 during #6509 PR1
+ * canary).
+ *
+ * Post-#6565 the CLI POSTs results to the new REST endpoint:
+ *
+ *     POST <ORCHESTRATOR_URL>/terminal/sessions/{session_id}/tool_results
+ *     Headers: x-api-key: <cli_token>
+ *     Body:    {"results": [{tool_use_id, content, is_error}, ...]}
+ *
+ * Server-side: atomic across the batch. Any unknown `tool_use_id`
+ * → 400 `unknown_tool_use_id` + no rows mutated. On success,
+ * ``mark_completed_batch.all_completed=True`` signals the WS
+ * handler (waiting on the per-session resume queue) to assemble
+ * tool_result blocks + resume the model stream.
+ *
+ * Retry policy: 3 attempts with 100ms→200ms→400ms exponential
+ * backoff for transient 5xx + network errors. 4xx errors are
+ * non-retriable (the server's rejection is durable — the
+ * tool_use_id IS unknown, retrying won't change that).
+ *
+ * Failure mode if all retries exhaust: the tool_result is lost
+ * from the server's perspective; the corresponding row stays as
+ * `status='pending'` in `terminal_pending_tool_calls` until the
+ * future expiry sweep (PR5). The user-visible symptom is a
+ * session that appears frozen (model never resumes). Tightening
+ * this is the WS-reconnect-replay work in PR4 — on the next WS
+ * connect, server re-emits pending tool_call events and the CLI
+ * can re-attempt the POST after re-rendering the menu.
+ */
+export interface ToolResultEntry {
+    tool_use_id: string;
+    content: string;
+    is_error: boolean;
+}
+export interface PostToolResultsResponse {
+    completed: string[];
+    all_completed: boolean;
+    resume_signaled: boolean;
+}
+/**
+ * Thrown on durable (4xx) HTTP rejections that retrying won't fix.
+ * #6573 CR-r1: replaces the pre-r1 string-prefix matching on the
+ * Error message (`startsWith("POST tool_results rejected")`) which
+ * was fragile to message-format drift. The retry loop checks
+ * `instanceof DurableHttpError` and re-throws without retry; all
+ * other thrown errors are treated as transient + retried.
+ */
+export declare class DurableHttpError extends Error {
+    readonly status: number;
+    readonly body: string;
+    constructor(status: number, body: string);
+}
+/**
+ * POST a batch of tool_results to the orchestrator. Retries on
+ * 5xx / network errors with exponential backoff; throws on
+ * 4xx (non-retriable) or after retries exhaust.
+ *
+ * Most callers pass a single-result batch (one tool finished, POST
+ * the result, move to next). Batch form exists so a future
+ * client-side allowlist-auto-execute path could fire multiple
+ * results in one POST.
+ */
+export declare function postToolResults(sessionId: string, results: ToolResultEntry[]): Promise<PostToolResultsResponse>;
+//# sourceMappingURL=tool_result_client.d.ts.map

package/dist/tool_result_client.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool_result_client.d.ts","sourceRoot":"","sources":["../src/tool_result_client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAKH,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;;GAOG;AACH,qBAAa,gBAAiB,SAAQ,KAAK;IACzC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;gBACV,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAMzC;AAKD;;;;;;;;;GASG;AACH,wBAAsB,eAAe,CACnC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,eAAe,EAAE,GACzB,OAAO,CAAC,uBAAuB,CAAC,CAmDlC"}

package/dist/tool_result_client.js

@@ -0,0 +1,123 @@
+"use strict";
+/**
+ * REST POST client for tool_result delivery.
+ *
+ * SPRINT-TERMINAL-CLIENT-OWNED-DISPATCH-1 (#6565) PR3.
+ *
+ * Pre-#6565 the CLI sent tool_result back to terminal-orchestrator
+ * over the WebSocket — the server awaited each one inline with a
+ * 120s timeout. Any approval taking >2 min wedged the session
+ * (the wedge class observed live 2026-05-20 during #6509 PR1
+ * canary).
+ *
+ * Post-#6565 the CLI POSTs results to the new REST endpoint:
+ *
+ *     POST <ORCHESTRATOR_URL>/terminal/sessions/{session_id}/tool_results
+ *     Headers: x-api-key: <cli_token>
+ *     Body:    {"results": [{tool_use_id, content, is_error}, ...]}
+ *
+ * Server-side: atomic across the batch. Any unknown `tool_use_id`
+ * → 400 `unknown_tool_use_id` + no rows mutated. On success,
+ * ``mark_completed_batch.all_completed=True`` signals the WS
+ * handler (waiting on the per-session resume queue) to assemble
+ * tool_result blocks + resume the model stream.
+ *
+ * Retry policy: 3 attempts with 100ms→200ms→400ms exponential
+ * backoff for transient 5xx + network errors. 4xx errors are
+ * non-retriable (the server's rejection is durable — the
+ * tool_use_id IS unknown, retrying won't change that).
+ *
+ * Failure mode if all retries exhaust: the tool_result is lost
+ * from the server's perspective; the corresponding row stays as
+ * `status='pending'` in `terminal_pending_tool_calls` until the
+ * future expiry sweep (PR5). The user-visible symptom is a
+ * session that appears frozen (model never resumes). Tightening
+ * this is the WS-reconnect-replay work in PR4 — on the next WS
+ * connect, server re-emits pending tool_call events and the CLI
+ * can re-attempt the POST after re-rendering the menu.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DurableHttpError = void 0;
+exports.postToolResults = postToolResults;
+const config_js_1 = require("./config.js");
+const auth_js_1 = require("./auth.js");
+/**
+ * Thrown on durable (4xx) HTTP rejections that retrying won't fix.
+ * #6573 CR-r1: replaces the pre-r1 string-prefix matching on the
+ * Error message (`startsWith("POST tool_results rejected")`) which
+ * was fragile to message-format drift. The retry loop checks
+ * `instanceof DurableHttpError` and re-throws without retry; all
+ * other thrown errors are treated as transient + retried.
+ */
+class DurableHttpError extends Error {
+    status;
+    body;
+    constructor(status, body) {
+        super(`POST tool_results rejected (${status}): ${body}`);
+        this.name = "DurableHttpError";
+        this.status = status;
+        this.body = body;
+    }
+}
+exports.DurableHttpError = DurableHttpError;
+const MAX_ATTEMPTS = 3;
+const BACKOFF_BASE_MS = 100;
+/**
+ * POST a batch of tool_results to the orchestrator. Retries on
+ * 5xx / network errors with exponential backoff; throws on
+ * 4xx (non-retriable) or after retries exhaust.
+ *
+ * Most callers pass a single-result batch (one tool finished, POST
+ * the result, move to next). Batch form exists so a future
+ * client-side allowlist-auto-execute path could fire multiple
+ * results in one POST.
+ */
+async function postToolResults(sessionId, results) {
+    const url = `${config_js_1.ORCHESTRATOR_URL}/terminal/sessions/${sessionId}/tool_results`;
+    const headers = {
+        "Content-Type": "application/json",
+        "x-api-key": (0, auth_js_1.getToken)(),
+    };
+    const body = JSON.stringify({ results });
+    let lastErr = null;
+    for (let attempt = 1; attempt <= MAX_ATTEMPTS; attempt++) {
+        try {
+            const response = await fetch(url, {
+                method: "POST",
+                headers,
+                body,
+            });
+            if (response.ok) {
+                return (await response.json());
+            }
+            // 4xx is durable — server rejected the payload, retrying
+            // won't change the outcome. Throw a typed DurableHttpError
+            // (caught + re-raised below via instanceof check, never
+            // retried).
+            if (response.status >= 400 && response.status < 500) {
+                const errBody = await response.text();
+                throw new DurableHttpError(response.status, errBody);
+            }
+            // 5xx — retriable.
+            lastErr = new Error(`POST tool_results failed (${response.status}): ${await response.text()}`);
+        }
+        catch (err) {
+            // #6573 CR-r1: type-check the rejection class instead of
+            // string-matching the Error message. DurableHttpError means
+            // "server told us no, retrying won't change that" — re-raise
+            // immediately. Everything else (network error, fetch
+            // failure, unexpected throw) is treated as transient +
+            // retried below.
+            if (err instanceof DurableHttpError) {
+                throw err;
+            }
+            lastErr = err instanceof Error ? err : new Error(String(err));
+        }
+        if (attempt < MAX_ATTEMPTS) {
+            const delay = BACKOFF_BASE_MS * 2 ** (attempt - 1);
+            await new Promise((r) => setTimeout(r, delay));
+        }
+    }
+    throw lastErr ?? new Error("POST tool_results failed (unknown)");
+}
+//# sourceMappingURL=tool_result_client.js.map

package/dist/tool_result_client.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool_result_client.js","sourceRoot":"","sources":["../src/tool_result_client.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;;;AAiDH,0CAsDC;AArGD,2CAA+C;AAC/C,uCAAqC;AAcrC;;;;;;;GAOG;AACH,MAAa,gBAAiB,SAAQ,KAAK;IAChC,MAAM,CAAS;IACf,IAAI,CAAS;IACtB,YAAY,MAAc,EAAE,IAAY;QACtC,KAAK,CAAC,+BAA+B,MAAM,MAAM,IAAI,EAAE,CAAC,CAAC;QACzD,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC;QAC/B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC;CACF;AATD,4CASC;AAED,MAAM,YAAY,GAAG,CAAC,CAAC;AACvB,MAAM,eAAe,GAAG,GAAG,CAAC;AAE5B;;;;;;;;;GASG;AACI,KAAK,UAAU,eAAe,CACnC,SAAiB,EACjB,OAA0B;IAE1B,MAAM,GAAG,GAAG,GAAG,4BAAgB,sBAAsB,SAAS,eAAe,CAAC;IAC9E,MAAM,OAAO,GAAG;QACd,cAAc,EAAE,kBAAkB;QAClC,WAAW,EAAE,IAAA,kBAAQ,GAAE;KACxB,CAAC;IACF,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEzC,IAAI,OAAO,GAAiB,IAAI,CAAC;IACjC,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,YAAY,EAAE,OAAO,EAAE,EAAE,CAAC;QACzD,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAChC,MAAM,EAAE,MAAM;gBACd,OAAO;gBACP,IAAI;aACL,CAAC,CAAC;YACH,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;gBAChB,OAAO,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAA4B,CAAC;YAC5D,CAAC;YACD,yDAAyD;YACzD,2DAA2D;YAC3D,wDAAwD;YACxD,YAAY;YACZ,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,EAAE,CAAC;gBACpD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;gBACtC,MAAM,IAAI,gBAAgB,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACvD,CAAC;YACD,mBAAmB;YACnB,OAAO,GAAG,IAAI,KAAK,CACjB,6BAA6B,QAAQ,CAAC,MAAM,MAAM,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAC1E,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,yDAAyD;YACzD,4DAA4D;YAC5D,6DAA6D;YAC7D,qDAAqD;YACrD,uDAAuD;YACvD,iBAAiB;YACjB,IAAI,GAAG,YAAY,gBAAgB,EAAE,CAAC;gBACpC,MAAM,GAAG,CAAC;YACZ,CAAC;YACD,OAAO,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;QAChE,CAAC;QAED,IAAI,OAAO,GAAG,YAAY,EAAE,CAAC;YAC3B,MAAM,KAAK,GAAG,eAAe,GAAG,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,CAAC;YACnD,MAAM,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IAED,MAAM,OAAO,IAAI,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;AACnE,CAAC"}

package/dist/ws.d.ts

@@ -5,6 +5,16 @@
  * SessionUI state machine from incoming WS events so the user gets
  * a spinner while the model is generating / a tool is running, and
  * approval prompts don't race the main rl on keystrokes.
+ *
+ * SPRINT-TERMINAL-CLIENT-OWNED-DISPATCH-1 (#6565) PR3 — tool_result
+ * delivery moved off the WebSocket: results POST to
+ * /terminal/sessions/{id}/tool_results via the new REST endpoint.
+ * The WS now carries only inbound (server→client) `tool_call`
+ * events as informational triggers. Tool calls drain serially
+ * through a local queue so concurrent menus can't corrupt
+ * SessionUI state — the pre-#6565 `inFlightToolUseId` reject-on-
+ * overlap guard is gone (it caused the wedge observed in the
+ * #6509 PR1 canary).
  */
 export declare function runSession(sessionId: string): Promise<void>;
 //# sourceMappingURL=ws.d.ts.map

package/dist/ws.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../src/ws.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAgBH,wBAAsB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAgMjE"}
+{"version":3,"file":"ws.d.ts","sourceRoot":"","sources":["../src/ws.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAwBH,wBAAsB,UAAU,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiQjE"}

package/dist/ws.js

@@ -6,6 +6,16 @@
  * SessionUI state machine from incoming WS events so the user gets
  * a spinner while the model is generating / a tool is running, and
  * approval prompts don't race the main rl on keystrokes.
+ *
+ * SPRINT-TERMINAL-CLIENT-OWNED-DISPATCH-1 (#6565) PR3 — tool_result
+ * delivery moved off the WebSocket: results POST to
+ * /terminal/sessions/{id}/tool_results via the new REST endpoint.
+ * The WS now carries only inbound (server→client) `tool_call`
+ * events as informational triggers. Tool calls drain serially
+ * through a local queue so concurrent menus can't corrupt
+ * SessionUI state — the pre-#6565 `inFlightToolUseId` reject-on-
+ * overlap guard is gone (it caused the wedge observed in the
+ * #6509 PR1 canary).
  */
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
@@ -16,8 +26,10 @@ const ws_1 = __importDefault(require("ws"));
 const config_js_1 = require("./config.js");
 const auth_js_1 = require("./auth.js");
 const tools_js_1 = require("./tools.js");
+const tool_result_client_js_1 = require("./tool_result_client.js");
 const display_js_1 = require("./display.js");
 const ui_state_js_1 = require("./ui_state.js");
+const chalk_1 = __importDefault(require("chalk"));
 async function runSession(sessionId) {
     const wsUrl = `${config_js_1.WS_URL}/terminal/sessions/${sessionId}/stream`;
     return new Promise((resolve, reject) => {
@@ -25,19 +37,93 @@ async function runSession(sessionId) {
         let connected = false;
         const ui = new ui_state_js_1.SessionUI();
         let firstTokenThisTurn = true;
-        // #6169 review §1 — guard against concurrent tool_call messages.
-        // The server-side WS handler dispatches tool calls serially (one
-        // tool_call → wait for tool_result → next tool_call), but a buggy
-        // server or future protocol change could break that invariant.
-        // Overlapping executions would corrupt the SessionUI state
-        // machine (running_tool vs awaiting_approval) and possibly skip
-        // the approval gate on the second call. Track the in-flight
-        // tool_use_id; reject any second tool_call that arrives before
-        // the first one's tool_result was sent.
-        let inFlightToolUseId = null;
+        // #6565 PR3 — serial drain queue. The server may emit multiple
+        // tool_call events back-to-back (one per tool_use block in the
+        // model's batch). Executing concurrently would corrupt
+        // SessionUI state (two menus rendering on top of each other);
+        // queueing + draining one-at-a-time gives clean approval flows
+        // while still parallelizable across the server (server emits
+        // all N then awaits the resume signal — order of completion
+        // doesn't matter to the server, only that all N land via POST).
+        const toolCallQueue = [];
+        let drainRunning = false;
+        async function drainToolCallQueue() {
+            if (drainRunning)
+                return;
+            drainRunning = true;
+            try {
+                while (toolCallQueue.length > 0) {
+                    const tc = toolCallQueue.shift();
+                    ui.setState("running_tool");
+                    const result = await (0, tools_js_1.executeTool)({
+                        tool_use_id: tc.tool_use_id,
+                        name: tc.name,
+                        input: tc.input,
+                    }, ui);
+                    let postFailed = false;
+                    try {
+                        await (0, tool_result_client_js_1.postToolResults)(sessionId, [
+                            {
+                                tool_use_id: result.tool_use_id,
+                                content: result.content,
+                                is_error: result.is_error,
+                            },
+                        ]);
+                    }
+                    catch (err) {
+                        // POST exhausted retries (transient 5xx / network) OR
+                        // 4xx (durable rejection, e.g. unknown_tool_use_id from
+                        // a server restart that lost the pending row). Tool
+                        // result is lost from the server's perspective; the
+                        // pending row stays as `pending` until PR5's expiry
+                        // sweep. PR4's WS-reconnect replay path will re-emit
+                        // the tool_call on next session connect for a retry.
+                        const msg = err instanceof Error ? err.message : String(err);
+                        process.stderr.write(chalk_1.default.yellow(`  (tool_result POST failed: ${msg})\n`));
+                        postFailed = true;
+                    }
+                    // #6573 CR-r1: on POST failure, the server's resume signal
+                    // won't fire (server never learns this tool completed).
+                    // The CLI would sit silently with no further events from
+                    // the server, looking wedged. Bounce the user back to the
+                    // prompt with a clear cue + a fresh idle state so they can
+                    // type `xiaotime dev --session <id>` (resume) or pick a
+                    // different recovery action. The unfinished pending rows
+                    // stay durable in the DB for PR4's reconnect replay.
+                    if (postFailed) {
+                        ui.setState("idle");
+                        process.stderr.write(chalk_1.default.yellow("  (session paused — POST failed; reconnect with " +
+                            "`xiaotime dev --session " +
+                            sessionId +
+                            "` to retry pending tool calls)\n"));
+                        // #6573 CR-r1: a POST failure means the server never got
+                        // the resume signal — its dispatch state is inconsistent.
+                        // Close the socket rather than returning to the prompt:
+                        // the clean recovery is a fresh session, not a retry on a
+                        // half-dispatched one. ws.close() fires the on("close")
+                        // handler (rl teardown + resolve), so the user genuinely
+                        // re-runs `xiaotime dev --session <id>`. Pending rows stay
+                        // durable in the DB for PR4's reconnect replay; draining
+                        // stops here because the loop is abandoned with the session.
+                        ws.close();
+                        return;
+                    }
+                    // Don't transition state back to "generating" here — the
+                    // model may already be streaming on the next turn (the
+                    // server's resume happens as soon as all batch results
+                    // land via POST). The next text_delta clears the spinner
+                    // via onFirstToken.
+                    firstTokenThisTurn = true;
+                }
+            }
+            finally {
+                drainRunning = false;
+            }
+        }
         ws.on("open", () => {
-            // Auth
-            ws.send(JSON.stringify({ type: "auth", token: (0, auth_js_1.getToken)() }));
+            // Auth — #6565 PR5: `version` lets the server reject pre-0.4.0
+            // clients that would wedge on the old WS tool_result path.
+            ws.send(JSON.stringify({ type: "auth", token: (0, auth_js_1.getToken)(), version: config_js_1.CLI_VERSION }));
             // Connect with cwd
             ws.send(JSON.stringify({ type: "connect", cwd: process.cwd() }));
         });
@@ -48,7 +134,20 @@ async function runSession(sessionId) {
                     connected = true;
                     (0, tools_js_1.setSessionCwd)(process.cwd());
                     (0, display_js_1.printWelcome)(msg.session_id, msg.session_name, msg.resumed, msg.message_count);
-                    startUserPromptLoop();
+                    // #6565 PR4b — if the server is replaying tool calls left
+                    // pending by a prior session (restart / crash mid-approval),
+                    // defer the prompt loop. The server emits those `tool_call`
+                    // events next; they drain through the queue, the CLI POSTs
+                    // results, the server resumes the turn, and that turn's
+                    // `message_stop` starts the prompt loop. Starting it here
+                    // would race the replayed approval menus against the prompt.
+                    if ((msg.pending_tool_calls ?? 0) > 0) {
+                        process.stderr.write(chalk_1.default.cyan(`  (resuming ${msg.pending_tool_calls} pending tool ` +
+                            `call(s) from a prior session)\n`));
+                    }
+                    else {
+                        startUserPromptLoop();
+                    }
                     break;
                 case "text_delta":
                     if (firstTokenThisTurn) {
@@ -58,49 +157,22 @@ async function runSession(sessionId) {
                     (0, display_js_1.printTextDelta)(msg.content);
                     break;
                 case "tool_call": {
-                    // #6169 review §1 — reject overlapping tool calls. The
-                    // server-side WS handler is supposed to dispatch one
-                    // tool_call at a time and wait for its tool_result before
-                    // sending the next; a protocol violation here would
-                    // corrupt the SessionUI state. Reject the second tool by
-                    // returning an is_error tool_result and logging — leaves
-                    // the first execution untouched.
-                    if (inFlightToolUseId !== null) {
-                        const errMsg = `Protocol violation: tool_call (id=${msg.tool_use_id}) arrived ` +
-                            `while another tool (id=${inFlightToolUseId}) is still in flight. ` +
-                            `CLI rejects overlapping executions; the server WS handler should ` +
-                            `serialize tool dispatch.`;
-                        console.error(`\n[cli] ${errMsg}\n`);
-                        ws.send(JSON.stringify({
-                            type: "tool_result",
-                            tool_use_id: msg.tool_use_id,
-                            content: errMsg,
-                            is_error: true,
-                        }));
-                        break;
-                    }
-                    inFlightToolUseId = msg.tool_use_id;
-                    // executeTool drives its own state transitions when an
-                    // approval is needed (running_tool ↔ awaiting_approval).
-                    ui.setState("running_tool");
-                    (0, tools_js_1.executeTool)({
+                    // #6565 PR3 — informational event now. Server has already
+                    // persisted the pending row + is awaiting our POST to
+                    // /terminal/sessions/{id}/tool_results. Queue the call
+                    // for serial draining (one menu rendering at a time);
+                    // POST the result after each drain iteration. The
+                    // pre-#6565 inFlightToolUseId reject-on-overlap guard is
+                    // gone — concurrent dispatch is now safe by construction
+                    // via the drain serialization.
+                    toolCallQueue.push({
                         tool_use_id: msg.tool_use_id,
                         name: msg.name,
                         input: msg.input,
-                    }, ui).then((result) => {
-                        inFlightToolUseId = null;
-                        ws.send(JSON.stringify({
-                            type: "tool_result",
-                            tool_use_id: result.tool_use_id,
-                            content: result.content,
-                            is_error: result.is_error,
-                        }));
-                        // Back to generating; the next text_delta will clear any
-                        // spinner if onFirstToken hasn't yet been called for this
-                        // generation segment.
-                        ui.setState("generating");
-                        firstTokenThisTurn = true;
                     });
+                    // Fire-and-forget — drainToolCallQueue is idempotent on
+                    // concurrent invocation (the drainRunning guard inside).
+                    drainToolCallQueue();
                     break;
                 }
                 case "message_stop":

package/dist/ws.js.map

@@ -1 +1 @@
-{"version":3,"file":"ws.js","sourceRoot":"","sources":["../src/ws.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ws.js","sourceRoot":"","sources":["../src/ws.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xiaotime",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Xiaotime Developer — persistent-memory AI coding assistant",
   "bin": {
     "xiaotime": "./dist/index.js"
@@ -26,9 +26,9 @@
     "@types/node": "^22.0.0",
     "typescript": "^5.7.0",
     "ts-node": "^10.9.2",
-    "vitest": "^2.1.0"
+    "vitest": "^4.1.7"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.19.0"
   }
 }