@tokenbuddy/tokenbuddy 1.0.37 → 1.0.39

package/dist/src/buyer-store.d.ts

@@ -251,7 +251,7 @@ export interface BuyerStoreOptions {
 }
 /**
  * 解析 buyer store 的 DB 路径。
- * 优先级：`dbPath` → `TOKENBUDDY_BUYER_STORE` env → `~/.tokenbuddy-store/buyer-store.db`。
+ * 优先级：`dbPath` → `TOKENBUDDY_BUYER_STORE` env → `TB_WORKDIR` env → `~/.config/tokenbuddy/buyer-store.db`。
  *
  * @param options 解析选项
  * @returns DB 文件绝对路径

package/dist/src/buyer-store.js

@@ -2,9 +2,9 @@
 import { DatabaseSync } from "node:sqlite";
 import * as crypto from "crypto";
 import * as fs from "fs";
-import * as os from "os";
 import * as path from "path";
 import { createModuleLogger } from "@tokenbuddy/logging";
+import { resolveTokenBuddyWorkdir } from "./workdir.js";
 const logger = createModuleLogger("tb-proxyd");
 function nowIso() {
     return new Date().toISOString();
@@ -26,7 +26,7 @@ function ensureDirForFile(filePath) {
 }
 /**
  * 解析 buyer store 的 DB 路径。
- * 优先级：`dbPath` → `TOKENBUDDY_BUYER_STORE` env → `~/.tokenbuddy-store/buyer-store.db`。
+ * 优先级：`dbPath` → `TOKENBUDDY_BUYER_STORE` env → `TB_WORKDIR` env → `~/.config/tokenbuddy/buyer-store.db`。
  *
  * @param options 解析选项
  * @returns DB 文件绝对路径
@@ -35,7 +35,7 @@ export function resolveBuyerStorePath(options = {}) {
     if (options.dbPath) {
         return options.dbPath;
     }
-    const root = options.root || process.env.TOKENBUDDY_BUYER_STORE || path.join(os.homedir(), ".tokenbuddy-store");
+    const root = options.root || process.env.TOKENBUDDY_BUYER_STORE || resolveTokenBuddyWorkdir();
     return path.join(root, "buyer-store.db");
 }
 /**

package/dist/src/cli.d.ts

@@ -34,6 +34,7 @@ export interface LaunchdPlistOptions {
     proxyPort: number;
     sellerRegistryUrl: string;
     pathEnv?: string;
+    workdir?: string;
     clawtipProofCommand?: string;
     clawtipProofTimeoutMs?: number;
 }

package/dist/src/cli.js

@@ -19,6 +19,7 @@ import { DEFAULT_CLAWTIP_BOOTSTRAP_URL, fetchClawtipBootstrap, } from "./clawtip
 import { displayTerminalImage } from "./terminal-image.js";
 import { checkPackageUpdate, readInstalledPackageManifest, runPackageUpdate, } from "./package-update.js";
 import { DEFAULT_SELLER_REGISTRY_URL } from "./registry-trust.js";
+import { resolveTokenBuddyWorkdir, resolveTokenBuddyWorkdirPath, TB_WORKDIR_ENV } from "./workdir.js";
 // @ts-ignore
 import qrcode from "qrcode-terminal";
 const CONTROL_PORT = 17820;
@@ -119,7 +120,7 @@ function launchControlUi(controlPort, pathname = "/") {
     return url;
 }
 function defaultProxydLogPath(kind) {
-    const logDir = path.join(os.homedir(), ".tokenbuddy-store");
+    const logDir = resolveTokenBuddyWorkdir();
     fs.mkdirSync(logDir, { recursive: true });
     return path.join(logDir, `tb-proxyd.${kind}.log`);
 }
@@ -164,6 +165,9 @@ export function buildLaunchdPlistContent(options) {
     if (options.clawtipProofCommand?.trim()) {
         env.TB_PROXYD_CLAWTIP_PROOF_COMMAND = options.clawtipProofCommand.trim();
     }
+    if (options.workdir?.trim()) {
+        env[TB_WORKDIR_ENV] = options.workdir.trim();
+    }
     if (options.clawtipProofTimeoutMs !== undefined) {
         env.TB_PROXYD_CLAWTIP_PROOF_TIMEOUT_MS = String(options.clawtipProofTimeoutMs);
     }
@@ -383,8 +387,9 @@ export async function runWebInitLauncher(deps = {}) {
     if (platform === "darwin") {
         const plistDir = path.join(home, "Library", "LaunchAgents");
         const plistPath = path.join(plistDir, `${TOKENBUDDY_LAUNCHD_LABEL}.plist`);
-        const stdoutPath = deps.stdoutPath ?? path.join(home, ".tokenbuddy-store", "tb-proxyd.stdout.log");
-        const stderrPath = deps.stderrPath ?? path.join(home, ".tokenbuddy-store", "tb-proxyd.stderr.log");
+        const workdir = resolveTokenBuddyWorkdir({ homeDir: home });
+        const stdoutPath = deps.stdoutPath ?? resolveTokenBuddyWorkdirPath("tb-proxyd.stdout.log", { homeDir: home });
+        const stderrPath = deps.stderrPath ?? resolveTokenBuddyWorkdirPath("tb-proxyd.stderr.log", { homeDir: home });
         try {
             (deps.mkdirSync ?? fs.mkdirSync)(plistDir, { recursive: true });
             (deps.mkdirSync ?? fs.mkdirSync)(path.dirname(stdoutPath), { recursive: true });
@@ -394,6 +399,7 @@ export async function runWebInitLauncher(deps = {}) {
                 nodePath: deps.nodePath ?? process.execPath,
                 scriptPath: deps.scriptPath ?? tbProxydScriptPath(),
                 pathEnv: deps.pathEnv,
+                workdir,
                 stdoutPath,
                 stderrPath,
                 controlPort,
@@ -690,6 +696,33 @@ function stableModelChoices(models) {
         };
     });
 }
+const OPENCODE_SUPPORTED_PROTOCOLS = ["chat_completions", "responses", "messages"];
+function uniqueModelIds(models) {
+    const seen = new Set();
+    const output = [];
+    for (const model of models) {
+        const trimmed = model.trim();
+        if (!trimmed || seen.has(trimmed)) {
+            continue;
+        }
+        seen.add(trimmed);
+        output.push(trimmed);
+    }
+    return output;
+}
+function availableModelsByProtocol(models, protocols) {
+    const result = {};
+    for (const protocol of protocols) {
+        const modelIds = uniqueModelIds(filterCatalogByProtocol(models, protocol).map((entry) => entry.id));
+        if (modelIds.length > 0) {
+            result[protocol] = modelIds;
+        }
+    }
+    return result;
+}
+function filterCatalogByAnyProtocol(models, protocols) {
+    return models.filter((entry) => protocols.some((protocol) => entry.supportedProtocols.includes(protocol)));
+}
 async function promptSellerRoutingPreference(catalog) {
     const healthySellers = catalog.sellers.filter((seller) => seller.status === "ok");
     const mode = await p.select({
@@ -854,6 +887,28 @@ async function promptSingleModelSelection(providerId, models) {
         selectionKind: "single-model",
         protocolPreference,
         defaultModel: selectedModel,
+        ...(protocolPreference ? {
+            availableModelsByProtocol: availableModelsByProtocol(models, [protocolPreference]),
+        } : {}),
+    };
+}
+async function promptOpenCodeModelSelection(models) {
+    const compatibleModels = filterCatalogByAnyProtocol(models, OPENCODE_SUPPORTED_PROTOCOLS);
+    const choices = stableModelChoices(compatibleModels);
+    if (choices.length === 0) {
+        throw new Error("no compatible models available for OpenCode");
+    }
+    const selectedModel = await p.select({
+        message: "Choose the default model for OpenCode:",
+        options: choices,
+    });
+    if (typeof selectedModel !== "string") {
+        throw new Error("default model selection was cancelled for OpenCode");
+    }
+    return {
+        selectionKind: "single-model",
+        defaultModel: selectedModel,
+        availableModelsByProtocol: availableModelsByProtocol(models, OPENCODE_SUPPORTED_PROTOCOLS),
     };
 }
 function defaultClaudeDisplayName(modelId) {
@@ -952,6 +1007,10 @@ async function promptProviderSelections(providerIds, catalog, sellerRouting) {
             : catalog.models;
     const selections = {};
     for (const providerId of providerIds) {
+        if (providerId === "opencode") {
+            selections[providerId] = await promptOpenCodeModelSelection(baseModels);
+            continue;
+        }
         const selectionKind = getProviderModelSelectionKind(providerId);
         if (selectionKind === "claude-role-mapping") {
             selections[providerId] = await promptClaudeCodeModelSelection(baseModels);
@@ -1799,8 +1858,9 @@ export function buildCli() {
                     const sellerRegistryUrl = sellerRegistryUrlForInit();
                     const nodePath = process.execPath;
                     const scriptPath = tbProxydScriptPath();
-                    const stdoutPath = path.join(home, ".tokenbuddy-store", "tb-proxyd.stdout.log");
-                    const stderrPath = path.join(home, ".tokenbuddy-store", "tb-proxyd.stderr.log");
+                    const workdir = resolveTokenBuddyWorkdir({ homeDir: home });
+                    const stdoutPath = resolveTokenBuddyWorkdirPath("tb-proxyd.stdout.log", { homeDir: home });
+                    const stderrPath = resolveTokenBuddyWorkdirPath("tb-proxyd.stderr.log", { homeDir: home });
                     fs.mkdirSync(path.dirname(stdoutPath), { recursive: true });
                     fs.mkdirSync(path.dirname(stderrPath), { recursive: true });
                     const plistContent = buildLaunchdPlistContent({
@@ -1813,6 +1873,7 @@ export function buildCli() {
                         proxyPort,
                         sellerRegistryUrl,
                         pathEnv: process.env.PATH,
+                        workdir,
                         clawtipProofCommand: defaultClawtipProofCommand(),
                         clawtipProofTimeoutMs: process.env.TB_PROXYD_CLAWTIP_PROOF_TIMEOUT_MS
                             ? Number(process.env.TB_PROXYD_CLAWTIP_PROOF_TIMEOUT_MS)

package/dist/src/daemon.d.ts

@@ -24,11 +24,7 @@ export interface DaemonConfig {
     /** test-only override for the existing tb init ClawTip activation runner. */
     clawtipWalletBootstrapStarter?: (payment: ClawtipBootstrapPayment, options?: {
         home?: string;
-    }) => Promise<{
-        orderFile: string;
-        parsedOutput: ParsedClawtipOutput;
-        payCredential?: string;
-    }>;
+    }) => Promise<ClawtipActivationResult>;
     /** test-only override for waiting on the existing tb init ClawTip registration loop. */
     clawtipActivationWaiter?: (options?: WaitForClawtipActivationOptions) => Promise<boolean>;
     /** test-only override for bundled ClawTip static assets; false disables bundled assets. */
@@ -93,6 +89,7 @@ export declare class TokenbuddyDaemon {
     private ensureClawtipStaticAssets;
     private copyClawtipQrToStatic;
     private startClawtipActivationQr;
+    private startClawtipActivationWithRebindFallback;
     private scheduleClawtipActivationWait;
     private clawtipRechargeQr;
     private lastRegistrySnapshot;
@@ -130,6 +127,21 @@ export declare class TokenbuddyDaemon {
     private applyAutoProviderRoutingConfig;
     private autoProviderCanRoute;
     private providerModePayload;
+    private isReconnectProviderId;
+    private uniqueModelIds;
+    private reconnectProtocolForProvider;
+    private reconnectProtocolsForProvider;
+    private catalogModelSupportsProtocol;
+    private catalogModelsByProtocol;
+    private previousProviderDefaultModel;
+    private pickReconnectDefaultModel;
+    private reconnectProviderSelection;
+    private reconnectProviderSelections;
+    private manualProviderModelCatalog;
+    private discoverSellerModelCatalog;
+    private refreshEnabledManualProviderModels;
+    private filterAutoEffectiveCatalog;
+    private effectiveModelCatalog;
     private clientToolsSummary;
     private initRepairStatus;
     private initStateSnapshot;
@@ -270,4 +282,10 @@ export declare class TokenbuddyDaemon {
      */
     setLastRegistrySnapshotForTest(snapshot: SellerRegistryDocument | null): void;
 }
+interface ClawtipActivationResult {
+    orderFile: string;
+    parsedOutput: ParsedClawtipOutput;
+    payCredential?: string;
+}
+export {};
 //# sourceMappingURL=daemon.d.ts.map