@useorgx/wizard 0.1.1 → 0.1.4

package/dist/cli.js

@@ -578,15 +578,12 @@ async function checkOrgxAuth(options = {}) {
       ok: false,
       skipped: true,
       source: "none",
-      error: "No OrgX API key found in ORGX_API_KEY, the wizard auth store, or OpenClaw config.",
+      error: "No OrgX account connected. Run `orgx-wizard auth login` to connect.",
       url: buildOrgxApiUrl("/client/sync", DEFAULT_ORGX_BASE_URL)
     };
   }
   return verifyOrgxAuth(auth);
 }
-function describeSetupStatusScope() {
-  return "The setup-status endpoint is still service-key-only and uses ORGX_SERVICE_KEY.";
-}
 
 // src/lib/browser-auth.ts
 function asString(value) {
@@ -670,6 +667,7 @@ async function startBrowserPairing(options, fetchImpl) {
     method: "POST",
     body: JSON.stringify({
       installationId: options.installationId,
+      clientType: "orgx-wizard",
       ...options.deviceName ? { deviceName: options.deviceName } : {},
       ...options.platform ? { platform: options.platform } : {}
     }),
@@ -745,48 +743,6 @@ function openBrowser(url) {
   return { ok: true };
 }
 
-// src/lib/setup-status.ts
-async function fetchSetupStatus(apiKey = process.env.ORGX_SERVICE_KEY?.trim()) {
-  if (!apiKey) {
-    return {
-      ok: false,
-      skipped: true,
-      error: "ORGX_SERVICE_KEY is not set; /api/setup/status is a service-level check and was skipped.",
-      url: ORGX_SETUP_STATUS_URL
-    };
-  }
-  try {
-    const response = await fetch(ORGX_SETUP_STATUS_URL, {
-      headers: {
-        Authorization: `Bearer ${apiKey}`
-      },
-      signal: AbortSignal.timeout(7e3)
-    });
-    const text2 = await response.text();
-    let data = text2;
-    try {
-      data = text2.length > 0 ? JSON.parse(text2) : null;
-    } catch {
-      data = text2;
-    }
-    return {
-      ok: response.ok,
-      skipped: false,
-      status: response.status,
-      data,
-      url: ORGX_SETUP_STATUS_URL,
-      ...response.ok ? {} : { error: `HTTP ${response.status}` }
-    };
-  } catch (error) {
-    return {
-      ok: false,
-      skipped: false,
-      error: error instanceof Error ? error.message : String(error),
-      url: ORGX_SETUP_STATUS_URL
-    };
-  }
-}
-
 // src/lib/openclaw-health.ts
 import { spawnSync as spawnSync2 } from "child_process";
 function trimOutput(value) {
@@ -2288,9 +2244,8 @@ async function runDoctor() {
   const hostedMcpTool = await checkHostedMcpToolAccess();
   const npmRegistry = await checkNpmRegistryHealth();
   const workspace = await checkWorkspaceConnectivity();
-  const remote = await fetchSetupStatus();
   const openclaw = openclawSurface?.detected ? await checkOpenClawHealth(openclawSurface.path) : skippedOpenClawHealth();
-  return { surfaces, auth, hostedMcp, hostedMcpTool, npmRegistry, workspace, remote, openclaw };
+  return { surfaces, auth, hostedMcp, hostedMcpTool, npmRegistry, workspace, openclaw };
 }
 function assessDoctorReport(report) {
   const issues = [];
@@ -2342,13 +2297,6 @@ function assessDoctorReport(report) {
       suggestion: "Run `openclaw doctor` or `openclaw doctor --repair` before relying on local bridge clients like Cursor."
     });
   }
-  if (!report.remote.skipped && !report.remote.ok) {
-    issues.push({
-      level: "warning",
-      title: "Remote setup status check failed.",
-      suggestion: "If you expected the service-key check to pass, verify ORGX_SERVICE_KEY before trusting setup-status output."
-    });
-  }
   return {
     ok: !issues.some((issue) => issue.level === "error"),
     issues
@@ -3123,53 +3071,50 @@ function createOrgxSpinner(text2) {
 }
 
 // src/cli.ts
+var ICON = {
+  ok: pc3.green("\u2713"),
+  err: pc3.red("\u2717"),
+  warn: pc3.yellow("!"),
+  skip: pc3.dim("\xB7")
+};
 function formatAuthSource(source) {
   switch (source) {
     case "environment":
-      return "ORGX_API_KEY";
+      return "env ORGX_API_KEY";
     case "wizard-store":
       return "wizard auth store";
     case "openclaw-config-file":
-      return "OpenClaw config";
+      return "openclaw config";
     default:
       return "not configured";
   }
 }
 function printSurfaceTable(statuses) {
   for (const status of statuses) {
-    const state = status.configured ? pc3.green("configured") : status.detected ? pc3.yellow("detected") : pc3.dim("not detected");
-    const mode = status.mode === "automated" ? pc3.cyan("auto") : pc3.magenta("manual");
-    console.log(`${pc3.bold(status.name.padEnd(10))} ${mode.padEnd(14)} ${state}`);
-    console.log(`  ${status.summary}`);
-    if (status.path) {
-      console.log(`  path: ${status.path}`);
-    }
-    for (const detail of status.details) {
-      console.log(`  - ${detail}`);
-    }
+    const icon = status.configured ? ICON.ok : status.detected ? ICON.warn : ICON.skip;
+    const state = status.configured ? pc3.green("configured") : status.detected ? pc3.yellow("detected") : pc3.dim("not found");
+    const mode = pc3.dim(status.mode === "automated" ? "auto  " : "manual");
+    console.log(`  ${icon}  ${pc3.bold(status.name.padEnd(10))} ${mode}  ${state}`);
   }
 }
 function printMutationResults(results) {
   for (const result of summarizeMutationResults(results)) {
-    const marker = result.state === "updated" ? pc3.green("updated") : pc3.yellow("unchanged");
-    console.log(`${pc3.bold(result.name)} ${marker} ${result.message}`);
+    const icon = result.state === "updated" ? ICON.ok : ICON.skip;
+    const state = result.state === "updated" ? pc3.green("updated  ") : pc3.dim("unchanged");
+    console.log(`  ${icon}  ${pc3.bold(result.name.padEnd(10))} ${state}  ${pc3.dim(result.message)}`);
   }
 }
 function printSkillInstallReport(report) {
   for (const write of report.writes) {
-    const marker = write.changed ? pc3.green("updated") : pc3.yellow("unchanged");
-    console.log(`${pc3.bold(write.label)} ${marker} ${write.path}`);
+    const icon = write.changed ? ICON.ok : ICON.skip;
+    const state = write.changed ? pc3.green("updated  ") : pc3.dim("unchanged");
+    console.log(`  ${icon}  ${pc3.bold(write.label.padEnd(10))} ${state}`);
   }
   for (const pack of report.packs) {
-    const changedCount = pack.files.filter((file) => file.changed).length;
-    const marker = changedCount > 0 ? pc3.green("updated") : pc3.yellow("unchanged");
-    console.log(
-      `${pc3.bold(pack.name)} ${marker} ${changedCount}/${pack.files.length} files written`
-    );
-    for (const file of pack.files) {
-      const state = file.changed ? "updated" : "unchanged";
-      console.log(`  - ${state} ${file.path}`);
-    }
+    const changedCount = pack.files.filter((f) => f.changed).length;
+    const icon = changedCount > 0 ? ICON.ok : ICON.skip;
+    const state = changedCount > 0 ? pc3.green(`${changedCount} updated `) : pc3.dim("unchanged");
+    console.log(`  ${icon}  ${pc3.bold(pack.name.padEnd(10))} ${state}  ${pc3.dim(`${pack.files.length} files`)}`);
   }
 }
 function printWorkspace(workspace) {
@@ -3197,15 +3142,11 @@ function printWorkspaceList(workspaces) {
   }
 }
 function printWorkspaceSetupResult(result) {
-  console.log(pc3.bold("workspace bootstrap"));
-  const statusLabel = result.status === "updated" ? pc3.green("updated") : result.status === "unchanged" ? pc3.yellow("unchanged") : pc3.dim(result.status);
-  console.log(`  ${statusLabel} ${result.message}`);
   if (result.workspace) {
-    console.log(`  workspace: ${result.workspace.name}`);
-    console.log(`  id: ${result.workspace.id}`);
-    if (result.workspace.isDefault) {
-      console.log("  default: yes");
-    }
+    const icon = result.status === "updated" ? ICON.ok : ICON.skip;
+    console.log(`  ${icon}  ${pc3.green("workspace ")} ${pc3.bold(result.workspace.name)}`);
+  } else {
+    console.log(`  ${ICON.skip}  ${pc3.dim(result.message)}`);
   }
 }
 function printFounderPresetResult(result) {
@@ -3274,81 +3215,6 @@ async function syncContinuityAfterAuth(seed = {}) {
   } catch {
   }
 }
-function printOpenClawHealth(check) {
-  console.log(pc3.bold("openclaw runtime"));
-  if (check.skipped) {
-    console.log(`  ${pc3.yellow(check.error ?? "Gateway health check skipped.")}`);
-  } else if (check.ok) {
-    const via = check.method === "cli" ? "CLI" : "HTTP";
-    console.log(`  ${pc3.green(`healthy via ${via}`)}`);
-  } else {
-    const via = check.method === "none" ? "unavailable" : check.method.toUpperCase();
-    console.log(`  ${pc3.red(`unhealthy via ${via}`)} ${check.error ?? "unknown error"}`);
-  }
-  if (check.url) {
-    console.log(`  url: ${check.url}`);
-  }
-  for (const detail of check.details) {
-    console.log(`  - ${detail}`);
-  }
-}
-function printHostedMcpHealth(check) {
-  console.log(pc3.bold("hosted mcp"));
-  if (check.skipped) {
-    console.log(`  ${pc3.yellow(check.error ?? "Hosted MCP health check skipped.")}`);
-  } else if (check.ok) {
-    console.log(`  ${pc3.green("reachable")}`);
-  } else {
-    console.log(`  ${pc3.red("unreachable")} ${check.error ?? "unknown error"}`);
-  }
-  console.log(`  url: ${check.url}`);
-  for (const detail of check.details) {
-    console.log(`  - ${detail}`);
-  }
-}
-function printHostedMcpToolCheck(check) {
-  console.log(pc3.bold("hosted mcp tool call"));
-  if (check.skipped) {
-    console.log(`  ${pc3.yellow(check.error ?? "Hosted MCP tool verification skipped.")}`);
-  } else if (check.ok) {
-    console.log(`  ${pc3.green("authenticated tool call ok")}`);
-  } else {
-    console.log(`  ${pc3.red("authenticated tool call failed")} ${check.error ?? "unknown error"}`);
-  }
-  console.log(`  tool: ${check.toolName}`);
-  console.log(`  url: ${check.url}`);
-  if (check.source !== "none") {
-    console.log(`  auth source: ${formatAuthSource(check.source)}`);
-  }
-  if (check.baseUrl) {
-    console.log(`  base url: ${check.baseUrl}`);
-  }
-  if (check.initializeStatus !== void 0) {
-    console.log(`  initialize status: ${check.initializeStatus}`);
-  }
-  if (check.callStatus !== void 0) {
-    console.log(`  tool call status: ${check.callStatus}`);
-  }
-  for (const detail of check.details) {
-    console.log(`  - ${detail}`);
-  }
-}
-function printNpmRegistryHealth(check) {
-  console.log(pc3.bold("npm registry"));
-  if (!check.reachable) {
-    console.log(`  ${pc3.red("unreachable")} ${check.error ?? "unknown error"}`);
-  } else if (check.published) {
-    console.log(
-      `  ${pc3.green("reachable")} ${check.packageName}${check.version ? `@${check.version}` : ""}`
-    );
-  } else {
-    console.log(`  ${pc3.yellow("reachable")} ${check.error ?? `${check.packageName} is not published yet.`}`);
-  }
-  console.log(`  url: ${check.url}`);
-  for (const detail of check.details) {
-    console.log(`  - ${detail}`);
-  }
-}
 function parseTimeoutSeconds(value) {
   const parsed = Number(value);
   if (!Number.isFinite(parsed) || parsed <= 0) {
@@ -3356,86 +3222,78 @@ function parseTimeoutSeconds(value) {
   }
   return parsed;
 }
-function describeBrowserPairingFailure(error) {
-  const message = error instanceof Error ? error.message : String(error);
-  return `${message} Use \`wizard auth login --api-key <oxk_...>\` or \`wizard auth set-key <oxk_...>\` to fall back to a manual key.`;
-}
 function printAuthStatus(status) {
-  console.log(pc3.bold("orgx auth"));
   if (!status.configured) {
-    console.log(`  ${pc3.yellow(status.error ?? "No OrgX API key configured.")}`);
+    console.log(`  ${ICON.warn}  ${pc3.yellow("no account")}   run ${pc3.cyan("orgx-wizard auth login")} to connect`);
     return;
   }
-  const state = status.ok ? pc3.green("verified") : status.skipped ? pc3.yellow("skipped") : pc3.red("invalid");
-  console.log(
-    `  ${state} ${status.keyPrefix ?? "unknown"} via ${formatAuthSource(status.source)}`
-  );
-  if (status.baseUrl) {
-    console.log(`  base url: ${status.baseUrl}`);
-  }
-  if (status.path) {
-    console.log(`  path: ${status.path}`);
-  }
-  if (status.verifiedAt) {
-    console.log(`  verified at: ${status.verifiedAt}`);
-  }
+  const icon = status.ok ? ICON.ok : ICON.err;
+  const state = status.ok ? pc3.green("verified  ") : status.skipped ? pc3.yellow("skipped   ") : pc3.red("invalid   ");
+  const via = pc3.dim(formatAuthSource(status.source));
+  console.log(`  ${icon}  ${state} ${pc3.bold(status.keyPrefix ?? "unknown")}  ${via}`);
   if (!status.ok && status.error) {
-    console.log(`  error: ${status.error}`);
+    console.log(`       ${pc3.red(status.error)}`);
   }
 }
-function printRemoteSetupStatus(status) {
-  if (status.skipped) {
-    console.log(pc3.yellow(status.error ?? "Remote setup check skipped."));
-    console.log(pc3.dim(describeSetupStatusScope()));
-    return;
+function printDoctorReport(report, assessment) {
+  console.log(pc3.dim("  surfaces"));
+  printSurfaceTable(report.surfaces);
+  console.log("");
+  console.log(pc3.dim("  account"));
+  printAuthStatus(report.auth);
+  console.log("");
+  console.log(pc3.dim("  services"));
+  const mcp = report.hostedMcp;
+  {
+    const icon = mcp.skipped ? ICON.skip : mcp.ok ? ICON.ok : ICON.err;
+    const label = pc3.dim("cloud mcp ".padEnd(14));
+    const state = mcp.skipped ? pc3.dim("skipped") : mcp.ok ? pc3.green("reachable") : pc3.red("unreachable");
+    const tail = !mcp.ok && !mcp.skipped && mcp.error ? `  ${pc3.dim(mcp.error)}` : "";
+    console.log(`  ${icon}  ${label} ${state}${tail}`);
+  }
+  const tool = report.hostedMcpTool;
+  {
+    const icon = tool.skipped ? ICON.skip : tool.ok ? ICON.ok : ICON.err;
+    const label = pc3.dim("tool call ".padEnd(14));
+    const state = tool.skipped ? pc3.dim("skipped") : tool.ok ? pc3.green("authenticated") : pc3.red("failed");
+    const tail = !tool.ok && !tool.skipped && tool.error ? `  ${pc3.dim(tool.error)}` : "";
+    console.log(`  ${icon}  ${label} ${state}${tail}`);
+  }
+  const ws = report.workspace;
+  {
+    const icon = !ws.configured ? ICON.skip : ws.ok ? ICON.ok : ICON.err;
+    const label = pc3.dim("workspace ".padEnd(14));
+    const state = !ws.configured ? pc3.dim("not configured") : ws.ok && ws.workspace ? pc3.green(ws.workspace.name) : pc3.red(`unreachable${ws.error ? `: ${ws.error}` : ""}`);
+    console.log(`  ${icon}  ${label} ${state}`);
+  }
+  const openclaw = report.openclaw;
+  {
+    const icon = openclaw.skipped ? ICON.skip : openclaw.ok ? ICON.ok : ICON.err;
+    const label = pc3.dim("openclaw ".padEnd(14));
+    const state = openclaw.skipped ? pc3.dim("not installed") : openclaw.ok ? pc3.green(`healthy${openclaw.method && openclaw.method !== "none" ? ` (${openclaw.method})` : ""}`) : pc3.red(`unhealthy${openclaw.error ? `: ${openclaw.error}` : ""}`);
+    console.log(`  ${icon}  ${label} ${state}`);
   }
-  if (!status.ok) {
-    console.log(pc3.red(`Remote setup check failed: ${status.error ?? "unknown error"}`));
-    if (status.status) {
-      console.log(`status: ${status.status}`);
+  console.log("");
+  const configuredCount = report.surfaces.filter((s) => s.configured).length;
+  if (assessment.issues.length === 0) {
+    console.log(`  ${ICON.ok}  ${pc3.green("All systems ready.")}`);
+    if (!report.auth.configured) {
+      console.log(`
+  ${pc3.dim("\u2192")}  ${pc3.cyan("orgx-wizard auth login")}  ${pc3.dim("to connect your account")}`);
+    } else {
+      console.log(`  ${pc3.dim("\u2192")}  ${pc3.dim(`OrgX is active across ${configuredCount} editor${configuredCount !== 1 ? "s" : ""}`)}`);
     }
-    return;
-  }
-  console.log(pc3.green(`Remote setup check passed via ${status.url}`));
-  if (status.data) {
-    console.log(JSON.stringify(status.data, null, 2));
-  }
-}
-function printWorkspaceConnectivity(check) {
-  console.log(pc3.bold("workspace connectivity"));
-  if (!check.configured) {
-    console.log(`  ${pc3.yellow(check.error ?? "Workspace connectivity check skipped.")}`);
-    return;
-  }
-  if (!check.ok) {
-    console.log(`  ${pc3.red("unreachable")} ${check.error ?? "unknown error"}`);
-  } else if (check.workspace) {
-    console.log(`  ${pc3.green("reachable")} ${check.workspace.name}`);
-    console.log(`  workspace id: ${check.workspace.id}`);
-    if (check.workspace.isDefault) {
-      console.log("  default: yes");
+  } else {
+    const hasError = assessment.issues.some((i) => i.level === "error");
+    const headline = hasError ? `${ICON.err}  ${pc3.red("Issues detected")}` : `${ICON.warn}  ${pc3.yellow("Warnings detected")}`;
+    console.log(`  ${headline}`);
+    for (const issue of assessment.issues) {
+      const label = issue.level === "error" ? pc3.red("error") : pc3.yellow("warn ");
+      console.log(`
+       ${label}  ${issue.title}`);
+      console.log(`       ${pc3.dim("\u2192")}     ${issue.suggestion}`);
     }
   }
-  if (check.baseUrl) {
-    console.log(`  base url: ${check.baseUrl}`);
-  }
-  for (const detail of check.details) {
-    console.log(`  - ${detail}`);
-  }
-}
-function printDoctorAssessment(report) {
-  console.log(pc3.bold("doctor summary"));
-  if (report.issues.length === 0) {
-    console.log(`  ${pc3.green("ready")} No blocking issues detected.`);
-    return;
-  }
-  const headline = report.ok ? pc3.yellow("warnings only") : pc3.red("blocking issues detected");
-  console.log(`  ${headline}`);
-  for (const issue of report.issues) {
-    const label = issue.level === "error" ? pc3.red("error") : pc3.yellow("warning");
-    console.log(`  ${label} ${issue.title}`);
-    console.log(`  fix: ${issue.suggestion}`);
-  }
 }
 async function main() {
   const program = new Command();
@@ -3473,24 +3331,8 @@ async function main() {
       printFounderPresetResult(presetResult);
       console.log("");
       const doctor2 = await runDoctor();
-      printSurfaceTable(doctor2.surfaces);
-      console.log("");
-      printAuthStatus(doctor2.auth);
-      console.log("");
-      printHostedMcpHealth(doctor2.hostedMcp);
-      console.log("");
-      printHostedMcpToolCheck(doctor2.hostedMcpTool);
-      console.log("");
-      printNpmRegistryHealth(doctor2.npmRegistry);
-      console.log("");
-      printWorkspaceConnectivity(doctor2.workspace);
-      console.log("");
-      printOpenClawHealth(doctor2.openclaw);
-      console.log("");
-      printRemoteSetupStatus(doctor2.remote);
-      console.log("");
       const assessment2 = assessDoctorReport(doctor2);
-      printDoctorAssessment(assessment2);
+      printDoctorReport(doctor2, assessment2);
       if (!assessment2.ok) {
         process.exitCode = 1;
       }
@@ -3501,12 +3343,42 @@ async function main() {
     const results = await setupDetectedSurfaces();
     spinner.succeed("Detected surfaces configured");
     printMutationResults(results);
-    const resolvedAuth = await resolveOrgxAuth();
+    let resolvedAuth = await resolveOrgxAuth();
     if (!resolvedAuth) {
       console.log("");
-      console.log(
-        `${pc3.yellow("No OrgX API key configured.")} Run ${pc3.cyan("orgx-wizard auth login")} to connect your account and enable workspace + tool access.`
-      );
+      const interactive = Boolean(process.stdin.isTTY && process.stdout.isTTY);
+      if (interactive) {
+        const choice = await selectPrompt({
+          message: "Connect your OrgX account to enable workspace and AI tool access",
+          options: [
+            { value: "login", label: "Open browser to connect", hint: "recommended" },
+            { value: "skip", label: "Skip for now", hint: "run `orgx-wizard auth login` later" }
+          ]
+        });
+        if (clack.isCancel(choice)) {
+          clack.cancel("Setup cancelled.");
+          return;
+        }
+        if (choice === "login") {
+          const loginOk = await runBrowserLogin();
+          if (!loginOk) {
+            console.log(`
+  ${pc3.dim("\u2192")}  ${pc3.cyan("orgx-wizard auth login")}           ${pc3.dim("to try again")}`);
+            console.log(`  ${pc3.dim("\u2192")}  ${pc3.cyan("orgx-wizard auth login --api-key")}  ${pc3.dim("to paste a key directly")}`);
+            return;
+          }
+          resolvedAuth = await resolveOrgxAuth();
+        } else {
+          console.log(`
+  ${pc3.dim("\u2192")}  ${pc3.cyan("orgx-wizard auth login")}  ${pc3.dim("to connect when ready")}`);
+          return;
+        }
+      } else {
+        console.log(
+          `  ${ICON.warn}  ${pc3.yellow("No account connected.")}  Run ${pc3.cyan("orgx-wizard auth login")} to connect.`
+        );
+        return;
+      }
     }
     if (resolvedAuth) {
       console.log("");
@@ -3527,131 +3399,128 @@ async function main() {
           interactive: Boolean(process.stdin.isTTY && process.stdout.isTTY)
         }
       );
-      if (workspaceSetup.status !== "cancelled") {
-        printWorkspaceSetupResult(workspaceSetup);
-      } else {
+      if (workspaceSetup.status === "cancelled") {
         return;
       }
+      if (workspaceSetup.workspace) {
+        console.log(`  ${ICON.ok}  ${pc3.green("workspace ")} ${pc3.bold(workspaceSetup.workspace.name)}`);
+      }
     }
-    console.log("");
     const doctor = await runDoctor();
-    printSurfaceTable(doctor.surfaces);
-    console.log("");
-    printAuthStatus(doctor.auth);
-    console.log("");
-    printHostedMcpHealth(doctor.hostedMcp);
-    console.log("");
-    printHostedMcpToolCheck(doctor.hostedMcpTool);
-    console.log("");
-    printNpmRegistryHealth(doctor.npmRegistry);
-    console.log("");
-    printWorkspaceConnectivity(doctor.workspace);
-    console.log("");
-    printOpenClawHealth(doctor.openclaw);
-    console.log("");
-    printRemoteSetupStatus(doctor.remote);
-    console.log("");
     const assessment = assessDoctorReport(doctor);
-    printDoctorAssessment(assessment);
-    if (!assessment.ok) {
-      process.exitCode = 1;
-    }
-  });
-  const auth = program.command("auth").description("Manage OrgX API key auth for the wizard.");
-  auth.command("status").description("Show the resolved OrgX API key source and verify it against OrgX.").action(async () => {
-    const spinner = createOrgxSpinner("Checking OrgX auth");
-    spinner.start();
-    const status = await checkOrgxAuth();
-    spinner.stop();
-    printAuthStatus(status);
-  });
-  auth.command("login").description("Start browser pairing for OrgX auth, with direct API key fallback for CI and blocked browsers.").option("--api-key <key>", "Bypass browser pairing and verify this OrgX API key directly.").option("--base-url <url>", "OrgX base URL").option("--device-name <name>", "Device name shown during browser approval.").option("--no-open", "Do not automatically open the browser connect URL.").option("--timeout <seconds>", "How long to wait for browser pairing before giving up.", parseTimeoutSeconds, 600).action(async (options) => {
-    if (options.apiKey) {
-      const spinner2 = createOrgxSpinner("Verifying OrgX API key");
-      spinner2.start();
-      const result = await verifyAndPersistAuth(options.apiKey, options);
-      if (!("stored" in result)) {
-        spinner2.fail("OrgX API key verification failed");
-        printAuthStatus(result.verification);
-        return;
-      }
-      spinner2.succeed("OrgX API key verified and saved");
-      await syncContinuityAfterAuth();
-      printAuthStatus({
-        ...result.verification,
-        source: "wizard-store",
-        path: ORGX_WIZARD_AUTH_PATH,
-        verifiedAt: result.stored.verifiedAt
-      });
-      if (result.openclawResults.length > 0) {
-        console.log("");
-        printMutationResults(result.openclawResults);
+    const configuredCount = doctor.surfaces.filter((s) => s.configured).length;
+    console.log("");
+    if (assessment.issues.length === 0) {
+      console.log(`  ${ICON.ok}  ${pc3.green("You're all set.")}  ${pc3.dim(`OrgX is active across ${configuredCount} editor${configuredCount !== 1 ? "s" : ""}`)}`);
+    } else {
+      printDoctorReport(doctor, assessment);
+      if (!assessment.ok) {
+        process.exitCode = 1;
       }
-      return;
     }
+  });
+  async function runBrowserLogin(opts = {}) {
     const installationId = getOrCreateWizardInstallationId();
     const spinner = createOrgxSpinner("Starting OrgX browser pairing");
     spinner.start();
     try {
       const pairing = await startBrowserPairing({
         installationId,
-        baseUrl: options.baseUrl,
-        deviceName: options.deviceName ?? hostname(),
+        baseUrl: opts.baseUrl,
+        deviceName: opts.deviceName ?? hostname(),
         platform: process.platform
       });
-      spinner.succeed("OrgX browser pairing started");
-      console.log(`Open to continue: ${pairing.connectUrl}`);
-      if (options.open !== false) {
+      spinner.succeed("Browser pairing session opened");
+      console.log(`
+  ${pc3.dim("Open this URL to connect:")}`);
+      console.log(`  ${pc3.cyan(pairing.connectUrl)}
+`);
+      if (opts.open !== false) {
         const openResult = openBrowser(pairing.connectUrl);
         if (!openResult.ok && openResult.error) {
           console.log(pc3.yellow(`Browser open failed: ${openResult.error}`));
         }
       }
       spinner.start();
-      spinner.text = pc3.cyan("Waiting for OrgX browser approval");
+      spinner.text = "Waiting for browser approval...";
       const ready = await waitForBrowserPairing({
-        baseUrl: options.baseUrl,
+        baseUrl: opts.baseUrl,
         pairingId: pairing.pairingId,
         pollIntervalMs: pairing.pollIntervalMs,
         pollToken: pairing.pollToken,
-        timeoutMs: options.timeout * 1e3
+        timeoutMs: (opts.timeout ?? 600) * 1e3
+      });
+      spinner.text = "Verifying API key...";
+      const result = await verifyAndPersistAuth(ready.key, {
+        ...opts.baseUrl !== void 0 ? { baseUrl: opts.baseUrl } : {}
       });
-      spinner.text = pc3.cyan("Verifying OrgX API key");
-      const result = await verifyAndPersistAuth(ready.key, options);
       if (!("stored" in result)) {
-        spinner.fail("OrgX browser pairing delivered an invalid API key");
+        spinner.fail("API key invalid");
         printAuthStatus(result.verification);
-        return;
+        return false;
       }
       await acknowledgeBrowserPairing({
-        baseUrl: options.baseUrl,
+        baseUrl: opts.baseUrl,
         pairingId: pairing.pairingId,
         pollToken: pairing.pollToken
       }).catch((error) => {
-        console.log(pc3.yellow(`Pairing acknowledge failed: ${error instanceof Error ? error.message : String(error)}`));
+        console.log(pc3.dim(`Pairing ack failed: ${error instanceof Error ? error.message : String(error)}`));
       });
-      spinner.succeed("OrgX browser pairing completed");
+      spinner.succeed("OrgX account connected");
       await syncContinuityAfterAuth({
         executionMode: ready.executionMode,
         workspaceName: ready.workspaceName
       });
-      printAuthStatus({
-        ...result.verification,
-        source: "wizard-store",
-        path: ORGX_WIZARD_AUTH_PATH,
-        verifiedAt: result.stored.verifiedAt
-      });
+      console.log(`  ${ICON.ok}  ${pc3.green("verified  ")} ${pc3.bold(result.stored.keyPrefix ?? result.verification.keyPrefix ?? "unknown")}  ${pc3.dim("wizard auth store")}`);
       if (ready.workspaceName) {
-        console.log(`workspace: ${ready.workspaceName}`);
+        console.log(`  ${ICON.ok}  ${pc3.green("workspace ")} ${pc3.bold(ready.workspaceName)}`);
       }
       if (result.openclawResults.length > 0) {
         console.log("");
         printMutationResults(result.openclawResults);
       }
+      return true;
     } catch (error) {
-      spinner.fail("OrgX browser pairing failed");
-      console.log(pc3.red(describeBrowserPairingFailure(error)));
+      const message = error instanceof Error ? error.message : String(error);
+      spinner.fail("Browser pairing failed");
+      console.log(`       ${pc3.red(message)}`);
+      return false;
     }
+  }
+  const auth = program.command("auth").description("Manage OrgX API key auth for the wizard.");
+  auth.command("status").description("Show the resolved OrgX API key source and verify it against OrgX.").action(async () => {
+    const spinner = createOrgxSpinner("Checking OrgX auth");
+    spinner.start();
+    const status = await checkOrgxAuth();
+    spinner.stop();
+    console.log(pc3.dim("  account"));
+    printAuthStatus(status);
+  });
+  auth.command("login").description("Start browser pairing for OrgX auth, with direct API key fallback for CI and blocked browsers.").option("--api-key <key>", "Bypass browser pairing and verify this OrgX API key directly.").option("--base-url <url>", "OrgX base URL").option("--device-name <name>", "Device name shown during browser approval.").option("--no-open", "Do not automatically open the browser connect URL.").option("--timeout <seconds>", "How long to wait for browser pairing before giving up.", parseTimeoutSeconds, 600).action(async (options) => {
+    if (options.apiKey) {
+      const spinner = createOrgxSpinner("Verifying OrgX API key");
+      spinner.start();
+      const result = await verifyAndPersistAuth(options.apiKey, options);
+      if (!("stored" in result)) {
+        spinner.fail("OrgX API key verification failed");
+        printAuthStatus(result.verification);
+        return;
+      }
+      spinner.succeed("OrgX account connected");
+      await syncContinuityAfterAuth();
+      console.log(`  ${ICON.ok}  ${pc3.green("verified  ")} ${pc3.bold(result.stored.keyPrefix ?? result.verification.keyPrefix ?? "unknown")}  ${pc3.dim("wizard auth store")}`);
+      if (result.openclawResults.length > 0) {
+        console.log("");
+        printMutationResults(result.openclawResults);
+      }
+      return;
+    }
+    await runBrowserLogin({
+      ...options.baseUrl !== void 0 ? { baseUrl: options.baseUrl } : {},
+      ...options.deviceName !== void 0 ? { deviceName: options.deviceName } : {},
+      ...options.open !== void 0 ? { open: options.open } : {},
+      timeout: options.timeout
+    });
   });
   auth.command("set-key").description("Verify and persist a per-user OrgX API key for the wizard.").argument("<apiKey>", "per-user OrgX API key (oxk_...)").option("--base-url <url>", "OrgX base URL").action(async (apiKey, options) => {
     const spinner = createOrgxSpinner("Verifying OrgX API key");
@@ -3662,14 +3531,9 @@ async function main() {
       printAuthStatus(result.verification);
       return;
     }
-    spinner.succeed("OrgX API key verified and saved");
+    spinner.succeed("OrgX account connected");
     await syncContinuityAfterAuth();
-    printAuthStatus({
-      ...result.verification,
-      source: "wizard-store",
-      path: ORGX_WIZARD_AUTH_PATH,
-      verifiedAt: result.stored.verifiedAt
-    });
+    console.log(`  ${ICON.ok}  ${pc3.green("verified  ")} ${pc3.bold(result.stored.keyPrefix ?? result.verification.keyPrefix ?? "unknown")}  ${pc3.dim("wizard auth store")}`);
     if (result.openclawResults.length > 0) {
       console.log("");
       printMutationResults(result.openclawResults);
@@ -3755,28 +3619,12 @@ async function main() {
     printWorkspace(result.workspace);
   });
   program.command("doctor").description("Verify local OrgX surface config and optional remote setup status.").action(async () => {
-    const spinner = createOrgxSpinner("Running OrgX doctor");
+    const spinner = createOrgxSpinner("Running OrgX health check");
     spinner.start();
     const report = await runDoctor();
     spinner.stop();
-    printSurfaceTable(report.surfaces);
-    console.log("");
-    printAuthStatus(report.auth);
-    console.log("");
-    printHostedMcpHealth(report.hostedMcp);
-    console.log("");
-    printHostedMcpToolCheck(report.hostedMcpTool);
-    console.log("");
-    printNpmRegistryHealth(report.npmRegistry);
-    console.log("");
-    printWorkspaceConnectivity(report.workspace);
-    console.log("");
-    printOpenClawHealth(report.openclaw);
-    console.log("");
-    printRemoteSetupStatus(report.remote);
-    console.log("");
     const assessment = assessDoctorReport(report);
-    printDoctorAssessment(assessment);
+    printDoctorReport(report, assessment);
     if (!assessment.ok) {
       process.exitCode = 1;
     }