@bli-cockpit/cli 0.2.5 → 0.2.7

package/dist/commands/doctor.js

@@ -1,13 +1,13 @@
-import { spawn } from "node:child_process";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { autostartStatus, installAutostartAgent } from "../autostart.js";
 import { inspectBackfillLock } from "../backfill-lock.js";
-import { backfillCompletionMarkerPath, readBackfillCursor, } from "../cursors/backfill-cursor.js";
-import { DEFAULT_DASHBOARD_URL, getCollectorRuntimePaths, inspectLocalCollectorStatus, LOCAL_COLLECTOR_VERSION, readLocalCollectorConfig, readLocalCollectorSessionFile, } from "../local-state.js";
+import { backfillCompletionCovers, readBackfillCompletionMarker, readBackfillCursor, } from "../cursors/backfill-cursor.js";
+import { DEFAULT_DASHBOARD_URL, getCollectorRuntimePaths, LOCAL_COLLECTOR_VERSION, readLocalCollectorConfig, readLocalCollectorSessionFile, } from "../local-state.js";
 import { normalizeCollectionRoots } from "../root-normalization.js";
 import { runRawEvidenceLocalGc, rawEvidenceGcSummary } from "../raw-evidence-gc.js";
 import { runBackfillCommand } from "./backfill.js";
+import { createInteractiveExecRunner } from "../process-runner.js";
 const GC_MIN_INTERVAL_MS = 24 * 60 * 60 * 1000;
 export async function runDoctor(command, io, hooks, overrides = {}) {
     const deps = { ...defaultDoctorDeps(hooks), ...overrides };
@@ -123,7 +123,10 @@ async function checkCliLatest(context) {
 }
 async function fixCliLatest(context, state) {
     try {
-        await context.deps.selfUpdate(context.io, { json: context.command.json });
+        await context.deps.selfUpdate(context.io, {
+            json: context.command.json,
+            tag: context.command.updateTag,
+        });
     }
     catch (error) {
         return fail("cli-latest", selfUpdateFailureCode(error), selfUpdateFailureMessage(error));
@@ -156,7 +159,10 @@ async function latestCliVersionFromNpm(context) {
     const exec = context.io.exec;
     if (!exec)
         return null;
-    const result = await exec("npm", ["view", "@bli-cockpit/cli", "version", "--json"]);
+    const packageSpec = context.command.updateTag
+        ? `@bli-cockpit/cli@${context.command.updateTag}`
+        : "@bli-cockpit/cli";
+    const result = await exec("npm", ["view", packageSpec, "version", "--json"]);
     if (result.code !== 0)
         return null;
     return parseNpmVersion(result.stdout);
@@ -198,11 +204,17 @@ async function readRootState(context) {
 async function checkAutostartState(context) {
     const exec = context.io.exec;
     if (!exec) {
-        return needsFix("autostart-alive", "runner_unavailable", "launchd runner unavailable; would refresh autostart");
+        return needsFix("autostart-alive", "runner_unavailable", "autostart runner unavailable; would refresh autostart");
     }
-    const result = await autostartStatus({ exec });
+    const roots = await doctorRoots(context);
+    const result = await autostartStatus({
+        repoRoot: roots[0],
+        repoRoots: roots,
+        dashboardUrl: context.command.dashboardUrl,
+        exec,
+    });
     if (result.status === "loaded") {
-        return ok("autostart-alive", "already_installed", "launchd agent loaded");
+        return ok("autostart-alive", "already_installed", "autostart scheduler loaded");
     }
     if (result.status === "unsupported") {
         return skipped("autostart-alive", "unsupported", result.message ?? "unsupported");
@@ -212,7 +224,7 @@ async function checkAutostartState(context) {
 async function fixAutostartState(context) {
     const exec = context.io.exec;
     if (!exec) {
-        return fail("autostart-alive", "runner_unavailable", "launchd runner unavailable");
+        return fail("autostart-alive", "runner_unavailable", "autostart runner unavailable");
     }
     const roots = await savedRoots();
     const result = await installAutostartAgent({
@@ -225,18 +237,20 @@ async function fixAutostartState(context) {
         return skipped("autostart-alive", "unsupported", result.message ?? "unsupported");
     }
     if (result.loaded === false) {
-        return fail("autostart-alive", "autostart_load_failed", result.message ?? "launchctl load failed");
+        return fail("autostart-alive", "autostart_load_failed", result.message ?? "operating-system scheduler load failed");
     }
     return ok("autostart-alive", "installed", "autostart installed and loaded");
 }
-async function checkBackfillState(_context) {
+async function checkBackfillState(context) {
     const paths = getCollectorRuntimePaths();
-    if (await hasBackfillCompletionMarker(paths)) {
-        return ok("backfill-complete", "complete", "backfill completion marker exists");
+    const roots = await doctorRoots(context);
+    const marker = await readBackfillCompletionMarker(paths);
+    if (backfillCompletionCovers(marker, roots, ["codex", "claude_code"])) {
+        return ok("backfill-complete", "complete", "backfill completion covers the current saved roots and both session sources");
     }
     const lock = await inspectBackfillLock(paths);
     if (lock.held) {
-        return skipped("backfill-complete", "backfill_already_running", `backfill already running since ${lock.held_since ?? "unknown"}`);
+        return needsFix("backfill-complete", "backfill_already_running", `backfill completion is not yet proven; another run holds the lock since ${lock.held_since ?? "unknown"}`);
     }
     const cursor = await readBackfillCursor(paths);
     return needsFix("backfill-complete", cursor.updated_at ? "partial" : "never_run", "backfill completion marker missing");
@@ -256,7 +270,7 @@ async function fixBackfillState(context) {
     }
     const reason = jsonField(output, "failure_reason");
     if (reason === "backfill_already_running") {
-        return skipped("backfill-complete", "backfill_already_running", "backfill lock held; skipping as healthy");
+        return fail("backfill-complete", "backfill_already_running", "backfill lock is still held and no scope-valid completion marker exists");
     }
     return fail("backfill-complete", reason ?? "backfill_failed", "backfill did not complete");
 }
@@ -283,36 +297,46 @@ async function fixGcState(context) {
     return ok("gc-checked", `removed_${result.removed_dirs}`, rawEvidenceGcSummary(result));
 }
 async function checkSyncState(context) {
-    const status = await inspectLocalCollectorStatus({
-        repoRoot: context.command.repoRoot,
-    }).catch(() => null);
-    if (status?.collector_freshness === "fresh") {
-        return ok("sync-fresh", "fresh", "last sync is fresh");
+    const roots = await doctorRoots(context);
+    if (roots.length === 0) {
+        return needsFix("sync-fresh", "no_roots", "sync has no saved workspace roots");
     }
-    return needsFix("sync-fresh", "stale", "last sync is stale or missing");
+    // Upload state is currently device-global, so it cannot prove that every
+    // saved root succeeded. Doctor therefore performs one explicit sync per root
+    // and only turns green from those command receipts.
+    return needsFix("sync-fresh", "per_root_verification_required", `fresh upload proof is required for ${roots.length} saved root${roots.length === 1 ? "" : "s"}`);
 }
 async function fixSyncState(context) {
     const exec = context.io.exec;
     if (!exec)
         return fail("sync-fresh", "runner_unavailable", "sync runner unavailable");
-    const args = ["sync", "--json"];
-    if (context.command.repoRoot)
-        args.push("--workspace", context.command.repoRoot);
-    if (context.command.dashboardUrl !== DEFAULT_DASHBOARD_URL) {
-        args.push("--dashboard-url", context.command.dashboardUrl);
-    }
-    const result = await exec("cockpit", args);
-    const output = `${result.stdout}\n${result.stderr}`;
-    const status = jsonField(output, "status");
-    if (result.code === 0 &&
-        (status === "sync_already_running" ||
-            status === "live_sync_paused_during_backfill")) {
-        return skipped("sync-fresh", status, "sync already running; skipping as healthy");
-    }
-    if (result.code === 0) {
-        return ok("sync-fresh", "synced", "ran `cockpit sync`");
+    const roots = await doctorRoots(context);
+    if (roots.length === 0) {
+        return fail("sync-fresh", "no_roots", "sync has no saved workspace roots");
+    }
+    for (const repoRoot of roots) {
+        const args = ["sync", "--json", "--workspace", repoRoot];
+        if (context.command.dashboardUrl !== DEFAULT_DASHBOARD_URL) {
+            args.push("--dashboard-url", context.command.dashboardUrl);
+        }
+        const result = await exec("cockpit", args);
+        const output = `${result.stdout}\n${result.stderr}`;
+        const status = jsonField(output, "status");
+        if (result.code !== 0) {
+            return fail("sync-fresh", status ?? "sync_failed", `sync failed for ${repoRoot}`);
+        }
+        if (status !== "uploaded") {
+            return fail("sync-fresh", status ?? "sync_unverified", `sync did not return an uploaded receipt for ${repoRoot}`);
+        }
     }
-    return fail("sync-fresh", status ?? "sync_failed", "sync failed");
+    return ok("sync-fresh", "synced", roots.length === 1
+        ? "ran `cockpit sync` and received an uploaded receipt"
+        : `received uploaded receipts for ${roots.length} saved roots`);
+}
+async function doctorRoots(context) {
+    if (context.command.repoRoot)
+        return [context.command.repoRoot];
+    return savedRoots();
 }
 async function maybeReportDoctorEvents(context, rows) {
     if (context.command.dryRun)
@@ -398,16 +422,6 @@ async function savedRoots() {
     const config = await readLocalCollectorConfig(getCollectorRuntimePaths()).catch(() => null);
     return normalizeCollectionRoots(config?.default_repo_paths ?? []);
 }
-async function hasBackfillCompletionMarker(paths) {
-    try {
-        const raw = JSON.parse(await fs.readFile(backfillCompletionMarkerPath(paths), "utf8"));
-        return (raw.schema_version === "cockpit-backfill-complete.v1" &&
-            typeof raw.completed_at === "string");
-    }
-    catch {
-        return false;
-    }
-}
 function parseNpmVersion(stdout) {
     const trimmed = stdout.trim();
     if (!trimmed)
@@ -427,20 +441,18 @@ function reexecDoctor(command, io) {
     if (command.dashboardUrl !== DEFAULT_DASHBOARD_URL) {
         args.push("--dashboard-url", command.dashboardUrl);
     }
+    if (command.updateTag)
+        args.push("--update-tag", command.updateTag);
     if (command.json)
         args.push("--json");
-    return new Promise((resolve) => {
-        const child = spawn("cockpit", args, {
-            stdio: "inherit",
-            env: {
-                ...process.env,
-                ...io.env,
-                COCKPIT_DOCTOR_REEXEC: "1",
-            },
-        });
-        child.on("error", () => resolve(1));
-        child.on("close", (code) => resolve(code ?? 1));
-    });
+    const exec = io.interactiveExec ?? createInteractiveExecRunner();
+    return exec("cockpit", args, {
+        env: {
+            ...process.env,
+            ...io.env,
+            COCKPIT_DOCTOR_REEXEC: "1",
+        },
+    }).then((result) => result.code);
 }
 function capturedIo(io, forward) {
     const stdoutChunks = [];

package/dist/commands/local-args.js

@@ -115,15 +115,26 @@ function parseUpdateArgs(alias, args) {
 }
 function parseDoctorArgs(alias, args) {
     const values = parseNamedArgs(args, {
-        allowedFlags: ["--workspace", "--dashboard-url", "--dry-run", "--json"],
-        valueFlags: ["--workspace", "--dashboard-url"],
+        allowedFlags: [
+            "--workspace",
+            "--dashboard-url",
+            "--update-tag",
+            "--dry-run",
+            "--json",
+        ],
+        valueFlags: ["--workspace", "--dashboard-url", "--update-tag"],
     });
     assertNoPositionals(values.positionals, alias);
+    const updateTag = optionalNonEmpty(values.flags.get("--update-tag"));
+    if (updateTag && !/^[a-z0-9][a-z0-9._-]*$/u.test(updateTag)) {
+        throw new Error("--update-tag must be a lowercase npm dist-tag such as 'next' or 'latest'.");
+    }
     return {
         kind: "doctor",
         alias,
         repoRoot: optionalNonEmpty(values.flags.get("--workspace")),
         dashboardUrl: normalizeUrl(values.flags.get("--dashboard-url") ?? DEFAULT_DASHBOARD_URL),
+        updateTag,
         dryRun: values.booleans.has("--dry-run"),
         json: values.booleans.has("--json"),
     };
@@ -351,6 +362,8 @@ function parseBackfillArgs(args) {
             "--source",
             "--dry-run",
             "--max-files",
+            "--max-depth",
+            "--max-repos",
             "--yes",
             "--json",
         ],
@@ -361,6 +374,8 @@ function parseBackfillArgs(args) {
             "--since-days",
             "--source",
             "--max-files",
+            "--max-depth",
+            "--max-repos",
         ],
     });
     assertNoPositionals(values.positionals, "backfill");
@@ -382,6 +397,8 @@ function parseBackfillArgs(args) {
         all,
         dryRun: values.booleans.has("--dry-run"),
         maxFiles: optionalPositiveInteger(values.flags.get("--max-files"), "--max-files"),
+        maxDepth: optionalPositiveInteger(values.flags.get("--max-depth"), "--max-depth"),
+        maxRepos: optionalPositiveInteger(values.flags.get("--max-repos"), "--max-repos"),
         yes: values.booleans.has("--yes"),
         json: values.booleans.has("--json"),
     };