billion-context 0.1.83 → 0.1.84-pr.370.354

package/README.md

@@ -112,6 +112,17 @@ turn is a semantic mismatch the model tolerates (it is clearly marked
   summaries (their tool call isn't in the agent's history and the agent's view
   skips `acp_summary`) — but that needs the id match above, which doesn't occur.
 
+## Which do I need?
+
+Pick by your client:
+
+| Client | Use |
+|---|---|
+| **pi** | [`billion-context-pi`](https://github.com/ranxianglei/billion-context-pi) (in-process extension) |
+| **opencode** | [`opencode-acp`](https://github.com/ranxianglei/opencode-acp) (in-process extension) |
+| **omp** | [`billion-context`](https://github.com/ranxianglei/billion-context) via `bili omp` (built-in plugin) |
+| **everything else** (no context hook) | [`billion-context`](https://github.com/ranxianglei/billion-context) — `bili <client>` (launcher, preferred) or `/bili/` prefix |
+
 ## Install
 
 ```bash
@@ -382,7 +393,7 @@ pass an explicit `x-acp-session` header per conversation to avoid collisions.
 
 Early. Protocol handling and compression work against mock tests (500+ passing). Real-model integration testing is the next milestone. Expect rough edges.
 
-See [billion-context-pi](https://github.com/ranxianglei/billion-context-pi) for the pi-extension mode (in-process, tighter integration, the reference implementation).
+Client-side plugins for pi / omp / opencode ship inside `billion-context` (`dist/agent/*.js`) for the cooperative-proxy path. See the **"Which do I need?"** section above for how `billion-context`, the standalone `billion-context-pi`, and `opencode-acp` relate.
 
 ## License
 

package/README.zh-CN.md

@@ -50,6 +50,17 @@ AI 编程助手的<strong>通用上下文压缩代理</strong>
 
 代理向对话注入四个上下文管理工具(`compress`、`decompress`、`search_context`、`acp_status`)。模型在对话增长时调用 `compress`,代理在服务端执行 —— 压缩后的范围在下一轮之前折叠进对话历史。
 
+## 该选哪个?
+
+按客户端选:
+
+| 客户端 | 用这个 |
+|---|---|
+| **pi** | [`billion-context-pi`](https://github.com/ranxianglei/billion-context-pi)(进程内扩展) |
+| **opencode** | [`opencode-acp`](https://github.com/ranxianglei/opencode-acp)(进程内扩展) |
+| **omp** | [`billion-context`](https://github.com/ranxianglei/billion-context),`bili omp`(内置插件) |
+| **其余所有**(没有上下文 hook) | [`billion-context`](https://github.com/ranxianglei/billion-context) —— `bili <client>`(启动器,优先)或 `/bili/` 前缀 |
+
 ## 安装
 
 ```bash
@@ -258,7 +269,7 @@ Windows 下会自动发现常见 Clash/Mihomo 静态系统代理;Web UI 会显
 
 早期。协议处理和压缩已通过 mock 测试(500+ 项通过)。真实模型集成测试是下一里程碑。预期会有粗糙的地方。
 
-pi 扩展模式(进程内、更紧密集成、参考实现)见 [billion-context-pi](https://github.com/ranxianglei/billion-context-pi)。
+针对 pi / omp / opencode 的客户端插件随 `billion-context` 一起发布(`dist/agent/*.js`),用于协作代理路径。三者(`billion-context`、独立的 `billion-context-pi`、`opencode-acp`)如何取舍,见上文「该选哪个?」一节。
 
 ## 许可证
 

package/dist/index.js

@@ -49370,6 +49370,7 @@ function subagentNamespace(identityValue, instructions) {
 
 // src/persist.ts
 import { createHash as createHash3 } from "crypto";
+import { existsSync as existsSync3, mkdirSync as mkdirSync3, writeFileSync as writeFileSync2 } from "fs";
 import { rm } from "fs/promises";
 import * as path5 from "path";
 
@@ -49806,6 +49807,7 @@ function rel(p2, base) {
 
 // src/persist.ts
 var PERSIST_VERSION = 3;
+var MIGRATION_MARKER = ".bili-migration-286.done";
 function mergeState(parsed) {
   const fresh = createInitialState();
   return {
@@ -49865,6 +49867,21 @@ var SessionStore = class {
     }
     return out;
   }
+  /** Single-pass boot (#401): ONE loadAll walk+parse, then the #286
+   *  identity migration over the SAME parsed map (no extra directory
+   *  walk), then hydration into Sessions. initSessions calls this instead
+   *  of migrateLegacyIds()+loadAll(), which walked and parsed the whole
+   *  tree twice per start. */
+  async boot() {
+    if (!this.enabled) return /* @__PURE__ */ new Map();
+    const loaded = await this.store.loadAll();
+    await this.applyLegacyMigration(loaded);
+    const out = /* @__PURE__ */ new Map();
+    for (const [id, envelope] of loaded) {
+      out.set(id, buildSession(envelope.payload));
+    }
+    return out;
+  }
   /** One-time migration for the #286 identity change: sessions persisted
    *  under the old derived hash id are re-keyed to the client-provided
    *  conversation value stored in meta.label (which is now the session id
@@ -49873,10 +49890,21 @@ var SessionStore = class {
    *  session, are deleted. Records without a label cannot be mapped and are
    *  left in place (they load under their old id but are never requested
    *  again — the new proxy 400s anonymous requests). Self-terminating:
-   *  after one pass no loaded id differs from its label. */
+   *  after one pass no loaded id differs from its label. A completion
+   *  marker makes it run ONCE EVER (#401): the old code re-scanned the tree
+   *  on every boot because unlabeled files are intentionally kept, so the
+   *  "one-time" log line repeated forever. */
   async migrateLegacyIds() {
     if (!this.enabled) return;
+    if (existsSync3(this.markerPath())) return;
     const loaded = await this.store.loadAll();
+    await this.applyLegacyMigration(loaded);
+  }
+  markerPath() {
+    return path5.join(this.dir, MIGRATION_MARKER);
+  }
+  async applyLegacyMigration(loaded) {
+    if (existsSync3(this.markerPath())) return;
     const claimed = /* @__PURE__ */ new Set();
     const byLabel = /* @__PURE__ */ new Map();
     let unlabeled = 0;
@@ -49894,24 +49922,39 @@ var SessionStore = class {
       }
       const prev = byLabel.get(label);
       if (!prev || envelope.savedAt >= prev.savedAt) {
-        if (prev) await this.removeLegacyFile(prev.id, prev.session);
+        if (prev) {
+          await this.removeLegacyFile(prev.id, prev.session);
+          loaded.delete(prev.id);
+        }
         byLabel.set(label, { id, savedAt: envelope.savedAt, session });
       } else {
         await this.removeLegacyFile(id, session);
+        loaded.delete(id);
       }
     }
     let rekeyed = 0;
     for (const [label, { id, session }] of byLabel) {
       if (claimed.has(label)) {
         await this.removeLegacyFile(id, session);
+        loaded.delete(id);
         continue;
       }
       session.id = label;
       await this.store.writeNow(label, () => buildRecord(session));
       await this.removeLegacyFile(id, session);
+      const envelope = loaded.get(id);
+      if (envelope) {
+        loaded.set(label, { ...envelope, id: label, payload: { ...envelope.payload, id: label } });
+      }
+      loaded.delete(id);
       claimed.add(label);
       rekeyed++;
     }
+    try {
+      mkdirSync3(this.dir, { recursive: true });
+      writeFileSync2(this.markerPath(), String(Date.now()), "utf8");
+    } catch {
+    }
     if (rekeyed || unlabeled) {
       log("info", `[persist] one-time migration (#286): rekeyed ${rekeyed} legacy session(s), left ${unlabeled} unlabeled legacy file(s) in place`);
     }
@@ -49997,10 +50040,21 @@ function buildRecord(session) {
     createdAt: session.createdAt
   };
 }
+function isBlockView(v2) {
+  return !!v2 && typeof v2 === "object" && typeof v2.text === "string" && typeof v2.count === "number";
+}
 function buildSession(parsed) {
   const blockContents = /* @__PURE__ */ new Map();
   for (const [bid, content] of Object.entries(parsed.blockContents ?? {})) {
-    if (content && typeof content === "object") blockContents.set(bid, content);
+    if (!content || typeof content !== "object") continue;
+    const full = content.full;
+    if (!isBlockView(full)) continue;
+    const one = content.one;
+    const oneView = isBlockView(one) ? one : null;
+    blockContents.set(bid, {
+      one: oneView && !(oneView.text === full.text && oneView.count === full.count) ? oneView : null,
+      full
+    });
   }
   const meta = parsed.meta ?? {};
   const stats = parsed.stats ?? {};
@@ -50085,8 +50139,7 @@ async function initSessions() {
   initialized = true;
   const store = getStore();
   if (!store.enabled) return;
-  await store.migrateLegacyIds();
-  const loaded = await store.loadAll();
+  const loaded = await store.boot();
   if (loaded.size > MAX_SESSIONS) {
     const freshness = (s3) => Math.max(s3.createdAt ?? 0, s3.lastSeen ?? 0);
     const entries = [...loaded.entries()].sort((a, b2) => freshness(b2[1]) - freshness(a[1]));
@@ -50292,7 +50345,7 @@ function withStagedCompressGuidance(text) {
 }
 
 // src/decompress-shared.ts
-import { mkdirSync as mkdirSync3, unlinkSync, writeFileSync as writeFileSync2 } from "fs";
+import { mkdirSync as mkdirSync4, unlinkSync, writeFileSync as writeFileSync3 } from "fs";
 import { dirname as dirname2, join as join2 } from "path";
 import { tmpdir } from "os";
 var trackedTempFiles = [];
@@ -50339,7 +50392,7 @@ function resolveDecompress(args, ctx) {
   let body;
   let count;
   if (cached) {
-    const view = full ? cached.full : cached.one;
+    const view = full ? cached.full : cached.one ?? cached.full;
     body = view.text;
     count = view.count;
   } else {
@@ -50352,8 +50405,8 @@ function resolveDecompress(args, ctx) {
   const outPath = body.length > 1e4 ? join2(tmpdir(), `acp-decompress-${safeBlockId}-${Date.now()}.txt`) : null;
   if (outPath) {
     try {
-      mkdirSync3(dirname2(outPath), { recursive: true });
-      writeFileSync2(outPath, body, "utf8");
+      mkdirSync4(dirname2(outPath), { recursive: true });
+      writeFileSync3(outPath, body, "utf8");
       trackedTempFiles.push({ path: outPath, mtimeMs: Date.now() });
       reapTempFiles();
       return `${header}
@@ -50649,8 +50702,9 @@ ${reasons.map((r) => `- ${r}`).join("\n")}` : "";
       const full = collectBlockContent(res.state, b2, ctx.messages, { full: true });
       const one = collectBlockContent(res.state, b2, ctx.messages, { full: false });
       if (full.count > 0 || one.count > 0) {
+        const sameView = one.text === full.text && one.count === full.count;
         cacheBlockContent(ctx.session, b2.blockId, {
-          one: { text: one.text, count: one.count },
+          one: sameView ? null : { text: one.text, count: one.count },
           full: { text: full.text, count: full.count }
         });
       }
@@ -51032,7 +51086,7 @@ import { dirname as dirname4, join as join3 } from "path";
 import { fileURLToPath } from "url";
 
 // src/web/page.ts
-import { existsSync as existsSync3 } from "fs";
+import { existsSync as existsSync4 } from "fs";
 
 // src/ca.ts
 var import_node_forge = __toESM(require_lib(), 1);
@@ -51216,7 +51270,7 @@ function escapeHtml(value) {
 function renderPage(origin, version2) {
   const caPath = rootCaPath();
   const caPathEsc = escapeHtml(caPath);
-  const caReady = existsSync3(caPath);
+  const caReady = existsSync4(caPath);
   return `<!doctype html><html lang="zh-CN"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>billion-context</title><style>${WEB_STYLES}</style></head><body>
 <div class="app"><aside class="sidebar"><div class="brand"><div class="brand-title">billion<span>-context</span></div><div class="version">v${version2}</div></div><a class="fork-ribbon" href="https://github.com/ranxianglei/billion-context" target="_blank" rel="noopener">\u2605 Fork me on GitHub</a><nav class="nav"><button class="active" data-page="overview">\u6982\u89C8</button><button data-page="routing">\u63A5\u5165</button><button data-page="upstream">\u4E0A\u6E38</button><button data-page="sessions">\u4F1A\u8BDD</button><button data-page="settings">\u8BBE\u7F6E</button></nav></aside>
 <main class="main"><section id="page-overview" class="page active"><h1>\u6982\u89C8</h1><p class="lead">\u672C\u5730\u8DEF\u7531\u4E0E\u4E0A\u6E38\u7F51\u7EDC\u76F8\u4E92\u72EC\u7ACB\uFF0CACP \u538B\u7F29\u8FD0\u884C\u5728\u4E24\u8005\u4E4B\u95F4\u3002</p><div class="grid"><div class="card"><h2>\u670D\u52A1\u5730\u5740</h2><p class="mono">${origin}</p></div><div class="card"><h2>\u5BA2\u6237\u7AEF\u63A5\u5165</h2><p class="status">\u5728"\u63A5\u5165"\u9875\u5C06\u5404\u5BA2\u6237\u7AEF\uFF08Codex / Claude Code / OpenCode / Pi \u7B49\uFF09\u7684\u6D41\u91CF\u8DEF\u7531\u5230 bili\u3002</p></div></div></section>
@@ -51238,7 +51292,7 @@ function renderPage(origin, version2) {
 }
 
 // src/web/api.ts
-import { closeSync, existsSync as existsSync4, fsyncSync, mkdirSync as mkdirSync4, openSync, renameSync as renameSync2, unlinkSync as unlinkSync2, writeFileSync as writeFileSync3 } from "fs";
+import { closeSync, existsSync as existsSync5, fsyncSync, mkdirSync as mkdirSync5, openSync, renameSync as renameSync2, unlinkSync as unlinkSync2, writeFileSync as writeFileSync4 } from "fs";
 import { dirname as dirname3 } from "path";
 import { randomUUID as randomUUID2 } from "crypto";
 function readConfig() {
@@ -51246,7 +51300,7 @@ function readConfig() {
   return parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
 }
 function configParseError() {
-  if (!existsSync4(configFile())) return null;
+  if (!existsSync5(configFile())) return null;
   const parsed = safeReadJson(configFile());
   if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) return null;
   return `config file is not valid JSON: ${configFile()}`;
@@ -51264,12 +51318,12 @@ function readUpstreamSettings() {
 }
 function atomicWriteConfig(config) {
   const filePath = configFile();
-  mkdirSync4(dirname3(filePath), { recursive: true });
+  mkdirSync5(dirname3(filePath), { recursive: true });
   const tempPath = `${filePath}.${process.pid}.${randomUUID2()}.tmp`;
   let descriptor;
   try {
     descriptor = openSync(tempPath, "wx", 384);
-    writeFileSync3(descriptor, JSON.stringify(config, null, 2) + "\n", "utf8");
+    writeFileSync4(descriptor, JSON.stringify(config, null, 2) + "\n", "utf8");
     fsyncSync(descriptor);
     closeSync(descriptor);
     descriptor = void 0;
@@ -51699,6 +51753,23 @@ function isLoopThinking(m2) {
 function stripLoopThinking(messages) {
   return messages.filter((m2) => !isLoopThinking(m2));
 }
+function canonicalArgs(args) {
+  try {
+    return JSON.stringify(sortKeys(JSON.parse(args)));
+  } catch {
+    return args;
+  }
+}
+function sortKeys(v2) {
+  if (Array.isArray(v2)) return v2.map(sortKeys);
+  if (v2 !== null && typeof v2 === "object") {
+    const src = v2;
+    const out = {};
+    for (const k2 of Object.keys(src).sort()) out[k2] = sortKeys(src[k2]);
+    return out;
+  }
+  return v2;
+}
 function executeProxyTool(toolName, args, ctx, callId) {
   if (toolName === "compress") {
     return applyRanges(parseCompressInput(args, callId), ctx);
@@ -51801,6 +51872,7 @@ async function* runCompressLoop(upstream, ctx, requestBody, requestOptions, adap
       log("warn", `[acp-loop] upstream rejected replay (HTTP ${info.status}); retrying in ${info.delayMs}ms (attempt ${info.attempt}/${info.maxAttempts})${lc}`);
     }
   );
+  const failedSignatures = /* @__PURE__ */ new Set();
   try {
     for (let round = 1; round <= MAX_LOOP_ROUNDS; round++) {
       if (signal?.aborted) break;
@@ -52055,6 +52127,19 @@ async function* runCompressLoop(upstream, ctx, requestBody, requestOptions, adap
         yield adapter.emitCompletion({ finishReason: "length", usage });
         return;
       }
+      const failedMutating = proxyResults.filter(
+        (pr2) => (pr2.name === "compress" || pr2.name === "decompress") && pr2.result.includes("FAILED")
+      );
+      if (reRequest && failedMutating.length > 0 && failedMutating.length === proxyResults.length) {
+        const repeated = failedMutating.some((pr2) => failedSignatures.has(`${pr2.name}\0${canonicalArgs(pr2.arguments)}`));
+        if (repeated) {
+          ctx.log(`[acp-loop] round ${round}: model re-submitted an already-failed compress with identical arguments; stopping after ${round} round(s) instead of ${MAX_LOOP_ROUNDS}`);
+          log("warn", `[acp-loop] repeated identical compress failure at round ${round}; breaking early (#156)`);
+          yield adapter.emitCompletion({ finishReason: "length", usage });
+          return;
+        }
+      }
+      for (const pr2 of failedMutating) failedSignatures.add(`${pr2.name}\0${canonicalArgs(pr2.arguments)}`);
       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);
@@ -54087,14 +54172,14 @@ var MIN_TAIL_MATCH = 3;
 var MAX_STORED_ITEMS = 128;
 var MIN_FORK_PREFIX = 3;
 function stableStringify(value) {
-  return JSON.stringify(sortKeys(value));
+  return JSON.stringify(sortKeys2(value));
 }
-function sortKeys(value) {
-  if (Array.isArray(value)) return value.map(sortKeys);
+function sortKeys2(value) {
+  if (Array.isArray(value)) return value.map(sortKeys2);
   if (value && typeof value === "object") {
     const record = value;
     const out = {};
-    for (const key of Object.keys(record).sort()) out[key] = sortKeys(record[key]);
+    for (const key of Object.keys(record).sort()) out[key] = sortKeys2(record[key]);
     return out;
   }
   return value;
@@ -56964,7 +57049,7 @@ Content-Length: ${Buffer.byteLength(body)}\r
       );
     }
     if (opts.debug) {
-      log2("info", `[debug] build features: raw-HTTP-capture(on) | remote_compaction_v2-strip(on) | cert-MITM-launcher(on) | strip-acp-summary(on) \u2014 seeing this line confirms the launcher build (not registry 0.1.34)`);
+      log2("info", `[debug] build features: raw-HTTP-capture(${bodyDumpEnabled() ? "on" : "off"}) | remote_compaction_v2-strip(on) | cert-MITM-launcher(on) | strip-acp-summary(on) \u2014 seeing this line confirms the launcher build (not registry 0.1.34)`);
     }
   };
   const attemptListen = (port) => {
@@ -58640,10 +58725,10 @@ async function pipeThrough(stream2, res) {
   }
 }
 async function dumpStreamToFile(stream2, dir, name) {
-  const { mkdirSync: mkdirSync6, createWriteStream: createWriteStream2 } = await import("fs");
+  const { mkdirSync: mkdirSync7, createWriteStream: createWriteStream2 } = await import("fs");
   const { join: join4 } = await import("path");
   try {
-    mkdirSync6(dir, { recursive: true });
+    mkdirSync7(dir, { recursive: true });
     const ws2 = createWriteStream2(join4(dir, name));
     ws2.on("error", (e) => {
       logDumpFailure("SSE stream dump", e);
@@ -62704,7 +62789,6 @@ function selfDistFile(name) {
   return path15.join(selfPackageRoot(), "dist", name);
 }
 var LAUNCHER_DEFAULT_HOST = "127.0.0.1";
-var LAUNCHER_DEFAULT_PORT = 8787;
 var LAUNCH_CLIENTS = ["pi", "codex", "claude", "omp", "opencode", "hermes", "dsh", "pi-test"];
 var HEALTH_PATH = "/__bili/health";
 var HEALTH_POLL_INTERVAL_MS = 200;
@@ -63878,6 +63962,19 @@ async function probeExistingInstance(readInstance, fetchHealthInfo) {
   if (health.instanceId !== void 0 && health.instanceId !== inst.instanceId) return void 0;
   return inst;
 }
+function pickEphemeralPort(host = LAUNCHER_DEFAULT_HOST) {
+  return new Promise((resolve, reject) => {
+    const srv = net2.createServer();
+    srv.once("error", reject);
+    srv.listen(0, host, () => {
+      const addr = srv.address();
+      srv.close(() => {
+        if (addr && typeof addr === "object") resolve(addr.port);
+        else reject(new Error("could not allocate a free port"));
+      });
+    });
+  });
+}
 var INHERITED_PROXY_VARS = ["http_proxy", "https_proxy", "all_proxy", "HTTP_PROXY", "HTTPS_PROXY", "ALL_PROXY"];
 function stripInheritedProxy(env) {
   const cleaned = { ...env };
@@ -63903,7 +64000,7 @@ async function ensureProxyRunning(opts, deps = {}) {
     return { origin: existing.origin, port: existing.port, attached: true };
   }
   const launchToken = randomUUID5();
-  const port = opts.port;
+  const port = opts.port > 0 ? opts.port : await pickEphemeralPort(opts.host);
   const script = process.argv[1];
   if (!script) throw new Error("bili: cannot resolve launcher script path");
   const logPath2 = path15.join(os5.tmpdir(), `bili-proxy-${port}.log`);
@@ -63912,7 +64009,7 @@ async function ensureProxyRunning(opts, deps = {}) {
   try {
     child = spawnImpl(
       process.execPath,
-      [script, ...proxyStartArgs(opts)],
+      [script, ...proxyStartArgs({ ...opts, port })],
       {
         detached: true,
         stdio: ["ignore", logFd, logFd],
@@ -64019,8 +64116,9 @@ function resolveClientCommand(client, env) {
   return { command: resolved ?? client, prefixArgs: [] };
 }
 function parsePort(raw) {
-  const port = raw && raw.trim() ? parseInt(raw, 10) : LAUNCHER_DEFAULT_PORT;
-  if (!Number.isFinite(port) || port <= 0 || port > 65535) {
+  if (!raw || !raw.trim()) return 0;
+  const port = parseInt(raw, 10);
+  if (!Number.isFinite(port) || port < 1 || port > 65535) {
     console.error(`bili: invalid --port "${raw}"`);
     process.exit(2);
   }
@@ -64248,7 +64346,7 @@ async function runTestPi(params, deps = {}) {
 }
 
 // src/export.ts
-import { mkdirSync as mkdirSync5, writeFileSync as writeFileSync4 } from "fs";
+import { mkdirSync as mkdirSync6, writeFileSync as writeFileSync5 } from "fs";
 import path16 from "path";
 function fmtDate(ms2) {
   return ms2 ? new Date(ms2).toISOString().replace("T", " ").slice(0, 19) + " UTC" : "\u2014";
@@ -64381,8 +64479,8 @@ async function exportSession(selector, opts = {}) {
   }
   const markdown = renderHandoff(matches[0], opts.full ?? false);
   if (opts.output) {
-    mkdirSync5(path16.dirname(path16.resolve(opts.output)), { recursive: true });
-    writeFileSync4(opts.output, markdown, "utf8");
+    mkdirSync6(path16.dirname(path16.resolve(opts.output)), { recursive: true });
+    writeFileSync5(opts.output, markdown, "utf8");
     return `written to ${opts.output}`;
   }
   return markdown;
@@ -64459,7 +64557,7 @@ Launcher (bili pi / bili codex / bili claude / bili omp / bili opencode / bili h
 Options (override config file / env):
   -F <url>                         upstream proxy to forward through (gost-style;
                                    http://host:port; must precede the client name)
-  --port <N>                       listen port (default 8787)
+  --port <N>                       listen port (start: 8787; launcher default: random free port)
   --host <ADDR>                    listen host (default 127.0.0.1)
   --mitm-domain <domain>           extra MITM domain (repeatable; launcher only)
   --config <FILE>                  path to config JSON (default: XDG location)