@nurix/etna 0.19.45 → 0.19.46

package/data/harness-index.json

@@ -1,5 +1,5 @@
 {
-    "fingerprint": "8a30d3130f63",
+    "fingerprint": "efebb48c460d",
     "harnesses": {
         "apollo": {
             "plugin": "apollo",

package/data/harnesses/apollo/harness.json

@@ -14,5 +14,5 @@
     "docs/history/backlog.md",
     "docs/memory/main.md"
   ],
-  "digest": "544ba9e97120"
+  "digest": "25bb37bef74c"
 }

package/data/harnesses/apollo/hooks/awareness.mjs

@@ -123,6 +123,14 @@ function driftBanner(projectDir) {
   const waivers = unexpiredWaivers(queueRows, "dead-glob", today());
   const unwaivedDead = dead.filter((d) => !waivers.some((w) => w.body.includes(d.glob)));
 
+  // A queued dead-glob row covered by an unexpired waiver is resolved history — drop it,
+  // so waiving a finding class actually empties the rows it supersedes.
+  resolveRows(projectDir, (row) => {
+    if (row.kind !== "auto" || !row.body.includes("dead-glob")) return false;
+    const m = /`([^`]+)`/.exec(row.body);
+    return !!m && waivers.some((w) => w.body.includes(`\`${m[1]}\``));
+  });
+
   // Docs older than the code they own (doc mtime < newest owned-file mtime).
   const staleDocs = [];
   for (const entry of scanFeatureDocs(projectDir)) {
@@ -313,7 +321,9 @@ function detectorForFile(projectDir, rel, meta, rows) {
 
 function detectRenames(projectDir, command, meta, rows) {
   if (!/\bgit mv\b|\bmv\b/.test(command || "")) return;
+  const waivers = unexpiredWaivers(readQueue(projectDir), "dead-glob", today());
   for (const { glob, doc } of deadGlobs(projectDir)) {
+    if (waivers.some((w) => w.body.includes(`\`${glob}\``))) continue;
     rows.push(
       formatAutoRow({
         ...meta,

package/data/harnesses/apollo/hooks/compliance.mjs

@@ -232,7 +232,8 @@ function bashGate(projectDir, command, sessionId) {
     return commitGate(projectDir);
   }
 
-  if (statement(String.raw`git\s+(checkout\s+-b|switch\s+-c|branch\s+\S+|worktree\s+add)\b`).test(command)) {
+  // `git branch <name>` creates; flag-led forms (--show-current, --list, -d, -vv) query or manage
+  if (statement(String.raw`git\s+(checkout\s+-b|switch\s+-c|branch\s+(?!-)\S+|worktree\s+add)`).test(command)) {
     return askOnce(
       projectDir,
       sessionId,
@@ -290,12 +291,17 @@ function plansCompletedThisSession(projectDir) {
 function stopGate(projectDir, payload) {
   if (payload.stop_hook_active) return null; // the runtime's infinite-loop guard — never re-block
 
-  const counts = countRows(readQueue(projectDir));
+  // The Stop wall is scoped to this session's own rows (plus sid-less ones) — a concurrent
+  // session's open work must not block this one's stop. The commit wall stays global.
+  const mine = readQueue(projectDir).filter(
+    (row) => !/\bsid=/.test(row.body) || row.body.includes(`sid=${payload.session_id}`)
+  );
+  const counts = countRows(mine);
   if (counts.unresolved > 0 && !bookkeeperDispatched(payload.transcript_path)) {
     return {
       decision: "block",
       reason:
-        `${counts.unresolved} unresolved bookkeeping rows (${counts.auto} auto, ${counts.note} note, ${counts.needsSession} needs-session) in docs/operations/bookkeeping.md. ` +
+        `${counts.unresolved} unresolved bookkeeping rows from this session (${counts.auto} auto, ${counts.note} note, ${counts.needsSession} needs-session) in docs/operations/bookkeeping.md. ` +
         "Dispatch the `bookkeeper` agent to drain them, resolve them now, or convert to `waived:` rows with reason + expiry. " +
         "If implementation of the open plan is complete, also report it and offer the verification gate — never run it unbidden.",
     };

package/data/harnesses/apollo/hooks/lib/state.mjs

@@ -1,8 +1,8 @@
 // harness/code/hooks/lib/state.mjs — the bookkeeping queue (docs/operations/bookkeeping.md) and the
 // machine-local state dir (.claude/state/). The row grammar is the contract between the awareness
 // detector (writer), the bookkeeper agent (drain), the compliance gates (walls), and CI (backstop):
-//   - auto: {YYYY-MM-DD} · {finding-kind} · {description} → {action} | sid={session_id} tp={transcript_path} ts={ISO}
-//   - note: {YYYY-MM-DD} · {area} · {context} → lands-in: {owning doc | backlog | memory} | sid=… tp=… ts=…
+//   - auto: {YYYY-MM-DD} · {finding-kind} · {description} → {action} | sid={session_id}
+//   - note: {YYYY-MM-DD} · {area} · {context} → lands-in: {owning doc | backlog | memory} | sid=…
 //   - needs-session: {YYYY-MM-DD} · {what could not be grounded} → main session resolves | refs={ts}
 //   - waived: {YYYY-MM-DD} · {what is deferred} · reason: {why} → expires={YYYY-MM-DD}
 // Unresolved = auto + note + needs-session. waived: rows are resolved history until expires= passes.
@@ -57,9 +57,10 @@ export function countRows(rows) {
   return c;
 }
 
-// Format one auto: row per the grammar; sid/tp/ts come from the hook payload.
-export function formatAutoRow({ date, kind, description, action, sessionId, transcriptPath, ts }) {
-  return `- auto: ${date} · ${kind} · ${description} → ${action} | sid=${sessionId || "-"} tp=${transcriptPath || "-"} ts=${ts || "-"}`;
+// Format one auto: row per the grammar; the sid tail is the only provenance kept —
+// a transcript path or timestamp is machine noise in a PR-reviewed queue.
+export function formatAutoRow({ date, kind, description, action, sessionId }) {
+  return `- auto: ${date} · ${kind} · ${description} → ${action} | sid=${sessionId || "-"}`;
 }
 
 // Append rows to the queue, creating the file with its genre header when absent.

package/data/harnesses/code/harness.json

@@ -8,5 +8,5 @@
     ".vscode/settings.json"
   ],
   "seeds": [],
-  "digest": "132494301fd0"
+  "digest": "9074f75982ad"
 }

package/data/harnesses/code/hooks/awareness.mjs

@@ -123,6 +123,14 @@ function driftBanner(projectDir) {
   const waivers = unexpiredWaivers(queueRows, "dead-glob", today());
   const unwaivedDead = dead.filter((d) => !waivers.some((w) => w.body.includes(d.glob)));
 
+  // A queued dead-glob row covered by an unexpired waiver is resolved history — drop it,
+  // so waiving a finding class actually empties the rows it supersedes.
+  resolveRows(projectDir, (row) => {
+    if (row.kind !== "auto" || !row.body.includes("dead-glob")) return false;
+    const m = /`([^`]+)`/.exec(row.body);
+    return !!m && waivers.some((w) => w.body.includes(`\`${m[1]}\``));
+  });
+
   // Docs older than the code they own (doc mtime < newest owned-file mtime).
   const staleDocs = [];
   for (const entry of scanFeatureDocs(projectDir)) {
@@ -313,7 +321,9 @@ function detectorForFile(projectDir, rel, meta, rows) {
 
 function detectRenames(projectDir, command, meta, rows) {
   if (!/\bgit mv\b|\bmv\b/.test(command || "")) return;
+  const waivers = unexpiredWaivers(readQueue(projectDir), "dead-glob", today());
   for (const { glob, doc } of deadGlobs(projectDir)) {
+    if (waivers.some((w) => w.body.includes(`\`${glob}\``))) continue;
     rows.push(
       formatAutoRow({
         ...meta,

package/data/harnesses/code/hooks/compliance.mjs

@@ -232,7 +232,8 @@ function bashGate(projectDir, command, sessionId) {
     return commitGate(projectDir);
   }
 
-  if (statement(String.raw`git\s+(checkout\s+-b|switch\s+-c|branch\s+\S+|worktree\s+add)\b`).test(command)) {
+  // `git branch <name>` creates; flag-led forms (--show-current, --list, -d, -vv) query or manage
+  if (statement(String.raw`git\s+(checkout\s+-b|switch\s+-c|branch\s+(?!-)\S+|worktree\s+add)`).test(command)) {
     return askOnce(
       projectDir,
       sessionId,
@@ -290,12 +291,17 @@ function plansCompletedThisSession(projectDir) {
 function stopGate(projectDir, payload) {
   if (payload.stop_hook_active) return null; // the runtime's infinite-loop guard — never re-block
 
-  const counts = countRows(readQueue(projectDir));
+  // The Stop wall is scoped to this session's own rows (plus sid-less ones) — a concurrent
+  // session's open work must not block this one's stop. The commit wall stays global.
+  const mine = readQueue(projectDir).filter(
+    (row) => !/\bsid=/.test(row.body) || row.body.includes(`sid=${payload.session_id}`)
+  );
+  const counts = countRows(mine);
   if (counts.unresolved > 0 && !bookkeeperDispatched(payload.transcript_path)) {
     return {
       decision: "block",
       reason:
-        `${counts.unresolved} unresolved bookkeeping rows (${counts.auto} auto, ${counts.note} note, ${counts.needsSession} needs-session) in docs/operations/bookkeeping.md. ` +
+        `${counts.unresolved} unresolved bookkeeping rows from this session (${counts.auto} auto, ${counts.note} note, ${counts.needsSession} needs-session) in docs/operations/bookkeeping.md. ` +
         "Dispatch the `bookkeeper` agent to drain them, resolve them now, or convert to `waived:` rows with reason + expiry. " +
         "If implementation of the open plan is complete, also report it and offer the verification gate — never run it unbidden.",
     };

package/data/harnesses/code/hooks/lib/state.mjs

@@ -1,8 +1,8 @@
 // harness/code/hooks/lib/state.mjs — the bookkeeping queue (docs/operations/bookkeeping.md) and the
 // machine-local state dir (.claude/state/). The row grammar is the contract between the awareness
 // detector (writer), the bookkeeper agent (drain), the compliance gates (walls), and CI (backstop):
-//   - auto: {YYYY-MM-DD} · {finding-kind} · {description} → {action} | sid={session_id} tp={transcript_path} ts={ISO}
-//   - note: {YYYY-MM-DD} · {area} · {context} → lands-in: {owning doc | backlog | memory} | sid=… tp=… ts=…
+//   - auto: {YYYY-MM-DD} · {finding-kind} · {description} → {action} | sid={session_id}
+//   - note: {YYYY-MM-DD} · {area} · {context} → lands-in: {owning doc | backlog | memory} | sid=…
 //   - needs-session: {YYYY-MM-DD} · {what could not be grounded} → main session resolves | refs={ts}
 //   - waived: {YYYY-MM-DD} · {what is deferred} · reason: {why} → expires={YYYY-MM-DD}
 // Unresolved = auto + note + needs-session. waived: rows are resolved history until expires= passes.
@@ -57,9 +57,10 @@ export function countRows(rows) {
   return c;
 }
 
-// Format one auto: row per the grammar; sid/tp/ts come from the hook payload.
-export function formatAutoRow({ date, kind, description, action, sessionId, transcriptPath, ts }) {
-  return `- auto: ${date} · ${kind} · ${description} → ${action} | sid=${sessionId || "-"} tp=${transcriptPath || "-"} ts=${ts || "-"}`;
+// Format one auto: row per the grammar; the sid tail is the only provenance kept —
+// a transcript path or timestamp is machine noise in a PR-reviewed queue.
+export function formatAutoRow({ date, kind, description, action, sessionId }) {
+  return `- auto: ${date} · ${kind} · ${description} → ${action} | sid=${sessionId || "-"}`;
 }
 
 // Append rows to the queue, creating the file with its genre header when absent.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nurix/etna",
-    "version": "0.19.45",
+    "version": "0.19.46",
     "description": "Bootstrap a project with a Nurix harness — copies the harness's CLAUDE.md, skills, agents, rules, and hooks directly into the project from a bundled payload (no marketplace fetch, no network).",
     "type": "module",
     "bin": {
@@ -19,6 +19,7 @@
         "node": ">=18.0.0"
     },
     "scripts": {
+        "test": "node --test 'tests/**/*.test.mjs'",
         "build:data": "node scripts/build-data.js",
         "prepack": "node scripts/build-data.js",
         "validate:codex-agents": "node lib/codex/validate-codex-agents.mjs"
@@ -41,5 +42,5 @@
         "agent",
         "plugin"
     ],
-    "etnaFingerprint": "8a30d3130f63"
+    "etnaFingerprint": "efebb48c460d"
 }