@akagilnc/pi-workflow-roles 0.1.2120 → 0.1.2124

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akagilnc/pi-workflow-roles",
-  "version": "0.1.2120",
+  "version": "0.1.2124",
   "description": "Soul-bound workflow roles for Pi",
   "type": "module",
   "license": "Apache-2.0",

package/src/public-cli/invocation.ts

@@ -412,19 +412,17 @@ export type ParseMergerArgvResult = {
 };
 
 /**
- * #336/#337/#338 taishi public argv — four faces on one registration seam.
- * - issue (default): ticket N and/or project-root P
+ * #336/#337/#338/#399 taishi public argv — three live faces on one registration seam.
+ * - issue (default): bare whole-book or --ticket N (cwd git common-dir)
  * - sweep (#337): optional positional `sweep` and/or --attach paths;
  *   sweep payload rides exactly one typed JSON attachment (not argv/stdin)
  * - cohort: two labeled issue-number groups
- * - model-groups: one or more project-root scope keys
+ * --project-root deleted; --model-groups public face disabled (library kernel retained).
  */
 export type ParseTaishiIssueArgv = {
   readonly query: "issue";
   /** Caller ticket / issue number face (#176 numbering space). */
   readonly ticket?: number;
-  /** Direct projectRoot mechanical key (ADR 0068). */
-  readonly projectRoot?: string;
 };
 
 export type ParseTaishiSweepArgv = {
@@ -444,16 +442,10 @@ export type ParseTaishiCohortArgv = {
   ];
 };
 
-export type ParseTaishiModelGroupsArgv = {
-  readonly query: "model-groups";
-  readonly projectRoots: readonly string[];
-};
-
 export type ParseTaishiArgvResult =
   | ParseTaishiIssueArgv
   | ParseTaishiSweepArgv
-  | ParseTaishiCohortArgv
-  | ParseTaishiModelGroupsArgv;
+  | ParseTaishiCohortArgv;
 
 /** Honest activation-class failure while deriving the active-merge envelope. */
 export class MergerEnvelopeDerivationError extends Error {
@@ -2271,13 +2263,6 @@ export function parseTaishiArgv(args: readonly string[]): ParseTaishiArgvResult
         pushValue("ticket", taken.value);
         continue;
       }
-      if (taken.def.id === "project-root") {
-        pushValue(
-          "project-root",
-          requireOptionPath(taken.def.canonical, taken.value),
-        );
-        continue;
-      }
       if (taken.def.id === "attach") {
         pushValue(
           "attach",
@@ -2308,6 +2293,20 @@ export function parseTaishiArgv(args: readonly string[]): ParseTaishiArgvResult
       throw new CliUsageError(`unknown taishi option: ${taken.def.canonical}`);
     }
     const token = tokens.shift()!;
+    // #399: deleted --project-root; disabled --model-groups public face.
+    if (isRejectedPublicSpelling("taishi", token)) {
+      if (token === "--project-root" || token.startsWith("--project-root=")) {
+        throw new CliUsageError(
+          "taishi no longer accepts --project-root (deleted); use bare call for whole book or --ticket N (cwd git common-dir selects the book)",
+        );
+      }
+      if (token === "--model-groups" || token.startsWith("--model-groups=")) {
+        throw new CliUsageError(
+          "taishi --model-groups public CLI face is disabled; input face is being redesigned for multi-issue comparison (see follow-up ticket)",
+        );
+      }
+      throw new CliUsageError(`unknown taishi option: ${token}`);
+    }
     if (token.startsWith("-") && token !== "-") {
       throw new CliUsageError(`unknown taishi option: ${token}`);
     }
@@ -2351,13 +2350,6 @@ export function parseTaishiArgv(args: readonly string[]): ParseTaishiArgvResult
     };
   }
 
-  if (mode === "model-groups") {
-    return {
-      query: "model-groups",
-      projectRoots: valueLists.get("project-root") ?? [],
-    };
-  }
-
   if (mode === "sweep") {
     return {
       query: "sweep",
@@ -2366,12 +2358,10 @@ export function parseTaishiArgv(args: readonly string[]): ParseTaishiArgvResult
   }
 
   const ticketRaw = valueLists.get("ticket")?.[0];
-  const projectRoot = valueLists.get("project-root")?.[0];
   return {
     query: "issue",
     ...(ticketRaw === undefined
       ? {}
       : { ticket: parseTaishiTicketNumber(ticketRaw) }),
-    ...(projectRoot === undefined ? {} : { projectRoot }),
   };
 }

package/src/public-cli/option-definitions.ts

@@ -13,8 +13,8 @@
 
 import { CliUsageError } from "./cli-errors.ts";
 
-/** Taishi query faces (#336/#337/#338). */
-export type TaishiMode = "issue" | "sweep" | "cohort" | "model-groups";
+/** Taishi public query faces (#336/#337/#338/#399). model-groups CLI face disabled (library kernel retained). */
+export type TaishiMode = "issue" | "sweep" | "cohort";
 
 /** Coder/Fixer public phase tokens. */
 export type RolePhase = "plan" | "apply";
@@ -62,11 +62,10 @@ export type PublicOptionDefinition = {
   /** Modes in which this option is required (taishi conditional requiredness). */
   readonly requiredInModes?: readonly TaishiMode[];
   /**
-   * Other option ids on the same owner that cannot co-occur
-   * (e.g. cohort × model-groups).
+   * Other option ids on the same owner that cannot co-occur.
    */
   readonly exclusiveWith?: readonly string[];
-  /** Per-mode maximum occurrences (issue `--project-root` ≤ 1). */
+  /** Per-mode maximum occurrences. */
   readonly maxCountByMode?: Readonly<Partial<Record<TaishiMode, number>>>;
   /**
    * When this option (or positional) is present it activates this mode.
@@ -85,10 +84,11 @@ export type TaishiRequireAnyOfRule = {
   readonly optionIds: readonly string[];
 };
 
-/** Issue face: ticket | project-root at least one. */
-export const TAISHI_REQUIRE_ANY_OF = [
-  { mode: "issue", optionIds: ["ticket", "project-root"] },
-] as const satisfies readonly TaishiRequireAnyOfRule[];
+/**
+ * Cross-field at-least-one rules for taishi modes.
+ * #399: issue bare call is lawful (whole book from cwd) — no require-any-of on issue.
+ */
+export const TAISHI_REQUIRE_ANY_OF: readonly TaishiRequireAnyOfRule[] = [];
 
 /** Residual taishi mode when no `selectsMode` option is present. */
 export const TAISHI_DEFAULT_MODE: TaishiMode = "issue";
@@ -107,7 +107,6 @@ export function resolveTaishiMode(
   }
   if (selected.size === 0) return TAISHI_DEFAULT_MODE;
   if (selected.has("cohort")) return "cohort";
-  if (selected.has("model-groups")) return "model-groups";
   if (selected.has("sweep")) return "sweep";
   if (selected.has("issue")) return "issue";
   return TAISHI_DEFAULT_MODE;
@@ -181,13 +180,6 @@ export function evaluateTaishiModeOptionContract(
           "usage: ak-role taishi --cohort --group-a-label <L> --group-a-issues <N[,N...]> --group-b-label <L> --group-b-issues <N[,N...]",
       };
     }
-    if (mode === "model-groups") {
-      return {
-        ok: false,
-        message:
-          "usage: ak-role taishi --model-groups --project-root <P> [--project-root <P> ...]",
-      };
-    }
     return {
       ok: false,
       message: `usage: ak-role taishi ${mode} requires ${missingRequired
@@ -205,7 +197,7 @@ export function evaluateTaishiModeOptionContract(
       return {
         ok: false,
         message:
-          "usage: ak-role taishi ((--ticket <N> | --project-root <P>) | [sweep] --attach <sweep.json> | --cohort ... | --model-groups ...)",
+          "usage: ak-role taishi ([--ticket <N>] | [sweep] --attach <sweep.json> | --cohort ...)",
       };
     }
     const flags = rule.optionIds
@@ -247,6 +239,22 @@ export const REJECTED_PUBLIC_SPELLINGS = [
       zh: "校书郎 input packet 由内部装配，不是公开旗标。",
     },
   },
+  {
+    owner: "taishi",
+    spellings: ["--project-root"],
+    reason: {
+      en: "Deleted (#399). taishi no longer accepts --project-root; use bare call for whole book or --ticket N (cwd git common-dir selects the book).",
+      zh: "已删除（#399）。taishi 不再接受 --project-root；裸调用=整簿，或 --ticket N（cwd git common-dir 定簿）。",
+    },
+  },
+  {
+    owner: "taishi",
+    spellings: ["--model-groups"],
+    reason: {
+      en: "Public CLI face disabled (#399). Input face is being redesigned for multi-issue comparison (see follow-up ticket). Library kernel retained.",
+      zh: "公开 CLI 面已停用（#399）。输入面按多 issue 重设计中（见后续票）。聚合内核保留。",
+    },
+  },
 ] as const satisfies readonly RejectedSpelling[];
 
 const GLOBAL_OPTIONS = [
@@ -311,8 +319,8 @@ const GLOBAL_OPTIONS = [
 /**
  * Immutable shared semantics for the common ledger `--project` face.
  * Role rows bind owner only — do not copy these fields per role.
- * Role-specific project faces (merger merge-root; taishi `--project-root`)
- * stay explicit below and must not use this binding.
+ * Role-specific project faces (merger merge-root) stay explicit below and
+ * must not use this binding. taishi `--project-root` is deleted (#399).
  */
 const SHARED_PROJECT_SEMANTICS = {
   id: "project",
@@ -565,23 +573,6 @@ const TAISHI_OPTIONS = [
       zh: "可选 sweep 模式词元（至多一次；不得夹带其他 positional）。",
     },
   },
-  {
-    id: "project-root",
-    owner: "taishi",
-    canonical: "--project-root",
-    aliases: [],
-    valueMetavar: "path",
-    required: false,
-    repeatable: true,
-    form: "option",
-    modes: ["issue", "model-groups"],
-    requiredInModes: ["model-groups"],
-    maxCountByMode: { issue: 1 },
-    description: {
-      en: "Project-root scope key. Issue: at most one (with --ticket at least one of the two). Model-groups: one or more required.",
-      zh: "projectRoot 范围键。issue：至多一个（与 --ticket 至少居其一）。model-groups：一个或多个且必填。",
-    },
-  },
   {
     id: "ticket",
     owner: "taishi",
@@ -593,8 +584,8 @@ const TAISHI_OPTIONS = [
     form: "option",
     modes: ["issue"],
     description: {
-      en: "Ticket/issue number for issue mode (with --project-root at least one of the two).",
-      zh: "issue 模式的票号（与 --project-root 至少居其一）。",
+      en: "Ticket/issue number; live filter by invocation.ticketNumber inside the cwd book (git common-dir). Bare call = whole book. No library-index bootstrap.",
+      zh: "票号；在 cwd 候簿（git common-dir）内按 invocation.ticketNumber 现取现算。裸调用=整簿。不依赖 library-index 自举。",
     },
   },
   {
@@ -625,28 +616,10 @@ const TAISHI_OPTIONS = [
     repeatable: false,
     form: "option",
     modes: ["cohort"],
-    exclusiveWith: ["model-groups"],
     selectsMode: "cohort",
     description: {
-      en: "Select cohort mode (mutually exclusive with --model-groups).",
-      zh: "选择 cohort 模式（与 --model-groups 互斥）。",
-    },
-  },
-  {
-    id: "model-groups",
-    owner: "taishi",
-    canonical: "--model-groups",
-    aliases: [],
-    valueMetavar: null,
-    required: false,
-    repeatable: false,
-    form: "option",
-    modes: ["model-groups"],
-    exclusiveWith: ["cohort"],
-    selectsMode: "model-groups",
-    description: {
-      en: "Select model-groups mode (mutually exclusive with --cohort).",
-      zh: "选择 model-groups 模式（与 --cohort 互斥）。",
+      en: "Select cohort mode.",
+      zh: "选择 cohort 模式。",
     },
   },
   {
@@ -1097,14 +1070,14 @@ const ROLE_COMMAND_HELP = {
   },
   taishi: {
     command: "taishi",
-    summary: "Deterministic analysis seat (issue / sweep / cohort / model-groups).",
+    summary: "Deterministic analysis seat (issue / sweep / cohort).",
     usage: [
-      "ak-role taishi (--ticket <N> | --project-root <P>) [options]",
+      "ak-role taishi [--ticket <N>]",
       "ak-role taishi [sweep] --attach <path>",
       "ak-role taishi --cohort --group-a-label <L> --group-a-issues <N[,N...]> --group-b-label <L> --group-b-issues <N[,N...]>",
-      "ak-role taishi --model-groups --project-root <P> [--project-root <P> ...]",
     ],
     examples: [
+      "ak-role taishi",
       "ak-role taishi --ticket 125",
       "ak-role taishi sweep --attach ./sweep.json",
     ],

package/src/public-cli/taishi-run.ts

@@ -1,11 +1,13 @@
 /**
- * Public taishi adapter (#336/#337/#338): argv → typed query → runTaishi family.
+ * Public taishi adapter (#336/#337/#338/#399): argv → typed query → runTaishi family.
  * Deterministic analysis seat — no Pi runner, no admission lease.
  * Reuses existing CLI failure envelope (CliUsageError + structural reject +
  * ControlledFailure).
- * Index read reuses readTaishiLibraryIndexPage / findTaishiLibraryIndexRow.
+ * #399: issue query = book (cwd git common-dir) × optional --ticket N.
+ *   Bare call = whole book; --project-root deleted; --model-groups public face disabled;
+ *   no library-index bootstrap. Library model-groups kernel retained for follow-up.
  * #337 sweep: exactly one typed JSON attachment → TaishiSweepModeInput → #329 kernel.
- * #338: three query faces; sync compute-if-missing; whole-compute failure →
+ * #338: issue/cohort (+ library model-groups); sync compute-if-missing; whole-compute failure →
  * ControlledFailure terminal (code/projectRoot/issueNumber/real cause).
  * "Unobtrusive" binds #337 merge auto-trigger only, not this user-initiated query.
  */
@@ -13,16 +15,16 @@ import { readFile } from "node:fs/promises";
 import { isAbsolute, resolve } from "node:path";
 import { Value } from "typebox/value";
 
+import {
+  ActivationGitRepositoryRequiredError,
+  resolveBookKeyFromGit,
+} from "../activation-ledger-git.ts";
 import {
   errnoCode,
   physicalPathIdentity,
   resolveActivationLedgerHome,
 } from "../activation-ledger-topology.ts";
 import { exactUtf8 } from "../exact-utf8.ts";
-import {
-  findTaishiLibraryIndexRow,
-  readTaishiLibraryIndexPage,
-} from "../taishi-index.ts";
 import {
   readOrComputeTaishiIssuePage,
   runTaishi,
@@ -44,58 +46,52 @@ export type TaishiRunEnv = {
 };
 
 /**
- * Build the sole library issue-mode input from public argv faces.
- * - ticket N → issueNumber = ticketNumber = N; projectRoot from index (or project-root fallback).
- * - project-root P → direct mechanical key.
- * - both + index hit → index projectRoot wins; when direct root differs, retain it as
- *   conflictingProjectRoot so runTaishi records the C4 dual-param conflict fact on the page.
- * - both + index miss → project-root fallback.
- * Bare both-missing is owned by parseTaishiArgv — no second reject here.
+ * Resolve the issue-query book from cwd git common-dir (same owner as record layer).
+ * Non-git cwd fails loud — bare / --ticket both require a book identity.
+ */
+export function resolveTaishiIssueBookKeyFromCwd(cwd: string = process.cwd()): string {
+  try {
+    return resolveBookKeyFromGit(cwd);
+  } catch (error) {
+    if (error instanceof ActivationGitRepositoryRequiredError) {
+      throw new CliUsageError(
+        "taishi issue query requires a git repository cwd (book = git common-dir); run inside a repository (bare = whole book, or --ticket N)",
+        { cause: error },
+      );
+    }
+    throw error;
+  }
+}
+
+/**
+ * Build the sole library issue-mode input from public argv faces (#399).
+ * - bare → whole book from cwd git common-dir
+ * - --ticket N → issueNumber = ticketNumber = N inside that book (strict; no index)
+ * - --project-root rejected at parse (deleted unconditionally)
  */
 export async function buildTaishiIssueModeInputFromPublicArgv(
   parsed: ParseTaishiIssueArgv,
-  ledgerHome: string,
+  _ledgerHome: string,
 ): Promise<TaishiIssueModeInput> {
+  const cwd = process.cwd();
+  const bookKey = resolveTaishiIssueBookKeyFromCwd(cwd);
+  const projectRoot = physicalPathIdentity(cwd);
   const ticket = parsed.ticket;
-  const directRoot = parsed.projectRoot;
 
   if (ticket === undefined) {
     return {
       mode: "issue",
-      projectRoot: directRoot!,
+      bookKey,
+      projectRoot,
     };
   }
 
-  // ticket N = issueNumber (no conversion); also the C4 typed ticket face.
-  const index = await readTaishiLibraryIndexPage(ledgerHome);
-  const row = findTaishiLibraryIndexRow(index, ticket);
-
-  let projectRoot: string;
-  if (row !== undefined) {
-    // Ticket-resolved index projectRoot wins over any concurrent --project-root.
-    projectRoot = row.projectRoot;
-  } else if (directRoot !== undefined) {
-    // Index miss with project-root fallback (ticket faces still set for C4).
-    projectRoot = directRoot;
-  } else {
-    throw new CliUsageError(
-      `taishi library index has no row for ticket ${ticket}`,
-    );
-  }
-
-  // Dual-param conflict: index root won, but caller also supplied a distinct --project-root.
-  // Carry the losing root so the metrics page records the call-face conflict fact.
-  const dualParamConflict =
-    row !== undefined
-    && directRoot !== undefined
-    && physicalPathIdentity(directRoot) !== physicalPathIdentity(projectRoot);
-
   return {
     mode: "issue",
+    bookKey,
     projectRoot,
     ticketNumber: ticket,
     issueNumber: ticket,
-    ...(dualParamConflict ? { conflictingProjectRoot: directRoot } : {}),
   };
 }
 
@@ -164,7 +160,8 @@ export async function buildTaishiSweepModeInputFromAttachmentPaths(
 
 /**
  * Public taishi run path — parse → resolve → query → typed receipt on stdout.
- * Issue (#336/#338 compute-if-missing), sweep (#337), cohort/model-groups (#338).
+ * Issue (#336/#338 compute-if-missing), sweep (#337), cohort (#338).
+ * model-groups public face disabled at parse (#399); library kernel retained.
  */
 export async function runPublicTaishi(
   argv: readonly string[],
@@ -195,15 +192,6 @@ export async function runPublicTaishi(
       return { exitCode: 0 };
     }
 
-    if (parsed.query === "model-groups") {
-      const result = await runTaishi({
-        mode: "model-groups",
-        projectRoots: parsed.projectRoots,
-      });
-      io.stdout(`${JSON.stringify(result, null, 2)}\n`);
-      return { exitCode: 0 };
-    }
-
     // issue query — compute-if-missing (#338); sole kernel on miss.
     const input = await buildTaishiIssueModeInputFromPublicArgv(parsed, ledgerHome);
     const result = await readOrComputeTaishiIssuePage(input);
@@ -224,6 +212,7 @@ export async function runPublicTaishi(
         ...(code === undefined ? {} : { identity: { code } }),
         details: {
           code: error.code,
+          bookKey: error.bookKey,
           projectRoot: error.projectRoot,
           ...(error.issueNumber === undefined ? {} : { issueNumber: error.issueNumber }),
         },

package/src/taishi-cohort.ts

@@ -32,6 +32,7 @@ import type { TaishiAcceptanceSuccessReworkSection } from "./taishi-metric-famil
 export type TaishiIssuePageEnsuring = (input: {
   readonly projectRoot: string;
   readonly issueNumber: number;
+  readonly bookKey?: string;
 }) => Promise<TaishiIssueMetricsPage>;
 
 /** LOC-style optional metric — never encode absence as 0 or Infinity. */
@@ -56,6 +57,7 @@ export type TaishiCohortIssueEntry =
   | {
       readonly issueNumber: number;
       readonly status: "present";
+      readonly bookKey: string;
       readonly projectRoot: string;
     }
   | {
@@ -170,11 +172,13 @@ async function aggregateGroup(
     const page = (await ensureIssuePage({
       projectRoot: row.projectRoot,
       issueNumber,
+      bookKey: row.bookKey,
     })) as TaishiCohortSourcePage;
 
     issueEntries.push({
       issueNumber,
       status: "present",
+      bookKey: row.bookKey,
       projectRoot: row.projectRoot,
     });