@akagilnc/pi-workflow-roles 0.1.5775 → 0.1.5805

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/external-host-turn-loop.js

@@ -252,6 +252,9 @@ export async function driveExternalRoleTurnRounds(prepared, request, driver) {
             }
         }
         prompt = closure.retry.message;
+        // #1199: same-envelope 催交 / correctable retry — progress instruction is
+        // the bytes actually sent this round, not the first-mint summons.
+        prepared.recordSentInstruction?.(prompt);
         driver.afterRetry?.();
     }
 }