@sandagent/runner-cli 0.8.1 → 0.8.3

package/dist/bundle.mjs

@@ -477,20 +477,20 @@ function createCanUseToolCallback(claudeOptions) {
     }
     const cwd = claudeOptions.cwd || process.cwd();
     try {
-      const fs = await import("node:fs");
-      const path = await import("node:path");
-      const approvalDir = path.join(cwd, ".sandagent", "approvals");
-      const approvalFile = path.join(approvalDir, `${toolUseID}.json`);
+      const fs2 = await import("node:fs");
+      const path2 = await import("node:path");
+      const approvalDir = path2.join(cwd, ".sandagent", "approvals");
+      const approvalFile = path2.join(approvalDir, `${toolUseID}.json`);
       const timeout = Date.now() + 6e4;
       let lastApproval = null;
       while (Date.now() < timeout) {
         try {
-          const data = fs.readFileSync(approvalFile, "utf-8");
+          const data = fs2.readFileSync(approvalFile, "utf-8");
           const approval = JSON.parse(data);
           lastApproval = approval;
           if (approval.status === "completed") {
             try {
-              fs.unlinkSync(approvalFile);
+              fs2.unlinkSync(approvalFile);
             } catch {
             }
             return {
@@ -506,7 +506,7 @@ function createCanUseToolCallback(claudeOptions) {
         await new Promise((resolve3) => setTimeout(resolve3, 500));
       }
       try {
-        fs.unlinkSync(approvalFile);
+        fs2.unlinkSync(approvalFile);
       } catch {
       }
       if (lastApproval && Object.keys(lastApproval.answers).length > 0) {
@@ -708,6 +708,9 @@ Documentation: https://platform.claude.com/docs/en/agent-sdk/typescript-v2-previ
 }
 
 // ../../packages/runner-codex/dist/codex-runner.js
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
 import { Codex } from "@openai/codex-sdk";
 function normalizeCodexModel(model) {
   const trimmed = model.trim();
@@ -767,13 +770,15 @@ function toToolEndPayload(event) {
         status: item.status,
         exitCode: item.exit_code,
         output: item.aggregated_output
-      }
+      },
+      isError: item.exit_code !== 0
     };
   }
   if (item.type === "mcp_tool_call") {
     return {
       toolCallId: item.id,
-      result: item.result ?? item.error ?? { status: item.status }
+      result: item.result ?? item.error ?? { status: item.status },
+      isError: item.error != null || item.status === "failed"
     };
   }
   if (item.type === "web_search") {
@@ -815,7 +820,36 @@ function createCodexRunner(options) {
         approvalPolicy: options.approvalPolicy
       };
       const thread = options.resume ? codex.resumeThread(options.resume, threadOptions) : codex.startThread(threadOptions);
-      const streamedTurn = await thread.runStreamed(userInput, {
+      let inputToCodex = userInput;
+      const tempFiles = [];
+      try {
+        if (userInput.startsWith("[") && userInput.endsWith("]")) {
+          const parsed = JSON.parse(userInput);
+          if (Array.isArray(parsed)) {
+            const parts = [];
+            for (const p of parsed) {
+              if (p.type === "image" && typeof p.data === "string") {
+                const match = /^data:([^;]+);base64,(.+)$/.exec(p.data);
+                if (match) {
+                  const ext = match[1].split("/")[1] ?? "png";
+                  const tmpPath = path.join(os.tmpdir(), `sandagent-img-${Date.now()}-${Math.random().toString(36).slice(2)}.${ext}`);
+                  fs.writeFileSync(tmpPath, Buffer.from(match[2], "base64"));
+                  tempFiles.push(tmpPath);
+                  parts.push({ type: "local_image", path: tmpPath });
+                }
+              } else {
+                const text = typeof p.text === "string" ? p.text : JSON.stringify(p);
+                parts.push({ type: "text", text });
+              }
+            }
+            if (parts.length > 0) {
+              inputToCodex = parts;
+            }
+          }
+        }
+      } catch (e) {
+      }
+      const streamedTurn = await thread.runStreamed(inputToCodex, {
         signal: options.abortController?.signal
       });
       for await (const event of streamedTurn.events) {
@@ -836,7 +870,7 @@ function createCodexRunner(options) {
         }
         const toolEnd = toToolEndPayload(event);
         if (toolEnd) {
-          yield `data: ${JSON.stringify({ type: "tool-output-available", toolCallId: toolEnd.toolCallId, output: toolEnd.result })}
+          yield `data: ${JSON.stringify({ type: "tool-output-available", toolCallId: toolEnd.toolCallId, output: toolEnd.result, isError: toolEnd.isError })}
 
 `;
         }
@@ -871,6 +905,12 @@ function createCodexRunner(options) {
 `;
         }
       }
+      for (const tmpFile of tempFiles) {
+        try {
+          fs.unlinkSync(tmpFile);
+        } catch {
+        }
+      }
     }
   };
 }
@@ -1156,19 +1196,19 @@ function createOpenCodeRunner(options = {}) {
 }
 
 // ../../packages/runner-pi/dist/pi-runner.js
-import { appendFileSync as appendFileSync2, existsSync as existsSync3, unlinkSync as unlinkSync2 } from "node:fs";
-import { join as join4 } from "node:path";
+import { appendFileSync as appendFileSync2, existsSync as existsSync3, unlinkSync as unlinkSync3 } from "node:fs";
+import { join as join5 } from "node:path";
 import { getModel } from "@mariozechner/pi-ai";
 import { AuthStorage, ModelRegistry, SessionManager, createAgentSession } from "@mariozechner/pi-coding-agent";
 
 // ../../packages/runner-pi/dist/sandagent-resource-loader.js
-import { join as join3 } from "node:path";
 import { homedir } from "node:os";
+import { join as join4 } from "node:path";
 import { DefaultResourceLoader, loadSkills } from "@mariozechner/pi-coding-agent";
 var SandagentResourceLoader = class {
   constructor(options = {}) {
     this.cwd = options.cwd ?? process.cwd();
-    this.agentDir = options.agentDir ?? join3(homedir(), ".pi", "agent");
+    this.agentDir = options.agentDir ?? join4(homedir(), ".pi", "agent");
     this.skillPaths = options.skillPaths ?? [];
     this.delegate = new DefaultResourceLoader({
       cwd: this.cwd,
@@ -1257,6 +1297,24 @@ function emitStreamError(errorText) {
     "data: [DONE]\n\n"
   ];
 }
+function extractToolResultText(result) {
+  if (result !== null && typeof result === "object") {
+    const r = result;
+    if (Array.isArray(r.content) && r.content.length > 0) {
+      const text = r.content.filter((c) => c.type === "text" && typeof c.text === "string").map((c) => c.text).join("\n");
+      if (text.length > 0) {
+        return text;
+      }
+    }
+  }
+  if (typeof result === "string")
+    return result;
+  try {
+    return JSON.stringify(result);
+  } catch {
+    return String(result);
+  }
+}
 function usageToMessageMetadata(usage) {
   return {
     input_tokens: usage.input,
@@ -1288,9 +1346,9 @@ function traceRawMessage(debugCwd, data, reset = false) {
   if (!enabled)
     return;
   try {
-    const file = join4(debugCwd, "pi-message-stream-debug.json");
+    const file = join5(debugCwd, "pi-message-stream-debug.json");
     if (reset && existsSync3(file))
-      unlinkSync2(file);
+      unlinkSync3(file);
     const type = data !== null && typeof data === "object" ? data.type : void 0;
     let payload = data;
     try {
@@ -1353,16 +1411,20 @@ function createPiRunner(options = {}) {
           }
           const sessions = await SessionManager.list(cwd);
           const found = sessions.find((s) => s.id === resume);
-          return found ? SessionManager.open(found.path) : SessionManager.continueRecent(cwd);
+          return found ? SessionManager.open(found.path) : SessionManager.create(cwd);
         }
-        return SessionManager.continueRecent(cwd);
+        return SessionManager.create(cwd);
       })();
+      const resourceLoader = options.skillPaths ? new SandagentResourceLoader({ cwd, skillPaths: options.skillPaths }) : void 0;
+      if (resourceLoader) {
+        await resourceLoader.reload();
+      }
       const { session } = await createAgentSession({
         cwd,
         model,
         sessionManager,
         modelRegistry,
-        resourceLoader: options.skillPaths ? new SandagentResourceLoader({ cwd, skillPaths: options.skillPaths }) : void 0
+        resourceLoader
       });
       if (options.systemPrompt != null && options.systemPrompt !== "") {
         session.agent.setSystemPrompt(options.systemPrompt);
@@ -1399,7 +1461,26 @@ function createPiRunner(options = {}) {
       }
       try {
         traceRawMessage(cwd, null, true);
-        const promptPromise = session.prompt(userInput);
+        let promptText = userInput;
+        let images = void 0;
+        try {
+          if (userInput.startsWith("[") && userInput.endsWith("]")) {
+            const parsed = JSON.parse(userInput);
+            if (Array.isArray(parsed)) {
+              promptText = parsed.filter((p) => p.type === "text").map((p) => p.text).join("\n");
+              const imageParts = parsed.filter((p) => p.type === "image");
+              if (imageParts.length > 0) {
+                images = imageParts.map((p) => ({
+                  type: "image",
+                  data: p.data,
+                  mimeType: p.mimeType
+                }));
+              }
+            }
+          }
+        } catch (e) {
+        }
+        const promptPromise = session.prompt(promptText, images ? { images } : void 0);
         const messageId = `msg_${Date.now()}_${Math.random().toString(36).slice(2)}`;
         const textId = `text_${Date.now()}_${Math.random().toString(36).slice(2)}`;
         let hasStarted = false;
@@ -1471,7 +1552,8 @@ function createPiRunner(options = {}) {
 
 `;
             } else if (event.type === "tool_execution_end") {
-              yield `data: ${JSON.stringify({ type: "tool-output-available", toolCallId: event.toolCallId, output: event.result, dynamic: true })}
+              const output = extractToolResultText(event.result);
+              yield `data: ${JSON.stringify({ type: "tool-output-available", toolCallId: event.toolCallId, output, isError: event.isError, dynamic: true })}
 
 `;
             } else if (event.type === "agent_end") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sandagent/runner-cli",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "SandAgent Runner CLI - Like gemini-cli or claude-code, runs in your local terminal with AI SDK UI streaming",
   "type": "module",
   "bin": {
@@ -55,9 +55,9 @@
     "vitest": "^1.6.1",
     "@sandagent/runner-claude": "0.6.2",
     "@sandagent/runner-codex": "0.6.2",
+    "@sandagent/runner-gemini": "0.6.2",
     "@sandagent/runner-opencode": "0.6.2",
-    "@sandagent/runner-pi": "0.6.3",
-    "@sandagent/runner-gemini": "0.6.2"
+    "@sandagent/runner-pi": "0.6.3"
   },
   "scripts": {
     "build": "tsc && pnpm bundle",