@distributionos/cli 0.1.15 → 0.1.17

package/src/oauth.js

@@ -27,14 +27,14 @@ export async function loginWithOAuth(options) {
       state,
     });
 
-    options.stdout?.write([
-      'Open this DistributionOS authorization URL:',
-      authorizeUrl,
-      '',
-      'Keep this terminal running until the browser says the CLI is connected.',
-      'If the browser opens a failed connection page, press Ctrl+C here and rerun with --no-open, then paste the full printed URL into your browser.',
-      '',
-    ].join('\n'));
+    options.stdout?.write([
+      'Open this DistributionOS authorization URL:',
+      authorizeUrl,
+      '',
+      'Keep this terminal running until the browser says the CLI is connected.',
+      'If the browser opens a failed connection page, press Ctrl+C here and rerun with --no-open, then paste the full printed URL into your browser.',
+      '',
+    ].join('\n'));
     if (options.openBrowser !== false) openUrl(authorizeUrl);
 
     const authResult = await callback.waitForCallback();
@@ -207,28 +207,28 @@ async function createCallbackServer() {
   };
 }
 
-export function getOpenUrlCommand(url, platform = process.platform) {
-  const command = platform === 'win32'
-    ? 'cmd'
-    : platform === 'darwin'
-      ? 'open'
-      : 'xdg-open';
-  const args = platform === 'win32'
-    ? ['/c', 'start', '""', quoteWindowsStartUrl(url)]
-    : [url];
-  return { command, args };
-}
-
-function quoteWindowsStartUrl(url) {
-  const safeUrl = String(url).replace(/"/g, '%22');
-  return `"${safeUrl}"`;
-}
-
-function openUrl(url) {
-  const { command, args } = getOpenUrlCommand(url);
-  try {
-    const child = spawn(command, args, {
-      detached: true,
+export function getOpenUrlCommand(url, platform = process.platform) {
+  const command = platform === 'win32'
+    ? 'cmd'
+    : platform === 'darwin'
+      ? 'open'
+      : 'xdg-open';
+  const args = platform === 'win32'
+    ? ['/c', 'start', '""', quoteWindowsStartUrl(url)]
+    : [url];
+  return { command, args };
+}
+
+function quoteWindowsStartUrl(url) {
+  const safeUrl = String(url).replace(/"/g, '%22');
+  return `"${safeUrl}"`;
+}
+
+function openUrl(url) {
+  const { command, args } = getOpenUrlCommand(url);
+  try {
+    const child = spawn(command, args, {
+      detached: true,
       stdio: 'ignore',
       windowsHide: true,
     });

package/src/plan.js

@@ -10,16 +10,16 @@ import {
   buildSetupCommand,
   getBootstrapAction,
 } from './bootstrap.js';
-import { scanRepo } from './detect.js';
-import { buildProjectMcpConfigPlan } from './mcp-config.js';
-import {
-  buildAnalyticsRouteConfigScript,
-  buildAnalyticsRouteConfigSnippet,
-} from './privacy.js';
-import {
-  extractBootstrapMetadata,
-  formatSetupReportSummary,
-} from './setup-report.js';
+import { scanRepo } from './detect.js';
+import { buildCodexMcpConfigPlan, buildProjectMcpConfigPlan } from './mcp-config.js';
+import {
+  buildAnalyticsRouteConfigScript,
+  buildAnalyticsRouteConfigSnippet,
+} from './privacy.js';
+import {
+  extractBootstrapMetadata,
+  formatSetupReportSummary,
+} from './setup-report.js';
 
 export async function createSetupPlan(options) {
   const cwd = options.cwd;
@@ -38,14 +38,15 @@ export async function createSetupPlan(options) {
     remote.instructions?.recommendedBootstrapBlock ??
     buildLocalBootstrapBlock(instructionPackVersion, appId);
   const bootstrap = getBootstrapAction(repo.instructionFiles, recommendedBootstrapBlock);
-  const analyticsContract = remote.analyticsContract;
-  const planRepo = sanitizeRepoForPlan(repo);
-  const mcp = await buildProjectMcpConfigPlan(cwd);
-
-  return {
+  const analyticsContract = remote.analyticsContract;
+  const planRepo = sanitizeRepoForPlan(repo);
+  const codexMcp = await buildCodexMcpConfigPlan(cwd);
+  const mcp = await buildProjectMcpConfigPlan(cwd);
+
+  return {
     appId,
     cwd,
-    mode: options.apply ? 'apply' : 'review',
+    mode: options.apply ? 'apply' : 'review',
     packageName: CLI_PACKAGE_NAME,
     futureCommand: buildSetupCommand(appId),
     localCommand: `npm run cli:setup -- --app ${appId}`,
@@ -53,41 +54,43 @@ export async function createSetupPlan(options) {
     repo: planRepo,
     remote,
     instructionPackVersion,
-    bootstrap,
-    mcp,
-    analytics: buildAnalyticsPlan({ analyticsContract, repo: planRepo, instructionPackVersion }),
+    bootstrap,
+    codexMcp,
+    mcp,
+    analytics: buildAnalyticsPlan({ analyticsContract, repo: planRepo, instructionPackVersion }),
     fallbackInstructions: buildFallbackMcpInstructions(appId),
     warnings: buildWarnings({ repo: planRepo, remote }),
     validation: buildValidationPlan(planRepo),
-    deploymentChecklist: [
-      'Review this plan and any proposed file edits.',
-      'Apply reviewed bootstrap, analytics, and non-secret project MCP config changes only.',
-      'Restart or reconnect your agent if the project-local MCP config changed.',
-      'Return to the DistributionOS onboarding page and verify the agent MCP connection before reviewing generated context.',
-      'Run baseline tests before mutation when the worktree is messy.',
+    deploymentChecklist: [
+      'Review this plan and any proposed file edits.',
+      'Apply reviewed bootstrap, analytics, and non-secret agent MCP config changes only.',
+      'For Codex, start a new Codex chat in this repo after the Codex MCP config changes.',
+      'For Claude Code, restart or reconnect Claude Code if the project-local MCP config changed.',
+      'Return to the DistributionOS onboarding page and verify the agent MCP connection before reviewing generated context.',
+      'Run baseline tests before mutation when the worktree is messy.',
       'Run build and test commands after mutation.',
       'Do not deploy until a human reviews the diff.',
       'After deployment, call verify_analytics_install on representative public URLs.',
-      'Call report_implementation for shipped artifacts or analytics opt-outs.',
-    ],
-    setupReport: null,
-  };
-}
+      'Call report_implementation for shipped artifacts or analytics opt-outs.',
+    ],
+    setupReport: null,
+  };
+}
 
 function sanitizeRepoForPlan(repo) {
   return {
     ...repo,
     packageJson: sanitizePackageJson(repo.packageJson),
-    instructionFiles: (repo.instructionFiles ?? []).map(file => ({
-      path: file.path,
-      priority: file.priority,
-      exists: file.exists,
-      hasManagedDistributionOsBlock: extractBootstrapMetadata(file.content).hasManagedDistributionOsBlock,
-      managedDistributionOsVersion: extractBootstrapMetadata(file.content).version,
-      managedDistributionOsAppId: extractBootstrapMetadata(file.content).appId,
-      contentOmitted: true,
-    })),
-  };
+    instructionFiles: (repo.instructionFiles ?? []).map(file => ({
+      path: file.path,
+      priority: file.priority,
+      exists: file.exists,
+      hasManagedDistributionOsBlock: extractBootstrapMetadata(file.content).hasManagedDistributionOsBlock,
+      managedDistributionOsVersion: extractBootstrapMetadata(file.content).version,
+      managedDistributionOsAppId: extractBootstrapMetadata(file.content).appId,
+      contentOmitted: true,
+    })),
+  };
 }
 
 function sanitizePackageJson(packageJson) {
@@ -101,11 +104,11 @@ function sanitizePackageJson(packageJson) {
 
 export function formatPlanText(plan) {
   const lines = [
-    'DistributionOS CLI setup plan',
-    `App: ${plan.appId}`,
-    plan.mode === 'apply'
-      ? 'Step: apply approved setup'
-      : 'Step: review setup plan (no files changed yet)',
+    'DistributionOS CLI setup plan',
+    `App: ${plan.appId}`,
+    plan.mode === 'apply'
+      ? 'Step: apply approved setup'
+      : 'Step: review setup plan (no files changed yet)',
     `Package: ${plan.packageName}`,
     `Future command: ${plan.futureCommand}`,
     `Local command: ${plan.localCommand}`,
@@ -118,19 +121,20 @@ export function formatPlanText(plan) {
     `- Layout candidates: ${formatList(plan.repo.layoutCandidates)}`,
     `- Content files found: ${plan.repo.contentFiles.length}`,
     `- Deploy hints: ${formatList(plan.repo.deployHints)}`,
-    '',
-    'DistributionOS access',
-    remoteSummary(plan),
-    ...usageSummary(plan.remote.usage),
-    ...plan.remote.errors.map(error => `- ${error}`),
-    '',
+    '',
+    'DistributionOS access',
+    remoteSummary(plan),
+    ...usageSummary(plan.remote.usage),
+    ...plan.remote.errors.map(error => `- ${error}`),
+    '',
     'Planned changes',
-    `1. Agent bootstrap: ${plan.bootstrap.action} ${plan.bootstrap.target}`,
-    `   ${plan.bootstrap.reason}`,
-    `2. Agent instructions: ${plan.remote.instructions ? 'use fetched current instruction pack' : 'use fallback MCP/OAuth instructions until authenticated'}`,
-    `3. Analytics: ${analyticsSummary(plan.analytics)}`,
-    `4. Agent MCP config: ${mcpSummary(plan.mcp)}`,
-    '',
+    `1. Agent bootstrap: ${plan.bootstrap.action} ${plan.bootstrap.target}`,
+    `   ${plan.bootstrap.reason}`,
+    `2. Agent instructions: ${plan.remote.instructions ? 'use fetched current instruction pack' : 'use fallback MCP/OAuth instructions until authenticated'}`,
+    `3. Analytics: ${analyticsSummary(plan.analytics)}`,
+    `4. Codex MCP config: ${mcpSummary(plan.codexMcp)}`,
+    `5. Claude MCP config: ${mcpSummary(plan.mcp)}`,
+    '',
     'Route privacy review',
     `- Allowed public candidates: ${formatList(plan.repo.routePrivacy.allowed, 8)}`,
     `- Blocked private candidates: ${formatList(plan.repo.routePrivacy.blocked, 8)}`,
@@ -141,71 +145,72 @@ export function formatPlanText(plan) {
     `- Test: ${plan.validation.test ?? 'not detected'}`,
     `- Lint: ${plan.validation.lint ?? 'not detected'}`,
     '',
-    'Fallback MCP/OAuth instructions',
-    ...plan.fallbackInstructions.map(item => `- ${item}`),
-    '',
-    'Agent live-data connection',
-    `- Project config: ${plan.mcp.path}`,
-    `- Planned action: ${plan.mcp.action}`,
-    `- Auth mode: ${plan.mcp.authMode}; no API keys or OAuth tokens are written.`,
-    `- ${plan.mcp.reason}`,
-    '- Verification is separate from install: after apply, restart or reconnect your agent and ask it to call check_distributionos_connection.',
-    '',
+    'Fallback MCP/OAuth instructions',
+    ...plan.fallbackInstructions.map(item => `- ${item}`),
+    '',
+    'Agent live-data connection',
+    `- Codex config: ${plan.codexMcp.path} (${plan.codexMcp.action})`,
+    `- Claude/project config: ${plan.mcp.path} (${plan.mcp.action})`,
+    `- Auth mode: ${plan.mcp.authMode}; no API keys or OAuth tokens are written.`,
+    `- Codex: ${plan.codexMcp.reason}`,
+    `- Claude/other MCP hosts: ${plan.mcp.reason}`,
+    '- Verification is separate from install: after apply, start a fresh agent chat or reconnect the agent and ask it to call check_distributionos_connection.',
+    '',
     'Deployment checklist',
     ...plan.deploymentChecklist.map(item => `- ${item}`),
   ];
 
-  if (plan.analytics.configSnippet) {
-    lines.push('', 'Future-compatible route gate config', plan.analytics.configSnippet);
-  }
-
-  const setupReportLines = formatSetupReportSummary(plan.setupReport);
-  if (setupReportLines.length > 0) {
-    lines.push('', ...setupReportLines);
-  }
-
-  if (plan.warnings.length > 0) {
-    lines.push('', 'Warnings', ...plan.warnings.map(item => `- ${item}`));
-  }
-
-  lines.push(...nextStepLines(plan));
-
-  return `${lines.join('\n')}\n`;
-}
-
-function nextStepLines(plan) {
-  if (plan.mode === 'apply') return [];
-
-  const applyCommand = `${plan.futureCommand} --apply`;
-  const lines = [
-    '',
-    'Next step: install approved setup',
-  ];
-
-  if (plan.repo.git.dirty) {
-    lines.push(
-      'This repo has existing uncommitted changes.',
-      'Recommended: commit or stash those changes, then run:',
-      `  ${applyCommand}`,
-      '',
-      'If you recognize the existing changes and want DistributionOS to edit only its managed files, run:',
-      `  ${applyCommand} --allow-dirty`,
-    );
-  } else {
-    lines.push(
-      'If the planned changes look right, run:',
-      `  ${applyCommand}`,
-    );
-  }
-
-  lines.push(
-    '',
-    'DistributionOS expects to edit only the managed agent instruction block, supported analytics layout, and non-secret project MCP config. Review git diff before committing or deploying.',
-    'After apply, return to the DistributionOS onboarding page. It will show the exact restart, auth, and verification prompts and will wait for a real MCP call before letting you continue.',
-  );
-
-  return lines;
-}
+  if (plan.analytics.configSnippet) {
+    lines.push('', 'Future-compatible route gate config', plan.analytics.configSnippet);
+  }
+
+  const setupReportLines = formatSetupReportSummary(plan.setupReport);
+  if (setupReportLines.length > 0) {
+    lines.push('', ...setupReportLines);
+  }
+
+  if (plan.warnings.length > 0) {
+    lines.push('', 'Warnings', ...plan.warnings.map(item => `- ${item}`));
+  }
+
+  lines.push(...nextStepLines(plan));
+
+  return `${lines.join('\n')}\n`;
+}
+
+function nextStepLines(plan) {
+  if (plan.mode === 'apply') return [];
+
+  const applyCommand = `${plan.futureCommand} --apply`;
+  const lines = [
+    '',
+    'Next step: install approved setup',
+  ];
+
+  if (plan.repo.git.dirty) {
+    lines.push(
+      'This repo has existing uncommitted changes.',
+      'Recommended: commit or stash those changes, then run:',
+      `  ${applyCommand}`,
+      '',
+      'If you recognize the existing changes and want DistributionOS to edit only its managed files, run:',
+      `  ${applyCommand} --allow-dirty`,
+    );
+  } else {
+    lines.push(
+      'If the planned changes look right, run:',
+      `  ${applyCommand}`,
+    );
+  }
+
+  lines.push(
+    '',
+    'DistributionOS expects to edit only the managed agent instruction block, supported analytics layout, and non-secret agent MCP config. Review git diff before committing or deploying.',
+    'After apply, return to the DistributionOS onboarding page. It will show the exact new-chat/reconnect, auth, and verification prompts and will wait for a real MCP call before letting you continue.',
+  );
+
+  return lines;
+}
 
 function buildAnalyticsPlan({ analyticsContract, repo, instructionPackVersion }) {
   const layoutTarget = selectAnalyticsLayoutTarget(repo);
@@ -251,6 +256,7 @@ function buildAnalyticsPlan({ analyticsContract, repo, instructionPackVersion })
       'Preserve clean canonical URLs.',
       'Backfill public blog and landing pages with stable dosContentId markers.',
       'Add data-dos-event and data-dos-link-id only to primary CTAs or campaign links.',
+      'Wire checkout_started before public checkout redirects and success-only signup/waitlist/email events where safe.',
     ],
   };
 }
@@ -271,14 +277,14 @@ function selectAnalyticsLayoutTarget(repo) {
   return candidates[0] ?? null;
 }
 
-function buildWarnings({ repo, remote }) {
-  const warnings = [];
-  if (remote.access?.reason === 'subscription_required') {
-    warnings.push('Active Builder or Distributor subscription required before applying setup.');
-  }
-  if (repo.git.dirty) {
-    warnings.push('Worktree has existing changes. Keep baseline failures separate before applying edits.');
-  }
+function buildWarnings({ repo, remote }) {
+  const warnings = [];
+  if (remote.access?.reason === 'subscription_required') {
+    warnings.push('Active Builder or Distributor subscription required before applying setup.');
+  }
+  if (repo.git.dirty) {
+    warnings.push('Worktree has existing changes. Keep baseline failures separate before applying edits.');
+  }
   if (!remote.instructions) {
     warnings.push('Live DistributionOS instructions were not fetched. Connect MCP OAuth or provide a safe env token before applying app-specific setup.');
   }
@@ -302,54 +308,54 @@ function buildValidationPlan(repo) {
   };
 }
 
-function remoteSummary(plan) {
-  if (plan.remote.status === 'fetched') {
-    return `- Fetched live instructions and analytics contract using ${plan.remote.tokenName}.`;
-  }
-  if (plan.remote.status === 'partial') {
-    return `- Used ${plan.remote.tokenName}, but one or more DistributionOS requests failed.`;
-  }
-  if (plan.remote.status === 'skipped') {
-    return '- Remote fetch skipped. The setup plan used local fallback instructions and did not call DistributionOS APIs.';
-  }
-  return '- No OAuth or env token found. The setup plan used local fallback instructions and did not call DistributionOS APIs.';
-}
-
-function usageSummary(usage) {
-  if (!usage) return [];
-  const plan = usage.plan
-    ? `- Plan: ${usage.plan.name}${usage.plan.priceLabel ? ` (${usage.plan.priceLabel})` : ''}`
-    : '- Plan: active account access';
-  const monthly = usage.monthly ?? {};
-  return [
-    plan,
-    `- Monthly caps: briefs ${meterText(monthly.brief_handoffs)}, images ${meterText(monthly.image_generations)}, research ${meterText(monthly.fresh_research_runs)}`,
-  ];
-}
-
-function meterText(value) {
-  if (!value) return 'unknown';
-  const limit = value.limit < 0 ? 'unlimited' : value.limit;
-  return `${value.used ?? 0}/${limit}`;
-}
+function remoteSummary(plan) {
+  if (plan.remote.status === 'fetched') {
+    return `- Fetched live instructions and analytics contract using ${plan.remote.tokenName}.`;
+  }
+  if (plan.remote.status === 'partial') {
+    return `- Used ${plan.remote.tokenName}, but one or more DistributionOS requests failed.`;
+  }
+  if (plan.remote.status === 'skipped') {
+    return '- Remote fetch skipped. The setup plan used local fallback instructions and did not call DistributionOS APIs.';
+  }
+  return '- No OAuth or env token found. The setup plan used local fallback instructions and did not call DistributionOS APIs.';
+}
+
+function usageSummary(usage) {
+  if (!usage) return [];
+  const plan = usage.plan
+    ? `- Plan: ${usage.plan.name}${usage.plan.priceLabel ? ` (${usage.plan.priceLabel})` : ''}`
+    : '- Plan: active account access';
+  const monthly = usage.monthly ?? {};
+  return [
+    plan,
+    `- Monthly caps: briefs ${meterText(monthly.brief_handoffs)}, images ${meterText(monthly.image_generations)}, research ${meterText(monthly.fresh_research_runs)}`,
+  ];
+}
 
-function analyticsSummary(analytics) {
+function meterText(value) {
+  if (!value) return 'unknown';
+  const limit = value.limit < 0 ? 'unlimited' : value.limit;
+  return `${value.used ?? 0}/${limit}`;
+}
+
+function analyticsSummary(analytics) {
   if (analytics.status === 'enabled') {
     return `contract ${analytics.contractVersion}; install script in ${analytics.layoutTarget ?? 'reviewed shared layout'}`;
   }
-  if (analytics.status === 'disabled') {
-    return 'tracker will be created or fetched during apply before analytics is installed';
-  }
+  if (analytics.status === 'disabled') {
+    return 'tracker will be created or fetched during apply before analytics is installed';
+  }
   return 'contract not fetched; print manual guidance only';
-}
-
-function mcpSummary(mcp) {
-  if (!mcp) return 'manual instructions only';
-  if (mcp.action === 'none') return `${mcp.path} already includes DistributionOS`;
-  if (mcp.action === 'create') return `create ${mcp.path} with DistributionOS MCP server URL`;
-  if (mcp.action === 'update') return `update ${mcp.path} with DistributionOS MCP server URL`;
-  return `manual setup needed for ${mcp.path}`;
-}
+}
+
+function mcpSummary(mcp) {
+  if (!mcp) return 'manual instructions only';
+  if (mcp.action === 'none') return `${mcp.path} already includes DistributionOS`;
+  if (mcp.action === 'create') return `create ${mcp.path} with DistributionOS MCP server URL`;
+  if (mcp.action === 'update') return `update ${mcp.path} with DistributionOS MCP server URL`;
+  return `manual setup needed for ${mcp.path}`;
+}
 
 function formatList(values, limit = 5) {
   if (!values || values.length === 0) return 'none';