billion-context 0.1.110 → 0.1.111-pr.748.622

package/dist/index.js

@@ -49414,7 +49414,7 @@ function rejectLegacyRoute(key, value) {
 
 // src/server.ts
 import http from "http";
-import fs8 from "fs";
+import fs9 from "fs";
 import { randomUUID as randomUUID4 } from "crypto";
 
 // src/compress-settings.ts
@@ -54348,6 +54348,66 @@ ${icon} [ACP] ${inner}
 `;
 }
 
+// src/tool-pair-order.ts
+var CALL_TYPES = /* @__PURE__ */ new Set(["function_call", "custom_tool_call"]);
+var OUTPUT_TYPES = /* @__PURE__ */ new Set(["function_call_output", "custom_tool_call_output"]);
+function isCall(type) {
+  return type !== void 0 && CALL_TYPES.has(type);
+}
+function isOutput(type) {
+  return type !== void 0 && OUTPUT_TYPES.has(type);
+}
+function idOf(item) {
+  return typeof item.call_id === "string" ? item.call_id : "";
+}
+function hoistTrappedToolItems(items) {
+  const n = items.length;
+  if (n < 3) return items;
+  const callPos = /* @__PURE__ */ new Map();
+  const outPos = /* @__PURE__ */ new Map();
+  for (let i = 0; i < n; i++) {
+    const id = idOf(items[i]);
+    if (!id) continue;
+    const t = items[i].type;
+    if (isCall(t) && !callPos.has(id)) callPos.set(id, i);
+    else if (isOutput(t) && !outPos.has(id)) outPos.set(id, i);
+  }
+  if (callPos.size === 0) return items;
+  const hoistBefore = new Array(n).fill(null);
+  let anyTrapped = false;
+  for (let p2 = 0; p2 < n; p2++) {
+    const t = items[p2].type;
+    if (isCall(t) || isOutput(t)) continue;
+    let target = -1;
+    for (const [id, c] of callPos) {
+      const o = outPos.get(id);
+      if (o === void 0 || !(c < p2 && o > p2)) continue;
+      if (target === -1 || c < target) target = c;
+    }
+    if (target >= 0) {
+      hoistBefore[p2] = target;
+      anyTrapped = true;
+    }
+  }
+  if (!anyTrapped) return items;
+  const pendingByTarget = /* @__PURE__ */ new Map();
+  for (let p2 = 0; p2 < n; p2++) {
+    const target = hoistBefore[p2];
+    if (target === null) continue;
+    const batch = pendingByTarget.get(target);
+    if (batch) batch.push(items[p2]);
+    else pendingByTarget.set(target, [items[p2]]);
+  }
+  const result = [];
+  for (let p2 = 0; p2 < n; p2++) {
+    if (hoistBefore[p2] !== null) continue;
+    const batch = pendingByTarget.get(p2);
+    if (batch) result.push(...batch);
+    result.push(items[p2]);
+  }
+  return result;
+}
+
 // src/weak-overflow.ts
 var MIN_USAGE = 0.9;
 var WINDOW_MS = 15 * 60 * 1e3;
@@ -54489,6 +54549,79 @@ function warnCacheCollapse(session, input, cached) {
   );
 }
 
+// src/error-dump.ts
+import fs4 from "fs";
+var DEFAULT_MAX_BYTES = 2 * 1024 * 1024;
+var failCount = 0;
+var lastFailLog = 0;
+function warnDumpFailure(err2) {
+  failCount++;
+  const now = Date.now();
+  if (failCount === 1 || now - lastFailLog >= 6e4) {
+    lastFailLog = now;
+    const msg = err2 instanceof Error ? err2.message : String(err2);
+    log("warn", `[dump] rejected-body dump failed (total ${failCount}x): ${msg}`);
+  }
+}
+function dumpRejectedBody(status, sessionId, body) {
+  if (process.env.BILI_DUMP_4XX !== "1") return null;
+  const raw = typeof body === "string" ? body : body.toString("utf8");
+  if (!raw) return null;
+  try {
+    const cap = Math.max(1024, Number(process.env.BILI_DUMP_4XX_MAX_BYTES) || DEFAULT_MAX_BYTES);
+    let text;
+    let marker = "";
+    if (raw.length > cap) {
+      text = raw.slice(0, cap);
+      marker = `
+[truncated: ${raw.length - cap} more character(s)]
+`;
+    } else {
+      try {
+        text = JSON.stringify(JSON.parse(raw), null, 2);
+      } catch {
+        text = raw;
+      }
+    }
+    const dir = process.env.ACP_DUMP_DIR || `${stateDir()}/dumps`;
+    fs4.mkdirSync(dir, { recursive: true });
+    const sid = sessionId.replace(/[^a-zA-Z0-9_-]/g, "_");
+    const out = `${dir}/err-${Date.now()}-${sid}-${status}.json`;
+    fs4.writeFileSync(out, `${text}${marker}`);
+    log("info", `[dump] upstream ${status} rejected body written to ${out}`);
+    return out;
+  } catch (err2) {
+    warnDumpFailure(err2);
+    return null;
+  }
+}
+
+// src/strict-echo.ts
+function isStrictReasoningEcho(session, upstreamOrigin) {
+  if (session.metadata.strictReasoningEcho === true) return true;
+  return upstreamOrigin !== void 0 && /deepseek/i.test(upstreamOrigin);
+}
+function normalizeStrictEchoReasoning(messages, enabled, log2, sessionId) {
+  if (!enabled) return messages;
+  let patched = 0;
+  const out = messages.map((m2) => {
+    if (m2.role !== "assistant") return m2;
+    if (!Array.isArray(m2.tool_calls) || m2.tool_calls.length === 0) return m2;
+    if (typeof m2.reasoning_content === "string") return m2;
+    patched++;
+    return { ...m2, reasoning_content: "" };
+  });
+  if (patched > 0) {
+    log2("info", `[${sessionId}] strict-echo: injected blank reasoning_content on ${patched} assistant tool-call message(s) (#762)`);
+  }
+  return patched > 0 ? out : messages;
+}
+function normalizeStrictEchoBody(body, enabled, log2, sessionId) {
+  if (!enabled || !Array.isArray(body.messages)) return body;
+  const patched = normalizeStrictEchoReasoning(body.messages, true, log2, sessionId);
+  return patched === body.messages ? body : { ...body, messages: patched };
+}
+
 // src/util.ts
 import { createHash as createHash5 } from "crypto";
 function hashId2(s3) {
@@ -54603,6 +54736,7 @@ function shouldReserveOutputHeadroom(protocol) {
 
 // src/loop/core.ts
 var MAX_LOOP_ROUNDS = 10;
+var DEGENERATE_RETRY_NUDGE = "[billion-context] Your previous response ended with no visible text and no tool call. Continue now: take your next concrete action.";
 function isLoopThinking(m2) {
   return m2.contentType === "reasoning" && typeof m2.id === "string" && m2.id.startsWith("acp_loop_");
 }
@@ -54672,6 +54806,7 @@ async function* runCompressLoop(upstream, ctx, requestBody, requestOptions, adap
   const coreMessages = [...ctx.messages];
   let degradedRetried = false;
   let truncationRetried = false;
+  let degenerateRetried = false;
   const fetchUpstream = (body) => fetchWithRetry(
     requestOptions.url,
     {
@@ -54689,6 +54824,12 @@ async function* runCompressLoop(upstream, ctx, requestBody, requestOptions, adap
     }
   );
   const failedSignatures = /* @__PURE__ */ new Set();
+  let strictEchoOrigin;
+  try {
+    strictEchoOrigin = new URL(requestOptions.url).origin;
+  } catch {
+    strictEchoOrigin = void 0;
+  }
   try {
     for (let round = 1; round <= MAX_LOOP_ROUNDS; round++) {
       if (signal?.aborted) break;
@@ -54702,6 +54843,7 @@ async function* runCompressLoop(upstream, ctx, requestBody, requestOptions, adap
       let sawDone = false;
       let suppressCompletion = false;
       let truncatedDone = false;
+      let sawThinking = false;
       let forwardedAny = false;
       const fwd = (chunk) => {
         forwardedAny = true;
@@ -54718,6 +54860,7 @@ async function* runCompressLoop(upstream, ctx, requestBody, requestOptions, adap
         sawDone = false;
         suppressCompletion = false;
         truncatedDone = false;
+        sawThinking = false;
         forwardedAny = false;
         for await (const ev of adapter.parseStream(currentUpstream, round)) {
           if (signal?.aborted) break;
@@ -54759,6 +54902,7 @@ async function* runCompressLoop(upstream, ctx, requestBody, requestOptions, adap
             finishReason = ev.finishReason;
             suppressCompletion = ev.suppressCompletion === true;
             truncatedDone = ev.truncated === true;
+            sawThinking = ev.thinking === true;
           } else if (ev.kind === "meta") {
             if (round === 1 || !ev.firstRoundOnly) {
               yield fwd(ev.chunk);
@@ -54787,6 +54931,37 @@ async function* runCompressLoop(upstream, ctx, requestBody, requestOptions, adap
             }
           }
         }
+        if (!degenerateRetried && sawDone && sawThinking && !truncatedDone && !suppressCompletion && typeof finishReason === "string" && finishReason !== "failed" && finishReason !== "incomplete" && finishReason !== "error" && assistantText.length === 0 && calls.length === 0 && !forwardedAny && !signal?.aborted) {
+          degenerateRetried = true;
+          ctx.log(`[acp-loop] round ${round}: degenerate terminal turn (completed, zero text/tool calls) invisible to client; retrying once with continuation nudge (#732)`);
+          log("warn", `[acp-loop] degenerate-turn auto-retry round ${round} (session ${ctx.session.id})`);
+          const nudge = {
+            id: `acp_degenerate_retry_r${round}`,
+            role: "user",
+            contentType: "text",
+            text: DEGENERATE_RETRY_NUDGE
+          };
+          try {
+            const retryBody = adapter.buildRequest([...coreMessages, nudge], systemPrompt, requestBody);
+            const respResult2 = await fetchUpstream(retryBody);
+            if (!respResult2.response.body) {
+              respResult2.clearTimer();
+              throw new UpstreamHttpError(respResult2.response.status, "(empty response body)", 1);
+            }
+            currentUpstream = respResult2.response.body;
+            roundBody = retryBody;
+            if (activeClearTimer) activeClearTimer();
+            activeClearTimer = respResult2.clearTimer;
+            continue;
+          } catch (e) {
+            if (e instanceof UpstreamHttpError) {
+              ctx.log(`[acp-loop] round ${round}: degenerate retry failed (upstream error ${e.status}: ${e.body.slice(0, 200)}); passing the empty turn through`);
+            } else {
+              ctx.log(`[acp-loop] round ${round}: degenerate retry failed (${e instanceof Error ? e.message : String(e)}); passing the empty turn through`);
+            }
+            log("warn", `[acp-loop] degenerate-turn auto-retry failed round ${round}: ${e instanceof Error ? e.message : String(e)}`);
+          }
+        }
         break;
       }
       if (usage.inputTokens !== void 0 || usage.outputTokens !== void 0 || usage.cachedTokens !== void 0) {
@@ -54964,13 +55139,14 @@ async function* runCompressLoop(upstream, ctx, requestBody, requestOptions, adap
       ctx.log(`[acp-loop] round ${round}: proxy tool executed; re-requesting so the model sees the result`);
       if (signal?.aborted) break;
       let newBody = adapter.buildRequest(coreMessages, systemPrompt, requestBody);
+      newBody = normalizeStrictEchoBody(newBody, isStrictReasoningEcho(ctx.session, strictEchoOrigin), (level, msg) => log(level, `[acp-loop] ${msg}`), ctx.session.id ?? "unknown");
       if (process.env.ACP_DUMP_BODY === "1") {
         try {
-          const fs13 = await import("fs");
+          const fs14 = await import("fs");
           const dumpDir = process.env.ACP_DUMP_DIR || `${process.env.HOME}/.local/state/billion-context/dumps`;
-          fs13.mkdirSync(dumpDir, { recursive: true });
+          fs14.mkdirSync(dumpDir, { recursive: true });
           const sid = ctx.session.id ?? "unknown";
-          fs13.writeFileSync(`${dumpDir}/req-${Date.now()}-${sid}-REREQUEST.json`, JSON.stringify(newBody, null, 2));
+          fs14.writeFileSync(`${dumpDir}/req-${Date.now()}-${sid}-REREQUEST.json`, JSON.stringify(newBody, null, 2));
         } catch {
         }
       }
@@ -54998,6 +55174,9 @@ async function* runCompressLoop(upstream, ctx, requestBody, requestOptions, adap
           ctx.log(`[acp-loop] 400 mentions reasoning_content \u2014 learned strict reasoning echo for this session; #651 reasoning-drop disabled (#684)`);
           log("warn", `[acp-loop] learned strictReasoningEcho (session ${ctx.session.id}); reasoning-drop disabled (#684)`);
         }
+        if (e.status >= 400 && e.status < 500) {
+          dumpRejectedBody(e.status, ctx.session.id ?? "unknown", JSON.stringify(newBody));
+        }
         const suffix = e.attempts > 1 ? ` after ${e.attempts} attempt(s)` : "";
         ctx.log(`[acp-proxy: compress loop upstream error ${e.status}${suffix}: ${e.body.slice(0, 200)}]`);
         log("error", `[acp-loop] upstream error ${e.status}${suffix}: ${e.body.slice(0, 200)}`);
@@ -55297,6 +55476,7 @@ data: ${JSON.stringify({ type: "response.created", response: { id: createdRespId
       } else {
         inputItems = coreToResponses(coreMessages, customToolCallIds);
       }
+      inputItems = hoistTrappedToolItems(inputItems);
       const devParts = projection && projection.systemParts.length > 0 ? [...projection.systemParts, systemPrompt] : [systemPrompt];
       const withDev = injectResponsesDeveloperMessage(inputItems, devParts.join("\n\n---\n\n"));
       const rebuilt = { ...requestBody, input: withDev };
@@ -55477,7 +55657,7 @@ data: ${JSON.stringify({ type: "response.created", response: { id: createdRespId
             cachedTokens: typeof pd?.cached_tokens === "number" ? pd.cached_tokens : void 0
           };
           maybeWarnDegenerate("completed");
-          yield { kind: "done", finishReason: "completed" };
+          yield { kind: "done", finishReason: "completed", thinking: sawReasoning };
         } else if (type === "response.incomplete") {
           yield* flushFilter();
           terminalKind = "incomplete";
@@ -55867,7 +56047,7 @@ function createOpenaiAdapter(requestBody, clientSystem, absorbName) {
             yield { kind: "meta", chunk: Buffer.from(eventStr + "\n\n", "utf8") };
           }
           maybeWarnDegenerate("stop");
-          yield { kind: "done", finishReason: "stop", ...sawRealToolCall ? { suppressCompletion: true } : {} };
+          yield { kind: "done", finishReason: "stop", thinking: sawReasoning, ...sawRealToolCall ? { suppressCompletion: true } : {} };
           continue;
         }
         let parsed;
@@ -55913,13 +56093,14 @@ function createOpenaiAdapter(requestBody, clientSystem, absorbName) {
             const chunk = rawBuf;
             yield { kind: "meta", chunk };
             maybeWarnDegenerate(finishReason);
-            yield { kind: "done", finishReason, suppressCompletion: true };
+            yield { kind: "done", finishReason, suppressCompletion: true, thinking: sawReasoning };
             continue;
           } else {
             maybeWarnDegenerate(finishReason);
             yield {
               kind: "done",
-              finishReason: hadToolCalls && finishReason === "stop" ? "tool_calls" : finishReason
+              finishReason: hadToolCalls && finishReason === "stop" ? "tool_calls" : finishReason,
+              thinking: sawReasoning
             };
           }
         }
@@ -56340,7 +56521,7 @@ ${systemPrompt}` : systemPrompt;
             };
           }
           maybeWarnDegenerate(stopReason);
-          yield { kind: "done", finishReason: stopReason };
+          yield { kind: "done", finishReason: stopReason, thinking: sawThinking };
         } else if (type === "message_stop") {
           if (lastTextIndex !== null) {
             const tail = tagFilter.flush();
@@ -56359,7 +56540,7 @@ ${systemPrompt}` : systemPrompt;
             };
           }
           maybeWarnDegenerate(stopReason);
-          yield { kind: "done", finishReason: stopReason ?? "end_turn" };
+          yield { kind: "done", finishReason: stopReason ?? "end_turn", thinking: sawThinking };
         } else if (round === 1) {
           yield { kind: "meta", chunk: rawBuf, firstRoundOnly: true };
         }
@@ -56530,7 +56711,16 @@ function surfaceReadonlyJson(current, proxyCalls, ctx) {
   }
   if (markers.length === 0) return current;
   const out = Array.isArray(current.output) ? [...current.output] : [];
-  out.push({ type: "message", id: `msg_acp_ro_${Date.now()}_${markers.length}`, role: "assistant", content: [{ type: "output_text", text: markers.join("\n") }] });
+  const markerItem = { type: "message", id: `msg_acp_ro_${Date.now()}_${markers.length}`, role: "assistant", content: [{ type: "output_text", text: markers.join("\n") }] };
+  let insertAt = out.length;
+  for (let i = 0; i < out.length; i++) {
+    const t = out[i]?.type;
+    if (t === "function_call" || t === "custom_tool_call") {
+      insertAt = i;
+      break;
+    }
+  }
+  out.splice(insertAt, 0, markerItem);
   return { ...current, output: out };
 }
 async function compressLoopResponsesJson(initialResponse, ctx, requestBody, requestOptions) {
@@ -56565,7 +56755,7 @@ async function compressLoopResponsesJson(initialResponse, ctx, requestBody, requ
       ctx.log(`[acp-proxy: responses JSON ${call.name} \u2192 ${result2.slice(0, 120).replace(/\n/g, " ")}]`);
       inputItems.push({ type: "message", role: "developer", content: buildVisibilityMarker(call.name, result2) });
     }
-    requestBody.input = inputItems;
+    requestBody.input = hoistTrappedToolItems(inputItems);
     const result = await fetchWithRetry(requestOptions.url, {
       method: "POST",
       headers: requestOptions.headers,
@@ -57760,7 +57950,7 @@ var PrefixAffinityResolver = class {
 var prefixAffinity = new PrefixAffinityResolver();
 
 // src/affinity-persist.ts
-import fs4 from "fs";
+import fs5 from "fs";
 import path11 from "path";
 var PERSIST_DEBOUNCE_MS = 5e3;
 function affinityFile() {
@@ -57775,9 +57965,9 @@ function writeSnapshot() {
     const file = affinityFile();
     const snapshot = { version: 1, entries: prefixAffinity.exportSnapshot() };
     const tmp = `${file}.tmp`;
-    fs4.mkdirSync(path11.dirname(file), { recursive: true });
-    fs4.writeFileSync(tmp, JSON.stringify(snapshot));
-    fs4.renameSync(tmp, file);
+    fs5.mkdirSync(path11.dirname(file), { recursive: true });
+    fs5.writeFileSync(tmp, JSON.stringify(snapshot));
+    fs5.renameSync(tmp, file);
   } catch (e) {
     log("warn", `[prefix-affinity] persist failed (${e instanceof Error ? e.message : String(e)}); affinity survives in memory`);
   } finally {
@@ -57802,8 +57992,8 @@ function flushPrefixAffinity() {
 function hydratePrefixAffinity() {
   try {
     const file = affinityFile();
-    if (!fs4.existsSync(file)) return;
-    const parsed = JSON.parse(fs4.readFileSync(file, "utf8"));
+    if (!fs5.existsSync(file)) return;
+    const parsed = JSON.parse(fs5.readFileSync(file, "utf8"));
     const imported = prefixAffinity.importSnapshot(parsed.entries);
     if (imported > 0) log("info", `[prefix-affinity] hydrated ${imported} chain(s) from ${path11.basename(file)} \u2014 anonymous sessions reattach across restarts`);
   } catch (e) {
@@ -57954,13 +58144,13 @@ function buildStatusPanel(input) {
 
 // src/plugin.ts
 import { fileURLToPath as fileURLToPath3 } from "url";
-import fs5 from "fs";
+import fs6 from "fs";
 import path12 from "path";
 var PROXY_VERSION = (() => {
   try {
     const here = fileURLToPath3(import.meta.url);
     const pkg = path12.join(path12.dirname(here), "..", "package.json");
-    return JSON.parse(fs5.readFileSync(pkg, "utf8")).version ?? "dev";
+    return JSON.parse(fs6.readFileSync(pkg, "utf8")).version ?? "dev";
   } catch {
     return "dev";
   }
@@ -57973,7 +58163,7 @@ var VERSION2 = (() => {
   try {
     const here = fileURLToPath3(import.meta.url);
     const pkg = path12.join(path12.dirname(here), "..", "package.json");
-    return JSON.parse(fs5.readFileSync(pkg, "utf8")).version ?? "dev";
+    return JSON.parse(fs6.readFileSync(pkg, "utf8")).version ?? "dev";
   } catch {
     return "dev";
   }
@@ -58010,11 +58200,11 @@ function writeConversationsFile() {
   try {
     const obj = {};
     for (const [k2, v2] of conversations) obj[k2] = v2;
-    fs5.mkdirSync(stateDir(), { recursive: true });
+    fs6.mkdirSync(stateDir(), { recursive: true });
     const filePath = conversationsFile();
     const draft = `${filePath}.${process.pid}.bili-tmp`;
-    fs5.writeFileSync(draft, JSON.stringify(obj));
-    fs5.renameSync(draft, filePath);
+    fs6.writeFileSync(draft, JSON.stringify(obj));
+    fs6.renameSync(draft, filePath);
     conversationsDirty = false;
   } catch {
   }
@@ -58036,7 +58226,7 @@ function flushConversations() {
 function loadConversations() {
   let raw;
   try {
-    raw = fs5.readFileSync(conversationsFile(), "utf8");
+    raw = fs6.readFileSync(conversationsFile(), "utf8");
   } catch {
     return;
   }
@@ -58049,7 +58239,7 @@ function loadConversations() {
     }
   } catch {
     try {
-      fs5.renameSync(conversationsFile(), `${conversationsFile()}.corrupt-${Date.now()}`);
+      fs6.renameSync(conversationsFile(), `${conversationsFile()}.corrupt-${Date.now()}`);
     } catch {
     }
     log("warn", "[plugin] plugin-conversations.json is corrupt \u2014 backed up beside the original, starting an empty routing table");
@@ -58892,12 +59082,12 @@ async function pipePluginJson(stream2, res, session, protocol) {
 import tls3 from "tls";
 
 // src/discover.ts
-import fs7 from "fs";
+import fs8 from "fs";
 import os2 from "os";
 import path14 from "path";
 
 // src/client-config.ts
-import fs6 from "fs";
+import fs7 from "fs";
 import os from "os";
 import path13 from "path";
 function toModelWindow(id, contextWindow) {
@@ -58918,7 +59108,7 @@ function qoderIsCnSite(env = process.env) {
   const cnDir = path13.join(h, ".qoder-cn");
   const intlDir = path13.join(h, ".qoder");
   try {
-    if (fs6.existsSync(cnDir) && !fs6.existsSync(intlDir)) return true;
+    if (fs7.existsSync(cnDir) && !fs7.existsSync(intlDir)) return true;
   } catch {
   }
   return false;
@@ -58957,7 +59147,7 @@ function nonEmpty2(s3) {
 }
 function readJsonObject(filePath) {
   try {
-    const txt = fs6.readFileSync(filePath, "utf8");
+    const txt = fs7.readFileSync(filePath, "utf8");
     const parsed = JSON.parse(txt);
     return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : null;
   } catch {
@@ -59031,7 +59221,7 @@ function parseCodebuddyModelsJson(obj) {
 }
 function readJsonFile(filePath) {
   try {
-    return JSON.parse(fs6.readFileSync(filePath, "utf8"));
+    return JSON.parse(fs7.readFileSync(filePath, "utf8"));
   } catch {
     return null;
   }
@@ -59093,7 +59283,7 @@ function parseDshSettingsYaml(text) {
 function readDshConfig(dshHome) {
   let text;
   try {
-    text = fs6.readFileSync(path13.join(dshHome, "settings.yaml"), "utf8");
+    text = fs7.readFileSync(path13.join(dshHome, "settings.yaml"), "utf8");
   } catch {
     return { baseUrls: [] };
   }
@@ -59195,7 +59385,7 @@ function readCodexConfig(codexHome) {
   const cfgPath = path13.join(codexHome, "config.toml");
   let text;
   try {
-    text = fs6.readFileSync(cfgPath, "utf8");
+    text = fs7.readFileSync(cfgPath, "utf8");
   } catch {
     return { providers: {} };
   }
@@ -59279,7 +59469,7 @@ function readKimiConfig(kimiHome, env = process.env) {
   const cfgPath = path13.join(kimiHome, "config.toml");
   let text;
   try {
-    text = fs6.readFileSync(cfgPath, "utf8");
+    text = fs7.readFileSync(cfgPath, "utf8");
   } catch {
     return { providers: {} };
   }
@@ -59380,7 +59570,7 @@ function readOmpConfig(ompHome) {
   const cfgPath = path13.join(ompHome, "models.yml");
   let text;
   try {
-    text = fs6.readFileSync(cfgPath, "utf8");
+    text = fs7.readFileSync(cfgPath, "utf8");
   } catch {
     return { providers: {} };
   }
@@ -59461,7 +59651,7 @@ function readHermesConfig(hermesHome) {
   const cfgPath = path13.join(hermesHome, "config.yaml");
   let text;
   try {
-    text = fs6.readFileSync(cfgPath, "utf8");
+    text = fs7.readFileSync(cfgPath, "utf8");
   } catch {
     return { providers: {} };
   }
@@ -59475,7 +59665,7 @@ function resolveOpencodeConfigFile(env) {
 function readOpencodeConfig(file) {
   let text;
   try {
-    text = fs6.readFileSync(file, "utf8");
+    text = fs7.readFileSync(file, "utf8");
   } catch {
     return { providers: {} };
   }
@@ -59535,7 +59725,7 @@ function readZcodeConfig(zcodeHome) {
   const cfgPath = path13.join(zcodeHome, "v2", "config.json");
   let txt;
   try {
-    txt = fs6.readFileSync(cfgPath, "utf8");
+    txt = fs7.readFileSync(cfgPath, "utf8");
   } catch {
     return { providers: {} };
   }
@@ -59661,7 +59851,7 @@ function readMtimes(paths) {
   const mtimes = /* @__PURE__ */ new Map();
   for (const p2 of paths) {
     try {
-      const st2 = fs7.statSync(p2);
+      const st2 = fs8.statSync(p2);
       mtimes.set(p2, st2.mtimeMs);
     } catch {
     }
@@ -60882,7 +61072,7 @@ Content-Length: ${Buffer.byteLength(body)}\r
     const originHost = opts.host === "0.0.0.0" || opts.host === "::" || opts.host === "localhost" ? "127.0.0.1" : opts.host.includes(":") && !opts.host.startsWith("[") ? `[${opts.host}]` : opts.host;
     const origin = `http://${originHost}:${actualPort}`;
     try {
-      fs8.mkdirSync(stateDir(), { recursive: true });
+      fs9.mkdirSync(stateDir(), { recursive: true });
       hydratePrefixAffinity();
       atomicWriteInstanceFile({
         origin,
@@ -61303,14 +61493,14 @@ async function handle(req, res, opts, core, config, log2, instanceId, instanceSt
     try {
       const rawDir = process.env.ACP_RAW_DUMP_DIR || `${stateDir()}/raw`;
       try {
-        fs8.mkdirSync(rawDir, { recursive: true });
+        fs9.mkdirSync(rawDir, { recursive: true });
       } catch {
       }
       const hdrs = maskHeadersForLog(
         Object.fromEntries(Object.entries(req.headers).map(([k2, v2]) => [k2, Array.isArray(v2) ? v2.join(",") : String(v2)]))
       );
       const hdrText = Object.entries(hdrs).map(([k2, v2]) => `${k2}: ${v2}`).join("\n");
-      fs8.writeFileSync(`${rawDir}/${Date.now()}-INCOMING.txt`, `${req.method} ${maskUrlsInText(req.url ?? "")}
+      fs9.writeFileSync(`${rawDir}/${Date.now()}-INCOMING.txt`, `${req.method} ${maskUrlsInText(req.url ?? "")}
 ${hdrText}
 
 ${bodyBuffer.toString("utf8")}`);
@@ -61654,17 +61844,13 @@ function withReasoningDrop(msgs, reasoning, log2, sessionId, strictEcho) {
   }
   return out;
 }
-function isStrictReasoningEcho(session, upstreamOrigin) {
-  if (session.metadata.strictReasoningEcho === true) return true;
-  return upstreamOrigin !== void 0 && /deepseek/i.test(upstreamOrigin);
-}
 function warnReasoningPairs(wireMessages, log2, sessionId) {
   let withRc = 0;
   let split = 0;
   for (const m2 of wireMessages) {
     const msg = m2;
     if (msg?.role !== "assistant") continue;
-    const hasRc = typeof msg.reasoning_content === "string" && msg.reasoning_content.length > 0;
+    const hasRc = typeof msg.reasoning_content === "string";
     if (hasRc) withRc++;
     else if (Array.isArray(msg.tool_calls) && msg.tool_calls.length > 0) split++;
   }
@@ -61844,9 +62030,9 @@ function prepareAnthropic(parsed, req, opts, core, config, prompts, surface, log
     applyCompactionArchive(session, activeBefore, new Set(msgs.map((m2) => m2.id)), log2);
     reapOrphanBlocks(session, msgs, deactivateBlock);
     rebuiltMessages = coreToAnthropic(processedMessages, cacheControls);
-    systemOut = injectSystem(parsed, opts, prompts, loopConfig);
+    systemOut = injectSystem(parsed, opts, prompts, loopConfig, surface);
     if (injectTools) {
-      toolsOut = injectTool(parsed.tools, absorbActive ? ABSORB_TOOL : void 0);
+      toolsOut = injectTool(parsed.tools, absorbActive ? ABSORB_TOOL : void 0, surface?.toolPrompts);
     }
     if (willInjectNudge && turn.nudge) {
       try {
@@ -61976,7 +62162,7 @@ function prepareOpenai(parsed, req, opts, core, config, prompts, surface, log2,
     rebuiltMessages = injectOpenaiSystem(rebuiltMessages, sysParts);
     openaiOutboundSystem = sysParts.join("\n\n");
     if (injectTools) {
-      toolsOut = injectOpenaiTool(parsed.tools, absorbActive ? ABSORB_TOOL_OPENAI : void 0);
+      toolsOut = injectOpenaiTool(parsed.tools, absorbActive ? ABSORB_TOOL_OPENAI : void 0, surface?.toolPrompts);
     }
     if (willInjectNudge && turn.nudge) {
       try {
@@ -61991,6 +62177,7 @@ function prepareOpenai(parsed, req, opts, core, config, prompts, surface, log2,
     log2("warn", `[${sessionId}] kernel transform failed, forwarding unchanged: ${String(err2)}`);
     processedMessages = [];
   }
+  rebuiltMessages = normalizeStrictEchoReasoning(rebuiltMessages, isStrictReasoningEcho(session, upstreamOrigin), log2, sessionId);
   const rebuilt = { ...parsed, messages: rebuiltMessages, tools: toolsOut };
   warnReasoningPairs(rebuiltMessages, log2, sessionId);
   clampOutgoingOutput(rebuilt, typeof parsed.max_completion_tokens === "number" ? "max_completion_tokens" : "max_tokens", { systemText: openaiSystemText, tools: toolsOut, processedMessages, lastInputTokens: session.stats.lastInputTokens, nativeWindow, imageTokens: imageTokensInParsedBody("openai", rebuilt, imageBillingFor(opts, billingUpstream ?? upstreamOrigin)) }, sessionId, log2);
@@ -62077,6 +62264,7 @@ function prepareResponses(parsed, req, opts, core, config, prompts, surface, log
     processedMessages = repairResponsesAssistantOrdering(stripReasoning(stripKernelSummaries(turn.messages, turn.state)), originalMessages);
     reapOrphanBlocks(session, msgs, deactivateBlock);
     rebuiltInput = patchResponsesInput(projection, processedMessages);
+    if (Array.isArray(rebuiltInput)) rebuiltInput = hoistTrappedToolItems(rebuiltInput);
     const forgedSummaries = echoReplaced ? [] : session.metadata.codexForgedSummaries ?? [];
     if (shouldInject && !isCompactionTrigger && !process.env.ACP_NO_COMPRESS_PROMPT) {
       const prompt = withMarkerIntegrityNote(responsesTextProtocol ? buildCompressHybridSystemPrompt(prompts, surface?.promptSections) : buildCompressSystemPrompt(prompts, surface?.promptSections));
@@ -62086,7 +62274,7 @@ function prepareResponses(parsed, req, opts, core, config, prompts, surface, log
       responsesDevContent = devContent;
       rebuiltInput = injectResponsesDeveloperMessage(rebuiltInput, devContent);
       if (!process.env.ACP_NO_INJECT_TOOL && injectTools) {
-        toolsOut = responsesTextProtocol ? injectResponsesTool(parsed.tools, ACP_READONLY_TOOLS_RESPONSES) : injectResponsesTool(parsed.tools, absorbActive ? [...ACP_TOOLS_RESPONSES, ABSORB_TOOL_RESPONSES] : ACP_TOOLS_RESPONSES);
+        toolsOut = responsesTextProtocol ? injectResponsesTool(parsed.tools, ACP_READONLY_TOOLS_RESPONSES, surface?.toolPrompts) : injectResponsesTool(parsed.tools, absorbActive ? [...ACP_TOOLS_RESPONSES, ABSORB_TOOL_RESPONSES] : ACP_TOOLS_RESPONSES, surface?.toolPrompts);
       }
     } else if (projection.systemParts.length > 0 || forgedSummaries.length > 0) {
       const devContent = [...projection.systemParts, ...forgedSummaries].join("\n\n---\n\n");
@@ -62242,11 +62430,12 @@ function prepareResponsesCompact(body, parsed, session, req, core, config, log2)
     }
     const viewed = applyAbsorbView(turn.messages, turn.state, compactConfig, session.stats.lastInputTokens);
     const processed = repairResponsesAssistantOrdering(stripKernelSummaries(viewed, turn.state), projection.msgs);
-    const output = patchResponsesInput(projection, processed);
+    let output = patchResponsesInput(projection, processed);
     if (typeof output === "string") {
       session.state = prevState;
       return base;
     }
+    output = hoistTrappedToolItems(output);
     snapshotMessages(session, projection.msgs);
     markDirty(session);
     log2("info", `[${session.id}] codex compact intercepted (endpoint); forged history with ${output.length} item(s), upstream not contacted`);
@@ -62600,16 +62789,16 @@ async function forward(req, res, opts, body, prepared, core, config, log2, route
       if (bodyDumpEnabled() && process.env.ACP_DUMP_REQ !== "0") {
         const dumpDir = process.env.ACP_DUMP_DIR || `${stateDir()}/dumps`;
         try {
-          fs8.mkdirSync(dumpDir, { recursive: true });
+          fs9.mkdirSync(dumpDir, { recursive: true });
         } catch {
         }
         const sid = prepared?.session.id ?? "unknown";
         const out = `${dumpDir}/req-${Date.now()}-${safeSessionId(sid)}.json`;
         try {
           const pretty = JSON.stringify(JSON.parse(wireBody), null, 2);
-          fs8.writeFileSync(out, pretty);
+          fs9.writeFileSync(out, pretty);
         } catch {
-          fs8.writeFileSync(out, wireBody);
+          fs9.writeFileSync(out, wireBody);
         }
         log2("info", `[debug] forwarded body written to ${out}`);
       }
@@ -62629,7 +62818,7 @@ async function forward(req, res, opts, body, prepared, core, config, log2, route
   const rawBase = bodyDumpEnabled() ? (() => {
     try {
       const rawDir = process.env.ACP_RAW_DUMP_DIR || `${stateDir()}/raw`;
-      fs8.mkdirSync(rawDir, { recursive: true });
+      fs9.mkdirSync(rawDir, { recursive: true });
       return `${rawDir}/${Date.now()}-${safeSessionId(prepared?.session.id)}`;
     } catch {
       return "";
@@ -62640,7 +62829,7 @@ async function forward(req, res, opts, body, prepared, core, config, log2, route
       const hdrText = Object.entries(maskHeadersForLog(headers)).map(([k2, v2]) => `${k2}: ${v2}`).join("\n");
       const bodyText = req.method === "GET" || req.method === "HEAD" ? "" : typeof wireBody === "string" ? wireBody : Buffer.from(wireBody).toString("utf8");
       const reqPath = `${rawBase}-REQ.txt`;
-      fs8.writeFileSync(reqPath, `${req.method ?? "POST"} ${maskUrlForLog(upstreamUrl)}
+      fs9.writeFileSync(reqPath, `${req.method ?? "POST"} ${maskUrlForLog(upstreamUrl)}
 ${hdrText}
 
 ${bodyText}`);
@@ -62752,7 +62941,7 @@ ${bodyText}`);
     try {
       const hdrText = Object.entries(maskHeadersForLog(respHeaders)).map(([k2, v2]) => `${k2}: ${v2}`).join("\n");
       const resPath = `${rawBase}-RES.txt`;
-      fs8.writeFileSync(resPath, `${upstream.status}
+      fs9.writeFileSync(resPath, `${upstream.status}
 ${hdrText}
 `);
       log2("info", `[debug] RAW response dump: ${resPath}`);
@@ -62811,6 +63000,13 @@ ${hdrText}
         }
         markDirty(s3);
       }
+      if (upstream.status === 400 && /reasoning_content/i.test(errBody.toString("utf8"))) {
+        if (s3.metadata.strictReasoningEcho !== true) {
+          s3.metadata.strictReasoningEcho = true;
+          markDirty(s3);
+          log2("warn", `[${s3.id}] upstream 400 mentions reasoning_content \u2014 learned strictReasoningEcho for this session (#684/#762); reasoning-drop disabled`);
+        }
+      }
     }
     if (prepared?.session && upstream.status >= 500) {
       armFailureShrink(prepared, log2, `upstream ${upstream.status}`);
@@ -62823,6 +63019,9 @@ ${hdrText}
     if (bodyText.length > 600) snippet += " \u2026";
     if (!snippet) snippet = "(no body)";
     log("warn", `[${errSid}] \u2190 upstream ${upstream.status}${reqIdText}: ${snippet}`);
+    if (upstream.status >= 400 && upstream.status < 500) {
+      dumpRejectedBody(upstream.status, errSid, wireBody);
+    }
     if (res.headersSent) {
       if (prepared?.stream) {
         emitStreamError(res, prepared.protocol, `upstream HTTP ${upstream.status}: ${snippet}`, (m2) => log("info", m2));
@@ -65227,7 +65426,7 @@ var hr = /* @__PURE__ */ Symbol("entry");
 var cs = /* @__PURE__ */ Symbol("entryOpt");
 var ui = /* @__PURE__ */ Symbol("writeEntryClass");
 var lr = /* @__PURE__ */ Symbol("write");
-var fs9 = /* @__PURE__ */ Symbol("ondrain");
+var fs10 = /* @__PURE__ */ Symbol("ondrain");
 var wt = class extends A {
   sync = false;
   opt;
@@ -65261,8 +65460,8 @@ var wt = class extends A {
       if ((t.gzip ? 1 : 0) + (t.brotli ? 1 : 0) + (t.zstd ? 1 : 0) > 1) throw new TypeError("gzip, brotli, zstd are mutually exclusive");
       if (t.gzip && (typeof t.gzip != "object" && (t.gzip = {}), this.portable && (t.gzip.portable = true), this.zip = new ze(t.gzip)), t.brotli && (typeof t.brotli != "object" && (t.brotli = {}), this.zip = new We(t.brotli)), t.zstd && (typeof t.zstd != "object" && (t.zstd = {}), this.zip = new Ye(t.zstd)), !this.zip) throw new Error("impossible");
       let e = this.zip;
-      e.on("data", (i) => super.write(i)), e.on("end", () => super.end()), e.on("drain", () => this[fs9]()), this.on("resume", () => e.resume());
-    } else this.on("drain", this[fs9]);
+      e.on("data", (i) => super.write(i)), e.on("end", () => super.end()), e.on("drain", () => this[fs10]()), this.on("resume", () => e.resume());
+    } else this.on("drain", this[fs10]);
     this.noDirRecurse = !!t.noDirRecurse, this.follow = !!t.follow, this.noMtime = !!t.noMtime, t.mtime && (this.mtime = t.mtime), this.filter = typeof t.filter == "function" ? t.filter : () => true, this[W] = new hi(), this[G] = 0, this.jobs = Number(t.jobs) || 4, this[Ee] = false, this[me] = false;
   }
   [lr](t) {
@@ -65375,7 +65574,7 @@ var wt = class extends A {
       this.emit("error", e);
     }
   }
-  [fs9]() {
+  [fs10]() {
     this[Et] && this[Et].entry && this[Et].entry.resume();
   }
   [di](t) {
@@ -66733,14 +66932,14 @@ function startAutoUpdate(opts) {
 }
 
 // src/mcp.ts
-import fs10 from "fs";
+import fs11 from "fs";
 import path16 from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
 var VERSION3 = (() => {
   try {
     const here = fileURLToPath5(import.meta.url);
     const pkg = path16.join(path16.dirname(here), "..", "package.json");
-    return JSON.parse(fs10.readFileSync(pkg, "utf8")).version ?? "dev";
+    return JSON.parse(fs11.readFileSync(pkg, "utf8")).version ?? "dev";
   } catch {
     return "dev";
   }
@@ -66945,7 +67144,7 @@ if (process.argv[1] && /(?:^|[\\/])mcp\.(?:ts|js)$/.test(process.argv[1])) {
 }
 
 // src/plugin-install.ts
-import fs11 from "fs";
+import fs12 from "fs";
 import path17 from "path";
 import os4 from "os";
 import { execFileSync as execFileSync2 } from "child_process";
@@ -66973,14 +67172,14 @@ function homeFile(rel2, envOverride) {
   return path17.join(base, rel2);
 }
 function backupOnce(file) {
-  if (fs11.existsSync(file) && !fs11.existsSync(`${file}.bili-bak`)) {
-    fs11.copyFileSync(file, `${file}.bili-bak`);
+  if (fs12.existsSync(file) && !fs12.existsSync(`${file}.bili-bak`)) {
+    fs12.copyFileSync(file, `${file}.bili-bak`);
   }
 }
 function readJson(file) {
   let text;
   try {
-    text = fs11.readFileSync(file, "utf8");
+    text = fs12.readFileSync(file, "utf8");
   } catch (err2) {
     if (err2.code === "ENOENT") return {};
     throw err2;
@@ -66997,12 +67196,12 @@ function readJson(file) {
   return parsed;
 }
 function writeJson(file, data) {
-  fs11.mkdirSync(path17.dirname(file), { recursive: true });
+  fs12.mkdirSync(path17.dirname(file), { recursive: true });
   backupOnce(file);
-  fs11.writeFileSync(file, JSON.stringify(data, null, 2) + "\n");
+  fs12.writeFileSync(file, JSON.stringify(data, null, 2) + "\n");
 }
 function requireDistFile(file) {
-  if (!fs11.existsSync(file)) {
+  if (!fs12.existsSync(file)) {
     process.stderr.write(`bili plugin: warning: ${file} does not exist yet (run \`npm run build\` in ${selfPackageRoot()}) \u2014 the entry will be dead until built
 `);
   }
@@ -67090,13 +67289,13 @@ function ompBlockLoaded(text) {
   const lines = text.split("\n");
   return ompExtensionItemLines(text).some((i) => {
     const v2 = ompEntryValue(lines[i]);
-    return OMP_ENTRY_RE.test(v2) && fs11.existsSync(v2);
+    return OMP_ENTRY_RE.test(v2) && fs12.existsSync(v2);
   });
 }
 function ompRemove() {
   const file = ompConfigFile();
-  if (!fs11.existsSync(file)) return `omp: not installed (${file})`;
-  const text = fs11.readFileSync(file, "utf8");
+  if (!fs12.existsSync(file)) return `omp: not installed (${file})`;
+  const text = fs12.readFileSync(file, "utf8");
   const lines = text.split("\n");
   const drop = new Set(
     ompExtensionItemLines(text).filter((i) => OMP_ENTRY_RE.test(ompEntryValue(lines[i])))
@@ -67104,15 +67303,15 @@ function ompRemove() {
   if (drop.size === 0) return `omp: not installed (${file})`;
   const cleaned = lines.filter((_2, i) => !drop.has(i)).join("\n");
   backupOnce(file);
-  fs11.writeFileSync(file, cleaned);
+  fs12.writeFileSync(file, cleaned);
   return `omp: removed from ${file}`;
 }
 function ompInstall() {
   const file = ompConfigFile();
   const entry = ompExtensionPath();
   requireDistFile(entry);
-  fs11.mkdirSync(path17.dirname(file), { recursive: true });
-  let text = fs11.existsSync(file) ? fs11.readFileSync(file, "utf8") : "";
+  fs12.mkdirSync(path17.dirname(file), { recursive: true });
+  let text = fs12.existsSync(file) ? fs12.readFileSync(file, "utf8") : "";
   if (ompBlockLoaded(text)) return `omp: already installed (${file})`;
   {
     const lines = text.split("\n");
@@ -67154,25 +67353,25 @@ ${tail}`;
     throw new Error(`${file}: edit would leave ${occurrences} copies of the entry \u2014 aborting without writing`);
   }
   backupOnce(file);
-  fs11.writeFileSync(file, out);
+  fs12.writeFileSync(file, out);
   return `omp: installed -> ${file} extensions += ${entry}`;
 }
 function ompStatus() {
   const file = ompConfigFile();
-  const text = fs11.existsSync(file) ? fs11.readFileSync(file, "utf8") : "";
+  const text = fs12.existsSync(file) ? fs12.readFileSync(file, "utf8") : "";
   const lines = text.split("\n");
   let broken = false;
   for (const i of ompExtensionItemLines(text)) {
     const v2 = ompEntryValue(lines[i]);
     if (!OMP_ENTRY_RE.test(v2)) continue;
-    if (fs11.existsSync(v2)) return "installed";
+    if (fs12.existsSync(v2)) return "installed";
     broken = true;
   }
   return broken ? "broken" : "not installed";
 }
 function ompPluginLoadedFrom(ompHome) {
   try {
-    return ompBlockLoaded(fs11.readFileSync(path17.join(ompHome, "config.yml"), "utf8"));
+    return ompBlockLoaded(fs12.readFileSync(path17.join(ompHome, "config.yml"), "utf8"));
   } catch {
     return false;
   }
@@ -67226,7 +67425,7 @@ function malformedCodexArgs(block) {
 }
 function codexInstall() {
   const file = codexToml();
-  const text = fs11.existsSync(file) ? fs11.readFileSync(file, "utf8") : "";
+  const text = fs12.existsSync(file) ? fs12.readFileSync(file, "utf8") : "";
   const existing = /^[ \t]*\[mcp_servers\.bili\][ \t]*$/m.exec(text);
   if (existing !== null) {
     const block = text.slice(existing.index, text.indexOf("\n[", existing.index + 1) === -1 ? void 0 : text.indexOf("\n[", existing.index + 1));
@@ -67234,19 +67433,19 @@ function codexInstall() {
     if (block.trimEnd() === canonical.trimEnd()) return `codex: already installed (${file})`;
     const refreshed = text.slice(0, existing.index) + canonical + text.slice(existing.index + block.length);
     backupOnce(file);
-    fs11.writeFileSync(file, refreshed);
+    fs12.writeFileSync(file, refreshed);
     const healed = malformedCodexArgs(block) ? " (repaired args: was not an array)" : "";
     return `codex: refreshed [mcp_servers.bili] -> ${file}${healed}`;
   }
-  fs11.mkdirSync(path17.dirname(file), { recursive: true });
+  fs12.mkdirSync(path17.dirname(file), { recursive: true });
   backupOnce(file);
-  fs11.writeFileSync(file, text + (text.endsWith("\n") || text.length === 0 ? "" : "\n") + codexBlock());
+  fs12.writeFileSync(file, text + (text.endsWith("\n") || text.length === 0 ? "" : "\n") + codexBlock());
   return `codex: installed -> ${file} [mcp_servers.bili]`;
 }
 function codexRemove() {
   const file = codexToml();
-  if (!fs11.existsSync(file)) return `codex: not installed (${file})`;
-  const text = fs11.readFileSync(file, "utf8");
+  if (!fs12.existsSync(file)) return `codex: not installed (${file})`;
+  const text = fs12.readFileSync(file, "utf8");
   const start = (() => {
     const m2 = /^[ \t]*\[mcp_servers\.bili\][ \t]*$/m.exec(text);
     return m2 === null ? -1 : m2.index;
@@ -67259,11 +67458,11 @@ function codexRemove() {
   const end = nextTable >= 0 ? start + firstNewline + 1 + nextTable : text.length;
   const cleaned = (text.slice(0, lineStart).replace(/\n+$/, "\n") + text.slice(end)).replace(/^\n+/, "");
   backupOnce(file);
-  fs11.writeFileSync(file, cleaned);
+  fs12.writeFileSync(file, cleaned);
   return `codex: removed from ${file}`;
 }
 function codexStatus() {
-  const text = fs11.existsSync(codexToml()) ? fs11.readFileSync(codexToml(), "utf8") : "";
+  const text = fs12.existsSync(codexToml()) ? fs12.readFileSync(codexToml(), "utf8") : "";
   return /^\[mcp_servers\.bili\]\s*$/m.test(text) ? "installed" : "not installed";
 }
 function opencodeJson() {
@@ -67327,7 +67526,7 @@ function pluginStatusAll() {
 
 // src/launcher.ts
 import { randomUUID as randomUUID5 } from "crypto";
-import fs12 from "fs";
+import fs13 from "fs";
 import net2 from "net";
 import os5 from "os";
 import path18 from "path";
@@ -67795,7 +67994,7 @@ function overlayLockPath(overlay) {
 function livePidHoldsOverlay(overlay) {
   let raw;
   try {
-    raw = fs12.readFileSync(overlayLockPath(overlay), "utf8");
+    raw = fs13.readFileSync(overlayLockPath(overlay), "utf8");
   } catch {
     return void 0;
   }
@@ -67813,13 +68012,13 @@ function linkOverlayEntry(realHome, overlay, entry) {
   const link = path18.join(overlay, entry);
   let st2;
   try {
-    st2 = fs12.lstatSync(target);
+    st2 = fs13.lstatSync(target);
   } catch {
     return false;
   }
   const kind = st2.isDirectory() ? process.platform === "win32" ? "junction" : "dir" : "file";
   try {
-    fs12.symlinkSync(target, link, kind);
+    fs13.symlinkSync(target, link, kind);
     return true;
   } catch (err2) {
     const code = err2.code;
@@ -67827,18 +68026,18 @@ function linkOverlayEntry(realHome, overlay, entry) {
   }
   if (st2.isDirectory()) {
     try {
-      fs12.symlinkSync(target, link, "junction");
+      fs13.symlinkSync(target, link, "junction");
       return true;
     } catch {
       return false;
     }
   }
   try {
-    fs12.linkSync(target, link);
+    fs13.linkSync(target, link);
     return true;
   } catch {
     try {
-      fs12.copyFileSync(target, link);
+      fs13.copyFileSync(target, link);
       return true;
     } catch {
       return false;
@@ -67848,7 +68047,7 @@ function linkOverlayEntry(realHome, overlay, entry) {
 function isWriteThroughHardlink(overlayPath, realPath, st2) {
   if (st2.isDirectory() || st2.isSymbolicLink() || st2.nlink <= 1) return false;
   try {
-    const realSt = fs12.lstatSync(realPath);
+    const realSt = fs13.lstatSync(realPath);
     return st2.dev === realSt.dev && st2.ino === realSt.ino;
   } catch {
     return false;
@@ -67862,7 +68061,7 @@ function freeConflictName(dst) {
   let n = 1;
   while (n < 1e5) {
     try {
-      fs12.lstatSync(candidate);
+      fs13.lstatSync(candidate);
       candidate = `${dst}.bili-conflict.${n}`;
       n += 1;
     } catch {
@@ -67875,7 +68074,7 @@ function mergeSqliteSet(overlay, realHome, base) {
   const members = sqliteSetMembers(base);
   const statFile = (dir, m2) => {
     try {
-      const st2 = fs12.lstatSync(path18.join(dir, m2));
+      const st2 = fs13.lstatSync(path18.join(dir, m2));
       return st2.isFile() ? st2 : void 0;
     } catch {
       return void 0;
@@ -67901,22 +68100,22 @@ function mergeSqliteSet(overlay, realHome, base) {
   const movePreserving = (src, dst) => {
     let dstStat;
     try {
-      dstStat = fs12.lstatSync(dst);
+      dstStat = fs13.lstatSync(dst);
     } catch {
     }
     if (dstStat) {
       if (dstStat.isDirectory()) throw new Error("target is a directory");
       const conflict = freeConflictName(dst);
-      fs12.renameSync(dst, conflict);
-      undo.push(() => fs12.renameSync(conflict, dst));
+      fs13.renameSync(dst, conflict);
+      undo.push(() => fs13.renameSync(conflict, dst));
     }
-    fs12.renameSync(src, dst);
-    undo.push(() => fs12.renameSync(dst, src));
+    fs13.renameSync(src, dst);
+    undo.push(() => fs13.renameSync(dst, src));
   };
   const preserveAsConflict = (src, name) => {
     const conflict = freeConflictName(path18.join(realHome, name));
-    fs12.renameSync(src, conflict);
-    undo.push(() => fs12.renameSync(conflict, src));
+    fs13.renameSync(src, conflict);
+    undo.push(() => fs13.renameSync(conflict, src));
   };
   try {
     for (const m2 of members) {
@@ -67942,7 +68141,7 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
   const generatedFiles = new Set(Array.isArray(generatedFile) ? generatedFile : [generatedFile]);
   const isGeneratedDraft = (name) => [...generatedFiles].some((g2) => name.startsWith(`.${g2}.`) && name.endsWith(".tmp"));
   try {
-    fs12.mkdirSync(overlay, { recursive: true });
+    fs13.mkdirSync(overlay, { recursive: true });
   } catch {
     return false;
   }
@@ -67953,19 +68152,19 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
     );
   }
   try {
-    fs12.writeFileSync(overlayLockPath(overlay), `${process.pid}
+    fs13.writeFileSync(overlayLockPath(overlay), `${process.pid}
 `);
   } catch {
   }
   const realEntries = /* @__PURE__ */ new Set();
   try {
-    for (const entry of fs12.readdirSync(realHome)) realEntries.add(entry);
+    for (const entry of fs13.readdirSync(realHome)) realEntries.add(entry);
   } catch {
   }
   try {
     let overlayEntries;
     try {
-      overlayEntries = fs12.readdirSync(overlay);
+      overlayEntries = fs13.readdirSync(overlay);
     } catch {
       overlayEntries = [];
     }
@@ -67976,7 +68175,7 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
       if (!members.some((m2) => m2 !== entry && overlayEntries.includes(m2))) continue;
       let mainSt;
       try {
-        mainSt = fs12.lstatSync(path18.join(overlay, entry));
+        mainSt = fs13.lstatSync(path18.join(overlay, entry));
       } catch {
       }
       const keepSidecars = mainSt !== void 0 && isWriteThroughHardlink(path18.join(overlay, entry), path18.join(realHome, entry), mainSt);
@@ -67993,7 +68192,7 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
       const overlayPath = path18.join(overlay, entry);
       if (isGeneratedDraft(entry)) {
         try {
-          fs12.unlinkSync(overlayPath);
+          fs13.unlinkSync(overlayPath);
         } catch {
         }
         continue;
@@ -68001,20 +68200,20 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
       if (skipEntries.has(entry)) continue;
       let st2;
       try {
-        st2 = fs12.lstatSync(overlayPath);
+        st2 = fs13.lstatSync(overlayPath);
       } catch {
         continue;
       }
       if (st2.isSymbolicLink()) {
         let target;
         try {
-          target = fs12.readlinkSync(overlayPath);
+          target = fs13.readlinkSync(overlayPath);
         } catch {
         }
         const wanted = realEntries.has(entry) ? path18.join(realHome, entry) : void 0;
         if (!wanted || target !== wanted) {
           try {
-            fs12.unlinkSync(overlayPath);
+            fs13.unlinkSync(overlayPath);
           } catch {
           }
         }
@@ -68022,12 +68221,12 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
         const realPath = path18.join(realHome, entry);
         if (isWriteThroughHardlink(overlayPath, realPath, st2)) {
           try {
-            fs12.unlinkSync(overlayPath);
+            fs13.unlinkSync(overlayPath);
           } catch {
           }
         } else if (mergeOverlayEntry(overlayPath, realPath, generatedFiles)) {
           try {
-            fs12.rmSync(overlayPath, { recursive: true, force: true });
+            fs13.rmSync(overlayPath, { recursive: true, force: true });
           } catch {
           }
         } else {
@@ -68052,7 +68251,7 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
       const overlayPath = path18.join(overlay, entry);
       let present = false;
       try {
-        fs12.lstatSync(overlayPath);
+        fs13.lstatSync(overlayPath);
         present = true;
       } catch {
       }
@@ -68084,32 +68283,32 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
 function mergeOverlayEntry(src, dst, excludedNames) {
   let st2;
   try {
-    st2 = fs12.lstatSync(src);
+    st2 = fs13.lstatSync(src);
   } catch {
     return true;
   }
   let dstStat;
   try {
-    dstStat = fs12.lstatSync(dst);
+    dstStat = fs13.lstatSync(dst);
   } catch {
   }
   if (st2.isDirectory()) {
     if (dstStat && !dstStat.isDirectory()) {
       try {
-        fs12.renameSync(dst, freeConflictName(dst));
+        fs13.renameSync(dst, freeConflictName(dst));
         dstStat = void 0;
       } catch {
         return false;
       }
     }
     try {
-      fs12.mkdirSync(dst, { recursive: true });
+      fs13.mkdirSync(dst, { recursive: true });
     } catch {
       return false;
     }
     let entries;
     try {
-      entries = fs12.readdirSync(src);
+      entries = fs13.readdirSync(src);
     } catch {
       return false;
     }
@@ -68122,7 +68321,7 @@ function mergeOverlayEntry(src, dst, excludedNames) {
   }
   if (dstStat && dstStat.isDirectory()) {
     try {
-      fs12.renameSync(src, freeConflictName(dst));
+      fs13.renameSync(src, freeConflictName(dst));
       return true;
     } catch {
       return false;
@@ -68131,13 +68330,13 @@ function mergeOverlayEntry(src, dst, excludedNames) {
   if (st2.isSymbolicLink()) {
     if (dstStat) {
       try {
-        fs12.unlinkSync(src);
+        fs13.unlinkSync(src);
       } catch {
       }
       return true;
     }
     try {
-      fs12.renameSync(src, dst);
+      fs13.renameSync(src, dst);
     } catch {
       return false;
     }
@@ -68145,7 +68344,7 @@ function mergeOverlayEntry(src, dst, excludedNames) {
   }
   if (dstStat && dstStat.mtimeMs >= st2.mtimeMs) {
     try {
-      fs12.renameSync(src, freeConflictName(dst));
+      fs13.renameSync(src, freeConflictName(dst));
       return true;
     } catch {
       return false;
@@ -68153,13 +68352,13 @@ function mergeOverlayEntry(src, dst, excludedNames) {
   }
   if (dstStat) {
     try {
-      fs12.renameSync(dst, freeConflictName(dst));
+      fs13.renameSync(dst, freeConflictName(dst));
     } catch {
       return false;
     }
   }
   try {
-    fs12.renameSync(src, dst);
+    fs13.renameSync(src, dst);
     return true;
   } catch {
     return false;
@@ -68169,7 +68368,7 @@ function piPluginInstalled(piHome) {
   const root = selfPackageRoot();
   if (!root) return false;
   try {
-    const parsed = JSON.parse(fs12.readFileSync(path18.join(piHome, "settings.json"), "utf8"));
+    const parsed = JSON.parse(fs13.readFileSync(path18.join(piHome, "settings.json"), "utf8"));
     const list = Array.isArray(parsed.packages) ? parsed.packages.map(String) : [];
     return list.some((p2) => isBiliPiEntry(p2, root));
   } catch {
@@ -68179,11 +68378,11 @@ function piPluginInstalled(piHome) {
 function writeOverlayFileAtomic(overlay, fileName, contents) {
   const draft = path18.join(overlay, `.${fileName}.${process.pid}.tmp`);
   try {
-    fs12.writeFileSync(draft, contents);
-    fs12.renameSync(draft, path18.join(overlay, fileName));
+    fs13.writeFileSync(draft, contents);
+    fs13.renameSync(draft, path18.join(overlay, fileName));
   } catch {
     try {
-      fs12.rmSync(draft, { force: true });
+      fs13.rmSync(draft, { force: true });
     } catch {
     }
   }
@@ -68192,7 +68391,7 @@ function prepareDshHome(dshHome, origin, rewrites) {
   const cfgPath = path18.join(dshHome, "settings.yaml");
   let txt;
   try {
-    txt = fs12.readFileSync(cfgPath, "utf8");
+    txt = fs13.readFileSync(cfgPath, "utf8");
   } catch {
     return void 0;
   }
@@ -68241,7 +68440,7 @@ env = { BILI_MCP_PROXY = ${JSON.stringify(origin)}, BILI_CONVERSATION_ID = ${JSO
 function prepareCodexHome(codexHome, origin, conversationId2) {
   let txt = "";
   try {
-    txt = fs12.readFileSync(path18.join(codexHome, "config.toml"), "utf8");
+    txt = fs13.readFileSync(path18.join(codexHome, "config.toml"), "utf8");
   } catch {
   }
   const overlay = `${codexHome}-bili`;
@@ -68253,7 +68452,7 @@ function writeDshAcpPatch(dshHome) {
   const pluginUrl = pathToFileURL(selfDistFile("agent/dsh-acp.js")).href;
   const dir = `${dshHome}-bili`;
   try {
-    fs12.mkdirSync(dir, { recursive: true });
+    fs13.mkdirSync(dir, { recursive: true });
   } catch {
     return void 0;
   }
@@ -68262,7 +68461,7 @@ function writeDshAcpPatch(dshHome) {
 `);
   const file = path18.join(dir, ".bili-acp.patch.yml");
   try {
-    return fs12.existsSync(file) ? file : void 0;
+    return fs13.existsSync(file) ? file : void 0;
   } catch {
     return void 0;
   }
@@ -68277,7 +68476,7 @@ function prepareOpencodeHttpRewrite(configFile2, origin, httpRewrites, httpsRewr
   if (httpRewrites.length === 0 && httpsRewrites.length === 0 && !pluginPath) return void 0;
   let root = {};
   try {
-    const txt = fs12.readFileSync(configFile2, "utf8");
+    const txt = fs13.readFileSync(configFile2, "utf8");
     const parsed = JSON.parse(txt);
     if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
       root = { ...parsed };
@@ -68305,9 +68504,9 @@ function prepareOpencodeHttpRewrite(configFile2, origin, httpRewrites, httpsRewr
     if (!plugins.includes(pluginPath)) plugins.push(pluginPath);
     root.plugin = plugins;
   }
-  const tmp = fs12.mkdtempSync(path18.join(os5.tmpdir(), "bili-opencode-"));
+  const tmp = fs13.mkdtempSync(path18.join(os5.tmpdir(), "bili-opencode-"));
   const tmpFile = path18.join(tmp, "opencode.json");
-  fs12.writeFileSync(tmpFile, JSON.stringify(root));
+  fs13.writeFileSync(tmpFile, JSON.stringify(root));
   return tmpFile;
 }
 function dedupeInOrder(list) {
@@ -68453,7 +68652,7 @@ async function ensureProxyRunning(opts, deps = {}) {
   const script = process.argv[1];
   if (!script) throw new Error("bili: cannot resolve launcher script path");
   const logPath2 = path18.join(os5.tmpdir(), `bili-proxy-${port}.log`);
-  const logFd = fs12.openSync(logPath2, "a");
+  const logFd = fs13.openSync(logPath2, "a");
   const claimMarker = () => claimStartingMarker({ token: launchToken, pid: process.pid, host: opts.host, port, startedAt: now() });
   let claimed = claimMarker();
   if (!claimed) {
@@ -68487,7 +68686,7 @@ async function ensureProxyRunning(opts, deps = {}) {
       );
     } finally {
       try {
-        fs12.closeSync(logFd);
+        fs13.closeSync(logFd);
       } catch {
       }
     }
@@ -68587,7 +68786,7 @@ function resolveOnPath(name, env) {
     for (const ext of PATH_EXTS) {
       const f2 = path18.join(dir, name + ext);
       try {
-        if (fs12.existsSync(f2) && fs12.statSync(f2).isFile()) return f2;
+        if (fs13.existsSync(f2) && fs13.statSync(f2).isFile()) return f2;
       } catch {
       }
     }
@@ -68653,7 +68852,7 @@ async function runLaunch(params, deps = {}) {
   const ompRealHome = resolveOmpHome({ ...process.env, PI_CODING_AGENT_DIR: void 0 });
   if (base === "pi" && (routes.httpRewrites.length > 0 || routes.httpsRewrites.length > 0)) {
     const piExt = selfDistFile("agent/pi.js");
-    const extAvailable = piExt !== void 0 && fs12.existsSync(piExt) || piPluginInstalled(piRealHome);
+    const extAvailable = piExt !== void 0 && fs13.existsSync(piExt) || piPluginInstalled(piRealHome);
     if (!extAvailable) {
       throw new Error(
         "bili: pi needs provider URL rewrites but the bili extension cannot load (dist/agent/pi.js missing and the plugin is not installed in ~/.pi/agent/settings.json) \u2014 reinstall billion-context or run `bili plugin install pi`"
@@ -68662,7 +68861,7 @@ async function runLaunch(params, deps = {}) {
   }
   if (base === "omp" && routes.httpRewrites.length > 0) {
     const ompExt = selfDistFile("agent/omp.js");
-    const extAvailable = ompExt !== void 0 && fs12.existsSync(ompExt) || ompPluginLoadedFrom(ompRealHome);
+    const extAvailable = ompExt !== void 0 && fs13.existsSync(ompExt) || ompPluginLoadedFrom(ompRealHome);
     if (!extAvailable) {
       throw new Error(
         "bili: omp needs provider URL rewrites but the bili extension cannot load (dist/agent/omp.js missing and the plugin is not installed in ~/.omp/agent/config.yml) \u2014 reinstall billion-context or run `bili plugin install omp`"
@@ -68716,20 +68915,20 @@ async function runLaunch(params, deps = {}) {
     env = buildPiEnv(origin, ca, process.env, routes.httpRewrites, routes.httpsRewrites);
     delete env.PI_CODING_AGENT_DIR;
     const piExt = selfDistFile("agent/pi.js");
-    if (piExt && fs12.existsSync(piExt) && !piPluginInstalled(piRealHome)) {
+    if (piExt && fs13.existsSync(piExt) && !piPluginInstalled(piRealHome)) {
       clientArgs = ["-e", piExt, ...clientArgs];
     }
   } else if (base === "omp") {
     env = buildPiEnv(origin, ca, process.env, routes.httpRewrites);
     delete env.PI_CODING_AGENT_DIR;
     const ompExt = selfDistFile("agent/omp.js");
-    if (ompExt && fs12.existsSync(ompExt) && !ompPluginLoadedFrom(ompRealHome)) {
+    if (ompExt && fs13.existsSync(ompExt) && !ompPluginLoadedFrom(ompRealHome)) {
       clientArgs = ["-e", ompExt, ...clientArgs];
     }
   } else if (base === "opencode") {
     env = { ...process.env, HTTPS_PROXY: origin, NODE_EXTRA_CA_CERTS: ca, BILLION_CONTEXT_PROXY: origin };
     const opencodePlugin = selfDistFile("agent/opencode.js");
-    const opencodePluginPath = opencodePlugin && fs12.existsSync(opencodePlugin) ? opencodePlugin : void 0;
+    const opencodePluginPath = opencodePlugin && fs13.existsSync(opencodePlugin) ? opencodePlugin : void 0;
     opencodeTmpFile = prepareOpencodeHttpRewrite(resolveOpencodeConfigFile(process.env), origin, routes.httpRewrites, routes.httpsRewrites, opencodePluginPath);
     if (opencodeTmpFile) env.OPENCODE_CONFIG = opencodeTmpFile;
   } else if (base === "hermes") {
@@ -68866,7 +69065,7 @@ async function runLaunch(params, deps = {}) {
     }
     if (injectMcp) {
       const mcpFile = path18.join(os5.tmpdir(), `bili-mcp-${Date.now()}.json`);
-      fs12.writeFileSync(mcpFile, JSON.stringify(buildMcpConfig(origin)));
+      fs13.writeFileSync(mcpFile, JSON.stringify(buildMcpConfig(origin)));
       tmpFiles.push(mcpFile);
       clientArgs = ["--mcp-config", mcpFile, ...clientArgs];
     }
@@ -68885,13 +69084,13 @@ async function runLaunch(params, deps = {}) {
     stopProxy(handle2);
     if (opencodeTmpFile) {
       try {
-        fs12.rmSync(path18.dirname(opencodeTmpFile), { recursive: true, force: true });
+        fs13.rmSync(path18.dirname(opencodeTmpFile), { recursive: true, force: true });
       } catch {
       }
     }
     for (const f2 of tmpFiles) {
       try {
-        fs12.rmSync(f2, { force: true });
+        fs13.rmSync(f2, { force: true });
       } catch {
       }
     }
@@ -68918,7 +69117,7 @@ async function runTestPi(params, deps = {}) {
   const ca = resolveCaCertPath(process.env);
   const env = buildPiEnv(handle2.origin, ca, process.env);
   const sessionDir = path18.join(os5.tmpdir(), `bili-pi-test-${Date.now()}`);
-  fs12.mkdirSync(sessionDir, { recursive: true });
+  fs13.mkdirSync(sessionDir, { recursive: true });
   const args = [
     "-p",
     "--no-session",