billion-context-pi 0.1.29 → 0.1.31

package/dist/compat.d.ts

@@ -0,0 +1,23 @@
+import type { ExtensionContext } from "@earendil-works/pi-coding-agent";
+/**
+ * Host compatibility layer for pi vs omp (oh-my-pi) API differences.
+ *
+ * pi: systemPrompt is string, getSystemPrompt() returns string
+ * omp: systemPrompt is string[], getSystemPrompt() returns string[]
+ *
+ * These helpers normalize the differences so the rest of the codebase
+ * can work with a consistent string interface.
+ */
+/** Normalize systemPrompt to a single string (join with newlines if array). */
+export declare function normalizeSystemPrompt(input: string | string[] | undefined): string;
+/**
+ * Format systemPrompt for before_agent_start event handler.
+ * Always returns string to satisfy pi's type definition, but handles
+ * both string (pi) and string[] (omp) input types at runtime.
+ */
+export declare function formatSystemPromptForEvent(base: string | string[], append: string): string;
+/**
+ * Get the system prompt as a single string, regardless of host type.
+ * Handles both pi (string) and omp (string[]) return types.
+ */
+export declare function getSystemPromptText(ctx: ExtensionContext): string;

package/dist/index.js

@@ -2537,6 +2537,15 @@ function patchRefTag(original, core) {
   if (!tag) return original;
   const base = original;
   if (base.role === "assistant") return original;
+  const tagCore = tag.replace(/\s+$/, "");
+  let bodyStart = tagCore.length;
+  if (core.text && core.text.charAt(bodyStart) === "\n") bodyStart += 1;
+  const coreBody = core.text ? core.text.slice(bodyStart) : "";
+  const originalBody = extractText(base.content);
+  const trimEnd = (s) => s.replace(/\s+$/, "");
+  if (coreBody && trimEnd(coreBody) !== trimEnd(originalBody)) {
+    return rebuildBodyFromCore(original, coreBody, tag);
+  }
   const rawBlocks = Array.isArray(base.content) ? base.content : typeof base.content === "string" ? [{ type: "text", text: base.content }] : [];
   const peeled = peelRefTagBlocks(rawBlocks);
   const newBlocks = [...peeled];
@@ -2560,6 +2569,23 @@ ${tag}` : tag };
     content: [...peeled, { type: "text", text: tag }]
   };
 }
+function rebuildBodyFromCore(original, coreBody, tag) {
+  const base = original;
+  const text = `${coreBody.replace(/\s+$/, "")}
+
+${tag}`;
+  if (typeof base.content === "string") {
+    return { ...original, content: text };
+  }
+  if (Array.isArray(base.content)) {
+    const nonText = base.content.filter((b) => b.type !== "text");
+    return {
+      ...original,
+      content: [...nonText, { type: "text", text }]
+    };
+  }
+  return { ...original, content: [{ type: "text", text }] };
+}
 function peelRefTagBlocks(blocks) {
   const out = [];
   for (const block of blocks) {
@@ -2730,6 +2756,50 @@ function isPiHost(sm) {
   const source = sm;
   return typeof source.buildContextEntries === "function";
 }
+function mergeLiveEntries(entries, live) {
+  const persisted = entries.filter((e) => e.type === "message");
+  const out = [];
+  let p = 0;
+  let unmatched = 0;
+  for (let i = 0; i < live.length; i++) {
+    const msg = live[i];
+    let matched;
+    let j = p;
+    while (j < persisted.length && persisted[j].message.role !== msg.role) j++;
+    if (j < persisted.length && sameMessage(persisted[j].message, msg)) {
+      matched = persisted[j];
+      p = j + 1;
+    }
+    if (matched) {
+      out.push(matched);
+    } else {
+      unmatched++;
+      out.push({
+        type: "message",
+        id: `live-${i}`,
+        parentId: null,
+        timestamp: String(msg.timestamp ?? Date.now()),
+        message: msg
+      });
+    }
+  }
+  if (unmatched > 0) logInfo("runtime", { event: "merge-live-entries", live: live.length, unmatched });
+  return out;
+}
+function sameMessage(a, b) {
+  const ra = a.role;
+  const rb = b.role;
+  if (ra !== rb) return false;
+  const ca = a.content;
+  const cb = b.content;
+  if (ca === void 0 || cb === void 0) return false;
+  try {
+    return JSON.stringify(ca) === JSON.stringify(cb);
+  } catch (e) {
+    logWarn("runtime", { event: "message-compare-failed", error: e instanceof Error ? e.message : String(e) });
+    return a === b;
+  }
+}
 function createRuntime(adapter) {
   const core = createCore({ countTokens: defaultCountTokens });
   const store = new SessionStateStore();
@@ -2758,11 +2828,12 @@ function createRuntime(adapter) {
   function configFor(ctx) {
     return resolveConfig(adapterRef, liveContextLimit(ctx));
   }
-  async function stateFor(ctx) {
+  async function stateFor(ctx, liveMessages) {
     const sm = ctx.sessionManager;
     const state = await store.load(sm.getSessionFile() ?? void 0, sm.getSessionId());
     const entries = readContextEntries(sm);
-    return { state, coreMessages: entriesToCoreMessages(entries), entries };
+    const merged = isPiHost(sm) || !liveMessages || liveMessages.length === 0 ? entries : mergeLiveEntries(entries, liveMessages);
+    return { state, coreMessages: entriesToCoreMessages(merged), entries: merged };
   }
   async function save(state, ctx) {
     const sm = ctx.sessionManager;
@@ -7469,7 +7540,7 @@ function buildMessageOwnerMap(state) {
   return m;
 }
 function estimateTokens2(text) {
-  if (!text) return 0;
+  if (typeof text !== "string" || !text) return 0;
   const cjk = text.match(/[\u4e00-\u9fff\u3040-\u30ff\uac00-\ud7af]/g);
   const cjkCount = cjk?.length ?? 0;
   return cjkCount + Math.ceil((text.length - cjkCount) / 4);
@@ -8561,6 +8632,23 @@ function truncate2(s, n) {
   return s.slice(0, n - 1) + "\u2026";
 }
 
+// src/compat.ts
+function normalizeSystemPrompt(input) {
+  if (input === void 0) return "";
+  if (Array.isArray(input)) return input.join("\n");
+  return input;
+}
+function formatSystemPromptForEvent(base, append) {
+  const normalized = normalizeSystemPrompt(base);
+  return `${normalized}
+
+${append}`;
+}
+function getSystemPromptText(ctx) {
+  const result = ctx.getSystemPrompt?.();
+  return normalizeSystemPrompt(result);
+}
+
 // src/commands.ts
 function makeCommands(runtime) {
   return [
@@ -8648,7 +8736,7 @@ async function statusReport(runtime, ctx) {
   const bd = nudge?.contextBreakdown;
   const limit = config.modelContextLimit;
   const classified = bd ? bd.system + bd.tool + bd.summaries + bd.code + bd.text : 0;
-  const systemPromptText = ctx.getSystemPrompt?.() ?? "";
+  const systemPromptText = getSystemPromptText(ctx);
   const systemPromptTokens = systemPromptText ? defaultCountTokens(systemPromptText) : 0;
   const framework = bd ? Math.max(0, tokenCount - classified - systemPromptTokens) : 0;
   const displayTotal = tokenCount;
@@ -8656,7 +8744,7 @@ async function statusReport(runtime, ctx) {
   const activeBlocksList = state.blocks.filter((b) => b.active);
   const totalBlocksList = state.blocks;
   const lines = [];
-  const versionStr = "0.1.29" ? `billion-context-pi@${"0.1.29"}` : "";
+  const versionStr = "0.1.31" ? `billion-context-pi@${"0.1.31"}` : "";
   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");
@@ -8961,11 +9049,12 @@ async function readPackageJson(path4) {
 }
 function findNpmRoot(extDir) {
   let dir = dirname3(extDir);
-  while (dir !== "/" && dir !== ".") {
+  for (; ; ) {
     if (dir.endsWith("node_modules")) return dirname3(dir);
-    dir = dirname3(dir);
+    const parent = dirname3(dir);
+    if (parent === dir) return void 0;
+    dir = parent;
   }
-  return void 0;
 }
 async function findExtensionDir() {
   let dir = dirname3(fileURLToPath(import.meta.url));
@@ -9021,7 +9110,7 @@ async function checkForUpdate(autoUpdate, notify) {
     const data = await res.json();
     const latest = data.version;
     if (!latest) return;
-    const current = runtimeVersion ?? "0.1.29";
+    const current = runtimeVersion ?? "0.1.31";
     const hasUpdate = isNewer(latest, current);
     debug.event("update-check", {
       current,
@@ -9260,7 +9349,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.29" : null });
+    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.1.31" : null });
     try {
       const user = await loadUserConfig(ctx.cwd);
       runtime.setAdapter(applyUserConfig(runtime.adapter, user));
@@ -9289,7 +9378,7 @@ function wireContextTransform(pi, runtime) {
     const sid = ctx.sessionManager.getSessionId();
     const release = await runtime.acquireLock(sid);
     try {
-      const { state, coreMessages, entries } = await runtime.stateFor(ctx);
+      const { state, coreMessages, entries } = await runtime.stateFor(ctx, event.messages);
       const config = runtime.configFor(ctx);
       const coveredIds = collectCoveredMessageIds(state);
       const realUsage = ctx.getContextUsage?.();
@@ -9382,15 +9471,13 @@ function wireSystemPrompt(pi, runtime) {
     const delegate = runtime.adapter.delegate !== false;
     const prompt = delegate ? `${ACP_SYSTEM_PROMPT}
 ${ACP_DELEGATE_PROMPT}` : ACP_SYSTEM_PROMPT;
-    return { systemPrompt: `${event.systemPrompt}
-
-${prompt}` };
+    return { systemPrompt: formatSystemPromptForEvent(event.systemPrompt, prompt) };
   });
 }
 function collectOriginals(entries) {
   const map = /* @__PURE__ */ new Map();
   for (const entry of entries) {
-    if (entry.type === "message") {
+    if (entry.type === "message" && entry.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;