@aiden-ade/sandbox-agent 0.1.2 → 0.1.5

package/dist/index.cjs

@@ -36,7 +36,7 @@ var require_XMLHttpRequest = __commonJS({
     "use strict";
     var fs = require("fs");
     var Url = require("url");
-    var spawn3 = require("child_process").spawn;
+    var spawn2 = require("child_process").spawn;
     module2.exports = XMLHttpRequest3;
     XMLHttpRequest3.XMLHttpRequest = XMLHttpRequest3;
     function XMLHttpRequest3(opts) {
@@ -332,7 +332,7 @@ var require_XMLHttpRequest = __commonJS({
           var syncFile = ".node-xmlhttprequest-sync-" + process.pid;
           fs.writeFileSync(syncFile, "", "utf8");
           var execString = "var http = require('http'), https = require('https'), fs = require('fs');var doRequest = http" + (ssl ? "s" : "") + ".request;var options = " + JSON.stringify(options) + ";var responseText = '';var responseData = Buffer.alloc(0);var req = doRequest(options, function(response) {response.on('data', function(chunk) {  var data = Buffer.from(chunk);  responseText += data.toString('utf8');  responseData = Buffer.concat([responseData, data]);});response.on('end', function() {fs.writeFileSync('" + contentFile + "', JSON.stringify({err: null, data: {statusCode: response.statusCode, headers: response.headers, text: responseText, data: responseData.toString('base64')}}), 'utf8');fs.unlinkSync('" + syncFile + "');});response.on('error', function(error) {fs.writeFileSync('" + contentFile + "', 'NODE-XMLHTTPREQUEST-ERROR:' + JSON.stringify(error), 'utf8');fs.unlinkSync('" + syncFile + "');});}).on('error', function(error) {fs.writeFileSync('" + contentFile + "', 'NODE-XMLHTTPREQUEST-ERROR:' + JSON.stringify(error), 'utf8');fs.unlinkSync('" + syncFile + "');});" + (data ? "req.write('" + JSON.stringify(data).slice(1, -1).replace(/'/g, "\\'") + "');" : "") + "req.end();";
-          var syncProc = spawn3(process.argv[0], ["-e", execString]);
+          var syncProc = spawn2(process.argv[0], ["-e", execString]);
           var statusText;
           while (fs.existsSync(syncFile)) {
           }
@@ -921,21 +921,19 @@ var require_supports_color = __commonJS({
     var tty = require("tty");
     var hasFlag = require_has_flag();
     var { env } = process;
-    var flagForceColor;
+    var forceColor;
     if (hasFlag("no-color") || hasFlag("no-colors") || hasFlag("color=false") || hasFlag("color=never")) {
-      flagForceColor = 0;
+      forceColor = 0;
     } else if (hasFlag("color") || hasFlag("colors") || hasFlag("color=true") || hasFlag("color=always")) {
-      flagForceColor = 1;
+      forceColor = 1;
     }
-    function envForceColor() {
-      if ("FORCE_COLOR" in env) {
-        if (env.FORCE_COLOR === "true") {
-          return 1;
-        }
-        if (env.FORCE_COLOR === "false") {
-          return 0;
-        }
-        return env.FORCE_COLOR.length === 0 ? 1 : Math.min(Number.parseInt(env.FORCE_COLOR, 10), 3);
+    if ("FORCE_COLOR" in env) {
+      if (env.FORCE_COLOR === "true") {
+        forceColor = 1;
+      } else if (env.FORCE_COLOR === "false") {
+        forceColor = 0;
+      } else {
+        forceColor = env.FORCE_COLOR.length === 0 ? 1 : Math.min(parseInt(env.FORCE_COLOR, 10), 3);
       }
     }
     function translateLevel(level) {
@@ -949,22 +947,15 @@ var require_supports_color = __commonJS({
         has16m: level >= 3
       };
     }
-    function supportsColor(haveStream, { streamIsTTY, sniffFlags = true } = {}) {
-      const noFlagForceColor = envForceColor();
-      if (noFlagForceColor !== void 0) {
-        flagForceColor = noFlagForceColor;
-      }
-      const forceColor = sniffFlags ? flagForceColor : noFlagForceColor;
+    function supportsColor(haveStream, streamIsTTY) {
       if (forceColor === 0) {
         return 0;
       }
-      if (sniffFlags) {
-        if (hasFlag("color=16m") || hasFlag("color=full") || hasFlag("color=truecolor")) {
-          return 3;
-        }
-        if (hasFlag("color=256")) {
-          return 2;
-        }
+      if (hasFlag("color=16m") || hasFlag("color=full") || hasFlag("color=truecolor")) {
+        return 3;
+      }
+      if (hasFlag("color=256")) {
+        return 2;
       }
       if (haveStream && !streamIsTTY && forceColor === void 0) {
         return 0;
@@ -981,7 +972,7 @@ var require_supports_color = __commonJS({
         return 1;
       }
       if ("CI" in env) {
-        if (["TRAVIS", "CIRCLECI", "APPVEYOR", "GITLAB_CI", "GITHUB_ACTIONS", "BUILDKITE", "DRONE"].some((sign) => sign in env) || env.CI_NAME === "codeship") {
+        if (["TRAVIS", "CIRCLECI", "APPVEYOR", "GITLAB_CI", "GITHUB_ACTIONS", "BUILDKITE"].some((sign) => sign in env) || env.CI_NAME === "codeship") {
           return 1;
         }
         return min;
@@ -993,7 +984,7 @@ var require_supports_color = __commonJS({
         return 3;
       }
       if ("TERM_PROGRAM" in env) {
-        const version = Number.parseInt((env.TERM_PROGRAM_VERSION || "").split(".")[0], 10);
+        const version = parseInt((env.TERM_PROGRAM_VERSION || "").split(".")[0], 10);
         switch (env.TERM_PROGRAM) {
           case "iTerm.app":
             return version >= 3 ? 3 : 2;
@@ -1012,17 +1003,14 @@ var require_supports_color = __commonJS({
       }
       return min;
     }
-    function getSupportLevel(stream, options = {}) {
-      const level = supportsColor(stream, {
-        streamIsTTY: stream && stream.isTTY,
-        ...options
-      });
+    function getSupportLevel(stream) {
+      const level = supportsColor(stream, stream && stream.isTTY);
       return translateLevel(level);
     }
     module2.exports = {
       supportsColor: getSupportLevel,
-      stdout: getSupportLevel({ isTTY: tty.isatty(1) }),
-      stderr: getSupportLevel({ isTTY: tty.isatty(2) })
+      stdout: translateLevel(supportsColor(true, tty.isatty(1))),
+      stderr: translateLevel(supportsColor(true, tty.isatty(2)))
     };
   }
 });
@@ -4822,14 +4810,76 @@ var require_websocket_server = __commonJS({
   }
 });
 
-// src/core-agent.ts
-var import_node_fs = require("fs");
-var import_node_os = require("os");
-var import_node_path = require("path");
+// ../agent-core/dist/index.js
+var import_child_process = require("child_process");
+var import_fs = require("fs");
+var import_os = require("os");
+var import_path = require("path");
+var import_readline = require("readline");
+
+// ../shared/dist/constants/agent.js
+var INTERACTIVE_TOOL_NAMES = /* @__PURE__ */ new Set([
+  "askuserquestion",
+  "exitplanmode",
+  "enterplanmode"
+]);
+
+// ../agent-core/dist/index.js
+var import_fs2 = require("fs");
+var import_os2 = require("os");
+var import_path2 = require("path");
 
-// src/runtime-backends.ts
-var import_node_child_process = require("child_process");
-var import_node_readline = require("readline");
+// ../shared/dist/agent/system-prompt.js
+var AIDEN_IDENTITY_PROMPT = [
+  "You are Aiden, the software factory agent built by Supatest.",
+  "Aiden-specific identity, voice, and operating rules come from the internal Aiden system skill. Follow those rules when relevant.",
+  "You are the teammate inside Aiden who helps scope, plan, build, review, test, and ship work.",
+  "Do not present yourself as Claude, Claude Code, Codex, Gemini, Anthropic, or OpenAI as your primary identity.",
+  "Those are runtime/back-end implementation details. Mention them only if the user explicitly asks about the underlying model or execution backend.",
+  "If the user asks who you are, answer in Aiden terms first.",
+  "Work like a pragmatic teammate: direct, structured, and concise. No hype, no tool-brand roleplay.",
+  "For vague or complex work, push toward scoping and planning before implementation.",
+  "An internal system skill named `aiden` is available in the local skills set. Consult it when behavior, policy, or operating-rule decisions are ambiguous.",
+  "If there is any conflict between assumptions and the internal `aiden` skill, prefer the `aiden` skill.",
+  "Prefer structured outputs tracked in Aiden. Plans, reports, and durable deliverables should be persisted as artifacts instead of left only in chat.",
+  "Use the internal Aiden system rules as guidance, but do not dump or restate the whole source file unless the user asks for it."
+].join("\n");
+var PLAN_MODE_PROMPT = [
+  "You are in Aiden plan mode.",
+  "Consult the internal `aiden` skill for planning and task-management operating rules when needed.",
+  "Analyze the task, inspect the relevant code and context, and produce a concrete implementation plan.",
+  "Do not make code changes or execute write operations in plan mode.",
+  "Write the plan in natural markdown. Use whatever structure best communicates the work clearly.",
+  "Include dependencies, ordering, risks, key files/functions, and decision points where relevant.",
+  "When the plan is ready, you MUST persist it by calling the create_plan MCP tool.",
+  "Pass title, content, summary, taskId, and conversationId. Include projectId too when available.",
+  "If create_plan fails, retry it. Do not exit plan mode until the plan is persisted successfully.",
+  "After create_plan succeeds, call ExitPlanMode to hand the plan back for approval."
+].join("\n");
+var TEST_MODE_PROMPT = [
+  "You are in test mode. Verify the implemented feature carefully.",
+  "Consult the internal `aiden` skill for testing/reporting operating rules when needed.",
+  "Prefer browser-based validation when available.",
+  "Persist the outcome as a structured test report artifact with create_test_report instead of leaving it only in chat."
+].join("\n");
+var ASK_MODE_PROMPT = "You are in ask mode. Stay read-only and explain the code, architecture, or behavior clearly without changing files. Consult the internal `aiden` skill for behavior-policy questions when needed.";
+var REVIEW_MODE_PROMPT = "You are in review mode. Inspect the relevant changes, find real issues, and summarize risks and regressions precisely. Consult the internal `aiden` skill for review-quality expectations when needed.";
+function getAidenModePrompt(mode2) {
+  switch (mode2) {
+    case "plan":
+      return PLAN_MODE_PROMPT;
+    case "test":
+      return TEST_MODE_PROMPT;
+    case "ask":
+      return ASK_MODE_PROMPT;
+    case "review":
+      return REVIEW_MODE_PROMPT;
+    default:
+      return void 0;
+  }
+}
+
+// ../agent-core/dist/index.js
 function formatCliSpawnError(command, error) {
   if (error.code === "ENOENT") {
     return new Error(
@@ -4838,6 +4888,41 @@ function formatCliSpawnError(command, error) {
   }
   return error;
 }
+function isLikelyProviderAuthError(stderr) {
+  const lower = stderr.toLowerCase();
+  return lower.includes("api key") || lower.includes("api_key") || lower.includes("invalid api key") || lower.includes("api key invalid") || lower.includes("unauthorized") || lower.includes("authentication failed") || lower.includes("authentication error") || lower.includes("provider settings") || lower.includes("invalid token") || lower.includes("token expired");
+}
+function classifyCliError(stderr, exitCode) {
+  const lower = stderr.toLowerCase();
+  if (lower.includes("rate_limit") || lower.includes("rate limit") || lower.includes("429"))
+    return "Rate limited by API. Try again shortly.";
+  if (isLikelyProviderAuthError(stderr))
+    return "API key invalid or expired. Check your provider settings.";
+  if (lower.includes("not logged in") || lower.includes("login required") || lower.includes("please sign in") || lower.includes("please log in") || lower.includes("sign in to") || lower.includes("log in to"))
+    return "Not logged in. Please authenticate with this provider first.";
+  if (lower.includes("model not supported") || lower.includes("unsupported model") || lower.includes("model not found") || lower.includes("model not available") || lower.includes("model is not available") || lower.includes("invalid model") || lower.includes("unknown model") || lower.includes("no such model"))
+    return "Model not supported by this provider. Check your provider's model list.";
+  if (lower.includes("subscription") || lower.includes("paid plan") || lower.includes("plan required") || lower.includes("upgrade your plan") || lower.includes("only supports free") || lower.includes("not available on your") || lower.includes("requires a paid"))
+    return "This model requires a paid subscription. Switch to a supported model or upgrade your plan.";
+  if (lower.includes("quota exceeded") || lower.includes("quota limit") || lower.includes("daily limit") || lower.includes("monthly limit") || lower.includes("usage limit"))
+    return "API quota exceeded. Wait for it to reset or check your billing.";
+  if (lower.includes("overloaded") || lower.includes("503") || lower.includes("service unavailable"))
+    return "API is overloaded. Will retry automatically.";
+  if (lower.includes("context_length") || lower.includes("too long") || lower.includes("max tokens") || lower.includes("context window"))
+    return "Context window exceeded. Try a shorter prompt or start a new session.";
+  if (lower.includes("econnrefused") || lower.includes("network") || lower.includes("enotfound") || lower.includes("timeout") || lower.includes("etimedout"))
+    return "Network connection failed. Check your internet connection.";
+  if (lower.includes("permission denied") || lower.includes("eacces"))
+    return "Permission denied. Check file or command permissions.";
+  if (lower.includes("out of memory") || lower.includes("enomem"))
+    return "Out of memory. Close other applications and try again.";
+  const raw = stderr.trim().slice(0, 200);
+  return raw || `Process exited with code ${exitCode}`;
+}
+function isTransientError(errorMessage) {
+  const lower = errorMessage.toLowerCase();
+  return lower.includes("rate limit") || lower.includes("overloaded") || lower.includes("503") || lower.includes("429") || lower.includes("service unavailable") || lower.includes("etimedout") || lower.includes("econnreset") || lower.includes("econnrefused") || lower.includes("epipe");
+}
 function buildPromptWithSystem(config, promptText) {
   const parts2 = [
     config.systemPrompt?.trim(),
@@ -4856,13 +4941,16 @@ function buildPlanModePrefix(promptText) {
   ].join("\n");
 }
 function spawnCli(command, args, context) {
-  const spawnWithShell = process.platform === "win32";
-  return (0, import_node_child_process.spawn)(command, args, {
+  const isWindows = process.platform === "win32";
+  return (0, import_child_process.spawn)(command, args, {
     cwd: context.cwd,
     env: context.env,
     stdio: ["pipe", "pipe", "pipe"],
-    shell: spawnWithShell,
-    signal: context.abortController.signal
+    shell: isWindows,
+    // Detached on Unix creates a new process group so we can kill the entire tree
+    // (CLI tools spawn child processes for tool execution that would otherwise be orphaned).
+    // On Windows, detached opens a new console — shell mode handles grouping instead.
+    detached: !isWindows
   });
 }
 function createGenericCliBackend(options) {
@@ -4874,30 +4962,39 @@ function createGenericCliBackend(options) {
       const state = {
         process: null,
         iterations: 0,
-        summary: ""
+        summary: "",
+        allowContinuation: options.allowContinuation ?? false
       };
       const prompt = options.augmentPrompt?.(context) ?? (context.config.mode === "plan" ? buildPlanModePrefix(buildPromptWithSystem(context.config, context.promptText)) : buildPromptWithSystem(context.config, context.promptText));
       const args = options.buildArgs?.(context, prompt) ?? options.args.map((arg) => arg === "{{prompt}}" ? prompt : arg);
       const child = spawnCli(options.command, args, context);
       state.process = child;
+      context.onProcessSpawned?.(child);
       const safeArgs = args.map(
-        (a, i) => (
-          // Redact API keys but show everything else for debugging
-          i > 0 && args[i - 1] === "--system-prompt" ? `"<system-prompt ${a.length} chars>"` : a
-        )
+        (a, i) => i > 0 && args[i - 1] === "--system-prompt" ? `"<system-prompt ${a.length} chars>"` : a
       );
       console.info(`[${options.kind}] Spawning: ${options.command} ${safeArgs.join(" ")}`);
       presenter.recordRawTranscript?.("system", `${options.command} ${args.join(" ")}`, {
         backendKind: options.kind
       });
-      if (options.promptViaStdin) {
+      child.stdin.on("error", (err) => {
+        if (err.code !== "EPIPE") {
+          console.error(`[${options.kind}] stdin error:`, err);
+        }
+      });
+      if (options.stdinWriter) {
+        options.stdinWriter(child.stdin, context);
+      } else if (options.promptViaStdin) {
         child.stdin.write(prompt);
         child.stdin.end();
       } else {
         child.stdin.end();
       }
-      const stdoutRl = (0, import_node_readline.createInterface)({ input: child.stdout });
-      const stderrRl = (0, import_node_readline.createInterface)({ input: child.stderr });
+      if (options.keepStdinOpen) {
+        state.stdin = child.stdin;
+      }
+      const stdoutRl = (0, import_readline.createInterface)({ input: child.stdout });
+      const stderrRl = (0, import_readline.createInterface)({ input: child.stderr });
       const stderrLines = [];
       stdoutRl.on("line", (line) => {
         presenter.recordRawTranscript?.("stdout", line);
@@ -4919,12 +5016,109 @@ function createGenericCliBackend(options) {
           void presenter.onLog(`[${options.kind}] ${line}`);
         }
       });
-      const exitCode = await new Promise((resolve2, reject) => {
-        child.on("error", (error) => {
-          reject(formatCliSpawnError(options.command, error));
+      let exitCode;
+      try {
+        const exitPromise = new Promise((resolve2, reject) => {
+          child.on("error", (error) => {
+            reject(formatCliSpawnError(options.command, error));
+          });
+          child.on("exit", (code) => resolve2(code ?? 0));
+          const onAbort = () => {
+            const pid = child.pid;
+            if (!pid) return;
+            try {
+              process.kill(-pid, "SIGTERM");
+            } catch {
+              try {
+                child.kill("SIGTERM");
+              } catch {
+              }
+            }
+          };
+          context.abortController.signal.addEventListener("abort", onAbort, { once: true });
         });
-        child.on("exit", (code) => resolve2(code ?? 0));
-      });
+        if (options.keepStdinOpen) {
+          if (options.allowContinuation) {
+            const IDLE_MS = options.continuationIdleMs ?? 10 * 60 * 1e3;
+            let idleTimer = null;
+            let heartbeatInterval = null;
+            const resetIdleTimer = () => {
+              if (idleTimer) clearTimeout(idleTimer);
+              idleTimer = setTimeout(() => {
+                if (state.stdin && !state.stdin.destroyed) {
+                  state.stdin.end();
+                  console.info(`[${options.kind}] Continuation idle timeout (${IDLE_MS}ms) \u2014 closing stdin`);
+                }
+              }, IDLE_MS);
+            };
+            state.onNewOutput = resetIdleTimer;
+            state.stopHeartbeat = () => {
+              if (heartbeatInterval) {
+                clearInterval(heartbeatInterval);
+                heartbeatInterval = null;
+              }
+            };
+            state.startHeartbeat = () => {
+              state.stopHeartbeat?.();
+              void presenter.onActivity?.("background_work");
+              heartbeatInterval = setInterval(() => {
+                void presenter.onActivity?.("background_work");
+              }, 3e4);
+            };
+            resetIdleTimer();
+            exitCode = await exitPromise;
+            if (idleTimer) clearTimeout(idleTimer);
+            state.stopHeartbeat?.();
+          } else {
+            const resultPromise = new Promise((resolve2) => {
+              state.onResultReceived = () => resolve2("result_received");
+              if (state.resultReceived) resolve2("result_received");
+            });
+            const raceResult = await Promise.race([exitPromise, resultPromise]);
+            if (raceResult === "result_received") {
+              const GRACE_MS = 5e3;
+              const gracedExit = await Promise.race([
+                exitPromise,
+                new Promise((resolve2) => setTimeout(() => resolve2(0), GRACE_MS))
+              ]);
+              exitCode = typeof gracedExit === "number" ? gracedExit : 0;
+              if (child.exitCode === null && !child.killed) {
+                console.warn(`[${options.kind}] Process still alive ${GRACE_MS}ms after result event, killing`);
+                try {
+                  if (process.platform === "win32") {
+                    child.kill("SIGKILL");
+                  } else if (child.pid) {
+                    process.kill(-child.pid, "SIGKILL");
+                  }
+                } catch {
+                }
+              }
+            } else {
+              exitCode = raceResult;
+            }
+          }
+        } else {
+          exitCode = await exitPromise;
+        }
+      } finally {
+        stdoutRl.close();
+        stderrRl.close();
+      }
+      if (context.abortController.signal.aborted) {
+        return {
+          success: false,
+          summary: "Interrupted by user",
+          filesModified: [],
+          planFilesCreated: [],
+          iterations: Math.max(state.iterations, 1),
+          error: "Interrupted by user",
+          providerSessionId: state.runtimeSessionId,
+          runtimeSessionId: state.runtimeSessionId,
+          backendKind: options.kind,
+          supportTier: options.supportTier,
+          usage: state.usage
+        };
+      }
       if (exitCode !== 0) {
         console.error(`[${options.kind}] Process exited with code ${exitCode}`, {
           stderrLines: stderrLines.slice(-10),
@@ -4937,14 +5131,17 @@ function createGenericCliBackend(options) {
       if (hasRenderableTurn) {
         await presenter.onTurnComplete([]);
       }
-      const summary = state.summary.trim() || state.error?.trim() || (exitCode === 0 ? "Task completed" : "Task failed");
+      const stderrText = stderrLines.join("\n").trim();
+      const hasStructuredError = exitCode === 0 && !!state.error?.trim();
+      const failed = exitCode !== 0 || hasStructuredError;
+      const summary = state.summary.trim() || state.error?.trim() || (failed ? "Task failed" : "Task completed");
       return {
-        success: exitCode === 0,
+        success: !failed,
         summary,
         filesModified: [],
         planFilesCreated: [],
         iterations: Math.max(state.iterations, 1),
-        error: exitCode === 0 ? void 0 : state.error?.trim() || (stderrLines.length > 0 ? stderrLines.join("\n").trim() : void 0) || `${options.command} exited with code ${exitCode}`,
+        error: failed ? classifyCliError(state.error?.trim() || stderrText || "", exitCode) : void 0,
         providerSessionId: state.runtimeSessionId,
         runtimeSessionId: state.runtimeSessionId,
         backendKind: options.kind,
@@ -4955,12 +5152,8 @@ function createGenericCliBackend(options) {
   };
 }
 function extractToolResultContent(content) {
-  if (typeof content === "string") {
-    return content;
-  }
-  if (!Array.isArray(content)) {
-    return "";
-  }
+  if (typeof content === "string") return content;
+  if (!Array.isArray(content)) return "";
   return content.map((block) => {
     if (typeof block === "object" && block !== null && "type" in block && block.type === "text" && "text" in block && typeof block.text === "string") {
       return block.text;
@@ -4974,10 +5167,7 @@ function parseClaudeStructuredLine(line, context, state) {
   try {
     parsed = JSON.parse(line);
   } catch {
-    state.summary += `${line}
-`;
-    void presenter.onAssistantText(`${line}
-`);
+    void presenter.onLog(`[claude_cli] ${line}`);
     return;
   }
   const type = typeof parsed.type === "string" ? parsed.type : "";
@@ -4994,13 +5184,22 @@ function parseClaudeStructuredLine(line, context, state) {
       break;
     }
     case "assistant": {
+      if (presenter.pendingAskUserToolIds?.size) {
+        console.info(`[claude_cli] Suppressing fallback assistant turn \u2014 ${presenter.pendingAskUserToolIds.size} AskUserQuestion(s) still pending`);
+        break;
+      }
+      if (state.resultReceived && state.allowContinuation) {
+        console.info("[claude_cli] Continuation turn detected \u2014 restarting presenter");
+        state.resultReceived = false;
+        state.stopHeartbeat?.();
+        void presenter.onStart(context.config);
+      }
+      state.onNewOutput?.();
       state.iterations += 1;
       const message = typeof parsed.message === "object" && parsed.message !== null ? parsed.message : null;
       const content = Array.isArray(message?.content) ? message.content : [];
       for (const block of content) {
-        if (typeof block !== "object" || block === null || !("type" in block)) {
-          continue;
-        }
+        if (typeof block !== "object" || block === null || !("type" in block)) continue;
         if (block.type === "text" && typeof block.text === "string") {
           const text = block.text;
           state.summary += `${text}
@@ -5015,6 +5214,25 @@ function parseClaudeStructuredLine(line, context, state) {
         if (block.type === "tool_use" && typeof block.id === "string" && typeof block.name === "string") {
           const toolBlock = block;
           void presenter.onToolUse(toolBlock.name, toolBlock.input ?? {}, toolBlock.id);
+          const lowerName = toolBlock.name.toLowerCase();
+          if (INTERACTIVE_TOOL_NAMES.has(lowerName)) {
+            if (!state.suppressedToolResultIds) state.suppressedToolResultIds = /* @__PURE__ */ new Set();
+            state.suppressedToolResultIds.add(toolBlock.id);
+          }
+          const toolInput = toolBlock.input ?? {};
+          if (lowerName === "askuserquestion") {
+            if (!presenter.pendingAskUserToolIds) presenter.pendingAskUserToolIds = /* @__PURE__ */ new Set();
+            presenter.pendingAskUserToolIds.add(toolBlock.id);
+            console.info(`[claude_cli] AskUserQuestion tool_use detected \u2014 id=${toolBlock.id}, pendingSize=${presenter.pendingAskUserToolIds.size}, presenterHasProp=${Object.prototype.hasOwnProperty.call(presenter, "pendingAskUserToolIds")}`);
+            const questions = Array.isArray(toolInput.questions) ? toolInput.questions : [];
+            void presenter.onAskUser?.(toolBlock.id, questions);
+            console.info(`[claude_cli] After onAskUser \u2014 pendingSize=${presenter.pendingAskUserToolIds?.size}`);
+          } else if (lowerName === "exitplanmode") {
+            void presenter.onExitPlanMode?.(toolBlock.id, toolInput);
+          } else if (lowerName === "todowrite") {
+            const todos = Array.isArray(toolInput.todos) ? toolInput.todos : [];
+            void presenter.onTodoWrite?.(todos);
+          }
         }
       }
       break;
@@ -5024,19 +5242,26 @@ function parseClaudeStructuredLine(line, context, state) {
       const content = Array.isArray(message?.content) ? message.content : [];
       for (const block of content) {
         if (typeof block === "object" && block !== null && "type" in block && block.type === "tool_result" && "tool_use_id" in block && typeof block.tool_use_id === "string") {
+          if (state.suppressedToolResultIds?.has(block.tool_use_id)) {
+            console.info(`[claude_cli] Suppressed auto-generated tool_result for ${block.tool_use_id}`);
+            continue;
+          }
+          const isError = "is_error" in block && block.is_error === true ? true : void 0;
           void presenter.onToolResult?.(
             block.tool_use_id,
-            extractToolResultContent(block.content)
+            extractToolResultContent(block.content),
+            isError
           );
         }
       }
       break;
     }
     case "result": {
-      const inputTokens = typeof parsed.usage === "object" && parsed.usage !== null && typeof parsed.usage.input_tokens === "number" ? parsed.usage.input_tokens : 0;
-      const outputTokens = typeof parsed.usage === "object" && parsed.usage !== null && typeof parsed.usage.output_tokens === "number" ? parsed.usage.output_tokens : 0;
-      const cacheReadTokens = typeof parsed.usage === "object" && parsed.usage !== null && typeof parsed.usage.cache_read_input_tokens === "number" ? parsed.usage.cache_read_input_tokens : 0;
-      const cacheCreationTokens = typeof parsed.usage === "object" && parsed.usage !== null && typeof parsed.usage.cache_creation_input_tokens === "number" ? parsed.usage.cache_creation_input_tokens : 0;
+      const usage = parsed.usage;
+      const inputTokens = typeof usage?.input_tokens === "number" ? usage.input_tokens : 0;
+      const outputTokens = typeof usage?.output_tokens === "number" ? usage.output_tokens : 0;
+      const cacheReadTokens = typeof usage?.cache_read_input_tokens === "number" ? usage.cache_read_input_tokens : 0;
+      const cacheCreationTokens = typeof usage?.cache_creation_input_tokens === "number" ? usage.cache_creation_input_tokens : 0;
       state.usage = {
         model: typeof parsed.model === "string" ? parsed.model : typeof context.config.selectedModel === "string" ? context.config.selectedModel : "claude",
         numTurns: typeof parsed.num_turns === "number" ? parsed.num_turns : Math.max(state.iterations, 1),
@@ -5065,17 +5290,46 @@ function parseClaudeStructuredLine(line, context, state) {
         const errObj = typeof parsed.error === "object" && parsed.error !== null ? parsed.error : null;
         const errMsg = typeof parsed.error === "string" && parsed.error.trim() || errObj && typeof errObj.message === "string" && errObj.message.trim() || typeof parsed.message === "string" && parsed.message.trim() || typeof parsed.result === "string" && parsed.result.trim() || subtype;
         state.error = errMsg;
-        const errFields = {
+        console.error("[claude_cli] result subtype=", subtype, "error fields:", JSON.stringify({
           error: parsed.error,
           message: parsed.message,
           result: typeof parsed.result === "string" ? parsed.result.slice(0, 200) : parsed.result,
           session_id: parsed.session_id,
           model: parsed.model,
-          num_turns: parsed.num_turns,
-          is_error: parsed.is_error
+          num_turns: parsed.num_turns
+        }));
+      }
+      console.info(`[claude_cli] result event \u2014 pendingAskUserToolIds size=${presenter.pendingAskUserToolIds?.size ?? "undefined"}, hasOwnProp=${Object.prototype.hasOwnProperty.call(presenter, "pendingAskUserToolIds")}`);
+      if (presenter.pendingAskUserToolIds?.size) {
+        console.info(`[claude_cli] Keeping stdin open \u2014 ${presenter.pendingAskUserToolIds.size} AskUserQuestion(s) awaiting user response`);
+        state.onNewOutput?.();
+        break;
+      }
+      state.resultReceived = true;
+      if (state.allowContinuation) {
+        const continuationResult = {
+          success: !state.error,
+          summary: state.summary || state.error || "",
+          filesModified: [],
+          planFilesCreated: [],
+          iterations: Math.max(state.iterations, 1),
+          error: state.error ? classifyCliError(state.error, 0) : void 0,
+          providerSessionId: state.runtimeSessionId,
+          runtimeSessionId: state.runtimeSessionId,
+          backendKind: context.config.backendKind,
+          supportTier: context.config.supportTier,
+          usage: state.usage
         };
-        console.error("[claude_cli] result subtype=", subtype, "error fields:", JSON.stringify(errFields));
-        console.error("[claude_cli] Full result event:", JSON.stringify(parsed).slice(0, 2e3));
+        void presenter.onComplete(continuationResult);
+        state.onNewOutput?.();
+        state.startHeartbeat?.();
+        console.info("[claude_cli] Result received in continuation mode \u2014 keeping stdin open for background work");
+      } else {
+        state.onResultReceived?.();
+        if (state.stdin && !state.stdin.destroyed) {
+          state.stdin.end();
+          console.info("[claude_cli] Closed stdin after result event to signal CLI exit");
+        }
       }
       break;
     }
@@ -5089,10 +5343,7 @@ function parseCodexStructuredLine(line, context, state) {
   try {
     parsed = JSON.parse(line);
   } catch {
-    state.summary += `${line}
-`;
-    void presenter.onAssistantText(`${line}
-`);
+    void presenter.onLog(`[codex] ${line}`);
     return;
   }
   const type = typeof parsed.type === "string" ? parsed.type : "";
@@ -5101,13 +5352,9 @@ function parseCodexStructuredLine(line, context, state) {
     state.runtimeSessionId = parsed.thread_id;
   }
   const extractCodexErrorMessage = (value2) => {
-    if (typeof value2 !== "string") {
-      return "";
-    }
+    if (typeof value2 !== "string") return "";
     const trimmed = value2.trim();
-    if (!trimmed) {
-      return "";
-    }
+    if (!trimmed) return "";
     try {
       const parsedValue = JSON.parse(trimmed);
       if (typeof parsedValue.detail === "string" && parsedValue.detail.trim().length > 0) {
@@ -5136,18 +5383,14 @@ function parseCodexStructuredLine(line, context, state) {
       break;
     case "item.started": {
       const item = typeof parsed.item === "object" && parsed.item !== null ? parsed.item : null;
-      if (!item || item.type !== "command_execution" || typeof item.id !== "string") {
-        break;
-      }
+      if (!item || item.type !== "command_execution" || typeof item.id !== "string") break;
       const command = typeof item.command === "string" ? item.command : "";
       void presenter.onToolUse("Bash", { command, cwd: context.cwd }, item.id);
       break;
     }
     case "item.completed": {
       const item = typeof parsed.item === "object" && parsed.item !== null ? parsed.item : null;
-      if (!item || typeof item.type !== "string") {
-        break;
-      }
+      if (!item || typeof item.type !== "string") break;
       if (item.type === "reasoning" && typeof item.text === "string") {
         void presenter.onThinking(item.text);
         break;
@@ -5160,8 +5403,8 @@ function parseCodexStructuredLine(line, context, state) {
       }
       if (item.type === "command_execution" && typeof item.id === "string") {
         const output = typeof item.aggregated_output === "string" ? item.aggregated_output : "";
-        const exitCode = typeof item.exit_code === "number" ? item.exit_code : null;
-        const resultText = output.trim().length > 0 ? output : exitCode === null ? "" : `Exit code: ${exitCode}`;
+        const itemExitCode = typeof item.exit_code === "number" ? item.exit_code : null;
+        const resultText = output.trim().length > 0 ? output : itemExitCode === null ? "" : `Exit code: ${itemExitCode}`;
         void presenter.onToolResult?.(item.id, resultText);
         break;
       }
@@ -5205,20 +5448,17 @@ function parseCodexStructuredLine(line, context, state) {
     }
     case "mcp_tool_call_end": {
       const toolId = typeof parsed.call_id === "string" ? parsed.call_id : `mcp-${Date.now()}`;
-      const result = parsed.result;
-      void presenter.onToolResult?.(toolId, JSON.stringify(result ?? {}, null, 2));
+      void presenter.onToolResult?.(toolId, JSON.stringify(parsed.result ?? {}, null, 2));
       break;
     }
     case "token_count": {
       const info = typeof parsed.info === "object" && parsed.info !== null ? parsed.info : {};
-      const inputTokens = typeof info.input_tokens === "number" ? info.input_tokens : 0;
-      const outputTokens = typeof info.output_tokens === "number" ? info.output_tokens : 0;
       state.usage = {
         model: typeof info.model === "string" ? info.model : "codex",
         numTurns: Math.max(state.iterations, 1),
         durationMs: 0,
-        inputTokens,
-        outputTokens,
+        inputTokens: typeof info.input_tokens === "number" ? info.input_tokens : 0,
+        outputTokens: typeof info.output_tokens === "number" ? info.output_tokens : 0,
         cacheReadTokens: typeof info.cached_input_tokens === "number" ? info.cached_input_tokens : 0,
         cacheCreationTokens: 0,
         costUsd: typeof info.total_cost_usd === "number" ? info.total_cost_usd : 0
@@ -5234,23 +5474,18 @@ function parseCodexStructuredLine(line, context, state) {
     }
     case "task_complete": {
       const lastMessage = typeof parsed.last_agent_message === "string" ? parsed.last_agent_message : "";
-      if (lastMessage.length > 0) {
-        state.summary = lastMessage;
-      }
+      if (lastMessage.length > 0) state.summary = lastMessage;
       break;
     }
     case "turn.completed": {
       const usage = typeof parsed.usage === "object" && parsed.usage !== null ? parsed.usage : {};
-      const inputTokens = typeof usage.input_tokens === "number" ? usage.input_tokens : 0;
-      const outputTokens = typeof usage.output_tokens === "number" ? usage.output_tokens : 0;
-      const cacheReadTokens = typeof usage.cached_input_tokens === "number" ? usage.cached_input_tokens : 0;
       state.usage = {
         model: typeof context.config.selectedModel === "string" && context.config.selectedModel.trim() ? context.config.selectedModel : "codex",
         numTurns: Math.max(state.iterations, 1),
         durationMs: 0,
-        inputTokens,
-        outputTokens,
-        cacheReadTokens,
+        inputTokens: typeof usage.input_tokens === "number" ? usage.input_tokens : 0,
+        outputTokens: typeof usage.output_tokens === "number" ? usage.output_tokens : 0,
+        cacheReadTokens: typeof usage.cached_input_tokens === "number" ? usage.cached_input_tokens : 0,
         cacheCreationTokens: 0,
         costUsd: 0
       };
@@ -5266,6 +5501,7 @@ function parseCodexStructuredLine(line, context, state) {
     case "error": {
       const message = extractCodexErrorMessage(parsed.message) || extractCodexErrorMessage(parsed.error) || typeof parsed.detail === "string" && parsed.detail.trim() || "";
       if (message) {
+        void presenter.onError(message);
         state.error = message;
       }
       break;
@@ -5274,6 +5510,7 @@ function parseCodexStructuredLine(line, context, state) {
       const error = typeof parsed.error === "object" && parsed.error !== null ? parsed.error : {};
       const message = extractCodexErrorMessage(error.message) || extractCodexErrorMessage(error.detail) || typeof parsed.message === "string" && parsed.message.trim() || "";
       if (message) {
+        void presenter.onError(message);
         state.error = message;
       }
       break;
@@ -5282,20 +5519,130 @@ function parseCodexStructuredLine(line, context, state) {
       break;
   }
 }
+function extractCursorToolEntry(toolCall) {
+  const [rawName, rawPayload] = Object.entries(toolCall)[0] ?? [];
+  if (!rawName || typeof rawPayload !== "object" || rawPayload === null) return null;
+  return { rawName, payload: rawPayload };
+}
+function formatCursorToolName(rawName) {
+  if (rawName === "terminalToolCall") return "Bash";
+  const trimmed = rawName.replace(/ToolCall$/, "");
+  if (!trimmed) return "Cursor Tool";
+  return trimmed.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/^[a-z]/, (char) => char.toUpperCase());
+}
+function buildCursorToolResultText(result) {
+  if (typeof result === "string") return result;
+  if (!result || typeof result !== "object") return JSON.stringify(result ?? {});
+  const resultRecord = result;
+  const success = typeof resultRecord.success === "object" && resultRecord.success !== null ? resultRecord.success : null;
+  if (success) {
+    if (typeof success.content === "string" && success.content.trim().length > 0) return success.content;
+    if (typeof success.output === "string" && success.output.trim().length > 0) return success.output;
+    const stdout = typeof success.stdout === "string" ? success.stdout.trim() : "";
+    const stderr = typeof success.stderr === "string" ? success.stderr.trim() : "";
+    if (stdout || stderr) return [stdout, stderr].filter(Boolean).join("\n\n");
+  }
+  const error = typeof resultRecord.error === "object" && resultRecord.error !== null ? resultRecord.error : null;
+  if (error) {
+    if (typeof error.message === "string" && error.message.trim().length > 0) return error.message;
+    if (typeof error.content === "string" && error.content.trim().length > 0) return error.content;
+  }
+  return JSON.stringify(result, null, 2);
+}
+function parseCursorStructuredLine(line, context, state) {
+  const presenter = context.presenter;
+  let parsed = null;
+  try {
+    parsed = JSON.parse(line);
+  } catch {
+    if (line.trim().length > 0) void presenter.onLog(`[cursor_agent_cli] ${line}`);
+    return;
+  }
+  const type = typeof parsed.type === "string" ? parsed.type : "";
+  if (!type) return;
+  if (typeof parsed.session_id === "string") state.runtimeSessionId = parsed.session_id;
+  if (typeof parsed.model === "string") state.activeModel = parsed.model;
+  switch (type) {
+    case "system":
+      break;
+    case "assistant": {
+      const message = typeof parsed.message === "object" && parsed.message !== null ? parsed.message : null;
+      const content = Array.isArray(message?.content) ? message.content : [];
+      for (const block of content) {
+        if (!block || typeof block !== "object") continue;
+        const part = block;
+        const blockType = typeof part.type === "string" ? part.type : "";
+        const text = typeof part.text === "string" ? part.text : "";
+        if (!text) continue;
+        state.iterations = Math.max(state.iterations, 1);
+        if (blockType === "thinking" || blockType === "reasoning") {
+          void presenter.onThinking(text);
+          continue;
+        }
+        state.summary += text;
+        void presenter.onAssistantText(text);
+      }
+      break;
+    }
+    case "tool_call": {
+      const subtype = typeof parsed.subtype === "string" ? parsed.subtype : "";
+      const toolId = typeof parsed.call_id === "string" ? parsed.call_id : `cursor-tool-${Date.now()}`;
+      const toolCall = typeof parsed.tool_call === "object" && parsed.tool_call !== null ? parsed.tool_call : null;
+      const entry = toolCall ? extractCursorToolEntry(toolCall) : null;
+      if (!entry) break;
+      state.iterations = Math.max(state.iterations, 1);
+      const toolName = formatCursorToolName(entry.rawName);
+      const toolArgs = typeof entry.payload.args === "object" && entry.payload.args !== null ? entry.payload.args : entry.payload;
+      if (subtype === "started") {
+        void presenter.onToolUse(toolName, toolArgs, toolId);
+        break;
+      }
+      if (subtype === "completed") {
+        void presenter.onToolResult?.(toolId, buildCursorToolResultText(entry.payload.result));
+      }
+      break;
+    }
+    case "result": {
+      const subtype = typeof parsed.subtype === "string" ? parsed.subtype : "";
+      const durationMs = typeof parsed.duration_ms === "number" ? parsed.duration_ms : 0;
+      const resultText = typeof parsed.result === "string" ? parsed.result : "";
+      state.iterations = Math.max(state.iterations, 1);
+      state.usage = {
+        model: state.activeModel || (typeof context.config.selectedModel === "string" && context.config.selectedModel.trim() ? context.config.selectedModel : "cursor-agent"),
+        numTurns: Math.max(state.iterations, 1),
+        durationMs,
+        inputTokens: 0,
+        outputTokens: 0,
+        cacheReadTokens: 0,
+        cacheCreationTokens: 0,
+        costUsd: 0
+      };
+      void presenter.onUsageUpdate?.({
+        model: state.usage.model,
+        inputTokens: 0,
+        outputTokens: 0,
+        cacheReadTokens: 0,
+        cacheCreationTokens: 0
+      });
+      if (resultText.trim().length > 0) state.summary = resultText;
+      if ((parsed.is_error === true || subtype === "error") && !state.error) {
+        state.error = resultText.trim() || "Cursor Agent run failed";
+        void presenter.onError(state.error);
+      }
+      break;
+    }
+    default:
+      break;
+  }
+}
 function buildGeminiToolResultText(parsed) {
   const output = typeof parsed.output === "string" ? parsed.output : "";
-  if (output.trim().length > 0) {
-    return output;
-  }
+  if (output.trim().length > 0) return output;
   const error = typeof parsed.error === "object" && parsed.error !== null ? parsed.error : null;
   const message = typeof error?.message === "string" ? error.message.trim() : "";
   const errorType = typeof error?.type === "string" ? error.type.trim() : "";
-  if (message && errorType) {
-    return `${errorType}: ${message}`;
-  }
-  if (message) {
-    return message;
-  }
+  if (message && errorType) return `${errorType}: ${message}`;
+  if (message) return message;
   const status = typeof parsed.status === "string" ? parsed.status.trim() : "";
   return status || "Tool completed";
 }
@@ -5305,22 +5652,13 @@ function parseGeminiStructuredLine(line, context, state) {
   try {
     parsed = JSON.parse(line);
   } catch {
-    state.summary += `${line}
-`;
-    void presenter.onAssistantText(`${line}
-`);
+    void presenter.onLog(`[gemini_cli] ${line}`);
     return;
   }
   const type = typeof parsed.type === "string" ? parsed.type : "";
-  if (!type) {
-    return;
-  }
-  if (typeof parsed.session_id === "string") {
-    state.runtimeSessionId = parsed.session_id;
-  }
-  if (typeof parsed.model === "string") {
-    state.activeModel = parsed.model;
-  }
+  if (!type) return;
+  if (typeof parsed.session_id === "string") state.runtimeSessionId = parsed.session_id;
+  if (typeof parsed.model === "string") state.activeModel = parsed.model;
   switch (type) {
     case "init": {
       const model2 = state.activeModel || context.config.selectedModel || "gemini";
@@ -5328,14 +5666,9 @@ function parseGeminiStructuredLine(line, context, state) {
       break;
     }
     case "message": {
-      const role = typeof parsed.role === "string" ? parsed.role : "";
-      if (role !== "assistant") {
-        break;
-      }
+      if (typeof parsed.role !== "string" || parsed.role !== "assistant") break;
       const content = typeof parsed.content === "string" ? parsed.content : "";
-      if (!content) {
-        break;
-      }
+      if (!content) break;
       state.iterations = Math.max(state.iterations, 1);
       state.summary += content;
       void presenter.onAssistantText(content);
@@ -5359,9 +5692,11 @@ function parseGeminiStructuredLine(line, context, state) {
       const message = typeof parsed.message === "string" && parsed.message.trim() || errObj && typeof errObj.message === "string" && errObj.message.trim() || typeof parsed.error === "string" && parsed.error.trim() || typeof parsed.error_message === "string" && parsed.error_message.trim() || "";
       const severity = typeof parsed.severity === "string" ? parsed.severity : "error";
       if (message) {
-        void presenter.onLog(`[gemini_cli/${severity}] ${message}`);
         if (severity === "error") {
+          void presenter.onError(message);
           state.error = message;
+        } else {
+          void presenter.onLog(`[gemini_cli/${severity}] ${message}`);
         }
       }
       break;
@@ -5390,11 +5725,10 @@ function parseGeminiStructuredLine(line, context, state) {
         const errObj = typeof parsed.error === "object" && parsed.error !== null ? parsed.error : null;
         const errMsg = typeof parsed.error === "string" && parsed.error.trim() || errObj && typeof errObj.message === "string" && errObj.message.trim() || typeof parsed.error_message === "string" && parsed.error_message.trim() || typeof parsed.message === "string" && parsed.message.trim() || typeof parsed.result === "string" && parsed.result.trim() || parsed.status;
         state.error = errMsg;
-        console.error("[gemini_cli] result status=", parsed.status, "error fields:", JSON.stringify({
+        console.error("[gemini_cli] result status=", parsed.status, "error:", JSON.stringify({
           error: parsed.error,
           error_message: parsed.error_message,
-          message: parsed.message,
-          result: typeof parsed.result === "string" ? parsed.result.slice(0, 200) : parsed.result
+          message: parsed.message
         }));
       }
       break;
@@ -5403,8 +5737,8 @@ function parseGeminiStructuredLine(line, context, state) {
       break;
   }
 }
-function getClaudePermissionMode(mode) {
-  switch (mode) {
+function getClaudePermissionMode(mode2) {
+  switch (mode2) {
     case "plan":
     case "ask":
     case "review":
@@ -5413,40 +5747,108 @@ function getClaudePermissionMode(mode) {
       return "bypassPermissions";
   }
 }
+function isCodexReadOnlyMode(mode2) {
+  return mode2 === "plan" || mode2 === "ask" || mode2 === "review";
+}
+function shouldForceCursorAgent(mode2) {
+  switch (mode2) {
+    case "plan":
+    case "ask":
+    case "review":
+      return false;
+    default:
+      return true;
+  }
+}
+function writeImagesToTempFiles(images) {
+  if (!images?.length) return { paths: [], cleanup: () => {
+  } };
+  const paths = [];
+  for (const img of images) {
+    const ext = img.mimeType.split("/")[1]?.replace("jpeg", "jpg") ?? "png";
+    const filePath = (0, import_path.join)((0, import_os.tmpdir)(), `aiden-img-${img.id}.${ext}`);
+    (0, import_fs.writeFileSync)(filePath, Buffer.from(img.data, "base64"));
+    paths.push(filePath);
+  }
+  return {
+    paths,
+    cleanup: () => {
+      for (const p of paths) {
+        try {
+          (0, import_fs.rmSync)(p, { force: true });
+        } catch {
+        }
+      }
+    }
+  };
+}
 function createClaudeCliBackend(command = "claude", defaultArgs = []) {
   return {
     kind: "claude_cli",
     supportTier: "structured",
     async run(context) {
       const args = [
-        "--print",
         "--verbose",
         "--output-format",
         "stream-json",
+        "--input-format",
+        "stream-json",
         "--permission-mode",
         getClaudePermissionMode(context.config.mode)
       ];
-      if (context.config.systemPrompt?.trim()) {
-        args.push("--system-prompt", context.config.systemPrompt.trim());
-      }
-      if (context.config.systemPromptAppend?.trim()) {
-        args.push("--append-system-prompt", context.config.systemPromptAppend.trim());
+      const resumeId = context.config.runtimeSessionId?.trim() || context.config.providerSessionId?.trim();
+      if (!resumeId) {
+        if (context.config.systemPrompt?.trim()) {
+          args.push("--system-prompt", context.config.systemPrompt.trim());
+        }
+        if (context.config.systemPromptAppend?.trim()) {
+          args.push("--append-system-prompt", context.config.systemPromptAppend.trim());
+        }
       }
       if (context.config.selectedModel?.trim()) {
         args.push("--model", context.config.selectedModel.trim());
       }
-      const resumeId = context.config.runtimeSessionId?.trim() || context.config.providerSessionId?.trim();
+      if (context.config.mcpConfigPath?.trim()) {
+        args.push("--mcp-config", context.config.mcpConfigPath.trim());
+      }
       if (resumeId) {
         args.push("--resume", resumeId);
         console.info("[claude_cli] Resuming session", { resumeId });
       }
-      args.push(...defaultArgs, context.promptText);
+      args.push(...defaultArgs);
       return createGenericCliBackend({
         kind: "claude_cli",
         supportTier: "structured",
         command,
         args,
-        parseStructuredLine: parseClaudeStructuredLine
+        parseStructuredLine: parseClaudeStructuredLine,
+        stdinWriter: (stdin, ctx) => {
+          const contentBlocks = [];
+          if (ctx.config.images?.length) {
+            for (const img of ctx.config.images) {
+              contentBlocks.push({
+                type: "image",
+                source: { type: "base64", media_type: img.mimeType, data: img.data }
+              });
+            }
+          }
+          const promptText = ctx.config.mode === "plan" ? buildPlanModePrefix(buildPromptWithSystem(ctx.config, ctx.promptText)) : buildPromptWithSystem(ctx.config, ctx.promptText);
+          if (promptText.trim()) {
+            contentBlocks.push({ type: "text", text: promptText });
+          }
+          console.info(`[claude_cli] stdinWriter: ${contentBlocks.length} content blocks (${ctx.config.images?.length ?? 0} images)`);
+          const message = JSON.stringify({
+            type: "user",
+            message: { role: "user", content: contentBlocks },
+            session_id: "default",
+            parent_tool_use_id: null
+          });
+          stdin.write(message + "\n");
+        },
+        keepStdinOpen: true,
+        allowContinuation: true,
+        continuationIdleMs: 10 * 60 * 1e3
+        // 10 minutes
       }).run(context);
     }
   };
@@ -5462,45 +5864,168 @@ function createGeminiCliBackend(command = "gemini", defaultArgs = []) {
       const resumeId = context.config.runtimeSessionId?.trim() || context.config.providerSessionId?.trim();
       const approvalMode = context.config.mode === "plan" || context.config.mode === "ask" || context.config.mode === "review" ? "plan" : "yolo";
       args.push("--approval-mode", approvalMode);
-      if (resumeId) {
-        args.push("--resume", resumeId);
-      }
-      if (context.config.selectedModel?.trim()) {
-        args.push("--model", context.config.selectedModel.trim());
-      }
+      if (resumeId) args.push("--resume", resumeId);
+      if (context.config.selectedModel?.trim()) args.push("--model", context.config.selectedModel.trim());
       return [...args, ...defaultArgs];
     },
     promptViaStdin: true,
     augmentPrompt: (context) => {
       const basePrompt = buildPromptWithSystem(context.config, context.promptText);
-      if (context.config.mode === "plan") {
-        return buildPlanModePrefix(basePrompt);
-      }
-      return basePrompt;
+      return context.config.mode === "plan" ? buildPlanModePrefix(basePrompt) : basePrompt;
     },
     parseStructuredLine: parseGeminiStructuredLine
   });
 }
-function parseOpencodeStructuredLine(line, context, state) {
+function isCursorAgentCliModelId(model2) {
+  return model2 === "auto" || /^composer-/.test(model2) || /^gpt-\d/.test(model2) || /^claude-\d/.test(model2) || /^gemini-\d/.test(model2) || /^grok-\d/.test(model2) || /^kimi-/.test(model2);
+}
+function createCursorAgentCliBackend(command = "cursor-agent", defaultArgs = []) {
+  return createGenericCliBackend({
+    kind: "cursor_agent_cli",
+    supportTier: "structured",
+    command,
+    args: [],
+    buildArgs: (context, prompt) => {
+      const args = ["--print", "--output-format", "stream-json"];
+      const resumeId = context.config.runtimeSessionId?.trim() || context.config.providerSessionId?.trim();
+      if (shouldForceCursorAgent(context.config.mode)) args.push("--force");
+      if (resumeId) args.push("--resume", resumeId);
+      const model2 = context.config.selectedModel?.trim();
+      if (model2 && isCursorAgentCliModelId(model2)) args.push("--model", model2);
+      return [...args, ...defaultArgs, prompt];
+    },
+    augmentPrompt: (context) => {
+      const base = buildPromptWithSystem(context.config, context.promptText);
+      return context.config.mode === "plan" ? buildPlanModePrefix(base) : base;
+    },
+    parseStructuredLine: parseCursorStructuredLine
+  });
+}
+function droidExecPermissionArgs(mode2) {
+  if (mode2 === "plan" || mode2 === "ask" || mode2 === "review") return [];
+  return ["--auto", "high"];
+}
+function parseDroidStructuredLine(line, context, state) {
   const presenter = context.presenter;
   let parsed = null;
   try {
     parsed = JSON.parse(line);
   } catch {
-    if (line.trim().length > 0) {
-      state.summary += `${line}
-`;
-      void presenter.onAssistantText(`${line}
-`);
+    if (line.trim().length > 0) void presenter.onLog(`[droid_cli] ${line}`);
+    return;
+  }
+  const type = typeof parsed.type === "string" ? parsed.type : "";
+  if (!type) return;
+  if (typeof parsed.session_id === "string") state.runtimeSessionId = parsed.session_id;
+  if (typeof parsed.model === "string") state.activeModel = parsed.model;
+  switch (type) {
+    case "system": {
+      const subtype = typeof parsed.subtype === "string" ? parsed.subtype : "";
+      if (subtype === "init") {
+        if (typeof parsed.session_id === "string") state.runtimeSessionId = parsed.session_id;
+        if (typeof parsed.model === "string") state.activeModel = parsed.model;
+      }
+      break;
     }
+    case "message": {
+      const role = typeof parsed.role === "string" ? parsed.role : "";
+      if (role !== "assistant") break;
+      const text = typeof parsed.text === "string" ? parsed.text : "";
+      if (!text) break;
+      state.iterations = Math.max(state.iterations, 1);
+      state.summary += text;
+      void presenter.onAssistantText(text);
+      break;
+    }
+    case "tool_call": {
+      const toolId = typeof parsed.id === "string" ? parsed.id : `droid-tool-${Date.now()}`;
+      const toolName = typeof parsed.toolName === "string" ? parsed.toolName : "Tool";
+      const parameters = typeof parsed.parameters === "object" && parsed.parameters !== null ? parsed.parameters : {};
+      state.iterations = Math.max(state.iterations, 1);
+      void presenter.onToolUse(toolName, parameters, toolId);
+      break;
+    }
+    case "tool_result": {
+      const toolId = typeof parsed.id === "string" ? parsed.id : `droid-tool-${Date.now()}`;
+      const value2 = parsed.value;
+      const content = typeof value2 === "string" ? value2 : value2 !== void 0 ? JSON.stringify(value2) : "";
+      const isError = parsed.isError === true;
+      void presenter.onToolResult?.(toolId, content, isError);
+      break;
+    }
+    case "completion": {
+      const finalText = typeof parsed.finalText === "string" ? parsed.finalText : "";
+      const numTurns = typeof parsed.numTurns === "number" ? parsed.numTurns : 1;
+      const durationMs = typeof parsed.durationMs === "number" ? parsed.durationMs : 0;
+      state.iterations = Math.max(state.iterations, numTurns, finalText ? 1 : 0);
+      if (finalText.trim() && !state.summary.trim()) {
+        state.summary = finalText;
+        void presenter.onAssistantText(finalText);
+      }
+      state.usage = {
+        model: state.activeModel || (typeof context.config.selectedModel === "string" && context.config.selectedModel.trim() ? context.config.selectedModel : "droid"),
+        numTurns: Math.max(numTurns, 1),
+        durationMs,
+        inputTokens: 0,
+        outputTokens: 0,
+        cacheReadTokens: 0,
+        cacheCreationTokens: 0,
+        costUsd: 0
+      };
+      void presenter.onUsageUpdate?.({
+        model: state.usage.model,
+        inputTokens: 0,
+        outputTokens: 0,
+        cacheReadTokens: 0,
+        cacheCreationTokens: 0
+      });
+      break;
+    }
+    default:
+      break;
+  }
+}
+function createDroidCliBackend(command = "droid", defaultArgs = []) {
+  return createGenericCliBackend({
+    kind: "droid_cli",
+    supportTier: "structured",
+    command,
+    args: [],
+    buildArgs: (context, prompt) => {
+      const args = [
+        "exec",
+        "--output-format",
+        "stream-json",
+        ...droidExecPermissionArgs(context.config.mode),
+        ...defaultArgs
+      ];
+      const resumeId = context.config.runtimeSessionId?.trim() || context.config.providerSessionId?.trim();
+      if (resumeId) args.push("--session-id", resumeId);
+      const model2 = context.config.selectedModel?.trim();
+      if (model2) args.push("-m", model2);
+      args.push(prompt);
+      return args;
+    },
+    augmentPrompt: (context) => {
+      const base = buildPromptWithSystem(context.config, context.promptText);
+      return context.config.mode === "plan" ? buildPlanModePrefix(base) : base;
+    },
+    parseStructuredLine: parseDroidStructuredLine
+  });
+}
+function parseOpencodeStructuredLine(line, context, state) {
+  const presenter = context.presenter;
+  let parsed = null;
+  try {
+    parsed = JSON.parse(line);
+  } catch {
+    if (line.trim().length > 0) void presenter.onLog(`[opencode] ${line}`);
     return;
   }
   const type = typeof parsed.type === "string" ? parsed.type : "";
   if (!type) return;
   const sessionID = typeof parsed.sessionID === "string" ? parsed.sessionID : void 0;
-  if (sessionID) {
-    state.runtimeSessionId = sessionID;
-  }
+  if (sessionID) state.runtimeSessionId = sessionID;
   const part = typeof parsed.part === "object" && parsed.part !== null ? parsed.part : null;
   switch (type) {
     case "step_start": {
@@ -5534,20 +6059,49 @@ function parseOpencodeStructuredLine(line, context, state) {
       if (part && typeof part.tokens === "object" && part.tokens !== null) {
         const tokens = part.tokens;
         state.usage = {
+          model: typeof context.config.selectedModel === "string" && context.config.selectedModel.trim() || "opencode",
+          numTurns: Math.max(state.iterations, 1),
+          durationMs: 0,
           inputTokens: tokens.input ?? 0,
-          outputTokens: tokens.output ?? 0
+          outputTokens: tokens.output ?? 0,
+          cacheReadTokens: tokens.cache_read ?? 0,
+          cacheCreationTokens: tokens.cache_creation ?? 0,
+          costUsd: 0
         };
+        void presenter.onUsageUpdate?.({
+          model: state.usage.model,
+          inputTokens: state.usage.inputTokens,
+          outputTokens: state.usage.outputTokens,
+          cacheReadTokens: state.usage.cacheReadTokens,
+          cacheCreationTokens: state.usage.cacheCreationTokens
+        });
       }
       break;
     }
     case "session.error":
     case "error": {
       const errObj = typeof parsed.error === "object" && parsed.error !== null ? parsed.error : null;
-      const message = typeof parsed.message === "string" && parsed.message.trim() || part && typeof part.message === "string" && part.message.trim() || typeof parsed.error === "string" && parsed.error.trim() || errObj && typeof errObj.message === "string" && errObj.message.trim() || part && typeof part.error === "string" && part.error.trim() || "";
-      if (message) {
-        void presenter.onLog(`[opencode/error] ${message}`);
+      if (!state.error) {
+        console.error("[opencode] error event (raw):", JSON.stringify(parsed).slice(0, 500));
+      }
+      const rawMessage = typeof parsed.message === "string" && parsed.message.trim() || part && typeof part.message === "string" && part.message.trim() || typeof parsed.error === "string" && parsed.error.trim() || errObj && typeof errObj.message === "string" && errObj.message.trim() || part && typeof part.error === "string" && part.error.trim() || // Also try data.message — some opencode versions nest the message here
+      (typeof parsed.data?.message === "string" ? parsed.data.message.trim() : "") || "";
+      const message = rawMessage || "OpenCode encountered an error. Check your provider and model settings.";
+      if (!state.error) {
+        void presenter.onError(message);
         state.error = message;
       }
+      const pid = state.process?.pid;
+      if (pid) {
+        try {
+          process.kill(-pid, "SIGTERM");
+        } catch {
+          try {
+            state.process?.kill("SIGTERM");
+          } catch {
+          }
+        }
+      }
       break;
     }
     default:
@@ -5555,25 +6109,40 @@ function parseOpencodeStructuredLine(line, context, state) {
   }
 }
 function createOpencodeCliBackend(command = "opencode", defaultArgs = []) {
-  return createGenericCliBackend({
+  return {
     kind: "opencode_cli",
     supportTier: "structured",
-    command,
-    args: [],
-    buildArgs: (context, prompt) => {
-      const args = ["run", "--format", "json"];
-      const resumeId = context.config.runtimeSessionId?.trim() || context.config.providerSessionId?.trim();
-      if (resumeId) args.push("--session", resumeId);
-      const model2 = context.config.selectedModel?.trim();
-      if (model2 && model2.includes("/")) args.push("--model", model2);
-      return [...args, ...defaultArgs, prompt];
-    },
-    augmentPrompt: (context) => {
-      const base = buildPromptWithSystem(context.config, context.promptText);
-      return context.config.mode === "plan" ? buildPlanModePrefix(base) : base;
-    },
-    parseStructuredLine: parseOpencodeStructuredLine
-  });
+    async run(context) {
+      const { paths: imagePaths, cleanup } = writeImagesToTempFiles(context.config.images);
+      try {
+        return await createGenericCliBackend({
+          kind: "opencode_cli",
+          supportTier: "structured",
+          command,
+          args: [],
+          buildArgs: (ctx, prompt) => {
+            const args = ["run", "--format", "json"];
+            const resumeId = ctx.config.runtimeSessionId?.trim() || ctx.config.providerSessionId?.trim();
+            if (resumeId) args.push("--session", resumeId);
+            const model2 = ctx.config.selectedModel?.trim();
+            if (model2 && model2.includes("/")) args.push("--model", model2);
+            const fileArgs = imagePaths.flatMap((p) => ["--file", p]);
+            if (fileArgs.length > 0) {
+              return [...args, ...fileArgs, ...defaultArgs, "--", prompt];
+            }
+            return [...args, ...defaultArgs, prompt];
+          },
+          augmentPrompt: (ctx) => {
+            const base = buildPromptWithSystem(ctx.config, ctx.promptText);
+            return ctx.config.mode === "plan" ? buildPlanModePrefix(base) : base;
+          },
+          parseStructuredLine: parseOpencodeStructuredLine
+        }).run(context);
+      } finally {
+        cleanup();
+      }
+    }
+  };
 }
 function createGenericCliPassthroughBackend(command, defaultArgs = []) {
   return createGenericCliBackend({
@@ -5585,95 +6154,121 @@ function createGenericCliPassthroughBackend(command, defaultArgs = []) {
   });
 }
 function createCodexRuntimeBackend(command = "codex", defaultArgs = []) {
-  return createGenericCliBackend({
+  return {
     kind: "codex_app_server",
     supportTier: "structured",
-    command,
-    args: [],
-    buildArgs: (context) => {
-      const resumeId = context.config.runtimeSessionId?.trim() || context.config.providerSessionId?.trim();
-      const baseArgs = resumeId ? ["exec", "resume", "--json", "--skip-git-repo-check", resumeId, "-"] : ["exec", "--json", "--skip-git-repo-check", "-"];
-      return [...baseArgs, ...defaultArgs];
-    },
-    promptViaStdin: true,
-    augmentPrompt: (context) => {
-      const basePrompt = buildPromptWithSystem(context.config, context.promptText);
-      if (context.config.mode === "plan") {
-        return buildPlanModePrefix(basePrompt);
+    async run(context) {
+      const { paths: imagePaths, cleanup } = writeImagesToTempFiles(context.config.images);
+      try {
+        return await createGenericCliBackend({
+          kind: "codex_app_server",
+          supportTier: "structured",
+          command,
+          args: [],
+          buildArgs: (ctx) => {
+            const resumeId = ctx.config.runtimeSessionId?.trim() || ctx.config.providerSessionId?.trim();
+            const modelArgs = ctx.config.selectedModel?.trim() ? ["--model", ctx.config.selectedModel.trim()] : [];
+            const permissionArgs = isCodexReadOnlyMode(ctx.config.mode) ? ["--ask-for-approval", "never", "--sandbox", "read-only"] : ["--dangerously-bypass-approvals-and-sandbox"];
+            const imageArgs = imagePaths.flatMap((p) => ["--image", p]);
+            const baseArgs = resumeId ? [...permissionArgs, "exec", "resume", "--json", "--skip-git-repo-check", ...modelArgs, ...imageArgs, resumeId, "-"] : [...permissionArgs, "exec", "--json", "--skip-git-repo-check", ...modelArgs, ...imageArgs, "-"];
+            return [...baseArgs, ...defaultArgs];
+          },
+          promptViaStdin: true,
+          augmentPrompt: (ctx) => {
+            const basePrompt = buildPromptWithSystem(ctx.config, ctx.promptText);
+            return ctx.config.mode === "plan" ? buildPlanModePrefix(basePrompt) : basePrompt;
+          },
+          parseStructuredLine: parseCodexStructuredLine
+        }).run(context);
+      } finally {
+        cleanup();
       }
-      return basePrompt;
-    },
-    parseStructuredLine: parseCodexStructuredLine
-  });
+    }
+  };
 }
-
-// src/core-agent.ts
-var MODE_CONFIG = {
-  agent: {},
-  plan: {
-    systemPromptHint: "You are in plan mode. Focus on analysis, sequencing, and implementation planning rather than making edits."
-  },
-  debug: {
-    systemPromptHint: "You are in debug mode. Prioritize reproducing the issue, isolating the cause, and validating the fix."
-  },
-  ask: {
-    systemPromptHint: "You are in ask mode. Stay read-only and explain the code or architecture clearly without changing files."
-  },
-  review: {
-    systemPromptHint: "You are in review mode. Inspect the changes, identify real issues, and summarize risks and regressions."
-  }
-};
 var DEFAULT_MODEL = "claude-sonnet-4-6";
+var DROID_DEFAULT_MODEL = "claude-opus-4-7";
 function canonicalizePath(inputPath) {
   try {
-    const resolved = (0, import_node_path.resolve)(inputPath);
-    return (0, import_node_fs.existsSync)(resolved) ? (0, import_node_fs.realpathSync)(resolved) : resolved;
-  } catch (error) {
-    console.warn("CoreAgent", "Failed to canonicalize path", { inputPath, error });
+    const resolved = (0, import_path2.resolve)(inputPath);
+    return (0, import_fs2.existsSync)(resolved) ? (0, import_fs2.realpathSync)(resolved) : resolved;
+  } catch {
     return null;
   }
 }
 function buildPromptWithFiles(task2, files) {
-  if (!files || files.length === 0) {
-    return task2;
-  }
+  if (!files || files.length === 0) return task2;
   const fileList = files.map((file) => `- ${file.filename} (${file.label}): ${file.tempPath}`).join("\n");
   return `${task2}
 
 The user has attached the following files. You can read them using your available tools:
 ${fileList}`;
 }
-var CoreAgent = class {
+var BaseMachineAgent = class _BaseMachineAgent {
+  static MAX_RETRIES = 2;
+  static RETRY_BASE_DELAY_MS = 3e3;
   presenter;
-  abortController = null;
   runtime;
-  pendingQuestionResolvers = /* @__PURE__ */ new Map();
-  pendingPlanApprovalResolvers = /* @__PURE__ */ new Map();
+  abortController = null;
   constructor(presenter, runtime) {
     this.presenter = presenter;
     this.runtime = runtime;
   }
-  submitAnswer(questionId, answers) {
-    const resolver = this.pendingQuestionResolvers.get(questionId);
-    if (!resolver) return false;
-    resolver(answers);
-    this.pendingQuestionResolvers.delete(questionId);
-    return true;
+  // ── Overridable hooks (defaults match sandbox behaviour) ───────────────
+  /**
+   * Extra system-prompt sections appended after identity + mode hint.
+   * Sandbox: artifact IDs from env vars.
+   * Desktop: taskMeta block + artifact IDs from AgentConfig fields.
+   */
+  buildExtraSystemPromptParts(_config) {
+    return [];
   }
-  submitPlanApproval(approvalId, approved) {
-    const resolver = this.pendingPlanApprovalResolvers.get(approvalId);
-    if (!resolver) return false;
-    resolver(approved);
-    this.pendingPlanApprovalResolvers.delete(approvalId);
-    return true;
+  /**
+   * Return a callback to be notified when the CLI child process spawns.
+   * Desktop returns a closure that registers the process for kill tracking.
+   * Sandbox returns undefined (no process management needed).
+   */
+  getOnProcessSpawned() {
+    return void 0;
   }
+  /**
+   * Whether to skip calling presenter.onComplete() after runCliBackend.
+   * Desktop returns true when the agent was externally killed to avoid
+   * a second onComplete firing on top of the "Interrupted by user" event.
+   */
+  shouldSkipOnComplete() {
+    return false;
+  }
+  /**
+   * Called when a session-resume attempt fails with a non-transient error.
+   *
+   * - Return null          → retry immediately without the session ID (sandbox default).
+   * - Return AgentResult   → stop and surface this result, no retry (desktop behaviour).
+   */
+  async onSessionResumeFailure(_runtimeConfig, _lastResult) {
+    this.presenter.onLog("Session resume failed, starting fresh session...");
+    return null;
+  }
+  /**
+   * Called before sleeping between retry attempts.
+   * Desktop uses this to wait for the previous child process to exit.
+   */
+  async beforeRetry() {
+  }
+  /**
+   * Build the prompt text sent to the CLI backend.
+   * Default appends file attachment paths (sandbox uses this).
+   * Desktop overrides to return config.task unchanged.
+   */
+  buildPromptText(config) {
+    return buildPromptWithFiles(config.task, config.files);
+  }
+  // ── Shared helpers ─────────────────────────────────────────────────────
   abort() {
     this.abortController?.abort();
   }
   isAbortError(error) {
-    if (error instanceof Error && error.name === "AbortError") {
-      return true;
-    }
+    if (error instanceof Error && error.name === "AbortError") return true;
     const message = error instanceof Error ? error.message.toLowerCase() : String(error).toLowerCase();
     return message.includes("aborted") || message.includes("interrupted") || message.includes("cancelled") || message.includes("canceled");
   }
@@ -5684,6 +6279,8 @@ var CoreAgent = class {
     switch (backendKind2) {
       case "claude_cli":
       case "codex_app_server":
+      case "cursor_agent_cli":
+      case "droid_cli":
       case "gemini_cli":
       case "opencode_cli":
         return "structured";
@@ -5692,77 +6289,112 @@ var CoreAgent = class {
         return "text";
     }
   }
-  buildCliEnvironment() {
-    const loginEnv = process.env;
-    const env = {};
-    for (const [key, value2] of Object.entries(loginEnv)) {
-      if (value2 !== void 0) {
-        env[key] = value2;
-      }
-    }
-    env.PATH = `/home/user/.local/node/bin:${env.PATH ?? ""}`;
-    return env;
-  }
-  async buildRuntimeConfig(config, safeProjectPath) {
+  // ── Core lifecycle ─────────────────────────────────────────────────────
+  buildRuntimeConfig(config, safeProjectPath) {
     const backendKind2 = this.resolveBackendKind(config);
     const supportTier = config.supportTier || this.getDefaultSupportTier(backendKind2);
-    const systemPromptParts = [config.systemPrompt?.trim()].filter(Boolean);
-    const modeHint = MODE_CONFIG[config.mode || "agent"]?.systemPromptHint;
-    if (modeHint) {
-      systemPromptParts.push(modeHint);
-    }
-    if (safeProjectPath) {
+    const systemPromptParts = [AIDEN_IDENTITY_PROMPT, config.systemPrompt?.trim()].filter(
+      Boolean
+    );
+    const modeHint = getAidenModePrompt(config.mode);
+    if (modeHint) systemPromptParts.push(modeHint);
+    const workingDir = config.worktreePath || safeProjectPath;
+    if (workingDir) {
       systemPromptParts.push(
-        [
-          `You are working inside: ${safeProjectPath}`,
-          "Prefer relative paths and keep your work scoped to this project."
-        ].join("\n")
-      );
-    }
-    if (config.images?.length) {
-      this.presenter.onLog(
-        `Image attachments are not yet passed directly to the CLI agent. Attached image count: ${config.images.length}.`
+        `You are working inside: ${workingDir}
+Prefer relative paths and keep your work scoped to this project.`
       );
     }
+    const extra = this.buildExtraSystemPromptParts(config);
+    systemPromptParts.push(...extra);
     return {
       ...config,
       backendKind: backendKind2,
       supportTier,
       runtimeCommand: config.runtimeCommand || this.runtime.runtimeCommand,
       runtimeArgs: config.runtimeArgs || this.runtime.runtimeArgs,
-      selectedModel: config.selectedModel || DEFAULT_MODEL,
+      selectedModel: config.selectedModel || (backendKind2 === "droid_cli" ? DROID_DEFAULT_MODEL : DEFAULT_MODEL),
       systemPrompt: systemPromptParts.join("\n\n") || void 0
     };
   }
   async runCliBackend(config, safeProjectPath) {
     const backendKind2 = this.resolveBackendKind(config);
-    const defaultCwd = (0, import_node_path.join)((0, import_node_os.homedir)(), "Documents", "aiden");
-    if (!(0, import_node_fs.existsSync)(defaultCwd)) {
-      (0, import_node_fs.mkdirSync)(defaultCwd, { recursive: true });
+    const defaultCwd = (0, import_path2.join)((0, import_os2.homedir)(), "Documents", "aiden");
+    if (!(0, import_fs2.existsSync)(defaultCwd)) {
+      (0, import_fs2.mkdirSync)(defaultCwd, { recursive: true });
     }
-    const runtimeConfig = await this.buildRuntimeConfig(config, safeProjectPath);
+    let runtimeConfig = this.buildRuntimeConfig(config, safeProjectPath);
     const cwd = runtimeConfig.worktreePath || safeProjectPath || runtimeConfig.cwd || defaultCwd;
-    const promptText = buildPromptWithFiles(runtimeConfig.task, runtimeConfig.files);
     const env = this.buildCliEnvironment();
+    const promptText = this.buildPromptText(runtimeConfig);
     const runtimeCommand = runtimeConfig.runtimeCommand || this.runtime.runtimeCommand;
     const runtimeArgs = runtimeConfig.runtimeArgs || this.runtime.runtimeArgs || [];
-    const backend = backendKind2 === "claude_cli" ? createClaudeCliBackend(runtimeCommand || "claude", runtimeArgs) : backendKind2 === "codex_app_server" ? createCodexRuntimeBackend(runtimeCommand || "codex", runtimeArgs) : backendKind2 === "gemini_cli" ? createGeminiCliBackend(runtimeCommand || "gemini", runtimeArgs) : backendKind2 === "opencode_cli" ? createOpencodeCliBackend(runtimeCommand || "opencode", runtimeArgs) : createGenericCliPassthroughBackend(runtimeCommand || "generic-cli", runtimeArgs);
-    const result = await backend.run({
-      presenter: this.presenter,
-      config: runtimeConfig,
-      abortController: this.abortController,
-      cwd,
-      env,
-      promptText
-    });
-    const normalizedResult = {
-      ...result,
-      backendKind: backend.kind,
-      supportTier: backend.supportTier,
-      runtimeSessionId: result.runtimeSessionId || result.providerSessionId,
-      providerSessionId: result.providerSessionId || result.runtimeSessionId
-    };
-    this.presenter.onComplete(normalizedResult);
+    const backend = backendKind2 === "claude_cli" ? createClaudeCliBackend(runtimeCommand || "claude", runtimeArgs) : backendKind2 === "codex_app_server" ? createCodexRuntimeBackend(runtimeCommand || "codex", runtimeArgs) : backendKind2 === "cursor_agent_cli" ? createCursorAgentCliBackend(runtimeCommand || "cursor-agent", runtimeArgs) : backendKind2 === "gemini_cli" ? createGeminiCliBackend(runtimeCommand || "gemini", runtimeArgs) : backendKind2 === "droid_cli" ? createDroidCliBackend(runtimeCommand || "droid", runtimeArgs) : backendKind2 === "opencode_cli" ? createOpencodeCliBackend(runtimeCommand || "opencode", runtimeArgs) : createGenericCliPassthroughBackend(runtimeCommand || "generic-cli", runtimeArgs);
+    let lastResult = null;
+    for (let attempt = 0; attempt <= _BaseMachineAgent.MAX_RETRIES; attempt++) {
+      if (this.abortController?.signal.aborted) break;
+      const result = await backend.run({
+        presenter: this.presenter,
+        config: runtimeConfig,
+        abortController: this.abortController,
+        cwd,
+        env,
+        promptText,
+        onProcessSpawned: this.getOnProcessSpawned()
+      });
+      lastResult = {
+        ...result,
+        backendKind: backend.kind,
+        supportTier: backend.supportTier,
+        runtimeSessionId: result.runtimeSessionId || result.providerSessionId,
+        providerSessionId: result.providerSessionId || result.runtimeSessionId
+      };
+      if (lastResult.success || !lastResult.error) break;
+      const hadResumeId = runtimeConfig.runtimeSessionId || runtimeConfig.providerSessionId;
+      if (hadResumeId && !isTransientError(lastResult.error)) {
+        const overrideResult = await this.onSessionResumeFailure(runtimeConfig, lastResult);
+        if (overrideResult !== null) {
+          lastResult = overrideResult;
+          break;
+        }
+        console.warn(
+          "[base-machine-agent] Resume failed, retrying without session ID:",
+          lastResult.error
+        );
+        runtimeConfig = { ...runtimeConfig, runtimeSessionId: void 0, providerSessionId: void 0 };
+        const retryResult = await backend.run({
+          presenter: this.presenter,
+          config: runtimeConfig,
+          abortController: this.abortController,
+          cwd,
+          env,
+          promptText,
+          onProcessSpawned: this.getOnProcessSpawned()
+        });
+        lastResult = {
+          ...retryResult,
+          backendKind: backend.kind,
+          supportTier: backend.supportTier,
+          runtimeSessionId: retryResult.runtimeSessionId || retryResult.providerSessionId,
+          providerSessionId: retryResult.providerSessionId || retryResult.runtimeSessionId
+        };
+        break;
+      }
+      if (!isTransientError(lastResult.error)) break;
+      if (attempt < _BaseMachineAgent.MAX_RETRIES) {
+        await this.beforeRetry();
+        const delayMs = _BaseMachineAgent.RETRY_BASE_DELAY_MS * Math.pow(2, attempt);
+        console.warn(
+          `[base-machine-agent] Transient error (attempt ${attempt + 1}/${_BaseMachineAgent.MAX_RETRIES + 1}), retrying in ${delayMs}ms: ${lastResult.error}`
+        );
+        void this.presenter.onLog(`Transient error, retrying in ${Math.round(delayMs / 1e3)}s...`);
+        await new Promise((resolve2) => setTimeout(resolve2, delayMs));
+      }
+    }
+    const normalizedResult = lastResult;
+    if (!this.shouldSkipOnComplete()) {
+      this.presenter.onComplete(normalizedResult);
+    }
     return normalizedResult;
   }
   async run(config) {
@@ -5780,11 +6412,9 @@ var CoreAgent = class {
     let safeProjectPath = initialConfig.projectPath;
     if (initialConfig.projectPath) {
       const canonicalized = canonicalizePath(initialConfig.projectPath);
-      if (canonicalized) {
-        safeProjectPath = canonicalized;
-      }
+      if (canonicalized) safeProjectPath = canonicalized;
     }
-    if (safeProjectPath && !(0, import_node_fs.existsSync)(safeProjectPath)) {
+    if (safeProjectPath && !(0, import_fs2.existsSync)(safeProjectPath)) {
       const message = `Project path no longer exists: "${safeProjectPath}". Please update the project's local path in project settings before running the agent.`;
       this.presenter.onError(message, true);
       const result = {
@@ -5806,7 +6436,7 @@ var CoreAgent = class {
       const interrupted = this.isAbortError(error);
       const message = interrupted ? "Interrupted by user" : error instanceof Error ? error.message : String(error);
       if (!interrupted) {
-        console.error("CoreAgent", "CLI runtime failed", error);
+        console.error("[base-machine-agent] CLI runtime failed", error);
         this.presenter.onError(message, true);
       }
       const result = {
@@ -5825,6 +6455,79 @@ var CoreAgent = class {
   }
 };
 
+// src/core-agent.ts
+var CoreAgent = class extends BaseMachineAgent {
+  childProcess = null;
+  constructor(presenter, runtime) {
+    super(presenter, runtime);
+  }
+  // ── Interactive tool response (WS relay → stdin) ───────────────────────
+  /**
+   * Send a tool_result to the CLI's stdin (stream-json format).
+   * Used for interactive tools like AskUserQuestion.
+   */
+  sendToolResponse(toolId, response) {
+    if (!this.childProcess) return false;
+    const stdin = this.childProcess.stdin;
+    if (!stdin || stdin.destroyed) return false;
+    try {
+      const message = JSON.stringify({
+        type: "user",
+        message: {
+          role: "user",
+          content: [
+            {
+              type: "tool_result",
+              tool_use_id: toolId,
+              content: response
+            }
+          ]
+        },
+        session_id: "default",
+        parent_tool_use_id: null
+      });
+      stdin.write(message + "\n");
+      console.info(`[CoreAgent] Sent tool_response for tool ${toolId}`);
+      return true;
+    } catch (err) {
+      console.error("[CoreAgent] Failed to write tool_response to stdin", err);
+      return false;
+    }
+  }
+  // ── BaseMachineAgent hooks ─────────────────────────────────────────────
+  getOnProcessSpawned() {
+    return (child) => {
+      this.childProcess = child;
+      child.on("exit", () => {
+        this.childProcess = null;
+      });
+    };
+  }
+  buildCliEnvironment() {
+    const loginEnv = process.env;
+    const env = {};
+    for (const [key, value2] of Object.entries(loginEnv)) {
+      if (value2 !== void 0) env[key] = value2;
+    }
+    env.PATH = `/home/user/.local/node/bin:${env.PATH ?? ""}`;
+    return env;
+  }
+  buildExtraSystemPromptParts(_config) {
+    const artifactIds = [];
+    const envTaskId = process.env.AIDEN_TASK_ID;
+    const envSessionId = process.env.AIDEN_SESSION_ID;
+    if (envTaskId) artifactIds.push(`- taskId: "${envTaskId}"`);
+    if (envSessionId) artifactIds.push(`- conversationId: "${envSessionId}"`);
+    if (artifactIds.length === 0) return [];
+    return [
+      [
+        "When creating artifacts using MCP tools (create_plan, create_document_artifact, create_test_report), always pass these IDs:",
+        ...artifactIds
+      ].join("\n")
+    ];
+  }
+};
+
 // src/web-presenter.ts
 var WebPresenter = class {
   wsClient;
@@ -5852,8 +6555,14 @@ var WebPresenter = class {
   onToolUse(tool, input, toolId) {
     this.wsClient.emitEvent({ type: "tool_use", id: toolId, name: tool, input, ts: Date.now() });
   }
-  onToolResult(toolId, content) {
-    this.wsClient.emitEvent({ type: "tool_result", id: toolId, content, ts: Date.now() });
+  onToolResult(toolId, content, isError) {
+    this.wsClient.emitEvent({
+      type: "tool_result",
+      id: toolId,
+      content,
+      ts: Date.now(),
+      ...isError ? { is_error: true } : {}
+    });
   }
   onTurnComplete(content) {
     this.wsClient.emitEvent({ type: "turn_complete", content, ts: Date.now() });
@@ -5861,6 +6570,26 @@ var WebPresenter = class {
   onUsageUpdate(usage) {
     this.wsClient.emitEvent({ type: "usage", usage });
   }
+  onAskUser(id, questions) {
+    this.wsClient.emitEvent({ type: "ask_user", id, questions });
+  }
+  onTodoWrite(todos) {
+    this.wsClient.emitEvent({ type: "todo_write", todos });
+  }
+  onExitPlanMode(id, input, planFilePath) {
+    this.wsClient.emitEvent({ type: "exit_plan_mode", id, input, ...planFilePath ? { planFilePath } : {} });
+  }
+  onCheckpoint(id) {
+    this.wsClient.emitEvent({ type: "checkpoint", id });
+  }
+  onActivity(status) {
+    this.wsClient.emitEvent({ type: "activity", status, ts: Date.now() });
+  }
+  onOpenBrowserTab(browserId, url2) {
+    this.wsClient.emitEvent({ type: "open_browser_tab", browserId, ...url2 ? { url: url2 } : {} });
+  }
+  recordRawTranscript() {
+  }
   onError(message, _isAgentError) {
     this.wsClient.emitEvent({ type: "error", message });
     if (!this.suppressSessionLifecycle) {
@@ -9462,10 +10191,6 @@ var WSClient = class {
   emitEvent(event) {
     this.socket.emit("agent_event", event);
   }
-  /** Signal the WS relay that this agent is about to update (not crashing). */
-  emitUpdating() {
-    this.socket.emit("agent_updating");
-  }
   waitForConnection(timeoutMs = 15e3) {
     return new Promise((resolve2, reject) => {
       if (this.socket.connected) {
@@ -9501,15 +10226,24 @@ var WSClient = class {
     this.socket.on("connect_error", (error) => {
       console.warn(`[WSClient] Connection error: ${error.message}`);
     });
-    this.socket.on("user_message", (data) => {
-      callbacks.onUserMessage({ text: data.text, providerSessionId: data.providerSessionId, backendKind: data.backendKind, selectedModel: data.selectedModel });
+    this.socket.on("user_message", (data, ack) => {
+      ack?.({ ok: true });
+      callbacks.onUserMessage({
+        text: data.text,
+        images: data.images,
+        providerSessionId: data.providerSessionId,
+        backendKind: data.backendKind,
+        selectedModel: data.selectedModel,
+        mode: data.mode
+      });
     });
     this.socket.on("stop", () => {
       callbacks.onStop();
     });
-    this.socket.on("update_agent", (data) => {
-      console.info("[WSClient] Received update_agent:", data);
-      callbacks.onUpdateAgent?.(data);
+    this.socket.on("tool_response", (data) => {
+      if (data?.toolId && typeof data.response === "string") {
+        callbacks.onToolResponse?.(data.toolId, data.response);
+      }
     });
     this.socket.on("error", (data) => {
       console.error(`[WSClient] Server error: ${data.message} (${data.code})`);
@@ -9518,52 +10252,15 @@ var WSClient = class {
 };
 
 // src/version.ts
-var AGENT_VERSION = "0.1.2";
-
-// src/updater.ts
-var import_node_child_process2 = require("child_process");
-var DEFAULT_PATH = "/home/user/.local/node/bin:/home/user/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin";
-async function installUpdate(payload) {
-  const version = payload.version ?? "latest";
-  try {
-    console.info(`[updater] Installing @aiden-ade/sandbox-agent@${version} via npm`);
-    (0, import_node_child_process2.execSync)(`npm install -g @aiden-ade/sandbox-agent@${version}`, {
-      timeout: 6e4,
-      env: { ...process.env, PATH: DEFAULT_PATH },
-      stdio: "pipe"
-    });
-    console.info("[updater] npm install complete");
-    return true;
-  } catch (error) {
-    console.error("[updater] npm install failed:", error.message);
-    return false;
-  }
-}
-function respawnAgent(lastProviderSessionId) {
-  const env = { ...process.env };
-  if (lastProviderSessionId) {
-    env.AIDEN_PROVIDER_SESSION_ID = lastProviderSessionId;
-  }
-  console.info("[updater] Spawning new agent process");
-  const child = (0, import_node_child_process2.spawn)("aiden-agent", [], {
-    detached: true,
-    stdio: "ignore",
-    env: { ...env, PATH: DEFAULT_PATH }
-  });
-  child.unref();
-  setTimeout(() => {
-    console.info("[updater] Old agent exiting after respawn");
-    process.exit(0);
-  }, 500);
-}
+var AGENT_VERSION = "0.1.5";
 
 // src/sandbox.ts
 async function runSandbox(config) {
   let currentTask = config.task;
+  let currentImages = [];
   let stopped = false;
   let pendingMessageResolve = null;
   let currentAgent = null;
-  let pendingUpdate = null;
   console.info("[sandbox] Connecting to WS server", { wsUrl: config.wsUrl, sessionId: config.sessionId });
   const wsClient = new WSClient(
     config.wsUrl,
@@ -9584,13 +10281,14 @@ async function runSandbox(config) {
         console.info("[sandbox] Stop signal received");
         if (currentAgent) currentAgent.abort();
       },
-      onUpdateAgent: (payload) => {
-        console.info("[sandbox] Update requested:", payload);
-        pendingUpdate = payload;
-        if (pendingMessageResolve) {
-          const resolve2 = pendingMessageResolve;
-          pendingMessageResolve = null;
-          resolve2(null);
+      onToolResponse: (toolId, response) => {
+        if (currentAgent) {
+          const sent = currentAgent.sendToolResponse(toolId, response);
+          if (!sent) {
+            console.warn("[sandbox] Failed to deliver tool_response to agent stdin", { toolId });
+          }
+        } else {
+          console.warn("[sandbox] No active agent for tool_response", { toolId });
         }
       },
       onConnect: () => console.info("[sandbox] WS connected"),
@@ -9609,11 +10307,8 @@ async function runSandbox(config) {
   let lastProviderSessionId = config.providerSessionId;
   let activeBackendKind = config.backendKind || "claude_cli";
   let activeModel = config.model;
+  let activeMode = config.mode || "agent";
   while (!stopped) {
-    if (pendingUpdate) {
-      await performUpdate(wsClient, pendingUpdate, lastProviderSessionId);
-      pendingUpdate = null;
-    }
     if (currentTask?.trim()) {
       const agent = new CoreAgent(presenter, {
         backendKind: activeBackendKind
@@ -9627,8 +10322,17 @@ async function runSandbox(config) {
           projectPath: config.projectPath,
           cwd: config.projectPath,
           backendKind: activeBackendKind,
+          mode: activeMode,
           selectedModel: activeModel,
-          providerSessionId: lastProviderSessionId ?? void 0
+          providerSessionId: lastProviderSessionId ?? void 0,
+          images: currentImages.length > 0 ? currentImages.map((img) => ({
+            id: img.id,
+            data: img.data,
+            mimeType: img.mimeType,
+            filename: img.filename,
+            width: 0,
+            height: 0
+          })) : void 0
         });
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
@@ -9640,22 +10344,15 @@ async function runSandbox(config) {
         lastProviderSessionId = result.providerSessionId;
       }
       if (stopped) break;
-      if (pendingUpdate) {
-        await performUpdate(wsClient, pendingUpdate, lastProviderSessionId);
-        pendingUpdate = null;
-      }
     }
     const nextPayload = await new Promise((resolve2) => {
       pendingMessageResolve = resolve2;
     });
     if (nextPayload === null || stopped) {
-      if (pendingUpdate) {
-        await performUpdate(wsClient, pendingUpdate, lastProviderSessionId);
-        pendingUpdate = null;
-      }
       break;
     }
     currentTask = nextPayload.text;
+    currentImages = nextPayload.images ?? [];
     if (nextPayload.providerSessionId) {
       lastProviderSessionId = nextPayload.providerSessionId;
     }
@@ -9665,25 +10362,20 @@ async function runSandbox(config) {
     if (nextPayload.selectedModel) {
       activeModel = nextPayload.selectedModel;
     }
+    if (nextPayload.mode) {
+      activeMode = nextPayload.mode;
+    }
   }
   presenter.setSuppressSessionLifecycle(false);
   wsClient.close();
 }
-async function performUpdate(wsClient, payload, lastProviderSessionId) {
-  console.info("[sandbox] Performing self-update", payload);
-  wsClient.emitUpdating();
-  await new Promise((r) => setTimeout(r, 200));
-  wsClient.close();
-  const success = await installUpdate(payload);
-  if (success) {
-    respawnAgent(lastProviderSessionId);
-    await new Promise((r) => setTimeout(r, 2e3));
-  } else {
-    console.error("[sandbox] Update failed \u2014 continuing with current version");
-  }
-}
 
 // src/index.ts
+if (process.argv.includes("--version")) {
+  process.stdout.write(`${AGENT_VERSION}
+`);
+  process.exit(0);
+}
 var wsUrl = process.env.AIDEN_WS_URL;
 var sessionId = process.env.AIDEN_SESSION_ID;
 var taskId = process.env.AIDEN_TASK_ID;
@@ -9691,13 +10383,14 @@ var sessionToken = process.env.AIDEN_SESSION_TOKEN;
 var task = process.env.AIDEN_TASK;
 var projectPath = process.env.AIDEN_PROJECT_PATH || "/home/user/workspace";
 var backendKind = process.env.AIDEN_BACKEND_KIND || "claude_cli";
+var mode = process.env.AIDEN_MODE || "agent";
 var model = process.env.AIDEN_MODEL;
 var providerSessionId = process.env.AIDEN_PROVIDER_SESSION_ID || void 0;
 if (!wsUrl || !sessionId || !taskId || !sessionToken || task == null) {
   console.error("[aiden-agent] Missing required env vars: AIDEN_WS_URL, AIDEN_SESSION_ID, AIDEN_TASK_ID, AIDEN_SESSION_TOKEN, AIDEN_TASK");
   process.exit(1);
 }
-console.info("[aiden-agent] Starting", { sessionId, taskId, projectPath, backendKind, model, version: AGENT_VERSION });
+console.info("[aiden-agent] Starting", { sessionId, taskId, projectPath, backendKind, mode, model, version: AGENT_VERSION });
 runSandbox({
   wsUrl,
   sessionId,
@@ -9706,6 +10399,7 @@ runSandbox({
   task,
   projectPath,
   backendKind,
+  mode,
   model,
   providerSessionId,
   maxIterations: 50