billion-context 0.1.93 → 0.1.94-pr.632.453

package/dist/index.js

@@ -46740,6 +46740,74 @@ function renderCompressedDrilldown(blocks, state, sort, limit, countTokens) {
   }
   return lines.join("\n");
 }
+function renderMessage2(m2) {
+  const parts = [];
+  switch (m2.contentType) {
+    case "text":
+      parts.push(m2.text ?? "");
+      break;
+    case "tool-call":
+      parts.push(`\`${m2.toolName ?? "?"}(${m2.toolCallId ?? ""})\` args: ${m2.text ?? ""}`);
+      break;
+    case "tool-result":
+      parts.push(`\`${m2.toolName ?? "?"}(${m2.toolCallId ?? ""})\` \u2192 ${m2.text ?? ""}`);
+      break;
+    case "reasoning":
+      parts.push(`_reasoning_: ${m2.text ?? ""}`);
+      break;
+  }
+  const body = parts.join("\n").trim();
+  return body === "" ? "_(empty)_" : body + "\n";
+}
+function renderHandoff(input) {
+  const { coreMessages, state, full, meta } = input;
+  const lines = [];
+  lines.push("# billion-context session handoff");
+  lines.push("");
+  lines.push(`- title: ${meta.title ?? "(untitled)"}`);
+  if (meta.label) lines.push(`- label: ${meta.label}`);
+  lines.push(`- session id: ${meta.sessionId}`);
+  for (const bullet of meta.extraBullets ?? []) lines.push(bullet);
+  if (meta.contextTokens) lines.push(`- last context tokens: ~${meta.contextTokens}`);
+  lines.push(`- compression blocks: ${state.blocks.length} (active ${state.blocks.filter((b2) => b2.active).length})`);
+  lines.push("");
+  const folded = input.folded === true;
+  const view = full || folded ? coreMessages : prune(coreMessages, state);
+  lines.push(full && !folded ? `## Full conversation (${coreMessages.length} messages)` : folded ? `## Conversation (persisted folded snapshot, ${coreMessages.length} messages)` : `## Conversation (folded view as the model saw it, ${coreMessages.length} client messages)`);
+  lines.push("");
+  if (view.length === 0) {
+    lines.push("No conversation messages to export.");
+    lines.push("");
+  }
+  let lastRole = "";
+  for (const m2 of view) {
+    if (m2.role !== lastRole) {
+      lines.push(`### ${m2.role}`);
+      lines.push("");
+      lastRole = m2.role;
+    }
+    lines.push(renderMessage2(m2));
+  }
+  lines.push("");
+  if (full && folded) {
+    for (const b2 of input.blocksFull ?? []) {
+      lines.push(`## Block ${b2.blockId}${b2.topic ? ` \u2014 ${b2.topic}` : ""}`);
+      lines.push("");
+      lines.push(`### Original messages (${b2.count})`);
+      lines.push("");
+      lines.push(b2.fullText.trim());
+      lines.push("");
+    }
+  }
+  return lines.join("\n");
+}
+function matchSession(sessions2, selector, labelOf) {
+  const exact = sessions2.filter((s3) => s3.id === selector);
+  if (exact.length > 0) return exact;
+  const byLabel = sessions2.filter((s3) => labelOf(s3) === selector);
+  if (byLabel.length > 0) return byLabel;
+  return sessions2.filter((s3) => s3.id.startsWith(selector) || (labelOf(s3) ?? "").startsWith(selector));
+}
 function parseCompressArgs(input, opts) {
   const callId = opts?.callId;
   const diag = { ok: false, kind: "ok", invalidItems: 0 };
@@ -48293,6 +48361,7 @@ function loadOptions(env = process.env) {
     passthrough: passthrough.enabled,
     passthroughSource: passthrough.source,
     autoUpdate: (env.ACP_AUTO_UPDATE ?? (fileConfig.autoUpdate === false ? "0" : "1")) !== "0",
+    updateTag: (env.ACP_UPDATE_TAG ?? fileConfig.updateTag ?? "latest").trim() || "latest",
     logFile: env.ACP_LOG_FILE !== void 0 ? env.ACP_LOG_FILE || void 0 : fileConfig.logFile,
     mitm: {
       enabled: (env.BILI_MITM ?? (fileConfig.mitm?.enabled === false ? "0" : "1")) !== "0",
@@ -63656,6 +63725,12 @@ var To = (s3) => {
 import path12 from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 var REGISTRY_BASE = "https://registry.npmjs.org";
+function normalizeUpdateTag(tag) {
+  return (tag ?? "latest").trim() || "latest";
+}
+function registryUrlFor(packageName, tag) {
+  return `${REGISTRY_BASE}/${packageName}/${encodeURIComponent(tag)}`;
+}
 var CHECK_INTERVAL_MS = 3 * 60 * 1e3;
 var THROTTLE_FILE = path12.join(cacheDir(), ".update-check");
 var LOCK_FILE = path12.join(cacheDir(), ".update-lock");
@@ -63666,22 +63741,42 @@ function shouldStealLock(holderAlive, ageMs) {
 var timer2;
 var inFlight = false;
 var firstCheckDone = false;
-function parseVersion(v2) {
-  return v2.replace(/^v/, "").split(".").map((n) => parseInt(n, 10) || 0);
-}
-function isNewer(latest, current) {
-  const l = parseVersion(latest);
-  const c = parseVersion(current);
+function isVersionNewer(latest, current) {
+  const next = parseSemVer(latest);
+  const prev = parseSemVer(current);
+  if (!next || !prev) return false;
   for (let i = 0; i < 3; i++) {
-    const lv = l[i] ?? 0;
-    const cv = c[i] ?? 0;
-    if (lv > cv) return true;
-    if (lv < cv) return false;
+    const a = next.parts[i] ?? 0;
+    const b2 = prev.parts[i] ?? 0;
+    if (a !== b2) return a > b2;
+  }
+  if (!next.pre.length && prev.pre.length) return true;
+  if (next.pre.length && !prev.pre.length) return false;
+  for (let i = 0; i < Math.max(next.pre.length, prev.pre.length); i++) {
+    const a = next.pre[i];
+    const b2 = prev.pre[i];
+    if (a === void 0) return false;
+    if (b2 === void 0) return true;
+    if (a === b2) continue;
+    const aNumber = /^\d+$/.test(a) ? Number(a) : void 0;
+    const bNumber = /^\d+$/.test(b2) ? Number(b2) : void 0;
+    if (aNumber !== void 0 && bNumber !== void 0) return aNumber > bNumber;
+    if (aNumber !== void 0) return false;
+    if (bNumber !== void 0) return true;
+    return a > b2;
   }
   return false;
 }
+function parseSemVer(version2) {
+  const match = version2.match(/^v?(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+.+)?$/);
+  if (!match) return void 0;
+  return {
+    parts: [Number(match[1]), Number(match[2]), Number(match[3])],
+    pre: match[4]?.split(".") ?? []
+  };
+}
 function staleInstallStatus(diskVersion, runningVersion) {
-  return diskVersion !== void 0 && isNewer(diskVersion, runningVersion) ? "restart" : "current";
+  return diskVersion !== void 0 && isVersionNewer(diskVersion, runningVersion) ? "restart" : "current";
 }
 async function readLastCheck() {
   try {
@@ -63887,7 +63982,8 @@ async function checkForUpdate(opts, force = false) {
       return;
     }
     log("info", `[update] checking npm registry for ${opts.packageName}${sinceLastSec < 0 ? " (startup check)" : sinceLastSec === 0 ? "" : ` (last check ${sinceLastSec}s ago)`}\u2026`);
-    const url = `${REGISTRY_BASE}/${opts.packageName}/latest`;
+    const tag = normalizeUpdateTag(opts.updateTag);
+    const url = registryUrlFor(opts.packageName, tag);
     const registryDispatcher = egressDispatcher(opts, url);
     const res = await fetchWithEgress(url, {
       signal: AbortSignal.timeout(5e3),
@@ -63906,11 +64002,11 @@ async function checkForUpdate(opts, force = false) {
     }
     const diskVersion = installDir ? await readDiskVersion(installDir) : void 0;
     const currentVersion = diskVersion ?? opts.currentVersion;
-    if (!isNewer(latest, currentVersion)) {
+    if (!isVersionNewer(latest, currentVersion)) {
       if (staleInstallStatus(diskVersion, opts.currentVersion) === "restart") {
         log("warn", `[update] running v${opts.currentVersion} but v${diskVersion} is installed \u2014 restart bili to activate (auto-update replaced the on-disk install; this process is still on the old code)`);
       } else {
-        log("info", `[update] current=${currentVersion} latest=${latest} (up to date)`);
+        log("info", `[update] current=${currentVersion} latest=${latest} tag=${tag} (up to date)`);
       }
       return;
     }
@@ -65975,7 +66071,33 @@ function latestBlockTime(s3) {
   for (const b2 of s3.state.blocks) if (b2.createdAt > latest) latest = b2.createdAt;
   return latest;
 }
-function renderHandoff(s3, full) {
+function renderHandoff2(s3, full) {
+  const messages = s3.lastMessages;
+  if (messages && messages.length > 0) {
+    const folded = s3.lastMessagesFolded === true;
+    const blocksFull = full && folded ? s3.state.blocks.filter((b2) => b2.active).map((b2) => {
+      const content = s3.blockContents.get(b2.blockId);
+      return content ? { blockId: b2.blockId, topic: b2.topic, count: content.full.count, fullText: content.full.text } : void 0;
+    }).filter((x) => x !== void 0) : void 0;
+    return renderHandoff({
+      coreMessages: messages,
+      state: s3.state,
+      full,
+      folded,
+      blocksFull,
+      meta: {
+        title: s3.meta.title,
+        label: s3.meta.label,
+        sessionId: s3.id,
+        contextTokens: s3.stats.contextTokens,
+        extraBullets: [
+          ...s3.meta.protocol ? [`- protocol: ${s3.meta.protocol}`] : [],
+          ...s3.meta.upstreamOrigin ? [`- upstream: ${s3.meta.upstreamOrigin}`] : [],
+          `- requests: ${s3.stats.requests}`
+        ]
+      }
+    });
+  }
   const lines = [];
   lines.push(`# billion-context session handoff`);
   lines.push("");
@@ -65988,38 +66110,6 @@ function renderHandoff(s3, full) {
   if (s3.stats.contextTokens) lines.push(`- last context tokens: ~${s3.stats.contextTokens}`);
   lines.push(`- compression blocks: ${s3.state.blocks.length} (active ${s3.state.blocks.filter((b2) => b2.active).length})`);
   lines.push("");
-  const messages = s3.lastMessages;
-  if (messages && messages.length > 0) {
-    const folded = s3.lastMessagesFolded === true;
-    const view = full || folded ? messages : prune(messages, s3.state);
-    lines.push(
-      full && !folded ? `## Full conversation (${messages.length} messages)` : folded ? `## Conversation (persisted folded snapshot, ${messages.length} messages)` : `## Conversation (folded view as the model saw it, ${messages.length} client messages)`
-    );
-    lines.push("");
-    let lastRole = "";
-    for (const m2 of view) {
-      if (m2.role !== lastRole) {
-        lines.push(`### ${m2.role}`);
-        lines.push("");
-        lastRole = m2.role;
-      }
-      lines.push(renderMessage2(m2));
-    }
-    lines.push("");
-    if (full && folded) {
-      for (const b2 of s3.state.blocks.filter((x) => x.active)) {
-        const content = s3.blockContents.get(b2.blockId);
-        if (!content) continue;
-        lines.push(`## Block ${b2.blockId}${b2.topic ? ` \u2014 ${b2.topic}` : ""}`);
-        lines.push("");
-        lines.push(`### Original messages (${content.full.count})`);
-        lines.push("");
-        lines.push(content.full.text.trim());
-        lines.push("");
-      }
-    }
-    return lines.join("\n");
-  }
   const active = s3.state.blocks.filter((b2) => b2.active);
   if (active.length === 0) {
     lines.push("No active compression blocks and no persisted conversation snapshot (v2 session file). Original messages are only persisted when they are compressed into a block, so this session's conversation content is not available for export.");
@@ -66048,32 +66138,8 @@ function renderHandoff(s3, full) {
   }
   return lines.join("\n");
 }
-function renderMessage2(m2) {
-  const parts = [];
-  switch (m2.contentType) {
-    case "text":
-      parts.push(m2.text ?? "");
-      break;
-    case "tool-call":
-      parts.push(`\`${m2.toolName ?? "?"}(${m2.toolCallId ?? ""})\` args: ${m2.text ?? ""}`);
-      break;
-    case "tool-result":
-      parts.push(`\`${m2.toolName ?? "?"}(${m2.toolCallId ?? ""})\` \u2192 ${m2.text ?? ""}`);
-      break;
-    case "reasoning":
-      parts.push(`_reasoning_: ${m2.text ?? ""}`);
-      break;
-  }
-  const body = parts.join("\n").trim();
-  return body === "" ? "_(empty)_" : body + "\n";
-}
-function matchSession(sessions2, selector) {
-  const exact = sessions2.filter((s3) => s3.id === selector);
-  if (exact.length > 0) return exact;
-  const byLabel = sessions2.filter((s3) => s3.meta.label === selector);
-  if (byLabel.length > 0) return byLabel;
-  const byPrefix = sessions2.filter((s3) => s3.id.startsWith(selector) || (s3.meta.label ?? "").startsWith(selector));
-  return byPrefix;
+function matchSession2(sessions2, selector) {
+  return matchSession(sessions2, selector, (s3) => s3.meta.label);
 }
 async function exportSession(selector, opts = {}) {
   const store = new SessionStore({ dir: opts.dir, enabled: true });
@@ -66088,7 +66154,7 @@ async function exportSession(selector, opts = {}) {
     );
     return ["Persisted sessions:", "", ...rows.map((r) => `  ${r}`), "", "Usage: bili export <session-id|label> [--output handoff.md] [--full]"].join("\n");
   }
-  const matches = matchSession(all, selector);
+  const matches = matchSession2(all, selector);
   if (matches.length === 0) {
     throw new Error(`no session matches "${selector}" (run "bili export" to list sessions)`);
   }
@@ -66096,7 +66162,7 @@ async function exportSession(selector, opts = {}) {
     const ids = matches.map((s3) => s3.id).join(", ");
     throw new Error(`selector "${selector}" matches ${matches.length} sessions (${ids}); use the full session id`);
   }
-  const markdown = renderHandoff(matches[0], opts.full ?? false);
+  const markdown = renderHandoff2(matches[0], opts.full ?? false);
   if (opts.output) {
     mkdirSync6(path16.dirname(path16.resolve(opts.output)), { recursive: true });
     writeFileSync5(opts.output, markdown, "utf8");
@@ -66421,14 +66487,16 @@ async function main() {
       if (v2 !== void 0) process.env[k2] = v2;
     }
     let updaterResolveProxy;
+    let updateTag;
     try {
       const o = loadOptions();
       updaterResolveProxy = (url) => resolveProxy(o.routes, o.proxy, url, o.proxyFallback);
+      updateTag = o.updateTag;
     } catch (e) {
       console.error(`bili update: config load failed (${String(e)}); updater egress goes direct`);
     }
     await checkForUpdate(
-      { packageName: PACKAGE_NAME, currentVersion: VERSION3, autoUpdate: true, resolveProxy: updaterResolveProxy },
+      { packageName: PACKAGE_NAME, currentVersion: VERSION3, autoUpdate: true, resolveProxy: updaterResolveProxy, updateTag },
       true
     );
     return;
@@ -66456,7 +66524,8 @@ async function main() {
       packageName: PACKAGE_NAME,
       currentVersion: VERSION3,
       autoUpdate: true,
-      resolveProxy: (url) => resolveProxy(opts.routes, opts.proxy, url, opts.proxyFallback)
+      resolveProxy: (url) => resolveProxy(opts.routes, opts.proxy, url, opts.proxyFallback),
+      updateTag: opts.updateTag
     });
   }
 }