fix(agent-manager): fix sending in iTerm

codeaholicguy · codeaholicguy · commit 59ab878ee355 · 2026-04-21T12:44:12.000+02:00
diff --git a/packages/agent-manager/src/__tests__/terminal/TtyWriter.test.ts b/packages/agent-manager/src/__tests__/terminal/TtyWriter.test.ts
@@ -78,14 +78,19 @@ describe('TtyWriter', () => {
 
             await TtyWriter.send(location, 'hello');
 
+            // First call: send text without newline
             expect(mockedExecFile).toHaveBeenCalledWith(
                 'osascript',
                 ['-e', expect.stringContaining('write text "hello" newline no')],
                 expect.any(Function),
             );
-            const scriptArg = (mockedExecFile.mock.calls[0] as unknown[])[1] as string[];
-            const script = scriptArg[1];
-            expect(script).toContain('key code 36');
+            // Second call: send Enter via separate write text with newline
+            expect(mockedExecFile).toHaveBeenCalledWith(
+                'osascript',
+                ['-e', expect.stringContaining('write text "" newline yes')],
+                expect.any(Function),
+            );
+            expect(mockedExecFile).toHaveBeenCalledTimes(2);
         });
 
         it('escapes special characters in message', async () => {
@@ -100,12 +105,37 @@ describe('TtyWriter', () => {
             );
         });
 
+        it('escapes newlines in message', async () => {
+            mockExecFileSuccess('ok');
+
+            await TtyWriter.send(location, 'line1\nline2');
+
+            expect(mockedExecFile).toHaveBeenCalledWith(
+                'osascript',
+                ['-e', expect.stringContaining('write text "line1\\nline2" newline no')],
+                expect.any(Function),
+            );
+        });
+
         it('throws when session not found', async () => {
             mockExecFileSuccess('not_found');
 
             await expect(TtyWriter.send(location, 'test'))
                 .rejects.toThrow('iTerm2 session not found');
         });
+
+        it('throws when session disappears before Enter', async () => {
+            // First call succeeds (text sent), second returns not_found
+            let callCount = 0;
+            mockedExecFile.mockImplementation((...args: unknown[]) => {
+                const cb = args[args.length - 1] as (err: Error | null, result: { stdout: string }, stderr: string) => void;
+                callCount++;
+                cb(null, { stdout: callCount === 1 ? 'ok' : 'not_found' }, '');
+            });
+
+            await expect(TtyWriter.send(location, 'test'))
+                .rejects.toThrow('iTerm2 session disappeared before Enter');
+        });
     });
 
     describe('Terminal.app', () => {
@@ -115,16 +145,24 @@ describe('TtyWriter', () => {
             tty: '/dev/ttys030',
         };
 
-        it('sends message via System Events keystroke (not do script)', async () => {
+        it('sends message via do script (not System Events)', async () => {
             mockExecFileSuccess('ok');
 
             await TtyWriter.send(location, 'hello');
 
-            const scriptArg = (mockedExecFile.mock.calls[0] as unknown[])[1] as string[];
-            const script = scriptArg[1];
-            expect(script).toContain('keystroke "hello"');
-            expect(script).toContain('key code 36');
-            expect(script).not.toContain('do script');
+            // First call: send text via do script
+            const firstCallArgs = (mockedExecFile.mock.calls[0] as unknown[])[1] as string[];
+            const textScript = firstCallArgs[1];
+            expect(textScript).toContain('do script "hello" in targetTab');
+            expect(textScript).not.toContain('keystroke');
+            expect(textScript).not.toContain('key code 36');
+
+            // Second call: send Enter via separate do script
+            const secondCallArgs = (mockedExecFile.mock.calls[1] as unknown[])[1] as string[];
+            const enterScript = secondCallArgs[1];
+            expect(enterScript).toContain('do script "" in targetTab');
+
+            expect(mockedExecFile).toHaveBeenCalledTimes(2);
         });
 
         it('throws when tab not found', async () => {
@@ -133,6 +171,18 @@ describe('TtyWriter', () => {
             await expect(TtyWriter.send(location, 'test'))
                 .rejects.toThrow('Terminal.app tab not found');
         });
+
+        it('throws when tab disappears before Enter', async () => {
+            let callCount = 0;
+            mockedExecFile.mockImplementation((...args: unknown[]) => {
+                const cb = args[args.length - 1] as (err: Error | null, result: { stdout: string }, stderr: string) => void;
+                callCount++;
+                cb(null, { stdout: callCount === 1 ? 'ok' : 'not_found' }, '');
+            });
+
+            await expect(TtyWriter.send(location, 'test'))
+                .rejects.toThrow('Terminal.app tab disappeared before Enter');
+        });
     });
 
     describe('unsupported terminal', () => {
diff --git a/packages/agent-manager/src/terminal/TtyWriter.ts b/packages/agent-manager/src/terminal/TtyWriter.ts
@@ -7,10 +7,13 @@ const execFileAsync = promisify(execFile);
 
 /**
  * Escape a string for safe use inside an AppleScript double-quoted string.
- * Backslashes and double quotes must be escaped.
+ * Backslashes, double quotes, and newlines must be escaped.
  */
 function escapeAppleScript(text: string): string {
-    return text.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+    return text
+        .replace(/\\/g, '\\\\')
+        .replace(/"/g, '\\"')
+        .replace(/\r\n|\r|\n/g, '\\n');
 }
 
 export class TtyWriter {
@@ -19,8 +22,8 @@ export class TtyWriter {
      *
      * Dispatches to the correct mechanism based on terminal type:
      * - tmux: `tmux send-keys`
-     * - iTerm2: AppleScript `write text`
-     * - Terminal.app: System Events `keystroke` + `key code 36` (Return)
+     * - iTerm2: Two separate AppleScript `write text` calls (text then newline)
+     * - Terminal.app: Two separate AppleScript `do script` calls (text then newline)
      *
      * All AppleScript is executed via `execFile('osascript', ['-e', script])`
      * to avoid shell interpolation and command injection.
@@ -56,12 +59,13 @@ export class TtyWriter {
         await execFileAsync('tmux', ['send-keys', '-t', identifier, 'Enter']);
     }
 
-    private static async sendViaITerm2(tty: string, message: string): Promise<void> {
-        const escaped = escapeAppleScript(message);
-        // Send text WITHOUT a trailing newline to avoid the newline being swallowed
-        // by bracketed paste mode. Then simulate pressing Return separately so that
-        // Claude Code (and other interactive TUIs) treat it as a real submit action.
-        const script = `
+    /**
+     * Build an AppleScript that finds an iTerm2 session by TTY and runs a
+     * command against it. The `sessionCommand` is inserted inside a
+     * `tell targetSession` block.
+     */
+    private static iterm2SessionScript(tty: string, sessionCommand: string): string {
+        return `
 tell application "iTerm"
   set targetSession to missing value
   repeat with w in windows
@@ -77,66 +81,90 @@ tell application "iTerm"
     if targetSession is not missing value then exit repeat
   end repeat
   if targetSession is missing value then return "not_found"
-  tell targetSession to write text "${escaped}" newline no
-end tell
-tell application "iTerm" to activate
-delay 0.15
-tell application "System Events"
-  tell process "iTerm2"
-    key code 36
-  end tell
+  tell targetSession to ${sessionCommand}
 end tell
 return "ok"`;
+    }
+
+    private static async sendViaITerm2(tty: string, message: string): Promise<void> {
+        const escaped = escapeAppleScript(message);
+        // Send text and Enter as two separate write text calls so the newline
+        // is delivered outside the bracketed paste sequence of the message body.
+        // iTerm2 appends the newline after the paste-end marker (\e[201~), so
+        // the inner TUI (Claude Code, Codex) sees it as a real submit action.
+        const textScript = TtyWriter.iterm2SessionScript(tty, `write text "${escaped}" newline no`);
 
-        const { stdout } = await execFileAsync('osascript', ['-e', script]);
-        if (stdout.trim() !== 'ok') {
+        const { stdout: textResult } = await execFileAsync('osascript', ['-e', textScript]);
+        if (textResult.trim() !== 'ok') {
             throw new Error(`iTerm2 session not found for TTY ${tty}`);
         }
+
+        // Wait for the paste to complete before sending Enter separately
+        await new Promise((resolve) => setTimeout(resolve, 150));
+
+        const enterScript = TtyWriter.iterm2SessionScript(tty, 'write text "" newline yes');
+        const { stdout: enterResult } = await execFileAsync('osascript', ['-e', enterScript]);
+        if (enterResult.trim() !== 'ok') {
+            throw new Error(`iTerm2 session disappeared before Enter could be sent for TTY ${tty}`);
+        }
     }
 
     private static async sendViaTerminalApp(tty: string, message: string): Promise<void> {
         const escaped = escapeAppleScript(message);
-        // Use System Events keystroke to type into the foreground process,
-        // NOT Terminal.app's "do script" which runs a new shell command.
-        // First activate Terminal and select the correct tab, then type via System Events.
-        // Send the text first, then wait for the paste/input to complete before pressing
-        // Return separately — this ensures interactive TUIs (like Claude Code) see the
-        // Return as a real submit action, not part of a bracketed paste.
-        const script = `
+        // Use Terminal.app's `do script` to send text to the correct tab by TTY.
+        // We avoid System Events `keystroke` + `key code 36` because it requires
+        // accessibility permissions and unreliably delivers the Return key.
+        //
+        // `do script` with `in` targets a specific tab without opening a new one.
+        // We send text and Enter as two separate calls so the newline arrives
+        // outside of bracketed paste mode — same pattern as iTerm2 and tmux.
+        const textScript = `
 tell application "Terminal"
-  set targetFound to false
+  set targetTab to missing value
   repeat with w in windows
     repeat with i from 1 to count of tabs of w
       set t to tab i of w
       if tty of t is "${tty}" then
-        set selected tab of w to t
-        set index of w to 1
-        activate
-        set targetFound to true
+        set targetTab to t
         exit repeat
       end if
     end repeat
-    if targetFound then exit repeat
+    if targetTab is not missing value then exit repeat
   end repeat
-  if not targetFound then return "not_found"
-end tell
-delay 0.1
-tell application "System Events"
-  tell process "Terminal"
-    keystroke "${escaped}"
-  end tell
-end tell
-delay 0.15
-tell application "System Events"
-  tell process "Terminal"
-    key code 36
-  end tell
+  if targetTab is missing value then return "not_found"
+  do script "${escaped}" in targetTab
 end tell
 return "ok"`;
 
-        const { stdout } = await execFileAsync('osascript', ['-e', script]);
-        if (stdout.trim() !== 'ok') {
+        const { stdout: textResult } = await execFileAsync('osascript', ['-e', textScript]);
+        if (textResult.trim() !== 'ok') {
             throw new Error(`Terminal.app tab not found for TTY ${tty}`);
         }
+
+        // Wait for the text to be delivered before sending Enter
+        await new Promise((resolve) => setTimeout(resolve, 150));
+
+        const enterScript = `
+tell application "Terminal"
+  set targetTab to missing value
+  repeat with w in windows
+    repeat with i from 1 to count of tabs of w
+      set t to tab i of w
+      if tty of t is "${tty}" then
+        set targetTab to t
+        exit repeat
+      end if
+    end repeat
+    if targetTab is not missing value then exit repeat
+  end repeat
+  if targetTab is missing value then return "not_found"
+  do script "" in targetTab
+end tell
+return "ok"`;
+
+        const { stdout: enterResult } = await execFileAsync('osascript', ['-e', enterScript]);
+        if (enterResult.trim() !== 'ok') {
+            throw new Error(`Terminal.app tab disappeared before Enter could be sent for TTY ${tty}`);
+        }
     }
 }
