billion-context-pi 0.1.69-pr.428.222 → 0.1.69

package/dist/index.js

@@ -3404,7 +3404,7 @@ function buildStatusReport(state, messages, countTokens, options = {}) {
   const limit = options.limit ?? 30;
   const activeBlocks2 = state.blocks.filter((b2) => b2.active).sort((a, b2) => numericPart2(a.blockId) - numericPart2(b2.blockId));
   if (scope === "compressed") {
-    return renderCompressedDrilldown(activeBlocks2, state, sort, limit, countTokens);
+    return renderCompressedDrilldown(activeBlocks2, state, sort, limit, countTokens, options.meta);
   }
   const { visible, summaryTokens } = collectVisible(messages, state, countTokens);
   if (scope === "uncompressed") {
@@ -3413,10 +3413,23 @@ function buildStatusReport(state, messages, countTokens, options = {}) {
     }
     return renderUncompressedRanges(visible);
   }
-  return renderOverview(visible, summaryTokens, activeBlocks2, state, countTokens, limit);
+  return renderOverview(visible, summaryTokens, activeBlocks2, state, countTokens, limit, options.meta);
 }
-function renderOverview(visible, summaryTokens, blocks, state, countTokens, limit) {
+function surfaceLine(meta) {
+  if (!meta) return null;
+  const parts = [];
+  if (meta.pack) parts.push(`pack=${meta.pack}${meta.packVersion ? ` v${meta.packVersion}` : ""}`);
+  if (meta.host) parts.push(`host=${meta.host}`);
+  if (parts.length === 0) return null;
+  return `ACTIVE SURFACE: ${parts.join(" | ")}`;
+}
+function renderOverview(visible, summaryTokens, blocks, state, countTokens, limit, meta) {
   const lines = [];
+  const surface = surfaceLine(meta);
+  if (surface) {
+    lines.push(surface);
+    lines.push("");
+  }
   const toolTypeMap = /* @__PURE__ */ new Map();
   for (const message of visible) {
     toolTypeMap.set(message.tool, (toolTypeMap.get(message.tool) ?? 0) + message.tokens);
@@ -3533,7 +3546,7 @@ function renderMessageDrilldown(visible, toolFilter, sort, limit) {
   }
   return lines.join("\n");
 }
-function renderCompressedDrilldown(blocks, state, sort, limit, countTokens) {
+function renderCompressedDrilldown(blocks, state, sort, limit, countTokens, meta) {
   let sorted = [...blocks];
   if (sort === "time") sorted.sort((a, b2) => a.createdAt - b2.createdAt);
   else if (sort === "age") sorted.sort((a, b2) => b2.survivedCount - a.survivedCount);
@@ -3546,9 +3559,15 @@ function renderCompressedDrilldown(blocks, state, sort, limit, countTokens) {
     (s, b2) => s + effectiveCompressedTokens(b2, state, countTokens),
     0
   );
-  const lines = [
+  const lines = [];
+  const surface = surfaceLine(meta);
+  if (surface) {
+    lines.push(surface);
+    lines.push("");
+  }
+  lines.push(
     `COMPRESSED \u2014 ${sorted.length} blocks | ${formatTokens2(totalEffective)} original \u2192 ${formatTokens2(totalSummary)} summary`
-  ];
+  );
   const breakdown = tierBreakdown(sorted, countTokens);
   if (breakdown) lines.push(`Tier usage: ${breakdown}`);
   lines.push("");
@@ -5189,6 +5208,7 @@ var SessionStateStore = class {
     let state = createInitialState();
     let liveRefOrigins = [];
     let derivedFrom = null;
+    let activePack;
     if (file) {
       try {
         const raw = await fs.readFile(file, "utf8");
@@ -5197,6 +5217,7 @@ var SessionStateStore = class {
           state = mergeInitialState(parsed);
           liveRefOrigins = parseLiveRefOrigins(parsed.liveRefOrigins);
           derivedFrom = parseDerivedFrom(parsed.derivedFrom);
+          if (typeof parsed.activePack === "string" && parsed.activePack) activePack = parsed.activePack;
         }
       } catch (e) {
         const code = e.code;
@@ -5209,16 +5230,27 @@ var SessionStateStore = class {
         if (parentState) state = parentState;
       }
     }
-    this.cache.set(key, { state, liveRefOrigins, derivedFrom });
+    this.cache.set(key, { state, liveRefOrigins, derivedFrom, activePack });
     return state;
   }
+  /** Stamp the effective prompt pack for the live session (audit trail:
+   *  persisted into the sidecar on the next save). */
+  setActivePack(sessionFile, sessionId, activePack) {
+    const key = cacheKey(sessionFile, sessionId);
+    const slot = this.cache.get(key);
+    if (slot) this.cache.set(key, { ...slot, activePack });
+  }
+  getActivePack(sessionFile, sessionId) {
+    return this.cache.get(cacheKey(sessionFile, sessionId))?.activePack;
+  }
   async save(state, sessionFile, sessionId) {
     const file = stateFileFor(sessionFile);
     const key = cacheKey(sessionFile, sessionId);
     const prev = this.cache.get(key);
     const liveRefOrigins = prev?.liveRefOrigins ?? [];
     const derivedFrom = prev?.derivedFrom ?? null;
-    this.cache.set(key, { state, liveRefOrigins, derivedFrom });
+    const activePack = prev?.activePack;
+    this.cache.set(key, { state, liveRefOrigins, derivedFrom, activePack });
     if (!file) return;
     const dir = path3.dirname(file);
     await fs.mkdir(dir, { recursive: true }).catch((e) => {
@@ -5228,6 +5260,7 @@ var SessionStateStore = class {
     try {
       const payload = { ...state, liveRefOrigins };
       if (derivedFrom) payload.derivedFrom = derivedFrom;
+      if (activePack) payload.activePack = activePack;
       await fs.writeFile(tmp, JSON.stringify(payload), "utf8");
       await fs.rename(tmp, file);
     } catch (e) {
@@ -11542,6 +11575,147 @@ function formatSize(tokens) {
   return `${(tokens / 1e6).toFixed(1)}M`;
 }
 
+// src/prompt-pack.ts
+import { readFileSync as readFileSync4 } from "fs";
+import * as path6 from "path";
+import { homedir as homedir5 } from "os";
+function defaultPackSources2(cwd) {
+  return defaultPackSources({
+    projectDir: path6.join(cwd, CONFIG_DIR_NAME2, "acp", "packs"),
+    userDirs: [path6.join(homedir5(), CONFIG_DIR_NAME2, "acp", "packs")]
+  });
+}
+function packResolver(cwd) {
+  return createPackResolver(defaultPackSources2(cwd));
+}
+function resolvePackName(adapter, provider, modelId) {
+  const raw = resolveCompress(adapter.compress, provider, modelId).promptPack;
+  return typeof raw === "string" && isValidPackName(raw) ? raw : "default";
+}
+function resolveActivePack(adapter, cwd, provider, modelId, resolver) {
+  const name = resolvePackName(adapter, provider, modelId);
+  if (name === "default") return defaultPack;
+  const r = resolver ?? packResolver(cwd);
+  return r.resolve(name) ?? defaultPack;
+}
+var HOST_VERSION = (() => {
+  try {
+    return "0.1.69";
+  } catch {
+    return "dev";
+  }
+})();
+function surfaceMetaOf(pack, requested) {
+  const resolved = requested !== "default" && pack.name === requested ? requested : "default";
+  return { pack: resolved, packVersion: pack.version, host: `billion-context-pi ${HOST_VERSION}` };
+}
+function resolveSurfaceMeta(adapter, cwd, provider, modelId, resolver) {
+  return surfaceMetaOf(
+    resolveActivePack(adapter, cwd, provider, modelId, resolver),
+    resolvePackName(adapter, provider, modelId)
+  );
+}
+var ACP_TOOLS = /* @__PURE__ */ new Set(["compress", "decompress", "search_context", "acp_status"]);
+function piAdapterSurface(pack) {
+  const raw = pack.surface.adapters?.pi;
+  const rec = raw && typeof raw === "object" && !Array.isArray(raw) ? raw : {};
+  const toolExtras = {};
+  const extrasRaw = rec.toolExtras;
+  if (extrasRaw && typeof extrasRaw === "object" && !Array.isArray(extrasRaw)) {
+    for (const [tool, value] of Object.entries(extrasRaw)) {
+      if (!ACP_TOOLS.has(tool) || !value || typeof value !== "object") continue;
+      const src = value;
+      const entry = {};
+      if (typeof src.promptSnippet === "string") entry.promptSnippet = src.promptSnippet;
+      if (typeof src.promptGuidelines === "string") {
+        entry.promptGuidelines = [src.promptGuidelines];
+      } else if (Array.isArray(src.promptGuidelines)) {
+        const guidelines = src.promptGuidelines.filter((g2) => typeof g2 === "string");
+        if (guidelines.length === src.promptGuidelines.length) entry.promptGuidelines = guidelines;
+      }
+      if (Object.keys(entry).length > 0) toolExtras[tool] = entry;
+    }
+  }
+  const surface = {
+    promptSections: sanitizePromptSections(rec.promptSections),
+    toolExtras
+  };
+  if (typeof rec.delegatePrompt === "string" || rec.delegatePrompt === null) {
+    surface.delegatePrompt = rec.delegatePrompt;
+  }
+  return surface;
+}
+function packToolPrompts(pack) {
+  const out = {};
+  const toolPrompts = pack?.surface.toolPrompts;
+  if (toolPrompts) {
+    for (const [tool, overrides] of Object.entries(toolPrompts)) {
+      if (ACP_TOOLS.has(tool)) out[tool] = { ...overrides };
+    }
+  }
+  if (pack) {
+    for (const [tool, extras] of Object.entries(piAdapterSurface(pack).toolExtras)) {
+      out[tool] = { ...out[tool], ...extras };
+    }
+  }
+  return out;
+}
+function mergeToolPrompts(pack, inline) {
+  if (!pack) return inline ?? {};
+  if (!inline) return pack;
+  const out = {};
+  for (const name of /* @__PURE__ */ new Set([...Object.keys(pack), ...Object.keys(inline)])) {
+    const p = pack[name];
+    const i = inline[name];
+    if (!i) {
+      out[name] = p;
+      continue;
+    }
+    if (!p) {
+      out[name] = i;
+      continue;
+    }
+    out[name] = {
+      ...p,
+      ...i,
+      paramDescriptions: { ...p.paramDescriptions, ...i.paramDescriptions }
+    };
+  }
+  return out;
+}
+function mergeSurface(pack, inline) {
+  const s = pack?.surface ?? {};
+  const pi = pack ? piAdapterSurface(pack) : { promptSections: {}, toolExtras: {} };
+  return {
+    prompts: { ...s.prompts ?? {}, ...inline.prompts ?? {} },
+    promptSections: { ...pi.promptSections, ...inline.promptSections ?? {} },
+    nudgeSections: { ...s.nudgeSections ?? {}, ...inline.nudgeSections ?? {} },
+    toolPrompts: mergeToolPrompts(packToolPrompts(pack), inline.toolPrompts),
+    delegatePrompt: inline.delegatePrompt !== void 0 ? inline.delegatePrompt : pi.delegatePrompt
+  };
+}
+function readToolSurfaceWithPacks(cwd) {
+  const home = homedir5();
+  let inline = {};
+  let packName = "default";
+  for (const base of [path6.join(home, CONFIG_DIR_NAME2), path6.join(cwd, CONFIG_DIR_NAME2)]) {
+    try {
+      const parsed = JSON.parse(readFileSync4(path6.join(base, "acp.json"), "utf8"));
+      if (parsed && typeof parsed === "object") {
+        const rec = parsed;
+        if (rec.toolPrompts) inline = sanitizeToolPrompts(rec.toolPrompts);
+        const c = rec.compress;
+        if (c && typeof c === "object" && typeof c.promptPack === "string") {
+          packName = c.promptPack;
+        }
+      }
+    } catch {
+    }
+  }
+  const pack = packName === "default" || !isValidPackName(packName) ? null : packResolver(cwd).resolve(packName);
+  return mergeToolPrompts(packToolPrompts(pack), inline);
+}
+
 // src/floor-stale.ts
 function validAnchorUsage(u) {
   if (!u) return false;
@@ -11570,7 +11744,7 @@ import {
 import { createWriteStream, existsSync as existsSync3 } from "fs";
 import { mkdir as mkdir2, mkdtemp, writeFile as writeFile2, rm, appendFile, readFile, copyFile } from "fs/promises";
 import { tmpdir as tmpdir2 } from "os";
-import { dirname as dirname4, join as join8, resolve as resolvePath } from "path";
+import { dirname as dirname4, join as join9, resolve as resolvePath } from "path";
 
 // src/footer-status.ts
 var FOOTER_STATUS_KEY = "billion-context-pi";
@@ -11989,7 +12163,7 @@ var EOF_GRACE_MS = 1e4;
 var SETTLED_GRACE_MS = 1e4;
 var KILL_GRACE_MS = 1e4;
 var RESULT_SUMMARY_CHARS = 500;
-var OUT_DIR = join8(tmpdir2(), "acp-delegate");
+var OUT_DIR = join9(tmpdir2(), "acp-delegate");
 var NOTIFY_COALESCE_MS = 2e3;
 var NOTIFY_COALESCE_MAX_MS = 1e4;
 var SESSION_EXT = ".session.jsonl";
@@ -12019,11 +12193,11 @@ function delegateChildEnv(parentDepth, maxDepth) {
   };
 }
 var PI_CLI_ENTRY_RE = /[\\/]pi-coding-agent[\\/]dist[\\/]cli\.js$/;
-var PI_PACKAGE_REL = join8("@earendil-works", "pi-coding-agent", "dist", "cli.js");
+var PI_PACKAGE_REL = join9("@earendil-works", "pi-coding-agent", "dist", "cli.js");
 function probeUpFromArgv(argv1) {
   let dir = resolvePath(dirname4(argv1) || process.cwd());
   for (; ; ) {
-    const candidate = join8(dir, "node_modules", PI_PACKAGE_REL);
+    const candidate = join9(dir, "node_modules", PI_PACKAGE_REL);
     if (existsSync3(candidate)) return candidate;
     const parent = dirname4(dir);
     if (parent === dir) return null;
@@ -12033,12 +12207,12 @@ function probeUpFromArgv(argv1) {
 function piCliGlobalCandidates(env) {
   const candidates = [];
   if (process.platform === "win32") {
-    if (env.APPDATA) candidates.push(join8(env.APPDATA, "npm", "node_modules", PI_PACKAGE_REL));
+    if (env.APPDATA) candidates.push(join9(env.APPDATA, "npm", "node_modules", PI_PACKAGE_REL));
   } else {
     const home = env.HOME ?? env.USERPROFILE;
-    if (home) candidates.push(join8(home, ".local", "lib", "node_modules", PI_PACKAGE_REL));
-    candidates.push(join8("/usr/local", "lib", "node_modules", PI_PACKAGE_REL));
-    candidates.push(join8("/usr", "lib", "node_modules", PI_PACKAGE_REL));
+    if (home) candidates.push(join9(home, ".local", "lib", "node_modules", PI_PACKAGE_REL));
+    candidates.push(join9("/usr/local", "lib", "node_modules", PI_PACKAGE_REL));
+    candidates.push(join9("/usr", "lib", "node_modules", PI_PACKAGE_REL));
   }
   return candidates;
 }
@@ -12056,7 +12230,7 @@ function resolvePiCliEntry(argv1, env = process.env, piHost = true) {
   }
   return argv1;
 }
-var ACP_TOOLS = ["compress", "decompress", "search_context", "acp_status"];
+var ACP_TOOLS2 = ["compress", "decompress", "search_context", "acp_status"];
 var RESTRICTED_TOOLS = "read,bash,grep,find,ls";
 var AGENTS = {
   reviewer: {
@@ -12198,7 +12372,7 @@ function markDelegateResultRead(filePath) {
   const abs = resolvePath(filePath);
   let matched = false;
   for (const run of runs.values()) {
-    if (join8(OUT_DIR, `${run.runId}.out`) === abs) {
+    if (join9(OUT_DIR, `${run.runId}.out`) === abs) {
       run.readAt = Date.now();
       suppressIfReadNow(run);
       matched = true;
@@ -12247,9 +12421,9 @@ function toFleetRunView(r) {
     exitLabel: exitLabel(r.exitCode ?? null, r.exitSignal),
     timedOut: r.timedOut,
     resumedFrom: r.resumedFrom,
-    replyFile: r.result?.file ?? join8(OUT_DIR, `${r.runId}.out`),
+    replyFile: r.result?.file ?? join9(OUT_DIR, `${r.runId}.out`),
     activityFile: r.activityFile,
-    sessionFile: join8(OUT_DIR, `${r.runId}${SESSION_EXT}`),
+    sessionFile: join9(OUT_DIR, `${r.runId}${SESSION_EXT}`),
     usage: r.usage
   };
 }
@@ -12708,7 +12882,7 @@ function makeDelegateWaitTool(_pi) {
     const displayMode = delegateDisplayUsage;
     if (run.status === "cancelled") {
       run.consumed = true;
-      const file = run.result?.file || join8(OUT_DIR, `${args.runId}.out`);
+      const file = run.result?.file || join9(OUT_DIR, `${args.runId}.out`);
       return buildWaitResult(run, `Delegate \`${args.runId}\` was cancelled. ${cancelledFileNote(args.runId, file)}${remainingLineForWait(args.runId)}`, displayMode);
     }
     if (run.status === "completed" || run.status === "failed") {
@@ -12744,7 +12918,7 @@ function makeDelegateWaitTool(_pi) {
       run.waiter = () => {
         run.consumed = true;
         if (run.status === "cancelled") {
-          const file = run.result?.file || join8(OUT_DIR, `${run.runId}.out`);
+          const file = run.result?.file || join9(OUT_DIR, `${run.runId}.out`);
           finish2(buildWaitResult(run, `Delegate \`${run.runId}\` was cancelled. ${cancelledFileNote(run.runId, file)}${remainingLineForWait(run.runId)}`, displayMode));
           return;
         }
@@ -12798,7 +12972,7 @@ function makeDelegateCancelTool(_pi) {
     }
     delegateStatusWidget.poke();
     const displayMode = delegateDisplayUsage;
-    const file = join8(OUT_DIR, `${runId}.out`);
+    const file = join9(OUT_DIR, `${runId}.out`);
     return buildCancelResult(run, `Cancelled ${runId} (${run.agent}). ${cancelledFileNote(runId, file)}`, displayMode);
   };
   return {
@@ -12850,7 +13024,7 @@ async function runDelegate(pi, args, ctx, signal) {
     if (prev && (prev.status === "running" || prev.status === "queued")) {
       return `Cannot resume from run \`${args.resumeFrom}\`: it has not finished yet (${prev.status}). Wait for it to finish first, then resume from its final session.`;
     }
-    prevSession = join8(OUT_DIR, `${args.resumeFrom}${SESSION_EXT}`);
+    prevSession = join9(OUT_DIR, `${args.resumeFrom}${SESSION_EXT}`);
     if (!existsSync3(prevSession)) {
       return `Cannot resume ${args.resumeFrom}: no session file at ${prevSession} (the run produced no assistant output, or the file was cleaned up). Re-dispatch the task fresh instead.`;
     }
@@ -12874,8 +13048,8 @@ async function runDelegate(pi, args, ctx, signal) {
     await copyFile(prevSession, sessionFile);
   }
   if (isAsync) {
-    const replyFile = join8(OUT_DIR, `${runId}.out`);
-    const activityFile = join8(OUT_DIR, `${runId}.activity`);
+    const replyFile = join9(OUT_DIR, `${runId}.out`);
+    const activityFile = join9(OUT_DIR, `${runId}.activity`);
     const run = {
       runId,
       agent: args.agent,
@@ -13102,8 +13276,8 @@ ${output}`);
   return formatSyncResult(args.agent, runId, taskText, result, file);
 }
 async function buildChildArgs(args, rolePrompt, ctx, runId) {
-  const tmpDir = await mkdtemp(join8(tmpdir2(), "acp-delegate-"));
-  const promptFile = join8(tmpDir, "role.md");
+  const tmpDir = await mkdtemp(join9(tmpdir2(), "acp-delegate-"));
+  const promptFile = join9(tmpDir, "role.md");
   await writeFile2(promptFile, `${rolePrompt}
 
 ---
@@ -13112,12 +13286,12 @@ Complete the task below.`, "utf8");
   const isAsync = args.async !== false && ctx.mode !== "print" && ctx.mode !== "json";
   const useJsonStream = isAsync && isPiHost(ctx.sessionManager);
   const useSession = isPiHost(ctx.sessionManager);
-  const sessionFile = useSession ? join8(OUT_DIR, `${runId}${SESSION_EXT}`) : null;
+  const sessionFile = useSession ? join9(OUT_DIR, `${runId}${SESSION_EXT}`) : null;
   const sessionArgs = sessionFile ? ["--session", sessionFile, "--session-dir", OUT_DIR] : ["--no-session"];
   const cliArgs = useJsonStream ? ["--mode", "json", ...sessionArgs, "--append-system-prompt", promptFile] : ["-p", ...sessionArgs, "--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])];
+    const merged = [.../* @__PURE__ */ new Set([...agentDef.tools.split(",").map((s) => s.trim()), ...ACP_TOOLS2])];
     cliArgs.push("--tools", merged.join(","));
   }
   const roleCfg = delegateDefaults.agents?.[args.agent];
@@ -13349,7 +13523,7 @@ async function persistResult(runId, body) {
     await mkdir2(OUT_DIR, { recursive: true });
   } catch {
   }
-  const file = join8(OUT_DIR, `${runId}.out`);
+  const file = join9(OUT_DIR, `${runId}.out`);
   try {
     await writeFile2(file, body, "utf8");
     return file;
@@ -13422,12 +13596,15 @@ async function handleStatus(args, runtime, ctx) {
     tokenCount: anchorStale ? viewSentTokens : Math.max(viewSentTokens, providerReal)
   });
   const processed = turn.messages;
+  const modelInfo = ctx.model;
+  const meta = resolveSurfaceMeta(runtime.adapter, ctx?.cwd ?? process.cwd(), modelInfo?.provider, modelInfo?.id);
   const base = buildStatusReport(turn.state, processed, defaultCountTokens, {
     scope: args.scope,
     view: args.view,
     tool: args.tool,
     sort: args.sort,
-    limit: args.limit
+    limit: args.limit,
+    meta
   });
   if (args.scope) return base;
   const nudge = turn.nudge;
@@ -13472,12 +13649,12 @@ ${extra.join("\n")}` : base;
 }
 
 // src/commands.ts
-import * as path11 from "path";
+import * as path12 from "path";
 
 // src/export.ts
 import { mkdirSync as mkdirSync2, writeFileSync } from "fs";
 import { promises as fs3 } from "fs";
-import * as path6 from "path";
+import * as path7 from "path";
 import { SessionManager } from "@earendil-works/pi-coding-agent";
 var ACP_STATE_SUFFIX = ".acp.json";
 function truncate3(text, max) {
@@ -13521,7 +13698,7 @@ async function loadAllSessions(sessionDir) {
     if (!name.endsWith(ACP_STATE_SUFFIX)) continue;
     const jsonl = name.slice(0, -ACP_STATE_SUFFIX.length);
     try {
-      sessions.push(await loadSession(path6.join(sessionDir, jsonl), store));
+      sessions.push(await loadSession(path7.join(sessionDir, jsonl), store));
     } catch {
     }
   }
@@ -13561,7 +13738,7 @@ async function exportSession(selector, opts, sessionDir) {
     }
   });
   if (opts.output) {
-    mkdirSync2(path6.dirname(path6.resolve(opts.output)), { recursive: true });
+    mkdirSync2(path7.dirname(path7.resolve(opts.output)), { recursive: true });
     writeFileSync(opts.output, markdown, "utf8");
     return `written to ${opts.output}`;
   }
@@ -15251,12 +15428,12 @@ var KITTY_PRINTABLE_ALLOWED_MODIFIERS = MODIFIERS.shift | LOCK_MASK;
 // node_modules/@earendil-works/pi-tui/dist/tui.js
 import * as fs4 from "fs";
 import * as os from "os";
-import * as path7 from "path";
+import * as path8 from "path";
 import { performance } from "perf_hooks";
 
 // node_modules/@earendil-works/pi-tui/dist/terminal-image.js
 import { execSync } from "child_process";
-import { homedir as homedir5 } from "os";
+import { homedir as homedir6 } from "os";
 import { isAbsolute as isAbsolute2 } from "path";
 import { pathToFileURL } from "url";
 var cachedCapabilities = null;
@@ -17193,12 +17370,12 @@ var Markdown = class {
 // node_modules/@earendil-works/pi-tui/dist/terminal.js
 import * as fs5 from "fs";
 import { createRequire as createRequire3 } from "module";
-import * as path9 from "path";
+import * as path10 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 
 // node_modules/@earendil-works/pi-tui/dist/native-modifiers.js
 import { createRequire as createRequire2 } from "module";
-import * as path8 from "path";
+import * as path9 from "path";
 import { fileURLToPath } from "url";
 var cjsRequire = createRequire2(import.meta.url);
 
@@ -17716,16 +17893,16 @@ async function openFleetInspector(ctx) {
 // src/setup-subagent-tools.ts
 import * as fs6 from "fs";
 import * as os2 from "os";
-import * as path10 from "path";
-var ACP_TOOLS2 = ["compress", "decompress", "search_context", "acp_status"];
+import * as path11 from "path";
+var ACP_TOOLS3 = ["compress", "decompress", "search_context", "acp_status"];
 function resolveAgentDir() {
   const envDir = process.env.PI_CODING_AGENT_DIR;
   if (envDir) {
     if (envDir === "~") return os2.homedir();
-    if (envDir.startsWith("~/")) return path10.join(os2.homedir(), envDir.slice(2));
+    if (envDir.startsWith("~/")) return path11.join(os2.homedir(), envDir.slice(2));
     return envDir;
   }
-  return path10.join(os2.homedir(), CONFIG_DIR_NAME2, "agent");
+  return path11.join(os2.homedir(), CONFIG_DIR_NAME2, "agent");
 }
 function parseFrontmatterTools(content) {
   const match = content.match(/^---\r?\n([\s\S]*?)\r?\n---/);
@@ -17750,15 +17927,15 @@ function parseFrontmatterTools(content) {
 }
 function findPiSubagentsInstall(agentDir, cwd) {
   const candidates = [
-    path10.join(agentDir, "npm", "node_modules", "pi-subagents"),
-    path10.join(cwd, CONFIG_DIR_NAME2, "npm", "node_modules", "pi-subagents")
+    path11.join(agentDir, "npm", "node_modules", "pi-subagents"),
+    path11.join(cwd, CONFIG_DIR_NAME2, "npm", "node_modules", "pi-subagents")
   ];
   const extensionRoots = [
-    path10.join(agentDir, "extensions"),
-    path10.join(cwd, CONFIG_DIR_NAME2, "extensions")
+    path11.join(agentDir, "extensions"),
+    path11.join(cwd, CONFIG_DIR_NAME2, "extensions")
   ];
   for (const dir of candidates) {
-    if (fs6.existsSync(path10.join(dir, "package.json"))) return dir;
+    if (fs6.existsSync(path11.join(dir, "package.json"))) return dir;
   }
   for (const root of extensionRoots) {
     let entries;
@@ -17769,10 +17946,10 @@ function findPiSubagentsInstall(agentDir, cwd) {
     }
     for (const entry of entries) {
       if (!entry.isDirectory()) continue;
-      const pkgPath = path10.join(root, entry.name, "package.json");
+      const pkgPath = path11.join(root, entry.name, "package.json");
       try {
         if (JSON.parse(fs6.readFileSync(pkgPath, "utf-8")).name === "pi-subagents") {
-          return path10.join(root, entry.name);
+          return path11.join(root, entry.name);
         }
       } catch {
       }
@@ -17781,7 +17958,7 @@ function findPiSubagentsInstall(agentDir, cwd) {
   return null;
 }
 function discoverBuiltinAgents(installDir) {
-  const agentsDir = path10.join(installDir, "agents");
+  const agentsDir = path11.join(installDir, "agents");
   let entries;
   try {
     entries = fs6.readdirSync(agentsDir, { withFileTypes: true });
@@ -17792,7 +17969,7 @@ function discoverBuiltinAgents(installDir) {
   for (const entry of entries) {
     if (!entry.isFile() || !entry.name.endsWith(".md")) continue;
     try {
-      const result = parseFrontmatterTools(fs6.readFileSync(path10.join(agentsDir, entry.name), "utf-8"));
+      const result = parseFrontmatterTools(fs6.readFileSync(path11.join(agentsDir, entry.name), "utf-8"));
       if (result) parsed.push(result);
     } catch {
     }
@@ -17801,7 +17978,7 @@ function discoverBuiltinAgents(installDir) {
 }
 function desiredTools(baseTools) {
   const tools = baseTools ? [...baseTools] : [];
-  for (const tool of ACP_TOOLS2) {
+  for (const tool of ACP_TOOLS3) {
     if (!tools.includes(tool)) tools.push(tool);
   }
   return tools;
@@ -17809,11 +17986,11 @@ function desiredTools(baseTools) {
 function ensureSubagentAcpTools(settingsPath, options) {
   const agentDir = options?.agentDir ?? resolveAgentDir();
   const cwd = options?.cwd ?? process.cwd();
-  const path_ = settingsPath ?? path10.join(agentDir, "settings.json");
+  const path_ = settingsPath ?? path11.join(agentDir, "settings.json");
   let installDir;
   if (options?.installDir) {
-    installDir = path10.resolve(options.installDir);
-    if (!fs6.existsSync(path10.join(installDir, "package.json"))) {
+    installDir = path11.resolve(options.installDir);
+    if (!fs6.existsSync(path11.join(installDir, "package.json"))) {
       return { path: path_, action: "failed", reason: `not a package: ${installDir}` };
     }
   } else {
@@ -17887,7 +18064,7 @@ function ensureSubagentAcpTools(settingsPath, options) {
     for (const b2 of builtins) {
       const entry = writtenOverrides[b2.name];
       const tools = entry?.tools ?? [];
-      if (frontmatterByName.get(b2.name) !== void 0 && !ACP_TOOLS2.every((t) => tools.includes(t))) {
+      if (frontmatterByName.get(b2.name) !== void 0 && !ACP_TOOLS3.every((t) => tools.includes(t))) {
         fs6.copyFileSync(backupPath, path_);
         return { path: path_, action: "failed", reason: "post-write verification failed" };
       }
@@ -18060,7 +18237,7 @@ function resolveSessionDir(sm) {
   const dir = typeof sm.getSessionDir === "function" ? sm.getSessionDir() : void 0;
   if (dir) return dir;
   const file = sm.getSessionFile();
-  return file ? path11.dirname(file) : void 0;
+  return file ? path12.dirname(file) : void 0;
 }
 async function statusReport(runtime, ctx) {
   const { state, coreMessages, entries } = await runtime.stateFor(ctx);
@@ -18077,7 +18254,7 @@ async function statusReport(runtime, ctx) {
   const sentTokens = estimateTokens(coreMessages, coveredIds, imageTokens) + systemPromptTokens;
   const viewSentTokens = adjustedTokenCount(runtime.core, coreMessages, state, config, sentTokens, imageTokens, systemPromptTokens);
   const turn = runtime.core.processTurn({ messages: coreMessages, state, config, tokenCount: anchorStale ? viewSentTokens : Math.max(viewSentTokens, realUsage?.tokens ?? 0) });
-  const versionStr = "0.1.69" ? `billion-context-pi@${"0.1.69"}` : void 0;
+  const versionStr = "0.1.69" ? `billion-context-pi@${"0.1.69"} \xB7 pack: ${resolveSurfaceMeta(runtime.adapter, ctx?.cwd ?? process.cwd(), ctx?.model?.provider, ctx?.model?.id).pack}` : void 0;
   let text = buildStatusPanel({
     version: versionStr,
     tokenCount: sessionTokens,
@@ -18098,130 +18275,6 @@ async function statusReport(runtime, ctx) {
   return text;
 }
 
-// src/prompt-pack.ts
-import { readFileSync as readFileSync5 } from "fs";
-import * as path12 from "path";
-import { homedir as homedir8 } from "os";
-function defaultPackSources2(cwd) {
-  return defaultPackSources({
-    projectDir: path12.join(cwd, CONFIG_DIR_NAME2, "acp", "packs"),
-    userDirs: [path12.join(homedir8(), CONFIG_DIR_NAME2, "acp", "packs")]
-  });
-}
-function packResolver(cwd) {
-  return createPackResolver(defaultPackSources2(cwd));
-}
-function resolvePackName(adapter, provider, modelId) {
-  const raw = resolveCompress(adapter.compress, provider, modelId).promptPack;
-  return typeof raw === "string" && isValidPackName(raw) ? raw : "default";
-}
-function resolveActivePack(adapter, cwd, provider, modelId, resolver) {
-  const name = resolvePackName(adapter, provider, modelId);
-  if (name === "default") return defaultPack;
-  const r = resolver ?? packResolver(cwd);
-  return r.resolve(name) ?? defaultPack;
-}
-var ACP_TOOLS3 = /* @__PURE__ */ new Set(["compress", "decompress", "search_context", "acp_status"]);
-function piAdapterSurface(pack) {
-  const raw = pack.surface.adapters?.pi;
-  const rec = raw && typeof raw === "object" && !Array.isArray(raw) ? raw : {};
-  const toolExtras = {};
-  const extrasRaw = rec.toolExtras;
-  if (extrasRaw && typeof extrasRaw === "object" && !Array.isArray(extrasRaw)) {
-    for (const [tool, value] of Object.entries(extrasRaw)) {
-      if (!ACP_TOOLS3.has(tool) || !value || typeof value !== "object") continue;
-      const src = value;
-      const entry = {};
-      if (typeof src.promptSnippet === "string") entry.promptSnippet = src.promptSnippet;
-      if (typeof src.promptGuidelines === "string") {
-        entry.promptGuidelines = [src.promptGuidelines];
-      } else if (Array.isArray(src.promptGuidelines)) {
-        const guidelines = src.promptGuidelines.filter((g2) => typeof g2 === "string");
-        if (guidelines.length === src.promptGuidelines.length) entry.promptGuidelines = guidelines;
-      }
-      if (Object.keys(entry).length > 0) toolExtras[tool] = entry;
-    }
-  }
-  const surface = {
-    promptSections: sanitizePromptSections(rec.promptSections),
-    toolExtras
-  };
-  if (typeof rec.delegatePrompt === "string" || rec.delegatePrompt === null) {
-    surface.delegatePrompt = rec.delegatePrompt;
-  }
-  return surface;
-}
-function packToolPrompts(pack) {
-  const out = {};
-  const toolPrompts = pack?.surface.toolPrompts;
-  if (toolPrompts) {
-    for (const [tool, overrides] of Object.entries(toolPrompts)) {
-      if (ACP_TOOLS3.has(tool)) out[tool] = { ...overrides };
-    }
-  }
-  if (pack) {
-    for (const [tool, extras] of Object.entries(piAdapterSurface(pack).toolExtras)) {
-      out[tool] = { ...out[tool], ...extras };
-    }
-  }
-  return out;
-}
-function mergeToolPrompts(pack, inline) {
-  if (!pack) return inline ?? {};
-  if (!inline) return pack;
-  const out = {};
-  for (const name of /* @__PURE__ */ new Set([...Object.keys(pack), ...Object.keys(inline)])) {
-    const p = pack[name];
-    const i = inline[name];
-    if (!i) {
-      out[name] = p;
-      continue;
-    }
-    if (!p) {
-      out[name] = i;
-      continue;
-    }
-    out[name] = {
-      ...p,
-      ...i,
-      paramDescriptions: { ...p.paramDescriptions, ...i.paramDescriptions }
-    };
-  }
-  return out;
-}
-function mergeSurface(pack, inline) {
-  const s = pack?.surface ?? {};
-  const pi = pack ? piAdapterSurface(pack) : { promptSections: {}, toolExtras: {} };
-  return {
-    prompts: { ...s.prompts ?? {}, ...inline.prompts ?? {} },
-    promptSections: { ...pi.promptSections, ...inline.promptSections ?? {} },
-    nudgeSections: { ...s.nudgeSections ?? {}, ...inline.nudgeSections ?? {} },
-    toolPrompts: mergeToolPrompts(packToolPrompts(pack), inline.toolPrompts),
-    delegatePrompt: inline.delegatePrompt !== void 0 ? inline.delegatePrompt : pi.delegatePrompt
-  };
-}
-function readToolSurfaceWithPacks(cwd) {
-  const home = homedir8();
-  let inline = {};
-  let packName = "default";
-  for (const base of [path12.join(home, CONFIG_DIR_NAME2), path12.join(cwd, CONFIG_DIR_NAME2)]) {
-    try {
-      const parsed = JSON.parse(readFileSync5(path12.join(base, "acp.json"), "utf8"));
-      if (parsed && typeof parsed === "object") {
-        const rec = parsed;
-        if (rec.toolPrompts) inline = sanitizeToolPrompts(rec.toolPrompts);
-        const c = rec.compress;
-        if (c && typeof c === "object" && typeof c.promptPack === "string") {
-          packName = c.promptPack;
-        }
-      }
-    } catch {
-    }
-  }
-  const pack = packName === "default" || !isValidPackName(packName) ? null : packResolver(cwd).resolve(packName);
-  return mergeToolPrompts(packToolPrompts(pack), inline);
-}
-
 // src/degeneration.ts
 var DEFAULT_DEGENERATION_GUARD = { enabled: true, minRun: 200 };
 var MIN_VALID_MIN_RUN = 8;
@@ -19341,7 +19394,14 @@ function wireSystemPrompt(pi, runtime) {
     if (runtime.refused) return;
     const m2 = ctx?.model;
     const cwd = ctx?.cwd ?? process.cwd();
-    const merged = mergeSurface(resolveActivePack(runtime.adapter, cwd, m2?.provider, m2?.id), runtime.adapter);
+    const requested = resolvePackName(runtime.adapter, m2?.provider, m2?.id);
+    const activePack = resolveActivePack(runtime.adapter, cwd, m2?.provider, m2?.id);
+    const merged = mergeSurface(activePack, runtime.adapter);
+    try {
+      const sid = ctx?.sessionManager?.getSessionId();
+      if (sid) runtime.store.setActivePack(ctx?.sessionManager?.getSessionFile?.(), sid, surfaceMetaOf(activePack, requested).pack);
+    } catch {
+    }
     try {
       runtime.setPrompts(resolvePrompts(merged.prompts, { acknowledgeRisk: runtime.adapter.acknowledgePromptsRisk === true }));
     } catch (e) {