aiden-runtime 4.1.2 → 4.1.3

package/dist/cli/v4/doctor.js

@@ -55,7 +55,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DOCTOR_GROUP_ORDER = void 0;
+exports.subsystemHealthResults = subsystemHealthResults;
 exports.renderSubsystemHealthSection = renderSubsystemHealthSection;
+exports.skillOutcomeResults = skillOutcomeResults;
+exports.sessionCounterResults = sessionCounterResults;
 exports.renderSkillOutcomesSection = renderSkillOutcomesSection;
 exports.resolveBinaryPath = resolveBinaryPath;
 exports._resetBinaryResolutionCacheForTests = _resetBinaryResolutionCacheForTests;
@@ -86,8 +90,84 @@ const checkUpdate_1 = require("../../core/v4/update/checkUpdate");
 const box_1 = require("./box");
 const audioBackend_1 = require("../../core/voice/audioBackend");
 /**
- * Phase v4.1.2-slice3: render the Subsystem health section. Decision
- * tree (per slice3 Phase 3 Q4):
+ * Display order for groups. Renderer iterates this list rather than
+ * the order checks appear in the results array — keeps the visual
+ * hierarchy stable even if `runDoctor` reorders its check sequence.
+ */
+exports.DOCTOR_GROUP_ORDER = [
+    'Providers',
+    'Inference',
+    'System tools',
+    'Storage',
+    'Voice',
+    'Updates',
+    'Subsystem health',
+    'Skill outcomes',
+    // v4.1.3-essentials doctor-polish: session counters land just
+    // above provider liveness — they're agent-loop telemetry, distinct
+    // from skill outcomes (per-skill stats) and subsystem health
+    // (per-subsystem error tracking).
+    'Session counters',
+    'Provider liveness',
+];
+/**
+ * v4.1.3-essentials doctor-polish: convert the subsystem-health
+ * registry snapshot into CheckResult rows so they render inside the
+ * grouped health box alongside the other checks. Returns an empty
+ * array when the registry is undefined / empty so the renderer skips
+ * the group cleanly (DOCTOR_GROUP_ORDER drops empty groups).
+ *
+ * One row per subsystem, plus a fixed "(not instrumented yet)" row
+ * for HonestyEnforcement — same convention as the legacy section
+ * renderer below.
+ */
+function subsystemHealthResults(registry) {
+    if (!registry)
+        return [];
+    const snaps = registry.snapshot();
+    if (snaps.length === 0)
+        return [];
+    const out = [];
+    for (const s of snaps) {
+        const passed = s.totalErrors === 0;
+        const stats = `${s.totalCalls} call${s.totalCalls === 1 ? '' : 's'}, ${s.totalErrors} error${s.totalErrors === 1 ? '' : 's'}`;
+        let message = stats;
+        let suggestion;
+        if (s.lastError) {
+            const ago = humanAge(Date.now() - s.lastError.at.getTime());
+            const streak = s.lastError.consecutive > 1
+                ? ` (${s.lastError.consecutive} consecutive)`
+                : '';
+            message = `${stats}${streak}`;
+            suggestion = `last ${ago} ago: "${s.lastError.message}"`;
+        }
+        out.push({
+            name: s.subsystem,
+            group: 'Subsystem health',
+            passed,
+            message,
+            ...(suggestion ? { suggestion } : {}),
+        });
+    }
+    // Slice3 audit decision: HonestyEnforcement was deliberately not
+    // instrumented (pure-pattern path has no failure surface). Surface
+    // that explicitly so users know the gap is known, not forgotten.
+    out.push({
+        name: 'honesty',
+        group: 'Subsystem health',
+        passed: true,
+        message: '(not instrumented yet)',
+    });
+    return out;
+}
+/**
+ * Phase v4.1.2-slice3: render the Subsystem health section.
+ *
+ * v4.1.3-essentials doctor-polish: kept for back-compat with any
+ * direct callers but the in-REPL `/doctor` path now uses
+ * `subsystemHealthResults()` and renders inline via the grouped box.
+ *
+ * Decision tree (per slice3 Phase 3 Q4):
  *   - registry undefined → render nothing (no live state to report)
  *   - all subsystems healthy → one-line green summary
  *   - any degradation → expand block with last-error per failed sub
@@ -144,9 +224,102 @@ function humanAge(ms) {
     return `${Math.floor(ms / 86400000)}d`;
 }
 /**
- * Phase v4.1.2-slice4: render the Skill outcomes section. Per Q3
- * decision: silent on empty state (no tracker, or no skills tracked
- * yet) — doctor output for healthy systems stays short.
+ * v4.1.3-essentials doctor-polish: convert the skill-outcome tracker
+ * snapshot into CheckResult rows so they render inside the grouped
+ * health box. Empty tracker → empty array → group dropped by renderer.
+ *
+ * One row per top-N skill (sorted by load count). Skills with at
+ * least one failure render as `passed:false` so they get the red
+ * `✗` icon and a hint line with the last-error message.
+ */
+function skillOutcomeResults(tracker, topN = 5) {
+    if (!tracker)
+        return [];
+    const snaps = tracker.snapshot();
+    if (snaps.length === 0)
+        return [];
+    const out = [];
+    for (const s of snaps.slice(0, topN)) {
+        const attributed = s.toolSuccesses + s.toolFailures;
+        const rate = attributed === 0
+            ? '—'
+            : `${Math.round((s.toolSuccesses / attributed) * 100)}% success`;
+        const last = s.lastUsed
+            ? `, last ${humanAge(Date.now() - new Date(s.lastUsed).getTime())} ago`
+            : '';
+        const message = `loaded ${s.loaded}, ${s.toolSuccesses} ok, ${s.toolFailures} err (${rate})${last}`;
+        const passed = s.toolFailures === 0;
+        out.push({
+            name: s.skillName,
+            group: 'Skill outcomes',
+            passed,
+            message,
+            ...(s.lastError && !passed
+                ? { suggestion: `last failure: "${s.lastError.message}"` }
+                : {}),
+        });
+    }
+    return out;
+}
+function sessionCounterResults(agent) {
+    if (!agent)
+        return [];
+    const s = agent.getSkillEnforcementMetrics();
+    const u = agent.getUrlProvenanceMetrics();
+    const e = agent.getEmptyResponseMetrics();
+    // Same all-zero classifier per row — keeps the rule symmetric
+    // across the three counter sources even though their internal
+    // semantics differ.
+    const allZero = (vals) => vals.every((v) => v === 0);
+    const rows = [];
+    // ── skill enforcement ─────────────────────────────────────────────
+    {
+        const passed = allZero([s.armed, s.preArmed, s.recovered, s.failed]);
+        rows.push({
+            name: 'skill enforcement',
+            group: 'Session counters',
+            passed: true,
+            message: `armed=${s.armed}, pre-armed=${s.preArmed}, ` +
+                `recovered=${s.recovered}, failed=${s.failed}`,
+            // Suggestion attached only when non-zero so outcomeBucket()
+            // routes the row to warning (yellow) rather than passing (green).
+            // Text is concise — full counters already in `message`.
+            ...(passed ? {} : { suggestion: 'guard fired this session — review if any failed > 0' }),
+        });
+    }
+    // ── URL provenance ────────────────────────────────────────────────
+    {
+        const passed = allZero([u.blocked, u.recovered, u.failed]);
+        rows.push({
+            name: 'url provenance',
+            group: 'Session counters',
+            passed: true,
+            message: `blocked=${u.blocked}, recovered=${u.recovered}, failed=${u.failed}`,
+            ...(passed ? {} : { suggestion: 'open_url provenance gate fired this session' }),
+        });
+    }
+    // ── empty response ────────────────────────────────────────────────
+    {
+        const passed = allZero([e.detected, e.retried, e.recovered]);
+        rows.push({
+            name: 'empty response',
+            group: 'Session counters',
+            passed: true,
+            message: `detected=${e.detected}, retried=${e.retried}, recovered=${e.recovered}`,
+            ...(passed ? {} : { suggestion: 'provider emitted empty turn(s) this session' }),
+        });
+    }
+    return rows;
+}
+/**
+ * Phase v4.1.2-slice4: render the Skill outcomes section.
+ *
+ * v4.1.3-essentials doctor-polish: kept for back-compat. The in-REPL
+ * `/doctor` path now uses `skillOutcomeResults()` and renders inline
+ * via the grouped box.
+ *
+ * Per Q3 decision: silent on empty state (no tracker, or no skills
+ * tracked yet) — doctor output for healthy systems stays short.
  *
  * Output (when not empty): top N skills sorted by load count, with
  * total observations and success percentage. Last-error message
@@ -328,6 +501,7 @@ async function checkConfigFile(paths) {
         await node_fs_1.promises.access(paths.configYaml);
         return {
             name: 'config file',
+            group: 'Storage',
             passed: true,
             message: `found at ${paths.configYaml}`,
             durationMs: Date.now() - t0,
@@ -336,6 +510,7 @@ async function checkConfigFile(paths) {
     catch {
         return {
             name: 'config file',
+            group: 'Storage',
             passed: false,
             message: `missing at ${paths.configYaml}`,
             suggestion: 'run `aiden setup` to create one',
@@ -359,6 +534,7 @@ function checkProviderAuth(env) {
     if (present.length === 0) {
         return {
             name: 'provider auth',
+            group: 'Providers',
             passed: false,
             message: 'no provider API key found in environment',
             suggestion: 'run `aiden setup` and pick a provider, or set ANTHROPIC_API_KEY',
@@ -367,6 +543,7 @@ function checkProviderAuth(env) {
     }
     return {
         name: 'provider auth',
+        group: 'Providers',
         passed: true,
         message: `${present.length} provider key(s) present (${present.join(', ')})`,
         durationMs: Date.now() - t0,
@@ -376,6 +553,7 @@ async function checkOllamaReachable(opts) {
     const t0 = Date.now();
     const fallback = {
         name: 'ollama reachable',
+        group: 'Inference',
         passed: false,
         message: 'no response from http://localhost:11434',
         suggestion: 'install Ollama from https://ollama.com or skip if you only use cloud providers',
@@ -393,6 +571,7 @@ async function checkOllamaReachable(opts) {
             }
             return {
                 name: 'ollama reachable',
+                group: 'Inference',
                 passed: true,
                 message: 'Ollama responding on :11434',
                 durationMs: Date.now() - t0,
@@ -411,6 +590,7 @@ async function checkPythonAvailable(opts) {
     const t0 = Date.now();
     const fallback = {
         name: 'python available',
+        group: 'System tools',
         passed: false,
         message: 'python not found on PATH',
         suggestion: 'install python 3.10+ — required for graphify and a few skills',
@@ -423,6 +603,7 @@ async function checkPythonAvailable(opts) {
             if (res.ok) {
                 return {
                     name: 'python available',
+                    group: 'System tools',
                     passed: true,
                     message: res.stdout || `${bin} present`,
                     durationMs: Date.now() - t0,
@@ -439,6 +620,7 @@ async function checkDockerAvailable(opts) {
         if (res.ok) {
             return {
                 name: 'docker available',
+                group: 'System tools',
                 passed: true,
                 message: res.stdout || 'docker present',
                 durationMs: Date.now() - t0,
@@ -446,6 +628,7 @@ async function checkDockerAvailable(opts) {
         }
         return {
             name: 'docker available',
+            group: 'System tools',
             passed: false,
             message: 'docker not found on PATH',
             suggestion: 'optional — install Docker Desktop if you want sandboxed tool execution',
@@ -453,6 +636,7 @@ async function checkDockerAvailable(opts) {
         };
     })(), opts.timeoutMs, {
         name: 'docker available',
+        group: 'System tools',
         passed: false,
         message: 'docker probe timed out',
         durationMs: Date.now() - t0,
@@ -465,6 +649,7 @@ async function checkNpxAvailable(opts) {
         if (res.ok) {
             return {
                 name: 'npx available',
+                group: 'System tools',
                 passed: true,
                 message: `npx ${res.stdout}`,
                 durationMs: Date.now() - t0,
@@ -472,6 +657,7 @@ async function checkNpxAvailable(opts) {
         }
         return {
             name: 'npx available',
+            group: 'System tools',
             passed: false,
             message: 'npx not found on PATH',
             suggestion: 'install Node.js 20+ — required for npm-published MCP servers',
@@ -479,6 +665,7 @@ async function checkNpxAvailable(opts) {
         };
     })(), opts.timeoutMs, {
         name: 'npx available',
+        group: 'System tools',
         passed: false,
         message: 'npx probe timed out',
         durationMs: Date.now() - t0,
@@ -491,6 +678,7 @@ async function checkSkillsDir(paths) {
         if (!stat.isDirectory()) {
             return {
                 name: 'skills dir',
+                group: 'Storage',
                 passed: false,
                 message: `${paths.skillsDir} is not a directory`,
                 durationMs: Date.now() - t0,
@@ -499,6 +687,7 @@ async function checkSkillsDir(paths) {
         const entries = await node_fs_1.promises.readdir(paths.skillsDir);
         return {
             name: 'skills dir',
+            group: 'Storage',
             passed: true,
             message: `${paths.skillsDir} (${entries.length} entries)`,
             durationMs: Date.now() - t0,
@@ -507,6 +696,7 @@ async function checkSkillsDir(paths) {
     catch {
         return {
             name: 'skills dir',
+            group: 'Storage',
             passed: false,
             message: `missing ${paths.skillsDir}`,
             suggestion: 'run `aiden setup` — it creates the skills directory',
@@ -520,6 +710,7 @@ async function checkBundledManifest(paths) {
         await node_fs_1.promises.access(paths.bundledManifest);
         return {
             name: 'bundled manifest',
+            group: 'Storage',
             passed: true,
             message: `present at ${paths.bundledManifest}`,
             durationMs: Date.now() - t0,
@@ -528,6 +719,7 @@ async function checkBundledManifest(paths) {
     catch {
         return {
             name: 'bundled manifest',
+            group: 'Storage',
             passed: false,
             message: 'bundled skill manifest missing',
             suggestion: 'reinstall `aiden` — the package was not unpacked correctly',
@@ -541,6 +733,7 @@ async function checkPlatformPaths(paths) {
         await node_fs_1.promises.access(paths.root);
         return {
             name: 'platform paths',
+            group: 'Storage',
             passed: true,
             message: `aiden home: ${paths.root}`,
             durationMs: Date.now() - t0,
@@ -549,6 +742,7 @@ async function checkPlatformPaths(paths) {
     catch {
         return {
             name: 'platform paths',
+            group: 'Storage',
             passed: false,
             message: `aiden home missing: ${paths.root}`,
             suggestion: 'run `aiden setup` to initialise the home directory',
@@ -575,6 +769,7 @@ async function checkAudioBackend() {
     if (playback && record) {
         return {
             name: 'audio backend',
+            group: 'Voice',
             passed: true,
             message: `${process.platform}: playback=${playback.label} · record=${record.label}`,
             durationMs: Date.now() - t0,
@@ -588,6 +783,7 @@ async function checkAudioBackend() {
         missing.push((0, audioBackend_1.missingBackendMessage)('record'));
     return {
         name: 'audio backend',
+        group: 'Voice',
         passed: true,
         message: `${process.platform}: voice features will not work — backends missing (known: ${[...new Set([...known.playback, ...known.record])].join(', ') || 'none'})`,
         suggestion: missing.join(' || '),
@@ -608,6 +804,7 @@ async function checkLicense(opts) {
         if (!present) {
             return {
                 name: 'license',
+                group: 'Updates',
                 passed: true,
                 message: 'free tier (no license cache)',
                 durationMs: Date.now() - t0,
@@ -621,6 +818,7 @@ async function checkLicense(opts) {
             if (status.tier !== 'pro') {
                 return {
                     name: 'license',
+                    group: 'Updates',
                     passed: true,
                     message: 'license cache present but not currently valid (free tier)',
                     suggestion: 'run /license refresh to re-verify against server',
@@ -630,12 +828,14 @@ async function checkLicense(opts) {
             const expiry = status.cache.expiresAt || 'lifetime';
             return {
                 name: 'license',
+                group: 'Updates',
                 passed: true,
                 message: `Pro (${status.cache.plan}, expires ${expiry})`,
                 durationMs: Date.now() - t0,
             };
         })(), opts.timeoutMs, {
             name: 'license',
+            group: 'Updates',
             passed: false,
             message: 'license check timed out reading cache',
             durationMs: Date.now() - t0,
@@ -644,6 +844,7 @@ async function checkLicense(opts) {
     catch (err) {
         return {
             name: 'license',
+            group: 'Updates',
             passed: false,
             message: `license check failed: ${err instanceof Error ? err.message : String(err)}`,
             suggestion: 'run /license refresh; if persistent, re-activate with /license activate <key>',
@@ -668,6 +869,7 @@ async function checkUpdate(opts) {
                 const where = status.fromCache ? 'cached' : 'live';
                 return {
                     name: 'npm update',
+                    group: 'Updates',
                     passed: true,
                     message: `installed v${status.installed} is up to date (${where})`,
                     durationMs: Date.now() - t0,
@@ -675,6 +877,7 @@ async function checkUpdate(opts) {
             }
             return {
                 name: 'npm update',
+                group: 'Updates',
                 passed: true,
                 message: `v${status.latest} available (installed: v${status.installed})`,
                 suggestion: 'run `npm install -g aiden-runtime@latest`',
@@ -684,6 +887,7 @@ async function checkUpdate(opts) {
         catch (err) {
             return {
                 name: 'npm update',
+                group: 'Updates',
                 passed: false,
                 message: `update check error: ${err instanceof Error ? err.message : String(err)}`,
                 durationMs: Date.now() - t0,
@@ -691,6 +895,7 @@ async function checkUpdate(opts) {
         }
     })(), opts.timeoutMs, {
         name: 'npm update',
+        group: 'Updates',
         passed: true,
         message: 'update check timed out (network slow — non-fatal)',
         durationMs: Date.now() - t0,
@@ -705,6 +910,7 @@ async function checkLogsWritable(paths) {
         await node_fs_1.promises.unlink(probe);
         return {
             name: 'logs writable',
+            group: 'Storage',
             passed: true,
             message: paths.logsDir,
             durationMs: Date.now() - t0,
@@ -713,6 +919,7 @@ async function checkLogsWritable(paths) {
     catch (err) {
         return {
             name: 'logs writable',
+            group: 'Storage',
             passed: false,
             message: `cannot write to ${paths.logsDir}: ${err instanceof Error ? err.message : String(err)}`,
             suggestion: `check permissions on ${node_os_1.default.homedir()}`,
@@ -802,21 +1009,56 @@ function checkIconKind(r) {
         return { icon: '⚠', colour: 'warn' };
     return { icon: '✓', colour: 'success' };
 }
+/**
+ * Classify outcomes into the three buckets the top summary surfaces:
+ *   passing  — passed && no suggestion
+ *   warning  — passed && suggestion present (soft warning — works but
+ *              has a remediation hint, e.g. audio backend on Linux)
+ *   failing  — !passed
+ *
+ * Order matters: failing dominates warning, warning dominates passing.
+ * Same convention as the row-icon picker above.
+ */
+function outcomeBucket(r) {
+    if (!r.passed)
+        return 'failing';
+    if (r.suggestion)
+        return 'warning';
+    return 'passing';
+}
 function maxNameWidth(report) {
     return report.results.reduce((m, r) => Math.max(m, r.name.length), 0);
 }
+/**
+ * v4.1.3-essentials doctor-polish: group results by their `group`
+ * field, preserving the configured display order (DOCTOR_GROUP_ORDER)
+ * and dropping empty groups. Within each group, results stay in their
+ * original insertion order — keeps related checks visually adjacent
+ * even when `runDoctor` reorders for parallelism in a future revision.
+ */
+function groupResults(results) {
+    const byGroup = new Map();
+    for (const r of results) {
+        const list = byGroup.get(r.group) ?? [];
+        list.push(r);
+        byGroup.set(r.group, list);
+    }
+    const out = [];
+    for (const g of exports.DOCTOR_GROUP_ORDER) {
+        const rows = byGroup.get(g);
+        if (rows && rows.length > 0)
+            out.push({ group: g, rows });
+    }
+    return out;
+}
 /**
  * Compute the inner-cell width for the health box: widest visible
- * content row across all check rows + any hint continuations + the
- * footer summary, plus a 1-char trailing gutter. Floored / capped per
- * HEALTH_BOX_MIN/MAX_WIDTH. Title length also factored so the
- * `╭── Health Check ─...─╮` row doesn't underflow.
+ * content row across all check rows, section headers, hint
+ * continuations, and the top summary, plus a 1-char trailing gutter.
+ * Floored / capped per HEALTH_BOX_MIN/MAX_WIDTH. Title length also
+ * factored so the `╭── Health Check ─...─╮` row doesn't underflow.
  */
 function computeHealthBoxWidth(report, nameWidth) {
-    // The minimum width the title needs (`╭── <title> ──╮` shape):
-    // 2 corners + 2 leading dashes + 1 space + title + 1 space + at
-    // least 2 trailing dashes, minus the 2 corners since the cell is
-    // measured between them.
     const titleMin = 2 + 1 + HEALTH_BOX_TITLE.length + 1 + 2;
     let widest = titleMin;
     const measureRow = (row) => {
@@ -824,25 +1066,41 @@ function computeHealthBoxWidth(report, nameWidth) {
         if (v + 1 > widest)
             widest = v + 1; // +1 for trailing gutter
     };
-    for (const r of report.results) {
-        measureRow(` ✓  ${r.name.padEnd(nameWidth)}  ${r.message}`);
-        if (r.suggestion && !r.passed) {
-            measureRow(`      hint: ${r.suggestion}`);
+    // Top summary line.
+    const buckets = { passing: 0, warning: 0, failing: 0 };
+    for (const r of report.results)
+        buckets[outcomeBucket(r)] += 1;
+    measureRow(` Overall: ${buckets.passing} passing · ${buckets.warning} warning · ${buckets.failing} failing  (${report.results.length} checks, ${report.totalMs} ms)`);
+    // Section header rows + group's checks + any hint continuations.
+    const groups = groupResults(report.results);
+    for (const g of groups) {
+        const passed = g.rows.filter((r) => r.passed).length;
+        measureRow(`  ${g.group} (${passed}/${g.rows.length})`);
+        for (const r of g.rows) {
+            measureRow(`    ✓  ${r.name.padEnd(nameWidth)}  ${r.message}`);
+            if (r.suggestion && !r.passed) {
+                measureRow(`        hint: ${r.suggestion}`);
+            }
         }
     }
-    const passedCount = report.results.filter((x) => x.passed).length;
-    measureRow(` ${passedCount} of ${report.results.length} checks passed in ${report.totalMs} ms`);
     return Math.max(HEALTH_BOX_MIN_WIDTH, Math.min(HEALTH_BOX_MAX_WIDTH, widest));
 }
 /**
- * Render the report as an orange-bordered rounded box. Pure — returns
- * the multi-line string; caller writes it. `display` is needed for
- * skin-aware colouring of the border, icons, and footer summary.
+ * Render the report as an orange-bordered rounded box with grouped
+ * sections + top summary.
+ *
+ * v4.1.3-essentials doctor-polish: previously rendered as a flat list
+ * of 13 rows with the summary at the bottom — hard to scan, easy to
+ * miss issues. Now:
+ *   - Top: `Overall: X passing · Y warning · Z failing` with per-
+ *     bucket colors (green / yellow / red).
+ *   - Section headers per group (`Providers (1/1)`) in brand+bold.
+ *   - Rows packed tight within group, blank line between groups.
+ *   - Hints stay on a continuation line under failed rows only.
  *
- * Phase 22 Group C smoke-fix #3 (Bug 1 round 2): box width now
- * auto-fits to the widest content row instead of clamping at a fixed
- * 70 chars. The previous fix correctly aligned the right border but
- * truncated content mid-word for any Windows path > 65-ish chars.
+ * Pure — returns the multi-line string; caller writes it. `display`
+ * is needed for skin-aware colouring of the border, icons, headers,
+ * and summary buckets.
  */
 function renderHealthBox(report, display) {
     const nameWidth = maxNameWidth(report);
@@ -858,23 +1116,50 @@ function renderHealthBox(report, display) {
         return `${display.brand(left)}${inner}${display.brand(right)}`;
     };
     const lines = [top, side('')];
-    for (const r of report.results) {
-        const { icon, colour } = checkIconKind(r);
-        const colouredIcon = display.paint(icon, colour);
-        const namePart = ` ${colouredIcon}  ${r.name.padEnd(nameWidth)}  ${r.message}`;
-        lines.push(side(namePart));
-        if (r.suggestion && !r.passed) {
-            // Failed checks get the suggestion on a continuation line, indented
-            // past the icon column. Prefix in soft cyan to read as a hint.
-            const hint = `      ${display.muted('hint:')} ${r.suggestion}`;
-            lines.push(side(hint));
+    // ── Top summary — three colored buckets ───────────────────────────
+    const buckets = { passing: 0, warning: 0, failing: 0 };
+    for (const r of report.results)
+        buckets[outcomeBucket(r)] += 1;
+    // Each bucket colored only when non-zero; zero counters stay muted
+    // so the eye lands on the actual state.
+    const paintBucket = (n, kind, label) => {
+        const text = `${n} ${label}`;
+        return n > 0 ? display.paint(text, kind) : display.muted(text);
+    };
+    const summary = ` Overall: ${paintBucket(buckets.passing, 'success', 'passing')} · ` +
+        `${paintBucket(buckets.warning, 'warn', 'warning')} · ` +
+        `${paintBucket(buckets.failing, 'error', 'failing')}  ` +
+        `${display.muted(`(${report.results.length} checks, ${report.totalMs} ms)`)}`;
+    lines.push(side(summary));
+    lines.push(side(''));
+    // ── Grouped section rendering ─────────────────────────────────────
+    const groups = groupResults(report.results);
+    for (let gi = 0; gi < groups.length; gi += 1) {
+        const g = groups[gi];
+        const passed = g.rows.filter((r) => r.passed).length;
+        // Group-level count tinted by aggregate state: all pass → success,
+        // any fail → error, only warnings → warn.
+        const anyFail = g.rows.some((r) => !r.passed);
+        const anyWarn = g.rows.some((r) => r.passed && r.suggestion);
+        const countColour = anyFail ? 'error' : anyWarn ? 'warn' : 'success';
+        const header = `  ${display.brand(g.group)} ` +
+            display.paint(`(${passed}/${g.rows.length})`, countColour);
+        lines.push(side(header));
+        for (const r of g.rows) {
+            const { icon, colour } = checkIconKind(r);
+            const colouredIcon = display.paint(icon, colour);
+            const namePart = `    ${colouredIcon}  ${r.name.padEnd(nameWidth)}  ${r.message}`;
+            lines.push(side(namePart));
+            if (r.suggestion && !r.passed) {
+                const hint = `        ${display.muted('hint:')} ${r.suggestion}`;
+                lines.push(side(hint));
+            }
         }
+        // Blank line between groups (not after the last one).
+        if (gi < groups.length - 1)
+            lines.push(side(''));
     }
     lines.push(side(''));
-    const passedCount = report.results.filter((r) => r.passed).length;
-    const summary = `${passedCount} of ${report.results.length} checks passed in ${report.totalMs} ms`;
-    const summaryColour = report.passed ? 'success' : 'warn';
-    lines.push(side(' ' + display.paint(summary, summaryColour)));
     lines.push(bot);
     return lines.join('\n');
 }
@@ -885,51 +1170,68 @@ function renderHealthBox(report, display) {
  */
 async function runDoctorCli(opts) {
     const report = await runDoctor(opts);
-    for (const r of report.results) {
-        const marker = r.passed ? '[ok]  ' : '[fail]';
-        process.stdout.write(`${marker} ${r.name}: ${r.message}\n`);
-        if (!r.passed && r.suggestion) {
-            process.stdout.write(`        hint: ${r.suggestion}\n`);
-        }
-    }
-    process.stdout.write(`\n${report.passed ? 'all checks passed' : 'some checks failed'} in ${report.totalMs} ms\n`);
-    // Phase v4.1.1-oauth-fix Phase 5: discoverability hint for the deep
-    // mode. Only emitted in standard mode — if the user already passed
-    // `--providers`, the section right below this is the answer to the hint.
-    if (!opts?.liveness) {
-        process.stdout.write('  hint: Run `aiden doctor --providers` for live provider checks\n');
-    }
-    // Phase v4.1.1-oauth-fix Phase 4: opt-in provider liveness.
-    // Runs after the standard report so a failed config check is visible
-    // before the network probes start. Section header + summary line are
-    // rendered by doctorLiveness.renderProviderLivenessSection so the
-    // formatting stays alongside its consumer.
+    // v4.1.3-essentials doctor-polish: Path-A unification — the CLI
+    // path now uses the SAME `renderHealthBox` renderer as `/doctor`
+    // (in-REPL). Previously this emitted a plain `[ok]` / `[fail]`
+    // list with no box, no grouping, and the optional sections
+    // (subsystem health, skill outcomes, liveness) dangled below the
+    // summary. Now everything renders inside one cohesive box.
+    //
+    // NO_COLOR / forceMono handling: the Display instance honors both,
+    // so `aiden doctor | tee report.txt` produces clean plain text
+    // when piped (no ANSI in the captured file).
+    //
+    // Lazy-import Display + SkinEngine here because runDoctorCli is
+    // also called from non-REPL contexts (tests) where instantiating
+    // a Display might not be appropriate. CLI invocations get a fresh
+    // skin engine; tests can mock or inspect the report directly.
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const { Display: DisplayCtor } = require('./display');
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const { SkinEngine: SkinEngineCtor } = require('./skinEngine');
+    const display = new DisplayCtor({ skin: new SkinEngineCtor() });
+    // Pull in-process surfaces if the caller supplied them. CLI
+    // invocations from a fresh process don't have a live agent so the
+    // helpers return empty arrays → groups dropped by renderer.
+    report.results.push(...subsystemHealthResults(opts?.subsystemHealthRegistry));
+    report.results.push(...skillOutcomeResults(opts?.skillOutcomeTracker));
+    // Provider-liveness path: runs an opt-in network probe per
+    // configured provider when `--providers` is set. Results coerce
+    // to CheckResult shape and fold into the same grouped box.
     let livenessFailed = false;
     if (opts?.liveness) {
-        process.stdout.write('\n  Running provider liveness checks...\n');
-        const { runProviderLiveness, renderProviderLivenessSection } = await Promise.resolve().then(() => __importStar(require('./doctorLiveness')));
+        const { runProviderLiveness } = await Promise.resolve().then(() => __importStar(require('./doctorLiveness')));
         const paths = opts.paths ?? (0, paths_1.resolveAidenPaths)();
-        const { results, summary } = await runProviderLiveness({
+        const { results: liveResults, summary } = await runProviderLiveness({
             paths,
             env: opts.env,
             fetchImpl: opts.fetchImpl,
             timeoutMs: opts.livenessTimeoutMs,
         });
-        process.stdout.write(renderProviderLivenessSection(results, summary));
+        // Coerce per-provider liveness results into CheckResult rows.
+        // `liveResults` shape varies by provider but always has a
+        // `passed`/`ok` flag and a message. Treat unknown shapes as
+        // pass-through so future probe-result additions don't break.
+        for (const lr of liveResults) {
+            const passed = lr.passed === true || lr.ok === true;
+            const latency = typeof lr.latencyMs === 'number' ? ` (${lr.latencyMs}ms)` : '';
+            const msg = (lr.message ?? lr.status ?? (passed ? 'live' : (lr.error ?? 'failed'))) + latency;
+            report.results.push({
+                name: String(lr.name ?? lr.provider ?? 'provider'),
+                group: 'Provider liveness',
+                passed,
+                message: msg,
+                ...(passed ? {} : { suggestion: lr.error ?? 'check API key / network' }),
+            });
+        }
         livenessFailed = summary.red > 0;
     }
-    // Phase v4.1.2-slice3: subsystem-health surface. Renders only when
-    // a registry was passed (in-REPL doctor); standalone CLI doctor has
-    // no live agent so the section is omitted.
-    const subsystemBlock = renderSubsystemHealthSection(opts?.subsystemHealthRegistry);
-    if (subsystemBlock)
-        process.stdout.write(subsystemBlock);
-    // Phase v4.1.2-slice4: skill-outcome surface. Same gating — only
-    // renders when a tracker was passed and has at least one observed
-    // skill. Standalone CLI invocations skip it.
-    const outcomesBlock = renderSkillOutcomesSection(opts?.skillOutcomeTracker);
-    if (outcomesBlock)
-        process.stdout.write(outcomesBlock);
+    process.stdout.write(renderHealthBox(report, display) + '\n');
+    // Phase v4.1.1-oauth-fix Phase 5: discoverability hint for the deep
+    // mode. Outside the box so it reads as meta-guidance, not a check.
+    if (!opts?.liveness) {
+        process.stdout.write('\n  hint: Run `aiden doctor --providers` for live provider checks\n');
+    }
     // Liveness reds count toward the overall exit code so CI / scripts
     // can `aiden doctor --providers && deploy`.
     process.exitCode = (report.passed && !livenessFailed) ? 0 : 1;