move-doctor 0.2.0-dev.4820c3a → 0.2.0-dev.d0feceb

package/dist/cli.js

@@ -3,13 +3,13 @@ import * as path5 from 'path';
 import { statSync, readdirSync, existsSync, readFileSync, mkdirSync, writeFileSync, chmodSync } from 'fs';
 import { fileURLToPath } from 'url';
 import { Parser, Language } from 'web-tree-sitter';
-import { readFile, mkdir, writeFile, stat, mkdtemp, rm, readdir } from 'fs/promises';
+import { readFile, mkdir, writeFile, readdir, stat, mkdtemp, rm } from 'fs/promises';
 import { spawn } from 'child_process';
 import pc from 'picocolors';
 import * as os from 'os';
+import { intro, outro, spinner, log, select as select$1, isCancel, multiselect as multiselect$1, cancel } from '@clack/prompts';
 import { getSkillAgentConfig, detectInstalledSkillAgents, installSkillsFromSource } from 'agent-install';
 import { createHash } from 'crypto';
-import prompts from 'prompts';
 
 var resolveGrammarWasmPath = () => {
   const candidates = [
@@ -158,14 +158,25 @@ var scanMoveFiles = async (project, options) => {
   return results.filter((file) => file !== null);
 };
 
-// ../core/dist/engine/score.js
+// ../core/dist/engine/score.const.js
 var SEVERITY_WEIGHTS = {
   error: 8,
   warning: 3,
   info: 1
 };
-var PER_RULE_DEDUCTION_CAP = 25;
+var PER_RULE_DEDUCTION_CAP = {
+  error: 25,
+  warning: 25,
+  info: 5
+};
+var SEVERITY_RANK = {
+  error: 3,
+  warning: 2,
+  info: 1
+};
 var MAX_SCORE = 100;
+
+// ../core/dist/engine/score.js
 var computeScore = (diagnostics) => {
   const bySeverity = {
     error: 0,
@@ -178,12 +189,22 @@ var computeScore = (diagnostics) => {
     bySeverity[diagnostic.severity] += 1;
     byBucket[diagnostic.bucket] = (byBucket[diagnostic.bucket] ?? 0) + 1;
     const weight = SEVERITY_WEIGHTS[diagnostic.severity];
-    const prior = deductionByRule.get(diagnostic.ruleId) ?? 0;
-    deductionByRule.set(diagnostic.ruleId, prior + weight);
+    const prior = deductionByRule.get(diagnostic.ruleId);
+    if (prior) {
+      prior.weight += weight;
+      if (SEVERITY_RANK[diagnostic.severity] > SEVERITY_RANK[prior.severity]) {
+        prior.severity = diagnostic.severity;
+      }
+    } else {
+      deductionByRule.set(diagnostic.ruleId, {
+        weight,
+        severity: diagnostic.severity
+      });
+    }
   }
   let totalDeductions = 0;
-  for (const ruleDeduction of deductionByRule.values()) {
-    totalDeductions += Math.min(ruleDeduction, PER_RULE_DEDUCTION_CAP);
+  for (const { weight, severity } of deductionByRule.values()) {
+    totalDeductions += Math.min(weight, PER_RULE_DEDUCTION_CAP[severity]);
   }
   const score = Math.max(0, MAX_SCORE - totalDeductions);
   return {
@@ -680,6 +701,7 @@ var highlighter = {
   bgYellow: pc.bgYellow,
   bgRed: pc.bgRed
 };
+var colorEnabled = () => pc.isColorSupported;
 var PERFECT_SCORE = 100;
 var SCORE_GOOD_THRESHOLD = 80;
 var SCORE_OK_THRESHOLD = 50;
@@ -2893,12 +2915,12 @@ var unnecessaryTestScenario = defineAstRule({
         continue;
       }
       const calls = collectNodesOfType(body, "call_expression");
-      const scenarioPaths = calls.map((call) => callExpressionPath(call)).filter((path14) => path14.module === "test_scenario");
-      const usesBegin = scenarioPaths.some((path14) => path14.member === "begin");
+      const scenarioPaths = calls.map((call) => callExpressionPath(call)).filter((path13) => path13.module === "test_scenario");
+      const usesBegin = scenarioPaths.some((path13) => path13.member === "begin");
       if (!usesBegin) {
         continue;
       }
-      const usesApi = scenarioPaths.some((path14) => path14.member !== null && SCENARIO_API.has(path14.member));
+      const usesApi = scenarioPaths.some((path13) => path13.member !== null && SCENARIO_API.has(path13.member));
       if (usesApi) {
         continue;
       }
@@ -3060,51 +3082,6 @@ var resolveChangedFiles = async (rootDirectory, diff) => {
   );
 };
 
-// src/cli/skill-content.ts
-var SKILL_MD_CONTENT = `---
-name: move-doctor
-description: Use when finishing a Sui Move feature, fixing a bug, before committing Move code, or when the user types /movedoctor, asks to scan, triage, or clean up Move diagnostics. Covers Move Book conventions, Move 2024 idioms, ability mistakes, testing style, and security best practices.
-version: "0.1.0"
----
-
-# Move Doctor
-
-Scans Sui Move codebases for convention, idiom, ability, testing, and security issues. Outputs a 0\u2013100 health score.
-
-## After making Move code changes
-
-Run \`npx move-doctor@latest --verbose --diff\` and check the score did not regress. If it dropped, fix the regressions before committing.
-
-## For a full cleanup pass
-
-Run \`npx move-doctor@latest --verbose\` (without \`--diff\`) to scan the whole codebase. Fix issues by severity \u2014 errors first, then warnings, then info.
-
-## /movedoctor \u2014 full triage workflow
-
-When the user types \`/movedoctor\`, says "run move doctor", or asks for a full triage / cleanup pass, fetch the canonical playbook and follow every step (fetching it means updates ship without a skill reinstall):
-
-\`\`\`bash
-curl --fail --silent --show-error \\
-  --header 'Cache-Control: no-cache' \\
-  https://move.doctor/prompts/move-doctor-agent.md
-\`\`\`
-
-It's a scan \u2192 group \u2192 triage \u2192 fix \u2192 re-score loop that edits the working tree directly (never commits, never opens PRs). For each finding, fetch the matching per-rule fix recipe on demand \u2014 \`<bucket>/<rule>\` comes straight from the diagnostic's rule id:
-
-\`\`\`bash
-curl --fail --silent --show-error \\
-  https://move.doctor/prompts/rules/<bucket>/<rule>.md
-\`\`\`
-
-If the fetch fails (offline / site down), fall back to: run \`move-doctor --verbose\`, fix errors first (\`security/*\` and \`abilities/*\` findings are real vulnerabilities, not style), apply each finding's \`fixHint\` verbatim, and re-run until the score stops rising. Never suppress a rule unless you can explain why the surrounding code is a documented exception.
-
-## Command
-
-\`\`\`bash
-npx move-doctor@latest [path] --verbose --diff   # --score for CI gating \xB7 --help for all flags
-\`\`\`
-`;
-
 // src/cli/parse-args.ts
 var HELP_FLAGS = /* @__PURE__ */ new Set(["-h", "--help"]);
 var VERSION_FLAGS = /* @__PURE__ */ new Set(["-v", "--version"]);
@@ -3200,131 +3177,221 @@ var parseArgs = (argv2) => {
   return args;
 };
 
-// src/cli/utils/next-steps.ts
-var POINTER = process.platform === "win32" && !process.env.WT_SESSION ? ">" : "\u203A";
-var buildNextStep = (line) => ({ line });
-var findHottestBucket = (result) => {
-  const buckets = /* @__PURE__ */ new Map();
-  const severityWeight = (severity) => {
-    if (severity === "error") {
-      return 8;
-    }
-    if (severity === "warning") {
-      return 3;
-    }
-    return 1;
-  };
-  for (const diagnostic of result.diagnostics) {
-    const weight = severityWeight(diagnostic.severity);
-    buckets.set(
-      diagnostic.bucket,
-      (buckets.get(diagnostic.bucket) ?? 0) + weight
-    );
+// src/cli/constants.ts
+var BAR_WIDTH = 24;
+var MIN_TERM_WIDTH = 40;
+var MAX_TERM_WIDTH = 80;
+var MAX_CARD_WIDTH = 74;
+var HOMEPAGE = "https://move.doctor/";
+
+// src/cli/utils/glyphs.ts
+var LEGACY_WIN = process.platform === "win32" && !process.env.WT_SESSION;
+var glyph = {
+  /** Brand mark / "diagnosis" accent. */
+  cross: LEGACY_WIN ? "+" : "\u271A",
+  /** Filled status dot — health at a glance. */
+  dot: LEGACY_WIN ? "*" : "\u25CF",
+  /** Hollow status dot — info / neutral. */
+  dotOpen: LEGACY_WIN ? "\xB7" : "\u25CB",
+  check: LEGACY_WIN ? "\u221A" : "\u2713",
+  warn: LEGACY_WIN ? "!" : "\u26A0",
+  crossMark: LEGACY_WIN ? "x" : "\u2717",
+  /** Action / next-step list marker. */
+  pointer: LEGACY_WIN ? ">" : "\u203A",
+  /** Inline separator between facts. */
+  bullet: "\xB7"};
+
+// src/cli/utils/meter.ts
+var ERROR_CELL = "\u2588";
+var WARNING_CELL = "\u2593";
+var INFO_CELL = "\u2592";
+var EMPTY_CELL = "\u2591";
+var makeSegments = (counts) => [
+  {
+    n: counts.errors,
+    paint: highlighter.error,
+    char: ERROR_CELL,
+    cells: 0,
+    frac: 0
+  },
+  {
+    n: counts.warnings,
+    paint: highlighter.warn,
+    char: WARNING_CELL,
+    cells: 0,
+    frac: 0
+  },
+  {
+    n: counts.info,
+    paint: highlighter.muted,
+    char: INFO_CELL,
+    cells: 0,
+    frac: 0
   }
-  let best = null;
-  let bestWeight = 0;
-  for (const [bucket, weight] of buckets) {
-    if (weight > bestWeight) {
-      best = bucket;
-      bestWeight = weight;
+];
+var paintComposition = (counts, cells) => {
+  if (cells <= 0) {
+    return "";
+  }
+  const total = counts.errors + counts.warnings + counts.info;
+  if (total === 0) {
+    return highlighter.muted(EMPTY_CELL.repeat(cells));
+  }
+  const segments = makeSegments(counts);
+  let used = 0;
+  for (const seg of segments) {
+    const exact = seg.n / total * cells;
+    seg.cells = Math.floor(exact);
+    seg.frac = exact - seg.cells;
+    used += seg.cells;
+  }
+  const byFraction = [...segments].sort((a, b) => b.frac - a.frac);
+  for (let k = 0; used < cells && byFraction.length > 0; k++) {
+    const seg = byFraction[k % byFraction.length];
+    if (seg) {
+      seg.cells += 1;
+      used += 1;
+    }
+  }
+  for (const seg of segments) {
+    if (seg.n > 0 && seg.cells === 0) {
+      const donor = segments.reduce(
+        (max, s) => s.cells > max.cells ? s : max
+      );
+      if (donor.cells > 1) {
+        donor.cells -= 1;
+        seg.cells += 1;
+      }
     }
   }
-  return best;
+  return segments.map((seg) => seg.paint(seg.char.repeat(seg.cells))).join("");
 };
-var buildNextSteps = (context) => {
-  const { result, hasInstalledSkill, hasSuiCli } = context;
-  const lines = [];
-  const steps = [];
-  if (result.diagnostics.length > 0) {
-    steps.push(
-      buildNextStep(
-        `${highlighter.muted(POINTER)} Run ${highlighter.accent("--verbose")} for file refs and fix hints.`
-      )
-    );
-    const hottest = findHottestBucket(result);
-    if (hottest) {
-      steps.push(
-        buildNextStep(
-          `${highlighter.muted(POINTER)} Focus on ${highlighter.bold(hottest)} first: ${highlighter.accent("move-doctor . --verbose")}`
-        )
-      );
+var compositionBar = (counts, width) => {
+  const total = counts.errors + counts.warnings + counts.info;
+  if (total === 0) {
+    return highlighter.ok(ERROR_CELL.repeat(width));
+  }
+  return paintComposition(counts, width);
+};
+var magnitudeBar = (counts, width, maxTotal) => {
+  const total = counts.errors + counts.warnings + counts.info;
+  if (total === 0) {
+    return highlighter.muted(EMPTY_CELL.repeat(width));
+  }
+  const ratio = maxTotal > 0 ? total / maxTotal : 1;
+  const filled = Math.min(width, Math.max(1, Math.round(ratio * width)));
+  return paintComposition(counts, filled) + highlighter.muted(EMPTY_CELL.repeat(width - filled));
+};
+var SEVERITY_MARK = {
+  error: ERROR_CELL,
+  warning: WARNING_CELL,
+  info: INFO_CELL
+};
+
+// src/cli/utils/terminal.ts
+var supportsHyperlinks = () => process.stdout.isTTY === true && colorEnabled();
+var ESC = String.fromCharCode(27);
+var BEL = String.fromCharCode(7);
+var hyperlink = (text, url) => supportsHyperlinks() ? `${ESC}]8;;${url}${BEL}${text}${ESC}]8;;${BEL}` : text;
+
+// src/cli/render-common.ts
+var ANSI_SGR = new RegExp(`${String.fromCharCode(27)}[[][0-9;]*m`, "g");
+var visibleLength = (text) => text.replace(ANSI_SGR, "").length;
+var truncatePlain = (text, max) => text.length <= max ? text : `${text.slice(0, Math.max(0, max - 1))}\u2026`;
+var terminalWidth = () => {
+  const width = process.stdout.columns ?? MAX_TERM_WIDTH;
+  return Math.max(MIN_TERM_WIDTH, Math.min(width, MAX_TERM_WIDTH));
+};
+var plural = (n, word) => `${n} ${word}${n === 1 ? "" : "s"}`;
+var formatDurationShort = (durationMs) => durationMs < 1e3 ? `${durationMs}ms` : `${(durationMs / 1e3).toFixed(1)}s`;
+var countSeverities = (diagnostics) => {
+  const counts = { errors: 0, warnings: 0, info: 0 };
+  for (const diagnostic of diagnostics) {
+    if (diagnostic.severity === "error") {
+      counts.errors += 1;
+    } else if (diagnostic.severity === "warning") {
+      counts.warnings += 1;
+    } else {
+      counts.info += 1;
     }
   }
-  if (!hasInstalledSkill) {
-    steps.push(
-      buildNextStep(
-        `${highlighter.muted(POINTER)} Install the agent skill so your agent can auto-fix findings: ${highlighter.accent("npx move-doctor install")}`
-      )
+  return counts;
+};
+var severityDot = (counts) => {
+  if (counts.errors > 0) {
+    return highlighter.error(glyph.dot);
+  }
+  if (counts.warnings > 0) {
+    return highlighter.warn(glyph.dot);
+  }
+  return highlighter.muted(glyph.dotOpen);
+};
+var severitySummary = (counts) => {
+  const parts = [];
+  if (counts.errors > 0) {
+    parts.push(highlighter.error(plural(counts.errors, "error")));
+  }
+  if (counts.warnings > 0) {
+    parts.push(highlighter.warn(plural(counts.warnings, "warning")));
+  }
+  if (counts.info > 0) {
+    parts.push(highlighter.muted(`${counts.info} info`));
+  }
+  return parts.join(highlighter.muted(" \xB7 "));
+};
+var barRow = (dot, label, bar, ...columns) => `  ${dot} ${label}  ${bar}  ${columns.join("  ")}`;
+var severityLegend = (counts, total) => {
+  const pct = (n) => highlighter.muted(` ${Math.round(n / total * 100)}%`);
+  const parts = [];
+  if (counts.errors > 0) {
+    parts.push(
+      highlighter.error(
+        `${SEVERITY_MARK.error} ${plural(counts.errors, "error")}`
+      ) + pct(counts.errors)
     );
   }
-  if (!hasSuiCli) {
-    steps.push(
-      buildNextStep(
-        `${highlighter.muted(POINTER)} Install the Sui CLI to enable compiler lints (W0*): ${highlighter.accent("https://docs.sui.io/guides/developer/getting-started/sui-install")}`
-      )
+  if (counts.warnings > 0) {
+    parts.push(
+      highlighter.warn(
+        `${SEVERITY_MARK.warning} ${plural(counts.warnings, "warning")}`
+      ) + pct(counts.warnings)
     );
   }
-  steps.push(
-    buildNextStep(
-      `${highlighter.muted(POINTER)} Full rule catalog: ${highlighter.accent("https://move.doctor/docs/rules")}`
-    )
-  );
-  for (const step of steps) {
-    lines.push(`  ${step.line}`);
+  if (counts.info > 0) {
+    parts.push(
+      highlighter.muted(`${SEVERITY_MARK.info} ${counts.info} info`) + pct(counts.info)
+    );
   }
-  return lines;
+  return parts.join("    ");
 };
-
-// src/cli/render.ts
-var POINTER2 = process.platform === "win32" && !process.env.WT_SESSION ? ">" : "\xB7";
-var terminalWidth = () => {
-  const width = process.stdout.columns ?? 80;
-  return Math.max(40, Math.min(width, 80));
+var buildTopBorder = (width, cross, title) => {
+  const muted = highlighter.muted;
+  const label = "diagnosis";
+  const fixed = 8 + label.length;
+  const shownTitle = truncatePlain(title, Math.max(4, width - 2 - fixed - 1));
+  const fill = Math.max(1, width - 2 - fixed - shownTitle.length);
+  return `  ${muted("\u256D\u2500 ")}${cross}${muted(` ${label} ${"\u2500".repeat(fill)} `)}${highlighter.bold(shownTitle)}${muted(" \u2500\u256E")}`;
 };
-var buildScoreBar = (score, width) => {
-  const filled = Math.round(score / PERFECT_SCORE * width);
-  const empty = width - filled;
-  return colorizeByScore("\u2588".repeat(filled), score) + highlighter.muted("\u2591".repeat(empty));
+var buildBottomBorder = (width) => {
+  const muted = highlighter.muted;
+  const label = "move.doctor";
+  const fill = Math.max(0, width - 2 - (label.length + 3));
+  const wordmark = highlighter.bold(
+    highlighter.accent(hyperlink(label, HOMEPAGE))
+  );
+  return `  ${muted(`\u2570${"\u2500".repeat(fill)} `)}${wordmark}${muted(" \u2500\u256F")}`;
 };
-var ANSI_PATTERN = /\x1b\[[0-9;]*m/g;
-var stripAnsi = (text) => text.replace(ANSI_PATTERN, "");
-var visibleLength = (text) => stripAnsi(text).length;
-var formatDurationShort = (durationMs) => durationMs < 1e3 ? `${durationMs}ms` : `${(durationMs / 1e3).toFixed(1)}s`;
-var truncatePlain = (text, max) => text.length <= max ? text : `${text.slice(0, Math.max(0, max - 1))}\u2026`;
-var buildInfoCard = (data) => {
+var buildDiagnosisHeader = (data) => {
   const { score } = data;
-  const width = Math.min(terminalWidth(), 74);
+  const color = (text) => colorizeByScore(text, score);
+  const width = Math.min(terminalWidth(), MAX_CARD_WIDTH);
   const inner = width - 4;
   const muted = highlighter.muted;
-  const colorScore = (text) => colorizeByScore(text, score);
-  const top = `  ${muted(`\u256D${"\u2500".repeat(width - 2)}\u256E`)}`;
-  const bottomLabel = "move.doctor";
-  const bottomFill = Math.max(0, width - 2 - (1 + bottomLabel.length + 2));
-  const bottom = `  ${muted(`\u2570${"\u2500".repeat(bottomFill)} `)}${highlighter.bold(highlighter.accent(bottomLabel))}${muted(" \u2500\u256F")}`;
-  const blank = `  ${muted("\u2502")}${" ".repeat(width - 2)}${muted("\u2502")}`;
-  const row = (content) => {
-    const pad = Math.max(0, inner - visibleLength(content));
-    return `  ${muted("\u2502")} ${content}${" ".repeat(pad)} ${muted("\u2502")}`;
-  };
-  const rowLR = (left, right) => {
-    const pad = Math.max(1, inner - visibleLength(left) - visibleLength(right));
-    return `  ${muted("\u2502")} ${left}${" ".repeat(pad)}${right} ${muted("\u2502")}`;
-  };
-  const scoreLeft = `${colorScore(highlighter.bold(String(score)))} ${muted(`/ ${PERFECT_SCORE}`)}   ${colorScore(scoreLabel(score))}`;
-  const scoreLeftWidth = visibleLength(scoreLeft);
-  const title = highlighter.bold(
-    truncatePlain(data.title, Math.max(8, inner - scoreLeftWidth - 2))
-  );
-  const bar = buildScoreBar(score, inner);
   const metaParts = [];
   if (data.packageCount !== void 0) {
-    metaParts.push(
-      `${data.packageCount} package${data.packageCount === 1 ? "" : "s"}`
-    );
+    metaParts.push(plural(data.packageCount, "package"));
   }
-  metaParts.push(
-    `${data.moduleCount} module${data.moduleCount === 1 ? "" : "s"}`
-  );
+  metaParts.push(plural(data.moduleCount, "module"));
   if (data.edition !== void 0) {
     metaParts.push(`edition ${data.edition ?? "unset"}`);
   }
@@ -3337,48 +3404,59 @@ var buildInfoCard = (data) => {
   if (data.durationMs !== null) {
     metaParts.push(`scanned in ${formatDurationShort(data.durationMs)}`);
   }
+  const counts = {
+    errors: data.findings.errors,
+    warnings: data.findings.warnings,
+    info: data.findings.info
+  };
+  const blank = `  ${muted("\u2502")}${" ".repeat(width - 2)}${muted("\u2502")}`;
+  const row = (content) => {
+    const pad = Math.max(0, inner - visibleLength(content));
+    return `  ${muted("\u2502")} ${content}${" ".repeat(pad)} ${muted("\u2502")}`;
+  };
+  const scoreLine = `${muted("score")}  ${color(highlighter.bold(String(score)))} ${muted(`/ ${PERFECT_SCORE}`)}   ${color(glyph.dot)} ${color(highlighter.bold(scoreLabel(score)))}`;
+  const legend = data.findings.total === 0 ? `${highlighter.ok(glyph.check)} ${highlighter.ok("clean bill of health")}` : severityLegend(counts, data.findings.total);
   const meta = muted(truncatePlain(metaParts.join(" \xB7 "), inner));
-  const findings = buildFindingsTldr(data.findings);
   return [
-    top,
+    buildTopBorder(width, color(glyph.cross), data.title),
+    blank,
+    row(scoreLine),
     blank,
-    rowLR(scoreLeft, title),
-    row(bar),
+    row(compositionBar(counts, inner)),
+    row(legend),
     blank,
     row(meta),
-    row(findings),
-    bottom
+    buildBottomBorder(width)
   ].join("\n");
 };
-var buildFindingsTldr = (f) => {
-  if (f.total === 0) {
-    return highlighter.ok("\u2713 no findings");
-  }
-  const head = f.total === 1 ? `${f.total} ${highlighter.bold("finding")}` : `${f.total} ${highlighter.bold("findings")}`;
-  const breakdown = [];
-  if (f.errors > 0) {
-    breakdown.push(
-      highlighter.error(`${f.errors} error${f.errors === 1 ? "" : "s"}`)
-    );
+var severityRank = (group) => {
+  if (group.diagnostics.some((d) => d.severity === "error")) {
+    return 0;
   }
-  if (f.warnings > 0) {
-    breakdown.push(
-      highlighter.warn(`${f.warnings} warning${f.warnings === 1 ? "" : "s"}`)
-    );
+  if (group.diagnostics.some((d) => d.severity === "warning")) {
+    return 1;
   }
-  if (f.info > 0) {
-    breakdown.push(highlighter.muted(`${f.info} info`));
+  return 2;
+};
+var groupByBucket = (diagnostics) => {
+  const byBucket = /* @__PURE__ */ new Map();
+  for (const diagnostic of diagnostics) {
+    const list = byBucket.get(diagnostic.bucket) ?? [];
+    list.push(diagnostic);
+    byBucket.set(diagnostic.bucket, list);
   }
-  return `${head}  ${highlighter.muted(POINTER2)}  ${breakdown.join(highlighter.muted(" \xB7 "))}`;
+  return [...byBucket.entries()].map(([bucket, list]) => ({ bucket, diagnostics: list })).sort(
+    (a, b) => severityRank(a) - severityRank(b) || b.diagnostics.length - a.diagnostics.length
+  );
 };
 var severityIcon = (severity) => {
   if (severity === "error") {
-    return "\u2717";
+    return glyph.crossMark;
   }
   if (severity === "warning") {
-    return "\u26A0";
+    return glyph.warn;
   }
-  return "\xB7";
+  return glyph.bullet;
 };
 var colorizeBySeverity = (text, severity) => {
   if (severity === "error") {
@@ -3389,26 +3467,6 @@ var colorizeBySeverity = (text, severity) => {
   }
   return highlighter.muted(text);
 };
-var groupByBucket = (diagnostics) => {
-  const byBucket = /* @__PURE__ */ new Map();
-  for (const diagnostic of diagnostics) {
-    const list = byBucket.get(diagnostic.bucket) ?? [];
-    list.push(diagnostic);
-    byBucket.set(diagnostic.bucket, list);
-  }
-  return [...byBucket.entries()].map(([bucket, list]) => ({ bucket, diagnostics: list })).sort(
-    (a, b) => severityRank(a) - severityRank(b) || b.diagnostics.length - a.diagnostics.length
-  );
-};
-var severityRank = (group) => {
-  if (group.diagnostics.some((d) => d.severity === "error")) {
-    return 0;
-  }
-  if (group.diagnostics.some((d) => d.severity === "warning")) {
-    return 1;
-  }
-  return 2;
-};
 var groupByRule = (diagnostics) => {
   const byRule = /* @__PURE__ */ new Map();
   for (const diagnostic of diagnostics) {
@@ -3418,29 +3476,6 @@ var groupByRule = (diagnostics) => {
   }
   return byRule;
 };
-var buildBucketBreakdownLine = (group, columnWidth) => {
-  const errors = group.diagnostics.filter((d) => d.severity === "error").length;
-  const warnings = group.diagnostics.filter(
-    (d) => d.severity === "warning"
-  ).length;
-  const infos = group.diagnostics.filter((d) => d.severity === "info").length;
-  const parts = [];
-  if (errors > 0) {
-    parts.push(
-      highlighter.error(`${errors} ${errors === 1 ? "error" : "errors"}`)
-    );
-  }
-  if (warnings > 0) {
-    parts.push(
-      highlighter.warn(`${warnings} ${warnings === 1 ? "warning" : "warnings"}`)
-    );
-  }
-  if (infos > 0) {
-    parts.push(highlighter.muted(`${infos} info`));
-  }
-  const bucketLabel = group.bucket.padEnd(columnWidth);
-  return `  ${highlighter.bold(bucketLabel)}  ${highlighter.muted(POINTER2)}  ${parts.join(highlighter.muted(" \xB7 "))}`;
-};
 var buildRuleHeaderLine = (ruleId, ruleDiagnostics, ruleColumnWidth) => {
   const first = ruleDiagnostics[0];
   const icon = colorizeBySeverity(severityIcon(first.severity), first.severity);
@@ -3451,55 +3486,7 @@ var buildRuleHeaderLine = (ruleId, ruleDiagnostics, ruleColumnWidth) => {
     first.severity
   );
   const citation = first.citation ? `  ${highlighter.muted(first.citation)}` : "";
-  return `  ${icon} ${padded}${citation}${countBadge}`;
-};
-var cardFromContext = (result, context) => buildInfoCard({
-  score: result.score.score,
-  title: result.project.packageName,
-  edition: result.project.edition,
-  suiVersion: context.suiVersion,
-  moduleCount: context.moduleCount,
-  durationMs: context.durationMs,
-  packageCount: context.packageCount,
-  findings: {
-    total: result.score.totalFindings,
-    errors: result.score.bySeverity.error,
-    warnings: result.score.bySeverity.warning,
-    info: result.score.bySeverity.info
-  }
-});
-var buildCompactSummary = (result, context) => {
-  const lines = [];
-  lines.push(cardFromContext(result, context));
-  if (result.diagnostics.length > 0) {
-    lines.push("");
-    const bucketGroups = groupByBucket(result.diagnostics);
-    const bucketColumnWidth = Math.max(
-      ...bucketGroups.map((g) => g.bucket.length),
-      0
-    );
-    for (const group of bucketGroups) {
-      lines.push(buildBucketBreakdownLine(group, bucketColumnWidth));
-    }
-  }
-  if (!(result.compilerLintAvailable || context.hasSuiCli)) {
-    lines.push("");
-    lines.push(
-      highlighter.muted(
-        `  ${POINTER2} Sui CLI not found on PATH \u2014 compiler lints (W0*) skipped.`
-      )
-    );
-  }
-  const nextSteps = buildNextSteps({
-    result,
-    hasInstalledSkill: context.hasInstalledSkill,
-    hasSuiCli: context.hasSuiCli
-  });
-  if (nextSteps.length > 0) {
-    lines.push("");
-    lines.push(...nextSteps);
-  }
-  return lines.join("\n");
+  return `    ${icon} ${padded}${citation}${countBadge}`;
 };
 var indentBlock = (text, prefix) => text.split("\n").map((line) => `${prefix}${line.trimStart()}`).join("\n");
 var buildLocation = (diagnostic, rootDirectory) => {
@@ -3507,44 +3494,34 @@ var buildLocation = (diagnostic, rootDirectory) => {
   return `${relativePath}:${diagnostic.line}:${diagnostic.column}`;
 };
 var buildVerboseRuleGroup = (ruleId, ruleDiagnostics, ruleColumnWidth, rootDirectory) => {
-  const lines = [];
-  lines.push(buildRuleHeaderLine(ruleId, ruleDiagnostics, ruleColumnWidth));
+  const lines = [
+    buildRuleHeaderLine(ruleId, ruleDiagnostics, ruleColumnWidth)
+  ];
   const first = ruleDiagnostics[0];
-  lines.push(highlighter.muted(indentBlock(first.message, "      ")));
+  lines.push(highlighter.muted(indentBlock(first.message, "        ")));
   if (first.fixHint) {
-    const hint = `${POINTER2} ${first.fixHint}`;
-    lines.push(highlighter.muted(indentBlock(hint, "      ")));
+    lines.push(
+      highlighter.muted(
+        indentBlock(`${glyph.pointer} ${first.fixHint}`, "        ")
+      )
+    );
   }
   for (const diagnostic of ruleDiagnostics) {
     lines.push(
-      highlighter.muted(`      ${buildLocation(diagnostic, rootDirectory)}`)
+      highlighter.muted(`        ${buildLocation(diagnostic, rootDirectory)}`)
     );
   }
   lines.push("");
   return lines;
 };
-var buildVerboseSummary = (result, context) => {
+var buildBucketRuleDetail = (diagnostics, rootDirectory) => {
   const lines = [];
-  lines.push(cardFromContext(result, context));
-  if (result.diagnostics.length === 0) {
-    if (!(result.compilerLintAvailable || context.hasSuiCli)) {
-      lines.push("");
-      lines.push(
-        highlighter.muted(
-          `  ${POINTER2} Sui CLI not found on PATH \u2014 compiler lints (W0*) skipped.`
-        )
-      );
-    }
-    return lines.join("\n");
-  }
-  lines.push("");
-  for (const group of groupByBucket(result.diagnostics)) {
-    const ruleGroups = groupByRule(group.diagnostics);
-    const bucketColumnWidth = Math.max(
-      ...groupByBucket(result.diagnostics).map((g) => g.bucket.length)
-    );
-    lines.push(buildBucketBreakdownLine(group, bucketColumnWidth));
+  for (const group of groupByBucket(diagnostics)) {
     lines.push("");
+    lines.push(
+      `  ${severityDot(countSeverities(group.diagnostics))} ${highlighter.bold(group.bucket)}`
+    );
+    const ruleGroups = groupByRule(group.diagnostics);
     const ruleColumnWidth = Math.max(
       ...[...ruleGroups.keys()].map((ruleId) => ruleId.length),
       0
@@ -3555,27 +3532,178 @@ var buildVerboseSummary = (result, context) => {
           ruleId,
           ruleDiagnostics,
           ruleColumnWidth,
-          result.project.rootDirectory
+          rootDirectory
         )
       );
     }
   }
-  if (!(result.compilerLintAvailable || context.hasSuiCli)) {
+  return lines;
+};
+
+// src/cli/utils/commands.ts
+var NPX = "npx move-doctor@latest";
+var CMD = {
+  verbose: `${NPX} --verbose`,
+  verboseHere: `${NPX} . --verbose`,
+  install: `${NPX} install`};
+var SUI_INSTALL_URL = "https://docs.sui.io/guides/developer/getting-started/sui-install";
+
+// src/cli/utils/next-steps.ts
+var buildNextStep = (line) => ({ line });
+var findHottestBucket = (result) => {
+  const buckets = /* @__PURE__ */ new Map();
+  const severityWeight = (severity) => {
+    if (severity === "error") {
+      return 8;
+    }
+    if (severity === "warning") {
+      return 3;
+    }
+    return 1;
+  };
+  for (const diagnostic of result.diagnostics) {
+    const weight = severityWeight(diagnostic.severity);
+    buckets.set(
+      diagnostic.bucket,
+      (buckets.get(diagnostic.bucket) ?? 0) + weight
+    );
+  }
+  let best = null;
+  let bestWeight = 0;
+  for (const [bucket, weight] of buckets) {
+    if (weight > bestWeight) {
+      best = bucket;
+      bestWeight = weight;
+    }
+  }
+  return best;
+};
+var buildNextSteps = (context) => {
+  const { result, hasInstalledSkill, hasSuiCli } = context;
+  const lines = [];
+  const steps = [];
+  if (result.diagnostics.length > 0) {
+    steps.push(
+      buildNextStep(
+        `${highlighter.muted(glyph.pointer)} Run ${highlighter.accent("--verbose")} for file refs and fix hints.`
+      )
+    );
+    const hottest = findHottestBucket(result);
+    if (hottest) {
+      steps.push(
+        buildNextStep(
+          `${highlighter.muted(glyph.pointer)} Focus on ${highlighter.bold(hottest)} first: ${highlighter.accent(CMD.verboseHere)}`
+        )
+      );
+    }
+  }
+  if (!hasInstalledSkill) {
+    steps.push(
+      buildNextStep(
+        `${highlighter.muted(glyph.pointer)} Install the agent skill so your agent can auto-fix findings: ${highlighter.accent(CMD.install)}`
+      )
+    );
+  }
+  if (!hasSuiCli) {
+    steps.push(
+      buildNextStep(
+        `${highlighter.muted(glyph.pointer)} Install the Sui CLI to enable compiler lints (W0*): ${highlighter.accent(SUI_INSTALL_URL)}`
+      )
+    );
+  }
+  for (const step of steps) {
+    lines.push(`  ${step.line}`);
+  }
+  return lines;
+};
+
+// src/cli/render.ts
+var buildAreaBreakdown = (diagnostics) => {
+  const groups = groupByBucket(diagnostics);
+  const labelWidth = Math.max(...groups.map((g) => g.bucket.length), 0);
+  const maxTotal = Math.max(...groups.map((g) => g.diagnostics.length), 1);
+  const lines = ["", `  ${highlighter.bold("by area")}`];
+  for (const group of groups) {
+    const counts = countSeverities(group.diagnostics);
+    const bar = magnitudeBar(counts, BAR_WIDTH, maxTotal);
+    const count = highlighter.bold(
+      String(group.diagnostics.length).padStart(3)
+    );
     lines.push(
-      highlighter.muted(
-        `  ${POINTER2} Sui CLI not found on PATH \u2014 compiler lints (W0*) skipped.`
+      barRow(
+        severityDot(counts),
+        group.bucket.padEnd(labelWidth),
+        bar,
+        count,
+        severitySummary(counts)
       )
     );
-    lines.push("");
   }
+  return lines;
+};
+var buildFindingsDetail = (diagnostics, rootDirectory) => [
+  "",
+  `  ${highlighter.bold("findings")}`,
+  ...buildBucketRuleDetail(diagnostics, rootDirectory)
+];
+var headerFromContext = (result, context) => buildDiagnosisHeader({
+  score: result.score.score,
+  title: result.project.packageName,
+  edition: result.project.edition,
+  suiVersion: context.suiVersion,
+  moduleCount: context.moduleCount,
+  durationMs: context.durationMs,
+  packageCount: context.packageCount,
+  findings: {
+    total: result.score.totalFindings,
+    errors: result.score.bySeverity.error,
+    warnings: result.score.bySeverity.warning,
+    info: result.score.bySeverity.info
+  }
+});
+var suiMissingNote = () => highlighter.muted(
+  `  ${glyph.bullet} Sui CLI not found on PATH \u2014 compiler lints (W0*) skipped.`
+);
+var appendNextSteps = (lines, result, context) => {
   const nextSteps = buildNextSteps({
     result,
     hasInstalledSkill: context.hasInstalledSkill,
     hasSuiCli: context.hasSuiCli
   });
   if (nextSteps.length > 0) {
+    lines.push("");
     lines.push(...nextSteps);
   }
+};
+var buildCompactSummary = (result, context) => {
+  const lines = [headerFromContext(result, context)];
+  if (result.diagnostics.length > 0) {
+    lines.push(...buildAreaBreakdown(result.diagnostics));
+  }
+  if (!(result.compilerLintAvailable || context.hasSuiCli)) {
+    lines.push("");
+    lines.push(suiMissingNote());
+  }
+  appendNextSteps(lines, result, context);
+  return lines.join("\n");
+};
+var buildVerboseSummary = (result, context) => {
+  const lines = [headerFromContext(result, context)];
+  if (result.diagnostics.length === 0) {
+    if (!(result.compilerLintAvailable || context.hasSuiCli)) {
+      lines.push("");
+      lines.push(suiMissingNote());
+    }
+    return lines.join("\n").trimEnd();
+  }
+  lines.push(...buildAreaBreakdown(result.diagnostics));
+  lines.push(
+    ...buildFindingsDetail(result.diagnostics, result.project.rootDirectory)
+  );
+  if (!(result.compilerLintAvailable || context.hasSuiCli)) {
+    lines.push(suiMissingNote());
+  }
+  appendNextSteps(lines, result, context);
   return lines.join("\n").trimEnd();
 };
 var renderText = (result, options) => {
@@ -3602,19 +3730,19 @@ var renderJson = (result) => JSON.stringify(
 );
 
 // src/cli/render-workspace.ts
-var POINTER3 = process.platform === "win32" && !process.env.WT_SESSION ? ">" : "\xB7";
-var buildBar = (score, width) => {
-  const filled = Math.round(score / PERFECT_SCORE * width);
-  const empty = width - filled;
-  return colorizeByScore("\u2588".repeat(filled), score) + highlighter.muted("\u2591".repeat(empty));
-};
-var buildWorkspaceScoreHeader = (workspace, result, suiVersion, durationMs) => {
+var SCORE_COL = `${PERFECT_SCORE}/${PERFECT_SCORE}`.length;
+var countsOf = (entry) => ({
+  errors: entry.score.bySeverity.error,
+  warnings: entry.score.bySeverity.warning,
+  info: entry.score.bySeverity.info
+});
+var buildWorkspaceHeader = (workspace, result, suiVersion, durationMs) => {
   const workspaceName = workspace.rootDirectory.split(/[\\/]/).pop() ?? "workspace";
   const moduleCount = result.perPackage.reduce(
     (sum, entry) => sum + (entry.skipped ? 0 : entry.moduleCount),
     0
   );
-  return buildInfoCard({
+  return buildDiagnosisHeader({
     score: result.aggregateScore.score,
     title: workspaceName,
     suiVersion,
@@ -3642,152 +3770,95 @@ var formatPackageName = (relativePath, width) => {
   const leaf = relativePath.slice(sepIndex + 1);
   return `${highlighter.muted(prefix)}${leaf}${pad}`;
 };
-var buildPerPackageTable = (perPackage) => {
-  const lines = [];
-  lines.push("");
-  lines.push(`  ${highlighter.bold("Per-package scores")}`);
-  const nameColWidth = Math.max(
+var buildPackageBreakdown = (perPackage) => {
+  const labelWidth = Math.max(
     ...perPackage.map((entry) => entry.relativePath.length),
-    "Package".length
+    "package".length
+  );
+  const maxTotal = Math.max(
+    ...perPackage.filter((entry) => !entry.skipped).map((entry) => entry.diagnostics.length),
+    1
   );
-  const barWidth = 18;
   const sorted = [...perPackage].sort((a, b) => a.score.score - b.score.score);
+  const lines = [
+    "",
+    `  ${highlighter.bold("by package")}  ${highlighter.muted(`(score out of ${PERFECT_SCORE})`)}`
+  ];
   for (const entry of sorted) {
-    const name = formatPackageName(entry.relativePath, nameColWidth);
+    const name = formatPackageName(entry.relativePath, labelWidth);
     if (entry.skipped) {
       lines.push(
-        `  ${highlighter.muted(entry.relativePath.padEnd(nameColWidth))}  ${highlighter.muted("\u2014")} ${highlighter.muted("\xB7")} ${highlighter.muted("no changed files")}`
+        barRow(
+          highlighter.muted(glyph.dotOpen),
+          name,
+          " ".repeat(BAR_WIDTH),
+          highlighter.muted("\u2014".padStart(SCORE_COL)),
+          highlighter.muted("skipped \xB7 no changed files")
+        )
       );
       continue;
     }
-    const score = entry.score.score;
-    const scoreText = colorizeByScore(String(score).padStart(3), score);
-    const bar = buildBar(score, barWidth);
-    const label = colorizeByScore(scoreLabel(score), score);
-    const errors = entry.score.bySeverity.error;
-    const warnings = entry.score.bySeverity.warning;
-    const infos = entry.score.bySeverity.info;
-    const findings = [];
-    if (errors > 0) {
-      findings.push(highlighter.error(`${errors}e`));
-    }
-    if (warnings > 0) {
-      findings.push(highlighter.warn(`${warnings}w`));
-    }
-    if (infos > 0) {
-      findings.push(highlighter.muted(`${infos}i`));
-    }
-    const findingsCol = findings.length > 0 ? findings.join(" ") : highlighter.muted("clean");
-    lines.push(
-      `  ${name}  ${scoreText}  ${bar}  ${label.padEnd(10)}  ${findingsCol}`
+    const counts = countsOf(entry);
+    const bar = magnitudeBar(counts, BAR_WIDTH, maxTotal);
+    const score = colorizeByScore(
+      `${entry.score.score}/${PERFECT_SCORE}`.padStart(SCORE_COL),
+      entry.score.score
     );
+    const trailing = entry.diagnostics.length === 0 ? highlighter.ok("clean") : severitySummary(counts);
+    lines.push(barRow(severityDot(counts), name, bar, score, trailing));
   }
-  return lines.join("\n");
-};
-var severityIcon2 = (severity) => {
-  if (severity === "error") {
-    return "\u2717";
-  }
-  if (severity === "warning") {
-    return "\u26A0";
-  }
-  return "\xB7";
-};
-var colorizeBySeverity2 = (text, severity) => {
-  if (severity === "error") {
-    return highlighter.error(text);
-  }
-  if (severity === "warning") {
-    return highlighter.warn(text);
-  }
-  return highlighter.muted(text);
+  return lines;
 };
 var buildWorkspaceNextSteps = (options) => {
   const lines = [];
   if (!options.verbose) {
     lines.push(
-      `  ${highlighter.muted(POINTER3)} For details: ${highlighter.accent("npx move-doctor@latest --verbose")}`
+      `  ${highlighter.muted(glyph.pointer)} For per-finding detail: ${highlighter.accent(CMD.verbose)}`
     );
   }
   if (!options.hasInstalledSkill) {
     lines.push(
-      `  ${highlighter.muted(POINTER3)} Install the agent skill: ${highlighter.accent("npx move-doctor install")}`
+      `  ${highlighter.muted(glyph.pointer)} Install the agent skill: ${highlighter.accent(CMD.install)}`
     );
   }
   if (!options.hasSuiCli) {
     lines.push(
-      `  ${highlighter.muted(POINTER3)} Install the Sui CLI to enable compiler lints (W0*).`
+      `  ${highlighter.muted(glyph.pointer)} Install the Sui CLI to enable compiler lints (W0*).`
     );
   }
-  lines.push(
-    `  ${highlighter.muted(POINTER3)} Full rule catalog: ${highlighter.accent("https://move.doctor/docs/rules")}`
-  );
-  return lines.length > 0 ? `
-${lines.join("\n")}` : "";
+  return lines.length > 0 ? ["", ...lines] : [];
 };
-var buildVerboseDetails = (perPackage) => {
-  const sections = [];
+var buildWorkspaceDetail = (perPackage) => {
+  const lines = ["", `  ${highlighter.bold("findings")}`];
   for (const entry of perPackage) {
     if (entry.diagnostics.length === 0) {
       continue;
     }
-    sections.push("");
-    sections.push(
-      `  ${highlighter.bold(entry.relativePath)} ${highlighter.muted(`(${entry.diagnostics.length} finding${entry.diagnostics.length === 1 ? "" : "s"})`)}`
+    const count = entry.diagnostics.length;
+    lines.push("");
+    lines.push(
+      `  ${severityDot(countsOf(entry))} ${highlighter.bold(entry.relativePath)} ${highlighter.muted(`(${count} finding${count === 1 ? "" : "s"})`)}`
     );
-    const ruleColWidth = Math.max(
-      ...entry.diagnostics.map((d) => d.ruleId.length),
-      0
+    lines.push(
+      ...buildBucketRuleDetail(entry.diagnostics, entry.project.rootDirectory)
     );
-    const byRule = /* @__PURE__ */ new Map();
-    for (const diagnostic of entry.diagnostics) {
-      const list = byRule.get(diagnostic.ruleId) ?? [];
-      list.push(diagnostic);
-      byRule.set(diagnostic.ruleId, list);
-    }
-    for (const [ruleId, diagnostics] of byRule) {
-      const first = diagnostics[0];
-      const icon = colorizeBySeverity2(
-        severityIcon2(first.severity),
-        first.severity
-      );
-      const ruleText = colorizeBySeverity2(
-        ruleId.padEnd(ruleColWidth),
-        first.severity
-      );
-      const count = diagnostics.length > 1 ? `  ${highlighter.muted(`\xD7${diagnostics.length}`)}` : "";
-      sections.push(`  ${icon} ${ruleText}${count}`);
-      sections.push(highlighter.muted(`      ${first.message}`));
-      if (first.fixHint) {
-        sections.push(highlighter.muted(`      ${POINTER3} ${first.fixHint}`));
-      }
-      for (const diagnostic of diagnostics) {
-        const rel = `${entry.relativePath}/${diagnostic.filePath.split(/[\\/]/).at(-1)}`;
-        sections.push(
-          highlighter.muted(
-            `      ${rel}:${diagnostic.line}:${diagnostic.column}`
-          )
-        );
-      }
-    }
   }
-  return sections.join("\n");
+  return lines;
 };
 var renderWorkspaceText = (options) => {
-  const sections = [];
-  sections.push(
-    buildWorkspaceScoreHeader(
+  const sections = [
+    buildWorkspaceHeader(
       options.workspace,
       options.result,
       options.suiVersion,
       options.durationMs ?? null
-    )
-  );
-  sections.push(buildPerPackageTable(options.result.perPackage));
-  if (options.verbose) {
-    sections.push(buildVerboseDetails(options.result.perPackage));
+    ),
+    ...buildPackageBreakdown(options.result.perPackage)
+  ];
+  if (options.verbose && options.result.diagnostics.length > 0) {
+    sections.push(...buildWorkspaceDetail(options.result.perPackage));
   }
-  sections.push(buildWorkspaceNextSteps(options));
+  sections.push(...buildWorkspaceNextSteps(options));
   return sections.join("\n");
 };
 var renderWorkspaceJson = (workspace, result) => JSON.stringify(
@@ -3815,11 +3886,12 @@ var renderWorkspaceJson = (workspace, result) => JSON.stringify(
 var renderWorkspaceScoreOnly = (result) => String(result.aggregateScore.score);
 
 // src/cli/utils/branded-header.ts
-var VERSION = "0.1.0";
+var VERSION = "0.2.0-dev.d0feceb";
 var printBrandedHeader = () => {
+  const wordmark = highlighter.accent(hyperlink("move.doctor", HOMEPAGE));
   process.stdout.write(
     `
-  ${highlighter.bold("move-doctor")} ${highlighter.muted(`v${VERSION}`)}  ${highlighter.muted("\xB7")}  ${highlighter.accent("move.doctor")}
+  ${highlighter.accent(glyph.cross)} ${highlighter.bold("move-doctor")} ${highlighter.muted(`v${VERSION}`)}  ${highlighter.muted("\xB7")}  ${wordmark}
 
 `
   );
@@ -3843,13 +3915,17 @@ var runCommand2 = (command, args, cwd) => new Promise((resolve9) => {
     resolve9(null);
   }
 });
-var detectSuiVersion = async (cwd) => {
-  const result = await runCommand2("sui", ["--version"], cwd);
-  if (!result || result.exitCode !== 0) {
-    return null;
-  }
-  const match = result.stdout.match(/sui\s+(\S+)/);
-  return match?.[1] ?? null;
+var suiVersionPromise;
+var detectSuiVersion = (cwd) => {
+  suiVersionPromise ??= (async () => {
+    const result = await runCommand2("sui", ["--version"], cwd);
+    if (!result || result.exitCode !== 0) {
+      return null;
+    }
+    const match = result.stdout.match(/sui\s+(\S+)/);
+    return match?.[1] ?? null;
+  })();
+  return suiVersionPromise;
 };
 var detectGitChanges = async (cwd) => {
   const result = await runCommand2("git", ["status", "--porcelain"], cwd);
@@ -3887,13 +3963,12 @@ var countSourceFiles = async (rootDirectory) => {
   if (!existsSync(sourcesDirectory)) {
     return 0;
   }
-  const { readdir: readdir2 } = await import('fs/promises');
   let count = 0;
   const queue = [sourcesDirectory];
   while (queue.length > 0) {
     const current = queue.shift();
     try {
-      const entries = await readdir2(current, { withFileTypes: true });
+      const entries = await readdir(current, { withFileTypes: true });
       for (const entry of entries) {
         if (entry.name.startsWith(".") || entry.name === "build") {
           continue;
@@ -3937,6 +4012,46 @@ var detectContext = async (startDirectory) => {
     sourceFileCount
   };
 };
+
+// src/cli/skill-content.ts
+var SKILL_MD_CONTENT = `---
+name: move-doctor
+description: Use when finishing a Sui Move feature, fixing a bug, before committing Move code, or when the user types /movedoctor, asks to scan, triage, or clean up Move diagnostics. Covers Move Book conventions, Move 2024 idioms, ability mistakes, testing style, and security best practices.
+version: "0.1.0"
+---
+
+# Move Doctor
+
+Scans Sui Move codebases for convention, idiom, ability, testing, and security issues. Outputs a 0\u2013100 health score.
+
+## After making Move code changes
+
+Run \`npx move-doctor@latest --verbose --diff\` and check the score did not regress. If it dropped, fix the regressions before committing.
+
+## For a full cleanup pass
+
+Run \`npx move-doctor@latest --verbose\` (without \`--diff\`) to scan the whole codebase. Fix issues by severity \u2014 errors first, then warnings, then info.
+
+## /movedoctor \u2014 full triage workflow
+
+When the user types \`/movedoctor\`, says "run move doctor", or asks for a full triage / cleanup pass, fetch the canonical playbook and follow every step (fetching it means updates ship without a skill reinstall):
+
+\`\`\`bash
+curl --fail --silent --show-error \\
+  --header 'Cache-Control: no-cache' \\
+  https://move.doctor/prompts/move-doctor-agent.md
+\`\`\`
+
+It's a scan \u2192 triage \u2192 fix \u2192 re-score loop that edits the working tree directly (never commits, never opens PRs). Every finding in \`--json\` carries its own \`fixHint\` and \`citation\` \u2014 fix straight from those; there's nothing else to fetch.
+
+If the fetch fails (offline / site down), fall back to: run \`move-doctor --verbose\`, fix errors first (\`security/*\` and \`abilities/*\` findings are real vulnerabilities, not style), apply each finding's \`fixHint\`, and re-run until the score stops rising. Never silence a finding unless you can explain why the surrounding code is a documented exception.
+
+## Command
+
+\`\`\`bash
+npx move-doctor@latest [path] --verbose --diff   # --score for CI gating \xB7 --help for all flags
+\`\`\`
+`;
 var AGENT_HOOK_TIMEOUT_SECONDS = 120;
 var EXECUTABLE_MODE = 493;
 var JSON_INDENT_SPACES = 2;
@@ -4183,134 +4298,52 @@ var disableSetupPrompt = async (projectRoot) => {
   };
   await writeConfig({ ...config, projects });
 };
-var POINTER4 = process.platform === "win32" && !process.env.WT_SESSION ? ">" : "\u203A";
+var abort = () => {
+  cancel("Cancelled.");
+  process.exit(130);
+};
 var select = async (options) => {
   if (!isInteractive()) {
     return null;
   }
-  const answer = await prompts(
-    {
-      type: "select",
-      name: "value",
-      message: options.message,
-      choices: options.choices.map((choice) => ({
-        title: choice.title,
-        description: choice.description,
-        value: choice.value
-      })),
-      initial: options.initial ?? 0
-    },
-    {
-      onCancel: () => {
-        process.stderr.write(
-          `
-  ${highlighter.muted(POINTER4)} Cancelled.
-
-`
-        );
-        process.exit(130);
-      }
-    }
-  );
-  return answer.value ?? null;
+  const initialValue = options.choices[options.initial ?? 0]?.value;
+  const result = await select$1({
+    message: options.message,
+    options: options.choices.map((choice) => ({
+      value: choice.value,
+      label: choice.title,
+      ...choice.description ? { hint: choice.description } : {}
+    })),
+    ...initialValue === void 0 ? {} : { initialValue }
+  });
+  if (isCancel(result)) {
+    abort();
+  }
+  return result;
 };
 var multiselect = async (options) => {
   if (!isInteractive()) {
     return null;
   }
-  const answer = await prompts(
-    {
-      type: "multiselect",
-      name: "values",
-      message: options.message,
-      hint: options.hint ?? "- Space to toggle. Enter to confirm.",
-      instructions: false,
-      min: options.min ?? 1,
-      choices: options.choices.map((choice) => ({
-        title: choice.title,
-        description: choice.description,
-        value: choice.value,
-        selected: choice.selected ?? false,
-        disabled: choice.disabled ?? false
-      }))
-    },
-    {
-      onCancel: () => {
-        process.stderr.write(
-          `
-  ${highlighter.muted(POINTER4)} Cancelled.
-
-`
-        );
-        process.exit(130);
-      }
-    }
-  );
-  return answer.values ?? null;
-};
-
-// src/cli/utils/spinner.ts
-var FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
-var FRAME_INTERVAL_MS = 80;
-var ERASE_LINE = "\r\x1B[K";
-var startSpinner = (initialText) => {
-  if (!isInteractive()) {
-    process.stderr.write(`  ${highlighter.muted("\u2026")} ${initialText}
-`);
-    return {
-      update: () => {
-      },
-      succeed: (text) => process.stderr.write(`  ${highlighter.ok("\u2713")} ${text}
-`),
-      fail: (text) => process.stderr.write(`  ${highlighter.error("\u2717")} ${text}
-`),
-      stop: () => {
-      }
-    };
+  const initialValues = options.choices.filter((choice) => choice.selected).map((choice) => choice.value);
+  const result = await multiselect$1({
+    message: options.message,
+    options: options.choices.map((choice) => ({
+      value: choice.value,
+      label: choice.title,
+      ...choice.description ? { hint: choice.description } : {},
+      disabled: choice.disabled ?? false
+    })),
+    initialValues,
+    required: (options.min ?? 1) >= 1
+  });
+  if (isCancel(result)) {
+    abort();
   }
-  let currentText = initialText;
-  let frameIndex = 0;
-  let finalized = false;
-  const renderFrame = () => {
-    if (finalized) {
-      return;
-    }
-    const frame = FRAMES[frameIndex % FRAMES.length] ?? FRAMES[0];
-    process.stderr.write(
-      `${ERASE_LINE}  ${highlighter.accent(frame)} ${currentText}`
-    );
-    frameIndex += 1;
-  };
-  renderFrame();
-  const interval = setInterval(renderFrame, FRAME_INTERVAL_MS);
-  const finalize = (icon, text) => {
-    if (finalized) {
-      return;
-    }
-    finalized = true;
-    clearInterval(interval);
-    process.stderr.write(`${ERASE_LINE}  ${icon} ${text}
-`);
-  };
-  return {
-    update: (text) => {
-      currentText = text;
-    },
-    succeed: (text) => finalize(highlighter.ok("\u2713"), text),
-    fail: (text) => finalize(highlighter.error("\u2717"), text),
-    stop: () => {
-      if (finalized) {
-        return;
-      }
-      finalized = true;
-      clearInterval(interval);
-      process.stderr.write(ERASE_LINE);
-    }
-  };
+  return result;
 };
 
 // src/cli/utils/install-wizard.ts
-var POINTER5 = process.platform === "win32" && !process.env.WT_SESSION ? ">" : "\u203A";
 var SKILL_NAME = "move-doctor";
 var FALLBACK_AGENT = "claude-code";
 var GITHUB_ACTION_WORKFLOW = `name: move-doctor
@@ -4392,31 +4425,26 @@ var installWorkflow = async (projectRoot) => {
   }
   return { path: targetPath, existed };
 };
-var formatSkillSummary = (summary, projectRoot) => {
-  if (summary.installed.length === 0 && summary.failed.length === 0) {
-    return `  ${highlighter.muted("\xB7")} No agents detected on this machine \u2014 skill not installed anywhere.`;
+var skillSummaryHeadline = (summary) => {
+  if (summary.installed.length === 0) {
+    return "No agents detected \u2014 skill not installed";
   }
-  const lines = [];
-  if (summary.installed.length > 0) {
-    const agents = summary.installed.map((entry) => entry.agent).join(", ");
-    lines.push(
-      `  ${highlighter.ok("\u2713")} Skill installed for ${highlighter.bold(`${summary.installed.length} agent${summary.installed.length === 1 ? "" : "s"}`)}  ${highlighter.muted(`(${agents})`)}`
-    );
-    const canonical = summary.installed.find(
-      (entry) => entry.mode === "symlink"
+  const agents = summary.installed.map((entry) => entry.agent).join(", ");
+  const count = `${summary.installed.length} agent${summary.installed.length === 1 ? "" : "s"}`;
+  return `Skill installed for ${highlighter.bold(count)}  ${highlighter.muted(`(${agents})`)}`;
+};
+var emitSkillExtras = (summary, projectRoot) => {
+  const canonical = summary.installed.find((entry) => entry.mode === "symlink");
+  if (canonical) {
+    log.message(
+      highlighter.muted(
+        `source: ${path5.relative(projectRoot, canonical.path) || canonical.path}`
+      )
     );
-    if (canonical) {
-      lines.push(
-        `       ${highlighter.muted(`source: ${path5.relative(projectRoot, canonical.path) || canonical.path}`)}`
-      );
-    }
   }
   for (const failure of summary.failed) {
-    lines.push(
-      `  ${highlighter.warn("\u26A0")} ${failure.agent}: ${highlighter.muted(failure.error)}`
-    );
+    log.warn(`${failure.agent}: ${highlighter.muted(failure.error)}`);
   }
-  return lines.join("\n");
 };
 var detectAgentsWithFallback = async () => {
   try {
@@ -4448,69 +4476,66 @@ var pickAgentsInteractively = async (detected) => {
   return selection;
 };
 var resolveAgents = async (pick) => {
-  const detectionSpinner = startSpinner("Detecting installed agents\u2026");
+  const detectionSpinner = spinner();
+  detectionSpinner.start("Detecting installed agents\u2026");
   const detected = await detectAgentsWithFallback();
-  detectionSpinner.succeed(
+  detectionSpinner.stop(
     `Detected ${detected.length} agent${detected.length === 1 ? "" : "s"}: ${highlighter.muted(detected.join(", "))}`
   );
   const agents = pick ? await pickAgentsInteractively(detected) : detected;
   if (agents.length !== detected.length) {
-    process.stdout.write(
-      `  ${highlighter.muted("\xB7")} Selected ${highlighter.bold(`${agents.length}`)} of ${detected.length}: ${highlighter.muted(agents.join(", "))}
-`
+    log.message(
+      highlighter.muted(
+        `Selected ${agents.length} of ${detected.length}: ${agents.join(", ")}`
+      )
     );
   }
   return agents;
 };
 var applyTargets = async (projectRoot, targets) => {
   if (targets.skill) {
-    const installSpinner = startSpinner(
+    const installSpinner = spinner();
+    installSpinner.start(
       `Installing skill to ${targets.agents.length} agent${targets.agents.length === 1 ? "" : "s"}\u2026`
     );
     const summary = await installSkillForAgents(projectRoot, targets.agents);
-    installSpinner.stop();
-    process.stdout.write(`${formatSkillSummary(summary, projectRoot)}
-`);
+    installSpinner.stop(skillSummaryHeadline(summary));
+    emitSkillExtras(summary, projectRoot);
   }
   if (targets.workflow) {
     const { path: workflowPath, existed } = await installWorkflow(projectRoot);
+    const rel = path5.relative(projectRoot, workflowPath);
     if (existed) {
-      process.stdout.write(
-        `  ${highlighter.muted("\xB7")} Workflow already exists at ${highlighter.muted(path5.relative(projectRoot, workflowPath))}, left untouched.
-`
+      log.message(
+        highlighter.muted(`Workflow already exists at ${rel}, left untouched.`)
       );
     } else {
-      process.stdout.write(
-        `  ${highlighter.ok("\u2713")} GitHub workflow installed at ${highlighter.muted(path5.relative(projectRoot, workflowPath))}
-`
-      );
+      log.success(`GitHub workflow installed at ${highlighter.muted(rel)}`);
     }
   }
   if (targets.agentHooks) {
-    const hookSpinner = startSpinner("Installing agent hooks\u2026");
+    const hookSpinner = spinner();
+    hookSpinner.start("Installing agent hooks\u2026");
     const result = installMoveDoctorAgentHooks({
       projectRoot,
       agents: targets.agents
     });
-    hookSpinner.stop();
     if (result.installedAgents.length === 0) {
-      process.stdout.write(
-        `  ${highlighter.muted("\xB7")} No Claude Code / Cursor agents selected \u2014 agent hooks not installed.
-`
+      hookSpinner.stop(
+        highlighter.muted(
+          "No Claude Code / Cursor agents \u2014 hooks not installed"
+        )
       );
     } else {
       const names = result.installedAgents.map((agent) => getSkillAgentConfig(agent).displayName).join(", ");
-      process.stdout.write(
-        `  ${highlighter.ok("\u2713")} Agent hooks installed for ${highlighter.bold(names)}
-`
-      );
+      hookSpinner.stop(`Agent hooks installed for ${highlighter.bold(names)}`);
     }
   }
 };
 var printNoninteractiveHint = (projectRoot) => {
   process.stdout.write(
     `
-  ${highlighter.muted(POINTER5)} Run ${highlighter.accent("npx move-doctor install --yes")} in ${highlighter.muted(projectRoot)} to install the skill + CI workflow.
+  ${highlighter.muted("\u203A")} Run ${highlighter.accent("npx move-doctor install --yes")} in ${highlighter.muted(projectRoot)} to install the skill + CI workflow.
 `
   );
 };
@@ -4545,6 +4570,7 @@ var buildSetupChoices = (projectRoot, agents) => {
 var runInstallWizard = async (options) => {
   const { projectRoot, yes = false } = options;
   if (yes || !isInteractive()) {
+    intro(`\u271A ${highlighter.bold("move-doctor setup")}`);
     const agents2 = await resolveAgents(false);
     await applyTargets(projectRoot, {
       agents: agents2,
@@ -4552,12 +4578,14 @@ var runInstallWizard = async (options) => {
       workflow: true,
       agentHooks: false
     });
+    outro("Skill + CI workflow installed.");
     return;
   }
   if (await hasDisabledSetupPrompt(projectRoot)) {
     printNoninteractiveHint(projectRoot);
     return;
   }
+  intro(`\u271A ${highlighter.bold("move-doctor setup")}`);
   const choice = await select({
     message: "Set up move-doctor for this project?",
     choices: [
@@ -4580,20 +4608,21 @@ var runInstallWizard = async (options) => {
     initial: 0
   });
   if (choice === null || choice === "skip") {
+    outro(
+      `Skipped. Run ${highlighter.accent("npx move-doctor install")} anytime.`
+    );
     return;
   }
   if (choice === "never") {
     await disableSetupPrompt(projectRoot);
-    process.stdout.write(
-      `
-  ${highlighter.muted(POINTER5)} Got it. Run ${highlighter.accent("npx move-doctor install")} when you change your mind.
-`
+    outro(
+      `Got it. Run ${highlighter.accent("npx move-doctor install")} when you change your mind.`
     );
     return;
   }
-  process.stdout.write("\n");
   const agents = await resolveAgents(true);
   if (agents.length === 0) {
+    outro("No agents selected \u2014 nothing installed.");
     return;
   }
   const setupChoices = buildSetupChoices(projectRoot, agents);
@@ -4613,15 +4642,38 @@ var runInstallWizard = async (options) => {
     workflow: !didSkipOptional && actions.includes("workflow"),
     agentHooks: !didSkipOptional && actions.includes("agent-hooks")
   });
-  process.stdout.write(
-    `
-  ${highlighter.muted(POINTER5)} Done. Run ${highlighter.accent("npx move-doctor .")} again to see the agent in action.
-`
+  outro(
+    `Done. Run ${highlighter.accent("npx move-doctor .")} again to see the agent in action.`
   );
 };
 
+// src/cli/utils/output.ts
+var writeError = (message) => {
+  process.stderr.write(`${highlighter.error(glyph.crossMark)} ${message}
+`);
+};
+var errorExitCode = (score) => score.bySeverity.error > 0 ? 1 : 0;
+
 // src/cli/utils/scope-prompt.ts
-process.platform === "win32" && !process.env.WT_SESSION ? ">" : "\u203A";
+var promptPackageScope = async (focusName, totalPackages) => {
+  const choice = await select({
+    message: `You're inside ${highlighter.bold(focusName)} \u2014 1 of ${totalPackages} packages. What should I scan?`,
+    choices: [
+      {
+        title: `Just ${focusName}`,
+        value: "focus",
+        description: "this package only \xB7 fast"
+      },
+      {
+        title: `All ${totalPackages} packages`,
+        value: "all",
+        description: "the whole workspace"
+      }
+    ],
+    initial: 0
+  });
+  return choice ?? "focus";
+};
 var resolveScope = async (options) => {
   if (options.diffFlagPassed) {
     return "diff";
@@ -4650,6 +4702,68 @@ var resolveScope = async (options) => {
   return choice ?? "full";
 };
 
+// src/cli/utils/spinner.ts
+var FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+var FRAME_INTERVAL_MS = 80;
+var ERASE_LINE = "\r\x1B[K";
+var startSpinner = (initialText) => {
+  if (!isInteractive()) {
+    process.stderr.write(`  ${highlighter.muted("\u2026")} ${initialText}
+`);
+    return {
+      update: () => {
+      },
+      succeed: (text) => process.stderr.write(`  ${highlighter.ok(glyph.check)} ${text}
+`),
+      fail: (text) => process.stderr.write(
+        `  ${highlighter.error(glyph.crossMark)} ${text}
+`
+      ),
+      stop: () => {
+      }
+    };
+  }
+  let currentText = initialText;
+  let frameIndex = 0;
+  let finalized = false;
+  const renderFrame = () => {
+    if (finalized) {
+      return;
+    }
+    const frame = FRAMES[frameIndex % FRAMES.length] ?? FRAMES[0];
+    process.stderr.write(
+      `${ERASE_LINE}  ${highlighter.accent(frame)} ${currentText}`
+    );
+    frameIndex += 1;
+  };
+  renderFrame();
+  const interval = setInterval(renderFrame, FRAME_INTERVAL_MS);
+  const finalize = (icon, text) => {
+    if (finalized) {
+      return;
+    }
+    finalized = true;
+    clearInterval(interval);
+    process.stderr.write(`${ERASE_LINE}  ${icon} ${text}
+`);
+  };
+  return {
+    update: (text) => {
+      currentText = text;
+    },
+    succeed: (text) => finalize(highlighter.ok(glyph.check), text),
+    fail: (text) => finalize(highlighter.error(glyph.crossMark), text),
+    stop: () => {
+      if (finalized) {
+        return;
+      }
+      finalized = true;
+      clearInterval(interval);
+      process.stderr.write(ERASE_LINE);
+    }
+  };
+};
+
 // src/cli/index.ts
 var HELP_TEXT = `Move Doctor \u2014 A deterministic linter for Sui Move.
 
@@ -4676,9 +4790,16 @@ Setup flags:
   -h, --help            Show this help
   -v, --version         Show version
 `;
-var writeError = (message) => {
-  process.stderr.write(`${highlighter.error("\u2717")} ${message}
-`);
+var offerSetupIfNeeded = async (workspace, args, skillInstalled) => {
+  const fullySetUp = skillInstalled && isWorkflowInstalledForWorkspace(workspace);
+  const shouldOffer = !args.skipSetup && isInteractive() && !fullySetUp && !await hasDisabledSetupPrompt(workspace.rootDirectory);
+  if (shouldOffer) {
+    await runInstallWizard({
+      projectRoot: workspace.rootDirectory,
+      yes: false
+    });
+    process.stdout.write("\n");
+  }
 };
 var planScan = (workspace, args) => {
   if (args.packageFilter) {
@@ -4766,22 +4887,21 @@ var runSinglePackageScan = async (workspace, focus, args, showHeader) => {
   }
   scanSpinner?.stop();
   const durationMs = Date.now() - scanStartedAt;
-  changedFiles ? changedFiles.length : totalFileCount;
   if (result.diagnostics.length === 0 && totalFileCount === 0 && !args.json && !args.scoreOnly) {
     process.stderr.write(
-      `  ${highlighter.warn("\u26A0")} ${highlighter.warn("warning")} ${highlighter.muted("\u2014 no .move source files found; score does not reflect a real codebase.")}
+      `  ${highlighter.warn(glyph.warn)} ${highlighter.warn("warning")} ${highlighter.muted("\u2014 no .move source files found; score does not reflect a real codebase.")}
 `
     );
   }
   if (args.json) {
     process.stdout.write(`${renderJson(result)}
 `);
-    return result.score.bySeverity.error > 0 ? 1 : 0;
+    return errorExitCode(result.score);
   }
   if (args.scoreOnly) {
     process.stdout.write(`${renderScoreOnly(result)}
 `);
-    return result.score.bySeverity.error > 0 ? 1 : 0;
+    return errorExitCode(result.score);
   }
   const skillInstalled = isSkillInstalledForWorkspace(workspace);
   process.stdout.write(
@@ -4796,16 +4916,8 @@ ${renderText(result, {
 
 `
   );
-  const workflowInstalled = isWorkflowInstalledForWorkspace(workspace);
-  const shouldOfferSetup = !args.skipSetup && isInteractive() && !(skillInstalled && workflowInstalled) && !await hasDisabledSetupPrompt(workspace.rootDirectory);
-  if (shouldOfferSetup) {
-    await runInstallWizard({
-      projectRoot: workspace.rootDirectory,
-      yes: false
-    });
-    process.stdout.write("\n");
-  }
-  return result.score.bySeverity.error > 0 ? 1 : 0;
+  await offerSetupIfNeeded(workspace, args, skillInstalled);
+  return errorExitCode(result.score);
 };
 var runWorkspaceScan = async (workspace, packagesToScan, args, showHeader) => {
   const gitRoot = workspace.gitRootDirectory ?? await findGitRoot(workspace.rootDirectory);
@@ -4851,12 +4963,12 @@ var runWorkspaceScan = async (workspace, packagesToScan, args, showHeader) => {
   if (args.json) {
     process.stdout.write(`${renderWorkspaceJson(workspace, result)}
 `);
-    return result.aggregateScore.bySeverity.error > 0 ? 1 : 0;
+    return errorExitCode(result.aggregateScore);
   }
   if (args.scoreOnly) {
     process.stdout.write(`${renderWorkspaceScoreOnly(result)}
 `);
-    return result.aggregateScore.bySeverity.error > 0 ? 1 : 0;
+    return errorExitCode(result.aggregateScore);
   }
   const skillInstalled = isSkillInstalledForWorkspace(workspace);
   process.stdout.write(
@@ -4873,17 +4985,8 @@ ${renderWorkspaceText({
 
 `
   );
-  const workflowInstalled = isWorkflowInstalledForWorkspace(workspace);
-  const shouldOfferSetup = !args.skipSetup && isInteractive() && !(skillInstalled && workflowInstalled) && !await hasDisabledSetupPrompt(workspace.rootDirectory);
-  if (shouldOfferSetup) {
-    await runInstallWizard({
-      projectRoot: workspace.rootDirectory,
-      yes: false,
-      rootDisplayName: path5.basename(workspace.rootDirectory)
-    });
-    process.stdout.write("\n");
-  }
-  return result.aggregateScore.bySeverity.error > 0 ? 1 : 0;
+  await offerSetupIfNeeded(workspace, args, skillInstalled);
+  return errorExitCode(result.aggregateScore);
 };
 var runCli = async (argv2) => {
   let args;
@@ -4961,21 +5064,26 @@ ${HELP_TEXT}`);
     writeError(error.message);
     return 2;
   }
-  const workspaceSui = await detectSuiVersion(workspace.rootDirectory);
-  const suiLabel = workspaceSui ? highlighter.muted(` \xB7 Sui ${workspaceSui.split("-")[0]}`) : "";
-  if (plan.focusPackage && workspace.isMonorepo) {
-    const focused = plan.focusPackage;
-    contextSpinner?.succeed(
-      `${highlighter.bold(focused.packageName)} ${highlighter.muted(`(1 of ${workspace.packages.length})`)} ${highlighter.muted(`edition ${focused.edition ?? "unset"}`)}${suiLabel}`
+  contextSpinner?.stop();
+  const canPromptScope = !(args.json || args.scoreOnly) && isInteractive();
+  if (plan.focusPackage && workspace.isMonorepo && canPromptScope) {
+    const scope = await promptPackageScope(
+      plan.focusPackage.packageName,
+      workspace.packages.length
     );
-  } else if (workspace.isMonorepo) {
-    contextSpinner?.succeed(
-      `${highlighter.bold(path5.basename(workspace.rootDirectory))} ${highlighter.muted(`\xB7 ${workspace.packages.length} packages`)}${suiLabel}`
-    );
-  } else {
-    const only = workspace.packages[0];
-    contextSpinner?.succeed(
-      `${highlighter.bold(only.packageName)} ${highlighter.muted(`edition ${only.edition ?? "unset"}`)}${suiLabel}`
+    if (scope === "all") {
+      plan = {
+        workspace,
+        packagesToScan: workspace.packages,
+        focusPackage: null
+      };
+    }
+  } else if (plan.focusPackage && workspace.isMonorepo && showHeader) {
+    process.stderr.write(
+      highlighter.muted(
+        `  ${glyph.pointer} Scanning only ${plan.focusPackage.packageName} \u2014 use --all for the whole workspace.
+`
+      )
     );
   }
   if (plan.packagesToScan) {