@sandagent/runner-cli 0.9.19-beta.3 → 0.9.19-beta.5

package/dist/bundle.mjs

@@ -1246,6 +1246,7 @@ var SandagentResourceLoader = class {
     this.cwd = options.cwd ?? process.cwd();
     this.agentDir = options.agentDir ?? join4(homedir(), ".pi", "agent");
     this.skillPaths = options.skillPaths ?? [];
+    this.extraAppendPrompt = options.appendSystemPrompt;
     this.delegate = new DefaultResourceLoader({
       cwd: this.cwd,
       agentDir: this.agentDir,
@@ -1286,10 +1287,12 @@ var SandagentResourceLoader = class {
     return this.delegate.getSystemPrompt();
   }
   getAppendSystemPrompt() {
-    return this.delegate.getAppendSystemPrompt();
-  }
-  getPathMetadata() {
-    return this.delegate.getPathMetadata();
+    const base = this.delegate.getAppendSystemPrompt();
+    if (this.extraAppendPrompt) {
+      console.error(`${LOG_PREFIX} getAppendSystemPrompt: appending extra prompt (${this.extraAppendPrompt.length} chars)`);
+      return [...base, this.extraAppendPrompt];
+    }
+    return base;
   }
   extendResources(paths) {
     this.delegate.extendResources(paths);
@@ -1301,16 +1304,13 @@ function redactSecrets(text, secrets) {
   if (Object.keys(secrets).length === 0)
     return text;
   let result = text;
-  const esc = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  for (const k of Object.keys(secrets)) {
-    const ek = esc(k);
-    result = result.replace(new RegExp(`^${ek}\\s*=.*$\\n?`, "gm"), "");
-    result = result.replace(new RegExp(`\\s*["']?${ek}["']?\\s*:\\s*['"][^'"]*['"],?`, "g"), "");
-  }
-  for (const v of Object.values(secrets)) {
-    if (v.length >= 8) {
-      result = result.split(v).join("***");
-    }
+  const escapeRegex = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const values = Object.values(secrets).filter((v) => v.length >= 8).sort((a, b) => b.length - a.length);
+  for (const v of values) {
+    const ev = escapeRegex(v);
+    result = result.replace(new RegExp(`^\\S+=.*${ev}.*$\\n?`, "gm"), "");
+    result = result.replace(new RegExp(`\\s*["']?\\w+["']?\\s*:\\s*['"][^'"]*${ev}[^'"]*['"],?`, "g"), "");
+    result = result.split(v).join("***");
   }
   result = result.replace(/\n{3,}/g, "\n\n");
   return result.trim();
@@ -1450,7 +1450,7 @@ function createPiRunner(options = {}) {
   const cwd = options.cwd || process.cwd();
   const apiKeyEnvKey = `${provider.toUpperCase().replace(/-/g, "_")}_API_KEY`;
   const inlineApiKey = typeof options.env?.[apiKeyEnvKey] === "string" && options.env[apiKeyEnvKey].length > 0 ? options.env[apiKeyEnvKey] : void 0;
-  const modelRegistry = new ModelRegistry(AuthStorage.create());
+  const modelRegistry = ModelRegistry.inMemory(AuthStorage.create());
   const defaultModel = getModel(provider, modelName);
   let model = defaultModel ?? modelRegistry.find(provider, modelName);
   if (model == null) {
@@ -1500,7 +1500,11 @@ function createPiRunner(options = {}) {
           }
           return SessionManager.create(cwd);
         })();
-        const resourceLoader = options.skillPaths ? new SandagentResourceLoader({ cwd, skillPaths: options.skillPaths }) : void 0;
+        const resourceLoader = options.skillPaths ? new SandagentResourceLoader({
+          cwd,
+          skillPaths: options.skillPaths,
+          appendSystemPrompt: options.systemPrompt
+        }) : void 0;
         if (options.skillPaths && options.skillPaths.length > 0) {
           console.error(`${LOG_PREFIX2} runner: cwd=${cwd} skillPaths=${JSON.stringify(options.skillPaths)}`);
         }
@@ -1516,14 +1520,6 @@ function createPiRunner(options = {}) {
           resourceLoader,
           customTools
         });
-        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;
@@ -1646,8 +1642,11 @@ ${options.systemPrompt}` : options.systemPrompt);
                   yield* endTextStreamIfOpen();
                   yield* beginTextStream();
                 } else if (sub.type === "text_delta") {
-                  const delta = sub.delta;
+                  let delta = sub.delta;
                   if (delta) {
+                    if (options.env && Object.keys(options.env).length > 0) {
+                      delta = redactSecrets(delta, options.env);
+                    }
                     if (!textStreamOpen) {
                       yield* beginTextStream();
                     }
@@ -1671,7 +1670,10 @@ ${options.systemPrompt}` : options.systemPrompt);
 
 `;
               } else if (event.type === "tool_execution_end") {
-                const output = extractToolResultText(event.result);
+                let output = extractToolResultText(event.result);
+                if (options.env && Object.keys(options.env).length > 0) {
+                  output = redactSecrets(output, options.env);
+                }
                 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.19-beta.3",
+  "version": "0.9.19-beta.5",
   "description": "SandAgent Runner CLI - Like gemini-cli or claude-code, runs in your local terminal with AI SDK UI streaming",
   "type": "module",
   "bin": {
@@ -41,9 +41,9 @@
   ],
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "0.2.70",
-    "@mariozechner/pi-agent-core": "^0.61.0",
-    "@mariozechner/pi-ai": "^0.61.0",
-    "@mariozechner/pi-coding-agent": "^0.61.0",
+    "@mariozechner/pi-agent-core": "0.64.0",
+    "@mariozechner/pi-ai": "0.64.0",
+    "@mariozechner/pi-coding-agent": "0.64.0",
     "@openai/codex-sdk": "^0.110.0",
     "dotenv": "^17.3.1",
     "zod": "^4.0.0"
@@ -53,11 +53,11 @@
     "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-opencode": "0.6.2",
     "@sandagent/runner-gemini": "0.6.2",
+    "@sandagent/runner-core": "0.1.1-beta.0",
     "@sandagent/runner-pi": "0.6.4-beta.0",
+    "@sandagent/runner-opencode": "0.6.2",
     "@sandagent/runner-codex": "0.6.2"
   },
   "scripts": {