@aiden-ade/sandbox-agent 0.1.13 → 0.1.15

package/dist/index.cjs

@@ -4812,11 +4812,6 @@ var require_websocket_server = __commonJS({
 
 // ../agent-core/dist/index.js
 var import_child_process = require("child_process");
-var import_crypto = require("crypto");
-var import_fs = require("fs");
-var import_os = require("os");
-var import_path = require("path");
-var import_readline = require("readline");
 
 // ../shared/dist/agent/agent-definitions.js
 var COORDINATOR_PROMPT = `## You are the Coordinator
@@ -4940,7 +4935,7 @@ var GENERAL_PROMPT = `## You are the General Agent
 
 You are a flexible general-purpose agent (an Aiden agent profile) for work that does not need a specialist profile. Wear whatever hat the moment demands \u2014 product thinker, planner, programmer, debugger, tester. Read the room and pick the hat.
 
-When identifying yourself, say "I'm the General Agent (an Aiden agent profile)."
+Your name is Aiden, General Agent.
 
 Clarify the goal only when required, inspect the relevant context first, then complete the requested work directly. Keep changes focused, avoid unrelated refactors, and validate the result before reporting back.
 
@@ -5175,8 +5170,8 @@ var PLAN_MODE_PROMPT = [
   "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 teamId 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."
+  "If create_plan fails, retry it. Do not finish plan mode until the plan is persisted successfully.",
+  "After create_plan succeeds, present the plan title and artifact link to the user for approval."
 ].join("\n");
 var TEST_MODE_PROMPT = [
   "You are in test mode. Verify the implemented feature carefully.",
@@ -5206,6 +5201,17 @@ function getAidenAgentPrompt(agentId) {
 // ../shared/dist/agent/session-result.js
 var SESSION_RESUME_FAILED_MESSAGE = "Session resume failed. The previous session may have expired or is no longer available. Please start a new session.";
 
+// ../agent-core/dist/index.js
+var import_fs = require("fs");
+var import_os = require("os");
+var import_path = require("path");
+var import_crypto = require("crypto");
+var import_fs2 = require("fs");
+var import_fs3 = require("fs");
+var import_os2 = require("os");
+var import_path2 = require("path");
+var import_readline = require("readline");
+
 // ../shared/dist/constants/agent.js
 var INTERACTIVE_TOOL_NAMES = /* @__PURE__ */ new Set([
   "askuserquestion",
@@ -5232,17 +5238,9 @@ var DEFAULT_TEAM_STATUSES = STATUS_OPTIONS.map((o) => ({
 }));
 
 // ../agent-core/dist/index.js
-var import_fs2 = require("fs");
-var import_os2 = require("os");
-var import_path2 = require("path");
-function formatCliSpawnError(command, error) {
-  if (error.code === "ENOENT") {
-    return new Error(
-      `CLI command not found: ${command}. Install it or configure this provider with the full executable path.`
-    );
-  }
-  return error;
-}
+var import_fs4 = require("fs");
+var import_os3 = require("os");
+var import_path3 = require("path");
 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");
@@ -5287,23 +5285,6 @@ 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(),
-    config.systemPromptAppend?.trim(),
-    promptText.trim()
-  ].filter((value2) => Boolean(value2 && value2.length > 0));
-  return parts2.join("\n\n");
-}
-function buildPlanModePrefix(promptText) {
-  return [
-    "You are in plan-only mode.",
-    "Do not make code changes or execute write operations.",
-    "Focus on analysis, planning, and explaining the next steps.",
-    "",
-    promptText
-  ].join("\n");
-}
 function planCliSpawn(command, args, env = process.env) {
   const isWindows = process.platform === "win32";
   const comSpec = env.ComSpec ?? process.env.ComSpec ?? "cmd.exe";
@@ -5339,48 +5320,334 @@ function spawnCli(command, args, context) {
     detached: process.platform !== "win32"
   });
 }
-function createGenericCliBackend(options) {
-  return {
-    kind: options.kind,
-    supportTier: options.supportTier,
-    async run(context) {
-      const presenter = context.presenter;
-      const state = {
-        process: null,
-        iterations: 0,
-        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) => 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
-      });
-      child.stdin.on("error", (err) => {
-        if (err.code !== "EPIPE") {
-          console.error(`[${options.kind}] stdin error:`, err);
+function shouldUseReadOnlyRuntimePermissions(config) {
+  if (isReadOnlyAgent(config.agentId)) return true;
+  switch (config.mode) {
+    case "plan":
+    case "ask":
+    case "review":
+      return true;
+    default:
+      return false;
+  }
+}
+function getClaudePermissionMode(config) {
+  switch (config.mode) {
+    case "plan":
+    case "ask":
+    case "review":
+      return "plan";
+    default:
+      return "bypassPermissions";
+  }
+}
+function getClaudeDisallowedTools(config) {
+  return isReadOnlyAgent(config.agentId) ? ["Edit", "Write", "MultiEdit", "NotebookEdit"] : [];
+}
+function parseJsonObject(value2) {
+  try {
+    const parsed = JSON.parse(value2);
+    return typeof parsed === "object" && parsed !== null ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+function parseMaybeJson(value2) {
+  if (typeof value2 !== "string") return value2;
+  return parseJsonObject(value2) ?? value2;
+}
+function normalizeCodexMcpToolResult(output) {
+  if (typeof output !== "string") return JSON.stringify(output ?? {}, null, 2);
+  const outputMarker = "\nOutput:\n";
+  const raw = output.includes(outputMarker) ? output.slice(output.indexOf(outputMarker) + outputMarker.length).trim() : output.trim();
+  let parsed;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    return raw;
+  }
+  if (Array.isArray(parsed)) {
+    const textBlocks = parsed.filter(
+      (entry) => typeof entry === "object" && entry !== null && "text" in entry
+    ).map((entry) => typeof entry.text === "string" ? entry.text : "").filter(Boolean);
+    if (textBlocks.length > 0) return textBlocks.join("\n");
+  }
+  return raw;
+}
+function findCodexSessionLog(runtimeSessionId, codexHome) {
+  if (!runtimeSessionId || !(0, import_fs.existsSync)(codexHome)) return null;
+  const root = (0, import_path.join)(codexHome, "sessions");
+  if (!(0, import_fs.existsSync)(root)) return null;
+  const matches = [];
+  const stack = [root];
+  while (stack.length > 0) {
+    const dir = stack.pop();
+    let entries;
+    try {
+      entries = (0, import_fs.readdirSync)(dir, { withFileTypes: true });
+    } catch {
+      continue;
+    }
+    for (const entry of entries) {
+      const path = (0, import_path.join)(dir, entry.name);
+      if (entry.isDirectory()) {
+        stack.push(path);
+      } else if (entry.isFile() && entry.name.includes(runtimeSessionId) && entry.name.endsWith(".jsonl")) {
+        try {
+          matches.push({ path, mtimeMs: (0, import_fs.statSync)(path).mtimeMs });
+        } catch {
+          matches.push({ path, mtimeMs: 0 });
         }
-      });
-      if (options.stdinWriter) {
-        options.stdinWriter(child.stdin, context);
-      } else if (options.promptViaStdin) {
-        child.stdin.write(prompt);
-        child.stdin.end();
-      } else {
-        child.stdin.end();
       }
-      if (options.keepStdinOpen) {
-        state.stdin = child.stdin;
+    }
+  }
+  matches.sort((a, b) => b.mtimeMs - a.mtimeMs);
+  return matches[0]?.path ?? null;
+}
+async function replayCodexMcpToolEventsFromSessionLog(context, state) {
+  const runtimeSessionId = state.runtimeSessionId;
+  if (!runtimeSessionId) return;
+  const codexHome = context.env.CODEX_HOME || process.env.CODEX_HOME || (0, import_path.join)((0, import_os.homedir)(), ".codex");
+  const logPath = findCodexSessionLog(runtimeSessionId, codexHome);
+  if (!logPath) return;
+  const emittedToolIds = /* @__PURE__ */ new Set();
+  const lines = (0, import_fs.readFileSync)(logPath, "utf8").split(/\r?\n/).filter(Boolean);
+  for (const line of lines) {
+    const entry = parseJsonObject(line);
+    const payload = entry && typeof entry.payload === "object" && entry.payload !== null ? entry.payload : null;
+    if (!payload) continue;
+    if (payload.type === "function_call") {
+      const callId = typeof payload.call_id === "string" ? payload.call_id : "";
+      const name = typeof payload.name === "string" ? payload.name : "";
+      const namespace = typeof payload.namespace === "string" ? payload.namespace : "";
+      if (!callId || !name || !namespace.startsWith("mcp__")) continue;
+      const toolName = `${namespace}${name}`;
+      context.presenter.onToolUse(toolName, parseMaybeJson(payload.arguments), callId);
+      emittedToolIds.add(callId);
+      continue;
+    }
+    if (payload.type === "tool_search_call") {
+      const callId = typeof payload.call_id === "string" ? payload.call_id : "";
+      if (!callId) continue;
+      context.presenter.onToolUse("tool_search", payload.arguments ?? {}, callId);
+      emittedToolIds.add(callId);
+    }
+  }
+  if (emittedToolIds.size === 0) return;
+  for (const line of lines) {
+    const entry = parseJsonObject(line);
+    const payload = entry && typeof entry.payload === "object" && entry.payload !== null ? entry.payload : null;
+    if (!payload || payload.type !== "function_call_output" && payload.type !== "tool_search_output") continue;
+    const callId = typeof payload.call_id === "string" ? payload.call_id : "";
+    if (!emittedToolIds.has(callId)) continue;
+    try {
+      const result = payload.type === "tool_search_output" ? JSON.stringify(payload.tools ?? [], null, 2) : normalizeCodexMcpToolResult(payload.output);
+      context.presenter.onToolResult?.(callId, result);
+    } catch {
+      context.presenter.onToolResult?.(callId, String(payload.output ?? ""));
+    }
+  }
+}
+function kimiSessionId(cwd) {
+  let resolved = cwd;
+  try {
+    resolved = (0, import_fs2.realpathSync)(cwd);
+  } catch {
+  }
+  return (0, import_crypto.createHash)("md5").update(resolved).digest("hex");
+}
+function parseKimiStructuredLine(line, context, state) {
+  const presenter = context.presenter;
+  if (!state.runtimeSessionId) {
+    state.runtimeSessionId = kimiSessionId(context.cwd);
+  }
+  let parsed;
+  try {
+    parsed = JSON.parse(line);
+  } catch {
+    const text = line.trim();
+    if (text.length > 0) {
+      if (text.toLowerCase().includes("llm not set")) state.error = text;
+      void presenter.onLog(`[kimi_cli] ${line}`);
+    }
+    return;
+  }
+  const role = typeof parsed.role === "string" ? parsed.role : "";
+  const contentBlocks = Array.isArray(parsed.content) ? parsed.content : [];
+  const toolCalls = Array.isArray(parsed.tool_calls) ? parsed.tool_calls : [];
+  if (role === "assistant") {
+    const thinking = contentBlocks.filter((b) => b.type === "think" && typeof b.think === "string").map((b) => b.think).join("");
+    if (thinking) {
+      state.iterations = Math.max(state.iterations, 1);
+      void presenter.onThinking(thinking);
+    }
+    if (toolCalls.length > 0) {
+      state.iterations = Math.max(state.iterations, 1);
+      for (const tc of toolCalls) {
+        const fn = typeof tc.function === "object" && tc.function !== null ? tc.function : {};
+        const toolId = typeof tc.id === "string" ? tc.id : `kimi-tool-${Date.now()}`;
+        const toolName = typeof fn.name === "string" ? fn.name : "Tool";
+        let args = {};
+        if (typeof fn.arguments === "string") {
+          try {
+            args = JSON.parse(fn.arguments);
+          } catch {
+          }
+        } else if (typeof fn.arguments === "object" && fn.arguments !== null) {
+          args = fn.arguments;
+        }
+        void presenter.onToolUse(toolName, args, toolId);
       }
-      const stdoutRl = (0, import_readline.createInterface)({ input: child.stdout });
-      const stderrRl = (0, import_readline.createInterface)({ input: child.stderr });
+    } else {
+      const text = contentBlocks.filter((b) => b.type === "text" && typeof b.text === "string").map((b) => b.text).join("");
+      if (text) {
+        state.iterations = Math.max(state.iterations, 1);
+        state.summary += text;
+        void presenter.onAssistantText(text);
+      }
+    }
+    return;
+  }
+  if (role === "tool") {
+    const toolCallId = typeof parsed.tool_call_id === "string" ? parsed.tool_call_id : `kimi-tool-${Date.now()}`;
+    const allText = contentBlocks.filter((b) => b.type === "text" && typeof b.text === "string").map((b) => b.text);
+    const userText = allText.filter((t) => !t.startsWith("<system>")).join("\n");
+    void presenter.onToolResult?.(toolCallId, userText || allText.join("\n"));
+    return;
+  }
+}
+function buildPromptWithSystem(config, promptText) {
+  const parts2 = [
+    config.systemPrompt?.trim(),
+    config.systemPromptAppend?.trim(),
+    promptText.trim()
+  ].filter((value2) => Boolean(value2 && value2.length > 0));
+  return parts2.join("\n\n");
+}
+function buildPlanModePrefix(promptText) {
+  return [
+    "You are in plan-only mode.",
+    "Do not make code changes or execute write operations.",
+    "Focus on analysis, planning, and explaining the next steps.",
+    "",
+    promptText
+  ].join("\n");
+}
+function imageFileExtension(mimeType) {
+  const subtype = mimeType.split("/")[1]?.split(/[+;]/)[0]?.trim();
+  if (!subtype) return "png";
+  return subtype === "jpeg" ? "jpg" : subtype;
+}
+function createImageTempDirectory(cwd) {
+  const candidates = [
+    cwd ? (0, import_path2.join)(cwd, ".aiden-images-") : null,
+    (0, import_path2.join)((0, import_os2.tmpdir)(), "aiden-images-")
+  ].filter((value2) => Boolean(value2));
+  for (const candidate of candidates) {
+    try {
+      return (0, import_fs3.mkdtempSync)(candidate);
+    } catch {
+    }
+  }
+  return (0, import_fs3.mkdtempSync)((0, import_path2.join)((0, import_os2.tmpdir)(), "aiden-images-"));
+}
+function writeImagesToTempFiles(images, cwd) {
+  if (!images?.length) return { paths: [], files: [], cleanup: () => {
+  } };
+  const directory = createImageTempDirectory(cwd);
+  const paths = [];
+  const files = [];
+  for (const img of images) {
+    const ext = imageFileExtension(img.mimeType);
+    const filePath = (0, import_path2.join)(directory, `aiden-img-${img.id}.${ext}`);
+    (0, import_fs3.writeFileSync)(filePath, Buffer.from(img.data, "base64"));
+    paths.push(filePath);
+    files.push({
+      filename: img.filename,
+      mimeType: img.mimeType,
+      width: img.width,
+      height: img.height,
+      path: filePath
+    });
+  }
+  return {
+    paths,
+    files,
+    cleanup: () => {
+      try {
+        (0, import_fs3.rmSync)(directory, { recursive: true, force: true });
+      } catch {
+      }
+    }
+  };
+}
+function appendImagePathReferences(prompt, images) {
+  if (images.length === 0) return prompt;
+  const imageLines = images.map((img) => {
+    const dimensions = img.width > 0 && img.height > 0 ? `, ${img.width}x${img.height}` : "";
+    return `- ${img.filename} (${img.mimeType}${dimensions}): @${img.path} (path: ${img.path})`;
+  });
+  return [
+    prompt,
+    "Attached images are available as local files. Use the @path references below when this CLI supports file references, or read the plain paths with filesystem tools:",
+    ...imageLines
+  ].join("\n\n");
+}
+function buildPromptWithImagePathReferences(context, images) {
+  const base = buildPromptWithSystem(context.config, context.promptText);
+  const prompt = context.config.mode === "plan" ? buildPlanModePrefix(base) : base;
+  return appendImagePathReferences(prompt, images);
+}
+function formatCliSpawnError(command, error) {
+  if (error.code === "ENOENT") {
+    return new Error(
+      `CLI command not found: ${command}. Install it or configure this provider with the full executable path.`
+    );
+  }
+  return error;
+}
+function createGenericCliBackend(options) {
+  return {
+    kind: options.kind,
+    supportTier: options.supportTier,
+    async run(context) {
+      const presenter = context.presenter;
+      const state = {
+        process: null,
+        iterations: 0,
+        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) => 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
+      });
+      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);
+        if (!options.keepStdinOpen) child.stdin.end();
+      } else if (!options.keepStdinOpen) {
+        child.stdin.end();
+      }
+      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);
@@ -5708,155 +5975,281 @@ function parseClaudeStructuredLine(line, context, state) {
       break;
   }
 }
-function parseCodexStructuredLine(line, context, state) {
-  const presenter = context.presenter;
-  let parsed = null;
-  try {
-    parsed = JSON.parse(line);
-  } catch {
-    void presenter.onLog(`[codex] ${line}`);
-    return;
-  }
-  const type = typeof parsed.type === "string" ? parsed.type : "";
-  if (!type) return;
-  if (typeof parsed.thread_id === "string") {
-    state.runtimeSessionId = parsed.thread_id;
-  }
-  const extractCodexErrorMessage = (value2) => {
-    if (typeof value2 !== "string") return "";
-    const trimmed = value2.trim();
-    if (!trimmed) return "";
-    try {
-      const parsedValue = JSON.parse(trimmed);
-      if (typeof parsedValue.detail === "string" && parsedValue.detail.trim().length > 0) {
-        return parsedValue.detail.trim();
-      }
-      if (typeof parsedValue.message === "string" && parsedValue.message.trim().length > 0) {
-        return parsedValue.message.trim();
+function buildClaudeModelArg(baseModel, selectedContextWindow) {
+  if (selectedContextWindow === "1m") return `${baseModel}[1m]`;
+  return baseModel;
+}
+function createClaudeCliBackend(command = "claude", defaultArgs = []) {
+  return {
+    kind: "claude_cli",
+    supportTier: "structured",
+    async run(context) {
+      const args = [
+        "--verbose",
+        "--output-format",
+        "stream-json",
+        "--input-format",
+        "stream-json",
+        "--permission-mode",
+        getClaudePermissionMode(context.config)
+      ];
+      const disallowedTools = getClaudeDisallowedTools(context.config);
+      if (disallowedTools.length > 0) {
+        args.push("--disallowedTools", disallowedTools.join(","));
       }
-    } catch {
-    }
-    return trimmed;
-  };
-  switch (type) {
-    case "thread.started":
-      break;
-    case "turn.started":
-      state.iterations += 1;
-      break;
-    case "session_configured":
-      if (typeof parsed.session_id === "string") {
-        state.runtimeSessionId = parsed.session_id;
+      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());
+        }
       }
-      break;
-    case "task_started":
-      state.iterations += 1;
-      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;
-      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.type === "reasoning" && typeof item.text === "string") {
-        void presenter.onThinking(item.text);
-        break;
+      const baseModel = context.config.selectedModel?.trim();
+      if (baseModel) {
+        args.push("--model", buildClaudeModelArg(baseModel, context.config.selectedContextWindow));
       }
-      if (item.type === "agent_message" && typeof item.text === "string") {
-        state.summary += `${item.text}
-`;
-        void presenter.onAssistantText(item.text);
-        break;
+      const claudeEffort = context.config.selectedEffortLevel?.trim();
+      if (claudeEffort) {
+        args.push("--effort", claudeEffort);
       }
-      if (item.type === "command_execution" && typeof item.id === "string") {
-        const output = typeof item.aggregated_output === "string" ? item.aggregated_output : "";
-        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;
+      if (resumeId) {
+        args.push("--resume", resumeId);
+        console.info("[claude_cli] Resuming session", { resumeId });
       }
-      break;
+      args.push("--chrome");
+      console.info("[claude_cli] Chrome flag added \u2014 final args:", args.join(" "));
+      args.push(...defaultArgs);
+      return createGenericCliBackend({
+        kind: "claude_cli",
+        supportTier: "structured",
+        command,
+        args,
+        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);
     }
-    case "agent_message_delta":
-    case "agent_message_content_delta": {
-      const delta = typeof parsed.delta === "string" ? parsed.delta : "";
-      if (!delta) return;
-      state.summary += delta;
-      void presenter.onAssistantText(delta);
-      break;
-    }
-    case "agent_reasoning_delta":
-    case "reasoning_content_delta":
-    case "agent_reasoning_raw_content_delta": {
-      const delta = typeof parsed.delta === "string" ? parsed.delta : "";
-      if (!delta) return;
-      void presenter.onThinking(delta);
-      break;
+  };
+}
+function createSupatestCliBackend(command = "supatest", defaultArgs = []) {
+  return {
+    kind: "supatest_cli",
+    supportTier: "structured",
+    async run(context) {
+      const args = [
+        "--cwd",
+        context.cwd,
+        "--output-format",
+        "stream-json",
+        "--input-format",
+        "stream-json",
+        "--permission-mode",
+        getClaudePermissionMode(context.config)
+      ];
+      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());
+        }
+      }
+      const baseModel = context.config.selectedModel?.trim();
+      if (baseModel) {
+        args.push("--model", buildClaudeModelArg(baseModel, context.config.selectedContextWindow));
+      }
+      if (resumeId) {
+        args.push("--resume", resumeId);
+        console.info("[supatest_cli] Resuming session", { resumeId });
+      }
+      args.push(...defaultArgs);
+      return createGenericCliBackend({
+        kind: "supatest_cli",
+        supportTier: "structured",
+        command,
+        args,
+        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 });
+          }
+          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
+      }).run(context);
     }
-    case "exec_command_begin": {
-      const toolId = typeof parsed.call_id === "string" ? parsed.call_id : `exec-${Date.now()}`;
-      const command = Array.isArray(parsed.command) ? parsed.command.join(" ") : "";
-      const cwd = typeof parsed.cwd === "string" ? parsed.cwd : context.cwd;
-      void presenter.onToolUse("Bash", { command, cwd }, toolId);
-      break;
+  };
+}
+function shouldEnableKimiCliThinking(model) {
+  return model?.trim() === "kimi-k2.6-thinking";
+}
+function resolveKimiCliModelArg(model) {
+  const trimmed = model?.trim();
+  if (!trimmed) return void 0;
+  if (trimmed === "kimi-latest" || trimmed === "kimi-k2.5" || trimmed === "kimi-k2.6" || shouldEnableKimiCliThinking(trimmed)) {
+    return void 0;
+  }
+  if (trimmed.startsWith("claude-")) return void 0;
+  return trimmed;
+}
+function createKimiCliBackend(command = "kimi", defaultArgs = []) {
+  return {
+    kind: "kimi_cli",
+    supportTier: "structured",
+    async run(context) {
+      const { files: imageFiles, cleanup } = writeImagesToTempFiles(context.config.images, context.cwd);
+      try {
+        return await createGenericCliBackend({
+          kind: "kimi_cli",
+          supportTier: "structured",
+          command,
+          args: [],
+          buildArgs: (ctx, prompt) => {
+            const args = [
+              "--print",
+              "--output-format",
+              "stream-json",
+              "--work-dir",
+              ctx.cwd
+            ];
+            const resumeId = ctx.config.runtimeSessionId?.trim() || ctx.config.providerSessionId?.trim();
+            if (resumeId) args.push("--session", resumeId);
+            if (shouldEnableKimiCliThinking(ctx.config.selectedModel)) {
+              args.push("--thinking");
+            }
+            const model = resolveKimiCliModelArg(ctx.config.selectedModel);
+            if (model) args.push("--model", model);
+            return [...args, ...defaultArgs, "--prompt", prompt];
+          },
+          augmentPrompt: (ctx) => buildPromptWithImagePathReferences(ctx, imageFiles),
+          parseStructuredLine: parseKimiStructuredLine
+        }).run(context);
+      } finally {
+        cleanup();
+      }
     }
-    case "exec_command_end": {
-      const toolId = typeof parsed.call_id === "string" ? parsed.call_id : `exec-${Date.now()}`;
-      const output = typeof parsed.formatted_output === "string" ? parsed.formatted_output : typeof parsed.aggregated_output === "string" ? parsed.aggregated_output : "";
-      void presenter.onToolResult?.(toolId, output);
+  };
+}
+function buildGeminiToolResultText(parsed) {
+  const output = typeof parsed.output === "string" ? parsed.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;
+  const status = typeof parsed.status === "string" ? parsed.status.trim() : "";
+  return status || "Tool completed";
+}
+function parseGeminiStructuredLine(line, context, state) {
+  const presenter = context.presenter;
+  let parsed = null;
+  try {
+    parsed = JSON.parse(line);
+  } catch {
+    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;
+  switch (type) {
+    case "init": {
+      const model = state.activeModel || context.config.selectedModel || "gemini";
+      void presenter.onLog(`[gemini_cli] Session initialized with ${model}`);
       break;
     }
-    case "mcp_tool_call_begin": {
-      const toolId = typeof parsed.call_id === "string" ? parsed.call_id : `mcp-${Date.now()}`;
-      const invocation = typeof parsed.invocation === "object" && parsed.invocation !== null ? parsed.invocation : {};
-      const tool = typeof invocation.tool_name === "string" ? invocation.tool_name : typeof invocation.tool === "string" ? invocation.tool : "MCP Tool";
-      void presenter.onToolUse(tool, invocation, toolId);
+    case "message": {
+      if (typeof parsed.role !== "string" || parsed.role !== "assistant") break;
+      const content = typeof parsed.content === "string" ? parsed.content : "";
+      if (!content) break;
+      state.iterations = Math.max(state.iterations, 1);
+      state.summary += content;
+      void presenter.onAssistantText(content);
       break;
     }
-    case "mcp_tool_call_end": {
-      const toolId = typeof parsed.call_id === "string" ? parsed.call_id : `mcp-${Date.now()}`;
-      void presenter.onToolResult?.(toolId, JSON.stringify(parsed.result ?? {}, null, 2));
+    case "tool_use": {
+      const toolName = typeof parsed.tool_name === "string" ? parsed.tool_name : "Gemini Tool";
+      const toolId = typeof parsed.tool_id === "string" ? parsed.tool_id : `gemini-tool-${Date.now()}`;
+      state.iterations = Math.max(state.iterations, 1);
+      void presenter.onToolUse(toolName, parsed.parameters ?? {}, toolId);
       break;
     }
-    case "token_count": {
-      const info = typeof parsed.info === "object" && parsed.info !== null ? parsed.info : {};
-      state.usage = {
-        model: typeof info.model === "string" ? info.model : "codex",
-        numTurns: Math.max(state.iterations, 1),
-        durationMs: 0,
-        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
-      };
-      void presenter.onUsageUpdate?.({
-        model: state.usage.model,
-        inputTokens: state.usage.inputTokens,
-        outputTokens: state.usage.outputTokens,
-        cacheReadTokens: state.usage.cacheReadTokens,
-        cacheCreationTokens: state.usage.cacheCreationTokens
-      });
+    case "tool_result": {
+      const toolId = typeof parsed.tool_id === "string" ? parsed.tool_id : `gemini-tool-${Date.now()}`;
+      state.iterations = Math.max(state.iterations, 1);
+      void presenter.onToolResult?.(toolId, buildGeminiToolResultText(parsed));
       break;
     }
-    case "task_complete": {
-      const lastMessage = typeof parsed.last_agent_message === "string" ? parsed.last_agent_message : "";
-      if (lastMessage.length > 0) state.summary = lastMessage;
+    case "error": {
+      const errObj = typeof parsed.error === "object" && parsed.error !== null ? parsed.error : null;
+      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) {
+        if (severity === "error") {
+          void presenter.onError(message);
+          state.error = message;
+        } else {
+          void presenter.onLog(`[gemini_cli/${severity}] ${message}`);
+        }
+      }
       break;
     }
-    case "turn.completed": {
-      const usage = typeof parsed.usage === "object" && parsed.usage !== null ? parsed.usage : {};
+    case "result": {
+      const stats = typeof parsed.stats === "object" && parsed.stats !== null ? parsed.stats : {};
+      state.iterations = Math.max(state.iterations, 1);
       state.usage = {
-        model: typeof context.config.selectedModel === "string" && context.config.selectedModel.trim() ? context.config.selectedModel : "codex",
+        model: state.activeModel || (typeof context.config.selectedModel === "string" && context.config.selectedModel.trim() ? context.config.selectedModel : "gemini"),
         numTurns: Math.max(state.iterations, 1),
-        durationMs: 0,
-        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,
+        durationMs: typeof stats.duration_ms === "number" ? stats.duration_ms : 0,
+        inputTokens: typeof stats.input_tokens === "number" ? stats.input_tokens : typeof stats.input === "number" ? stats.input : 0,
+        outputTokens: typeof stats.output_tokens === "number" ? stats.output_tokens : 0,
+        cacheReadTokens: typeof stats.cached === "number" ? stats.cached : 0,
         cacheCreationTokens: 0,
         costUsd: 0
       };
@@ -5867,24 +6260,15 @@ function parseCodexStructuredLine(line, context, state) {
         cacheReadTokens: state.usage.cacheReadTokens,
         cacheCreationTokens: state.usage.cacheCreationTokens
       });
-      break;
-    }
-    case "error": {
-      const message = extractCodexErrorMessage(parsed.message) || extractCodexErrorMessage(parsed.error) || typeof parsed.detail === "string" && parsed.detail.trim() || "";
-      if (message) {
-        const normalizedMessage = normalizeCodexCliErrorMessage(message);
-        void presenter.onError(normalizedMessage);
-        state.error = normalizedMessage;
-      }
-      break;
-    }
-    case "turn.failed": {
-      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) {
-        const normalizedMessage = normalizeCodexCliErrorMessage(message);
-        void presenter.onError(normalizedMessage);
-        state.error = normalizedMessage;
+      if (typeof parsed.status === "string" && parsed.status !== "success" && !state.error) {
+        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:", JSON.stringify({
+          error: parsed.error,
+          error_message: parsed.error_message,
+          message: parsed.message
+        }));
       }
       break;
     }
@@ -5892,109 +6276,36 @@ function parseCodexStructuredLine(line, context, state) {
       break;
   }
 }
-function parseJsonObject(value2) {
-  try {
-    const parsed = JSON.parse(value2);
-    return typeof parsed === "object" && parsed !== null ? parsed : null;
-  } catch {
-    return null;
-  }
-}
-function parseMaybeJson(value2) {
-  if (typeof value2 !== "string") return value2;
-  return parseJsonObject(value2) ?? value2;
-}
-function normalizeCodexMcpToolResult(output) {
-  if (typeof output !== "string") return JSON.stringify(output ?? {}, null, 2);
-  const outputMarker = "\nOutput:\n";
-  const raw = output.includes(outputMarker) ? output.slice(output.indexOf(outputMarker) + outputMarker.length).trim() : output.trim();
-  let parsed;
-  try {
-    parsed = JSON.parse(raw);
-  } catch {
-    return raw;
-  }
-  if (Array.isArray(parsed)) {
-    const textBlocks = parsed.filter(
-      (entry) => typeof entry === "object" && entry !== null && "text" in entry
-    ).map((entry) => typeof entry.text === "string" ? entry.text : "").filter(Boolean);
-    if (textBlocks.length > 0) return textBlocks.join("\n");
-  }
-  return raw;
-}
-function findCodexSessionLog(runtimeSessionId, codexHome) {
-  if (!runtimeSessionId || !(0, import_fs.existsSync)(codexHome)) return null;
-  const root = (0, import_path.join)(codexHome, "sessions");
-  if (!(0, import_fs.existsSync)(root)) return null;
-  const matches = [];
-  const stack = [root];
-  while (stack.length > 0) {
-    const dir = stack.pop();
-    let entries;
-    try {
-      entries = (0, import_fs.readdirSync)(dir, { withFileTypes: true });
-    } catch {
-      continue;
-    }
-    for (const entry of entries) {
-      const path = (0, import_path.join)(dir, entry.name);
-      if (entry.isDirectory()) {
-        stack.push(path);
-      } else if (entry.isFile() && entry.name.includes(runtimeSessionId) && entry.name.endsWith(".jsonl")) {
-        try {
-          matches.push({ path, mtimeMs: (0, import_fs.statSync)(path).mtimeMs });
-        } catch {
-          matches.push({ path, mtimeMs: 0 });
-        }
+function createGeminiCliBackend(command = "gemini", defaultArgs = []) {
+  return {
+    kind: "gemini_cli",
+    supportTier: "structured",
+    async run(context) {
+      const { files: imageFiles, cleanup } = writeImagesToTempFiles(context.config.images, context.cwd);
+      try {
+        return await createGenericCliBackend({
+          kind: "gemini_cli",
+          supportTier: "structured",
+          command,
+          args: [],
+          buildArgs: (ctx) => {
+            const args = ["-p", "", "--output-format", "stream-json"];
+            const resumeId = ctx.config.runtimeSessionId?.trim() || ctx.config.providerSessionId?.trim();
+            const approvalMode = ctx.config.mode === "plan" || ctx.config.mode === "ask" || ctx.config.mode === "review" ? "plan" : "yolo";
+            args.push("--approval-mode", approvalMode);
+            if (resumeId) args.push("--resume", resumeId);
+            if (ctx.config.selectedModel?.trim()) args.push("--model", ctx.config.selectedModel.trim());
+            return [...args, ...defaultArgs];
+          },
+          promptViaStdin: true,
+          augmentPrompt: (ctx) => buildPromptWithImagePathReferences(ctx, imageFiles),
+          parseStructuredLine: parseGeminiStructuredLine
+        }).run(context);
+      } finally {
+        cleanup();
       }
     }
-  }
-  matches.sort((a, b) => b.mtimeMs - a.mtimeMs);
-  return matches[0]?.path ?? null;
-}
-async function replayCodexMcpToolEventsFromSessionLog(context, state) {
-  const runtimeSessionId = state.runtimeSessionId;
-  if (!runtimeSessionId) return;
-  const codexHome = context.env.CODEX_HOME || process.env.CODEX_HOME || (0, import_path.join)((0, import_os.homedir)(), ".codex");
-  const logPath = findCodexSessionLog(runtimeSessionId, codexHome);
-  if (!logPath) return;
-  const emittedToolIds = /* @__PURE__ */ new Set();
-  const lines = (0, import_fs.readFileSync)(logPath, "utf8").split(/\r?\n/).filter(Boolean);
-  for (const line of lines) {
-    const entry = parseJsonObject(line);
-    const payload = entry && typeof entry.payload === "object" && entry.payload !== null ? entry.payload : null;
-    if (!payload) continue;
-    if (payload.type === "function_call") {
-      const callId = typeof payload.call_id === "string" ? payload.call_id : "";
-      const name = typeof payload.name === "string" ? payload.name : "";
-      const namespace = typeof payload.namespace === "string" ? payload.namespace : "";
-      if (!callId || !name || !namespace.startsWith("mcp__")) continue;
-      const toolName = `${namespace}${name}`;
-      context.presenter.onToolUse(toolName, parseMaybeJson(payload.arguments), callId);
-      emittedToolIds.add(callId);
-      continue;
-    }
-    if (payload.type === "tool_search_call") {
-      const callId = typeof payload.call_id === "string" ? payload.call_id : "";
-      if (!callId) continue;
-      context.presenter.onToolUse("tool_search", payload.arguments ?? {}, callId);
-      emittedToolIds.add(callId);
-    }
-  }
-  if (emittedToolIds.size === 0) return;
-  for (const line of lines) {
-    const entry = parseJsonObject(line);
-    const payload = entry && typeof entry.payload === "object" && entry.payload !== null ? entry.payload : null;
-    if (!payload || payload.type !== "function_call_output" && payload.type !== "tool_search_output") continue;
-    const callId = typeof payload.call_id === "string" ? payload.call_id : "";
-    if (!emittedToolIds.has(callId)) continue;
-    try {
-      const result = payload.type === "tool_search_output" ? JSON.stringify(payload.tools ?? [], null, 2) : normalizeCodexMcpToolResult(payload.output);
-      context.presenter.onToolResult?.(callId, result);
-    } catch {
-      context.presenter.onToolResult?.(callId, String(payload.output ?? ""));
-    }
-  }
+  };
 }
 function extractCursorToolEntry(toolCall) {
   const [rawName, rawPayload] = Object.entries(toolCall)[0] ?? [];
@@ -6106,30 +6417,81 @@ function parseCursorStructuredLine(line, context, state) {
         state.error = resultText.trim() || "Cursor Agent run failed";
         void presenter.onError(state.error);
       }
+      state.resultReceived = true;
+      state.onResultReceived?.();
+      if (state.stdin && !state.stdin.destroyed) {
+        state.stdin.end();
+      }
       break;
     }
     default:
       break;
   }
 }
-function buildGeminiToolResultText(parsed) {
-  const output = typeof parsed.output === "string" ? parsed.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;
-  const status = typeof parsed.status === "string" ? parsed.status.trim() : "";
-  return status || "Tool completed";
+function isCursorAgentCliModelId(model) {
+  return model === "auto" || /^composer-/.test(model) || /^gpt-\d/.test(model) || /^claude-\d/.test(model) || /^gemini-\d/.test(model) || /^grok-\d/.test(model) || /^kimi-/.test(model);
 }
-function parseGeminiStructuredLine(line, context, state) {
+function shouldForceCursorAgent(config) {
+  if (shouldUseReadOnlyRuntimePermissions(config)) return false;
+  switch (config.mode) {
+    case "plan":
+    case "ask":
+    case "review":
+      return false;
+    default:
+      return true;
+  }
+}
+function createCursorAgentCliBackend(command = "cursor-agent", defaultArgs = []) {
+  return {
+    kind: "cursor_agent_cli",
+    supportTier: "structured",
+    async run(context) {
+      const { files: imageFiles, cleanup } = writeImagesToTempFiles(context.config.images, context.cwd);
+      try {
+        return await createGenericCliBackend({
+          kind: "cursor_agent_cli",
+          supportTier: "structured",
+          command,
+          args: [],
+          buildArgs: (ctx, prompt) => {
+            const args = [
+              "--print",
+              "--output-format",
+              "stream-json",
+              "--trust",
+              "--workspace",
+              ctx.cwd
+            ];
+            const resumeId = ctx.config.runtimeSessionId?.trim() || ctx.config.providerSessionId?.trim();
+            if (shouldForceCursorAgent(ctx.config)) args.push("--force");
+            if (ctx.config.mode === "plan" || ctx.config.mode === "review") {
+              args.push("--mode", "plan");
+            } else if (ctx.config.mode === "ask") {
+              args.push("--mode", "ask");
+            }
+            if (resumeId) args.push("--resume", resumeId);
+            const model = ctx.config.selectedModel?.trim();
+            if (model && isCursorAgentCliModelId(model)) args.push("--model", model);
+            return [...args, ...defaultArgs, prompt];
+          },
+          keepStdinOpen: true,
+          augmentPrompt: (ctx) => buildPromptWithImagePathReferences(ctx, imageFiles),
+          parseStructuredLine: parseCursorStructuredLine
+        }).run(context);
+      } finally {
+        cleanup();
+      }
+    }
+  };
+}
+function parseDroidStructuredLine(line, context, state) {
   const presenter = context.presenter;
   let parsed = null;
   try {
     parsed = JSON.parse(line);
   } catch {
-    void presenter.onLog(`[gemini_cli] ${line}`);
+    if (line.trim().length > 0) void presenter.onLog(`[droid_cli] ${line}`);
     return;
   }
   const type = typeof parsed.type === "string" ? parsed.type : "";
@@ -6137,581 +6499,441 @@ function parseGeminiStructuredLine(line, context, state) {
   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 model = state.activeModel || context.config.selectedModel || "gemini";
-      void presenter.onLog(`[gemini_cli] Session initialized with ${model}`);
+    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": {
-      if (typeof parsed.role !== "string" || parsed.role !== "assistant") break;
-      const content = typeof parsed.content === "string" ? parsed.content : "";
-      if (!content) break;
+      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 += content;
-      void presenter.onAssistantText(content);
+      state.summary += text;
+      void presenter.onAssistantText(text);
       break;
     }
-    case "tool_use": {
-      const toolName = typeof parsed.tool_name === "string" ? parsed.tool_name : "Gemini Tool";
-      const toolId = typeof parsed.tool_id === "string" ? parsed.tool_id : `gemini-tool-${Date.now()}`;
+    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, parsed.parameters ?? {}, toolId);
+      void presenter.onToolUse(toolName, parameters, toolId);
       break;
     }
     case "tool_result": {
-      const toolId = typeof parsed.tool_id === "string" ? parsed.tool_id : `gemini-tool-${Date.now()}`;
-      state.iterations = Math.max(state.iterations, 1);
-      void presenter.onToolResult?.(toolId, buildGeminiToolResultText(parsed));
+      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 "error": {
-      const errObj = typeof parsed.error === "object" && parsed.error !== null ? parsed.error : null;
-      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) {
-        if (severity === "error") {
-          void presenter.onError(message);
-          state.error = message;
-        } else {
-          void presenter.onLog(`[gemini_cli/${severity}] ${message}`);
-        }
+    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);
       }
-      break;
-    }
-    case "result": {
-      const stats = typeof parsed.stats === "object" && parsed.stats !== null ? parsed.stats : {};
-      state.iterations = Math.max(state.iterations, 1);
       state.usage = {
-        model: state.activeModel || (typeof context.config.selectedModel === "string" && context.config.selectedModel.trim() ? context.config.selectedModel : "gemini"),
-        numTurns: Math.max(state.iterations, 1),
-        durationMs: typeof stats.duration_ms === "number" ? stats.duration_ms : 0,
-        inputTokens: typeof stats.input_tokens === "number" ? stats.input_tokens : typeof stats.input === "number" ? stats.input : 0,
-        outputTokens: typeof stats.output_tokens === "number" ? stats.output_tokens : 0,
-        cacheReadTokens: typeof stats.cached === "number" ? stats.cached : 0,
+        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: state.usage.inputTokens,
-        outputTokens: state.usage.outputTokens,
-        cacheReadTokens: state.usage.cacheReadTokens,
-        cacheCreationTokens: state.usage.cacheCreationTokens
+        inputTokens: 0,
+        outputTokens: 0,
+        cacheReadTokens: 0,
+        cacheCreationTokens: 0
       });
-      if (typeof parsed.status === "string" && parsed.status !== "success" && !state.error) {
-        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:", JSON.stringify({
-          error: parsed.error,
-          error_message: parsed.error_message,
-          message: parsed.message
-        }));
-      }
       break;
     }
     default:
       break;
   }
 }
-function shouldUseReadOnlyRuntimePermissions(config) {
-  if (isReadOnlyAgent(config.agentId)) return true;
-  switch (config.mode) {
-    case "plan":
-    case "ask":
-    case "review":
-      return true;
-    default:
-      return false;
-  }
-}
-function getClaudePermissionMode(config) {
-  switch (config.mode) {
-    case "plan":
-    case "ask":
-    case "review":
-      return "plan";
-    default:
-      return "bypassPermissions";
-  }
-}
-function getClaudeDisallowedTools(config) {
-  return isReadOnlyAgent(config.agentId) ? ["Edit", "Write", "MultiEdit", "NotebookEdit"] : [];
-}
-function shouldForceCursorAgent(config) {
-  if (shouldUseReadOnlyRuntimePermissions(config)) return false;
-  switch (config.mode) {
-    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 buildClaudeModelArg(baseModel, selectedContextWindow) {
-  if (selectedContextWindow === "1m") return `${baseModel}[1m]`;
-  return baseModel;
+function droidExecPermissionArgs(mode) {
+  if (mode === "plan" || mode === "ask" || mode === "review") return [];
+  return ["--auto", "high"];
 }
-function createClaudeCliBackend(command = "claude", defaultArgs = []) {
+function createDroidCliBackend(command = "droid", defaultArgs = []) {
   return {
-    kind: "claude_cli",
+    kind: "droid_cli",
     supportTier: "structured",
     async run(context) {
-      const args = [
-        "--verbose",
-        "--output-format",
-        "stream-json",
-        "--input-format",
-        "stream-json",
-        "--permission-mode",
-        getClaudePermissionMode(context.config)
-      ];
-      const disallowedTools = getClaudeDisallowedTools(context.config);
-      if (disallowedTools.length > 0) {
-        args.push("--disallowedTools", disallowedTools.join(","));
-      }
-      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());
-        }
-      }
-      const baseModel = context.config.selectedModel?.trim();
-      if (baseModel) {
-        args.push("--model", buildClaudeModelArg(baseModel, context.config.selectedContextWindow));
-      }
-      const claudeEffort = context.config.selectedEffortLevel?.trim();
-      if (claudeEffort) {
-        args.push("--effort", claudeEffort);
-      }
-      if (resumeId) {
-        args.push("--resume", resumeId);
-        console.info("[claude_cli] Resuming session", { resumeId });
+      const { files: imageFiles, cleanup } = writeImagesToTempFiles(context.config.images, context.cwd);
+      try {
+        return await createGenericCliBackend({
+          kind: "droid_cli",
+          supportTier: "structured",
+          command,
+          args: [],
+          buildArgs: (ctx, prompt) => {
+            const args = [
+              "exec",
+              "--output-format",
+              "stream-json",
+              ...droidExecPermissionArgs(ctx.config.mode),
+              ...defaultArgs
+            ];
+            const resumeId = ctx.config.runtimeSessionId?.trim() || ctx.config.providerSessionId?.trim();
+            if (resumeId) args.push("--session-id", resumeId);
+            const model = ctx.config.selectedModel?.trim();
+            if (model) args.push("-m", model);
+            args.push(prompt);
+            return args;
+          },
+          augmentPrompt: (ctx) => buildPromptWithImagePathReferences(ctx, imageFiles),
+          parseStructuredLine: parseDroidStructuredLine
+        }).run(context);
+      } finally {
+        cleanup();
       }
-      args.push("--chrome");
-      console.info("[claude_cli] Chrome flag added \u2014 final args:", args.join(" "));
-      args.push(...defaultArgs);
-      return createGenericCliBackend({
-        kind: "claude_cli",
-        supportTier: "structured",
-        command,
-        args,
-        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);
     }
   };
 }
-function kimiSessionId(cwd) {
-  let resolved = cwd;
-  try {
-    resolved = (0, import_fs.realpathSync)(cwd);
-  } catch {
-  }
-  return (0, import_crypto.createHash)("md5").update(resolved).digest("hex");
-}
-function shouldEnableKimiCliThinking(model) {
-  return model?.trim() === "kimi-k2.6-thinking";
-}
-function resolveKimiCliModelArg(model) {
-  const trimmed = model?.trim();
-  if (!trimmed) return void 0;
-  if (trimmed === "kimi-latest" || trimmed === "kimi-k2.5" || trimmed === "kimi-k2.6" || shouldEnableKimiCliThinking(trimmed)) {
-    return void 0;
-  }
-  if (trimmed.startsWith("claude-")) return void 0;
-  return trimmed;
-}
-function parseKimiStructuredLine(line, context, state) {
+function parseOpencodeStructuredLine(line, context, state) {
   const presenter = context.presenter;
-  if (!state.runtimeSessionId) {
-    state.runtimeSessionId = kimiSessionId(context.cwd);
-  }
-  let parsed;
+  let parsed = null;
   try {
     parsed = JSON.parse(line);
   } catch {
-    const text = line.trim();
-    if (text.length > 0) {
-      if (text.toLowerCase().includes("llm not set")) state.error = text;
-      void presenter.onLog(`[kimi_cli] ${line}`);
-    }
+    if (line.trim().length > 0) void presenter.onLog(`[opencode] ${line}`);
     return;
   }
-  const role = typeof parsed.role === "string" ? parsed.role : "";
-  const contentBlocks = Array.isArray(parsed.content) ? parsed.content : [];
-  const toolCalls = Array.isArray(parsed.tool_calls) ? parsed.tool_calls : [];
-  if (role === "assistant") {
-    const thinking = contentBlocks.filter((b) => b.type === "think" && typeof b.think === "string").map((b) => b.think).join("");
-    if (thinking) {
-      state.iterations = Math.max(state.iterations, 1);
-      void presenter.onThinking(thinking);
+  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;
+  const part = typeof parsed.part === "object" && parsed.part !== null ? parsed.part : null;
+  switch (type) {
+    case "step_start": {
+      state.iterations += 1;
+      void presenter.onLog(`[opencode] Step ${state.iterations} started`);
+      break;
     }
-    if (toolCalls.length > 0) {
-      state.iterations = Math.max(state.iterations, 1);
-      for (const tc of toolCalls) {
-        const fn = typeof tc.function === "object" && tc.function !== null ? tc.function : {};
-        const toolId = typeof tc.id === "string" ? tc.id : `kimi-tool-${Date.now()}`;
-        const toolName = typeof fn.name === "string" ? fn.name : "Tool";
-        let args = {};
-        if (typeof fn.arguments === "string") {
+    case "text": {
+      const text = part && typeof part.text === "string" ? part.text : "";
+      if (text) {
+        state.summary += text;
+        void presenter.onAssistantText(text);
+      }
+      break;
+    }
+    case "tool_use":
+    case "tool.execute": {
+      const toolName = part && typeof part.name === "string" ? part.name : "OpenCode Tool";
+      const toolId = part && typeof part.id === "string" ? part.id : `opencode-tool-${Date.now()}`;
+      void presenter.onToolUse(toolName, part ?? {}, toolId);
+      break;
+    }
+    case "tool_result":
+    case "tool.result": {
+      const toolId = part && typeof part.id === "string" ? part.id : `opencode-tool-${Date.now()}`;
+      const output = part && typeof part.output === "string" ? part.output : JSON.stringify(part);
+      void presenter.onToolResult?.(toolId, output);
+      break;
+    }
+    case "step_finish": {
+      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,
+          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;
+      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 {
-            args = JSON.parse(fn.arguments);
+            state.process?.kill("SIGTERM");
           } catch {
           }
-        } else if (typeof fn.arguments === "object" && fn.arguments !== null) {
-          args = fn.arguments;
         }
-        void presenter.onToolUse(toolName, args, toolId);
       }
-    } else {
-      const text = contentBlocks.filter((b) => b.type === "text" && typeof b.text === "string").map((b) => b.text).join("");
-      if (text) {
-        state.iterations = Math.max(state.iterations, 1);
-        state.summary += text;
-        void presenter.onAssistantText(text);
+      break;
+    }
+    default:
+      break;
+  }
+}
+function createOpencodeCliBackend(command = "opencode", defaultArgs = []) {
+  return {
+    kind: "opencode_cli",
+    supportTier: "structured",
+    async run(context) {
+      const { paths: imagePaths, cleanup } = writeImagesToTempFiles(context.config.images, context.cwd);
+      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 model = ctx.config.selectedModel?.trim();
+            if (model && model.includes("/")) args.push("--model", model);
+            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();
       }
     }
-    return;
-  }
-  if (role === "tool") {
-    const toolCallId = typeof parsed.tool_call_id === "string" ? parsed.tool_call_id : `kimi-tool-${Date.now()}`;
-    const allText = contentBlocks.filter((b) => b.type === "text" && typeof b.text === "string").map((b) => b.text);
-    const userText = allText.filter((t) => !t.startsWith("<system>")).join("\n");
-    void presenter.onToolResult?.(toolCallId, userText || allText.join("\n"));
-    return;
-  }
+  };
 }
-function createKimiCliBackend(command = "kimi", defaultArgs = []) {
-  return createGenericCliBackend({
-    kind: "kimi_cli",
-    supportTier: "structured",
-    command,
-    args: [],
-    buildArgs: (context, prompt) => {
-      const args = [
-        "--print",
-        "--output-format",
-        "stream-json",
-        "--work-dir",
-        context.cwd
-      ];
-      const resumeId = context.config.runtimeSessionId?.trim() || context.config.providerSessionId?.trim();
-      if (resumeId) args.push("--session", resumeId);
-      if (shouldEnableKimiCliThinking(context.config.selectedModel)) {
-        args.push("--thinking");
+function createGenericCliPassthroughBackend(command, defaultArgs = []) {
+  return {
+    kind: "generic_cli",
+    supportTier: "text",
+    async run(context) {
+      const { files: imageFiles, cleanup } = writeImagesToTempFiles(context.config.images, context.cwd);
+      try {
+        return await createGenericCliBackend({
+          kind: "generic_cli",
+          supportTier: "text",
+          command,
+          args: defaultArgs,
+          promptViaStdin: true,
+          augmentPrompt: (ctx) => buildPromptWithImagePathReferences(ctx, imageFiles)
+        }).run(context);
+      } finally {
+        cleanup();
       }
-      const model = resolveKimiCliModelArg(context.config.selectedModel);
-      if (model) args.push("--model", model);
-      return [...args, ...defaultArgs, "--prompt", prompt];
-    },
-    augmentPrompt: (context) => {
-      const base = buildPromptWithSystem(context.config, context.promptText);
-      return context.config.mode === "plan" ? buildPlanModePrefix(base) : base;
-    },
-    parseStructuredLine: parseKimiStructuredLine
-  });
-}
-function createGeminiCliBackend(command = "gemini", defaultArgs = []) {
-  return createGenericCliBackend({
-    kind: "gemini_cli",
-    supportTier: "structured",
-    command,
-    args: [],
-    buildArgs: (context) => {
-      const args = ["-p", "", "--output-format", "stream-json"];
-      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());
-      return [...args, ...defaultArgs];
-    },
-    promptViaStdin: true,
-    augmentPrompt: (context) => {
-      const basePrompt = buildPromptWithSystem(context.config, context.promptText);
-      return context.config.mode === "plan" ? buildPlanModePrefix(basePrompt) : basePrompt;
-    },
-    parseStructuredLine: parseGeminiStructuredLine
-  });
-}
-function isCursorAgentCliModelId(model) {
-  return model === "auto" || /^composer-/.test(model) || /^gpt-\d/.test(model) || /^claude-\d/.test(model) || /^gemini-\d/.test(model) || /^grok-\d/.test(model) || /^kimi-/.test(model);
-}
-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)) args.push("--force");
-      if (resumeId) args.push("--resume", resumeId);
-      const model = context.config.selectedModel?.trim();
-      if (model && isCursorAgentCliModelId(model)) args.push("--model", model);
-      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(mode) {
-  if (mode === "plan" || mode === "ask" || mode === "review") return [];
-  return ["--auto", "high"];
+    }
+  };
 }
-function parseDroidStructuredLine(line, context, state) {
+function parseCodexStructuredLine(line, context, state) {
   const presenter = context.presenter;
   let parsed = null;
   try {
     parsed = JSON.parse(line);
   } catch {
-    if (line.trim().length > 0) void presenter.onLog(`[droid_cli] ${line}`);
+    void presenter.onLog(`[codex] ${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 (typeof parsed.thread_id === "string") {
+    state.runtimeSessionId = parsed.thread_id;
+  }
+  const extractCodexErrorMessage = (value2) => {
+    if (typeof value2 !== "string") return "";
+    const trimmed = value2.trim();
+    if (!trimmed) return "";
+    try {
+      const parsedValue = JSON.parse(trimmed);
+      if (typeof parsedValue.detail === "string" && parsedValue.detail.trim().length > 0) {
+        return parsedValue.detail.trim();
+      }
+      if (typeof parsedValue.message === "string" && parsedValue.message.trim().length > 0) {
+        return parsedValue.message.trim();
+      }
+    } catch {
+    }
+    return trimmed;
+  };
   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;
+    case "thread.started":
+      break;
+    case "turn.started":
+      state.iterations += 1;
+      break;
+    case "session_configured":
+      if (typeof parsed.session_id === "string") {
+        state.runtimeSessionId = parsed.session_id;
       }
       break;
+    case "task_started":
+      state.iterations += 1;
+      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;
+      const command = typeof item.command === "string" ? item.command : "";
+      void presenter.onToolUse("Bash", { command, cwd: context.cwd }, item.id);
+      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);
+    case "item.completed": {
+      const item = typeof parsed.item === "object" && parsed.item !== null ? parsed.item : null;
+      if (!item || typeof item.type !== "string") break;
+      if (item.type === "reasoning" && typeof item.text === "string") {
+        void presenter.onThinking(item.text);
+        break;
+      }
+      if (item.type === "agent_message" && typeof item.text === "string") {
+        state.summary += `${item.text}
+`;
+        void presenter.onAssistantText(item.text);
+        break;
+      }
+      if (item.type === "command_execution" && typeof item.id === "string") {
+        const output = typeof item.aggregated_output === "string" ? item.aggregated_output : "";
+        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;
+      }
       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);
+    case "agent_message_delta":
+    case "agent_message_content_delta": {
+      const delta = typeof parsed.delta === "string" ? parsed.delta : "";
+      if (!delta) return;
+      state.summary += delta;
+      void presenter.onAssistantText(delta);
       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);
+    case "agent_reasoning_delta":
+    case "reasoning_content_delta":
+    case "agent_reasoning_raw_content_delta": {
+      const delta = typeof parsed.delta === "string" ? parsed.delta : "";
+      if (!delta) return;
+      void presenter.onThinking(delta);
       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
-      });
+    case "exec_command_begin": {
+      const toolId = typeof parsed.call_id === "string" ? parsed.call_id : `exec-${Date.now()}`;
+      const command = Array.isArray(parsed.command) ? parsed.command.join(" ") : "";
+      const cwd = typeof parsed.cwd === "string" ? parsed.cwd : context.cwd;
+      void presenter.onToolUse("Bash", { command, cwd }, toolId);
       break;
     }
-    default:
+    case "exec_command_end": {
+      const toolId = typeof parsed.call_id === "string" ? parsed.call_id : `exec-${Date.now()}`;
+      const output = typeof parsed.formatted_output === "string" ? parsed.formatted_output : typeof parsed.aggregated_output === "string" ? parsed.aggregated_output : "";
+      void presenter.onToolResult?.(toolId, output);
       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 model = context.config.selectedModel?.trim();
-      if (model) args.push("-m", model);
-      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;
-  const part = typeof parsed.part === "object" && parsed.part !== null ? parsed.part : null;
-  switch (type) {
-    case "step_start": {
-      state.iterations += 1;
-      void presenter.onLog(`[opencode] Step ${state.iterations} started`);
+    }
+    case "mcp_tool_call_begin": {
+      const toolId = typeof parsed.call_id === "string" ? parsed.call_id : `mcp-${Date.now()}`;
+      const invocation = typeof parsed.invocation === "object" && parsed.invocation !== null ? parsed.invocation : {};
+      const tool = typeof invocation.tool_name === "string" ? invocation.tool_name : typeof invocation.tool === "string" ? invocation.tool : "MCP Tool";
+      void presenter.onToolUse(tool, invocation, toolId);
       break;
     }
-    case "text": {
-      const text = part && typeof part.text === "string" ? part.text : "";
-      if (text) {
-        state.summary += text;
-        void presenter.onAssistantText(text);
-      }
+    case "mcp_tool_call_end": {
+      const toolId = typeof parsed.call_id === "string" ? parsed.call_id : `mcp-${Date.now()}`;
+      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 : {};
+      state.usage = {
+        model: typeof info.model === "string" ? info.model : "codex",
+        numTurns: Math.max(state.iterations, 1),
+        durationMs: 0,
+        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
+      };
+      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 "tool_use":
-    case "tool.execute": {
-      const toolName = part && typeof part.name === "string" ? part.name : "OpenCode Tool";
-      const toolId = part && typeof part.id === "string" ? part.id : `opencode-tool-${Date.now()}`;
-      void presenter.onToolUse(toolName, part ?? {}, toolId);
+    case "task_complete": {
+      const lastMessage = typeof parsed.last_agent_message === "string" ? parsed.last_agent_message : "";
+      if (lastMessage.length > 0) state.summary = lastMessage;
       break;
     }
-    case "tool_result":
-    case "tool.result": {
-      const toolId = part && typeof part.id === "string" ? part.id : `opencode-tool-${Date.now()}`;
-      const output = part && typeof part.output === "string" ? part.output : JSON.stringify(part);
-      void presenter.onToolResult?.(toolId, output);
+    case "turn.completed": {
+      const usage = typeof parsed.usage === "object" && parsed.usage !== null ? parsed.usage : {};
+      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: 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
+      };
+      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 "step_finish": {
-      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,
-          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
-        });
+    case "error": {
+      const message = extractCodexErrorMessage(parsed.message) || extractCodexErrorMessage(parsed.error) || typeof parsed.detail === "string" && parsed.detail.trim() || "";
+      if (message) {
+        const normalizedMessage = normalizeCodexCliErrorMessage(message);
+        void presenter.onError(normalizedMessage);
+        state.error = normalizedMessage;
       }
       break;
     }
-    case "session.error":
-    case "error": {
-      const errObj = typeof parsed.error === "object" && parsed.error !== null ? parsed.error : null;
-      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 {
-          }
-        }
+    case "turn.failed": {
+      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) {
+        const normalizedMessage = normalizeCodexCliErrorMessage(message);
+        void presenter.onError(normalizedMessage);
+        state.error = normalizedMessage;
       }
       break;
     }
@@ -6719,51 +6941,6 @@ function parseOpencodeStructuredLine(line, context, state) {
       break;
   }
 }
-function createOpencodeCliBackend(command = "opencode", defaultArgs = []) {
-  return {
-    kind: "opencode_cli",
-    supportTier: "structured",
-    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 model = ctx.config.selectedModel?.trim();
-            if (model && model.includes("/")) args.push("--model", model);
-            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({
-    kind: "generic_cli",
-    supportTier: "text",
-    command,
-    args: defaultArgs,
-    promptViaStdin: true
-  });
-}
 function buildCodexEffortArgs(selectedEffortLevel) {
   const level = selectedEffortLevel?.trim();
   if (!level) return [];
@@ -6774,7 +6951,7 @@ function createCodexRuntimeBackend(command = "codex", defaultArgs = []) {
     kind: "codex_app_server",
     supportTier: "structured",
     async run(context) {
-      const { paths: imagePaths, cleanup } = writeImagesToTempFiles(context.config.images);
+      const { paths: imagePaths, cleanup } = writeImagesToTempFiles(context.config.images, context.cwd);
       try {
         return await createGenericCliBackend({
           kind: "codex_app_server",
@@ -6785,7 +6962,7 @@ function createCodexRuntimeBackend(command = "codex", defaultArgs = []) {
             const resumeId = ctx.config.runtimeSessionId?.trim() || ctx.config.providerSessionId?.trim();
             const modelArgs = ctx.config.selectedModel?.trim() ? ["--model", ctx.config.selectedModel.trim()] : [];
             const effortArgs = buildCodexEffortArgs(ctx.config.selectedEffortLevel);
-            const permissionArgs = shouldUseReadOnlyRuntimePermissions(ctx.config) ? ["--ask-for-approval", "never", "--sandbox", "read-only"] : ["--dangerously-bypass-approvals-and-sandbox"];
+            const permissionArgs = ["--dangerously-bypass-approvals-and-sandbox"];
             const imageArgs = imagePaths.flatMap((p) => ["--image", p]);
             const baseArgs = resumeId ? [...permissionArgs, "exec", "resume", "--json", "--skip-git-repo-check", ...modelArgs, ...effortArgs, ...imageArgs, resumeId, "-"] : [...permissionArgs, "exec", "--json", "--skip-git-repo-check", ...modelArgs, ...effortArgs, ...imageArgs, "-"];
             return [...baseArgs, ...defaultArgs];
@@ -6881,51 +7058,67 @@ function parseCopilotStructuredLine(line, context, state) {
   }
 }
 function createCopilotCliBackend(command = "copilot", defaultArgs = []) {
-  return createGenericCliBackend({
+  return {
     kind: "copilot_cli",
     supportTier: "structured",
-    command,
-    args: [],
-    buildArgs: (context, prompt) => {
-      const args = [
-        "--autopilot",
-        "--yolo",
-        "--max-autopilot-continues",
-        "20",
-        "-s",
-        "--stream",
-        "on",
-        "--output-format",
-        "json",
-        "-p",
-        prompt
-      ];
-      if (context.config.selectedModel?.trim()) {
-        args.push("--model", context.config.selectedModel.trim());
+    async run(context) {
+      const { files: imageFiles, cleanup } = writeImagesToTempFiles(context.config.images, context.cwd);
+      try {
+        return await createGenericCliBackend({
+          kind: "copilot_cli",
+          supportTier: "structured",
+          command,
+          args: [],
+          buildArgs: (ctx, prompt) => {
+            const args = [
+              "--autopilot",
+              "--yolo",
+              "--max-autopilot-continues",
+              "20",
+              "-s",
+              "--stream",
+              "on",
+              "--output-format",
+              "json",
+              "-p",
+              prompt
+            ];
+            if (ctx.config.selectedModel?.trim()) {
+              args.push("--model", ctx.config.selectedModel.trim());
+            }
+            return [...args, ...defaultArgs];
+          },
+          augmentPrompt: (ctx) => buildPromptWithImagePathReferences(ctx, imageFiles),
+          parseStructuredLine: parseCopilotStructuredLine
+        }).run(context);
+      } finally {
+        cleanup();
       }
-      return [...args, ...defaultArgs];
-    },
-    parseStructuredLine: parseCopilotStructuredLine
-  });
+    }
+  };
 }
 var DEFAULT_MODEL = "claude-sonnet-4-6";
 var DROID_DEFAULT_MODEL = "claude-opus-4-7";
 function defaultSelectedModelForBackend(backendKind) {
   switch (backendKind) {
+    case "claude_cli":
+      return void 0;
     case "droid_cli":
       return DROID_DEFAULT_MODEL;
     case "copilot_cli":
       return "claude-sonnet-4.5";
     case "kimi_cli":
       return void 0;
+    case "supatest_cli":
+      return "medium";
     default:
       return DEFAULT_MODEL;
   }
 }
 function canonicalizePath(inputPath) {
   try {
-    const resolved = (0, import_path2.resolve)(inputPath);
-    return (0, import_fs2.existsSync)(resolved) ? (0, import_fs2.realpathSync)(resolved) : resolved;
+    const resolved = (0, import_path3.resolve)(inputPath);
+    return (0, import_fs4.existsSync)(resolved) ? (0, import_fs4.realpathSync)(resolved) : resolved;
   } catch {
     return null;
   }
@@ -6938,6 +7131,34 @@ function buildPromptWithFiles(task, files) {
 The user has attached the following files. You can read them using your available tools:
 ${fileList}`;
 }
+function buildTaskLifecyclePrompt(config) {
+  if (config.mode === "plan" || config.mode === "ask" || config.mode === "review") {
+    return void 0;
+  }
+  const taskId = config.taskId ?? config.taskMeta?.id;
+  if (!taskId) return void 0;
+  const statusLines = config.taskMeta?.statusOptions?.length ? [
+    "",
+    "Available task statuses for this task, in board order:",
+    ...config.taskMeta.statusOptions.map(
+      (status) => `- ${status.id}: ${status.label} (${status.group})`
+    )
+  ] : [];
+  return [
+    "## Task Lifecycle",
+    `This session is attached to taskId "${taskId}". Keep the task status current by calling the Aiden MCP update_task tool as you move through work phases.`,
+    ...statusLines,
+    "",
+    "Use exact status IDs from the available statuses when provided. Do not invent status IDs.",
+    "Lifecycle mapping:",
+    "- Research / discovery / code reading / planning: use the best matching status such as research, discovery, planning, or the first active status.",
+    "- Implementation / coding / file edits: use the best matching status such as implementing, in_progress, working, or running.",
+    "- Local validation / tests / QA: use the best matching status such as localtesting, local_testing, testing, qa, or validation.",
+    "- Ready for human review: use the best matching review status such as in_review or review.",
+    "- Done: use only when the requested work is fully complete and validated; otherwise leave it in the review/testing phase.",
+    "If no suitable status exists for a phase, leave the current status unchanged rather than forcing an unrelated one."
+  ].join("\n");
+}
 var BaseMachineAgent = class _BaseMachineAgent {
   static MAX_RETRIES = 2;
   static RETRY_BASE_DELAY_MS = 3e3;
@@ -7018,6 +7239,8 @@ var BaseMachineAgent = class _BaseMachineAgent {
       case "gemini_cli":
       case "opencode_cli":
       case "copilot_cli":
+      case "supatest_cli":
+      case "kimi_cli":
         return "structured";
       case "generic_cli":
       default:
@@ -7042,6 +7265,8 @@ var BaseMachineAgent = class _BaseMachineAgent {
 Prefer relative paths and keep your work scoped to this project.`
       );
     }
+    const lifecyclePrompt = buildTaskLifecyclePrompt(config);
+    if (lifecyclePrompt) systemPromptParts.push(lifecyclePrompt);
     const extra = this.buildExtraSystemPromptParts(config);
     systemPromptParts.push(...extra);
     return {
@@ -7056,9 +7281,9 @@ Prefer relative paths and keep your work scoped to this project.`
   }
   async runCliBackend(config, safeProjectPath) {
     const backendKind = this.resolveBackendKind(config);
-    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 defaultCwd = (0, import_path3.join)((0, import_os3.homedir)(), "Documents", "aiden");
+    if (!(0, import_fs4.existsSync)(defaultCwd)) {
+      (0, import_fs4.mkdirSync)(defaultCwd, { recursive: true });
     }
     let runtimeConfig = this.buildRuntimeConfig(config, safeProjectPath);
     const cwd = runtimeConfig.worktreePath || safeProjectPath || runtimeConfig.cwd || defaultCwd;
@@ -7066,7 +7291,7 @@ Prefer relative paths and keep your work scoped to this project.`
     const promptText = this.buildPromptText(runtimeConfig);
     const runtimeCommand = runtimeConfig.runtimeCommand || this.runtime.runtimeCommand;
     const runtimeArgs = runtimeConfig.runtimeArgs || this.runtime.runtimeArgs || [];
-    const backend = backendKind === "claude_cli" ? createClaudeCliBackend(runtimeCommand || "claude", runtimeArgs) : backendKind === "codex_app_server" ? createCodexRuntimeBackend(runtimeCommand || "codex", runtimeArgs) : backendKind === "copilot_cli" ? createCopilotCliBackend(runtimeCommand || "copilot", runtimeArgs) : backendKind === "cursor_agent_cli" ? createCursorAgentCliBackend(runtimeCommand || "cursor-agent", runtimeArgs) : backendKind === "gemini_cli" ? createGeminiCliBackend(runtimeCommand || "gemini", runtimeArgs) : backendKind === "droid_cli" ? createDroidCliBackend(runtimeCommand || "droid", runtimeArgs) : backendKind === "opencode_cli" ? createOpencodeCliBackend(runtimeCommand || "opencode", runtimeArgs) : backendKind === "kimi_cli" ? createKimiCliBackend(runtimeCommand || "kimi", runtimeArgs) : createGenericCliPassthroughBackend(runtimeCommand || "generic-cli", runtimeArgs);
+    const backend = backendKind === "claude_cli" ? createClaudeCliBackend(runtimeCommand || "claude", runtimeArgs) : backendKind === "codex_app_server" ? createCodexRuntimeBackend(runtimeCommand || "codex", runtimeArgs) : backendKind === "copilot_cli" ? createCopilotCliBackend(runtimeCommand || "copilot", runtimeArgs) : backendKind === "cursor_agent_cli" ? createCursorAgentCliBackend(runtimeCommand || "cursor-agent", runtimeArgs) : backendKind === "gemini_cli" ? createGeminiCliBackend(runtimeCommand || "gemini", runtimeArgs) : backendKind === "droid_cli" ? createDroidCliBackend(runtimeCommand || "droid", runtimeArgs) : backendKind === "opencode_cli" ? createOpencodeCliBackend(runtimeCommand || "opencode", runtimeArgs) : backendKind === "kimi_cli" ? createKimiCliBackend(runtimeCommand || "kimi", runtimeArgs) : backendKind === "supatest_cli" ? createSupatestCliBackend(runtimeCommand || "supatest", runtimeArgs) : createGenericCliPassthroughBackend(runtimeCommand || "generic-cli", runtimeArgs);
     let lastResult = null;
     for (let attempt = 0; attempt <= _BaseMachineAgent.MAX_RETRIES; attempt++) {
       if (this.abortController?.signal.aborted) break;
@@ -7162,7 +7387,7 @@ Prefer relative paths and keep your work scoped to this project.`
       const canonicalized = canonicalizePath(initialConfig.teamPath);
       if (canonicalized) safeProjectPath = canonicalized;
     }
-    if (safeProjectPath && !(0, import_fs2.existsSync)(safeProjectPath)) {
+    if (safeProjectPath && !(0, import_fs4.existsSync)(safeProjectPath)) {
       const message = `Local path no longer exists: "${safeProjectPath}". Please update the team's local path in team settings before running the agent.`;
       this.presenter.onError(message, true);
       const result = {
@@ -7207,25 +7432,78 @@ Prefer relative paths and keep your work scoped to this project.`
 var import_node_os2 = require("os");
 
 // src/cli-executable.ts
-var import_node_fs = require("fs");
 var import_node_child_process = require("child_process");
+var import_node_fs = require("fs");
+var import_node_child_process2 = require("child_process");
 var import_node_os = require("os");
 var import_node_path = require("path");
 var PROVIDER_CLI_COMMANDS = {
   claude_cli: { provider: "claude_cli", command: "claude", envVar: "AIDEN_CLAUDE_PATH" },
-  codex: { provider: "codex", command: "codex", envVar: "AIDEN_CODEX_PATH" },
-  gemini: { provider: "gemini", command: "gemini", envVar: "AIDEN_GEMINI_PATH" }
+  codex_app_server: { provider: "codex_app_server", command: "codex", envVar: "AIDEN_CODEX_PATH" },
+  copilot_cli: { provider: "copilot_cli", command: "copilot", envVar: "AIDEN_COPILOT_PATH" },
+  cursor_agent_cli: { provider: "cursor_agent_cli", command: "cursor-agent", envVar: "AIDEN_CURSOR_AGENT_PATH" },
+  gemini_cli: { provider: "gemini_cli", command: "gemini", envVar: "AIDEN_GEMINI_PATH" },
+  kimi_cli: { provider: "kimi_cli", command: "kimi", envVar: "AIDEN_KIMI_PATH" },
+  opencode_cli: { provider: "opencode_cli", command: "opencode", envVar: "AIDEN_OPENCODE_PATH" },
+  droid_cli: { provider: "droid_cli", command: "droid", envVar: "AIDEN_DROID_PATH" },
+  supatest_cli: { provider: "supatest_cli", command: "supatest", envVar: "AIDEN_SUPATEST_PATH" }
+};
+var DISCOVERABLE_PROVIDER_KINDS = Object.keys(PROVIDER_CLI_COMMANDS);
+var PROVIDER_ALIASES = {
+  codex: "codex_app_server",
+  gemini: "gemini_cli"
 };
 var BACKEND_CLI_COMMANDS = {
   claude_cli: "claude",
   codex: "codex",
   codex_app_server: "codex",
+  copilot_cli: "copilot",
+  cursor_agent_cli: "cursor-agent",
   gemini_cli: "gemini",
-  gemini: "gemini"
+  gemini: "gemini",
+  kimi_cli: "kimi",
+  opencode_cli: "opencode",
+  droid_cli: "droid",
+  supatest_cli: "supatest"
 };
 var resolvedCliCache = /* @__PURE__ */ new Map();
+var cachedLoginShellEnv = null;
+function parseEnvOutput(output) {
+  const loginEnv = {};
+  for (const line of output.split("\n")) {
+    if (!line.trim()) continue;
+    const eqIdx = line.indexOf("=");
+    if (eqIdx <= 0) continue;
+    const key = line.slice(0, eqIdx);
+    if (/\s/.test(key)) continue;
+    loginEnv[key] = line.slice(eqIdx + 1);
+  }
+  if (!loginEnv.HOME) loginEnv.HOME = process.env.HOME ?? (0, import_node_os.homedir)();
+  if (!loginEnv.SHELL) loginEnv.SHELL = process.env.SHELL ?? "/bin/zsh";
+  return loginEnv;
+}
+function loadLoginShellEnvironment() {
+  if (cachedLoginShellEnv) return cachedLoginShellEnv;
+  if ((0, import_node_os.platform)() === "win32") {
+    cachedLoginShellEnv = process.env;
+    return cachedLoginShellEnv;
+  }
+  try {
+    const shell = (process.env.SHELL || "/bin/bash").replace(/'/g, "'\\''");
+    const envOutput = (0, import_node_child_process.execSync)(`'${shell}' -ilc 'env'`, {
+      encoding: "utf8",
+      stdio: ["pipe", "pipe", "pipe"],
+      timeout: 5e3
+    });
+    cachedLoginShellEnv = parseEnvOutput(envOutput);
+  } catch {
+    cachedLoginShellEnv = process.env;
+  }
+  return cachedLoginShellEnv;
+}
 function getDaemonCliEnvironment() {
-  return augmentCliPath(process.env);
+  const base = (0, import_node_os.platform)() === "win32" ? process.env : loadLoginShellEnvironment();
+  return augmentCliPath(base);
 }
 function cacheResolvedCli(command, resolvedPath) {
   resolvedCliCache.set(command, resolvedPath);
@@ -7237,7 +7515,7 @@ function resolveViaWhere(command, env) {
   if ((0, import_node_os.platform)() !== "win32") return null;
   const whereExe = (0, import_node_path.join)(env.SystemRoot ?? process.env.SystemRoot ?? "C:\\Windows", "System32", "where.exe");
   if (!(0, import_node_fs.existsSync)(whereExe)) return null;
-  const result = (0, import_node_child_process.spawnSync)(whereExe, [command], {
+  const result = (0, import_node_child_process2.spawnSync)(whereExe, [command], {
     encoding: "utf8",
     env,
     windowsHide: true,
@@ -7251,26 +7529,6 @@ function resolveViaWhere(command, env) {
   }
   return null;
 }
-function runCliVersionProbe(executable, env, args = ["--version"]) {
-  const isWin = (0, import_node_os.platform)() === "win32";
-  if (isWin && /\.(cmd|bat)$/i.test(executable)) {
-    const comSpec = env.ComSpec ?? process.env.ComSpec ?? "cmd.exe";
-    return (0, import_node_child_process.spawnSync)(comSpec, ["/d", "/s", "/c", executable, ...args], {
-      encoding: "utf8",
-      timeout: 3e3,
-      env,
-      windowsHide: true
-    });
-  }
-  const useShell = isWin && !/[\\/]/.test(executable);
-  return (0, import_node_child_process.spawnSync)(executable, args, {
-    encoding: "utf8",
-    timeout: 3e3,
-    env,
-    shell: useShell,
-    windowsHide: isWin ? true : void 0
-  });
-}
 function pathSeparator() {
   return (0, import_node_os.platform)() === "win32" ? ";" : ":";
 }
@@ -7371,8 +7629,18 @@ function resolveCliExecutable(command, env = getDaemonCliEnvironment()) {
   }
   return null;
 }
+function normalizeDiscoverableProvider(provider) {
+  const alias = PROVIDER_ALIASES[provider];
+  if (alias) return alias;
+  if (provider in PROVIDER_CLI_COMMANDS) {
+    return provider;
+  }
+  return null;
+}
 function resolveProviderCliCommand(provider, env = getDaemonCliEnvironment()) {
-  const spec = PROVIDER_CLI_COMMANDS[provider];
+  const normalized = normalizeDiscoverableProvider(provider);
+  if (!normalized) return null;
+  const spec = PROVIDER_CLI_COMMANDS[normalized];
   const override = process.env[spec.envVar]?.trim();
   if (override) {
     const resolved2 = resolveCliExecutable(override, env) ?? (isRunnableFile(override) ? override : null);
@@ -7389,7 +7657,8 @@ function resolveBackendRuntimeCommand(backendKind, env = getDaemonCliEnvironment
   if (!command) return void 0;
   const cached = getCachedResolvedCli(command);
   if (cached && isRunnableFile(cached)) return cached;
-  const envOverride = command === "codex" ? env.AIDEN_CODEX_PATH : command === "claude" ? env.AIDEN_CLAUDE_PATH : command === "gemini" ? env.AIDEN_GEMINI_PATH : void 0;
+  const spec = Object.values(PROVIDER_CLI_COMMANDS).find((entry) => entry.command === command);
+  const envOverride = spec ? env[spec.envVar] : void 0;
   const resolved = resolveCliExecutable(envOverride?.trim() || command, env);
   if (resolved) cacheResolvedCli(command, resolved);
   return resolved ?? void 0;
@@ -7399,10 +7668,12 @@ function resolveBackendRuntimeCommand(backendKind, env = getDaemonCliEnvironment
 var CoreAgent = class _CoreAgent extends BaseMachineAgent {
   childProcess = null;
   _aborted = false;
+  providerApiKey;
   /** How long to wait after SIGTERM before escalating to SIGKILL. */
   static SIGKILL_DELAY_MS = 3e3;
   constructor(presenter, runtime) {
     super(presenter, runtime);
+    this.providerApiKey = runtime.providerApiKey;
   }
   abort() {
     this._aborted = true;
@@ -7527,6 +7798,9 @@ var CoreAgent = class _CoreAgent extends BaseMachineAgent {
       if (value2 !== void 0) env[key] = value2;
     }
     const augmented = getDaemonCliEnvironment();
+    if (this.runtime.backendKind === "supatest_cli" && this.providerApiKey) {
+      augmented.SUPATEST_API_KEY = this.providerApiKey;
+    }
     if ((0, import_node_os2.platform)() !== "win32") {
       const home = augmented.HOME ?? "/home/user";
       const extraPaths = [`${home}/.local/node/bin`, `${home}/.local/bin`];
@@ -11361,7 +11635,7 @@ var WSClient = class {
 };
 
 // src/version.ts
-var AGENT_VERSION = "0.1.13";
+var AGENT_VERSION = "0.1.15";
 
 // src/sandbox.ts
 async function runSandbox(config) {
@@ -11377,6 +11651,8 @@ async function runSandbox(config) {
   let currentConversationId = config.sessionId;
   let currentTeamId = config.teamId;
   let currentUser = config.currentUser;
+  let currentTerminalContextRefs;
+  let currentTerminalSnapshots;
   console.info("[sandbox] Connecting to WS server", { wsUrl: config.wsUrl, sessionId: config.sessionId });
   const wsClient = new WSClient(
     config.wsUrl,
@@ -11458,6 +11734,8 @@ async function runSandbox(config) {
           teamId: currentTeamId,
           currentUser,
           workflowTools: currentWorkflowTools,
+          terminalContextRefs: currentTerminalContextRefs,
+          terminalSnapshots: currentTerminalSnapshots,
           images: currentImages.length > 0 ? currentImages.map((img) => ({
             id: img.id,
             data: img.data,
@@ -11498,8 +11776,8 @@ async function runSandbox(config) {
     if (nextPayload.agentPrompt !== void 0) {
       activeAgentPrompt = nextPayload.agentPrompt;
     }
-    if (nextPayload.selectedModel) {
-      activeModel = nextPayload.selectedModel;
+    if (nextPayload.selectedModel !== void 0) {
+      activeModel = nextPayload.selectedModel.trim() || void 0;
     }
     if (nextPayload.selectedContextWindow !== void 0) {
       activeContextWindow = nextPayload.selectedContextWindow;
@@ -11531,6 +11809,12 @@ async function runSandbox(config) {
     if (nextPayload.teamId !== void 0) {
       currentTeamId = nextPayload.teamId;
     }
+    if (nextPayload.terminalContextRefs !== void 0) {
+      currentTerminalContextRefs = nextPayload.terminalContextRefs;
+    }
+    if (nextPayload.terminalSnapshots !== void 0) {
+      currentTerminalSnapshots = nextPayload.terminalSnapshots;
+    }
   }
   presenter.setSuppressSessionLifecycle(false);
   wsClient.close();
@@ -11546,6 +11830,26 @@ var PRODUCTION_API_URL = "https://api.aiden-platform.com";
 var PRODUCTION_WS_URL = "wss://ws.aiden-platform.com";
 var LOCAL_API_URL = "http://localhost:8400";
 var LOCAL_WS_URL = "ws://localhost:8401";
+async function probeLocalDaemonEndpoint(port, token, timeoutMs = 750) {
+  try {
+    const headers = {};
+    if (token) headers.authorization = `Bearer ${token}`;
+    const response = await fetch(`http://127.0.0.1:${port}/status`, {
+      headers,
+      signal: AbortSignal.timeout(timeoutMs)
+    });
+    if (response.status === 401) return { state: "listening_unauthorized" };
+    if (!response.ok) return { state: "absent" };
+    const body = await response.json();
+    if (!body.runtimeId) return { state: "absent" };
+    return { state: "running", status: body };
+  } catch {
+    return { state: "absent" };
+  }
+}
+function describeOccupiedLocalDaemon(port) {
+  return `local daemon API port ${port} is already in use. If Aiden desktop is open, it manages the daemon automatically. Quit Aiden desktop or stop the existing daemon before starting another.`;
+}
 function getConfigPath() {
   return process.env.AIDEN_AGENT_CONFIG_PATH ?? (0, import_node_path2.join)((0, import_node_os3.homedir)(), ".aiden", "agent", "config.json");
 }
@@ -11603,44 +11907,70 @@ function isLocalEndpoint(url2) {
 function getLocalApiPort(args, stored) {
   const raw = argValue(args, "--local-api-port") ?? process.env.AIDEN_AGENT_LOCAL_API_PORT;
   if (raw) return Number.parseInt(raw, 10);
-  return stored.localApiPort ?? 47831;
+  const storedPort = stored.localApiPort;
+  if (storedPort && storedPort > 0) return storedPort;
+  return 47831;
 }
 function sleep(ms) {
   if (ms <= 0) return Promise.resolve();
   return new Promise((resolve2) => setTimeout(resolve2, ms));
 }
-function commandVersion(command, args = ["--version"]) {
-  const env = getDaemonCliEnvironment();
-  const executable = command === "claude" ? resolveProviderCliCommand("claude_cli", env) : command === "codex" ? resolveProviderCliCommand("codex", env) : command === "gemini" ? resolveProviderCliCommand("gemini", env) : resolveCliExecutable(command, env);
-  if (!executable) return void 0;
-  const result = runCliVersionProbe(executable, env, args);
-  if (result.error || result.status !== 0) return void 0;
-  return (result.stdout || result.stderr).split("\n")[0]?.trim() || void 0;
-}
 function normalizeBackendKind(backendKind) {
   if (backendKind === "codex") return "codex_app_server";
   return backendKind;
 }
 function discoverCapabilities() {
   const now = (/* @__PURE__ */ new Date()).toISOString();
-  const providers = ["claude_cli", "codex", "gemini"];
+  const env = getDaemonCliEnvironment();
   return {
-    agents: providers.map((provider) => {
-      const executable = resolveProviderCliCommand(provider);
-      const version = executable ? commandVersion(executable) : void 0;
+    agents: DISCOVERABLE_PROVIDER_KINDS.map((provider) => {
+      const executable = resolveProviderCliCommand(provider, env);
       return {
         provider,
-        available: Boolean(version),
-        ...version ? { version } : {},
+        available: Boolean(executable),
         models: [],
         lastCheckedAt: now
       };
     }),
-    hasGit: Boolean(commandVersion("git")),
+    hasGit: Boolean(resolveCliExecutable("git", env)),
     hasTerminal: true,
     supportsFilesystem: true
   };
 }
+var USER_INTERRUPTED_RESULT = {
+  success: false,
+  summary: "Interrupted by user",
+  filesModified: [],
+  planFilesCreated: [],
+  iterations: 0,
+  error: "Interrupted by user"
+};
+function abortActiveAgent(entry) {
+  entry.presenter.onComplete(USER_INTERRUPTED_RESULT);
+  entry.agent.kill();
+}
+function collectRuntimeMetadata() {
+  const cpuList = (0, import_node_os3.cpus)();
+  const metadata = {
+    platform: (0, import_node_os3.platform)(),
+    arch: (0, import_node_os3.arch)(),
+    osVersion: (0, import_node_os3.release)(),
+    agentVersion: AGENT_VERSION,
+    memoryBytes: (0, import_node_os3.totalmem)(),
+    memoryFreeBytes: (0, import_node_os3.freemem)()
+  };
+  if (cpuList.length > 0) {
+    metadata.cpuModel = cpuList[0]?.model;
+    metadata.cpuCores = cpuList.length;
+  }
+  try {
+    const disk = (0, import_node_fs2.statfsSync)((0, import_node_os3.homedir)());
+    metadata.diskFreeBytes = disk.bavail * disk.bsize;
+    metadata.diskTotalBytes = disk.blocks * disk.bsize;
+  } catch {
+  }
+  return metadata;
+}
 var RuntimePresenter = class {
   constructor(socket, conversationId, runId) {
     this.socket = socket;
@@ -11746,11 +12076,7 @@ async function setupDaemon(args) {
       ownerType: scope,
       visibility: scope,
       capabilities: discoverCapabilities(),
-      metadata: {
-        platform: (0, import_node_os3.platform)(),
-        arch: (0, import_node_os3.arch)(),
-        agentVersion: AGENT_VERSION
-      }
+      metadata: collectRuntimeMetadata()
     })
   });
   if (!response.ok) {
@@ -11781,11 +12107,7 @@ async function loginWithDeviceCode(args) {
       displayName,
       hostname: (0, import_node_os3.hostname)(),
       capabilities: discoverCapabilities(),
-      metadata: {
-        platform: (0, import_node_os3.platform)(),
-        arch: (0, import_node_os3.arch)(),
-        agentVersion: AGENT_VERSION
-      }
+      metadata: collectRuntimeMetadata()
     })
   });
   if (!start.ok) {
@@ -11833,8 +12155,9 @@ async function startDaemon(args) {
   if (!runtimeId || !runtimeToken || !wsUrl) {
     throw new Error("daemon requires runtimeId, runtime token, and wsUrl. Run setup first or pass --runtime-id/--token/--ws-url.");
   }
-  const capabilities = discoverCapabilities();
   const activeAgents = /* @__PURE__ */ new Map();
+  const currentCapabilities = () => discoverCapabilities();
+  const currentMetadata = () => collectRuntimeMetadata();
   const recentLogs = [];
   const pushLog = (message) => {
     recentLogs.push(`${(/* @__PURE__ */ new Date()).toISOString()} ${message}`);
@@ -11856,16 +12179,21 @@ async function startDaemon(args) {
     extraHeaders: { "ngrok-skip-browser-warning": "1" }
   });
   const heartbeat = setInterval(() => {
-    if (socket.connected) socket.emit("runtime.heartbeat", { capabilities });
+    if (socket.connected) socket.emit("runtime.heartbeat", { capabilities: currentCapabilities(), metadata: currentMetadata() });
   }, 15e3);
   socket.on("connect", () => {
     pushLog(`connected runtime=${runtimeId}`);
     console.info("[aiden-agent] Daemon connected", { runtimeId, wsUrl, version: AGENT_VERSION });
-    socket.emit("runtime.hello", { capabilities });
+    socket.emit("runtime.hello", { capabilities: currentCapabilities(), metadata: currentMetadata() });
   });
+  let lastConnectErrorLogAt = 0;
   socket.on("connect_error", (error) => {
     pushLog(`connect_error ${error.message}`);
-    console.warn("[aiden-agent] Daemon connection error:", error.message);
+    const now = Date.now();
+    if (now - lastConnectErrorLogAt < 5e3) return;
+    lastConnectErrorLogAt = now;
+    const wsHint = isLocalEndpoint(wsUrl) ? ` Nothing is listening at ${wsUrl}. For local dev run setup with --profile local and start the stack (WS on ws://localhost:8401).` : ` Verify wsUrl in ${getConfigPath()} and that you can reach ${wsUrl}.`;
+    console.warn("[aiden-agent] Daemon connection error:", `${error.message}.${wsHint}`);
   });
   socket.on("disconnect", (reason) => {
     pushLog(`disconnected ${reason}`);
@@ -11893,10 +12221,11 @@ async function startDaemon(args) {
     const presenter = new RuntimePresenter(socket, payload.conversationId, payload.runId);
     const agent = new CoreAgent(presenter, {
       backendKind,
-      runtimeCommand
+      runtimeCommand,
+      providerApiKey: payload.providerApiKey
     });
-    activeAgents.set(payload.runId, agent);
     const cwd = payload.projectPath ?? process.cwd();
+    activeAgents.set(payload.runId, { agent, presenter });
     void agent.run({
       task: payload.content,
       maxIterations: payload.maxIterations ?? 50,
@@ -11932,21 +12261,21 @@ async function startDaemon(args) {
   });
   socket.on("agent.abort", (payload) => {
     if (!payload?.runId) return;
-    const agent = activeAgents.get(payload.runId);
-    if (!agent) return;
-    agent.kill();
+    const entry = activeAgents.get(payload.runId);
+    if (!entry) return;
+    abortActiveAgent(entry);
     activeAgents.delete(payload.runId);
     pushLog(`aborted run=${payload.runId}`);
   });
   socket.on("agent.tool_response", (payload) => {
     if (!payload?.toolId || typeof payload.response !== "string") return;
-    const agents = payload.runId ? [activeAgents.get(payload.runId)] : [...activeAgents.values()];
+    const agents = payload.runId ? [activeAgents.get(payload.runId)?.agent] : [...activeAgents.values()].map((entry) => entry.agent);
     const delivered = agents.some((agent) => agent?.sendToolResponse(payload.toolId, payload.response) === true);
     if (!delivered) pushLog(`tool_response missed tool=${payload.toolId}`);
   });
   socket.on("agent.append_message", (payload) => {
     if (!payload?.runId || typeof payload.text !== "string") return;
-    const agent = activeAgents.get(payload.runId);
+    const agent = activeAgents.get(payload.runId)?.agent;
     const delivered = agent?.sendUserMessage(payload.text) === true;
     socket.emit(delivered ? "agent.accepted" : "agent.rejected", {
       runId: payload.runId,
@@ -11980,21 +12309,47 @@ async function startDaemon(args) {
       return;
     }
     if (req.method === "POST" && req.url === "/stop") {
-      for (const agent of activeAgents.values()) agent.kill();
+      for (const entry of activeAgents.values()) abortActiveAgent(entry);
       activeAgents.clear();
       res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify({ ok: true }));
       return;
     }
+    if (req.method === "POST" && req.url === "/shutdown") {
+      res.writeHead(200, { "content-type": "application/json" }).end(JSON.stringify({ ok: true }));
+      setImmediate(queueFullShutdown);
+      return;
+    }
     res.writeHead(404, { "content-type": "application/json" }).end(JSON.stringify({ error: "Not found" }));
   });
+  const occupiedProbe = await probeLocalDaemonEndpoint(localApiPort, localApiToken);
+  if (occupiedProbe.state === "running") {
+    clearInterval(heartbeat);
+    socket.disconnect();
+    throw new Error(
+      `${describeOccupiedLocalDaemon(localApiPort)} (runtime ${occupiedProbe.status.runtimeId})`
+    );
+  }
+  if (occupiedProbe.state === "listening_unauthorized") {
+    clearInterval(heartbeat);
+    socket.disconnect();
+    throw new Error(
+      `${describeOccupiedLocalDaemon(localApiPort)} The token in ${getConfigPath()} no longer matches the running daemon; quit Aiden desktop or run setup again.`
+    );
+  }
   await new Promise((resolve2, reject) => {
     const onError = (error) => {
       clearInterval(heartbeat);
       socket.disconnect();
       if (error.code === "EADDRINUSE") {
-        reject(new Error(
-          `local daemon API port ${localApiPort} is already in use. Another aiden-agent daemon may already be running; use \`aiden-agent status\` or stop the existing daemon before starting a new one.`
-        ));
+        void probeLocalDaemonEndpoint(localApiPort).then((probe) => {
+          if (probe.state !== "absent") {
+            reject(new Error(describeOccupiedLocalDaemon(localApiPort)));
+            return;
+          }
+          reject(new Error(
+            `local daemon API port ${localApiPort} is already in use by another process. Otherwise free the port or pass \`--local-api-port\` with a different value.`
+          ));
+        });
         return;
       }
       reject(error);
@@ -12014,8 +12369,8 @@ async function startDaemon(args) {
     if (stopped) return;
     stopped = true;
     clearInterval(heartbeat);
-    for (const agent of activeAgents.values()) {
-      agent.kill();
+    for (const entry of activeAgents.values()) {
+      abortActiveAgent(entry);
     }
     activeAgents.clear();
     socket.disconnect();
@@ -12023,13 +12378,74 @@ async function startDaemon(args) {
       localServer.close(() => resolve2());
     });
   };
-  return { runtimeId, wsUrl, localApiPort, localApiToken, stop };
+  const controller = {
+    runtimeId,
+    wsUrl,
+    localApiPort,
+    localApiToken,
+    stop
+  };
+  const queueFullShutdown = () => {
+    void stop().then(() => controller.whenExternallyStopped?.());
+  };
+  return controller;
+}
+async function stopDaemon(args) {
+  const stored = readConfig();
+  const localApiPort = getLocalApiPort(args, stored);
+  const localApiToken = stored.localApiToken;
+  if (!localApiToken) {
+    throw new Error("No local API token in config. Run setup or login first.");
+  }
+  const probe = await probeLocalDaemonEndpoint(localApiPort, localApiToken);
+  if (probe.state === "listening_unauthorized") {
+    throw new Error(
+      `Daemon is listening on port ${localApiPort} but rejected this config token. Quit Aiden desktop or rerun setup/login to refresh config.`
+    );
+  }
+  if (probe.state === "absent") {
+    console.info("[aiden-agent] No daemon listening", { port: localApiPort });
+    return;
+  }
+  const response = await fetch(`http://127.0.0.1:${localApiPort}/shutdown`, {
+    method: "POST",
+    headers: { authorization: `Bearer ${localApiToken}` },
+    signal: AbortSignal.timeout(5e3)
+  });
+  if (!response.ok) {
+    throw new Error(`Failed to stop daemon: HTTP ${response.status}`);
+  }
+  console.info("[aiden-agent] Daemon stopped", {
+    port: localApiPort,
+    runtimeId: probe.status.runtimeId
+  });
 }
 async function runDaemon(args) {
+  const stored = readConfig();
+  const localApiPort = getLocalApiPort(args, stored);
+  const localApiToken = stored.localApiToken;
+  const existingProbe = await probeLocalDaemonEndpoint(localApiPort, localApiToken);
+  if (existingProbe.state === "running") {
+    console.info("[aiden-agent] Daemon already running", {
+      port: localApiPort,
+      runtimeId: existingProbe.status.runtimeId,
+      connected: existingProbe.status.connected,
+      hint: "If Aiden desktop is open, it manages the daemon automatically."
+    });
+    return;
+  }
+  if (existingProbe.state === "listening_unauthorized") {
+    console.info("[aiden-agent] Daemon already running", {
+      port: localApiPort,
+      hint: "Aiden desktop is using a different local API token than config.json. Quit the desktop app or rerun setup if you need a fresh daemon."
+    });
+    return;
+  }
   const controller = await startDaemon(args);
   const shutdown = () => {
     void controller.stop().finally(() => process.exit(0));
   };
+  controller.whenExternallyStopped = shutdown;
   process.once("SIGINT", shutdown);
   process.once("SIGTERM", shutdown);
   await new Promise(() => {
@@ -12076,13 +12492,16 @@ function logoutDaemon() {
   removeConfig();
   console.info("[aiden-agent] Runtime config removed", { configPath: getConfigPath() });
 }
-function printStatus() {
+async function printStatus() {
   const config = readConfig();
   const configured = Boolean(config.runtimeId && config.runtimeToken && config.wsUrl);
   const warnings = [];
   if ((isLocalEndpoint(config.apiUrl) || isLocalEndpoint(config.wsUrl)) && config.endpointProfile !== "local") {
     warnings.push("Configured endpoint points at localhost. Use --profile local only for local development.");
   }
+  const localApiPort = config.localApiPort && config.localApiPort > 0 ? config.localApiPort : getLocalApiPort([], config);
+  const localDaemonProbe = config.localApiToken ? await probeLocalDaemonEndpoint(localApiPort, config.localApiToken) : { state: "absent" };
+  const localDaemonRunning = localDaemonProbe.state === "running";
   console.info(JSON.stringify({
     mode: "runtime",
     configured,
@@ -12091,9 +12510,10 @@ function printStatus() {
     wsUrl: config.wsUrl ?? null,
     endpointProfile: config.endpointProfile ?? null,
     localApiPort: config.localApiPort ?? null,
+    localDaemonRunning,
     hasLocalApiToken: Boolean(config.localApiToken),
     configPath: getConfigPath(),
-    note: configured ? "Durable runtime config is present. Start it with: aiden-agent daemon" : "No durable runtime configured. Cloud sandbox sessions are launched by Aiden with session env vars and do not appear in this local config.",
+    note: configured ? localDaemonRunning ? "Local daemon is running. Stop it with: aiden-agent stop" : "Durable runtime config is present. Start it with: aiden-agent daemon" : "No durable runtime configured. Cloud sandbox sessions are launched by Aiden with session env vars and do not appear in this local config.",
     warnings
   }, null, 2));
 }
@@ -12112,7 +12532,7 @@ async function printDoctor(args = []) {
         authorization: `Bearer ${config.runtimeToken}`,
         "content-type": "application/json"
       },
-      body: JSON.stringify({ capabilities })
+      body: JSON.stringify({ capabilities, metadata: collectRuntimeMetadata() })
     });
     if (!response.ok) {
       syncError = `${response.status} ${await response.text()}`;
@@ -12145,6 +12565,7 @@ Commands:
   setup       Register this computer with a setup token from Aiden
   login       Register this computer through browser authorization
   daemon      Start the durable runtime daemon
+  stop        Stop the local daemon (or active runs only via the local API /stop)
   status      Show local runtime configuration without secrets
   doctor      Check local CLI capabilities
   logout      Remove local runtime configuration
@@ -12156,6 +12577,7 @@ Common flows:
   aiden-agent setup --setup-token <token>
   aiden-agent setup --setup-token <token> --scope user
   aiden-agent daemon
+  aiden-agent stop
 
 Local development:
   aiden-agent login --profile local
@@ -12242,8 +12664,12 @@ async function main() {
     await runDaemon(commandArgs);
     return;
   }
+  if (command === "stop") {
+    await stopDaemon(commandArgs);
+    return;
+  }
   if (command === "status") {
-    printStatus();
+    await printStatus();
     return;
   }
   if (command === "doctor") {