billion-context-pi 0.1.24 → 0.1.26

package/dist/index.js

@@ -611,9 +611,13 @@ var TAG_CLOSE = LT + "/acp" + GT;
 function acpTag(ref, tokens, type) {
   return TAG_OPEN + 'tokens="' + formatTokens(tokens) + '" type="' + type + '"' + GT + ref + TAG_CLOSE;
 }
-function renderMessage(message, map, countTokens) {
+function renderMessage(message, map, countTokens, strategy) {
   const ref = refForRaw(map, message.id);
   if (!ref || ref === BLOCKED_REF) return message;
+  if (strategy === "none") return message;
+  if (strategy === "text-only" && message.contentType !== "text") {
+    return message;
+  }
   const ownTagRe = new RegExp(
     "^" + escapeRegex(TAG_OPEN) + "[^>]*" + GT + escapeRegex(ref) + escapeRegex(TAG_CLOSE) + "\\n?"
   );
@@ -624,21 +628,24 @@ function renderMessage(message, map, countTokens) {
   if (!cleanText) return { ...message, text: prefix };
   return { ...message, text: prefix + cleanText };
 }
-function renderVisibleRefs(messages, state, countTokens = (text) => Math.ceil(text.length / 4)) {
+function renderVisibleRefs(messages, state, countTokens = (text) => Math.ceil(text.length / 4), strategy = "all") {
   const map = state.messageRefs;
   return messages.map(
-    (message) => renderMessage(message, map, countTokens)
+    (message) => renderMessage(message, map, countTokens, strategy)
   );
 }
-var renderRefsNode = {
-  name: "render-refs",
-  run(io, ctx) {
-    return {
-      ...io,
-      messages: renderVisibleRefs(io.messages, io.state, ctx.countTokens)
-    };
-  }
-};
+function createRenderRefsNode(strategy) {
+  return {
+    name: "render-refs",
+    run(io, ctx) {
+      return {
+        ...io,
+        messages: renderVisibleRefs(io.messages, io.state, ctx.countTokens, strategy)
+      };
+    }
+  };
+}
+var renderRefsNode = createRenderRefsNode("all");
 var ALWAYS_PROTECTED_TOOLS = ["compress"];
 var NEVER_PRESERVE_RECENT_TOOLS = [
   "decompress",
@@ -1009,7 +1016,9 @@ function createCore(ports = {}) {
       state: input.state,
       effects: {}
     };
-    const result = runPipeline(defaultNodes(), initial, ctx);
+    const strategy = input.renderTags ?? "all";
+    const nodes = buildNodes(strategy);
+    const result = runPipeline(nodes, initial, ctx);
     return {
       messages: result.messages,
       state: result.state,
@@ -1039,7 +1048,10 @@ function createCore(ports = {}) {
     };
   }
   function defaultNodes() {
-    return [
+    return buildNodes("all");
+  }
+  function buildNodes(strategy) {
+    const base = [
       assignRefsNode,
       syncBlocksNode,
       pruneNode,
@@ -1047,9 +1059,10 @@ function createCore(ports = {}) {
       hideCompressCallsNode,
       recommendNode,
       nudgeNode,
-      emergencyTruncateNode,
-      renderRefsNode
+      emergencyTruncateNode
     ];
+    if (strategy === "none") return base;
+    return [...base, createRenderRefsNode(strategy)];
   }
   return { processTurn, applyCompression, defaultNodes, decompress, search, status };
 }
@@ -2342,6 +2355,8 @@ function makePreview(text, query, len) {
 }
 
 // src/config.ts
+var DEFAULT_TOOL_BASH_TIMEOUT = 60;
+var DEFAULT_TOOL_OUTPUT_MAX_BYTES = 2e5;
 function resolveConfig(adapter, liveContextLimit) {
   const envLimit = process.env.ACP_MODEL_CONTEXT_LIMIT;
   const envLimitNum = envLimit ? Number(envLimit) : NaN;
@@ -2359,7 +2374,15 @@ var REF_TAG = new RegExp("^(?:<acp\\s[^>]*>m\\d{5}</acp>|\\[m\\d{1,5}\\])\\s?\\n
 function entriesToCoreMessages(entries) {
   const out = [];
   for (const entry of entries) {
-    if (entry.type !== "message") continue;
+    if (entry.type !== "message") {
+      if (entry.type === "custom_message") {
+        const text = extractText(entry.content);
+        if (text.length > 0) {
+          out.push({ id: entry.id, role: "user", contentType: "text", text });
+        }
+      }
+      continue;
+    }
     const cores = projectMessage(entry.message, entry.id);
     out.push(...cores);
   }
@@ -7183,7 +7206,7 @@ async function handleCompress(args, runtime, ctx, toolCallId) {
     config
   });
   await runtime.save(applied.state, ctx);
-  const { blocksCreated, tokensCompressed, errors } = applied.result;
+  const { blocksCreated, tokensCompressed, errors, warnings } = applied.result;
   const afterTokens = Math.max(0, beforeTokens - tokensCompressed);
   const newBlocks = applied.state.blocks.slice(-blocksCreated);
   debug.event("compress-out", {
@@ -7200,6 +7223,7 @@ async function handleCompress(args, runtime, ctx, toolCallId) {
     newBlocks: newBlocks.map((b) => ({ blockId: b.blockId, tier: b.tier, summaryLen: b.summary.length, directMsgCount: b.directMessageIds.length, effectiveMsgCount: b.effectiveMessageIds.length, summary: b.summary }))
   });
   const lines = [`\u25A3 ACP | ${formatK2(beforeTokens)} \u2192 ${formatK2(afterTokens)} tokens (~${formatK2(tokensCompressed)} reclaimed, ${blocksCreated} block${blocksCreated > 1 ? "s" : ""})`];
+  if (warnings.length > 0) lines.push("\u26A0\uFE0F " + warnings.join("; "));
   if (errors.length > 0) lines.push("Errors: " + errors.join("; "));
   return lines.join("\n");
 }
@@ -7625,15 +7649,19 @@ var MAX_DEPTH = 2;
 var SYNC_TIMEOUT_MS = 5 * 6e4;
 var RESULT_SUMMARY_CHARS = 500;
 var OUT_DIR = join4(tmpdir2(), "acp-delegate");
+var ACP_TOOLS = ["compress", "decompress", "search_context", "acp_status"];
+var RESTRICTED_TOOLS = "read,bash,grep,find,ls";
 var AGENTS = {
   reviewer: {
-    tools: "read,bash",
+    tools: RESTRICTED_TOOLS,
+    restricted: true,
     prompt: `You are a senior code reviewer with read-only access.
 Read the given code and report: bugs, security/safety risks, correctness issues, and concrete improvement suggestions.
 Be specific \u2014 cite file:line for every finding. Do NOT modify any files; only read and report.`
   },
   researcher: {
-    tools: "read,bash",
+    tools: RESTRICTED_TOOLS,
+    restricted: true,
     prompt: `You are a code researcher with read-only access.
 Investigate the codebase to answer the question thoroughly. Report findings with exact file:line references, function/type signatures, and relevant code snippets.
 Do NOT modify any files; only read and report.`
@@ -7645,13 +7673,15 @@ Make exactly the requested code changes \u2014 minimal, focused, following exist
 After editing, briefly summarize what you changed and why. Do not expand scope.`
   },
   planner: {
-    tools: "read,bash",
+    tools: RESTRICTED_TOOLS,
+    restricted: true,
     prompt: `You are a technical planner with read-only access.
 Analyze the task and produce a concrete, ordered step-by-step implementation plan with rationale for each step.
 Cite file:line for code you reference. Do NOT modify any files; only read and propose.`
   },
   oracle: {
-    tools: "read,bash",
+    tools: RESTRICTED_TOOLS,
+    restricted: true,
     prompt: `You are an expert advisor with read-only access.
 Answer the question concisely with clear reasoning. Cite file:line when referencing code. Do NOT modify any files.`
   }
@@ -7707,7 +7737,7 @@ var agentListLine = (name) => {
     planner: "analyze + propose step-by-step plan (read-only)",
     oracle: "answer questions / advise (read-only)"
   };
-  return `  \u2022 ${name} \u2014 ${blurb[name]} [tools: ${def.tools}]`;
+  return `  \u2022 ${name} - ${blurb[name]} [tools: ${def.tools}${def.restricted ? " + ACP context tools" : ""}]`;
 };
 function makeDelegateTool(pi) {
   return {
@@ -7748,6 +7778,12 @@ function remainingLineForWait(selfRunId) {
   const remaining = Array.from(runs.values()).filter((r) => r.status === "running" && r.runId !== selfRunId).length;
   return remaining > 0 ? ` ${remaining} delegate${remaining === 1 ? " is" : "s are"} still running.` : "";
 }
+function injectedWaitMessage(run, runId, remainingLine) {
+  if (!run.injected) return null;
+  const file = run.result?.file;
+  const fileLine = file ? ` If you need details, read the result file: \`${file}\`.` : "";
+  return `Delegate \`${runId}\` already delivered its result via a system notification when it finished \u2014 no need to wait on it again.${remainingLine}${fileLine}`;
+}
 function makeDelegateWaitTool(_pi) {
   return {
     name: "acp_delegate_wait",
@@ -7770,6 +7806,11 @@ function makeDelegateWaitTool(_pi) {
         return { details: void 0, content: [{ type: "text", text: `Delegate \`${args.runId}\` was cancelled (no result).${remainingLineForWait(args.runId)}` }] };
       }
       if (run.status !== "running") {
+        const dedup = injectedWaitMessage(run, args.runId, remainingLineForWait(args.runId));
+        if (dedup) {
+          run.consumed = true;
+          return { details: void 0, content: [{ type: "text", text: dedup }] };
+        }
         run.consumed = true;
         if (!run.result) {
           return { details: void 0, content: [{ type: "text", text: `Delegate \`${args.runId}\` finished but no result is available (persist error).` }] };
@@ -7934,6 +7975,7 @@ async function runDelegate(pi, args, ctx, signal) {
           return;
         }
         const injected = injectResult(pi, args.agent, runId, args.task, code, file2);
+        run.injected = injected;
         debug.event("delegate-done", { runId, code, status: run.status, injected, outLen: output.length, file: file2 });
         delegateStatusWidget.poke();
       }).catch((err) => {
@@ -7979,6 +8021,11 @@ async function buildChildArgs(args, rolePrompt, ctx) {
 
 Complete the task below.`, "utf8");
   const cliArgs = ["-p", "--no-session", "--append-system-prompt", promptFile];
+  const agentDef = AGENTS[args.agent];
+  if (agentDef?.restricted) {
+    const merged = [.../* @__PURE__ */ new Set([...agentDef.tools.split(",").map((s) => s.trim()), ...ACP_TOOLS])];
+    cliArgs.push("--tools", merged.join(","));
+  }
   if (args.model && args.model.includes("/")) {
     const [providerId, ...rest] = args.model.split("/");
     const modelId = rest.join("/");
@@ -8185,7 +8232,7 @@ async function statusReport(runtime, ctx) {
   const activeBlocksList = state.blocks.filter((b) => b.active);
   const totalBlocksList = state.blocks;
   const lines = [];
-  const versionStr = "0.1.24" ? `billion-context-pi@${"0.1.24"}` : "";
+  const versionStr = "0.1.26" ? `billion-context-pi@${"0.1.26"}` : "";
   lines.push("\u256D\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256E");
   lines.push("\u2502           ACP Context Analysis              \u2502");
   lines.push("\u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F");
@@ -8327,6 +8374,116 @@ When a background delegate finishes, an automated completion notification is inj
 - Arrive asynchronously: if you have moved on to other work, only act on a notification if it is relevant to the current task; otherwise note it and continue.
 `;
 
+// src/tool-guardrails.ts
+import {
+  isBashToolResult,
+  isToolCallEventType
+} from "@earendil-works/pi-coding-agent";
+function resolveBashTimeout(input, defaultTimeout) {
+  if (input.timeout !== void 0) return void 0;
+  const d = defaultTimeout ?? DEFAULT_TOOL_BASH_TIMEOUT;
+  if (!Number.isFinite(d) || d <= 0) return void 0;
+  return d;
+}
+function capToolOutput(content, maxBytes, fullPath) {
+  const max = maxBytes ?? DEFAULT_TOOL_OUTPUT_MAX_BYTES;
+  if (!Number.isFinite(max) || max <= 0) return void 0;
+  const kept = [];
+  const texts = [];
+  for (const c of content) {
+    if (c.type === "text") texts.push(c.text);
+    else kept.push(c);
+  }
+  if (texts.length === 0) return void 0;
+  const combined = texts.join("\n");
+  const total = Buffer.byteLength(combined, "utf8");
+  if (total <= max) return void 0;
+  const head = keepHead(combined, max);
+  const dropped = total - Buffer.byteLength(head, "utf8");
+  kept.push({ type: "text", text: head + buildCapNotice(dropped, max, fullPath) });
+  return kept;
+}
+var TIMEOUT_RE = /Command timed out after (\d+) seconds/;
+function detectBashTimeout(content) {
+  for (const c of content) {
+    if (c.type !== "text") continue;
+    const m = c.text.match(TIMEOUT_RE);
+    if (m) return Number(m[1]);
+  }
+  return void 0;
+}
+function appendTimeoutNotice(content, secs) {
+  const notice = buildTimeoutNotice(secs);
+  const next = [...content];
+  for (let i = next.length - 1; i >= 0; i--) {
+    const part = next[i];
+    if (part && part.type === "text") {
+      next[i] = { type: "text", text: part.text + notice };
+      return next;
+    }
+  }
+  next.push({ type: "text", text: notice });
+  return next;
+}
+function keepHead(str, maxBytes) {
+  const buf = Buffer.from(str, "utf8");
+  if (buf.length <= maxBytes) return str;
+  let end = maxBytes;
+  while (end > 0) {
+    const b = buf[end];
+    if (b === void 0 || (b & 192) !== 128) break;
+    end--;
+  }
+  let head = buf.subarray(0, end).toString("utf8");
+  const nl = head.lastIndexOf("\n");
+  if (nl >= Math.floor(maxBytes / 2)) head = head.slice(0, nl);
+  return head;
+}
+function buildCapNotice(dropped, maxBytes, fullPath) {
+  const where = fullPath ? `Full output saved to: ${fullPath} \u2014 read it to see everything.` : "To see more, narrow the query or redirect output to a file and read the relevant slice.";
+  return `
+
+[ACP guardrail: output capped at ${formatBytes(maxBytes)} (~${formatBytes(dropped)} dropped). ${where}]`;
+}
+function buildTimeoutNotice(secs) {
+  const suggested = Math.min(Math.max(Math.ceil(secs * 2), 120), 3600);
+  return `
+
+[ACP guardrail: command killed after ${secs}s. To give it more time, re-run the bash tool with a larger \`timeout\` argument (e.g. \`"timeout": ${suggested}\`).]`;
+}
+function formatBytes(n) {
+  return n >= 1024 ? `${(n / 1024).toFixed(1)}KB` : `${n}B`;
+}
+function wireToolGuardrails(pi, runtime) {
+  pi.on("tool_call", (event) => {
+    if (!isToolCallEventType("bash", event)) return;
+    const t = resolveBashTimeout(event.input, runtime.adapter.toolBashDefaultTimeout);
+    if (t !== void 0) {
+      event.input.timeout = t;
+      debug.event("guardrail-bash-timeout", { applied: t });
+    }
+  });
+  pi.on("tool_result", (event) => {
+    const isBash = isBashToolResult(event);
+    const fullPath = isBash ? event.details?.fullOutputPath : void 0;
+    const timeoutSecs = isBash && event.isError ? detectBashTimeout(event.content) : void 0;
+    let modified;
+    const max = runtime.adapter.toolOutputMaxBytes;
+    if (max !== void 0 && max > 0) {
+      const next = capToolOutput(event.content, max, fullPath);
+      if (next) {
+        modified = next;
+        debug.event("guardrail-output-cap", { max, hadPath: !!fullPath });
+      }
+    }
+    if (timeoutSecs !== void 0) {
+      modified = appendTimeoutNotice(modified ?? event.content, timeoutSecs);
+      debug.event("guardrail-bash-timeout-notice", { secs: timeoutSecs });
+    }
+    if (modified) return { content: modified };
+  });
+}
+
 // src/update.ts
 import { readFile, writeFile as writeFile3, mkdir as mkdir3 } from "fs/promises";
 import { join as join5, dirname as dirname3 } from "path";
@@ -8433,7 +8590,7 @@ async function checkForUpdate(autoUpdate, notify) {
     const data = await res.json();
     const latest = data.version;
     if (!latest) return;
-    const current = runtimeVersion ?? "0.1.24";
+    const current = runtimeVersion ?? "0.1.26";
     debug.event("update-check", {
       current,
       latest,
@@ -8468,7 +8625,7 @@ import { readFile as readFile2, writeFile as writeFile4, stat, copyFile, rename
 import { existsSync } from "fs";
 import { homedir as homedir4 } from "os";
 import { join as join6 } from "path";
-var ACP_TOOLS = ["compress", "decompress", "search_context", "acp_status"];
+var ACP_TOOLS2 = ["compress", "decompress", "search_context", "acp_status"];
 var BUILTIN_DEFAULT_TOOLS = {
   advisor: ["read", "grep", "find", "ls", "bash", "intercom"],
   "context-builder": ["read", "grep", "find", "ls", "bash", "write", "web_search", "intercom"],
@@ -8488,9 +8645,9 @@ function resolveAgentDir() {
 }
 function desiredTools(existing, name) {
   const base = Array.isArray(existing?.tools) && existing.tools.length > 0 ? [...existing.tools] : [...BUILTIN_DEFAULT_TOOLS[name] ?? []];
-  const hasAll = ACP_TOOLS.every((t) => base.includes(t));
+  const hasAll = ACP_TOOLS2.every((t) => base.includes(t));
   if (hasAll) return { tools: base, changed: false };
-  for (const t of ACP_TOOLS) if (!base.includes(t)) base.push(t);
+  for (const t of ACP_TOOLS2) if (!base.includes(t)) base.push(t);
   return { tools: base, changed: true };
 }
 async function ensureSubagentAcpTools(settingsPath) {
@@ -8561,7 +8718,7 @@ async function ensureSubagentAcpTools(settingsPath) {
     if (typeof v !== "object" || v === null) throw new Error("agentOverrides missing after write");
     for (const name of Object.keys(BUILTIN_DEFAULT_TOOLS)) {
       const tools = v[name]?.tools;
-      if (!Array.isArray(tools) || !ACP_TOOLS.every((t) => tools.includes(t))) {
+      if (!Array.isArray(tools) || !ACP_TOOLS2.every((t) => tools.includes(t))) {
         throw new Error(`${name} missing ACP tools after write`);
       }
     }
@@ -8613,7 +8770,7 @@ async function loadUserConfig(cwd) {
 function join8(...parts) {
   return path3.join(...parts);
 }
-var KNOWN = /* @__PURE__ */ new Set(["debug", "autoUpdate", "modelContextLimit", "delegate"]);
+var KNOWN = /* @__PURE__ */ new Set(["debug", "autoUpdate", "modelContextLimit", "delegate", "toolBashDefaultTimeout", "toolOutputMaxBytes"]);
 function pickKnown(parsed) {
   const out = {};
   for (const [k, v] of Object.entries(parsed)) {
@@ -8641,6 +8798,7 @@ function createAcpExtension(adapter = {}) {
     wireSessionLifecycle(pi, runtime);
     wireContextTransform(pi, runtime);
     wireSystemPrompt(pi, runtime);
+    wireToolGuardrails(pi, runtime);
     pi.registerTool(makeCompressTool(runtime));
     pi.registerTool(makeDecompressTool(runtime));
     pi.registerTool(makeSearchTool(runtime));
@@ -8767,7 +8925,12 @@ ${prompt}` };
 function collectOriginals(entries) {
   const map = /* @__PURE__ */ new Map();
   for (const entry of entries) {
-    if (entry.type === "message") map.set(entry.id, entry.message);
+    if (entry.type === "message") {
+      map.set(entry.id, entry.message);
+    } else if (entry.type === "custom_message") {
+      const content = typeof entry.content === "string" ? [{ type: "text", text: entry.content }] : entry.content;
+      map.set(entry.id, { role: "user", content });
+    }
   }
   return map;
 }