fix: keep heredoc exec bodies out of command summaries (#99379)

ZengWen-DT · web-flow · commit 7e81f1596107 · 2026-07-06T05:41:29.000Z
diff --git a/src/agents/tool-display-exec-shell.ts b/src/agents/tool-display-exec-shell.ts
@@ -237,7 +237,7 @@ export function unwrapShellWrapper(command: string): string {
   return inner ? (stripOuterQuotes(inner) ?? command) : command;
 }
 
-function scanTopLevelChars(
+export function scanTopLevelChars(
   command: string,
   visit: (char: string, index: number) => boolean | void,
 ): void {
diff --git a/src/agents/tool-display-exec.ts b/src/agents/tool-display-exec.ts
@@ -12,6 +12,7 @@ import {
   firstPositional,
   optionValue,
   positionalArgs,
+  scanTopLevelChars,
   splitShellWords,
   splitTopLevelPipes,
   splitTopLevelStages,
@@ -299,6 +300,115 @@ function summarizePipeline(stage: string): string {
   return summarizeKnownExec(trimLeadingEnv(splitShellWords(stage)));
 }
 
+type HeredocTerminator = {
+  value: string;
+  stripLeadingTabs: boolean;
+};
+
+function collectHeredocTerminators(commandLine: string): HeredocTerminator[] {
+  const terminators: HeredocTerminator[] = [];
+  scanTopLevelChars(commandLine, (char, index) => {
+    if (char !== "<" || commandLine[index + 1] !== "<" || commandLine[index + 2] === "<") {
+      return true;
+    }
+
+    const stripLeadingTabs = commandLine[index + 2] === "-";
+    const parsed = parseHeredocTerminator(commandLine, index + (stripLeadingTabs ? 3 : 2));
+    if (parsed) {
+      terminators.push({ value: parsed, stripLeadingTabs });
+    }
+    return true;
+  });
+  return terminators;
+}
+
+function parseHeredocTerminator(commandLine: string, rawStart: number): string | undefined {
+  let start = rawStart;
+  while (/\s/u.test(commandLine[start] ?? "")) {
+    start += 1;
+  }
+
+  let value = "";
+  let quote: '"' | "'" | undefined;
+
+  for (let index = start; index < commandLine.length; index += 1) {
+    const char = commandLine[index] ?? "";
+
+    if (quote) {
+      if (char === quote) {
+        quote = undefined;
+        continue;
+      }
+      if (quote === '"' && char === "\\" && index + 1 < commandLine.length) {
+        index += 1;
+        value += commandLine[index] ?? "";
+        continue;
+      }
+      value += char;
+      continue;
+    }
+
+    if (/[\s;&|<>]/u.test(char)) {
+      break;
+    }
+    if (char === "'" || char === '"') {
+      quote = char;
+      continue;
+    }
+    if (char === "\\" && index + 1 < commandLine.length) {
+      index += 1;
+      value += commandLine[index] ?? "";
+      continue;
+    }
+    value += char;
+  }
+
+  return value || undefined;
+}
+
+function commandWithoutHeredocBodies(command: string): string | undefined {
+  if (!command.includes("\n")) {
+    return undefined;
+  }
+
+  const lines = command.split(/\r?\n/u);
+  const summaryLines: string[] = [];
+  let foundHeredoc = false;
+
+  for (let index = 0; index < lines.length; index += 1) {
+    const line = lines[index] ?? "";
+    summaryLines.push(line);
+
+    const terminators = collectHeredocTerminators(line);
+    if (terminators.length === 0) {
+      continue;
+    }
+    foundHeredoc = true;
+
+    for (const terminator of terminators) {
+      index += 1;
+      while (index < lines.length) {
+        const candidate = terminator.stripLeadingTabs
+          ? (lines[index] ?? "").replace(/^\t+/u, "")
+          : (lines[index] ?? "");
+        if (candidate === terminator.value) {
+          break;
+        }
+        index += 1;
+      }
+    }
+  }
+
+  if (!foundHeredoc) {
+    return undefined;
+  }
+
+  return summaryLines
+    .map((line) => line.trim())
+    .filter(Boolean)
+    .join("; ");
+}
+
 type ExecSummary = {
   text: string;
   chdirPath?: string;
@@ -362,7 +472,8 @@ function summarizeExecCommand(command: string): ExecSummary | undefined {
     return chdirPath ? { text: "", chdirPath } : undefined;
   }
 
-  const stages = splitTopLevelStages(cleaned);
+  const summaryCommand = commandWithoutHeredocBodies(cleaned) ?? cleaned;
+  const stages = splitTopLevelStages(summaryCommand);
   if (stages.length === 0) {
     return undefined;
   }
diff --git a/src/agents/tool-display.test.ts b/src/agents/tool-display.test.ts
@@ -464,6 +464,61 @@ describe("tool display details", () => {
     expect(nodeShortCheckDetail).toContain("check js syntax for /tmp/test.js");
   });
 
+  it("does not split heredoc body content into exec stages", () => {
+    const detail = formatToolDetail(
+      resolveToolDisplay({
+        name: "exec",
+        args: {
+          command: [
+            "python3 <<'PY'",
+            "const slugify = () => 'court-mix';",
+            "if (true) console.log('a') && console.log('b');",
+            "cat <<YAML",
+            "- uses: subosito/flutter-action@v2",
+            "YAML",
+            "PY",
+          ].join("\n"),
+          workdir: "/Users/example/.openclaw/workspace",
+        },
+        detailMode: "explain",
+      }),
+    );
+
+    expect(detail).toBe("run python3 inline script (heredoc) (agent)");
+  });
+
+  it("keeps command stages after a heredoc terminator", () => {
+    const detail = formatToolDetail(
+      resolveToolDisplay({
+        name: "exec",
+        args: {
+          command: ["python3 <<'PY'", "print('body && not a command')", "PY", "npm test"].join(
+            "\n",
+          ),
+        },
+        detailMode: "explain",
+      }),
+    );
+
+    expect(detail).toBe("run python3 inline script (heredoc) → run tests");
+  });
+
+  it("matches shell-quoted heredoc terminators before keeping later stages", () => {
+    const detail = formatToolDetail(
+      resolveToolDisplay({
+        name: "exec",
+        args: {
+          command: ["python3 <<\\PY", "print('body && not a command')", "PY", "npm test"].join(
+            "\n",
+          ),
+        },
+        detailMode: "explain",
+      }),
+    );
+
+    expect(detail).toBe("run python3 inline script (heredoc) → run tests");
+  });
+
   it("appends node name to exec detail when node is set", () => {
     const detail = formatToolDetail(
       resolveToolDisplay({

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ export function unwrapShellWrapper(command: string): string {`
`237`	`237`	`return inner ? (stripOuterQuotes(inner) ?? command) : command;`
`238`	`238`	`}`
`239`	`239`
`240`		`-function scanTopLevelChars(`
	`240`	`+export function scanTopLevelChars(`
`241`	`241`	`command: string,`
`242`	`242`	`visit: (char: string, index: number) => boolean \| void,`
`243`	`243`	`): void {`