@bunny-agent/runner-cli 0.9.62-release.2 → 0.9.63-beta.2

package/dist/bundle.mjs

@@ -39551,10 +39551,10 @@ function createMcpExtension(config4) {
 }
 
 // ../../packages/runner-pi/dist/pi-runner.js
-import { appendFileSync as appendFileSync2, existsSync as existsSync9, unlinkSync as unlinkSync7 } from "node:fs";
-import { join as join13 } from "node:path";
+import { appendFileSync as appendFileSync2, existsSync as existsSync8, unlinkSync as unlinkSync7 } from "node:fs";
+import { isAbsolute, join as join12, resolve as resolve2 } from "node:path";
 import { getBuiltinModel } from "@earendil-works/pi-ai/providers/all";
-import { createAgentSession, createCodingTools, ModelRuntime, SessionManager as SessionManager2 } from "@earendil-works/pi-coding-agent";
+import { CONFIG_DIR_NAME, createAgentSession, DefaultResourceLoader, getAgentDir, ModelRuntime, SessionManager as SessionManager2, SettingsManager } from "@earendil-works/pi-coding-agent";
 
 // ../../packages/runner-pi/dist/apply-patch-shim.js
 import { chmodSync, existsSync as existsSync5, mkdirSync as mkdirSync4, renameSync, writeFileSync as writeFileSync5 } from "node:fs";
@@ -39848,105 +39848,9 @@ function buildApplyPatchTool(cwd) {
   };
 }
 
-// ../../packages/runner-pi/dist/bunny-agent-resource-loader.js
-import { existsSync as existsSync7 } from "node:fs";
-import { homedir } from "node:os";
-import { isAbsolute, join as join9, resolve as resolve2 } from "node:path";
-import { DefaultResourceLoader, loadSkills } from "@earendil-works/pi-coding-agent";
-var LOG_PREFIX = "[bunny-agent:pi]";
-function logSkillLoad(cwd, agentDir, skillPaths, result) {
-  const lines = [
-    `${LOG_PREFIX} loadSkills`,
-    `  cwd: ${cwd}`,
-    `  agentDir: ${agentDir}`,
-    `  extra skillPaths (${skillPaths.length}):`
-  ];
-  for (const raw of skillPaths) {
-    const abs = isAbsolute(raw) ? raw : resolve2(cwd, raw);
-    lines.push(`    ${raw} -> ${abs} (exists: ${existsSync7(abs) ? "yes" : "no"})`);
-  }
-  lines.push(`  loaded skills: ${result.skills.length}`);
-  if (result.skills.length > 0) {
-    lines.push(`  skill names: ${result.skills.map((s) => s.name).join(", ")}`);
-  }
-  if (result.diagnostics.length > 0) {
-    lines.push(`  diagnostics (${result.diagnostics.length}):`);
-    for (const d of result.diagnostics) {
-      const pathPart = d.path !== void 0 ? ` path=${d.path}` : "";
-      lines.push(`    [${d.type}] ${d.message}${pathPart}`);
-    }
-  }
-  console.error(lines.join("\n"));
-}
-var BunnyAgentResourceLoader = class {
-  constructor(options = {}) {
-    this.cwd = options.cwd ?? process.cwd();
-    this.agentDir = options.agentDir ?? join9(homedir(), ".bunny", "agent");
-    this.skillPaths = options.skillPaths ?? [];
-    this.extraAppendPrompt = options.appendSystemPrompt;
-    this.delegate = new DefaultResourceLoader({
-      cwd: this.cwd,
-      agentDir: this.agentDir,
-      settingsManager: options.settingsManager,
-      extensionFactories: options.extensionFactories
-    });
-  }
-  async reload() {
-    await this.delegate.reload();
-    this.cachedSkills = void 0;
-  }
-  getSkills() {
-    if (!this.cachedSkills) {
-      this.cachedSkills = loadSkills({
-        cwd: this.cwd,
-        agentDir: this.agentDir,
-        skillPaths: this.skillPaths,
-        includeDefaults: true
-      });
-      if (this.skillPaths.length > 0) {
-        logSkillLoad(this.cwd, this.agentDir, this.skillPaths, this.cachedSkills);
-      }
-    }
-    return this.cachedSkills;
-  }
-  // Delegate all other methods
-  getExtensions() {
-    return this.delegate.getExtensions();
-  }
-  getPrompts() {
-    return this.delegate.getPrompts();
-  }
-  getThemes() {
-    return this.delegate.getThemes();
-  }
-  getAgentsFiles() {
-    return this.delegate.getAgentsFiles();
-  }
-  getSystemPrompt() {
-    return this.delegate.getSystemPrompt();
-  }
-  getSystemPromptSource() {
-    return this.delegate.getSystemPromptSource();
-  }
-  getAppendSystemPromptSources() {
-    return this.delegate.getAppendSystemPromptSources();
-  }
-  getAppendSystemPrompt() {
-    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);
-  }
-};
-
 // ../../packages/runner-pi/dist/image-tools.js
 import { mkdirSync as mkdirSync6, writeFileSync as writeFileSync7 } from "node:fs";
-import { dirname as dirname3, extname, join as join10 } from "node:path";
+import { dirname as dirname3, extname, join as join9 } from "node:path";
 var generateImageSchema = {
   type: "object",
   properties: {
@@ -40207,7 +40111,7 @@ function buildImageGenerateTool(cwd, imageModelId, baseUrl, apiKey) {
       const imageSize = p.imageSize;
       const rawFilename = p.filename;
       const filename = rawFilename ? extname(rawFilename) ? rawFilename : `${rawFilename}.png` : `image_${Date.now()}.png`;
-      const filePath = join10(cwd, filename.replace(/[^a-zA-Z0-9_\-./]/g, "_"));
+      const filePath = join9(cwd, filename.replace(/[^a-zA-Z0-9_\-./]/g, "_"));
       try {
         const url3 = `${baseUrl.replace(/\/$/, "")}/v1/images/generations`;
         const res = await fetch(url3, {
@@ -40355,7 +40259,7 @@ function buildImageEditTool(cwd, imageModelId, baseUrl, apiKey) {
     // biome-ignore lint/suspicious/noExplicitAny: plain JSON Schema compatible with TypeBox TSchema
     parameters: editImageSchema,
     async execute(_toolCallId, params, signal, _onUpdate) {
-      const { readFileSync: readFileSync8, existsSync: existsSync13 } = await import("node:fs");
+      const { readFileSync: readFileSync8, existsSync: existsSync12 } = await import("node:fs");
       const { resolve: resolve5, basename: basename3 } = await import("node:path");
       const p = params;
       const imagePath = p.image;
@@ -40368,7 +40272,7 @@ function buildImageEditTool(cwd, imageModelId, baseUrl, apiKey) {
       const rawFilename = p.filename;
       const safePrompt = buildPolicySafeEditPrompt(prompt);
       const resolvedImage = resolve5(cwd, imagePath);
-      if (!existsSync13(resolvedImage)) {
+      if (!existsSync12(resolvedImage)) {
         return {
           content: [
             {
@@ -40380,7 +40284,7 @@ function buildImageEditTool(cwd, imageModelId, baseUrl, apiKey) {
         };
       }
       const filename = rawFilename ? extname(rawFilename) ? rawFilename : `${rawFilename}.png` : `edited_${Date.now()}.png`;
-      const filePath = join10(cwd, filename.replace(/[^a-zA-Z0-9_\-./]/g, "_"));
+      const filePath = join9(cwd, filename.replace(/[^a-zA-Z0-9_\-./]/g, "_"));
       try {
         const imageBuffer = readFileSync8(resolvedImage);
         const fields = [
@@ -40412,7 +40316,7 @@ function buildImageEditTool(cwd, imageModelId, baseUrl, apiKey) {
         ];
         if (maskPath) {
           const resolvedMask = resolve5(cwd, maskPath);
-          if (existsSync13(resolvedMask)) {
+          if (existsSync12(resolvedMask)) {
             files.push({
               name: "mask",
               filename: basename3(resolvedMask),
@@ -40479,7 +40383,7 @@ function buildImageEditTool(cwd, imageModelId, baseUrl, apiKey) {
 
 // ../../packages/runner-pi/dist/session-utils.js
 import { closeSync, fstatSync, openSync, readdirSync, readSync, statSync } from "node:fs";
-import { join as join11 } from "node:path";
+import { join as join10 } from "node:path";
 import { SessionManager } from "@earendil-works/pi-coding-agent";
 var MAX_SESSION_FILE_BYTES = Number(process.env.SANDAGENT_MAX_SESSION_BYTES) || 10 * 1024 * 1024;
 function resolveSessionPathById(cwd, sessionIdOrPath) {
@@ -40490,7 +40394,7 @@ function resolveSessionPathById(cwd, sessionIdOrPath) {
   try {
     const suffix = `_${sessionIdOrPath}.jsonl`;
     const match = readdirSync(sessionsDir).find((f) => f.endsWith(suffix));
-    return match ? join11(sessionsDir, match) : void 0;
+    return match ? join10(sessionsDir, match) : void 0;
   } catch {
     return void 0;
   }
@@ -43629,37 +43533,37 @@ function buildAskUserQuestionTool(options) {
     }
   };
 }
-function wrapToolWithApproval(tool, options) {
+function createToolApprovalExtension(options) {
   return {
-    name: tool.name,
-    label: tool.label ?? tool.name,
-    description: tool.description,
-    parameters: tool.parameters,
-    async execute(toolCallId, params, signal, onUpdate, ctx) {
-      const decision = await waitForApproval({
-        cwd: options.cwd,
-        toolCallId,
-        toolName: tool.name,
-        input: params,
-        signal: signal ?? options.fallbackSignal,
-        pollIntervalMs: options.pollIntervalMs,
-        timeoutMs: options.timeoutMs
+    name: "bunny-agent-tool-approval",
+    factory: (pi) => {
+      pi.on("tool_call", async (event, ctx) => {
+        if (isAskUserQuestionToolName(event.toolName) || event.parentToolCallId !== void 0) {
+          return void 0;
+        }
+        const decision = await waitForApproval({
+          cwd: options.cwd,
+          toolCallId: event.toolCallId,
+          toolName: event.toolName,
+          input: event.input,
+          signal: ctx.signal ?? options.fallbackSignal,
+          pollIntervalMs: options.pollIntervalMs,
+          timeoutMs: options.timeoutMs
+        });
+        if (decision.behavior === "deny") {
+          return {
+            block: true,
+            reason: `Tool "${event.toolName}" was not approved: ${decision.message}`
+          };
+        }
+        return void 0;
       });
-      if (decision.behavior === "deny") {
-        throw new Error(`Tool "${tool.name}" was not approved: ${decision.message}`);
-      }
-      return tool.execute(toolCallId, params, signal, onUpdate, ctx);
     }
   };
 }
-function gateToolsForApproval(tools, bypass, options) {
-  if (bypass)
-    return tools;
-  return tools.map((tool) => wrapToolWithApproval(tool, options));
-}
 
 // ../../packages/runner-pi/dist/tool-overrides.js
-import { createBashTool, createReadTool } from "@earendil-works/pi-coding-agent";
+import { createBashToolDefinition } from "@earendil-works/pi-coding-agent";
 
 // ../../packages/runner-pi/dist/web-tools.js
 var braveProvider = {
@@ -44081,11 +43985,11 @@ function buildWebFetchTool() {
 
 // ../../packages/runner-pi/dist/tool-overrides.js
 function redactSecrets(text, secrets) {
-  if (Object.keys(secrets).length === 0)
+  const values = secretValues(secrets).filter((v) => text.includes(v));
+  if (values.length === 0)
     return text;
   let result = text;
   const escapeRegex3 = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  const values = Object.values(secrets).filter((v) => v.length >= 8).filter((v) => !/^\//.test(v) && !/^[A-Za-z]:[/\\]/.test(v)).sort((a, b) => b.length - a.length);
   for (const v of values) {
     const ev = escapeRegex3(v);
     result = result.replace(new RegExp(`^\\S+=.*${ev}.*$\\n?`, "gm"), "");
@@ -44095,19 +43999,61 @@ function redactSecrets(text, secrets) {
   result = result.replace(/\n{3,}/g, "\n\n");
   return result.trim();
 }
-function redactResultContent(result, secrets) {
-  if (result?.content && Array.isArray(result.content)) {
-    result.content = result.content.map((c) => c.type === "text" && typeof c.text === "string" ? { ...c, text: redactSecrets(c.text, secrets) } : c);
+function secretValues(secrets) {
+  return Object.values(secrets).filter((v) => v.length >= 8).filter((v) => !/^\//.test(v) && !/^[A-Za-z]:[/\\]/.test(v)).sort((a, b) => b.length - a.length);
+}
+function maskSecrets(value, values) {
+  if (typeof value === "string") {
+    let masked = value;
+    for (const v of values)
+      masked = masked.split(v).join("***");
+    return masked;
+  }
+  if (Array.isArray(value)) {
+    const next = value.map((item) => maskSecrets(item, values));
+    return next.some((item, i) => item !== value[i]) ? next : value;
+  }
+  if (value !== null && typeof value === "object") {
+    let changed = false;
+    const next = {};
+    for (const [key, item] of Object.entries(value)) {
+      next[key] = maskSecrets(item, values);
+      if (next[key] !== item)
+        changed = true;
+    }
+    return changed ? next : value;
   }
+  return value;
 }
+var ENV_OPTIONS_WITH_VALUE = /* @__PURE__ */ new Set([
+  "-u",
+  "--unset",
+  "-C",
+  "--chdir",
+  "-S",
+  "--split-string"
+]);
 function isEnvDumpCommand(command) {
   const cmd = command.replace(/\s+/g, " ").trim();
-  return /(?:^|[|;&])\s*(?:env|printenv|export\s+-p|declare\s+-x)\b/.test(cmd);
+  if (/(?:^|[|;&])\s*(?:printenv|export\s+-p|declare\s+-x)\b/.test(cmd)) {
+    return true;
+  }
+  for (const match of cmd.matchAll(/(?:^|[|;&])\s*env(?=$|[\s|;&>])([^|;&>]*)/g)) {
+    const words = match[1].trim().split(" ").filter(Boolean);
+    let i = 0;
+    while (i < words.length && (words[i].startsWith("-") || /^[A-Za-z_]\w*=/.test(words[i]))) {
+      i += ENV_OPTIONS_WITH_VALUE.has(words[i]) ? 2 : 1;
+    }
+    if (i >= words.length || isEnvDumpCommand(words.slice(i).join(" "))) {
+      return true;
+    }
+  }
+  return false;
 }
-function buildEnvInjectedBashTool(cwd, extraEnv, opts = {}) {
+function buildEnvInjectedBashTool(cwd, opts = {}) {
   const safeEnv = opts.systemEnv ?? {};
   const pathPrepend = opts.pathPrepend;
-  const bashAgentTool = createBashTool(cwd, {
+  return createBashToolDefinition(cwd, {
     spawnHook: (ctx) => {
       const env = {
         ...ctx.env,
@@ -44120,50 +44066,45 @@ function buildEnvInjectedBashTool(cwd, extraEnv, opts = {}) {
       return { ...ctx, env };
     }
   });
-  return {
-    name: bashAgentTool.name,
-    label: bashAgentTool.label ?? "bash",
-    description: bashAgentTool.description,
-    // biome-ignore lint/suspicious/noExplicitAny: TypeBox schema from pi internals
-    parameters: bashAgentTool.parameters,
-    async execute(toolCallId, params, signal, onUpdate) {
-      const command = params.command ?? "";
-      if (isEnvDumpCommand(command)) {
-        return {
-          content: [
-            {
-              type: "text",
-              text: "Command blocked: printing or redirecting environment variables is not allowed."
-            }
-          ],
-          details: void 0
-        };
-      }
-      const result = await bashAgentTool.execute(toolCallId, params, signal, onUpdate);
-      redactResultContent(result, extraEnv);
-      return result;
-    }
-  };
 }
-function buildSecretRedactingReadTool(cwd, secrets) {
-  const readAgentTool = createReadTool(cwd);
+var ENV_DUMP_BLOCKED_MESSAGE = "Command blocked: printing or redirecting environment variables is not allowed.";
+function createSecretGuardExtension(secrets) {
   return {
-    name: readAgentTool.name,
-    label: readAgentTool.label ?? "read",
-    description: readAgentTool.description,
-    // biome-ignore lint/suspicious/noExplicitAny: TypeBox schema from pi internals
-    parameters: readAgentTool.parameters,
-    async execute(toolCallId, params, signal, onUpdate) {
-      const result = await readAgentTool.execute(toolCallId, params, signal, onUpdate);
-      redactResultContent(result, secrets);
-      return result;
+    name: "bunny-agent-secret-guard",
+    factory: (pi) => {
+      pi.on("tool_call", (event) => {
+        if (event.toolName === "bash" && typeof event.input.command === "string" && isEnvDumpCommand(event.input.command)) {
+          return { block: true, reason: ENV_DUMP_BLOCKED_MESSAGE };
+        }
+        return void 0;
+      });
+      const values = secretValues(secrets);
+      pi.on("tool_result", (event) => {
+        if (values.length === 0)
+          return void 0;
+        let contentChanged = false;
+        const content = event.content.map((part) => {
+          if (part.type !== "text")
+            return part;
+          const text = redactSecrets(part.text, secrets);
+          if (text === part.text)
+            return part;
+          contentChanged = true;
+          return { ...part, text };
+        });
+        const details = maskSecrets(event.details, values);
+        const structuredContent = maskSecrets(event.structuredContent, values);
+        if (!contentChanged && details === event.details && structuredContent === event.structuredContent) {
+          return void 0;
+        }
+        return { content, details, structuredContent };
+      });
     }
   };
 }
 function buildSecretAwareTools(cwd, secrets, opts = {}) {
   const tools = [
-    buildEnvInjectedBashTool(cwd, secrets, opts),
-    buildSecretRedactingReadTool(cwd, secrets),
+    buildEnvInjectedBashTool(cwd, opts),
     buildWebFetchTool()
   ];
   if (resolveSearchProvider(secrets)) {
@@ -44275,7 +44216,7 @@ function serializeResult2(result) {
 }
 
 // ../../packages/runner-pi/dist/pi-runner.js
-var LOG_PREFIX2 = "[bunny-agent:pi]";
+var LOG_PREFIX = "[bunny-agent:pi]";
 var DEFAULT_DYNAMIC_MODEL_PROFILE = {
   contextWindow: 128e3,
   maxTokens: 16384,
@@ -44403,8 +44344,8 @@ function traceRawMessage(debugCwd, data, reset = false, optionsEnv) {
   if (!enabled)
     return;
   try {
-    const file3 = join13(debugCwd, "pi-message-stream-debug.json");
-    if (reset && existsSync9(file3))
+    const file3 = join12(debugCwd, "pi-message-stream-debug.json");
+    if (reset && existsSync8(file3))
       unlinkSync7(file3);
     const type = data !== null && typeof data === "object" ? data.type : void 0;
     let payload = data;
@@ -44418,6 +44359,39 @@ function traceRawMessage(debugCwd, data, reset = false, optionsEnv) {
   } catch {
   }
 }
+async function createPiResourceLoader(options) {
+  const { systemPrompt } = options;
+  const defaultSkillDirs = [
+    join12(options.agentDir, "skills"),
+    join12(options.cwd, CONFIG_DIR_NAME, "skills")
+  ].filter((dir) => existsSync8(dir));
+  const loader = new DefaultResourceLoader({
+    cwd: options.cwd,
+    agentDir: options.agentDir,
+    settingsManager: options.settingsManager,
+    noSkills: true,
+    additionalSkillPaths: [...defaultSkillDirs, ...options.skillPaths ?? []],
+    appendSystemPromptOverride: systemPrompt ? (base) => [...base, systemPrompt] : void 0,
+    extensionFactories: options.extensionFactories
+  });
+  await loader.reload();
+  if (options.skillPaths && options.skillPaths.length > 0) {
+    logSkillLoad(options.cwd, options.skillPaths, loader.getSkills());
+  }
+  return loader;
+}
+function logSkillLoad(cwd, skillPaths, result) {
+  const lines = [`${LOG_PREFIX} loadSkills cwd=${cwd}`];
+  for (const raw of skillPaths) {
+    const abs = isAbsolute(raw) ? raw : resolve2(cwd, raw);
+    lines.push(`  ${raw} -> ${abs} (exists: ${existsSync8(abs) ? "yes" : "no"})`);
+  }
+  lines.push(`  loaded skills (${result.skills.length}): ${result.skills.map((s) => s.name).join(", ")}`);
+  for (const d of result.diagnostics) {
+    lines.push(`  [${d.type}] ${d.message}${d.path !== void 0 ? ` path=${d.path}` : ""}`);
+  }
+  console.error(lines.join("\n"));
+}
 function createPiRunner(options = {}) {
   const modelSpec = options.model;
   if (modelSpec == null || modelSpec.trim() === "") {
@@ -44431,6 +44405,8 @@ function createPiRunner(options = {}) {
   const mcpExtension = shouldEnableMcp(options.mcpConfig, options.allowedTools) ? createMcpExtension(options.mcpConfig) : void 0;
   return {
     async *run(userInput) {
+      const agentDir = getAgentDir();
+      const settingsManager = SettingsManager.create(cwd, agentDir);
       const modelRuntime = await ModelRuntime.create({
         modelsPath: null,
         allowModelNetwork: false
@@ -44477,7 +44453,7 @@ function createPiRunner(options = {}) {
         const sessionManager = await (async () => {
           if (forkFrom) {
             const sourcePath = resolveSessionPathById(cwd, forkFrom);
-            console.error(`${LOG_PREFIX2} fork: sourceId=${forkFrom} sourcePath=${sourcePath ?? "(not found)"}`);
+            console.error(`${LOG_PREFIX} fork: sourceId=${forkFrom} sourcePath=${sourcePath ?? "(not found)"}`);
             if (!sourcePath) {
               throw new Error(`Pi runner: forkFrom source session not found: ${forkFrom}`);
             }
@@ -44485,11 +44461,11 @@ function createPiRunner(options = {}) {
           }
           if (resume) {
             const sessionPath2 = resolveSessionPathById(cwd, resume);
-            console.error(`${LOG_PREFIX2} resume: id=${resume} path=${sessionPath2 ?? "(not found)"}`);
+            console.error(`${LOG_PREFIX} resume: id=${resume} path=${sessionPath2 ?? "(not found)"}`);
             if (sessionPath2) {
               if (isSessionFileTooLarge(sessionPath2)) {
                 const context = extractSessionContext(sessionPath2);
-                console.error(`${LOG_PREFIX2} session file too large, starting fresh${context ? " (with context)" : ""}`);
+                console.error(`${LOG_PREFIX} session file too large, starting fresh${context ? " (with context)" : ""}`);
                 const newMgr = SessionManager2.create(cwd);
                 if (context) {
                   const firstId = newMgr.getEntries()[0]?.id ?? "";
@@ -44503,24 +44479,14 @@ function createPiRunner(options = {}) {
           }
           return SessionManager2.create(cwd);
         })();
-        const resourceLoader = options.skillPaths || options.systemPrompt || mcpExtension ? new BunnyAgentResourceLoader({
-          cwd,
-          skillPaths: options.skillPaths,
-          appendSystemPrompt: options.systemPrompt,
-          extensionFactories: mcpExtension ? [mcpExtension] : void 0
-        }) : 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 applyPatchShimDir = ensureApplyPatchShim();
         const customTools = options.env && Object.keys(options.env).length > 0 ? buildSecretAwareTools(cwd, options.env, {
           systemEnv: options.systemEnv,
           pathPrepend: applyPatchShimDir
         }) : applyPatchShimDir ? [
-          buildEnvInjectedBashTool(cwd, {}, { pathPrepend: applyPatchShimDir })
+          buildEnvInjectedBashTool(cwd, {
+            pathPrepend: applyPatchShimDir
+          })
         ] : [];
         if (provider === "openai") {
           customTools.push(buildApplyPatchTool(cwd));
@@ -44541,29 +44507,34 @@ function createPiRunner(options = {}) {
           cwd,
           fallbackSignal: options.abortController?.signal
         };
-        let regularTools = [
-          ...applyAllowedTools(customTools, allowedTools),
-          ...toolRefDefinitions
-        ];
-        if (!bypassApproval) {
-          const overriddenNames = new Set(regularTools.map((tool) => tool.name));
-          const builtinTools = applyAllowedTools(createCodingTools(cwd), allowedTools).filter((tool) => !overriddenNames.has(tool.name));
-          regularTools = [...regularTools, ...builtinTools];
-        }
-        const gatedTools = gateToolsForApproval(regularTools, bypassApproval, approvalGate);
         const askUserQuestionEnabled = allowedTools === void 0 || allowedTools.includes(ASK_USER_QUESTION_TOOL_NAME);
         const previousModel = sessionManager.buildSessionContext?.().model;
         const thinkingLevel = resolveInitialThinkingLevel(options.effort, previousModel, model);
+        const resourceLoader = await createPiResourceLoader({
+          cwd,
+          agentDir,
+          settingsManager,
+          skillPaths: options.skillPaths,
+          systemPrompt: options.systemPrompt,
+          extensionFactories: [
+            createSecretGuardExtension(options.env ?? {}),
+            ...bypassApproval ? [] : [createToolApprovalExtension(approvalGate)],
+            ...mcpExtension ? [mcpExtension] : []
+          ]
+        });
         const { session } = await createAgentSession({
           cwd,
+          agentDir,
           model,
           sessionManager,
+          settingsManager,
           modelRuntime,
           resourceLoader,
           thinkingLevel,
           tools: allowedTools,
           customTools: [
-            ...gatedTools,
+            ...applyAllowedTools(customTools, allowedTools),
+            ...toolRefDefinitions,
             ...askUserQuestionEnabled ? [
               buildAskUserQuestionTool({
                 ...approvalGate,
@@ -44696,17 +44667,17 @@ function createPiRunner(options = {}) {
 }
 
 // ../../packages/runner-harness/dist/session.js
-import { existsSync as existsSync10, mkdirSync as mkdirSync8, readFileSync as readFileSync6, writeFileSync as writeFileSync9 } from "node:fs";
-import { join as join14 } from "node:path";
+import { existsSync as existsSync9, mkdirSync as mkdirSync8, readFileSync as readFileSync6, writeFileSync as writeFileSync9 } from "node:fs";
+import { join as join13 } from "node:path";
 var DIR = ".bunny-agent";
 var FILE = "session-id";
 function sessionPath(cwd) {
-  return join14(cwd, DIR, FILE);
+  return join13(cwd, DIR, FILE);
 }
 function readSessionId(cwd) {
   try {
     const p = sessionPath(cwd);
-    if (!existsSync10(p))
+    if (!existsSync9(p))
       return void 0;
     return readFileSync6(p, "utf8").trim() || void 0;
   } catch {
@@ -44715,28 +44686,28 @@ function readSessionId(cwd) {
 }
 function writeSessionId(cwd, id) {
   try {
-    mkdirSync8(join14(cwd, DIR), { recursive: true });
+    mkdirSync8(join13(cwd, DIR), { recursive: true });
     writeFileSync9(sessionPath(cwd), id, "utf8");
   } catch {
   }
 }
 
 // ../../packages/runner-harness/dist/skills.js
-import { existsSync as existsSync11, readdirSync as readdirSync2, statSync as statSync2 } from "node:fs";
-import { homedir as homedir2 } from "node:os";
-import { join as join15 } from "node:path";
+import { existsSync as existsSync10, readdirSync as readdirSync2, statSync as statSync2 } from "node:fs";
+import { homedir } from "node:os";
+import { join as join14 } from "node:path";
 function discoverSkillPaths(cwd) {
   const paths = [];
   for (const base of [
-    join15(cwd, "skills"),
-    join15(homedir2(), ".bunny-agent", "skills")
+    join14(cwd, "skills"),
+    join14(homedir(), ".bunny-agent", "skills")
   ]) {
-    if (!existsSync11(base))
+    if (!existsSync10(base))
       continue;
     try {
       for (const entry of readdirSync2(base)) {
-        const full = join15(base, entry);
-        if (statSync2(full).isDirectory() && existsSync11(join15(full, "SKILL.md"))) {
+        const full = join14(base, entry);
+        if (statSync2(full).isDirectory() && existsSync10(join14(full, "SKILL.md"))) {
           paths.push(full);
         }
       }
@@ -45270,14 +45241,14 @@ async function runAcpAgent(options) {
 import { execSync } from "node:child_process";
 import {
   copyFileSync,
-  existsSync as existsSync12,
+  existsSync as existsSync11,
   mkdirSync as mkdirSync9,
   readdirSync as readdirSync3,
   readFileSync as readFileSync7,
   statSync as statSync3,
   writeFileSync as writeFileSync10
 } from "node:fs";
-import { basename as basename2, dirname as dirname5, join as join16, resolve as resolve3 } from "node:path";
+import { basename as basename2, dirname as dirname5, join as join15, resolve as resolve3 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 function getPackageRoot() {
   const thisDir = dirname5(fileURLToPath2(import.meta.url));
@@ -45286,7 +45257,7 @@ function getPackageRoot() {
 function getShippedDockerfile() {
   const packageRoot = getPackageRoot();
   const candidates = [
-    join16(packageRoot, "Dockerfile"),
+    join15(packageRoot, "Dockerfile"),
     resolve3(
       packageRoot,
       "..",
@@ -45298,7 +45269,7 @@ function getShippedDockerfile() {
     resolve3(process.cwd(), "docker", "bunny-agent-claude", "Dockerfile")
   ];
   for (const p of candidates) {
-    if (existsSync12(p)) return p;
+    if (existsSync11(p)) return p;
   }
   console.error(
     `\u274C Dockerfile not found. Searched:
@@ -45319,7 +45290,7 @@ function ensureDocker() {
 }
 function resolveTemplatePath(template) {
   const abs = resolve3(process.cwd(), template);
-  if (!existsSync12(abs)) {
+  if (!existsSync11(abs)) {
     console.error(`\u274C Template directory not found: ${abs}`);
     process.exit(1);
   }
@@ -45328,8 +45299,8 @@ function resolveTemplatePath(template) {
 function copyDirSync(src, dest) {
   mkdirSync9(dest, { recursive: true });
   for (const entry of readdirSync3(src)) {
-    const srcPath = join16(src, entry);
-    const destPath = join16(dest, entry);
+    const srcPath = join15(src, entry);
+    const destPath = join15(dest, entry);
     if (statSync3(srcPath).isDirectory()) {
       copyDirSync(srcPath, destPath);
     } else {
@@ -45349,23 +45320,23 @@ async function buildImage(opts) {
   console.log(`  Push: ${opts.push}`);
   console.log("");
   ensureDocker();
-  const buildContext = join16(process.cwd(), ".docker-staging");
+  const buildContext = join15(process.cwd(), ".docker-staging");
   mkdirSync9(buildContext, { recursive: true });
   let dockerfile = readFileSync7(getShippedDockerfile(), "utf8");
   if (templatePath && templateName) {
-    const destDir = join16(buildContext, "templates", templateName);
+    const destDir = join15(buildContext, "templates", templateName);
     mkdirSync9(destDir, { recursive: true });
-    const claudeMd = join16(templatePath, "CLAUDE.md");
-    if (existsSync12(claudeMd))
-      copyFileSync(claudeMd, join16(destDir, "CLAUDE.md"));
-    const claudeDir = join16(templatePath, ".claude");
-    if (existsSync12(claudeDir)) copyDirSync(claudeDir, join16(destDir, ".claude"));
+    const claudeMd = join15(templatePath, "CLAUDE.md");
+    if (existsSync11(claudeMd))
+      copyFileSync(claudeMd, join15(destDir, "CLAUDE.md"));
+    const claudeDir = join15(templatePath, ".claude");
+    if (existsSync11(claudeDir)) copyDirSync(claudeDir, join15(destDir, ".claude"));
     let copyLines = "\n# Template files\nRUN mkdir -p /opt/bunny-agent/templates";
-    if (existsSync12(join16(destDir, "CLAUDE.md"))) {
+    if (existsSync11(join15(destDir, "CLAUDE.md"))) {
       copyLines += `
 COPY templates/${templateName}/CLAUDE.md /opt/bunny-agent/templates/CLAUDE.md`;
     }
-    if (existsSync12(join16(destDir, ".claude"))) {
+    if (existsSync11(join15(destDir, ".claude"))) {
       copyLines += `
 COPY templates/${templateName}/.claude /opt/bunny-agent/templates/.claude`;
     }
@@ -45374,10 +45345,10 @@ COPY templates/${templateName}/.claude /opt/bunny-agent/templates/.claude`;
 CMD `);
     console.log("\u{1F9E9} Injected template files into Dockerfile");
   }
-  writeFileSync10(join16(buildContext, "Dockerfile"), dockerfile);
+  writeFileSync10(join15(buildContext, "Dockerfile"), dockerfile);
   console.log("\u{1F433} Building Docker image...");
   run(
-    `docker build --platform=${opts.platform} -t ${localImage} -f ${join16(buildContext, "Dockerfile")} ${buildContext}`
+    `docker build --platform=${opts.platform} -t ${localImage} -f ${join15(buildContext, "Dockerfile")} ${buildContext}`
   );
   console.log(`
 \u2705 Image built: ${localImage}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bunny-agent/runner-cli",
-  "version": "0.9.62-release.2",
+  "version": "0.9.63-beta.2",
   "description": "BunnyAgent Runner CLI - Like gemini-cli or claude-code, runs in your local terminal with AI SDK UI streaming",
   "type": "module",
   "bin": {
@@ -60,14 +60,14 @@
     "typescript": "^5.3.0",
     "vitest": "^1.6.1",
     "@bunny-agent/apply-patch": "0.1.0",
-    "@bunny-agent/runner-claude": "0.6.2",
     "@bunny-agent/runner-codex": "0.6.2",
-    "@bunny-agent/runner-copilot": "0.1.0",
+    "@bunny-agent/runner-claude": "0.6.2",
     "@bunny-agent/runner-gemini": "0.6.2",
-    "@bunny-agent/runner-opencode": "0.6.2",
     "@bunny-agent/runner-harness": "0.1.1-beta.0",
-    "@bunny-agent/manager": "0.9.62-release.2",
+    "@bunny-agent/runner-copilot": "0.1.0",
+    "@bunny-agent/runner-opencode": "0.6.2",
     "@bunny-agent/runner-pi": "0.6.4-beta.0",
+    "@bunny-agent/manager": "0.9.63-beta.2",
     "@bunny-agent/server-acp": "0.1.0"
   },
   "scripts": {