@useorgx/wizard 0.1.23 → 0.1.25

package/dist/cli.js

@@ -1337,6 +1337,80 @@ function parsePeopleFirstCapture(value) {
     entries
   };
 }
+function parseDailyBriefOnboardingEntry(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return void 0;
+  }
+  const record = value;
+  const status = record.status;
+  if (!isNonEmptyString2(record.workspaceId) || status !== "completed" && status !== "skipped") {
+    return void 0;
+  }
+  const completedAt = isNonEmptyString2(record.completedAt) ? record.completedAt.trim() : void 0;
+  const skippedAt = isNonEmptyString2(record.skippedAt) ? record.skippedAt.trim() : void 0;
+  if (status === "completed" && !completedAt) return void 0;
+  if (status === "skipped" && !skippedAt) return void 0;
+  return {
+    workspaceId: record.workspaceId.trim(),
+    status,
+    ...completedAt ? { completedAt } : {},
+    ...skippedAt ? { skippedAt } : {},
+    ...isNonEmptyString2(record.workspaceName) ? { workspaceName: record.workspaceName.trim() } : {}
+  };
+}
+function parseDailyBriefOnboarding(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return void 0;
+  }
+  const record = value;
+  if (!isNonEmptyString2(record.updatedAt) || !Array.isArray(record.entries)) {
+    return void 0;
+  }
+  const entries = record.entries.map((entry) => parseDailyBriefOnboardingEntry(entry)).filter(
+    (entry) => Boolean(entry)
+  );
+  if (entries.length === 0) return void 0;
+  return {
+    updatedAt: record.updatedAt.trim(),
+    entries
+  };
+}
+function isSetupPromptKey(value) {
+  return value === "first_initiative" || value === "onboarding_task" || value === "agent_roster" || value === "setup_intent";
+}
+function parseSetupPromptDecisionEntry(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return void 0;
+  }
+  const record = value;
+  if (!isNonEmptyString2(record.workspaceId) || !isSetupPromptKey(record.promptKey) || record.status !== "skipped" || !isNonEmptyString2(record.skippedAt)) {
+    return void 0;
+  }
+  return {
+    promptKey: record.promptKey,
+    skippedAt: record.skippedAt.trim(),
+    status: "skipped",
+    workspaceId: record.workspaceId.trim(),
+    ...isNonEmptyString2(record.workspaceName) ? { workspaceName: record.workspaceName.trim() } : {}
+  };
+}
+function parseSetupPromptDecisions(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return void 0;
+  }
+  const record = value;
+  if (!isNonEmptyString2(record.updatedAt) || !Array.isArray(record.entries)) {
+    return void 0;
+  }
+  const entries = record.entries.map((entry) => parseSetupPromptDecisionEntry(entry)).filter(
+    (entry) => Boolean(entry)
+  );
+  if (entries.length === 0) return void 0;
+  return {
+    updatedAt: record.updatedAt.trim(),
+    entries
+  };
+}
 function createWizardState(now = (/* @__PURE__ */ new Date()).toISOString()) {
   return {
     installationId: `wizard-${randomUUID()}`,
@@ -1352,6 +1426,8 @@ function sanitizeWizardStateRecord(record) {
   const onboardingTask = parseOnboardingTask(record.onboardingTask);
   const skillFiles = parseSkillFiles(record.skillFiles);
   const peopleFirstCapture = parsePeopleFirstCapture(record.peopleFirstCapture);
+  const dailyBriefOnboarding = parseDailyBriefOnboarding(record.dailyBriefOnboarding);
+  const setupPromptDecisions = parseSetupPromptDecisions(record.setupPromptDecisions);
   return {
     installationId: record.installationId.trim(),
     createdAt: record.createdAt.trim(),
@@ -1362,7 +1438,9 @@ function sanitizeWizardStateRecord(record) {
     ...firstValueInitiative ? { firstValueInitiative } : {},
     ...onboardingTask ? { onboardingTask } : {},
     ...skillFiles ? { skillFiles } : {},
-    ...peopleFirstCapture ? { peopleFirstCapture } : {}
+    ...peopleFirstCapture ? { peopleFirstCapture } : {},
+    ...dailyBriefOnboarding ? { dailyBriefOnboarding } : {},
+    ...setupPromptDecisions ? { setupPromptDecisions } : {}
   };
 }
 function readWizardState(statePath = ORGX_WIZARD_STATE_PATH) {
@@ -1391,8 +1469,70 @@ function readWizardState(statePath = ORGX_WIZARD_STATE_PATH) {
   if (skillFiles !== void 0) state.skillFiles = skillFiles;
   const peopleFirstCapture = parsePeopleFirstCapture(parsed.peopleFirstCapture);
   if (peopleFirstCapture !== void 0) state.peopleFirstCapture = peopleFirstCapture;
+  const dailyBriefOnboarding = parseDailyBriefOnboarding(parsed.dailyBriefOnboarding);
+  if (dailyBriefOnboarding !== void 0) {
+    state.dailyBriefOnboarding = dailyBriefOnboarding;
+  }
+  const setupPromptDecisions = parseSetupPromptDecisions(parsed.setupPromptDecisions);
+  if (setupPromptDecisions !== void 0) {
+    state.setupPromptDecisions = setupPromptDecisions;
+  }
   return state;
 }
+function getDailyBriefOnboardingDecision(workspaceId, statePath = ORGX_WIZARD_STATE_PATH) {
+  const state = readWizardState(statePath);
+  return state?.dailyBriefOnboarding?.entries.find(
+    (entry) => entry.workspaceId === workspaceId
+  ) ?? null;
+}
+function recordDailyBriefOnboardingDecision(entry, statePath = ORGX_WIZARD_STATE_PATH) {
+  return updateWizardState((current) => {
+    const existingEntries = current.dailyBriefOnboarding?.entries ?? [];
+    const withoutExisting = existingEntries.filter(
+      (e) => e.workspaceId !== entry.workspaceId
+    );
+    return {
+      ...current,
+      dailyBriefOnboarding: {
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        entries: [...withoutExisting, entry]
+      }
+    };
+  }, statePath);
+}
+function getSetupPromptDecision(workspaceId, promptKey, statePath = ORGX_WIZARD_STATE_PATH) {
+  const state = readWizardState(statePath);
+  return state?.setupPromptDecisions?.entries.find(
+    (entry) => entry.workspaceId === workspaceId && entry.promptKey === promptKey
+  ) ?? null;
+}
+function hasSetupPromptSkip(workspaceId, promptKey, statePath = ORGX_WIZARD_STATE_PATH) {
+  return getSetupPromptDecision(workspaceId, promptKey, statePath) !== null;
+}
+function recordSetupPromptSkip(entry, statePath = ORGX_WIZARD_STATE_PATH) {
+  return updateWizardState((current) => {
+    const existingEntries = current.setupPromptDecisions?.entries ?? [];
+    const withoutExisting = existingEntries.filter(
+      (existing) => !(existing.workspaceId === entry.workspaceId && existing.promptKey === entry.promptKey)
+    );
+    return {
+      ...current,
+      setupPromptDecisions: {
+        updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
+        entries: [
+          ...withoutExisting,
+          {
+            promptKey: entry.promptKey,
+            skippedAt: entry.skippedAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+            status: "skipped",
+            workspaceId: entry.workspaceId,
+            ...entry.workspaceName ? { workspaceName: entry.workspaceName } : {}
+          }
+        ]
+      }
+    };
+  }, statePath);
+}
 function writeWizardState(value, statePath = ORGX_WIZARD_STATE_PATH) {
   const record = sanitizeWizardStateRecord(value);
   writeJsonFile(statePath, record, { mode: 384 });
@@ -5104,6 +5244,14 @@ async function runWorkspaceSetup(client, prompts, options) {
     }
     return createAndSelectWorkspace(client, prompts);
   }
+  if (options.skipIfConfigured && currentWorkspace) {
+    return {
+      defaultChanged: false,
+      message: `Using "${currentWorkspace.name}" as the default OrgX workspace.`,
+      status: "unchanged",
+      workspace: currentWorkspace
+    };
+  }
   const initialWorkspaceId = currentWorkspace?.id ?? workspaces.find((workspace) => workspace.isDefault)?.id ?? workspaces[0]?.id;
   const selected = await prompts.select({
     message: "Choose the OrgX workspace this machine should use by default.",
@@ -5744,20 +5892,73 @@ var BASELINE_PROMPTS = [
   { task_type: "launch_post", label: "Launch post", placeholder: "60" },
   { task_type: "architecture_doc", label: "Architecture doc", placeholder: "90" }
 ];
+var DAILY_BRIEF_SETUP_CHOICES = {
+  defaults: "defaults",
+  customize: "customize",
+  skip: "skip"
+};
+function buildDefaultBaselines() {
+  return BASELINE_PROMPTS.map((bp) => ({
+    task_type: bp.task_type,
+    minutes: Number.parseInt(bp.placeholder, 10),
+    confidence: 0.4
+  }));
+}
+function buildDefaultGoals() {
+  return [
+    {
+      goal_type: "time_saved_weekly",
+      target_value: 180,
+      unit: "minutes",
+      period: "weekly"
+    }
+  ];
+}
+function normalizeSendTime(value) {
+  return value.trim().length === 4 ? `0${value.trim()}` : value.trim();
+}
+function recordSkipped(workspace, statePath) {
+  recordDailyBriefOnboardingDecision(
+    {
+      workspaceId: workspace.id,
+      workspaceName: workspace.name,
+      status: "skipped",
+      skippedAt: (/* @__PURE__ */ new Date()).toISOString()
+    },
+    statePath
+  );
+  return {
+    status: "skipped_user",
+    message: "Daily Brief setup skipped. Run `wizard setup --daily-brief` when ready."
+  };
+}
 async function runDailyBriefOnboarding(options) {
-  if (!options.interactive) {
-    return {
-      status: "skipped_non_interactive",
-      message: "Daily Brief onboarding skipped \u2014 not attached to a TTY."
-    };
-  }
   if (!options.workspace) {
     return {
       status: "skipped_no_workspace",
       message: "Daily Brief onboarding skipped \u2014 no workspace resolved."
     };
   }
-  const auth = await resolveOrgxAuth();
+  if (options.skip) {
+    return recordSkipped(options.workspace, options.statePath);
+  }
+  const localDecision = getDailyBriefOnboardingDecision(
+    options.workspace.id,
+    options.statePath
+  );
+  if (!options.force && localDecision) {
+    return {
+      status: "skipped_already_completed",
+      message: localDecision.status === "completed" ? "Daily Brief onboarding already completed for this workspace." : "Daily Brief setup was skipped for this workspace. Run `wizard setup --daily-brief` to configure."
+    };
+  }
+  if (!options.interactive) {
+    return {
+      status: "skipped_non_interactive",
+      message: "Daily Brief onboarding skipped \u2014 not attached to a TTY."
+    };
+  }
+  const auth = await resolveOrgxAuth(options.authOptions);
   if (!auth) {
     return {
       status: "failed",
@@ -5769,6 +5970,15 @@ async function runDailyBriefOnboarding(options) {
   if (state) {
     const row = state.workspaces.find((w) => w.id === options.workspace.id);
     if (row?.onboardingCompletedAt) {
+      recordDailyBriefOnboardingDecision(
+        {
+          workspaceId: options.workspace.id,
+          workspaceName: options.workspace.name,
+          status: "completed",
+          completedAt: row.onboardingCompletedAt
+        },
+        options.statePath
+      );
       return {
         status: "skipped_already_completed",
         message: "Daily Brief onboarding already completed for this workspace."
@@ -5776,93 +5986,116 @@ async function runDailyBriefOnboarding(options) {
     }
   }
   const { prompts } = options;
-  const proceed = await prompts.confirm({
-    message: "Set up your Daily Brief? (captures baselines so tomorrow's brief can show real time-saved numbers)",
-    initialValue: true
+  const setupChoice = await prompts.select({
+    message: "Set up Daily Brief now?",
+    initialValue: DAILY_BRIEF_SETUP_CHOICES.defaults,
+    options: [
+      {
+        value: DAILY_BRIEF_SETUP_CHOICES.defaults,
+        label: "Use defaults",
+        hint: "20m code review, 45m PRD, 07:00 daily."
+      },
+      {
+        value: DAILY_BRIEF_SETUP_CHOICES.customize,
+        label: "Customize baselines",
+        hint: "Answer baseline and delivery questions."
+      },
+      {
+        value: DAILY_BRIEF_SETUP_CHOICES.skip,
+        label: "Skip and remember",
+        hint: "Do not ask again unless you pass --daily-brief."
+      }
+    ]
   });
-  if (prompts.isCancel(proceed)) {
+  if (prompts.isCancel(setupChoice)) {
     return { status: "cancelled", message: "Daily Brief onboarding cancelled." };
   }
-  if (!proceed) {
-    return {
-      status: "cancelled",
-      message: "Skipped \u2014 run `wizard brief setup` later to configure."
-    };
+  if (setupChoice === DAILY_BRIEF_SETUP_CHOICES.skip) {
+    return recordSkipped(options.workspace, options.statePath);
+  }
+  const shouldCustomize = setupChoice === DAILY_BRIEF_SETUP_CHOICES.customize;
+  const baselines = shouldCustomize ? [] : buildDefaultBaselines();
+  if (shouldCustomize) {
+    for (const bp of BASELINE_PROMPTS) {
+      const answer = await prompts.text({
+        message: `${bp.label} minutes`,
+        placeholder: bp.placeholder,
+        validate(value) {
+          if (!value || value.trim() === "") return void 0;
+          const n = Number.parseInt(value, 10);
+          if (!Number.isFinite(n) || n <= 0 || n > 24 * 60) {
+            return "Enter 1-1440 or leave blank.";
+          }
+          return void 0;
+        }
+      });
+      if (prompts.isCancel(answer)) {
+        return { status: "cancelled", message: "Daily Brief onboarding cancelled." };
+      }
+      if (typeof answer === "string" && answer.trim() !== "") {
+        const minutes = Number.parseInt(answer, 10);
+        if (Number.isFinite(minutes) && minutes > 0) {
+          baselines.push({ task_type: bp.task_type, minutes, confidence: 0.5 });
+        }
+      }
+    }
   }
-  const baselines = [];
-  for (const bp of BASELINE_PROMPTS) {
-    const answer = await prompts.text({
-      message: `How long does ${bp.label.toLowerCase()} usually take? (minutes, blank to skip)`,
-      placeholder: bp.placeholder,
+  const goals = shouldCustomize ? [] : buildDefaultGoals();
+  if (shouldCustomize) {
+    const goalAnswer = await prompts.text({
+      message: "Weekly time-saved target minutes",
+      placeholder: "180",
       validate(value) {
         if (!value || value.trim() === "") return void 0;
         const n = Number.parseInt(value, 10);
-        if (!Number.isFinite(n) || n <= 0 || n > 24 * 60) {
-          return "Enter 1 \u2013 1440 or leave blank.";
+        if (!Number.isFinite(n) || n <= 0) {
+          return "Enter a positive number or leave blank.";
         }
         return void 0;
       }
     });
-    if (prompts.isCancel(answer)) {
+    if (prompts.isCancel(goalAnswer)) {
       return { status: "cancelled", message: "Daily Brief onboarding cancelled." };
     }
-    if (typeof answer === "string" && answer.trim() !== "") {
-      const minutes = Number.parseInt(answer, 10);
-      if (Number.isFinite(minutes) && minutes > 0) {
-        baselines.push({ task_type: bp.task_type, minutes, confidence: 0.5 });
+    if (typeof goalAnswer === "string" && goalAnswer.trim() !== "") {
+      const target = Number.parseInt(goalAnswer, 10);
+      if (Number.isFinite(target) && target > 0) {
+        goals.push({
+          goal_type: "time_saved_weekly",
+          target_value: target,
+          unit: "minutes",
+          period: "weekly"
+        });
       }
     }
   }
-  const goals = [];
-  const goalAnswer = await prompts.text({
-    message: "Weekly time saved target (minutes, blank to skip)",
-    placeholder: "180",
-    validate(value) {
-      if (!value || value.trim() === "") return void 0;
-      const n = Number.parseInt(value, 10);
-      if (!Number.isFinite(n) || n <= 0) {
-        return "Enter a positive number or leave blank.";
+  let sendTimeLocal = "07:00";
+  let onlyOnAttention = false;
+  if (shouldCustomize) {
+    const sendTimeAnswer = await prompts.text({
+      message: "Daily brief time (HH:MM)",
+      placeholder: "07:00",
+      validate(value) {
+        if (!value || value.trim() === "") return void 0;
+        if (!/^\d{1,2}:\d{2}$/.test(value.trim())) {
+          return "Use HH:MM (24h).";
+        }
+        return void 0;
       }
-      return void 0;
-    }
-  });
-  if (prompts.isCancel(goalAnswer)) {
-    return { status: "cancelled", message: "Daily Brief onboarding cancelled." };
-  }
-  if (typeof goalAnswer === "string" && goalAnswer.trim() !== "") {
-    const target = Number.parseInt(goalAnswer, 10);
-    if (Number.isFinite(target) && target > 0) {
-      goals.push({
-        goal_type: "time_saved_weekly",
-        target_value: target,
-        unit: "minutes",
-        period: "weekly"
-      });
+    });
+    if (prompts.isCancel(sendTimeAnswer)) {
+      return { status: "cancelled", message: "Daily Brief onboarding cancelled." };
     }
-  }
-  const sendTimeAnswer = await prompts.text({
-    message: "When should your daily brief arrive? (HH:MM local, default 07:00)",
-    placeholder: "07:00",
-    validate(value) {
-      if (!value || value.trim() === "") return void 0;
-      if (!/^\d{1,2}:\d{2}$/.test(value.trim())) {
-        return "Use HH:MM (24h).";
-      }
-      return void 0;
+    sendTimeLocal = typeof sendTimeAnswer === "string" && sendTimeAnswer.trim() ? normalizeSendTime(sendTimeAnswer) : "07:00";
+    const onlyOnAttentionAnswer = await prompts.confirm({
+      message: "Email only when attention is needed?",
+      initialValue: false
+    });
+    if (prompts.isCancel(onlyOnAttentionAnswer)) {
+      return { status: "cancelled", message: "Daily Brief onboarding cancelled." };
     }
-  });
-  if (prompts.isCancel(sendTimeAnswer)) {
-    return { status: "cancelled", message: "Daily Brief onboarding cancelled." };
-  }
-  const sendTimeLocal = typeof sendTimeAnswer === "string" && sendTimeAnswer.trim() ? sendTimeAnswer.trim().length === 4 ? `0${sendTimeAnswer.trim()}` : sendTimeAnswer.trim() : "07:00";
-  const onlyOnAttentionAnswer = await prompts.confirm({
-    message: "Only email when something needs your attention?",
-    initialValue: false
-  });
-  if (prompts.isCancel(onlyOnAttentionAnswer)) {
-    return { status: "cancelled", message: "Daily Brief onboarding cancelled." };
+    onlyOnAttention = Boolean(onlyOnAttentionAnswer);
   }
-  const onlyOnAttention = Boolean(onlyOnAttentionAnswer);
   const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC";
   const commitPayload = {
     workspace_id: options.workspace.id,
@@ -5904,6 +6137,15 @@ async function runDailyBriefOnboarding(options) {
   }
   const commitBody = await commitResponse.json().catch(() => ({}));
   const previewUrl = typeof commitBody.daily_brief_preview_url === "string" ? commitBody.daily_brief_preview_url : "/today?mode=preview";
+  recordDailyBriefOnboardingDecision(
+    {
+      workspaceId: options.workspace.id,
+      workspaceName: options.workspace.name,
+      status: "completed",
+      completedAt: (/* @__PURE__ */ new Date()).toISOString()
+    },
+    options.statePath
+  );
   return {
     status: "completed",
     message: "Your Daily Brief is configured. First brief lands tomorrow.",
@@ -7224,6 +7466,9 @@ async function maybeCaptureSetupIntent(input) {
   if (!input.interactive || !input.workspace) {
     return "skipped";
   }
+  if (hasSetupPromptSkip(input.workspace.id, "setup_intent")) {
+    return "skipped";
+  }
   const prompt = await textPrompt({
     message: "In one line, what do you want OrgX to move first? (blank to skip \u2014 you can start from the dashboard)",
     placeholder: "e.g. open a warm-intro loop to 50 design-led SaaS founders",
@@ -7239,6 +7484,11 @@ async function maybeCaptureSetupIntent(input) {
   }
   const intentText = typeof prompt === "string" ? prompt.trim() : "";
   if (!intentText) {
+    recordSetupPromptSkip({
+      promptKey: "setup_intent",
+      workspaceId: input.workspace.id,
+      workspaceName: input.workspace.name
+    });
     return "skipped";
   }
   const spinner = createOrgxSpinner("Routing");
@@ -7473,7 +7723,11 @@ async function maybeConfigureOptionalWorkspaceAddOns(input) {
   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 firstInitiativeSkipped = hasSetupPromptSkip(
+    input.workspace.id,
+    "first_initiative"
+  );
+  if (!effectiveInitiativeId && !firstInitiativeSkipped) {
     const firstInitiativeChoice = await selectPrompt({
       initialValue: "yes",
       message: `Create your first OrgX initiative in ${input.workspace.name}?`,
@@ -7530,10 +7784,20 @@ async function maybeConfigureOptionalWorkspaceAddOns(input) {
         const message = error instanceof Error ? error.message : String(error);
         console.log(`  ${ICON.warn}  ${pc3.yellow("initiative")} ${pc3.dim(message)}`);
       }
+    } else if (firstInitiativeChoice === "no") {
+      recordSetupPromptSkip({
+        promptKey: "first_initiative",
+        workspaceId: input.workspace.id,
+        workspaceName: input.workspace.name
+      });
     }
   }
   const hasOnboardingTask = existingState?.onboardingTask?.workspaceId === input.workspace.id;
-  if (!hasOnboardingTask && effectiveInitiativeId) {
+  const onboardingTaskSkipped = hasSetupPromptSkip(
+    input.workspace.id,
+    "onboarding_task"
+  );
+  if (!hasOnboardingTask && effectiveInitiativeId && !onboardingTaskSkipped) {
     let shouldCreateOnboardingTask = firstValueInitiative !== null;
     if (!shouldCreateOnboardingTask) {
       const onboardingChoice = await selectPrompt({
@@ -7549,6 +7813,13 @@ async function maybeConfigureOptionalWorkspaceAddOns(input) {
         return "cancelled";
       }
       shouldCreateOnboardingTask = onboardingChoice === "yes";
+      if (onboardingChoice === "no") {
+        recordSetupPromptSkip({
+          promptKey: "onboarding_task",
+          workspaceId: input.workspace.id,
+          workspaceName: input.workspace.name
+        });
+      }
     }
     if (shouldCreateOnboardingTask) {
       const spinner = createOrgxSpinner("Creating onboarding workstream and starter task");
@@ -7588,7 +7859,8 @@ async function maybeConfigureOptionalWorkspaceAddOns(input) {
   }
   const refreshedState = readWizardState();
   const hasAgentRoster = refreshedState?.agentRoster?.workspaceId === input.workspace.id;
-  if (!hasAgentRoster) {
+  const agentRosterSkipped = hasSetupPromptSkip(input.workspace.id, "agent_roster");
+  if (!hasAgentRoster && !agentRosterSkipped) {
     const rosterChoice = await selectPrompt({
       initialValue: "default",
       message: `Set up an OrgX agent roster for ${input.workspace.name}?`,
@@ -7624,6 +7896,11 @@ async function maybeConfigureOptionalWorkspaceAddOns(input) {
         );
       } else {
         console.log(`  ${ICON.skip}  ${pc3.dim("agent roster skipped")} ${pc3.dim("(no agents selected)")}`);
+        recordSetupPromptSkip({
+          promptKey: "agent_roster",
+          workspaceId: input.workspace.id,
+          workspaceName: input.workspace.name
+        });
       }
     } else if (rosterChoice === "default") {
       const roster = ensureDefaultAgentRoster(input.workspace);
@@ -7641,6 +7918,12 @@ async function maybeConfigureOptionalWorkspaceAddOns(input) {
           }
         )
       );
+    } else if (rosterChoice === "no") {
+      recordSetupPromptSkip({
+        promptKey: "agent_roster",
+        workspaceId: input.workspace.id,
+        workspaceName: input.workspace.name
+      });
     }
   }
   return "configured";
@@ -7720,11 +8003,11 @@ async function maybeInstallOptionalCompanionPlugins(input) {
 }
 function printAuthStatus(status) {
   if (!status.configured) {
-    console.log(`  ${ICON.warn}  ${pc3.yellow("no account")}   run ${pc3.cyan(`${getCmd()} auth login`)} to connect`);
+    console.log(`  ${ICON.warn}  ${pc3.yellow("not paired")}  run ${pc3.cyan(`${getCmd()} auth login`)} to pair this terminal`);
     return;
   }
   const icon = status.ok ? ICON.ok : ICON.err;
-  const state = status.ok ? pc3.green("verified  ") : status.skipped ? pc3.yellow("skipped   ") : pc3.red("invalid   ");
+  const state = status.ok ? pc3.green("paired    ") : 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) {
@@ -7796,13 +8079,16 @@ 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.23" : void 0;
+  const pkgVersion = true ? "0.1.25" : void 0;
   program.version(pkgVersion ?? "unknown", "-V, --version");
   program.hook("preAction", () => {
     console.log(renderBanner(pkgVersion));
   });
-  program.command("setup").description("Add OrgX MCP configs, skills/rules, and companion plugins to detected tools.").option("--preset <name>", "run a setup bundle (currently: founder)").action(async (options) => {
+  program.command("setup").description("Add OrgX MCP configs, skills/rules, and companion plugins to detected tools.").option("--preset <name>", "run a setup bundle (currently: founder)").option("--workspace", "choose or change the default workspace during setup").option("--daily-brief", "configure Daily Brief even if setup already handled it").option("--skip-daily-brief", "skip Daily Brief prompts and remember the skip").action(async (options) => {
     const interactive = Boolean(process.stdin.isTTY && process.stdout.isTTY);
+    if (options.dailyBrief && options.skipDailyBrief) {
+      throw new Error("Use either --daily-brief or --skip-daily-brief, not both.");
+    }
     await safeTrackWizardTelemetry("wizard_started", {
       command: "setup",
       interactive,
@@ -7921,9 +8207,9 @@ async function main() {
       console.log("");
       if (interactive) {
         const choice = await selectPrompt({
-          message: "Connect your OrgX account to enable workspace and AI tool access",
+          message: "Pair this terminal with your OrgX account to finish setup",
           options: [
-            { value: "login", label: "Open browser to connect", hint: "recommended" },
+            { value: "login", label: "Open browser to pair", hint: "recommended" },
             { value: "skip", label: "Skip for now", hint: `run \`${getCmd()} auth login\` later` }
           ]
         });
@@ -7935,19 +8221,19 @@ async function main() {
           const loginOk = await runBrowserLogin({ telemetrySource: "browser_pairing" });
           if (!loginOk) {
             console.log(`
-  ${pc3.dim("\u2192")}  ${pc3.cyan(`${getCmd()} auth login`)}           ${pc3.dim("to try again")}`);
+  ${pc3.dim("\u2192")}  ${pc3.cyan(`${getCmd()} auth login`)}           ${pc3.dim("to start a fresh browser pairing")}`);
             console.log(`  ${pc3.dim("\u2192")}  ${pc3.cyan(`${getCmd()} auth login --api-key`)}  ${pc3.dim("to paste a key directly")}`);
             return;
           }
           resolvedAuth = await resolveOrgxAuth();
         } else {
           console.log(`
-  ${pc3.dim("\u2192")}  ${pc3.cyan(`${getCmd()} auth login`)}  ${pc3.dim("to connect when ready")}`);
+  ${pc3.dim("\u2192")}  ${pc3.cyan(`${getCmd()} auth login`)}  ${pc3.dim("to pair when ready")}`);
           return;
         }
       } else {
         console.log(
-          `  ${ICON.warn}  ${pc3.yellow("No account connected.")}  Run ${pc3.cyan(`${getCmd()} auth login`)} to connect.`
+          `  ${ICON.warn}  ${pc3.yellow("Terminal not paired.")}  Run ${pc3.cyan(`${getCmd()} auth login`)} to pair it.`
         );
         return;
       }
@@ -7968,7 +8254,8 @@ async function main() {
           text: textPrompt
         },
         {
-          interactive
+          interactive,
+          skipIfConfigured: !options.workspace
         }
       );
       if (workspaceSetup.status === "cancelled") {
@@ -8006,7 +8293,9 @@ async function main() {
         console.log(`  ${ICON.ok}  ${pc3.green("workspace ")} ${pc3.bold(workspaceSetup.workspace.name)}`);
       }
       const briefResult = await runDailyBriefOnboarding({
+        force: Boolean(options.dailyBrief),
         interactive,
+        skip: Boolean(options.skipDailyBrief),
         workspace: resolvedWorkspace,
         prompts: {
           cancel: clack.cancel,
@@ -8018,6 +8307,8 @@ async function main() {
       });
       if (briefResult.status === "cancelled") {
         console.log(`  ${ICON.skip}  ${pc3.dim(briefResult.message)}`);
+      } else if (briefResult.status === "skipped_user") {
+        console.log(`  ${ICON.skip}  ${pc3.dim(briefResult.message)}`);
       } else if (briefResult.status === "completed") {
         console.log(`  ${ICON.ok}  ${pc3.green("daily brief")}  ${pc3.dim(briefResult.message)}`);
       } else if (briefResult.status === "failed") {
@@ -8122,9 +8413,9 @@ async function main() {
         has_base_url: false
       });
       const openclawResults = detectSurface("openclaw").detected ? await addSurface("openclaw") : [];
-      spinner.succeed("OrgX account connected");
+      spinner.succeed("OrgX account paired");
       await syncContinuityAfterAuth();
-      console.log(`  ${ICON.ok}  ${pc3.green("verified  ")} ${pc3.bold(stored.keyPrefix)}  ${pc3.dim("OAuth / PKCE")}`);
+      console.log(`  ${ICON.ok}  ${pc3.green("paired    ")} ${pc3.bold(stored.keyPrefix)}  ${pc3.dim("browser sign-in")}`);
       if (openclawResults.length > 0) {
         console.log("");
         printMutationResults(openclawResults);
@@ -8137,22 +8428,36 @@ async function main() {
       return false;
     }
   }
+  function shortPairingId(pairingId) {
+    return pairingId.length > 13 ? `${pairingId.slice(0, 8)}...${pairingId.slice(-4)}` : pairingId;
+  }
+  function formatPairingExpiry(expiresAt) {
+    const remainingMs = Date.parse(expiresAt) - Date.now();
+    if (!Number.isFinite(remainingMs) || remainingMs <= 0) return "expired";
+    const minutes = Math.ceil(remainingMs / 6e4);
+    return minutes <= 1 ? "<1m" : `${minutes}m`;
+  }
   async function runBrowserLogin(opts = {}) {
     const installationId = getOrCreateWizardInstallationId();
+    const deviceName = opts.deviceName ?? hostname();
     const spinner = createOrgxSpinner("Starting OrgX browser pairing");
     spinner.start();
     try {
       const pairing = await startBrowserPairing({
         installationId,
         baseUrl: opts.baseUrl,
-        deviceName: opts.deviceName ?? hostname(),
+        deviceName,
         platform: process.platform
       });
-      spinner.succeed("Browser pairing session opened");
+      spinner.succeed("Browser pairing ready");
       console.log(`
-  ${pc3.dim("Open this URL to connect:")}`);
+  ${pc3.dim("Open this URL to approve terminal pairing:")}`);
       console.log(`  ${pc3.cyan(pairing.connectUrl)}
 `);
+      console.log(
+        `  ${pc3.dim("session  ")} ${pc3.bold(shortPairingId(pairing.pairingId))}  ${pc3.dim("device")} ${pc3.bold(deviceName)}  ${pc3.dim("expires")} ${pc3.bold(formatPairingExpiry(pairing.expiresAt))}
+`
+      );
       if (opts.open !== false) {
         const openResult = openBrowser(pairing.connectUrl);
         if (!openResult.ok && openResult.error) {
@@ -8168,33 +8473,38 @@ async function main() {
         pollToken: pairing.pollToken,
         timeoutMs: (opts.timeout ?? 600) * 1e3
       });
-      spinner.text = "Verifying API key...";
+      spinner.text = "Verifying paired account...";
       const result = await verifyAndPersistAuth(ready.key, {
         ...opts.baseUrl !== void 0 ? { baseUrl: opts.baseUrl } : {},
         ...opts.telemetrySource ? { telemetrySource: opts.telemetrySource } : {}
       });
       if (!("stored" in result)) {
-        spinner.fail("Pairing completed but key was rejected");
+        spinner.fail("Pairing completed but OrgX rejected the key");
         console.log(`       ${pc3.red(result.verification.error ?? `HTTP ${result.verification.status ?? "error"}`)}`);
         console.log(`       ${pc3.dim("The browser flow finished, but OrgX rejected the key. Try again or check your account at useorgx.com.")}`);
         return false;
       }
-      await acknowledgeBrowserPairing({
-        baseUrl: opts.baseUrl,
-        pairingId: pairing.pairingId,
-        pollToken: pairing.pollToken
-      }).catch((error) => {
+      let ackConfirmed = false;
+      try {
+        await acknowledgeBrowserPairing({
+          baseUrl: opts.baseUrl,
+          pairingId: pairing.pairingId,
+          pollToken: pairing.pollToken
+        });
+        ackConfirmed = true;
+      } catch (error) {
         console.log(pc3.dim(`Pairing ack failed: ${error instanceof Error ? error.message : String(error)}`));
-      });
-      spinner.succeed("OrgX account connected");
+      }
+      spinner.succeed("OrgX account paired");
       await syncContinuityAfterAuth({
         executionMode: ready.executionMode,
         workspaceName: ready.workspaceName
       });
-      console.log(`  ${ICON.ok}  ${pc3.green("verified  ")} ${pc3.bold(result.stored.keyPrefix ?? result.verification.keyPrefix ?? "unknown")}  ${pc3.dim("wizard auth store")}`);
+      console.log(`  ${ICON.ok}  ${pc3.green("paired    ")} ${pc3.bold(result.stored.keyPrefix ?? result.verification.keyPrefix ?? "unknown")}  ${pc3.dim("wizard auth store")}`);
       if (ready.workspaceName) {
         console.log(`  ${ICON.ok}  ${pc3.green("workspace ")} ${pc3.bold(ready.workspaceName)}`);
       }
+      console.log(`  ${ackConfirmed ? ICON.ok : ICON.warn}  ${ackConfirmed ? pc3.green("ack       ") : pc3.yellow("ack       ")} ${pc3.bold(ackConfirmed ? "terminal confirmed" : "browser delivery pending")}  ${pc3.dim(shortPairingId(pairing.pairingId))}`);
       if (result.openclawResults.length > 0) {
         console.log("");
         printMutationResults(result.openclawResults);
@@ -8207,8 +8517,8 @@ async function main() {
       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 auth = program.command("auth").description("Pair this terminal with an OrgX account.");
+  auth.command("status").description("Show which OrgX account this terminal is paired with.").action(async () => {
     const spinner = createOrgxSpinner("Checking OrgX auth");
     spinner.start();
     const status = await checkOrgxAuth();
@@ -8216,7 +8526,7 @@ async function main() {
     console.log(pc3.dim("  account"));
     printAuthStatus(status);
   });
-  auth.command("login").description("Authenticate with OrgX. Uses OAuth PKCE (no OpenClaw required) by default, with OpenClaw pairing and direct key fallbacks.").option("--api-key <key>", "Bypass browser auth and verify this OrgX API key directly.").option("--base-url <url>", "OrgX base URL (for OpenClaw pairing fallback).").option("--device-name <name>", "Device name shown during OpenClaw pairing.").option("--no-open", "Do not automatically open the browser auth URL.").option("--pairing", "Force OpenClaw pairing flow instead of OAuth PKCE.").option("--timeout <seconds>", "How long to wait for browser auth before giving up.", parseTimeoutSeconds, 600).action(async (options) => {
+  auth.command("login").description("Open the browser pairing flow and store a scoped OrgX key for this terminal.").option("--api-key <key>", "Bypass browser auth and verify this OrgX API key directly.").option("--base-url <url>", "OrgX base URL (for OpenClaw pairing fallback).").option("--device-name <name>", "Device name shown during OpenClaw pairing.").option("--no-open", "Do not automatically open the browser auth URL.").option("--pairing", "Force the terminal pairing fallback instead of browser sign-in.").option("--timeout <seconds>", "How long to wait for browser auth before giving up.", parseTimeoutSeconds, 600).action(async (options) => {
     if (options.apiKey) {
       const spinner = createOrgxSpinner("Verifying OrgX API key");
       spinner.start();
@@ -8229,9 +8539,9 @@ async function main() {
         printAuthStatus(result.verification);
         return;
       }
-      spinner.succeed("OrgX account connected");
+      spinner.succeed("OrgX account paired");
       await syncContinuityAfterAuth();
-      console.log(`  ${ICON.ok}  ${pc3.green("verified  ")} ${pc3.bold(result.stored.keyPrefix ?? result.verification.keyPrefix ?? "unknown")}  ${pc3.dim("wizard auth store")}`);
+      console.log(`  ${ICON.ok}  ${pc3.green("paired    ")} ${pc3.bold(result.stored.keyPrefix ?? result.verification.keyPrefix ?? "unknown")}  ${pc3.dim("wizard auth store")}`);
       if (result.openclawResults.length > 0) {
         console.log("");
         printMutationResults(result.openclawResults);
@@ -8254,7 +8564,7 @@ async function main() {
       timeout: options.timeout
     });
     if (!pkceOk) {
-      console.log(pc3.dim("\n  Falling back to OpenClaw pairing..."));
+      console.log(pc3.dim("\n  Browser sign-in did not finish. Opening the terminal pairing fallback..."));
       await runBrowserLogin({
         ...options.baseUrl !== void 0 ? { baseUrl: options.baseUrl } : {},
         ...options.deviceName !== void 0 ? { deviceName: options.deviceName } : {},
@@ -8276,9 +8586,9 @@ async function main() {
       printAuthStatus(result.verification);
       return;
     }
-    spinner.succeed("OrgX account connected");
+    spinner.succeed("OrgX account paired");
     await syncContinuityAfterAuth();
-    console.log(`  ${ICON.ok}  ${pc3.green("verified  ")} ${pc3.bold(result.stored.keyPrefix ?? result.verification.keyPrefix ?? "unknown")}  ${pc3.dim("wizard auth store")}`);
+    console.log(`  ${ICON.ok}  ${pc3.green("paired    ")} ${pc3.bold(result.stored.keyPrefix ?? result.verification.keyPrefix ?? "unknown")}  ${pc3.dim("wizard auth store")}`);
     if (result.openclawResults.length > 0) {
       console.log("");
       printMutationResults(result.openclawResults);