@akagilnc/pi-workflow-roles 0.1.3826 → 0.1.3837

package/dist/public-cli/main.js

@@ -16584,7 +16584,7 @@ var init_sitian_facade = __esm({
 import { execFile, spawn } from "node:child_process";
 import { constants } from "node:fs";
 import { access, appendFile, readFile as readFile3, realpath } from "node:fs/promises";
-import { delimiter as delimiter2, isAbsolute as isAbsolute3, join as join10, resolve as resolve4 } from "node:path";
+import { basename as basename4, delimiter as delimiter2, dirname as dirname6, isAbsolute as isAbsolute3, join as join10, resolve as resolve4 } from "node:path";
 import { platform } from "node:process";
 import { promisify } from "node:util";
 import { randomUUID as randomUUID2 } from "node:crypto";
@@ -16692,12 +16692,26 @@ function buildMethodArgs(methods) {
   }
   return skillArgs;
 }
+function applyPiNativeSkillInvocation(methods, prompt) {
+  const skills = methods.filter((method) => method.kind === "skill");
+  if (skills.length !== 1) return prompt;
+  const name = basename4(dirname6(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}
+`)) {
+    return prompt;
+  }
+  return prompt.length === 0 ? token : `${token} ${prompt}`;
+}
 function buildPiTurnExtraArgs(request, authority, extraPiArgs = []) {
   const { sessionFile, sessionDirectory } = authority.decode(request.principal);
-  const prompt = request.continuation.kind === "initial" || request.continuation.kind === "resume" ? request.continuation.prompt : (() => {
+  const rawPrompt = request.continuation.kind === "initial" || request.continuation.kind === "resume" ? request.continuation.prompt : (() => {
     const _exhaustive = request.continuation;
     return _exhaustive;
   })();
+  const prompt = applyPiNativeSkillInvocation(request.methods, rawPrompt);
   return [
     "--no-skills",
     ...buildMethodArgs(request.methods),
@@ -17173,7 +17187,7 @@ var init_terminating_tools = __esm({
 
 // src/doctor-evidence.ts
 import { readdir, readFile as readFile5, realpath as realpath2, stat } from "node:fs/promises";
-import { dirname as dirname6, relative as relative2, resolve as resolve5, sep as sep2 } from "node:path";
+import { dirname as dirname7, relative as relative2, resolve as resolve5, sep as sep2 } from "node:path";
 function record2(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -17212,7 +17226,7 @@ async function stableRunsIdentity(root) {
     } catch (error) {
       if (!isMissingPathError(error)) throw error;
     }
-    const parent = dirname6(cursor);
+    const parent = dirname7(cursor);
     if (parent === cursor) return root;
     cursor = parent;
   }
@@ -19025,7 +19039,7 @@ __export(notary_source_run_exports, {
   loadNotarySourceRunLocator: () => loadNotarySourceRunLocator,
   resolveNotarySourceRunLocator: () => resolveNotarySourceRunLocator
 });
-import { dirname as dirname7, isAbsolute as isAbsolute5, join as join14, resolve as resolve6, basename as basename4 } from "node:path";
+import { dirname as dirname8, isAbsolute as isAbsolute5, join as join14, resolve as resolve6, basename as basename5 } from "node:path";
 import { lstat as lstat2, realpath as realpath3 } from "node:fs/promises";
 function parseRunDirectoryName(name) {
   const match = RUN_DIR_NAME.exec(name);
@@ -19056,10 +19070,10 @@ async function requireRunDirectory(candidate, display) {
       `notary --source-run must be a run directory: ${display}`
     );
   }
-  const identity = parseRunDirectoryName(basename4(real));
+  const identity = parseRunDirectoryName(basename5(real));
   if (identity === void 0) {
     throw new NotarySourceRunError(
-      `notary --source-run must be named <runId>@<role>: ${basename4(real)}`
+      `notary --source-run must be named <runId>@<role>: ${basename5(real)}`
     );
   }
   return real;
@@ -19080,9 +19094,9 @@ async function resolveNotarySourceRunLocator(options) {
     candidate = isAbsolute5(raw) ? raw : resolve6(options.projectRoot, raw);
   }
   const real = await requireRunDirectory(candidate, raw);
-  const identity = parseRunDirectoryName(basename4(real));
+  const identity = parseRunDirectoryName(basename5(real));
   const runsRootIdentity = physicalPathIdentity(bookRunsRoot);
-  const parentIdentity = physicalPathIdentity(dirname7(real));
+  const parentIdentity = physicalPathIdentity(dirname8(real));
   if (parentIdentity !== runsRootIdentity) {
     throw new NotarySourceRunError(
       "notary --source-run must resolve to a retained run under the project machine-ledger book"
@@ -19117,7 +19131,7 @@ async function resolveNotarySourceRunLocator(options) {
 }
 async function loadNotarySourceRunLocator(path) {
   const real = await requireRunDirectory(path, path);
-  const identity = parseRunDirectoryName(basename4(real));
+  const identity = parseRunDirectoryName(basename5(real));
   const runState = await readRoleRunIdentity(real);
   if (runState === void 0) {
     throw new NotarySourceRunError(
@@ -20215,7 +20229,7 @@ import {
   realpath as realpath4,
   writeFile as writeFile4
 } from "node:fs/promises";
-import { basename as basename5, isAbsolute as isAbsolute6, join as join15, resolve as resolve7, sep as sep3 } from "node:path";
+import { basename as basename6, isAbsolute as isAbsolute6, join as join15, resolve as resolve7, sep as sep3 } from "node:path";
 function issueAdmissionPlacement(authority, request) {
   const principal = authority.issue(request);
   const { sessionDirectory, sessionFile } = authority.decode(principal);
@@ -20609,7 +20623,7 @@ async function freezeRegularFileAttachment(sourcePath, destinationDir, index) {
     );
   }
   const bytes = await readFile9(absolute);
-  const name = `${String(index).padStart(2, "0")}-${basename5(absolute)}`;
+  const name = `${String(index).padStart(2, "0")}-${basename6(absolute)}`;
   const frozenPath = join15(destinationDir, name);
   await writeFile4(frozenPath, bytes);
   return {
@@ -22044,9 +22058,7 @@ async function admitMergerInvocation(options) {
   };
 }
 function buildMergerTransportPrompt(admitted, engineMaterial) {
-  const lines = [
-    `/skill:resolving-merge-conflicts ${admitted.instruction}`
-  ];
+  const lines = [admitted.instruction];
   if (admitted.attachments.length > 0) {
     lines.push("");
     lines.push("\u5DF2\u53D7\u7406\u9644\u4EF6\uFF08\u51BB\u7ED3\u5FEB\u7167\u8DEF\u5F84\uFF09\uFF1A");
@@ -23054,7 +23066,7 @@ var init_analyst_gate_cycles_read = __esm({
 
 // src/run-terminal-artifacts.ts
 import { readdir as readdir4, readFile as readFile12 } from "node:fs/promises";
-import { basename as basename6, dirname as dirname8, join as join18 } from "node:path";
+import { basename as basename7, dirname as dirname9, join as join18 } from "node:path";
 function isMissingPathError2(error) {
   return error instanceof Error && "code" in error && (error.code === "ENOENT" || error.code === "ENOTDIR");
 }
@@ -23135,7 +23147,7 @@ async function listUniqueErrorFallbackPaths(directories) {
   return found;
 }
 function runIdFromRunDirectory(runDirectory) {
-  const name = basename6(runDirectory);
+  const name = basename7(runDirectory);
   const at = name.lastIndexOf("@");
   if (at <= 0 || at === name.length - 1) return void 0;
   return name.slice(0, at);
@@ -23161,7 +23173,7 @@ async function readRunTerminalArtifact(runDirectory) {
     if (read3 !== void 0) return read3;
   }
   const expectedRunId = runIdFromRunDirectory(runDirectory);
-  for (const path of await listUniqueErrorFallbackPaths([dirname8(runDirectory)])) {
+  for (const path of await listUniqueErrorFallbackPaths([dirname9(runDirectory)])) {
     const read3 = await readTerminalArtifactAtPath(path, "error.json");
     if (read3 === void 0) continue;
     if (read3.status === "present") {
@@ -23292,15 +23304,15 @@ var init_submission_ledger = __esm({
 // src/session-opening-materials.ts
 import { existsSync as existsSync7 } from "node:fs";
 import { readFile as readFile13 } from "node:fs/promises";
-import { dirname as dirname9, join as join19 } from "node:path";
+import { dirname as dirname10, join as join19 } from "node:path";
 import { fileURLToPath, pathToFileURL as pathToFileURL3 } from "node:url";
 function resolvePackageRootDir(moduleUrl = import.meta.url) {
-  let dir = dirname9(fileURLToPath(moduleUrl));
+  let dir = dirname10(fileURLToPath(moduleUrl));
   for (let i = 0; i < 8; i += 1) {
     if (existsSync7(join19(dir, "package.json")) && existsSync7(join19(dir, "souls"))) {
       return dir;
     }
-    const parent = dirname9(dir);
+    const parent = dirname10(dir);
     if (parent === dir) break;
     dir = parent;
   }
@@ -23964,7 +23976,7 @@ var init_terminal = __esm({
 // src/public-cli/settlement.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
 import { appendFile as appendFile2, readFile as readFile15, readdir as readdir5, writeFile as writeFile5 } from "node:fs/promises";
-import { dirname as dirname10, join as join21 } from "node:path";
+import { dirname as dirname11, join as join21 } from "node:path";
 function sealedLedgerHome(admitted) {
   return homeFromRunDirectory(admitted.runDirectory);
 }
@@ -24358,7 +24370,7 @@ async function readSitianRetainedAuditorProviderStop(sessionFile) {
       kind: "auditor",
       sessionParent: sessionFile,
       // Path is driven by sessionParent when under ledger home; cwd is a fallback only.
-      cwd: dirname10(sessionFile)
+      cwd: dirname11(sessionFile)
     });
     const { records: records2 } = await readSitianRecords(recordFile);
     for (let i = records2.length - 1; i >= 0; i -= 1) {
@@ -24384,7 +24396,7 @@ async function readSessionProviderStop(sessionFile) {
   }
 }
 async function readBoundEvidenceChildKnownFailure(sessionFile) {
-  const childDirectory = join21(dirname10(sessionFile), "evidence-children");
+  const childDirectory = join21(dirname11(sessionFile), "evidence-children");
   let names;
   try {
     names = await readdir5(childDirectory);
@@ -24449,7 +24461,7 @@ async function loadBoundAuditorVolumes(sessionFile) {
     latestParentUserIndex = i;
     break;
   }
-  const childDirectories = [join21(dirname10(sessionFile), "auditor-roles")];
+  const childDirectories = [join21(dirname11(sessionFile), "auditor-roles")];
   const valid = [];
   let sawAnyDirectory = false;
   for (const childDirectory of childDirectories) {
@@ -26023,7 +26035,7 @@ function publicationAttemptFromError(path, error) {
 }
 function uniqueFailureFallbackDirs(runDirectory, baseDir) {
   const dirs = [];
-  for (const dir of [baseDir, runDirectory, dirname10(runDirectory)]) {
+  for (const dir of [baseDir, runDirectory, dirname11(runDirectory)]) {
     if (!dirs.includes(dir)) dirs.push(dir);
   }
   return dirs;
@@ -26479,7 +26491,7 @@ var init_case_dossier_delivery = __esm({
 
 // src/host-transition-prior-native.ts
 import { access as access2, readdir as readdir6 } from "node:fs/promises";
-import { dirname as dirname11, join as join23 } from "node:path";
+import { dirname as dirname12, join as join23 } from "node:path";
 function isEnoent2(error) {
   return typeof error === "object" && error !== null && error.code === "ENOENT";
 }
@@ -26493,7 +26505,7 @@ async function listPiNativeRecordPaths(sessionFile) {
   }
 }
 async function listSitianRecordPaths(sessionParent) {
-  const sessionRoot = dirname11(sessionParent);
+  const sessionRoot = dirname12(sessionParent);
   let entries;
   try {
     entries = await readdir6(sessionRoot, { withFileTypes: true });
@@ -29875,9 +29887,9 @@ var init_analyst_book_key = __esm({
 // src/atomic-write.ts
 import { randomUUID as randomUUID6 } from "node:crypto";
 import { rename, rm, writeFile as writeFile8 } from "node:fs/promises";
-import { dirname as dirname12, join as join27 } from "node:path";
+import { dirname as dirname13, join as join27 } from "node:path";
 async function writeFileAtomically(destination, contents) {
-  const parent = dirname12(destination);
+  const parent = dirname13(destination);
   const temporary = join27(parent, `.atomic-write-${randomUUID6()}.tmp`);
   try {
     await writeFile8(temporary, contents);
@@ -29895,7 +29907,7 @@ var init_atomic_write = __esm({
 
 // src/analyst-index.ts
 import { open as open3, readFile as readFile17, unlink as unlink4 } from "node:fs/promises";
-import { dirname as dirname13, join as join28 } from "node:path";
+import { dirname as dirname14, join as join28 } from "node:path";
 function sleep(ms) {
   return new Promise((resolve11) => {
     setTimeout(resolve11, ms);
@@ -29903,8 +29915,8 @@ function sleep(ms) {
 }
 async function withAnalystLibraryIndexLock(ledgerHome, fn) {
   const indexPath = analystLibraryIndexPath(ledgerHome);
-  ensureRealDirectoryTree(ledgerHome, dirname13(indexPath));
-  const lockPath = join28(dirname13(indexPath), LIBRARY_INDEX_LOCK_NAME);
+  ensureRealDirectoryTree(ledgerHome, dirname14(indexPath));
+  const lockPath = join28(dirname14(indexPath), LIBRARY_INDEX_LOCK_NAME);
   assertLedgerFileInsideHome(lockPath, ledgerHome);
   const startedAt = Date.now();
   while (true) {
@@ -30040,7 +30052,7 @@ async function readAnalystLibraryIndexPage(ledgerHome) {
 }
 async function writeAnalystLibraryIndexPage(ledgerHome, page) {
   const path = analystLibraryIndexPath(ledgerHome);
-  ensureRealDirectoryTree(ledgerHome, dirname13(path));
+  ensureRealDirectoryTree(ledgerHome, dirname14(path));
   assertLedgerFileInsideHome(path, ledgerHome);
   await writeFileAtomically(path, `${JSON.stringify(page, null, 2)}
 `);
@@ -31417,7 +31429,7 @@ var init_analyst_metric_family = __esm({
 
 // src/analyst-page.ts
 import { createHash as createHash5 } from "node:crypto";
-import { dirname as dirname14, join as join30 } from "node:path";
+import { dirname as dirname15, join as join30 } from "node:path";
 function analystIssuePageKey(address) {
   const parts = ["book", address.bookKey];
   if (address.issueNumber !== void 0) {
@@ -31547,7 +31559,7 @@ async function buildAnalystIssueMetricsPage(input) {
 }
 async function writeAnalystIssueMetricsPage(ledgerHome, page) {
   const path = analystIssuePagePath(ledgerHome, analystIssuePageAddressFromPage(page));
-  ensureRealDirectoryTree(ledgerHome, dirname14(path));
+  ensureRealDirectoryTree(ledgerHome, dirname15(path));
   assertLedgerFileInsideHome(path, ledgerHome);
   await writeFileAtomically(path, `${JSON.stringify(page, null, 2)}
 `);
@@ -33065,7 +33077,7 @@ var init_cli = __esm({
 
 // src/public-cli/main.ts
 import { existsSync as existsSync8 } from "node:fs";
-import { dirname as dirname15, join as join32 } from "node:path";
+import { dirname as dirname16, join as join32 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // src/public-cli/host-pi-runtime.ts
@@ -33152,7 +33164,7 @@ function linkPackage(packageRoot2, name, targetDir) {
 }
 
 // src/public-cli/main.ts
-var here = dirname15(fileURLToPath2(import.meta.url));
+var here = dirname16(fileURLToPath2(import.meta.url));
 function resolvePackageRoot(binDir) {
   const canonical = join32(binDir, "..", "..");
   if (existsSync8(join32(canonical, "package.json"))) {

package/dist/role-runtime.js

@@ -748,17 +748,14 @@ export function createRoleRuntimeExtension(dependencies) {
             const role = roleHost.getFlag(ROLE_FLAG.name);
             if (role !== undefined && !admitted)
                 return { action: "handled" };
-            // Envelope exclusively owns Reviewer Skill invocation transform + original-request capture.
+            // Reviewer: recover original request; Pi argv may already carry native form.
             if (role === "reviewer"
                 && admitted
                 && activeReviewerParent !== undefined
                 && reviewerOriginalRequest === undefined) {
-                reviewerOriginalRequest = event.text;
-                return {
-                    action: "transform",
-                    text: activeReviewerParent.skillBinding.invocation(event.text),
-                    ...(event.images === undefined ? {} : { images: event.images }),
-                };
+                reviewerOriginalRequest =
+                    roleHost.capabilities?.skillOriginalRequest?.(activeReviewerParent.skillBinding.name, event.text) ?? event.text;
+                return { action: "continue" };
             }
             return { action: "continue" };
         });

package/dist/worker-role.js

@@ -227,6 +227,12 @@ export function createCoderRoleRuntime(pi, dependencies, hostActions) {
     });
     return {
         async activate(ctx) {
+            // Each activation owns its own Skill capture state; prior-session flags must
+            // not authorize a later apply completed (same RoleHost, sequential activate).
+            tddInvocationInjected = false;
+            originalRequest = undefined;
+            expansionPending = false;
+            expansionCaptured = false;
             soul = (await dependencies.loadSoul()).trim();
             if (soul.length === 0)
                 throw new Error("Coder soul is empty");
@@ -303,18 +309,14 @@ export function createCoderRoleRuntime(pi, dependencies, hostActions) {
                     }
                     tddInvocationInjected = true;
                     expansionPending = true;
-                    const isNativeTdd = event.text === "/skill:tdd" ||
-                        event.text.startsWith("/skill:tdd ");
-                    if (isNativeTdd) {
-                        originalRequest = event.text.slice("/skill:tdd".length).trim();
-                        return { action: "continue" };
-                    }
-                    originalRequest = event.text.trim();
-                    return {
-                        action: "transform",
-                        text: binding?.invocation(event.text) ?? `/skill:tdd ${event.text}`,
-                        ...(event.images === undefined ? {} : { images: event.images }),
-                    };
+                    // Original request via host capability when Pi argv already carries native form;
+                    // non-pi keeps plain original bytes (no consumer trim; #822 r3 / reviewer-aligned).
+                    // Role never emits or parses `/skill:` (ADR 0082).
+                    originalRequest = binding === undefined
+                        ? event.text
+                        : (pi.capabilities?.skillOriginalRequest?.(binding.name, event.text)
+                            ?? event.text);
+                    return { action: "continue" };
                 });
                 pi.on("before_agent_start", (event, ctx) => {
                     if (soul === undefined)

package/package.json

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

package/src/acp-host/role-envelope.ts

@@ -41,27 +41,26 @@ type RpcRequest = { readonly id: number; readonly token: string; readonly method
 type ToolCallParams = { readonly name?: unknown; readonly arguments?: unknown };
 type ContentPart = { type: "text"; text: string } | { type: "image"; data: string; mimeType: string };
 
-/** Parse the canonical Skill invocation produced by the shared input transform. */
-export function parseCanonicalSkillInvocation(prompt: string): { readonly name: string; readonly userMessage: string } | undefined {
-  const match = /^\/skill:([A-Za-z0-9_-]+)(?:\s+([\s\S]*))?$/s.exec(prompt.trim());
-  if (match === null) return undefined;
-  return { name: match[1]!, userMessage: (match[2] ?? "").trim() };
-}
-
-/** Build host-side Skill expansion evidence from pre-read RoleTurnRequest.methods. */
+/**
+ * Build host-side Skill expansion evidence from pre-read RoleTurnRequest.methods.
+ * Non-pi hosts never parse Pi `/skill:` syntax (ADR 0082 `pi-no-privilege`);
+ * a single bound method treats the plain prompt as the preserved user message.
+ * Pi-native slash forms stay inside `src/pi/` only.
+ */
 export function buildAcpSkillExpansion(
   methodSkills: ReadonlyMap<string, { readonly path: string; readonly body: string }>,
   prompt: string,
 ): HostSkillExpansionEvidence | undefined {
-  const parsed = parseCanonicalSkillInvocation(prompt);
-  if (parsed === undefined) return undefined;
-  const method = methodSkills.get(parsed.name);
-  if (method === undefined) return undefined;
+  if (methodSkills.size !== 1) return undefined;
+  const entry = methodSkills.entries().next().value;
+  if (entry === undefined) return undefined;
+  const [name, method] = entry;
   return Object.freeze({
-    name: parsed.name,
+    name,
     location: method.path,
     content: `References are relative to ${dirname(method.path)}.\n\n${method.body}`,
-    userMessage: parsed.userMessage,
+    // Non-pi typed chain keeps original task bytes (ticket #822 r3); no consumer trim.
+    userMessage: prompt,
   });
 }
 

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

@@ -26,7 +26,7 @@ export type AcpPreparedTurn = Readonly<{
    * send path — never a test-only parallel face.
    */
   systemPrompt: { readonly body: string; readonly materials: readonly unknown[] };
-  /** Effective user prompt after host-side input transform (canonical Skill invocation). */
+  /** Effective user prompt after host-side input handling (host-neutral; no Pi `/skill:` syntax). */
   prompt: string;
   /**
    * Host abort signal armed only by typed infrastructure failure (envelope

package/src/canonical-skill-binding.ts

@@ -25,7 +25,10 @@ export type CanonicalSkillEvidence<Name extends CanonicalSkillName = CanonicalSk
 export type CanonicalSkillBinding<Name extends CanonicalSkillName = CanonicalSkillName> = Readonly<{
   name: Name;
   snapshot: CanonicalSkillSnapshot;
-  invocation(originalRequest: string): string;
+  /**
+   * Accept host expansion evidence when name/location/content match the binding
+   * and userMessage equals the captured original request (ADR 0032).
+   */
   captureExpansion(
     evidence: HostSkillExpansionEvidence | undefined,
     originalRequest: string,
@@ -100,9 +103,6 @@ export async function loadCanonicalSkillBinding(
   const binding: CanonicalSkillBinding<typeof name> = {
     name,
     snapshot,
-    invocation(originalRequest) {
-      return `/skill:${name} ${originalRequest}`;
-    },
     captureExpansion(evidence, originalRequest) {
       return captureCanonicalSkillExpansion(
         name,

package/src/host-contracts.ts

@@ -321,6 +321,12 @@ export type HostSkillExpansionEvidence = Readonly<{
 /** Host capability declaration (contract verb ④). */
 export type HostCapabilityDeclaration = Readonly<{
   skillExpansion(prompt: string): HostSkillExpansionEvidence | undefined;
+  /**
+   * Pi-only: recover the plain original request from a native skill turn text
+   * (argv may already carry `/skill:<name>` from the Pi adapter). Absent on
+   * non-pi hosts so role body never parses Pi slash syntax (ADR 0082).
+   */
+  skillOriginalRequest?(name: string, text: string): string;
 }>;
 
 /** Host-owned effects used by the shared activation envelope. */

package/src/package-resources/method-skill-binding.ts

@@ -46,9 +46,6 @@ export async function loadPackagedCanonicalSkillBinding<
   const binding: CanonicalSkillBinding<Name> = {
     name,
     snapshot,
-    invocation(originalRequest) {
-      return `/skill:${name} ${originalRequest}`;
-    },
     captureExpansion(evidence, originalRequest) {
       return captureCanonicalSkillExpansion(
         name,

package/src/pi/adapter.ts

@@ -157,6 +157,19 @@ export function createPiRoleHostAdapter(
           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),

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 { delimiter, isAbsolute, join, resolve } from "node:path";
+import { basename, delimiter, dirname, isAbsolute, join, resolve } from "node:path";
 import { platform } from "node:process";
 import { promisify } from "node:util";
 import { randomUUID } from "node:crypto";
@@ -167,9 +167,35 @@ function buildMethodArgs(methods: readonly MethodBinding[]): string[] {
   return skillArgs;
 }
 
+/**
+ * Pi-native `/skill:<name>` for a single forced method (ADR 0082 `pi-no-privilege`).
+ * 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}`;
+}
+
 /**
  * Translate a closed RoleTurnRequest into Pi argv after `--no-extensions -e entry`.
  * Controlled session constants and session coordinates are adapter-internal.
+ * Single forced method → Pi-native `/skill:` on the argv prompt (coder/reviewer/merger).
  */
 export function buildPiTurnExtraArgs(
   request: RoleTurnRequest,
@@ -177,13 +203,14 @@ export function buildPiTurnExtraArgs(
   extraPiArgs: readonly string[] = [],
 ): string[] {
   const { sessionFile, sessionDirectory } = authority.decode(request.principal);
-  const prompt =
+  const rawPrompt =
     request.continuation.kind === "initial" || request.continuation.kind === "resume"
       ? request.continuation.prompt
       : (() => {
           const _exhaustive: never = request.continuation;
           return _exhaustive;
         })();
+  const prompt = applyPiNativeSkillInvocation(request.methods, rawPrompt);
   return [
     "--no-skills",
     ...buildMethodArgs(request.methods),

package/src/public-cli/invocation.ts

@@ -3071,16 +3071,15 @@ export async function admitMergerInvocation(
 }
 
 /**
- * Build the Pi prompt transport for an admitted Merger request.
- * Every invocation forces package merge-only method expansion before conflict work.
+ * Build the host-neutral prompt transport for an admitted Merger request.
+ * Method material binds on RoleTurnRequest.methods; Pi-native `/skill:` form
+ * is adapter-internal only (ADR 0082).
  */
 export function buildMergerTransportPrompt(
   admitted: AdmittedMergerInvocation,
   engineMaterial?: EngineSessionMaterial,
 ): string {
-  const lines: string[] = [
-    `/skill:resolving-merge-conflicts ${admitted.instruction}`,
-  ];
+  const lines: string[] = [admitted.instruction];
   if (admitted.attachments.length > 0) {
     lines.push("");
     lines.push("已受理附件（冻结快照路径）：");

package/src/role-runtime.ts

@@ -1227,19 +1227,19 @@ export function createRoleRuntimeExtension(
     roleHost.on("input", (event) => {
       const role = roleHost.getFlag(ROLE_FLAG.name);
       if (role !== undefined && !admitted) return { action: "handled" as const };
-      // Envelope exclusively owns Reviewer Skill invocation transform + original-request capture.
+      // Reviewer: recover original request; Pi argv may already carry native form.
       if (
         role === "reviewer"
         && admitted
         && activeReviewerParent !== undefined
         && reviewerOriginalRequest === undefined
       ) {
-        reviewerOriginalRequest = event.text;
-        return {
-          action: "transform" as const,
-          text: activeReviewerParent.skillBinding.invocation(event.text),
-          ...(event.images === undefined ? {} : { images: event.images }),
-        };
+        reviewerOriginalRequest =
+          roleHost.capabilities?.skillOriginalRequest?.(
+            activeReviewerParent.skillBinding.name,
+            event.text,
+          ) ?? event.text;
+        return { action: "continue" as const };
       }
       return { action: "continue" as const };
     });

package/src/worker-role.ts

@@ -347,6 +347,12 @@ export function createCoderRoleRuntime(
 
   return {
     async activate(ctx) {
+      // Each activation owns its own Skill capture state; prior-session flags must
+      // not authorize a later apply completed (same RoleHost, sequential activate).
+      tddInvocationInjected = false;
+      originalRequest = undefined;
+      expansionPending = false;
+      expansionCaptured = false;
       soul = (await dependencies.loadSoul()).trim();
       if (soul.length === 0) throw new Error("Coder soul is empty");
       const selectedPhase = pi.getFlag("ak-coder-phase");
@@ -433,19 +439,14 @@ export function createCoderRoleRuntime(
           }
           tddInvocationInjected = true;
           expansionPending = true;
-          const isNativeTdd =
-            event.text === "/skill:tdd" ||
-            event.text.startsWith("/skill:tdd ");
-          if (isNativeTdd) {
-            originalRequest = event.text.slice("/skill:tdd".length).trim();
-            return { action: "continue" as const };
-          }
-          originalRequest = event.text.trim();
-          return {
-            action: "transform" as const,
-            text: binding?.invocation(event.text) ?? `/skill:tdd ${event.text}`,
-            ...(event.images === undefined ? {} : { images: event.images }),
-          };
+          // Original request via host capability when Pi argv already carries native form;
+          // non-pi keeps plain original bytes (no consumer trim; #822 r3 / reviewer-aligned).
+          // Role never emits or parses `/skill:` (ADR 0082).
+          originalRequest = binding === undefined
+            ? event.text
+            : (pi.capabilities?.skillOriginalRequest?.(binding.name, event.text)
+              ?? event.text);
+          return { action: "continue" as const };
         });
         pi.on("before_agent_start", (event, ctx) => {
           if (soul === undefined) throw new Error("将作监职分未装载");