@bli-cockpit/cli 0.2.112 → 0.2.114

package/dist/commands/public-root.js

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

package/dist/commands/session-sync.js

@@ -108,6 +108,16 @@ export async function runAttributedWorktreeSync(options) {
         now,
         claudePriorDurablePointers: worktreePass.claudePriorDurablePointers,
     });
+    // BLI-4341: every session should arrive counted. Say how many did, and say
+    // it on the success path too: a silent drop from "all" to "some" is exactly
+    // the kind of decay nobody notices.
+    const sessionsCounted = sessions.filter((session) => session.session_facts).length;
+    console.error("[session-sync] session facts counted at upload", JSON.stringify({
+        reason: sessionsCounted === sessions.length ? "counted_at_upload" : "some_sessions_unreadable",
+        sessions: sessions.length,
+        counted: sessionsCounted,
+        tokens_total: sessions.reduce((total, session) => total + (session.session_facts?.total_tokens ?? 0), 0),
+    }));
     const delivery = await reportSessionsAndAdvanceCursors({
         run: options,
         paths,

package/dist/commands/settings-overview.js

@@ -0,0 +1,94 @@
+/**
+ * What bare `cockpit settings` shows: every section at once (BLI-3461).
+ *
+ * It lives beside `settings.ts` because it is the only caller that has to hold
+ * six independent reads in its head at the same time and decide, per section,
+ * between a body, "admin only" and a named failure. The per-section verbs next
+ * door each answer for exactly one route.
+ *
+ * "Admin only" is not an error here. A read that 403s is the system working,
+ * so a section this person cannot see renders as one line saying so.
+ */
+import { writeLine } from "./cli-io.js";
+import { renderCliFloor, renderEnvBlobs, renderModelRouting, renderPersonal, renderSwitches, renderTeamSummary, } from "./settings-render.js";
+import { asRecord, callTower, isForbidden, writeCommandFailure, } from "./tower-command.js";
+/**
+ * Everything at once, with the sections this person may not see named as such.
+ *
+ * The six reads go out together: they are independent, and a person waiting on
+ * six sequential round trips would reasonably conclude the command had hung.
+ */
+export async function showOverview(command, tower, io) {
+    const [personal, switches, models, env, team, cliFloor] = await Promise.all([
+        callTower(tower, { path: "/api/settings/personal", label: "settings personal" }),
+        callTower(tower, { path: "/api/settings/switches", label: "settings switches" }),
+        callTower(tower, { path: "/api/settings/model-routing", label: "settings models" }),
+        callTower(tower, { path: "/api/settings/env-blobs", label: "settings env" }),
+        callTower(tower, { path: "/api/team/members", label: "settings team" }),
+        // BLI-3557: the floor rides the overview because "which version is the
+        // fleet being pulled to?" is a question people ask about their own laptop,
+        // and it went unanswered for weeks precisely because nothing showed it.
+        callTower(tower, { path: "/api/settings/cli-floor", label: "settings cli-floor" }),
+    ]);
+    // The one read every signed-in person is entitled to. If THAT is refused,
+    // nothing else is going to work either, so say so once and stop.
+    if (!personal.ok && !isForbidden(personal)) {
+        return writeCommandFailure(io, command.json, personal);
+    }
+    if (command.json) {
+        writeLine(io.stdout, JSON.stringify({
+            ok: true,
+            personal: sectionPayload(personal),
+            switches: sectionPayload(switches),
+            models: sectionPayload(models),
+            env: sectionPayload(env),
+            team: sectionPayload(team),
+            cliFloor: sectionPayload(cliFloor),
+        }));
+        return 0;
+    }
+    writeLine(io.stdout, "TOWER SETTINGS");
+    writeSection(io, "PERSONAL", personal, (body) => renderPersonal(body));
+    writeSection(io, "TEAM", team, (body) => renderTeamSummary(body));
+    writeSection(io, "SWITCHES", switches, (body) => renderSwitches(body));
+    writeSection(io, "MODELS", models, (body) => renderModelRouting(body));
+    writeSection(io, "ENV FILES", env, (body) => renderEnvBlobs(body));
+    writeSection(io, "FLEET CLI FLOOR", cliFloor, (body) => renderCliFloor(body));
+    writeLine(io.stderr, `[settings cli] overview ${JSON.stringify({
+        personal: outcome(personal),
+        team: outcome(team),
+        switches: outcome(switches),
+        models: outcome(models),
+        env: outcome(env),
+        cli_floor: outcome(cliFloor),
+    })}`);
+    return 0;
+}
+/** One section's heading and body — or the one line that says it is not yours. */
+function writeSection(io, heading, result, render) {
+    writeLine(io.stdout, "");
+    writeLine(io.stdout, heading);
+    if (isForbidden(result)) {
+        writeLine(io.stdout, "  admin only");
+        return;
+    }
+    if (!result.ok) {
+        // Not "admin only" and not shown: a real failure, named where it happened.
+        writeLine(io.stdout, `  unavailable — ${result.detail}`);
+        return;
+    }
+    for (const line of render(asRecord(result.body)))
+        writeLine(io.stdout, line);
+}
+function sectionPayload(result) {
+    if (result.ok)
+        return result.body;
+    if (isForbidden(result))
+        return { visible: false, reason: "admin_only" };
+    return { visible: false, reason: result.reason, detail: result.detail };
+}
+function outcome(result) {
+    if (result.ok)
+        return "ok";
+    return isForbidden(result) ? "admin_only" : result.reason;
+}

package/dist/commands/settings.js

@@ -21,7 +21,8 @@
  */
 import { isInteractiveStdin, readLine, writeLine, yesByDefault } from "./cli-io.js";
 import { asList, asRecord, callTower, isForbidden, openTower, parseModelKey, readAllStdin, writeCommandFailure, } from "./tower-command.js";
-import { renderCliFloor, renderEnvBlobs, renderModelRouting, renderPersonal, renderSwitches, renderTeamSummary, } from "./settings-render.js";
+import { showOverview } from "./settings-overview.js";
+import { renderCliFloor, renderEnvBlobs, renderModelRouting, renderPersonal, renderSwitches, } from "./settings-render.js";
 export async function runSettings(command, io) {
     const tower = await openTower("settings", command, io);
     switch (command.section) {
@@ -51,87 +52,6 @@ export async function runSettings(command, io) {
             return listEnvBlobs(command, tower, io);
     }
 }
-// ── overview ──────────────────────────────────────────────────────────
-/**
- * Everything at once, with the sections this person may not see named as such.
- *
- * The five reads go out together: they are independent, and a person waiting on
- * five sequential round trips would reasonably conclude the command had hung.
- */
-async function showOverview(command, tower, io) {
-    const [personal, switches, models, env, team, cliFloor] = await Promise.all([
-        callTower(tower, { path: "/api/settings/personal", label: "settings personal" }),
-        callTower(tower, { path: "/api/settings/switches", label: "settings switches" }),
-        callTower(tower, { path: "/api/settings/model-routing", label: "settings models" }),
-        callTower(tower, { path: "/api/settings/env-blobs", label: "settings env" }),
-        callTower(tower, { path: "/api/team/members", label: "settings team" }),
-        // BLI-3557: the floor rides the overview because "which version is the
-        // fleet being pulled to?" is a question people ask about their own laptop,
-        // and it went unanswered for weeks precisely because nothing showed it.
-        callTower(tower, { path: "/api/settings/cli-floor", label: "settings cli-floor" }),
-    ]);
-    // The one read every signed-in person is entitled to. If THAT is refused,
-    // nothing else is going to work either, so say so once and stop.
-    if (!personal.ok && !isForbidden(personal)) {
-        return writeCommandFailure(io, command.json, personal);
-    }
-    if (command.json) {
-        writeLine(io.stdout, JSON.stringify({
-            ok: true,
-            personal: sectionPayload(personal),
-            switches: sectionPayload(switches),
-            models: sectionPayload(models),
-            env: sectionPayload(env),
-            team: sectionPayload(team),
-            cliFloor: sectionPayload(cliFloor),
-        }));
-        return 0;
-    }
-    writeLine(io.stdout, "TOWER SETTINGS");
-    writeSection(io, "PERSONAL", personal, (body) => renderPersonal(body));
-    writeSection(io, "TEAM", team, (body) => renderTeamSummary(body));
-    writeSection(io, "SWITCHES", switches, (body) => renderSwitches(body));
-    writeSection(io, "MODELS", models, (body) => renderModelRouting(body));
-    writeSection(io, "ENV FILES", env, (body) => renderEnvBlobs(body));
-    writeSection(io, "FLEET CLI FLOOR", cliFloor, (body) => renderCliFloor(body));
-    writeLine(io.stderr, `[settings cli] overview ${JSON.stringify({
-        personal: outcome(personal),
-        team: outcome(team),
-        switches: outcome(switches),
-        models: outcome(models),
-        env: outcome(env),
-        cli_floor: outcome(cliFloor),
-    })}`);
-    return 0;
-}
-/** One section's heading and body — or the one line that says it is not yours. */
-function writeSection(io, heading, result, render) {
-    writeLine(io.stdout, "");
-    writeLine(io.stdout, heading);
-    if (isForbidden(result)) {
-        writeLine(io.stdout, "  admin only");
-        return;
-    }
-    if (!result.ok) {
-        // Not "admin only" and not shown: a real failure, named where it happened.
-        writeLine(io.stdout, `  unavailable — ${result.detail}`);
-        return;
-    }
-    for (const line of render(asRecord(result.body)))
-        writeLine(io.stdout, line);
-}
-function sectionPayload(result) {
-    if (result.ok)
-        return result.body;
-    if (isForbidden(result))
-        return { visible: false, reason: "admin_only" };
-    return { visible: false, reason: result.reason, detail: result.detail };
-}
-function outcome(result) {
-    if (result.ok)
-        return "ok";
-    return isForbidden(result) ? "admin_only" : result.reason;
-}
 // ── personal ──────────────────────────────────────────────────────────
 async function showPersonal(command, tower, io) {
     const result = await callTower(tower, {

package/dist/commands/usage.js

@@ -43,7 +43,7 @@ export async function runUsage(command, io) {
         if (!email)
             return failAgentDoor(door, "[usage]", "caller_email_unavailable", "The paired session has no email. Sign in again or pass --person <email>.");
         body.people = (body.people ?? []).filter((person) => person.email?.toLowerCase() === email.toLowerCase());
-        body.coverage = { sessions_labelled: body.people.reduce((total, person) => total + (person.sessions_labelled ?? 0), 0), sessions_extracted: body.people.reduce((total, person) => total + person.sessions_extracted, 0), sessions_observed: body.people.reduce((total, person) => total + person.sessions_observed, 0) };
+        body.coverage = { sessions_labelled: body.people.reduce((total, person) => total + (person.sessions_labelled ?? 0), 0), sessions_extracted: body.people.reduce((total, person) => total + person.sessions_extracted, 0), sessions_observed: body.people.reduce((total, person) => total + person.sessions_observed, 0), sessions_counted_at_upload: body.people.reduce((total, person) => total + (person.sessions_counted_at_upload ?? 0), 0), sessions_counted_by_server: body.people.reduce((total, person) => total + (person.sessions_counted_by_server ?? 0), 0) };
     }
     if (command.byRepo && body.people?.some((person) => !Array.isArray(person.repos))) {
         return failAgentDoor(door, "[usage]", "repo_grouping_unavailable", "The dashboard returned person totals without project rows. Deploy the dashboard project split before using --by-repo.");
@@ -104,6 +104,9 @@ export async function runUsage(command, io) {
     writeLine(io.stdout, "");
     writeLine(io.stdout, body.api_list_price_equivalent_label ?? "API list-price equivalent (not actual spend)");
     writeLine(io.stdout, `${body.coverage?.sessions_extracted ?? 0} of ${body.coverage?.sessions_observed ?? 0} sessions extracted`);
+    // BLI-4341: a session should arrive counted. This line is how a person sees
+    // whether that is happening, or whether the server is still doing the work.
+    writeLine(io.stdout, `${body.coverage?.sessions_counted_at_upload ?? 0} of ${body.coverage?.sessions_observed ?? 0} sessions counted at upload, ${body.coverage?.sessions_counted_by_server ?? 0} by server backfill`);
     if (command.bySubject)
         writeLine(io.stdout, `${(body.people ?? []).reduce((n, person) => n + (person.sessions_summarized ?? 0), 0)} of ${body.coverage?.sessions_observed ?? 0} sessions summarized`);
     if (command.byTopic)

package/dist/onboarding-root-guidance.js

@@ -0,0 +1,60 @@
+/**
+ * Why a folder cannot be a collection root, and exactly what we say about it.
+ *
+ * Split out of onboarding-roots.ts so the file that RESOLVES a root reads as
+ * the conversation, and this one holds the sentences. Every string here is
+ * read by a person mid-install and matched verbatim by tests: change the
+ * wording only on purpose.
+ */
+import os from "node:os";
+import path from "node:path";
+export function homeRootConsentPrompt(homeDirInput) {
+    const homeDir = path.resolve(homeDirInput ?? os.homedir());
+    return `You're in your home folder (${homeDir}).\n  Sync ALL projects on this machine? Every git repo under here gets captured now and in the future.\n  This is a work machine — exclude personal projects yourself if needed.\n  Press Enter to sync everything, or answer n to name one folder instead.  [Y/n]: `;
+}
+export const HOME_ROOT_DECLINE_PATH_PROMPT = "Okay — which folder should I sync? Enter the full path to your work directory: ";
+export const HOME_ROOT_NO_FOLDER_CHOSEN_MESSAGE = "No folder chosen. Re-run: cockpit onboard --workspace <path-to-your-work-folder>";
+export function rootRejectionExplanation(rejection, options = {}) {
+    switch (rejection.reason) {
+        case "home_dir":
+            return homeRootTutorial(options.homeDir);
+        case "fs_root":
+            return filesystemRootTutorial(options.homeDir);
+    }
+}
+export function homeRootTutorial(homeDirInput) {
+    const homeDir = path.resolve(homeDirInput ?? os.homedir());
+    const bliRoot = path.join(homeDir, "BLI");
+    const otherRoot = path.join(homeDir, "other");
+    return [
+        "Your home folder can't be a collection root by default:",
+        `  scanning all of ${homeDir} would include personal folders and every repo you ever create.`,
+        "What you can do:",
+        `  1) Specific folders: cockpit onboard --workspace "${bliRoot},${otherRoot}"`,
+        "  2) One work parent: mkdir ~/BLI && move your repos in, then: cockpit onboard --workspace ~/BLI",
+        "  3) Collect everything anyway (company machine): rerun with --allow-home-root",
+    ].join("\n");
+}
+function filesystemRootTutorial(homeDirInput) {
+    const homeDir = path.resolve(homeDirInput ?? os.homedir());
+    const bliRoot = path.join(homeDir, "BLI");
+    const otherRoot = path.join(homeDir, "other");
+    return [
+        "Your filesystem root can't be a collection root:",
+        `  scanning all of ${path.parse(homeDir).root} would include system folders, private data, and every mounted repo.`,
+        "What you can do:",
+        `  1) Specific folders: cockpit onboard --workspace "${bliRoot},${otherRoot}"`,
+        "  2) One work parent: mkdir ~/BLI && move your repos in, then: cockpit onboard --workspace ~/BLI",
+    ].join("\n");
+}
+export function missingCollectionRootMessage(options = {}) {
+    const homeDir = path.resolve(options.homeDir ?? os.homedir());
+    return [
+        "No collection root was confirmed:",
+        "  Tower only scans folders you name or confirm.",
+        "What you can do:",
+        `  1) Paste one work parent: ${path.join(homeDir, "BLI")}`,
+        `  2) Paste specific folders: ${path.join(homeDir, "repo-a")},${path.join(homeDir, "repo-b")}`,
+        "  3) Stop and rerun with a flag: cockpit onboard --workspace ~/BLI",
+    ].join("\n");
+}

package/dist/onboarding-roots.js

@@ -2,7 +2,12 @@ import fs from "node:fs/promises";
 import { realpathSync } from "node:fs";
 import os from "node:os";
 import path from "node:path";
+import { HOME_ROOT_DECLINE_PATH_PROMPT, HOME_ROOT_NO_FOLDER_CHOSEN_MESSAGE, homeRootConsentPrompt, homeRootTutorial, missingCollectionRootMessage, rootRejectionExplanation, } from "./onboarding-root-guidance.js";
 import { isSamePath, normalizeCollectionRoots, } from "./root-normalization.js";
+// Every sentence this file says to a person lives next door, with the reasons
+// it says them. Re-exported here because this is the address callers and tests
+// have always imported them from.
+export { HOME_ROOT_DECLINE_PATH_PROMPT, HOME_ROOT_NO_FOLDER_CHOSEN_MESSAGE, homeRootConsentPrompt, missingCollectionRootMessage, rootRejectionExplanation, } from "./onboarding-root-guidance.js";
 export const COLLECTION_ROOT_REQUIRED = "collection_root_required";
 /**
  * No approved collection root, so there is nothing this machine may look at.
@@ -21,12 +26,6 @@ export class CollectionRootRequiredError extends Error {
         this.name = "CollectionRootRequiredError";
     }
 }
-export function homeRootConsentPrompt(homeDirInput) {
-    const homeDir = path.resolve(homeDirInput ?? os.homedir());
-    return `You're in your home folder (${homeDir}).\n  Sync ALL projects on this machine? Every git repo under here gets captured now and in the future.\n  This is a work machine — exclude personal projects yourself if needed.\n  Press Enter to sync everything, or answer n to name one folder instead.  [Y/n]: `;
-}
-export const HOME_ROOT_DECLINE_PATH_PROMPT = "Okay — which folder should I sync? Enter the full path to your work directory: ";
-export const HOME_ROOT_NO_FOLDER_CHOSEN_MESSAGE = "No folder chosen. Re-run: cockpit onboard --workspace <path-to-your-work-folder>";
 export async function resolveOnboardingRoots(options) {
     const explicitInput = options.explicitRoots ?? [];
     const explicit = normalizeRootsDetailed(explicitInput, {
@@ -207,28 +206,12 @@ function explainRejectedRoots(options, rejections) {
         return;
     const prompt = requirePrompt(options);
     for (const rejection of rejections) {
-        prompt.message?.(rootRejectionPromptHint(rejection, options));
-    }
-}
-export function rootRejectionExplanation(rejection, options = {}) {
-    switch (rejection.reason) {
-        case "home_dir":
-            return homeRootTutorial(options.homeDir);
-        case "fs_root":
-            return filesystemRootTutorial(options.homeDir);
+        prompt.message?.(rootRejectionExplanation(rejection, options));
     }
 }
 function withoutHomeRejections(rejections) {
     return rejections.filter((rejection) => rejection.reason !== "home_dir");
 }
-function rootRejectionPromptHint(rejection, options = {}) {
-    switch (rejection.reason) {
-        case "home_dir":
-            return homeRootTutorial(options.homeDir);
-        case "fs_root":
-            return filesystemRootTutorial(options.homeDir);
-    }
-}
 async function promptForHomeRootOptIn(options, rejections) {
     if (!rejections.some((rejection) => rejection.reason === "home_dir"))
         return null;
@@ -324,42 +307,6 @@ function canonicalPath(input, pathApi = path, realpath = realpathSync) {
 function isHomeRoot(root, homeDir) {
     return isSamePath(canonicalPath(root), canonicalPath(homeDir ?? os.homedir()));
 }
-function homeRootTutorial(homeDirInput) {
-    const homeDir = path.resolve(homeDirInput ?? os.homedir());
-    const bliRoot = path.join(homeDir, "BLI");
-    const otherRoot = path.join(homeDir, "other");
-    return [
-        "Your home folder can't be a collection root by default:",
-        `  scanning all of ${homeDir} would include personal folders and every repo you ever create.`,
-        "What you can do:",
-        `  1) Specific folders: cockpit onboard --workspace "${bliRoot},${otherRoot}"`,
-        "  2) One work parent: mkdir ~/BLI && move your repos in, then: cockpit onboard --workspace ~/BLI",
-        "  3) Collect everything anyway (company machine): rerun with --allow-home-root",
-    ].join("\n");
-}
-function filesystemRootTutorial(homeDirInput) {
-    const homeDir = path.resolve(homeDirInput ?? os.homedir());
-    const bliRoot = path.join(homeDir, "BLI");
-    const otherRoot = path.join(homeDir, "other");
-    return [
-        "Your filesystem root can't be a collection root:",
-        `  scanning all of ${path.parse(homeDir).root} would include system folders, private data, and every mounted repo.`,
-        "What you can do:",
-        `  1) Specific folders: cockpit onboard --workspace "${bliRoot},${otherRoot}"`,
-        "  2) One work parent: mkdir ~/BLI && move your repos in, then: cockpit onboard --workspace ~/BLI",
-    ].join("\n");
-}
-export function missingCollectionRootMessage(options = {}) {
-    const homeDir = path.resolve(options.homeDir ?? os.homedir());
-    return [
-        "No collection root was confirmed:",
-        "  Tower only scans folders you name or confirm.",
-        "What you can do:",
-        `  1) Paste one work parent: ${path.join(homeDir, "BLI")}`,
-        `  2) Paste specific folders: ${path.join(homeDir, "repo-a")},${path.join(homeDir, "repo-b")}`,
-        "  3) Stop and rerun with a flag: cockpit onboard --workspace ~/BLI",
-    ].join("\n");
-}
 export function likelyBliRootFromCwd(cwd, pathApi = path) {
     const root = pathApi.parse(cwd).root;
     const parts = pathApi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bli-cockpit/cli",
-  "version": "0.2.112",
+  "version": "0.2.114",
   "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-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.30",
-    "@bli-cockpit/mcp": "0.1.40",
-    "@bli-cockpit/telemetry-core": "0.1.46"
+    "@bli-cockpit/memory-mcp": "0.1.32",
+    "@bli-cockpit/mcp": "0.1.42",
+    "@bli-cockpit/telemetry-core": "0.1.48"
   }
 }