@akagilnc/pi-workflow-roles 0.1.5663 → 0.1.5673

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

@@ -1466,27 +1466,61 @@ var init_gatekeeper_output = __esm({
 var navigator_output_exports = {};
 __export(navigator_output_exports, {
   NAVIGATOR_OUTPUT_TOOL_NAME: () => NAVIGATOR_OUTPUT_TOOL_NAME,
+  byStatusToPlainObject: () => byStatusToPlainObject,
+  mergePreparedAdvice: () => mergePreparedAdvice,
+  navigatorAdviceBodySchema: () => navigatorAdviceBodySchema,
+  navigatorAdviceFields: () => navigatorAdviceFields,
   navigatorOutputSchema: () => navigatorOutputSchema,
   navigatorProseFromUnknown: () => navigatorProseFromUnknown,
+  pickPreparedProse: () => pickPreparedProse,
+  preparedAdviceFromUnknown: () => preparedAdviceFromUnknown,
   projectLawfulNavigatorOutput: () => projectLawfulNavigatorOutput,
   validateRecordedNavigatorOutput: () => validateRecordedNavigatorOutput
 });
 import { Type as Type4 } from "typebox";
+function nonEmptyProse(value) {
+  if (typeof value === "string") {
+    return value.trim() === "" ? void 0 : value;
+  }
+  if (value === void 0 || value === null) return void 0;
+  if (typeof value === "object") {
+    const text2 = JSON.stringify(value);
+    if (text2 === void 0 || text2.trim() === "" || text2 === "{}" || text2 === "[]") return void 0;
+    return text2;
+  }
+  const text = String(value);
+  return text.trim() === "" ? void 0 : text;
+}
+function setStatusProse(target, key, prose) {
+  const prior = target.get(key);
+  target.set(key, prior === void 0 ? prose : `${prior}
+
+${prose}`);
+}
+function byStatusFromUnknown(value) {
+  const out = /* @__PURE__ */ new Map();
+  if (!isRecord(value)) return out;
+  for (const [key, raw] of Object.entries(value)) {
+    const prose = nonEmptyProse(raw);
+    if (prose !== void 0) out.set(key, prose);
+  }
+  return out;
+}
+function byStatusToPlainObject(byStatus) {
+  return Object.fromEntries(byStatus);
+}
 function projectLawfulNavigatorOutput(value) {
   if (value === void 0 || value === null) return void 0;
   if (typeof value === "string") return { prose: value };
   if (isRecord(value)) {
     if (typeof value.prose === "string") return { prose: value.prose };
     if (value.prose !== void 0 && value.prose !== null) {
-      return { prose: typeof value.prose === "string" ? value.prose : String(value.prose) };
+      const serialized = nonEmptyProse(value.prose);
+      if (serialized !== void 0) return { prose: serialized };
     }
     const keys = Object.keys(value);
     if (keys.length === 0) return { prose: "" };
-    try {
-      return { prose: JSON.stringify(value) };
-    } catch {
-      return { prose: String(value) };
-    }
+    return { prose: JSON.stringify(value) };
   }
   return { prose: String(value) };
 }
@@ -1503,7 +1537,58 @@ function navigatorProseFromUnknown(value) {
   const trimmed = projected.prose.trim();
   return trimmed === "" ? void 0 : projected.prose;
 }
-var NAVIGATOR_OUTPUT_TOOL_NAME, navigatorOutputSchema;
+function preparedAdviceFromUnknown(value) {
+  if (value === void 0 || value === null) return void 0;
+  if (typeof value === "string") {
+    const prose2 = nonEmptyProse(value);
+    return prose2 === void 0 ? void 0 : { byStatus: /* @__PURE__ */ new Map(), prose: prose2 };
+  }
+  if (!isRecord(value)) {
+    const prose2 = nonEmptyProse(value);
+    return prose2 === void 0 ? void 0 : { byStatus: /* @__PURE__ */ new Map(), prose: prose2 };
+  }
+  const byStatus = byStatusFromUnknown(value.byStatus);
+  const hasProseField = Object.prototype.hasOwnProperty.call(value, "prose");
+  const hasByStatusField = Object.prototype.hasOwnProperty.call(value, "byStatus");
+  const prose = nonEmptyProse(value.prose);
+  if (byStatus.size === 0 && prose === void 0) {
+    if (hasProseField || hasByStatusField) return void 0;
+    const keys = Object.keys(value);
+    if (keys.length === 0) return void 0;
+    const text = JSON.stringify(value);
+    return text.trim() === "" || text === "{}" ? void 0 : { byStatus: /* @__PURE__ */ new Map(), prose: text };
+  }
+  return {
+    byStatus,
+    ...prose === void 0 ? {} : { prose }
+  };
+}
+function mergePreparedAdvice(prior, next) {
+  if (prior === void 0) return next;
+  if (next === void 0) return prior;
+  const byStatus = new Map(prior.byStatus);
+  for (const [key, prose2] of next.byStatus) {
+    setStatusProse(byStatus, key, prose2);
+  }
+  const proseParts = [prior.prose, next.prose].filter((part) => typeof part === "string" && part.trim() !== "");
+  const prose = proseParts.length === 0 ? void 0 : proseParts.join("\n\n");
+  if (byStatus.size === 0 && prose === void 0) return void 0;
+  return {
+    byStatus,
+    ...prose === void 0 ? {} : { prose }
+  };
+}
+function pickPreparedProse(prepared, status) {
+  if (prepared === void 0) return void 0;
+  if (prepared.byStatus.size > 0) {
+    if (status === void 0) return void 0;
+    const hit = prepared.byStatus.get(status);
+    return typeof hit === "string" && hit.trim() !== "" ? hit : void 0;
+  }
+  const prose = prepared.prose;
+  return typeof prose === "string" && prose.trim() !== "" ? prose : void 0;
+}
+var NAVIGATOR_OUTPUT_TOOL_NAME, navigatorAdviceFields, navigatorAdviceBodySchema, navigatorOutputSchema;
 var init_navigator_output = __esm({
   "src/package-contracts/navigator-output.ts"() {
     "use strict";
@@ -1511,15 +1596,16 @@ var init_navigator_output = __esm({
     init_open_tool_schema();
     init_terminating_infrastructure();
     NAVIGATOR_OUTPUT_TOOL_NAME = "ak_navigator_output";
-    navigatorOutputSchema = withTerminatingOutputDeclarations(
-      openToolObject(
-        Type4.Object({
-          prose: Type4.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"
-          })
-        })
-      )
-    );
+    navigatorAdviceFields = {
+      prose: Type4.Unknown({
+        description: "\u5355\u6761\u6563\u6587\u5EFA\u8BAE\u3002\u65E0\u72B6\u6001\u5206\u53C9\u65F6\u4F7F\u7528\uFF1B\u539F\u6837\u5448\u73B0\u3002"
+      }),
+      byStatus: Type4.Unknown({
+        description: "\u6309\u4E3B\u8859\u95E8\u7ED3\u5C40 status \u9884\u5199\u7684\u6563\u6587\u5EFA\u8BAE\u3002\u952E\u4E3A status \u5B57\u9762\u91CF\uFF0C\u503C\u4E3A\u5EFA\u8BAE\u6B63\u6587\u3002\u7ED3\u7B97\u65F6\u4EE3\u7801\u53EA\u6309\u5B9E\u9645 status \u53D6\u5BF9\u5E94\u539F\u6587\uFF0C\u4E0D\u89E3\u6790\u5EFA\u8BAE\u8BED\u4E49\u3002"
+      })
+    };
+    navigatorAdviceBodySchema = openToolObject(Type4.Object(navigatorAdviceFields));
+    navigatorOutputSchema = withTerminatingOutputDeclarations(navigatorAdviceBodySchema);
   }
 });
 
@@ -9972,8 +10058,10 @@ function buildPiTurnExtraArgs(request, authority, extraPiArgs = []) {
     // Envelope assembly = projectActivationFlags; pi only renders argv pairs.
     ...activationFlagsToPiArgv(projectActivationFlags(request)),
     ...piEngineModelArgs(request),
+    // #1182: text single-shot keeps pi's native assistant error/aborted
+    // exit (stderr + exit 1). json mode never takes that failure branch.
     "--mode",
-    "json",
+    "text",
     ...buildSeatModelCliArgs(request.model)
   ];
 }
@@ -12116,6 +12204,7 @@ function projectRoleTurnRequest(admitted, roleDetails, options) {
     ...options.courtAttemptId === void 0 || options.courtAttemptId.length === 0 ? {} : { courtAttemptId: options.courtAttemptId },
     ...options.invocationScopeId === void 0 || options.invocationScopeId.length === 0 ? {} : { invocationScopeId: options.invocationScopeId },
     ...options.stationChild === void 0 ? {} : { stationChild: options.stationChild },
+    ...options.navigatorByStatusPrepare === void 0 ? {} : { navigatorByStatusPrepare: options.navigatorByStatusPrepare },
     ...options.deliveryRequestLimit === void 0 ? {} : { deliveryRequestLimit: options.deliveryRequestLimit }
   };
 }
@@ -13091,6 +13180,9 @@ async function dispatchPostAdmissionTurn(input) {
     if (env.stationChild !== void 0) {
       turnRequest = { ...turnRequest, stationChild: env.stationChild };
     }
+    if (env.navigatorByStatusPrepare === true) {
+      turnRequest = { ...turnRequest, navigatorByStatusPrepare: true };
+    }
     if (typeof env.host === "string" && env.host.trim() !== "") {
       turnRequest = { ...turnRequest, host: env.host.trim() };
     }
@@ -13349,6 +13441,7 @@ function resumeTurnRequestProjectionOptions(admitted, request, env, summonsPrepa
       prompt
     },
     ...env.stationChild === void 0 ? {} : { stationChild: env.stationChild },
+    ...env.navigatorByStatusPrepare === true ? { navigatorByStatusPrepare: true } : {},
     // #1132: one configured ceiling, already resolved by the caller (#422).
     deliveryRequestLimit: deliveryLimitFromConfig(env.autoResumeLimit)
   };
@@ -13361,6 +13454,7 @@ function roleTurnOptions(env, admitted, continuation) {
     ...correlationId === void 0 || correlationId.trim() === "" ? {} : { correlationId },
     continuation,
     ...env.stationChild === void 0 ? {} : { stationChild: env.stationChild },
+    ...env.navigatorByStatusPrepare === true ? { navigatorByStatusPrepare: true } : {},
     // #1132: one configured ceiling, already resolved by the caller (#422).
     deliveryRequestLimit: deliveryLimitFromConfig(env.autoResumeLimit)
   };
@@ -18595,6 +18689,7 @@ async function summonPublicRole(options) {
           // Nested court stations keep station-child semantics; dual-lens
           // ordinary Reviewer axes opt out (#946 / ADR 0082).
           ...options.stationChild === false ? {} : { stationChild: true },
+          ...options.navigatorByStatusPrepare === true ? { navigatorByStatusPrepare: true } : {},
           // Forward composition-root adapters so nested stations (e.g.
           // secretariat → diarist) select the same faux/production table (#924).
           ...options.hostAdapters === void 0 ? {} : { hostAdapters: options.hostAdapters },
@@ -21097,7 +21192,7 @@ init_navigator_invocation_identity();
 init_packaged_role_registry();
 init_activation_ledger_topology();
 import { resolve as resolve15 } from "node:path";
-import { Type as Type20 } from "typebox";
+import "typebox";
 
 // src/navigator-public-session.ts
 init_host_session_record();
@@ -21322,7 +21417,6 @@ async function navigatorHostRunResumable(home, runId) {
 }
 function createNativeNavigatorSessionFactory(deps) {
   return async ({ context, tool }) => {
-    let thinkingLevel;
     const entries = [];
     let providerFailure;
     let noReceipt;
@@ -21350,6 +21444,9 @@ function createNativeNavigatorSessionFactory(deps) {
             role: "navigator",
             argv: [text],
             cwd: context.cwd,
+            // Attendance prepare always asks for structured byStatus (#1160).
+            // Direct `ak-role navigator` never sets this flag.
+            navigatorByStatusPrepare: true,
             ...summonHome === void 0 ? {} : { home: summonHome },
             ...context.signal === void 0 ? {} : { signal: context.signal }
           };
@@ -21408,17 +21505,23 @@ function createNativeNavigatorSessionFactory(deps) {
           if (outcome.kind !== "accepted") {
             return;
           }
-          const { navigatorProseFromUnknown: navigatorProseFromUnknown2 } = await Promise.resolve().then(() => (init_navigator_output(), navigator_output_exports));
-          const proseParts = [];
+          const {
+            byStatusToPlainObject: byStatusToPlainObject2,
+            mergePreparedAdvice: mergePreparedAdvice2,
+            preparedAdviceFromUnknown: preparedAdviceFromUnknown2
+          } = await Promise.resolve().then(() => (init_navigator_output(), navigator_output_exports));
+          let prepared = void 0;
           for (const payload of outcome.payloads ?? []) {
-            const prose = navigatorProseFromUnknown2(payload);
-            if (prose !== void 0) proseParts.push(prose);
+            prepared = mergePreparedAdvice2(prepared, preparedAdviceFromUnknown2(payload));
           }
-          if (proseParts.length === 0) return;
+          if (prepared === void 0) return;
           if (disposed) return;
           await tool.execute(
             "navigator-public-prepare",
-            { prose: proseParts.join("\n\n") },
+            {
+              ...prepared.prose === void 0 ? {} : { prose: prepared.prose },
+              ...prepared.byStatus.size === 0 ? {} : { byStatus: byStatusToPlainObject2(prepared.byStatus) }
+            },
             void 0,
             void 0,
             context
@@ -21447,16 +21550,13 @@ function createNativeNavigatorSessionFactory(deps) {
         });
       },
       entries: () => entries,
-      setModel: async (next, nextThinking) => {
-        let nextParsed;
+      setModel: async (next) => {
         try {
-          nextParsed = parseNavigatorModelSetting(next);
+          parseNavigatorModelSetting(next);
         } catch (error) {
           throw navigatorUnavailableError("model", error);
         }
-        thinkingLevel = nextThinking ?? nextParsed.thinkingLevel;
       },
-      getThinkingLevel: () => thinkingLevel,
       dispose: async () => {
         disposed = true;
       }
@@ -21478,11 +21578,7 @@ function resolveNavigatorAuthorityMaterial(roleInput, fileAuthority) {
   return void 0;
 }
 var NAVIGATOR_TARGETS = PACKAGED_ROLE_REGISTRY.map(({ role, phases }) => ({ role, phases }));
-var prepareSchema = Type20.Object({
-  prose: Type20.Optional(Type20.Unknown({
-    description: "\u6E38\u5955\u4F7F\u6563\u6587\u5EFA\u8BAE\uFF0C\u539F\u6837\u5448\u73B0\u3002\u4E0D\u8981\u6C42 candidates/next \u7ED3\u6784\u3002"
-  }))
-}, { additionalProperties: true });
+var prepareSchema = navigatorAdviceBodySchema;
 var INVOCATION_ENTRY = NAVIGATOR_INVOCATION_ENTRY;
 var SETTLEMENT_ENTRY = "ak-navigator-settlement";
 function rejectedPrepareReason(entries, start) {
@@ -21507,8 +21603,8 @@ function rejectedPrepareReason(entries, start) {
   }
   return reason;
 }
-function normalizePrepareProse(value) {
-  return navigatorProseFromUnknown(value);
+function normalizePreparedAdvice(value) {
+  return preparedAdviceFromUnknown(value);
 }
 function navigatorSubjectKey(subjectRoot, subject, provenance = "role_input") {
   if (issueRoot(subjectRoot) !== void 0 || !subjectRoot.includes("/.ak/work/")) return subjectRoot;
@@ -21558,7 +21654,7 @@ function createNavigatorAttendance(options) {
   let subject = options.subject;
   let authority = options.authority;
   let contextError = options.contextError;
-  let preparedProse;
+  let preparedAdvice;
   const invocationPrincipal = options.invocationId ?? mintNavigatorInvocationId();
   let activeInvocationId = invocationPrincipal;
   let outputSink;
@@ -21583,7 +21679,6 @@ function createNavigatorAttendance(options) {
       unavailableCause: failure.unavailableCause
     };
   };
-  let prepareBoundSettlement;
   const loadMaterialsAndSession = async (invocationId) => {
     if (contextError !== void 0) throw navigatorUnavailableError("context", contextError);
     if (typeof authority !== "string" || authority.trim() === "") {
@@ -21654,29 +21749,32 @@ function createNavigatorAttendance(options) {
     if (session === void 0) throw new Error("Navigator session was not created");
     return session;
   };
-  const prepare = async (existingSession) => {
-    const boundSettlement = prepareBoundSettlement;
-    prepareBoundSettlement = void 0;
+  const prepare = async () => {
     const invocationId = invocationPrincipal;
     activeInvocationId = invocationId;
     let output;
     let prepareBatchRejected = false;
     outputSink = (value) => {
+      const next = normalizePreparedAdvice(value);
       if (output === void 0) {
         output = value;
         return;
       }
-      const prior = normalizePrepareProse(output) ?? "";
-      const next = normalizePrepareProse(value) ?? "";
-      const merged = [prior, next].filter((part) => part.trim() !== "").join("\n\n");
-      output = { prose: merged };
+      const merged = mergePreparedAdvice(normalizePreparedAdvice(output), next);
+      output = {
+        ...merged?.prose === void 0 ? {} : { prose: merged.prose },
+        ...merged === void 0 || merged.byStatus.size === 0 ? {} : { byStatus: byStatusToPlainObject(merged.byStatus) }
+      };
     };
-    const activeSession = existingSession ?? await loadMaterialsAndSession(invocationId);
-    if (boundSettlement === void 0) return void 0;
+    const activeSession = await loadMaterialsAndSession(invocationId);
     const request = JSON.stringify({
-      ...boundSettlement,
+      kind: "prepare",
+      role: options.role,
+      phase: options.phase,
       invocationId,
-      subjectKey
+      subjectKey,
+      subject,
+      authority
     });
     try {
       try {
@@ -21710,27 +21808,21 @@ function createNavigatorAttendance(options) {
           }
         };
         await promptAllowingRejectedPrepare(request);
-        if (boundSettlement !== void 0) {
-          while (output === void 0 && prepareBatchRejected && delivery.nextAction() === "request-delivery") {
-            delivery.recordDeliveryRequest();
-            await promptAllowingRejectedPrepare(JSON.stringify(delivery.deliveryState()));
-          }
-          if (output === void 0 && delivery.nextAction() === "request-delivery") {
-            delivery.closeBudget();
-          }
-          if (output === void 0 && delivery.nextAction() === "no-receipt" && activeSession.providerFailure?.() === void 0) {
-            preparedProse = void 0;
-            return void 0;
-          }
+        while (output === void 0 && prepareBatchRejected && delivery.nextAction() === "request-delivery") {
+          delivery.recordDeliveryRequest();
+          await promptAllowingRejectedPrepare(JSON.stringify(delivery.deliveryState()));
+        }
+        if (output === void 0 && delivery.nextAction() === "request-delivery") {
+          delivery.closeBudget();
+        }
+        if (output === void 0 && delivery.nextAction() === "no-receipt" && activeSession.providerFailure?.() === void 0) {
+          preparedAdvice = void 0;
+          return void 0;
         }
       } catch (error) {
         throw error instanceof NavigatorUnavailableError ? error : navigatorUnavailableError("transport", error);
       }
       if (output === void 0) {
-        if (boundSettlement === void 0) {
-          preparedProse = void 0;
-          return void 0;
-        }
         const nativeFailure = [...activeSession.entries()].reverse().find((entry) => {
           if (!isRecord(entry) || entry.type !== "message" || !isRecord(entry.message)) return false;
           return entry.message.role === "assistant" && typeof entry.message.errorMessage === "string" && entry.message.errorMessage.trim() !== "";
@@ -21742,12 +21834,8 @@ function createNavigatorAttendance(options) {
         const cause = providerFailure?.cause ?? source;
         throw navigatorUnavailableError(source, errorMessage, cause);
       }
-      if (boundSettlement === void 0) {
-        preparedProse = void 0;
-        return void 0;
-      }
-      preparedProse = normalizePrepareProse(output);
-      return preparedProse;
+      preparedAdvice = normalizePreparedAdvice(output);
+      return preparedAdvice;
     } finally {
       const playbookFailure = activeSession.routePlaybookReadFailure?.();
       observedRoutePlaybookFailure = typeof playbookFailure === "string" && playbookFailure.trim() !== "" ? playbookFailure : void 0;
@@ -21771,6 +21859,7 @@ function createNavigatorAttendance(options) {
     prepare() {
       if (disposed || preparation !== void 0) return;
       preparationFailure = void 0;
+      preparedAdvice = void 0;
       preparationInFlight = true;
       preparation = prepare().finally(() => {
         preparationInFlight = false;
@@ -21808,24 +21897,8 @@ function createNavigatorAttendance(options) {
   };
   async function settleOnce(settlement) {
     if (disposed) return;
-    observedRoutePlaybookFailure = void 0;
     const invocationId = activeInvocationId ?? invocationPrincipal;
     let report;
-    if (sessionReady !== void 0) {
-      try {
-        await sessionReady;
-      } catch (error) {
-        preparationFailure ??= error;
-      }
-    }
-    if (preparation !== void 0) {
-      try {
-        await preparation;
-      } catch (error) {
-        preparationFailure ??= error;
-      }
-      preparation = void 0;
-    }
     const settlementFact = {
       invocationId,
       subjectKey,
@@ -21834,8 +21907,14 @@ function createNavigatorAttendance(options) {
       kind: settlement.kind,
       ..."status" in settlement && settlement.status !== void 0 ? { status: settlement.status } : {}
     };
-    let drainedProse;
     if (settlement.kind === "arrival") {
+      if (sessionReady !== void 0) {
+        try {
+          await sessionReady;
+        } catch (error) {
+          preparationFailure ??= error;
+        }
+      }
       session?.appendEntry(SETTLEMENT_ENTRY, settlementFact);
       if (preparationFailure !== void 0) {
         report = unavailable(invocationId, preparationFailure);
@@ -21846,35 +21925,32 @@ function createNavigatorAttendance(options) {
         };
       }
     } else {
-      if (session !== void 0) preparationFailure = void 0;
-      let coldSession;
-      if (session === void 0 && preparationFailure === void 0) {
+      if (sessionReady !== void 0) {
         try {
-          coldSession = await loadMaterialsAndSession(invocationId);
+          await sessionReady;
         } catch (error) {
-          preparationFailure = error;
+          preparationFailure ??= error;
         }
       }
-      session?.appendEntry(SETTLEMENT_ENTRY, settlementFact);
-      if (preparationFailure === void 0) {
-        prepareBoundSettlement = settlement;
-        preparation = prepare(coldSession);
-        void preparation.catch((error) => {
-          preparationFailure = error;
-        });
+      if (preparation !== void 0) {
         try {
-          drainedProse = await preparation;
+          await preparation;
         } catch (error) {
           preparationFailure ??= error;
         }
         preparation = void 0;
       }
+      session?.appendEntry(SETTLEMENT_ENTRY, settlementFact);
       if (preparationFailure !== void 0) {
         report = unavailable(invocationId, preparationFailure);
-      } else if (typeof drainedProse === "string" && drainedProse.trim() !== "") {
-        report = { disposition: "advice", prose: drainedProse };
       } else {
-        report = { disposition: "no-advice" };
+        const status = "status" in settlement ? settlement.status : void 0;
+        const picked = pickPreparedProse(preparedAdvice, status);
+        if (typeof picked === "string" && picked.trim() !== "") {
+          report = { disposition: "advice", prose: picked };
+        } else {
+          report = { disposition: "no-advice" };
+        }
       }
     }
     if (observedRoutePlaybookFailure !== void 0) {
@@ -21903,8 +21979,9 @@ function createNavigatorAttendance(options) {
     }
     preparation = void 0;
     sessionReady = void 0;
-    preparedProse = void 0;
+    preparedAdvice = void 0;
     preparationFailure = void 0;
+    observedRoutePlaybookFailure = void 0;
   }
 }