@tokenbuddy/tokenbuddy 1.0.26 → 1.0.27

package/src/cli.ts

@@ -62,10 +62,20 @@ import {
   waitForClawtipActivationConfirmation,
 } from "./init-clawtip-activation.js";
 import {
+  DEFAULT_CLAWTIP_BOOTSTRAP_URL,
   fetchClawtipBootstrap,
   normalizeClawtipBootstrapResourceUrl,
 } from "./clawtip-bootstrap.js";
 import { displayTerminalImage } from "./terminal-image.js";
+import {
+  checkPackageUpdate,
+  readInstalledPackageManifest,
+  runPackageUpdate,
+  type PackageRestartResult,
+  type PackageUpdateCheck,
+  type PackageUpdateResult,
+} from "./package-update.js";
+import { DEFAULT_SELLER_REGISTRY_URL } from "./registry-trust.js";
 
 // @ts-ignore
 import qrcode from "qrcode-terminal";
@@ -80,34 +90,7 @@ const STALE_TOKENBUDDY_LAUNCHD_LABELS = [
 const logger = createModuleLogger("tokenbuddy-cli");
 
 function readCliPackageVersion(): string {
-  const candidateRoots = [
-    process.argv[1],
-    path.join(process.cwd(), "packages", "tokenbuddy-cli"),
-    process.cwd(),
-  ];
-  const seen = new Set<string>();
-  for (const candidateRoot of candidateRoots) {
-    if (!candidateRoot) continue;
-    let current = fs.existsSync(candidateRoot) ? fs.realpathSync(candidateRoot) : candidateRoot;
-    if (!fs.existsSync(current)) continue;
-    if (!fs.statSync(current).isDirectory()) {
-      current = path.dirname(current);
-    }
-    while (!seen.has(current)) {
-      seen.add(current);
-      const packageJsonPath = path.join(current, "package.json");
-      if (fs.existsSync(packageJsonPath)) {
-        const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8")) as { name?: unknown; version?: unknown };
-        if (packageJson.name === "@tokenbuddy/tokenbuddy" && typeof packageJson.version === "string" && packageJson.version.length > 0) {
-          return packageJson.version;
-        }
-      }
-      const parent = path.dirname(current);
-      if (parent === current) break;
-      current = parent;
-    }
-  }
-  return "0.0.0";
+  return readInstalledPackageManifest().version;
 }
 const SUPPORTED_PAYMENT_METHODS = ["mock", "clawtip"] as const;
 type SupportedPaymentMethod = typeof SUPPORTED_PAYMENT_METHODS[number];
@@ -265,6 +248,14 @@ function tbProxydScriptPath(): string {
   return path.resolve(currentModuleDir(), "./tb-proxyd.js");
 }
 
+function tbClawtipProofScriptPath(): string {
+  return path.resolve(currentModuleDir(), "../../bin/tb-clawtip-proof.js");
+}
+
+function defaultClawtipProofCommand(): string {
+  return process.env.TB_PROXYD_CLAWTIP_PROOF_COMMAND || tbClawtipProofScriptPath();
+}
+
 /**
  * `buildLaunchdPlistContent` 的输入。
  * 用于生成 macOS launchd plist，把 `tb-proxyd` 注册成 LaunchAgent。
@@ -376,27 +367,59 @@ function runLaunchctl(args: string[], ignoreFailure = false): void {
   }
 }
 
-function launchAgentLoaded(label: string): boolean {
+function sleepSync(ms: number): void {
+  const shared = new Int32Array(new SharedArrayBuffer(4));
+  Atomics.wait(shared, 0, 0, ms);
+}
+
+function runLaunchctlWithRetry(
+  args: string[],
+  run: (args: string[], ignoreFailure?: boolean) => void,
+  attempts = 3
+): void {
+  let latestError: unknown;
+  for (let attempt = 0; attempt < attempts; attempt += 1) {
+    try {
+      run(args);
+      return;
+    } catch (error: unknown) {
+      latestError = error;
+      if (attempt < attempts - 1) {
+        sleepSync(250 * (attempt + 1));
+      }
+    }
+  }
+  throw latestError;
+}
+
+function launchAgentLoaded(label: string, run: (args: string[], ignoreFailure?: boolean) => void = runLaunchctl): boolean {
   try {
-    runLaunchctl(["print", launchdServiceTarget(label)]);
+    run(["print", launchdServiceTarget(label)]);
     return true;
   } catch {
     return false;
   }
 }
 
-function installLaunchAgent(plistPath: string, label: string): void {
+export function installLaunchAgentWithRunner(
+  plistPath: string,
+  label: string,
+  run: (args: string[], ignoreFailure?: boolean) => void
+): void {
   const domain = launchdUserDomain();
   for (const staleLabel of STALE_TOKENBUDDY_LAUNCHD_LABELS) {
-    runLaunchctl(["bootout", `${domain}/${staleLabel}`], true);
+    run(["bootout", `${domain}/${staleLabel}`], true);
   }
   const target = launchdServiceTarget(label);
-  if (launchAgentLoaded(label)) {
-    runLaunchctl(["kickstart", target]);
-    return;
+  if (launchAgentLoaded(label, run)) {
+    run(["bootout", target], true);
   }
-  runLaunchctl(["bootstrap", domain, plistPath]);
-  runLaunchctl(["kickstart", "-k", target]);
+  runLaunchctlWithRetry(["bootstrap", domain, plistPath], run);
+  run(["kickstart", "-k", target]);
+}
+
+function installLaunchAgent(plistPath: string, label: string): void {
+  installLaunchAgentWithRunner(plistPath, label, runLaunchctl);
 }
 
 async function repairDaemon(controlPort: number): Promise<{ repair: DaemonRepairResult; probe: DaemonProbeResult }> {
@@ -604,7 +627,7 @@ export async function runWebInitLauncher(deps: WebInitLauncherDeps = {}): Promis
         controlPort,
         proxyPort,
         sellerRegistryUrl,
-        clawtipProofCommand: deps.clawtipProofCommand ?? process.env.TB_PROXYD_CLAWTIP_PROOF_COMMAND,
+        clawtipProofCommand: deps.clawtipProofCommand ?? defaultClawtipProofCommand(),
         clawtipProofTimeoutMs: deps.clawtipProofTimeoutMs ?? (
           process.env.TB_PROXYD_CLAWTIP_PROOF_TIMEOUT_MS
             ? Number(process.env.TB_PROXYD_CLAWTIP_PROOF_TIMEOUT_MS)
@@ -710,7 +733,7 @@ function rootActionName(command: Command): string {
 
 function commandRequiresDaemon(command: Command): boolean {
   const rootName = rootActionName(command);
-  return rootName !== "doctor" && rootName !== "init" && rootName !== "routing" && rootName !== "daemon" && rootName !== "ui";
+  return rootName !== "doctor" && rootName !== "init" && rootName !== "routing" && rootName !== "daemon" && rootName !== "ui" && rootName !== "update";
 }
 
 async function enforceDaemonGate(command: Command): Promise<void> {
@@ -796,6 +819,91 @@ function printPaymentList(payments: PaymentConfig[], asJson: boolean): void {
   console.log(table.toString());
 }
 
+async function safeCheckPackageUpdate(): Promise<{ check?: PackageUpdateCheck; error?: string }> {
+  if (process.env.NODE_ENV === "test" && process.env.TOKENBUDDY_TEST_UPDATE_CHECK !== "1") {
+    return { error: "version check skipped in tests" };
+  }
+  try {
+    return { check: await checkPackageUpdate() };
+  } catch (error: unknown) {
+    return { error: error instanceof Error ? error.message : String(error) };
+  }
+}
+
+async function runDoctorPackageUpdate(
+  fix: boolean,
+  controlPort: number,
+): Promise<{ check?: PackageUpdateCheck; error?: string } | PackageUpdateResult> {
+  if (process.env.NODE_ENV === "test" && process.env.TOKENBUDDY_TEST_UPDATE_CHECK !== "1") {
+    return { error: "version check skipped in tests" };
+  }
+  if (!fix) {
+    return safeCheckPackageUpdate();
+  }
+  return await runPackageUpdate({ apply: true, controlPort }, { restartProxyd: restartProxydForPackageUpdate });
+}
+
+function printPackageUpdateCheck(result: { check?: PackageUpdateCheck; error?: string }): void {
+  if (result.error) {
+    console.log(`⚠️ Version check unavailable: ${result.error}`);
+    return;
+  }
+  const check = result.check!;
+  if (check.updateAvailable) {
+    console.log(`⬆️ TokenBuddy update available: ${check.currentVersion} -> ${check.latestVersion}`);
+    console.log(`   Run \`tb update\` to install and restart tb-proxyd.`);
+  } else {
+    console.log(`✅ TokenBuddy package is current (${check.currentVersion}).`);
+  }
+}
+
+function packageUpdateExitCode(result: PackageUpdateResult): number {
+  if (!result.check.updateAvailable) {
+    return 0;
+  }
+  if (!result.install.succeeded || !result.restart.restarted) {
+    return 1;
+  }
+  return 0;
+}
+
+function printPackageUpdateResult(result: PackageUpdateResult): void {
+  const { check, install, restart } = result;
+  if (!check.updateAvailable) {
+    console.log(`TokenBuddy is already current (${check.currentVersion}).`);
+    return;
+  }
+
+  console.log(`TokenBuddy update available: ${check.currentVersion} -> ${check.latestVersion}`);
+  if (!install.attempted) {
+    console.log(`Run \`${check.installCommand}\` to install it.`);
+    return;
+  }
+  if (!install.succeeded) {
+    console.error(`Failed to install ${check.packageName}@${check.latestVersion}: ${install.error || "unknown error"}`);
+    return;
+  }
+
+  console.log(`Installed ${check.packageName}@${check.latestVersion}.`);
+  if (!restart.restarted) {
+    console.error(`Failed to restart tb-proxyd: ${restart.error || "unknown error"}`);
+    return;
+  }
+  console.log("tb-proxyd restarted.");
+}
+
+async function restartProxydForPackageUpdate(controlPort: number): Promise<PackageRestartResult> {
+  const result = await restartLaunchAgent(controlPort);
+  return {
+    attempted: result.attempted,
+    restarted: result.restarted,
+    method: result.method,
+    plistPath: result.plistPath,
+    target: result.target,
+    error: result.error,
+  };
+}
+
 export {
   fetchClawtipBootstrap,
   normalizeClawtipBootstrapResourceUrl,
@@ -820,7 +928,7 @@ function readProof(options: { proofFile?: string; requireProof?: boolean }): str
 }
 
 function sellerRegistryUrlForInit(): string {
-  return process.env.TB_PROXYD_SELLER_REGISTRY_URL || "https://tb-wallet-bootstrap.fly.dev/registry/sellers";
+  return process.env.TB_PROXYD_SELLER_REGISTRY_URL || DEFAULT_SELLER_REGISTRY_URL;
 }
 
 function stableModelChoices(models: ModelCatalogEntry[]): SelectOption[] {
@@ -1176,12 +1284,45 @@ export function buildCli(): Command {
     await enforceDaemonGate(actionCommand);
   });
 
+  program
+    .command("update")
+    .description("Check for a TokenBuddy package update, install it, and restart tb-proxyd")
+    .option("--check", "Only check for an available update")
+    .option("--json", "Output update state as JSON")
+    .action(async (options: { check?: boolean; json?: boolean }) => {
+      const controlPort = configuredControlPort();
+      try {
+        const result = await runPackageUpdate(
+          { apply: !options.check, controlPort },
+          { restartProxyd: restartProxydForPackageUpdate },
+        );
+        if (options.json) {
+          console.log(JSON.stringify(result, null, 2));
+        } else if (options.check) {
+          printPackageUpdateCheck({ check: result.check });
+        } else {
+          printPackageUpdateResult(result);
+        }
+        if (!options.check) {
+          process.exitCode = packageUpdateExitCode(result);
+        }
+      } catch (error: unknown) {
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        process.exitCode = 1;
+        if (options.json) {
+          console.log(JSON.stringify({ error: { code: "package_update_failed", message: errorMessage } }, null, 2));
+        } else {
+          console.error(`TokenBuddy update failed: ${errorMessage}`);
+        }
+      }
+    });
+
   // 1. tb doctor
   program
     .command("doctor")
     .description("Check running status, system agents, and network diagnostics")
     .option("--json", "Output diagnostics as JSON")
-    .option("--fix", "Start tb-proxyd in the background when it is not running")
+    .option("--fix", "Start tb-proxyd when needed, install available package updates, and restart the service")
     .action(async (options: { json?: boolean; fix?: boolean }) => {
       const controlPort = configuredControlPort();
       const proxyPort = configuredProxyPort();
@@ -1203,9 +1344,18 @@ export function buildCli(): Command {
         ? daemonInfo as { selectionMode?: string; sellerRoutingMode?: string; selectedSellerId?: string; sellerRegistryUrl?: string }
         : undefined;
       const providers = readDoctorProviders();
+      const updateState = await runDoctorPackageUpdate(Boolean(options.fix), controlPort).catch((error: unknown) => ({
+            error: error instanceof Error ? error.message : String(error)
+          }));
       if (options.fix && repair.attempted && !repair.fixed) {
         process.exitCode = 1;
       }
+      if (options.fix && "check" in updateState && updateState.check?.updateAvailable) {
+        process.exitCode = packageUpdateExitCode(updateState as PackageUpdateResult);
+      }
+      if (options.fix && "error" in updateState && updateState.error) {
+        process.exitCode = 1;
+      }
 
       if (options.json) {
         const diagnostics = await collectDoctorDiagnostics({
@@ -1233,6 +1383,7 @@ export function buildCli(): Command {
             requested: Boolean(options.fix),
             ...repair
           },
+          packageUpdate: updateState,
           service: {
             platform: process.platform,
             plistPath,
@@ -1245,6 +1396,11 @@ export function buildCli(): Command {
       }
 
       console.log("=== TokenBuddy System Diagnostics ===");
+      printPackageUpdateCheck("check" in updateState ? { check: updateState.check } : updateState);
+      if (options.fix && "install" in updateState) {
+        printPackageUpdateResult(updateState);
+      }
+      console.log("");
       
       // 1. Detect if daemon is listening
       if (daemonRunning) {
@@ -1475,10 +1631,7 @@ export function buildCli(): Command {
           return;
         }
 
-        const bootstrapUrl = options.bootstrapUrl || process.env.TOKENBUDDY_BOOTSTRAP_URL;
-        if (!bootstrapUrl) {
-          throw new Error("ClawTip bootstrap URL is required; pass --bootstrap-url or TOKENBUDDY_BOOTSTRAP_URL");
-        }
+        const bootstrapUrl = options.bootstrapUrl || process.env.TOKENBUDDY_BOOTSTRAP_URL || DEFAULT_CLAWTIP_BOOTSTRAP_URL;
         const proof = readProof({
           proofFile: options.proofFile,
           requireProof: options.requireProof
@@ -1815,7 +1968,7 @@ export function buildCli(): Command {
             }
 
             spinner.start("Requesting payment activation payload from public bootstrap registry...");
-            const bootstrapUrl = process.env.TOKENBUDDY_BOOTSTRAP_URL || "https://tb-wallet-bootstrap.fly.dev";
+            const bootstrapUrl = process.env.TOKENBUDDY_BOOTSTRAP_URL || DEFAULT_CLAWTIP_BOOTSTRAP_URL;
             const bootstrap = await fetchClawtipBootstrap(bootstrapUrl);
             spinner.stop("Bootstrap payload received.");
 
@@ -2043,7 +2196,7 @@ export function buildCli(): Command {
               proxyPort,
               sellerRegistryUrl,
               pathEnv: process.env.PATH,
-              clawtipProofCommand: process.env.TB_PROXYD_CLAWTIP_PROOF_COMMAND,
+              clawtipProofCommand: defaultClawtipProofCommand(),
               clawtipProofTimeoutMs: process.env.TB_PROXYD_CLAWTIP_PROOF_TIMEOUT_MS
                 ? Number(process.env.TB_PROXYD_CLAWTIP_PROOF_TIMEOUT_MS)
                 : undefined,