Add support for iterm

Author: steipete

CodeLooper.xcodeproj/project.pbxproj

@@ -205,6 +205,7 @@
 		B4EF67DB32B4713E51AD4972 /* GeneralSettingsTab.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA6CB723D91D9348E2086AAD /* GeneralSettingsTab.swift */; };
 		B5F52A6677D9BC895B34A60B /* QueryManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0C40C39CC2F895E1A45E415B /* QueryManager.swift */; };
 		B64065FF2DB310363F17F357 /* AISettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2322F598135E442321A408B0 /* AISettingsView.swift */; };
+		B8E51A81C6B99B427F084FCC /* ITermAppleScriptHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51772CC8CF625D8BA2502A4D /* ITermAppleScriptHelper.swift */; };
 		BC0A1686EEAA49A0E2E1D5E4 /* ProcessMonitorService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0D6CAF9E9B702E02DFDBFEB2 /* ProcessMonitorService.swift */; };
 		BDA9C21C437EE2BB5BDE4630 /* AXpector in Frameworks */ = {isa = PBXBuildFile; productRef = C82404169CD50D644E1ED271 /* AXpector */; };
 		BDFA492781204ACB586E5163 /* Demark in Frameworks */ = {isa = PBXBuildFile; productRef = 8EAC0DEA71BA55AC629B56ED /* Demark */; };
@@ -413,6 +414,7 @@
 		50A25A5FB23DB0E34CBBC220 /* MainInputFieldHeuristic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainInputFieldHeuristic.swift; sourceTree = "<group>"; };
 		5106D3073FAE7B4DC45FE4CF /* NativePopoverController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NativePopoverController.swift; sourceTree = "<group>"; };
 		5174C00218163417DA60504F /* AsyncPatterns.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AsyncPatterns.swift; sourceTree = "<group>"; };
+		51772CC8CF625D8BA2502A4D /* ITermAppleScriptHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ITermAppleScriptHelper.swift; sourceTree = "<group>"; };
 		521C37D802EABF317FFA3944 /* AppIconStateController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppIconStateController.swift; sourceTree = "<group>"; };
 		5223F335B0AAADC0E755A7DC /* ConnectionErrorIndicatorHeuristic.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectionErrorIndicatorHeuristic.swift; sourceTree = "<group>"; };
 		531FE09FAC2B42748DE1EEF5 /* ClaudeTerminalTitleManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClaudeTerminalTitleManager.swift; sourceTree = "<group>"; };
@@ -1336,6 +1338,7 @@
 			children = (
 				458A7357AE49C33B120A678C /* CursorAppLifecycleManager.swift */,
 				3FD09182D0EEA303D40F5CFC /* CursorWindowManager.swift */,
+				51772CC8CF625D8BA2502A4D /* ITermAppleScriptHelper.swift */,
 			);
 			path = Infrastructure;
 			sourceTree = "<group>";
@@ -1804,6 +1807,7 @@
 				36AC393507E97BD2C7F3D0DE /* TTYWindowMappingService.swift in Sources */,
 				FD1A41D5B07CFB152A30F973 /* CursorAppLifecycleManager.swift in Sources */,
 				7B69C358953A327727D855D2 /* CursorWindowManager.swift in Sources */,
+				B8E51A81C6B99B427F084FCC /* ITermAppleScriptHelper.swift in Sources */,
 				3944BC08C53F8A9532580BA0 /* AllPermissionsView.swift in Sources */,
 				EAD2792BDE3E13E195ECC83F /* AutomationPermissionsView.swift in Sources */,
 				9DC624C8FA666B3A80C48E90 /* AccessibilityStepView.swift in Sources */,

Features/Monitoring/Domain/Services/ClaudeMonitorService.swift

@@ -26,7 +26,7 @@ public final class ClaudeMonitorService: ObservableObject, Sendable, Loggable {
     // MARK: - Configuration
 
     private struct Configuration {
-        static let monitoringInterval: TimeInterval = 5.0
+        static let monitoringInterval: TimeInterval = 1.0
         static let maxRetries = 3
         static let retryDelay: TimeInterval = 1.0
     }

Features/Monitoring/Domain/Services/ClaudeStatusExtractor.swift

@@ -86,20 +86,32 @@ final class ClaudeStatusExtractor: ObservableObject, Loggable {
     /// Robust window cache to prevent duplicate matches
     private let windowCache = WindowCache()
 
+    /// iTerm helper for AppleScript-based text extraction
+    private let iTermHelper = ITermAppleScriptHelper()
+    
     // MARK: - Public API
 
     /// Extract Claude status for a specific instance using multiple methods
     func extractStatus(for instance: ClaudeInstance) async -> ClaudeActivity {
         logger.debug("Extracting Claude status for PID \(instance.pid) in \(instance.folderName)")
 
-        // Method 1: Try accessibility API first (fastest and most reliable)
+        // Method 1: Try iTerm AppleScript for iTerm windows (most reliable for iTerm)
+        if iTermHelper.isITermRunning() {
+            if let statusText = await extractViaITermAppleScript(instance: instance) {
+                let activity = ClaudeActivity(text: statusText)
+                logger.info("Extracted status via iTerm AppleScript for \(instance.folderName): '\(activity.text)' (type: \(activity.type))")
+                return activity
+            }
+        }
+        
+        // Method 2: Try accessibility API (fastest and most reliable for other terminals)
         if let statusText = await extractViaAccessibility(instance: instance) {
             let activity = ClaudeActivity(text: statusText)
             logger.info("Extracted status via accessibility for \(instance.folderName): '\(activity.text)' (type: \(activity.type))")
             return activity
         }
 
-        // Method 2: Try modern ScreenCaptureKit with OCR fallback
+        // Method 3: Try modern ScreenCaptureKit with OCR fallback
         if let statusText = await extractViaScreenCapture(instance: instance) {
             let activity = ClaudeActivity(text: statusText)
             logger.info("Extracted status via OCR for \(instance.folderName): '\(activity.text)' (type: \(activity.type))")
@@ -116,6 +128,60 @@ final class ClaudeStatusExtractor: ObservableObject, Loggable {
         windowCache.clear()
     }
 
+    // MARK: - iTerm AppleScript-based Extraction
+    
+    private func extractViaITermAppleScript(instance: ClaudeInstance) async -> String? {
+        logger.debug("Attempting iTerm AppleScript extraction for \(instance.folderName)")
+        
+        // First try to find by TTY if available
+        if !instance.ttyPath.isEmpty {
+            if let content = await iTermHelper.getITermSessionByTTY(instance.ttyPath) {
+                logger.debug("Found iTerm session by TTY for \(instance.folderName)")
+                return parseClaudeStatus(from: content)
+            }
+        }
+        
+        // Fall back to directory matching
+        if let content = await iTermHelper.getITermSessionByDirectory(instance.folderName) {
+            logger.debug("Found iTerm session by directory for \(instance.folderName)")
+            return parseClaudeStatus(from: content)
+        }
+        
+        // If no direct match, try all sessions and match
+        let sessions = await iTermHelper.getAllITermSessions()
+        for session in sessions {
+            // Check if this session matches our instance
+            if sessionMatchesInstance(session: session, instance: instance) {
+                logger.debug("Found matching iTerm session for \(instance.folderName)")
+                return parseClaudeStatus(from: session.content)
+            }
+        }
+        
+        return nil
+    }
+    
+    private func sessionMatchesInstance(session: (sessionId: String, tty: String, content: String), instance: ClaudeInstance) -> Bool {
+        // Check TTY match
+        if !instance.ttyPath.isEmpty {
+            let ttyName = URL(fileURLWithPath: instance.ttyPath).lastPathComponent
+            if session.tty.contains(ttyName) {
+                return true
+            }
+        }
+        
+        // Check content for Claude indicators and instance directory
+        let content = session.content.lowercased()
+        if content.contains("claude") && content.contains("esc to interrupt") {
+            // Check if working directory is in the content
+            if content.contains(instance.workingDirectory.lowercased()) ||
+               content.contains(instance.folderName.lowercased()) {
+                return true
+            }
+        }
+        
+        return false
+    }
+    
     // MARK: - Accessibility-based Extraction
 
     private nonisolated func extractViaAccessibility(instance: ClaudeInstance) async -> String? {

Features/Monitoring/Domain/Services/ClaudeTerminalTitleManager.swift

@@ -8,6 +8,8 @@ import Darwin
 @MainActor
 final class ClaudeTerminalTitleManager: Loggable {
 
+    private let iTermHelper = ITermAppleScriptHelper()
+    
     // MARK: - Configuration
 
     private struct Configuration {
@@ -41,6 +43,15 @@ final class ClaudeTerminalTitleManager: Loggable {
 
         let title = buildTitle(for: instance)
 
+        // Check if this is an iTerm session
+        if iTermHelper.isITermRunning() {
+            // Try to update iTerm title via AppleScript
+            if await updateITermTitle(title: title, instance: instance) {
+                logger.info("✅ Updated iTerm title for \(instance.folderName) via AppleScript")
+                return
+            }
+        }
+        
         // First try to find the window using the shared service
         if TTYWindowMappingService.shared.findWindowForTTY(instance.ttyPath) != nil {
             logger.debug("Found window via TTYWindowMappingService for TTY \(instance.ttyPath)")
@@ -117,6 +128,50 @@ final class ClaudeTerminalTitleManager: Loggable {
             logger.error("Failed to write title to TTY \(ttyPath): \(error)")
         }
     }
+    
+    // MARK: - iTerm Support
+    
+    private func updateITermTitle(title: String, instance: ClaudeInstance) async -> Bool {
+        let ttyName = URL(fileURLWithPath: instance.ttyPath).lastPathComponent
+        
+        let script = """
+        tell application "iTerm"
+            repeat with w in windows
+                tell w
+                    repeat with t in tabs
+                        tell t
+                            repeat with s in sessions
+                                tell s
+                                    try
+                                        if tty contains "\(ttyName)" then
+                                            set name to "\(title)"
+                                            return true
+                                        end if
+                                    end try
+                                end tell
+                            end repeat
+                        end tell
+                    end repeat
+                end tell
+            end repeat
+            return false
+        end tell
+        """
+        
+        do {
+            var error: NSDictionary?
+            let appleScript = NSAppleScript(source: script)
+            let result = appleScript?.executeAndReturnError(&error)
+            
+            if let error = error {
+                let errorMessage = error["NSAppleScriptErrorMessage"] as? String ?? "Unknown error"
+                logger.error("Failed to update iTerm title: \(errorMessage)")
+                return false
+            }
+            
+            return result?.booleanValue ?? false
+        }
+    }
 }
 
 // MARK: - Title Format Extensions

Features/Monitoring/Domain/Services/TTYWindowMappingService.swift

@@ -20,6 +20,8 @@ final class TTYWindowMappingService: Loggable {
 
     static let shared = TTYWindowMappingService()
 
+    private let iTermHelper = ITermAppleScriptHelper()
+    
     private init() {}
 
     // MARK: - Public API
@@ -142,6 +144,11 @@ final class TTYWindowMappingService: Loggable {
 
         logger.debug("Checking \(windows.count) windows in \(app.bundleIdentifier ?? "unknown") for TTY \(ttyName)")
 
+        // Special handling for iTerm2
+        if app.bundleIdentifier == "com.googlecode.iterm2" {
+            return findITermWindowForTTY(windows: windows, ttyName: ttyName)
+        }
+        
         // For each window, check if it's associated with our TTY
         for window in windows {
                 // Different terminals expose TTY info differently
@@ -255,4 +262,27 @@ final class TTYWindowMappingService: Loggable {
 
         return nil
     }
+    
+    /// Find iTerm window that contains a session with the given TTY
+    private func findITermWindowForTTY(windows: [Element], ttyName: String) -> Element? {
+        logger.debug("Using iTerm-specific logic to find window for TTY \(ttyName)")
+        
+        // For synchronous context, we'll use a different approach
+        // Check if any window title contains the TTY name
+        for window in windows {
+            if let title = window.title(), title.contains(ttyName) {
+                logger.debug("Found iTerm window by title containing TTY \(ttyName)")
+                return window
+            }
+        }
+        
+        // In iTerm, windows typically don't show TTY in title, so return the first window
+        // iTerm usually has one main window with multiple tabs/sessions
+        if let firstWindow = windows.first {
+            logger.debug("Returning first iTerm window as likely container for TTY \(ttyName)")
+            return firstWindow
+        }
+        
+        return nil
+    }
 }