claude-issue-solver 1.43.1 → 1.43.3

package/dist/utils/helpers.d.ts

@@ -5,11 +5,13 @@ export declare function checkRequirements(): {
 };
 /**
  * Generate AppleScript for opening a script in iTerm2.
+ * Changes to the script's directory first so the session path matches the worktree.
  * Sends 'n' first to dismiss any oh-my-zsh update prompts, then runs the script with bash.
  */
 export declare function generateITermOpenScript(script: string): string;
 /**
  * Generate AppleScript for opening a script in Terminal.app.
+ * Changes to the script's directory first so the session path matches the worktree.
  * Sends 'n' first to dismiss any oh-my-zsh update prompts, then runs the script with bash.
  */
 export declare function generateTerminalOpenScript(script: string): string;

package/dist/utils/helpers.js

@@ -75,11 +75,16 @@ function checkRequirements() {
 }
 /**
  * Generate AppleScript for opening a script in iTerm2.
+ * Changes to the script's directory first so the session path matches the worktree.
  * Sends 'n' first to dismiss any oh-my-zsh update prompts, then runs the script with bash.
  */
 function generateITermOpenScript(script) {
     const escapedScript = script.replace(/"/g, '\\"');
-    const bashCommand = `/bin/bash "${escapedScript}"`;
+    // Extract directory from script path to set as working directory
+    const scriptDir = path.dirname(script.replace(/'/g, ''));
+    const escapedDir = scriptDir.replace(/"/g, '\\"');
+    // cd to the script's directory first, so session path matches worktree
+    const bashCommand = `cd "${escapedDir}" && /bin/bash "${escapedScript}"`;
     return `
       tell application "iTerm"
         activate
@@ -94,11 +99,16 @@ function generateITermOpenScript(script) {
 }
 /**
  * Generate AppleScript for opening a script in Terminal.app.
+ * Changes to the script's directory first so the session path matches the worktree.
  * Sends 'n' first to dismiss any oh-my-zsh update prompts, then runs the script with bash.
  */
 function generateTerminalOpenScript(script) {
     const escapedScript = script.replace(/"/g, '\\"');
-    const bashCommand = `/bin/bash "${escapedScript}"`;
+    // Extract directory from script path to set as working directory
+    const scriptDir = path.dirname(script.replace(/'/g, ''));
+    const escapedDir = scriptDir.replace(/"/g, '\\"');
+    // cd to the script's directory first, so session path matches worktree
+    const bashCommand = `cd "${escapedDir}" && /bin/bash "${escapedScript}"`;
     return `
       tell application "Terminal"
         activate

package/dist/utils/helpers.test.js

@@ -99,4 +99,24 @@ const helpers_1 = require("./helpers");
             (0, vitest_1.expect)(script).toMatch(/do script "n;.*\/bin\/bash/);
         });
     });
+    (0, vitest_1.describe)('working directory for terminal closing', () => {
+        (0, vitest_1.it)('iTerm script should cd to script directory before running', () => {
+            const script = (0, helpers_1.generateITermOpenScript)('/path/to/worktree/.claude-runner.sh');
+            // Should cd to the script's directory first (quotes are escaped in AppleScript)
+            (0, vitest_1.expect)(script).toContain('cd \\"/path/to/worktree\\"');
+            (0, vitest_1.expect)(script).toContain('/bin/bash');
+        });
+        (0, vitest_1.it)('Terminal script should cd to script directory before running', () => {
+            const script = (0, helpers_1.generateTerminalOpenScript)('/path/to/worktree/.claude-runner.sh');
+            // Should cd to the script's directory first (quotes are escaped in AppleScript)
+            (0, vitest_1.expect)(script).toContain('cd \\"/path/to/worktree\\"');
+            (0, vitest_1.expect)(script).toContain('/bin/bash');
+        });
+        (0, vitest_1.it)('should handle script paths with quotes', () => {
+            const script = (0, helpers_1.generateITermOpenScript)('/path/to/work"tree/.script.sh');
+            (0, vitest_1.expect)(script).toContain('/bin/bash');
+            // Path should be escaped
+            (0, vitest_1.expect)(script).toContain('work');
+        });
+    });
 });

package/dist/utils/terminal.d.ts

@@ -25,6 +25,14 @@ export declare function generateVSCodeCloseScript(patterns: string[]): string;
  * Execute AppleScript and handle errors gracefully
  */
 export declare function executeAppleScript(script: string, timeout?: number): boolean;
+/**
+ * Find TTYs associated with processes in the given directory
+ */
+export declare function findTTYsInDirectory(dirPath: string): string[];
+/**
+ * Generate AppleScript to close iTerm2 windows by TTY
+ */
+export declare function generateITermCloseByTTYScript(ttys: string[]): string;
 /**
  * Find and terminate shell processes running in the given directory
  * This is a fallback approach when AppleScript matching fails

package/dist/utils/terminal.js

@@ -38,6 +38,8 @@ exports.generateITermCloseScript = generateITermCloseScript;
 exports.generateTerminalCloseScript = generateTerminalCloseScript;
 exports.generateVSCodeCloseScript = generateVSCodeCloseScript;
 exports.executeAppleScript = executeAppleScript;
+exports.findTTYsInDirectory = findTTYsInDirectory;
+exports.generateITermCloseByTTYScript = generateITermCloseByTTYScript;
 exports.killProcessesInDirectory = killProcessesInDirectory;
 exports.closeWindowsForWorktree = closeWindowsForWorktree;
 const child_process_1 = require("child_process");
@@ -208,6 +210,84 @@ function executeAppleScript(script, timeout = 5000) {
         return false;
     }
 }
+/**
+ * Find TTYs associated with processes in the given directory
+ */
+function findTTYsInDirectory(dirPath) {
+    if (os.platform() !== 'darwin' && os.platform() !== 'linux') {
+        return [];
+    }
+    try {
+        // Use lsof to find processes with files open in the directory
+        const output = (0, child_process_1.execSync)(`lsof +D "${dirPath}" 2>/dev/null || true`, {
+            encoding: 'utf8',
+            timeout: 5000,
+        });
+        if (!output.trim()) {
+            return [];
+        }
+        // Parse lsof output to get TTYs
+        const lines = output.split('\n').slice(1); // Skip header
+        const ttys = new Set();
+        for (const line of lines) {
+            const parts = line.split(/\s+/);
+            // lsof output: COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME
+            // We want to find the FD column that shows the tty
+            if (parts.length >= 9) {
+                const fd = parts[3];
+                const type = parts[4];
+                const name = parts[8];
+                // Look for tty file descriptors
+                if ((fd === '0u' || fd === '1u' || fd === '2u') && name.startsWith('/dev/ttys')) {
+                    ttys.add(name);
+                }
+            }
+        }
+        return Array.from(ttys);
+    }
+    catch {
+        return [];
+    }
+}
+/**
+ * Generate AppleScript to close iTerm2 windows by TTY
+ */
+function generateITermCloseByTTYScript(ttys) {
+    if (ttys.length === 0)
+        return '';
+    const ttyConditions = ttys.map(tty => `tty of s is "${tty}"`).join(' or ');
+    return `
+tell application "iTerm"
+  set windowsToClose to {}
+
+  repeat with w in windows
+    set windowId to id of w
+    repeat with t in tabs of w
+      repeat with s in sessions of t
+        try
+          if ${ttyConditions} then
+            if windowsToClose does not contain windowId then
+              set end of windowsToClose to windowId
+            end if
+          end if
+        end try
+      end repeat
+    end repeat
+  end repeat
+
+  repeat with targetWindowId in windowsToClose
+    try
+      repeat with w in windows
+        if id of w is targetWindowId then
+          close w
+          exit repeat
+        end if
+      end repeat
+    end try
+  end repeat
+end tell
+`;
+}
 /**
  * Find and terminate shell processes running in the given directory
  * This is a fallback approach when AppleScript matching fails
@@ -264,10 +344,21 @@ function closeWindowsForWorktree(options) {
         return { iTerm: false, terminal: false, vscode: false, processes: false };
     }
     const patterns = getSearchPatterns(options);
-    // Try to close iTerm2 windows/sessions
-    const iTermScript = generateITermCloseScript(patterns);
-    const iTermResult = executeAppleScript(iTermScript);
-    // Try to close Terminal.app windows
+    // First, find TTYs associated with processes in the worktree
+    // This is the most reliable way to identify the terminal
+    const ttys = findTTYsInDirectory(options.folderPath);
+    let iTermResult = false;
+    // Try to close iTerm2 by TTY first (most reliable)
+    if (ttys.length > 0) {
+        const iTermTTYScript = generateITermCloseByTTYScript(ttys);
+        iTermResult = executeAppleScript(iTermTTYScript);
+    }
+    // Fall back to pattern-based matching if TTY approach didn't work
+    if (!iTermResult) {
+        const iTermScript = generateITermCloseScript(patterns);
+        iTermResult = executeAppleScript(iTermScript);
+    }
+    // Try to close Terminal.app windows (pattern-based)
     const terminalScript = generateTerminalCloseScript(patterns);
     const terminalResult = executeAppleScript(terminalScript);
     // Try to close VS Code windows

package/dist/utils/terminal.test.js

@@ -218,4 +218,30 @@ const terminal_1 = require("./terminal");
             (0, vitest_1.expect)(typeof result).toBe('boolean');
         });
     });
+    (0, vitest_1.describe)('findTTYsInDirectory', () => {
+        (0, vitest_1.it)('should return empty array for non-existent directory', () => {
+            const result = (0, terminal_1.findTTYsInDirectory)('/nonexistent/path/that/does/not/exist');
+            (0, vitest_1.expect)(result).toEqual([]);
+        });
+        (0, vitest_1.it)('should return array', () => {
+            const result = (0, terminal_1.findTTYsInDirectory)('/tmp');
+            (0, vitest_1.expect)(Array.isArray(result)).toBe(true);
+        });
+    });
+    (0, vitest_1.describe)('generateITermCloseByTTYScript', () => {
+        (0, vitest_1.it)('should return empty string for empty TTY array', () => {
+            const script = (0, terminal_1.generateITermCloseByTTYScript)([]);
+            (0, vitest_1.expect)(script).toBe('');
+        });
+        (0, vitest_1.it)('should generate valid AppleScript for single TTY', () => {
+            const script = (0, terminal_1.generateITermCloseByTTYScript)(['/dev/ttys001']);
+            (0, vitest_1.expect)(script).toContain('tell application "iTerm"');
+            (0, vitest_1.expect)(script).toContain('tty of s is "/dev/ttys001"');
+            (0, vitest_1.expect)(script).toContain('close w');
+        });
+        (0, vitest_1.it)('should generate OR conditions for multiple TTYs', () => {
+            const script = (0, terminal_1.generateITermCloseByTTYScript)(['/dev/ttys001', '/dev/ttys002']);
+            (0, vitest_1.expect)(script).toContain('tty of s is "/dev/ttys001" or tty of s is "/dev/ttys002"');
+        });
+    });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-issue-solver",
-  "version": "1.43.1",
+  "version": "1.43.3",
   "description": "Automatically solve GitHub issues using Claude Code",
   "main": "dist/index.js",
   "bin": {