billion-context-pi 0.1.39 → 0.1.41

package/dist/delegate-tool.d.ts

@@ -81,6 +81,11 @@ export declare function makeEventApplier(opts: {
     onUsage?: (usage: Usage) => void;
     onSettled?: () => void;
 }, writers: EventApplierWriters): EventApplier;
+/** Resolve a wait timeout to ms. Agents frequently pass seconds (e.g. 180)
+ *  instead of milliseconds; values below the 1s floor make no sense as a wait
+ *  duration, so rescale them to seconds before clamping — otherwise 180 clamps
+ *  to 1000ms and the wait times out in 1s. */
+export declare function resolveWaitTimeoutMs(raw: number | undefined): number;
 declare const DelegateParams: Type.TObject<{
     agent: Type.TString;
     task: Type.TString;

package/dist/index.js

@@ -2828,6 +2828,19 @@ function clamp(v, lo, hi) {
   return v < lo ? lo : v > hi ? hi : v;
 }
 
+// src/tag-tokens.ts
+function formatTokens3(tokens) {
+  if (tokens < 1e3) return String(tokens);
+  if (tokens < 1e4) return `${(tokens / 1e3).toFixed(1)}K`;
+  return `${Math.round(tokens / 1e3)}K`;
+}
+function stableTagTokens(text) {
+  return formatTokens3(defaultCountTokens(text));
+}
+function rewriteTagTokens(tag, body) {
+  return tag.replace(/tokens="[^"]*"/, `tokens="${stableTagTokens(body)}"`);
+}
+
 // src/messages.ts
 var REF_TAG_SOURCE = "(?:<acp\\s[^>]*>m\\d{5}</acp>|\\[m\\d{1,5}\\])";
 var REF_TAG = new RegExp(`^${REF_TAG_SOURCE}\\s?\\n?`);
@@ -3037,6 +3050,7 @@ function reconstructToolCallMessage(original, firstCore, survivingCallIds) {
     return true;
   });
   const peeled = peelRefTagBlocks(filtered);
+  const stableTag = rewriteTagTokens(tag, coreBodyOf(firstCore.text ?? "", tag));
   const lastTextIdx = [...peeled].reverse().findIndex((b) => b.type === "text");
   if (lastTextIdx >= 0) {
     const idx = peeled.length - 1 - lastTextIdx;
@@ -3044,10 +3058,16 @@ function reconstructToolCallMessage(original, firstCore, survivingCallIds) {
     const baseText = lastBlock.text ?? "";
     peeled[idx] = { ...lastBlock, text: baseText.length > 0 ? `${baseText}
 
-${tag}` : tag };
+${stableTag}` : stableTag };
     return { ...original, content: peeled };
   }
-  return { ...original, content: [{ type: "text", text: tag }, ...peeled] };
+  return { ...original, content: [{ type: "text", text: stableTag }, ...peeled] };
+}
+function coreBodyOf(coreText, tag) {
+  const tagCore = tag.replace(/\s+$/, "");
+  let bodyStart = tagCore.length;
+  if (coreText.charAt(bodyStart) === "\n") bodyStart += 1;
+  return coreText.slice(bodyStart);
 }
 function patchRefTag(original, core) {
   const match = core.text ? core.text.match(REF_TAG) : null;
@@ -3055,15 +3075,13 @@ 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 coreBody = coreBodyOf(core.text ?? "", tag);
   const originalBody = extractText(base.content);
   const trimEnd = (s) => s.replace(/\s+$/, "");
   if (coreBody && trimEnd(coreBody) !== trimEnd(originalBody)) {
-    return rebuildBodyFromCore(original, coreBody, tag);
+    return rebuildBodyFromCore(original, coreBody, rewriteTagTokens(tag, coreBody));
   }
+  const stableTag = rewriteTagTokens(tag, originalBody);
   const rawBlocks = Array.isArray(base.content) ? base.content : typeof base.content === "string" ? [{ type: "text", text: base.content }] : [];
   const peeled = peelRefTagBlocks(rawBlocks);
   const newBlocks = [...peeled];
@@ -3074,7 +3092,7 @@ function patchRefTag(original, core) {
       const baseText = b.text.replace(/\n*$/, "");
       newBlocks[i] = { ...b, text: `${baseText}
 
-${tag}` };
+${stableTag}` };
       injected = true;
       break;
     }
@@ -3084,7 +3102,7 @@ ${tag}` };
   }
   return {
     ...original,
-    content: [...peeled, { type: "text", text: tag }]
+    content: [...peeled, { type: "text", text: stableTag }]
   };
 }
 function rebuildBodyFromCore(original, coreBody, tag) {
@@ -3341,6 +3359,64 @@ function mergeInitialState(parsed) {
   };
 }
 
+// src/user-config.ts
+import { promises as fs2 } from "fs";
+import * as path3 from "path";
+import { homedir as homedir2 } from "os";
+import { CONFIG_DIR_NAME as CONFIG_DIR_NAME2 } from "@earendil-works/pi-coding-agent";
+async function loadUserConfig(cwd) {
+  const home = homedir2();
+  const merged = {};
+  for (const base of [join4(home, CONFIG_DIR_NAME2), join4(cwd, CONFIG_DIR_NAME2)]) {
+    const file = join4(base, "acp.json");
+    try {
+      const raw = await fs2.readFile(file, "utf8");
+      const parsed = JSON.parse(raw);
+      if (parsed && typeof parsed === "object") {
+        Object.assign(merged, pickKnown(parsed));
+        debug.event("config-loaded", { file });
+      }
+    } catch (e) {
+      const code = e.code;
+      if (code !== "ENOENT") {
+        logWarn("config", { event: "load-failed", file, error: e instanceof Error ? e.message : String(e) });
+      }
+    }
+  }
+  return merged;
+}
+function join4(...parts) {
+  return path3.join(...parts);
+}
+var KNOWN = /* @__PURE__ */ new Set([
+  "debug",
+  "autoUpdate",
+  "modelContextLimit",
+  "toolBashDefaultTimeout",
+  "toolOutputMaxBytes",
+  "delegate",
+  "compress",
+  "displayUsage",
+  "prompts",
+  "acknowledgePromptsRisk"
+]);
+function pickKnown(parsed) {
+  const out = {};
+  for (const [k, v] of Object.entries(parsed)) {
+    if (KNOWN.has(k)) out[k] = v;
+  }
+  return out;
+}
+function applyUserConfig(adapter, user) {
+  return {
+    ...adapter,
+    ...user,
+    coreOverrides: adapter.coreOverrides,
+    protectedTools: adapter.protectedTools,
+    preserveRecentMessages: adapter.preserveRecentMessages
+  };
+}
+
 // src/sequence-match.ts
 function findUniqueLongestRun(candidates, live) {
   if (candidates.length === 0 || live.length === 0) return void 0;
@@ -3565,7 +3641,9 @@ function createRuntime(adapter) {
   const store = new SessionStateStore();
   const lastActiveBlockIds = /* @__PURE__ */ new Map();
   const locks = /* @__PURE__ */ new Map();
+  const factoryAdapter = adapter;
   let adapterRef = adapter;
+  let lastUserConfigKey;
   let promptsRef = defaultPrompts;
   const nudgeShownTurns = /* @__PURE__ */ new Set();
   async function acquireLock(sid) {
@@ -3591,6 +3669,25 @@ function createRuntime(adapter) {
     const m = ctx.model;
     return resolveConfig(adapterRef, liveContextLimit(ctx), m?.provider, m?.id);
   }
+  async function reloadConfig(cwd) {
+    let user;
+    try {
+      user = await loadUserConfig(cwd);
+    } catch (e) {
+      logWarn("runtime", { event: "config-reload-failed", error: e instanceof Error ? e.message : String(e) });
+      return;
+    }
+    try {
+      const key = JSON.stringify(user);
+      if (key === lastUserConfigKey) return;
+      lastUserConfigKey = key;
+      adapterRef = applyUserConfig(factoryAdapter, user);
+      if (adapterRef.debug !== void 0) setDebugEnabled(adapterRef.debug);
+      logInfo("runtime", { event: "config-reloaded", limit: adapterRef.modelContextLimit ?? null });
+    } catch (e) {
+      logWarn("runtime", { event: "config-reload-failed", error: e instanceof Error ? e.message : String(e) });
+    }
+  }
   async function stateFor(ctx, liveMessages) {
     const sm = ctx.sessionManager;
     const sessionFile = sm.getSessionFile() ?? void 0;
@@ -3626,8 +3723,6 @@ function createRuntime(adapter) {
     countModelId = m;
   }, noteActiveBlocks, clearSessionTracking, get adapter() {
     return adapterRef;
-  }, setAdapter: (a) => {
-    adapterRef = a;
   }, get prompts() {
     return promptsRef;
   }, setPrompts: (p) => {
@@ -3636,7 +3731,7 @@ function createRuntime(adapter) {
     nudgeShownTurns.add(k);
   }, nudgeShownFor: (k) => nudgeShownTurns.has(k), clearNudgeTracking: () => {
     nudgeShownTurns.clear();
-  }, liveContextLimit, configFor, stateFor, save, acquireLock };
+  }, liveContextLimit, configFor, reloadConfig, stateFor, save, acquireLock };
 }
 
 // node_modules/typebox/build/system/memory/memory.mjs
@@ -8159,7 +8254,14 @@ async function handleCompress(args, runtime, ctx, toolCallId) {
   });
   await runtime.save(applied.state, ctx);
   const { blocksCreated, tokensCompressed, errors, warnings } = applied.result;
-  const afterTokens = Math.max(0, beforeTokens - tokensCompressed);
+  const afterTurn = runtime.core.processTurn({
+    messages: coreMessages,
+    state: applied.state,
+    config,
+    tokenCount: calibrateTokens(sentTokens, density)
+  });
+  const afterTokens = calibrateTokens(estimateTokens(afterTurn.messages, collectCoveredMessageIds(applied.state)), density);
+  const reclaimed = Math.max(0, beforeTokens - afterTokens);
   const newBlocks = applied.state.blocks.slice(-blocksCreated);
   debug.event("compress-out", {
     sid: ctx.sessionManager.getSessionId(),
@@ -8190,9 +8292,9 @@ async function handleCompress(args, runtime, ctx, toolCallId) {
     logError("compress", { sid: ctx.sessionManager.getSessionId(), event: "errors", count: errors.length, errors: errors.slice(0, 5) });
   }
   if (warnings.length > 0) {
-    logError("compress", { sid: ctx.sessionManager.getSessionId(), event: "warnings", count: warnings.length, warnings: warnings.slice(0, 5) });
+    logWarn("compress", { sid: ctx.sessionManager.getSessionId(), event: "warnings", count: warnings.length, warnings: warnings.slice(0, 5) });
   }
-  const lines = [`\u25A3 ACP | ${formatK2(beforeTokens)} \u2192 ${formatK2(afterTokens)} tokens (~${formatK2(tokensCompressed)} reclaimed, ${blocksCreated} block${blocksCreated > 1 ? "s" : ""})`];
+  const lines = [`\u25A3 ACP | ${formatK2(beforeTokens)} \u2192 ${formatK2(afterTokens)} tokens (~${formatK2(reclaimed)} 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");
@@ -8201,9 +8303,9 @@ async function handleCompress(args, runtime, ctx, toolCallId) {
 // src/decompress-tool.ts
 import { writeFile, mkdir } from "fs/promises";
 import { existsSync as existsSync2, lstatSync, readlinkSync, realpathSync } from "fs";
-import { resolve, relative, isAbsolute, join as join3, basename as basename2, dirname as dirname3 } from "path";
-import { tmpdir, homedir as homedir2 } from "os";
-var AUTO_DIR = join3(homedir2() || tmpdir(), ".cache", "pi", "acp-decompress");
+import { resolve, relative, isAbsolute, join as join5, basename as basename2, dirname as dirname3 } from "path";
+import { tmpdir, homedir as homedir3 } from "os";
+var AUTO_DIR = join5(homedir3() || tmpdir(), ".cache", "pi", "acp-decompress");
 var PREVIEW_CHARS = 600;
 var MESSAGE_INLINE_THRESHOLD = 2e3;
 var DecompressParams = typebox_exports.Object({
@@ -8239,11 +8341,11 @@ function makeDecompressTool(runtime) {
 }
 var ALLOWED_DIRS = [
   tmpdir(),
-  join3(homedir2(), ".cache", "opencode"),
-  join3(homedir2(), ".cache", "pi")
+  join5(homedir3(), ".cache", "opencode"),
+  join5(homedir3(), ".cache", "pi")
 ];
 function resolveToFilePath(targetPath) {
-  const expanded = targetPath.startsWith("~/") ? join3(homedir2(), targetPath.slice(2)) : targetPath;
+  const expanded = targetPath.startsWith("~/") ? join5(homedir3(), targetPath.slice(2)) : targetPath;
   const resolved = resolve(expanded);
   let probe = resolved;
   const suffix = [];
@@ -8254,7 +8356,7 @@ function resolveToFilePath(targetPath) {
   const real = existsSync2(probe) ? realpathSync(probe) : probe;
   let checked = real;
   for (const part of suffix) {
-    checked = join3(checked, part);
+    checked = join5(checked, part);
     try {
       if (lstatSync(checked).isSymbolicLink()) {
         const target = readlinkSync(checked);
@@ -8280,7 +8382,7 @@ function resolveToFilePath(targetPath) {
   return checked;
 }
 function autoFilePath(blockId) {
-  return join3(AUTO_DIR, `${blockId}-${Date.now()}.txt`);
+  return join5(AUTO_DIR, `${blockId}-${Date.now()}.txt`);
 }
 function headPreview(text) {
   if (text.length <= PREVIEW_CHARS) return text;
@@ -8627,7 +8729,7 @@ import {
 import { createWriteStream, existsSync as existsSync3 } from "fs";
 import { mkdir as mkdir2, mkdtemp, writeFile as writeFile2, rm, appendFile } from "fs/promises";
 import { tmpdir as tmpdir2 } from "os";
-import { dirname as dirname4, join as join4, resolve as resolvePath } from "path";
+import { dirname as dirname4, join as join6, resolve as resolvePath } from "path";
 
 // src/footer-status.ts
 var FOOTER_STATUS_KEY = "billion-context-pi";
@@ -9031,7 +9133,7 @@ var IDLE_GRACE_MS = 5 * 6e4;
 var ASYNC_TIMEOUT_MS = 30 * 6e4;
 var KILL_GRACE_MS = 1e4;
 var RESULT_SUMMARY_CHARS = 500;
-var OUT_DIR = join4(tmpdir2(), "acp-delegate");
+var OUT_DIR = join6(tmpdir2(), "acp-delegate");
 function delegateSpawnOptions(cwd, env) {
   return {
     cwd,
@@ -9041,11 +9143,11 @@ function delegateSpawnOptions(cwd, env) {
   };
 }
 var PI_CLI_ENTRY_RE = /[\\/]pi-coding-agent[\\/]dist[\\/]cli\.js$/;
-var PI_PACKAGE_REL = join4("@earendil-works", "pi-coding-agent", "dist", "cli.js");
+var PI_PACKAGE_REL = join6("@earendil-works", "pi-coding-agent", "dist", "cli.js");
 function probeUpFromArgv(argv1) {
   let dir = resolvePath(dirname4(argv1) || process.cwd());
   for (; ; ) {
-    const candidate = join4(dir, "node_modules", PI_PACKAGE_REL);
+    const candidate = join6(dir, "node_modules", PI_PACKAGE_REL);
     if (existsSync3(candidate)) return candidate;
     const parent = dirname4(dir);
     if (parent === dir) return null;
@@ -9055,12 +9157,12 @@ function probeUpFromArgv(argv1) {
 function piCliGlobalCandidates(env) {
   const candidates = [];
   if (process.platform === "win32") {
-    if (env.APPDATA) candidates.push(join4(env.APPDATA, "npm", "node_modules", PI_PACKAGE_REL));
+    if (env.APPDATA) candidates.push(join6(env.APPDATA, "npm", "node_modules", PI_PACKAGE_REL));
   } else {
     const home = env.HOME ?? env.USERPROFILE;
-    if (home) candidates.push(join4(home, ".local", "lib", "node_modules", PI_PACKAGE_REL));
-    candidates.push(join4("/usr/local", "lib", "node_modules", PI_PACKAGE_REL));
-    candidates.push(join4("/usr", "lib", "node_modules", PI_PACKAGE_REL));
+    if (home) candidates.push(join6(home, ".local", "lib", "node_modules", PI_PACKAGE_REL));
+    candidates.push(join6("/usr/local", "lib", "node_modules", PI_PACKAGE_REL));
+    candidates.push(join6("/usr", "lib", "node_modules", PI_PACKAGE_REL));
   }
   return candidates;
 }
@@ -9212,6 +9314,11 @@ function makeEventApplier(opts, writers) {
 }
 var WAIT_TIMEOUT_MS_DEFAULT = 1e4;
 var WAIT_TIMEOUT_MS_MAX = 3e5;
+function resolveWaitTimeoutMs(raw) {
+  if (raw === void 0) return WAIT_TIMEOUT_MS_DEFAULT;
+  const ms = raw < 1e3 ? raw * 1e3 : raw;
+  return Math.min(Math.max(ms, 1e3), WAIT_TIMEOUT_MS_MAX);
+}
 var DelegateParams = typebox_exports.Object({
   agent: typebox_exports.String({
     description: `Role of the delegate. One of: ${AGENT_NAMES.join(", ")}. See tool description for what each does.`
@@ -9243,7 +9350,7 @@ var WaitParams = typebox_exports.Object({
   runId: typebox_exports.String({ description: "The runId returned by acp_delegate to wait for." }),
   timeout: typebox_exports.Optional(
     typebox_exports.Integer({
-      description: `Maximum milliseconds to block waiting for the result. Default ${WAIT_TIMEOUT_MS_DEFAULT} (10s); max ${WAIT_TIMEOUT_MS_MAX} (300s). If the delegate does not finish in time, returns "failed (not ready)" \u2014 do NOT keep waiting or retry; go do other work, and a completion notification will still be injected when it completes.`
+      description: `Maximum time to block waiting for the result, in milliseconds. Default ${WAIT_TIMEOUT_MS_DEFAULT} (10s); max ${WAIT_TIMEOUT_MS_MAX} (300s). Values below 1000 are treated as seconds (so 180 means 180s, not 180ms). If the delegate does not finish in time, returns "failed (not ready)" \u2014 do NOT keep waiting or retry; go do other work, and a completion notification will still be injected when it completes.`
     })
   )
 });
@@ -9402,10 +9509,7 @@ function makeDelegateWaitTool(_pi) {
         }
         return buildWaitResult(run, formatRunResult(run), displayMode);
       }
-      const timeoutMs = Math.min(
-        Math.max(args.timeout ?? WAIT_TIMEOUT_MS_DEFAULT, 1e3),
-        WAIT_TIMEOUT_MS_MAX
-      );
+      const timeoutMs = resolveWaitTimeoutMs(args.timeout);
       if (run.waiter) {
         return { details: void 0, content: [{ type: "text", text: `Delegate \`${args.runId}\` already has a wait in progress; do not wait on it twice.` }] };
       }
@@ -9526,8 +9630,8 @@ async function runDelegate(pi, args, ctx, signal) {
       },
       { eofGraceMs: EOF_GRACE_MS, idleMs: IDLE_GRACE_MS, timeoutMs: ASYNC_TIMEOUT_MS, killGraceMs: KILL_GRACE_MS }
     );
-    const replyFile = join4(OUT_DIR, `${runId}.out`);
-    const activityFile = join4(OUT_DIR, `${runId}.activity`);
+    const replyFile = join6(OUT_DIR, `${runId}.out`);
+    const activityFile = join6(OUT_DIR, `${runId}.activity`);
     await mkdir2(OUT_DIR, { recursive: true });
     const replyStream = createWriteStream(replyFile, { flags: "a" });
     const activityStream = useJsonStream ? createWriteStream(activityFile, { flags: "a" }) : null;
@@ -9677,8 +9781,8 @@ async function runDelegate(pi, args, ctx, signal) {
   return formatSyncResult(args.agent, runId, args.task, result, file);
 }
 async function buildChildArgs(args, rolePrompt, ctx) {
-  const tmpDir = await mkdtemp(join4(tmpdir2(), "acp-delegate-"));
-  const promptFile = join4(tmpDir, "role.md");
+  const tmpDir = await mkdtemp(join6(tmpdir2(), "acp-delegate-"));
+  const promptFile = join6(tmpDir, "role.md");
   await writeFile2(promptFile, `${rolePrompt}
 
 ---
@@ -9815,7 +9919,7 @@ async function persistResult(runId, body) {
     await mkdir2(OUT_DIR, { recursive: true });
   } catch {
   }
-  const file = join4(OUT_DIR, `${runId}.out`);
+  const file = join6(OUT_DIR, `${runId}.out`);
   try {
     await writeFile2(file, body, "utf8");
     return file;
@@ -10002,7 +10106,7 @@ async function statusReport(runtime, ctx) {
   const modelId = ctx.model?.id ?? "default";
   const sentTokens = estimateTokens(coreMessages, coveredIds) + systemPromptTokens;
   const turn = runtime.core.processTurn({ messages: coreMessages, state, config, tokenCount: calibrateTokens(sentTokens, runtime.density.densityFor(modelId)) });
-  const versionStr = "0.1.39" ? `billion-context-pi@${"0.1.39"}` : void 0;
+  const versionStr = "0.1.41" ? `billion-context-pi@${"0.1.41"}` : void 0;
   let text = buildStatusPanel({
     version: versionStr,
     tokenCount: sessionTokens,
@@ -10215,16 +10319,16 @@ function wireToolGuardrails(pi, runtime) {
 
 // src/update.ts
 import { readFile, writeFile as writeFile3, mkdir as mkdir3 } from "fs/promises";
-import { join as join5, dirname as dirname5 } from "path";
+import { join as join7, dirname as dirname5 } 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";
+import { homedir as homedir4 } from "os";
+import { CONFIG_DIR_NAME as CONFIG_DIR_NAME3 } 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(), CONFIG_DIR_NAME2, "agent", ".billion-context-pi-update-check");
+var THROTTLE_FILE = join7(homedir4(), CONFIG_DIR_NAME3, "agent", ".billion-context-pi-update-check");
 var updateInFlight = false;
 function parseVersion(v) {
   return v.replace(/^v/, "").split(".").map((n) => parseInt(n, 10) || 0);
@@ -10273,7 +10377,7 @@ function findNpmRoot(extDir) {
 async function findExtensionDir() {
   let dir = dirname5(fileURLToPath(import.meta.url));
   for (; ; ) {
-    const pkg = await readPackageJson(join5(dir, "package.json"));
+    const pkg = await readPackageJson(join7(dir, "package.json"));
     if (pkg?.name === PACKAGE_NAME) return dir;
     const parent = dirname5(dir);
     if (parent === dir) return void 0;
@@ -10324,7 +10428,7 @@ async function checkForUpdate(autoUpdate, notify) {
     const data = await res.json();
     const latest = data.version;
     if (!latest) return;
-    const current = runtimeVersion ?? "0.1.39";
+    const current = runtimeVersion ?? "0.1.41";
     const hasUpdate = isNewer(latest, current);
     debug.event("update-check", {
       current,
@@ -10354,16 +10458,16 @@ async function checkForUpdate(autoUpdate, notify) {
 async function getRuntimeVersion() {
   const extDir = await findExtensionDir();
   if (!extDir) return void 0;
-  const pkg = await readPackageJson(join5(extDir, "package.json"));
+  const pkg = await readPackageJson(join7(extDir, "package.json"));
   return pkg?.version;
 }
 
 // src/setup-subagent-tools.ts
 import { readFile as readFile2, writeFile as writeFile4, stat, copyFile, rename } from "fs/promises";
 import { existsSync as existsSync4 } 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";
+import { homedir as homedir5 } from "os";
+import { join as join8 } from "path";
+import { CONFIG_DIR_NAME as CONFIG_DIR_NAME4 } 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"],
@@ -10378,9 +10482,9 @@ var BUILTIN_DEFAULT_TOOLS = {
 };
 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(), CONFIG_DIR_NAME3, "agent");
+  if (configured === "~") return homedir5();
+  if (configured?.startsWith("~/")) return join8(homedir5(), configured.slice(2));
+  return configured || join8(homedir5(), CONFIG_DIR_NAME4, "agent");
 }
 function desiredTools(existing, name) {
   const base = Array.isArray(existing?.tools) && existing.tools.length > 0 ? [...existing.tools] : [...BUILTIN_DEFAULT_TOOLS[name] ?? []];
@@ -10390,7 +10494,7 @@ function desiredTools(existing, name) {
   return { tools: base, changed: true };
 }
 async function ensureSubagentAcpTools(settingsPath) {
-  const path4 = settingsPath ?? join6(resolveAgentDir(), "settings.json");
+  const path4 = settingsPath ?? join8(resolveAgentDir(), "settings.json");
   let raw;
   let mtimeMs;
   try {
@@ -10488,64 +10592,6 @@ async function runSetupAndNotify(notify) {
   }
 }
 
-// src/user-config.ts
-import { promises as fs2 } from "fs";
-import * as path3 from "path";
-import { homedir as homedir5 } from "os";
-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_NAME4), join8(cwd, CONFIG_DIR_NAME4)]) {
-    const file = join8(base, "acp.json");
-    try {
-      const raw = await fs2.readFile(file, "utf8");
-      const parsed = JSON.parse(raw);
-      if (parsed && typeof parsed === "object") {
-        Object.assign(merged, pickKnown(parsed));
-        debug.event("config-loaded", { file });
-      }
-    } catch (e) {
-      const code = e.code;
-      if (code !== "ENOENT") {
-        logWarn("config", { event: "load-failed", file, error: e instanceof Error ? e.message : String(e) });
-      }
-    }
-  }
-  return merged;
-}
-function join8(...parts) {
-  return path3.join(...parts);
-}
-var KNOWN = /* @__PURE__ */ new Set([
-  "debug",
-  "autoUpdate",
-  "modelContextLimit",
-  "toolBashDefaultTimeout",
-  "toolOutputMaxBytes",
-  "delegate",
-  "compress",
-  "displayUsage",
-  "prompts",
-  "acknowledgePromptsRisk"
-]);
-function pickKnown(parsed) {
-  const out = {};
-  for (const [k, v] of Object.entries(parsed)) {
-    if (KNOWN.has(k)) out[k] = v;
-  }
-  return out;
-}
-function applyUserConfig(adapter, user) {
-  return {
-    ...adapter,
-    ...user,
-    coreOverrides: adapter.coreOverrides,
-    protectedTools: adapter.protectedTools,
-    preserveRecentMessages: adapter.preserveRecentMessages
-  };
-}
-
 // src/index.ts
 function createAcpExtension(adapter = {}) {
   return (pi) => {
@@ -10579,12 +10625,10 @@ function wireSessionLifecycle(pi, runtime) {
     const sid = ctx.sessionManager.getSessionId();
     runtime.clearSessionTracking(sid);
     const modelInfo = ctx.model;
-    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.1.39" : null, model: modelInfo?.id ?? null, modelApi: modelInfo?.api ?? null, contextWindow: modelInfo?.contextWindow ?? null });
+    logInfo("session", { event: "start", sid, cwd: ctx.cwd, debug: runtime.adapter.debug ?? null, version: true ? "0.1.41" : null, model: modelInfo?.id ?? null, modelApi: modelInfo?.api ?? null, contextWindow: modelInfo?.contextWindow ?? null });
     try {
-      const user = await loadUserConfig(ctx.cwd);
-      runtime.setAdapter(applyUserConfig(runtime.adapter, user));
+      await runtime.reloadConfig(ctx.cwd);
       setDelegateDisplayUsage(resolveDelegate(runtime.adapter).displayUsage);
-      if (runtime.adapter.debug !== void 0) setDebugEnabled(runtime.adapter.debug);
     } catch (e) {
       logThrow("config", e, { sid, phase: "session_start" });
     }
@@ -10615,6 +10659,7 @@ function wireContextTransform(pi, runtime) {
     const sid = ctx.sessionManager.getSessionId();
     const release = await runtime.acquireLock(sid);
     try {
+      await runtime.reloadConfig(ctx.cwd);
       const modelId = ctx.model?.id ?? "default";
       runtime.setCountModel(modelId);
       const { state, coreMessages, entries } = await runtime.stateFor(ctx, event.messages);