@useorgx/wizard 0.1.11 → 0.1.13

package/dist/cli.js

@@ -82,6 +82,8 @@ var CLAUDE_ORGX_SKILL_DIR = join(CLAUDE_SKILLS_DIR, "orgx");
 var CLAUDE_ORGX_SKILL_PATH = join(CLAUDE_ORGX_SKILL_DIR, "SKILL.md");
 var CURSOR_RULES_DIR = join(CURSOR_DIR, "rules");
 var CURSOR_ORGX_RULE_PATH = join(CURSOR_RULES_DIR, "orgx.md");
+var CURSOR_PLUGINS_DIR = join(CURSOR_DIR, "plugins", "local");
+var CURSOR_ORGX_PLUGIN_DIR = join(CURSOR_PLUGINS_DIR, "cursor-plugin");
 var CODEX_PLUGINS_DIR = join(CODEX_DIR, "plugins");
 var CODEX_ORGX_PLUGIN_DIR = join(CODEX_PLUGINS_DIR, "orgx-codex-plugin");
 var CODEX_MARKETPLACE_DIR = join(AGENTS_DIR, "plugins");
@@ -517,9 +519,6 @@ function normalizeOrgxBaseUrl(raw) {
 }
 function buildOrgxApiUrl(path, baseUrl) {
   const parsedBase = new URL(normalizeOrgxBaseUrl(baseUrl));
-  if (parsedBase.protocol === "https:" && normalizeHost(parsedBase.hostname) === "useorgx.com") {
-    parsedBase.hostname = "www.useorgx.com";
-  }
   const normalizedBase = parsedBase.toString().replace(/\/+$/, "");
   const apiBase = normalizedBase.endsWith("/api") ? normalizedBase : `${normalizedBase}/api`;
   const normalizedPath = path.startsWith("/") ? path : `/${path}`;
@@ -928,6 +927,24 @@ function parseDemoInitiative(value) {
     ...isNonEmptyString2(record.workspaceName) ? { workspaceName: record.workspaceName.trim() } : {}
   };
 }
+function parseFirstValueInitiative(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return void 0;
+  }
+  const record = value;
+  if (!isNonEmptyString2(record.id) || !isNonEmptyString2(record.title) || !isNonEmptyString2(record.liveUrl) || !isNonEmptyString2(record.createdAt)) {
+    return void 0;
+  }
+  return {
+    createdAt: record.createdAt.trim(),
+    id: record.id.trim(),
+    liveUrl: record.liveUrl.trim(),
+    ...isNonEmptyString2(record.summary) ? { summary: record.summary.trim() } : {},
+    title: record.title.trim(),
+    ...isNonEmptyString2(record.workspaceId) ? { workspaceId: record.workspaceId.trim() } : {},
+    ...isNonEmptyString2(record.workspaceName) ? { workspaceName: record.workspaceName.trim() } : {}
+  };
+}
 function parseOnboardingTask(value) {
   if (!value || typeof value !== "object" || Array.isArray(value)) {
     return void 0;
@@ -1024,6 +1041,7 @@ function sanitizeWizardStateRecord(record) {
   const continuity = parseContinuityDefaults(record.continuity);
   const agentRoster = parseAgentRoster(record.agentRoster);
   const demoInitiative = parseDemoInitiative(record.demoInitiative);
+  const firstValueInitiative = parseFirstValueInitiative(record.firstValueInitiative);
   const onboardingTask = parseOnboardingTask(record.onboardingTask);
   const skillFiles = parseSkillFiles(record.skillFiles);
   return {
@@ -1033,6 +1051,7 @@ function sanitizeWizardStateRecord(record) {
     ...continuity ? { continuity } : {},
     ...agentRoster ? { agentRoster } : {},
     ...demoInitiative ? { demoInitiative } : {},
+    ...firstValueInitiative ? { firstValueInitiative } : {},
     ...onboardingTask ? { onboardingTask } : {},
     ...skillFiles ? { skillFiles } : {}
   };
@@ -1053,6 +1072,10 @@ function readWizardState(statePath = ORGX_WIZARD_STATE_PATH) {
   if (agentRoster !== void 0) state.agentRoster = agentRoster;
   const demoInitiative = parseDemoInitiative(parsed.demoInitiative);
   if (demoInitiative !== void 0) state.demoInitiative = demoInitiative;
+  const firstValueInitiative = parseFirstValueInitiative(parsed.firstValueInitiative);
+  if (firstValueInitiative !== void 0) {
+    state.firstValueInitiative = firstValueInitiative;
+  }
   const onboardingTask = parseOnboardingTask(parsed.onboardingTask);
   if (onboardingTask !== void 0) state.onboardingTask = onboardingTask;
   const skillFiles = parseSkillFiles(parsed.skillFiles);
@@ -2704,6 +2727,8 @@ 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.";
+var FIRST_VALUE_INITIATIVE_TITLE = "Make OrgX useful on this machine";
+var FIRST_VALUE_INITIATIVE_SUMMARY = "First initiative created by @useorgx/wizard so setup ends with a live workspace, an onboarding workstream, and a clean handoff into the user's configured AI tools.";
 function parseResponseBody3(text2) {
   if (!text2) {
     return null;
@@ -2825,6 +2850,17 @@ function toOnboardingTaskRecord(task, workspace, options = {}) {
     workspaceName: workspace.name
   };
 }
+function toFirstValueInitiativeRecord(initiative, liveUrl, workspace) {
+  return {
+    createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+    id: initiative.id,
+    liveUrl,
+    ...initiative.summary ? { summary: initiative.summary } : {},
+    title: initiative.title,
+    workspaceId: workspace.id,
+    workspaceName: workspace.name
+  };
+}
 async function requireOrgxAuth2(options = {}) {
   const auth = await resolveOrgxAuth(options);
   if (!auth) {
@@ -2877,9 +2913,6 @@ async function updateEntity(type, id, body, parse2, options = {}) {
 }
 function buildLiveUrl(baseUrl, initiativeId) {
   const parsed = new URL(normalizeOrgxBaseUrl(baseUrl));
-  if (parsed.protocol === "https:" && parsed.hostname === "useorgx.com") {
-    parsed.hostname = "www.useorgx.com";
-  }
   parsed.pathname = `/live/${initiativeId}`;
   parsed.search = "";
   parsed.hash = "";
@@ -2990,6 +3023,43 @@ async function ensureFounderDemoInitiative(workspace, options = {}) {
     liveUrl
   };
 }
+async function ensureFirstValueInitiative(workspace, options = {}) {
+  const existingRecord = readWizardState(options.statePath)?.firstValueInitiative;
+  const matchingRecord = existingRecord?.workspaceId === workspace.id ? existingRecord : void 0;
+  const auth = await requireOrgxAuth2(options);
+  if (matchingRecord) {
+    return {
+      created: false,
+      initiative: {
+        id: matchingRecord.id,
+        title: matchingRecord.title,
+        ...matchingRecord.summary ? { summary: matchingRecord.summary } : {}
+      },
+      liveUrl: matchingRecord.liveUrl || buildLiveUrl(auth.baseUrl, matchingRecord.id)
+    };
+  }
+  const initiative = await createInitiative(
+    {
+      title: options.title?.trim() || FIRST_VALUE_INITIATIVE_TITLE,
+      summary: options.summary?.trim() || FIRST_VALUE_INITIATIVE_SUMMARY,
+      workspaceId: workspace.id
+    },
+    options
+  );
+  const liveUrl = buildLiveUrl(auth.baseUrl, initiative.id);
+  updateWizardState(
+    (current) => ({
+      ...current,
+      firstValueInitiative: toFirstValueInitiativeRecord(initiative, liveUrl, workspace)
+    }),
+    options.statePath
+  );
+  return {
+    created: true,
+    initiative,
+    liveUrl
+  };
+}
 async function ensureOnboardingTask(workspace, options = {}) {
   const existingRecord = readWizardState(options.statePath)?.onboardingTask;
   if (existingRecord?.workspaceId === workspace.id) {
@@ -3652,6 +3722,7 @@ var ORGX_PLUGIN_GITHUB_REF = "main";
 var ORGX_CLAUDE_PLUGIN_NAME = "orgx-claude-code-plugin";
 var ORGX_CLAUDE_MARKETPLACE_NAME = "orgx-local";
 var ORGX_CODEX_PLUGIN_NAME = "orgx-codex-plugin";
+var ORGX_CURSOR_PLUGIN_NAME = "cursor-plugin";
 var ORGX_OPENCLAW_PLUGIN_ID = "orgx";
 var ORGX_OPENCLAW_PLUGIN_PACKAGE_NAME = "@useorgx/openclaw-plugin";
 var CLAUDE_PLUGIN_SYNC_SPEC = {
@@ -3679,6 +3750,22 @@ var CODEX_PLUGIN_SYNC_SPEC = {
     { localPath: "skills", remotePath: "skills" }
   ]
 };
+var CURSOR_PLUGIN_SYNC_SPEC = {
+  owner: ORGX_PLUGIN_GITHUB_OWNER,
+  repo: ORGX_CURSOR_PLUGIN_NAME,
+  ref: ORGX_PLUGIN_GITHUB_REF,
+  include: [
+    { localPath: ".cursor-plugin", remotePath: ".cursor-plugin" },
+    { localPath: ".mcp.json", remotePath: ".mcp.json" },
+    { localPath: "agents", remotePath: "agents" },
+    { localPath: "assets", remotePath: "assets" },
+    { localPath: "commands", remotePath: "commands" },
+    { localPath: "hooks", remotePath: "hooks" },
+    { localPath: "rules", remotePath: "rules" },
+    { localPath: "scripts", remotePath: "scripts" },
+    { localPath: "skills", remotePath: "skills" }
+  ]
+};
 function defaultPluginPaths() {
   return {
     claudeMarketplaceDir: CLAUDE_MANAGED_MARKETPLACE_DIR,
@@ -3686,6 +3773,7 @@ function defaultPluginPaths() {
     claudePluginDir: CLAUDE_MANAGED_PLUGIN_DIR,
     codexMarketplacePath: CODEX_MARKETPLACE_PATH,
     codexPluginDir: CODEX_ORGX_PLUGIN_DIR,
+    cursorPluginDir: CURSOR_ORGX_PLUGIN_DIR,
     cursorRulePath: CURSOR_ORGX_RULE_PATH
   };
 }
@@ -4106,15 +4194,36 @@ async function getOpenclawInstallState(runner) {
     installed: extractOpenclawPluginIds(result.stdout).includes(ORGX_OPENCLAW_PLUGIN_ID)
   };
 }
+function cursorPluginManifestPath(paths) {
+  return join3(paths.cursorPluginDir, ".cursor-plugin", "plugin.json");
+}
+function cursorPluginMcpPath(paths) {
+  return join3(paths.cursorPluginDir, ".mcp.json");
+}
+function isCursorPluginInstalled(paths) {
+  return existsSync4(cursorPluginManifestPath(paths)) && existsSync4(cursorPluginMcpPath(paths));
+}
+function isCursorPluginAvailable(paths) {
+  return detectSurface("cursor").detected || existsSync4(paths.cursorPluginDir) || existsSync4(dirname3(paths.cursorPluginDir)) || readTextIfExists(paths.cursorRulePath) !== null;
+}
 function buildCursorStatus(paths) {
   const existingRules = readTextIfExists(paths.cursorRulePath);
-  const available = detectSurface("cursor").detected || existingRules !== null;
-  if (existingRules === CURSOR_RULES_CONTENT) {
+  const available = isCursorPluginAvailable(paths);
+  const installed = isCursorPluginInstalled(paths);
+  if (installed) {
     return {
       target: "cursor",
       available: true,
       installed: true,
-      message: "Cursor OrgX rules are installed."
+      message: "Cursor OrgX plugin bundle is installed."
+    };
+  }
+  if (existingRules === CURSOR_RULES_CONTENT) {
+    return {
+      target: "cursor",
+      available: true,
+      installed: false,
+      message: "Legacy Cursor OrgX rules are installed; run plugins add cursor to install the full plugin bundle."
     };
   }
   if (existingRules !== null) {
@@ -4122,14 +4231,14 @@ function buildCursorStatus(paths) {
       target: "cursor",
       available: true,
       installed: false,
-      message: "Cursor OrgX rules file exists, but differs from the managed rules."
+      message: "Cursor rules file exists, but the OrgX plugin bundle is missing."
     };
   }
   return {
     target: "cursor",
     available,
     installed: false,
-    message: available ? "Cursor is available and ready for OrgX rules install." : "Cursor was not detected."
+    message: available ? "Cursor is available and ready for OrgX plugin install." : "Cursor was not detected."
   };
 }
 async function buildClaudeStatus(paths, runner) {
@@ -4247,28 +4356,19 @@ async function resolveOpenclawTarball(fetchImpl) {
     version: latestVersion
   };
 }
-function installCursorPlugin(paths) {
-  const existingRules = readTextIfExists(paths.cursorRulePath);
-  const available = detectSurface("cursor").detected || existingRules !== null;
-  if (!available) {
+async function installCursorPlugin(paths, fetchImpl) {
+  if (!isCursorPluginAvailable(paths)) {
     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);
+  const syncResult = await syncManagedRepoTree(CURSOR_PLUGIN_SYNC_SPEC, paths.cursorPluginDir, fetchImpl);
   return {
     target: "cursor",
-    changed: true,
-    message: "Installed the managed Cursor OrgX rules."
+    changed: syncResult.changed,
+    message: syncResult.changed ? `Synced ${syncResult.fileCount} Cursor plugin files into ${paths.cursorPluginDir}. Reload Cursor to finish loading the plugin.` : "Cursor plugin bundle is already installed and up to date."
   };
 }
 async function installClaudePlugin(paths, fetchImpl, runner) {
@@ -4379,25 +4479,13 @@ async function installOpenclawPlugin(fetchImpl, runner) {
 }
 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);
+  const removedPluginDir = removePathIfExists(paths.cursorPluginDir);
+  const removedLegacyRules = existingRules === CURSOR_RULES_CONTENT ? deleteFileIfExists(paths.cursorRulePath) : false;
+  const changed = removedPluginDir || removedLegacyRules;
   return {
     target: "cursor",
     changed,
-    message: changed ? "Removed the managed Cursor OrgX rules." : "Cursor OrgX rules were not installed."
+    message: changed ? existingRules !== null && existingRules !== CURSOR_RULES_CONTENT ? "Removed the managed Cursor OrgX plugin bundle. Existing Cursor rules differ from managed OrgX rules, so they were left in place." : "Removed the managed Cursor OrgX plugin bundle and legacy managed Cursor rules." : existingRules !== null && existingRules !== CURSOR_RULES_CONTENT ? "Cursor plugin was not installed. Existing Cursor rules differ from managed OrgX rules, so they were left in place." : "Cursor plugin was not installed."
   };
 }
 async function uninstallClaudePlugin(paths, runner) {
@@ -4513,7 +4601,7 @@ async function installOrgxPlugins(options = {}) {
   for (const target of targets) {
     switch (target) {
       case "cursor":
-        results.push(installCursorPlugin(paths));
+        results.push(await installCursorPlugin(paths, fetchImpl));
         break;
       case "claude":
         results.push(await installClaudePlugin(paths, fetchImpl, runner));
@@ -4869,6 +4957,15 @@ function buildFounderDemoTelemetryProperties(result, base = {}) {
     base
   );
 }
+function buildFirstValueInitiativeTelemetryProperties(result, base = {}) {
+  return withBaseProperties(
+    {
+      created: result.created,
+      has_live_url: Boolean(result.liveUrl)
+    },
+    base
+  );
+}
 function buildDoctorTelemetryProperties(report, assessment, verification, base = {}) {
   const errorCount = assessment.issues.filter((issue) => issue.level === "error").length;
   const warningCount = assessment.issues.filter((issue) => issue.level === "warning").length;
@@ -5005,7 +5102,7 @@ function formatAuthSource(source) {
 function formatPluginTargetLabel(target) {
   switch (target) {
     case "cursor":
-      return "Cursor rules";
+      return "Cursor plugin";
     case "claude":
       return "Claude Code";
     case "codex":
@@ -5051,10 +5148,10 @@ function printPluginMutationReport(report) {
   }
 }
 async function printPluginStatusSection() {
-  const spinner = createOrgxSpinner("Checking OrgX plugin and Cursor rules status");
+  const spinner = createOrgxSpinner("Checking OrgX companion plugin status");
   spinner.start();
   const statuses = await listOrgxPluginStatuses();
-  spinner.succeed("OrgX plugin and Cursor rules status checked");
+  spinner.succeed("OrgX companion plugin status checked");
   console.log("");
   console.log(pc3.dim("  plugins"));
   printPluginStatusReport(statuses);
@@ -5161,6 +5258,41 @@ function printWorkspaceSetupResult(result) {
     console.log(`  ${ICON.skip}  ${pc3.dim(result.message)}`);
   }
 }
+function printSetupScopeNote() {
+  console.log(pc3.dim("  setup updates your AI tools with:"));
+  console.log(`  ${ICON.skip}  ${pc3.dim("MCP configs for local and cloud OrgX access")}`);
+  console.log(`  ${ICON.skip}  ${pc3.dim("OrgX agent skills, rules, prompts, commands, and hooks")}`);
+  console.log(`  ${ICON.skip}  ${pc3.dim("companion plugins where your editor supports them")}`);
+}
+function printFirstValueHandoff(input) {
+  const cmd = getCmd();
+  console.log("");
+  console.log(pc3.bold("first OrgX handoff"));
+  console.log(
+    `  ${input.initiative.created ? pc3.green("created") : pc3.yellow("ready")} ${pc3.bold(input.initiative.initiative.title)}`
+  );
+  console.log(`  live: ${input.initiative.liveUrl}`);
+  console.log(
+    `  ${pc3.dim("ask your AI tool:")} ${pc3.cyan(
+      `Use OrgX to continue "${input.initiative.initiative.title}" in ${input.workspace.name}. Show the next action, then start with the onboarding task.`
+    )}`
+  );
+  console.log(`  ${pc3.dim("later:")} ${pc3.cyan(`${cmd} doctor`)} ${pc3.dim("checks tool wiring")}`);
+}
+function firstValueRecordToResult(record) {
+  if (!record) {
+    return null;
+  }
+  return {
+    created: false,
+    initiative: {
+      id: record.id,
+      title: record.title,
+      ...record.summary ? { summary: record.summary } : {}
+    },
+    liveUrl: record.liveUrl
+  };
+}
 function printFounderPresetResult(result) {
   printMutationResults(result.surfaceResults);
   console.log("");
@@ -5201,7 +5333,7 @@ async function textPrompt(input) {
 }
 async function multiselectPrompt(input) {
   const promptInput = {
-    message: `${input.message} ${pc3.dim("Space selects items; Enter continues.")}`,
+    message: `${input.message} ${pc3.dim("Space to select, Enter to continue. Defaults are preselected.")}`,
     options: input.options,
     ...input.initialValues ? { initialValues: input.initialValues } : {},
     ...input.required !== void 0 ? { required: input.required } : {}
@@ -5308,25 +5440,96 @@ 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 && effectiveInitiativeId) {
-    const onboardingChoice = await selectPrompt({
-      message: `Create a starter onboarding task for ${input.workspace.name}?`,
+  const providedInitiativeId = input.initiativeId?.trim();
+  const storedDemoInitiative = existingState?.demoInitiative?.workspaceId === input.workspace.id ? existingState.demoInitiative : void 0;
+  const storedFirstValueInitiative = existingState?.firstValueInitiative?.workspaceId === input.workspace.id ? existingState.firstValueInitiative : void 0;
+  let effectiveInitiativeId = providedInitiativeId || storedDemoInitiative?.id || storedFirstValueInitiative?.id;
+  let firstValueInitiative = providedInitiativeId || storedDemoInitiative ? null : firstValueRecordToResult(storedFirstValueInitiative);
+  if (!effectiveInitiativeId) {
+    const firstInitiativeChoice = await selectPrompt({
+      initialValue: "yes",
+      message: `Create your first OrgX initiative in ${input.workspace.name}?`,
       options: [
-        { value: "yes", label: "Create onboarding task", hint: "recommended" },
-        { value: "no", label: "Skip task creation" }
+        {
+          value: "yes",
+          label: "Create first initiative",
+          hint: "recommended; gives setup a live next step"
+        },
+        { value: "no", label: "Skip initiative creation" }
       ]
     });
-    if (clack.isCancel(onboardingChoice)) {
+    if (clack.isCancel(firstInitiativeChoice)) {
       clack.cancel("Setup cancelled.");
       return "cancelled";
     }
-    if (onboardingChoice === "yes") {
+    if (firstInitiativeChoice === "yes") {
+      const title = await textPrompt({
+        initialValue: FIRST_VALUE_INITIATIVE_TITLE,
+        message: "What should OrgX help you move forward first?",
+        validate: (value) => {
+          if (!value || value.trim().length === 0) {
+            return "Enter an initiative title.";
+          }
+          return void 0;
+        }
+      });
+      if (clack.isCancel(title)) {
+        clack.cancel("Setup cancelled.");
+        return "cancelled";
+      }
+      const spinner = createOrgxSpinner("Creating your first OrgX initiative and live handoff");
+      spinner.start();
+      try {
+        firstValueInitiative = await ensureFirstValueInitiative(input.workspace, {
+          title: String(title)
+        });
+        spinner.succeed(
+          firstValueInitiative.created ? "First OrgX initiative created" : "First OrgX initiative ready"
+        );
+        effectiveInitiativeId = firstValueInitiative.initiative.id;
+        await safeTrackWizardTelemetry(
+          "first_value_initiative_ready",
+          buildFirstValueInitiativeTelemetryProperties(
+            firstValueInitiative,
+            {
+              command: input.telemetry?.command ?? "setup",
+              ...input.telemetry?.preset ? { preset: input.telemetry.preset } : {}
+            }
+          )
+        );
+      } catch (error) {
+        spinner.fail("First OrgX initiative was not created");
+        const message = error instanceof Error ? error.message : String(error);
+        console.log(`  ${ICON.warn}  ${pc3.yellow("initiative")} ${pc3.dim(message)}`);
+      }
+    }
+  }
+  const hasOnboardingTask = existingState?.onboardingTask?.workspaceId === input.workspace.id;
+  if (!hasOnboardingTask && effectiveInitiativeId) {
+    let shouldCreateOnboardingTask = firstValueInitiative !== null;
+    if (!shouldCreateOnboardingTask) {
+      const onboardingChoice = await selectPrompt({
+        initialValue: "yes",
+        message: `Create a starter onboarding task for ${input.workspace.name}?`,
+        options: [
+          { value: "yes", label: "Create onboarding task", hint: "recommended" },
+          { value: "no", label: "Skip task creation" }
+        ]
+      });
+      if (clack.isCancel(onboardingChoice)) {
+        clack.cancel("Setup cancelled.");
+        return "cancelled";
+      }
+      shouldCreateOnboardingTask = onboardingChoice === "yes";
+    }
+    if (shouldCreateOnboardingTask) {
+      const spinner = createOrgxSpinner("Creating onboarding workstream and starter task");
+      spinner.start();
       try {
         const task = await ensureOnboardingTask(input.workspace, {
           initiativeId: effectiveInitiativeId
         });
+        spinner.succeed("Onboarding workstream and starter task ready");
         console.log(`  ${ICON.ok}  ${pc3.green("onboarding")} ${pc3.bold(task.title)}`);
         await safeTrackWizardTelemetry(
           "onboarding_task_created",
@@ -5343,11 +5546,18 @@ async function maybeConfigureOptionalWorkspaceAddOns(input) {
           )
         );
       } catch (error) {
+        spinner.fail("Onboarding task was not created");
         const message = error instanceof Error ? error.message : String(error);
         console.log(`  ${ICON.warn}  ${pc3.yellow("onboarding")} ${pc3.dim(message)}`);
       }
     }
   }
+  if (firstValueInitiative) {
+    printFirstValueHandoff({
+      initiative: firstValueInitiative,
+      workspace: input.workspace
+    });
+  }
   const refreshedState = readWizardState();
   const hasAgentRoster = refreshedState?.agentRoster?.workspaceId === input.workspace.id;
   if (!hasAgentRoster) {
@@ -5413,17 +5623,18 @@ async function promptOptionalCompanionPluginTargets(input) {
   }
   let statuses = input.statuses;
   if (!statuses) {
-    const spinner = createOrgxSpinner("Checking optional OrgX plugin and Cursor rules status");
+    const spinner = createOrgxSpinner("Checking optional OrgX companion plugin status");
     spinner.start();
     statuses = await listOrgxPluginStatuses();
-    spinner.succeed("Optional OrgX plugin and Cursor rules status checked");
+    spinner.succeed("Optional OrgX companion plugin status checked");
   }
   const installable = statuses.filter((status) => status.available && !status.installed);
   if (installable.length === 0) {
     return [];
   }
   const selection = await multiselectPrompt({
-    message: "Install OrgX companion plugins/rules into your detected AI tools?",
+    initialValues: installable.map((status) => status.target),
+    message: "Install OrgX companion plugins into your detected AI tools?",
     options: installable.map((status) => ({
       value: status.target,
       label: `Install ${formatPluginTargetLabel(status.target)}`,
@@ -5438,12 +5649,12 @@ async function promptOptionalCompanionPluginTargets(input) {
   return selection;
 }
 function printPluginSkillOwnershipNote(targets) {
-  if (!targets.some((target) => target === "claude" || target === "codex")) {
+  if (!targets.some((target) => target === "cursor" || target === "claude" || target === "codex")) {
     return;
   }
   console.log(
     `  ${ICON.skip}  ${pc3.dim(
-      "Claude Code and Codex companion plugins carry their own OrgX skills. Use 'wizard skills add' for Cursor rules or standalone Claude setup when those plugins are not in play."
+      "Cursor, Claude Code, and Codex companion plugins carry their own OrgX skills, rules, MCP config, commands, hooks, and agent prompts. Use 'wizard skills add' only for standalone rules or skills when those plugins are not in play."
     )}`
   );
 }
@@ -5451,10 +5662,10 @@ async function installSelectedCompanionPlugins(input) {
   if (input.targets.length === 0) {
     return "skipped";
   }
-  const spinner = createOrgxSpinner("Installing OrgX companion plugins/rules");
+  const spinner = createOrgxSpinner("Installing OrgX companion plugins");
   spinner.start();
   const report = await installOrgxPlugins({ targets: input.targets });
-  spinner.succeed("OrgX companion plugins/rules processed");
+  spinner.succeed("OrgX companion plugins processed");
   printPluginMutationReport(report);
   printPluginSkillOwnershipNote(input.targets);
   await safeTrackWizardTelemetry("plugins_installed", {
@@ -5557,7 +5768,7 @@ function printDoctorReport(report, assessment) {
 async function main() {
   const program = new Command();
   program.name("orgx-wizard").description("Add OrgX MCP configs, skills/rules, and companion plugins to your local AI tools.").showHelpAfterError();
-  const pkgVersion = true ? "0.1.11" : void 0;
+  const pkgVersion = true ? "0.1.13" : void 0;
   program.version(pkgVersion ?? "unknown", "-V, --version");
   program.hook("preAction", () => {
     console.log(renderBanner(pkgVersion));
@@ -5569,6 +5780,8 @@ async function main() {
       interactive,
       preset: options.preset ?? "standard"
     });
+    printSetupScopeNote();
+    console.log("");
     if (options.preset) {
       if (options.preset !== "founder") {
         throw new Error(`Unknown setup preset '${options.preset}'. Supported presets: founder.`);
@@ -5928,7 +6141,7 @@ async function main() {
       );
     }
   });
-  program.command("uninstall").description("Remove OrgX-managed MCP tool configs, 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 tool config removal.").action(async (options) => {
+  program.command("uninstall").description("Remove OrgX-managed MCP tool configs, companion plugins, 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 legacy Cursor rules removal.").option("--skip-surfaces", "Skip MCP tool config removal.").action(async (options) => {
     await safeTrackWizardTelemetry("wizard_uninstalled", {
       keep_auth: Boolean(options.keepAuth),
       keep_state: Boolean(options.keepState),
@@ -5949,10 +6162,10 @@ async function main() {
     } else {
       console.log("");
       console.log(pc3.dim("  plugins"));
-      const spinner = createOrgxSpinner("Removing OrgX companion plugins and rules");
+      const spinner = createOrgxSpinner("Removing OrgX companion plugins and legacy Cursor rules");
       spinner.start();
       const pluginReport = await uninstallOrgxPlugins({ targets: ["all"] });
-      spinner.succeed("OrgX companion plugins and rules processed");
+      spinner.succeed("OrgX companion plugins and legacy Cursor rules processed");
       printPluginMutationReport(pluginReport);
     }
     console.log("");
@@ -5994,19 +6207,19 @@ async function main() {
     const results = removeMcpSurface(names);
     printMutationResults(results);
   });
-  const plugins = program.command("plugins").description("Install or remove OrgX companion plugins/rules in Cursor, Claude Code, Codex, and OpenClaw.");
-  plugins.command("list").description("Show companion plugin/rules availability and install status in your tools.").action(async () => {
-    const spinner = createOrgxSpinner("Checking OrgX plugin and Cursor rules status");
+  const plugins = program.command("plugins").description("Install or remove OrgX companion plugins in Cursor, Claude Code, Codex, and OpenClaw.");
+  plugins.command("list").description("Show companion plugin availability and install status in your tools.").action(async () => {
+    const spinner = createOrgxSpinner("Checking OrgX companion plugin status");
     spinner.start();
     const statuses = await listOrgxPluginStatuses();
-    spinner.succeed("OrgX plugin and Cursor rules status checked");
+    spinner.succeed("OrgX companion plugin status checked");
     printPluginStatusReport(statuses);
   });
-  plugins.command("add").description("Install OrgX companion plugins/rules into Cursor, Claude Code, Codex, and OpenClaw.").argument("[targets...]", "cursor, claude, codex, openclaw, or all", ["all"]).action(async (targets) => {
-    const spinner = createOrgxSpinner("Installing OrgX companion plugins/rules");
+  plugins.command("add").description("Install OrgX companion plugins into Cursor, 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 });
-    spinner.succeed("OrgX companion plugins/rules processed");
+    spinner.succeed("OrgX companion plugins processed");
     printPluginMutationReport(report);
     printPluginSkillOwnershipNote(report.results.map((result) => result.target));
     await safeTrackWizardTelemetry("plugins_installed", {
@@ -6016,11 +6229,11 @@ async function main() {
       target_count: report.results.length
     });
   });
-  plugins.command("remove").description("Uninstall managed OrgX companion plugins/rules from Cursor, Claude Code, Codex, and OpenClaw.").argument("[targets...]", "cursor, claude, codex, openclaw, or all", ["all"]).action(async (targets) => {
-    const spinner = createOrgxSpinner("Removing OrgX companion plugins/rules");
+  plugins.command("remove").description("Uninstall managed OrgX companion plugins and legacy managed Cursor rules from Cursor, Claude Code, Codex, and OpenClaw.").argument("[targets...]", "cursor, claude, codex, openclaw, or all", ["all"]).action(async (targets) => {
+    const spinner = createOrgxSpinner("Removing OrgX companion plugins and legacy Cursor rules");
     spinner.start();
     const report = await uninstallOrgxPlugins({ targets });
-    spinner.succeed("OrgX companion plugins/rules removed");
+    spinner.succeed("OrgX companion plugins and legacy Cursor rules processed");
     printPluginMutationReport(report);
     await safeTrackWizardTelemetry("plugins_removed", {
       changed_count: countPluginReportChanges(report),