@nvae/llmswitch 0.6.0 → 0.7.0

package/dist/adapters/opencode.js

@@ -6,6 +6,7 @@ import { atomicWriteFile, backupFile, ensureDir } from "../utils/fs.js";
 import { applyProxyToEnvRecord, clearProxyEnvKeys } from "../utils/proxy.js";
 import { getBackupsDir, getOpenCodeAuthPath, getOpenCodeConfigDir, getOpenCodeConfigPath, } from "../utils/paths.js";
 import { setActiveProfile } from "../store/profiles.js";
+import { ensureBridgeForProfile, profileNeedsBridge, } from "../bridge/manager.js";
 function providerId(name) {
     return `llms-${name}`.replace(/[^a-zA-Z0-9_-]/g, "-");
 }
@@ -30,7 +31,7 @@ export function readOpenCodeAuth(path = getOpenCodeAuthPath()) {
         return {};
     return JSON.parse(readFileSync(path, "utf8"));
 }
-export function buildOpenCodeProviderBlock(profile) {
+export function buildOpenCodeProviderBlock(profile, overrides) {
     const models = {};
     for (const id of profile.models.list) {
         models[id] = { name: id };
@@ -39,10 +40,12 @@ export function buildOpenCodeProviderBlock(profile) {
         models[profile.models.default] = { name: profile.models.default };
     }
     const options = {
-        baseURL: normalizeBaseUrlForFormat(profile.apiFormat, profile.baseUrl),
+        baseURL: overrides?.baseURL ||
+            normalizeBaseUrlForFormat(profile.apiFormat, profile.baseUrl),
     };
-    if (profile.apiKey) {
-        options.apiKey = profile.apiKey;
+    const apiKey = overrides?.apiKey ?? profile.apiKey;
+    if (apiKey) {
+        options.apiKey = apiKey;
     }
     if (profile.headers && Object.keys(profile.headers).length > 0) {
         options.headers = { ...profile.headers };
@@ -54,19 +57,23 @@ export function buildOpenCodeProviderBlock(profile) {
         models,
     };
 }
-export function buildOpenCodeConfig(existing, profile) {
+export function buildOpenCodeConfig(existing, profile, overrides) {
     assertCompatible("opencode", profile.apiFormat);
     const id = providerId(profile.name);
     const providers = {
         ...(existing.provider || {}),
     };
-    providers[id] = buildOpenCodeProviderBlock(profile);
-    // Optional top-level env for proxy (OpenCode may pass through)
+    providers[id] = buildOpenCodeProviderBlock(profile, overrides);
+    // Optional top-level env for proxy (OpenCode may pass through). When the
+    // profile routes through the bridge, the upstream proxy is applied inside the
+    // bridge; skip env-var proxy injection so OpenCode doesn't apply its own.
     const env = {
         ...(existing.env || {}),
     };
     clearProxyEnvKeys(env);
-    applyProxyToEnvRecord(env, profile.proxy);
+    if (!overrides) {
+        applyProxyToEnvRecord(env, profile.proxy);
+    }
     const next = {
         ...existing,
         $schema: existing.$schema || "https://opencode.ai/config.json",
@@ -92,18 +99,25 @@ export function buildOpenCodeAuth(existing, profile) {
     }
     return next;
 }
-export function applyOpenCodeProfile(profile) {
+export async function applyOpenCodeProfile(profile) {
     assertCompatible("opencode", profile.apiFormat);
     ensureDir(getOpenCodeConfigDir());
     ensureDir(dirname(getOpenCodeAuthPath()));
+    let bridgeConnection = null;
+    if (profileNeedsBridge(profile)) {
+        bridgeConnection = await ensureBridgeForProfile(profile, "opencode");
+    }
     const configPath = getOpenCodeConfigPath();
     const authPath = getOpenCodeAuthPath();
     const existing = readOpenCodeConfig(configPath);
     const backupPath = backupFile(configPath, getBackupsDir("opencode"), "opencode");
     backupFile(authPath, getBackupsDir("opencode"), "auth");
-    const nextConfig = buildOpenCodeConfig(existing, profile);
+    const nextConfig = buildOpenCodeConfig(existing, profile, bridgeConnection
+        ? { baseURL: bridgeConnection.baseUrl, apiKey: bridgeConnection.clientToken }
+        : undefined);
     atomicWriteFile(configPath, JSON.stringify(nextConfig, null, 2) + "\n");
-    const nextAuth = buildOpenCodeAuth(readOpenCodeAuth(authPath), profile);
+    const bridgeApiKey = bridgeConnection?.clientToken || profile.apiKey;
+    const nextAuth = buildOpenCodeAuth(readOpenCodeAuth(authPath), { ...profile, apiKey: bridgeApiKey });
     atomicWriteFile(authPath, JSON.stringify(nextAuth, null, 2) + "\n");
     setActiveProfile("opencode", profile.name);
     return {
@@ -111,7 +125,9 @@ export function applyOpenCodeProfile(profile) {
         profile: profile.name,
         configPath,
         backupPath,
-        restartHint: "请重新启动 OpenCode 会话以使配置与代理生效。",
+        restartHint: bridgeConnection
+            ? "已通过本地 bridge 启用供应商（上游代理在 bridge 内生效）。请重新启动 OpenCode 会话使配置生效。"
+            : "请重新启动 OpenCode 会话以使配置与代理生效。",
     };
 }
 export function deactivateOpenCodeProfile(profileName) {

package/dist/bridge/manager.js

@@ -28,8 +28,14 @@ export class BridgeControlError extends Error {
 export function profileNeedsBridge(profile) {
     return profile.apiFormat === "openai-chat";
 }
+function isBunRuntime() {
+    return typeof process.versions?.bun ===
+        "string";
+}
 export function bridgeToolForCliTool(tool) {
-    return tool === "codex" || tool === "claude" ? tool : null;
+    return tool === "codex" || tool === "claude" || tool === "opencode"
+        ? tool
+        : null;
 }
 export function upstreamFromProfile(profile, tool, clientToken = null) {
     const mode = tool === "claude" ? "chat" : profile.bridgeMode || "chat";
@@ -186,17 +192,26 @@ export async function startBridgeDaemon(host = DEFAULT_BRIDGE_HOST, port = DEFAU
         instance: null,
         pid: null,
     }));
-    const entry = resolveCliEntry();
-    const args = [entry, "bridge", "serve", "--host", host, "--port", String(port)];
+    const runner = resolveBridgeDaemonRunner();
+    const args = [
+        runner.entry,
+        "bridge",
+        "serve",
+        "--host",
+        host,
+        "--port",
+        String(port),
+    ];
     if (allowRemote)
         args.push("--allow-remote");
-    const child = spawn(process.execPath, args, {
+    const child = spawn(runner.command, args, {
         detached: true,
         stdio: "ignore",
         env: {
             ...process.env,
             LLM_SWITCH_BRIDGE_PORT: String(port),
             LLM_SWITCH_BRIDGE_HOST: host,
+            LLM_SWITCH_BRIDGE_RUNTIME: runner.command,
         },
     });
     child.unref();
@@ -243,6 +258,9 @@ export async function forceStopBridge() {
     await stopBridge();
 }
 export async function runBridgeForeground(host, port, allowRemote = false) {
+    if (process.env.LLM_SWITCH_BRIDGE_RUNTIME !== "node" && isBunRuntime()) {
+        console.error("注意：bridge 当前由 Bun 运行，Bun 会本地解析 DNS，可能导致 socks5h 代理出口地区错误。建议用「node dist/index.js bridge serve」运行。");
+    }
     assertBridgeListenerAllowed(host, allowRemote);
     const listener = resolveBridgeListener({ host, port, allowRemote });
     const previous = readBridgeState();
@@ -321,15 +339,29 @@ export async function runBridgeForeground(host, port, allowRemote = false) {
     process.removeListener("SIGINT", onSignal);
     process.removeListener("SIGTERM", onSignal);
 }
-function resolveCliEntry() {
+/**
+ * Resolve how the detached bridge daemon is launched. The bridge must run under
+ * Node.js: Bun's node:https stack resolves target DNS locally, which defeats
+ * socks5h remote-DNS and can produce wrong-region egress. Node delegates the
+ * hostname to the socks agent, giving correct remote-DNS behavior.
+ */
+function resolveBridgeDaemonRunner() {
+    const candidates = [
+        fileURLToPath(new URL("../index.js", import.meta.url)),
+        fileURLToPath(new URL("../../dist/index.js", import.meta.url)),
+        fileURLToPath(new URL("../index.ts", import.meta.url)),
+    ];
+    for (const candidate of candidates) {
+        if (existsSync(candidate)) {
+            if (candidate.endsWith(".js")) {
+                return { command: "node", entry: candidate };
+            }
+            return { command: process.execPath, entry: candidate };
+        }
+    }
     const running = process.argv[1];
-    if (running && existsSync(running))
-        return running;
-    const compiled = fileURLToPath(new URL("../index.js", import.meta.url));
-    if (existsSync(compiled))
-        return compiled;
-    const source = fileURLToPath(new URL("../index.ts", import.meta.url));
-    if (existsSync(source))
-        return source;
+    if (running && existsSync(running)) {
+        return { command: process.execPath, entry: running };
+    }
     throw new BridgeControlError("无法定位 llmswitch 入口文件");
 }

package/dist/bridge/server.js

@@ -29,7 +29,7 @@ function authenticateDataRequest(req, upstream, tool) {
     if (!upstream?.clientToken || upstream.migrationRequired)
         return false;
     const bearer = bearerToken(req);
-    if (tool === "codex") {
+    if (tool === "codex" || tool === "opencode") {
         return constantTimeTokenEqual(upstream.clientToken, bearer);
     }
     const apiKey = headerValue(req.headers["x-api-key"]);
@@ -40,7 +40,8 @@ function authenticateDataRequest(req, upstream, tool) {
 }
 function authenticateModelsRequest(req, upstreams) {
     return (authenticateDataRequest(req, upstreams.codex, "codex") ||
-        authenticateDataRequest(req, upstreams.claude, "claude"));
+        authenticateDataRequest(req, upstreams.claude, "claude") ||
+        authenticateDataRequest(req, upstreams.opencode, "opencode"));
 }
 function readBody(req, maxBytes = parseBridgeRuntimeLimits().maxBodyBytes) {
     return new Promise((resolve, reject) => {
@@ -156,7 +157,7 @@ async function fetchModelsJson(upstream) {
     }
 }
 async function proxyModelsMerged(_req, res, upstreams) {
-    const sides = [upstreams.codex, upstreams.claude].filter((u) => Boolean(u?.baseUrl));
+    const sides = [upstreams.codex, upstreams.claude, upstreams.opencode].filter((u) => Boolean(u?.baseUrl));
     if (!sides.length) {
         sendJson(res, 503, {
             error: { message: "Bridge 未配置上游" },
@@ -293,6 +294,52 @@ async function forwardChatResponses(req, res, upstream, body, wantStream) {
     }
     await pipeChatStreamToResponses(response, res, String(body.model || ""), customTools, true);
 }
+/**
+ * OpenCode-facing passthrough: forward an OpenAI chat request verbatim to the
+ * upstream `/chat/completions` (with llm-switch transport applying the proxy)
+ * and relay the raw response, preserving streaming for SSE.
+ */
+async function forwardOpenCodeChat(_req, res, upstream, bodyBuf) {
+    let body;
+    try {
+        body = JSON.parse(bodyBuf.toString("utf8"));
+    }
+    catch {
+        sendJson(res, 400, { error: { message: "Invalid JSON body" } });
+        return;
+    }
+    const wantStream = Boolean(body.stream);
+    const url = joinUrl(upstream.baseUrl, "/chat/completions");
+    let response;
+    try {
+        response = await requestUpstream(upstream, url, "POST", bodyBuf.toString("utf8"));
+    }
+    catch (err) {
+        sendJson(res, 502, {
+            error: {
+                message: `Upstream chat 请求失败: ${err instanceof Error ? err.message : String(err)}`,
+            },
+        });
+        return;
+    }
+    if (!response.ok) {
+        const text = await response.text();
+        res.writeHead(response.status, {
+            "Content-Type": response.headers.get("content-type") || "application/json",
+        });
+        res.end(text);
+        return;
+    }
+    if (!wantStream) {
+        const text = await response.text();
+        res.writeHead(response.status, {
+            "Content-Type": response.headers.get("content-type") || "application/json",
+        });
+        res.end(text);
+        return;
+    }
+    await pipeRawStream(response, res);
+}
 async function forwardCompletions(_req, res, upstream, body, wantStream) {
     const completionReq = responsesToCompletionsRequest(body);
     const customTools = collectCustomToolNames(body.tools);
@@ -444,6 +491,34 @@ async function pipeChatStreamToAnthropic(upstream, res, model) {
         res.end();
     }
 }
+/** Relay an upstream SSE stream verbatim (OpenCode chat passthrough). */
+async function pipeRawStream(upstream, res) {
+    res.writeHead(200, {
+        "Content-Type": "text/event-stream; charset=utf-8",
+        "Cache-Control": "no-cache, no-transform",
+        Connection: "keep-alive",
+        "X-Accel-Buffering": "no",
+    });
+    const reader = upstream.body?.getReader();
+    if (!reader) {
+        res.end();
+        return;
+    }
+    try {
+        while (true) {
+            const { done, value } = await reader.read();
+            if (done)
+                break;
+            res.write(value);
+        }
+    }
+    catch {
+        // Connection dropped; best-effort close.
+    }
+    finally {
+        res.end();
+    }
+}
 export function createBridgeServer(options = {}) {
     return createServer(async (req, res) => {
         try {
@@ -487,6 +562,13 @@ export function createBridgeServer(options = {}) {
                                 migrationRequired: merged.claude.migrationRequired === true,
                             }
                             : null,
+                        opencode: merged.opencode
+                            ? {
+                                mode: merged.opencode.mode,
+                                profile: merged.opencode.profileName || null,
+                                migrationRequired: merged.opencode.migrationRequired === true,
+                            }
+                            : null,
                     },
                 });
                 return;
@@ -584,9 +666,32 @@ export function createBridgeServer(options = {}) {
                 await handleMessages(req, res, merged.claude, body);
                 return;
             }
+            if (req.method === "POST" &&
+                (path === "/v1/chat/completions" || path === "/chat/completions")) {
+                if (!merged.opencode?.baseUrl) {
+                    sendJson(res, 503, {
+                        error: {
+                            message: "Bridge 未配置 OpenCode 上游。请先 llms opencode use <openai-chat profile>",
+                        },
+                    });
+                    return;
+                }
+                if (!authenticateDataRequest(req, merged.opencode, "opencode")) {
+                    sendJson(res, 401, {
+                        error: {
+                            code: "invalid_bridge_token",
+                            message: "Bridge token 无效；请重新执行 llms opencode use <profile>",
+                        },
+                    });
+                    return;
+                }
+                const body = await readBody(req);
+                await forwardOpenCodeChat(req, res, merged.opencode, body);
+                return;
+            }
             sendJson(res, 404, {
                 error: {
-                    message: `Bridge 支持 GET /v1/models、POST /v1/responses、POST /v1/messages（当前: ${req.method} ${path}）`,
+                    message: `Bridge 支持 GET /v1/models、POST /v1/responses、POST /v1/messages、POST /v1/chat/completions（当前: ${req.method} ${path}）`,
                 },
             });
         }

package/dist/bridge/state.js

@@ -63,7 +63,10 @@ function isLegacyUpstream(raw) {
     if (!raw || typeof raw !== "object" || Array.isArray(raw))
         return false;
     const row = raw;
-    return typeof row.baseUrl === "string" && !("codex" in row) && !("claude" in row);
+    return (typeof row.baseUrl === "string" &&
+        !("codex" in row) &&
+        !("claude" in row) &&
+        !("opencode" in row));
 }
 export function normalizeBridgeUpstreams(raw) {
     if (!raw || typeof raw !== "object" || Array.isArray(raw)) {
@@ -71,11 +74,12 @@ export function normalizeBridgeUpstreams(raw) {
     }
     const row = raw;
     if (isLegacyUpstream(raw)) {
-        return { codex: raw, claude: null };
+        return { codex: raw, claude: null, opencode: null };
     }
     return {
         codex: row.codex ?? null,
         claude: row.claude ?? null,
+        opencode: row.opencode ?? null,
     };
 }
 /** Legacy upstreams cannot authenticate until reapplied. */
@@ -155,6 +159,7 @@ function readLegacyMigrationState() {
             upstreams: {
                 codex: markUpstreamMigrationRequired(upstreams.codex),
                 claude: markUpstreamMigrationRequired(upstreams.claude),
+                opencode: markUpstreamMigrationRequired(upstreams.opencode),
             },
             pending: null,
         });
@@ -224,6 +229,7 @@ function persistState(next) {
         upstreams: {
             codex: next.upstreams.codex,
             claude: next.upstreams.claude,
+            opencode: next.upstreams.opencode,
         },
         pending: next.pending,
     };

package/dist/bridge/types.js

@@ -1,8 +1,10 @@
 export const DEFAULT_BRIDGE_PORT = 17890;
 export const DEFAULT_BRIDGE_HOST = "127.0.0.1";
 export function emptyUpstreams() {
-    return { codex: null, claude: null };
+    return { codex: null, claude: null, opencode: null };
 }
 export function hasAnyUpstream(upstreams) {
-    return Boolean(upstreams.codex?.baseUrl || upstreams.claude?.baseUrl);
+    return Boolean(upstreams.codex?.baseUrl ||
+        upstreams.claude?.baseUrl ||
+        upstreams.opencode?.baseUrl);
 }

package/dist/commands/bridge-cmd.js

@@ -72,6 +72,7 @@ export function registerBridgeCommand(program) {
             upstreams: {
                 codex: summarize(state.upstreams.codex),
                 claude: summarize(state.upstreams.claude),
+                opencode: summarize(state.upstreams.opencode),
             },
         };
         if (opts.json) {
@@ -80,9 +81,9 @@ export function registerBridgeCommand(program) {
         }
         console.log(`状态：${alive ? "运行中" : "未运行"}`);
         console.log(`根地址：${data.rootUrl}`);
-        console.log(`Codex base：${data.codexBaseUrl}`);
+        console.log(`Codex/OpenCode base：${data.codexBaseUrl}`);
         console.log(`PID：${pid ?? "-"}`);
-        for (const tool of ["codex", "claude"]) {
+        for (const tool of ["codex", "claude", "opencode"]) {
             const u = data.upstreams[tool];
             if (u) {
                 console.log(`${tool} 上游：${u.baseUrl}（${u.mode}） profile=${u.profile ?? "-"}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nvae/llmswitch",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "CLI to switch LLM providers and models for Claude Code, Codex, and OpenCode",
   "type": "module",
   "bin": {