@akagilnc/pi-workflow-roles 0.1.4586 → 0.1.4631

package/dist/navigator-public-session.js

@@ -1,3 +1,4 @@
+import { basename } from "node:path";
 import { sitianReport } from "./sitian-facade.js";
 import {
   NavigatorUnavailableError,
@@ -7,6 +8,7 @@ import {
   parseNavigatorModelSetting
 } from "./navigator-session-contracts.js";
 import { runDirectoryFromHostContext } from "./host-contracts.js";
+import { CliUsageError } from "./public-cli/cli-errors.js";
 async function resolveNavigatorLedgerHome(context) {
   const { tryHomeFromAkRolesPath } = await import("./activation-ledger-topology.js");
   const runDirectory = runDirectoryFromHostContext(context);
@@ -21,7 +23,42 @@ async function resolveNavigatorLedgerHome(context) {
   }
   return void 0;
 }
-function createNativeNavigatorSessionFactory() {
+const NAVIGATOR_HOST_RUN_POINTER_ENTRY = "ak-navigator-host-run";
+function exactRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function runIdFromNavigatorDirectory(runDirectory) {
+  const entry = basename(runDirectory);
+  const suffix = "@navigator";
+  if (!entry.endsWith(suffix)) return void 0;
+  const runId = entry.slice(0, entry.length - suffix.length);
+  return runId.length > 0 ? runId : void 0;
+}
+function readNavigatorHostRunPointer(entries) {
+  for (let index = entries.length - 1; index >= 0; index -= 1) {
+    const entry = entries[index];
+    if (!exactRecord(entry)) continue;
+    if (entry.type === "custom" && entry.customType === NAVIGATOR_HOST_RUN_POINTER_ENTRY) {
+      const data = entry.data;
+      if (exactRecord(data) && typeof data.runId === "string" && data.runId.trim() !== "") {
+        return data.runId.trim();
+      }
+    }
+  }
+  return void 0;
+}
+async function navigatorHostRunResumable(home, runId) {
+  const { piDurablePrincipalAuthority } = await import("./pi/durable-principal.js");
+  const { loadResumableInstructionSeatRun } = await import("./public-cli/run-lifecycle.js");
+  try {
+    const loaded = await loadResumableInstructionSeatRun(home, runId, piDurablePrincipalAuthority);
+    return loaded.admitted.role === "navigator";
+  } catch (error) {
+    if (error instanceof CliUsageError) return false;
+    throw error;
+  }
+}
+function createNativeNavigatorSessionFactory(deps) {
   return async ({ context, subject, tool }) => {
     let thinkingLevel;
     const { createRecordSession, NAVIGATOR_RECORD_KIND } = await import("./archivist-record-entry.js");
@@ -37,6 +74,11 @@ function createNativeNavigatorSessionFactory() {
     let noReceipt;
     let disposed = false;
     let inFlightPrompt;
+    let hostRunId = readNavigatorHostRunPointer(sessionManager.getEntries());
+    const summon = deps?.summonPublicRole ?? (async (options) => {
+      const { summonPublicRole } = await import("./public-role-summons.js");
+      return summonPublicRole(options);
+    });
     return {
       prompt: async (text) => {
         if (disposed) {
@@ -46,14 +88,24 @@ function createNativeNavigatorSessionFactory() {
         noReceipt = void 0;
         const run = (async () => {
           try {
-            const { summonPublicRole } = await import("./public-role-summons.js");
             const summonHome = await resolveNavigatorLedgerHome(context);
-            const summoned = await summonPublicRole({
+            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)) {
+              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}`;
@@ -76,21 +128,31 @@ function createNativeNavigatorSessionFactory() {
               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 } = await import("./package-contracts/navigator-output.js");
+            const proseParts = [];
             for (const payload of outcome.payloads ?? []) {
-              if (typeof payload !== "object" || payload === null || Array.isArray(payload)) continue;
-              const candidates = payload.candidates;
-              if (!Array.isArray(candidates)) continue;
-              await tool.execute(
-                "navigator-public-prepare",
-                { candidates },
-                void 0,
-                void 0,
-                context
-              );
+              const prose = navigatorProseFromUnknown(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
+            );
           } catch (error) {
             if (error instanceof NavigatorUnavailableError) throw error;
             const fact = navigatorProviderFailureFromError(error);
@@ -142,5 +204,9 @@ function createNativeNavigatorSessionFactory() {
   };
 }
 export {
-  createNativeNavigatorSessionFactory
+  NAVIGATOR_HOST_RUN_POINTER_ENTRY,
+  createNativeNavigatorSessionFactory,
+  navigatorHostRunResumable,
+  readNavigatorHostRunPointer,
+  runIdFromNavigatorDirectory
 };

package/dist/package-contracts/navigator-output.js

@@ -6,31 +6,49 @@ const NAVIGATOR_ACCEPTED_TEXT = "\u6E38\u5955\u4F7F\u5EFA\u8BAE\u5DF2\u53D7\u740
 const navigatorOutputSchema = withTerminatingOutputDeclarations(
   openToolObject(
     Type.Object({
-      status: Type.Unknown({
-        description: "advice \u2014 \u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8"
-      }),
-      candidates: Type.Unknown({
-        description: "\u6392\u597D\u5E8F\u7684\u8DEF\u7EBF\u5EFA\u8BAE\u6570\u7EC4\uFF0C\u5143\u7D20\u542B next/phase/reason \u2014 \u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8"
+      prose: Type.Unknown({
+        description: "\u6E38\u5955\u4F7F\u6563\u6587\u5EFA\u8BAE\uFF0C\u539F\u6837\u5448\u73B0\u3002\u4E0D\u8981\u6C42 candidates/next \u7B49\u7ED3\u6784\u5316\u5B57\u6BB5\u3002\u5F62\u72B6\u6307\u5F15\uFF0C\u975E schema \u95F8"
       })
     })
   )
 );
-function isRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 function projectLawfulNavigatorOutput(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : void 0;
+  if (value === void 0 || value === null) return void 0;
+  if (typeof value === "string") return { prose: value };
+  if (typeof value === "object" && !Array.isArray(value)) {
+    const record = value;
+    if (typeof record.prose === "string") return { prose: record.prose };
+    if (record.prose !== void 0 && record.prose !== null) {
+      return { prose: typeof record.prose === "string" ? record.prose : String(record.prose) };
+    }
+    const keys = Object.keys(record);
+    if (keys.length === 0) return { prose: "" };
+    try {
+      return { prose: JSON.stringify(record) };
+    } catch {
+      return { prose: String(record) };
+    }
+  }
+  return { prose: String(value) };
 }
 function validateRecordedNavigatorOutput(value) {
-  if (typeof value !== "object" || value === null || Array.isArray(value)) {
-    throw new Error("Navigator output is not an object");
+  const projected = projectLawfulNavigatorOutput(value);
+  if (projected === void 0) {
+    throw new Error("Navigator output is empty");
   }
-  return value;
+  return projected;
+}
+function navigatorProseFromUnknown(value) {
+  const projected = projectLawfulNavigatorOutput(value);
+  if (projected === void 0) return void 0;
+  const trimmed = projected.prose.trim();
+  return trimmed === "" ? void 0 : projected.prose;
 }
 export {
   NAVIGATOR_ACCEPTED_TEXT,
   NAVIGATOR_OUTPUT_TOOL_NAME,
   navigatorOutputSchema,
+  navigatorProseFromUnknown,
   projectLawfulNavigatorOutput,
   validateRecordedNavigatorOutput
 };

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

@@ -361,9 +361,6 @@ export function createPiRoleTurnHost(config) {
                 && process.env.AK_ROLE_AUDITOR_SUBJECT.trim() !== "") {
                 env.AK_ROLE_AUDITOR_SUBJECT = process.env.AK_ROLE_AUDITOR_SUBJECT;
             }
-            if (request.correlationId !== undefined && request.correlationId.trim() !== "") {
-                env.AK_CORRELATION_ID = request.correlationId;
-            }
             if (config.recordLaunchedRolePackageIdentity !== undefined &&
                 config.observeLaunchedRolePackageIdentity !== undefined) {
                 await config.recordLaunchedRolePackageIdentity(request.runDirectory, await config.observeLaunchedRolePackageIdentity(config.packageRoot, roleEntry));

package/dist/public-cli/auto-resume.js

@@ -18,6 +18,7 @@ import { join } from "node:path";
 import { roleRunArtifactsDirectory } from "../role-run-placement.js";
 import { AUTO_RESUME_LIMIT, describeErrorIdentity, acquireRunWriterLease, markRunResumable, markRunTerminal, RunWriterLeaseHeldError, } from "./run-lifecycle.js";
 import { parseAutoResumeLimit } from "./config.js";
+import { processCancelSignalName } from "./process-cancel.js";
 import { isLawfulTypedTerminalOutcome, formatTerminalResult } from "./terminal.js";
 import { attachRecordedSubmissions, presentFailureTerminal, presentStructuralRejection, resolveControlledFailureResumeObservation, } from "./settlement.js";
 const dummyIo = { stdout: () => { }, stderr: () => { } };
@@ -423,6 +424,12 @@ export async function runWithAutoResumeLoop(options) {
                     presentTerminal(terminal, options.io);
                 return result;
             }
+            // #855: process cancel — stop even if dispatch forgot skipAutoResume.
+            if (processCancelSignalName(options.signal) !== undefined) {
+                if (terminal !== undefined)
+                    presentTerminal(terminal, options.io);
+                return result;
+            }
         }
         if (result !== undefined) {
             const terminal = result.terminal;
@@ -457,6 +464,25 @@ export async function runWithAutoResumeLoop(options) {
                     terminal,
                 };
             }
+            // #855: process cancel on the throw path — do not re-dispatch; name the signal.
+            const cancelName = processCancelSignalName(options.signal);
+            if (cancelName !== undefined) {
+                const terminal = await attachDispatchExceptionTerminal(options.admitted, dispatchExceptionFailureTerminal({
+                    role: options.admitted.role,
+                    runId: options.admitted.runId,
+                    causeError: lastThrownError,
+                    errorFiles: retainedErrorFiles,
+                    autoResumeAttempts,
+                    endReason: `ak-role terminated by ${cancelName}`,
+                    everyAttemptThrew,
+                }), options.io);
+                await finalizeExceptionRunBestEffort(options.admitted.runDirectory, options.io);
+                presentTerminal(terminal, options.io);
+                return {
+                    exitCode: 1,
+                    terminal,
+                };
+            }
             if (!(await isPrincipalAvailable(options.admitted.principal))) {
                 const terminal = await attachDispatchExceptionTerminal(options.admitted, dispatchExceptionFailureTerminal({
                     role: options.admitted.role,

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

@@ -1,7 +1,7 @@
 import { engineSessionMaterialFromOptions, pickEngineAxis } from "../package-resources/engine-material.js";
 import { CliUsageError } from "./cli-errors.js";
 import { admitJudgeInvocation, buildJudgeTransportPrompt, } from "./invocation.js";
-import { loadResumableJudgeRun, markRunAdmitted, buildResumeContinuationPrompt, } from "./run-lifecycle.js";
+import { loadResumableJudgeRun, markRunAdmitted, buildAutoResumeContinuationPrompt, } from "./run-lifecycle.js";
 import { presentStructuralRejection, readEngineDetourInfrastructureFailure, trySettleJudgeTerminalResult, } from "./settlement.js";
 import { projectRoleTurnRequest, } from "./turn-request.js";
 import { runPostAdmissionResumable, runPostAdmissionSeatResume, resumeTurnRequestProjectionOptions, } from "./post-admission.js";
@@ -86,7 +86,7 @@ export async function runPublicJudge(argv, env, io, parseJudgeArgv) {
                 : { correlationId: admitted.correlationId ?? env.correlationId }),
             continuation: {
                 kind: "resume",
-                prompt: buildResumeContinuationPrompt({
+                prompt: buildAutoResumeContinuationPrompt({
                     packageRoot: env.packageRoot,
                     ...pickEngineAxis(env),
                 }),