@akagilnc/pi-workflow-roles 0.1.3816 → 0.1.3826

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

@@ -2712,6 +2712,10 @@ var init_submission_errors = __esm({
 });
 
 // src/submission-correctable-error.ts
+function mechanicalSubmissionRejectionResumeMessage(code) {
+  if (code === "non-sole-round") return NON_SOLE_ROUND_RESUME_MESSAGE;
+  return code;
+}
 function isCorrectableSubmissionError(error) {
   return error instanceof CorrectableSubmissionError;
 }
@@ -2736,11 +2740,12 @@ function projectCorrectableExecuteRejection(error) {
     }
   };
 }
-var correctableSubmissionErrorBrand, CorrectableSubmissionError;
+var NON_SOLE_ROUND_RESUME_MESSAGE, correctableSubmissionErrorBrand, CorrectableSubmissionError;
 var init_submission_correctable_error = __esm({
   "src/submission-correctable-error.ts"() {
     "use strict";
     init_submission_errors();
+    NON_SOLE_ROUND_RESUME_MESSAGE = "\u7EC8\u5C40\u4EA4\u5377\u5E76\u975E\u672C\u8F6E\u552F\u4E00\u5DE5\u5177\u8C03\u7528\u3002";
     correctableSubmissionErrorBrand = /* @__PURE__ */ Symbol("ak-roles.correctable-submission-error");
     CorrectableSubmissionError = class extends Error {
       [correctableSubmissionErrorBrand] = true;
@@ -24413,7 +24418,7 @@ function createPiRoleHostAdapter(pi, options = {}) {
     deliverSubmissionRejection(rejection) {
       pi.sendMessage({
         customType: "ak-role-submission-rejection",
-        content: "The terminal submission was rejected because it was not the sole tool call in its turn. Correct the call pattern and resubmit.",
+        content: mechanicalSubmissionRejectionResumeMessage(rejection.code),
         display: true,
         details: rejection
       }, { triggerTurn: true, deliverAs: "followUp" });
@@ -24528,6 +24533,7 @@ var init_adapter = __esm({
     init_oauth_keepalive();
     init_role_runtime();
     init_agent_start_materials();
+    init_submission_correctable_error();
     piContexts = /* @__PURE__ */ new WeakMap();
   }
 });
@@ -26192,7 +26198,7 @@ ${priorNativePaths.join("\n")}` : prepared.prompt;
             if ("failure" in closure) {
               return { code: null, stderr: "", timedOut: false, knownFailure: closure.failure };
             }
-            prompt = `The prior terminal submission was rejected (${closure.retry.code}). Resubmit it as the sole terminal tool call. Rejected call ids: ${closure.retry.toolCallIds.join(", ") || "none"}.`;
+            prompt = closure.retry.message;
           }
           return failure("output", "AcpRoundLimit", "round-retry-limit", { sessionId });
         } finally {
@@ -26390,7 +26396,11 @@ async function prepareAcpRoleEnvelope(options) {
   };
   const host = {
     deliverSubmissionRejection(value) {
-      rejection = value;
+      rejection = {
+        code: value.code,
+        toolCallIds: value.toolCallIds,
+        message: mechanicalSubmissionRejectionResumeMessage(value.code)
+      };
     },
     capabilities: {
       skillExpansion(prompt) {
@@ -26460,18 +26470,22 @@ async function prepareAcpRoleEnvelope(options) {
   createRoleRuntimeExtension(options.dependencies)(envelope);
   const token = randomUUID7();
   const server = createServer((socket) => serveSocket(socket));
-  function rememberProjectedRejection(details, toolCallId) {
+  function rememberProjectedRejection(details, toolCallId, content) {
     if (typeof details !== "object" || details === null) return;
     const record4 = details;
     if (record4.cause === "infrastructure") return;
     if (record4.kind === "role_infrastructure_failure") return;
     const code = typeof record4.code === "string" && record4.code.length > 0 ? record4.code : record4.status === "bounce" || record4.status === "escalate" || record4.status === "no_receipt" ? record4.status : void 0;
     if (code === void 0) return;
-    rejection = { code, toolCallIds: [toolCallId] };
+    rejection = {
+      code,
+      toolCallIds: [toolCallId],
+      message: textDiagnostic(content) ?? code
+    };
   }
   function textDiagnostic(content) {
-    const text = content.map((part) => part.type === "text" ? part.text : "").join("").trim();
-    return text.length > 0 ? text : void 0;
+    const text = content.map((part) => part.type === "text" ? part.text : "").join("");
+    return text.trim().length > 0 ? text : void 0;
   }
   function rememberInfrastructureFailure(details, content) {
     if (infrastructureRoundFailure !== void 0) return;
@@ -26527,7 +26541,7 @@ async function prepareAcpRoleEnvelope(options) {
     sessionEntries.push(toolResultEntry);
     if (projected.isError) {
       rememberInfrastructureFailure(projected.details, projected.content);
-      rememberProjectedRejection(projected.details, toolCallId);
+      rememberProjectedRejection(projected.details, toolCallId, projected.content);
     }
     await emit("tool_execution_end", { toolCallId, toolName, isError: projected.isError });
     return projected;
@@ -26718,7 +26732,11 @@ async function prepareAcpRoleEnvelope(options) {
       return { accepted: true };
     }
     if (rejection !== void 0) {
-      const retry = { code: rejection.code, toolCallIds: rejection.toolCallIds };
+      const retry = {
+        code: rejection.code,
+        toolCallIds: rejection.toolCallIds,
+        message: rejection.message
+      };
       rejection = void 0;
       return { accepted: false, retry };
     }

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

@@ -2712,6 +2712,10 @@ var init_submission_errors = __esm({
 });
 
 // src/submission-correctable-error.ts
+function mechanicalSubmissionRejectionResumeMessage(code) {
+  if (code === "non-sole-round") return NON_SOLE_ROUND_RESUME_MESSAGE;
+  return code;
+}
 function isCorrectableSubmissionError(error) {
   return error instanceof CorrectableSubmissionError;
 }
@@ -2736,11 +2740,12 @@ function projectCorrectableExecuteRejection(error) {
     }
   };
 }
-var correctableSubmissionErrorBrand, CorrectableSubmissionError;
+var NON_SOLE_ROUND_RESUME_MESSAGE, correctableSubmissionErrorBrand, CorrectableSubmissionError;
 var init_submission_correctable_error = __esm({
   "src/submission-correctable-error.ts"() {
     "use strict";
     init_submission_errors();
+    NON_SOLE_ROUND_RESUME_MESSAGE = "\u7EC8\u5C40\u4EA4\u5377\u5E76\u975E\u672C\u8F6E\u552F\u4E00\u5DE5\u5177\u8C03\u7528\u3002";
     correctableSubmissionErrorBrand = /* @__PURE__ */ Symbol("ak-roles.correctable-submission-error");
     CorrectableSubmissionError = class extends Error {
       [correctableSubmissionErrorBrand] = true;
@@ -24413,7 +24418,7 @@ function createPiRoleHostAdapter(pi, options = {}) {
     deliverSubmissionRejection(rejection) {
       pi.sendMessage({
         customType: "ak-role-submission-rejection",
-        content: "The terminal submission was rejected because it was not the sole tool call in its turn. Correct the call pattern and resubmit.",
+        content: mechanicalSubmissionRejectionResumeMessage(rejection.code),
         display: true,
         details: rejection
       }, { triggerTurn: true, deliverAs: "followUp" });
@@ -24528,6 +24533,7 @@ var init_adapter = __esm({
     init_oauth_keepalive();
     init_role_runtime();
     init_agent_start_materials();
+    init_submission_correctable_error();
     piContexts = /* @__PURE__ */ new WeakMap();
   }
 });
@@ -26086,7 +26092,11 @@ async function prepareAcpRoleEnvelope(options) {
   };
   const host = {
     deliverSubmissionRejection(value) {
-      rejection = value;
+      rejection = {
+        code: value.code,
+        toolCallIds: value.toolCallIds,
+        message: mechanicalSubmissionRejectionResumeMessage(value.code)
+      };
     },
     capabilities: {
       skillExpansion(prompt) {
@@ -26156,18 +26166,22 @@ async function prepareAcpRoleEnvelope(options) {
   createRoleRuntimeExtension(options.dependencies)(envelope);
   const token = randomUUID7();
   const server = createServer((socket) => serveSocket(socket));
-  function rememberProjectedRejection(details, toolCallId) {
+  function rememberProjectedRejection(details, toolCallId, content) {
     if (typeof details !== "object" || details === null) return;
     const record4 = details;
     if (record4.cause === "infrastructure") return;
     if (record4.kind === "role_infrastructure_failure") return;
     const code = typeof record4.code === "string" && record4.code.length > 0 ? record4.code : record4.status === "bounce" || record4.status === "escalate" || record4.status === "no_receipt" ? record4.status : void 0;
     if (code === void 0) return;
-    rejection = { code, toolCallIds: [toolCallId] };
+    rejection = {
+      code,
+      toolCallIds: [toolCallId],
+      message: textDiagnostic(content) ?? code
+    };
   }
   function textDiagnostic(content) {
-    const text = content.map((part) => part.type === "text" ? part.text : "").join("").trim();
-    return text.length > 0 ? text : void 0;
+    const text = content.map((part) => part.type === "text" ? part.text : "").join("");
+    return text.trim().length > 0 ? text : void 0;
   }
   function rememberInfrastructureFailure(details, content) {
     if (infrastructureRoundFailure !== void 0) return;
@@ -26223,7 +26237,7 @@ async function prepareAcpRoleEnvelope(options) {
     sessionEntries.push(toolResultEntry);
     if (projected.isError) {
       rememberInfrastructureFailure(projected.details, projected.content);
-      rememberProjectedRejection(projected.details, toolCallId);
+      rememberProjectedRejection(projected.details, toolCallId, projected.content);
     }
     await emit("tool_execution_end", { toolCallId, toolName, isError: projected.isError });
     return projected;
@@ -26414,7 +26428,11 @@ async function prepareAcpRoleEnvelope(options) {
       return { accepted: true };
     }
     if (rejection !== void 0) {
-      const retry = { code: rejection.code, toolCallIds: rejection.toolCallIds };
+      const retry = {
+        code: rejection.code,
+        toolCallIds: rejection.toolCallIds,
+        message: rejection.message
+      };
       rejection = void 0;
       return { accepted: false, retry };
     }
@@ -26937,7 +26955,7 @@ ${priorNativePaths.join("\n")}` : prepared.prompt;
               outcome = { code: null, stderr: spawned.stderr, timedOut: false, knownFailure: closure.failure };
               break;
             }
-            prompt = `The prior terminal submission was rejected (${closure.retry.code}). Resubmit it as the sole terminal structured output (or the sole terminating tool call). Rejected call ids: ${closure.retry.toolCallIds.join(", ") || "none"}.`;
+            prompt = closure.retry.message;
             sessionKind = "resume";
             if (attempt === 7) {
               outcome = failure("output", "HeadlessRoundLimit", "round-retry-limit", { sessionId });

package/dist/pi/adapter.js

@@ -3,6 +3,7 @@ import { requireGatekeeperPass } from "../gatekeeper-pass-envelope.js";
 import { createOAuthKeepalive } from "../oauth-keepalive.js";
 import { createRoleRuntimeExtension } from "../role-runtime.js";
 import { renderAgentStartMaterials } from "../agent-start-materials.js";
+import { mechanicalSubmissionRejectionResumeMessage } from "../submission-correctable-error.js";
 const piContexts = new WeakMap();
 /** Pi-only entrypoint adapter around the host-neutral shared composition. */
 export function createPiRoleRuntimeExtension(dependencies, options = {}) {
@@ -87,7 +88,7 @@ export function createPiRoleHostAdapter(pi, options = {}) {
         deliverSubmissionRejection(rejection) {
             pi.sendMessage({
                 customType: "ak-role-submission-rejection",
-                content: "The terminal submission was rejected because it was not the sole tool call in its turn. Correct the call pattern and resubmit.",
+                content: mechanicalSubmissionRejectionResumeMessage(rejection.code),
                 display: true,
                 details: rejection,
             }, { triggerTurn: true, deliverAs: "followUp" });

package/dist/submission-correctable-error.js

@@ -1,4 +1,16 @@
 import { GatekeeperDecisionError, ParentQueueReaskError, WorkerCommitReminderError, WorkerPrefixReminderError, WorkerUnfinishedReasonReminderError, } from "./submission-errors.js";
+/**
+ * Mechanical non-sole resume text — one shared authority for Pi followUp and
+ * ACP/headless closeRound retry (#813). Officer bounce/escalate use projected
+ * receipt text instead; this string is only the round-shape correction.
+ */
+export const NON_SOLE_ROUND_RESUME_MESSAGE = "终局交卷并非本轮唯一工具调用。";
+/** Resume text for mechanical deliverSubmissionRejection codes (no officer receipt). */
+export function mechanicalSubmissionRejectionResumeMessage(code) {
+    if (code === "non-sole-round")
+        return NON_SOLE_ROUND_RESUME_MESSAGE;
+    return code;
+}
 /** Shared, unforgeable identity for submission errors that the same session may correct. */
 const correctableSubmissionErrorBrand = Symbol("ak-roles.correctable-submission-error");
 export class CorrectableSubmissionError extends Error {

package/package.json

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

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

@@ -28,6 +28,7 @@ import {
 } from "./role-turn-host.ts";
 import {
   isCorrectableExecuteError,
+  mechanicalSubmissionRejectionResumeMessage,
   projectCorrectableExecuteRejection,
 } from "../submission-correctable-error.ts";
 import {
@@ -184,7 +185,9 @@ export async function prepareAcpRoleEnvelope(options: {
   const sessionEntries: Array<Record<string, unknown>> = [];
   const methodSkills = new Map<string, { path: string; body: string }>();
   let preferredTools: string[] = [];
-  let rejection: { readonly code: string; readonly toolCallIds: readonly string[] } | undefined;
+  let rejection:
+    | { readonly code: string; readonly toolCallIds: readonly string[]; readonly message: string }
+    | undefined;
   /** Typed infrastructure failure for this ACP round; closeRound returns it as knownFailure (#593). */
   let infrastructureRoundFailure: RoleTurnKnownFailure | undefined;
   const hostAbort = new AbortController();
@@ -263,7 +266,14 @@ export async function prepareAcpRoleEnvelope(options: {
   };
 
   const host: RoleHost = {
-    deliverSubmissionRejection(value) { rejection = value; },
+    deliverSubmissionRejection(value) {
+      // Mechanical round rejection has no officer receipt; shared resume text is the fact (#813).
+      rejection = {
+        code: value.code,
+        toolCallIds: value.toolCallIds,
+        message: mechanicalSubmissionRejectionResumeMessage(value.code),
+      };
+    },
     capabilities: {
       skillExpansion(prompt): HostSkillExpansionEvidence | undefined {
         return buildAcpSkillExpansion(methodSkills, prompt);
@@ -321,7 +331,11 @@ export async function prepareAcpRoleEnvelope(options: {
   const token = randomUUID();
   const server = createServer((socket) => serveSocket(socket));
   /** Correctable non-pass must arm the existing rejection state so closeRound returns retry. */
-  function rememberProjectedRejection(details: unknown, toolCallId: string): void {
+  function rememberProjectedRejection(
+    details: unknown,
+    toolCallId: string,
+    content: ContentPart[],
+  ): void {
     if (typeof details !== "object" || details === null) return;
     const record = details as Record<string, unknown>;
     if (record.cause === "infrastructure") return;
@@ -332,14 +346,21 @@ export async function prepareAcpRoleEnvelope(options: {
         ? record.status
         : undefined;
     if (code === undefined) return;
-    rejection = { code, toolCallIds: [toolCallId] };
+    // Officer bounce/escalate text is already the tool_result content (GatekeeperDecisionError
+    // message = raw receipt). Adapters resume with this message — never a host-invented line (#813).
+    rejection = {
+      code,
+      toolCallIds: [toolCallId],
+      message: textDiagnostic(content) ?? code,
+    };
   }
   function textDiagnostic(content: ContentPart[]): string | undefined {
+    // Keep concatenated text bytes intact for resume relay (#813 online P2):
+    // only emptiness uses the trimmed form; do not alter Markdown/spacing.
     const text = content
       .map((part) => (part.type === "text" ? part.text : ""))
-      .join("")
-      .trim();
-    return text.length > 0 ? text : undefined;
+      .join("");
+    return text.trim().length > 0 ? text : undefined;
   }
   /** Arm closeRound + abort path with the durable infrastructure failure for this round. */
   function rememberInfrastructureFailure(
@@ -430,7 +451,7 @@ export async function prepareAcpRoleEnvelope(options: {
     sessionEntries.push(toolResultEntry);
     if (projected.isError) {
       rememberInfrastructureFailure(projected.details, projected.content);
-      rememberProjectedRejection(projected.details, toolCallId);
+      rememberProjectedRejection(projected.details, toolCallId, projected.content);
     }
     await emit("tool_execution_end", { toolCallId, toolName, isError: projected.isError });
     return projected;
@@ -646,7 +667,11 @@ export async function prepareAcpRoleEnvelope(options: {
       return { accepted: true as const };
     }
     if (rejection !== undefined) {
-      const retry = { code: rejection.code, toolCallIds: rejection.toolCallIds };
+      const retry = {
+        code: rejection.code,
+        toolCallIds: rejection.toolCallIds,
+        message: rejection.message,
+      };
       rejection = undefined;
       return { accepted: false as const, retry };
     }

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

@@ -39,7 +39,15 @@ export type AcpPreparedTurn = Readonly<{
   /** Shared ledger consumes the complete ACP round after session/prompt resolves. */
   closeRound(): Promise<
     | { readonly accepted: true }
-    | { readonly accepted: false; readonly retry: { readonly code: string; readonly toolCallIds: readonly string[] } }
+    | {
+      readonly accepted: false;
+      /** Shared envelope provides officer/correctable text; adapters only deliver it (#813). */
+      readonly retry: {
+        readonly code: string;
+        readonly toolCallIds: readonly string[];
+        readonly message: string;
+      };
+    }
     | { readonly accepted: false; readonly failure: RoleTurnKnownFailure }
   >;
   dispose?(): Promise<void>;
@@ -400,7 +408,8 @@ export function createAcpRoleTurnHost(config: AcpRoleTurnHostConfig): RoleTurnHo
             if ("failure" in closure) {
               return { code: null, stderr: "", timedOut: false, knownFailure: closure.failure };
             }
-            prompt = `The prior terminal submission was rejected (${closure.retry.code}). Resubmit it as the sole terminal tool call. Rejected call ids: ${closure.retry.toolCallIds.join(", ") || "none"}.`;
+            // Shared envelope already owns the officer/correctable text (#813).
+            prompt = closure.retry.message;
           }
           return failure("output", "AcpRoundLimit", "round-retry-limit", { sessionId });
         } finally {

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

@@ -401,8 +401,8 @@ export function createHeadlessRoleTurnHost(config: HeadlessRoleTurnHostConfig):
               outcome = { code: null, stderr: spawned.stderr, timedOut: false, knownFailure: closure.failure };
               break;
             }
-            // Correctable rejection → resume same session with plain resubmit prompt.
-            prompt = `The prior terminal submission was rejected (${closure.retry.code}). Resubmit it as the sole terminal structured output (or the sole terminating tool call). Rejected call ids: ${closure.retry.toolCallIds.join(", ") || "none"}.`;
+            // Shared envelope already owns the officer/correctable text (#813).
+            prompt = closure.retry.message;
             sessionKind = "resume";
             if (attempt === 7) {
               outcome = failure("output", "HeadlessRoundLimit", "round-retry-limit", { sessionId });

package/src/pi/adapter.ts

@@ -21,6 +21,7 @@ import type {
 import { createOAuthKeepalive, type OAuthKeepaliveOptions } from "../oauth-keepalive.ts";
 import { createRoleRuntimeExtension, type RoleRuntimeDependencies } from "../role-runtime.ts";
 import { renderAgentStartMaterials } from "../agent-start-materials.ts";
+import { mechanicalSubmissionRejectionResumeMessage } from "../submission-correctable-error.ts";
 
 export type PiRoleHostAdapter = RoleEnvelopeHost;
 
@@ -139,7 +140,7 @@ export function createPiRoleHostAdapter(
     deliverSubmissionRejection(rejection) {
       pi.sendMessage({
         customType: "ak-role-submission-rejection",
-        content: "The terminal submission was rejected because it was not the sole tool call in its turn. Correct the call pattern and resubmit.",
+        content: mechanicalSubmissionRejectionResumeMessage(rejection.code),
         display: true,
         details: rejection,
       }, { triggerTurn: true, deliverAs: "followUp" });

package/src/submission-correctable-error.ts

@@ -6,6 +6,20 @@ import {
   WorkerUnfinishedReasonReminderError,
 } from "./submission-errors.ts";
 
+/**
+ * Mechanical non-sole resume text — one shared authority for Pi followUp and
+ * ACP/headless closeRound retry (#813). Officer bounce/escalate use projected
+ * receipt text instead; this string is only the round-shape correction.
+ */
+export const NON_SOLE_ROUND_RESUME_MESSAGE =
+  "终局交卷并非本轮唯一工具调用。";
+
+/** Resume text for mechanical deliverSubmissionRejection codes (no officer receipt). */
+export function mechanicalSubmissionRejectionResumeMessage(code: string): string {
+  if (code === "non-sole-round") return NON_SOLE_ROUND_RESUME_MESSAGE;
+  return code;
+}
+
 /** Shared, unforgeable identity for submission errors that the same session may correct. */
 const correctableSubmissionErrorBrand = Symbol("ak-roles.correctable-submission-error");