ctxr-cli 0.32.0 → 0.33.0

package/dist/version.d.ts

@@ -1,5 +1,5 @@
 /** Kept in sync with package.json's "version" field. */
-export declare const CLI_VERSION = "0.32.0";
+export declare const CLI_VERSION = "0.33.0";
 /**
  * The npm package this executable is published as. Bound here, beside the
  * version, because the release check resolves the latest published release by

package/dist/version.js

@@ -1,5 +1,5 @@
 /** Kept in sync with package.json's "version" field. */
-export const CLI_VERSION = '0.32.0';
+export const CLI_VERSION = '0.33.0';
 /**
  * The npm package this executable is published as. Bound here, beside the
  * version, because the release check resolves the latest published release by

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ctxr-cli",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "description": "Context store for AI coding agents — markdown and git, catalog and graph retrieval, no vector database.",
   "type": "module",
   "license": "MIT",

package/templates/skills/ctxr-capture-circleback/sweep.mjs

@@ -73,7 +73,17 @@ function recentMeetings() {
   return meetings.sort((a, b) => a.createdAt.localeCompare(b.createdAt));
 }
 
-/** Circleback ids already in the default branch, and in each open pull request's diff. */
+/** Where the runner keeps its review worktree: a fixed path, so a later run finds and clears it. */
+function reviewWorktreePath(root) {
+  return path.join(tmpdir(), `ctxr-capture-circleback-${path.basename(root)}`);
+}
+
+/**
+ * Circleback ids already in the default branch, in each open pull request's diff, and in the store's other
+ * local worktrees, tracked or not: an agent's session that captured a meeting but has not pushed yet is work
+ * in flight, not a gap. The runner's own review worktree is left out, or what an earlier run rendered there
+ * would count as present and a meeting whose pull request was closed unmerged could never be captured again.
+ */
 function presence(root, settings) {
   run('git', ['fetch', '-q', 'origin'], { cwd: root });
   const onMain = new Set(
@@ -87,7 +97,19 @@ function presence(root, settings) {
     const diff = run('gh', ['pr', 'diff', String(pr.number)], { cwd: root, check: false });
     for (const match of diff.matchAll(/circleback\/([A-Za-z0-9_-]+)/g)) if (!inPullRequest.has(match[1])) inPullRequest.set(match[1], pr.number);
   }
-  return { onMain, inPullRequest };
+  const inWorktree = new Map();
+  const own = path.resolve(reviewWorktreePath(root));
+  for (const entry of run('git', ['worktree', 'list', '--porcelain'], { cwd: root, check: false }).split('\n')) {
+    if (!entry.startsWith('worktree ')) continue;
+    const worktree = entry.slice('worktree '.length);
+    if (path.resolve(worktree) === own) continue;
+    const found = run('git', ['grep', '--untracked', '-I', '-h', '-o', '-E', 'circleback/[A-Za-z0-9_-]+'], { cwd: worktree, check: false });
+    for (const match of found.split('\n').filter(Boolean)) {
+      const id = match.slice('circleback/'.length);
+      if (!onMain.has(id) && !inWorktree.has(id)) inWorktree.set(id, worktree);
+    }
+  }
+  return { onMain, inPullRequest, inWorktree };
 }
 
 /**
@@ -96,7 +118,7 @@ function presence(root, settings) {
  * first, because an agent running unattended may not be allowed to delete it.
  */
 function prepareWorktree(root, settings) {
-  const worktree = path.join(tmpdir(), `ctxr-capture-circleback-${path.basename(root)}`);
+  const worktree = reviewWorktreePath(root);
   run('git', ['worktree', 'remove', '--force', worktree], { cwd: root, check: false });
   rmSync(worktree, { recursive: true, force: true });
   run('git', ['worktree', 'prune'], { cwd: root });
@@ -171,7 +193,7 @@ function main() {
   const settings = JSON.parse(readFileSync(path.join(HERE, 'settings.json'), 'utf8'));
   const root = storeRoot();
   const otherTags = new Set(settings.other_tags);
-  const { onMain, inPullRequest } = presence(root, settings);
+  const { onMain, inPullRequest, inWorktree } = presence(root, settings);
   const meetings = recentMeetings();
   const now = Date.now();
   const ageDays = (meeting) => (now - Date.parse(meeting.createdAt)) / 86_400_000;
@@ -181,13 +203,17 @@ function main() {
   const untagged = [];
   const multiStore = [];
   const declined = [];
+  const unpushed = [];
   let present = 0;
   for (const meeting of meetings) {
     const tags = tagNames(meeting);
     const isLocked = (meeting.notes ?? '').includes(LOCKED_NOTICE);
-    const here = onMain.has(meeting.id) || inPullRequest.has(meeting.id);
+    const here = onMain.has(meeting.id) || inPullRequest.has(meeting.id) || inWorktree.has(meeting.id);
     const others = [...tags].filter((tag) => otherTags.has(tag));
     if (tags.has(settings.tag) && here) present += 1;
+    if (tags.has(settings.tag) && inWorktree.has(meeting.id) && !onMain.has(meeting.id) && !inPullRequest.has(meeting.id)) {
+      unpushed.push(`${line(meeting)} (in ${inWorktree.get(meeting.id)})`);
+    }
     if (tags.size === 0 && !here) untagged.push(`${line(meeting)}${isLocked ? ' (locked)' : ageDays(meeting) >= URGENT_DAYS ? ' (URGENT, locks soon)' : ''}`);
     if (tags.has(settings.tag) && others.length > 0) multiStore.push(`${line(meeting)} (also ${others.join(', ')})`);
     if (tags.has(settings.decline_tag) && ageDays(meeting) <= DECLINE_REPORT_DAYS) declined.push(line(meeting));
@@ -197,7 +223,7 @@ function main() {
   }
 
   const report = [
-    `Store tag \`${settings.tag}\`. Meetings in the last ${LOOKBACK_DAYS} days: ${meetings.length}. Already in this store or an open pull request: ${present}.`,
+    `Store tag \`${settings.tag}\`. Meetings in the last ${LOOKBACK_DAYS} days: ${meetings.length}. Already in this store, an open pull request or a local worktree: ${present}.`,
     ...section('TO CAPTURE — date | id | title', owed.map(line)),
   ];
   if (owed.length > 0) {
@@ -214,6 +240,7 @@ function main() {
     }
   }
   report.push(
+    ...section('UNPUSHED — captured in a local worktree but not on the default branch or in an open pull request; land that work', unpushed),
     ...section(`LOCKED — tagged \`${settings.tag}\`, never captured, no longer readable in full`, locked),
     ...section('UNTAGGED', untagged),
     ...section('TAGGED FOR MORE THAN ONE STORE', multiStore),

package/templates/skills/ctxr-capture-circleback.md

@@ -17,12 +17,13 @@ It needs Circleback's command-line tool (`cb`) signed in, plus `git` and `gh`. A
 start and puts its report in your prompt; then skip to step 2.
 
 The runner reads every meeting from the last 35 days with its tags, and compares them with this store's default
-branch and its open pull requests. A meeting is owed when it carries this store's tag, does not carry the decline
-tag, carries no other store's tag, is not already in the store or an open pull request, and can still be read in
-full. For each owed meeting it prepares a review-branch worktree and writes the record into `__INBOX_PATH__` there:
-the meeting's metadata and attendees, Circleback's action items and summary (marked as the service's derivation),
-and the transcript verbatim, with `source_type` and `source_id` stamped. It never writes the recording URL, which is
-a signed, expiring link and so a credential.
+branch, its open pull requests, and the store's other local worktrees, uncommitted files included. A meeting is owed
+when it carries this store's tag, does not carry the decline tag, carries no other store's tag, is in none of those
+places, and can still be read in full. A meeting found only in a local worktree is someone's capture in flight: it
+is listed under UNPUSHED rather than captured again. For each owed meeting it prepares a review-branch worktree and
+writes the record into `__INBOX_PATH__` there: the meeting's metadata and attendees, Circleback's action items and
+summary (marked as the service's derivation), and the transcript verbatim, with `source_type` and `source_id`
+stamped. It never writes the recording URL, which is a signed, expiring link and so a credential.
 
 The report is authoritative. Do not work the list out again yourself, and do not rebuild the files it wrote. If it
 prints `COLLECTION FAILED`, report that line and stop.
@@ -52,6 +53,8 @@ Give the counts (retrieved, already present), the pull request link, and the run
 they are:
 
 - **LOCKED**: tagged for this store but no longer readable in full, so it cannot be captured.
+- **UNPUSHED**: captured in a local worktree but not yet on the default branch or in a pull request. That work
+  needs landing; nothing here captures it again.
 - **UNTAGGED**, **TAGGED FOR MORE THAN ONE STORE** and **DECLINED IN THE LAST 8 DAYS**, when the runner prints them.
 
 If nothing was owed and every section is empty, say "Nothing missing".