billion-context-pi 0.1.32 → 0.1.33

package/dist/delegate-tool.d.ts

@@ -1,5 +1,7 @@
+import { type SpawnOptions } from "node:child_process";
 import { Type, type Static } from "typebox";
 import type { ExtensionAPI, ExtensionContext, ToolDefinition } from "@earendil-works/pi-coding-agent";
+export declare function delegateSpawnOptions(cwd: string, env: NodeJS.ProcessEnv): SpawnOptions;
 /** Snapshot of currently-running delegate runs, for the TUI status widget. */
 export declare function runningRunsSnapshot(): {
     runId: string;
@@ -7,6 +9,34 @@ export declare function runningRunsSnapshot(): {
     task: string;
     startedAt: number;
 }[];
+/** Minimal writable surface accepted by makeEventApplier — real WriteStreams
+ *  in production, in-memory collectors in tests. */
+export interface EventApplierWriters {
+    reply: {
+        write(chunk: string): void;
+    };
+    activity: {
+        write(chunk: string): void;
+    } | null;
+}
+export interface EventApplier {
+    handleEventLine(line: string): void;
+    getReplyText(): string;
+    /** omp fallback: `-p` prints the plain reply as raw stdout; append it
+     *  straight through (no event parsing). */
+    appendRaw(text: string): void;
+}
+/** Applies parsed delegate JSON-event lines to the live reply/activity files.
+ *  Extracted from the spawn closure so the write logic is unit-testable.
+ *
+ *  reply-delta (text_delta) is streamed to the reply file as it arrives;
+ *  reply-complete (text_end) carries the authoritative full content of the
+ *  text block — any portion not already written is appended (tracked via
+ *  msgWritten) so a final answer that arrives without preceding deltas is
+ *  never lost from the file. */
+export declare function makeEventApplier(opts: {
+    showThinking: boolean;
+}, writers: EventApplierWriters): EventApplier;
 declare const DelegateParams: Type.TObject<{
     agent: Type.TString;
     task: Type.TString;

package/dist/index.js

@@ -2654,10 +2654,11 @@ import * as path2 from "path";
 import { appendFileSync, mkdirSync, statSync, renameSync, existsSync } from "fs";
 import * as path from "path";
 import { homedir } from "os";
+import { CONFIG_DIR_NAME } from "@earendil-works/pi-coding-agent";
 var MAX_BYTES = 10 * 1024 * 1024;
 var ENV_DEBUG = process.env.ACP_DEBUG === "1" || process.env.ACP_DEBUG === "true";
 function resolveLogFile() {
-  return process.env.ACP_LOG_FILE ?? path.join(homedir(), ".pi", "acp.log");
+  return process.env.ACP_LOG_FILE ?? path.join(homedir(), CONFIG_DIR_NAME, "acp.log");
 }
 var runtimeDebug = null;
 function setDebugEnabled(enabled) {
@@ -8064,6 +8065,14 @@ var ASYNC_TIMEOUT_MS = 30 * 6e4;
 var KILL_GRACE_MS = 1e4;
 var RESULT_SUMMARY_CHARS = 500;
 var OUT_DIR = join4(tmpdir2(), "acp-delegate");
+function delegateSpawnOptions(cwd, env) {
+  return {
+    cwd,
+    env,
+    stdio: ["pipe", "pipe", "pipe"],
+    shell: false
+  };
+}
 var ACP_TOOLS = ["compress", "decompress", "search_context", "acp_status"];
 var RESTRICTED_TOOLS = "read,bash,grep,find,ls";
 var AGENTS = {
@@ -8110,6 +8119,69 @@ function runningRunsSnapshot() {
   }
   return out;
 }
+function makeEventApplier(opts, writers) {
+  let replyText = "";
+  let msgWritten = 0;
+  const lastToolText = /* @__PURE__ */ new Map();
+  const thinking = new ThinkingCollector(opts.showThinking);
+  const flushThinking = () => {
+    const line = thinking.flush();
+    if (line) writers.activity?.write(line);
+  };
+  const handleEventLine = (line) => {
+    const ev = parseEventLine(line);
+    if (!ev) return;
+    if (ev.kind === "thinking-delta") {
+      thinking.push(ev.delta);
+      return;
+    }
+    if (ev.kind === "thinking-end") {
+      flushThinking();
+      return;
+    }
+    if (ev.kind === "reply-delta") {
+      flushThinking();
+      replyText += ev.delta;
+      msgWritten += ev.delta.length;
+      writers.reply.write(ev.delta);
+      return;
+    }
+    if (ev.kind === "reply-complete") {
+      flushThinking();
+      const tail = ev.content.slice(msgWritten);
+      if (tail) {
+        writers.reply.write(tail);
+        debug.event("reply-complete-tail", { tailLen: tail.length, contentLen: ev.content.length });
+      }
+      if (ev.content.length < msgWritten) {
+        logWarn("delegate", { event: "reply-content-shorter-than-delta", contentLen: ev.content.length, written: msgWritten });
+      }
+      msgWritten = 0;
+      replyText = ev.content;
+      return;
+    }
+    if (ev.kind === "tool-update") {
+      flushThinking();
+      const prev = lastToolText.get(ev.toolCallId) ?? "";
+      const add = newPortion(ev.text, prev);
+      lastToolText.set(ev.toolCallId, ev.text);
+      if (add) writers.activity?.write(add.endsWith("\n") ? add : `${add}
+`);
+      return;
+    }
+    flushThinking();
+    const lines = activityLines(ev, { showThinking: opts.showThinking });
+    if (lines.length) writers.activity?.write(lines.join(""));
+  };
+  return {
+    handleEventLine,
+    getReplyText: () => replyText,
+    appendRaw(text) {
+      replyText += text;
+      writers.reply.write(text);
+    }
+  };
+}
 var WAIT_TIMEOUT_MS_DEFAULT = 1e4;
 var WAIT_TIMEOUT_MS_MAX = 3e5;
 var DelegateParams = typebox_exports.Object({
@@ -8341,12 +8413,11 @@ async function runDelegate(pi, args, ctx, signal) {
   const runId = `del_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 6)}`;
   debug.event("delegate-spawn", { agent: args.agent, runId, cwd, async: isAsync, useJsonStream, cliArgs });
   logInfo("delegate", { event: "spawn", agent: args.agent, runId, cwd, async: isAsync, useJsonStream, mode: ctx.mode, parentDepth });
-  const child = spawn(process.execPath, [process.argv[1], ...cliArgs], {
-    cwd,
-    env: childEnv,
-    stdio: ["pipe", "pipe", "pipe"],
-    shell: process.platform === "win32"
-  });
+  const child = spawn(
+    process.execPath,
+    [process.argv[1], ...cliArgs],
+    delegateSpawnOptions(cwd, childEnv)
+  );
   child.stdin?.once("error", (e) => {
     debug.event("delegate-stdin-error", { runId: "pre-spawn", error: String(e) });
     logError("delegate", { event: "stdin-error", runId, error: String(e) });
@@ -8380,49 +8451,11 @@ async function runDelegate(pi, args, ctx, signal) {
       if (!s || s.destroyed || s.closed) return resolve2();
       s.end(() => resolve2());
     });
-    let replyText = "";
     let stdoutBuf = "";
-    const lastToolText = /* @__PURE__ */ new Map();
-    const thinking = new ThinkingCollector(args.showThinking === true);
-    const flushThinking = () => {
-      const line = thinking.flush();
-      if (line) activityStream?.write(line);
-    };
-    const handleEventLine = (line) => {
-      const ev = parseEventLine(line);
-      if (!ev) return;
-      if (ev.kind === "thinking-delta") {
-        thinking.push(ev.delta);
-        return;
-      }
-      if (ev.kind === "thinking-end") {
-        flushThinking();
-        return;
-      }
-      if (ev.kind === "reply-delta") {
-        flushThinking();
-        replyText += ev.delta;
-        replyStream.write(ev.delta);
-        return;
-      }
-      if (ev.kind === "reply-complete") {
-        flushThinking();
-        replyText = ev.content;
-        return;
-      }
-      if (ev.kind === "tool-update") {
-        flushThinking();
-        const prev = lastToolText.get(ev.toolCallId) ?? "";
-        const add = newPortion(ev.text, prev);
-        lastToolText.set(ev.toolCallId, ev.text);
-        if (add) activityStream?.write(add.endsWith("\n") ? add : `${add}
-`);
-        return;
-      }
-      flushThinking();
-      const lines = activityLines(ev, { showThinking: args.showThinking === true });
-      if (lines.length) activityStream?.write(lines.join(""));
-    };
+    const applier = makeEventApplier(
+      { showThinking: args.showThinking === true },
+      { reply: replyStream, activity: activityStream }
+    );
     child.stdout?.on("data", (c) => {
       watchdog.poke();
       if (useJsonStream) {
@@ -8431,12 +8464,11 @@ async function runDelegate(pi, args, ctx, signal) {
         while ((nl = stdoutBuf.indexOf("\n")) >= 0) {
           const line = stdoutBuf.slice(0, nl);
           stdoutBuf = stdoutBuf.slice(nl + 1);
-          handleEventLine(line);
+          applier.handleEventLine(line);
         }
       } else {
         const text = c.toString("utf8");
-        replyText += text;
-        replyStream.write(text);
+        applier.appendRaw(text);
       }
     });
     child.stderr?.on("data", (c) => {
@@ -8461,7 +8493,7 @@ async function runDelegate(pi, args, ctx, signal) {
         void cleanupTmp(tmpDir);
         await Promise.all([endStream(replyStream), endStream(activityStream)]);
         run.exitCode = code;
-        const output = replyText.trim();
+        const output = applier.getReplyText().trim();
         const body2 = code === 0 ? output || "(no output)" : stderrText.trim() || output || "(no output)";
         if (run.status === "cancelled") {
           await Promise.all([rm(replyFile, { force: true }), rm(activityFile, { force: true })]);
@@ -8790,7 +8822,7 @@ async function statusReport(runtime, ctx) {
   const activeBlocksList = state.blocks.filter((b) => b.active);
   const totalBlocksList = state.blocks;
   const lines = [];
-  const versionStr = "0.1.32" ? `billion-context-pi@${"0.1.32"}` : "";
+  const versionStr = "0.1.33" ? `billion-context-pi@${"0.1.33"}` : "";
   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");
@@ -9052,11 +9084,12 @@ import { join as join5, dirname as dirname3 } from "path";
 import { fileURLToPath } from "url";
 import { execFile } from "child_process";
 import { homedir as homedir3 } from "os";
+import { CONFIG_DIR_NAME as CONFIG_DIR_NAME2 } from "@earendil-works/pi-coding-agent";
 var PACKAGE_NAME = "billion-context-pi";
 var REGISTRY_URL = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`;
 var SEMVER_RE = /^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z-.]+)?$/;
 var CHECK_INTERVAL_MS = 3 * 60 * 1e3;
-var THROTTLE_FILE = join5(homedir3(), ".pi", "agent", ".billion-context-pi-update-check");
+var THROTTLE_FILE = join5(homedir3(), CONFIG_DIR_NAME2, "agent", ".billion-context-pi-update-check");
 var updateInFlight = false;
 function parseVersion(v) {
   return v.replace(/^v/, "").split(".").map((n) => parseInt(n, 10) || 0);
@@ -9156,7 +9189,7 @@ async function checkForUpdate(autoUpdate, notify) {
     const data = await res.json();
     const latest = data.version;
     if (!latest) return;
-    const current = runtimeVersion ?? "0.1.32";
+    const current = runtimeVersion ?? "0.1.33";
     const hasUpdate = isNewer(latest, current);
     debug.event("update-check", {
       current,
@@ -9195,6 +9228,7 @@ import { readFile as readFile2, writeFile as writeFile4, stat, copyFile, rename
 import { existsSync as existsSync2 } from "fs";
 import { homedir as homedir4 } from "os";
 import { join as join6 } from "path";
+import { CONFIG_DIR_NAME as CONFIG_DIR_NAME3 } from "@earendil-works/pi-coding-agent";
 var ACP_TOOLS2 = ["compress", "decompress", "search_context", "acp_status"];
 var BUILTIN_DEFAULT_TOOLS = {
   advisor: ["read", "grep", "find", "ls", "bash", "intercom"],
@@ -9211,7 +9245,7 @@ function resolveAgentDir() {
   const configured = process.env.PI_CODING_AGENT_DIR;
   if (configured === "~") return homedir4();
   if (configured?.startsWith("~/")) return join6(homedir4(), configured.slice(2));
-  return configured || join6(homedir4(), ".pi", "agent");
+  return configured || join6(homedir4(), CONFIG_DIR_NAME3, "agent");
 }
 function desiredTools(existing, name) {
   const base = Array.isArray(existing?.tools) && existing.tools.length > 0 ? [...existing.tools] : [...BUILTIN_DEFAULT_TOOLS[name] ?? []];
@@ -9323,11 +9357,11 @@ async function runSetupAndNotify(notify) {
 import { promises as fs2 } from "fs";
 import * as path3 from "path";
 import { homedir as homedir5 } from "os";
-import { CONFIG_DIR_NAME } from "@earendil-works/pi-coding-agent";
+import { CONFIG_DIR_NAME as CONFIG_DIR_NAME4 } from "@earendil-works/pi-coding-agent";
 async function loadUserConfig(cwd) {
   const home = homedir5();
   const merged = {};
-  for (const base of [join8(home, CONFIG_DIR_NAME), join8(cwd, CONFIG_DIR_NAME)]) {
+  for (const base of [join8(home, CONFIG_DIR_NAME4), join8(cwd, CONFIG_DIR_NAME4)]) {
     const file = join8(base, "acp.json");
     try {
       const raw = await fs2.readFile(file, "utf8");
@@ -9395,7 +9429,7 @@ function wireSessionLifecycle(pi, runtime) {
     runtime.store.invalidate();
     runtime.clearNudgeTracking();
     const sid = ctx.sessionManager.getSessionId();
-    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.1.32" : null });
+    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.1.33" : null });
     try {
       const user = await loadUserConfig(ctx.cwd);
       runtime.setAdapter(applyUserConfig(runtime.adapter, user));