@tianshu-ai/tianshu 0.50.3 → 0.52.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tianshu-ai/tianshu",
-  "version": "0.50.3",
+  "version": "0.52.0",
   "description": "An open AI agent platform with a sidecar browser. Built in public.",
   "license": "Apache-2.0",
   "homepage": "https://github.com/tianshu-ai/tianshu",

package/packages/server/dist/boot/ws-upgrade.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ws-upgrade.d.ts","sourceRoot":"","sources":["../../src/boot/ws-upgrade.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAQrC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAGlE,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,cAAc,CAAC;CAChC;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,wBAAwB,GAC7B,eAAe,CA4GjB"}
+{"version":3,"file":"ws-upgrade.d.ts","sourceRoot":"","sources":["../../src/boot/ws-upgrade.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,IAAI,CAAC;AAQrC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAGlE,MAAM,WAAW,wBAAwB;IACvC,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,EAAE,cAAc,CAAC;CAChC;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,wBAAwB,GAC7B,eAAe,CAkIjB"}

package/packages/server/dist/boot/ws-upgrade.js

@@ -25,7 +25,28 @@ import { attachChatHandler } from "../chat/handler.js";
 export function installChatWebSocket(deps) {
     const { server, globalOps, pluginRegistry } = deps;
     const wss = new WebSocketServer({ server, path: "/ws" });
+    // Server-side ping/pong: keep WS connections alive through NAT/
+    // firewalls (typically drop idle TCP after 60-120s) and detect
+    // dead clients. 30s interval; client has 10s to pong back.
+    const PING_INTERVAL_MS = 30_000;
+    const PONG_TIMEOUT_MS = 10_000;
+    const aliveSet = new Set();
+    const pingTimer = setInterval(() => {
+        for (const client of wss.clients) {
+            if (!aliveSet.has(client)) {
+                // Missed previous pong — terminate.
+                client.terminate();
+                continue;
+            }
+            aliveSet.delete(client);
+            client.ping();
+        }
+    }, PING_INTERVAL_MS);
+    pingTimer.unref();
+    wss.on("close", () => clearInterval(pingTimer));
     wss.on("connection", async (socket, request) => {
+        aliveSet.add(socket);
+        socket.on("pong", () => aliveSet.add(socket));
         // Build the chain from the live auth config so WS honours the same
         // login wall as HTTP. Skipping this (pinning DEV_RESOLVER_CHAIN) would
         // be an isolation hole: an unauthenticated socket could bypass auth.

package/packages/server/dist/boot/ws-upgrade.js.map

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

package/packages/server/dist/chat/handler.d.ts

@@ -60,41 +60,6 @@ interface RunPromptArgs {
     retryLastTurn?: boolean;
 }
 export declare function runPrompt(args: RunPromptArgs): Promise<void>;
-/**
- * Build the retry prompt for the auto-recovery loop after a
- * transient provider error / abort.
- *
- * Bare "please retry" caused endless blind-retry loops when the
- * failing tool was itself the reason for the abort (e.g. a bridge
- * disconnected while a `bridge_*_exec` call was in flight, so the
- * tool_call never returned a tool_result, provider timed out, we
- * blindly told the agent to "retry what you were doing", the agent
- * re-fired the same tool call, and the whole cycle repeated).
- *
- * When we can identify the tool(s) that were being called, name
- * them explicitly and steer the agent toward an environment probe /
- * user-facing failure report instead of re-issuing the exact same
- * call.
- *
- * DATA SOURCES (in preference order):
- *
- *   1. `outstandingToolCalls`: a Map handler.ts maintains from
- *      pi's `tool_execution_start` / `tool_execution_end` events.
- *      Reliable ONLY when execution never got to _end. In practice
- *      pi emits both events as a pair even on aborts, so this map
- *      is almost always empty by the time we get here.
- *
- *   2. `lastAssistantMessageContent`: the full JSON body of the
- *      just-persisted failing assistant message. It contains the
- *      `toolCall` blocks the model was trying to invoke, so we
- *      can name them even when the harness already flushed its
- *      execution-end events. This is the source that actually
- *      catches the bridge-disconnect / mid-call abort scenario
- *      Yu reported.
- *
- * Exported so it can be unit-tested; not intended for external
- * callers.
- */
 export declare function buildAutoRecoveryPrompt(outstandingToolCalls: ReadonlyMap<string, {
     name: string;
 }>, lastAssistantMessageContent?: string): string;

package/packages/server/dist/chat/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/chat/handler.ts"],"names":[],"mappings":"AAgDA,OAAO,EACL,mBAAmB,EACnB,cAAc,EAEd,KAAK,mBAAmB,EACxB,KAAK,wBAAwB,EAC9B,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EACL,mBAAmB,EACnB,cAAc,EACd,KAAK,mBAAmB,EACxB,KAAK,wBAAwB,GAC9B,CAAC;AAGF,OAAO,EACL,mBAAmB,EACnB,0BAA0B,EAC1B,wBAAwB,EACxB,2BAA2B,EAC3B,wBAAwB,EACxB,2BAA2B,EAC3B,yBAAyB,EACzB,6BAA6B,EAC7B,2BAA2B,EAC3B,4BAA4B,EAC5B,KAAK,oBAAoB,GAC1B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAOL,KAAK,aAAa,EACnB,MAAM,kBAAkB,CAAC;AAmB1B,OAAO,EAGL,KAAK,WAAW,EACjB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAOL,KAAK,WAAW,EAEjB,MAAM,eAAe,CAAC;AAWvB,OAAO,EAGL,KAAK,SAAS,EAEd,KAAK,cAAc,EAEpB,MAAM,kBAAkB,CAAC;AAY1B,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,aAAa,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,CAAC;IAClB;;;;;OAKG;IACH,cAAc,CAAC,EAAE,OAAO,6BAA6B,EAAE,cAAc,CAAC;IACtE,+DAA+D;IAC/D,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,CAyP7D;AAED,UAAU,aAAa;IACrB,GAAG,EAAE,aAAa,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,MAAM,EAAE,WAAW,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,6BAA6B,EAAE,cAAc,CAAC;IACtE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;;;;OAQG;IACH,OAAO,CAAC,EAAE,OAAO,eAAe,EAAE,WAAW,CAAC;IAC9C;;;;;;OAMG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAu0BlE;AAuRD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAgB,uBAAuB,CACrC,oBAAoB,EAAE,WAAW,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,EAC3D,2BAA2B,CAAC,EAAE,MAAM,GACnC,MAAM,CAuCR;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,oBAAoB,EAAE,MAAM,GAAG,MAAM,EAAE,CAgB3E;AAsCD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,MAAM,GAChB,MAAM,GAAG,IAAI,CA0Ef;AA4QD,wBAAgB,cAAc,IAAI,WAAW,EAAE,CAkC9C;AAGD,YAAY,EAAE,WAAW,EAAE,CAAC"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../../src/chat/handler.ts"],"names":[],"mappings":"AAgDA,OAAO,EACL,mBAAmB,EACnB,cAAc,EAEd,KAAK,mBAAmB,EACxB,KAAK,wBAAwB,EAC9B,MAAM,uBAAuB,CAAC;AAI/B,OAAO,EACL,mBAAmB,EACnB,cAAc,EACd,KAAK,mBAAmB,EACxB,KAAK,wBAAwB,GAC9B,CAAC;AAGF,OAAO,EACL,mBAAmB,EACnB,0BAA0B,EAC1B,wBAAwB,EACxB,2BAA2B,EAC3B,wBAAwB,EACxB,2BAA2B,EAC3B,yBAAyB,EACzB,6BAA6B,EAC7B,2BAA2B,EAC3B,4BAA4B,EAC5B,KAAK,oBAAoB,GAC1B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,EAOL,KAAK,aAAa,EACnB,MAAM,kBAAkB,CAAC;AA4B1B,OAAO,EAGL,KAAK,WAAW,EACjB,MAAM,2BAA2B,CAAC;AAGnC,OAAO,EAOL,KAAK,WAAW,EAEjB,MAAM,eAAe,CAAC;AAWvB,OAAO,EAGL,KAAK,SAAS,EAEd,KAAK,cAAc,EAEpB,MAAM,kBAAkB,CAAC;AAY1B,MAAM,WAAW,eAAe;IAC9B,GAAG,EAAE,aAAa,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,CAAC;IAClB;;;;;OAKG;IACH,cAAc,CAAC,EAAE,OAAO,6BAA6B,EAAE,cAAc,CAAC;IACtE,+DAA+D;IAC/D,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,eAAe,GAAG,IAAI,CAyP7D;AAED,UAAU,aAAa;IACrB,GAAG,EAAE,aAAa,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,IAAI,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,cAAc,EAAE,CAAC;IAC/B,MAAM,EAAE,WAAW,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,6BAA6B,EAAE,cAAc,CAAC;IACtE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;;;;OAQG;IACH,OAAO,CAAC,EAAE,OAAO,eAAe,EAAE,WAAW,CAAC;IAC9C;;;;;;OAMG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,wBAAsB,SAAS,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CA28BlE;AAmVD,wBAAgB,uBAAuB,CACrC,oBAAoB,EAAE,WAAW,CAAC,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,EAC3D,2BAA2B,CAAC,EAAE,MAAM,GACnC,MAAM,CAuCR;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,oBAAoB,EAAE,MAAM,GAAG,MAAM,EAAE,CAgB3E;AAsCD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,uBAAuB,CACrC,GAAG,EAAE,aAAa,EAClB,SAAS,EAAE,MAAM,GAChB,MAAM,GAAG,IAAI,CA0Ef;AA4QD,wBAAgB,cAAc,IAAI,WAAW,EAAE,CAkC9C;AAGD,YAAY,EAAE,WAAW,EAAE,CAAC"}

package/packages/server/dist/chat/handler.js

@@ -37,9 +37,11 @@ import { adaptToolset } from "./agent-tool-adapter.js";
 import { pruneOldToolResults } from "./tool-result-truncation.js";
 import { dumpSystemPrompt } from "./dump-system-prompt.js";
 import { SqliteSessionRepo } from "./sqlite-session-repo.js";
-import { drainPending as drainInbox, renderForPrompt as renderInboxForPrompt, extractEvents, markDeliveredFromMessage, } from "./session-inbox.js";
+import { drainPending as drainInbox, renderForPrompt as renderInboxForPrompt, extractEvents, enqueue as enqueueInbox, markDeliveredFromMessage, } from "./session-inbox.js";
 import { registerActiveHarness, registerUserSendChannel, } from "./active-harnesses.js";
 import { SqliteSessionStorage } from "./sqlite-session-storage.js";
+import { createLogger, elapsedMs, summarizeToolArgs, estimateToolResultBytes, } from "../setup/logger.js";
+const log = createLogger("handler");
 import { filterSkillsForTenant, loadSkillsForPlugin, } from "../core/plugins/skills.js";
 import { loadTenantSkills } from "../core/tenant-skills.js";
 import { fileURLToPath } from "node:url";
@@ -632,11 +634,33 @@ export async function runPrompt(args) {
         const ev = event;
         if (ev.type === "tool_execution_start") {
             const tc = event;
-            outstandingToolCalls.set(tc.toolCallId, { name: tc.toolName });
+            const startedAt = process.hrtime.bigint();
+            outstandingToolCalls.set(tc.toolCallId, {
+                name: tc.toolName,
+                startedAt,
+            });
+            // Tool call debug trail (Yu, 2026-09-14 09:03): without this
+            // there was no way to correlate a bridge hang with which tool
+            // + args the agent had asked for. Only emitted at debug
+            // level so info-level logs stay quiet.
+            const rawArgs = tc.input ?? tc.arguments ?? tc.args;
+            log.debug(`tool_start name=${tc.toolName} id=${tc.toolCallId} args=${summarizeToolArgs(rawArgs)}`);
         }
         else if (ev.type === "tool_execution_end") {
             const te = event;
+            const started = outstandingToolCalls.get(te.toolCallId);
             outstandingToolCalls.delete(te.toolCallId);
+            if (started) {
+                const duration = elapsedMs(started.startedAt);
+                const outcome = te.error != null ? "error" : "ok";
+                const resultBytes = estimateToolResultBytes(te.result ?? te.output);
+                log.debug(`tool_end name=${started.name} id=${te.toolCallId} duration_ms=${duration} outcome=${outcome} result_bytes=${resultBytes}`);
+            }
+            else {
+                // Endpoint fired without a matching start — either recovery
+                // path or the start event was swallowed. Log so we notice.
+                log.debug(`tool_end id=${te.toolCallId} (no matching start; likely recovery or lost event)`);
+            }
         }
         bridgeHarnessEventToWs(event, {
             ctx,
@@ -807,37 +831,63 @@ export async function runPrompt(args) {
         // context to probe environment state before re-issuing the same
         // call — and to bail out and tell the user if the tool is
         // fundamentally unavailable.
-        let recoveryAttempts = 0;
-        const MAX_RECOVERY = 2;
-        while (recoveryAttempts < MAX_RECOVERY) {
+        // Auto-recover from transient errors by scheduling a NEW turn
+        // via the session inbox, not harness.prompt() within this turn.
+        //
+        // Root cause (Yu, 2026-09-14): harness.prompt() reuses the same
+        // toolset snapshot built at the top of handleTurn. If a bridge
+        // tool failed because the connection dropped, the toolset still
+        // holds the dead BridgeConn — so the retry always fails again.
+        // Meanwhile, the user typing "继续" triggers a fresh handleTurn
+        // which calls refreshStaleToolsets() + buildToolset(), picks up
+        // the reconnected bridge, and succeeds.
+        //
+        // Fix: enqueue the retry prompt into the session inbox. The
+        // inbox flush triggers a brand-new handleTurn with fresh tool
+        // resolution — identical to what a user message does.
+        {
             const lastRow = lastAssistantRow;
-            if (!lastRow)
-                break;
-            try {
-                const parsed = JSON.parse(lastRow.content);
-                if (parsed.stopReason !== "error" && parsed.stopReason !== "aborted")
-                    break;
-            }
-            catch {
-                break;
+            if (lastRow && !signal.aborted) {
+                let needsRecovery = false;
+                try {
+                    const parsed = JSON.parse(lastRow.content);
+                    needsRecovery = parsed.stopReason === "error" || parsed.stopReason === "aborted";
+                }
+                catch { /* not JSON or no stopReason */ }
+                if (needsRecovery) {
+                    // Guard against infinite retry loops: check how many recent
+                    // auto-recovery notes already exist in this session. If we've
+                    // already retried MAX times, stop and let the user intervene.
+                    const MAX_AUTO_RECOVERY = 2;
+                    const recentRecoveries = countRecentRecoveryNotes(ctx, session.id);
+                    if (recentRecoveries >= MAX_AUTO_RECOVERY) {
+                        console.log(`[handler] auto-recovery: already retried ${recentRecoveries} times, stopping to avoid infinite loop`);
+                    }
+                    else {
+                        // Purge orphaned tool_result rows BEFORE scheduling retry.
+                        // A failed turn can leave tool_result rows without matching
+                        // tool_use — Anthropic rejects these with 400. Clean up now
+                        // so the retry turn starts with valid history.
+                        try {
+                            const purged = purgeOrphanedToolResults(ctx, session.id);
+                            if (purged > 0) {
+                                console.log(`[handler] auto-recovery: pre-purged ${purged} orphaned toolResult row(s)`);
+                            }
+                        }
+                        catch { /* best effort */ }
+                        const retryPrompt = buildAutoRecoveryPrompt(outstandingToolCalls, lastRow.content);
+                        console.log(`[handler] auto-recovery ${recentRecoveries + 1}/${MAX_AUTO_RECOVERY}: scheduling new turn via inbox in 3s`);
+                        // 3s delay lets bridge reconnect, then a fresh handleTurn
+                        // re-resolves toolsets with the live connection.
+                        setTimeout(() => {
+                            void enqueueInbox(ctx, session.id, {
+                                kind: "system_note",
+                                text: `[auto-recovery ${recentRecoveries + 1}/${MAX_AUTO_RECOVERY}] ${retryPrompt}`,
+                            });
+                        }, 3000);
+                    }
+                }
             }
-            // Don't retry if user explicitly aborted
-            if (signal.aborted)
-                break;
-            recoveryAttempts++;
-            console.log(`[handler] auto-recovery ${recoveryAttempts}/${MAX_RECOVERY} (stopReason=error/aborted, retrying)`);
-            // Brief delay before retry to let transient issues resolve
-            await new Promise((r) => setTimeout(r, 2000));
-            // Pass the full assistant JSON as the second-tier data source:
-            // pi emits tool_execution_start/end in pairs even on aborts, so
-            // outstandingToolCalls is nearly always empty by the time we
-            // land here. The persisted assistant content still carries the
-            // toolCall blocks that were being invoked — that's what actually
-            // identifies the failing tool in Yu's bridge-disconnect scenario.
-            const retryPrompt = buildAutoRecoveryPrompt(outstandingToolCalls, lastRow?.content);
-            console.log(`[handler] auto-recovery prompt (first 200 chars): ${retryPrompt.slice(0, 200)}`);
-            await harness.prompt(retryPrompt);
-            await harness.waitForIdle();
         }
     }
     catch (err) {
@@ -854,14 +904,44 @@ export async function runPrompt(args) {
             console.log(`[handler] catch: ${errMsg.slice(0, 300)}`);
             if (/tool_use_id.*tool_result|tool_result.*tool_use/i.test(errMsg)) {
                 console.log(`[handler] detected orphaned tool_result error, session=${session.id}`);
+                // The orphan is NOT a DB row — it's generated during pi-agent-core's
+                // session-tree → Anthropic wire-format conversion (compaction can
+                // break tool_use ↔ tool_result adjacency). Row-level purge won't
+                // help. Force a full compaction to rebuild the history cleanly.
                 try {
-                    const purged = purgeOrphanedToolResults(ctx, session.id);
-                    if (purged > 0) {
-                        console.log(`[handler] purged ${purged} orphaned toolResult row(s) from session ${session.id}`);
-                    }
+                    console.log(`[handler] forcing compaction to clear corrupted history...`);
+                    await compactSession({
+                        ctx,
+                        userId,
+                        oldSession: session,
+                        pi: loadAgentHistoryForSession(ctx, session.id, {
+                            api: modelInfo.api,
+                            provider: modelInfo.providerId,
+                            model: modelInfo.modelId,
+                        }).messages,
+                        rows: loadAgentHistoryForSession(ctx, session.id, {
+                            api: modelInfo.api,
+                            provider: modelInfo.providerId,
+                            model: modelInfo.modelId,
+                        }).rows,
+                        modelInfo,
+                        signal: new AbortController().signal,
+                    });
+                    console.log(`[handler] compaction done, scheduling retry via inbox`);
+                    setTimeout(() => {
+                        void enqueueInbox(ctx, session.id, {
+                            kind: "system_note",
+                            text: "History was compacted to fix a corrupted tool_result chain. Continue where you left off.",
+                        });
+                    }, 1000);
                 }
-                catch (purgeErr) {
-                    console.warn(`[handler] purgeOrphanedToolResults failed: ${purgeErr}`);
+                catch (compactErr) {
+                    console.warn(`[handler] forced compaction failed: ${compactErr}`);
+                    // Fallback: try the old row-level purge
+                    try {
+                        purgeOrphanedToolResults(ctx, session.id);
+                    }
+                    catch { /* best effort */ }
                 }
             }
             // pi harness state-machine errors are NOT provider failures —
@@ -986,9 +1066,11 @@ export async function runPrompt(args) {
     // After every successful turn, decide whether to fire it.
     // Also fires when the agent explicitly called compact_context mid-turn
     // (which deferred to this post-turn hook via compactRef.requestedByAgent).
+    let compacted = false;
     if (!streamErrorSent || compactRef?.requestedByAgent) {
         if (compactRef)
             compactRef.requestedByAgent = false;
+        const preCompactSession = session;
         await maybeAutoCompact({
             session,
             piSession,
@@ -997,6 +1079,7 @@ export async function runPrompt(args) {
             send,
             compactionSettings,
             onSuccessRefresh: () => {
+                compacted = true;
                 // Refresh after compaction: same default page size as the
                 // initial fetch. The compacted session is what the client
                 // wants to see; we don't try to preserve the older paged-in
@@ -1010,6 +1093,34 @@ export async function runPrompt(args) {
             },
         });
     }
+    // After successful post-turn compaction, check if the agent was
+    // mid-task. The last assistant message may have tool calls that
+    // completed, but the agent intended to do more. Without a nudge
+    // the session goes silent — the user has to manually type "继续".
+    // Inject a "continue" via inbox so a fresh handleTurn picks up
+    // with the newly-compacted (smaller) context.
+    if (compacted && !signal.aborted) {
+        const lastRow = lastAssistantRow;
+        if (lastRow)
+            try {
+                const parsed = JSON.parse(lastRow.content);
+                // Heuristic: the agent was mid-task if its last turn contained
+                // tool calls (it was doing work, not just chatting).
+                const hadToolCalls = Array.isArray(parsed.content) &&
+                    parsed.content.some((b) => b.type === "tool_use" || b.type === "toolCall");
+                if (hadToolCalls) {
+                    console.log(`[handler] post-compaction: agent had tool calls in last turn, injecting continue via inbox`);
+                    setTimeout(() => {
+                        void enqueueInbox(ctx, session.id, {
+                            kind: "system_note",
+                            text: "Context was automatically compacted to free space. " +
+                                "Continue where you left off — the task is still in progress.",
+                        });
+                    }, 1000);
+                }
+            }
+            catch { /* not JSON, skip */ }
+    }
     // Emit stream_end so the UI re-enables the send button.
     //
     // Skip the persisted row when its rendered text is empty —
@@ -1288,6 +1399,31 @@ function bridgeHarnessEventToWs(event, args) {
  * Exported so it can be unit-tested; not intended for external
  * callers.
  */
+/**
+ * Count recent auto-recovery inbox notes for this session (last 60s).
+ * Used to cap the retry loop and prevent infinite recovery cycles.
+ */
+function countRecentRecoveryNotes(ctx, sessionId) {
+    const cutoff = Date.now() - 60_000;
+    try {
+        const rows = ctx.db
+            .prepare(`SELECT payload FROM session_inbox
+         WHERE target_session_id = ? AND created_at > ?`)
+            .all(sessionId, cutoff);
+        return rows.filter((r) => {
+            try {
+                const m = JSON.parse(r.payload);
+                return typeof m.text === "string" && m.text.includes("[auto-recovery");
+            }
+            catch {
+                return false;
+            }
+        }).length;
+    }
+    catch {
+        return 0;
+    }
+}
 export function buildAutoRecoveryPrompt(outstandingToolCalls, lastAssistantMessageContent) {
     // Prefer the outstanding map when it has anything at all.
     const outstanding = [...outstandingToolCalls.values()];
@@ -1753,9 +1889,11 @@ function filterOrphanedToolResults(entries) {
             continue;
         for (const part of content) {
             const p = part;
-            if (p.type === "toolCall") {
+            if (p.type === "toolCall" || p.type === "tool_use") {
                 if (p.id)
                     toolUseIds.add(p.id);
+                if (p.toolCallId)
+                    toolUseIds.add(p.toolCallId);
             }
         }
     }
@@ -1804,8 +1942,10 @@ function purgeOrphanedToolResults(ctx, sessionId) {
                 const content = parsed.content ?? parsed;
                 if (Array.isArray(content)) {
                     for (const part of content) {
-                        if (part.type === "toolCall" && part.id)
-                            toolUseIds.add(part.id);
+                        // pi stores as "toolCall", Anthropic wire format as "tool_use"
+                        if ((part.type === "toolCall" || part.type === "tool_use") && (part.id || part.toolCallId)) {
+                            toolUseIds.add(part.id ?? part.toolCallId);
+                        }
                     }
                 }
             }
@@ -1818,7 +1958,8 @@ function purgeOrphanedToolResults(ctx, sessionId) {
             continue;
         try {
             const parsed = JSON.parse(row.content);
-            const tcId = parsed.toolCallId;
+            // pi stores as "toolCallId", Anthropic wire as "tool_use_id"
+            const tcId = parsed.toolCallId ?? parsed.tool_use_id;
             if (tcId && !toolUseIds.has(tcId)) {
                 orphanRowIds.push(row.id);
             }