claude-issue-solver 1.42.1 → 1.43.1

package/dist/utils/helpers.d.ts

@@ -3,6 +3,16 @@ export declare function checkRequirements(): {
     ok: boolean;
     missing: string[];
 };
+/**
+ * Generate AppleScript for opening a script in iTerm2.
+ * 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.
+ * Sends 'n' first to dismiss any oh-my-zsh update prompts, then runs the script with bash.
+ */
+export declare function generateTerminalOpenScript(script: string): string;
 export declare function openInNewTerminal(script: string): void;
 export declare function copyEnvFiles(from: string, to: string): void;
 export declare function symlinkNodeModules(from: string, to: string): void;

package/dist/utils/helpers.js

@@ -35,6 +35,8 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.slugify = slugify;
 exports.checkRequirements = checkRequirements;
+exports.generateITermOpenScript = generateITermOpenScript;
+exports.generateTerminalOpenScript = generateTerminalOpenScript;
 exports.openInNewTerminal = openInNewTerminal;
 exports.copyEnvFiles = copyEnvFiles;
 exports.symlinkNodeModules = symlinkNodeModules;
@@ -71,16 +73,14 @@ function checkRequirements() {
     }
     return { ok: missing.length === 0, missing };
 }
-function openInNewTerminal(script) {
-    const platform = os.platform();
-    if (platform === 'darwin') {
-        // macOS - try iTerm2 first, then Terminal
-        // Use /bin/bash explicitly to bypass interactive shell issues (e.g., oh-my-zsh update prompts)
-        // Send 'n' first to dismiss any oh-my-zsh update prompt, then run the script
-        const escapedScript = script.replace(/"/g, '\\"');
-        const bashCommand = `/bin/bash "${escapedScript}"`;
-        // For iTerm: send 'n' to dismiss any prompt, wait briefly, then run the command
-        const iTermScript = `
+/**
+ * Generate AppleScript for opening a script in iTerm2.
+ * 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}"`;
+    return `
       tell application "iTerm"
         activate
         set newWindow to (create window with default profile)
@@ -91,13 +91,27 @@ function openInNewTerminal(script) {
         end tell
       end tell
     `;
-        // For Terminal: combine dismissing prompt and running command
-        const terminalScript = `
+}
+/**
+ * Generate AppleScript for opening a script in Terminal.app.
+ * 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}"`;
+    return `
       tell application "Terminal"
         activate
         do script "n; ${bashCommand.replace(/"/g, '\\"')}"
       end tell
     `;
+}
+function openInNewTerminal(script) {
+    const platform = os.platform();
+    if (platform === 'darwin') {
+        // macOS - try iTerm2 first, then Terminal
+        const iTermScript = generateITermOpenScript(script);
+        const terminalScript = generateTerminalOpenScript(script);
         try {
             // Check if iTerm is installed
             if (fs.existsSync('/Applications/iTerm.app')) {

package/dist/utils/helpers.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/utils/helpers.test.js

@@ -0,0 +1,102 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const helpers_1 = require("./helpers");
+(0, vitest_1.describe)('helpers utilities', () => {
+    (0, vitest_1.describe)('slugify', () => {
+        (0, vitest_1.it)('should convert text to lowercase slug', () => {
+            (0, vitest_1.expect)((0, helpers_1.slugify)('Hello World')).toBe('hello-world');
+        });
+        (0, vitest_1.it)('should remove brackets prefix', () => {
+            (0, vitest_1.expect)((0, helpers_1.slugify)('[Bug] Fix login issue')).toBe('fix-login-issue');
+            (0, vitest_1.expect)((0, helpers_1.slugify)('[FAQ] How to reset password')).toBe('how-to-reset-password');
+        });
+        (0, vitest_1.it)('should remove special characters', () => {
+            (0, vitest_1.expect)((0, helpers_1.slugify)('Fix: issue #123!')).toBe('fix-issue-123');
+        });
+        (0, vitest_1.it)('should remove duplicate consecutive words', () => {
+            (0, vitest_1.expect)((0, helpers_1.slugify)('[FAQ] FAQ question')).toBe('faq-question');
+        });
+        (0, vitest_1.it)('should limit slug to 30 characters', () => {
+            const longTitle = 'This is a very long issue title that should be truncated';
+            (0, vitest_1.expect)((0, helpers_1.slugify)(longTitle).length).toBeLessThanOrEqual(30);
+        });
+    });
+    (0, vitest_1.describe)('generateITermOpenScript', () => {
+        (0, vitest_1.it)('should generate valid AppleScript for iTerm', () => {
+            const script = (0, helpers_1.generateITermOpenScript)('/path/to/script.sh');
+            (0, vitest_1.expect)(script).toContain('tell application "iTerm"');
+            (0, vitest_1.expect)(script).toContain('create window with default profile');
+            (0, vitest_1.expect)(script).toContain('write text');
+        });
+        (0, vitest_1.it)('should send "n" to dismiss oh-my-zsh update prompts', () => {
+            const script = (0, helpers_1.generateITermOpenScript)('/path/to/script.sh');
+            (0, vitest_1.expect)(script).toContain('write text "n"');
+        });
+        (0, vitest_1.it)('should include delay after dismissing prompt', () => {
+            const script = (0, helpers_1.generateITermOpenScript)('/path/to/script.sh');
+            (0, vitest_1.expect)(script).toContain('delay 0.3');
+        });
+        (0, vitest_1.it)('should use /bin/bash to run the script', () => {
+            const script = (0, helpers_1.generateITermOpenScript)('/path/to/script.sh');
+            (0, vitest_1.expect)(script).toContain('/bin/bash');
+            (0, vitest_1.expect)(script).toContain('/path/to/script.sh');
+        });
+        (0, vitest_1.it)('should handle double quotes in script path without breaking AppleScript', () => {
+            const script = (0, helpers_1.generateITermOpenScript)('/path/to/"quoted"/script.sh');
+            // Should still contain the path and be valid AppleScript structure
+            (0, vitest_1.expect)(script).toContain('tell application "iTerm"');
+            (0, vitest_1.expect)(script).toContain('/bin/bash');
+            (0, vitest_1.expect)(script).toContain('quoted');
+        });
+        (0, vitest_1.it)('should handle paths with spaces', () => {
+            const script = (0, helpers_1.generateITermOpenScript)('/path/with spaces/script.sh');
+            (0, vitest_1.expect)(script).toContain('/path/with spaces/script.sh');
+        });
+    });
+    (0, vitest_1.describe)('generateTerminalOpenScript', () => {
+        (0, vitest_1.it)('should generate valid AppleScript for Terminal.app', () => {
+            const script = (0, helpers_1.generateTerminalOpenScript)('/path/to/script.sh');
+            (0, vitest_1.expect)(script).toContain('tell application "Terminal"');
+            (0, vitest_1.expect)(script).toContain('do script');
+        });
+        (0, vitest_1.it)('should send "n" to dismiss oh-my-zsh update prompts', () => {
+            const script = (0, helpers_1.generateTerminalOpenScript)('/path/to/script.sh');
+            (0, vitest_1.expect)(script).toContain('n;');
+        });
+        (0, vitest_1.it)('should use /bin/bash to run the script', () => {
+            const script = (0, helpers_1.generateTerminalOpenScript)('/path/to/script.sh');
+            (0, vitest_1.expect)(script).toContain('/bin/bash');
+            (0, vitest_1.expect)(script).toContain('/path/to/script.sh');
+        });
+        (0, vitest_1.it)('should handle double quotes in script path without breaking AppleScript', () => {
+            const script = (0, helpers_1.generateTerminalOpenScript)('/path/to/"quoted"/script.sh');
+            // Should still contain the path and be valid AppleScript structure
+            (0, vitest_1.expect)(script).toContain('tell application "Terminal"');
+            (0, vitest_1.expect)(script).toContain('/bin/bash');
+            (0, vitest_1.expect)(script).toContain('quoted');
+        });
+        (0, vitest_1.it)('should handle paths with spaces', () => {
+            const script = (0, helpers_1.generateTerminalOpenScript)('/path/with spaces/script.sh');
+            (0, vitest_1.expect)(script).toContain('/path/with spaces/script.sh');
+        });
+    });
+    (0, vitest_1.describe)('oh-my-zsh bypass behavior', () => {
+        (0, vitest_1.it)('iTerm script should have prompt dismissal before command execution', () => {
+            const script = (0, helpers_1.generateITermOpenScript)('/test/script.sh');
+            const lines = script.split('\n');
+            // Find the indices of the relevant lines
+            const dismissIndex = lines.findIndex(line => line.includes('write text "n"'));
+            const commandIndex = lines.findIndex(line => line.includes('/bin/bash'));
+            // Dismissal should come before command
+            (0, vitest_1.expect)(dismissIndex).toBeGreaterThan(-1);
+            (0, vitest_1.expect)(commandIndex).toBeGreaterThan(-1);
+            (0, vitest_1.expect)(dismissIndex).toBeLessThan(commandIndex);
+        });
+        (0, vitest_1.it)('Terminal script should combine dismiss and command in single do script', () => {
+            const script = (0, helpers_1.generateTerminalOpenScript)('/test/script.sh');
+            // Should have "n; /bin/bash..." in a single do script call
+            (0, vitest_1.expect)(script).toMatch(/do script "n;.*\/bin\/bash/);
+        });
+    });
+});

package/dist/utils/terminal.d.ts

@@ -10,6 +10,7 @@ export declare function getSearchPatterns(options: CloseTerminalOptions): string
 /**
  * Generate AppleScript to close iTerm2 windows/tabs matching patterns
  * Uses a two-pass approach: first collect IDs, then close them
+ * Matches both window names AND session working directories for reliability
  */
 export declare function generateITermCloseScript(patterns: string[]): string;
 /**
@@ -24,6 +25,11 @@ export declare function generateVSCodeCloseScript(patterns: string[]): string;
  * Execute AppleScript and handle errors gracefully
  */
 export declare function executeAppleScript(script: string, timeout?: number): boolean;
+/**
+ * Find and terminate shell processes running in the given directory
+ * This is a fallback approach when AppleScript matching fails
+ */
+export declare function killProcessesInDirectory(dirPath: string): boolean;
 /**
  * Close terminal windows and VS Code windows associated with a worktree
  * Returns an object indicating which applications had windows closed
@@ -32,4 +38,5 @@ export declare function closeWindowsForWorktree(options: CloseTerminalOptions):
     iTerm: boolean;
     terminal: boolean;
     vscode: boolean;
+    processes: boolean;
 };

package/dist/utils/terminal.js

@@ -38,6 +38,7 @@ exports.generateITermCloseScript = generateITermCloseScript;
 exports.generateTerminalCloseScript = generateTerminalCloseScript;
 exports.generateVSCodeCloseScript = generateVSCodeCloseScript;
 exports.executeAppleScript = executeAppleScript;
+exports.killProcessesInDirectory = killProcessesInDirectory;
 exports.closeWindowsForWorktree = closeWindowsForWorktree;
 const child_process_1 = require("child_process");
 const os = __importStar(require("os"));
@@ -48,6 +49,10 @@ function getSearchPatterns(options) {
     const { folderPath, issueNumber, prNumber } = options;
     const folderName = folderPath.split('/').pop() || '';
     const patterns = [];
+    // Full folder path (most reliable for working directory matching)
+    if (folderPath) {
+        patterns.push(folderPath);
+    }
     // Folder name pattern (e.g., "project-issue-38-slug")
     if (folderName) {
         patterns.push(folderName);
@@ -66,6 +71,7 @@ function getSearchPatterns(options) {
 /**
  * Generate AppleScript to close iTerm2 windows/tabs matching patterns
  * Uses a two-pass approach: first collect IDs, then close them
+ * Matches both window names AND session working directories for reliability
  */
 function generateITermCloseScript(patterns) {
     // Escape patterns for AppleScript string comparison
@@ -73,51 +79,39 @@ function generateITermCloseScript(patterns) {
     return `
 tell application "iTerm"
   set windowsToClose to {}
-  set sessionsToClose to {}
 
-  -- First pass: collect windows and sessions to close
+  -- First pass: collect windows to close (by name or by session working directory)
   repeat with w in windows
     try
       set windowName to name of w
       set windowId to id of w
-      ${escapedPatterns.map((p) => `if windowName contains "${p}" then set end of windowsToClose to windowId`).join('\n      ')}
-    end try
+      set shouldClose to false
 
-    -- Check tabs and sessions
-    repeat with t in tabs of w
-      repeat with s in sessions of t
-        try
-          set sessionName to name of s
-          set sessionId to unique id of s
-          ${escapedPatterns.map((p) => `if sessionName contains "${p}" then set end of sessionsToClose to {windowId, sessionId}`).join('\n          ')}
-        end try
-      end repeat
-    end repeat
-  end repeat
+      -- Match by window name
+      ${escapedPatterns.map((p) => `if windowName contains "${p}" then set shouldClose to true`).join('\n      ')}
 
-  -- Second pass: close sessions first (from windows not being fully closed)
-  repeat with sessionInfo in sessionsToClose
-    try
-      set targetWindowId to item 1 of sessionInfo
-      set targetSessionId to item 2 of sessionInfo
-      -- Only close session if its window isn't being closed entirely
-      if windowsToClose does not contain targetWindowId then
-        repeat with w in windows
-          if id of w is targetWindowId then
-            repeat with t in tabs of w
-              repeat with s in sessions of t
-                if unique id of s is targetSessionId then
-                  close s
-                end if
-              end repeat
-            end repeat
-          end if
+      -- Match by session working directory path (more reliable)
+      if not shouldClose then
+        repeat with t in tabs of w
+          repeat with s in sessions of t
+            try
+              set sessionPath to ""
+              try
+                set sessionPath to path of s
+              end try
+              ${escapedPatterns.map((p) => `if sessionPath contains "${p}" then set shouldClose to true`).join('\n              ')}
+            end try
+          end repeat
         end repeat
       end if
+
+      if shouldClose and windowsToClose does not contain windowId then
+        set end of windowsToClose to windowId
+      end if
     end try
   end repeat
 
-  -- Third pass: close entire windows
+  -- Second pass: close windows
   repeat with targetWindowId in windowsToClose
     try
       repeat with w in windows
@@ -214,13 +208,60 @@ function executeAppleScript(script, timeout = 5000) {
         return false;
     }
 }
+/**
+ * Find and terminate shell processes running in the given directory
+ * This is a fallback approach when AppleScript matching fails
+ */
+function killProcessesInDirectory(dirPath) {
+    if (os.platform() !== 'darwin' && os.platform() !== 'linux') {
+        return false;
+    }
+    try {
+        // Use lsof to find processes with their current working directory in the target path
+        // +D flag finds processes with files open in the directory (including cwd)
+        const output = (0, child_process_1.execSync)(`lsof +D "${dirPath}" 2>/dev/null || true`, {
+            encoding: 'utf8',
+            timeout: 5000,
+        });
+        if (!output.trim()) {
+            return false;
+        }
+        // Parse lsof output to get PIDs of shell processes
+        const lines = output.split('\n').slice(1); // Skip header
+        const pids = new Set();
+        for (const line of lines) {
+            const parts = line.split(/\s+/);
+            if (parts.length >= 2) {
+                const command = parts[0].toLowerCase();
+                const pid = parts[1];
+                // Only kill shell processes and their children, not system processes
+                if (['bash', 'zsh', 'sh', 'fish', 'claude', 'node'].some(s => command.includes(s))) {
+                    pids.add(pid);
+                }
+            }
+        }
+        // Send SIGTERM to each process
+        for (const pid of pids) {
+            try {
+                (0, child_process_1.execSync)(`kill -TERM ${pid} 2>/dev/null || true`, { stdio: 'pipe' });
+            }
+            catch {
+                // Process may have already exited
+            }
+        }
+        return pids.size > 0;
+    }
+    catch {
+        return false;
+    }
+}
 /**
  * Close terminal windows and VS Code windows associated with a worktree
  * Returns an object indicating which applications had windows closed
  */
 function closeWindowsForWorktree(options) {
     if (os.platform() !== 'darwin') {
-        return { iTerm: false, terminal: false, vscode: false };
+        return { iTerm: false, terminal: false, vscode: false, processes: false };
     }
     const patterns = getSearchPatterns(options);
     // Try to close iTerm2 windows/sessions
@@ -232,9 +273,12 @@ function closeWindowsForWorktree(options) {
     // Try to close VS Code windows
     const vscodeScript = generateVSCodeCloseScript(patterns);
     const vscodeResult = executeAppleScript(vscodeScript, 10000);
+    // Fallback: kill processes running in the worktree directory
+    const processResult = killProcessesInDirectory(options.folderPath);
     return {
         iTerm: iTermResult,
         terminal: terminalResult,
         vscode: vscodeResult,
+        processes: processResult,
     };
 }

package/dist/utils/terminal.test.js

@@ -10,10 +10,21 @@ const terminal_1 = require("./terminal");
                 issueNumber: '42',
             };
             const patterns = (0, terminal_1.getSearchPatterns)(options);
+            // Should include full path for working directory matching
+            (0, vitest_1.expect)(patterns).toContain('/Users/test/project-issue-42-fix-bug');
             (0, vitest_1.expect)(patterns).toContain('project-issue-42-fix-bug');
             (0, vitest_1.expect)(patterns).toContain('Issue #42');
             (0, vitest_1.expect)(patterns).toContain('issue-42-');
         });
+        (0, vitest_1.it)('should include full folder path for working directory matching', () => {
+            const options = {
+                folderPath: '/Users/dev/myproject-issue-123-feature',
+                issueNumber: '123',
+            };
+            const patterns = (0, terminal_1.getSearchPatterns)(options);
+            // Full path should be first for best matching
+            (0, vitest_1.expect)(patterns[0]).toBe('/Users/dev/myproject-issue-123-feature');
+        });
         (0, vitest_1.it)('should include PR patterns when prNumber is provided', () => {
             const options = {
                 folderPath: '/Users/test/project-issue-42-fix-bug',
@@ -51,7 +62,6 @@ const terminal_1 = require("./terminal");
             (0, vitest_1.expect)(script).toContain('project-issue-42');
             (0, vitest_1.expect)(script).toContain('Issue #42');
             (0, vitest_1.expect)(script).toContain('windowsToClose');
-            (0, vitest_1.expect)(script).toContain('sessionsToClose');
         });
         (0, vitest_1.it)('should escape double quotes in patterns', () => {
             const patterns = ['Issue "quoted"'];
@@ -61,12 +71,18 @@ const terminal_1 = require("./terminal");
         (0, vitest_1.it)('should use two-pass approach for closing', () => {
             const patterns = ['test'];
             const script = (0, terminal_1.generateITermCloseScript)(patterns);
-            // First pass collects
+            // First pass collects windows to close
             (0, vitest_1.expect)(script).toContain('First pass: collect');
-            // Second pass closes sessions
-            (0, vitest_1.expect)(script).toContain('Second pass: close sessions');
-            // Third pass closes windows
-            (0, vitest_1.expect)(script).toContain('Third pass: close entire windows');
+            // Second pass closes windows
+            (0, vitest_1.expect)(script).toContain('Second pass: close windows');
+        });
+        (0, vitest_1.it)('should match by session working directory path', () => {
+            const patterns = ['/Users/test/worktree'];
+            const script = (0, terminal_1.generateITermCloseScript)(patterns);
+            // Should include path matching
+            (0, vitest_1.expect)(script).toContain('set sessionPath to');
+            (0, vitest_1.expect)(script).toContain('path of s');
+            (0, vitest_1.expect)(script).toContain('sessionPath contains');
         });
     });
     (0, vitest_1.describe)('generateTerminalCloseScript', () => {
@@ -116,9 +132,11 @@ const terminal_1 = require("./terminal");
             (0, vitest_1.expect)(result).toHaveProperty('iTerm');
             (0, vitest_1.expect)(result).toHaveProperty('terminal');
             (0, vitest_1.expect)(result).toHaveProperty('vscode');
+            (0, vitest_1.expect)(result).toHaveProperty('processes');
             (0, vitest_1.expect)(typeof result.iTerm).toBe('boolean');
             (0, vitest_1.expect)(typeof result.terminal).toBe('boolean');
             (0, vitest_1.expect)(typeof result.vscode).toBe('boolean');
+            (0, vitest_1.expect)(typeof result.processes).toBe('boolean');
         });
         (0, vitest_1.it)('should handle prNumber parameter', () => {
             const result = (0, terminal_1.closeWindowsForWorktree)({
@@ -129,6 +147,7 @@ const terminal_1 = require("./terminal");
             (0, vitest_1.expect)(result).toHaveProperty('iTerm');
             (0, vitest_1.expect)(result).toHaveProperty('terminal');
             (0, vitest_1.expect)(result).toHaveProperty('vscode');
+            (0, vitest_1.expect)(result).toHaveProperty('processes');
         });
     });
     (0, vitest_1.describe)('pattern matching edge cases', () => {
@@ -175,7 +194,8 @@ const terminal_1 = require("./terminal");
             const script = (0, terminal_1.generateITermCloseScript)(patterns);
             // Script should be syntactically valid (quotes should be escaped)
             (0, vitest_1.expect)(script).toContain('test\\"pattern');
-            (0, vitest_1.expect)(script).not.toContain('""'); // No empty quotes from bad escaping
+            // Should not have broken string like contains "" (empty pattern)
+            (0, vitest_1.expect)(script).not.toMatch(/contains ""/);
         });
         (0, vitest_1.it)('should not have nested quotes issues in Terminal script', () => {
             const patterns = ['test"pattern'];
@@ -188,4 +208,14 @@ const terminal_1 = require("./terminal");
             (0, vitest_1.expect)(script).toContain('test\\"pattern');
         });
     });
+    (0, vitest_1.describe)('killProcessesInDirectory', () => {
+        (0, vitest_1.it)('should return false for non-existent directory', () => {
+            const result = (0, terminal_1.killProcessesInDirectory)('/nonexistent/path/that/does/not/exist');
+            (0, vitest_1.expect)(result).toBe(false);
+        });
+        (0, vitest_1.it)('should return boolean result', () => {
+            const result = (0, terminal_1.killProcessesInDirectory)('/tmp');
+            (0, vitest_1.expect)(typeof result).toBe('boolean');
+        });
+    });
 });

package/package.json

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