@aiden-ade/sandbox-agent 0.1.0 → 0.1.2

package/dist/index.cjs

@@ -900,9 +900,9 @@ var require_browser = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/has-flag@4.0.0/node_modules/has-flag/index.js
+// ../../node_modules/has-flag/index.js
 var require_has_flag = __commonJS({
-  "../../node_modules/.pnpm/has-flag@4.0.0/node_modules/has-flag/index.js"(exports2, module2) {
+  "../../node_modules/has-flag/index.js"(exports2, module2) {
     "use strict";
     module2.exports = (flag, argv = process.argv) => {
       const prefix = flag.startsWith("-") ? "" : flag.length === 1 ? "-" : "--";
@@ -913,9 +913,9 @@ var require_has_flag = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/supports-color@8.1.1/node_modules/supports-color/index.js
+// ../../node_modules/supports-color/index.js
 var require_supports_color = __commonJS({
-  "../../node_modules/.pnpm/supports-color@8.1.1/node_modules/supports-color/index.js"(exports2, module2) {
+  "../../node_modules/supports-color/index.js"(exports2, module2) {
     "use strict";
     var os = require("os");
     var tty = require("tty");
@@ -5264,7 +5264,7 @@ function parseCodexStructuredLine(line, context, state) {
       break;
     }
     case "error": {
-      const message = extractCodexErrorMessage(parsed.message);
+      const message = extractCodexErrorMessage(parsed.message) || extractCodexErrorMessage(parsed.error) || typeof parsed.detail === "string" && parsed.detail.trim() || "";
       if (message) {
         state.error = message;
       }
@@ -5272,7 +5272,7 @@ function parseCodexStructuredLine(line, context, state) {
     }
     case "turn.failed": {
       const error = typeof parsed.error === "object" && parsed.error !== null ? parsed.error : {};
-      const message = extractCodexErrorMessage(error.message);
+      const message = extractCodexErrorMessage(error.message) || extractCodexErrorMessage(error.detail) || typeof parsed.message === "string" && parsed.message.trim() || "";
       if (message) {
         state.error = message;
       }
@@ -5355,7 +5355,8 @@ function parseGeminiStructuredLine(line, context, state) {
       break;
     }
     case "error": {
-      const message = typeof parsed.message === "string" ? parsed.message.trim() : "";
+      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) {
         void presenter.onLog(`[gemini_cli/${severity}] ${message}`);
@@ -5386,7 +5387,15 @@ function parseGeminiStructuredLine(line, context, state) {
         cacheCreationTokens: state.usage.cacheCreationTokens
       });
       if (typeof parsed.status === "string" && parsed.status !== "success" && !state.error) {
-        state.error = parsed.status;
+        const errObj = typeof parsed.error === "object" && parsed.error !== null ? parsed.error : null;
+        const errMsg = typeof parsed.error === "string" && parsed.error.trim() || errObj && typeof errObj.message === "string" && errObj.message.trim() || typeof parsed.error_message === "string" && parsed.error_message.trim() || typeof parsed.message === "string" && parsed.message.trim() || typeof parsed.result === "string" && parsed.result.trim() || parsed.status;
+        state.error = errMsg;
+        console.error("[gemini_cli] result status=", parsed.status, "error fields:", JSON.stringify({
+          error: parsed.error,
+          error_message: parsed.error_message,
+          message: parsed.message,
+          result: typeof parsed.result === "string" ? parsed.result.slice(0, 200) : parsed.result
+        }));
       }
       break;
     }
@@ -5472,6 +5481,100 @@ function createGeminiCliBackend(command = "gemini", defaultArgs = []) {
     parseStructuredLine: parseGeminiStructuredLine
   });
 }
+function parseOpencodeStructuredLine(line, context, state) {
+  const presenter = context.presenter;
+  let parsed = null;
+  try {
+    parsed = JSON.parse(line);
+  } catch {
+    if (line.trim().length > 0) {
+      state.summary += `${line}
+`;
+      void presenter.onAssistantText(`${line}
+`);
+    }
+    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`);
+      break;
+    }
+    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 = {
+          inputTokens: tokens.input ?? 0,
+          outputTokens: tokens.output ?? 0
+        };
+      }
+      break;
+    }
+    case "session.error":
+    case "error": {
+      const errObj = typeof parsed.error === "object" && parsed.error !== null ? parsed.error : null;
+      const message = typeof parsed.message === "string" && parsed.message.trim() || part && typeof part.message === "string" && part.message.trim() || typeof parsed.error === "string" && parsed.error.trim() || errObj && typeof errObj.message === "string" && errObj.message.trim() || part && typeof part.error === "string" && part.error.trim() || "";
+      if (message) {
+        void presenter.onLog(`[opencode/error] ${message}`);
+        state.error = message;
+      }
+      break;
+    }
+    default:
+      break;
+  }
+}
+function createOpencodeCliBackend(command = "opencode", defaultArgs = []) {
+  return createGenericCliBackend({
+    kind: "opencode_cli",
+    supportTier: "structured",
+    command,
+    args: [],
+    buildArgs: (context, prompt) => {
+      const args = ["run", "--format", "json"];
+      const resumeId = context.config.runtimeSessionId?.trim() || context.config.providerSessionId?.trim();
+      if (resumeId) args.push("--session", resumeId);
+      const model2 = context.config.selectedModel?.trim();
+      if (model2 && model2.includes("/")) args.push("--model", model2);
+      return [...args, ...defaultArgs, prompt];
+    },
+    augmentPrompt: (context) => {
+      const base = buildPromptWithSystem(context.config, context.promptText);
+      return context.config.mode === "plan" ? buildPlanModePrefix(base) : base;
+    },
+    parseStructuredLine: parseOpencodeStructuredLine
+  });
+}
 function createGenericCliPassthroughBackend(command, defaultArgs = []) {
   return createGenericCliBackend({
     kind: "generic_cli",
@@ -5582,6 +5685,7 @@ var CoreAgent = class {
       case "claude_cli":
       case "codex_app_server":
       case "gemini_cli":
+      case "opencode_cli":
         return "structured";
       case "generic_cli":
       default:
@@ -5642,7 +5746,7 @@ var CoreAgent = class {
     const env = this.buildCliEnvironment();
     const runtimeCommand = runtimeConfig.runtimeCommand || this.runtime.runtimeCommand;
     const runtimeArgs = runtimeConfig.runtimeArgs || this.runtime.runtimeArgs || [];
-    const backend = backendKind2 === "claude_cli" ? createClaudeCliBackend(runtimeCommand || "claude", runtimeArgs) : backendKind2 === "codex_app_server" ? createCodexRuntimeBackend(runtimeCommand || "codex", runtimeArgs) : backendKind2 === "gemini_cli" ? createGeminiCliBackend(runtimeCommand || "gemini", runtimeArgs) : createGenericCliPassthroughBackend(runtimeCommand || "generic-cli", runtimeArgs);
+    const backend = backendKind2 === "claude_cli" ? createClaudeCliBackend(runtimeCommand || "claude", runtimeArgs) : backendKind2 === "codex_app_server" ? createCodexRuntimeBackend(runtimeCommand || "codex", runtimeArgs) : backendKind2 === "gemini_cli" ? createGeminiCliBackend(runtimeCommand || "gemini", runtimeArgs) : backendKind2 === "opencode_cli" ? createOpencodeCliBackend(runtimeCommand || "opencode", runtimeArgs) : createGenericCliPassthroughBackend(runtimeCommand || "generic-cli", runtimeArgs);
     const result = await backend.run({
       presenter: this.presenter,
       config: runtimeConfig,
@@ -9398,7 +9502,7 @@ var WSClient = class {
       console.warn(`[WSClient] Connection error: ${error.message}`);
     });
     this.socket.on("user_message", (data) => {
-      callbacks.onUserMessage({ text: data.text, providerSessionId: data.providerSessionId });
+      callbacks.onUserMessage({ text: data.text, providerSessionId: data.providerSessionId, backendKind: data.backendKind, selectedModel: data.selectedModel });
     });
     this.socket.on("stop", () => {
       callbacks.onStop();
@@ -9414,7 +9518,7 @@ var WSClient = class {
 };
 
 // src/version.ts
-var AGENT_VERSION = "0.1.0";
+var AGENT_VERSION = "0.1.2";
 
 // src/updater.ts
 var import_node_child_process2 = require("child_process");
@@ -9503,6 +9607,8 @@ async function runSandbox(config) {
   const presenter = new WebPresenter(wsClient, config.sessionId);
   presenter.setSuppressSessionLifecycle(true);
   let lastProviderSessionId = config.providerSessionId;
+  let activeBackendKind = config.backendKind || "claude_cli";
+  let activeModel = config.model;
   while (!stopped) {
     if (pendingUpdate) {
       await performUpdate(wsClient, pendingUpdate, lastProviderSessionId);
@@ -9510,7 +9616,7 @@ async function runSandbox(config) {
     }
     if (currentTask?.trim()) {
       const agent = new CoreAgent(presenter, {
-        backendKind: config.backendKind || "claude_cli"
+        backendKind: activeBackendKind
       });
       currentAgent = agent;
       let result;
@@ -9520,8 +9626,8 @@ async function runSandbox(config) {
           maxIterations: config.maxIterations || 50,
           projectPath: config.projectPath,
           cwd: config.projectPath,
-          backendKind: config.backendKind || "claude_cli",
-          selectedModel: config.model,
+          backendKind: activeBackendKind,
+          selectedModel: activeModel,
           providerSessionId: lastProviderSessionId ?? void 0
         });
       } catch (error) {
@@ -9553,6 +9659,12 @@ async function runSandbox(config) {
     if (nextPayload.providerSessionId) {
       lastProviderSessionId = nextPayload.providerSessionId;
     }
+    if (nextPayload.backendKind) {
+      activeBackendKind = nextPayload.backendKind;
+    }
+    if (nextPayload.selectedModel) {
+      activeModel = nextPayload.selectedModel;
+    }
   }
   presenter.setSuppressSessionLifecycle(false);
   wsClient.close();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aiden-ade/sandbox-agent",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "type": "module",
   "bin": {
     "aiden-agent": "./dist/index.cjs"