@akagilnc/pi-workflow-roles 0.1.3826 → 0.1.3837

package/dist/headless-host/production-host.js

@@ -1913,6 +1913,7 @@ var role_turn_host_exports = {};
 __export(role_turn_host_exports, {
   EXPLICIT_INTERNAL_LOAD_PROBE_ARGS: () => EXPLICIT_INTERNAL_LOAD_PROBE_ARGS,
   appendPiSessionCustomEntry: () => appendPiSessionCustomEntry,
+  applyPiNativeSkillInvocation: () => applyPiNativeSkillInvocation,
   buildExplicitInternalActivationArgs: () => buildExplicitInternalActivationArgs,
   buildPiTurnExtraArgs: () => buildPiTurnExtraArgs,
   createDefaultPiSpawnRunner: () => createDefaultPiSpawnRunner,
@@ -1922,7 +1923,7 @@ __export(role_turn_host_exports, {
 import { execFile, spawn as spawn3 } from "node:child_process";
 import { constants } from "node:fs";
 import { access, appendFile, readFile as readFile4, realpath as realpath2 } from "node:fs/promises";
-import { delimiter, isAbsolute as isAbsolute3, join as join7, resolve as resolve6 } from "node:path";
+import { basename as basename4, delimiter, dirname as dirname6, isAbsolute as isAbsolute3, join as join7, resolve as resolve6 } from "node:path";
 import { platform } from "node:process";
 import { promisify } from "node:util";
 import { randomUUID as randomUUID2 } from "node:crypto";
@@ -2030,12 +2031,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),
@@ -3946,7 +3961,7 @@ var init_terminating_tools = __esm({
 
 // src/doctor-evidence.ts
 import { readdir, readFile as readFile6, realpath as realpath3, stat } from "node:fs/promises";
-import { dirname as dirname6, relative as relative2, resolve as resolve7, sep as sep2 } from "node:path";
+import { dirname as dirname7, relative as relative2, resolve as resolve7, sep as sep2 } from "node:path";
 function record3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -3985,7 +4000,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;
   }
@@ -5433,7 +5448,7 @@ __export(notary_source_run_exports, {
   loadNotarySourceRunLocator: () => loadNotarySourceRunLocator,
   resolveNotarySourceRunLocator: () => resolveNotarySourceRunLocator
 });
-import { dirname as dirname7, isAbsolute as isAbsolute5, join as join12, resolve as resolve8, basename as basename4 } from "node:path";
+import { dirname as dirname8, isAbsolute as isAbsolute5, join as join12, resolve as resolve8, basename as basename5 } from "node:path";
 import { lstat as lstat2, realpath as realpath4 } from "node:fs/promises";
 function parseRunDirectoryName(name) {
   const match = RUN_DIR_NAME.exec(name);
@@ -5464,10 +5479,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;
@@ -5488,9 +5503,9 @@ async function resolveNotarySourceRunLocator(options) {
     candidate = isAbsolute5(raw) ? raw : resolve8(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"
@@ -5525,7 +5540,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(
@@ -6631,7 +6646,7 @@ import {
   realpath as realpath5,
   writeFile as writeFile4
 } from "node:fs/promises";
-import { basename as basename5, isAbsolute as isAbsolute6, join as join13, resolve as resolve9, sep as sep3 } from "node:path";
+import { basename as basename6, isAbsolute as isAbsolute6, join as join13, resolve as resolve9, sep as sep3 } from "node:path";
 function issueAdmissionPlacement(authority, request) {
   const principal = authority.issue(request);
   const { sessionDirectory, sessionFile } = authority.decode(principal);
@@ -7070,7 +7085,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 = join13(destinationDir, name);
   await writeFile4(frozenPath, bytes);
   return {
@@ -8525,9 +8540,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");
@@ -9568,7 +9581,7 @@ __export(config_exports, {
   validatePublicCliConfigAxes: () => validatePublicCliConfigAxes
 });
 import { mkdir as mkdir2, readFile as readFile10, writeFile as writeFile5 } from "node:fs/promises";
-import { dirname as dirname8, join as join17 } from "node:path";
+import { dirname as dirname9, join as join17 } from "node:path";
 function isGateOfficerSeat(value) {
   return GATE_OFFICER_SEATS.includes(value);
 }
@@ -9592,7 +9605,7 @@ async function loadPublicCliConfig(home) {
 }
 async function savePublicCliConfig(config, home) {
   const path = publicCliConfigPath(home);
-  await mkdir2(dirname8(path), { recursive: true });
+  await mkdir2(dirname9(path), { recursive: true });
   const normalized = parsePublicCliConfig(config);
   await writeFile5(
     path,
@@ -10329,7 +10342,7 @@ var init_case_dossier_delivery = __esm({
 
 // src/host-transition-prior-native.ts
 import { access as access2, readdir as readdir3 } from "node:fs/promises";
-import { dirname as dirname9, join as join19 } from "node:path";
+import { dirname as dirname10, join as join19 } from "node:path";
 function isEnoent2(error) {
   return typeof error === "object" && error !== null && error.code === "ENOENT";
 }
@@ -10343,7 +10356,7 @@ async function listPiNativeRecordPaths(sessionFile) {
   }
 }
 async function listSitianRecordPaths(sessionParent) {
-  const sessionRoot = dirname9(sessionParent);
+  const sessionRoot = dirname10(sessionParent);
   let entries;
   try {
     entries = await readdir3(sessionRoot, { withFileTypes: true });
@@ -10421,9 +10434,9 @@ var init_public_run_credentials = __esm({
 });
 
 // src/run-terminal-artifacts.ts
-import { basename as basename6, dirname as dirname10, join as join20 } from "node:path";
+import { basename as basename7, dirname as dirname11, join as join20 } from "node:path";
 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);
@@ -11131,15 +11144,15 @@ var init_analyst_gate_cycles_read = __esm({
 // src/session-opening-materials.ts
 import { existsSync as existsSync7 } from "node:fs";
 import { readFile as readFile12 } from "node:fs/promises";
-import { dirname as dirname11, join as join22 } from "node:path";
+import { dirname as dirname12, join as join22 } from "node:path";
 import { fileURLToPath, pathToFileURL as pathToFileURL3 } from "node:url";
 function resolvePackageRootDir(moduleUrl = import.meta.url) {
-  let dir = dirname11(fileURLToPath(moduleUrl));
+  let dir = dirname12(fileURLToPath(moduleUrl));
   for (let i = 0; i < 8; i += 1) {
     if (existsSync7(join22(dir, "package.json")) && existsSync7(join22(dir, "souls"))) {
       return dir;
     }
-    const parent = dirname11(dir);
+    const parent = dirname12(dir);
     if (parent === dir) break;
     dir = parent;
   }
@@ -14066,7 +14079,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 writeFile6 } from "node:fs/promises";
-import { dirname as dirname12, join as join25 } from "node:path";
+import { dirname as dirname13, join as join25 } from "node:path";
 function sealedLedgerHome(admitted) {
   return homeFromRunDirectory(admitted.runDirectory);
 }
@@ -14455,7 +14468,7 @@ async function readSitianRetainedAuditorProviderStop(sessionFile) {
       kind: "auditor",
       sessionParent: sessionFile,
       // Path is driven by sessionParent when under ledger home; cwd is a fallback only.
-      cwd: dirname12(sessionFile)
+      cwd: dirname13(sessionFile)
     });
     const { records: records2 } = await readSitianRecords(recordFile);
     for (let i = records2.length - 1; i >= 0; i -= 1) {
@@ -14481,7 +14494,7 @@ async function readSessionProviderStop(sessionFile) {
   }
 }
 async function readBoundEvidenceChildKnownFailure(sessionFile) {
-  const childDirectory = join25(dirname12(sessionFile), "evidence-children");
+  const childDirectory = join25(dirname13(sessionFile), "evidence-children");
   let names;
   try {
     names = await readdir5(childDirectory);
@@ -14546,7 +14559,7 @@ async function loadBoundAuditorVolumes(sessionFile) {
     latestParentUserIndex = i;
     break;
   }
-  const childDirectories = [join25(dirname12(sessionFile), "auditor-roles")];
+  const childDirectories = [join25(dirname13(sessionFile), "auditor-roles")];
   const valid = [];
   let sawAnyDirectory = false;
   for (const childDirectory of childDirectories) {
@@ -15495,7 +15508,7 @@ function publicationAttemptFromError(path, error) {
 }
 function uniqueFailureFallbackDirs(runDirectory, baseDir) {
   const dirs = [];
-  for (const dir of [baseDir, runDirectory, dirname12(runDirectory)]) {
+  for (const dir of [baseDir, runDirectory, dirname13(runDirectory)]) {
     if (!dirs.includes(dir)) dirs.push(dir);
   }
   return dirs;
@@ -18452,7 +18465,7 @@ __export(archivist_record_entry_exports, {
   subjectKeyedRecordDirectory: () => subjectKeyedRecordDirectory
 });
 import { existsSync as existsSync10, mkdirSync as mkdirSync4, readFileSync as readFileSync3, realpathSync as realpathSync2, writeFileSync as writeFileSync5 } from "node:fs";
-import { dirname as dirname13, resolve as resolve13, join as join30 } from "node:path";
+import { dirname as dirname14, resolve as resolve13, join as join30 } from "node:path";
 import { SessionManager } from "@earendil-works/pi-coding-agent";
 function readCurrentSession(sessionDir) {
   const ledger = join30(sessionDir, CURRENT_SESSION_LEDGER);
@@ -18531,7 +18544,7 @@ function createRecordSessionOpen(options) {
     return { session: SessionManager.inMemory(cwd), resumed: false };
   } else {
     const parentResolved = resolve13(parentFile);
-    sessionDir = physicallyContainedIn(ledgerHome, parentResolved) ? join30(dirname13(parentResolved), options.kind) : join30(activationBookDirectory(ledgerHome, resolveBookKeyFromGit(cwd)), options.kind);
+    sessionDir = physicallyContainedIn(ledgerHome, parentResolved) ? join30(dirname14(parentResolved), options.kind) : join30(activationBookDirectory(ledgerHome, resolveBookKeyFromGit(cwd)), options.kind);
     parentSession = parentFile;
   }
   const nestAlreadyExists = existsSync10(sessionDir);
@@ -18570,7 +18583,7 @@ function createRecordSession(options) {
   return createRecordSessionOpen(options).session;
 }
 function bookDirectOfficerRunPointer(options) {
-  const nest = join30(dirname13(options.parentSessionFile), "auditor-roles");
+  const nest = join30(dirname14(options.parentSessionFile), "auditor-roles");
   mkdirSync4(nest, { recursive: true });
   const pointer = {
     version: 1,
@@ -20001,7 +20014,7 @@ import {
   openSync,
   writeSync
 } from "node:fs";
-import { dirname as dirname16, isAbsolute as isAbsolute9, resolve as resolve17 } from "node:path";
+import { dirname as dirname17, isAbsolute as isAbsolute9, resolve as resolve17 } from "node:path";
 function correlationIdentityFromEnv(env = process.env) {
   const raw = env.AK_CORRELATION_ID;
   if (typeof raw === "string" && raw.trim().length > 0) {
@@ -20037,7 +20050,7 @@ function appendActivationLedgerLine(ledgerPath, line2, options) {
   }
   const resolvedLedger = resolve17(ledgerPath);
   const resolvedHome = resolve17(options.ledgerHome);
-  const parent = dirname16(resolvedLedger);
+  const parent = dirname17(resolvedLedger);
   ensureRealDirectoryTree(resolvedHome, parent);
   assertLedgerFileInsideHome(resolvedLedger, resolvedHome);
   if (typeof constants2.O_NOFOLLOW !== "number") {
@@ -20281,9 +20294,9 @@ var init_tool_execution_observation = __esm({
 // src/atomic-write.ts
 import { randomUUID as randomUUID6 } from "node:crypto";
 import { rename, rm as rm2, writeFile as writeFile8 } from "node:fs/promises";
-import { dirname as dirname17, join as join32 } from "node:path";
+import { dirname as dirname18, join as join32 } from "node:path";
 async function writeFileAtomically(destination, contents) {
-  const parent = dirname17(destination);
+  const parent = dirname18(destination);
   const temporary = join32(parent, `.atomic-write-${randomUUID6()}.tmp`);
   try {
     await writeFile8(temporary, contents);
@@ -22573,6 +22586,10 @@ function createCoderRoleRuntime(pi, dependencies, hostActions) {
   });
   return {
     async activate(ctx) {
+      tddInvocationInjected = false;
+      originalRequest = void 0;
+      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");
@@ -22655,17 +22672,8 @@ 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 === void 0 ? {} : { images: event.images }
-          };
+          originalRequest = binding === void 0 ? event.text : pi.capabilities?.skillOriginalRequest?.(binding.name, event.text) ?? event.text;
+          return { action: "continue" };
         });
         pi.on("before_agent_start", (event, ctx2) => {
           if (soul === void 0) throw new Error("\u5C06\u4F5C\u76D1\u804C\u5206\u672A\u88C5\u8F7D");
@@ -23438,12 +23446,11 @@ function createRoleRuntimeExtension(dependencies) {
       const role = roleHost.getFlag(ROLE_FLAG.name);
       if (role !== void 0 && !admitted) return { action: "handled" };
       if (role === "reviewer" && admitted && activeReviewerParent !== void 0 && reviewerOriginalRequest === void 0) {
-        reviewerOriginalRequest = event.text;
-        return {
-          action: "transform",
-          text: activeReviewerParent.skillBinding.invocation(event.text),
-          ...event.images === void 0 ? {} : { images: event.images }
-        };
+        reviewerOriginalRequest = roleHost.capabilities?.skillOriginalRequest?.(
+          activeReviewerParent.skillBinding.name,
+          event.text
+        ) ?? event.text;
+        return { action: "continue" };
       }
       return { action: "continue" };
     });
@@ -24434,6 +24441,16 @@ function createPiRoleHostAdapter(pi, options = {}) {
           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}
+`)) {
+          return text.slice(text.indexOf(token) + token.length).trim();
+        }
+        return text.trim();
       }
     },
     registerFlag: (name, definition) => pi.registerFlag(name, definition),
@@ -25758,9 +25775,6 @@ async function loadCanonicalSkillBinding(name) {
   const binding = {
     name,
     snapshot,
-    invocation(originalRequest) {
-      return `/skill:${name} ${originalRequest}`;
-    },
     captureExpansion(evidence, originalRequest) {
       return captureCanonicalSkillExpansion(
         name,
@@ -25879,7 +25893,7 @@ async function loadNavigatorWorkContext(options) {
 init_notary_source_run();
 
 // src/package-resources/method-skill-binding.ts
-import { dirname as dirname15 } from "node:path";
+import { dirname as dirname16 } from "node:path";
 init_method_skill();
 async function loadPackagedCanonicalSkillBinding(packageRoot, name) {
   const material = await loadPackagedMethodSkillMaterial(packageRoot, name);
@@ -25887,16 +25901,13 @@ async function loadPackagedCanonicalSkillBinding(packageRoot, name) {
   const snapshot = Object.freeze({
     raw: material.raw,
     path: material.skillPath,
-    baseDir: dirname15(material.skillPath),
+    baseDir: dirname16(material.skillPath),
     body: material.body,
     snapshotIdentity: Object.freeze({ text: material.raw })
   });
   const binding = {
     name,
     snapshot,
-    invocation(originalRequest) {
-      return `/skill:${name} ${originalRequest}`;
-    },
     captureExpansion(evidence, originalRequest) {
       return captureCanonicalSkillExpansion(
         name,
@@ -25925,7 +25936,7 @@ init_role_runtime();
 import { randomUUID as randomUUID7 } from "node:crypto";
 import { mkdir as mkdir5, readFile as readFile19, writeFile as writeFile9 } from "node:fs/promises";
 import { createServer } from "node:net";
-import { basename as basename7, dirname as dirname18, join as join37 } from "node:path";
+import { basename as basename8, dirname as dirname19, join as join37 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // src/acp-host/role-turn-host.ts
@@ -25937,23 +25948,19 @@ function renderAcpSystemPromptOverride(authority) {
 // src/acp-host/role-envelope.ts
 init_submission_correctable_error();
 init_navigator_invocation_identity();
-function parseCanonicalSkillInvocation(prompt) {
-  const match = /^\/skill:([A-Za-z0-9_-]+)(?:\s+([\s\S]*))?$/s.exec(prompt.trim());
-  if (match === null) return void 0;
-  return { name: match[1], userMessage: (match[2] ?? "").trim() };
-}
 function buildAcpSkillExpansion(methodSkills, prompt) {
-  const parsed = parseCanonicalSkillInvocation(prompt);
-  if (parsed === void 0) return void 0;
-  const method = methodSkills.get(parsed.name);
-  if (method === void 0) return void 0;
+  if (methodSkills.size !== 1) return void 0;
+  const entry = methodSkills.entries().next().value;
+  if (entry === void 0) return void 0;
+  const [name, method] = entry;
   return Object.freeze({
-    name: parsed.name,
+    name,
     location: method.path,
-    content: `References are relative to ${dirname18(method.path)}.
+    content: `References are relative to ${dirname19(method.path)}.
 
 ${method.body}`,
-    userMessage: parsed.userMessage
+    // Non-pi typed chain keeps original task bytes (ticket #822 r3); no consumer trim.
+    userMessage: prompt
   });
 }
 function projectAcpActivationFlags(request) {
@@ -26027,12 +26034,12 @@ async function prepareAcpRoleEnvelope(options) {
   await mkdir5(request.runDirectory, { recursive: true });
   for (const method of request.methods) {
     if (method.kind !== "skill") continue;
-    const name = basename7(dirname18(method.path));
+    const name = basename8(dirname19(method.path));
     const raw = await readFile19(method.path, "utf8");
     methodSkills.set(name, { path: method.path, body: stripSkillFrontmatter(raw).trim() });
   }
   let sessionFile = options.sessionFile ?? join37(request.runDirectory, "session", "session.jsonl");
-  await mkdir5(dirname18(sessionFile), { recursive: true });
+  await mkdir5(dirname19(sessionFile), { recursive: true });
   if (request.continuation.kind !== "resume") {
     try {
       await writeFile9(
@@ -26059,7 +26066,7 @@ async function prepareAcpRoleEnvelope(options) {
       getLeafEntry: () => sessionEntries.at(-1),
       getLeafId: () => runId,
       getEntries: () => sessionEntries,
-      getSessionDir: () => dirname18(sessionFile),
+      getSessionDir: () => dirname19(sessionFile),
       getSessionFile: () => sessionFile,
       getHeader: () => ({ type: "session", id: runId }),
       setSessionFile(path) {
@@ -26517,7 +26524,7 @@ async function prepareAcpRoleEnvelope(options) {
 
 // src/acp-host/session-identity.ts
 import { mkdir as mkdir6, readFile as readFile20, rename as rename2, writeFile as writeFile10 } from "node:fs/promises";
-import { dirname as dirname19, join as join38 } from "node:path";
+import { dirname as dirname20, join as join38 } from "node:path";
 function createAcpSessionIdentityAuthority(authority, sessionBindingFile) {
   const bindingPath = (principal) => join38(authority.decode(principal).sessionDirectory, sessionBindingFile);
   return {
@@ -26538,7 +26545,7 @@ function createAcpSessionIdentityAuthority(authority, sessionBindingFile) {
     },
     async bind(principal, sessionId) {
       const target = bindingPath(principal);
-      await mkdir6(dirname19(target), { recursive: true });
+      await mkdir6(dirname20(target), { recursive: true });
       const temporary = `${target}.${process.pid}.tmp`;
       await writeFile10(temporary, `${JSON.stringify({ sessionId })}
 `, { encoding: "utf8", mode: 384 });

package/dist/pi/adapter.js

@@ -106,6 +106,17 @@ export function createPiRoleHostAdapter(pi, options = {}) {
                     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/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 { 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";
@@ -144,18 +144,41 @@ function buildMethodArgs(methods) {
     }
     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, 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}`;
+}
 /**
  * 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, authority, extraPiArgs = []) {
     const { sessionFile, sessionDirectory } = authority.decode(request.principal);
-    const prompt = request.continuation.kind === "initial" || request.continuation.kind === "resume"
+    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),

package/dist/public-cli/invocation.js

@@ -2025,13 +2025,12 @@ export async function admitMergerInvocation(options) {
     };
 }
 /**
- * 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, engineMaterial) {
-    const lines = [
-        `/skill:resolving-merge-conflicts ${admitted.instruction}`,
-    ];
+    const lines = [admitted.instruction];
     if (admitted.attachments.length > 0) {
         lines.push("");
         lines.push("已受理附件（冻结快照路径）：");