ellm-proxy 0.0.3 → 0.0.6

package/manager/api/harness/claude-code.js

@@ -1,54 +1,54 @@
-// Claude Code 代理开关：~/.claude/settings.json 的 env.ANTHROPIC_BASE_URL / ANTHROPIC_AUTH_TOKEN
-// 指向本机 ellm-proxy 网关。JSON 字段级修改，其余字段原样保留。
-// 开关状态以实际文件内容判定（env.ANTHROPIC_BASE_URL 是否已指向网关）；不落额外状态文件。
-import { readFileSync, writeFileSync, existsSync, mkdirSync } from "node:fs";
-import { homedir } from "node:os";
-import { join, dirname } from "node:path";
-import { backupOnce, restoreFromBackup } from "./backup.js";
-
-const CLAUDE_SETTINGS = join(homedir(), ".claude", "settings.json");
-
-/** 去尾斜杠比较，容忍 http://x:1/ 与 http://x:1 视为同一地址 */
-function sameUrl(a, b) {
-  return String(a || "").replace(/\/+$/, "") === String(b || "").replace(/\/+$/, "");
-}
-
-function readClaudeSettings() {
-  if (!existsSync(CLAUDE_SETTINGS)) return null;
-  try {
-    return JSON.parse(readFileSync(CLAUDE_SETTINGS, "utf-8"));
-  } catch (err) {
-    throw new Error(`${CLAUDE_SETTINGS} 不是合法 JSON，拒绝修改（请先手工修复）: ${err.message}`);
-  }
-}
-
-/** Claude Code 开关状态：env.ANTHROPIC_BASE_URL 是否已指向网关 */
-export function claudeCodeStatus(gatewayBase) {
-  const settings = readClaudeSettings();
-  if (!settings) return false;
-  return sameUrl(settings?.env?.ANTHROPIC_BASE_URL, gatewayBase);
-}
-
-/** 开启 Claude Code 代理：备份 → 字段级写入 env.ANTHROPIC_BASE_URL / ANTHROPIC_AUTH_TOKEN（其余字段原样保留） */
-export function claudeCodeEnable({ gatewayBase, token }) {
-  mkdirSync(dirname(CLAUDE_SETTINGS), { recursive: true });
-  const settings = readClaudeSettings() ?? {};
-  backupOnce(CLAUDE_SETTINGS);
-  settings.env = { ...(settings.env ?? {}) };
-  settings.env.ANTHROPIC_BASE_URL = gatewayBase;
-  settings.env.ANTHROPIC_AUTH_TOKEN = token;
-  writeFileSync(CLAUDE_SETTINGS, JSON.stringify(settings, null, 2) + "\n", "utf-8");
-}
-
-/** 关闭 Claude Code 代理：从备份还原（无备份时仅移除代理相关字段） */
-export function claudeCodeDisable(gatewayBase) {
-  if (restoreFromBackup(CLAUDE_SETTINGS)) return true;
-  const settings = readClaudeSettings();
-  if (!settings) return false;
-  if (!sameUrl(settings?.env?.ANTHROPIC_BASE_URL, gatewayBase)) return false;
-  delete settings.env.ANTHROPIC_BASE_URL;
-  delete settings.env.ANTHROPIC_AUTH_TOKEN;
-  if (settings.env && Object.keys(settings.env).length === 0) delete settings.env;
-  writeFileSync(CLAUDE_SETTINGS, JSON.stringify(settings, null, 2) + "\n", "utf-8");
-  return true;
-}
+// Claude Code 代理开关：~/.claude/settings.json 的 env.ANTHROPIC_BASE_URL / ANTHROPIC_AUTH_TOKEN
+// 指向本机 ellm-proxy 网关。JSON 字段级修改，其余字段原样保留。
+// 开关状态以实际文件内容判定（env.ANTHROPIC_BASE_URL 是否已指向网关）；不落额外状态文件。
+import { readFileSync, writeFileSync, existsSync, mkdirSync } from "node:fs";
+import { homedir } from "node:os";
+import { join, dirname } from "node:path";
+import { backupOnce, restoreFromBackup } from "./backup.js";
+
+const CLAUDE_SETTINGS = join(homedir(), ".claude", "settings.json");
+
+/** 去尾斜杠比较，容忍 http://x:1/ 与 http://x:1 视为同一地址 */
+function sameUrl(a, b) {
+  return String(a || "").replace(/\/+$/, "") === String(b || "").replace(/\/+$/, "");
+}
+
+function readClaudeSettings() {
+  if (!existsSync(CLAUDE_SETTINGS)) return null;
+  try {
+    return JSON.parse(readFileSync(CLAUDE_SETTINGS, "utf-8"));
+  } catch (err) {
+    throw new Error(`${CLAUDE_SETTINGS} 不是合法 JSON，拒绝修改（请先手工修复）: ${err.message}`);
+  }
+}
+
+/** Claude Code 开关状态：env.ANTHROPIC_BASE_URL 是否已指向网关 */
+export function claudeCodeStatus(gatewayBase) {
+  const settings = readClaudeSettings();
+  if (!settings) return false;
+  return sameUrl(settings?.env?.ANTHROPIC_BASE_URL, gatewayBase);
+}
+
+/** 开启 Claude Code 代理：备份 → 字段级写入 env.ANTHROPIC_BASE_URL / ANTHROPIC_AUTH_TOKEN（其余字段原样保留） */
+export function claudeCodeEnable({ gatewayBase, token }) {
+  mkdirSync(dirname(CLAUDE_SETTINGS), { recursive: true });
+  const settings = readClaudeSettings() ?? {};
+  backupOnce(CLAUDE_SETTINGS);
+  settings.env = { ...(settings.env ?? {}) };
+  settings.env.ANTHROPIC_BASE_URL = gatewayBase;
+  settings.env.ANTHROPIC_AUTH_TOKEN = token;
+  writeFileSync(CLAUDE_SETTINGS, JSON.stringify(settings, null, 2) + "\n", "utf-8");
+}
+
+/** 关闭 Claude Code 代理：从备份还原（无备份时仅移除代理相关字段） */
+export function claudeCodeDisable(gatewayBase) {
+  if (restoreFromBackup(CLAUDE_SETTINGS)) return true;
+  const settings = readClaudeSettings();
+  if (!settings) return false;
+  if (!sameUrl(settings?.env?.ANTHROPIC_BASE_URL, gatewayBase)) return false;
+  delete settings.env.ANTHROPIC_BASE_URL;
+  delete settings.env.ANTHROPIC_AUTH_TOKEN;
+  if (settings.env && Object.keys(settings.env).length === 0) delete settings.env;
+  writeFileSync(CLAUDE_SETTINGS, JSON.stringify(settings, null, 2) + "\n", "utf-8");
+  return true;
+}

package/manager/api/harness/codex.js

@@ -1,123 +1,123 @@
-// Codex 代理开关：~/.codex/config.toml 顶层 model_provider + [model_providers.ellm-proxy] 段
-// 指向本机 ellm-proxy 网关（语法见 openai/codex docs/config.md；wire_api 仅支持 chat|responses，
-// 此处用 chat 走 /v1/chat/completions）。
-// TOML 解析/校验用 smol-toml 库（不手写解析器）；写入采用文本级编辑以保留用户注释与排版，
-// 且写盘前必须通过库校验（结果文本可解析且 model_provider 正确），否则抛错保留原文件。
-import { readFileSync, writeFileSync, existsSync, mkdirSync } from "node:fs";
-import { homedir } from "node:os";
-import { join, dirname } from "node:path";
-import { parse as parseToml } from "smol-toml";
-import { backupOnce, restoreFromBackup } from "./backup.js";
-
-const PROVIDER_ID = "ellm-proxy"; // Codex provider id（避开官方保留 id: openai/ollama/lmstudio）
-const CODEX_CONFIG = join(homedir(), ".codex", "config.toml");
-
-function readCodexConfig() {
-  return existsSync(CODEX_CONFIG) ? readFileSync(CODEX_CONFIG, "utf-8") : null;
-}
-
-/** 是否已写顶层 model_provider = "ellm-proxy"（库解析；文本不合法按未开启处理，enable 时会给出明确报错） */
-function codexProviderActive(text) {
-  try {
-    return parseToml(text)?.model_provider === PROVIDER_ID;
-  } catch {
-    return false;
-  }
-}
-
-/** 库校验：文本必须可解析，且 expectProvider 为 true 时顶层 model_provider 必须是本 provider（写盘前强制调用） */
-function validateTomlText(text, expectProvider) {
-  let parsed;
-  try {
-    parsed = parseToml(text);
-  } catch (err) {
-    throw new Error(`编辑后的 config.toml 不是合法 TOML，已保留原文件: ${err.message}`);
-  }
-  if (expectProvider && parsed?.model_provider !== PROVIDER_ID) {
-    throw new Error(`编辑后的 config.toml 顶层 model_provider 不是 "${PROVIDER_ID}"，已保留原文件`);
-  }
-}
-
-/** Codex 开关状态：顶层 model_provider 是否为 ellm-proxy */
-export function codexStatus() {
-  const text = readCodexConfig();
-  return text ? codexProviderActive(text) : false;
-}
-
-/** 移除已有的 [model_providers.ellm-proxy] 段（从段头到下一个段头/文件尾），供重写为最新 base_url */
-function removeProviderSection(text) {
-  const lines = text.split("\n");
-  const out = [];
-  let skipping = false;
-  for (const line of lines) {
-    if (/^\s*\[model_providers\.ellm-proxy\]\s*$/.test(line)) {
-      skipping = true;
-      continue;
-    }
-    if (skipping && /^\s*\[/.test(line)) skipping = false; // 下一个段头，恢复收集
-    if (!skipping) out.push(line);
-  }
-  return out.join("\n").replace(/\n{3,}$/, "\n\n");
-}
-
-/** 设置顶层 model_provider = "ellm-proxy"：已有该键则替换（忽略注释行），否则插到首个段头前（TOML 顶层键必须在任何 [section] 之前） */
-function setTopLevelProvider(text) {
-  const lines = text.split("\n");
-  const keyLine = `model_provider = "${PROVIDER_ID}"`;
-  let replaced = false;
-  const out = lines.map((line) => {
-    if (!replaced && /^\s*model_provider\s*=/.test(line) && !line.trim().startsWith("#")) {
-      replaced = true;
-      return keyLine;
-    }
-    return line;
-  });
-  if (replaced) return out.join("\n");
-  const firstSection = out.findIndex((line) => /^\s*\[/.test(line));
-  if (firstSection === -1) return [...out, keyLine].join("\n");
-  out.splice(firstSection, 0, keyLine, "");
-  return out.join("\n");
-}
-
-/** 开启 Codex 代理：备份 → 写 model_provider + [model_providers.ellm-proxy] 段（重复开启幂等刷新 base_url）。
- *  原文本不合法时直接报错（不覆盖坏文件）；编辑结果写盘前经库校验 */
-export function codexEnable({ gatewayBase }) {
-  mkdirSync(dirname(CODEX_CONFIG), { recursive: true });
-  const original = readCodexConfig();
-  if (original !== null) {
-    try {
-      parseToml(original);
-    } catch (err) {
-      throw new Error(`${CODEX_CONFIG} 不是合法 TOML，拒绝修改（请先手工修复）: ${err.message}`);
-    }
-  }
-  let text = original ?? "";
-  backupOnce(CODEX_CONFIG);
-  text = removeProviderSection(text);
-  text = setTopLevelProvider(text);
-  const section = [
-    `[model_providers.${PROVIDER_ID}]`,
-    `name = "ellm-proxy gateway"`,
-    `base_url = "${gatewayBase}/v1"`,
-    `wire_api = "chat"`,
-    `env_key = "ELLM_PROXY_API_KEY"`,
-  ].join("\n");
-  text = text.replace(/\s*$/, "") + "\n\n" + section + "\n";
-  validateTomlText(text, true);
-  writeFileSync(CODEX_CONFIG, text, "utf-8");
-}
-
-/** 关闭 Codex 代理：从备份还原（无备份时移除 provider 段与顶层键，写盘前经库校验） */
-export function codexDisable() {
-  if (restoreFromBackup(CODEX_CONFIG)) return true;
-  const text = readCodexConfig();
-  if (!text || !codexProviderActive(text)) return false;
-  let out = removeProviderSection(text);
-  out = out
-    .split("\n")
-    .filter((line) => !/^\s*model_provider\s*=\s*["']?ellm-proxy["']?\s*$/.test(line))
-    .join("\n");
-  validateTomlText(out, false);
-  writeFileSync(CODEX_CONFIG, out, "utf-8");
-  return true;
-}
+// Codex 代理开关：~/.codex/config.toml 顶层 model_provider + [model_providers.ellm-proxy] 段
+// 指向本机 ellm-proxy 网关（语法见 openai/codex docs/config.md；wire_api 仅支持 chat|responses，
+// 此处用 chat 走 /v1/chat/completions）。
+// TOML 解析/校验用 smol-toml 库（不手写解析器）；写入采用文本级编辑以保留用户注释与排版，
+// 且写盘前必须通过库校验（结果文本可解析且 model_provider 正确），否则抛错保留原文件。
+import { readFileSync, writeFileSync, existsSync, mkdirSync } from "node:fs";
+import { homedir } from "node:os";
+import { join, dirname } from "node:path";
+import { parse as parseToml } from "smol-toml";
+import { backupOnce, restoreFromBackup } from "./backup.js";
+
+const PROVIDER_ID = "ellm-proxy"; // Codex provider id（避开官方保留 id: openai/ollama/lmstudio）
+const CODEX_CONFIG = join(homedir(), ".codex", "config.toml");
+
+function readCodexConfig() {
+  return existsSync(CODEX_CONFIG) ? readFileSync(CODEX_CONFIG, "utf-8") : null;
+}
+
+/** 是否已写顶层 model_provider = "ellm-proxy"（库解析；文本不合法按未开启处理，enable 时会给出明确报错） */
+function codexProviderActive(text) {
+  try {
+    return parseToml(text)?.model_provider === PROVIDER_ID;
+  } catch {
+    return false;
+  }
+}
+
+/** 库校验：文本必须可解析，且 expectProvider 为 true 时顶层 model_provider 必须是本 provider（写盘前强制调用） */
+function validateTomlText(text, expectProvider) {
+  let parsed;
+  try {
+    parsed = parseToml(text);
+  } catch (err) {
+    throw new Error(`编辑后的 config.toml 不是合法 TOML，已保留原文件: ${err.message}`);
+  }
+  if (expectProvider && parsed?.model_provider !== PROVIDER_ID) {
+    throw new Error(`编辑后的 config.toml 顶层 model_provider 不是 "${PROVIDER_ID}"，已保留原文件`);
+  }
+}
+
+/** Codex 开关状态：顶层 model_provider 是否为 ellm-proxy */
+export function codexStatus() {
+  const text = readCodexConfig();
+  return text ? codexProviderActive(text) : false;
+}
+
+/** 移除已有的 [model_providers.ellm-proxy] 段（从段头到下一个段头/文件尾），供重写为最新 base_url */
+function removeProviderSection(text) {
+  const lines = text.split("\n");
+  const out = [];
+  let skipping = false;
+  for (const line of lines) {
+    if (/^\s*\[model_providers\.ellm-proxy\]\s*$/.test(line)) {
+      skipping = true;
+      continue;
+    }
+    if (skipping && /^\s*\[/.test(line)) skipping = false; // 下一个段头，恢复收集
+    if (!skipping) out.push(line);
+  }
+  return out.join("\n").replace(/\n{3,}$/, "\n\n");
+}
+
+/** 设置顶层 model_provider = "ellm-proxy"：已有该键则替换（忽略注释行），否则插到首个段头前（TOML 顶层键必须在任何 [section] 之前） */
+function setTopLevelProvider(text) {
+  const lines = text.split("\n");
+  const keyLine = `model_provider = "${PROVIDER_ID}"`;
+  let replaced = false;
+  const out = lines.map((line) => {
+    if (!replaced && /^\s*model_provider\s*=/.test(line) && !line.trim().startsWith("#")) {
+      replaced = true;
+      return keyLine;
+    }
+    return line;
+  });
+  if (replaced) return out.join("\n");
+  const firstSection = out.findIndex((line) => /^\s*\[/.test(line));
+  if (firstSection === -1) return [...out, keyLine].join("\n");
+  out.splice(firstSection, 0, keyLine, "");
+  return out.join("\n");
+}
+
+/** 开启 Codex 代理：备份 → 写 model_provider + [model_providers.ellm-proxy] 段（重复开启幂等刷新 base_url）。
+ *  原文本不合法时直接报错（不覆盖坏文件）；编辑结果写盘前经库校验 */
+export function codexEnable({ gatewayBase }) {
+  mkdirSync(dirname(CODEX_CONFIG), { recursive: true });
+  const original = readCodexConfig();
+  if (original !== null) {
+    try {
+      parseToml(original);
+    } catch (err) {
+      throw new Error(`${CODEX_CONFIG} 不是合法 TOML，拒绝修改（请先手工修复）: ${err.message}`);
+    }
+  }
+  let text = original ?? "";
+  backupOnce(CODEX_CONFIG);
+  text = removeProviderSection(text);
+  text = setTopLevelProvider(text);
+  const section = [
+    `[model_providers.${PROVIDER_ID}]`,
+    `name = "ellm-proxy gateway"`,
+    `base_url = "${gatewayBase}/v1"`,
+    `wire_api = "chat"`,
+    `env_key = "ELLM_PROXY_API_KEY"`,
+  ].join("\n");
+  text = text.replace(/\s*$/, "") + "\n\n" + section + "\n";
+  validateTomlText(text, true);
+  writeFileSync(CODEX_CONFIG, text, "utf-8");
+}
+
+/** 关闭 Codex 代理：从备份还原（无备份时移除 provider 段与顶层键，写盘前经库校验） */
+export function codexDisable() {
+  if (restoreFromBackup(CODEX_CONFIG)) return true;
+  const text = readCodexConfig();
+  if (!text || !codexProviderActive(text)) return false;
+  let out = removeProviderSection(text);
+  out = out
+    .split("\n")
+    .filter((line) => !/^\s*model_provider\s*=\s*["']?ellm-proxy["']?\s*$/.test(line))
+    .join("\n");
+  validateTomlText(out, false);
+  writeFileSync(CODEX_CONFIG, out, "utf-8");
+  return true;
+}