@akagilnc/pi-workflow-roles 0.1.5015 → 0.1.5063

package/src/host-descriptions.ts

@@ -56,9 +56,8 @@ export const HOST_DESCRIPTIONS: Readonly<Record<string, AcpHostDescription>> = O
  * Headless CLI family (#645 / #646). Claude print-mode is the first row;
  * codex exec (#646) adds another. Protocol-specific argv/parse live in
  * headless-host helpers (#752 per-host impl).
- * Claude fixedArgs: print mode, full permissions. stream-json + verbose: live
- * host events for sitian records (#811); result is last line. Forced methods
- * ride `--plugin-dir` (#922); operator skill/setting surfaces stay open.
+ * Claude fixedArgs: print mode. stream-json + verbose: live
+ * host events for sitian records (#811); result is last line.
  */
 export const HEADLESS_HOST_DESCRIPTIONS: Readonly<Record<string, HeadlessHostDescription>> = Object.freeze({
   "claude": Object.freeze({

package/src/packaged-role-registry.ts

@@ -42,7 +42,6 @@ export type PackagedArtifactFace = {
   readonly reportPhase?: true;
   readonly evidenceRole?: true;
   readonly leaves: readonly PackagedArtifactLeaf[];
-  readonly method?: "optional" | "observed";
   readonly doctorReportFacts?: true;
 };
 
@@ -132,7 +131,6 @@ export const PUBLIC_ROLE_RECORDS = [
         { key: "prerequisitesPath", omitUndefined: true },
         { key: "prerequisites" },
       ],
-      method: "observed",
     },
     boardPlacement: "marshal",
     activationFlags: [
@@ -158,7 +156,6 @@ export const PUBLIC_ROLE_RECORDS = [
     worker: true,
     applyMethod: "tdd",
     /** Method-material load failure keeps the activation cause (not reviewer/fixer). */
-    methodLoadFailureCause: "activation",
     boardPlacement: "coder",
     phases: ["plan", "apply"],
     outputTool: CODER_OUTPUT_TOOL_NAME,
@@ -170,7 +167,6 @@ export const PUBLIC_ROLE_RECORDS = [
         { key: "phase" },
         { key: "taskPath" },
       ],
-      method: "optional",
     },
     activationFlags: [
       { field: "taskPath", flag: "ak-coder-task", binds: "input" },
@@ -212,7 +208,6 @@ export const PUBLIC_ROLE_RECORDS = [
         { key: "authorityRefs", copyArray: true },
         { key: "callerProvenance", callerProvenance: true },
       ],
-      method: "observed",
     },
     /** Frozen base/lens/authority become the initial prompt; instruction follows. */
     transportPrompt: "skill-args",
@@ -311,7 +306,6 @@ export const PUBLIC_ROLE_RECORDS = [
     methodSkills: ["resolving-merge-conflicts"],
     settleMethod: "resolving-merge-conflicts",
     /** Method-material load failure keeps the activation cause (not reviewer/fixer). */
-    methodLoadFailureCause: "activation",
     phases: [null],
     outputTool: MERGER_OUTPUT_TOOL_NAME,
     settlement: "residual",
@@ -324,7 +318,6 @@ export const PUBLIC_ROLE_RECORDS = [
         { key: "mergerInputPath" },
         { key: "derived" },
       ],
-      method: "observed",
     },
     activationFlags: [
       { field: "inputPath", from: "mergerInputPath", flag: "ak-merger-input", binds: "input" },
@@ -391,7 +384,7 @@ export const PUBLIC_ROLE_RECORDS = [
     activationStage: "load-and-install",
     receiptStatusKey: "status",
     // #924: 公用《票面法》三席同装
-    sessionMaterials: ["CLAUDE.md", "souls/countersign.md", "souls/ticket-law.md"],
+    sessionMaterials: ["CLAUDE.md", "souls/countersign.md", "souls/ticket-law.md", "resources/countersign-ticket-issue.md"],
   },
   {
     role: "secretariat",
@@ -399,7 +392,7 @@ export const PUBLIC_ROLE_RECORDS = [
     presentSettled: "always",
     summonResume: false,
     admission: "instruction",
-    sameParent: "court-diarist",
+    sameParent: "none",
     phases: [null],
     outputTool: SECRETARIAT_OUTPUT_TOOL_NAME,
     settlement: "accepted",
@@ -415,6 +408,7 @@ export const PUBLIC_ROLE_RECORDS = [
       "CLAUDE.md",
       "souls/secretariat.md",
       "souls/ticket-law.md",
+      "resources/secretariat-ticket-identity.md",
       "souls/countersign.md",
       "souls/notary.md",
     ],
@@ -581,6 +575,20 @@ export function packagedRoleMetadata(role: string): PackagedRoleMetadata | undef
   return PACKAGED_ROLE_REGISTRY.find((entry) => entry.role === role);
 }
 
+/** Names any public seat may require. Setup and missing-Skill checks both read this. */
+export function packagedMethodSkillNames(): readonly string[] {
+  const names: string[] = [];
+  for (const record of PACKAGED_ROLE_REGISTRY) {
+    if ("methodSkills" in record && record.methodSkills !== undefined) {
+      for (const name of record.methodSkills) if (!names.includes(name)) names.push(name);
+    }
+    if ("applyMethod" in record && record.applyMethod !== undefined && !names.includes(record.applyMethod)) {
+      names.push(record.applyMethod);
+    }
+  }
+  return names;
+}
+
 /** Review officers (台院 / 符宝郎 / 审刑院). Absent on every other seat. */
 export function isOfficerReviewSeat(role: string): boolean {
   const record = packagedRoleMetadata(role);
@@ -651,13 +659,6 @@ export function packagedRoleOutputTool(role: string): string | undefined {
   return packagedRoleMetadata(role)?.outputTool;
 }
 
-/** Method-material load failure cause declared on the seat. Absent means no typed cause. */
-export function packagedMethodLoadFailureCause(role: string): "activation" | undefined {
-  const record = packagedRoleMetadata(role);
-  if (record === undefined || !("methodLoadFailureCause" in record)) return undefined;
-  return record.methodLoadFailureCause;
-}
-
 /** Diarist binds a board ticket onto its own run. Other seats do not. */
 export function packagedBindsBoardTicket(role: string): boolean {
   const record = packagedRoleMetadata(role);

package/src/pi/adapter.ts

@@ -1,5 +1,4 @@
 import {
-  parseSkillBlock,
   type BeforeAgentStartEventResult,
   type ExtensionAPI,
   type ExtensionContext,
@@ -166,32 +165,6 @@ export function createPiRoleHostAdapter(
     deliverSubmissionRejection(_rejection) {
       // #836 删 1/A4.5: no package-authored non-sole resume sentence.
     },
-    capabilities: {
-      skillExpansion(prompt) {
-        const parsed = parseSkillBlock(prompt);
-        if (parsed == null) return undefined;
-        const userMessage = parsed.userMessage ?? "";
-        return Object.freeze({
-          name: parsed.name,
-          location: parsed.location,
-          content: parsed.content,
-          userMessage,
-        });
-      },
-      /** Recover plain original request from Pi-native `/skill:` turn text (ADR 0082). */
-      skillOriginalRequest(name, text) {
-        const token = `/skill:${name}`;
-        const trimmed = text.trimStart();
-        if (
-          trimmed === token
-          || trimmed.startsWith(`${token} `)
-          || trimmed.startsWith(`${token}\n`)
-        ) {
-          return text.slice(text.indexOf(token) + token.length).trim();
-        }
-        return text.trim();
-      },
-    },
     registerFlag: (name, definition) => pi.registerFlag(name, definition),
     getFlag: (name) => pi.getFlag(name),
     registerTool: (tool) => pi.registerTool(toPiToolDefinition(

package/src/pi/role-turn-host.ts

@@ -6,7 +6,7 @@
 import { execFile, spawn } from "node:child_process";
 import { constants } from "node:fs";
 import { access, appendFile, readFile, realpath } from "node:fs/promises";
-import { basename, delimiter, dirname, isAbsolute, join, resolve } from "node:path";
+import { delimiter, dirname, isAbsolute, join, resolve } from "node:path";
 import { platform } from "node:process";
 import { promisify } from "node:util";
 import { randomUUID } from "node:crypto";
@@ -86,38 +86,12 @@ function buildMethodArgs(methods: readonly MethodBinding[]): string[] {
   const skillArgs: string[] = [];
   for (const method of methods) {
     if (method.kind === "skill") {
-      skillArgs.push("--skill", method.path);
+      skillArgs.push("--skill", dirname(method.path));
     }
   }
   return skillArgs;
 }
 
-/**
- * Pi-native `/skill:<name>` for a single forced method (ADR 0082: pi is one adapter
- * with no privilege; Pi-only seams stay inside the pi adapter).
- * Driven by typed RoleTurnRequest.methods — middle-layer decision, Pi-only syntax.
- * Zero/many methods leave the prompt alone (Fixer optional pair stays `--skill` only).
- */
-export function applyPiNativeSkillInvocation(
-  methods: readonly MethodBinding[],
-  prompt: string,
-): string {
-  const skills = methods.filter((method) => method.kind === "skill");
-  if (skills.length !== 1) return prompt;
-  const name = basename(dirname(skills[0]!.path));
-  if (name.length === 0) return prompt;
-  const token = `/skill:${name}`;
-  const trimmed = prompt.trimStart();
-  if (
-    trimmed === token
-    || trimmed.startsWith(`${token} `)
-    || trimmed.startsWith(`${token}\n`)
-  ) {
-    return prompt;
-  }
-  return prompt.length === 0 ? token : `${token} ${prompt}`;
-}
-
 /**
  * Pi last-hop argv after `--no-extensions -e entry` (#819).
  * Activation flag membership comes from middle-layer projectActivationFlags;
@@ -165,9 +139,7 @@ function piUserDialogueBody(request: RoleTurnRequest): string {
           const _exhaustive: never = request.continuation;
           return _exhaustive;
         })();
-  return request.continuation.kind === "resume"
-    ? rawPrompt
-    : applyPiNativeSkillInvocation(request.methods, rawPrompt);
+  return rawPrompt;
 }
 
 export type PiSpawnRunner = (

package/src/public-cli/cli.ts

@@ -48,6 +48,7 @@ import { packagedModelParent } from "../packaged-role-registry.ts";
 import { seatModelOnly } from "./registry.ts";
 import { CliUsageError } from "./cli-errors.ts";
 import type { CliIo } from "./cli-io.ts";
+import { runMachineSkillSetup } from "./machine-method-skills.ts";
 import type { PostAdmissionEnv } from "./post-admission.ts";
 import type { RoleTurnHost } from "../host-contracts.ts";
 import { appendPiSessionCustomEntry } from "../pi/role-turn-host.ts";
@@ -77,7 +78,8 @@ import {
   type PublicRoleOptionOwner,
   type TypedOptionConsumer,
 } from "./option-definitions.ts";
-import { runPublicInstructionSeat, runPublicInstructionSeatResume } from "./instruction-seat-run.ts";
+import { continueParentAfterChild, runPublicInstructionSeat, runPublicInstructionSeatResume } from "./instruction-seat-run.ts";
+import { courtDiaristEscalated } from "./countersign-run.ts";
 import { runPublicAnalyst } from "./analyst-run.ts";
 import {
   AUTO_RESUME_LIMIT,
@@ -1178,6 +1180,11 @@ export async function runAkRole(
       };
     }
 
+    if (parsed.command === "setup") {
+      if (parsed.args.length !== 0) throw new CliUsageError("setup takes no arguments");
+      return { exitCode: await runMachineSkillSetup(home, io.stdout) };
+    }
+
     // #724 explicit fresh summons: `ak-role new <role> …` — same role argv, always mint.
     // Rewrites onto the role command with freshSummons; auto-resume and resume stay intact.
     if (parsed.command === "new") {
@@ -1229,7 +1236,22 @@ export async function runAkRole(
         }),
         io,
       );
-      return cliResultFromRoleRun(result);
+      let current = result;
+      while (
+        current.exitCode === 0 && current.admitted?.correlationId !== undefined
+        && current.terminal?.roleOutcome.kind === "accepted"
+        && !courtDiaristEscalated(current.terminal.roleOutcome)
+      ) {
+        const parentRunId = current.admitted.correlationId;
+        const parentRole = await peekRoleRunRole(home, parentRunId);
+        if (parentRole === undefined) break;
+        const parentSeat = resolveEffectiveSeat(config, parentRole, credentials, invocationFromParsed(parsed));
+        const parentEnv = createRoleEnvironment(env, {
+          role: parentRole, home, agentDir, cwd, credentials, seat: parentSeat, config,
+        });
+        current = await continueParentAfterChild(parentRunId, current.admitted, parentEnv, io);
+      }
+      return cliResultFromRoleRun(current);
     }
 
     if (

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

@@ -45,8 +45,8 @@ export type CountersignRunEnv = PostAdmissionEnv & {
    */
   gateReviewInstruction?: string;
   /**
-   * #969 / #987 gate path: parent run durable board ticket handoff for bind only.
-   * Resume lookup uses parentRunPath — never this ticket number (#987 Result 7).
+   * #969 / #987 gate path: parent run durable board ticket handoff for bind.
+   * Same-ticket resume lookup narrows the parent path by this typed number.
    */
   boundTicketNumber?: number;
   /**
@@ -79,6 +79,7 @@ export type CourtDiaristIdentity =
 export type CourtDiaristInvocationResult = {
   readonly identity: CourtDiaristIdentity;
   readonly admitted?: import("./invocation.ts").AdmittedRoleInvocation;
+  readonly terminal?: import("./terminal.ts").TerminalResult;
   readonly failedWithoutEscalate?: { readonly diagnostic: string };
 };
 
@@ -161,7 +162,7 @@ export type CourtDiaristSummonEnv = Pick<
  * - Multiple submissions: last qualifying set wins.
  * Live path never shape-rejects the role turn; durable damage is a separate seam.
  */
-function courtTicketNumbersFromOutcome(
+export function courtTicketNumbersFromOutcome(
   roleOutcome: TerminalRoleOutcome | undefined,
   principalTicket: number,
   submissions?: readonly unknown[],
@@ -199,7 +200,7 @@ function courtTicketNumbersFromOutcome(
 }
 
 /** Routing boolean over the child's own typed sequence — does not pick or rewrite a sole row. */
-function courtDiaristEscalated(
+export function courtDiaristEscalated(
   roleOutcome: TerminalRoleOutcome | undefined,
 ): boolean {
   if (roleOutcome === undefined) return false;
@@ -280,6 +281,7 @@ export async function invokeCourtDiarist(
         diagnostic: courtDiaristEscalateDiagnostic(roleOutcome, submissions),
       },
       ...(result.admitted === undefined ? {} : { admitted: result.admitted }),
+      ...(result.terminal === undefined ? {} : { terminal: result.terminal }),
     };
   }
 
@@ -328,14 +330,15 @@ export async function invokeCourtDiarist(
  * Missing ticketNumber (true-unbound / identity deferred) skips the refresh
  * station — no diary is minted for a true-unbound run. First-entry identity
  * lives on the shared countersign entry (typed 起居郎 key for bind). Bound refresh:
- * 起居郎 failure propagates (失败诚实).
+ * technical failure propagates; LLM escalation remains a recorded conclusion.
  * Path delivery onto materials is not this station's job — post-admission owns it.
  */
 export async function runCountersignCourtDiaristStation(
   admitted: AdmittedCountersignInvocation,
   env: CountersignRunEnv,
   io: CliIo,
-): Promise<void> {
+  afterTicketNumber?: number,
+): Promise<{ readonly terminal: import("./terminal.ts").TerminalResult; readonly childRunId?: string } | undefined> {
   if (env.runCourtDiaristStation !== undefined) {
     await env.runCourtDiaristStation(admitted);
     return;
@@ -362,7 +365,8 @@ export async function runCountersignCourtDiaristStation(
     refreshTickets = [admitted.ticketNumber];
   }
 
-  for (const ticketNumber of refreshTickets) {
+  const completedIndex = afterTicketNumber === undefined ? -1 : refreshTickets.indexOf(afterTicketNumber);
+  for (const ticketNumber of refreshTickets.slice(completedIndex + 1)) {
     const outcome = await invokeCourtDiarist(
       {
         instruction: `整理 #${ticketNumber} 的本案依据。`,
@@ -376,13 +380,16 @@ export async function runCountersignCourtDiaristStation(
       io,
     );
 
-    if (outcome.identity.kind === "escalate") {
-      throw new StationChildExhaustedError(outcome.identity.diagnostic);
-    }
     if (outcome.failedWithoutEscalate !== undefined) {
       throw new StationChildExhaustedError(
         outcome.failedWithoutEscalate.diagnostic,
       );
     }
+    if (outcome.identity.kind === "escalate" && outcome.terminal !== undefined) {
+      return {
+        terminal: outcome.terminal,
+        ...(outcome.admitted === undefined ? {} : { childRunId: outcome.admitted.runId }),
+      };
+    }
   }
 }