@ai-devkit/agent-manager 0.7.0 → 0.8.0

package/dist/terminal/TerminalFocusManager.js

@@ -124,7 +124,7 @@ class TerminalFocusManager {
     async findTerminalAppWindow(tty) {
         try {
             // Check if Terminal is running
-            const { stdout: isRunning } = await execAsync('pgrep -x Terminal || echo "no"');
+            const { stdout: isRunning } = await execAsync('ps -eo pid=,comm= | grep "Terminal.app" || echo "no"');
             if (isRunning.trim() === "no")
                 return null;
             const script = `

package/dist/terminal/TerminalFocusManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"TerminalFocusManager.js","sourceRoot":"","sources":["../../src/terminal/TerminalFocusManager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TerminalFocusManager.js","sourceRoot":"","sources":["../../src/terminal/TerminalFocusManager.ts"],"names":[],"mappings":"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"}

package/dist/terminal/TtyWriter.d.ts

@@ -5,8 +5,8 @@ export declare 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.
@@ -17,6 +17,12 @@ export declare class TtyWriter {
      */
     static send(location: TerminalLocation, message: string): Promise<void>;
     private static sendViaTmux;
+    /**
+     * 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;
     private static sendViaITerm2;
     private static sendViaTerminalApp;
 }

package/dist/terminal/TtyWriter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TtyWriter.d.ts","sourceRoot":"","sources":["../../src/terminal/TtyWriter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAa/D,qBAAa,SAAS;IAClB;;;;;;;;;;;;;;OAcG;WACU,IAAI,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;mBAgBxD,WAAW;mBAWX,aAAa;mBAsCb,kBAAkB;CA6C1C"}
+{"version":3,"file":"TtyWriter.d.ts","sourceRoot":"","sources":["../../src/terminal/TtyWriter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAgB/D,qBAAa,SAAS;IAClB;;;;;;;;;;;;;;OAcG;WACU,IAAI,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;mBAgBxD,WAAW;IAWhC;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,mBAAmB;mBAsBb,aAAa;mBAuBb,kBAAkB;CA0D1C"}

package/dist/terminal/TtyWriter.js

@@ -7,10 +7,13 @@ const TerminalFocusManager_1 = require("./TerminalFocusManager");
 const execFileAsync = (0, util_1.promisify)(child_process_1.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) {
-    return text.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+    return text
+        .replace(/\\/g, '\\\\')
+        .replace(/"/g, '\\"')
+        .replace(/\r\n|\r|\n/g, '\\n');
 }
 class TtyWriter {
     /**
@@ -18,8 +21,8 @@ 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.
@@ -51,12 +54,13 @@ class TtyWriter {
         await new Promise((resolve) => setTimeout(resolve, 150));
         await execFileAsync('tmux', ['send-keys', '-t', identifier, 'Enter']);
     }
-    static async sendViaITerm2(tty, message) {
-        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.
+     */
+    static iterm2SessionScript(tty, sessionCommand) {
+        return `
 tell application "iTerm"
   set targetSession to missing value
   repeat with w in windows
@@ -72,64 +76,82 @@ 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"`;
-        const { stdout } = await execFileAsync('osascript', ['-e', script]);
-        if (stdout.trim() !== 'ok') {
+    }
+    static async sendViaITerm2(tty, message) {
+        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: 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}`);
+        }
     }
     static async sendViaTerminalApp(tty, message) {
         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}`);
+        }
     }
 }
 exports.TtyWriter = TtyWriter;

package/dist/terminal/TtyWriter.js.map

@@ -1 +1 @@
-{"version":3,"file":"TtyWriter.js","sourceRoot":"","sources":["../../src/terminal/TtyWriter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"TtyWriter.js","sourceRoot":"","sources":["../../src/terminal/TtyWriter.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-devkit/agent-manager",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "Standalone agent detection and management utilities for AI DevKit",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/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', () => {

package/src/terminal/TerminalFocusManager.ts

@@ -134,7 +134,7 @@ export class TerminalFocusManager {
     private async findTerminalAppWindow(tty: string): Promise<TerminalLocation | null> {
         try {
             // Check if Terminal is running
-            const { stdout: isRunning } = await execAsync('pgrep -x Terminal || echo "no"');
+            const { stdout: isRunning } = await execAsync('ps -eo pid=,comm= | grep "Terminal.app" || echo "no"');
             if (isRunning.trim() === "no") return null;
 
             const script = `

package/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}`);
+        }
     }
 }