@distributionos/cli 0.1.14 → 0.1.16

package/src/cli.js

@@ -1,17 +1,17 @@
-import { CLI_LOCAL_VERSION, DEFAULT_API_BASE } from './constants.js';
-import {
-  ensureAnalyticsSite,
-  reportSetupInstallation,
-  reportImplementation,
-  resolveAuthToken,
-  verifyAnalyticsInstall,
-} from './api.js';
+import { CLI_LOCAL_VERSION, DEFAULT_API_BASE } from './constants.js';
+import {
+  ensureAnalyticsSite,
+  reportSetupInstallation,
+  reportImplementation,
+  resolveAuthToken,
+  verifyAnalyticsInstall,
+} from './api.js';
 import { loginWithOAuth } from './oauth.js';
 import { createSetupPlan, formatPlanText } from './plan.js';
 import { applySetupPlan } from './mutate.js';
-import { submitInitialization } from './initialization.js';
-import { compareValidationResults, inspectInstallArtifacts, runValidationPlan } from './validation.js';
-import { buildSetupReport } from './setup-report.js';
+import { submitInitialization } from './initialization.js';
+import { compareValidationResults, inspectInstallArtifacts, runValidationPlan } from './validation.js';
+import { buildSetupReport } from './setup-report.js';
 
 export async function runCli(argv, runtime) {
   const stdout = runtime.stdout;
@@ -141,21 +141,21 @@ export async function runCli(argv, runtime) {
     if (!authReady) return 1;
   }
 
-  let plan = await createSetupPlan({
-    appId: args.appId,
-    cwd: args.cwd ?? runtime.cwd,
-    apiBase: args.apiBase ?? DEFAULT_API_BASE,
+  let plan = await createSetupPlan({
+    appId: args.appId,
+    cwd: args.cwd ?? runtime.cwd,
+    apiBase: args.apiBase ?? DEFAULT_API_BASE,
     env: runtime.env,
     fetch: runtime.fetch,
-    noFetch: args.noFetch,
-    apply: args.apply,
-  });
-  plan.setupReport = await submitSetupReportSafely({
-    args,
-    runtime,
-    plan,
-    phase: 'plan',
-  });
+    noFetch: args.noFetch,
+    apply: args.apply,
+  });
+  plan.setupReport = await submitSetupReportSafely({
+    args,
+    runtime,
+    plan,
+    phase: 'plan',
+  });
 
   if (!args.apply && !args.yes) {
     stdout.write(args.json ? `${JSON.stringify(plan, null, 2)}\n` : formatPlanText(plan));
@@ -165,19 +165,19 @@ export async function runCli(argv, runtime) {
     args.apply = true;
   }
 
-  if (args.yes) {
-    args.apply = true;
-  }
-
-  if (args.apply && hasRemoteAccessBlock(plan)) {
-    stderr.write(formatRemoteAccessBlock(plan));
-    return 1;
-  }
-
-  if (args.apply && plan.repo.git.dirty && !args.allowDirty) {
-    stderr.write('Refusing to apply changes to a dirty worktree. Commit/stash changes or pass --allow-dirty.\n');
-    return 1;
-  }
+  if (args.yes) {
+    args.apply = true;
+  }
+
+  if (args.apply && hasRemoteAccessBlock(plan)) {
+    stderr.write(formatRemoteAccessBlock(plan));
+    return 1;
+  }
+
+  if (args.apply && plan.repo.git.dirty && !args.allowDirty) {
+    stderr.write('Refusing to apply changes to a dirty worktree. Commit/stash changes or pass --allow-dirty.\n');
+    return 1;
+  }
 
   if (args.apply && !args.skipAnalytics) {
     const ensured = await ensureAnalyticsSite({
@@ -193,21 +193,21 @@ export async function runCli(argv, runtime) {
     }
   }
 
-  plan = await createSetupPlan({
-    appId: args.appId,
-    cwd: args.cwd ?? runtime.cwd,
-    apiBase: args.apiBase ?? DEFAULT_API_BASE,
+  plan = await createSetupPlan({
+    appId: args.appId,
+    cwd: args.cwd ?? runtime.cwd,
+    apiBase: args.apiBase ?? DEFAULT_API_BASE,
     env: runtime.env,
     fetch: runtime.fetch,
-    noFetch: args.noFetch,
-    apply: args.apply,
-  });
-  plan.setupReport = await submitSetupReportSafely({
-    args,
-    runtime,
-    plan,
-    phase: args.apply ? 'apply_started' : 'plan',
-  });
+    noFetch: args.noFetch,
+    apply: args.apply,
+  });
+  plan.setupReport = await submitSetupReportSafely({
+    args,
+    runtime,
+    plan,
+    phase: args.apply ? 'apply_started' : 'plan',
+  });
 
   if (!args.apply) {
     stdout.write(args.json ? `${JSON.stringify(plan, null, 2)}\n` : formatPlanText(plan));
@@ -219,119 +219,119 @@ export async function runCli(argv, runtime) {
     const changes = await applySetupPlan(plan, {
       allowDirty: args.allowDirty,
       skipAnalytics: args.skipAnalytics,
-    });
-    const postValidation = args.skipValidate ? [] : await runValidationPlan(plan);
-    const validation = compareValidationResults(baselineValidation, postValidation);
-    const inspection = args.skipAnalytics ? [] : await inspectInstallArtifacts(plan);
-    const completedPlan = await createSetupPlan({
-      appId: args.appId,
-      cwd: args.cwd ?? runtime.cwd,
-      apiBase: args.apiBase ?? DEFAULT_API_BASE,
-      env: runtime.env,
-      fetch: runtime.fetch,
-      noFetch: args.noFetch,
-      apply: true,
-    });
-    completedPlan.setupReport = await submitSetupReportSafely({
-      args,
-      runtime,
-      plan: completedPlan,
-      phase: 'apply_completed',
-      details: {
-        changes,
+    });
+    const postValidation = args.skipValidate ? [] : await runValidationPlan(plan);
+    const validation = compareValidationResults(baselineValidation, postValidation);
+    const inspection = args.skipAnalytics ? [] : await inspectInstallArtifacts(plan);
+    const completedPlan = await createSetupPlan({
+      appId: args.appId,
+      cwd: args.cwd ?? runtime.cwd,
+      apiBase: args.apiBase ?? DEFAULT_API_BASE,
+      env: runtime.env,
+      fetch: runtime.fetch,
+      noFetch: args.noFetch,
+      apply: true,
+    });
+    completedPlan.setupReport = await submitSetupReportSafely({
+      args,
+      runtime,
+      plan: completedPlan,
+      phase: 'apply_completed',
+      details: {
+        changes,
         validation,
         inspection,
-        requiresAgentRestart: changes.some((change) => change.type === 'mcp' && change.changed),
+        requiresAgentRestart: changes.some((change) => (change.type === 'mcp' || change.type === 'codex-mcp') && change.changed),
       },
     });
-    const token = await resolveAuthToken({
-      env: runtime.env,
-      apiBase: args.apiBase ?? DEFAULT_API_BASE,
-      appId: args.appId,
-      fetchImpl: runtime.fetch,
+    const token = await resolveAuthToken({
+      env: runtime.env,
+      apiBase: args.apiBase ?? DEFAULT_API_BASE,
+      appId: args.appId,
+      fetchImpl: runtime.fetch,
     });
-    const initialization = token
-      ? await submitInitialization({
-        plan: completedPlan,
-        token: token.value,
-        apiBase: args.apiBase ?? DEFAULT_API_BASE,
-        fetchImpl: runtime.fetch,
-        domain: args.domain,
-      })
-      : null;
-
-    stdout.write(args.json
-      ? `${JSON.stringify({ plan: completedPlan, changes, initialization, validation, inspection }, null, 2)}\n`
-      : formatApplyResult(completedPlan, changes, initialization, validation, inspection, args.skipValidate, args.apiBase ?? DEFAULT_API_BASE));
+    const initialization = token
+      ? await submitInitialization({
+        plan: completedPlan,
+        token: token.value,
+        apiBase: args.apiBase ?? DEFAULT_API_BASE,
+        fetchImpl: runtime.fetch,
+        domain: args.domain,
+      })
+      : null;
+
+    stdout.write(args.json
+      ? `${JSON.stringify({ plan: completedPlan, changes, initialization, validation, inspection }, null, 2)}\n`
+      : formatApplyResult(completedPlan, changes, initialization, validation, inspection, args.skipValidate, args.apiBase ?? DEFAULT_API_BASE));
     return hasBlockingApplyFailure(validation, inspection) ? 1 : 0;
-  } catch (error) {
-    await submitSetupReportSafely({
-      args,
-      runtime,
-      plan,
-      phase: 'apply_failed',
-      details: {
-        applyResult: {
-          validation: [{
-            name: 'apply',
-            status: 'failed',
-          }],
-        },
-      },
-    });
-    stderr.write(`${error instanceof Error ? error.message : 'Setup apply failed'}\n`);
-    return 1;
-  }
-}
-
-async function submitSetupReportSafely({ args, runtime, plan, phase, details = {} }) {
-  if (args.noFetch || args.skipSetupReport) {
-    return null;
-  }
-
-  try {
-    const report = await buildSetupReport(plan, phase, details);
-    const result = await reportSetupInstallation({
-      appId: args.appId,
-      apiBase: args.apiBase ?? DEFAULT_API_BASE,
-      env: runtime.env,
-      fetch: runtime.fetch,
-      report,
-    });
-    return {
-      status: 'submitted',
-      phase,
-      result,
-    };
-  } catch (error) {
-    return {
-      status: 'failed',
-      phase,
-      error: error instanceof Error ? error.message : 'Setup report failed',
-    };
-  }
-}
-
-function hasBlockingApplyFailure(validation, inspection) {
-  return validation.some((result) => result.introducedFailure) ||
-    inspection.some((result) => result.status === 'failed');
-}
-
-function hasRemoteAccessBlock(plan) {
-  return plan.remote?.access?.reason === 'subscription_required';
-}
-
-function formatRemoteAccessBlock(plan) {
-  const billingUrl = plan.remote?.access?.billingUrl ?? `${plan.apiBase ?? DEFAULT_API_BASE}/dashboard/account/billing`;
-  return [
-    'DistributionOS setup requires an active Builder or Distributor subscription before applying changes.',
-    `Manage billing: ${billingUrl}`,
-    'No files were changed.',
-    '',
-  ].join('\n');
-}
-
-export function parseArgs(rawArgs) {
+  } catch (error) {
+    await submitSetupReportSafely({
+      args,
+      runtime,
+      plan,
+      phase: 'apply_failed',
+      details: {
+        applyResult: {
+          validation: [{
+            name: 'apply',
+            status: 'failed',
+          }],
+        },
+      },
+    });
+    stderr.write(`${error instanceof Error ? error.message : 'Setup apply failed'}\n`);
+    return 1;
+  }
+}
+
+async function submitSetupReportSafely({ args, runtime, plan, phase, details = {} }) {
+  if (args.noFetch || args.skipSetupReport) {
+    return null;
+  }
+
+  try {
+    const report = await buildSetupReport(plan, phase, details);
+    const result = await reportSetupInstallation({
+      appId: args.appId,
+      apiBase: args.apiBase ?? DEFAULT_API_BASE,
+      env: runtime.env,
+      fetch: runtime.fetch,
+      report,
+    });
+    return {
+      status: 'submitted',
+      phase,
+      result,
+    };
+  } catch (error) {
+    return {
+      status: 'failed',
+      phase,
+      error: error instanceof Error ? error.message : 'Setup report failed',
+    };
+  }
+}
+
+function hasBlockingApplyFailure(validation, inspection) {
+  return validation.some((result) => result.introducedFailure) ||
+    inspection.some((result) => result.status === 'failed');
+}
+
+function hasRemoteAccessBlock(plan) {
+  return plan.remote?.access?.reason === 'subscription_required';
+}
+
+function formatRemoteAccessBlock(plan) {
+  const billingUrl = plan.remote?.access?.billingUrl ?? `${plan.apiBase ?? DEFAULT_API_BASE}/dashboard/account/billing`;
+  return [
+    'DistributionOS setup requires an active Builder or Distributor subscription before applying changes.',
+    `Manage billing: ${billingUrl}`,
+    'No files were changed.',
+    '',
+  ].join('\n');
+}
+
+export function parseArgs(rawArgs) {
   const parsed = {
     command: null,
     appId: null,
@@ -343,11 +343,11 @@ export function parseArgs(rawArgs) {
     apply: false,
     allowDirty: false,
     skipAnalytics: false,
-    skipValidate: false,
-    noOpen: false,
-    noLogin: false,
-    skipSetupReport: false,
-    yes: false,
+    skipValidate: false,
+    noOpen: false,
+    noLogin: false,
+    skipSetupReport: false,
+    yes: false,
     url: null,
     contentId: null,
     contractVersion: null,
@@ -379,11 +379,11 @@ export function parseArgs(rawArgs) {
     else if (arg === '--apply') parsed.apply = true;
     else if (arg === '--allow-dirty') parsed.allowDirty = true;
     else if (arg === '--skip-analytics') parsed.skipAnalytics = true;
-    else if (arg === '--skip-validate') parsed.skipValidate = true;
-    else if (arg === '--no-open') parsed.noOpen = true;
-    else if (arg === '--no-login') parsed.noLogin = true;
-    else if (arg === '--skip-setup-report') parsed.skipSetupReport = true;
-    else if (arg === '--yes' || arg === '-y') parsed.yes = true;
+    else if (arg === '--skip-validate') parsed.skipValidate = true;
+    else if (arg === '--no-open') parsed.noOpen = true;
+    else if (arg === '--no-login') parsed.noLogin = true;
+    else if (arg === '--skip-setup-report') parsed.skipSetupReport = true;
+    else if (arg === '--yes' || arg === '-y') parsed.yes = true;
     else if (arg === '--app') parsed.appId = args[++index] ?? null;
     else if (arg.startsWith('--app=')) parsed.appId = arg.slice('--app='.length);
     else if (arg === '--cwd') parsed.cwd = args[++index] ?? null;
@@ -416,15 +416,15 @@ function helpText() {
   return [
     'DistributionOS CLI',
     '',
-    'Usage:',
-    '  distributionos setup --app <appId> [--api-base <url>] [--cwd <path>] [--json] [--no-fetch]',
-    '  distributionos setup --app <appId> --apply [--domain <domain>] [--allow-dirty] [--skip-setup-report]',
+    'Usage:',
+    '  distributionos setup --app <appId> [--api-base <url>] [--cwd <path>] [--json] [--no-fetch]',
+    '  distributionos setup --app <appId> --apply [--domain <domain>] [--allow-dirty] [--skip-setup-report]',
     '  distributionos login --app <appId> [--api-base <url>]',
     '  distributionos verify --app <appId> --url <liveUrl> [--content-id <id>]',
     '  distributionos report-implementation --app <appId> --artifact <artifactId> [--url <liveUrl>] [--summary <text>]',
     '',
-    'Default mode reviews the setup plan without changing files. Run again with --apply after the plan looks right.',
-    'If the repo has existing uncommitted changes, commit/stash first or use --allow-dirty when you recognize them.',
+    'Default mode reviews the setup plan without changing files. Run again with --apply after the plan looks right.',
+    'If the repo has existing uncommitted changes, commit/stash first or use --allow-dirty when you recognize them.',
     '',
     'Authentication:',
     '  Happy path uses DistributionOS MCP OAuth and stores app-scoped credentials outside the repo.',
@@ -528,13 +528,13 @@ function formatReportResult(result) {
   return `${lines.join('\n')}\n`;
 }
 
-function formatApplyResult(plan, changes, initialization, validation, inspection, skipValidate, apiBase = DEFAULT_API_BASE) {
-  const reviewUrl = initialization?.reviewUrl
-    ? absoluteDistributionOsUrl(initialization.reviewUrl, apiBase)
-    : null;
-  const lines = [
-    formatPlanText({ ...plan, mode: 'apply' }).trimEnd(),
-    '',
+function formatApplyResult(plan, changes, initialization, validation, inspection, skipValidate, apiBase = DEFAULT_API_BASE) {
+  const reviewUrl = initialization?.reviewUrl
+    ? absoluteDistributionOsUrl(initialization.reviewUrl, apiBase)
+    : null;
+  const lines = [
+    formatPlanText({ ...plan, mode: 'apply' }).trimEnd(),
+    '',
     'Applied changes',
   ];
 
@@ -548,9 +548,9 @@ function formatApplyResult(plan, changes, initialization, validation, inspection
     }
   }
 
-  lines.push(reviewUrl
-    ? `- Initialization submitted. Review URL: ${reviewUrl}`
-    : '- Initialization was not submitted because no auth token was available.');
+  lines.push(reviewUrl
+    ? `- Initialization submitted. Review URL: ${reviewUrl}`
+    : '- Initialization was not submitted because no auth token was available.');
 
   lines.push('', 'Validation');
   if (skipValidate) {
@@ -579,36 +579,39 @@ function formatApplyResult(plan, changes, initialization, validation, inspection
     for (const result of inspection) {
       lines.push(`- ${result.name}: ${result.status} - ${result.message}`);
     }
-  }
-  lines.push('- Nothing was committed, pushed, or deployed.');
-  lines.push('', 'Next step');
-  if (reviewUrl) {
-    lines.push(
+  }
+  lines.push('- Nothing was committed, pushed, or deployed.');
+  lines.push('', 'Next step');
+  if (reviewUrl) {
+    lines.push(
       '- Open this DistributionOS review page now:',
       `  ${reviewUrl}`,
-      '- If .mcp.json was created or updated, restart or reconnect your agent session so it can load the DistributionOS MCP server.',
-      '- On the review page, copy the verification prompt and ask your agent to run it.',
-      '- DistributionOS will wait for a successful app-scoped MCP/API call before you continue to Brain Doc review.',
-      '- Verification prompt: "Check DistributionOS connection, fetch the latest agent instructions, then tell me today\'s analytics summary for this app."',
-      '- After review, come back to this repo and inspect git diff before committing, pushing, or deploying.',
-    );
-  } else {
-    lines.push(
-      '- Reconnect DistributionOS OAuth or provide an app-scoped token, then rerun setup so initialization can be submitted.',
-      '- No DistributionOS review page is ready yet.',
-    );
-  }
-  return `${lines.join('\n')}\n`;
-}
-
-function oneLine(value) {
-  return String(value).split(/\r?\n/).filter(Boolean).slice(-1)[0]?.slice(0, 240) ?? '';
-}
-
-function absoluteDistributionOsUrl(pathOrUrl, apiBase) {
-  try {
-    return new URL(pathOrUrl, apiBase || DEFAULT_API_BASE).toString();
-  } catch {
-    return String(pathOrUrl);
-  }
-}
+      '- Codex users: make sure `codex mcp add distributionos --url https://distributionos.dev/api/mcp` and `codex mcp login distributionos` have run, then fully quit and reopen Codex Desktop before checking the connection.',
+      '- Claude Code users: if .mcp.json was created or updated, restart or reconnect Claude Code and approve the project MCP server if asked.',
+      '- Other MCP-aware agents: reconnect the agent from this repo so it can load the DistributionOS MCP server.',
+      '- On the review page, copy the connection check prompt into the fresh/reconnected agent chat.',
+      '- If your agent only sees DistributionOS authentication tools, copy the auth prompt from the review page and complete OAuth before continuing.',
+      '- Then copy the verification prompt from the review page and ask your agent to call check_distributionos_connection, get_agent_instructions, and get_analytics_summary.',
+      '- DistributionOS will wait for a successful app-scoped MCP call before you continue to Brain Doc review.',
+      '- After review, come back to this repo and inspect git diff before committing, pushing, or deploying.',
+    );
+  } else {
+    lines.push(
+      '- Reconnect DistributionOS OAuth or provide an app-scoped token, then rerun setup so initialization can be submitted.',
+      '- No DistributionOS review page is ready yet.',
+    );
+  }
+  return `${lines.join('\n')}\n`;
+}
+
+function oneLine(value) {
+  return String(value).split(/\r?\n/).filter(Boolean).slice(-1)[0]?.slice(0, 240) ?? '';
+}
+
+function absoluteDistributionOsUrl(pathOrUrl, apiBase) {
+  try {
+    return new URL(pathOrUrl, apiBase || DEFAULT_API_BASE).toString();
+  } catch {
+    return String(pathOrUrl);
+  }
+}

package/src/constants.js

@@ -6,9 +6,9 @@ export const CLI_PACKAGE_NAME = '@distributionos/cli';
 export const CLI_LOCAL_VERSION = typeof cliPackageJson.version === 'string' ? cliPackageJson.version : '0.0.0-local';
 export const DEFAULT_API_BASE = 'https://distributionos.dev';
 export const MCP_SERVER_URL = 'https://distributionos.dev/api/mcp';
-export const CURRENT_BOOTSTRAP_VERSION = '2026.06.14';
-export const CURRENT_ANALYTICS_CONTRACT_VERSION = '2026.06.14';
-export const CURRENT_SETUP_CONTRACT_VERSION = '2026.06.18';
+export const CURRENT_BOOTSTRAP_VERSION = '2026.06.27';
+export const CURRENT_ANALYTICS_CONTRACT_VERSION = '2026.06.20';
+export const CURRENT_SETUP_CONTRACT_VERSION = '2026.07.01';
 
 export const TOKEN_ENV_NAMES = [
   'DISTRIBUTIONOS_API_KEY',
@@ -49,11 +49,11 @@ export const PRIVATE_ROUTE_PATTERNS = [
   '/products/**',
   '/project/**',
   '/projects/**',
-  '/workspace/**',
-  '/workspaces/**',
-  '/workflow/**',
-  '/workflows/**',
-  '/customer/**',
+  '/workspace/**',
+  '/workspaces/**',
+  '/workflow/**',
+  '/workflows/**',
+  '/customer/**',
   '/customers/**',
   '/client/**',
   '/clients/**',