billion-context 0.1.97-pr.667.487 → 0.1.97-pr.669.488

package/README.md

@@ -158,7 +158,7 @@ rewrite until dsh gains a settings-path env or an upstream loopback opt-out.
 Overlay dirs created by older versions are left in place and never merged back
 into the real home.
 
-### Option 1 — Launcher (`bili pi` / `bili codex` / `bili claude` / `bili omp` / `bili opencode` / `bili hermes` / `bili dsh`)
+### Option 1 — Launcher (`bili pi` / `bili codex` / `bili claude` / `bili omp` / `bili opencode` / `bili hermes` / `bili dsh` / `bili trae`)
 
 The launcher wraps a client in one command: it starts a proxy on an
 independent port (a fresh instance is always spawned — a port is never
@@ -177,6 +177,7 @@ bili omp                              # pi-style, file-free (#535): env + extens
 bili opencode                         # MITM for HTTPS + temp opencode.json (/bili/ for HTTP) + thin /acp plugin
 bili hermes                           # file-free (#535): hermes proxy env (HTTPS_PROXY + HERMES_CA_BUNDLE) — https via CONNECT MITM, http via absolute-form forward proxy; real ~/.hermes untouched
 bili dsh                              # deepseek-harness: non-loopback upstreams ride proxy envs (https MITM, http absolute-form), loopback keeps the overlay DSH_HOME (~/.dsh-bili) rewrite (#535), built-in deepseek route via DEEPSEEK_BASE_URL, native /acp command injected via --patch
+bili trae                             # Trae CLI (ByteDance, closed Go binary, no base-URL override) — cert-MITM via HTTPS_PROXY + SSL_CERT_FILE, model host from TRAE_CLI_API_HOST or the default enterprise gateway (#655)
 bili pi --mitm-domain api.foo.com     # add a domain to the MITM whitelist
 ```
 

package/README.zh-CN.md

@@ -84,7 +84,7 @@ npm install -g billion-context
 
 bili 永不拥有用户数据:每个被启动的客户端都跑在**真实 home** 上,运行期写入落在用户预期的位置。把客户端指向代理时,启动器按优先级选择——**优先 env 变量**(hermes/dsh/codex 的代理/CA env;pi/omp 的 `BILI_PROVIDER_REWRITES` URL 清单,由扩展加载时经 `registerProvider` 消费),其次 **CLI 参数或扩展 API**(codex `-c key=value`、opencode 插件),最后才是**生成文件**——目前仅剩 opencode 的临时 `opencode.json`(退出即删)和 dsh 的回环例外:dsh 的 fetch 栈对回环目标无条件绕过代理 env,所以本地上游保留持久 `~/.dsh-bili` overlay 改写,直到 dsh 提供 settings-path env 或上游支持回环 opt-out。旧版本创建的 overlay 目录原地保留,绝不合并回真实 home。
 
-### 方式 1 —— 启动器(`bili pi` / `bili codex` / `bili claude` / `bili omp` / `bili opencode` / `bili hermes` / `bili dsh`)
+### 方式 1 —— 启动器(`bili pi` / `bili codex` / `bili claude` / `bili omp` / `bili opencode` / `bili hermes` / `bili dsh` / `bili trae`)
 
 启动器把客户端包进一条命令:在独立端口拉起一个代理(总是全新实例,绝不复用端口),再按客户端支持的机制把它指向代理 —— 能吃代理/CA 环境变量的走**证书 MITM**,不吃的走隔离的**`/bili/` 配置重写**。真实配置文件从不被修改;客户端自己的配置只被**读取**,用来发现它实际连接的 HTTPS 上游主机,把这些主机加入 MITM 白名单 —— 代理只 TLS 终结它们,其余流量盲透传。
 
@@ -96,6 +96,7 @@ bili omp                              # pi 同款,file-free(#535):环境变量 +
 bili opencode                         # HTTPS 走 MITM + 临时 opencode.json(HTTP 走 /bili/)+ 轻量 /acp 插件
 bili hermes                           # file-free(#535):hermes 代理环境变量(HTTPS_PROXY + HERMES_CA_BUNDLE)—— https 走 CONNECT MITM,http 走绝对形式转发;真实 ~/.hermes 不动
 bili dsh                              # deepseek-harness:非回环上游走代理 env(https MITM、http absolute-form),回环上游保留 overlay DSH_HOME(~/.dsh-bili)改写(#535),内置 deepseek 路由走 DEEPSEEK_BASE_URL,经 --patch 注入原生 /acp 命令
+bili trae                             # Trae CLI(字节跳动,闭源 Go 二进制,无 base-URL 覆盖)—— 证书 MITM(HTTPS_PROXY + SSL_CERT_FILE),模型主机取 TRAE_CLI_API_HOST 或默认企业网关(#655)
 bili pi --mitm-domain api.foo.com     # 向 MITM 白名单追加域名
 ```
 

package/dist/index.js

@@ -56307,15 +56307,28 @@ function handlePluginManifest(res) {
     statusEndpoint: "/__bili/plugin/status"
   }));
 }
+function conversationIdForSession(sessionId) {
+  let bestId;
+  let bestSeen = -Infinity;
+  for (const [cid, entry] of conversations) {
+    if (entry.sessionId === sessionId && entry.lastSeen > bestSeen) {
+      bestId = cid;
+      bestSeen = entry.lastSeen;
+    }
+  }
+  return bestId;
+}
 function handlePluginStatus(conversationId2, res, deps, fallbackLatest = false) {
   let entry = conversations.get(conversationId2);
   let session = entry ? peekSession(entry.sessionId) : void 0;
   let viaFallback = false;
+  let resolvedConversationId = conversationId2;
   if ((!entry || !session) && fallbackLatest) {
     const latest = listSessions().filter((s3) => s3.restored !== true).sort((a, b2) => (b2.lastSeen ?? 0) - (a.lastSeen ?? 0))[0];
     if (latest) {
       session = latest;
       viaFallback = true;
+      resolvedConversationId = conversationIdForSession(latest.id) ?? conversationId2;
     } else {
       res.writeHead(404, { "content-type": "application/json" });
       res.end(JSON.stringify({ ok: false, error: "no session with activity since boot \u2014 issue a model request or pass the conversation id" }));
@@ -56365,7 +56378,7 @@ function handlePluginStatus(conversationId2, res, deps, fallbackLatest = false)
   res.writeHead(200, { "content-type": "application/json" });
   res.end(JSON.stringify({
     ok: true,
-    conversationId: conversationId2,
+    conversationId: resolvedConversationId,
     fallback: viaFallback || void 0,
     label: session.meta.label ?? null,
     pluginAgent: session.metadata.pluginAgent ?? null,
@@ -56400,8 +56413,12 @@ async function handlePluginTool(payload, res, deps) {
   const entry = conversations.get(conversationId2);
   const session = entry ? peekSession(entry.sessionId) : void 0;
   if (!entry || !session) {
+    deps.log("warn", `[plugin] tool "${tool}" rejected for conversation ${conversationId2}: ${entry ? "id registered but session not resident in this proxy instance" : "id never registered (stale shim session id after host resume?)"}`);
     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)" }));
+    res.end(JSON.stringify({
+      ok: false,
+      error: !entry ? "unknown plugin conversation (no model request has arrived with this conversation id yet)" : "unknown plugin conversation (id registered but its session is not resident in this proxy instance \u2014 a fresh model request re-binds it)"
+    }));
     return;
   }
   if (!isProxyToolFor(tool, session, deps.config)) {
@@ -56969,6 +56986,20 @@ function readDshConfig(dshHome) {
   }
   return { baseUrls: parseDshSettingsYaml(text) };
 }
+var TRAE_DEFAULT_MODEL_HOSTS = [
+  "console.enterprise.trae.cn",
+  "www.trae.cn"
+];
+function resolveTraeHome(env) {
+  const h = os.homedir();
+  return nonEmpty2(env.TRAE_CONFIG_DIR) ? env.TRAE_CONFIG_DIR : path10.join(h, ".trae");
+}
+function readTraeConfig(env) {
+  const result = {};
+  const host = nonEmpty2(env.TRAE_CLI_API_HOST) ? env.TRAE_CLI_API_HOST.replace(/^https?:\/\//i, "").replace(/\/+$/, "") : void 0;
+  if (host) result.modelApiHost = host;
+  return result;
+}
 function readClaudeSettings(homeDir, cwd, env = process.env) {
   const files = [
     path10.join(homeDir, ".claude", "settings.json"),
@@ -57319,6 +57350,7 @@ function loadClientConfig(env, cwd) {
   config.opencode = readOpencodeConfig(resolveOpencodeConfigFile(env));
   config.hermes = readHermesConfig(resolveHermesHome(env));
   config.dsh = readDshConfig(resolveDshHome(env));
+  config.trae = readTraeConfig(env);
   return config;
 }
 function collectModelWindows(config, scope) {
@@ -57376,6 +57408,10 @@ function extractHttpsHosts(config) {
   if (config.zcode) {
     for (const prov of Object.values(config.zcode.providers)) push(prov.baseURL);
   }
+  if (config.trae) {
+    const hosts = nonEmpty2(config.trae.modelApiHost) ? [config.trae.modelApiHost] : TRAE_DEFAULT_MODEL_HOSTS;
+    for (const h of hosts) push(`https://${h}`);
+  }
   return out;
 }
 function configFilePaths(env) {
@@ -57387,7 +57423,8 @@ function configFilePaths(env) {
     path11.join(process.cwd(), ".claude", "settings.json"),
     path11.join(codexHome, "config.toml"),
     path11.join(resolvePiHome(env), "models.json"),
-    path11.join(zcodeHome, "v2", "config.json")
+    path11.join(zcodeHome, "v2", "config.json"),
+    path11.join(resolveTraeHome(env), "traecli.yaml")
   ];
 }
 function readMtimes(paths) {
@@ -58433,7 +58470,7 @@ function logUnrecognizedPath(log2, url) {
   const n = (unrecognizedPathCounts.get(key) ?? 0) + 1;
   unrecognizedPathCounts.set(key, n);
   if (n <= 3) {
-    log2("warn", `unrecognized path ${key} \u2014 not a known protocol (/chat/completions, /v1/messages, /responses, /responses/compact); forwarding unchanged`);
+    log2("warn", `unrecognized path ${key} \u2014 not a known protocol (/chat/completions, /llm_raw_chat, /v1/messages, /responses, /responses/compact); forwarding unchanged`);
   } else if (n === 4) {
     log2("info", `unrecognized path ${key}: forwarding unchanged; further occurrences suppressed`);
   }
@@ -58985,7 +59022,7 @@ async function handle(req, res, opts, core, config, log2, instanceId, instanceSt
       }
     }
     upstreamOrigin = route ? route.upstream : /^https?:\/\//i.test(url) ? new URL(url).origin : opts.upstream;
-    protocol = route?.explicitProtocol ?? (req.method === "POST" && bodyBuffer.length > 0 ? urlPath.endsWith("/chat/completions") ? "openai" : urlPath.endsWith("/v1/messages") || urlPath.endsWith("/messages") ? "anthropic" : urlPath.endsWith("/responses") || responsesCompact ? "responses" : null : null);
+    protocol = route?.explicitProtocol ?? (req.method === "POST" && bodyBuffer.length > 0 ? urlPath.endsWith("/chat/completions") || urlPath.endsWith("/llm_raw_chat") ? "openai" : urlPath.endsWith("/v1/messages") || urlPath.endsWith("/messages") ? "anthropic" : urlPath.endsWith("/responses") || responsesCompact ? "responses" : null : null);
     if (protocol !== null && bodyBuffer.length > 0) {
       try {
         const decoded = await decodeRequestBody(headerValue2(req, "content-encoding"), bodyBuffer, MAX_REQUEST_BYTES);
@@ -60007,7 +60044,7 @@ function logUpstreamProxyDecision(opts, upstreamUrl, decision) {
 }
 function inferWireProtocol(path18) {
   const p2 = path18.split("?", 2)[0];
-  if (p2.endsWith("/chat/completions")) return "openai";
+  if (p2.endsWith("/chat/completions") || p2.endsWith("/llm_raw_chat")) return "openai";
   if (p2.endsWith("/responses") || p2.endsWith("/responses/compact")) return "responses";
   return null;
 }
@@ -64384,6 +64421,7 @@ function resolveProxyOrigin() {
 var TOOL_TIMEOUT_MS = 6e4;
 var CONVERSATION_FROM_ENV = process.env.CLAUDE_CODE_SESSION_ID?.trim() || process.env.BILI_CONVERSATION_ID?.trim() || void 0;
 var IDENTITY_BINDING = Boolean(process.env.CLAUDE_CODE_SESSION_ID?.trim());
+var ORPHAN_ADOPT = IDENTITY_BINDING && process.env.BILI_MCP_NO_ORPHAN_ADOPT !== "1";
 var manifestTools = [];
 var conversationId = CONVERSATION_FROM_ENV;
 var registered = false;
@@ -64416,21 +64454,45 @@ function ensureManifest() {
   return manifestPromise;
 }
 async function forwardTool(tool, args, timeoutMs = TOOL_TIMEOUT_MS) {
-  let res;
+  for (let attempt = 0; ; attempt++) {
+    let res;
+    try {
+      res = await fetch(`${resolveProxyOrigin()}/__bili/plugin/tool`, {
+        method: "POST",
+        headers: { "content-type": "application/json" },
+        body: JSON.stringify({ conversationId, tool, args }),
+        signal: AbortSignal.timeout(timeoutMs)
+      });
+    } catch (err2) {
+      if (err2 instanceof Error && err2.name === "TimeoutError") throw new Error(`tool forward timed out after ${timeoutMs}ms: ${tool}`);
+      throw err2;
+    }
+    const data = await res.json();
+    if (res.ok && data.ok) return data.result ?? "";
+    if (res.status === 404 && attempt === 0 && ORPHAN_ADOPT && conversationId && typeof data.error === "string" && data.error.includes("no model request has arrived")) {
+      if (await adoptLatestActiveConversation()) continue;
+    }
+    throw new Error(data.error ?? `tool forward failed: ${res.status}`);
+  }
+}
+async function adoptLatestActiveConversation() {
   try {
-    res = await fetch(`${resolveProxyOrigin()}/__bili/plugin/tool`, {
-      method: "POST",
-      headers: { "content-type": "application/json" },
-      body: JSON.stringify({ conversationId, tool, args }),
-      signal: AbortSignal.timeout(timeoutMs)
-    });
-  } catch (err2) {
-    if (err2 instanceof Error && err2.name === "TimeoutError") throw new Error(`tool forward timed out after ${timeoutMs}ms: ${tool}`);
-    throw err2;
+    const res = await fetch(
+      `${resolveProxyOrigin()}/__bili/plugin/status?conversationId=${encodeURIComponent(conversationId ?? "")}&fallback=latest`,
+      { signal: AbortSignal.timeout(5e3) }
+    );
+    if (!res.ok) return false;
+    const data = await res.json();
+    if (data.ok !== true || data.fallback !== true || !data.conversationId || data.conversationId === conversationId) return false;
+    process.stderr.write(
+      `[bili-mcp] conversation id no longer known by the proxy (host resumed its session?); adopting latest active conversation ${data.conversationId}
+`
+    );
+    conversationId = data.conversationId;
+    return true;
+  } catch {
+    return false;
   }
-  const data = await res.json();
-  if (!res.ok || !data.ok) throw new Error(data.error ?? `tool forward failed: ${res.status}`);
-  return data.result ?? "";
 }
 var ERR_TOOL = -32602;
 async function handleMessage(msg) {
@@ -64924,7 +64986,7 @@ function selfDistFile(name) {
   return path15.join(selfPackageRoot(), "dist", name);
 }
 var LAUNCHER_DEFAULT_HOST = "127.0.0.1";
-var LAUNCH_CLIENTS = ["pi", "codex", "claude", "omp", "opencode", "hermes", "dsh", "pi-test"];
+var LAUNCH_CLIENTS = ["pi", "codex", "claude", "omp", "opencode", "hermes", "dsh", "trae", "pi-test"];
 var HEALTH_PATH = "/__bili/health";
 var HEALTH_POLL_INTERVAL_MS = 200;
 var SPAWN_WAIT_MS = 2e4;
@@ -65073,6 +65135,15 @@ function discoverRoutes(client, config) {
       } catch {
       }
     }
+  } else if (client === "trae") {
+    const hosts = nonEmpty2(config.trae?.modelApiHost) ? [config.trae.modelApiHost] : TRAE_DEFAULT_MODEL_HOSTS;
+    for (const h of hosts) {
+      const host = h.split(":", 2)[0].toLowerCase();
+      if (host && !httpsSeen.has(host)) {
+        httpsSeen.add(host);
+        httpsDomains.push(host);
+      }
+    }
   } else {
     for (const [name, prov] of Object.entries(config.codex?.providers ?? {})) {
       classify(prov.baseUrl, `model_providers.${name}.base_url`);
@@ -65105,6 +65176,9 @@ function buildPiEnv(origin, caPath, baseEnv, httpRewrites = [], httpsRewrites =
 function buildCodexEnv(origin, caPath, baseEnv) {
   return { ...baseEnv, HTTPS_PROXY: origin, SSL_CERT_FILE: caPath, BILLION_CONTEXT_PROXY: origin };
 }
+function buildTraeEnv(origin, caPath, baseEnv) {
+  return { ...baseEnv, HTTPS_PROXY: origin, SSL_CERT_FILE: caPath, BILLION_CONTEXT_PROXY: origin };
+}
 function buildCodexArgs(origin, httpRewrites, httpsRewrites, extra) {
   const args = [];
   for (const r of httpRewrites) {
@@ -65195,7 +65269,7 @@ function isPrivateIPv4(host) {
   return false;
 }
 function launcherInjectMcp(env, base, codexUpstream) {
-  if (base === "pi" || base === "omp" || base === "opencode" || base === "hermes" || base === "dsh") return false;
+  if (base === "pi" || base === "omp" || base === "opencode" || base === "hermes" || base === "dsh" || base === "trae") return false;
   if (env.BILI_LAUNCHER_PLUGIN === "0") return false;
   if (base === "codex" && env.BILI_LAUNCHER_PLUGIN === void 0 && codexUpstream !== void 0 && isPrivateUpstreamHost(codexUpstream)) {
     return false;
@@ -65950,6 +66024,10 @@ function resolveClientCommand(client, env) {
     );
     return { command: process.execPath, prefixArgs: [cli] };
   }
+  if (client === "trae") {
+    const traeBin = resolveOnPath("traecli", env) ?? resolveOnPath("trae-cli", env) ?? resolveOnPath("trae", env);
+    return { command: traeBin ?? "traecli", prefixArgs: [] };
+  }
   const resolved = resolveOnPath(client, env);
   return { command: resolved ?? client, prefixArgs: [] };
 }
@@ -66085,6 +66163,8 @@ async function runLaunch(params, deps = {}) {
     }
     const dshAcpPatch = writeDshAcpPatch(dshHomeDir);
     if (dshAcpPatch) clientArgs = dshArgsWithPatch(clientArgs, dshAcpPatch);
+  } else if (base === "trae") {
+    env = buildTraeEnv(origin, resolveCombinedCaPath(process.env), stripInheritedProxy(process.env));
   } else if (base === "codex") {
     const codexConversationId = injectMcp ? randomUUID5() : void 0;
     if (directUrl) {
@@ -66360,6 +66440,7 @@ Usage:
   bili opencode [opts --] [args]   start a proxy + launch opencode against it (cert-MITM)
   bili hermes [opts --] [args]     start a proxy + launch hermes-agent against it (/bili/ rewrite)
   bili dsh [opts --] [args]        start a proxy + launch deepseek-harness against it (/bili/ rewrite)
+  bili trae [opts --] [args]       start a proxy + launch Trae CLI against it (cert-MITM)
   bili test pi                     non-polluting pi smoke test through the proxy
   bili export [session] [--full]   list sessions / export one as a Markdown handoff
                                     (--full includes original messages; --output FILE)
@@ -66374,12 +66455,12 @@ Usage:
   bili --version                   print version
   bili --help                      show this help
 
-Launcher (bili pi / bili codex / bili claude / bili omp / bili opencode / bili hermes / bili dsh):
+Launcher (bili pi / bili codex / bili claude / bili omp / bili opencode / bili hermes / bili dsh / bili trae):
   Brings up a proxy on an independent port (a fresh instance every launch), then runs the client pointed at it via HTTPS_PROXY + the proxy's
   MITM CA \u2014 no config-file edits. Discovered HTTPS upstream domains are
   auto-whitelisted for MITM so the proxy TLS-terminates exactly the hosts the
-  client uses; HTTP / localhost providers go direct. pi/claude trust the CA
-  via NODE_EXTRA_CA_CERTS, codex via SSL_CERT_FILE. Proxy killed on client exit.
+   client uses; HTTP / localhost providers go direct. pi/claude trust the CA
+   via NODE_EXTRA_CA_CERTS, codex/trae via SSL_CERT_FILE. Proxy killed on client exit.
   bili flags (-F, --mitm-domain, --port, ...) must precede the client name;
   everything after the client name is passed through to the client.
     bili pi                               # launch pi through the proxy
@@ -66389,8 +66470,9 @@ Launcher (bili pi / bili codex / bili claude / bili omp / bili opencode / bili h
     bili claude                           # launch claude through the proxy
     bili omp                              # launch omp through the proxy (pi-based; /bili/ rewrite)
     bili hermes                           # launch hermes-agent through the proxy (/bili/ rewrite of ~/.hermes/config.yaml)
-    bili dsh --profile web "task"         # launch deepseek-harness through the proxy (/bili/ rewrite of ~/.dsh/settings.yaml)
-    bili test pi                          # quick end-to-end check of the pi path
+     bili dsh --profile web "task"         # launch deepseek-harness through the proxy (/bili/ rewrite of ~/.dsh/settings.yaml)
+     bili trae                             # launch Trae CLI through the proxy (cert-MITM; model host via TRAE_CLI_API_HOST or --mitm-domain)
+     bili test pi                          # quick end-to-end check of the pi path
     bili --mitm-domain api.foo.com pi     # add a domain to the MITM whitelist (flags precede the client)
     bili -F http://127.0.0.1:7897 codex   # route bili's upstream through a proxy (gost-style -F)