@sandagent/runner-cli 0.9.16-beta.1 → 0.9.16-beta.3

package/dist/bundle.mjs

@@ -1209,7 +1209,7 @@ function createOpenCodeRunner(options = {}) {
 import { appendFileSync as appendFileSync2, existsSync as existsSync4, unlinkSync as unlinkSync3 } from "node:fs";
 import { join as join5 } from "node:path";
 import { getModel } from "@mariozechner/pi-ai";
-import { AuthStorage, createAgentSession, createCodingTools, ModelRegistry, SessionManager } from "@mariozechner/pi-coding-agent";
+import { AuthStorage, createAgentSession, createBashTool, ModelRegistry, SessionManager } from "@mariozechner/pi-coding-agent";
 
 // ../../packages/runner-pi/dist/sandagent-resource-loader.js
 import { existsSync as existsSync3 } from "node:fs";
@@ -1297,8 +1297,34 @@ var SandagentResourceLoader = class {
 };
 
 // ../../packages/runner-pi/dist/pi-runner.js
+function redactSecrets(text, secrets) {
+  let result = text;
+  for (const value of Object.values(secrets)) {
+    if (value.length < 4)
+      continue;
+    result = result.split(value).join("[REDACTED]");
+  }
+  return result;
+}
+function buildEnvInjectedBashTool(cwd, extraEnv) {
+  const bashAgentTool = createBashTool(cwd, {
+    spawnHook: (ctx) => ({
+      ...ctx,
+      env: { ...ctx.env, ...extraEnv }
+    })
+  });
+  return {
+    name: bashAgentTool.name,
+    label: bashAgentTool.label ?? "bash",
+    description: bashAgentTool.description,
+    // biome-ignore lint/suspicious/noExplicitAny: TypeBox schema from pi internals
+    parameters: bashAgentTool.parameters,
+    execute(toolCallId, params, signal, onUpdate) {
+      return bashAgentTool.execute(toolCallId, params, signal, onUpdate);
+    }
+  };
+}
 var LOG_PREFIX2 = "[sandagent:pi]";
-var DEBUG_ENABLED = process.env.DEBUG === "true" || process.env.DEBUG === "1";
 function parseModelSpec(model) {
   const trimmed = model.trim();
   const separator = trimmed.indexOf(":");
@@ -1383,7 +1409,8 @@ function getErrorFromAgentEndMessages(messages) {
   return void 0;
 }
 function traceRawMessage(debugCwd, data, reset = false) {
-  if (!DEBUG_ENABLED)
+  const enabled = process.env.DEBUG === "true" || process.env.DEBUG === "1";
+  if (!enabled)
     return;
   try {
     const file = join5(debugCwd, "pi-message-stream-debug.json");
@@ -1444,10 +1471,6 @@ function createPiRunner(options = {}) {
   applyModelOverrides(model, provider, options.env);
   return {
     async *run(userInput) {
-      if (DEBUG_ENABLED) {
-        const envKeys = Object.keys(options.env ?? {}).sort();
-        console.error(`${LOG_PREFIX2} runner env keys: ${envKeys.length > 0 ? envKeys.join(",") : "(none)"}`);
-      }
       if (inlineApiKey !== void 0) {
         modelRegistry.authStorage.setRuntimeApiKey(provider, inlineApiKey);
       }
@@ -1471,38 +1494,14 @@ function createPiRunner(options = {}) {
         if (resourceLoader) {
           await resourceLoader.reload();
         }
-        const tools = createCodingTools(cwd, {
-          bash: {
-            spawnHook: (ctx) => ({
-              ...ctx,
-              env: {
-                ...ctx.env,
-                ...options.env ?? {}
-              }
-            })
-          }
-        });
-        if (DEBUG_ENABLED) {
-          const debugCtx = {
-            command: "env",
-            cwd,
-            env: { PATH: process.env.PATH ?? "" }
-          };
-          const debugSpawn = tools.find((t) => t.name === "bash") ? debugCtx : debugCtx;
-          const merged = {
-            ...debugSpawn.env,
-            ...options.env ?? {}
-          };
-          const mergedKeys = Object.keys(merged).sort();
-          console.error(`${LOG_PREFIX2} bash spawn merged env key count: ${mergedKeys.length}`);
-        }
+        const customTools = options.env && Object.keys(options.env).length > 0 ? [buildEnvInjectedBashTool(cwd, options.env)] : [];
         const { session } = await createAgentSession({
           cwd,
           model,
           sessionManager,
           modelRegistry,
           resourceLoader,
-          tools
+          customTools
         });
         if (options.systemPrompt != null && options.systemPrompt !== "") {
           const existing = session.agent.state.systemPrompt ?? "";
@@ -1659,7 +1658,8 @@ ${options.systemPrompt}` : options.systemPrompt);
 
 `;
               } else if (event.type === "tool_execution_end") {
-                const output = extractToolResultText(event.result);
+                const rawOutput = extractToolResultText(event.result);
+                const output = event.toolName === "bash" && options.env && Object.keys(options.env).length > 0 ? redactSecrets(rawOutput, options.env) : rawOutput;
                 yield `data: ${JSON.stringify({ type: "tool-output-available", toolCallId: event.toolCallId, output, isError: event.isError, dynamic: true, providerExecuted: true })}
 
 `;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sandagent/runner-cli",
-  "version": "0.9.16-beta.1",
+  "version": "0.9.16-beta.3",
   "description": "SandAgent Runner CLI - Like gemini-cli or claude-code, runs in your local terminal with AI SDK UI streaming",
   "type": "module",
   "bin": {
@@ -53,12 +53,12 @@
     "esbuild": "^0.27.2",
     "typescript": "^5.3.0",
     "vitest": "^1.6.1",
-    "@sandagent/runner-core": "0.1.1-beta.0",
     "@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.4-beta.0"
+    "@sandagent/runner-core": "0.1.1-beta.0",
+    "@sandagent/runner-pi": "0.6.4-beta.0",
+    "@sandagent/runner-codex": "0.6.2"
   },
   "scripts": {
     "build": "tsc && pnpm bundle",