@tokenbuddy/tokenbuddy 1.0.12 → 1.0.13

package/dist/src/cli.js

@@ -3,7 +3,7 @@ import * as p from "@clack/prompts";
 import * as fs from "fs";
 import * as path from "path";
 import * as os from "os";
-import { execSync, spawn } from "child_process";
+import { execFileSync, spawn } from "child_process";
 import Table from "cli-table3";
 import { BuyerStore } from "./buyer-store.js";
 import { applyProviderInstall, detectProviders, getProviderModelSelectionKind, getProviderProtocolPreference, } from "./provider-install.js";
@@ -11,6 +11,7 @@ import { createModuleLogger } from "@tokenbuddy/logging";
 import * as crypto from "crypto";
 import { fileURLToPath } from "url";
 import { discoverSellerBackedModels, filterCatalogByProtocol, filterCatalogBySeller, } from "./seller-catalog.js";
+import { assertSellerRoutingConfig, defaultSellerRoutingConfig, normalizeSellerRoutingConfig, parseSellerIdList, ROUTING_CONFIG_KEY, } from "./seller-routing-config.js";
 import { collectDoctorDiagnostics, collectDoctorModelsSummary, printDoctorProviders, printDoctorModelsSummary, readDoctorProviders, renderDoctorDiagnosticsProgressively, } from "./doctor-diagnostics.js";
 import { buildInitSuccessMessage, buildInitTerminalSelectionState, buildInstalledTerminalMessage, INIT_PAYMENT_OPTIONS, inspectClawtipWalletReadiness, inspectOpenClawWalletConfig, noteInitComingSoonPayments, OTHER_TERMINAL_OPTION, validateInitTerminalSelection, } from "./init-payment-options.js";
 import { checkOpenClawRuntime, readClawtipPayCredential, startClawtipWalletBootstrap, waitForClawtipActivationConfirmation, } from "./init-clawtip-activation.js";
@@ -19,6 +20,11 @@ import { displayTerminalImage } from "./terminal-image.js";
 import qrcode from "qrcode-terminal";
 const CONTROL_PORT = 17820;
 const PROXY_PORT = 17821;
+const TOKENBUDDY_LAUNCHD_LABEL = "com.tokenbuddy.proxyd";
+const STALE_TOKENBUDDY_LAUNCHD_LABELS = [
+    "com.tokenbuddy.tb-proxyd",
+    "homebrew.mxcl.tokenbuddy",
+];
 const logger = createModuleLogger("tokenbuddy-cli");
 const SUPPORTED_PAYMENT_METHODS = ["mock", "clawtip"];
 function isSupportedPaymentMethod(method) {
@@ -101,6 +107,85 @@ function defaultProxydLogPath(kind) {
 function tbProxydScriptPath() {
     return path.resolve(currentModuleDir(), "./tb-proxyd.js");
 }
+function escapeXmlText(value) {
+    return value
+        .replace(/&/g, "&")
+        .replace(/</g, "&lt;")
+        .replace(/>/g, "&gt;");
+}
+/**
+ * 构造 macOS launchd plist 的 XML 文本，用于 `launchctl load` 注册 `tb-proxyd`。
+ * 已转义所有插值字段，避免 XML 注入；env 块只输出非空项。
+ *
+ * @param options plist 字段
+ * @returns 完整的 plist XML 字符串
+ */
+export function buildLaunchdPlistContent(options) {
+    const env = {
+        TB_PROXYD_CONTROL_PORT: String(options.controlPort),
+        TB_PROXYD_PROXY_PORT: String(options.proxyPort),
+        TB_PROXYD_SELLER_REGISTRY_URL: options.sellerRegistryUrl,
+    };
+    if (options.clawtipProofCommand?.trim()) {
+        env.TB_PROXYD_CLAWTIP_PROOF_COMMAND = options.clawtipProofCommand.trim();
+    }
+    if (options.clawtipProofTimeoutMs !== undefined) {
+        env.TB_PROXYD_CLAWTIP_PROOF_TIMEOUT_MS = String(options.clawtipProofTimeoutMs);
+    }
+    const envEntries = Object.entries(env)
+        .map(([key, value]) => `        <key>${escapeXmlText(key)}</key>\n        <string>${escapeXmlText(value)}</string>`)
+        .join("\n");
+    return `<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>Label</key>
+    <string>${escapeXmlText(options.label)}</string>
+    <key>ProgramArguments</key>
+    <array>
+        <string>${escapeXmlText(options.nodePath)}</string>
+        <string>${escapeXmlText(options.scriptPath)}</string>
+    </array>
+    <key>EnvironmentVariables</key>
+    <dict>
+${envEntries}
+    </dict>
+    <key>RunAtLoad</key>
+    <true/>
+    <key>KeepAlive</key>
+    <true/>
+    <key>StandardOutPath</key>
+    <string>${escapeXmlText(options.stdoutPath)}</string>
+    <key>StandardErrorPath</key>
+    <string>${escapeXmlText(options.stderrPath)}</string>
+</dict>
+</plist>`;
+}
+function launchdUserDomain() {
+    if (typeof process.getuid === "function") {
+        return `gui/${process.getuid()}`;
+    }
+    return "gui/501";
+}
+function runLaunchctl(args, ignoreFailure = false) {
+    try {
+        execFileSync("launchctl", args, { stdio: "ignore" });
+    }
+    catch (error) {
+        if (!ignoreFailure) {
+            throw error;
+        }
+    }
+}
+function installLaunchAgent(plistPath, label) {
+    const domain = launchdUserDomain();
+    for (const staleLabel of STALE_TOKENBUDDY_LAUNCHD_LABELS) {
+        runLaunchctl(["bootout", `${domain}/${staleLabel}`], true);
+    }
+    runLaunchctl(["bootout", `${domain}/${label}`], true);
+    runLaunchctl(["bootstrap", domain, plistPath]);
+    runLaunchctl(["kickstart", "-k", `${domain}/${label}`]);
+}
 async function repairDaemon(controlPort) {
     const existing = await probeDaemonStatus(controlPort);
     if (existing.running) {
@@ -159,7 +244,7 @@ function rootActionName(command) {
 }
 function commandRequiresDaemon(command) {
     const rootName = rootActionName(command);
-    return rootName !== "doctor" && rootName !== "init";
+    return rootName !== "doctor" && rootName !== "init" && rootName !== "routing";
 }
 async function enforceDaemonGate(command) {
     if (!commandRequiresDaemon(command)) {
@@ -236,6 +321,14 @@ function printPaymentList(payments, asJson) {
     console.log("=== TokenBuddy Payment Methods ===");
     console.log(table.toString());
 }
+/**
+ * 调 wallet-bootstrap 的 `/payments/clawtip/bootstrap` 端点，拿到激活支付参数。
+ * 校验：HTTP 200、订单字段齐全、`payTo` 不是占位符。
+ *
+ * @param bootstrapUrl wallet-bootstrap 服务 base URL
+ * @returns bootstrap 响应（含 `payment` 字段）
+ * @throws Error 任何校验失败
+ */
 export async function fetchClawtipBootstrap(bootstrapUrl) {
     const response = await fetch(`${bootstrapUrl.replace(/\/+$/, "")}/payments/clawtip/bootstrap`, {
         method: "POST",
@@ -259,6 +352,15 @@ export async function fetchClawtipBootstrap(bootstrapUrl) {
     body.payment.resourceUrl = normalizeClawtipBootstrapResourceUrl(bootstrapUrl, body.payment.resourceUrl);
     return body;
 }
+/**
+ * 修正 Clawtip bootstrap 返回的 `resourceUrl`。
+ * 早期 bootstrap 返回 `/registry/sellers` 这种占位 URL，把它替换成当前 bootstrap URL 的 path，
+ * 让 buyer 正确指向 wallet-bootstrap。
+ *
+ * @param bootstrapUrl wallet-bootstrap base URL
+ * @param resourceUrl bootstrap 响应中的 `resourceUrl` 字段
+ * @returns 修正后的 resource URL（无法解析时返回原值）
+ */
 export function normalizeClawtipBootstrapResourceUrl(bootstrapUrl, resourceUrl) {
     try {
         const bootstrap = new URL(bootstrapUrl);
@@ -318,50 +420,137 @@ async function promptSellerRoutingPreference(catalog) {
         message: "Choose seller routing mode for tb-proxyd:",
         options: [
             {
-                value: "auto",
-                label: "Auto",
-                hint: "Automatically choose a compatible seller based on the requested model.",
+                value: "fullAuto",
+                label: "Full Auto",
+                hint: "Use all compatible sellers and rank them by the selected scorer.",
             },
             {
                 value: "fixed",
                 label: "Fixed Seller",
                 hint: "Pin tb-proxyd to one seller and only use models from that seller.",
             },
+            {
+                value: "fixedSet",
+                label: "Fixed Seller Set",
+                hint: "Use only a selected seller pool and rank within that pool.",
+            },
         ],
     });
     if (typeof mode !== "string") {
         throw new Error("seller routing selection was cancelled");
     }
-    if (mode === "auto") {
-        return { mode };
-    }
-    if (healthySellers.length === 0) {
+    if ((mode === "fixed" || mode === "fixedSet") && healthySellers.length === 0) {
         throw new Error("no healthy sellers available for fixed routing");
     }
-    const sellerId = await p.select({
-        message: "Choose the seller to pin tb-proxyd to:",
-        options: healthySellers.map((seller) => ({
-            value: seller.id,
-            label: seller.name ? `${seller.name} (${seller.id})` : seller.id,
-            hint: [
-                seller.discountRatio != null ? `discount x${seller.discountRatio}` : null,
-                seller.modelCount != null ? `${seller.modelCount} models` : null,
-                seller.supportedProtocols?.length ? seller.supportedProtocols.join(",") : null,
-                seller.paymentMethods?.length ? seller.paymentMethods.join(",") : null,
-            ]
-                .filter(Boolean)
-                .join(" · ") || seller.url,
-        })),
+    const scorer = await promptSellerRoutingScorer();
+    if (mode === "fullAuto") {
+        return { mode, scorer };
+    }
+    if (mode === "fixed") {
+        const sellerId = await p.select({
+            message: "Choose the seller to pin tb-proxyd to:",
+            options: sellerChoices(healthySellers),
+        });
+        if (typeof sellerId !== "string") {
+            throw new Error("fixed seller selection was cancelled");
+        }
+        return {
+            mode,
+            sellerId,
+            scorer,
+        };
+    }
+    const sellerIds = await p.multiselect({
+        message: "Choose the seller pool for fixedSet routing:",
+        options: sellerChoices(healthySellers),
+        required: true
+    });
+    if (!Array.isArray(sellerIds)) {
+        throw new Error("fixedSet seller selection was cancelled");
+    }
+    return {
+        mode,
+        sellerIds,
+        scorer,
+    };
+}
+async function promptSellerRoutingScorer() {
+    const scorer = await p.select({
+        message: "Choose seller ranking preference:",
+        options: [
+            { value: "balanced", label: "Balanced", hint: "Balance health, latency, and discount." },
+            { value: "speed", label: "Speed", hint: "Prefer healthier, faster sellers." },
+            { value: "discount", label: "Discount", hint: "Prefer lower discount ratio first." },
+        ],
     });
-    if (typeof sellerId !== "string") {
-        throw new Error("fixed seller selection was cancelled");
+    if (typeof scorer !== "string") {
+        throw new Error("seller scorer selection was cancelled");
+    }
+    return scorer;
+}
+function sellerChoices(sellers) {
+    return sellers.map((seller) => ({
+        value: seller.id,
+        label: seller.name ? `${seller.name} (${seller.id})` : seller.id,
+        hint: [
+            seller.discountRatio != null ? `discount x${seller.discountRatio}` : null,
+            seller.modelCount != null ? `${seller.modelCount} models` : null,
+            seller.supportedProtocols?.length ? seller.supportedProtocols.join(",") : null,
+            seller.paymentMethods?.length ? seller.paymentMethods.join(",") : null,
+        ]
+            .filter(Boolean)
+            .join(" · ") || seller.url,
+    }));
+}
+function buildRoutingConfigFromOptions(modeValue, options) {
+    const mode = parseRoutingModeValue(modeValue);
+    const scorer = parseRoutingScorerValue(options.scorer || "balanced");
+    if (mode === "fixed") {
+        return {
+            mode,
+            sellerId: options.seller?.trim(),
+            scorer
+        };
+    }
+    if (mode === "fixedSet") {
+        return {
+            mode,
+            sellerIds: parseSellerIdList(options.sellerSet || ""),
+            scorer
+        };
     }
     return {
         mode,
-        sellerId,
+        scorer
     };
 }
-async function promptSingleModelSelection(providerId, models, sellerRouting) {
+function parseRoutingModeValue(value) {
+    if (value === "fixed" || value === "fixedSet" || value === "fullAuto") {
+        return value;
+    }
+    throw new Error("routing mode must be fixed, fixedSet, or fullAuto");
+}
+function parseRoutingScorerValue(value) {
+    if (value === "balanced" || value === "speed" || value === "discount") {
+        return value;
+    }
+    throw new Error("routing scorer must be balanced, speed, or discount");
+}
+function printRoutingConfig(config, updatedAt) {
+    console.log("=== TokenBuddy Seller Routing ===");
+    console.log(`Mode: ${config.mode}`);
+    console.log(`Scorer: ${config.scorer}`);
+    if (config.mode === "fixed") {
+        console.log(`Seller: ${config.sellerId || "(not configured)"}`);
+    }
+    if (config.mode === "fixedSet") {
+        console.log(`Seller Set: ${config.sellerIds?.join(",") || "(empty)"}`);
+    }
+    if (updatedAt) {
+        console.log(`Updated: ${updatedAt}`);
+    }
+}
+async function promptSingleModelSelection(providerId, models) {
     const protocolPreference = getProviderProtocolPreference(providerId);
     const protocolFiltered = protocolPreference
         ? filterCatalogByProtocol(models, protocolPreference)
@@ -385,12 +574,10 @@ async function promptSingleModelSelection(providerId, models, sellerRouting) {
     if (typeof selectedModel !== "string") {
         throw new Error(`default model selection was cancelled for ${providerId}`);
     }
-    const selectedEntry = protocolFiltered.find((entry) => entry.id === selectedModel);
     return {
         selectionKind: "single-model",
         protocolPreference,
         defaultModel: selectedModel,
-        sellerId: sellerRouting.mode === "fixed" ? selectedEntry?.sellerId : undefined,
     };
 }
 function defaultClaudeDisplayName(modelId) {
@@ -484,7 +671,9 @@ async function promptClaudeCodeModelSelection(models) {
 async function promptProviderSelections(providerIds, catalog, sellerRouting) {
     const baseModels = sellerRouting.mode === "fixed"
         ? filterCatalogBySeller(catalog.models, sellerRouting.sellerId)
-        : catalog.models;
+        : sellerRouting.mode === "fixedSet"
+            ? catalog.models.filter((model) => sellerRouting.sellerIds?.includes(model.sellerId))
+            : catalog.models;
     const selections = {};
     for (const providerId of providerIds) {
         const selectionKind = getProviderModelSelectionKind(providerId);
@@ -492,10 +681,16 @@ async function promptProviderSelections(providerIds, catalog, sellerRouting) {
             selections[providerId] = await promptClaudeCodeModelSelection(baseModels);
             continue;
         }
-        selections[providerId] = await promptSingleModelSelection(providerId, baseModels, sellerRouting);
+        selections[providerId] = await promptSingleModelSelection(providerId, baseModels);
     }
     return selections;
 }
+/**
+ * 构造 commander program，绑定所有 `tb` 子命令（doctor / init / config / provider 等）。
+ * 在 `preAction` 钩子里做 daemon gate：非 daemon-only 命令跳过，其余命令需要本地 `tb-proxyd` 在跑。
+ *
+ * @returns 配置完整的 commander Command 实例
+ */
 export function buildCli() {
     const program = new Command();
     program
@@ -789,6 +984,45 @@ export function buildCli() {
             store.close();
         }
     });
+    // 3. tb routing
+    const routing = program.command("routing").description("Manage buyer-side seller routing strategy");
+    routing
+        .command("show")
+        .description("Show the configured seller routing strategy")
+        .option("--json", "Output routing config as JSON")
+        .action(async (options) => {
+        const store = openBuyerStore();
+        try {
+            const record = store.getDaemonRuntimeConfig(ROUTING_CONFIG_KEY);
+            const config = record ? normalizeSellerRoutingConfig(record.config) : defaultSellerRoutingConfig();
+            if (options.json) {
+                console.log(JSON.stringify({ routing: config, updatedAt: record?.updatedAt }, null, 2));
+                return;
+            }
+            printRoutingConfig(config, record?.updatedAt);
+        }
+        finally {
+            store.close();
+        }
+    });
+    routing
+        .command("set <mode>")
+        .description("Set seller routing strategy: fullAuto, fixed, or fixedSet")
+        .option("--seller <id>", "Seller id for fixed routing")
+        .option("--seller-set <ids>", "Comma-separated seller ids for fixedSet routing")
+        .option("--scorer <scorer>", "Ranking scorer: balanced, speed, or discount", "balanced")
+        .action(async (mode, options) => {
+        const config = buildRoutingConfigFromOptions(mode, options);
+        assertSellerRoutingConfig(config);
+        const store = openBuyerStore();
+        try {
+            store.saveDaemonRuntimeConfig(ROUTING_CONFIG_KEY, config);
+        }
+        finally {
+            store.close();
+        }
+        printRoutingConfig(config);
+    });
     // 3. tb models
     program
         .command("models")
@@ -874,7 +1108,7 @@ export function buildCli() {
             }
             if (selectedProviders.length > 0) {
                 spinner.start("Fetching seller-backed model catalog...");
-                const proxyUrl = `http://127.0.0.1:${PROXY_PORT}`;
+                const proxyUrl = `http://127.0.0.1:${configuredProxyPort()}`;
                 const registryUrl = sellerRegistryUrlForInit();
                 let catalog;
                 try {
@@ -900,11 +1134,11 @@ export function buildCli() {
                 spinner.start("Configuring proxy routing in selected terminals...");
                 const store = openBuyerStore();
                 try {
+                    store.saveDaemonRuntimeConfig(ROUTING_CONFIG_KEY, sellerRouting);
                     applyProviderInstall({
                         providers: providerIds,
                         proxyUrl,
                         providerSelections,
-                        sellerRouting,
                     }, store);
                 }
                 finally {
@@ -1147,38 +1381,28 @@ export function buildCli() {
                     const plistDir = path.join(home, "Library", "LaunchAgents");
                     if (!fs.existsSync(plistDir))
                         fs.mkdirSync(plistDir, { recursive: true });
-                    const plistPath = path.join(plistDir, "com.tokenbuddy.proxyd.plist");
-                    // Resolve exact executable absolute path
-                    const nodePath = execSync("which node", { encoding: "utf8" }).trim();
+                    const plistPath = path.join(plistDir, `${TOKENBUDDY_LAUNCHD_LABEL}.plist`);
+                    const controlPort = configuredControlPort();
+                    const proxyPort = configuredProxyPort();
+                    const sellerRegistryUrl = sellerRegistryUrlForInit();
+                    const nodePath = process.execPath;
                     const scriptPath = tbProxydScriptPath();
-                    const plistContent = `<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>Label</key>
-    <string>com.tokenbuddy.proxyd</string>
-    <key>ProgramArguments</key>
-    <array>
-        <string>${nodePath}</string>
-        <string>${scriptPath}</string>
-    </array>
-    <key>RunAtLoad</key>
-    <true/>
-    <key>KeepAlive</key>
-    <true/>
-    <key>StandardOutPath</key>
-    <string>${path.join(home, ".tokenbuddy-store", "tb-proxyd.stdout.log")}</string>
-    <key>StandardErrorPath</key>
-    <string>${path.join(home, ".tokenbuddy-store", "tb-proxyd.stderr.log")}</string>
-</dict>
-</plist>`;
+                    const plistContent = buildLaunchdPlistContent({
+                        label: TOKENBUDDY_LAUNCHD_LABEL,
+                        nodePath,
+                        scriptPath,
+                        stdoutPath: path.join(home, ".tokenbuddy-store", "tb-proxyd.stdout.log"),
+                        stderrPath: path.join(home, ".tokenbuddy-store", "tb-proxyd.stderr.log"),
+                        controlPort,
+                        proxyPort,
+                        sellerRegistryUrl,
+                        clawtipProofCommand: process.env.TB_PROXYD_CLAWTIP_PROOF_COMMAND,
+                        clawtipProofTimeoutMs: process.env.TB_PROXYD_CLAWTIP_PROOF_TIMEOUT_MS
+                            ? Number(process.env.TB_PROXYD_CLAWTIP_PROOF_TIMEOUT_MS)
+                            : undefined,
+                    });
                     fs.writeFileSync(plistPath, plistContent, "utf8");
-                    // Load the LaunchAgent
-                    try {
-                        execSync(`launchctl unload ${plistPath}`, { stdio: "ignore" });
-                    }
-                    catch { }
-                    execSync(`launchctl load ${plistPath}`);
+                    installLaunchAgent(plistPath, TOKENBUDDY_LAUNCHD_LABEL);
                     spinner.stop("LaunchAgent daemon successfully registered and started! 🚀");
                     setupSummaryLines.push("Background tb-proxyd launchd service installed.");
                 }