@getpaseo/server 0.1.25 → 0.1.26

package/dist/src/server/agent/providers/claude-agent.js

@@ -1,4 +1,4 @@
-import { execSync, spawn } from "node:child_process";
+import { spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import fs from "node:fs";
 import { promises } from "node:fs";
@@ -9,7 +9,7 @@ import { mapClaudeCanceledToolCall, mapClaudeCompletedToolCall, mapClaudeFailedT
 import { isTaskNotificationUserContent, mapTaskNotificationSystemRecordToToolCall, mapTaskNotificationUserContentToToolCall, } from "./claude/task-notification-tool-call.js";
 import { buildClaudeModelFamilyAliases, buildClaudeSelectableModelIds, listClaudeCatalogModels, } from "./claude/model-catalog.js";
 import { buildToolCallDisplayModel } from "../../../shared/tool-call-display.js";
-import { applyProviderEnv, isProviderCommandAvailable, } from "../provider-launch-config.js";
+import { applyProviderEnv, } from "../provider-launch-config.js";
 import { getOrchestratorModeInstructions } from "../orchestrator-instructions.js";
 /*
  * Routing invariant:
@@ -175,21 +175,6 @@ const REWIND_COMMAND = {
 };
 const INTERRUPT_TOOL_USE_PLACEHOLDER = "[Request interrupted by user for tool use]";
 const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
-function whichClaude() {
-    try {
-        return execSync("which claude", { encoding: "utf8" }).trim() || null;
-    }
-    catch {
-        return null;
-    }
-}
-function resolveClaudeBinary() {
-    const claudePath = whichClaude();
-    if (claudePath) {
-        return claudePath;
-    }
-    throw new Error("Claude CLI not found. Install claude or configure agents.providers.claude.command.mode='replace'.");
-}
 function resolveClaudeSpawnCommand(spawnOptions, runtimeSettings) {
     const commandConfig = runtimeSettings?.command;
     if (!commandConfig || commandConfig.mode === "default") {
@@ -201,7 +186,7 @@ function resolveClaudeSpawnCommand(spawnOptions, runtimeSettings) {
     if (commandConfig.mode === "append") {
         return {
             command: spawnOptions.command,
-            args: [...(commandConfig.args ?? []), ...spawnOptions.args],
+            args: [...spawnOptions.args, ...(commandConfig.args ?? [])],
         };
     }
     return {
@@ -210,17 +195,17 @@ function resolveClaudeSpawnCommand(spawnOptions, runtimeSettings) {
     };
 }
 function applyRuntimeSettingsToClaudeOptions(options, runtimeSettings) {
-    const hasEnvOverrides = Object.keys(runtimeSettings?.env ?? {}).length > 0;
-    const commandMode = runtimeSettings?.command?.mode;
-    const needsCustomSpawn = hasEnvOverrides || commandMode === "append" || commandMode === "replace";
-    if (!needsCustomSpawn) {
-        return options;
-    }
     return {
         ...options,
         spawnClaudeCodeProcess: (spawnOptions) => {
             const resolved = resolveClaudeSpawnCommand(spawnOptions, runtimeSettings);
-            return spawn(resolved.command, resolved.args, {
+            // The SDK defaults to spawning "node" via PATH lookup, which fails when
+            // running from the managed runtime bundle where node isn't in PATH.
+            // Always use process.execPath — the actual node binary running the daemon.
+            const command = resolved.command === spawnOptions.command
+                ? process.execPath
+                : resolved.command;
+            return spawn(command, resolved.args, {
                 cwd: spawnOptions.cwd,
                 env: applyProviderEnv(spawnOptions.env, runtimeSettings),
                 signal: spawnOptions.signal,
@@ -963,25 +948,11 @@ export class ClaudeAgentClient {
         this.defaults = options.defaults;
         this.logger = options.logger.child({ module: "agent", provider: "claude" });
         this.runtimeSettings = options.runtimeSettings;
-        this.claudePath = whichClaude();
-        if (this.claudePath) {
-            try {
-                const version = execSync(`${this.claudePath} --version`, { encoding: "utf8" }).trim();
-                this.logger.trace({ claudePath: this.claudePath, version }, "Resolved Claude binary");
-            }
-            catch {
-                this.logger.trace({ claudePath: this.claudePath }, "Resolved Claude binary (version unknown)");
-            }
-        }
-        else {
-            this.logger.trace("Claude binary not found in PATH; SDK will use bundled binary");
-        }
     }
     async createSession(config) {
         const claudeConfig = this.assertConfig(config);
         return new ClaudeAgentSession(claudeConfig, {
             defaults: this.defaults,
-            claudePath: this.claudePath,
             runtimeSettings: this.runtimeSettings,
             logger: this.logger,
         });
@@ -996,7 +967,6 @@ export class ClaudeAgentClient {
         const claudeConfig = this.assertConfig(mergedConfig);
         return new ClaudeAgentSession(claudeConfig, {
             defaults: this.defaults,
-            claudePath: this.claudePath,
             runtimeSettings: this.runtimeSettings,
             handle,
             logger: this.logger,
@@ -1026,11 +996,11 @@ export class ClaudeAgentClient {
         return descriptors;
     }
     async isAvailable() {
-        const commandConfig = this.runtimeSettings?.command;
-        if (commandConfig?.mode === "replace") {
-            return isProviderCommandAvailable(commandConfig, resolveClaudeBinary);
+        const command = this.runtimeSettings?.command;
+        if (command?.mode === "replace") {
+            return fs.existsSync(command.argv[0]);
         }
-        return this.claudePath !== null;
+        return true;
     }
     assertConfig(config) {
         if (config.provider !== "claude") {
@@ -1141,7 +1111,6 @@ class ClaudeAgentSession {
         };
         this.config = config;
         this.defaults = options.defaults;
-        this.claudePath = options.claudePath;
         this.runtimeSettings = options.runtimeSettings;
         this.logger = options.logger;
         const handle = options.handle;
@@ -1805,7 +1774,6 @@ class ClaudeAgentSession {
             permissionMode: this.currentMode,
             agents: this.defaults?.agents,
             canUseTool: this.handlePermissionRequest,
-            ...(this.claudePath ? { pathToClaudeCodeExecutable: this.claudePath } : {}),
             // Use Claude Code preset system prompt and load CLAUDE.md files
             // Append provider-agnostic system prompt and orchestrator instructions for agents.
             systemPrompt: {
@@ -2540,26 +2508,27 @@ class ClaudeAgentSession {
         }
         try {
             this.logger.trace("interruptActiveTurn: calling query.interrupt()...");
-            const t0 = Date.now();
-            await queryToInterrupt.interrupt();
-            this.logger.trace({ durationMs: Date.now() - t0 }, "interruptActiveTurn: query.interrupt() returned");
-            // After interrupt(), the query iterator is done (returns done: true).
-            // Clear it so ensureQuery() creates a fresh query for the next turn.
-            // Also end the input stream and call return() to clean up the SDK process.
+            await this.awaitWithTimeout(queryToInterrupt.interrupt(), "interruptActiveTurn query.interrupt()");
             this.input?.end();
             this.logger.trace("interruptActiveTurn: calling query.return()...");
-            const t1 = Date.now();
-            await queryToInterrupt.return?.();
-            this.logger.trace({ durationMs: Date.now() - t1 }, "interruptActiveTurn: query.return() returned");
+            await this.awaitWithTimeout(queryToInterrupt.return?.(), "interruptActiveTurn query.return()");
             this.query = null;
             this.input = null;
             this.queryRestartNeeded = false;
         }
         catch (error) {
             this.logger.warn({ err: error }, "Failed to interrupt active turn");
-            // If interrupt fails, the SDK iterator may remain in an indeterminate state.
-            // Force a teardown/recreate path so the next turn cannot reuse stale query state.
-            this.queryRestartNeeded = true;
+            this.input?.end();
+            if (this.query === queryToInterrupt) {
+                this.query = null;
+                this.input = null;
+            }
+            // Try to force-close the iterator to unblock the pump's q.next() call.
+            this.awaitWithTimeout(queryToInterrupt.return?.(), "interruptActiveTurn force return after failure").catch(() => { });
+            // Disown the current pump and start a fresh one immediately so
+            // autonomous wakes are not lost while waiting for the next user turn.
+            this.queryPumpPromise = null;
+            this.startQueryPump();
         }
     }
     handleSidechainMessage(message, parentToolUseId) {