@bli-cockpit/cli 0.2.148 → 0.2.149

package/dist/commands/doctor-access.js

@@ -1,7 +1,5 @@
 import os from "node:os";
-import { readRootWorkScan, outsideWorkDirectories, readRootApprovals, rootsAddCommand, rootPathApi, sessionCoverageLine } from "../root-work.js";
-import { writeJsonFile } from "../local-state-files.js";
-import { containsPath } from "../root-normalization.js";
+import { readRootWorkScan, outsideWorkDirectories, rootsAddCommand, sessionCoverageLine } from "../root-work.js";
 import { scanWorkDirectories } from "./local-discovery.js";
 import { sendCollectorHeartbeatBestEffort } from "./heartbeat.js";
 import { isInteractiveDoctorFix } from "./doctor-report.js";
@@ -157,55 +155,36 @@ function shellQuote(value) {
     return `'${value.replace(/'/gu, "'\\''")}'`;
 }
 /**
- * The last scan names work missed by the saved boundary. Diagnosis never
- * grants consent — and since BLI-10734 there is nothing left to consent TO
- * for the session report itself, only for raw evidence: every session this
- * scan saw now reaches the server (`sessionCoverageLine`), labelled
- * `root_scope: "outside"` when its directory sits outside every approved
- * root. Widening the boundary still matters for the redacted transcript
- * BYTES, which stay root-gated, so this row keeps flagging the gap and
- * offering `roots add` — it is just no longer offering to rescue a session
- * that would otherwise vanish.
+ * The last scan names where this machine's work happens. Diagnosis never
+ * grants consent, and since BLI-10734 there is nothing left to consent TO for
+ * the session report itself: every session this scan saw already reached the
+ * server (`sessionCoverageLine`), labelled `root_scope: "outside"` when its
+ * directory sits outside every approved root. BLI-10740 finishes that ruling
+ * on the doctor row itself — approved roots are a LABEL on the upload, never
+ * a gate on it, so a session sitting outside one is not a defect doctor found
+ * and cannot repair. This row is therefore always informational (`ok`): it
+ * reports how many of this scan's sessions were inside vs. outside, never
+ * asks for approval, and attempts no fix. Widening the boundary still buys
+ * the redacted transcript BYTES for those outside directories (those stay
+ * root-gated), so the message still names `cockpit roots add` as something an
+ * operator can choose to do, never something doctor is stuck waiting on. The
+ * row only turns red the ordinary way every other doctor check does: the scan
+ * itself throwing (`work_directory_scan_incomplete` from unreadable session
+ * folders), which `runDoctorWithDeps`'s existing `check_threw` handling
+ * already turns into a `fail` row — a real collection problem, not a roots
+ * problem.
  */
 export async function readRootsCoverWork(context) {
     const homeDir = context.command.homeDir ?? os.homedir();
     const paths = getCollectorRuntimePaths(homeDir);
     const scan = await readRootWorkScan(paths) ?? await scanWorkDirectories(homeDir, false);
     const outside = outsideWorkDirectories(scan, (await readLocalCollectorConfig(paths))?.default_repo_paths ?? []);
-    const count = outside.reduce((sum, entry) => sum + entry.count, 0);
-    // ticket 10727 (ticket 4382 measured) then BLI-10734 (roots are labels, not
-    // gates): the coverage sentence a person asked doctor for, appended rather
-    // than replacing the existing per-directory breakdown below. Since
-    // BLI-10734, widening a root no longer rescues a session from oblivion —
-    // its metadata already reached the server either way — it buys the
-    // redacted transcript content instead, so the "needs fix" branch says so.
-    if (!count)
-        return ok("roots-cover-work", "work_covered", `${scan.observed} sessions seen; no known working directories outside approved roots. ${sessionCoverageLine(scan, count)}`);
+    const outsideCount = outside.reduce((sum, entry) => sum + entry.count, 0);
+    const insideCount = scan.observed - outsideCount;
+    if (!outsideCount)
+        return ok("roots-cover-work", "work_covered", `${scan.observed} sessions seen; no known working directories outside approved roots. ${sessionCoverageLine(scan, outsideCount)}`);
     return {
-        ...needsFix("roots-cover-work", "work_outside_roots", `${count} of ${scan.observed} sessions have working directories outside every approved root — their redacted transcript content stays unuploaded until the root widens, though their metadata already reaches the server with an outside label (scan ${scan.generated_at}):\n${outside.map(entry => `${entry.count}: ${entry.directory}\n  ${rootsAddCommand(entry.directory, process.platform, homeDir)}`).join("\n")}\n\n${sessionCoverageLine(scan, count)}`),
+        ...ok("roots-cover-work", "work_outside_roots_labelled", `${insideCount} of ${scan.observed} sessions inside approved roots, ${outsideCount} outside — every one already reached the server, the outside ones carrying an outside label. Their redacted transcript content stays unuploaded until a root widens (scan ${scan.generated_at}):\n${outside.map(entry => `${entry.count}: ${entry.directory}\n  ${rootsAddCommand(entry.directory, process.platform, homeDir)}`).join("\n")}\n\n${sessionCoverageLine(scan, outsideCount)}`),
         nextAction: rootsAddCommand(outside[0].directory, process.platform, homeDir),
     };
-}
-export async function fixRootsCoverWork(context) {
-    const homeDir = context.command.homeDir ?? os.homedir();
-    const paths = getCollectorRuntimePaths(homeDir);
-    const config = await readLocalCollectorConfig(paths);
-    if (!config)
-        return readRootsCoverWork(context);
-    const scan = await readRootWorkScan(paths) ?? await scanWorkDirectories(homeDir);
-    const approvals = await readRootApprovals(paths);
-    const outside = outsideWorkDirectories(scan, config.default_repo_paths);
-    const additions = outside.filter(entry => approvals.some(root => containsPath(root, entry.directory, rootPathApi())));
-    if (additions.length) {
-        // Restore the precise approved directories, preserving every other config option.
-        const roots = normalizeCollectionRoots([...config.default_repo_paths, ...additions.map(entry => entry.directory)], rootPathApi());
-        await writeJsonFile(paths.config_file, { ...config, default_repo_paths: roots });
-        console.error("[doctor] roots-cover-work repaired", JSON.stringify({ added: additions.length }));
-        await scanWorkDirectories(homeDir);
-    }
-    else {
-        console.error("[doctor] roots-cover-work needs approval", JSON.stringify({ outside: outside.length, added: 0 }));
-    }
-    const checked = await readRootsCoverWork(context);
-    return { ...checked, fixed: additions.length > 0 && checked.status === "ok" };
 }

package/dist/commands/doctor.js

@@ -2,7 +2,7 @@ import { LOCAL_COLLECTOR_VERSION } from "../local-state.js";
 import { isSemverBelow } from "../scheduled-self-update.js";
 import { describeError } from "../health-detail.js";
 import { withStage } from "../crash-guard.js";
-import { checkSingleInstallState, readRootsCoverWork, fixRootsCoverWork, fixAuthState, fixRootState, readAuthState, readRootState, } from "./doctor-access.js";
+import { checkSingleInstallState, readRootsCoverWork, fixAuthState, fixRootState, readAuthState, readRootState, } from "./doctor-access.js";
 import { backfillCompletionStepState, backfillFixVerdict, checkBackfillState, checkDiskState, checkGcState, checkSyncState, fixBackfillState, fixDiskState, fixGcState, fixSyncState, syncBacklogDrainingVerdict, syncStandAsideVerdict, } from "./doctor-pipeline.js";
 import { checkMcpAnswersState } from "./doctor-mcp.js";
 import { checkMemoryDaemonState } from "./doctor-memory-daemon.js";
@@ -119,7 +119,10 @@ function doctorInvariants() {
             fix: fixRootState,
             requiresInteractiveFix: true,
         },
-        { id: "roots-cover-work", check: context => context.deps.readRootsCoverWork(context), fix: context => context.deps.fixRootsCoverWork(context) },
+        // BLI-10740: roots are a label on the upload, never a gate — this row has
+        // no fix because a session outside an approved root is not a defect
+        // doctor can repair; it names the counts and moves on.
+        { id: "roots-cover-work", check: context => context.deps.readRootsCoverWork(context) },
         // Deliberately has NO fix: uninstalling software the operator did not ask
         // to have uninstalled is not a repair (BLI-3218/BLI-3553). Doctor names the
         // other install and the exact command; the person decides.
@@ -194,7 +197,6 @@ function defaultDoctorDeps(hooks) {
         runLogin: (context) => hooks.runLogin(context.command, context.io),
         readRoots: readRootState,
         readRootsCoverWork,
-        fixRootsCoverWork,
         resolveAndSaveRoots: (context) => hooks.resolveAndSaveRoots(context.command, context.io),
         checkSingleInstall: checkSingleInstallState,
         checkAutostart: checkAutostartState,

package/dist/commands/local-help-commands.js

@@ -91,7 +91,7 @@ export function localSubcommandHelp(command) {
                 "",
                 "Diagnose, repair, and verify this machine.",
                 "Repairs CLI, background sync, sign-in, roots, memory and hooks, agent rules, catch-up, uploads, and cleanup.",
-                "roots-cover-work names sessions outside saved roots and gives cockpit roots add commands. Previously approved directories are restored automatically.",
+                "roots-cover-work is informational: it names how many sessions are inside vs. outside saved roots (all already uploaded, outside ones labelled) and gives cockpit roots add commands for widening a root's redacted transcript content. It never needs a fix.",
                 "--check or --no-repair diagnoses without repairs. --dry-run previews repairs.",
                 "--backfill-budget defaults to 900 seconds; catch-up repeats chunks until complete, with progress every 30 seconds.",
                 "--lock-wait defaults to 600 seconds; progress prints every 30 seconds.",

package/dist/commands/public-root.js

@@ -21,7 +21,7 @@ export async function runCockpitCli(argv, io) {
   }
 
   if (command === "--version" || command === "-V" || command === "version") {
-    writeLine(io?.stdout ?? process.stdout, "0.2.148");
+    writeLine(io?.stdout ?? process.stdout, "0.2.149");
     return 0;
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bli-cockpit/cli",
-  "version": "0.2.148",
+  "version": "0.2.149",
   "private": false,
   "type": "module",
   "bin": {
@@ -27,8 +27,8 @@
     "test": "node dist/cli.js --help && node ../../scripts/assert-public-cli-routing.mjs && node ../../scripts/assert-public-cli-verb-help.mjs && node ../../scripts/assert-public-cli-surface-doors.mjs && node ../../scripts/assert-public-cli-runtime-files.mjs && node ../../scripts/assert-public-cli-exit-contract.mjs && node ../../scripts/assert-public-cli-no-fleet-posts.mjs && node ../../scripts/assert-public-package-pack.mjs --workspace=@bli-cockpit/cli"
   },
   "dependencies": {
-    "@bli-cockpit/memory-mcp": "0.1.37",
-    "@bli-cockpit/mcp": "0.1.71",
-    "@bli-cockpit/telemetry-core": "0.1.49"
+    "@bli-cockpit/memory-mcp": "0.1.38",
+    "@bli-cockpit/mcp": "0.1.72",
+    "@bli-cockpit/telemetry-core": "0.1.50"
   }
 }