Only match code-consuming trigger words in command position

segmentWords split on raw whitespace with no quote-awareness, so a
trigger word inside a quoted payload — a commit message mentioning
'source', a heredoc line mentioning 'env' — falsely marked the segment
as code-consuming and suppressed collapsing it. Rewrite segmentWords to
walk the segment and skip quoted and heredoc-body spans, so only the
actual command and its flags are considered.

Author: TheGreatAxios

src/tui/command-display.test.ts

@@ -210,3 +210,22 @@ test("collapseSegmentPayloads never collapses a nohup-wrapped bash -c invocation
   expect(collapseSegmentPayloads(segment)).toEqual({ display: segment, payloads: [] });
 });
 
+test("collapseSegmentPayloads still collapses a commit message containing a trigger word in quoted text", () => {
+  const segment = 'git commit -m "please source of truth\nfor this change"';
+  const { display, payloads } = collapseSegmentPayloads(segment);
+  expect(display).toBe("git commit -m <message, 2 lines>");
+  expect(payloads).toEqual([{ placeholder: "<message, 2 lines>", lines: ["please source of truth", "for this change"] }]);
+});
+
+test("collapseSegmentPayloads still collapses a quoted argument mentioning env in its text", () => {
+  const segment = 'echo "the env for this feature\nis staging"';
+  const { display } = collapseSegmentPayloads(segment);
+  expect(display).toBe("echo <text, 2 lines>");
+});
+
+test("collapseSegmentPayloads still collapses a normal long commit-message heredoc", () => {
+  const segment = "git commit -F <<'EOF'\nsummary line\nmore detail\nEOF\n";
+  const { display, payloads } = collapseSegmentPayloads(segment);
+  expect(display).toBe("git commit -F <<'EOF' <heredoc, 2 lines>");
+  expect(payloads).toEqual([{ placeholder: "<heredoc, 2 lines>", lines: ["summary line", "more detail"] }]);
+});

src/tui/command-display.ts

@@ -285,11 +285,76 @@ const INTERPRETER_CODE_FLAGS: Record<string, readonly string[]> = {
   php: ["-r"],
 };
 
-// Crude whitespace tokenizing is enough here: quoting doesn't change whether
-// an interpreter name or a `-c` flag literally appears as a word, and this is
-// display-only guesswork (see the file header) — never used for classification.
+// Command-position words only: the program name and its flags, never text
+// inside a quoted argument or heredoc body. A naive whitespace split would
+// let a trigger word incidentally appearing inside a quoted payload (a commit
+// message mentioning "source", a heredoc line mentioning "env") falsely mark
+// the segment as code-consuming and suppress collapsing it — this walk skips
+// quoted/heredoc spans entirely so only the actual command and its arguments
+// are considered. Display-only guesswork (see the file header) — never used
+// for classification.
 function segmentWords(segment: string): string[] {
-  return segment.split(/\s+/).filter((word) => word.length > 0);
+  const words: string[] = [];
+  let current = "";
+  let quote: '"' | "'" | "`" | null = null;
+  let heredocMarker: string | null = null;
+
+  const push = (): void => {
+    if (current.length > 0) words.push(current);
+    current = "";
+  };
+
+  let i = 0;
+  while (i < segment.length) {
+    const ch = segment[i] as string;
+
+    if (heredocMarker !== null) {
+      if (ch === "\n") {
+        let lineEnd = segment.indexOf("\n", i + 1);
+        if (lineEnd === -1) lineEnd = segment.length;
+        if (segment.slice(i + 1, lineEnd).trim() === heredocMarker) {
+          heredocMarker = null;
+          i = lineEnd;
+        }
+      }
+      i++;
+      continue;
+    }
+
+    if (quote !== null) {
+      if (ch === quote) quote = null;
+      i++;
+      continue;
+    }
+
+    if (ch === '"' || ch === "'" || ch === "`") {
+      push();
+      quote = ch;
+      i++;
+      continue;
+    }
+
+    if (ch === "<" && segment[i + 1] === "<") {
+      const marker = parseHeredocMarker(segment, i);
+      if (marker !== null) {
+        push();
+        heredocMarker = marker;
+        while (i < segment.length && segment[i] !== "\n") i++;
+        continue;
+      }
+    }
+
+    if (ch === " " || ch === "\t" || ch === "\n") {
+      push();
+      i++;
+      continue;
+    }
+
+    current += ch;
+    i++;
+  }
+  push();
+  return words;
 }
 
 // The POSIX basename of a word naming a program: strips any directory