@akagilnc/pi-workflow-roles 0.1.5015 → 0.1.5063

package/dist/host-descriptions.js

@@ -41,9 +41,8 @@ export const HOST_DESCRIPTIONS = Object.freeze({
  * 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 = Object.freeze({
     "claude": Object.freeze({

package/dist/migrate-book-topology.js

@@ -14051,8 +14051,7 @@ var init_packaged_role_registry = __esm({
             { key: "packetPath" },
             { key: "prerequisitesPath", omitUndefined: true },
             { key: "prerequisites" }
-          ],
-          method: "observed"
+          ]
         },
         boardPlacement: "marshal",
         activationFlags: [
@@ -14078,7 +14077,6 @@ var init_packaged_role_registry = __esm({
         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,
@@ -14089,8 +14087,7 @@ var init_packaged_role_registry = __esm({
           leaves: [
             { key: "phase" },
             { key: "taskPath" }
-          ],
-          method: "optional"
+          ]
         },
         activationFlags: [
           { field: "taskPath", flag: "ak-coder-task", binds: "input" },
@@ -14131,8 +14128,7 @@ var init_packaged_role_registry = __esm({
             { key: "lens" },
             { key: "authorityRefs", copyArray: true },
             { key: "callerProvenance", callerProvenance: true }
-          ],
-          method: "observed"
+          ]
         },
         /** Frozen base/lens/authority become the initial prompt; instruction follows. */
         transportPrompt: "skill-args",
@@ -14231,7 +14227,6 @@ var init_packaged_role_registry = __esm({
         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",
@@ -14243,8 +14238,7 @@ var init_packaged_role_registry = __esm({
           leaves: [
             { key: "mergerInputPath" },
             { key: "derived" }
-          ],
-          method: "observed"
+          ]
         },
         activationFlags: [
           { field: "inputPath", from: "mergerInputPath", flag: "ak-merger-input", binds: "input" }
@@ -14311,7 +14305,7 @@ var init_packaged_role_registry = __esm({
         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",
@@ -14319,7 +14313,7 @@ var init_packaged_role_registry = __esm({
         presentSettled: "always",
         summonResume: false,
         admission: "instruction",
-        sameParent: "court-diarist",
+        sameParent: "none",
         phases: [null],
         outputTool: SECRETARIAT_OUTPUT_TOOL_NAME,
         settlement: "accepted",
@@ -14335,6 +14329,7 @@ var init_packaged_role_registry = __esm({
           "CLAUDE.md",
           "souls/secretariat.md",
           "souls/ticket-law.md",
+          "resources/secretariat-ticket-identity.md",
           "souls/countersign.md",
           "souls/notary.md"
         ]

package/dist/packaged-role-registry.js

@@ -93,8 +93,7 @@ const PUBLIC_ROLE_RECORDS = [
         { key: "packetPath" },
         { key: "prerequisitesPath", omitUndefined: true },
         { key: "prerequisites" }
-      ],
-      method: "observed"
+      ]
     },
     boardPlacement: "marshal",
     activationFlags: [
@@ -120,7 +119,6 @@ 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,
@@ -131,8 +129,7 @@ const PUBLIC_ROLE_RECORDS = [
       leaves: [
         { key: "phase" },
         { key: "taskPath" }
-      ],
-      method: "optional"
+      ]
     },
     activationFlags: [
       { field: "taskPath", flag: "ak-coder-task", binds: "input" },
@@ -173,8 +170,7 @@ const PUBLIC_ROLE_RECORDS = [
         { key: "lens" },
         { key: "authorityRefs", copyArray: true },
         { key: "callerProvenance", callerProvenance: true }
-      ],
-      method: "observed"
+      ]
     },
     /** Frozen base/lens/authority become the initial prompt; instruction follows. */
     transportPrompt: "skill-args",
@@ -273,7 +269,6 @@ 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",
@@ -285,8 +280,7 @@ const PUBLIC_ROLE_RECORDS = [
       leaves: [
         { key: "mergerInputPath" },
         { key: "derived" }
-      ],
-      method: "observed"
+      ]
     },
     activationFlags: [
       { field: "inputPath", from: "mergerInputPath", flag: "ak-merger-input", binds: "input" }
@@ -353,7 +347,7 @@ 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",
@@ -361,7 +355,7 @@ const PUBLIC_ROLE_RECORDS = [
     presentSettled: "always",
     summonResume: false,
     admission: "instruction",
-    sameParent: "court-diarist",
+    sameParent: "none",
     phases: [null],
     outputTool: SECRETARIAT_OUTPUT_TOOL_NAME,
     settlement: "accepted",
@@ -377,6 +371,7 @@ const PUBLIC_ROLE_RECORDS = [
       "CLAUDE.md",
       "souls/secretariat.md",
       "souls/ticket-law.md",
+      "resources/secretariat-ticket-identity.md",
       "souls/countersign.md",
       "souls/notary.md"
     ]
@@ -525,6 +520,18 @@ const PACKAGED_ROLE_REGISTRY = PUBLIC_ROLE_RECORDS.map(({ sessionMaterials: _omi
 function packagedRoleMetadata(role) {
   return PACKAGED_ROLE_REGISTRY.find((entry) => entry.role === role);
 }
+function packagedMethodSkillNames() {
+  const names = [];
+  for (const record of PACKAGED_ROLE_REGISTRY) {
+    if ("methodSkills" in record && record.methodSkills !== void 0) {
+      for (const name of record.methodSkills) if (!names.includes(name)) names.push(name);
+    }
+    if ("applyMethod" in record && record.applyMethod !== void 0 && !names.includes(record.applyMethod)) {
+      names.push(record.applyMethod);
+    }
+  }
+  return names;
+}
 function isOfficerReviewSeat(role) {
   const record = packagedRoleMetadata(role);
   return record !== void 0 && "reviewOfficer" in record && record.reviewOfficer === true;
@@ -559,11 +566,6 @@ function packagedRolePhaseFlag(role) {
 function packagedRoleOutputTool(role) {
   return packagedRoleMetadata(role)?.outputTool;
 }
-function packagedMethodLoadFailureCause(role) {
-  const record = packagedRoleMetadata(role);
-  if (record === void 0 || !("methodLoadFailureCause" in record)) return void 0;
-  return record.methodLoadFailureCause;
-}
 function packagedBindsBoardTicket(role) {
   const record = packagedRoleMetadata(role);
   return record?.sameParent === "board-ticket";
@@ -689,7 +691,7 @@ export {
   packagedEmitsAuthorityRefs,
   packagedGateStageLabel,
   packagedGateSummon,
-  packagedMethodLoadFailureCause,
+  packagedMethodSkillNames,
   packagedModelParent,
   packagedNavigatorSubject,
   packagedProjectsTargetBindRejection,

package/dist/pi/role-turn-host.js

@@ -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";
@@ -67,33 +67,11 @@ function buildMethodArgs(methods) {
     const skillArgs = [];
     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, prompt) {
-    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;
@@ -135,9 +113,7 @@ function piUserDialogueBody(request) {
             const _exhaustive = request.continuation;
             return _exhaustive;
         })();
-    return request.continuation.kind === "resume"
-        ? rawPrompt
-        : applyPiNativeSkillInvocation(request.methods, rawPrompt);
+    return rawPrompt;
 }
 const execFileAsync = promisify(execFile);
 async function resolveSelectedPi(command, cwd, env) {

package/dist/public-cli/cli.js

@@ -12,11 +12,13 @@ import { loadHostProvidersTable, projectHostFacingProvider, renderHostProvidersT
 import { packagedModelParent } from "../packaged-role-registry.js";
 import { seatModelOnly } from "./registry.js";
 import { CliUsageError } from "./cli-errors.js";
+import { runMachineSkillSetup } from "./machine-method-skills.js";
 import { appendPiSessionCustomEntry } from "../pi/role-turn-host.js";
 import { composeRoleTurnHostAdapters, formatHostSelectionFailure, HostSelectionError, selectRoleTurnHost, } from "./role-turn-host-resolution.js";
 import { parseAnalystArgv, parsePublicSeatArgv, } from "./invocation.js";
 import { createTypedOptionConsumer, optionsForOwner, projectCommandHelp, projectOwnerOptions, PUBLIC_NAVIGATOR_HELP_NOTE, PUBLIC_ROLE_OPTION_OWNERS, renderHumanOwnerOptionLines, } from "./option-definitions.js";
-import { runPublicInstructionSeat, runPublicInstructionSeatResume } from "./instruction-seat-run.js";
+import { continueParentAfterChild, runPublicInstructionSeat, runPublicInstructionSeatResume } from "./instruction-seat-run.js";
+import { courtDiaristEscalated } from "./countersign-run.js";
 import { runPublicAnalyst } from "./analyst-run.js";
 import { AUTO_RESUME_LIMIT, peekRoleRunRole, } from "./run-lifecycle.js";
 import { INTERNAL_ROLE_ENTRYPOINT_RELATIVE, PUBLIC_CALLABLE_ROLES, isPublicCallableRole, isPublicCliSupportCommand, isPublicConfigurableSeat, listHelpCapabilities, } from "./registry.js";
@@ -792,6 +794,11 @@ export async function runAkRole(argv, env) {
                 exitCode: await runConfigCommand(parsed.args, home, env.packageRoot, io),
             };
         }
+        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") {
@@ -832,7 +839,21 @@ export async function runAkRole(argv, env) {
                 seat,
                 config,
             }), 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 (parsed.command !== undefined &&
             isPublicCliSupportCommand(parsed.command)) {

package/dist/public-cli/countersign-run.js

@@ -62,7 +62,7 @@ function courtDiaristEscalateDiagnostic(roleOutcome, submissions) {
  * - Multiple submissions: last qualifying set wins.
  * Live path never shape-rejects the role turn; durable damage is a separate seam.
  */
-function courtTicketNumbersFromOutcome(roleOutcome, principalTicket, submissions) {
+export function courtTicketNumbersFromOutcome(roleOutcome, principalTicket, submissions) {
     if (roleOutcome === undefined)
         return undefined;
     const payloads = courtDiaristPayloadRows(roleOutcome, submissions);
@@ -97,7 +97,7 @@ function courtTicketNumbersFromOutcome(roleOutcome, principalTicket, submissions
     return latest;
 }
 /** Routing boolean over the child's own typed sequence — does not pick or rewrite a sole row. */
-function courtDiaristEscalated(roleOutcome) {
+export function courtDiaristEscalated(roleOutcome) {
     if (roleOutcome === undefined)
         return false;
     if (roleOutcome.kind === "audit_escalation")
@@ -164,6 +164,7 @@ export async function invokeCourtDiarist(input, env, io) {
                 diagnostic: courtDiaristEscalateDiagnostic(roleOutcome, submissions),
             },
             ...(result.admitted === undefined ? {} : { admitted: result.admitted }),
+            ...(result.terminal === undefined ? {} : { terminal: result.terminal }),
         };
     }
     if (result.exitCode !== 0) {
@@ -204,10 +205,10 @@ export async function invokeCourtDiarist(input, env, io) {
  * 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, env, io) {
+export async function runCountersignCourtDiaristStation(admitted, env, io, afterTicketNumber) {
     if (env.runCourtDiaristStation !== undefined) {
         await env.runCourtDiaristStation(admitted);
         return;
@@ -230,7 +231,8 @@ export async function runCountersignCourtDiaristStation(admitted, env, io) {
     else {
         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} 的本案依据。`,
             projectRoot: admitted.projectRoot,
@@ -239,11 +241,14 @@ export async function runCountersignCourtDiaristStation(admitted, env, io) {
             // Refresh holds a typed key — hand it off so identity is bound before turn.
             boundTicketNumber: ticketNumber,
         }, env, 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 }),
+            };
+        }
     }
 }