@tokenbuddy/tokenbuddy 1.0.13 → 1.0.15

package/src/cli.ts

@@ -61,6 +61,10 @@ import {
   startClawtipWalletBootstrap,
   waitForClawtipActivationConfirmation,
 } from "./init-clawtip-activation.js";
+import {
+  fetchClawtipBootstrap,
+  normalizeClawtipBootstrapResourceUrl,
+} from "./clawtip-bootstrap.js";
 import { displayTerminalImage } from "./terminal-image.js";
 
 // @ts-ignore
@@ -90,26 +94,22 @@ interface DaemonRepairResult {
   error?: string;
 }
 
+interface DaemonRestartResult {
+  attempted: boolean;
+  restarted: boolean;
+  method: "launchd";
+  plistPath: string;
+  target?: string;
+  before?: DaemonProbeResult;
+  after?: DaemonProbeResult;
+  error?: string;
+}
+
 interface CommandFailure extends Error {
   code?: string;
   exitCode?: number;
 }
 
-interface ClawtipBootstrapResponse {
-  activationFeeFen?: number;
-  payment?: {
-    orderNo?: string;
-    amountFen?: number;
-    payTo?: string;
-    encryptedData?: string;
-    indicator?: string;
-    slug?: string;
-    skillId?: string;
-    description?: string;
-    resourceUrl?: string;
-  };
-}
-
 interface SelectOption {
   value: string;
   label: string;
@@ -196,8 +196,6 @@ interface NormalizedClawtipPaymentPayload {
   resourceUrl: string;
 }
 
-const CLAWTIP_BOOTSTRAP_PLACEHOLDER_PAY_TO = "bootstrap-pay-to";
-
 async function waitForDaemonStatus(controlPort: number, timeoutMs: number): Promise<DaemonProbeResult> {
   const deadline = Date.now() + timeoutMs;
   let latest: DaemonProbeResult = { running: false, error: "not checked" };
@@ -211,6 +209,20 @@ async function waitForDaemonStatus(controlPort: number, timeoutMs: number): Prom
   return latest;
 }
 
+function launchControlUi(controlPort: number): string {
+  const url = `http://127.0.0.1:${controlPort}/`;
+  const platform = process.platform;
+  const args: string[] = platform === "darwin" ? [url] : platform === "win32" ? ["/c", "start", "", url] : [url];
+  const cmd = platform === "win32" ? "cmd" : platform === "darwin" ? "open" : "xdg-open";
+  const child = spawn(cmd, args, { detached: true, stdio: "ignore" });
+  child.on("error", (err) => {
+    console.error(`Failed to launch browser: ${err.message}`);
+    process.exitCode = 1;
+  });
+  child.unref();
+  return url;
+}
+
 function defaultProxydLogPath(kind: "stdout" | "stderr"): string {
   const logDir = path.join(os.homedir(), ".tokenbuddy-store");
   fs.mkdirSync(logDir, { recursive: true });
@@ -302,6 +314,14 @@ function launchdUserDomain(): string {
   return "gui/501";
 }
 
+function launchAgentPlistPath(label: string): string {
+  return path.join(os.homedir(), "Library", "LaunchAgents", `${label}.plist`);
+}
+
+function launchdServiceTarget(label: string): string {
+  return `${launchdUserDomain()}/${label}`;
+}
+
 function runLaunchctl(args: string[], ignoreFailure = false): void {
   try {
     execFileSync("launchctl", args, { stdio: "ignore" });
@@ -363,6 +383,72 @@ async function repairDaemon(controlPort: number): Promise<{ repair: DaemonRepair
   };
 }
 
+interface RestartLaunchAgentDeps {
+  platform: NodeJS.Platform;
+  plistPath: string;
+  existsSync(filePath: string): boolean;
+  runLaunchctl(args: string[]): void;
+  probeDaemonStatus(controlPort: number): Promise<DaemonProbeResult>;
+  waitForDaemonStatus(controlPort: number, timeoutMs: number): Promise<DaemonProbeResult>;
+}
+
+export async function restartLaunchAgent(
+  controlPort: number,
+  deps: RestartLaunchAgentDeps = {
+    platform: process.platform,
+    plistPath: launchAgentPlistPath(TOKENBUDDY_LAUNCHD_LABEL),
+    existsSync: fs.existsSync,
+    runLaunchctl: (args) => runLaunchctl(args),
+    probeDaemonStatus,
+    waitForDaemonStatus,
+  },
+): Promise<DaemonRestartResult> {
+  const before = await deps.probeDaemonStatus(controlPort);
+  const baseResult = {
+    attempted: false,
+    restarted: false,
+    method: "launchd" as const,
+    plistPath: deps.plistPath,
+    before,
+  };
+
+  if (deps.platform !== "darwin") {
+    return {
+      ...baseResult,
+      error: "tb daemon restart is only supported for the macOS LaunchAgent service. Run `tb doctor --fix` to start tb-proxyd in the background."
+    };
+  }
+
+  if (!deps.existsSync(deps.plistPath)) {
+    return {
+      ...baseResult,
+      error: "LaunchAgent plist is missing. Run `tb init` to install tb-proxyd as a service first."
+    };
+  }
+
+  const target = launchdServiceTarget(TOKENBUDDY_LAUNCHD_LABEL);
+  try {
+    deps.runLaunchctl(["kickstart", "-k", target]);
+  } catch (error: unknown) {
+    return {
+      ...baseResult,
+      attempted: true,
+      target,
+      error: error instanceof Error ? error.message : String(error)
+    };
+  }
+
+  const after = await deps.waitForDaemonStatus(controlPort, 8000);
+  return {
+    ...baseResult,
+    attempted: true,
+    restarted: after.running,
+    target,
+    after,
+    error: after.running ? undefined : after.error || "tb-proxyd did not become ready after restart"
+  };
+}
+
 function commandPath(command: Command): string {
   const names: string[] = [];
   let current: Command | null = command;
@@ -386,7 +472,7 @@ function rootActionName(command: Command): string {
 
 function commandRequiresDaemon(command: Command): boolean {
   const rootName = rootActionName(command);
-  return rootName !== "doctor" && rootName !== "init" && rootName !== "routing";
+  return rootName !== "doctor" && rootName !== "init" && rootName !== "routing" && rootName !== "daemon" && rootName !== "ui";
 }
 
 async function enforceDaemonGate(command: Command): Promise<void> {
@@ -472,64 +558,10 @@ function printPaymentList(payments: PaymentConfig[], asJson: boolean): void {
   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: string): Promise<ClawtipBootstrapResponse> {
-  const response = await fetch(`${bootstrapUrl.replace(/\/+$/, "")}/payments/clawtip/bootstrap`, {
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ clientTag: "tb-payment-add" })
-  });
-  const body = await response.json() as ClawtipBootstrapResponse & { error?: string };
-  if (!response.ok) {
-    throw new Error(body.error || `ClawTip bootstrap failed with HTTP ${response.status}`);
-  }
-  if (!body.payment?.orderNo || !body.payment.indicator || !body.payment.resourceUrl) {
-    throw new Error("ClawTip bootstrap response missing payment order fields");
-  }
-  if ((body.payment.payTo || "").trim() === CLAWTIP_BOOTSTRAP_PLACEHOLDER_PAY_TO) {
-    throw new Error(
-      [
-        `ClawTip bootstrap service is misconfigured: payTo is still the placeholder \`${CLAWTIP_BOOTSTRAP_PLACEHOLDER_PAY_TO}\`.`,
-        `Bootstrap URL: ${bootstrapUrl}`,
-        "Configure the bootstrap service with the real ClawTip merchant pay_to before retrying `tb init`.",
-      ].join(" ")
-    );
-  }
-  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: string, resourceUrl: string): string {
-  try {
-    const bootstrap = new URL(bootstrapUrl);
-    const resource = new URL(resourceUrl);
-    if (resource.origin === bootstrap.origin && resource.pathname === "/registry/sellers") {
-      resource.pathname = bootstrap.pathname.replace(/\/+$/, "") || "/";
-      resource.search = "";
-      resource.hash = "";
-      return resource.toString().replace(/\/$/, "");
-    }
-  } catch {
-    // Leave the server-provided value unchanged when URL parsing fails.
-  }
-  return resourceUrl;
-}
+export {
+  fetchClawtipBootstrap,
+  normalizeClawtipBootstrapResourceUrl,
+} from "./clawtip-bootstrap.js";
 
 function readProof(options: { proofFile?: string; requireProof?: boolean }): string | undefined {
   const proofFile = options.proofFile || process.env.TOKENBUDDY_CLAWTIP_PROOF_FILE;
@@ -1036,6 +1068,79 @@ export function buildCli(): Command {
       }
     });
 
+  // tb ui — 探测 daemon + 用系统默认浏览器打开控制台
+  program
+    .command("ui")
+    .description("Open the local TokenBuddy control console in your default browser")
+    .action(async () => {
+      const controlPort = configuredControlPort();
+      const url = `http://127.0.0.1:${controlPort}/`;
+      const probe = await probeDaemonStatus(controlPort);
+      if (!probe.running) {
+        console.error(`tb-proxyd is not running.`);
+        console.error(`Checked: ${url}status`);
+        console.error(`Run \`tb init\` to complete first-time setup, then \`tb-proxyd\` to start the daemon.`);
+        process.exitCode = 1;
+        const err = new Error("tb-proxyd is not running") as CommandFailure;
+        err.code = "tokenbuddy.daemon_not_running";
+        err.exitCode = 1;
+        throw err;
+      }
+      console.log(`Opening ${launchControlUi(controlPort)} in your default browser…`);
+    });
+
+  const daemon = program
+    .command("daemon")
+    .description("Manage the local tb-proxyd service");
+
+  daemon
+    .command("restart")
+    .description("Restart tb-proxyd through the installed macOS LaunchAgent")
+    .option("--json", "Output restart result as JSON")
+    .action(async (options: { json?: boolean }) => {
+      const controlPort = configuredControlPort();
+      const proxyPort = configuredProxyPort();
+      if (!options.json) {
+        console.log("Restarting tb-proxyd LaunchAgent...");
+      }
+      const result = await restartLaunchAgent(controlPort);
+      if (!result.restarted) {
+        process.exitCode = 1;
+      }
+
+      if (options.json) {
+        const daemonProbe = result.after || result.before;
+        console.log(JSON.stringify({
+          restart: result,
+          daemon: {
+            running: Boolean(daemonProbe?.running),
+            controlPort,
+            proxyPort,
+            controlUrl: `http://127.0.0.1:${controlPort}`,
+            proxyUrl: `http://127.0.0.1:${proxyPort}`,
+            status: daemonProbe?.status,
+            error: daemonProbe?.error || result.error
+          }
+        }, null, 2));
+        return;
+      }
+
+      if (!result.restarted) {
+        console.error(`Failed to restart tb-proxyd: ${result.error || "unknown error"}`);
+        if (!result.after?.running) {
+          console.error(`Checked: http://127.0.0.1:${controlPort}/status`);
+        }
+        return;
+      }
+
+      const status = result.after?.status && typeof result.after.status === "object"
+        ? result.after.status as { pid?: number; controlPort?: number; proxyPort?: number }
+        : undefined;
+      console.log(`✅ tb-proxyd restarted${status?.pid ? ` (PID: ${status.pid})` : ""}.`);
+      console.log(`   Control Plane URL: http://127.0.0.1:${status?.controlPort || controlPort}`);
+      console.log(`   Proxy Plane URL: http://127.0.0.1:${status?.proxyPort || proxyPort}`);
+    });
+
   // v1.2 §18.11 helpers for `tb doctor` / `tb doctor --json`.
   async function fetchV12Snapshot(controlUrl: string): Promise<unknown | null> {
     try {
@@ -1679,6 +1784,26 @@ export function buildCli(): Command {
             installLaunchAgent(plistPath, TOKENBUDDY_LAUNCHD_LABEL);
             spinner.stop("LaunchAgent daemon successfully registered and started! 🚀");
             setupSummaryLines.push("Background tb-proxyd launchd service installed.");
+
+            spinner.start("Checking tb-proxyd control plane...");
+            const daemonProbe = await waitForDaemonStatus(controlPort, 8000);
+            spinner.stop(daemonProbe.running ? "tb-proxyd control plane is ready." : "tb-proxyd control plane is still starting.");
+
+            if (daemonProbe.running) {
+              const nextStep = await p.select({
+                message: "tb-proxyd is running. What would you like to do next?",
+                options: [
+                  { value: "continue", label: "Continue in terminal", hint: "Finish the CLI setup summary" },
+                  { value: "ui", label: "Open tb ui", hint: "Launch the local graphical console" }
+                ]
+              }) as string;
+              if (nextStep === "ui") {
+                const uiUrl = launchControlUi(controlPort);
+                setupSummaryLines.push(`Opened TokenBuddy UI at ${uiUrl}.`);
+                p.outro(buildInitSuccessMessage(setupSummaryLines));
+                return;
+              }
+            }
           } catch (err: any) {
             spinner.stop(`Failed to write launchd plist: ${err.message}`);
           }