@useorgx/wizard 0.1.0 → 0.1.3

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) {
@@ -745,48 +742,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) {
@@ -2106,36 +2061,30 @@ async function addAutomatedSurface(name) {
     }
     case "vscode": {
       const previous = readTextIfExists(path);
+      if (inspectVscodeMcpConfig(previous).hostedConfigured) {
+        return { name, changed: false, path, message: "OrgX cloud MCP is connected in VS Code." };
+      }
       const next = patchVscodeMcpConfig(previous);
       writeTextFile(path, next);
-      return {
-        name,
-        changed: previous !== next,
-        path,
-        message: "OrgX cloud MCP is connected in VS Code."
-      };
+      return { name, changed: true, path, message: "OrgX cloud MCP is connected in VS Code." };
     }
     case "windsurf": {
       const previous = readTextIfExists(path);
+      if (inspectWindsurfMcpConfig(previous).hostedConfigured) {
+        return { name, changed: false, path, message: "OrgX cloud MCP is connected in Windsurf." };
+      }
       const next = patchWindsurfMcpConfig(previous);
       writeTextFile(path, next);
-      return {
-        name,
-        changed: previous !== next,
-        path,
-        message: "OrgX cloud MCP is connected in Windsurf."
-      };
+      return { name, changed: true, path, message: "OrgX cloud MCP is connected in Windsurf." };
     }
     case "zed": {
       const previous = readTextIfExists(path);
+      if (inspectZedMcpConfig(previous).hostedConfigured) {
+        return { name, changed: false, path, message: "OrgX cloud MCP is connected in Zed." };
+      }
       const next = patchZedMcpConfig(previous);
       writeTextFile(path, next);
-      return {
-        name,
-        changed: previous !== next,
-        path,
-        message: "OrgX cloud MCP is connected in Zed."
-      };
+      return { name, changed: true, path, message: "OrgX cloud MCP is connected in Zed." };
     }
     default:
       return {
@@ -2294,9 +2243,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 = [];
@@ -2348,13 +2296,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
@@ -3389,24 +3330,6 @@ function printAuthStatus(status) {
     console.log(`  error: ${status.error}`);
   }
 }
-function printRemoteSetupStatus(status) {
-  if (status.skipped) {
-    console.log(pc3.yellow(status.error ?? "Remote setup check skipped."));
-    console.log(pc3.dim(describeSetupStatusScope()));
-    return;
-  }
-  if (!status.ok) {
-    console.log(pc3.red(`Remote setup check failed: ${status.error ?? "unknown error"}`));
-    if (status.status) {
-      console.log(`status: ${status.status}`);
-    }
-    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) {
@@ -3493,8 +3416,6 @@ async function main() {
       console.log("");
       printOpenClawHealth(doctor2.openclaw);
       console.log("");
-      printRemoteSetupStatus(doctor2.remote);
-      console.log("");
       const assessment2 = assessDoctorReport(doctor2);
       printDoctorAssessment(assessment2);
       if (!assessment2.ok) {
@@ -3507,7 +3428,35 @@ 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("");
+      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) && choice === "login") {
+          const loginOk = await runBrowserLogin();
+          if (loginOk) {
+            resolvedAuth = await resolveOrgxAuth();
+          }
+        } else if (clack.isCancel(choice)) {
+          clack.cancel("Setup cancelled.");
+          return;
+        } else {
+          console.log(pc3.dim(`Run ${pc3.cyan("orgx-wizard auth login")} to connect later.`));
+        }
+      } else {
+        console.log(
+          `${pc3.yellow("No OrgX account connected.")} Run ${pc3.cyan("orgx-wizard auth login")} to connect.`
+        );
+      }
+    }
     if (resolvedAuth) {
       console.log("");
       const workspaceSetup = await runWorkspaceSetup(
@@ -3549,59 +3498,26 @@ async function main() {
     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);
-      }
-      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) {
+      if (opts.open !== false) {
         const openResult = openBrowser(pairing.connectUrl);
         if (!openResult.ok && openResult.error) {
           console.log(pc3.yellow(`Browser open failed: ${openResult.error}`));
@@ -3610,21 +3526,23 @@ async function main() {
       spinner.start();
       spinner.text = pc3.cyan("Waiting for OrgX 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 = pc3.cyan("Verifying OrgX API key");
-      const result = await verifyAndPersistAuth(ready.key, options);
+      const result = await verifyAndPersistAuth(ready.key, {
+        ...opts.baseUrl !== void 0 ? { baseUrl: opts.baseUrl } : {}
+      });
       if (!("stored" in result)) {
         spinner.fail("OrgX browser pairing delivered an invalid API key");
         printAuthStatus(result.verification);
-        return;
+        return false;
       }
       await acknowledgeBrowserPairing({
-        baseUrl: options.baseUrl,
+        baseUrl: opts.baseUrl,
         pairingId: pairing.pairingId,
         pollToken: pairing.pollToken
       }).catch((error) => {
@@ -3648,10 +3566,51 @@ async function main() {
         console.log("");
         printMutationResults(result.openclawResults);
       }
+      return true;
     } catch (error) {
       spinner.fail("OrgX browser pairing failed");
       console.log(pc3.red(describeBrowserPairingFailure(error)));
+      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();
+    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 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);
+      }
+      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");
@@ -3773,8 +3732,6 @@ async function main() {
     console.log("");
     printOpenClawHealth(report.openclaw);
     console.log("");
-    printRemoteSetupStatus(report.remote);
-    console.log("");
     const assessment = assessDoctorReport(report);
     printDoctorAssessment(assessment);
     if (!assessment.ok) {
@@ -3783,10 +3740,9 @@ async function main() {
   });
   const skills = program.command("skills").description("Install OrgX rules and Claude skill packs.");
   skills.command("add").description("Write Cursor and Claude OrgX rules and install OrgX Claude skill packs.").argument("[packs...]", "skill pack names or 'all'", ["all"]).action(async (packs) => {
-    const selectedPacks = resolveSkillPackNames(packs);
     const spinner = createOrgxSpinner("Installing OrgX rules and skills");
     spinner.start();
-    const report = await installOrgxSkills({ skillNames: selectedPacks });
+    const report = await installOrgxSkills({ skillNames: packs });
     spinner.succeed("OrgX rules and skills installed");
     printSkillInstallReport(report);
   });