@akagilnc/pi-workflow-roles 0.1.2193 → 0.1.2207

package/src/taishi-index.ts

@@ -8,8 +8,11 @@
  * #399 D9: retained solely for cohort (and sweep producers that feed it).
  * Ticket CLI query path must not read this index (no bootstrap prerequisite).
  * Row address includes book identity so cross-book same ticket numbers do not merge (D5).
- * C2 joins cohort groups by issueNumber → page reference. Missing row =
+ * C2 joins cohort groups by (bookKey, issueNumber) → page reference. Missing row =
  * typed vacancy entry — never silent skip, never live recompute.
+ * #412: bare cohort issue numbers resolve inside one book; no cross-book silent find.
+ * Legacy rows lacking bookKey heal via the single shared projectRoot→bookKey rule
+ * (git common-dir when resolvable, else `root:<identity>`) on read/ingest (F1/F3).
  *
  * Multi-process issue/sweep writers coordinate the whole read→upsert→write
  * on one exclusive lock next to the index (atomic rename still prevents torn
@@ -22,7 +25,9 @@ import { writeFileAtomically } from "./atomic-write.ts";
 import {
   assertLedgerFileInsideHome,
   ensureRealDirectoryTree,
+  physicalPathIdentity,
 } from "./activation-ledger-topology.ts";
+import { resolveTaishiBookKey } from "./taishi-book-key.ts";
 import type {
   TaishiIssueMetricsPage,
   TaishiOptionalMetricNumber,
@@ -128,10 +133,27 @@ export function rowFromIssueMetricsPage(
   };
 }
 
+/**
+ * #412 F1/F3: pre-#399 library-index rows omit bookKey. Heal with the single
+ * shared projectRoot→bookKey rule (#399 / ADR 0048) — the same rule the
+ * issue/sweep path uses, never a second resolver.
+ */
+export function normalizeTaishiLibraryIndexRow(
+  row: TaishiLibraryIndexRow,
+): TaishiLibraryIndexRow {
+  const rawBook = (row as { readonly bookKey?: unknown }).bookKey;
+  if (typeof rawBook === "string" && rawBook !== "") {
+    if (rawBook === row.bookKey) return row;
+    return { ...row, bookKey: rawBook };
+  }
+  const projectRoot = physicalPathIdentity(row.projectRoot);
+  return { ...row, projectRoot, bookKey: resolveTaishiBookKey(projectRoot) };
+}
+
 function sortRows(
   rows: readonly TaishiLibraryIndexRow[],
 ): TaishiLibraryIndexRow[] {
-  // Stable book → projectRoot sort (C1 listing). Cohort join is by issueNumber find,
+  // Stable book → projectRoot sort (C1 listing). Cohort join is by (book, issue) find,
   // not row order — issueNumber secondary keeps C2 rows deterministic too.
   return [...rows].sort((a, b) => {
     const byBook = a.bookKey.localeCompare(b.bookKey);
@@ -153,20 +175,24 @@ export function buildTaishiLibraryIndexPage(
 ): TaishiLibraryIndexPage {
   return {
     kind: "taishi-library-index",
-    rows: sortRows(rows),
+    rows: sortRows(rows.map(normalizeTaishiLibraryIndexRow)),
   };
 }
 
 /**
- * Look up the first index row for an issue number.
+ * Look up the index row for (bookKey, issueNumber).
+ * #412: no cross-book silent scan — caller supplies the book (cwd book or book:N).
  * Absence is a lawful cohort vacancy signal — not an error.
  */
 export function findTaishiLibraryIndexRow(
   index: TaishiLibraryIndexPage | undefined,
   issueNumber: number,
+  bookKey: string,
 ): TaishiLibraryIndexRow | undefined {
   if (index === undefined) return undefined;
-  return index.rows.find((row) => row.issueNumber === issueNumber);
+  return index.rows.find(
+    (row) => row.issueNumber === issueNumber && row.bookKey === bookKey,
+  );
 }
 
 /** Row map key: book + root keeps cross-book same-ticket rows distinct (D5). */
@@ -193,6 +219,7 @@ export function upsertTaishiLibraryIndexRows(
   const keyByIssue = new Map<string, string>();
 
   const ingest = (row: TaishiLibraryIndexRow): void => {
+    row = normalizeTaishiLibraryIndexRow(row);
     const key = indexRowKey(row);
     // C2 uniqueness within book: one row per issueNumber — drop prior if number moved.
     if (row.issueNumber !== undefined) {
@@ -230,8 +257,10 @@ export function upsertTaishiLibraryIndexRows(
 
 /**
  * Read existing library index, or undefined when absent.
- * Single typed producer writes this file — JSON.parse failure is loud;
- * no bespoke shape validator on the self-read path.
+ * Single typed producer writes this file — JSON.parse failure is loud; a
+ * syntactically valid but malformed shape (null / non-object / rows not an
+ * array) is rejected at this sole read boundary with the file path and real
+ * shape, so no type assertion lets garbage reach consumers (#413 r2 U1).
  */
 export async function readTaishiLibraryIndexPage(
   ledgerHome: string,
@@ -250,7 +279,23 @@ export async function readTaishiLibraryIndexPage(
     }
     throw error;
   }
-  return JSON.parse(raw) as TaishiLibraryIndexPage;
+  const parsed: unknown = JSON.parse(raw);
+  if (
+    parsed === null
+    || typeof parsed !== "object"
+    || !Array.isArray((parsed as { readonly rows?: unknown }).rows)
+  ) {
+    const shape = parsed === null
+      ? "null"
+      : typeof parsed !== "object"
+      ? typeof parsed
+      : `object with non-array rows (${typeof (parsed as { rows?: unknown }).rows})`;
+    throw new Error(
+      `taishi library-index at ${path} is malformed (${shape}; expected an index page with a rows array) — rejected at the read boundary`,
+    );
+  }
+  // Heal legacy rows at the read boundary so every consumer sees defined bookKey.
+  return buildTaishiLibraryIndexPage((parsed as TaishiLibraryIndexPage).rows);
 }
 
 /**

package/src/taishi-ledger.ts

@@ -401,7 +401,9 @@ async function classifyScopedRun(input: {
 /**
  * Scan ledger home books/<book>/runs for runs in the issue scope.
  * #399: scope = book × optional ticket.
- * - bookKey set → that book only; whole-book when no ticket; ticket filters alone.
+ * - bookKey set → that book only; whole-book when no ticket and no projectRoot;
+ *   ticket filters alone; bookKey + projectRoot (cohort ensure, #412) narrows
+ *   to that root inside the book.
  * - projectRoot without bookKey (sweep/legacy): git-resolved → whole that book;
  *   non-git → path-narrow across books (fixture isolation).
  * Damaged required sources become unreadable exclusions.
@@ -429,8 +431,16 @@ export async function scanTaishiIssueRuns(input: {
 
   if (input.bookKey !== undefined && input.bookKey.trim() !== "") {
     bookNames = [input.bookKey];
-    // CLI book scope: whole book unless ticket filters. Never path-narrow.
-    wholeBook = true;
+    if (input.projectRoot !== undefined) {
+      // Cohort ensure conjunction (#412): the index join already selected the
+      // row — a cache-miss recompute must stay inside this root of this book,
+      // never inhale sibling roots' runs into one issue page.
+      wholeBook = false;
+      scopeRootIdentity = physicalPathIdentity(input.projectRoot);
+    } else {
+      // CLI book scope: whole book unless ticket filters. Never path-narrow.
+      wholeBook = true;
+    }
   } else if (input.projectRoot !== undefined) {
     const resolved = tryResolveBookKeyFromProjectRoot(input.projectRoot);
     if (resolved !== undefined) {