@distributionos/cli 0.1.2 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@distributionos/cli",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "DistributionOS repo setup CLI for agent onboarding and first-party analytics.",
   "homepage": "https://distributionos.dev",
   "repository": {

package/src/cli.js

@@ -344,7 +344,8 @@ function helpText() {
     '  distributionos verify --app <appId> --url <liveUrl> [--content-id <id>]',
     '  distributionos report-implementation --app <appId> --artifact <artifactId> [--url <liveUrl>] [--summary <text>]',
     '',
-    'Default mode prints a dry-run plan. Interactive terminals can confirm the plan before mutation; non-interactive runs need --apply or --yes.',
+    '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.',

package/src/plan.js

@@ -89,11 +89,11 @@ function sanitizePackageJson(packageJson) {
 
 export function formatPlanText(plan) {
   const lines = [
-    'DistributionOS CLI setup plan',
-    `App: ${plan.appId}`,
-    plan.mode === 'apply'
-      ? 'Mode: apply'
-      : 'Mode: dry-run (no files changed)',
+    '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}`,
@@ -139,12 +139,47 @@ export function formatPlanText(plan) {
     lines.push('', 'Future-compatible route gate config', plan.analytics.configSnippet);
   }
 
-  if (plan.warnings.length > 0) {
-    lines.push('', 'Warnings', ...plan.warnings.map(item => `- ${item}`));
-  }
-
-  return `${lines.join('\n')}\n`;
-}
+  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 and the supported analytics layout. Review git diff before committing or deploying.',
+  );
+
+  return lines;
+}
 
 function buildAnalyticsPlan({ analyticsContract, repo, instructionPackVersion }) {
   const layoutTarget = selectAnalyticsLayoutTarget(repo);
@@ -249,9 +284,9 @@ function remoteSummary(plan) {
     return `- Used ${plan.remote.tokenName}, but one or more DistributionOS requests failed.`;
   }
   if (plan.remote.status === 'skipped') {
-    return '- Remote fetch skipped. Dry-run used local fallback instructions and did not call DistributionOS APIs.';
+    return '- Remote fetch skipped. The setup plan used local fallback instructions and did not call DistributionOS APIs.';
   }
-  return '- No OAuth or env token found. Dry-run 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) {
@@ -276,9 +311,9 @@ 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 is not enabled yet; create tracker in DistributionOS first';
-  }
+  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';
 }