billion-context 0.1.74 → 0.1.75-pr.485.304

package/dist/index.js

@@ -48008,12 +48008,22 @@ import path3 from "path";
 // src/fetch-util.ts
 var MAX_REQUEST_BYTES = 100 * 1024 * 1024;
 var UPSTREAM_TIMEOUT_MS = 10 * 60 * 1e3;
+var liveUpstreamTimers = /* @__PURE__ */ new Set();
 async function fetchWithTimeout(url, opts, timeoutMs = UPSTREAM_TIMEOUT_MS, externalSignal) {
   const controller = new AbortController();
-  let timer2 = setTimeout(() => controller.abort(), timeoutMs);
+  const armTimer = () => {
+    const t = setTimeout(() => {
+      liveUpstreamTimers.delete(t);
+      controller.abort();
+    }, timeoutMs);
+    liveUpstreamTimers.add(t);
+    return t;
+  };
+  let timer2 = armTimer();
   const rearm = () => {
     clearTimeout(timer2);
-    timer2 = setTimeout(() => controller.abort(), timeoutMs);
+    liveUpstreamTimers.delete(timer2);
+    timer2 = armTimer();
   };
   let onExternalAbort = null;
   if (externalSignal) {
@@ -48025,6 +48035,7 @@ async function fetchWithTimeout(url, opts, timeoutMs = UPSTREAM_TIMEOUT_MS, exte
   }
   const cleanup = () => {
     clearTimeout(timer2);
+    liveUpstreamTimers.delete(timer2);
     if (onExternalAbort && externalSignal) externalSignal.removeEventListener("abort", onExternalAbort);
   };
   try {
@@ -50106,6 +50117,58 @@ function reconcileNativeCompactionBoundary(session) {
   markDirty(session);
   return true;
 }
+function markCompactionBoundary(session) {
+  session.metadata.compactionBoundary = {
+    at: Date.now(),
+    pending: true
+  };
+  markDirty(session);
+}
+function readPreCompactionArchive(session) {
+  const raw = session.metadata.preCompactionArchive;
+  if (raw && typeof raw === "object" && !Array.isArray(raw)) {
+    return raw;
+  }
+  return {};
+}
+function preCompactionArchiveOf(session) {
+  return readPreCompactionArchive(session);
+}
+function applyCompactionArchive(session, activeBefore, liveRawIds, log2) {
+  const boundary = session.metadata.compactionBoundary;
+  if (!boundary || typeof boundary !== "object" || !boundary.pending) {
+    return;
+  }
+  const activeAfter = new Set(session.state.blocks.filter((b2) => b2.active).map((b2) => b2.blockId));
+  const deactivated = [...activeBefore].filter((id) => !activeAfter.has(id));
+  if (deactivated.length > 0) {
+    const archive = readPreCompactionArchive(session);
+    const at2 = Date.now();
+    for (const id of deactivated) {
+      archive[id] = { at: at2, reason: "content replaced by client native compaction summary" };
+    }
+    session.metadata.preCompactionArchive = archive;
+  }
+  const { byRaw, byRef } = session.state.messageRefs;
+  const prunedByRaw = {};
+  for (const [rawId, ref] of Object.entries(byRaw)) {
+    if (liveRawIds.has(rawId)) prunedByRaw[rawId] = ref;
+  }
+  const prunedByRef = {};
+  for (const [ref, rawId] of Object.entries(byRef)) {
+    if (liveRawIds.has(rawId)) prunedByRef[ref] = rawId;
+  }
+  session.state.messageRefs.byRaw = prunedByRaw;
+  session.state.messageRefs.byRef = prunedByRef;
+  session.metadata.compactionBoundary = {
+    ...boundary,
+    pending: false,
+    archivedAt: Date.now(),
+    archivedBlocks: deactivated
+  };
+  markDirty(session);
+  log2("info", `[${session.id}] native compaction boundary: archived ${deactivated.length} pre-compaction block(s)${deactivated.length > 0 ? ` (${deactivated.join(", ")})` : ""}; pruned ref maps to ${prunedByRaw.length} live raw id(s)`);
+}
 function evictOldest() {
   let oldestId;
   let oldestSeen = Infinity;
@@ -50182,6 +50245,10 @@ function resolveDecompress(args, ctx) {
   const blockId = rawBlockId.trim();
   const block = ctx.core.decompress(blockId, ctx.session.state);
   if (!block) return `[Block ${blockId} not found]`;
+  const archived = preCompactionArchiveOf(ctx.session);
+  if (archived[blockId] !== void 0) {
+    return `[decompress FAILED: block ${blockId} is a pre-compaction archive \u2014 its content was in the history BEFORE the client's native compaction and is no longer reachable (replaced by the client's compaction summary). decompress is unavailable for archived blocks.]`;
+  }
   const full = args.full === true;
   const cached = ctx.session.blockContents.get(blockId);
   let body;
@@ -51427,6 +51494,8 @@ function handleAcpStatus(args, ctx) {
   const nudge = ctx.nudge;
   const ranges = nudge?.compressibleRanges ?? [];
   const protectedRanges = nudge?.protectedRanges ?? [];
+  const archive = preCompactionArchiveOf(ctx.session);
+  const archivedIds = Object.keys(archive);
   const extra = [];
   if (nudge) {
     extra.push("");
@@ -51436,6 +51505,13 @@ function handleAcpStatus(args, ctx) {
     extra.push("");
     extra.push(formatRanges(ranges, protectedRanges));
   }
+  if (archivedIds.length > 0) {
+    extra.push("");
+    extra.push(`PRE-COMPACTION ARCHIVE \u2014 ${archivedIds.length} block(s): content was replaced by the client's native compaction summary, so it is no longer in the session history and decompress is unavailable.`);
+    for (const id of archivedIds) {
+      extra.push(`  ${id} \u2014 ${archive[id].reason}`);
+    }
+  }
   return extra.length > 0 ? `${base}
 ${extra.join("\n")}` : base;
 }
@@ -54239,6 +54315,32 @@ function handlePluginRegister(payload, res) {
   queuePluginRegister(conversationId2, agent, parsed.identity === true);
   res.end(JSON.stringify({ ok: true, conversationId: conversationId2, agent }));
 }
+function handlePluginCompact(payload, res) {
+  let parsed;
+  try {
+    parsed = JSON.parse(payload);
+  } catch {
+    res.writeHead(400, { "content-type": "application/json" });
+    res.end(JSON.stringify({ ok: false, error: "invalid JSON body" }));
+    return;
+  }
+  const conversationId2 = typeof parsed.conversationId === "string" ? parsed.conversationId.trim() : "";
+  if (!conversationId2) {
+    res.writeHead(400, { "content-type": "application/json" });
+    res.end(JSON.stringify({ ok: false, error: "conversationId is required" }));
+    return;
+  }
+  const entry = conversations.get(conversationId2);
+  const session = entry ? peekSession(entry.sessionId) : void 0;
+  if (!entry || !session) {
+    res.writeHead(404, { "content-type": "application/json" });
+    res.end(JSON.stringify({ ok: false, error: "unknown plugin conversation (no model request has arrived with this conversation id yet)" }));
+    return;
+  }
+  markCompactionBoundary(session);
+  entry.lastSeen = Date.now();
+  res.end(JSON.stringify({ ok: true, conversationId: conversationId2 }));
+}
 function handlePluginManifest(res) {
   res.writeHead(200, { "content-type": "application/json" });
   res.end(JSON.stringify({
@@ -54472,6 +54574,12 @@ data: ${JSON.stringify({ type: "content_block_delta", index, delta: { type: delt
       return new Promise((r) => res.once("drain", () => r()));
     }
   };
+  const settleUsage = () => {
+    if (session && (acc.inputTokens !== void 0 || acc.outputTokens !== void 0 || acc.cachedTokens !== void 0)) {
+      applyUsageSample(session, acc, protocol);
+      markDirty(session);
+    }
+  };
   const pushField = (field, index, text) => {
     const s3 = filterFor(field, index);
     const clean = s3.filter.push(text);
@@ -54577,10 +54685,14 @@ data: ${JSON.stringify({ type: "content_block_delta", index, delta: { type: delt
     }
     const rest = flushTails();
     if (rest.length > 0 && !res.destroyed && !res.writableEnded) await write(rest);
-    if (session && (acc.inputTokens !== void 0 || acc.outputTokens !== void 0 || acc.cachedTokens !== void 0)) {
-      applyUsageSample(session, acc, protocol);
-      markDirty(session);
+    settleUsage();
+  } catch (e) {
+    settleUsage();
+    if (res.destroyed || res.writableEnded) {
+      log2?.("client aborted mid-stream");
+      return;
     }
+    throw e;
   } finally {
     reader.releaseLock();
     res.end();
@@ -54614,6 +54726,12 @@ async function pipePluginResponsesWithStrip(stream2, res, session, log2) {
       return new Promise((r) => res.once("drain", () => r()));
     }
   };
+  const settleUsage = () => {
+    if (session && (acc.inputTokens !== void 0 || acc.outputTokens !== void 0 || acc.cachedTokens !== void 0)) {
+      applyUsageSample(session, acc, "responses");
+      markDirty(session);
+    }
+  };
   let lastDeltaMeta = null;
   const flushTail = (after) => {
     const tail = tagFilter.flush();
@@ -54686,10 +54804,14 @@ async function pipePluginResponsesWithStrip(stream2, res, session, log2) {
       const rest = flushTail("");
       if (rest.length > 0) await write(rest);
     }
-    if (session && (acc.inputTokens !== void 0 || acc.outputTokens !== void 0 || acc.cachedTokens !== void 0)) {
-      applyUsageSample(session, acc, "responses");
-      markDirty(session);
+    settleUsage();
+  } catch (e) {
+    settleUsage();
+    if (res.destroyed || res.writableEnded) {
+      log2?.("client aborted mid-stream");
+      return;
     }
+    throw e;
   } finally {
     reader.releaseLock();
     res.end();
@@ -54715,10 +54837,16 @@ function rebuildEvent(rawEvent, ev) {
 async function pipePluginJson(stream2, res, session, protocol) {
   const reader = stream2.getReader();
   const chunks = [];
-  for (; ; ) {
-    const { done, value } = await reader.read();
-    if (done) break;
-    if (value && value.length > 0) chunks.push(Buffer.from(value));
+  try {
+    for (; ; ) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      if (value && value.length > 0) chunks.push(Buffer.from(value));
+    }
+  } catch (e) {
+    if (!res.writableEnded) res.end();
+    if (res.destroyed || res.writableEnded) return;
+    throw e;
   }
   reader.releaseLock();
   const text = Buffer.concat(chunks).toString("utf8");
@@ -56369,7 +56497,10 @@ async function startServer(opts) {
       await handle(req, res, opts, core, config, log2, instanceId, instanceStartedAt);
     } catch (err2) {
       const msg = String(err2);
-      log2("error", msg);
+      const e = err2;
+      const clientAbort = (e?.name === "AbortError" || /abort/i.test(String(e?.message ?? ""))) && (res.destroyed || res.writableEnded);
+      if (clientAbort) log2("info", `client aborted mid-stream: ${msg}`);
+      else log2("error", msg);
       if (!res.headersSent) {
         const status = msg.includes("exceeds") ? 413 : 502;
         res.writeHead(status, { "content-type": "application/json" });
@@ -56665,6 +56796,17 @@ async function handle(req, res, opts, core, config, log2, instanceId, instanceSt
       return;
     }
   }
+  if (req.method === "POST" && req.url === "/__bili/plugin/compact") {
+    try {
+      const body = await readBody(req);
+      handlePluginCompact(body.toString("utf8"), res);
+      return;
+    } catch (err2) {
+      res.writeHead(err2 instanceof BodyTooLargeError ? 413 : 400, { "content-type": "application/json" });
+      res.end(JSON.stringify({ ok: false, error: String(err2) }));
+      return;
+    }
+  }
   if (isAdminPath) {
     res.writeHead(404, { "content-type": "application/json" });
     res.end(JSON.stringify({ error: { type: "not_found", message: "no such management endpoint" } }));
@@ -56894,6 +57036,7 @@ ${bodyBuffer.toString("utf8")}`);
       nativeFromFallback = false;
       log2("info", `[${session.id}] self-healed context window: ${resolved} \u2192 ${learnedLimit} (learned from an upstream overflow)`);
     }
+    const nativeWindow = reqConfig.modelContextLimit;
     if (shouldReserveOutputHeadroom(protocol)) {
       const p2 = parsed;
       const rawMax = p2.max_tokens ?? p2.max_completion_tokens ?? p2.max_output_tokens;
@@ -56908,7 +57051,7 @@ ${bodyBuffer.toString("utf8")}`);
     acquireInFlight(session);
     try {
       await withSessionLock(session, async () => {
-        const runPrepare = () => countTokens ? prepareCountTokens(parsed, core, reqConfig, log2, session) : protocol === "anthropic" ? prepareAnthropic(parsed, req, opts, core, reqConfig, reqPrompts, log2, session, pluginMode) : protocol === "openai" ? prepareOpenai(parsed, req, opts, core, reqConfig, reqPrompts, log2, session, pluginMode) : responsesCompact ? prepareResponsesCompact(bodyBuffer, parsed, session, req, core, reqConfig, log2) : prepareResponses(parsed, req, opts, core, reqConfig, reqPrompts, log2, session, responsesIdentity, pluginMode, upstreamOrigin);
+        const runPrepare = () => countTokens ? prepareCountTokens(parsed, core, reqConfig, log2, session) : protocol === "anthropic" ? prepareAnthropic(parsed, req, opts, core, reqConfig, reqPrompts, log2, session, pluginMode) : protocol === "openai" ? prepareOpenai(parsed, req, opts, core, reqConfig, reqPrompts, log2, session, pluginMode, nativeWindow) : responsesCompact ? prepareResponsesCompact(bodyBuffer, parsed, session, req, core, reqConfig, log2) : prepareResponses(parsed, req, opts, core, reqConfig, reqPrompts, log2, session, responsesIdentity, pluginMode, upstreamOrigin, nativeWindow);
         prepared = runPrepare();
         if (!countTokens && !responsesCompact) {
           const outcome = await preflightCompressIfNeeded(
@@ -56992,7 +57135,7 @@ function diagNudge(turn, sessionId, tokenCount, limit, model, willInject) {
   const interval = b2["nudgeGrowthTokens"] ?? 0;
   const pendingT1 = b2["pendingT1"] ?? 0;
   const ref = b2["growthReference"] ?? 0;
-  const inject = !n.shouldInject ? "idle" : willInject ? `INJECT T${n.tier ?? "?"}` : `ARMED-SUPPRESSED T${n.tier ?? "?"}`;
+  const inject = willInject ? n.shouldInject ? `INJECT T${n.tier ?? "?"}` : `INJECT-ESC T${n.tier ?? "?"}` : n.shouldInject ? `ARMED-SUPPRESSED T${n.tier ?? "?"}` : "idle";
   const modelTag = model ? ` model=${model}` : "";
   return `[${sessionId}] nudge ${inject}: usage=${pct2} (${tokenCount}/${limit}), growth=${growth}/${floor} (ref=${ref}, interval=${interval}), pendingT1=${pendingT1}/${interval}${modelTag}, reason="${n.reason.slice(0, 120)}"`;
 }
@@ -57016,6 +57159,7 @@ function prepareAnthropic(parsed, req, opts, core, config, prompts, log2, sessio
     originalMessages = msgs;
     extractSystem(parsed.system);
     const tokenCount = session.stats.lastInputTokens;
+    const activeBefore = new Set(session.state.blocks.filter((b2) => b2.active).map((b2) => b2.blockId));
     const turn = core.processTurn({ messages: msgs, state: session.state, config, tokenCount, renderTags: "text-only" });
     session.state = turn.state;
     session.stats.compressCreditTokens = 0;
@@ -57027,9 +57171,10 @@ function prepareAnthropic(parsed, req, opts, core, config, prompts, log2, sessio
       if (t) session.meta.title = t;
     }
     log2("info", diagTagSummary(turn.messages, sessionId, "text-only"));
-    const willInjectNudge = opts.compress.injectNudge && !!turn.nudge?.shouldInject;
+    const willInjectNudge = opts.compress.injectNudge && !!turn.nudge && (turn.nudge.shouldInject || emergencyNudge(turn.nudge));
     log2("info", diagNudge(turn, sessionId, tokenCount, config.modelContextLimit, parsed.model, willInjectNudge));
     processedMessages = stripKernelSummaries(turn.messages, turn.state);
+    applyCompactionArchive(session, activeBefore, new Set(msgs.map((m2) => m2.id)), log2);
     reapOrphanBlocks(session, msgs, deactivateBlock);
     rebuiltMessages = coreToAnthropic(processedMessages, cacheControls);
     systemOut = injectSystem(parsed, opts, prompts);
@@ -57055,7 +57200,36 @@ function prepareAnthropic(parsed, req, opts, core, config, prompts, log2, sessio
   delete rebuilt.prompt_cache_key;
   return { body: JSON.stringify(rebuilt), session, processedMessages, originalMessages, anthropicSystem: parsed.system, protocol: "anthropic", stream: stream2, compressInjected: injectTools, pluginMode, nudge, prompts, renderTags: "text-only" };
 }
-function prepareOpenai(parsed, req, opts, core, config, prompts, log2, session, pluginMode) {
+var OUTPUT_CLAMP_MARGIN_PCT = 0.05;
+var OUTPUT_CLAMP_MIN_MARGIN = 2048;
+var OUTPUT_CLAMP_FLOOR = 1024;
+var EMERGENCY_NUDGE_ESCALATION_PCT = 0.7;
+function estimateInputTokens(processedMessages, systemText, tools, lastInputTokens) {
+  const est = estimateCoreMessages(processedMessages) + defaultCountTokens(systemText ?? "") + defaultCountTokens(JSON.stringify(tools ?? []));
+  return Math.max(lastInputTokens > 0 ? lastInputTokens : 0, est);
+}
+function clampOutputBudget(requested, inputEstimate, nativeWindow) {
+  const margin = Math.max(OUTPUT_CLAMP_MIN_MARGIN, Math.ceil(inputEstimate * OUTPUT_CLAMP_MARGIN_PCT));
+  const cap = nativeWindow - inputEstimate - margin;
+  if (cap < OUTPUT_CLAMP_FLOOR || cap >= requested) return void 0;
+  return cap;
+}
+function emergencyNudge(nudge, escalationPct = EMERGENCY_NUDGE_ESCALATION_PCT) {
+  if (!nudge || nudge.shouldInject) return false;
+  if (nudge.compressibleRanges.length === 0) return false;
+  return nudge.contextUsage >= escalationPct;
+}
+function clampOutgoingOutput(rebuilt, field, ctx, sessionId, log2) {
+  const raw = rebuilt[field];
+  if (typeof raw !== "number") return;
+  const inputEstimate = estimateInputTokens(ctx.processedMessages, ctx.systemText, ctx.tools, ctx.lastInputTokens);
+  const capped = clampOutputBudget(raw, inputEstimate, ctx.nativeWindow);
+  if (capped !== void 0) {
+    rebuilt[field] = capped;
+    log2("info", `[${sessionId}] output budget clamped ${raw} -> ${capped} (input~${inputEstimate}, window=${ctx.nativeWindow}); prevents input+output overflow (#453)`);
+  }
+}
+function prepareOpenai(parsed, req, opts, core, config, prompts, log2, session, pluginMode, nativeWindow) {
   const sessionId = session.id;
   const stream2 = parsed.stream === true;
   ++session.stats.requests;
@@ -57074,6 +57248,7 @@ function prepareOpenai(parsed, req, opts, core, config, prompts, log2, session,
     openaiSystemText = systemText;
     originalMessages = msgs;
     const tokenCount = session.stats.lastInputTokens;
+    const activeBefore = new Set(session.state.blocks.filter((b2) => b2.active).map((b2) => b2.blockId));
     const turn = core.processTurn({ messages: msgs, state: session.state, config, tokenCount, renderTags: "text-only" });
     session.state = turn.state;
     session.stats.compressCreditTokens = 0;
@@ -57085,9 +57260,10 @@ function prepareOpenai(parsed, req, opts, core, config, prompts, log2, session,
       if (t) session.meta.title = t;
     }
     log2("info", diagTagSummary(turn.messages, sessionId, "text-only"));
-    const willInjectNudge = opts.compress.injectNudge && !!turn.nudge?.shouldInject && shouldInject;
+    const willInjectNudge = opts.compress.injectNudge && !!turn.nudge && shouldInject && (turn.nudge.shouldInject || emergencyNudge(turn.nudge));
     log2("info", diagNudge(turn, sessionId, tokenCount, config.modelContextLimit, parsed.model, willInjectNudge));
     processedMessages = stripKernelSummaries(turn.messages, turn.state);
+    applyCompactionArchive(session, activeBefore, new Set(msgs.map((m2) => m2.id)), log2);
     reapOrphanBlocks(session, msgs, deactivateBlock);
     rebuiltMessages = systemToUser(coreToOpenai(processedMessages));
     const sysParts = [];
@@ -57111,6 +57287,7 @@ function prepareOpenai(parsed, req, opts, core, config, prompts, log2, session,
     processedMessages = [];
   }
   const rebuilt = { ...parsed, messages: rebuiltMessages, tools: toolsOut };
+  clampOutgoingOutput(rebuilt, typeof parsed.max_completion_tokens === "number" ? "max_completion_tokens" : "max_tokens", { systemText: openaiSystemText, tools: toolsOut, processedMessages, lastInputTokens: session.stats.lastInputTokens, nativeWindow }, sessionId, log2);
   delete rebuilt.prompt_cache_retention;
   if (stream2 && rebuilt.stream_options === void 0) {
     rebuilt.stream_options = { include_usage: true };
@@ -57119,7 +57296,7 @@ function prepareOpenai(parsed, req, opts, core, config, prompts, log2, session,
   markDirty(session);
   return { body: JSON.stringify(rebuilt), session, processedMessages, originalMessages, protocol: "openai", stream: stream2, compressInjected: injectTools, pluginMode, nudge, prompts, openaiSystemText, renderTags: "text-only" };
 }
-function prepareResponses(parsed, req, opts, core, config, prompts, log2, session, identity, pluginMode, upstreamOrigin) {
+function prepareResponses(parsed, req, opts, core, config, prompts, log2, session, identity, pluginMode, upstreamOrigin, nativeWindow) {
   const sessionId = session.id;
   const stream2 = parsed.stream === true;
   ++session.stats.requests;
@@ -57176,7 +57353,7 @@ function prepareResponses(parsed, req, opts, core, config, prompts, log2, sessio
       if (t) session.meta.title = t;
     }
     log2("info", diagTagSummary(turn.messages, sessionId, "text-only"));
-    const willInjectNudge = opts.compress.injectNudge && !!turn.nudge?.shouldInject && shouldInject && !isCompactionTrigger;
+    const willInjectNudge = opts.compress.injectNudge && !!turn.nudge && shouldInject && !isCompactionTrigger && (turn.nudge.shouldInject || emergencyNudge(turn.nudge));
     log2("info", diagNudge(turn, sessionId, tokenCount, config.modelContextLimit, parsed.model, willInjectNudge));
     processedMessages = stripKernelSummaries(turn.messages, turn.state);
     reapOrphanBlocks(session, msgs, deactivateBlock);
@@ -57227,6 +57404,9 @@ function prepareResponses(parsed, req, opts, core, config, prompts, log2, sessio
     log2("info", `[${sessionId}] codex compact intercepted (trigger); forged SSE with ${summaries.length} block summary(s), upstream not contacted`);
   }
   const rebuilt = { ...parsed, input: rebuiltInput, tools: toolsOut };
+  if (!isCompactionTrigger) {
+    clampOutgoingOutput(rebuilt, "max_output_tokens", { systemText: (responsesProjection?.systemParts ?? []).join("\n"), tools: toolsOut, processedMessages, lastInputTokens: session.stats.lastInputTokens, nativeWindow }, sessionId, log2);
+  }
   const promptCacheKey = resolvePromptCacheKey(
     rebuilt.prompt_cache_key,
     identity,
@@ -57709,187 +57889,191 @@ ${hdrText}
     return;
   }
   if (prepared?.pluginMode) {
-    if (prepared.stream) {
-      if (prepared.protocol === "responses") {
-        await pipePluginResponsesWithStrip(upstream.body, res, prepared.session, (msg) => log2("info", `[${prepared.session.id}] ${msg}`));
+    try {
+      if (prepared.stream) {
+        if (prepared.protocol === "responses") {
+          await pipePluginResponsesWithStrip(upstream.body, res, prepared.session, (msg) => log2("info", `[${prepared.session.id}] ${msg}`));
+        } else {
+          await pipePluginChatWithStrip(upstream.body, res, prepared.protocol, prepared.session, (msg) => log2("info", `[${prepared.session.id}] ${msg}`));
+        }
       } else {
-        await pipePluginChatWithStrip(upstream.body, res, prepared.protocol, prepared.session, (msg) => log2("info", `[${prepared.session.id}] ${msg}`));
+        await pipePluginJson(upstream.body, res, prepared.session, prepared.protocol);
       }
-    } else {
-      await pipePluginJson(upstream.body, res, prepared.session, prepared.protocol);
+    } finally {
+      clearUpstreamTimer();
     }
-    clearUpstreamTimer();
     return;
   }
   let responseBody = upstream.body;
-  if (prepared !== null && prepared.stream && maxFakeCompletionRetries() > 0) {
-    const resolvedBuf = await resolveFakeCompletion(upstream.body, {
-      protocol: prepared.protocol,
-      body,
-      upstreamUrl,
-      reqHeaders: buildForwardHeaders(headers),
-      proxyUrl,
-      signal: clientAbort.signal,
-      session: prepared.session,
-      log: log2
-    });
-    responseBody = bufferToStream(resolvedBuf);
-  }
-  const useRewriter = prepared !== null && prepared.compressInjected && prepared.processedMessages.length > 0;
-  if (!useRewriter || prepared === null) {
-    if (prepared && prepared.resetAfterSuccess) {
-      const [toClient, toObserve] = responseBody.tee();
-      const observed = observeResponsesTerminalState(toObserve, prepared.stream);
-      const tagLog = (msg) => log2("info", `[${prepared.session.id}] ${msg}`);
-      if ((upstream.headers.get("content-type") ?? "").includes("text/event-stream")) {
-        await pipePluginResponsesWithStrip(toClient, res, void 0, tagLog);
-      } else {
-        await pipeThrough(toClient, res);
-      }
-      clearUpstreamTimer();
-      const terminal = await observed;
-      if (terminal === "completed") {
-        markNativeCompactionBoundary(prepared.session);
-        log2("info", `[${prepared.session.id}] native Responses compact completed; rebase scheduled for next Responses turn`);
-      } else {
-        log2("warn", `[${prepared.session.id}] native compact response terminal=${terminal}; rebase NOT scheduled`);
-      }
-    } else if (prepared && prepared.stream && (upstream.headers.get("content-type") ?? "").includes("text/event-stream")) {
-      const p2 = prepared;
-      const tagLog = (msg) => log2("info", `[${p2.session.id}] ${msg}`);
-      if (p2.protocol === "responses") {
-        await pipePluginResponsesWithStrip(responseBody, res, void 0, tagLog);
+  try {
+    if (prepared !== null && prepared.stream && maxFakeCompletionRetries() > 0) {
+      const resolvedBuf = await resolveFakeCompletion(upstream.body, {
+        protocol: prepared.protocol,
+        body,
+        upstreamUrl,
+        reqHeaders: buildForwardHeaders(headers),
+        proxyUrl,
+        signal: clientAbort.signal,
+        session: prepared.session,
+        log: log2
+      });
+      responseBody = bufferToStream(resolvedBuf);
+    }
+    const useRewriter = prepared !== null && prepared.compressInjected && prepared.processedMessages.length > 0;
+    if (!useRewriter || prepared === null) {
+      if (prepared && prepared.resetAfterSuccess) {
+        const [toClient, toObserve] = responseBody.tee();
+        const observed = observeResponsesTerminalState(toObserve, prepared.stream);
+        const tagLog = (msg) => log2("info", `[${prepared.session.id}] ${msg}`);
+        if ((upstream.headers.get("content-type") ?? "").includes("text/event-stream")) {
+          await pipePluginResponsesWithStrip(toClient, res, void 0, tagLog);
+        } else {
+          await pipeThrough(toClient, res);
+        }
+        const terminal = await observed;
+        if (terminal === "completed") {
+          markNativeCompactionBoundary(prepared.session);
+          log2("info", `[${prepared.session.id}] native Responses compact completed; rebase scheduled for next Responses turn`);
+        } else {
+          log2("warn", `[${prepared.session.id}] native compact response terminal=${terminal}; rebase NOT scheduled`);
+        }
+      } else if (prepared && prepared.stream && (upstream.headers.get("content-type") ?? "").includes("text/event-stream")) {
+        const p2 = prepared;
+        const tagLog = (msg) => log2("info", `[${p2.session.id}] ${msg}`);
+        if (p2.protocol === "responses") {
+          await pipePluginResponsesWithStrip(responseBody, res, void 0, tagLog);
+        } else {
+          await pipePluginChatWithStrip(responseBody, res, p2.protocol, void 0, tagLog);
+        }
+      } else if (prepared && (upstream.headers.get("content-type") ?? "").includes("application/json")) {
+        await pipePluginJson(responseBody, res, void 0, prepared.protocol);
       } else {
-        await pipePluginChatWithStrip(responseBody, res, p2.protocol, void 0, tagLog);
+        await pipeThrough(responseBody, res);
       }
-      clearUpstreamTimer();
-    } else if (prepared && (upstream.headers.get("content-type") ?? "").includes("application/json")) {
-      await pipePluginJson(responseBody, res, void 0, prepared.protocol);
-      clearUpstreamTimer();
-    } else {
-      await pipeThrough(responseBody, res);
-      clearUpstreamTimer();
-    }
-    return;
-  }
-  const ctx = {
-    core,
-    config,
-    messages: prepared.originalMessages,
-    session: prepared.session,
-    log: (msg) => log2("info", `[${prepared.session.id}] ${msg}`),
-    debug: opts.debug
-  };
-  if (prepared.stream) {
-    let streamToRead = responseBody;
-    let dumpRaw;
-    if (opts.dumpSse) {
-      const [a, b2] = responseBody.tee();
-      streamToRead = a;
-      dumpRaw = dumpStreamToFile(b2, opts.dumpSse, `${Date.now()}-${safeSessionId(prepared.session.id)}-raw.sse`);
+      return;
     }
-    try {
-      const parsedReq = JSON.parse(typeof body === "string" ? body : body.toString("utf8"));
-      const reqHeaders = buildForwardHeaders(headers);
-      const textProtocol = prepared.protocol === "responses" && !!prepared.responsesTextProtocol;
-      const systemPrompt = textProtocol ? buildCompressHybridSystemPrompt(prepared.prompts ?? defaultPrompts) : buildCompressSystemPrompt(prepared.prompts ?? defaultPrompts);
-      const adapter = pickAdapter(prepared.protocol, parsedReq, textProtocol, prepared.responsesProjection, prepared.anthropicSystem, prepared.openaiSystemText);
-      const refreshFolded = (current) => {
-        const turn = core.processTurn({
-          messages: prepared.originalMessages,
-          state: prepared.session.state,
-          config,
-          tokenCount: prepared.session.stats.lastInputTokens,
-          renderTags: prepared.renderTags ?? "text-only"
-        });
-        prepared.session.state = turn.state;
-        const records = current.filter((m2) => typeof m2.id === "string" && m2.id.startsWith("acp_loop_"));
-        return stripKernelSummaries([...turn.messages, ...records], turn.state);
-      };
-      const loop = runCompressLoop(
-        streamToRead,
-        { core, config, messages: prepared.processedMessages.length > 0 ? prepared.processedMessages : prepared.originalMessages, compressMessages: prepared.originalMessages, session: prepared.session, log: ctx.log, proxyUrl, protocol: prepared.protocol, textProtocol, debug: opts.debug, nudge: prepared.nudge, refreshFolded },
-        parsedReq,
-        { url: upstreamUrl, headers: reqHeaders },
-        adapter,
-        systemPrompt,
-        clientAbort.signal
-      );
-      let protocolFragmentWarned = false;
-      for await (const chunk of loop) {
-        if (res.destroyed || res.writableEnded) break;
-        {
-          const s3 = chunk.toString("utf8");
-          if (s3.includes("<acp ") || s3.includes("</acp")) {
-            log2("warn", `[${prepared.session.id}] tag echo: ${prepared.protocol} response stream contains <acp tag`);
-          } else if (!protocolFragmentWarned && containsToolCallXmlFragment(s3)) {
-            protocolFragmentWarned = true;
-            log2("warn", `[${prepared.session.id}] tag echo: ${prepared.protocol} response stream contains tool-call XML fragment (possible tag echo; not stripped)`);
-          }
-        }
-        res.write(chunk);
-        if (res.writableNeedDrain) {
-          await Promise.race([
-            new Promise((r) => res.once("drain", () => r())),
-            new Promise((r) => res.once("close", () => r()))
-          ]);
-        }
-        if (res.destroyed || res.writableEnded) break;
+    const ctx = {
+      core,
+      config,
+      messages: prepared.originalMessages,
+      session: prepared.session,
+      log: (msg) => log2("info", `[${prepared.session.id}] ${msg}`),
+      debug: opts.debug
+    };
+    if (prepared.stream) {
+      let streamToRead = responseBody;
+      let dumpRaw;
+      if (opts.dumpSse) {
+        const [a, b2] = responseBody.tee();
+        streamToRead = a;
+        dumpRaw = dumpStreamToFile(b2, opts.dumpSse, `${Date.now()}-${safeSessionId(prepared.session.id)}-raw.sse`);
       }
-      res.end();
-    } catch (e) {
-      emitStreamError(res, prepared.protocol, e?.message ?? String(e), (m2) => log2("error", `[${prepared.session.id}] ${m2}`));
-    } finally {
-      clearUpstreamTimer();
-      if (dumpRaw) await dumpRaw;
-    }
-  } else {
-    try {
-      const buf = await upstream.arrayBuffer();
-      const text = Buffer.from(buf).toString("utf8");
       try {
-        let json = JSON.parse(text);
-        if (prepared.protocol === "responses" && prepared.responsesTextProtocol) {
-          const requestBody = JSON.parse(typeof body === "string" ? body : body.toString("utf8"));
-          const requestHeaders = buildForwardHeaders(headers);
-          json = await compressLoopResponsesJson(
-            json,
-            { core, config, messages: prepared.originalMessages, session: prepared.session, log: ctx.log, proxyUrl, textProtocol: true },
-            requestBody,
-            { url: upstreamUrl, headers: requestHeaders }
-          );
-        }
-        const u2 = json.usage ?? {};
-        const { total, cached } = usageTotals(prepared.protocol, u2);
-        if (typeof total === "number") {
-          prepared.session.stats.inputTokens += total;
-          prepared.session.stats.lastInputTokens = Math.max(
-            0,
-            total - (prepared.session.stats.compressCreditTokens ?? 0)
-          );
-          if (typeof cached === "number") {
-            prepared.session.stats.cachedTokens += cached;
-            prepared.session.stats.cacheSamples += 1;
+        const parsedReq = JSON.parse(typeof body === "string" ? body : body.toString("utf8"));
+        const reqHeaders = buildForwardHeaders(headers);
+        const textProtocol = prepared.protocol === "responses" && !!prepared.responsesTextProtocol;
+        const systemPrompt = textProtocol ? buildCompressHybridSystemPrompt(prepared.prompts ?? defaultPrompts) : buildCompressSystemPrompt(prepared.prompts ?? defaultPrompts);
+        const adapter = pickAdapter(prepared.protocol, parsedReq, textProtocol, prepared.responsesProjection, prepared.anthropicSystem, prepared.openaiSystemText);
+        const refreshFolded = (current) => {
+          const turn = core.processTurn({
+            messages: prepared.originalMessages,
+            state: prepared.session.state,
+            config,
+            tokenCount: prepared.session.stats.lastInputTokens,
+            renderTags: prepared.renderTags ?? "text-only"
+          });
+          prepared.session.state = turn.state;
+          const records = current.filter((m2) => typeof m2.id === "string" && m2.id.startsWith("acp_loop_"));
+          return stripKernelSummaries([...turn.messages, ...records], turn.state);
+        };
+        const loop = runCompressLoop(
+          streamToRead,
+          { core, config, messages: prepared.processedMessages.length > 0 ? prepared.processedMessages : prepared.originalMessages, compressMessages: prepared.originalMessages, session: prepared.session, log: ctx.log, proxyUrl, protocol: prepared.protocol, textProtocol, debug: opts.debug, nudge: prepared.nudge, refreshFolded },
+          parsedReq,
+          { url: upstreamUrl, headers: reqHeaders },
+          adapter,
+          systemPrompt,
+          clientAbort.signal
+        );
+        let protocolFragmentWarned = false;
+        for await (const chunk of loop) {
+          if (res.destroyed || res.writableEnded) break;
+          {
+            const s3 = chunk.toString("utf8");
+            if (s3.includes("<acp ") || s3.includes("</acp")) {
+              log2("warn", `[${prepared.session.id}] tag echo: ${prepared.protocol} response stream contains <acp tag`);
+            } else if (!protocolFragmentWarned && containsToolCallXmlFragment(s3)) {
+              protocolFragmentWarned = true;
+              log2("warn", `[${prepared.session.id}] tag echo: ${prepared.protocol} response stream contains tool-call XML fragment (possible tag echo; not stripped)`);
+            }
+          }
+          res.write(chunk);
+          if (res.writableNeedDrain) {
+            await Promise.race([
+              new Promise((r) => res.once("drain", () => r())),
+              new Promise((r) => res.once("close", () => r()))
+            ]);
           }
-          const out = u2.completion_tokens ?? u2.output_tokens;
-          if (typeof out === "number") prepared.session.stats.outputTokens += out;
+          if (res.destroyed || res.writableEnded) break;
         }
-        if (prepared.protocol === "openai") {
-          rewriteOpenaiJsonResponse(json, ctx);
-        } else if (prepared.protocol === "responses") {
-          rewriteResponsesJsonResponse(json, ctx);
-        } else {
-          rewriteJsonResponse(json, ctx);
+        res.end();
+      } catch (e) {
+        emitStreamError(res, prepared.protocol, e?.message ?? String(e), (m2) => log2("error", `[${prepared.session.id}] ${m2}`));
+      } finally {
+        clearUpstreamTimer();
+        if (dumpRaw) await dumpRaw;
+        markDirty(prepared.session);
+      }
+    } else {
+      try {
+        const buf = await upstream.arrayBuffer();
+        const text = Buffer.from(buf).toString("utf8");
+        try {
+          let json = JSON.parse(text);
+          if (prepared.protocol === "responses" && prepared.responsesTextProtocol) {
+            const requestBody = JSON.parse(typeof body === "string" ? body : body.toString("utf8"));
+            const requestHeaders = buildForwardHeaders(headers);
+            json = await compressLoopResponsesJson(
+              json,
+              { core, config, messages: prepared.originalMessages, session: prepared.session, log: ctx.log, proxyUrl, textProtocol: true },
+              requestBody,
+              { url: upstreamUrl, headers: requestHeaders }
+            );
+          }
+          const u2 = json.usage ?? {};
+          const { total, cached } = usageTotals(prepared.protocol, u2);
+          if (typeof total === "number") {
+            prepared.session.stats.inputTokens += total;
+            prepared.session.stats.lastInputTokens = Math.max(
+              0,
+              total - (prepared.session.stats.compressCreditTokens ?? 0)
+            );
+            if (typeof cached === "number") {
+              prepared.session.stats.cachedTokens += cached;
+              prepared.session.stats.cacheSamples += 1;
+            }
+            const out = u2.completion_tokens ?? u2.output_tokens;
+            if (typeof out === "number") prepared.session.stats.outputTokens += out;
+          }
+          if (prepared.protocol === "openai") {
+            rewriteOpenaiJsonResponse(json, ctx);
+          } else if (prepared.protocol === "responses") {
+            rewriteResponsesJsonResponse(json, ctx);
+          } else {
+            rewriteJsonResponse(json, ctx);
+          }
+          res.end(JSON.stringify(json));
+        } catch {
+          res.end(text);
         }
-        res.end(JSON.stringify(json));
-      } catch {
-        res.end(text);
+      } finally {
+        clearUpstreamTimer();
+        markDirty(prepared.session);
       }
-    } finally {
-      clearUpstreamTimer();
     }
+  } finally {
+    clearUpstreamTimer();
   }
-  markDirty(prepared.session);
 }
 async function readStreamToBuffer(stream2, maxBytes = 1 << 20) {
   const reader = stream2.getReader();
@@ -62333,19 +62517,20 @@ function livePidHoldsOverlay(overlay) {
 function linkOverlayEntry(realHome, overlay, entry) {
   const target = path14.join(realHome, entry);
   const link = path14.join(overlay, entry);
-  try {
-    fs11.symlinkSync(target, link);
-    return true;
-  } catch (err2) {
-    const code = err2.code;
-    if (code !== "EPERM" && code !== "EACCES" && code !== "EINVAL") return false;
-  }
   let st2;
   try {
     st2 = fs11.lstatSync(target);
   } catch {
     return false;
   }
+  const kind = st2.isDirectory() ? process.platform === "win32" ? "junction" : "dir" : "file";
+  try {
+    fs11.symlinkSync(target, link, kind);
+    return true;
+  } catch (err2) {
+    const code = err2.code;
+    if (code !== "EPERM" && code !== "EACCES" && code !== "EINVAL") return false;
+  }
   if (st2.isDirectory()) {
     try {
       fs11.symlinkSync(target, link, "junction");
@@ -62376,17 +62561,39 @@ function isWriteThroughHardlink(overlayPath, realPath, st2) {
   }
 }
 function sqliteSetMembers(base) {
-  return [base, `${base}-wal`, `${base}-shm`];
+  return [base, `${base}-wal`, `${base}-shm`, `${base}-journal`];
+}
+function freeConflictName(dst) {
+  let candidate = `${dst}.bili-conflict`;
+  let n = 1;
+  while (n < 1e5) {
+    try {
+      fs11.lstatSync(candidate);
+      candidate = `${dst}.bili-conflict.${n}`;
+      n += 1;
+    } catch {
+      return candidate;
+    }
+  }
+  return candidate;
 }
 function mergeSqliteSet(overlay, realHome, base) {
-  const members = sqliteSetMembers(base).filter((m2) => {
+  const members = sqliteSetMembers(base);
+  const statFile = (dir, m2) => {
     try {
-      return fs11.lstatSync(path14.join(overlay, m2)).isFile();
+      const st2 = fs11.lstatSync(path14.join(dir, m2));
+      return st2.isFile() ? st2 : void 0;
     } catch {
-      return false;
+      return void 0;
     }
-  });
-  if (members.length === 0) return true;
+  };
+  const oMain = statFile(overlay, base);
+  const rMain = statFile(realHome, base);
+  let winner;
+  if (oMain && rMain) winner = rMain.mtimeMs >= oMain.mtimeMs ? "real" : "overlay";
+  else if (oMain) winner = "overlay";
+  else if (rMain) winner = "real";
+  else winner = "orphan";
   const undo = [];
   const rollback = () => {
     for (const step of undo.reverse()) {
@@ -62397,46 +62604,39 @@ function mergeSqliteSet(overlay, realHome, base) {
     }
     undo.length = 0;
   };
+  const movePreserving = (src, dst) => {
+    let dstStat;
+    try {
+      dstStat = fs11.lstatSync(dst);
+    } catch {
+    }
+    if (dstStat) {
+      if (dstStat.isDirectory()) throw new Error("target is a directory");
+      const conflict = freeConflictName(dst);
+      fs11.renameSync(dst, conflict);
+      undo.push(() => fs11.renameSync(conflict, dst));
+    }
+    fs11.renameSync(src, dst);
+    undo.push(() => fs11.renameSync(dst, src));
+  };
+  const preserveAsConflict = (src, name) => {
+    const conflict = freeConflictName(path14.join(realHome, name));
+    fs11.renameSync(src, conflict);
+    undo.push(() => fs11.renameSync(conflict, src));
+  };
   try {
     for (const m2 of members) {
-      const src = path14.join(overlay, m2);
-      const dst = path14.join(realHome, m2);
-      let dstStat;
-      try {
-        dstStat = fs11.lstatSync(dst);
-      } catch {
-      }
-      if (dstStat && dstStat.isDirectory()) {
-        rollback();
-        return false;
-      }
-      const srcStat = fs11.lstatSync(src);
-      if (dstStat && dstStat.mtimeMs >= srcStat.mtimeMs) {
-        try {
-          fs11.renameSync(src, `${dst}.bili-conflict`);
-        } catch {
-          rollback();
-          return false;
-        }
-        undo.push(() => fs11.renameSync(`${dst}.bili-conflict`, src));
-        continue;
-      }
-      if (dstStat) {
-        try {
-          fs11.renameSync(dst, `${dst}.bili-conflict`);
-        } catch {
-          rollback();
-          return false;
-        }
-        undo.push(() => fs11.renameSync(`${dst}.bili-conflict`, dst));
-      }
-      try {
-        fs11.renameSync(src, dst);
-      } catch {
-        rollback();
-        return false;
+      const o = statFile(overlay, m2);
+      const r = statFile(realHome, m2);
+      if (winner === "overlay") {
+        if (o) movePreserving(path14.join(overlay, m2), path14.join(realHome, m2));
+        else if (r) preserveAsConflict(path14.join(realHome, m2), m2);
+      } else if (winner === "real") {
+        if (o) preserveAsConflict(path14.join(overlay, m2), m2);
+      } else {
+        if (o) preserveAsConflict(path14.join(overlay, m2), m2);
+        else if (r) preserveAsConflict(path14.join(realHome, m2), m2);
       }
-      undo.push(() => fs11.renameSync(dst, src));
     }
     return true;
   } catch {
@@ -62445,6 +62645,8 @@ function mergeSqliteSet(overlay, realHome, base) {
   }
 }
 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 {
     fs11.mkdirSync(overlay, { recursive: true });
   } catch {
@@ -62475,7 +62677,7 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
     }
     const dbSets = [];
     for (const entry of overlayEntries) {
-      if (!entry.endsWith(".db") || entry === generatedFile) continue;
+      if (!entry.endsWith(".db") || generatedFiles.has(entry)) continue;
       const members = sqliteSetMembers(entry);
       if (!members.some((m2) => m2 !== entry && overlayEntries.includes(m2))) continue;
       let mainSt;
@@ -62493,9 +62695,9 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
       }
     }
     for (const entry of overlayEntries) {
-      if (entry === generatedFile) continue;
+      if (generatedFiles.has(entry)) continue;
       const overlayPath = path14.join(overlay, entry);
-      if (entry.startsWith(`.${generatedFile}.`) && entry.endsWith(".tmp")) {
+      if (isGeneratedDraft(entry)) {
         try {
           fs11.unlinkSync(overlayPath);
         } catch {
@@ -62529,7 +62731,7 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
             fs11.unlinkSync(overlayPath);
           } catch {
           }
-        } else if (mergeOverlayEntry(overlayPath, realPath, generatedFile)) {
+        } else if (mergeOverlayEntry(overlayPath, realPath, generatedFiles)) {
           try {
             fs11.rmSync(overlayPath, { recursive: true, force: true });
           } catch {
@@ -62551,7 +62753,7 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
     let total = 0;
     const linkFailures = [];
     for (const entry of realEntries) {
-      if (entry === generatedFile) continue;
+      if (generatedFiles.has(entry)) continue;
       total += 1;
       const overlayPath = path14.join(overlay, entry);
       let present = false;
@@ -62585,7 +62787,7 @@ function refreshOverlayHome(realHome, overlay, generatedFile) {
   }
   return true;
 }
-function mergeOverlayEntry(src, dst, excludedName) {
+function mergeOverlayEntry(src, dst, excludedNames) {
   let st2;
   try {
     st2 = fs11.lstatSync(src);
@@ -62600,7 +62802,7 @@ function mergeOverlayEntry(src, dst, excludedName) {
   if (st2.isDirectory()) {
     if (dstStat && !dstStat.isDirectory()) {
       try {
-        fs11.renameSync(dst, `${dst}.bili-conflict`);
+        fs11.renameSync(dst, freeConflictName(dst));
         dstStat = void 0;
       } catch {
         return false;
@@ -62619,14 +62821,14 @@ function mergeOverlayEntry(src, dst, excludedName) {
     }
     let ok = true;
     for (const entry of entries) {
-      if (excludedName !== void 0 && entry === excludedName) continue;
-      if (!mergeOverlayEntry(path14.join(src, entry), path14.join(dst, entry), excludedName)) ok = false;
+      if (excludedNames?.has(entry)) continue;
+      if (!mergeOverlayEntry(path14.join(src, entry), path14.join(dst, entry), excludedNames)) ok = false;
     }
     return ok;
   }
   if (dstStat && dstStat.isDirectory()) {
     try {
-      fs11.renameSync(src, `${dst}.bili-conflict`);
+      fs11.renameSync(src, freeConflictName(dst));
       return true;
     } catch {
       return false;
@@ -62649,7 +62851,7 @@ function mergeOverlayEntry(src, dst, excludedName) {
   }
   if (dstStat && dstStat.mtimeMs >= st2.mtimeMs) {
     try {
-      fs11.renameSync(src, `${dst}.bili-conflict`);
+      fs11.renameSync(src, freeConflictName(dst));
       return true;
     } catch {
       return false;
@@ -62657,7 +62859,7 @@ function mergeOverlayEntry(src, dst, excludedName) {
   }
   if (dstStat) {
     try {
-      fs11.renameSync(dst, `${dst}.bili-conflict`);
+      fs11.renameSync(dst, freeConflictName(dst));
     } catch {
       return false;
     }
@@ -62692,45 +62894,58 @@ function writeOverlayFileAtomic(overlay, fileName, contents) {
     }
   }
 }
-function preparePiHttpRewrite(piHome, origin, httpRewrites, httpsRewrites) {
-  if (httpRewrites.length === 0 && httpsRewrites.length === 0) return void 0;
-  const modelsPath = path14.join(piHome, "models.json");
-  let txt;
+function writePiCompactionDisabledSettings(piHome, overlay) {
+  let settings = {};
   try {
-    txt = fs11.readFileSync(modelsPath, "utf8");
+    const parsed = JSON.parse(fs11.readFileSync(path14.join(piHome, "settings.json"), "utf8"));
+    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+      settings = parsed;
+    }
   } catch {
-    return void 0;
   }
-  let parsed;
+  const compactionRaw = settings.compaction;
+  const compaction = compactionRaw && typeof compactionRaw === "object" && !Array.isArray(compactionRaw) ? { ...compactionRaw } : {};
+  compaction.enabled = false;
+  settings.compaction = compaction;
+  writeOverlayFileAtomic(overlay, "settings.json", JSON.stringify(settings, null, 2));
+}
+function preparePiHttpRewrite(piHome, origin, httpRewrites, httpsRewrites) {
+  if (!fs11.existsSync(piHome)) return void 0;
+  const overlay = `${piHome}-bili`;
+  const generated = ["settings.json"];
+  let modelsRoot;
   try {
-    parsed = JSON.parse(txt);
+    const parsed = JSON.parse(fs11.readFileSync(path14.join(piHome, "models.json"), "utf8"));
+    if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+      modelsRoot = parsed;
+      generated.push("models.json");
+    }
   } catch {
-    return void 0;
   }
-  if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return void 0;
-  const root = parsed;
-  const providersVal = root.providers;
-  if (providersVal && typeof providersVal === "object" && !Array.isArray(providersVal)) {
-    const providers = providersVal;
-    for (const r of httpRewrites) {
-      const prov = providers[r.key];
-      if (prov && typeof prov === "object" && !Array.isArray(prov)) {
-        const p2 = prov;
-        const existing = typeof p2.baseUrl === "string" ? p2.baseUrl : r.realUpstream;
-        p2.baseUrl = wrapUpstream(origin, unwrapUpstream2(existing));
+  if (!refreshOverlayHome(piHome, overlay, generated)) return void 0;
+  if (modelsRoot) {
+    const providersVal = modelsRoot.providers;
+    if (providersVal && typeof providersVal === "object" && !Array.isArray(providersVal)) {
+      const providers = providersVal;
+      for (const r of httpRewrites) {
+        const prov = providers[r.key];
+        if (prov && typeof prov === "object" && !Array.isArray(prov)) {
+          const p2 = prov;
+          const existing = typeof p2.baseUrl === "string" ? p2.baseUrl : r.realUpstream;
+          p2.baseUrl = wrapUpstream(origin, unwrapUpstream2(existing));
+        }
       }
-    }
-    for (const r of httpsRewrites) {
-      const prov = providers[r.key];
-      if (prov && typeof prov === "object" && !Array.isArray(prov)) {
-        const p2 = prov;
-        p2.baseUrl = r.realUpstream;
+      for (const r of httpsRewrites) {
+        const prov = providers[r.key];
+        if (prov && typeof prov === "object" && !Array.isArray(prov)) {
+          const p2 = prov;
+          p2.baseUrl = r.realUpstream;
+        }
       }
     }
+    writeOverlayFileAtomic(overlay, "models.json", JSON.stringify(modelsRoot));
   }
-  const overlay = `${piHome}-bili`;
-  if (!refreshOverlayHome(piHome, overlay, "models.json")) return void 0;
-  writeOverlayFileAtomic(overlay, "models.json", JSON.stringify(root));
+  writePiCompactionDisabledSettings(piHome, overlay);
   return overlay;
 }
 function atomicWriteTextFile(filePath, contents) {
@@ -62781,55 +62996,145 @@ function unpackDeadProxyUrlsInFile(filePath, livePorts) {
   }
   return changed;
 }
+function mergeOmpCompactionDisabledYaml(text) {
+  const lines = text.split(/\r?\n/);
+  let compactionLine = -1;
+  for (let i = 0; i < lines.length; i++) {
+    const rawLine = lines[i];
+    const trimmed = rawLine.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+    const indent = rawLine.length - rawLine.trimStart().length;
+    if (indent === 0 && /^compaction:\s*(#.*)?$/.test(trimmed)) {
+      compactionLine = i;
+      break;
+    }
+  }
+  if (compactionLine === -1) {
+    const base = text === "" || text.endsWith("\n") ? text : `${text}
+`;
+    return `${base}compaction:
+  enabled: false
+`;
+  }
+  for (let i = compactionLine + 1; i < lines.length; i++) {
+    const rawLine = lines[i];
+    const trimmed = rawLine.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+    const indent = rawLine.length - rawLine.trimStart().length;
+    if (indent === 0) break;
+    if (/^enabled:/.test(trimmed)) {
+      const leading = rawLine.slice(0, rawLine.length - rawLine.trimStart().length);
+      const commentMatch = /\s+#.*$/.exec(rawLine);
+      const comment = commentMatch ? commentMatch[0] : "";
+      lines[i] = `${leading}enabled: false${comment}`;
+      return lines.join("\n");
+    }
+  }
+  let childIndent = 2;
+  for (let i = compactionLine + 1; i < lines.length; i++) {
+    const rawLine = lines[i];
+    const trimmed = rawLine.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+    const indent = rawLine.length - rawLine.trimStart().length;
+    if (indent === 0) break;
+    childIndent = indent;
+    break;
+  }
+  lines.splice(compactionLine + 1, 0, `${" ".repeat(childIndent)}enabled: false`);
+  return lines.join("\n");
+}
+function writeOmpCompactionDisabledConfig(ompHome, overlay) {
+  let base;
+  let baseIsJson = false;
+  for (const name of ["config.yml", "config.yaml"]) {
+    try {
+      base = fs11.readFileSync(path14.join(ompHome, name), "utf8");
+      break;
+    } catch {
+    }
+  }
+  if (base === void 0) {
+    try {
+      base = fs11.readFileSync(path14.join(ompHome, "settings.json"), "utf8");
+      baseIsJson = true;
+    } catch {
+    }
+  }
+  let merged;
+  if (base === void 0) {
+    merged = "compaction:\n  enabled: false\n";
+  } else if (baseIsJson) {
+    let settings = {};
+    try {
+      const parsed = JSON.parse(base);
+      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+        settings = parsed;
+      }
+    } catch {
+    }
+    const compactionRaw = settings.compaction;
+    const compaction = compactionRaw && typeof compactionRaw === "object" && !Array.isArray(compactionRaw) ? { ...compactionRaw } : {};
+    compaction.enabled = false;
+    settings.compaction = compaction;
+    merged = JSON.stringify(settings, null, 2);
+  } else {
+    merged = mergeOmpCompactionDisabledYaml(base);
+  }
+  writeOverlayFileAtomic(overlay, "config.yml", merged);
+}
 function prepareOmpHttpRewrite(ompHome, origin, httpRewrites, httpsRewrites) {
+  if (!fs11.existsSync(ompHome)) return void 0;
+  const overlay = `${ompHome}-bili`;
+  const generated = ["config.yml"];
   const modelsPath = path14.join(ompHome, "models.yml");
   const unpacked = unpackDeadProxyUrlsInFile(modelsPath, liveProxyPorts());
   if (unpacked > 0) {
     console.error(`bili: unpacked ${unpacked} dead proxy URL(s) from the real ${modelsPath}`);
   }
-  if (httpRewrites.length === 0 && httpsRewrites.length === 0) return void 0;
-  let txt;
+  let modelsText;
   try {
-    txt = fs11.readFileSync(modelsPath, "utf8");
+    modelsText = fs11.readFileSync(modelsPath, "utf8");
+    generated.push("models.yml");
   } catch {
-    return void 0;
   }
-  const httpMap = new Map(httpRewrites.map((r) => [r.key, wrapUpstream(origin, r.realUpstream)]));
-  const httpsMap = new Map(httpsRewrites.map((r) => [r.key, r.realUpstream]));
-  const lines = txt.split(/\r?\n/);
-  let providersIndent = -1;
-  let providerIndent = -1;
-  let currentProvider = null;
-  for (let i = 0; i < lines.length; i++) {
-    const rawLine = lines[i];
-    const trimmed = rawLine.trim();
-    if (!trimmed || trimmed.startsWith("#")) continue;
-    const indent = rawLine.length - rawLine.trimStart().length;
-    if (providersIndent === -1) {
-      if (/^providers:\s*(#.*)?$/.test(trimmed)) providersIndent = indent;
-      continue;
-    }
-    if (indent <= providersIndent) break;
-    if (providerIndent === -1) providerIndent = indent;
-    if (indent === providerIndent) {
-      const m2 = /^([A-Za-z0-9_.-]+):/.exec(trimmed);
-      currentProvider = m2 ? m2[1] : null;
-    } else if (indent > providerIndent && currentProvider) {
-      const baseMatch = /^(baseUrl:\s*)(\S+)/.exec(trimmed);
-      if (baseMatch) {
-        const target = httpMap.get(currentProvider) ?? httpsMap.get(currentProvider);
-        if (target) {
-          const leading = rawLine.slice(0, rawLine.length - rawLine.trimStart().length);
-          const commentMatch = /\s+#.*$/.exec(rawLine);
-          const comment = commentMatch ? commentMatch[0] : "";
-          lines[i] = `${leading}baseUrl: ${target}${comment}`;
+  if (!refreshOverlayHome(ompHome, overlay, generated)) return void 0;
+  if (modelsText !== void 0) {
+    const httpMap = new Map(httpRewrites.map((r) => [r.key, wrapUpstream(origin, r.realUpstream)]));
+    const httpsMap = new Map(httpsRewrites.map((r) => [r.key, r.realUpstream]));
+    const lines = modelsText.split(/\r?\n/);
+    let providersIndent = -1;
+    let providerIndent = -1;
+    let currentProvider = null;
+    for (let i = 0; i < lines.length; i++) {
+      const rawLine = lines[i];
+      const trimmed = rawLine.trim();
+      if (!trimmed || trimmed.startsWith("#")) continue;
+      const indent = rawLine.length - rawLine.trimStart().length;
+      if (providersIndent === -1) {
+        if (/^providers:\s*(#.*)?$/.test(trimmed)) providersIndent = indent;
+        continue;
+      }
+      if (indent <= providersIndent) break;
+      if (providerIndent === -1) providerIndent = indent;
+      if (indent === providerIndent) {
+        const m2 = /^([A-Za-z0-9_.-]+):/.exec(trimmed);
+        currentProvider = m2 ? m2[1] : null;
+      } else if (indent > providerIndent && currentProvider) {
+        const baseMatch = /^(baseUrl:\s*)(\S+)/.exec(trimmed);
+        if (baseMatch) {
+          const target = httpMap.get(currentProvider) ?? httpsMap.get(currentProvider);
+          if (target) {
+            const leading = rawLine.slice(0, rawLine.length - rawLine.trimStart().length);
+            const commentMatch = /\s+#.*$/.exec(rawLine);
+            const comment = commentMatch ? commentMatch[0] : "";
+            lines[i] = `${leading}baseUrl: ${target}${comment}`;
+          }
         }
       }
     }
+    writeOverlayFileAtomic(overlay, "models.yml", lines.join("\n"));
   }
-  const overlay = `${ompHome}-bili`;
-  if (!refreshOverlayHome(ompHome, overlay, "models.yml")) return void 0;
-  writeOverlayFileAtomic(overlay, "models.yml", lines.join("\n"));
+  writeOmpCompactionDisabledConfig(ompHome, overlay);
   return overlay;
 }
 function prepareHermesHome(hermesHome, origin, rewrites) {