Simplify ctrl-c e2e test to single task

- Revert pending_osc buffering in pty_terminal_test (unnecessary)
- Remove "ctrl-c receivedctrl-c received" redaction (no longer needed)
- Use single-package fixture with vite-task.json command instead of
  multi-package workspace with two concurrent tasks

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: branchseer

crates/pty_terminal_test/src/lib.rs

@@ -1,7 +1,4 @@
-use std::{
-    collections::VecDeque,
-    io::{BufReader, Read},
-};
+use std::io::{BufReader, Read};
 
 pub use portable_pty::CommandBuilder;
 use pty_terminal::terminal::{PtyReader, Terminal};
@@ -28,8 +25,6 @@ pub struct TestTerminal {
 pub struct Reader {
     pty: BufReader<PtyReader>,
     child_handle: ChildHandle,
-    /// OSC sequences taken from the PTY but not yet consumed by `expect_milestone`.
-    pending_osc: VecDeque<Vec<Vec<u8>>>,
 }
 
 impl TestTerminal {
@@ -42,11 +37,7 @@ impl TestTerminal {
         let Terminal { pty_reader, pty_writer, child_handle, .. } = Terminal::spawn(size, cmd)?;
         Ok(Self {
             writer: pty_writer,
-            reader: Reader {
-                pty: BufReader::new(pty_reader),
-                child_handle: child_handle.clone(),
-                pending_osc: VecDeque::new(),
-            },
+            reader: Reader { pty: BufReader::new(pty_reader), child_handle: child_handle.clone() },
             child_handle,
         })
     }
@@ -80,24 +71,15 @@ impl Reader {
         let mut buf = [0u8; 4096];
 
         loop {
-            // Drain new sequences from the PTY into our local buffer.
-            self.pending_osc.append(&mut self.pty.get_ref().take_unhandled_osc_sequences());
-
-            // Scan for the first matching milestone, keeping the rest.
-            let mut found = false;
-            let mut remaining = VecDeque::with_capacity(self.pending_osc.len());
-            for params in self.pending_osc.drain(..) {
-                if !found
-                    && pty_terminal_test_client::decode_milestone_from_osc8_params(&params)
-                        .is_some_and(|decoded| decoded == name)
-                {
-                    found = true;
-                    continue;
-                }
-                remaining.push_back(params);
-            }
-            self.pending_osc = remaining;
-
+            let found = self
+                .pty
+                .get_ref()
+                .take_unhandled_osc_sequences()
+                .into_iter()
+                .filter_map(|params| {
+                    pty_terminal_test_client::decode_milestone_from_osc8_params(&params)
+                })
+                .any(|decoded| decoded == name);
             if found {
                 return self.screen_contents();
             }

crates/vite_task_bin/tests/e2e_snapshots/fixtures/ctrl-c/package.json

@@ -1,4 +1,3 @@
 {
-  "name": "ctrl-c-test",
-  "private": true
+  "name": "ctrl-c-test"
 }

crates/vite_task_bin/tests/e2e_snapshots/fixtures/ctrl-c/packages/a/package.json

@@ -1,17 +1,13 @@
-# Tests that Ctrl+C (SIGINT) propagates to and terminates running tasks.
-# Two packages run concurrently; both set up ctrl-c handlers and emit
-# a "ready" milestone. After both are ready, ctrl-c is sent.
+# Tests that Ctrl+C (SIGINT) propagates to and terminates a running task.
 
 [[e2e]]
 name = "ctrl-c terminates running tasks"
 steps = [
   { argv = [
     "vt",
     "run",
-    "-r",
     "dev",
   ], interactions = [
-    { "expect-milestone" = "ready" },
     { "expect-milestone" = "ready" },
     { "write-key" = "ctrl-c" },
   ] },

crates/vite_task_bin/tests/e2e_snapshots/fixtures/ctrl-c/packages/b/package.json

@@ -2,17 +2,9 @@
 source: crates/vite_task_bin/tests/e2e_snapshots/main.rs
 expression: e2e_outputs
 ---
-> vt run -r dev
+> vt run dev
 @ expect-milestone: ready
-~/packages/a$ vtt exit-on-ctrlc ⊘ cache disabled
-~/packages/b$ vtt exit-on-ctrlc ⊘ cache disabled
-@ expect-milestone: ready
-~/packages/a$ vtt exit-on-ctrlc ⊘ cache disabled
-~/packages/b$ vtt exit-on-ctrlc ⊘ cache disabled
+$ vtt exit-on-ctrlc ⊘ cache disabled
 @ write-key: ctrl-c
-~/packages/a$ vtt exit-on-ctrlc ⊘ cache disabled
-~/packages/b$ vtt exit-on-ctrlc ⊘ cache disabled
+$ vtt exit-on-ctrlc ⊘ cache disabled
 ctrl-c received
-
----
-vt run: 0/2 cache hit (0%). (Run `vt run --last-details` for full details)

crates/vite_task_bin/tests/e2e_snapshots/fixtures/ctrl-c/pnpm-workspace.yaml

@@ -1,3 +1,8 @@
 {
-  "cache": false
+  "cache": false,
+  "tasks": {
+    "dev": {
+      "command": "vtt exit-on-ctrlc"
+    }
+  }
 }

crates/vite_task_bin/tests/e2e_snapshots/fixtures/ctrl-c/snapshots.toml

@@ -110,18 +110,6 @@ pub fn redact_e2e_output(mut output: String, workspace_root: &str) -> String {
         }
     }
 
-    // Normalize "ctrl-c received" output: when vt and tasks all receive SIGINT,
-    // it's a race whether one or both tasks print before the process exits.
-    // Normalize to a single occurrence for stable snapshots.
-    {
-        use cow_utils::CowUtils as _;
-        if let Cow::Owned(replaced) =
-            output.as_str().cow_replace("ctrl-c receivedctrl-c received", "ctrl-c received")
-        {
-            output = replaced;
-        }
-    }
-
     // Sort consecutive diagnostic blocks to handle non-deterministic tool output
     // (e.g., oxlint reports warnings in arbitrary order due to multi-threading).
     // Each block starts with "  ! " and ends at the next empty line.