@sandagent/runner-cli 0.9.8 → 0.9.9-beta.1

package/dist/bundle.mjs

@@ -1302,6 +1302,26 @@ function parseModelSpec(model) {
 function getEnvValue(optionsEnv, name) {
   return optionsEnv?.[name] ?? process.env[name];
 }
+function pushRunnerEnvToProcess(env) {
+  if (!env)
+    return () => {
+    };
+  const backup = {};
+  for (const [key, value] of Object.entries(env)) {
+    if (typeof value !== "string")
+      continue;
+    backup[key] = process.env[key];
+    process.env[key] = value;
+  }
+  return () => {
+    for (const [key, prev] of Object.entries(backup)) {
+      if (prev === void 0)
+        delete process.env[key];
+      else
+        process.env[key] = prev;
+    }
+  };
+}
 function applyModelOverrides(model, provider, optionsEnv) {
   if (model == null)
     return;
@@ -1404,7 +1424,7 @@ function createPiRunner(options = {}) {
   if (model == null) {
     const baseUrlEnvKey = `${provider.toUpperCase().replace(/-/g, "_")}_BASE_URL`;
     const apiKeyEnvKey = `${provider.toUpperCase().replace(/-/g, "_")}_API_KEY`;
-    const baseUrl = process.env[baseUrlEnvKey] ?? process.env.OPENAI_BASE_URL;
+    const baseUrl = getEnvValue(options.env, baseUrlEnvKey) ?? getEnvValue(options.env, "OPENAI_BASE_URL");
     if (!baseUrl) {
       throw new Error(`Pi runner: model "${modelSpec}" not found in built-in catalog. Set ${baseUrlEnvKey} (or OPENAI_BASE_URL) to auto-register it.`);
     }
@@ -1433,213 +1453,218 @@ function createPiRunner(options = {}) {
   applyModelOverrides(model, provider, options.env);
   return {
     async *run(userInput) {
-      const resume = options.sessionId?.trim();
-      const sessionManager = await (async () => {
-        if (resume !== void 0 && resume !== "") {
-          if (resume.includes("/")) {
-            return SessionManager.open(resume);
+      const restoreProcessEnv = pushRunnerEnvToProcess(options.env);
+      try {
+        const resume = options.sessionId?.trim();
+        const sessionManager = await (async () => {
+          if (resume !== void 0 && resume !== "") {
+            if (resume.includes("/")) {
+              return SessionManager.open(resume);
+            }
+            const sessions = await SessionManager.list(cwd);
+            const found = sessions.find((s) => s.id === resume);
+            return found ? SessionManager.open(found.path) : SessionManager.create(cwd);
           }
-          const sessions = await SessionManager.list(cwd);
-          const found = sessions.find((s) => s.id === resume);
-          return found ? SessionManager.open(found.path) : SessionManager.create(cwd);
+          return SessionManager.create(cwd);
+        })();
+        const resourceLoader = options.skillPaths ? new SandagentResourceLoader({ cwd, skillPaths: options.skillPaths }) : void 0;
+        if (options.skillPaths && options.skillPaths.length > 0) {
+          console.error(`${LOG_PREFIX2} runner: cwd=${cwd} skillPaths=${JSON.stringify(options.skillPaths)}`);
         }
-        return SessionManager.create(cwd);
-      })();
-      const resourceLoader = options.skillPaths ? new SandagentResourceLoader({ cwd, skillPaths: options.skillPaths }) : void 0;
-      if (options.skillPaths && options.skillPaths.length > 0) {
-        console.error(`${LOG_PREFIX2} runner: cwd=${cwd} skillPaths=${JSON.stringify(options.skillPaths)}`);
-      }
-      if (resourceLoader) {
-        await resourceLoader.reload();
-      }
-      const { session } = await createAgentSession({
-        cwd,
-        model,
-        sessionManager,
-        modelRegistry,
-        resourceLoader
-      });
-      if (options.systemPrompt != null && options.systemPrompt !== "") {
-        const existing = session.agent.state.systemPrompt ?? "";
-        session.agent.setSystemPrompt(existing ? `${existing}
+        if (resourceLoader) {
+          await resourceLoader.reload();
+        }
+        const { session } = await createAgentSession({
+          cwd,
+          model,
+          sessionManager,
+          modelRegistry,
+          resourceLoader
+        });
+        if (options.systemPrompt != null && options.systemPrompt !== "") {
+          const existing = session.agent.state.systemPrompt ?? "";
+          session.agent.setSystemPrompt(existing ? `${existing}
 
 ---
 
 ${options.systemPrompt}` : options.systemPrompt);
-      }
-      const eventQueue = [];
-      let isComplete = false;
-      let aborted = false;
-      let wakeConsumer = null;
-      const notify = () => {
-        wakeConsumer?.();
-        wakeConsumer = null;
-      };
-      const unsubscribe = session.subscribe((e) => {
-        eventQueue.push(e);
-        if (e.type === "agent_end") {
-          isComplete = true;
         }
-        notify();
-      });
-      const abortSignal = options.abortController?.signal;
-      const abortHandler = () => {
-        aborted = true;
-        isComplete = true;
-        void session.abort();
-        notify();
-      };
-      if (abortSignal) {
-        abortSignal.addEventListener("abort", abortHandler);
-        if (abortSignal.aborted) {
-          abortHandler();
+        const eventQueue = [];
+        let isComplete = false;
+        let aborted = false;
+        let wakeConsumer = null;
+        const notify = () => {
+          wakeConsumer?.();
+          wakeConsumer = null;
+        };
+        const unsubscribe = session.subscribe((e) => {
+          eventQueue.push(e);
+          if (e.type === "agent_end") {
+            isComplete = true;
+          }
+          notify();
+        });
+        const abortSignal = options.abortController?.signal;
+        const abortHandler = () => {
+          aborted = true;
+          isComplete = true;
+          void session.abort();
+          notify();
+        };
+        if (abortSignal) {
+          abortSignal.addEventListener("abort", abortHandler);
+          if (abortSignal.aborted) {
+            abortHandler();
+          }
         }
-      }
-      try {
-        traceRawMessage(cwd, null, true);
-        let promptText = userInput;
-        let images;
         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
-                }));
+          traceRawMessage(cwd, null, true);
+          let promptText = userInput;
+          let images;
+          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) {
           }
-        } 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;
-        let hasTextStarted = false;
-        let hasFinished = false;
-        const ensureStartEvent = async function* () {
-          if (!hasStarted) {
-            yield `data: ${JSON.stringify({ type: "start", messageId })}
+          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;
+          let hasTextStarted = false;
+          let hasFinished = false;
+          const ensureStartEvent = async function* () {
+            if (!hasStarted) {
+              yield `data: ${JSON.stringify({ type: "start", messageId })}
 
 `;
-            yield `data: ${JSON.stringify({
-              type: "message-metadata",
-              messageMetadata: { sessionId: session.sessionId }
-            })}
+              yield `data: ${JSON.stringify({
+                type: "message-metadata",
+                messageMetadata: { sessionId: session.sessionId }
+              })}
 
 `;
-            hasStarted = true;
-          }
-        };
-        const finishSuccess = async function* (usage) {
-          if (hasTextStarted) {
-            yield `data: ${JSON.stringify({ type: "text-end", id: textId })}
+              hasStarted = true;
+            }
+          };
+          const finishSuccess = async function* (usage) {
+            if (hasTextStarted) {
+              yield `data: ${JSON.stringify({ type: "text-end", id: textId })}
 
 `;
-          }
-          const finishPayload = { type: "finish", finishReason: "stop" };
-          if (usage != null) {
-            finishPayload.messageMetadata = {
-              usage: usageToMessageMetadata(usage)
-            };
-          }
-          yield `data: ${JSON.stringify(finishPayload)}
+            }
+            const finishPayload = { type: "finish", finishReason: "stop" };
+            if (usage != null) {
+              finishPayload.messageMetadata = {
+                usage: usageToMessageMetadata(usage)
+              };
+            }
+            yield `data: ${JSON.stringify(finishPayload)}
 
 `;
-          yield "data: [DONE]\n\n";
-          hasFinished = true;
-        };
-        const finishError = async function* (errorText) {
-          for (const chunk of emitStreamError(errorText)) {
-            yield chunk;
-          }
-          hasFinished = true;
-        };
-        while (!isComplete || eventQueue.length > 0) {
-          while (eventQueue.length > 0) {
-            const event = eventQueue.shift();
-            traceRawMessage(cwd, event);
-            yield* ensureStartEvent();
-            if (event.type === "message_update") {
-              if (event.assistantMessageEvent.type === "text_delta") {
-                const delta = event.assistantMessageEvent.delta;
-                if (delta) {
-                  if (!hasTextStarted) {
-                    yield `data: ${JSON.stringify({ type: "text-start", id: textId })}
+            yield "data: [DONE]\n\n";
+            hasFinished = true;
+          };
+          const finishError = async function* (errorText) {
+            for (const chunk of emitStreamError(errorText)) {
+              yield chunk;
+            }
+            hasFinished = true;
+          };
+          while (!isComplete || eventQueue.length > 0) {
+            while (eventQueue.length > 0) {
+              const event = eventQueue.shift();
+              traceRawMessage(cwd, event);
+              yield* ensureStartEvent();
+              if (event.type === "message_update") {
+                if (event.assistantMessageEvent.type === "text_delta") {
+                  const delta = event.assistantMessageEvent.delta;
+                  if (delta) {
+                    if (!hasTextStarted) {
+                      yield `data: ${JSON.stringify({ type: "text-start", id: textId })}
 
 `;
-                    hasTextStarted = true;
-                  }
-                  yield `data: ${JSON.stringify({ type: "text-delta", id: textId, delta })}
+                      hasTextStarted = true;
+                    }
+                    yield `data: ${JSON.stringify({ type: "text-delta", id: textId, delta })}
 
 `;
+                  }
                 }
-              }
-            } else if (event.type === "tool_execution_start") {
-              yield `data: ${JSON.stringify({ type: "tool-input-start", toolCallId: event.toolCallId, toolName: event.toolName, dynamic: true, providerExecuted: true })}
+              } else if (event.type === "tool_execution_start") {
+                yield `data: ${JSON.stringify({ type: "tool-input-start", toolCallId: event.toolCallId, toolName: event.toolName, dynamic: true, providerExecuted: true })}
 
 `;
-              yield `data: ${JSON.stringify({ type: "tool-input-available", toolCallId: event.toolCallId, toolName: event.toolName, input: event.args, dynamic: true, providerExecuted: true })}
+                yield `data: ${JSON.stringify({ type: "tool-input-available", toolCallId: event.toolCallId, toolName: event.toolName, input: event.args, dynamic: true, providerExecuted: true })}
 
 `;
-            } else if (event.type === "tool_execution_end") {
-              const output = extractToolResultText(event.result);
-              yield `data: ${JSON.stringify({ type: "tool-output-available", toolCallId: event.toolCallId, output, isError: event.isError, dynamic: true, providerExecuted: true })}
+              } else if (event.type === "tool_execution_end") {
+                const output = extractToolResultText(event.result);
+                yield `data: ${JSON.stringify({ type: "tool-output-available", toolCallId: event.toolCallId, output, isError: event.isError, dynamic: true, providerExecuted: true })}
 
 `;
-            } else if (event.type === "agent_end") {
-              if (aborted) {
-                yield* finishError("Run aborted by signal.");
-              } else {
-                const errorMsg = getErrorFromAgentEndMessages(event.messages);
-                if (errorMsg) {
-                  yield* finishError(errorMsg);
+              } else if (event.type === "agent_end") {
+                if (aborted) {
+                  yield* finishError("Run aborted by signal.");
                 } else {
-                  const usage = getUsageFromAgentEndMessages(event.messages);
-                  yield* finishSuccess(usage);
+                  const errorMsg = getErrorFromAgentEndMessages(event.messages);
+                  if (errorMsg) {
+                    yield* finishError(errorMsg);
+                  } else {
+                    const usage = getUsageFromAgentEndMessages(event.messages);
+                    yield* finishSuccess(usage);
+                  }
                 }
               }
             }
+            if (aborted && !hasFinished) {
+              yield* ensureStartEvent();
+              yield* finishError("Run aborted by signal.");
+              break;
+            }
+            if (!isComplete && eventQueue.length === 0) {
+              await new Promise((resolve4) => {
+                wakeConsumer = resolve4;
+              });
+            }
           }
-          if (aborted && !hasFinished) {
-            yield* ensureStartEvent();
-            yield* finishError("Run aborted by signal.");
-            break;
+          if (hasFinished) {
+            return;
           }
-          if (!isComplete && eventQueue.length === 0) {
-            await new Promise((resolve4) => {
-              wakeConsumer = resolve4;
-            });
+          try {
+            await promptPromise;
+          } catch (error) {
+            if (!hasFinished) {
+              yield* ensureStartEvent();
+              const message = error instanceof Error ? error.message : "Pi agent run failed.";
+              yield* finishError(message);
+            }
+            return;
           }
-        }
-        if (hasFinished) {
-          return;
-        }
-        try {
-          await promptPromise;
-        } catch (error) {
-          if (!hasFinished) {
+          if (!hasFinished && session.agent.state.error) {
             yield* ensureStartEvent();
-            const message = error instanceof Error ? error.message : "Pi agent run failed.";
-            yield* finishError(message);
+            yield* finishError(session.agent.state.error);
           }
-          return;
-        }
-        if (!hasFinished && session.agent.state.error) {
-          yield* ensureStartEvent();
-          yield* finishError(session.agent.state.error);
+        } finally {
+          if (abortSignal) {
+            abortSignal.removeEventListener("abort", abortHandler);
+          }
+          unsubscribe();
+          session.dispose();
         }
       } finally {
-        if (abortSignal) {
-          abortSignal.removeEventListener("abort", abortHandler);
-        }
-        unsubscribe();
-        session.dispose();
+        restoreProcessEnv();
       }
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sandagent/runner-cli",
-  "version": "0.9.8",
+  "version": "0.9.9-beta.1",
   "description": "SandAgent Runner CLI - Like gemini-cli or claude-code, runs in your local terminal with AI SDK UI streaming",
   "type": "module",
   "bin": {
@@ -53,11 +53,11 @@
     "esbuild": "^0.27.2",
     "typescript": "^5.3.0",
     "vitest": "^1.6.1",
-    "@sandagent/runner-core": "0.1.0",
     "@sandagent/runner-claude": "0.6.2",
-    "@sandagent/runner-codex": "0.6.2",
     "@sandagent/runner-gemini": "0.6.2",
+    "@sandagent/runner-core": "0.1.0",
     "@sandagent/runner-opencode": "0.6.2",
+    "@sandagent/runner-codex": "0.6.2",
     "@sandagent/runner-pi": "0.6.3"
   },
   "scripts": {