From cef82adf19f98a16c5dba3dc55294c2607a0dad9 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sat, 18 Apr 2026 23:13:11 +0100
Subject: [PATCH] test: speed up bash tool wait loops

---
 src/agents/bash-tools.test.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/agents/bash-tools.test.ts b/src/agents/bash-tools.test.ts
index 86668fe5913..890a413b6ff 100644
--- a/src/agents/bash-tools.test.ts
+++ b/src/agents/bash-tools.test.ts
@@ -32,7 +32,7 @@ const defaultShell = isWin
 // PowerShell: Start-Sleep for delays, ; for command separation, $null for null device
 const shortDelayCmd = isWin ? "Start-Sleep -Milliseconds 4" : "sleep 0.004";
 const yieldDelayCmd = isWin ? "Start-Sleep -Milliseconds 16" : "sleep 0.016";
-const POLL_INTERVAL_MS = 15;
+const POLL_INTERVAL_MS = isWin ? 15 : 2;
 const BACKGROUND_POLL_TIMEOUT_MS = isWin ? 8000 : 1200;
 const NOTIFY_EVENT_TIMEOUT_MS = isWin ? 12_000 : 5_000;
 const BACKGROUND_POLL_OPTIONS = {
@@ -53,6 +53,7 @@ const OUTPUT_NOPE = "nope";
 const OUTPUT_EXEC_COMPLETED = "Exec completed";
 const OUTPUT_EXIT_CODE_1 = "Command exited with code 1";
 const shellEcho = (message: string) => (isWin ? `Write-Output ${message}` : `echo ${message}`);
+const COMMAND_NOOP = isWin ? "$null" : ":";
 const COMMAND_ECHO_HELLO = shellEcho("hello");
 const COMMAND_PRINT_PATH = isWin ? "Write-Output $env:PATH" : "echo $PATH";
 const COMMAND_EXIT_WITH_ERROR = "exit 1";
@@ -106,7 +107,6 @@ const withLabel = <T extends object>(label: string, fields: T): T & LabeledCase
 });
 // Both PowerShell and bash use ; for command separation
 const joinCommands = (commands: string[]) => commands.join("; ");
-const echoAfterDelay = (message: string) => joinCommands([shortDelayCmd, shellEcho(message)]);
 const normalizeText = (value?: string) =>
   sanitizeBinaryOutput(value ?? "")
     .replace(/\r\n/g, "\n")
@@ -245,7 +245,7 @@ async function expectNotifyOnExitWake(tool: ExecToolInstance, expected: Record<s
     wakeHandler as unknown as Parameters<typeof setHeartbeatWakeHandler>[0],
   );
   try {
-    await startBackgroundCommand(tool, echoAfterDelay("notify"));
+    await startBackgroundCommand(tool, shellEcho("notify"));
     await expect.poll(() => wakeHandler.mock.calls[0]?.[0], NOTIFY_POLL_OPTIONS).toEqual(expected);
   } finally {
     dispose();
@@ -466,7 +466,7 @@ const runNotifyNoopCase = async ({ label, notifyOnExitEmptySuccess }: NotifyNoop
     notifyOnExitEmptySuccess ? { notifyOnExitEmptySuccess: true } : {},
   );
 
-  const { status } = await runBackgroundCommandToCompletion(tool, shortDelayCmd);
+  const { status } = await runBackgroundCommandToCompletion(tool, COMMAND_NOOP);
   expect(status).toBe(PROCESS_STATUS_COMPLETED);
   const events = peekSystemEvents(DEFAULT_NOTIFY_SESSION_KEY);
   expectNotifyNoopEvents(events, notifyOnExitEmptySuccess, label);
@@ -610,7 +610,7 @@ describe("exec notifyOnExit", () => {
   it("enqueues a system event when a backgrounded exec exits", async () => {
     const tool = createNotifyOnExitExecTool();
 
-    const sessionId = await startBackgroundCommand(tool, echoAfterDelay("notify"));
+    const sessionId = await startBackgroundCommand(tool, shellEcho("notify"));
 
     const { finished, hasEvent } = await waitForNotifyEvent(sessionId);
     const queuedEvent = peekSystemEventEntries(DEFAULT_NOTIFY_SESSION_KEY).find((event) =>
@@ -633,7 +633,7 @@ describe("exec notifyOnExit", () => {
       currentThreadTs: "47",
     });
 
-    const sessionId = await startBackgroundCommand(tool, echoAfterDelay("notify"));
+    const sessionId = await startBackgroundCommand(tool, shellEcho("notify"));
 
     await waitForNotifyEvent(sessionId, sessionKey);
     const queuedEvent = peekSystemEventEntries(sessionKey).find((event) =>
@@ -756,7 +756,7 @@ describe("exec backgrounded onUpdate suppression", () => {
     async () => {
       const onUpdateSpy = vi.fn();
       const tool = createTestExecTool({ allowBackground: true, backgroundMs: 0 });
-      const command = joinCommands([shellEcho("before"), yieldDelayCmd, shellEcho("after")]);
+      const command = joinCommands([shellEcho("before"), shortDelayCmd, shellEcho("after")]);
       const result = await tool.execute(
         nextCallId(),
         { command, background: true },