@useorgx/wizard 0.1.8 → 0.1.10

package/dist/cli.js

@@ -940,6 +940,7 @@ function parseOnboardingTask(value) {
     ...isNonEmptyString2(record.initiativeId) ? { initiativeId: record.initiativeId.trim() } : {},
     ...isNonEmptyString2(record.status) ? { status: record.status.trim() } : {},
     title: record.title.trim(),
+    ...isNonEmptyString2(record.workstreamId) ? { workstreamId: record.workstreamId.trim() } : {},
     ...isNonEmptyString2(record.workspaceId) ? { workspaceId: record.workspaceId.trim() } : {},
     ...isNonEmptyString2(record.workspaceName) ? { workspaceName: record.workspaceName.trim() } : {}
   };
@@ -1045,6 +1046,9 @@ function getOrCreateWizardInstallationId(statePath = ORGX_WIZARD_STATE_PATH) {
   writeWizardState(record, statePath);
   return record.installationId;
 }
+function clearWizardState(statePath = ORGX_WIZARD_STATE_PATH) {
+  return deleteFileIfExists(statePath);
+}
 
 // src/lib/agent-roster.ts
 var AGENT_ROSTER_PROFILES = [
@@ -1239,39 +1243,6 @@ async function checkHostedMcpHealth() {
 
 // src/lib/hosted-mcp-tool-check.ts
 var DEFAULT_TOOL_NAME = "get_setup_status";
-function buildHeaders(apiKey, sessionId) {
-  const headers = {
-    Authorization: `Bearer ${apiKey}`,
-    "Content-Type": "application/json",
-    Accept: "application/json, text/event-stream"
-  };
-  if (sessionId) {
-    headers["Mcp-Session-Id"] = sessionId;
-  }
-  return headers;
-}
-async function readJsonSafe(response) {
-  const text2 = await response.text();
-  if (!text2) return null;
-  try {
-    return JSON.parse(text2);
-  } catch {
-    return text2;
-  }
-}
-function readJsonRpcError(payload) {
-  if (!payload || typeof payload !== "object") {
-    return void 0;
-  }
-  const maybeError = payload.error;
-  if (!maybeError || typeof maybeError !== "object") {
-    return void 0;
-  }
-  return typeof maybeError.message === "string" ? maybeError.message : "Unknown MCP JSON-RPC error.";
-}
-function readSessionId(response) {
-  return response.headers.get("mcp-session-id") ?? response.headers.get("Mcp-Session-Id") ?? void 0;
-}
 async function checkHostedMcpToolAccess(options = {}, toolName = DEFAULT_TOOL_NAME) {
   const auth = await resolveOrgxAuth(options);
   if (!auth) {
@@ -1286,157 +1257,20 @@ async function checkHostedMcpToolAccess(options = {}, toolName = DEFAULT_TOOL_NA
       details: []
     };
   }
-  try {
-    const initializeResponse = await fetch(ORGX_HOSTED_MCP_URL, {
-      method: "POST",
-      headers: buildHeaders(auth.apiKey),
-      body: JSON.stringify({
-        jsonrpc: "2.0",
-        id: 1,
-        method: "initialize",
-        params: {
-          protocolVersion: "2024-11-05",
-          clientInfo: {
-            name: "orgx-wizard",
-            version: "0.1.0"
-          },
-          capabilities: {}
-        }
-      }),
-      signal: AbortSignal.timeout(1e4)
-    });
-    const initializePayload = await readJsonSafe(initializeResponse);
-    const initializeError = readJsonRpcError(initializePayload);
-    const sessionId = readSessionId(initializeResponse);
-    if (!initializeResponse.ok) {
-      return {
-        configured: true,
-        ok: false,
-        skipped: false,
-        source: auth.source,
-        toolName,
-        url: ORGX_HOSTED_MCP_URL,
-        baseUrl: auth.baseUrl,
-        initializeStatus: initializeResponse.status,
-        error: `MCP initialize failed with HTTP ${initializeResponse.status}.`,
-        details: [`auth source: ${auth.source}`],
-        response: initializePayload
-      };
-    }
-    if (initializeError) {
-      return {
-        configured: true,
-        ok: false,
-        skipped: false,
-        source: auth.source,
-        toolName,
-        url: ORGX_HOSTED_MCP_URL,
-        baseUrl: auth.baseUrl,
-        initializeStatus: initializeResponse.status,
-        error: `MCP initialize returned JSON-RPC error: ${initializeError}`,
-        details: [`auth source: ${auth.source}`],
-        response: initializePayload
-      };
-    }
-    if (!sessionId) {
-      return {
-        configured: true,
-        ok: false,
-        skipped: false,
-        source: auth.source,
-        toolName,
-        url: ORGX_HOSTED_MCP_URL,
-        baseUrl: auth.baseUrl,
-        initializeStatus: initializeResponse.status,
-        error: "MCP initialize succeeded but no Mcp-Session-Id header was returned.",
-        details: [`auth source: ${auth.source}`],
-        response: initializePayload
-      };
-    }
-    const callResponse = await fetch(ORGX_HOSTED_MCP_URL, {
-      method: "POST",
-      headers: buildHeaders(auth.apiKey, sessionId),
-      body: JSON.stringify({
-        jsonrpc: "2.0",
-        id: 2,
-        method: "tools/call",
-        params: {
-          name: toolName,
-          arguments: {}
-        }
-      }),
-      signal: AbortSignal.timeout(1e4)
-    });
-    const callPayload = await readJsonSafe(callResponse);
-    const callError = readJsonRpcError(callPayload);
-    if (!callResponse.ok) {
-      return {
-        configured: true,
-        ok: false,
-        skipped: false,
-        source: auth.source,
-        toolName,
-        url: ORGX_HOSTED_MCP_URL,
-        baseUrl: auth.baseUrl,
-        initializeStatus: initializeResponse.status,
-        callStatus: callResponse.status,
-        error: `MCP tool call failed with HTTP ${callResponse.status}.`,
-        details: [
-          `auth source: ${auth.source}`,
-          `session established: ${sessionId}`
-        ],
-        response: callPayload
-      };
-    }
-    if (callError) {
-      return {
-        configured: true,
-        ok: false,
-        skipped: false,
-        source: auth.source,
-        toolName,
-        url: ORGX_HOSTED_MCP_URL,
-        baseUrl: auth.baseUrl,
-        initializeStatus: initializeResponse.status,
-        callStatus: callResponse.status,
-        error: `MCP tool call returned JSON-RPC error: ${callError}`,
-        details: [
-          `auth source: ${auth.source}`,
-          `session established: ${sessionId}`
-        ],
-        response: callPayload
-      };
-    }
-    return {
-      configured: true,
-      ok: true,
-      skipped: false,
-      source: auth.source,
-      toolName,
-      url: ORGX_HOSTED_MCP_URL,
-      baseUrl: auth.baseUrl,
-      initializeStatus: initializeResponse.status,
-      callStatus: callResponse.status,
-      details: [
-        `auth source: ${auth.source}`,
-        `session established: ${sessionId}`,
-        `tool call: ${toolName}`
-      ],
-      response: callPayload
-    };
-  } catch (error) {
-    return {
-      configured: true,
-      ok: false,
-      skipped: false,
-      source: auth.source,
-      toolName,
-      url: ORGX_HOSTED_MCP_URL,
-      baseUrl: auth.baseUrl,
-      error: error instanceof Error ? error.message : String(error),
-      details: [`auth source: ${auth.source}`]
-    };
-  }
+  return {
+    configured: true,
+    ok: false,
+    skipped: true,
+    source: auth.source,
+    toolName,
+    url: ORGX_HOSTED_MCP_URL,
+    baseUrl: auth.baseUrl,
+    error: "Hosted OrgX MCP uses OAuth; API-key tool verification is skipped.",
+    details: [
+      `auth source: ${auth.source}`,
+      "Hosted OrgX MCP connectors complete OAuth during client setup, so the wizard cannot preflight tools with an oxk_ API key."
+    ]
+  };
 }
 
 // src/lib/npm-registry-health.ts
@@ -1633,7 +1467,7 @@ async function getCurrentWorkspace(options = {}) {
     }
     return workspace;
   }
-  if (response.status === 404) {
+  if (response.status === 401 || response.status === 404) {
     const workspaces = await listWorkspaces(options);
     return workspaces[0] ?? null;
   }
@@ -2334,7 +2168,10 @@ function buildChatgptManualStatus(detection, authHint) {
       "Manual step: in ChatGPT desktop developer mode, add a custom connector pointing at the hosted OrgX MCP URL."
     );
     details.push(
-      "After connecting ChatGPT, run `orgx-wizard doctor` to verify hosted MCP tool access."
+      "ChatGPT completes OAuth during connector setup; the wizard cannot preflight hosted MCP tools with an oxk_ API key."
+    );
+    details.push(
+      "After connecting ChatGPT, run `orgx-wizard doctor` to verify hosted MCP health from this machine."
     );
   } else {
     details.push(
@@ -2369,7 +2206,7 @@ function buildChatgptAddResult(path, authHint, toolCheck) {
       message: `Run \`${AUTH_SETUP_HINT}\` or \`${AUTH_SET_KEY_HINT}\` first, then add ${ORGX_HOSTED_MCP_URL} as a custom connector in ChatGPT developer mode.`
     };
   }
-  if (!toolCheck || !toolCheck.ok) {
+  if (toolCheck && !toolCheck.ok && !toolCheck.skipped) {
     const failure = toolCheck?.error ?? "hosted MCP verification did not complete.";
     return {
       name: "chatgpt",
@@ -2382,7 +2219,7 @@ function buildChatgptAddResult(path, authHint, toolCheck) {
     name: "chatgpt",
     changed: false,
     ...path ? { path } : {},
-    message: `OrgX auth and hosted MCP access are verified. Add ${ORGX_HOSTED_MCP_URL} as a custom connector in ChatGPT developer mode, then run \`${DOCTOR_HINT}\` to confirm \`${toolCheck.toolName}\`.`
+    message: `OrgX auth is ready via ${formatAuthHintSource(authHint)}. Add ${ORGX_HOSTED_MCP_URL} as a custom connector in ChatGPT developer mode; ChatGPT will complete the OAuth flow there. Then run \`${DOCTOR_HINT}\` to verify hosted MCP health from this machine.`
   };
 }
 function buildChatgptRemoveResult(path) {
@@ -2520,8 +2357,7 @@ async function addAutomatedSurface(name) {
       if (!authHint) {
         return buildChatgptAddResult(path, null);
       }
-      const toolCheck = await checkHostedMcpToolAccess();
-      return buildChatgptAddResult(path, authHint, toolCheck);
+      return buildChatgptAddResult(path, authHint);
     }
     default:
       return {
@@ -2827,6 +2663,8 @@ var FOUNDER_DEMO_ARTIFACT_TYPE = "document";
 var FOUNDER_DEMO_ARTIFACT_DESCRIPTION = "Live founder demo generated by @useorgx/wizard after workspace bootstrap completed.";
 var ONBOARDING_TASK_TITLE = "Complete OrgX onboarding";
 var ONBOARDING_TASK_SUMMARY = "Starter onboarding task created by @useorgx/wizard so the first workspace has a clear follow-up after setup.";
+var ONBOARDING_WORKSTREAM_TITLE = "OrgX onboarding";
+var ONBOARDING_WORKSTREAM_SUMMARY = "Starter onboarding workstream created by @useorgx/wizard so the first workspace has a home for setup follow-up tasks.";
 function parseResponseBody3(text2) {
   if (!text2) {
     return null;
@@ -2910,6 +2748,15 @@ function parseTask(payload) {
     ...typeof entity.summary === "string" && entity.summary.trim().length > 0 ? { summary: entity.summary.trim() } : {}
   };
 }
+function parseWorkstream(payload) {
+  const entity = extractEntity(payload);
+  const id = typeof entity.id === "string" ? entity.id.trim() : "";
+  const title = typeof entity.title === "string" ? entity.title.trim() : typeof entity.name === "string" ? entity.name.trim() : "";
+  if (!id || !title) {
+    throw new Error("OrgX returned an incomplete workstream payload.");
+  }
+  return { id, title };
+}
 function toDemoInitiativeRecord(artifact, decision, initiative, liveUrl, workspace) {
   return {
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -2927,13 +2774,14 @@ function toDemoInitiativeRecord(artifact, decision, initiative, liveUrl, workspa
     workspaceName: workspace.name
   };
 }
-function toOnboardingTaskRecord(task, workspace, initiativeId) {
+function toOnboardingTaskRecord(task, workspace, options = {}) {
   return {
     createdAt: (/* @__PURE__ */ new Date()).toISOString(),
     id: task.id,
-    ...initiativeId ? { initiativeId } : {},
+    ...options.initiativeId ? { initiativeId: options.initiativeId } : {},
     ...task.status ? { status: task.status } : {},
     title: task.title,
+    ...options.workstreamId ? { workstreamId: options.workstreamId } : {},
     workspaceId: workspace.id,
     workspaceName: workspace.name
   };
@@ -3112,14 +2960,33 @@ async function ensureOnboardingTask(workspace, options = {}) {
       ...existingRecord.status ? { status: existingRecord.status } : {}
     };
   }
+  const initiativeId = options.initiativeId?.trim();
+  if (!initiativeId) {
+    throw new Error(
+      "Starter onboarding task requires an initiative context. Re-run setup with the founder preset or create an initiative before requesting onboarding tasks."
+    );
+  }
+  const workstream = await createEntity(
+    "workstream",
+    {
+      initiative_id: initiativeId,
+      status: "active",
+      summary: ONBOARDING_WORKSTREAM_SUMMARY,
+      title: ONBOARDING_WORKSTREAM_TITLE,
+      workspace_id: workspace.id
+    },
+    parseWorkstream,
+    options
+  );
   const task = await createEntity(
     "task",
     {
+      initiative_id: initiativeId,
       status: "todo",
       summary: ONBOARDING_TASK_SUMMARY,
       title: ONBOARDING_TASK_TITLE,
-      workspace_id: workspace.id,
-      ...options.initiativeId ? { initiative_id: options.initiativeId } : {}
+      workstream_id: workstream.id,
+      workspace_id: workspace.id
     },
     parseTask,
     options
@@ -3127,7 +2994,10 @@ async function ensureOnboardingTask(workspace, options = {}) {
   updateWizardState(
     (current) => ({
       ...current,
-      onboardingTask: toOnboardingTaskRecord(task, workspace, options.initiativeId)
+      onboardingTask: toOnboardingTaskRecord(task, workspace, {
+        initiativeId,
+        workstreamId: workstream.id
+      })
     }),
     options.statePath
   );
@@ -3414,7 +3284,7 @@ import {
 } from "fs";
 import { tmpdir } from "os";
 import { dirname as dirname3, join as join3, relative } from "path";
-var DEFAULT_ORGX_PLUGIN_TARGETS = ["claude", "codex", "openclaw"];
+var DEFAULT_ORGX_PLUGIN_TARGETS = ["cursor", "claude", "codex", "openclaw"];
 var ORGX_PLUGIN_GITHUB_OWNER = "useorgx";
 var ORGX_PLUGIN_GITHUB_REF = "main";
 var ORGX_CLAUDE_PLUGIN_NAME = "orgx-claude-code-plugin";
@@ -3453,7 +3323,8 @@ function defaultPluginPaths() {
     claudeMarketplaceManifestPath: CLAUDE_MANAGED_MARKETPLACE_MANIFEST_PATH,
     claudePluginDir: CLAUDE_MANAGED_PLUGIN_DIR,
     codexMarketplacePath: CODEX_MARKETPLACE_PATH,
-    codexPluginDir: CODEX_ORGX_PLUGIN_DIR
+    codexPluginDir: CODEX_ORGX_PLUGIN_DIR,
+    cursorRulePath: CURSOR_ORGX_RULE_PATH
   };
 }
 function resolvePluginPaths(paths = {}) {
@@ -3873,6 +3744,32 @@ async function getOpenclawInstallState(runner) {
     installed: extractOpenclawPluginIds(result.stdout).includes(ORGX_OPENCLAW_PLUGIN_ID)
   };
 }
+function buildCursorStatus(paths) {
+  const existingRules = readTextIfExists(paths.cursorRulePath);
+  const available = detectSurface("cursor").detected || existingRules !== null;
+  if (existingRules === CURSOR_RULES_CONTENT) {
+    return {
+      target: "cursor",
+      available: true,
+      installed: true,
+      message: "Cursor OrgX rules are installed."
+    };
+  }
+  if (existingRules !== null) {
+    return {
+      target: "cursor",
+      available: true,
+      installed: false,
+      message: "Cursor OrgX rules file exists, but differs from the managed rules."
+    };
+  }
+  return {
+    target: "cursor",
+    available,
+    installed: false,
+    message: available ? "Cursor is available and ready for OrgX rules install." : "Cursor was not detected."
+  };
+}
 async function buildClaudeStatus(paths, runner) {
   const state = await getClaudeInstallState(runner);
   if (state.installed) {
@@ -3988,6 +3885,30 @@ async function resolveOpenclawTarball(fetchImpl) {
     version: latestVersion
   };
 }
+function installCursorPlugin(paths) {
+  const existingRules = readTextIfExists(paths.cursorRulePath);
+  const available = detectSurface("cursor").detected || existingRules !== null;
+  if (!available) {
+    return {
+      target: "cursor",
+      changed: false,
+      message: "Cursor is not available on this machine."
+    };
+  }
+  if (existingRules === CURSOR_RULES_CONTENT) {
+    return {
+      target: "cursor",
+      changed: false,
+      message: "Cursor OrgX rules are already installed."
+    };
+  }
+  writeTextFile(paths.cursorRulePath, CURSOR_RULES_CONTENT);
+  return {
+    target: "cursor",
+    changed: true,
+    message: "Installed the managed Cursor OrgX rules."
+  };
+}
 async function installClaudePlugin(paths, fetchImpl, runner) {
   const state = await getClaudeInstallState(runner);
   if (!state.available) {
@@ -4094,6 +4015,29 @@ async function installOpenclawPlugin(fetchImpl, runner) {
     message: `Installed OpenClaw plugin ${ORGX_OPENCLAW_PLUGIN_ID} from ${ORGX_OPENCLAW_PLUGIN_PACKAGE_NAME}@${version}.`
   };
 }
+function uninstallCursorPlugin(paths) {
+  const existingRules = readTextIfExists(paths.cursorRulePath);
+  if (existingRules === null) {
+    return {
+      target: "cursor",
+      changed: false,
+      message: "Cursor OrgX rules were not installed."
+    };
+  }
+  if (existingRules !== CURSOR_RULES_CONTENT) {
+    return {
+      target: "cursor",
+      changed: false,
+      message: "Cursor rules file differs from the managed OrgX rules, so it was left in place."
+    };
+  }
+  const changed = deleteFileIfExists(paths.cursorRulePath);
+  return {
+    target: "cursor",
+    changed,
+    message: changed ? "Removed the managed Cursor OrgX rules." : "Cursor OrgX rules were not installed."
+  };
+}
 async function uninstallClaudePlugin(paths, runner) {
   const state = await getClaudeInstallState(runner);
   let changed = false;
@@ -4189,6 +4133,7 @@ async function listOrgxPluginStatuses(options = {}) {
   const paths = resolvePluginPaths(options.paths);
   const runner = resolveCommandRunner(options.commandRunner);
   return await Promise.all([
+    buildCursorStatus(paths),
     buildClaudeStatus(paths, runner),
     buildCodexStatus(paths, runner),
     buildOpenclawStatus(runner)
@@ -4205,6 +4150,9 @@ async function installOrgxPlugins(options = {}) {
   const results = [];
   for (const target of targets) {
     switch (target) {
+      case "cursor":
+        results.push(installCursorPlugin(paths));
+        break;
       case "claude":
         results.push(await installClaudePlugin(paths, fetchImpl, runner));
         break;
@@ -4225,6 +4173,9 @@ async function uninstallOrgxPlugins(options = {}) {
   const results = [];
   for (const target of targets) {
     switch (target) {
+      case "cursor":
+        results.push(uninstallCursorPlugin(paths));
+        break;
       case "claude":
         results.push(await uninstallClaudePlugin(paths, runner));
         break;
@@ -4691,6 +4642,8 @@ function formatAuthSource(source) {
 }
 function formatPluginTargetLabel(target) {
   switch (target) {
+    case "cursor":
+      return "Cursor rules";
     case "claude":
       return "Claude Code";
     case "codex":
@@ -4735,6 +4688,16 @@ function printPluginMutationReport(report) {
     );
   }
 }
+async function printPluginStatusSection() {
+  const spinner = createOrgxSpinner("Checking OrgX plugin and Cursor rules status");
+  spinner.start();
+  const statuses = await listOrgxPluginStatuses();
+  spinner.succeed("OrgX plugin and Cursor rules status checked");
+  console.log("");
+  console.log(pc3.dim("  plugins"));
+  printPluginStatusReport(statuses);
+  return statuses;
+}
 function printSkillInstallReport(report) {
   for (const write of report.writes) {
     const icon = write.changed ? ICON.ok : ICON.skip;
@@ -4837,8 +4800,9 @@ async function textPrompt(input) {
 }
 async function multiselectPrompt(input) {
   const promptInput = {
-    message: input.message,
+    message: `${input.message} ${pc3.dim("Space selects items; Enter continues.")}`,
     options: input.options,
+    ...input.initialValues ? { initialValues: input.initialValues } : {},
     ...input.required !== void 0 ? { required: input.required } : {}
   };
   return normalizePromptResult(await clack.multiselect(promptInput));
@@ -4943,8 +4907,9 @@ async function maybeConfigureOptionalWorkspaceAddOns(input) {
     return "skipped";
   }
   const existingState = readWizardState();
+  const effectiveInitiativeId = input.initiativeId?.trim() || (existingState?.demoInitiative?.workspaceId === input.workspace.id ? existingState.demoInitiative.id : void 0);
   const hasOnboardingTask = existingState?.onboardingTask?.workspaceId === input.workspace.id;
-  if (!hasOnboardingTask) {
+  if (!hasOnboardingTask && effectiveInitiativeId) {
     const onboardingChoice = await selectPrompt({
       message: `Create a starter onboarding task for ${input.workspace.name}?`,
       options: [
@@ -4957,34 +4922,40 @@ async function maybeConfigureOptionalWorkspaceAddOns(input) {
       return "cancelled";
     }
     if (onboardingChoice === "yes") {
-      const task = await ensureOnboardingTask(input.workspace, {
-        ...input.initiativeId ? { initiativeId: input.initiativeId } : {}
-      });
-      console.log(`  ${ICON.ok}  ${pc3.green("onboarding")} ${pc3.bold(task.title)}`);
-      await safeTrackWizardTelemetry(
-        "onboarding_task_created",
-        buildOnboardingTaskTelemetryProperties(
-          {
-            created: true,
-            hasInitiative: Boolean(input.initiativeId),
-            task
-          },
-          {
-            command: input.telemetry?.command ?? "setup",
-            ...input.telemetry?.preset ? { preset: input.telemetry.preset } : {}
-          }
-        )
-      );
+      try {
+        const task = await ensureOnboardingTask(input.workspace, {
+          initiativeId: effectiveInitiativeId
+        });
+        console.log(`  ${ICON.ok}  ${pc3.green("onboarding")} ${pc3.bold(task.title)}`);
+        await safeTrackWizardTelemetry(
+          "onboarding_task_created",
+          buildOnboardingTaskTelemetryProperties(
+            {
+              created: true,
+              hasInitiative: true,
+              task
+            },
+            {
+              command: input.telemetry?.command ?? "setup",
+              ...input.telemetry?.preset ? { preset: input.telemetry.preset } : {}
+            }
+          )
+        );
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        console.log(`  ${ICON.warn}  ${pc3.yellow("onboarding")} ${pc3.dim(message)}`);
+      }
     }
   }
   const refreshedState = readWizardState();
   const hasAgentRoster = refreshedState?.agentRoster?.workspaceId === input.workspace.id;
   if (!hasAgentRoster) {
     const rosterChoice = await selectPrompt({
+      initialValue: "default",
       message: `Set up an OrgX agent roster for ${input.workspace.name}?`,
       options: [
-        { value: "guided", label: "Choose agents and domains", hint: "recommended" },
-        { value: "default", label: "Install the full default roster" },
+        { value: "default", label: "Install the full default roster", hint: "recommended" },
+        { value: "guided", label: "Choose agents and domains" },
         { value: "no", label: "Skip roster setup" }
       ]
     });
@@ -5039,7 +5010,13 @@ async function promptOptionalCompanionPluginTargets(input) {
   if (!input.interactive) {
     return [];
   }
-  const statuses = await listOrgxPluginStatuses();
+  let statuses = input.statuses;
+  if (!statuses) {
+    const spinner = createOrgxSpinner("Checking optional OrgX plugin and Cursor rules status");
+    spinner.start();
+    statuses = await listOrgxPluginStatuses();
+    spinner.succeed("Optional OrgX plugin and Cursor rules status checked");
+  }
   const installable = statuses.filter((status) => status.available && !status.installed);
   if (installable.length === 0) {
     return [];
@@ -5090,7 +5067,8 @@ async function installSelectedCompanionPlugins(input) {
 }
 async function maybeInstallOptionalCompanionPlugins(input) {
   const selection = await promptOptionalCompanionPluginTargets({
-    interactive: input.interactive
+    interactive: input.interactive,
+    ...input.statuses ? { statuses: input.statuses } : {}
   });
   if (selection === "cancelled") {
     return "cancelled";
@@ -5178,7 +5156,7 @@ function printDoctorReport(report, assessment) {
 async function main() {
   const program = new Command();
   program.name("orgx-wizard").description("One-line CLI onboarding for OrgX surfaces.").showHelpAfterError();
-  const pkgVersion = true ? "0.1.8" : void 0;
+  const pkgVersion = true ? "0.1.10" : void 0;
   program.version(pkgVersion ?? "unknown", "-V, --version");
   program.hook("preAction", () => {
     console.log(renderBanner(pkgVersion));
@@ -5289,6 +5267,7 @@ async function main() {
     const results = await setupDetectedSurfaces();
     spinner.succeed("Detected surfaces configured");
     printMutationResults(results);
+    const pluginStatuses = await printPluginStatusSection();
     await safeTrackWizardTelemetry("mcp_injected", {
       changed_count: results.filter((result) => result.changed).length,
       preset: "standard",
@@ -5377,6 +5356,7 @@ async function main() {
       }
       const pluginInstallResult = await maybeInstallOptionalCompanionPlugins({
         interactive,
+        statuses: pluginStatuses,
         telemetry: { command: "setup", preset: "standard" }
       });
       if (pluginInstallResult === "cancelled") {
@@ -5547,6 +5527,51 @@ async function main() {
       );
     }
   });
+  program.command("uninstall").description("Remove OrgX-managed surfaces, companion plugins/rules, auth, and wizard state from this machine.").option("--keep-auth", "Keep the wizard-local saved OrgX API key.").option("--keep-state", "Keep wizard-local setup state.").option("--skip-plugins", "Skip companion plugin and Cursor rules removal.").option("--skip-surfaces", "Skip MCP surface config removal.").action(async (options) => {
+    await safeTrackWizardTelemetry("wizard_uninstalled", {
+      keep_auth: Boolean(options.keepAuth),
+      keep_state: Boolean(options.keepState),
+      skip_plugins: Boolean(options.skipPlugins),
+      skip_surfaces: Boolean(options.skipSurfaces)
+    });
+    console.log(pc3.bold("Removing OrgX wizard-managed configuration"));
+    if (options.skipSurfaces) {
+      console.log(`  ${ICON.skip}  ${pc3.bold("surfaces".padEnd(10))} ${pc3.dim("skipped")}`);
+    } else {
+      console.log("");
+      console.log(pc3.dim("  surfaces"));
+      const surfaceResults = removeSurface(["all"]);
+      printMutationResults(surfaceResults);
+    }
+    if (options.skipPlugins) {
+      console.log(`  ${ICON.skip}  ${pc3.bold("plugins".padEnd(12))} ${pc3.dim("skipped")}`);
+    } else {
+      console.log("");
+      console.log(pc3.dim("  plugins"));
+      const spinner = createOrgxSpinner("Removing OrgX companion plugins and rules");
+      spinner.start();
+      const pluginReport = await uninstallOrgxPlugins({ targets: ["all"] });
+      spinner.succeed("OrgX companion plugins and rules processed");
+      printPluginMutationReport(pluginReport);
+    }
+    console.log("");
+    if (options.keepAuth) {
+      console.log(`  ${ICON.skip}  ${pc3.bold("auth".padEnd(12))} ${pc3.dim("kept")}`);
+    } else {
+      const removedAuth = await clearWizardAuth();
+      const state = removedAuth ? pc3.green("updated  ") : pc3.dim("unchanged");
+      const message = removedAuth ? "Removed the wizard-local OrgX API key." : "No wizard-local OrgX API key was stored.";
+      console.log(`  ${removedAuth ? ICON.ok : ICON.skip}  ${pc3.bold("auth".padEnd(12))} ${state}  ${pc3.dim(message)}`);
+    }
+    if (options.keepState) {
+      console.log(`  ${ICON.skip}  ${pc3.bold("state".padEnd(12))} ${pc3.dim("kept")}`);
+    } else {
+      const removedState = clearWizardState();
+      const state = removedState ? pc3.green("updated  ") : pc3.dim("unchanged");
+      const message = removedState ? "Removed wizard-local setup state." : "No wizard-local setup state was stored.";
+      console.log(`  ${removedState ? ICON.ok : ICON.skip}  ${pc3.bold("state".padEnd(12))} ${state}  ${pc3.dim(message)}`);
+    }
+  });
   const surface = program.command("surface").description("Manage supported OrgX surfaces.");
   surface.command("list").description("Show supported surfaces and their current status.").action(() => {
     printSurfaceTable(listSurfaceStatuses());
@@ -5568,15 +5593,15 @@ async function main() {
     const results = removeMcpSurface(names);
     printMutationResults(results);
   });
-  const plugins = program.command("plugins").description("Install or remove companion OrgX plugins for Claude Code, Codex, and OpenClaw.");
+  const plugins = program.command("plugins").description("Install or remove Cursor rules and companion OrgX plugins for Claude Code, Codex, and OpenClaw.");
   plugins.command("list").description("Show companion plugin availability and install status.").action(async () => {
-    const spinner = createOrgxSpinner("Checking companion plugin status");
+    const spinner = createOrgxSpinner("Checking OrgX plugin and Cursor rules status");
     spinner.start();
     const statuses = await listOrgxPluginStatuses();
-    spinner.stop();
+    spinner.succeed("OrgX plugin and Cursor rules status checked");
     printPluginStatusReport(statuses);
   });
-  plugins.command("add").description("Install OrgX companion plugins into Claude Code, Codex, or OpenClaw.").argument("[targets...]", "claude, codex, openclaw, or all", ["all"]).action(async (targets) => {
+  plugins.command("add").description("Install Cursor OrgX rules or companion plugins into Claude Code, Codex, and OpenClaw.").argument("[targets...]", "cursor, claude, codex, openclaw, or all", ["all"]).action(async (targets) => {
     const spinner = createOrgxSpinner("Installing OrgX companion plugins");
     spinner.start();
     const report = await installOrgxPlugins({ targets });
@@ -5590,7 +5615,7 @@ async function main() {
       target_count: report.results.length
     });
   });
-  plugins.command("remove").description("Uninstall managed OrgX companion plugins from Claude Code, Codex, or OpenClaw.").argument("[targets...]", "claude, codex, openclaw, or all", ["all"]).action(async (targets) => {
+  plugins.command("remove").description("Uninstall managed Cursor OrgX rules or companion plugins from Claude Code, Codex, and OpenClaw.").argument("[targets...]", "cursor, claude, codex, openclaw, or all", ["all"]).action(async (targets) => {
     const spinner = createOrgxSpinner("Removing OrgX companion plugins");
     spinner.start();
     const report = await uninstallOrgxPlugins({ targets });