@tokenbuddy/tokenbuddy 1.0.28 → 1.0.30

package/src/terminal-detect.ts

@@ -35,7 +35,7 @@ export function getHomeDir(): string {
  * Detect which coding terminals are installed on the local system.
  *
  * 通过 `~/.claude/settings.json`、`Library/Application Support/Claude/...`、
- * `~/.openclaw/config.json`、`~/.hermes/settings.json` 等约定路径判断。
+ * `~/.openclaw/openclaw.json`、`~/.hermes/config.yaml` 等约定路径判断。
  * Claude Desktop 在非 macOS 平台上 `configPath` 可能为空字符串，
  * 调用方需以 `detected` 字段为准。
  *
@@ -74,25 +74,25 @@ export function detectTerminals(): TerminalCandidate[] {
   });
 
   // 3. Openclaw
-  const openclawPath = path.join(home, ".openclaw", "config.json");
+  const openclawPath = path.join(home, ".openclaw", "openclaw.json");
   const openclawDetected = fs.existsSync(openclawPath);
   candidates.push({
     id: "openclaw",
     name: "Openclaw Agent",
     detected: openclawDetected,
     configPath: openclawPath,
-    reason: openclawDetected ? "Found `~/.openclaw/config.json`" : "Missing `~/.openclaw/config.json`"
+    reason: openclawDetected ? "Found `~/.openclaw/openclaw.json`" : "Missing `~/.openclaw/openclaw.json`"
   });
 
   // 4. Hermes
-  const hermesPath = path.join(home, ".hermes", "settings.json");
+  const hermesPath = path.join(home, ".hermes", "config.yaml");
   const hermesDetected = fs.existsSync(hermesPath);
   candidates.push({
     id: "hermes",
     name: "Hermes Terminal",
     detected: hermesDetected,
     configPath: hermesPath,
-    reason: hermesDetected ? "Found `~/.hermes/settings.json`" : "Missing `~/.hermes/settings.json`"
+    reason: hermesDetected ? "Found `~/.hermes/config.yaml`" : "Missing `~/.hermes/config.yaml`"
   });
 
   return candidates;
@@ -213,10 +213,10 @@ export function rewriteClaudeDesktop(configPath: string, proxyUrl: string, model
 /**
  * Rewrite Openclaw settings.
  *
- * 写入 `api_url` / `api_key`（占位 `TOKENBUDDY_PROXY`）/`model`。
+ * 写入 `models.providers.tokenbuddy`，并把 `agents.defaults.model` 指向 TokenBuddy。
  * 失败仅打印日志，不抛出。
  *
- * @param configPath `~/.openclaw/config.json` 的绝对路径
+ * @param configPath `~/.openclaw/openclaw.json` 的绝对路径
  * @param proxyUrl TokenBuddy proxy 的 base URL
  * @param model Openclaw 默认模型 ID
  */
@@ -230,9 +230,40 @@ export function rewriteOpenclaw(configPath: string, proxyUrl: string, model: str
       try { config = JSON.parse(fs.readFileSync(configPath, "utf8")); } catch {}
     }
 
-    config.api_url = proxyUrl;
-    config.api_key = PLACEHOLDER_API_KEY;
-    config.model = model;
+    const providers = config.models && typeof config.models === "object" && !Array.isArray(config.models)
+      ? config.models.providers && typeof config.models.providers === "object" && !Array.isArray(config.models.providers)
+        ? config.models.providers
+        : {}
+      : {};
+    const tokenbuddy = providers.tokenbuddy && typeof providers.tokenbuddy === "object" && !Array.isArray(providers.tokenbuddy)
+      ? providers.tokenbuddy
+      : {};
+    const existingModels = Array.isArray(tokenbuddy.models) ? tokenbuddy.models : [];
+    providers.tokenbuddy = {
+      ...tokenbuddy,
+      baseUrl: openAiBaseUrl(proxyUrl),
+      apiKey: PLACEHOLDER_API_KEY,
+      auth: "api-key",
+      api: "openai-completions",
+      models: [
+        ...existingModels.filter((entry: any) => !(entry && typeof entry === "object" && entry.id === model)),
+        {
+          id: model,
+          name: model,
+          api: "openai-completions",
+          input: ["text", "image"],
+        },
+      ],
+    };
+    config.models = {
+      ...(config.models && typeof config.models === "object" && !Array.isArray(config.models) ? config.models : {}),
+      providers,
+    };
+    const agents = config.agents && typeof config.agents === "object" && !Array.isArray(config.agents) ? config.agents : {};
+    const defaults = agents.defaults && typeof agents.defaults === "object" && !Array.isArray(agents.defaults) ? agents.defaults : {};
+    defaults.model = `tokenbuddy/${model}`;
+    agents.defaults = defaults;
+    config.agents = agents;
 
     fs.writeFileSync(configPath, JSON.stringify(config, null, 2), "utf8");
     console.log(`[terminal-detect] Openclaw successfully routed to ${proxyUrl}`);
@@ -244,10 +275,10 @@ export function rewriteOpenclaw(configPath: string, proxyUrl: string, model: str
 /**
  * Rewrite Hermes settings.
  *
- * 在 `openai` 块下写入 `base_url` / `api_key`（占位 `TOKENBUDDY_PROXY`）/`model`。
+ * 在 `model` 块下写入 TokenBuddy 的默认模型、custom provider、base_url、api_key 和 api_mode。
  * 失败仅打印日志，不抛出。
  *
- * @param configPath `~/.hermes/settings.json` 的绝对路径
+ * @param configPath `~/.hermes/config.yaml` 的绝对路径
  * @param proxyUrl TokenBuddy proxy 的 base URL
  * @param model Hermes 默认模型 ID
  */
@@ -256,21 +287,47 @@ export function rewriteHermes(configPath: string, proxyUrl: string, model: strin
     const parent = path.dirname(configPath);
     if (!fs.existsSync(parent)) fs.mkdirSync(parent, { recursive: true });
 
-    let config: any = {};
-    if (fs.existsSync(configPath)) {
-      try { config = JSON.parse(fs.readFileSync(configPath, "utf8")); } catch {}
-    }
-
-    if (!config.openai || typeof config.openai !== "object") {
-      config.openai = {};
-    }
-    config.openai.base_url = proxyUrl;
-    config.openai.api_key = PLACEHOLDER_API_KEY;
-    config.openai.model = model;
+    const existing = fs.existsSync(configPath) ? fs.readFileSync(configPath, "utf8") : "";
+    const modelSection = [
+      "model:",
+      `  default: ${model}`,
+      "  provider: custom",
+      `  base_url: ${JSON.stringify(openAiBaseUrl(proxyUrl))}`,
+      `  api_key: ${PLACEHOLDER_API_KEY}`,
+      "  api_mode: chat_completions",
+    ].join("\n");
 
-    fs.writeFileSync(configPath, JSON.stringify(config, null, 2), "utf8");
+    fs.writeFileSync(configPath, replaceTopLevelYamlSection(existing, "model", modelSection), "utf8");
     console.log(`[terminal-detect] Hermes successfully routed to ${proxyUrl}`);
   } catch (err: any) {
     console.error("[terminal-detect] Failed to rewrite Hermes config:", err.message);
   }
 }
+
+function openAiBaseUrl(proxyUrl: string): string {
+  const normalized = proxyUrl.replace(/\/+$/, "");
+  return normalized.endsWith("/v1") ? normalized : `${normalized}/v1`;
+}
+
+function replaceTopLevelYamlSection(existing: string, sectionName: string, sectionBody: string): string {
+  const lines = existing.split(/\r?\n/);
+  const sectionStart = lines.findIndex((line) => line === `${sectionName}:` || line.startsWith(`${sectionName}: `));
+  const bodyLines = sectionBody.trimEnd().split(/\r?\n/);
+  if (sectionStart < 0) {
+    const prefix = existing.trimEnd();
+    return `${prefix}${prefix ? "\n" : ""}${bodyLines.join("\n")}\n`;
+  }
+  let sectionEnd = sectionStart + 1;
+  while (sectionEnd < lines.length) {
+    const line = lines[sectionEnd];
+    if (line.trim() && !line.startsWith(" ") && !line.startsWith("\t")) {
+      break;
+    }
+    sectionEnd += 1;
+  }
+  return `${[
+    ...lines.slice(0, sectionStart),
+    ...bodyLines,
+    ...lines.slice(sectionEnd),
+  ].join("\n").replace(/\n*$/, "")}\n`;
+}