@akagilnc/pi-workflow-roles 0.1.5797 → 0.1.5820

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,