@bli-cockpit/cli 0.1.28 → 0.1.29

package/README.md

@@ -137,6 +137,9 @@ cockpit sync \
 
 No ticket is required for setup, chatting, planning, or general ambient capture.
 Only pass `--ticket` when the work really belongs to a visible ticket.
+Omitting `--ticket` preserves any existing ticket binding; run
+`cockpit start --clear-ticket --workspace "$PWD"` when you intentionally want
+to return a previously bound work context to general ambient capture.
 
 When the work is important but ticketless, label it explicitly before syncing so
 later analysis does not have to guess the topic:

package/dist/commands/local-args.js

@@ -206,6 +206,7 @@ function parseStartArgs(args) {
             "--workspace",
             "--branch",
             "--ticket",
+            "--clear-ticket",
             "--topic",
             "--topic-summary",
             "--intent",
@@ -237,6 +238,11 @@ function parseStartArgs(args) {
         ],
     });
     assertNoPositionals(values.positionals, "start");
+    const activeTicketId = optionalNonEmpty(values.flags.get("--ticket"));
+    const clearTicket = values.booleans.has("--clear-ticket");
+    if (activeTicketId && clearTicket) {
+        throw new Error("--ticket and --clear-ticket cannot be combined.");
+    }
     const topicLabel = optionalNonEmpty(values.flags.get("--topic"));
     const topicSummaryRedacted = optionalNonEmpty(values.flags.get("--topic-summary"));
     const workIntent = optionalSchemaValue(WorkIntentSchema, values.flags.get("--intent"), "--intent");
@@ -252,7 +258,8 @@ function parseStartArgs(args) {
         homeDir: optionalNonEmpty(values.flags.get("--home")),
         repoRoot: optionalNonEmpty(workRootFlagValue(values)),
         branch: optionalNonEmpty(values.flags.get("--branch")),
-        activeTicketId: optionalNonEmpty(values.flags.get("--ticket")),
+        activeTicketId,
+        clearTicket,
         topicLabel,
         topicSummaryRedacted,
         workIntent,

package/dist/commands/local.js

@@ -91,7 +91,7 @@ export function localCommandHelp(command) {
         "  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>] [--topic <label>] [--intent <intent>] [--phase <phase>] [--workspace <path>] [--branch <name>] [--max-depth <n>] [--max-repos <n>] [--json]",
+        "  cockpit start [--ticket <id>|--clear-ticket] [--topic <label>] [--intent <intent>] [--phase <phase>] [--workspace <path>] [--branch <name>] [--max-depth <n>] [--max-repos <n>] [--json]",
         "  cockpit sync [--workspace <path>] [--dashboard-url <url>] [--max-depth <n>] [--max-repos <n>] [--json]",
         "  cockpit status [--workspace <path>] [--max-depth <n>] [--max-repos <n>] [--json]",
         "  cockpit sessions [--source codex|claude] [--workspace <path>] [--max-depth <n>] [--max-repos <n>] [--json]",
@@ -169,10 +169,11 @@ function localSubcommandHelp(command) {
         [
             "start",
             [
-                "Usage: cockpit start [--ticket <id>] [--topic <label>] [--topic-summary <summary>] [--intent <intent>] [--phase <phase>] [--intent-confidence <0..1>] [--workspace <path>] [--branch <name>] [--json]",
+                "Usage: cockpit start [--ticket <id>|--clear-ticket] [--topic <label>] [--topic-summary <summary>] [--intent <intent>] [--phase <phase>] [--intent-confidence <0..1>] [--workspace <path>] [--branch <name>] [--json]",
                 "",
                 "Starts local ambient capture. Parent folders start each child git worktree.",
-                "Add --ticket only when the work already has a visible ticket.",
+                "Add --ticket only when the work already has a visible ticket; omit it to preserve an existing binding.",
+                "Use --clear-ticket to intentionally return the context to general ambient capture.",
                 "Use --topic/--intent/--phase for planning, discovery, and learning work that has no ticket yet.",
                 "Supported intents: implementation, bug_fix, root_cause_analysis, planning, discovery, review, testing, documentation, release, learning, coordination, maintenance, analysis, unknown, other.",
                 "Supported phases: planning, discovery, implementation, debugging, review, testing, documentation, release, handoff, analysis, unknown, other.",
@@ -1186,6 +1187,7 @@ async function runStart(command, io) {
             repoRoot: worktree.repo_root,
             branch: command.branch,
             activeTicketId: command.activeTicketId,
+            clearTicket: command.clearTicket,
             topicLabel: command.topicLabel,
             topicSummaryRedacted: command.topicSummaryRedacted,
             workIntent: command.workIntent,

package/dist/commands/session-sync.js

@@ -114,6 +114,7 @@ export async function runAttributedWorktreeSync(options) {
             homeDir: options.homeDir,
             repoRoot: worktree.repo_root,
             dashboardUrl: options.dashboardUrl,
+            worktreeInventory: worktreeInventoryForRepo(worktree, options.worktrees),
             codexSessionFiles: codexAttribution.results
                 .filter((result) => result.state === "attributed" &&
                 result.worktree?.worktree_fingerprint ===
@@ -510,6 +511,23 @@ function emptyClaudeScan() {
         },
     };
 }
+function worktreeInventoryForRepo(current, worktrees) {
+    return worktrees
+        .filter((worktree) => worktree.repo_fingerprint
+        ? worktree.repo_fingerprint === current.repo_fingerprint
+        : worktree.repo_label === current.repo_label)
+        .map((worktree) => ({
+        repo: worktree.repo_root,
+        repo_label: worktree.repo_label,
+        repo_fingerprint: worktree.repo_fingerprint,
+        repo_origin_url: worktree.repo_origin_url ?? undefined,
+        head_sha: worktree.head_sha ?? undefined,
+        worktree_label: worktree.worktree_label,
+        worktree_fingerprint: worktree.worktree_fingerprint,
+        worktree_is_primary: worktree.worktree_is_primary,
+        branch: worktree.branch,
+    }));
+}
 async function isClaudeCollectionEnabled(paths) {
     const config = await readLocalCollectorConfig(paths).catch(() => null);
     return config?.collect_claude_jsonl !== false;

package/dist/local-state.js

@@ -4,7 +4,7 @@ import { readFileSync } from "node:fs";
 import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
-import { resolveRepoWorktreeIdentity, } from "./repo-identity.js";
+import { resolveRepoWorktreeIdentity, stableWorktreeFingerprint, stableWorktreeRoot, } 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"));
@@ -138,6 +138,9 @@ export async function logoutLocalCollector(options = {}) {
     return { removed, session_file: paths.session_file };
 }
 export async function startLocalWorkContext(options = {}) {
+    if (options.activeTicketId && options.clearTicket) {
+        throw new Error("--ticket and --clear-ticket cannot be combined.");
+    }
     const now = options.now ?? new Date();
     const homeDir = options.homeDir ?? os.homedir();
     const repoRoot = path.resolve(options.repoRoot ?? process.cwd());
@@ -161,6 +164,9 @@ export async function startLocalWorkContext(options = {}) {
         worktreeFingerprint: identity.worktree_fingerprint,
     });
     const existingContext = await readLocalWorkContextByFingerprint(paths, identity.worktree_fingerprint).catch(() => null);
+    const activeTicketId = options.clearTicket
+        ? undefined
+        : (options.activeTicketId ?? existingContext?.active_ticket_id);
     const ticketBindingCandidates = options.activeTicketId
         ? [
             {
@@ -170,7 +176,9 @@ export async function startLocalWorkContext(options = {}) {
                 evidence_labels: ["cockpit_start_ticket"],
             },
         ]
-        : [];
+        : options.clearTicket
+            ? []
+            : (existingContext?.ticket_binding_candidates ?? []);
     const context = LocalWorkContextSchema.parse({
         work_context_id: workContextId,
         repo: identity.repo_root,
@@ -186,7 +194,7 @@ export async function startLocalWorkContext(options = {}) {
         session_id: sessionId,
         started_at: existingContext?.started_at ?? now.toISOString(),
         updated_at: now.toISOString(),
-        active_ticket_id: options.activeTicketId ?? undefined,
+        active_ticket_id: activeTicketId,
         ticket_binding_candidates: ticketBindingCandidates,
         topic_label: options.topicLabel,
         topic_summary_redacted: options.topicSummaryRedacted,
@@ -229,8 +237,8 @@ export async function inspectLocalCollectorStatus(options = {}) {
     const identity = await resolveIdentityOrFallback(repoRoot, options.branch);
     const context = await readLocalWorkContextForRepo(paths, repoRoot).catch(() => null);
     const branch = options.branch ?? identity.branch;
-    const freshness = classifyCollectorFreshness(context, now);
     const uploadSpool = await summarizeLocalUploadSpool(paths);
+    const freshness = classifyCollectorFreshness(context, uploadSpool.last_upload_success_at, now);
     const uploadState = !config
         ? "not_installed"
         : uploadSpool.pending_upload_count > 0
@@ -381,14 +389,14 @@ function workContextFile(paths, worktreeFingerprint) {
     return path.join(paths.work_contexts_dir, `${worktreeFingerprint}.json`);
 }
 async function resolveIdentityOrFallback(repoRoot, branchOverride) {
-    const resolvedRoot = path.resolve(repoRoot);
+    const resolvedRoot = await stableWorktreeRoot(repoRoot);
     const identity = await resolveRepoWorktreeIdentity(resolvedRoot).catch(() => null);
     if (identity) {
         return branchOverride ? { ...identity, branch: branchOverride } : identity;
     }
     const repoLabel = path.basename(resolvedRoot) || "workspace";
     const repoFingerprint = `repo-${sha256(`local:${resolvedRoot}`).slice(0, 24)}`;
-    const worktreeFingerprint = `wt-${sha256(`${repoFingerprint}:${resolvedRoot}`).slice(0, 24)}`;
+    const worktreeFingerprint = stableWorktreeFingerprint(resolvedRoot);
     const branch = branchOverride ?? (await resolveGitBranch(resolvedRoot));
     return {
         requested_path: resolvedRoot,
@@ -426,13 +434,24 @@ async function writeJsonFile(filePath, value) {
         await fs.chmod(filePath, 0o600).catch(() => undefined);
     }
 }
-function classifyCollectorFreshness(context, now) {
+export function classifyCollectorFreshness(context, lastUploadSuccessAt, now) {
     if (!context)
         return "missing";
-    const updatedAt = Date.parse(context.updated_at ?? context.started_at);
-    if (!Number.isFinite(updatedAt))
+    const latestActivityAt = latestTimestamp([
+        context.updated_at ?? context.started_at,
+        lastUploadSuccessAt,
+    ]);
+    if (latestActivityAt === null)
         return "stale";
-    return now.getTime() - updatedAt <= 5 * 60 * 1000 ? "fresh" : "stale";
+    return now.getTime() - latestActivityAt <= 5 * 60 * 1000 ? "fresh" : "stale";
+}
+function latestTimestamp(values) {
+    const timestamps = values
+        .map((value) => Date.parse(value ?? ""))
+        .filter((value) => Number.isFinite(value));
+    if (timestamps.length === 0)
+        return null;
+    return Math.max(...timestamps);
 }
 function normalizeDashboardUrl(value) {
     const normalized = value.trim().replace(/\/+$/, "");

package/dist/repo-identity.js

@@ -18,7 +18,7 @@ const SKIPPED_DIR_NAMES = new Set([
 export async function resolveRepoWorktreeIdentity(repoRoot) {
     const requestedPath = path.resolve(repoRoot);
     const gitRoot = await runGit(["rev-parse", "--show-toplevel"], requestedPath);
-    const resolvedRoot = path.resolve(gitRoot.trim() || requestedPath);
+    const resolvedRoot = await stableWorktreeRoot(gitRoot.trim() || requestedPath);
     const branch = await resolveGitBranchWithGit(resolvedRoot);
     const headSha = await runGit(["rev-parse", "HEAD"], resolvedRoot).then((value) => value.trim() || null, () => null);
     const absoluteGitDir = await runGit(["rev-parse", "--absolute-git-dir"], resolvedRoot)
@@ -36,11 +36,6 @@ export async function resolveRepoWorktreeIdentity(repoRoot) {
         ? `origin:${repoOriginUrl}`
         : `local:${sha256(commonGitDir ?? resolvedRoot)}`;
     const repoFingerprint = `repo-${sha256(repoMaterial).slice(0, 24)}`;
-    const worktreeMaterial = [
-        repoFingerprint,
-        resolvedRoot,
-        commonGitDir ?? "",
-    ].join("\n");
     const gitFilePath = path.join(resolvedRoot, ".git");
     const worktreeIsPrimary = await fs.stat(gitFilePath).then((stat) => stat.isDirectory(), () => false);
     return {
@@ -52,7 +47,7 @@ export async function resolveRepoWorktreeIdentity(repoRoot) {
         branch,
         head_sha: headSha,
         worktree_label: path.basename(resolvedRoot),
-        worktree_fingerprint: `wt-${sha256(worktreeMaterial).slice(0, 24)}`,
+        worktree_fingerprint: stableWorktreeFingerprint(resolvedRoot),
         worktree_is_primary: worktreeIsPrimary,
     };
 }
@@ -144,10 +139,9 @@ async function hasGitMarker(dir) {
     return fs.stat(path.join(dir, ".git")).then((stat) => stat.isDirectory() || stat.isFile(), () => false);
 }
 async function fallbackFilesystemIdentity(repoRoot) {
-    const resolvedRoot = path.resolve(repoRoot);
+    const resolvedRoot = await stableWorktreeRoot(repoRoot);
     const repoLabel = path.basename(resolvedRoot) || "repo";
     const repoFingerprint = `repo-${sha256(`local:${resolvedRoot}`).slice(0, 24)}`;
-    const worktreeFingerprint = `wt-${sha256(`${repoFingerprint}:${resolvedRoot}`).slice(0, 24)}`;
     return {
         requested_path: resolvedRoot,
         repo_root: resolvedRoot,
@@ -157,10 +151,17 @@ async function fallbackFilesystemIdentity(repoRoot) {
         branch: await resolveBranchFromHead(resolvedRoot),
         head_sha: null,
         worktree_label: repoLabel,
-        worktree_fingerprint: worktreeFingerprint,
+        worktree_fingerprint: stableWorktreeFingerprint(resolvedRoot),
         worktree_is_primary: true,
     };
 }
+export async function stableWorktreeRoot(repoRoot) {
+    const resolvedRoot = path.resolve(repoRoot);
+    return fs.realpath(resolvedRoot).catch(() => resolvedRoot);
+}
+export function stableWorktreeFingerprint(repoRoot) {
+    return `wt-${sha256(`worktree:${normalizeFingerprintPath(repoRoot)}`).slice(0, 24)}`;
+}
 async function resolveBranchFromHead(repoRoot) {
     try {
         const gitPath = path.join(repoRoot, ".git");
@@ -244,6 +245,10 @@ async function runGit(args, cwd) {
     });
     return stdout;
 }
+function normalizeFingerprintPath(repoRoot) {
+    const resolved = path.resolve(repoRoot);
+    return process.platform === "win32" ? resolved.toLowerCase() : resolved;
+}
 function sha256(value) {
     return crypto.createHash("sha256").update(value, "utf8").digest("hex");
 }

package/dist/upload.js

@@ -101,6 +101,7 @@ export async function buildLocalAmbientEnvelope(options = {}) {
         collector_version: LOCAL_COLLECTOR_VERSION,
         session_reference: sanitizeSessionReference(session),
         work_context: uploadWorkContext,
+        worktree_inventory: options.worktreeInventory ?? [],
         source_scan_results: sanitizeSourceScanResults(sourceCollection.scans, repoLabel),
         events,
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bli-cockpit/cli",
-  "version": "0.1.28",
+  "version": "0.1.29",
   "private": false,
   "type": "module",
   "bin": {
@@ -26,6 +26,6 @@
     "test": "node dist/cli.js --help && node ../../scripts/assert-public-package-pack.mjs --workspace=@bli-cockpit/cli"
   },
   "dependencies": {
-    "@bli-cockpit/telemetry-core": "0.1.8"
+    "@bli-cockpit/telemetry-core": "0.1.9"
   }
 }