@akagilnc/pi-workflow-roles 0.1.5797 → 0.1.5805

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

@@ -1425,18 +1425,29 @@ async function runEngineDetourOnce(input) {
 function isEngineDetourFailure(result) {
   return result.code !== 0 || result.stdout.trim() === "";
 }
-function engineDetourFailureDiagnostic(result) {
-  if (result.stderr.trim().length > 0) return result.stderr;
-  if (result.stdout.trim() === "") return ENGINE_DETOUR_EMPTY_STDOUT_DIAGNOSTIC;
-  const rows = result.stdout.split("\n");
-  let lastRow = "";
-  for (let index = rows.length - 1; index >= 0; index -= 1) {
-    if (rows[index].trim() !== "") {
-      lastRow = rows[index];
-      break;
-    }
+function engineDetourFailureSeatText(result) {
+  const parts = [];
+  if (result.stdout.length > 0) parts.push(result.stdout);
+  if (result.stderr.length > 0) parts.push(result.stderr);
+  let text = "";
+  if (parts.length > 0) {
+    text = parts[0];
+    for (let index = 1; index < parts.length; index += 1) {
+      if (!text.endsWith("\n")) text += "\n";
+      text += parts[index];
+    }
+  }
+  const append = (line2) => {
+    if (text.length > 0 && !text.endsWith("\n")) text += "\n";
+    text += line2;
+  };
+  if (result.code !== 0) {
+    append(`\u52B3\u52A1\u5F15\u64CE\u4EE5 code ${result.code} \u9000\u51FA`);
+  }
+  if (result.stdout.trim() === "") {
+    append(ENGINE_DETOUR_EMPTY_STDOUT_DIAGNOSTIC);
   }
-  return `\u52B3\u52A1\u5F15\u64CE\u4EE5 code ${result.code} \u9000\u51FA\uFF1A${lastRow}`;
+  return text.length > 0 ? text : ENGINE_DETOUR_EMPTY_STDOUT_DIAGNOSTIC;
 }
 function engineNameFromEnv() {
   return normalizeEngineName(
@@ -21065,6 +21076,7 @@ init_engine_material();
 init_engine_detour();
 init_engine_detour_usage();
 init_run_terminal_artifacts();
+init_serialize_thrown_value();
 import { Type as Type18 } from "typebox";
 var engineDetourArgsSchema = Type18.Object(
   {
@@ -21085,6 +21097,27 @@ function isCallerCancellation(error, signal) {
 function asError(error, fallback) {
   return error instanceof Error ? error : new Error(String(error).trim() || fallback);
 }
+function engineFailureResult(input) {
+  const details = {
+    tool: ENGINE_DETOUR_TOOL_NAME,
+    ...input.code === void 0 ? {} : { code: input.code },
+    ...input.stdout === void 0 ? {} : { stdout: input.stdout },
+    ...input.stderr === void 0 ? {} : { stderr: input.stderr },
+    ...input.errorCode === void 0 ? {} : { errorCode: input.errorCode },
+    ...input.ledgerError === void 0 ? {} : { ledgerError: input.ledgerError }
+  };
+  let text = input.text;
+  if (input.ledgerError !== void 0 && input.ledgerError.length > 0) {
+    if (text.length > 0 && !text.endsWith("\n")) text += "\n";
+    text += input.ledgerError;
+  }
+  return {
+    content: [{ type: "text", text }],
+    details,
+    // Identified detour failure is a tool error, not a seat-run death (#1213).
+    isError: true
+  };
+}
 function createEngineDetourToolDefinition(input) {
   const engineName = input.engineName;
   const engineModel = input.engineModel;
@@ -21098,13 +21131,6 @@ function createEngineDetourToolDefinition(input) {
     async execute(toolCallId, params, signal, _onUpdate, ctx) {
       const args = params;
       const argv = Array.isArray(args.argv) ? args.argv : [];
-      if (argv.length === 0 || argv.some((part) => typeof part !== "string" || part.length === 0)) {
-        input.fail(
-          new Error("\u52B3\u52A1\u5F15\u64CE argv \u987B\u4E3A\u975E\u7A7A\u5B57\u7B26\u4E32\u6570\u7EC4"),
-          toolCallId,
-          ctx
-        );
-      }
       const sessionParent = ctx.sessionManager?.getSessionFile?.();
       const startedAt = Date.now();
       const runDirectory = typeof ctx.runDirectory === "string" && ctx.runDirectory.length > 0 ? ctx.runDirectory : void 0;
@@ -21125,25 +21151,21 @@ function createEngineDetourToolDefinition(input) {
           ...observed2.stdoutByteLength === void 0 ? {} : { stdoutByteLength: observed2.stdoutByteLength }
         });
       };
-      const failAfterLedger = (engineCause, observed2, aggregateMessage) => {
+      const recordCallOrLedgerError = (observed2) => {
         try {
           recordCall(observed2);
+          return void 0;
         } catch (recordError) {
-          input.fail(
-            new AggregateError(
-              [
-                engineCause,
-                asError(recordError, "engine detour usage ledger write failed")
-              ],
-              aggregateMessage,
-              { cause: engineCause }
-            ),
-            toolCallId,
-            ctx
-          );
+          return serializeThrownValue(recordError);
         }
-        input.fail(engineCause, toolCallId, ctx);
       };
+      if (argv.length === 0 || argv.some((part) => typeof part !== "string" || part.length === 0)) {
+        const ledgerError = recordCallOrLedgerError({});
+        return engineFailureResult({
+          text: "\u52B3\u52A1\u5F15\u64CE argv \u987B\u4E3A\u975E\u7A7A\u5B57\u7B26\u4E32\u6570\u7EC4",
+          ...ledgerError === void 0 ? {} : { ledgerError }
+        });
+      }
       let result;
       try {
         result = await runEngineDetourOnce({
@@ -21153,20 +21175,26 @@ function createEngineDetourToolDefinition(input) {
         });
       } catch (error) {
         if (isCallerCancellation(error, signal)) throw error;
-        return failAfterLedger(
-          asError(error, "\u52B3\u52A1\u5F15\u64CE spawn \u5931\u8D25"),
-          {},
-          "engine detour spawn and usage ledger both failed"
-        );
+        const engineError = asError(error, "\u52B3\u52A1\u5F15\u64CE spawn \u5931\u8D25");
+        const ledgerError = recordCallOrLedgerError({});
+        const errno = typeof engineError.code === "string" ? engineError.code : void 0;
+        return engineFailureResult({
+          text: engineError.message,
+          ...errno === void 0 ? {} : { errorCode: errno },
+          ...ledgerError === void 0 ? {} : { ledgerError }
+        });
       }
       const stdoutByteLength = engineDetourStdoutByteLength(result.stdout);
       const observed = { code: result.code, stdoutByteLength };
       if (isEngineDetourFailure(result)) {
-        return failAfterLedger(
-          new Error(engineDetourFailureDiagnostic(result)),
-          observed,
-          "engine detour child-close and usage ledger both failed"
-        );
+        const ledgerError = recordCallOrLedgerError(observed);
+        return engineFailureResult({
+          text: engineDetourFailureSeatText(result),
+          code: result.code,
+          stdout: result.stdout,
+          stderr: result.stderr,
+          ...ledgerError === void 0 ? {} : { ledgerError }
+        });
       }
       recordCall(observed);
       return {
@@ -21180,7 +21208,7 @@ function createEngineDetourToolDefinition(input) {
     }
   };
 }
-function registerEngineDetourTool(roleHost, hostActions) {
+function registerEngineDetourTool(roleHost) {
   const getFlag = (name) => roleHost.getFlag(name);
   const engineName = resolveEngineName(getFlag);
   if (engineName === void 0) {
@@ -21189,10 +21217,7 @@ function registerEngineDetourTool(roleHost, hostActions) {
   const engineModel = resolveEngineModel(getFlag);
   const definition = createEngineDetourToolDefinition({
     engineName,
-    ...engineModel === void 0 ? {} : { engineModel },
-    fail(error, toolCallId, ctx) {
-      hostActions.failInfrastructure(error, ctx, toolCallId);
-    }
+    ...engineModel === void 0 ? {} : { engineModel }
   });
   roleHost.registerTool(definition);
   return true;
@@ -24128,7 +24153,7 @@ function createRoleRuntimeExtension(dependencies, deliveryRequestLimit) {
         ]);
         roleReferenceMaterials = await dependencies.loadRoleReferenceMaterials?.(entry.role) ?? "";
         if (!engineDetourRegistered) {
-          engineDetourRegistered = registerEngineDetourTool(roleHost, hostActions);
+          engineDetourRegistered = registerEngineDetourTool(roleHost);
         }
         if (secretariat.claimsEngineDetour === true && engineDetourRegistered) {
           roleHost.setActiveTools([
@@ -24501,7 +24526,7 @@ async function prepareRoleEnvelope(options) {
       const projected = await projectToolResult(toolCallId, name, {
         content: result.content,
         details: result.details,
-        isError: false
+        isError: result.isError === true
       });
       if (result.terminate === false) {
         rejection = {

package/dist/engine-detour-tool.js

@@ -1,7 +1,7 @@
 import { Type } from "typebox";
 import {
   ENGINE_DETOUR_TOOL_NAME,
-  engineDetourFailureDiagnostic,
+  engineDetourFailureSeatText,
   isEngineDetourFailure,
   resolveEngineModel,
   resolveEngineName,
@@ -12,6 +12,7 @@ import {
   reportEngineDetourCall
 } from "./engine-detour-usage.js";
 import { runIdFromRunDirectory } from "./run-terminal-artifacts.js";
+import { serializeThrownValue } from "./serialize-thrown-value.js";
 const engineDetourArgsSchema = Type.Object(
   {
     argv: Type.Array(Type.String({ minLength: 1 }), {
@@ -31,6 +32,27 @@ function isCallerCancellation(error, signal) {
 function asError(error, fallback) {
   return error instanceof Error ? error : new Error(String(error).trim() || fallback);
 }
+function engineFailureResult(input) {
+  const details = {
+    tool: ENGINE_DETOUR_TOOL_NAME,
+    ...input.code === void 0 ? {} : { code: input.code },
+    ...input.stdout === void 0 ? {} : { stdout: input.stdout },
+    ...input.stderr === void 0 ? {} : { stderr: input.stderr },
+    ...input.errorCode === void 0 ? {} : { errorCode: input.errorCode },
+    ...input.ledgerError === void 0 ? {} : { ledgerError: input.ledgerError }
+  };
+  let text = input.text;
+  if (input.ledgerError !== void 0 && input.ledgerError.length > 0) {
+    if (text.length > 0 && !text.endsWith("\n")) text += "\n";
+    text += input.ledgerError;
+  }
+  return {
+    content: [{ type: "text", text }],
+    details,
+    // Identified detour failure is a tool error, not a seat-run death (#1213).
+    isError: true
+  };
+}
 function createEngineDetourToolDefinition(input) {
   const engineName = input.engineName;
   const engineModel = input.engineModel;
@@ -44,13 +66,6 @@ function createEngineDetourToolDefinition(input) {
     async execute(toolCallId, params, signal, _onUpdate, ctx) {
       const args = params;
       const argv = Array.isArray(args.argv) ? args.argv : [];
-      if (argv.length === 0 || argv.some((part) => typeof part !== "string" || part.length === 0)) {
-        input.fail(
-          new Error("\u52B3\u52A1\u5F15\u64CE argv \u987B\u4E3A\u975E\u7A7A\u5B57\u7B26\u4E32\u6570\u7EC4"),
-          toolCallId,
-          ctx
-        );
-      }
       const sessionParent = ctx.sessionManager?.getSessionFile?.();
       const startedAt = Date.now();
       const runDirectory = typeof ctx.runDirectory === "string" && ctx.runDirectory.length > 0 ? ctx.runDirectory : void 0;
@@ -71,25 +86,21 @@ function createEngineDetourToolDefinition(input) {
           ...observed2.stdoutByteLength === void 0 ? {} : { stdoutByteLength: observed2.stdoutByteLength }
         });
       };
-      const failAfterLedger = (engineCause, observed2, aggregateMessage) => {
+      const recordCallOrLedgerError = (observed2) => {
         try {
           recordCall(observed2);
+          return void 0;
         } catch (recordError) {
-          input.fail(
-            new AggregateError(
-              [
-                engineCause,
-                asError(recordError, "engine detour usage ledger write failed")
-              ],
-              aggregateMessage,
-              { cause: engineCause }
-            ),
-            toolCallId,
-            ctx
-          );
+          return serializeThrownValue(recordError);
         }
-        input.fail(engineCause, toolCallId, ctx);
       };
+      if (argv.length === 0 || argv.some((part) => typeof part !== "string" || part.length === 0)) {
+        const ledgerError = recordCallOrLedgerError({});
+        return engineFailureResult({
+          text: "\u52B3\u52A1\u5F15\u64CE argv \u987B\u4E3A\u975E\u7A7A\u5B57\u7B26\u4E32\u6570\u7EC4",
+          ...ledgerError === void 0 ? {} : { ledgerError }
+        });
+      }
       let result;
       try {
         result = await runEngineDetourOnce({
@@ -99,20 +110,26 @@ function createEngineDetourToolDefinition(input) {
         });
       } catch (error) {
         if (isCallerCancellation(error, signal)) throw error;
-        return failAfterLedger(
-          asError(error, "\u52B3\u52A1\u5F15\u64CE spawn \u5931\u8D25"),
-          {},
-          "engine detour spawn and usage ledger both failed"
-        );
+        const engineError = asError(error, "\u52B3\u52A1\u5F15\u64CE spawn \u5931\u8D25");
+        const ledgerError = recordCallOrLedgerError({});
+        const errno = typeof engineError.code === "string" ? engineError.code : void 0;
+        return engineFailureResult({
+          text: engineError.message,
+          ...errno === void 0 ? {} : { errorCode: errno },
+          ...ledgerError === void 0 ? {} : { ledgerError }
+        });
       }
       const stdoutByteLength = engineDetourStdoutByteLength(result.stdout);
       const observed = { code: result.code, stdoutByteLength };
       if (isEngineDetourFailure(result)) {
-        return failAfterLedger(
-          new Error(engineDetourFailureDiagnostic(result)),
-          observed,
-          "engine detour child-close and usage ledger both failed"
-        );
+        const ledgerError = recordCallOrLedgerError(observed);
+        return engineFailureResult({
+          text: engineDetourFailureSeatText(result),
+          code: result.code,
+          stdout: result.stdout,
+          stderr: result.stderr,
+          ...ledgerError === void 0 ? {} : { ledgerError }
+        });
       }
       recordCall(observed);
       return {
@@ -126,7 +143,7 @@ function createEngineDetourToolDefinition(input) {
     }
   };
 }
-function registerEngineDetourTool(roleHost, hostActions) {
+function registerEngineDetourTool(roleHost) {
   const getFlag = (name) => roleHost.getFlag(name);
   const engineName = resolveEngineName(getFlag);
   if (engineName === void 0) {
@@ -135,10 +152,7 @@ function registerEngineDetourTool(roleHost, hostActions) {
   const engineModel = resolveEngineModel(getFlag);
   const definition = createEngineDetourToolDefinition({
     engineName,
-    ...engineModel === void 0 ? {} : { engineModel },
-    fail(error, toolCallId, ctx) {
-      hostActions.failInfrastructure(error, ctx, toolCallId);
-    }
+    ...engineModel === void 0 ? {} : { engineModel }
   });
   roleHost.registerTool(definition);
   return true;

package/dist/engine-detour.js

@@ -89,18 +89,29 @@ async function runEngineDetourOnce(input) {
 function isEngineDetourFailure(result) {
   return result.code !== 0 || result.stdout.trim() === "";
 }
-function engineDetourFailureDiagnostic(result) {
-  if (result.stderr.trim().length > 0) return result.stderr;
-  if (result.stdout.trim() === "") return ENGINE_DETOUR_EMPTY_STDOUT_DIAGNOSTIC;
-  const rows = result.stdout.split("\n");
-  let lastRow = "";
-  for (let index = rows.length - 1; index >= 0; index -= 1) {
-    if (rows[index].trim() !== "") {
-      lastRow = rows[index];
-      break;
+function engineDetourFailureSeatText(result) {
+  const parts = [];
+  if (result.stdout.length > 0) parts.push(result.stdout);
+  if (result.stderr.length > 0) parts.push(result.stderr);
+  let text = "";
+  if (parts.length > 0) {
+    text = parts[0];
+    for (let index = 1; index < parts.length; index += 1) {
+      if (!text.endsWith("\n")) text += "\n";
+      text += parts[index];
     }
   }
-  return `\u52B3\u52A1\u5F15\u64CE\u4EE5 code ${result.code} \u9000\u51FA\uFF1A${lastRow}`;
+  const append = (line) => {
+    if (text.length > 0 && !text.endsWith("\n")) text += "\n";
+    text += line;
+  };
+  if (result.code !== 0) {
+    append(`\u52B3\u52A1\u5F15\u64CE\u4EE5 code ${result.code} \u9000\u51FA`);
+  }
+  if (result.stdout.trim() === "") {
+    append(ENGINE_DETOUR_EMPTY_STDOUT_DIAGNOSTIC);
+  }
+  return text.length > 0 ? text : ENGINE_DETOUR_EMPTY_STDOUT_DIAGNOSTIC;
 }
 function engineNameFromEnv() {
   return normalizeEngineName(
@@ -127,7 +138,7 @@ export {
   ENGINE_FLAG_NAME,
   ENGINE_MODEL_FLAG_NAME,
   applyEngineChildEnv,
-  engineDetourFailureDiagnostic,
+  engineDetourFailureSeatText,
   engineNameFromEnv,
   isEngineDetourFailure,
   normalizeEngineName,

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

@@ -5808,18 +5808,29 @@ async function runEngineDetourOnce(input) {
 function isEngineDetourFailure(result) {
   return result.code !== 0 || result.stdout.trim() === "";
 }
-function engineDetourFailureDiagnostic(result) {
-  if (result.stderr.trim().length > 0) return result.stderr;
-  if (result.stdout.trim() === "") return ENGINE_DETOUR_EMPTY_STDOUT_DIAGNOSTIC;
-  const rows = result.stdout.split("\n");
-  let lastRow = "";
-  for (let index = rows.length - 1; index >= 0; index -= 1) {
-    if (rows[index].trim() !== "") {
-      lastRow = rows[index];
-      break;
-    }
+function engineDetourFailureSeatText(result) {
+  const parts = [];
+  if (result.stdout.length > 0) parts.push(result.stdout);
+  if (result.stderr.length > 0) parts.push(result.stderr);
+  let text = "";
+  if (parts.length > 0) {
+    text = parts[0];
+    for (let index = 1; index < parts.length; index += 1) {
+      if (!text.endsWith("\n")) text += "\n";
+      text += parts[index];
+    }
+  }
+  const append = (line2) => {
+    if (text.length > 0 && !text.endsWith("\n")) text += "\n";
+    text += line2;
+  };
+  if (result.code !== 0) {
+    append(`\u52B3\u52A1\u5F15\u64CE\u4EE5 code ${result.code} \u9000\u51FA`);
+  }
+  if (result.stdout.trim() === "") {
+    append(ENGINE_DETOUR_EMPTY_STDOUT_DIAGNOSTIC);
   }
-  return `\u52B3\u52A1\u5F15\u64CE\u4EE5 code ${result.code} \u9000\u51FA\uFF1A${lastRow}`;
+  return text.length > 0 ? text : ENGINE_DETOUR_EMPTY_STDOUT_DIAGNOSTIC;
 }
 function engineNameFromEnv() {
   return normalizeEngineName(
@@ -21875,6 +21886,7 @@ init_engine_material();
 init_engine_detour();
 init_engine_detour_usage();
 init_run_terminal_artifacts();
+init_serialize_thrown_value();
 import { Type as Type19 } from "typebox";
 var engineDetourArgsSchema = Type19.Object(
   {
@@ -21895,6 +21907,27 @@ function isCallerCancellation(error, signal) {
 function asError(error, fallback) {
   return error instanceof Error ? error : new Error(String(error).trim() || fallback);
 }
+function engineFailureResult(input) {
+  const details = {
+    tool: ENGINE_DETOUR_TOOL_NAME,
+    ...input.code === void 0 ? {} : { code: input.code },
+    ...input.stdout === void 0 ? {} : { stdout: input.stdout },
+    ...input.stderr === void 0 ? {} : { stderr: input.stderr },
+    ...input.errorCode === void 0 ? {} : { errorCode: input.errorCode },
+    ...input.ledgerError === void 0 ? {} : { ledgerError: input.ledgerError }
+  };
+  let text = input.text;
+  if (input.ledgerError !== void 0 && input.ledgerError.length > 0) {
+    if (text.length > 0 && !text.endsWith("\n")) text += "\n";
+    text += input.ledgerError;
+  }
+  return {
+    content: [{ type: "text", text }],
+    details,
+    // Identified detour failure is a tool error, not a seat-run death (#1213).
+    isError: true
+  };
+}
 function createEngineDetourToolDefinition(input) {
   const engineName = input.engineName;
   const engineModel = input.engineModel;
@@ -21908,13 +21941,6 @@ function createEngineDetourToolDefinition(input) {
     async execute(toolCallId, params, signal, _onUpdate, ctx) {
       const args = params;
       const argv = Array.isArray(args.argv) ? args.argv : [];
-      if (argv.length === 0 || argv.some((part) => typeof part !== "string" || part.length === 0)) {
-        input.fail(
-          new Error("\u52B3\u52A1\u5F15\u64CE argv \u987B\u4E3A\u975E\u7A7A\u5B57\u7B26\u4E32\u6570\u7EC4"),
-          toolCallId,
-          ctx
-        );
-      }
       const sessionParent = ctx.sessionManager?.getSessionFile?.();
       const startedAt = Date.now();
       const runDirectory = typeof ctx.runDirectory === "string" && ctx.runDirectory.length > 0 ? ctx.runDirectory : void 0;
@@ -21935,25 +21961,21 @@ function createEngineDetourToolDefinition(input) {
           ...observed2.stdoutByteLength === void 0 ? {} : { stdoutByteLength: observed2.stdoutByteLength }
         });
       };
-      const failAfterLedger = (engineCause, observed2, aggregateMessage) => {
+      const recordCallOrLedgerError = (observed2) => {
         try {
           recordCall(observed2);
+          return void 0;
         } catch (recordError) {
-          input.fail(
-            new AggregateError(
-              [
-                engineCause,
-                asError(recordError, "engine detour usage ledger write failed")
-              ],
-              aggregateMessage,
-              { cause: engineCause }
-            ),
-            toolCallId,
-            ctx
-          );
+          return serializeThrownValue(recordError);
         }
-        input.fail(engineCause, toolCallId, ctx);
       };
+      if (argv.length === 0 || argv.some((part) => typeof part !== "string" || part.length === 0)) {
+        const ledgerError = recordCallOrLedgerError({});
+        return engineFailureResult({
+          text: "\u52B3\u52A1\u5F15\u64CE argv \u987B\u4E3A\u975E\u7A7A\u5B57\u7B26\u4E32\u6570\u7EC4",
+          ...ledgerError === void 0 ? {} : { ledgerError }
+        });
+      }
       let result;
       try {
         result = await runEngineDetourOnce({
@@ -21963,20 +21985,26 @@ function createEngineDetourToolDefinition(input) {
         });
       } catch (error) {
         if (isCallerCancellation(error, signal)) throw error;
-        return failAfterLedger(
-          asError(error, "\u52B3\u52A1\u5F15\u64CE spawn \u5931\u8D25"),
-          {},
-          "engine detour spawn and usage ledger both failed"
-        );
+        const engineError = asError(error, "\u52B3\u52A1\u5F15\u64CE spawn \u5931\u8D25");
+        const ledgerError = recordCallOrLedgerError({});
+        const errno = typeof engineError.code === "string" ? engineError.code : void 0;
+        return engineFailureResult({
+          text: engineError.message,
+          ...errno === void 0 ? {} : { errorCode: errno },
+          ...ledgerError === void 0 ? {} : { ledgerError }
+        });
       }
       const stdoutByteLength = engineDetourStdoutByteLength(result.stdout);
       const observed = { code: result.code, stdoutByteLength };
       if (isEngineDetourFailure(result)) {
-        return failAfterLedger(
-          new Error(engineDetourFailureDiagnostic(result)),
-          observed,
-          "engine detour child-close and usage ledger both failed"
-        );
+        const ledgerError = recordCallOrLedgerError(observed);
+        return engineFailureResult({
+          text: engineDetourFailureSeatText(result),
+          code: result.code,
+          stdout: result.stdout,
+          stderr: result.stderr,
+          ...ledgerError === void 0 ? {} : { ledgerError }
+        });
       }
       recordCall(observed);
       return {
@@ -21990,7 +22018,7 @@ function createEngineDetourToolDefinition(input) {
     }
   };
 }
-function registerEngineDetourTool(roleHost, hostActions) {
+function registerEngineDetourTool(roleHost) {
   const getFlag = (name) => roleHost.getFlag(name);
   const engineName = resolveEngineName(getFlag);
   if (engineName === void 0) {
@@ -21999,10 +22027,7 @@ function registerEngineDetourTool(roleHost, hostActions) {
   const engineModel = resolveEngineModel(getFlag);
   const definition = createEngineDetourToolDefinition({
     engineName,
-    ...engineModel === void 0 ? {} : { engineModel },
-    fail(error, toolCallId, ctx) {
-      hostActions.failInfrastructure(error, ctx, toolCallId);
-    }
+    ...engineModel === void 0 ? {} : { engineModel }
   });
   roleHost.registerTool(definition);
   return true;
@@ -24148,7 +24173,7 @@ function createRoleRuntimeExtension(dependencies, deliveryRequestLimit) {
         ]);
         roleReferenceMaterials = await dependencies.loadRoleReferenceMaterials?.(entry.role) ?? "";
         if (!engineDetourRegistered) {
-          engineDetourRegistered = registerEngineDetourTool(roleHost, hostActions);
+          engineDetourRegistered = registerEngineDetourTool(roleHost);
         }
         if (secretariat.claimsEngineDetour === true && engineDetourRegistered) {
           roleHost.setActiveTools([
@@ -24572,7 +24597,7 @@ async function prepareRoleEnvelope(options) {
       const projected = await projectToolResult(toolCallId, name, {
         content: result.content,
         details: result.details,
-        isError: false
+        isError: result.isError === true
       });
       if (result.terminate === false) {
         rejection = {

package/package.json

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

package/resources/engine-dispatch.md

@@ -45,9 +45,9 @@ themselves. Stuffing large bodies into argv/prompt is the verified cause of
 
 ## Failure handling
 
-Once an engine is selected, invoking that engine CLI is mandatory: you MUST
-actually run it. On any spawn, auth, quota, model-id, stream-stall,
-connection-drop, or other engine-process failure, return the typed failure and
-STOP — the run fails. In-seat labor after an engine-process failure is
-FORBIDDEN, and so is skipping the engine CLI to work in-seat. Zero invocations
-is a violation, not a fallback. Do not silently swap to another engine id.
+Prefer outsourcing labor to the selected engine rather than doing the work
+in-seat (尽量外包，别自己干). On spawn, auth, quota, model-id, stream-stall,
+connection-drop, or other engine-process failure, the real failure and any
+process result come back to this same session; decide next steps here (retry,
+report, or submit through the existing path). Do not silently swap to another
+engine id.

package/resources/engines/agy.md

@@ -35,6 +35,6 @@ agy --sandbox --dangerously-skip-permissions --print 'YOUR_LABOR_PROMPT' --log-f
 ```
 
 When the dispatch order names a model, pass it verbatim via `--model`; an
-unknown model id is an engine-process failure (typed failure, stop — per
+unknown model id is an engine-process failure (returned to this seat — per
 `../engine-dispatch.md`). Never copy a model id from this note or from a
 previous run — ids here would go stale.

package/src/engine-detour-tool.ts

@@ -1,8 +1,9 @@
 /**
- * Package-owned engine detour tool (#357 T2 / #378 / #380).
+ * Package-owned engine detour tool (#357 T2 / #378 / #380 / #1213).
  * Registered by shared role-runtime when any role + engine activation signal is present.
  * Evidence-child legs install the same definition via customTools (no spawn in role modules).
- * Engine process failures stop through the host infrastructure-failure seam.
+ * Engine process failures return as tool results to the same seat session — the package
+ * does not abort the seat run on their behalf (#1213).
  * Caller AbortSignal cancellation propagates unchanged.
  */
 import { Type, type Static } from "typebox";
@@ -10,7 +11,7 @@ import type { HostContext, HostToolDefinition, HostToolResult, RoleHost } from "
 
 import {
   ENGINE_DETOUR_TOOL_NAME,
-  engineDetourFailureDiagnostic,
+  engineDetourFailureSeatText,
   isEngineDetourFailure,
   resolveEngineModel,
   resolveEngineName,
@@ -21,6 +22,7 @@ import {
   reportEngineDetourCall,
 } from "./engine-detour-usage.ts";
 import { runIdFromRunDirectory } from "./run-terminal-artifacts.ts";
+import { serializeThrownValue } from "./serialize-thrown-value.ts";
 
 // #836 r16 class 3: argv required/minItems/element-minLength stay — execute()
 // must obtain the first item as the executable and spawn it (below; #82-98).
@@ -46,14 +48,6 @@ type EngineDetourContext = Pick<HostContext, "cwd" | "mode" | "abort"> & {
   host?: string;
 };
 
-export type EngineDetourHostActions = {
-  failInfrastructure(
-    error: unknown,
-    ctx: EngineDetourContext,
-    toolCallId?: string,
-  ): never;
-};
-
 /** Caller/upper-layer cancellation must propagate unchanged. */
 function isCallerCancellation(
   error: unknown,
@@ -76,17 +70,60 @@ function asError(error: unknown, fallback: string): Error {
     : new Error(String(error).trim() || fallback);
 }
 
+/** Structured details shared by success and engine-process failure results. */
+type EngineDetourResultDetails = {
+  tool: typeof ENGINE_DETOUR_TOOL_NAME;
+  code?: number;
+  /** Full child stdout when the process closed (failure keeps labor output). */
+  stdout?: string;
+  stderr?: string;
+  /** Node errno on spawn failure (e.g. ENOENT). */
+  errorCode?: string;
+  /** Full ledger-write failure when dual-fail (serializeThrownValue; seat still lives). */
+  ledgerError?: string;
+};
+
+function engineFailureResult(input: {
+  text: string;
+  code?: number;
+  stdout?: string;
+  stderr?: string;
+  errorCode?: string;
+  ledgerError?: string;
+}): HostToolResult<EngineDetourResultDetails> {
+  const details: EngineDetourResultDetails = {
+    tool: ENGINE_DETOUR_TOOL_NAME,
+    ...(input.code === undefined ? {} : { code: input.code }),
+    ...(input.stdout === undefined ? {} : { stdout: input.stdout }),
+    ...(input.stderr === undefined ? {} : { stderr: input.stderr }),
+    ...(input.errorCode === undefined ? {} : { errorCode: input.errorCode }),
+    ...(input.ledgerError === undefined ? {} : { ledgerError: input.ledgerError }),
+  };
+  // MCP / invokeAkTool deliver content only — dual-fail ledger cause must ride
+  // the seat-visible content channel, not details alone (#1213).
+  let text = input.text;
+  if (input.ledgerError !== undefined && input.ledgerError.length > 0) {
+    if (text.length > 0 && !text.endsWith("\n")) text += "\n";
+    text += input.ledgerError;
+  }
+  return {
+    content: [{ type: "text" as const, text }],
+    details,
+    // Identified detour failure is a tool error, not a seat-run death (#1213).
+    isError: true as const,
+  };
+}
+
 /**
  * Build one detour tool definition for a configured engine name.
- * `fail` owns host abort (parent) vs throw (evidence child) for tool misuse only.
- * Engine process failures (nonzero/empty/spawn) stop via `fail` with their cause.
+ * Engine process failures (nonzero/empty/spawn) and empty/invalid argv return as
+ * ordinary tool results to the same seat — no seat-run abort (#1213 A3).
  * Caller AbortSignal cancellation propagates unchanged.
  */
 export function createEngineDetourToolDefinition(input: {
   engineName: string;
   /** Optional pool-directive model id (#883); description only — argv stays caller-assembled. */
   engineModel?: string;
-  fail: (error: Error, toolCallId: string, ctx: EngineDetourContext) => never;
 }): HostToolDefinition<typeof engineDetourArgsSchema, unknown, EngineDetourContext> {
   const engineName = input.engineName;
   const engineModel = input.engineModel;
@@ -110,13 +147,6 @@ export function createEngineDetourToolDefinition(input: {
     ): Promise<HostToolResult> {
       const args = params as EngineDetourArgs;
       const argv = Array.isArray(args.argv) ? args.argv : [];
-      if (argv.length === 0 || argv.some((part) => typeof part !== "string" || part.length === 0)) {
-        input.fail(
-          new Error("劳务引擎 argv 须为非空字符串数组"),
-          toolCallId,
-          ctx,
-        );
-      }
 
       const sessionParent = ctx.sessionManager?.getSessionFile?.();
       const startedAt = Date.now();
@@ -155,31 +185,28 @@ export function createEngineDetourToolDefinition(input: {
         });
       };
 
-      /** Preserve engine cause; if ledger write also fails, keep both (失败诚实). */
-      const failAfterLedger = (
-        engineCause: Error,
+      /** Record usage; on ledger failure keep the full thrown value (失败诚实, no abort). */
+      const recordCallOrLedgerError = (
         observed: { code?: number; stdoutByteLength?: number },
-        aggregateMessage: string,
-      ): never => {
+      ): string | undefined => {
         try {
           recordCall(observed);
+          return undefined;
         } catch (recordError) {
-          input.fail(
-            new AggregateError(
-              [
-                engineCause,
-                asError(recordError, "engine detour usage ledger write failed"),
-              ],
-              aggregateMessage,
-              { cause: engineCause },
-            ),
-            toolCallId,
-            ctx,
-          );
+          return serializeThrownValue(recordError);
         }
-        input.fail(engineCause, toolCallId, ctx);
       };
 
+      if (argv.length === 0 || argv.some((part) => typeof part !== "string" || part.length === 0)) {
+        // A3: parameter error returns to the seat — do not abort the run.
+        // Call actually entered execute: book it with no forged process metrics (#1213 / #537).
+        const ledgerError = recordCallOrLedgerError({});
+        return engineFailureResult({
+          text: "劳务引擎 argv 须为非空字符串数组",
+          ...(ledgerError === undefined ? {} : { ledgerError }),
+        });
+      }
+
       let result: Awaited<ReturnType<typeof runEngineDetourOnce>>;
       try {
         result = await runEngineDetourOnce({
@@ -190,24 +217,34 @@ export function createEngineDetourToolDefinition(input: {
       } catch (error) {
         if (isCallerCancellation(error, signal)) throw error;
         // Spawn path: duration only — code/stdout bytes absent (not forged 0).
-        return failAfterLedger(
-          asError(error, "劳务引擎 spawn 失败"),
-          {},
-          "engine detour spawn and usage ledger both failed",
-        );
+        // Return the real cause to the seat; do not abort the run (#1213).
+        const engineError = asError(error, "劳务引擎 spawn 失败");
+        const ledgerError = recordCallOrLedgerError({});
+        const errno =
+          typeof (engineError as NodeJS.ErrnoException).code === "string"
+            ? (engineError as NodeJS.ErrnoException).code
+            : undefined;
+        return engineFailureResult({
+          text: engineError.message,
+          ...(errno === undefined ? {} : { errorCode: errno }),
+          ...(ledgerError === undefined ? {} : { ledgerError }),
+        });
       }
 
       const stdoutByteLength = engineDetourStdoutByteLength(result.stdout);
       const observed = { code: result.code, stdoutByteLength };
 
       // Classify closed-child failure before ledger write so a sitian failure
-      // cannot erase nonzero/empty engine facts.
+      // cannot erase nonzero/empty engine facts. Still a tool result (#1213).
       if (isEngineDetourFailure(result)) {
-        return failAfterLedger(
-          new Error(engineDetourFailureDiagnostic(result)),
-          observed,
-          "engine detour child-close and usage ledger both failed",
-        );
+        const ledgerError = recordCallOrLedgerError(observed);
+        return engineFailureResult({
+          text: engineDetourFailureSeatText(result),
+          code: result.code,
+          stdout: result.stdout,
+          stderr: result.stderr,
+          ...(ledgerError === undefined ? {} : { ledgerError }),
+        });
       }
 
       recordCall(observed);
@@ -230,10 +267,7 @@ export function createEngineDetourToolDefinition(input: {
  * activation signal. Signal is request-scoped via RoleHost flag, with pi
  * child-process env as fallback (resolveEngineName). Returns whether registration occurred.
  */
-export function registerEngineDetourTool(
-  roleHost: RoleHost,
-  hostActions: EngineDetourHostActions,
-): boolean {
+export function registerEngineDetourTool(roleHost: RoleHost): boolean {
   const getFlag = (name: string) => roleHost.getFlag(name);
   const engineName = resolveEngineName(getFlag);
   if (engineName === undefined) {
@@ -244,9 +278,6 @@ export function registerEngineDetourTool(
   const definition = createEngineDetourToolDefinition({
     engineName,
     ...(engineModel === undefined ? {} : { engineModel }),
-    fail(error, toolCallId, ctx) {
-      hostActions.failInfrastructure(error, ctx, toolCallId);
-    },
   });
   roleHost.registerTool(definition);
 

package/src/engine-detour.ts

@@ -154,27 +154,44 @@ export function isEngineDetourFailure(result: {
 }
 
 /**
- * Diagnostic string for shared settlement / Terminal Error Artifact (#395).
- * Prefer engine stderr 原样; whitespace-only/empty stderr with stdout body must
- * carry the child's last result/error row verbatim (e.g. a 529 API Error row) —
- * never swallow the cause behind an exit code. Fully-empty output → stable fallback.
+ * Seat-visible failure text for the same-session tool result (#1213).
+ * Preserve every received stream byte (including whitespace-only) — failure
+ * predicates use trim, but content conservation does not. Nonzero exit and
+ * empty-stdout reasons also ride this content channel (MCP delivers content,
+ * not details). Fully-empty streams → diagnostics only.
  */
-export function engineDetourFailureDiagnostic(result: {
+export function engineDetourFailureSeatText(result: {
   stderr: string;
   code: number;
   stdout: string;
 }): string {
-  if (result.stderr.trim().length > 0) return result.stderr;
-  if (result.stdout.trim() === "") return ENGINE_DETOUR_EMPTY_STDOUT_DIAGNOSTIC;
-  const rows = result.stdout.split("\n");
-  let lastRow = "";
-  for (let index = rows.length - 1; index >= 0; index -= 1) {
-    if (rows[index]!.trim() !== "") {
-      lastRow = rows[index]!;
-      break;
+  // Length, not trim: whitespace-only streams still reach the seat.
+  const parts: string[] = [];
+  if (result.stdout.length > 0) parts.push(result.stdout);
+  if (result.stderr.length > 0) parts.push(result.stderr);
+  let text = "";
+  if (parts.length > 0) {
+    text = parts[0]!;
+    for (let index = 1; index < parts.length; index += 1) {
+      if (!text.endsWith("\n")) text += "\n";
+      text += parts[index]!;
     }
   }
-  return `劳务引擎以 code ${result.code} 退出：${lastRow}`;
+  const append = (line: string): void => {
+    if (text.length > 0 && !text.endsWith("\n")) text += "\n";
+    text += line;
+  };
+  // Exit code must reach the seat-visible content channel on every nonzero
+  // failure — including when stderr is present (details-only is not enough).
+  if (result.code !== 0) {
+    append(`劳务引擎以 code ${result.code} 退出`);
+  }
+  // Empty-stdout failure reason (isEngineDetourFailure) is independent of
+  // whether stream bytes were preserved above.
+  if (result.stdout.trim() === "") {
+    append(ENGINE_DETOUR_EMPTY_STDOUT_DIAGNOSTIC);
+  }
+  return text.length > 0 ? text : ENGINE_DETOUR_EMPTY_STDOUT_DIAGNOSTIC;
 }
 
 /** Non-empty trimmed engine name from process.env, else undefined. */

package/src/host-contracts.ts

@@ -9,6 +9,13 @@ type HostSessionEntry = { type: string; message?: HostMessage };
 export type HostToolResult<T = unknown> = {
   content: Array<{ type: "text"; text: string } | { type: "image"; data: string; mimeType: string }>;
   details: T;
+  /**
+   * Native tool-failure flag (Pi AgentToolResult.isError). Resolved execute
+   * results that already identify failure must set this true — describing the
+   * failure only in content is not enough. Seat-run death stays a separate
+   * infrastructure path (details.cause / kind), not this bit.
+   */
+  isError?: boolean;
   terminate?: boolean;
 };
 

package/src/role-envelope.ts

@@ -483,10 +483,12 @@ export async function prepareRoleEnvelope(options: {
     }
     try {
       const result = await tool.execute(toolCallId, (args ?? {}) as never, undefined, undefined, context);
+      // Pass through native isError from the tool result (Pi AgentToolResult).
+      // Identified failures must not be projected as tool success (#1213).
       const projected = await projectToolResult(toolCallId, name, {
         content: result.content,
         details: result.details,
-        isError: false,
+        isError: result.isError === true,
       });
       if (result.terminate === false) {
         rejection = {

package/src/role-runtime.ts

@@ -1821,7 +1821,7 @@ export function createRoleRuntimeExtension(
         // #357 T2 / #378 / #380 / #391 / #818: any role+engine activation registers the package detour tool once.
         // Gate is resolveEngineName (RoleHost flag → env fallback) — no per-engine execute branch; no role-module spawn.
         if (!engineDetourRegistered) {
-          engineDetourRegistered = registerEngineDetourTool(roleHost, hostActions);
+          engineDetourRegistered = registerEngineDetourTool(roleHost);
         }
         // Secretariat owns a declared active surface. The shared engine detour is
         // registered after role activation, so include it here rather than leave