fix: preserve non-terminal subagent tool-use turns

src/wrapper/cli.mjs

@@ -10,6 +10,10 @@ async function sleep(ms) {
   await new Promise((resolve) => setTimeout(resolve, ms));
 }
 
+function isTerminalAssistantStopReason(stopReason) {
+  return stopReason === "stop" || stopReason === "length" || stopReason === "aborted" || stopReason === "error";
+}
+
 async function appendJsonLine(path, value) {
   await appendBestEffort(path, `${JSON.stringify(value)}\n`);
 }
@@ -41,6 +45,7 @@ function makeResult(meta, startedAt, input = {}) {
     finishedAt: new Date().toISOString(),
     exitCode,
     stopReason: input.stopReason ?? (exitCode === 0 ? undefined : "error"),
+    rawStopReason: input.rawStopReason,
     finalText: input.finalText ?? "",
     usage: input.usage,
     stdoutPath: meta.stdoutPath,
@@ -71,6 +76,7 @@ async function runWrapper(meta, startedAt) {
   let finalText = "";
   let resolvedModel = meta.resolvedModel;
   let stopReason;
+  let rawStopReason;
   let usage = undefined;
   let stdoutBuffer = "";
   let stderrText = "";
@@ -122,9 +128,10 @@ async function runWrapper(meta, startedAt) {
       finalText = normalized.text;
       resolvedModel = normalized.model ?? resolvedModel;
       stopReason = normalized.stopReason ?? stopReason;
+      rawStopReason = normalized.rawStopReason ?? rawStopReason;
       usage = normalized.usage ?? usage;
 
-      if (normalized.stopReason) {
+      if (isTerminalAssistantStopReason(normalized.stopReason)) {
         void forceChildExitAfterSemanticCompletion();
       }
     }
@@ -208,6 +215,7 @@ async function runWrapper(meta, startedAt) {
   return makeResult(meta, startedAt, {
     exitCode,
     stopReason,
+    rawStopReason,
     finalText,
     usage,
     resolvedModel,