@bli-cockpit/cli 0.1.25 → 0.1.26

package/dist/local-state.js

@@ -5,6 +5,7 @@ import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { resolveRepoWorktreeIdentity, } from "./repo-identity.js";
+import { normalizeCollectionRoots } from "./root-normalization.js";
 import { summarizeLocalUploadSpool } from "./spool/local-spool.js";
 const localCollectorPackage = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8"));
 export const LOCAL_COLLECTOR_VERSION = typeof localCollectorPackage.version === "string"
@@ -26,10 +27,10 @@ export async function installLocalCollector(options = {}) {
     const paths = getCollectorRuntimePaths(homeDir);
     await ensureRuntimeDirectories(paths);
     const existingConfig = await readLocalCollectorConfig(paths).catch(() => null);
-    const defaultRepoPaths = new Set(options.replaceRepoRoots ? [] : (existingConfig?.default_repo_paths ?? []));
-    for (const root of repoRoots.length > 0 ? repoRoots : [repoRoot]) {
-        defaultRepoPaths.add(root);
-    }
+    const defaultRepoPaths = normalizeRepoRoots([
+        ...(options.replaceRepoRoots ? [] : (existingConfig?.default_repo_paths ?? [])),
+        ...(repoRoots.length > 0 ? repoRoots : [repoRoot]),
+    ]);
     const rawEvidenceUpload = existingConfig?.raw_evidence_upload === "disabled" ||
         existingConfig?.raw_evidence_upload === "remote_short_retention_opt_in"
         ? "remote_durable_opt_in"
@@ -45,7 +46,7 @@ export async function installLocalCollector(options = {}) {
             defaultDeviceName(),
         claimed_owner_email: existingConfig?.claimed_owner_email,
         operator_id: existingConfig?.operator_id,
-        default_repo_paths: [...defaultRepoPaths],
+        default_repo_paths: defaultRepoPaths,
         raw_evidence_upload: rawEvidenceUpload,
         session_file_path: paths.session_file,
         state_dir_path: paths.state_dir,
@@ -62,15 +63,15 @@ function normalizeRepoRoots(repoRoots) {
     if (!repoRoots)
         return [];
     const seen = new Set();
-    const normalized = [];
+    const candidates = [];
     for (const root of repoRoots) {
         const resolved = path.resolve(root);
         if (seen.has(resolved))
             continue;
         seen.add(resolved);
-        normalized.push(resolved);
+        candidates.push(resolved);
     }
-    return normalized;
+    return normalizeCollectionRoots(candidates);
 }
 export async function pairLocalCollector(options = {}) {
     const homeDir = options.homeDir ?? os.homedir();

package/dist/onboarding-roots.js

@@ -1,6 +1,7 @@
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
+import { normalizeCollectionRoots } from "./root-normalization.js";
 export const COLLECTION_ROOT_REQUIRED = "collection_root_required";
 export async function resolveOnboardingRoots(options) {
     const explicitRoots = normalizeRoots(options.explicitRoots ?? []);
@@ -43,7 +44,7 @@ export async function resolveOnboardingRoots(options) {
 }
 export function normalizeRoots(roots) {
     const seen = new Set();
-    const normalized = [];
+    const candidates = [];
     for (const root of roots) {
         const trimmed = root.trim();
         if (!trimmed)
@@ -57,10 +58,10 @@ export function normalizeRoots(roots) {
             if (seen.has(resolved))
                 continue;
             seen.add(resolved);
-            normalized.push(resolved);
+            candidates.push(resolved);
         }
     }
-    return normalized;
+    return normalizeCollectionRoots(candidates);
 }
 function splitRootInput(value) {
     return value

package/dist/root-normalization.js

@@ -0,0 +1,34 @@
+import path from "node:path";
+export function collapseAncestorRoots(roots) {
+    const collapsed = [];
+    for (const root of roots) {
+        const resolved = path.resolve(root);
+        if (collapsed.some((existing) => containsPath(existing, resolved)))
+            continue;
+        for (let index = collapsed.length - 1; index >= 0; index -= 1) {
+            if (containsPath(resolved, collapsed[index])) {
+                collapsed.splice(index, 1);
+            }
+        }
+        collapsed.push(resolved);
+    }
+    return collapsed;
+}
+export function normalizeCollectionRoots(roots) {
+    const collapsed = collapseAncestorRoots(roots);
+    if (!collapsed.some(isBliWorkspaceRoot))
+        return collapsed;
+    return collapsed.filter((root) => !isCodexWorktreePath(root));
+}
+function containsPath(parent, candidate) {
+    const relative = path.relative(parent, candidate);
+    return (relative === "" ||
+        (!!relative && !relative.startsWith("..") && !path.isAbsolute(relative)));
+}
+function isBliWorkspaceRoot(root) {
+    return path.basename(root) === "BLI";
+}
+function isCodexWorktreePath(root) {
+    const parts = root.split(path.sep).filter(Boolean);
+    return parts.some((part, index) => part === ".codex" && parts[index + 1] === "worktrees");
+}

package/package.json

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