@bli-cockpit/cli 0.1.5 → 0.1.6

package/README.md

@@ -33,9 +33,12 @@ npm exec --yes --package=@bli-cockpit/cli@latest -- cockpit onboard \
   --repo "$PWD"
 ```
 
-Parent mode scans child git repos/worktrees, creates one stable work context per
+Parent mode scans child git repos/worktrees (3 folder levels deep, up to 50
+repos by default — tune with `--max-depth` / `--max-repos`; a warning prints
+if the repo cap truncates discovery), creates one stable work context per
 worktree, and the dashboard rolls them up under one repo row with worktree
-drilldown. Device approval is still one time per laptop/dashboard/email. Codex
+drilldown. Repos cloned later are picked up automatically: `cockpit sync`
+starts a general ambient work context for newly discovered repos on its own. Device approval is still one time per laptop/dashboard/email. Codex
 JSONL transcripts are attributed to a repo/worktree deterministically (session
 cwd, workspace roots, git origin/branch/commit signals) and upload only into
 that repo's evidence lane; transcripts that cannot be attributed to exactly one

package/dist/commands/local.js

@@ -2,7 +2,7 @@ import os from "node:os";
 import path from "node:path";
 import { createCollectorServer } from "../server.js";
 import { DEFAULT_DASHBOARD_URL, getCollectorRuntimePaths, inspectLocalCollectorStatus, installLocalCollector, logoutLocalCollector, pairLocalCollector, readLocalCollectorSessionFile, readLocalSessionReference, startLocalWorkContext, } from "../local-state.js";
-import { postCodexSessionReport, syncLocalAmbientEnvelope, } from "../upload.js";
+import { LocalUploadBlockedError, postCodexSessionReport, syncLocalAmbientEnvelope, } from "../upload.js";
 import { scanAndAttributeCodexSessions, } from "../adapters/codex-attribution.js";
 import { countStaleSessions, readRawEvidenceCursor, recordSessionObservation, writeRawEvidenceCursor, } from "../cursors/raw-evidence-cursor.js";
 import { discoverGitWorktrees, } from "../repo-identity.js";
@@ -61,14 +61,14 @@ export function localCommandHelp(command) {
     if (command)
         return localSubcommandHelp(command);
     return [
-        "  cockpit onboard [--ticket <id>] [--email <owner@email>] [--device-name <name>] [--dashboard-url <url>] [--repo <path>] [--branch <name>] [--json]",
+        "  cockpit onboard [--ticket <id>] [--email <owner@email>] [--device-name <name>] [--dashboard-url <url>] [--repo <path>] [--branch <name>] [--max-depth <n>] [--max-repos <n>] [--json]",
         "  cockpit install [--dashboard-url <url>] [--repo <path>] [--json]",
         "  cockpit login [--email <owner@email>] [--device-name <name>] [--dashboard-url <url>] [--json]",
         "  cockpit pair [--email <owner@email>] [--device-name <name>] [--dashboard-url <url>] [--json]",
         "  cockpit logout",
-        "  cockpit start [--ticket <id>] [--repo <path>] [--branch <name>] [--json]",
-        "  cockpit sync [--repo <path>] [--dashboard-url <url>] [--json]",
-        "  cockpit status [--repo <path>] [--json]",
+        "  cockpit start [--ticket <id>] [--repo <path>] [--branch <name>] [--max-depth <n>] [--max-repos <n>] [--json]",
+        "  cockpit sync [--repo <path>] [--dashboard-url <url>] [--max-depth <n>] [--max-repos <n>] [--json]",
+        "  cockpit status [--repo <path>] [--max-depth <n>] [--max-repos <n>] [--json]",
         "  cockpit serve [--port <port>] [--repo <path>]",
     ].join("\n");
 }
@@ -127,6 +127,9 @@ function localSubcommandHelp(command) {
                 "Parent folders sync each child git worktree; Codex JSONL transcripts are attributed",
                 "to repos deterministically and ambiguous transcripts are retained as unattributed",
                 "instead of being duplicated across repos.",
+                "Newly discovered repos get a general ambient work context automatically.",
+                "Discovery scans 3 folder levels and up to 50 repos by default; tune with",
+                "--max-depth and --max-repos.",
             ],
         ],
         [
@@ -191,6 +194,8 @@ function parseOnboardArgs(args) {
             "--json",
             "--poll-interval-ms",
             "--timeout-ms",
+            "--max-depth",
+            "--max-repos",
         ],
         valueFlags: [
             "--home",
@@ -202,6 +207,8 @@ function parseOnboardArgs(args) {
             "--branch",
             "--poll-interval-ms",
             "--timeout-ms",
+            "--max-depth",
+            "--max-repos",
         ],
     });
     assertNoPositionals(values.positionals, "onboard");
@@ -217,6 +224,8 @@ function parseOnboardArgs(args) {
         json: values.booleans.has("--json"),
         pollIntervalMs: optionalPositiveInteger(values.flags.get("--poll-interval-ms"), "--poll-interval-ms"),
         timeoutMs: optionalPositiveInteger(values.flags.get("--timeout-ms"), "--timeout-ms"),
+        maxDepth: optionalPositiveInteger(values.flags.get("--max-depth"), "--max-depth"),
+        maxRepos: optionalPositiveInteger(values.flags.get("--max-repos"), "--max-repos"),
     };
 }
 function parseInstallArgs(args) {
@@ -294,6 +303,8 @@ function parseStartArgs(args) {
             "--operator-id",
             "--session-id",
             "--json",
+            "--max-depth",
+            "--max-repos",
         ],
         valueFlags: [
             "--home",
@@ -302,6 +313,8 @@ function parseStartArgs(args) {
             "--ticket",
             "--operator-id",
             "--session-id",
+            "--max-depth",
+            "--max-repos",
         ],
     });
     assertNoPositionals(values.positionals, "start");
@@ -314,12 +327,14 @@ function parseStartArgs(args) {
         operatorId: optionalNonEmpty(values.flags.get("--operator-id")),
         sessionId: optionalNonEmpty(values.flags.get("--session-id")),
         json: values.booleans.has("--json"),
+        maxDepth: optionalPositiveInteger(values.flags.get("--max-depth"), "--max-depth"),
+        maxRepos: optionalPositiveInteger(values.flags.get("--max-repos"), "--max-repos"),
     };
 }
 function parseSyncArgs(args) {
     const values = parseNamedArgs(args, {
-        allowedFlags: ["--home", "--repo", "--dashboard-url", "--json"],
-        valueFlags: ["--home", "--repo", "--dashboard-url"],
+        allowedFlags: ["--home", "--repo", "--dashboard-url", "--json", "--max-depth", "--max-repos"],
+        valueFlags: ["--home", "--repo", "--dashboard-url", "--max-depth", "--max-repos"],
     });
     assertNoPositionals(values.positionals, "sync");
     return {
@@ -328,12 +343,14 @@ function parseSyncArgs(args) {
         repoRoot: optionalNonEmpty(values.flags.get("--repo")),
         dashboardUrl: optionalUrl(values.flags.get("--dashboard-url")),
         json: values.booleans.has("--json"),
+        maxDepth: optionalPositiveInteger(values.flags.get("--max-depth"), "--max-depth"),
+        maxRepos: optionalPositiveInteger(values.flags.get("--max-repos"), "--max-repos"),
     };
 }
 function parseStatusArgs(args) {
     const values = parseNamedArgs(args, {
-        allowedFlags: ["--home", "--repo", "--json"],
-        valueFlags: ["--home", "--repo"],
+        allowedFlags: ["--home", "--repo", "--json", "--max-depth", "--max-repos"],
+        valueFlags: ["--home", "--repo", "--max-depth", "--max-repos"],
     });
     assertNoPositionals(values.positionals, "status");
     return {
@@ -341,6 +358,8 @@ function parseStatusArgs(args) {
         homeDir: optionalNonEmpty(values.flags.get("--home")),
         repoRoot: optionalNonEmpty(values.flags.get("--repo")),
         json: values.booleans.has("--json"),
+        maxDepth: optionalPositiveInteger(values.flags.get("--max-depth"), "--max-depth"),
+        maxRepos: optionalPositiveInteger(values.flags.get("--max-repos"), "--max-repos"),
     };
 }
 function parseServeArgs(args) {
@@ -465,7 +484,7 @@ async function runOnboard(command, io) {
                 writeLine(io.stdout, `Device: ${pair.session.device_name ?? pair.session.device_id ?? "unknown"}`);
             }
         }
-        const worktrees = await discoverCommandWorktrees(command.repoRoot);
+        const worktrees = await discoverCommandWorktrees(command.repoRoot, { maxDepth: command.maxDepth, maxRepos: command.maxRepos }, io);
         if (worktrees.length > 1) {
             const multi = await runMultiRepoOnboard(command, io, worktrees);
             if (command.json) {
@@ -626,7 +645,7 @@ async function runAttributedWorktreeSync(options) {
                 sessionId: options.sessionId,
             });
         }
-        const sync = await syncLocalAmbientEnvelope({
+        const syncOptions = {
             homeDir: options.homeDir,
             repoRoot: worktree.repo_root,
             dashboardUrl: options.dashboardUrl,
@@ -639,7 +658,29 @@ async function runAttributedWorktreeSync(options) {
                 codex_session_id: result.codex_session_id,
             })),
             fetch: options.fetchImpl,
-        });
+        };
+        let sync;
+        try {
+            sync = await syncLocalAmbientEnvelope(syncOptions);
+        }
+        catch (error) {
+            // A newly cloned repo has no work context yet. Capture is permissive
+            // and ticket binding comes later, so start general ambient capture for
+            // it instead of blocking every other repo's sync until someone runs
+            // `cockpit start` by hand.
+            if (error instanceof LocalUploadBlockedError &&
+                error.blocker === "missing_context") {
+                context = await startLocalWorkContext({
+                    homeDir: options.homeDir,
+                    repoRoot: worktree.repo_root,
+                    branch: options.branch,
+                });
+                sync = await syncLocalAmbientEnvelope(syncOptions);
+            }
+            else {
+                throw error;
+            }
+        }
         ok = ok && sync.status === "uploaded";
         outcomes.push({ worktree, context, sync });
     }
@@ -795,11 +836,20 @@ function rawEvidenceSyncLine(sync) {
 function cursorStatusLine(sync) {
     return `Cursor: ${sync.cursor_tracked_object_count} durable object(s) tracked`;
 }
-async function discoverCommandWorktrees(repoRoot) {
-    const worktrees = await discoverGitWorktrees(repoRoot ?? process.cwd());
+const DEFAULT_DISCOVERY_MAX_DEPTH = 3;
+const DEFAULT_DISCOVERY_MAX_REPOS = 50;
+async function discoverCommandWorktrees(repoRoot, discovery = {}, io) {
+    const maxWorktrees = discovery.maxRepos ?? DEFAULT_DISCOVERY_MAX_REPOS;
+    const worktrees = await discoverGitWorktrees(repoRoot ?? process.cwd(), {
+        maxDepth: discovery.maxDepth ?? DEFAULT_DISCOVERY_MAX_DEPTH,
+        maxWorktrees,
+    });
     if (worktrees.length === 0) {
         throw new Error("No git repos found. Run from a git repo, or from a parent folder containing git repos.");
     }
+    if (io && worktrees.length >= maxWorktrees) {
+        writeLine(io.stderr, `Warning: repo discovery hit the cap of ${maxWorktrees}; additional repos may be excluded. Raise --max-repos if this folder really holds more.`);
+    }
     return worktrees;
 }
 async function runMultiRepoOnboard(command, io, worktrees) {
@@ -959,7 +1009,7 @@ async function runLogout(command, io) {
     return 0;
 }
 async function runStart(command, io) {
-    const worktrees = await discoverCommandWorktrees(command.repoRoot);
+    const worktrees = await discoverCommandWorktrees(command.repoRoot, { maxDepth: command.maxDepth, maxRepos: command.maxRepos }, io);
     if (worktrees.length > 1) {
         const contexts = await Promise.all(worktrees.map((worktree) => startLocalWorkContext({
             homeDir: command.homeDir,
@@ -992,7 +1042,7 @@ async function runStart(command, io) {
     return 0;
 }
 async function runSync(command, io) {
-    const worktrees = await discoverCommandWorktrees(command.repoRoot);
+    const worktrees = await discoverCommandWorktrees(command.repoRoot, { maxDepth: command.maxDepth, maxRepos: command.maxRepos }, io);
     const run = await runAttributedWorktreeSync({
         homeDir: command.homeDir,
         dashboardUrl: command.dashboardUrl,
@@ -1052,7 +1102,7 @@ async function runSync(command, io) {
     return 1;
 }
 async function runStatus(command, io) {
-    const worktrees = await discoverCommandWorktrees(command.repoRoot);
+    const worktrees = await discoverCommandWorktrees(command.repoRoot, { maxDepth: command.maxDepth, maxRepos: command.maxRepos }, io);
     if (worktrees.length > 1) {
         const statuses = await Promise.all(worktrees.map(async (worktree) => ({
             ...(await inspectLocalCollectorStatus({

package/dist/local-state.js

@@ -5,7 +5,7 @@ import os from "node:os";
 import path from "node:path";
 import { resolveRepoWorktreeIdentity, } from "./repo-identity.js";
 import { summarizeLocalUploadSpool } from "./spool/local-spool.js";
-export const LOCAL_COLLECTOR_VERSION = "0.1.5";
+export const LOCAL_COLLECTOR_VERSION = "0.1.6";
 export const DEFAULT_DASHBOARD_URL = "http://127.0.0.1:3100";
 export function getCollectorRuntimePaths(homeDir = os.homedir()) {
     const paths = getUserLocalCockpitPaths(homeDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bli-cockpit/cli",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "private": false,
   "type": "module",
   "bin": {