billion-context 0.1.50-pr.232.72 → 0.1.50-pr.233.75

package/README.md

@@ -64,9 +64,9 @@ and blind-tunnel everything else.
 bili pi                               # launch pi through the proxy
 bili codex                            # launch codex through the proxy
 bili claude                           # launch claude through the proxy
-bili omp                              # pi-style: MITM env + isolated temp models.yml
+bili omp                              # pi-style: MITM env + persistent overlay home (~/.omp/agent-bili, real config untouched)
 bili opencode                         # MITM for HTTPS + temp opencode.json (/bili/ for HTTP) + thin /acp plugin
-bili hermes                           # no MITM possible (certifi CA) — isolated HERMES_HOME, all traffic /bili/
+bili hermes                           # no MITM possible (certifi CA) — persistent overlay home (~/.hermes-bili), all traffic /bili/
 bili pi --mitm-domain api.foo.com     # add a domain to the MITM whitelist
 ```
 

package/dist/index.js

@@ -58748,6 +58748,9 @@ function piSettingsFile() {
 function isPiEntry(entry, root) {
   return entry === root || /^npm:billion-context(-pi)?(@|$)/.test(entry) || /(^|[/\\])node_modules[/\\]billion-context(-pi)?([\/\\]|$)/.test(entry) || /(^|[/\\])billion-context(-pi)?$/.test(entry);
 }
+function isBiliPiEntry(entry, root) {
+  return entry === root || /^npm:billion-context(@|$)/.test(entry) || /(^|[/\\])node_modules[/\\]billion-context([\/\\]|$)/.test(entry) || /(^|[/\\])billion-context$/.test(entry);
+}
 function piInstall() {
   const root = selfPackageRoot();
   const file = piSettingsFile();
@@ -59184,17 +59187,205 @@ function buildCodexMcpArgs(origin, conversationId2) {
     `mcp_servers.bili.env.BILI_CONVERSATION_ID=${JSON.stringify(conversationId2)}`
   ];
 }
+function overlayLockPath(overlay) {
+  return path13.join(overlay, ".bili-launch.pid");
+}
+function livePidHoldsOverlay(overlay) {
+  let raw;
+  try {
+    raw = fs10.readFileSync(overlayLockPath(overlay), "utf8");
+  } catch {
+    return void 0;
+  }
+  const pid = Number.parseInt(raw.trim(), 10);
+  if (!Number.isInteger(pid) || pid <= 0 || pid === process.pid) return void 0;
+  try {
+    process.kill(pid, 0);
+  } catch (err2) {
+    if (err2.code === "ESRCH") return void 0;
+  }
+  return pid;
+}
+function refreshOverlayHome(realHome, overlay, generatedFile) {
+  try {
+    fs10.mkdirSync(overlay, { recursive: true });
+  } catch {
+    return false;
+  }
+  const holder = livePidHoldsOverlay(overlay);
+  if (holder !== void 0) {
+    console.error(
+      `bili: another bili launch (pid ${holder}) is using ${overlay} \u2014 concurrent launches share this overlay and the last one's proxy port wins in the generated config.`
+    );
+  }
+  try {
+    fs10.writeFileSync(overlayLockPath(overlay), `${process.pid}
+`);
+  } catch {
+  }
+  const realEntries = /* @__PURE__ */ new Set();
+  try {
+    for (const entry of fs10.readdirSync(realHome)) realEntries.add(entry);
+  } catch {
+  }
+  try {
+    for (const entry of fs10.readdirSync(overlay)) {
+      if (entry === generatedFile) continue;
+      const overlayPath = path13.join(overlay, entry);
+      if (entry.startsWith(`.${generatedFile}.`) && entry.endsWith(".tmp")) {
+        try {
+          fs10.unlinkSync(overlayPath);
+        } catch {
+        }
+        continue;
+      }
+      let st2;
+      try {
+        st2 = fs10.lstatSync(overlayPath);
+      } catch {
+        continue;
+      }
+      if (st2.isSymbolicLink()) {
+        let target;
+        try {
+          target = fs10.readlinkSync(overlayPath);
+        } catch {
+        }
+        const wanted = realEntries.has(entry) ? path13.join(realHome, entry) : void 0;
+        if (!wanted || target !== wanted) {
+          try {
+            fs10.unlinkSync(overlayPath);
+          } catch {
+          }
+        }
+      } else if (realEntries.has(entry)) {
+        if (mergeOverlayEntry(overlayPath, path13.join(realHome, entry))) {
+          try {
+            fs10.rmSync(overlayPath, { recursive: true, force: true });
+          } catch {
+          }
+        } else {
+          console.error(`bili: could not merge ${overlayPath} into ${realHome} \u2014 kept in place, resolve manually.`);
+        }
+      }
+    }
+    for (const entry of realEntries) {
+      if (entry === generatedFile) continue;
+      try {
+        fs10.symlinkSync(path13.join(realHome, entry), path13.join(overlay, entry));
+      } catch {
+      }
+    }
+  } catch {
+  }
+  return true;
+}
+function mergeOverlayEntry(src, dst) {
+  let st2;
+  try {
+    st2 = fs10.lstatSync(src);
+  } catch {
+    return true;
+  }
+  let dstStat;
+  try {
+    dstStat = fs10.lstatSync(dst);
+  } catch {
+  }
+  if (st2.isDirectory()) {
+    if (dstStat && !dstStat.isDirectory()) {
+      try {
+        fs10.renameSync(dst, `${dst}.bili-conflict`);
+        dstStat = void 0;
+      } catch {
+        return false;
+      }
+    }
+    try {
+      fs10.mkdirSync(dst, { recursive: true });
+    } catch {
+      return false;
+    }
+    let entries;
+    try {
+      entries = fs10.readdirSync(src);
+    } catch {
+      return false;
+    }
+    let ok = true;
+    for (const entry of entries) {
+      if (!mergeOverlayEntry(path13.join(src, entry), path13.join(dst, entry))) ok = false;
+    }
+    return ok;
+  }
+  if (dstStat && dstStat.isDirectory()) {
+    try {
+      fs10.renameSync(src, `${dst}.bili-conflict`);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  if (st2.isSymbolicLink()) {
+    if (dstStat) {
+      try {
+        fs10.unlinkSync(src);
+      } catch {
+      }
+      return true;
+    }
+    try {
+      fs10.renameSync(src, dst);
+    } catch {
+      return false;
+    }
+    return true;
+  }
+  if (dstStat && dstStat.mtimeMs >= st2.mtimeMs) {
+    try {
+      fs10.renameSync(src, `${dst}.bili-conflict`);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  if (dstStat) {
+    try {
+      fs10.renameSync(dst, `${dst}.bili-conflict`);
+    } catch {
+      return false;
+    }
+  }
+  try {
+    fs10.renameSync(src, dst);
+    return true;
+  } catch {
+    return false;
+  }
+}
 function piPluginInstalled(piHome) {
   const root = selfPackageRoot();
   if (!root) return false;
   try {
     const parsed = JSON.parse(fs10.readFileSync(path13.join(piHome, "settings.json"), "utf8"));
     const list = Array.isArray(parsed.packages) ? parsed.packages.map(String) : [];
-    return list.some((p2) => isPiEntry(p2, root));
+    return list.some((p2) => isBiliPiEntry(p2, root));
   } catch {
     return false;
   }
 }
+function writeOverlayFileAtomic(overlay, fileName, contents) {
+  const draft = path13.join(overlay, `.${fileName}.${process.pid}.tmp`);
+  try {
+    fs10.writeFileSync(draft, contents);
+    fs10.renameSync(draft, path13.join(overlay, fileName));
+  } catch {
+    try {
+      fs10.rmSync(draft, { force: true });
+    } catch {
+    }
+  }
+}
 function preparePiHttpRewrite(piHome, origin, httpRewrites, httpsRewrites) {
   if (httpRewrites.length === 0 && httpsRewrites.length === 0) return void 0;
   const modelsPath = path13.join(piHome, "models.json");
@@ -59231,19 +59422,10 @@ function preparePiHttpRewrite(piHome, origin, httpRewrites, httpsRewrites) {
       }
     }
   }
-  const tmp = fs10.mkdtempSync(path13.join(os5.tmpdir(), "bili-pi-"));
-  try {
-    for (const entry of fs10.readdirSync(piHome)) {
-      if (entry === "models.json") continue;
-      try {
-        fs10.symlinkSync(path13.join(piHome, entry), path13.join(tmp, entry));
-      } catch {
-      }
-    }
-  } catch {
-  }
-  fs10.writeFileSync(path13.join(tmp, "models.json"), JSON.stringify(root));
-  return tmp;
+  const overlay = `${piHome}-bili`;
+  if (!refreshOverlayHome(piHome, overlay, "models.json")) return void 0;
+  writeOverlayFileAtomic(overlay, "models.json", JSON.stringify(root));
+  return overlay;
 }
 function prepareOmpHttpRewrite(ompHome, origin, httpRewrites, httpsRewrites) {
   if (httpRewrites.length === 0 && httpsRewrites.length === 0) return void 0;
@@ -59287,19 +59469,10 @@ function prepareOmpHttpRewrite(ompHome, origin, httpRewrites, httpsRewrites) {
       }
     }
   }
-  const tmp = fs10.mkdtempSync(path13.join(os5.tmpdir(), "bili-omp-"));
-  try {
-    for (const entry of fs10.readdirSync(ompHome)) {
-      if (entry === "models.yml") continue;
-      try {
-        fs10.symlinkSync(path13.join(ompHome, entry), path13.join(tmp, entry));
-      } catch {
-      }
-    }
-  } catch {
-  }
-  fs10.writeFileSync(path13.join(tmp, "models.yml"), lines.join("\n"));
-  return tmp;
+  const overlay = `${ompHome}-bili`;
+  if (!refreshOverlayHome(ompHome, overlay, "models.yml")) return void 0;
+  writeOverlayFileAtomic(overlay, "models.yml", lines.join("\n"));
+  return overlay;
 }
 function prepareHermesHome(hermesHome, origin, rewrites) {
   if (rewrites.length === 0) return void 0;
@@ -59326,19 +59499,10 @@ function prepareHermesHome(hermesHome, origin, rewrites) {
     changed = true;
   }
   if (!changed) return void 0;
-  const tmp = fs10.mkdtempSync(path13.join(os5.tmpdir(), "bili-hermes-"));
-  try {
-    for (const entry of fs10.readdirSync(hermesHome)) {
-      if (entry === "config.yaml") continue;
-      try {
-        fs10.symlinkSync(path13.join(hermesHome, entry), path13.join(tmp, entry));
-      } catch {
-      }
-    }
-  } catch {
-  }
-  fs10.writeFileSync(path13.join(tmp, "config.yaml"), lines.join(eol));
-  return tmp;
+  const overlay = `${hermesHome}-bili`;
+  if (!refreshOverlayHome(hermesHome, overlay, "config.yaml")) return void 0;
+  writeOverlayFileAtomic(overlay, "config.yaml", lines.join(eol));
+  return overlay;
 }
 function prepareOpencodeHttpRewrite(configFile2, origin, httpRewrites, httpsRewrites, pluginPath) {
   if (httpRewrites.length === 0 && httpsRewrites.length === 0 && !pluginPath) return void 0;
@@ -59575,10 +59739,10 @@ async function runLaunch(params, deps = {}) {
   const ca = resolveCaCertPath(process.env);
   let env;
   let clientArgs = params.clientArgs;
-  let piTmpHome;
-  let ompTmpHome;
+  let piOverlayHome;
+  let ompOverlayHome;
   let opencodeTmpFile;
-  let hermesTmpHome;
+  let hermesOverlayHome;
   const tmpFiles = [];
   const directUrl = launcherDirectUrl(process.env);
   if (directUrl) {
@@ -59599,16 +59763,16 @@ async function runLaunch(params, deps = {}) {
   const origin = handle2.origin;
   if (base === "pi") {
     env = buildPiEnv(origin, ca, process.env);
-    piTmpHome = preparePiHttpRewrite(resolvePiHome(process.env), origin, routes.httpRewrites, routes.httpsRewrites);
-    if (piTmpHome) env.PI_CODING_AGENT_DIR = piTmpHome;
+    piOverlayHome = preparePiHttpRewrite(resolvePiHome(process.env), origin, routes.httpRewrites, routes.httpsRewrites);
+    if (piOverlayHome) env.PI_CODING_AGENT_DIR = piOverlayHome;
     const piExt = selfDistFile("agent/pi.js");
     if (piExt && fs10.existsSync(piExt) && !piPluginInstalled(resolvePiHome(process.env))) {
       clientArgs = ["-e", piExt, ...clientArgs];
     }
   } else if (base === "omp") {
     env = buildPiEnv(origin, ca, process.env);
-    ompTmpHome = prepareOmpHttpRewrite(resolveOmpHome(process.env), origin, routes.httpRewrites, routes.httpsRewrites);
-    if (ompTmpHome) env.PI_CODING_AGENT_DIR = ompTmpHome;
+    ompOverlayHome = prepareOmpHttpRewrite(resolveOmpHome(process.env), origin, routes.httpRewrites, routes.httpsRewrites);
+    if (ompOverlayHome) env.PI_CODING_AGENT_DIR = ompOverlayHome;
   } else if (base === "opencode") {
     env = { ...process.env, HTTPS_PROXY: origin, NODE_EXTRA_CA_CERTS: ca, BILLION_CONTEXT_PROXY: origin };
     const opencodePlugin = selfDistFile("agent/opencode.js");
@@ -59617,9 +59781,9 @@ async function runLaunch(params, deps = {}) {
     if (opencodeTmpFile) env.OPENCODE_CONFIG = opencodeTmpFile;
   } else if (base === "hermes") {
     env = { ...process.env };
-    hermesTmpHome = prepareHermesHome(resolveHermesHome(process.env), origin, routes.httpRewrites);
-    if (hermesTmpHome) {
-      env.HERMES_HOME = hermesTmpHome;
+    hermesOverlayHome = prepareHermesHome(resolveHermesHome(process.env), origin, routes.httpRewrites);
+    if (hermesOverlayHome) {
+      env.HERMES_HOME = hermesOverlayHome;
     } else {
       console.error(
         routes.httpRewrites.length === 0 ? "bili: no hermes providers found in ~/.hermes/config.yaml \u2014 traffic will NOT go through the proxy (configure a provider first)." : "bili: hermes config.yaml could not be rewritten (unreadable or no matching provider endpoints) \u2014 traffic will NOT go through the proxy."
@@ -59657,24 +59821,6 @@ async function runLaunch(params, deps = {}) {
     code = 1;
   } finally {
     stopProxy(handle2);
-    if (piTmpHome) {
-      try {
-        fs10.rmSync(piTmpHome, { recursive: true, force: true });
-      } catch {
-      }
-    }
-    if (ompTmpHome) {
-      try {
-        fs10.rmSync(ompTmpHome, { recursive: true, force: true });
-      } catch {
-      }
-    }
-    if (hermesTmpHome) {
-      try {
-        fs10.rmSync(hermesTmpHome, { recursive: true, force: true });
-      } catch {
-      }
-    }
     if (opencodeTmpFile) {
       try {
         fs10.rmSync(path13.dirname(opencodeTmpFile), { recursive: true, force: true });