@tokenbuddy/tb-admin 1.0.36 → 1.0.38

package/dist/src/cli.js

@@ -4,6 +4,8 @@ import { AdminClient } from "./client.js";
 import { FlyProvider } from "./server-cmd.js";
 import { SellerCommandRunner } from "./seller.js";
 import { bindAdminUiCommand } from "./ui-command.js";
+import { formatAdminInitResult, formatWorkdirDoctorResult, runAdminInitCommand, runWorkdirDoctor } from "./init-command.js";
+import { resolveAdminWorkdir } from "./workdir.js";
 import { loadRegistryFile, validateRegistryDocument } from "./bootstrap-registry.js";
 import Table from "cli-table3";
 import * as fs from "fs";
@@ -200,13 +202,91 @@ export function buildAdminCli(configManager) {
         .option("--url <url>", "Remote seller core API url")
         .option("--token <token>", "Operator Bearer token")
         .option("--profile <profile>", "Use custom profile instead of default")
-        .option("--config <path>", "Use custom config file path");
+        .option("--config <path>", "Use custom config file path")
+        .option("--workdir <path>", "Admin workdir path (default: $TB_ADMIN_WORKDIR or ~/.config/tb-admin)");
     bindAdminUiCommand(program, configManager);
+    function getRootConfigManager() {
+        const opts = program.opts();
+        if (opts.config || opts.workdir) {
+            return new ConfigManager(opts.config, { cliWorkdir: opts.workdir });
+        }
+        return configManager;
+    }
+    program
+        .command("init")
+        .description("Initialize an admin workdir for provider-specific deployment assets")
+        .option("--provider <provider>", "Deployment provider (default: fly.io)", "fly.io")
+        .option("--workdir <path>", "Admin workdir path (default: root --workdir, $TB_ADMIN_WORKDIR, or ~/.config/tb-admin)")
+        .option("--check-only", "Only check provider requirements; do not write files")
+        .option("--force", "Refresh regenerable templates without overwriting runtime secret files")
+        .option("--install-tools", "Install missing provider CLI tools when supported")
+        .option("--json", "Output structured JSON")
+        .action((options) => {
+        try {
+            const rootOptions = program.opts();
+            const result = runAdminInitCommand({
+                provider: options.provider,
+                cliWorkdir: options.workdir || rootOptions.workdir,
+                checkOnly: Boolean(options.checkOnly),
+                force: Boolean(options.force),
+                installTools: Boolean(options.installTools)
+            });
+            if (options.json) {
+                console.log(JSON.stringify(result, null, 2));
+            }
+            else {
+                console.log(formatAdminInitResult(result));
+            }
+        }
+        catch (err) {
+            console.error("Error:", err.message);
+            process.exit(1);
+        }
+    });
+    const workdirCmd = program.command("workdir").description("Inspect the resolved admin workdir");
+    workdirCmd
+        .command("path")
+        .description("Print the resolved admin workdir path")
+        .option("--workdir <path>", "Admin workdir path")
+        .action((options) => {
+        try {
+            const rootOptions = program.opts();
+            console.log(resolveAdminWorkdir({ cliWorkdir: options.workdir || rootOptions.workdir }));
+        }
+        catch (err) {
+            console.error("Error:", err.message);
+            process.exit(1);
+        }
+    });
+    workdirCmd
+        .command("doctor")
+        .description("Check admin workdir files and provider tooling")
+        .option("--provider <provider>", "Deployment provider (default: fly.io)", "fly.io")
+        .option("--workdir <path>", "Admin workdir path")
+        .option("--json", "Output structured JSON")
+        .action((options) => {
+        try {
+            const rootOptions = program.opts();
+            const result = runWorkdirDoctor({
+                provider: options.provider,
+                cliWorkdir: options.workdir || rootOptions.workdir
+            });
+            if (options.json) {
+                console.log(JSON.stringify(result, null, 2));
+            }
+            else {
+                console.log(formatWorkdirDoctorResult(result));
+            }
+        }
+        catch (err) {
+            console.error("Error:", err.message);
+            process.exit(1);
+        }
+    });
     // Helper to resolve client
     function getClient() {
         const opts = program.opts();
-        const configPath = opts.config;
-        const mgr = configPath ? new ConfigManager(configPath) : configManager;
+        const mgr = getRootConfigManager();
         const url = opts.url || process.env.TOKENBUDDY_ADMIN_URL;
         const token = opts.token || process.env.TOKENBUDDY_ADMIN_TOKEN;
         const profileName = opts.profile || process.env.TOKENBUDDY_ADMIN_PROFILE;
@@ -221,8 +301,7 @@ export function buildAdminCli(configManager) {
     }
     function getBaseUrl() {
         const opts = program.opts();
-        const configPath = opts.config;
-        const mgr = configPath ? new ConfigManager(configPath) : configManager;
+        const mgr = getRootConfigManager();
         const url = opts.url || process.env.TOKENBUDDY_ADMIN_URL;
         const profileName = opts.profile || process.env.TOKENBUDDY_ADMIN_PROFILE;
         if (url) {
@@ -1039,8 +1118,7 @@ export function buildAdminCli(configManager) {
         .option("--token <token>", "Bearer Operator secret token")
         .action((profileName, options) => {
         const opts = program.opts();
-        const configPath = opts.config;
-        const mgr = configPath ? new ConfigManager(configPath) : configManager;
+        const mgr = getRootConfigManager();
         const url = options.url || opts.url || process.env.TOKENBUDDY_ADMIN_URL;
         const token = options.token || opts.token || process.env.TOKENBUDDY_ADMIN_TOKEN;
         if (!url || !token) {
@@ -1055,8 +1133,7 @@ export function buildAdminCli(configManager) {
         .description("Switch default profile to select")
         .action((profileName) => {
         const opts = program.opts();
-        const configPath = opts.config;
-        const mgr = configPath ? new ConfigManager(configPath) : configManager;
+        const mgr = getRootConfigManager();
         try {
             mgr.useProfile(profileName);
             console.log(`Now using profile \`${profileName}\` by default.`);
@@ -1070,8 +1147,7 @@ export function buildAdminCli(configManager) {
         .description("List all configured profiles in the active config file")
         .action(() => {
         const opts = program.opts();
-        const configPath = opts.config;
-        const mgr = configPath ? new ConfigManager(configPath) : configManager;
+        const mgr = getRootConfigManager();
         const profiles = mgr.listProfiles();
         const config = mgr.load();
         console.log(`=== Configured Local Profiles (config: ${mgr.getConfigPath() || "default"}) ===`);
@@ -1082,13 +1158,13 @@ export function buildAdminCli(configManager) {
         }
     });
     // Step 14 (v1.1): 多 vendor 实例隔离.
-    // 默认 config dir 改成 ~/.config/tokenbuddy/profiles/*.toml, 每个 vendor 一份 config.
+    // 默认 config dir 改成 ~/.config/tb-admin/profiles/*.toml, 每个 vendor 一份 config.
     // 启动时 tb-admin (没传 --config) 会扫描 profiles/ 合并成一个虚拟配置 (default_profile 仍来自
-    // ~/.config/tokenbuddy/admin.toml). `tb-admin config ls` 列出当前 active file,
+    // ~/.config/tb-admin/admin.toml). `tb-admin config ls` 列出当前 active file,
     // `tb-admin config profiles` 扫描 profiles/ 列出所有 vendor file.
     configCmd
         .command("profiles")
-        .description("Scan the vendor profiles directory (~/.config/tokenbuddy/profiles/) and list every vendor config")
+        .description("Scan the vendor profiles directory (~/.config/tb-admin/profiles/) and list every vendor config")
         .action(() => {
         const profileDir = defaultProfileDir();
         const files = listProfileFiles(profileDir);
@@ -1117,20 +1193,17 @@ export function buildAdminCli(configManager) {
         .description("Print the config file path in use (resolves --config, env, or default)")
         .action(() => {
         const opts = program.opts();
-        const configPath = opts.config || process.env.TOKENBUDDY_ADMIN_CONFIG;
-        const resolved = configPath || `${process.env.HOME || ""}/.config/tokenbuddy/admin.toml`;
-        console.log(resolved);
+        const mgr = getRootConfigManager();
+        console.log(mgr.getConfigPath());
     });
     // 8. Seller Command (Fly.io)
     const sellerCmd = program.command("seller").description("Deploy and manage seller containers on Fly.io");
     function getFlyProvider() {
-        const opts = program.opts();
-        const mgr = opts.config ? new ConfigManager(opts.config) : configManager;
+        const mgr = getRootConfigManager();
         return new FlyProvider(mgr.getSellerProvider("fly"));
     }
     function getSellerRunner() {
-        const opts = program.opts();
-        const mgr = opts.config ? new ConfigManager(opts.config) : configManager;
+        const mgr = getRootConfigManager();
         return new SellerCommandRunner(mgr);
     }
     function printResult(res, json) {
@@ -1183,7 +1256,7 @@ export function buildAdminCli(configManager) {
         .option("--app <app>", "Fly.io app name (bypasses tb-seller- prefix; use tbs-<random> format)")
         .option("--region <region>", "Fly region (default: sin)", "sin")
         .requiredOption("--image <image>", "Published Docker image, for example registry.fly.io/tb-seller:<v>")
-        .requiredOption("--fly-config <path>", "Fly.io config file path, for example deploy/fly.io/fly.tb-seller.toml")
+        .option("--fly-config <path>", "Fly.io config file path (default: $TB_ADMIN_WORKDIR/fly/fly.tb-seller.toml)")
         .option("--volume-name <name>", "Persistent volume name")
         .option("--volume-size-gb <gb>", "Persistent volume size in GB", (v) => parseInt(v, 10))
         .option("--volume-id <id>", "Attach existing volume by ID (skips volume creation)")
@@ -1457,8 +1530,8 @@ function collectIds(value, previous) {
     return previous.concat([value]);
 }
 // Step 14 (v1.1): 多 vendor 实例 config 隔离.
-// 默认 profiles 目录是 ~/.config/tokenbuddy/profiles/, 每个 vendor 一份独立 toml.
-// 默认主 config 仍走 ~/.config/tokenbuddy/admin.toml (default_profile 在此设).
+// 默认 profiles 目录是 ~/.config/tb-admin/profiles/, 每个 vendor 一份独立 toml.
+// 默认主 config 仍走 ~/.config/tb-admin/admin.toml (default_profile 在此设).
 // 用户可以:
 //   - tb-admin --config /path/to/vendor-A.toml config ls    (单 vendor 显式)
 //   - tb-admin config profiles                             (扫 profiles/ 看所有 vendor)
@@ -1468,7 +1541,7 @@ function defaultProfileDir() {
     if (override) {
         return path.join(override, "profiles");
     }
-    return path.join(process.env.HOME || "", ".config", "tokenbuddy", "profiles");
+    return path.join(process.env.HOME || "", ".config", "tb-admin", "profiles");
 }
 function listProfileFiles(dir) {
     if (!fs.existsSync(dir)) {

package/dist/src/config.d.ts

@@ -1,3 +1,4 @@
+import { type AdminWorkdirOptions } from "./workdir.js";
 /**
  * admin CLI 单个 profile：远程 wallet-bootstrap / seller 服务的 URL + 鉴权 token。
  */
@@ -49,20 +50,25 @@ export interface AdminConfig {
     };
 }
 /**
- * 解析 admin CLI 的默认配置路径：`~/.config/tokenbuddy/admin.toml`。
+ * 解析 admin CLI 的默认配置路径：`~/.config/tb-admin/admin.toml`。
  * 兼容旧版 `~/.tokenbuddy/admin.json`（legacy JSON），由 `ConfigManager` 自动识别。
  *
  * @returns 配置文件绝对路径
  */
 export declare function getDefaultConfigPath(): string;
+export interface ConfigManagerOptions extends AdminWorkdirOptions {
+    workdir?: string;
+}
 /**
  * admin CLI 配置的读写管理器（TOML 优先，legacy JSON 兼容）。
  * 写盘时自动 chmod 0600（best effort）保护含 token 的配置文件。
  */
 export declare class ConfigManager {
     private configPath;
-    constructor(customPath?: string);
+    private workdir;
+    constructor(customPath?: string, options?: ConfigManagerOptions);
     getConfigPath(): string;
+    getWorkdir(): string;
     load(): AdminConfig;
     save(config: AdminConfig): void;
     getProfile(name?: string): AdminProfile | undefined;

package/dist/src/config.js

@@ -2,15 +2,15 @@ import * as fs from "fs";
 import * as path from "path";
 import * as os from "os";
 import TOML from "@iarna/toml";
+import { defaultAdminConfigPath, defaultAdminWorkdir, resolveAdminConfigPath, resolveAdminWorkdir } from "./workdir.js";
 /**
- * 解析 admin CLI 的默认配置路径：`~/.config/tokenbuddy/admin.toml`。
+ * 解析 admin CLI 的默认配置路径：`~/.config/tb-admin/admin.toml`。
  * 兼容旧版 `~/.tokenbuddy/admin.json`（legacy JSON），由 `ConfigManager` 自动识别。
  *
  * @returns 配置文件绝对路径
  */
 export function getDefaultConfigPath() {
-    const home = os.homedir();
-    return path.join(home, ".config", "tokenbuddy", "admin.toml");
+    return defaultAdminConfigPath(defaultAdminWorkdir(os.homedir()));
 }
 /**
  * admin CLI 配置的读写管理器（TOML 优先，legacy JSON 兼容）。
@@ -18,12 +18,24 @@ export function getDefaultConfigPath() {
  */
 export class ConfigManager {
     configPath;
-    constructor(customPath) {
-        this.configPath = customPath || getDefaultConfigPath();
+    workdir;
+    constructor(customPath, options = {}) {
+        this.workdir = options.workdir
+            ? path.resolve(options.workdir)
+            : resolveAdminWorkdir(options);
+        this.configPath = resolveAdminConfigPath({
+            workdir: this.workdir,
+            cliConfig: customPath,
+            env: options.env,
+            homeDir: options.homeDir
+        });
     }
     getConfigPath() {
         return this.configPath;
     }
+    getWorkdir() {
+        return this.workdir;
+    }
     load() {
         if (!fs.existsSync(this.configPath)) {
             return { profiles: {} };

package/dist/src/display-format.js

@@ -68,11 +68,7 @@ export function formatDiscountRatio(discountRatio) {
     if (!Number.isFinite(discountRatio))
         return UNKNOWN_VALUE;
     const ratio = Math.max(0, discountRatio);
-    if (ratio === 0)
-        return "免费";
-    if (Math.abs(ratio - 1) < 0.0001)
-        return "原价";
-    return `${formatSignificantDiscount(ratio * 10)}折`;
+    return formatRatioValue(ratio);
 }
 export function formatPriceMicrosPerMillion(value) {
     return formatMoney(value, { digits: 4 });
@@ -80,9 +76,8 @@ export function formatPriceMicrosPerMillion(value) {
 export function formatPricePair(inputMicros, outputMicros) {
     return formatMoneyPair(inputMicros, outputMicros, { digits: 4 });
 }
-function formatSignificantDiscount(value) {
-    const rounded = Math.round(value * 10) / 10;
-    return Number.isInteger(rounded) ? String(rounded) : rounded.toFixed(1);
+function formatRatioValue(value) {
+    return String(value);
 }
 export function normalizeStatusLabel(status) {
     if (!status)
@@ -272,15 +267,12 @@ function formatPercent(value) {
 function formatDiscountRatio(discountRatio) {
   if (!Number.isFinite(discountRatio)) return UNKNOWN_VALUE;
   const ratio = Math.max(0, discountRatio);
-  if (ratio === 0) return "免费";
-  if (Math.abs(ratio - 1) < 0.0001) return "原价";
-  return formatSignificantDiscount(ratio * 10) + "折";
+  return formatRatioValue(ratio);
 }
 function formatPriceMicrosPerMillion(value) { return formatMoney(value, { digits: 4 }); }
 function formatPricePair(inputMicros, outputMicros) { return formatMoneyPair(inputMicros, outputMicros, { digits: 4 }); }
-function formatSignificantDiscount(value) {
-  const rounded = Math.round(value * 10) / 10;
-  return Number.isInteger(rounded) ? String(rounded) : rounded.toFixed(1);
+function formatRatioValue(value) {
+  return String(value);
 }
 function normalizeStatusLabel(status) {
   if (!status) return UNKNOWN_VALUE;

package/dist/src/init-command.d.ts

@@ -0,0 +1,50 @@
+import type { AdminProviderId, ProviderCheckResult, SpawnSyncRunner } from "./providers/provider-definition.js";
+export interface AdminInitOptions {
+    provider?: string;
+    cliWorkdir?: string;
+    checkOnly?: boolean;
+    force?: boolean;
+    installTools?: boolean;
+    json?: boolean;
+    env?: NodeJS.ProcessEnv;
+    now?: Date;
+    templateRoot?: string;
+    packageRoot?: string;
+    packageVersion?: string;
+    spawnSync?: SpawnSyncRunner;
+}
+export interface WorkdirDoctorOptions {
+    provider?: string;
+    cliWorkdir?: string;
+    json?: boolean;
+    env?: NodeJS.ProcessEnv;
+    spawnSync?: SpawnSyncRunner;
+}
+export interface InitFileResult {
+    path: string;
+    status: "created" | "updated" | "skipped";
+}
+export interface AdminInitResult {
+    provider: AdminProviderId;
+    workdir: string;
+    templateVersion: string;
+    checkOnly: boolean;
+    checks: ProviderCheckResult[];
+    files: InitFileResult[];
+    install?: {
+        attempted: boolean;
+        ok: boolean;
+        message: string;
+    };
+    next: string[];
+}
+export interface WorkdirDoctorResult {
+    provider: AdminProviderId;
+    workdir: string;
+    checks: ProviderCheckResult[];
+}
+export declare function runAdminInitCommand(options?: AdminInitOptions): AdminInitResult;
+export declare function runWorkdirDoctor(options?: WorkdirDoctorOptions): WorkdirDoctorResult;
+export declare function formatAdminInitResult(result: AdminInitResult): string;
+export declare function formatWorkdirDoctorResult(result: WorkdirDoctorResult): string;
+//# sourceMappingURL=init-command.d.ts.map