tesseract-agent 0.4.16 → 0.4.17

package/dist-bundle/cli.js

@@ -21802,7 +21802,7 @@ ${input.command}
   }
   return blocks;
 }
-var SEARCH_SCAN_LIMIT, SEARCH_RESULT_LIMIT, SEARCH_MAX_FILE_BYTES, SessionStore;
+var SEARCH_SCAN_LIMIT, SEARCH_RESULT_LIMIT, SEARCH_MAX_FILE_BYTES, FORK_RETRY_ATTEMPTS, FORK_RETRY_DELAY_MS, delay, SessionStore;
 var init_session_store = __esm({
   "../../packages/agent-core/dist/session-store.js"() {
     "use strict";
@@ -21810,6 +21810,9 @@ var init_session_store = __esm({
     SEARCH_SCAN_LIMIT = 200;
     SEARCH_RESULT_LIMIT = 50;
     SEARCH_MAX_FILE_BYTES = 8 * 1024 * 1024;
+    FORK_RETRY_ATTEMPTS = 2;
+    FORK_RETRY_DELAY_MS = 300;
+    delay = (ms) => new Promise((resolve10) => setTimeout(resolve10, ms));
     SessionStore = class {
       /** List resumable sessions. When `projectDir` is given, only sessions whose
        *  cwd matches that project are returned, so each window's Resume list is
@@ -21890,16 +21893,20 @@ var init_session_store = __esm({
        *  Returns the new session id, or null on failure. NOTE: forked sessions start
        *  WITHOUT file-history/undo snapshots (SDK behavior). */
       async forkSession(sessionId, opts) {
-        try {
-          const upToMessageId = opts?.upToMessageId ?? await this.lastResumableMessageId(sessionId, opts?.projectDir);
-          const result = await forkSession(sessionId, {
-            ...opts?.projectDir ? { dir: opts.projectDir } : {},
-            ...upToMessageId ? { upToMessageId } : {},
-            ...opts?.title ? { title: opts.title } : {}
-          });
-          return result.sessionId;
-        } catch {
-          return null;
+        for (let attempt = 0; ; attempt++) {
+          try {
+            const upToMessageId = opts?.upToMessageId ?? await this.lastResumableMessageId(sessionId, opts?.projectDir);
+            const result = await forkSession(sessionId, {
+              ...opts?.projectDir ? { dir: opts.projectDir } : {},
+              ...upToMessageId ? { upToMessageId } : {},
+              ...opts?.title ? { title: opts.title } : {}
+            });
+            return result.sessionId;
+          } catch {
+            if (attempt >= FORK_RETRY_ATTEMPTS)
+              return null;
+            await delay(FORK_RETRY_DELAY_MS);
+          }
         }
       }
       /** The uuid of the last transcript message after which NO tool_use is left without
@@ -22111,6 +22118,34 @@ var init_session_usage = __esm({
   }
 });
 
+// ../../packages/agent-core/dist/kill-tree.js
+import { spawn } from "node:child_process";
+function killProcessTree(child, signal = "SIGKILL") {
+  if (!child || child.pid == null || child.exitCode !== null)
+    return;
+  const pid = child.pid;
+  if (process.platform === "win32") {
+    try {
+      spawn("taskkill", ["/pid", String(pid), "/T", "/F"], { stdio: "ignore" });
+    } catch {
+    }
+    return;
+  }
+  try {
+    process.kill(-pid, signal);
+  } catch {
+    try {
+      child.kill(signal);
+    } catch {
+    }
+  }
+}
+var init_kill_tree = __esm({
+  "../../packages/agent-core/dist/kill-tree.js"() {
+    "use strict";
+  }
+});
+
 // ../../packages/agent-core/dist/agent-manager.js
 import { query, createSdkMcpServer } from "@anthropic-ai/claude-agent-sdk";
 import { writeFile as writeFile4, mkdir as mkdir4, readFile as readFile6 } from "node:fs/promises";
@@ -22121,7 +22156,7 @@ import { existsSync as existsSync2, readFileSync as readFileSync3 } from "node:f
 import { fileURLToPath } from "node:url";
 import { createRequire } from "node:module";
 import { createServer } from "node:net";
-import { spawn, execSync } from "node:child_process";
+import { spawn as spawn2, execSync } from "node:child_process";
 function findClaudeCliJs() {
   const require2 = createRequire(import.meta.url);
   const sdkMain = require2.resolve("@anthropic-ai/claude-agent-sdk");
@@ -22328,7 +22363,7 @@ MOBILE (${fw}):
     return "";
   }
 }
-var cachedNodeExe, HUMAN_READABLE_FIELDS, TOOL_RESULT_CAP, MAX_RESULT_IMAGES, MAX_IMAGE_BASE64, PERMISSION_MODES, EDIT_PREVIEW_CAP, AsyncMessagePump, IDLE_REAP_MS, MODERATE_IDLE_MS, STEER_COALESCE_MS, AgentManager;
+var cachedNodeExe, HUMAN_READABLE_FIELDS, TOOL_RESULT_CAP, MAX_RESULT_IMAGES, MAX_IMAGE_BASE64, PERMISSION_MODES, EDIT_PREVIEW_CAP, AsyncMessagePump, IDLE_REAP_MS, MODERATE_IDLE_MS, STEER_COALESCE_MS, STOP_HARD_KILL_AFTER_MS, AgentManager;
 var init_agent_manager = __esm({
   "../../packages/agent-core/dist/agent-manager.js"() {
     "use strict";
@@ -22344,6 +22379,7 @@ var init_agent_manager = __esm({
     init_trace_store();
     init_session_store();
     init_session_usage();
+    init_kill_tree();
     init_log();
     HUMAN_READABLE_FIELDS = ["message", "text", "content", "summary", "description", "output", "stdout", "error", "reason", "name"];
     TOOL_RESULT_CAP = 16e3;
@@ -22393,6 +22429,7 @@ var init_agent_manager = __esm({
     IDLE_REAP_MS = 5 * 60 * 1e3;
     MODERATE_IDLE_MS = 60 * 1e3;
     STEER_COALESCE_MS = 500;
+    STOP_HARD_KILL_AFTER_MS = 1200;
     AgentManager = class {
       send;
       onBrowserRequest;
@@ -23298,12 +23335,18 @@ CRITICAL RULES:
                 const exe = nodeExe2 ?? process.execPath;
                 const runAsNode = exe === process.execPath && !!process.versions.electron;
                 const spawnEnv = { ...options.env, ...params.env ?? {}, ...params.engineEnv ?? {}, CCB_IPC_PORT: String(live.ipcPort), ...runAsNode ? { ELECTRON_RUN_AS_NODE: "1" } : {} };
-                const child = spawn(exe, [cliJs, ...options.args], {
+                const child = spawn2(exe, [cliJs, ...options.args], {
                   cwd: options.cwd,
                   env: spawnEnv,
                   signal: options.signal,
-                  stdio: ["pipe", "pipe", "pipe"]
+                  stdio: ["pipe", "pipe", "pipe"],
+                  // Own process group (POSIX) so Stop can SIGKILL the WHOLE tree — the
+                  // CLI re-execs node and its Bash tool spawns grandchildren (builds,
+                  // dev servers, sleeps) that a single-PID kill would orphan. Pipes keep
+                  // it attached; we never unref, so the parent still tracks it.
+                  detached: process.platform !== "win32"
                 });
+                live.child = child;
                 return child;
               },
               // Claude Code preset + our browser instructions appended. The preset
@@ -23556,6 +23599,7 @@ CRITICAL RULES:
                   refreshSessionUsage(turnSid);
                 } else if (live.interrupted) {
                   live.interrupted = false;
+                  this.clearStopWatchdog(live);
                   log("Session interrupted by user:", turnSid);
                   emit({ type: "chat:error", sessionId: turnSid, error: "Interrupted." });
                   emit({ type: "agent:status", sessionId: turnSid, status: "idle" });
@@ -23779,6 +23823,7 @@ ${text3}` : header;
           const sid = live.sessionId;
           if (live.interrupted || live.abort.signal.aborted) {
             live.interrupted = false;
+            this.clearStopWatchdog(live);
             log("Session interrupted by user (caught from iterator):", sid);
             emit({ type: "chat:error", sessionId: sid, error: "Interrupted." });
             emit({ type: "agent:status", sessionId: sid, status: "idle" });
@@ -23798,6 +23843,7 @@ ${err.stack}` : ""}` : String(err);
             clearTimeout(live.steerFlushTimer);
             live.steerFlushTimer = void 0;
           }
+          this.clearStopWatchdog(live);
           if (live.sessionId)
             this.liveSessions.delete(live.sessionId);
           this.pendingLiveSessions.delete(live);
@@ -23805,6 +23851,8 @@ ${err.stack}` : ""}` : String(err);
             live.query.close();
           } catch {
           }
+          if (live.abort.signal.aborted)
+            killProcessTree(live.child, "SIGKILL");
           for (const s of live.ipcSockets) {
             try {
               s.destroy();
@@ -23832,28 +23880,54 @@ ${err.stack}` : ""}` : String(err);
           live.pendingSteer = void 0;
           live.interrupted = true;
           live.query.interrupt().catch((err) => {
-            log("interrupt() failed, falling back to abort:", err instanceof Error ? err.message : String(err));
-            try {
-              live.abort.abort();
-            } catch {
-            }
+            log("interrupt() failed, force-killing process tree:", err instanceof Error ? err.message : String(err));
+            this.hardKillSession(live);
           });
+          this.armStopWatchdog(live);
           return true;
         }
         for (const pending of this.pendingLiveSessions) {
           log("Interrupting pending session (no canonical id yet)");
           pending.interrupted = true;
-          pending.query.interrupt().catch(() => {
-            try {
-              pending.abort.abort();
-            } catch {
-            }
-          });
+          pending.query.interrupt().catch(() => this.hardKillSession(pending));
+          this.armStopWatchdog(pending);
           return true;
         }
         log("No active session to interrupt for:", sessionId);
         return false;
       }
+      /** Arm the Stop watchdog: if the graceful interrupt hasn't ended the turn
+       *  within STOP_HARD_KILL_AFTER_MS, force-kill the whole process tree. The
+       *  `interrupted` flag is reset to false when the interrupt is acknowledged
+       *  (result frame / caught iterator), so a timely graceful stop self-cancels. */
+      armStopWatchdog(live) {
+        if (live.killTimer)
+          clearTimeout(live.killTimer);
+        live.killTimer = setTimeout(() => {
+          live.killTimer = void 0;
+          if (live.interrupted && !live.reaped) {
+            log("Stop watchdog: graceful interrupt stalled \u2014 force-killing process tree for", live.sessionId);
+            this.hardKillSession(live);
+          }
+        }, STOP_HARD_KILL_AFTER_MS);
+      }
+      /** Cancel a pending Stop watchdog (graceful interrupt landed / session torn down). */
+      clearStopWatchdog(live) {
+        if (live.killTimer) {
+          clearTimeout(live.killTimer);
+          live.killTimer = void 0;
+        }
+      }
+      /** Force-stop a session NOW: abort the SDK (so the consumer treats it as an
+       *  interrupt) and SIGKILL the CLI's entire process group, reaping any Bash /
+       *  tool / MCP grandchildren that a graceful stop left running. */
+      hardKillSession(live) {
+        try {
+          live.abort.abort();
+        } catch {
+        }
+        killProcessTree(live.child, "SIGKILL");
+      }
       /** M7 — stop ONE background task (vs interruptSession which aborts the whole
        *  turn). Driver-only, same origin guard. No-op if the session/task is gone. */
       async stopTask(sessionId, taskId, callerOrigin) {
@@ -24042,6 +24116,7 @@ ${err.stack}` : ""}` : String(err);
             clearTimeout(live.steerFlushTimer);
             live.steerFlushTimer = void 0;
           }
+          this.clearStopWatchdog(live);
           if (live.sessionId)
             this.liveSessions.delete(live.sessionId);
           this.pendingLiveSessions.delete(live);
@@ -24049,6 +24124,7 @@ ${err.stack}` : ""}` : String(err);
             live.abort.abort();
           } catch {
           }
+          killProcessTree(live.child, "SIGKILL");
           live.pump.end();
         }
       }
@@ -24109,6 +24185,7 @@ __export(dist_exports, {
   getTokenSegments: () => getTokenSegments,
   importSession: () => importSession,
   isToken: () => isToken,
+  killProcessTree: () => killProcessTree,
   log: () => log,
   normalizeTokens: () => normalizeTokens,
   parseColorToRgb: () => parseColorToRgb,
@@ -24137,6 +24214,7 @@ var init_dist4 = __esm({
     init_session_usage();
     init_session_transfer();
     init_log();
+    init_kill_tree();
     init_session_artifacts();
     init_imagegen_tools();
     init_design_tokens2();
@@ -36978,13 +37056,13 @@ var require_lazy_helpers = __commonJS({
       }
     };
     exports.DelayedConstructor = DelayedConstructor;
-    function delay2(wrappedConstructor) {
+    function delay3(wrappedConstructor) {
       if (typeof wrappedConstructor === "undefined") {
         throw new Error("Attempt to `delay` undefined. Constructor must be wrapped in a callback");
       }
       return new DelayedConstructor(wrappedConstructor);
     }
-    exports.delay = delay2;
+    exports.delay = delay3;
   }
 });
 
@@ -43936,7 +44014,7 @@ var require_main = __commonJS({
 // src/cli.ts
 import { readFileSync as readFileSync14 } from "node:fs";
 import { createHash as createHash5 } from "node:crypto";
-import { spawn as spawn7 } from "node:child_process";
+import { spawn as spawn8 } from "node:child_process";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 import { homedir as homedir17 } from "node:os";
 import { dirname as dirname18, join as join36, resolve as resolve9 } from "node:path";
@@ -44056,7 +44134,8 @@ async function createClaudeCodeBackend(send2, onBrowserRequest, loadPluginRuntim
 }
 
 // ../../packages/host-core/dist/engines/cli-backend-base.js
-import { spawn as spawn2 } from "node:child_process";
+init_dist4();
+import { spawn as spawn3 } from "node:child_process";
 import { randomUUID as randomUUID3 } from "node:crypto";
 var MAX_LIVE = 8;
 var CliAgentBackend = class {
@@ -44098,12 +44177,15 @@ var CliAgentBackend = class {
       emitMsg({ type: "session:created", sessionId, clientRequestId: params.clientRequestId });
     emitMsg({ type: "agent:status", sessionId, clientRequestId: params.clientRequestId, status: "running" });
     const args = this.adapter.buildArgs(params, ctx);
-    const child = spawn2(spawnCfg.command, args, {
+    const child = spawn3(spawnCfg.command, args, {
       cwd: params.projectDir,
       // engineEnv carries the resolved runner env + enabled-skill secrets (the desktop
       // resolves them into the 0600 snapshot); merge so CLI engines get them too.
       env: { ...process.env, ...spawnCfg.env, ...params.engineEnv ?? {} },
-      stdio: ["ignore", "pipe", "pipe"]
+      stdio: ["ignore", "pipe", "pipe"],
+      // Own process group (POSIX) so Stop can SIGKILL the whole tree, not just the
+      // CLI's PID — these engines spawn their own tool subprocesses too.
+      detached: process.platform !== "win32"
     });
     const turn = { child, sessionId, clientRequestId: params.clientRequestId, messageId: ctx.messageId, acc: "", buf: "", errored: false, interrupted: false };
     this.live.set(sessionId, turn);
@@ -44151,6 +44233,10 @@ var CliAgentBackend = class {
       emitMsg({ type: "agent:status", sessionId, clientRequestId: turn.clientRequestId, status: "error" });
     });
     child.on("close", (code) => {
+      if (turn.killTimer) {
+        clearTimeout(turn.killTimer);
+        turn.killTimer = void 0;
+      }
       if (this.adapter.streaming) {
         if (turn.buf.trim())
           handleLine(turn.buf);
@@ -44180,10 +44266,14 @@ var CliAgentBackend = class {
     if (!turn)
       return false;
     turn.interrupted = true;
-    try {
-      turn.child.kill("SIGTERM");
-    } catch {
-    }
+    killProcessTree(turn.child, "SIGTERM");
+    if (turn.killTimer)
+      clearTimeout(turn.killTimer);
+    turn.killTimer = setTimeout(() => {
+      turn.killTimer = void 0;
+      if (this.live.has(sessionId))
+        killProcessTree(turn.child, "SIGKILL");
+    }, 1200);
     return true;
   }
   // CLI engines don't expose a resumable on-disk session list to us in v1, so the
@@ -44200,10 +44290,11 @@ var CliAgentBackend = class {
     if (level !== "critical")
       return;
     for (const [id, turn] of this.live) {
-      try {
-        turn.child.kill("SIGTERM");
-      } catch {
+      if (turn.killTimer) {
+        clearTimeout(turn.killTimer);
+        turn.killTimer = void 0;
       }
+      killProcessTree(turn.child, "SIGKILL");
       this.live.delete(id);
     }
   }
@@ -44807,7 +44898,7 @@ import { createHash as createHash2 } from "node:crypto";
 
 // ../../packages/host-core/dist/runners/proxy-router.js
 init_dist2();
-import { spawn as spawn3, execFile as execFile2, execSync as execSync2 } from "node:child_process";
+import { spawn as spawn4, execFile as execFile2, execSync as execSync2 } from "node:child_process";
 import { createRequire as createRequire2 } from "node:module";
 import { randomUUID as randomUUID4, createHash } from "node:crypto";
 import { existsSync as existsSync4, mkdirSync as mkdirSync4, writeFileSync as writeFileSync5 } from "node:fs";
@@ -44963,7 +45054,7 @@ async function restart() {
   await ccr(["stop"]).catch(() => void 0);
   try {
     const { exe, asNode } = nodeExe();
-    const child = spawn3(exe, [ccrCliPath(), "start"], { env: ccrEnv(asNode), detached: true, stdio: "ignore" });
+    const child = spawn4(exe, [ccrCliPath(), "start"], { env: ccrEnv(asNode), detached: true, stdio: "ignore" });
     child.unref();
   } catch {
     running = false;
@@ -46780,7 +46871,7 @@ function toNdcIceServers(configs) {
   return out;
 }
 var peers = /* @__PURE__ */ new Map();
-var delay = (ms) => new Promise((r) => setTimeout(r, ms));
+var delay2 = (ms) => new Promise((r) => setTimeout(r, ms));
 var CHUNK = 64 * 1024;
 var MAX_MSG = 256 * 1024;
 var HIGH_WATER = 8 * 1024 * 1024;
@@ -46802,7 +46893,7 @@ async function serveGet(dc, id, path5, root) {
   } catch {
     return;
   }
-  const waitDrain = drainers.get(dc) ?? (() => delay(15));
+  const waitDrain = drainers.get(dc) ?? (() => delay2(15));
   for (let off = 0, seq = 0; off < bytes.length; off += CHUNK, seq++) {
     while (dc.isOpen() && dc.bufferedAmount() > HIGH_WATER)
       await waitDrain();
@@ -53387,6 +53478,8 @@ async function handleInboundAgent(msg, driverClientId) {
       const newId = await b.forkSession?.(msg.sessionId, { projectDir: msg.projectDir, upToMessageId: msg.upToMessageId, title: msg.title }).catch(() => null);
       if (newId)
         send("agent", { type: "session:forked", clientRequestId: msg.clientRequestId, sessionId: newId, sourceSessionId: msg.sessionId, title: msg.title }, route2);
+      else
+        send("agent", { type: "session:forkFailed", clientRequestId: msg.clientRequestId, sourceSessionId: msg.sessionId }, route2);
       break;
     }
     case "agent:context_usage":
@@ -54060,6 +54153,8 @@ async function startLocalServer(opts) {
           const newId = await b.forkSession?.(msg.sessionId, { projectDir: msg.projectDir, upToMessageId: msg.upToMessageId, title: msg.title }).catch(() => null);
           if (newId)
             send2("agent", { type: "session:forked", clientRequestId: msg.clientRequestId, sessionId: newId, sourceSessionId: msg.sessionId, title: msg.title });
+          else
+            send2("agent", { type: "session:forkFailed", clientRequestId: msg.clientRequestId, sourceSessionId: msg.sessionId });
           break;
         }
         case "agent:context_usage":
@@ -54200,7 +54295,7 @@ import { homedir as homedir14 } from "node:os";
 import { randomBytes as randomBytes3 } from "node:crypto";
 
 // ../../packages/host-core/dist/power-node.js
-import { spawn as spawn4 } from "node:child_process";
+import { spawn as spawn5 } from "node:child_process";
 import { platform } from "node:os";
 function createNodePowerController() {
   const active = /* @__PURE__ */ new Set();
@@ -54208,9 +54303,9 @@ function createNodePowerController() {
   function spawnInhibitor() {
     try {
       if (platform() === "darwin")
-        return spawn4("caffeinate", ["-i"], { stdio: "ignore" });
+        return spawn5("caffeinate", ["-i"], { stdio: "ignore" });
       if (platform() === "linux") {
-        return spawn4("systemd-inhibit", ["--what=sleep", "--why=tesseract agent running", "--mode=block", "sleep", "infinity"], { stdio: "ignore" });
+        return spawn5("systemd-inhibit", ["--what=sleep", "--why=tesseract agent running", "--mode=block", "sleep", "infinity"], { stdio: "ignore" });
       }
     } catch {
     }
@@ -54413,12 +54508,12 @@ import { dirname as dirname15, join as join31 } from "node:path";
 import { homedir as homedir15, userInfo } from "node:os";
 
 // ../../packages/host-core/dist/service/exec.js
-import { execFile as execFile5, spawn as spawn5 } from "node:child_process";
+import { execFile as execFile5, spawn as spawn6 } from "node:child_process";
 import { promisify as promisify4 } from "node:util";
 var run = promisify4(execFile5);
 function runInherit(cmd, args) {
   return new Promise((resolve10) => {
-    const p = spawn5(cmd, args, { stdio: "inherit" });
+    const p = spawn6(cmd, args, { stdio: "inherit" });
     p.on("error", () => resolve10());
     p.on("close", () => resolve10());
   });
@@ -54890,7 +54985,7 @@ function whoami() {
 }
 
 // src/self-update.ts
-import { spawn as spawn6 } from "node:child_process";
+import { spawn as spawn7 } from "node:child_process";
 var RESTART_EXIT_CODE = 75;
 var REGISTRY_URL = "https://registry.npmjs.org/tesseract-agent/latest";
 var FIRST_CHECK_MS = Number(process.env.CCB_UPDATE_FIRST_MS) || 3 * 6e4;
@@ -54936,7 +55031,7 @@ function installVersion(target) {
     log2(`installing tesseract-agent@${target} \u2026`);
     let child;
     try {
-      child = spawn6(npm, ["install", "-g", `tesseract-agent@${target}`], { stdio: ["ignore", "inherit", "inherit"] });
+      child = spawn7(npm, ["install", "-g", `tesseract-agent@${target}`], { stdio: ["ignore", "inherit", "inherit"] });
     } catch (e) {
       log2("npm spawn threw:", e instanceof Error ? e.message : String(e));
       resolve10(false);
@@ -55116,7 +55211,7 @@ async function superviseDaemon(cliEntry) {
   let stopping = false;
   let child = null;
   const spawnWorker = () => {
-    const c = spawn7(process.execPath, [cliEntry, "__worker"], { stdio: "inherit", env: process.env });
+    const c = spawn8(process.execPath, [cliEntry, "__worker"], { stdio: "inherit", env: process.env });
     child = c;
     let settled = false;
     const settle = (fn) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tesseract-agent",
-  "version": "0.4.16",
+  "version": "0.4.17",
   "license": "UNLICENSED",
   "publishConfig": {
     "access": "public"