@akagilnc/pi-workflow-roles 0.1.4659 → 0.1.4673

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

@@ -1778,10 +1778,10 @@ __export(session_assistant_usage_exports, {
 });
 import { join as join6 } from "node:path";
 async function readAssistantUsageFromSessionFile(sessionFile) {
-  const { readFile: readFile24 } = await import("node:fs/promises");
+  const { readFile: readFile25 } = await import("node:fs/promises");
   let text;
   try {
-    text = await readFile24(sessionFile, "utf8");
+    text = await readFile25(sessionFile, "utf8");
   } catch (error) {
     if (error?.code === "ENOENT") return void 0;
     throw error;
@@ -11423,10 +11423,10 @@ function pairGateRounds(volumes) {
   return rounds.sort((a, b) => a.officerStartedAt.localeCompare(b.officerStartedAt)).map((round, index) => ({ ...round, roundIndex: index + 1 }));
 }
 async function resolveOfficerSessionFromPointerFile(pointerPath) {
-  const { readFile: readFile24 } = await import("node:fs/promises");
+  const { readFile: readFile25 } = await import("node:fs/promises");
   let raw;
   try {
-    raw = JSON.parse(await readFile24(pointerPath, "utf8"));
+    raw = JSON.parse(await readFile25(pointerPath, "utf8"));
   } catch (error) {
     throw new Error(
       `direct officer run pointer unreadable in ${pointerPath}: ${error instanceof Error ? error.message : String(error)}`,
@@ -22739,7 +22739,6 @@ function createNativeNavigatorSessionFactory(deps) {
     let providerFailure;
     let noReceipt;
     let disposed = false;
-    let inFlightPrompt;
     let hostRunId = readNavigatorHostRunPointer(sessionManager.getEntries());
     const summon = deps?.summonPublicRole ?? (async (options) => {
       const { summonPublicRole: summonPublicRole2 } = await Promise.resolve().then(() => (init_public_role_summons(), public_role_summons_exports));
@@ -22752,85 +22751,87 @@ function createNativeNavigatorSessionFactory(deps) {
         }
         providerFailure = void 0;
         noReceipt = void 0;
-        const run = (async () => {
-          try {
-            const summonHome = await resolveNavigatorLedgerHome(context);
-            const resumeRunId = hostRunId;
-            const baseSummon = {
-              role: "navigator",
-              argv: [text],
-              cwd: context.cwd,
-              ...summonHome === void 0 ? {} : { home: summonHome }
-            };
-            const resumable = deps?.hostRunResumable ?? navigatorHostRunResumable;
-            let summoned;
-            if (resumeRunId === void 0 || summonHome === void 0) {
-              summoned = await summon(baseSummon);
-            } else if (await resumable(summonHome, resumeRunId)) {
+        try {
+          const summonHome = await resolveNavigatorLedgerHome(context);
+          if (disposed) return;
+          const resumeRunId = hostRunId;
+          const baseSummon = {
+            role: "navigator",
+            argv: [text],
+            cwd: context.cwd,
+            ...summonHome === void 0 ? {} : { home: summonHome },
+            ...context.signal === void 0 ? {} : { signal: context.signal }
+          };
+          const resumable = deps?.hostRunResumable ?? navigatorHostRunResumable;
+          let summoned;
+          if (resumeRunId === void 0 || summonHome === void 0) {
+            if (disposed) return;
+            summoned = await summon(baseSummon);
+          } else {
+            const canResume = await resumable(summonHome, resumeRunId);
+            if (disposed) return;
+            if (canResume) {
               summoned = await summon({ ...baseSummon, resumeRunId });
             } else {
               hostRunId = void 0;
               summoned = await summon(baseSummon);
             }
-            const outcome = summoned.terminal?.roleOutcome;
-            if (outcome === void 0) {
-              const detail = summoned.stderr?.trim() || `exit ${summoned.exitCode}`;
-              providerFailure = { source: "transport", cause: "unknown" };
-              throw navigatorUnavailableError(
-                providerFailure.source,
-                new Error(`Navigator public summon produced no terminal (${detail})`),
-                providerFailure.cause
-              );
-            }
-            if (outcome.kind === "failure") {
-              providerFailure = navigatorProviderFailureFromPublicTerminal(outcome);
-              throw navigatorUnavailableError(
-                providerFailure.source,
-                new Error(outcome.diagnostic),
-                providerFailure.cause
-              );
-            }
-            if (outcome.kind === "no_receipt") {
-              noReceipt = outcome;
-              return;
-            }
-            const runDirectory = summoned.runDirectory ?? (typeof summoned.admitted?.runDirectory === "string" ? summoned.admitted.runDirectory : void 0);
-            if (typeof runDirectory === "string" && runDirectory.trim() !== "") {
-              const nextRunId = runIdFromNavigatorDirectory(runDirectory);
-              if (nextRunId !== void 0) {
-                hostRunId = nextRunId;
-                sessionManager.appendCustomEntry(NAVIGATOR_HOST_RUN_POINTER_ENTRY, { runId: nextRunId });
-              }
-            }
-            if (outcome.kind !== "accepted") {
-              return;
-            }
-            const { navigatorProseFromUnknown: navigatorProseFromUnknown2 } = await Promise.resolve().then(() => (init_navigator_output(), navigator_output_exports));
-            const proseParts = [];
-            for (const payload of outcome.payloads ?? []) {
-              const prose = navigatorProseFromUnknown2(payload);
-              if (prose !== void 0) proseParts.push(prose);
-            }
-            if (proseParts.length === 0) return;
-            await tool.execute(
-              "navigator-public-prepare",
-              { prose: proseParts.join("\n\n") },
-              void 0,
-              void 0,
-              context
+          }
+          if (disposed) return;
+          const outcome = summoned.terminal?.roleOutcome;
+          if (outcome === void 0) {
+            const detail = summoned.stderr?.trim() || `exit ${summoned.exitCode}`;
+            providerFailure = { source: "transport", cause: "unknown" };
+            throw navigatorUnavailableError(
+              providerFailure.source,
+              new Error(`Navigator public summon produced no terminal (${detail})`),
+              providerFailure.cause
             );
-          } catch (error) {
-            if (error instanceof NavigatorUnavailableError) throw error;
-            const fact = navigatorProviderFailureFromError(error);
-            providerFailure = fact ?? { source: "transport", cause: "unknown" };
-            throw navigatorUnavailableError(providerFailure.source, error, providerFailure.cause);
           }
-        })();
-        inFlightPrompt = run;
-        try {
-          await run;
-        } finally {
-          if (inFlightPrompt === run) inFlightPrompt = void 0;
+          if (outcome.kind === "failure") {
+            providerFailure = navigatorProviderFailureFromPublicTerminal(outcome);
+            throw navigatorUnavailableError(
+              providerFailure.source,
+              new Error(outcome.diagnostic),
+              providerFailure.cause
+            );
+          }
+          if (outcome.kind === "no_receipt") {
+            noReceipt = outcome;
+            return;
+          }
+          const runDirectory = summoned.runDirectory ?? (typeof summoned.admitted?.runDirectory === "string" ? summoned.admitted.runDirectory : void 0);
+          if (typeof runDirectory === "string" && runDirectory.trim() !== "") {
+            const nextRunId = runIdFromNavigatorDirectory(runDirectory);
+            if (nextRunId !== void 0) {
+              hostRunId = nextRunId;
+              sessionManager.appendCustomEntry(NAVIGATOR_HOST_RUN_POINTER_ENTRY, { runId: nextRunId });
+            }
+          }
+          if (outcome.kind !== "accepted") {
+            return;
+          }
+          const { navigatorProseFromUnknown: navigatorProseFromUnknown2 } = await Promise.resolve().then(() => (init_navigator_output(), navigator_output_exports));
+          const proseParts = [];
+          for (const payload of outcome.payloads ?? []) {
+            const prose = navigatorProseFromUnknown2(payload);
+            if (prose !== void 0) proseParts.push(prose);
+          }
+          if (proseParts.length === 0) return;
+          if (disposed) return;
+          await tool.execute(
+            "navigator-public-prepare",
+            { prose: proseParts.join("\n\n") },
+            void 0,
+            void 0,
+            context
+          );
+        } catch (error) {
+          if (disposed) return;
+          if (error instanceof NavigatorUnavailableError) throw error;
+          const fact = navigatorProviderFailureFromError(error);
+          providerFailure = fact ?? { source: "transport", cause: "unknown" };
+          throw navigatorUnavailableError(providerFailure.source, error, providerFailure.cause);
         }
       },
       providerFailure: () => providerFailure,
@@ -22863,8 +22864,6 @@ function createNativeNavigatorSessionFactory(deps) {
       recordPointer: () => sessionManager.getSessionDir(),
       dispose: async () => {
         disposed = true;
-        const pending = inFlightPrompt;
-        if (pending !== void 0) await pending.catch(() => void 0);
       }
     };
   };
@@ -22976,7 +22975,14 @@ function createNavigatorAttendance(options) {
   let preparationFailure;
   let routePlaybookReadFailure;
   let disposed = false;
+  let closing;
+  const nestCancel = new AbortController();
   let warmedHelp;
+  const sessionHostContext = () => {
+    const parentSignal = options.context.signal;
+    const signal = parentSignal === void 0 ? nestCancel.signal : AbortSignal.any([nestCancel.signal, parentSignal]);
+    return { ...options.context, signal };
+  };
   const loadLiveHelp = async () => {
     try {
       return await Promise.all(
@@ -23066,7 +23072,7 @@ ${text}
         let created;
         try {
           created = await options.createSession({
-            context: options.context,
+            context: sessionHostContext(),
             subject: subjectKey,
             ...options.modelSettingPath === void 0 ? {} : { modelSettingPath: options.modelSettingPath },
             tool
@@ -23263,17 +23269,17 @@ ${helpContext}
   };
   return {
     setWorkContext(next) {
-      let closing;
+      let closing2;
       if (next.subjectKey !== subjectKey && session !== void 0) {
         const previous = session;
         session = void 0;
-        closing = previous.dispose();
+        closing2 = previous.dispose();
       }
       subjectKey = next.subjectKey;
       subject = next.subject;
       authority = next.authority;
       contextError = next.contextError;
-      return closing;
+      return closing2;
     },
     /**
      * Start live-help subprocesses during activation without beginning full
@@ -23311,10 +23317,19 @@ ${helpContext}
     },
     dispose() {
       disposed = true;
-      const current = session;
-      session = void 0;
+      if (!nestCancel.signal.aborted) {
+        nestCancel.abort(navigatorUnavailableError(
+          "session",
+          new Error("Navigator attendance was disposed")
+        ));
+      }
       activeInvocationId = void 0;
-      return current?.dispose();
+      if (closing === void 0) {
+        const current = session;
+        session = void 0;
+        closing = Promise.resolve(current?.dispose()).then(() => void 0);
+      }
+      return closing;
     }
   };
   async function settleOnce(settlement) {
@@ -26903,6 +26918,38 @@ function createRoleRuntimeExtension(dependencies) {
     let noReceiptRecorded = false;
     let priorFetch;
     let fetchWrapped = false;
+    const disposeNavigatorAttendanceNonBlocking = (attendance) => {
+      if (attendance === void 0) return;
+      const recordDisposeFailure = (error) => {
+        const diagnostic = error instanceof Error ? error.message : String(error);
+        try {
+          sitianReport({
+            level: "event",
+            kind: "navigator-dispose-failure",
+            cwd: navigatorCwd,
+            sessionParent: navigatorSessionParent,
+            payload: { diagnostic },
+            source: "role-runtime"
+          });
+        } catch (recordError) {
+          try {
+            envelopeHost.appendEntry?.("ak-navigator-dispose-failure", {
+              diagnostic,
+              recordFailure: recordError instanceof Error ? recordError.message : String(recordError)
+            });
+          } catch {
+          }
+        }
+      };
+      let pending;
+      try {
+        pending = attendance.dispose();
+      } catch (error) {
+        recordDisposeFailure(error);
+        return;
+      }
+      void Promise.resolve(pending).then(void 0, recordDisposeFailure);
+    };
     const settleNavigatorProjection = async (settlement) => {
       const attendance = navigatorAttendance;
       if (settlement === void 0 || attendance === void 0) return;
@@ -26935,27 +26982,7 @@ function createRoleRuntimeExtension(dependencies) {
           };
           pendingNavigatorPresentation = { event, report };
         }
-        void Promise.resolve(attendance.dispose()).then(
-          void 0,
-          (error) => {
-            const diagnostic = error instanceof Error ? error.message : String(error);
-            try {
-              sitianReport({
-                level: "event",
-                kind: "navigator-dispose-failure",
-                cwd: navigatorCwd,
-                sessionParent: navigatorSessionParent,
-                payload: { diagnostic },
-                source: "role-runtime"
-              });
-            } catch (recordError) {
-              envelopeHost.appendEntry?.("ak-navigator-dispose-failure", {
-                diagnostic,
-                recordFailure: recordError instanceof Error ? recordError.message : String(recordError)
-              });
-            }
-          }
-        );
+        disposeNavigatorAttendanceNonBlocking(attendance);
       })();
       pendingNavigatorSettlement = pending;
       await pending;
@@ -27237,9 +27264,10 @@ function createRoleRuntimeExtension(dependencies) {
         } catch {
         }
       }
-      await navigatorAttendance?.dispose();
+      const attendanceToDispose = navigatorAttendance;
       navigatorAttendance = void 0;
       pendingNavigatorSettlement = void 0;
+      disposeNavigatorAttendanceNonBlocking(attendanceToDispose);
       pendingInfrastructureFailures.clear();
       pendingSubmissionNonPassByToolCallId.clear();
       observationFace.reset();
@@ -27910,7 +27938,7 @@ async function requireGatekeeperPass(options) {
 }
 
 // src/host-native-method.ts
-import { lstat as lstat7, mkdir as mkdir6, readlink, realpath as realpath8, symlink } from "node:fs/promises";
+import { access as access4, lstat as lstat7, mkdir as mkdir6, readdir as readdir9, readFile as readFile24, readlink, realpath as realpath8, symlink } from "node:fs/promises";
 import { basename as basename10, dirname as dirname22, join as join41 } from "node:path";
 var HOST_METHOD_PLUGIN_NAME = "ak-methods";
 var packagedMethodsDir = (root) => join41(root, "resources", "methods");
@@ -27942,25 +27970,103 @@ function applyCodexSkillInvocation(methods, prompt) {
     prompt
   );
 }
+var isEnoent4 = (error) => error.code === "ENOENT";
+async function packagedMethodSkillNames(packagedMethodsRealpath) {
+  const entries = await readdir9(packagedMethodsRealpath, { withFileTypes: true });
+  const names = [];
+  for (const entry of entries) {
+    if (!entry.isDirectory() && !entry.isSymbolicLink()) continue;
+    try {
+      await access4(join41(packagedMethodsRealpath, entry.name, "SKILL.md"));
+    } catch (error) {
+      if (isEnoent4(error)) continue;
+      throw error;
+    }
+    names.push(entry.name);
+  }
+  return names;
+}
+async function packagedSkillFileBytes(skillDir) {
+  try {
+    await access4(join41(skillDir, "SKILL.md"));
+  } catch (error) {
+    if (isEnoent4(error)) return void 0;
+    throw error;
+  }
+  const files = /* @__PURE__ */ new Map();
+  async function walk(dir, prefix) {
+    const entries = await readdir9(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      const rel = prefix === "" ? entry.name : `${prefix}/${entry.name}`;
+      const full = join41(dir, entry.name);
+      if (entry.isDirectory()) {
+        await walk(full, rel);
+        continue;
+      }
+      if (entry.isFile()) {
+        files.set(rel, await readFile24(full));
+      }
+    }
+  }
+  await walk(skillDir, "");
+  return files;
+}
+async function catalogPublishesPackagedSkill(catalogSkillDir, required) {
+  for (const [rel, bytes] of required) {
+    let other;
+    try {
+      other = await readFile24(join41(catalogSkillDir, rel));
+    } catch (error) {
+      if (isEnoent4(error)) return false;
+      throw error;
+    }
+    if (!bytes.equals(other)) return false;
+  }
+  return true;
+}
+async function isCompatibleMethodCatalog(link, packagedMethodsRealpath) {
+  const stat2 = await lstat7(link);
+  if (!stat2.isSymbolicLink()) return false;
+  let resolved;
+  try {
+    resolved = await realpath8(link);
+  } catch (error) {
+    if (isEnoent4(error)) return false;
+    throw error;
+  }
+  if (resolved === packagedMethodsRealpath) return true;
+  const names = await packagedMethodSkillNames(packagedMethodsRealpath);
+  if (names.length === 0) return false;
+  for (const name of names) {
+    const required = await packagedSkillFileBytes(join41(packagedMethodsRealpath, name));
+    if (required === void 0) return false;
+    if (!await catalogPublishesPackagedSkill(join41(resolved, name), required)) return false;
+  }
+  return true;
+}
 async function installWorkspaceMethodSkills(cwd, packageRoot) {
   const target = await realpath8(packagedMethodsDir(packageRoot));
   const link = join41(cwd, ".agents", "skills");
+  let present;
   try {
-    const stat2 = await lstat7(link);
-    if (!stat2.isSymbolicLink() || await realpath8(link) !== target) {
-      const detail = stat2.isSymbolicLink() ? `symlink to ${await readlink(link)}` : "non-symlink entry";
-      throw new Error(`workspace method catalog conflict at ${link}: ${detail}`);
-    }
-    return;
+    await lstat7(link);
+    present = true;
   } catch (error) {
-    if (error.code !== "ENOENT") throw error;
+    if (!isEnoent4(error)) throw error;
+    present = false;
+  }
+  if (present) {
+    if (await isCompatibleMethodCatalog(link, target)) return;
+    const stat2 = await lstat7(link);
+    const detail = stat2.isSymbolicLink() ? `symlink to ${await readlink(link)}` : "non-symlink entry";
+    throw new Error(`workspace method catalog conflict at ${link}: ${detail}`);
   }
   await mkdir6(dirname22(link), { recursive: true });
   try {
     await symlink(target, link);
   } catch (error) {
     if (error.code !== "EEXIST") throw error;
-    if (await realpath8(link).catch(() => "") !== target) {
+    if (!await isCompatibleMethodCatalog(link, target)) {
       throw new Error(`workspace method catalog conflict at ${link}`);
     }
   }

package/dist/navigator-attendance.js

@@ -138,7 +138,14 @@ function createNavigatorAttendance(options) {
   let preparationFailure;
   let routePlaybookReadFailure;
   let disposed = false;
+  let closing;
+  const nestCancel = new AbortController();
   let warmedHelp;
+  const sessionHostContext = () => {
+    const parentSignal = options.context.signal;
+    const signal = parentSignal === void 0 ? nestCancel.signal : AbortSignal.any([nestCancel.signal, parentSignal]);
+    return { ...options.context, signal };
+  };
   const loadLiveHelp = async () => {
     try {
       return await Promise.all(
@@ -228,7 +235,7 @@ ${text}
         let created;
         try {
           created = await options.createSession({
-            context: options.context,
+            context: sessionHostContext(),
             subject: subjectKey,
             ...options.modelSettingPath === void 0 ? {} : { modelSettingPath: options.modelSettingPath },
             tool
@@ -425,17 +432,17 @@ ${helpContext}
   };
   return {
     setWorkContext(next) {
-      let closing;
+      let closing2;
       if (next.subjectKey !== subjectKey && session !== void 0) {
         const previous = session;
         session = void 0;
-        closing = previous.dispose();
+        closing2 = previous.dispose();
       }
       subjectKey = next.subjectKey;
       subject = next.subject;
       authority = next.authority;
       contextError = next.contextError;
-      return closing;
+      return closing2;
     },
     /**
      * Start live-help subprocesses during activation without beginning full
@@ -473,10 +480,19 @@ ${helpContext}
     },
     dispose() {
       disposed = true;
-      const current = session;
-      session = void 0;
+      if (!nestCancel.signal.aborted) {
+        nestCancel.abort(navigatorUnavailableError(
+          "session",
+          new Error("Navigator attendance was disposed")
+        ));
+      }
       activeInvocationId = void 0;
-      return current?.dispose();
+      if (closing === void 0) {
+        const current = session;
+        session = void 0;
+        closing = Promise.resolve(current?.dispose()).then(() => void 0);
+      }
+      return closing;
     }
   };
   async function settleOnce(settlement) {