@aiden-ade/sandbox-agent 0.1.7 → 0.1.8

package/dist/index.cjs

@@ -5160,6 +5160,7 @@ function createGenericCliBackend(options) {
           runtimeSessionId: state.runtimeSessionId
         });
       }
+      await options.afterExit?.(context, state);
       const hasRenderableTurn = state.summary.trim().length > 0 || state.iterations > 0;
       if (hasRenderableTurn) {
         await presenter.onTurnComplete([]);
@@ -5551,6 +5552,110 @@ 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 });
+        }
+      }
+    }
+  }
+  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] ?? [];
   if (!rawName || typeof rawPayload !== "object" || rawPayload === null) return null;
@@ -5892,10 +5997,13 @@ function kimiSessionId(cwd) {
   }
   return (0, import_crypto.createHash)("md5").update(resolved).digest("hex");
 }
+function shouldEnableKimiCliThinking(model2) {
+  return model2?.trim() === "kimi-k2.6-thinking";
+}
 function resolveKimiCliModelArg(model2) {
   const trimmed = model2?.trim();
   if (!trimmed) return void 0;
-  if (trimmed === "kimi-latest" || trimmed === "kimi-k2.5" || trimmed === "kimi-k2.6") {
+  if (trimmed === "kimi-latest" || trimmed === "kimi-k2.5" || trimmed === "kimi-k2.6" || shouldEnableKimiCliThinking(trimmed)) {
     return void 0;
   }
   if (trimmed.startsWith("claude-")) return void 0;
@@ -5921,6 +6029,11 @@ function parseKimiStructuredLine(line, context, state) {
   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) {
@@ -5972,6 +6085,9 @@ function createKimiCliBackend(command = "kimi", defaultArgs = []) {
       ];
       const resumeId = context.config.runtimeSessionId?.trim() || context.config.providerSessionId?.trim();
       if (resumeId) args.push("--session", resumeId);
+      if (shouldEnableKimiCliThinking(context.config.selectedModel)) {
+        args.push("--thinking");
+      }
       const model2 = resolveKimiCliModelArg(context.config.selectedModel);
       if (model2) args.push("--model", model2);
       return [...args, ...defaultArgs, "--prompt", prompt];
@@ -6308,7 +6424,8 @@ function createCodexRuntimeBackend(command = "codex", defaultArgs = []) {
             const basePrompt = buildPromptWithSystem(ctx.config, ctx.promptText);
             return ctx.config.mode === "plan" ? buildPlanModePrefix(basePrompt) : basePrompt;
           },
-          parseStructuredLine: parseCodexStructuredLine
+          parseStructuredLine: parseCodexStructuredLine,
+          afterExit: replayCodexMcpToolEventsFromSessionLog
         }).run(context);
       } finally {
         cleanup();
@@ -6316,12 +6433,37 @@ function createCodexRuntimeBackend(command = "codex", defaultArgs = []) {
     }
   };
 }
+function createCopilotCliBackend(command = "copilot", defaultArgs = []) {
+  return createGenericCliBackend({
+    kind: "copilot_cli",
+    supportTier: "text",
+    command,
+    args: [],
+    buildArgs: (context, prompt) => {
+      const args = [
+        "--autopilot",
+        "--yolo",
+        "--max-autopilot-continues",
+        "20",
+        "-s",
+        "-p",
+        prompt
+      ];
+      if (context.config.selectedModel?.trim()) {
+        args.push("--model", context.config.selectedModel.trim());
+      }
+      return [...args, ...defaultArgs];
+    }
+  });
+}
 var DEFAULT_MODEL = "claude-sonnet-4-6";
 var DROID_DEFAULT_MODEL = "claude-opus-4-7";
 function defaultSelectedModelForBackend(backendKind2) {
   switch (backendKind2) {
     case "droid_cli":
       return DROID_DEFAULT_MODEL;
+    case "copilot_cli":
+      return "claude-sonnet-4.5";
     case "kimi_cli":
       return void 0;
     default:
@@ -6424,6 +6566,7 @@ var BaseMachineAgent = class _BaseMachineAgent {
       case "gemini_cli":
       case "opencode_cli":
         return "structured";
+      case "copilot_cli":
       case "generic_cli":
       default:
         return "text";
@@ -6469,7 +6612,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 = backendKind2 === "claude_cli" ? createClaudeCliBackend(runtimeCommand || "claude", runtimeArgs) : backendKind2 === "codex_app_server" ? createCodexRuntimeBackend(runtimeCommand || "codex", runtimeArgs) : backendKind2 === "cursor_agent_cli" ? createCursorAgentCliBackend(runtimeCommand || "cursor-agent", runtimeArgs) : backendKind2 === "gemini_cli" ? createGeminiCliBackend(runtimeCommand || "gemini", runtimeArgs) : backendKind2 === "droid_cli" ? createDroidCliBackend(runtimeCommand || "droid", runtimeArgs) : backendKind2 === "opencode_cli" ? createOpencodeCliBackend(runtimeCommand || "opencode", runtimeArgs) : backendKind2 === "kimi_cli" ? createKimiCliBackend(runtimeCommand || "kimi", runtimeArgs) : createGenericCliPassthroughBackend(runtimeCommand || "generic-cli", runtimeArgs);
+    const backend = backendKind2 === "claude_cli" ? createClaudeCliBackend(runtimeCommand || "claude", runtimeArgs) : backendKind2 === "codex_app_server" ? createCodexRuntimeBackend(runtimeCommand || "codex", runtimeArgs) : backendKind2 === "copilot_cli" ? createCopilotCliBackend(runtimeCommand || "copilot", runtimeArgs) : backendKind2 === "cursor_agent_cli" ? createCursorAgentCliBackend(runtimeCommand || "cursor-agent", runtimeArgs) : backendKind2 === "gemini_cli" ? createGeminiCliBackend(runtimeCommand || "gemini", runtimeArgs) : backendKind2 === "droid_cli" ? createDroidCliBackend(runtimeCommand || "droid", runtimeArgs) : backendKind2 === "opencode_cli" ? createOpencodeCliBackend(runtimeCommand || "opencode", runtimeArgs) : backendKind2 === "kimi_cli" ? createKimiCliBackend(runtimeCommand || "kimi", runtimeArgs) : createGenericCliPassthroughBackend(runtimeCommand || "generic-cli", runtimeArgs);
     let lastResult = null;
     for (let attempt = 0; attempt <= _BaseMachineAgent.MAX_RETRIES; attempt++) {
       if (this.abortController?.signal.aborted) break;
@@ -6607,11 +6750,61 @@ Prefer relative paths and keep your work scoped to this project.`
 };
 
 // src/core-agent.ts
-var CoreAgent = class extends BaseMachineAgent {
+var CoreAgent = class _CoreAgent extends BaseMachineAgent {
   childProcess = null;
+  _aborted = false;
+  /** How long to wait after SIGTERM before escalating to SIGKILL. */
+  static SIGKILL_DELAY_MS = 3e3;
   constructor(presenter, runtime) {
     super(presenter, runtime);
   }
+  abort() {
+    this._aborted = true;
+    super.abort();
+  }
+  kill() {
+    this._aborted = true;
+    super.abort();
+    const child = this.childProcess;
+    if (!child || child.killed || child.exitCode !== null) return false;
+    return this.killChildProcess(child);
+  }
+  killChildProcess(child) {
+    const pid = child.pid;
+    if (!pid) return false;
+    console.info("[CoreAgent] Killing agent process", { pid });
+    try {
+      if (process.platform === "win32") {
+        child.kill("SIGTERM");
+      } else {
+        process.kill(-pid, "SIGTERM");
+      }
+    } catch (err) {
+      if (err.code !== "ESRCH") {
+        console.warn("[CoreAgent] SIGTERM failed", { pid, err });
+      }
+      try {
+        child.kill("SIGTERM");
+      } catch {
+      }
+    }
+    setTimeout(() => {
+      if (child.killed || child.exitCode !== null) return;
+      console.warn("[CoreAgent] Escalating to SIGKILL", { pid });
+      try {
+        if (process.platform === "win32") {
+          child.kill("SIGKILL");
+        } else {
+          process.kill(-pid, "SIGKILL");
+        }
+      } catch (err) {
+        if (err.code !== "ESRCH") {
+          console.warn("[CoreAgent] SIGKILL failed", { pid, err });
+        }
+      }
+    }, _CoreAgent.SIGKILL_DELAY_MS);
+    return true;
+  }
   // ── Interactive tool response (WS relay → stdin) ───────────────────────
   /**
    * Send a tool_result to the CLI's stdin (stream-json format).
@@ -6652,6 +6845,12 @@ var CoreAgent = class extends BaseMachineAgent {
       child.on("exit", () => {
         this.childProcess = null;
       });
+      child.on("error", () => {
+        this.childProcess = null;
+      });
+      if (this._aborted) {
+        this.killChildProcess(child);
+      }
     };
   }
   async buildCliEnvironment() {
@@ -10447,7 +10646,7 @@ var WSClient = class {
 };
 
 // src/version.ts
-var AGENT_VERSION = "0.1.7";
+var AGENT_VERSION = "0.1.8";
 
 // src/sandbox.ts
 async function runSandbox(config) {
@@ -10479,7 +10678,10 @@ async function runSandbox(config) {
       },
       onStop: () => {
         console.info("[sandbox] Stop signal received");
-        if (currentAgent) currentAgent.abort();
+        if (currentAgent) {
+          const killed = currentAgent.kill();
+          if (!killed) currentAgent.abort();
+        }
       },
       onToolResponse: (toolId, response) => {
         if (currentAgent) {

package/package.json

@@ -1,27 +1,29 @@
 {
   "name": "@aiden-ade/sandbox-agent",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "type": "module",
   "bin": {
     "aiden-agent": "./dist/index.cjs"
   },
-  "files": ["dist/"],
+  "files": [
+    "dist/"
+  ],
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "build": "tsup",
-    "dev": "tsx src/index.ts",
-    "type-check": "tsc --noEmit"
-  },
   "dependencies": {},
   "devDependencies": {
-    "@aiden/agent-core": "workspace:*",
-    "@aiden/shared": "workspace:*",
     "socket.io-client": "^4.8.0",
     "@types/node": "^22.0.0",
     "tsup": "^8.5.1",
     "tsx": "^4.19.0",
-    "typescript": "~5.9.3"
+    "typescript": "~5.9.3",
+    "@aiden/agent-core": "0.1.0",
+    "@aiden/shared": "0.1.0"
+  },
+  "scripts": {
+    "build": "tsup",
+    "dev": "tsx src/index.ts",
+    "type-check": "tsc --noEmit"
   }
-}
+}