@tokenbuddy/tokenbuddy 1.0.17 → 1.0.19

package/dist/src/init-setup.js

@@ -0,0 +1,125 @@
+export const INIT_SETUP_CONFIG_KEY = "init-setup";
+export const INIT_SETUP_VERSION = 1;
+export const INIT_SETUP_STEPS = [
+    "gateway_intro",
+    "model_access",
+    "supplier_routing",
+    "auto_purchase",
+    "connect_tools",
+    "verify_gateway",
+    "install_app",
+];
+export const DEFAULT_INIT_RECOMMENDED_MODELS = [
+    "deepseek-v4-flash",
+    "kimi-2.6",
+    "gpt-5.5",
+    "gpt-5.4",
+    "claude-opus-4.7",
+    "claude-opus-4.8",
+    "claude-sonnet-4.6",
+    "gemma-4-26b-a4b-it",
+    "qwen3-235b-a22b",
+    "google/gemini-3.5-flash",
+    "google/gemini-3.1-pro-preview",
+    "qwen/qwen3.7-max",
+    "qwen/qwen3.7-plus",
+];
+const INIT_SETUP_STEP_SET = new Set(INIT_SETUP_STEPS);
+export function normalizeInitSetupMarker(value) {
+    if (!value || typeof value !== "object") {
+        return defaultInitSetupMarker();
+    }
+    const raw = value;
+    const status = normalizeInitSetupStatus(raw.status);
+    return {
+        status,
+        version: INIT_SETUP_VERSION,
+        completedSteps: normalizeInitSetupSteps(raw.completedSteps),
+        startedAt: typeof raw.startedAt === "string" ? raw.startedAt : undefined,
+        updatedAt: typeof raw.updatedAt === "string" ? raw.updatedAt : undefined,
+        completedAt: typeof raw.completedAt === "string" ? raw.completedAt : undefined,
+    };
+}
+export function buildInProgressInitSetupMarker(previous = defaultInitSetupMarker(), now = new Date()) {
+    const updatedAt = now.toISOString();
+    return {
+        ...previous,
+        status: previous.status === "completed" ? "completed" : "in_progress",
+        version: INIT_SETUP_VERSION,
+        startedAt: previous.startedAt || updatedAt,
+        updatedAt,
+    };
+}
+export function buildCompletedInitSetupMarker(completedSteps = INIT_SETUP_STEPS, now = new Date()) {
+    const normalizedSteps = normalizeInitSetupSteps(completedSteps);
+    const updatedAt = now.toISOString();
+    return {
+        status: "completed",
+        version: INIT_SETUP_VERSION,
+        completedSteps: normalizedSteps.length > 0 ? normalizedSteps : [...INIT_SETUP_STEPS],
+        startedAt: updatedAt,
+        updatedAt,
+        completedAt: updatedAt,
+    };
+}
+export function assertInitSetupSteps(value) {
+    if (value === undefined) {
+        return [...INIT_SETUP_STEPS];
+    }
+    if (!Array.isArray(value)) {
+        throw new Error("completedSteps must be an array");
+    }
+    const steps = [];
+    for (const entry of value) {
+        if (typeof entry !== "string" || !INIT_SETUP_STEP_SET.has(entry)) {
+            throw new Error(`unknown init setup step: ${String(entry)}`);
+        }
+        if (!steps.includes(entry)) {
+            steps.push(entry);
+        }
+    }
+    return steps;
+}
+export function isFreshInitMachine(marker) {
+    return marker.status !== "completed";
+}
+export function normalizeInitRecommendedModels(value) {
+    const entries = typeof value === "string"
+        ? value.split(",")
+        : value ?? [];
+    return Array.from(new Set(entries.map((entry) => entry.trim()).filter(Boolean)));
+}
+export function resolveInitRecommendedModels(input) {
+    const configured = normalizeInitRecommendedModels(input?.configuredModels);
+    if (configured.length > 0) {
+        return configured;
+    }
+    const envModels = normalizeInitRecommendedModels(input?.env?.TB_PROXYD_INIT_RECOMMENDED_MODELS);
+    if (envModels.length > 0) {
+        return envModels;
+    }
+    return [...DEFAULT_INIT_RECOMMENDED_MODELS];
+}
+function defaultInitSetupMarker() {
+    return {
+        status: "not_started",
+        version: INIT_SETUP_VERSION,
+        completedSteps: [],
+    };
+}
+function normalizeInitSetupStatus(value) {
+    return value === "in_progress" || value === "completed" ? value : "not_started";
+}
+function normalizeInitSetupSteps(value) {
+    if (!Array.isArray(value)) {
+        return [];
+    }
+    const steps = [];
+    for (const entry of value) {
+        if (typeof entry === "string" && INIT_SETUP_STEP_SET.has(entry) && !steps.includes(entry)) {
+            steps.push(entry);
+        }
+    }
+    return steps;
+}
+//# sourceMappingURL=init-setup.js.map

package/dist/src/init-setup.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"init-setup.js","sourceRoot":"","sources":["../../src/init-setup.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,qBAAqB,GAAG,YAAY,CAAC;AAElD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC;AAEpC,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,eAAe;IACf,cAAc;IACd,kBAAkB;IAClB,eAAe;IACf,eAAe;IACf,gBAAgB;IAChB,aAAa;CACL,CAAC;AAEX,MAAM,CAAC,MAAM,+BAA+B,GAAG;IAC7C,mBAAmB;IACnB,UAAU;IACV,SAAS;IACT,SAAS;IACT,iBAAiB;IACjB,iBAAiB;IACjB,mBAAmB;IACnB,oBAAoB;IACpB,iBAAiB;IACjB,yBAAyB;IACzB,+BAA+B;IAC/B,kBAAkB;IAClB,mBAAmB;CACX,CAAC;AAcX,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAS,gBAAgB,CAAC,CAAC;AAE9D,MAAM,UAAU,wBAAwB,CAAC,KAAc;IACrD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,sBAAsB,EAAE,CAAC;IAClC,CAAC;IACD,MAAM,GAAG,GAAG,KAMX,CAAC;IACF,MAAM,MAAM,GAAG,wBAAwB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACpD,OAAO;QACL,MAAM;QACN,OAAO,EAAE,kBAAkB;QAC3B,cAAc,EAAE,uBAAuB,CAAC,GAAG,CAAC,cAAc,CAAC;QAC3D,SAAS,EAAE,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;QACxE,SAAS,EAAE,OAAO,GAAG,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;QACxE,WAAW,EAAE,OAAO,GAAG,CAAC,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;KAC/E,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC5C,WAA4B,sBAAsB,EAAE,EACpD,MAAY,IAAI,IAAI,EAAE;IAEtB,MAAM,SAAS,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IACpC,OAAO;QACL,GAAG,QAAQ;QACX,MAAM,EAAE,QAAQ,CAAC,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa;QACrE,OAAO,EAAE,kBAAkB;QAC3B,SAAS,EAAE,QAAQ,CAAC,SAAS,IAAI,SAAS;QAC1C,SAAS;KACV,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,6BAA6B,CAC3C,iBAAoC,gBAAgB,EACpD,MAAY,IAAI,IAAI,EAAE;IAEtB,MAAM,eAAe,GAAG,uBAAuB,CAAC,cAAc,CAAC,CAAC;IAChE,MAAM,SAAS,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;IACpC,OAAO;QACL,MAAM,EAAE,WAAW;QACnB,OAAO,EAAE,kBAAkB;QAC3B,cAAc,EAAE,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC;QACpF,SAAS,EAAE,SAAS;QACpB,SAAS;QACT,WAAW,EAAE,SAAS;KACvB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,KAAc;IACjD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,CAAC,GAAG,gBAAgB,CAAC,CAAC;IAC/B,CAAC;IACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;IACD,MAAM,KAAK,GAAoB,EAAE,CAAC;IAClC,KAAK,MAAM,KAAK,IAAI,KAAK,EAAE,CAAC;QAC1B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACjE,MAAM,IAAI,KAAK,CAAC,4BAA4B,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC/D,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAsB,CAAC,EAAE,CAAC;YAC5C,KAAK,CAAC,IAAI,CAAC,KAAsB,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAAuB;IACxD,OAAO,MAAM,CAAC,MAAM,KAAK,WAAW,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,8BAA8B,CAAC,KAA6C;IAC1F,MAAM,OAAO,GAAG,OAAO,KAAK,KAAK,QAAQ;QACvC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;QAClB,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;IAChB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AACnF,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,KAG5C;IACC,MAAM,UAAU,GAAG,8BAA8B,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;IAC3E,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1B,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,MAAM,SAAS,GAAG,8BAA8B,CAAC,KAAK,EAAE,GAAG,EAAE,iCAAiC,CAAC,CAAC;IAChG,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,CAAC,GAAG,+BAA+B,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,sBAAsB;IAC7B,OAAO;QACL,MAAM,EAAE,aAAa;QACrB,OAAO,EAAE,kBAAkB;QAC3B,cAAc,EAAE,EAAE;KACnB,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAAC,KAAc;IAC9C,OAAO,KAAK,KAAK,aAAa,IAAI,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC;AAClF,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAc;IAC7C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,KAAK,GAAoB,EAAE,CAAC;IAClC,KAAK,MAAM,KAAK,IAAI,KAAK,EAAE,CAAC;QAC1B,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,mBAAmB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAsB,CAAC,EAAE,CAAC;YAC3G,KAAK,CAAC,IAAI,CAAC,KAAsB,CAAC,CAAC;QACrC,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@tokenbuddy/tokenbuddy",
-  "version": "1.0.17",
+  "version": "1.0.19",
   "description": "TokenBuddy Client CLI and Daemon",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",
   "type": "module",
   "bin": {
-    "tb": "./bin/tb.js",
-    "tb-proxyd": "./bin/tb-proxyd.js"
+    "tb": "bin/tb.js",
+    "tb-proxyd": "bin/tb-proxyd.js"
   },
   "scripts": {
     "build": "tsc"

package/src/cli.ts

@@ -78,16 +78,47 @@ const STALE_TOKENBUDDY_LAUNCHD_LABELS = [
   "homebrew.mxcl.tokenbuddy",
 ] as const;
 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";
+}
 const SUPPORTED_PAYMENT_METHODS = ["mock", "clawtip"] as const;
 type SupportedPaymentMethod = typeof SUPPORTED_PAYMENT_METHODS[number];
 
-interface DaemonProbeResult {
+export interface DaemonProbeResult {
   running: boolean;
   status?: unknown;
   error?: string;
 }
 
-interface DaemonRepairResult {
+export interface DaemonRepairResult {
   attempted: boolean;
   fixed: boolean;
   pid?: number;
@@ -209,8 +240,9 @@ async function waitForDaemonStatus(controlPort: number, timeoutMs: number): Prom
   return latest;
 }
 
-function launchControlUi(controlPort: number): string {
-  const url = `http://127.0.0.1:${controlPort}/`;
+function launchControlUi(controlPort: number, pathname = "/"): string {
+  const normalizedPathname = pathname.startsWith("/") ? pathname : `/${pathname}`;
+  const url = `http://127.0.0.1:${controlPort}${normalizedPathname}`;
   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";
@@ -332,14 +364,27 @@ function runLaunchctl(args: string[], ignoreFailure = false): void {
   }
 }
 
+function launchAgentLoaded(label: string): boolean {
+  try {
+    runLaunchctl(["print", launchdServiceTarget(label)]);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 function installLaunchAgent(plistPath: string, label: string): void {
   const domain = launchdUserDomain();
   for (const staleLabel of STALE_TOKENBUDDY_LAUNCHD_LABELS) {
     runLaunchctl(["bootout", `${domain}/${staleLabel}`], true);
   }
-  runLaunchctl(["bootout", `${domain}/${label}`], true);
+  const target = launchdServiceTarget(label);
+  if (launchAgentLoaded(label)) {
+    runLaunchctl(["kickstart", target]);
+    return;
+  }
   runLaunchctl(["bootstrap", domain, plistPath]);
-  runLaunchctl(["kickstart", "-k", `${domain}/${label}`]);
+  runLaunchctl(["kickstart", "-k", target]);
 }
 
 async function repairDaemon(controlPort: number): Promise<{ repair: DaemonRepairResult; probe: DaemonProbeResult }> {
@@ -449,6 +494,185 @@ export async function restartLaunchAgent(
   };
 }
 
+export interface WebInitLauncherResult {
+  method: "launchd" | "detached";
+  controlPort: number;
+  proxyPort: number;
+  url: string;
+  probe: DaemonProbeResult;
+  repair?: DaemonRepairResult;
+  plistPath?: string;
+  serviceInstalled?: boolean;
+  error?: string;
+}
+
+interface WebInitStateForLaunch {
+  freshMachine?: boolean;
+  repairMode?: boolean;
+  setup?: {
+    status?: string;
+  };
+}
+
+export interface WebInitLauncherDeps {
+  platform?: NodeJS.Platform;
+  controlPort?: number;
+  proxyPort?: number;
+  sellerRegistryUrl?: string;
+  homeDir?: string;
+  nodePath?: string;
+  scriptPath?: string;
+  stdoutPath?: string;
+  stderrPath?: string;
+  clawtipProofCommand?: string;
+  clawtipProofTimeoutMs?: number;
+  openBrowser?: boolean;
+  mkdirSync?(dirPath: string, options: { recursive: boolean }): void;
+  writeFileSync?(filePath: string, content: string, encoding: BufferEncoding): void;
+  installLaunchAgent?(plistPath: string, label: string): void;
+  repairDaemon?(controlPort: number): Promise<{ repair: DaemonRepairResult; probe: DaemonProbeResult }>;
+  waitForDaemonStatus?(controlPort: number, timeoutMs: number): Promise<DaemonProbeResult>;
+  fetchInitState?(controlPort: number): Promise<WebInitStateForLaunch>;
+  launchControlUi?(controlPort: number, pathname?: string): string;
+}
+
+async function fetchInitStateForLaunch(controlPort: number): Promise<WebInitStateForLaunch> {
+  const res = await fetch(`http://127.0.0.1:${controlPort}/init/state`);
+  if (!res.ok) {
+    throw new Error(`/init/state returned ${res.status}`);
+  }
+  return await res.json() as WebInitStateForLaunch;
+}
+
+async function resolveWebInitPath(
+  controlPort: number,
+  fetchInitState: (controlPort: number) => Promise<WebInitStateForLaunch>
+): Promise<"/init" | "/overview"> {
+  try {
+    const state = await fetchInitState(controlPort);
+    if (state.repairMode === true) {
+      return "/init";
+    }
+    return state.freshMachine === false || state.setup?.status === "completed" ? "/overview" : "/init";
+  } catch (error: unknown) {
+    logger.warn("init.web.state_probe.failed", "web init state probe failed", {
+      errorMessage: error instanceof Error ? error.message : String(error)
+    });
+    return "/init";
+  }
+}
+
+export async function runWebInitLauncher(deps: WebInitLauncherDeps = {}): Promise<WebInitLauncherResult> {
+  const platform = deps.platform ?? process.platform;
+  const controlPort = deps.controlPort ?? configuredControlPort();
+  const proxyPort = deps.proxyPort ?? configuredProxyPort();
+  const sellerRegistryUrl = deps.sellerRegistryUrl ?? sellerRegistryUrlForInit();
+  const home = deps.homeDir ?? os.homedir();
+  const launchUi = deps.launchControlUi ?? launchControlUi;
+  const fetchInitState = deps.fetchInitState ?? fetchInitStateForLaunch;
+  const expectedUrl = `http://127.0.0.1:${controlPort}/init`;
+
+  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");
+    try {
+      (deps.mkdirSync ?? fs.mkdirSync)(plistDir, { recursive: true });
+      (deps.mkdirSync ?? fs.mkdirSync)(path.dirname(stdoutPath), { recursive: true });
+      (deps.mkdirSync ?? fs.mkdirSync)(path.dirname(stderrPath), { recursive: true });
+      const plistContent = buildLaunchdPlistContent({
+        label: TOKENBUDDY_LAUNCHD_LABEL,
+        nodePath: deps.nodePath ?? process.execPath,
+        scriptPath: deps.scriptPath ?? tbProxydScriptPath(),
+        stdoutPath,
+        stderrPath,
+        controlPort,
+        proxyPort,
+        sellerRegistryUrl,
+        clawtipProofCommand: deps.clawtipProofCommand ?? process.env.TB_PROXYD_CLAWTIP_PROOF_COMMAND,
+        clawtipProofTimeoutMs: deps.clawtipProofTimeoutMs ?? (
+          process.env.TB_PROXYD_CLAWTIP_PROOF_TIMEOUT_MS
+            ? Number(process.env.TB_PROXYD_CLAWTIP_PROOF_TIMEOUT_MS)
+            : undefined
+        ),
+      });
+      (deps.writeFileSync ?? fs.writeFileSync)(plistPath, plistContent, "utf8");
+      (deps.installLaunchAgent ?? installLaunchAgent)(plistPath, TOKENBUDDY_LAUNCHD_LABEL);
+    } catch (error: unknown) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      const probe = await (deps.waitForDaemonStatus ?? waitForDaemonStatus)(controlPort, 3_000);
+      if (probe.running) {
+        const pathname = await resolveWebInitPath(controlPort, fetchInitState);
+        const url = deps.openBrowser !== false
+          ? launchUi(controlPort, pathname)
+          : `http://127.0.0.1:${controlPort}${pathname}`;
+        logger.warn("init.web.launcher.recovered", "web init launchd install failed but service is ready", {
+          method: "launchd",
+          plistPath,
+          errorMessage,
+        });
+        return {
+          method: "launchd",
+          controlPort,
+          proxyPort,
+          plistPath,
+          serviceInstalled: true,
+          url,
+          probe,
+        };
+      }
+      logger.warn("init.web.launcher.failed", "web init launchd install failed", {
+        method: "launchd",
+        plistPath,
+        errorMessage
+      });
+      return {
+        method: "launchd",
+        controlPort,
+        proxyPort,
+        plistPath,
+        serviceInstalled: false,
+        url: expectedUrl,
+        probe: { ...probe, error: probe.error || errorMessage },
+        error: errorMessage,
+      };
+    }
+
+    const probe = await (deps.waitForDaemonStatus ?? waitForDaemonStatus)(controlPort, 12_000);
+    const pathname = probe.running ? await resolveWebInitPath(controlPort, fetchInitState) : "/init";
+    const url = probe.running && deps.openBrowser !== false
+      ? launchUi(controlPort, pathname)
+      : `http://127.0.0.1:${controlPort}${pathname}`;
+    return {
+      method: "launchd",
+      controlPort,
+      proxyPort,
+      plistPath,
+      serviceInstalled: true,
+      url,
+      probe,
+      error: probe.running ? undefined : probe.error || "tb-proxyd did not become ready"
+    };
+  }
+
+  const repaired = await (deps.repairDaemon ?? repairDaemon)(controlPort);
+  const pathname = repaired.probe.running ? await resolveWebInitPath(controlPort, fetchInitState) : "/init";
+  const url = repaired.probe.running && deps.openBrowser !== false
+    ? launchUi(controlPort, pathname)
+    : `http://127.0.0.1:${controlPort}${pathname}`;
+  return {
+    method: "detached",
+    controlPort,
+    proxyPort,
+    url,
+    probe: repaired.probe,
+    repair: repaired.repair,
+    serviceInstalled: repaired.probe.running,
+    error: repaired.probe.running ? undefined : repaired.repair.error || repaired.probe.error || "tb-proxyd did not become ready"
+  };
+}
+
 function commandPath(command: Command): string {
   const names: string[] = [];
   let current: Command | null = command;
@@ -932,7 +1156,7 @@ export function buildCli(): Command {
   program
     .name("tb")
     .description("Buyer CLI for TokenBuddy")
-    .version("1.0.0");
+    .version(readCliPackageVersion());
 
   program.hook("preAction", async (_thisCommand, actionCommand) => {
     await enforceDaemonGate(actionCommand);
@@ -1391,8 +1615,34 @@ export function buildCli(): Command {
   // 4. tb init (WOW terminal guide向导)
   program
     .command("init")
-    .description("Launch step-by-step interactive setup wizard")
-    .action(async () => {
+    .description("Start TokenBuddy and open the web setup wizard")
+    .option("--terminal", "Run the legacy terminal setup wizard")
+    .action(async (options: { terminal?: boolean }) => {
+      if (!options.terminal) {
+        const result = await runWebInitLauncher();
+        if (result.probe.running) {
+          console.log(`TokenBuddy local service is ready on :${result.controlPort}.`);
+          console.log(`Opening ${result.url} in your default browser…`);
+          console.log("Run `tb init --terminal` if you need the legacy terminal wizard.");
+          return;
+        }
+
+        console.error("TokenBuddy local service did not become ready.");
+        console.error(`Checked: http://127.0.0.1:${result.controlPort}/status`);
+        if (result.method === "launchd" && result.plistPath) {
+          console.error(`LaunchAgent: ${result.plistPath}`);
+        }
+        if (result.error) {
+          console.error(`Reason: ${result.error}`);
+        }
+        console.error("Run `tb doctor --fix` to retry background startup, or `tb init --terminal` for the legacy terminal wizard.");
+        process.exitCode = 1;
+        const error = new Error("TokenBuddy local service did not become ready") as CommandFailure;
+        error.code = "tokenbuddy.init_daemon_not_ready";
+        error.exitCode = 1;
+        throw error;
+      }
+
       p.intro("🚀 Welcome to TokenBuddy Interactive Wizard!");
       const setupSummaryLines: string[] = [];
 
@@ -1765,12 +2015,16 @@ export function buildCli(): Command {
 
             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");
+            fs.mkdirSync(path.dirname(stdoutPath), { recursive: true });
+            fs.mkdirSync(path.dirname(stderrPath), { recursive: true });
             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"),
+              stdoutPath,
+              stderrPath,
               controlPort,
               proxyPort,
               sellerRegistryUrl,