Fix v1.3 hook migration, stale sessions, and MCP tool names

Author: farouqaldori

ClaudeIsland/Core/ClaudePaths.swift

@@ -62,11 +62,11 @@ enum ClaudePaths {
         claudeDir.appendingPathComponent("projects")
     }
 
-    /// Shell-expanded path for hook commands in settings.json.
-    /// Uses "~/" so Claude Code resolves it relative to the user's home.
+    /// Shell-safe absolute path for hook commands in settings.json.
+    /// Absolute paths keep custom directories and ~/.config/claude working;
+    /// quoting keeps paths with spaces from being split by the shell.
     static var hookScriptShellPath: String {
-        let dirName = claudeDir.lastPathComponent
-        return "~/\(dirName)/hooks/claude-island-state.py"
+        shellQuote(claudeDir.appendingPathComponent("hooks/claude-island-state.py").path)
     }
 
     /// Invalidate the cached directory so the next access re-resolves.
@@ -110,4 +110,8 @@ enum ClaudePaths {
         // 4. Legacy fallback
         return home.appendingPathComponent(".claude")
     }
+
+    private static func shellQuote(_ path: String) -> String {
+        "'" + path.replacingOccurrences(of: "'", with: "'\\''") + "'"
+    }
 }

ClaudeIsland/Services/Hooks/HookInstaller.swift

@@ -79,23 +79,9 @@ struct HookInstaller {
         ]
 
         for (event, config) in hookEvents {
-            if var existingEvent = hooks[event] as? [[String: Any]] {
-                let hasOurHook = existingEvent.contains { entry in
-                    if let entryHooks = entry["hooks"] as? [[String: Any]] {
-                        return entryHooks.contains { h in
-                            let cmd = h["command"] as? String ?? ""
-                            return cmd.contains("claude-island-state.py")
-                        }
-                    }
-                    return false
-                }
-                if !hasOurHook {
-                    existingEvent.append(contentsOf: config)
-                    hooks[event] = existingEvent
-                }
-            } else {
-                hooks[event] = config
-            }
+            let existingEvent = hooks[event] as? [[String: Any]] ?? []
+            let cleanedEvent = existingEvent.compactMap { removingClaudeIslandHooks(from: $0) }
+            hooks[event] = cleanedEvent + config
         }
 
         json["hooks"] = hooks
@@ -151,15 +137,7 @@ struct HookInstaller {
 
         for (event, value) in hooks {
             if var entries = value as? [[String: Any]] {
-                entries.removeAll { entry in
-                    if let entryHooks = entry["hooks"] as? [[String: Any]] {
-                        return entryHooks.contains { hook in
-                            let cmd = hook["command"] as? String ?? ""
-                            return cmd.contains("claude-island-state.py")
-                        }
-                    }
-                    return false
-                }
+                entries = entries.compactMap { removingClaudeIslandHooks(from: $0) }
 
                 if entries.isEmpty {
                     hooks.removeValue(forKey: event)
@@ -200,4 +178,22 @@ struct HookInstaller {
 
         return "python"
     }
+
+    nonisolated private static func removingClaudeIslandHooks(from entry: [String: Any]) -> [String: Any]? {
+        guard var entryHooks = entry["hooks"] as? [[String: Any]] else {
+            return entry
+        }
+
+        entryHooks.removeAll(where: isClaudeIslandHook)
+        guard !entryHooks.isEmpty else { return nil }
+
+        var updatedEntry = entry
+        updatedEntry["hooks"] = entryHooks
+        return updatedEntry
+    }
+
+    nonisolated private static func isClaudeIslandHook(_ hook: [String: Any]) -> Bool {
+        let cmd = hook["command"] as? String ?? ""
+        return cmd.contains("claude-island-state.py")
+    }
 }

ClaudeIsland/Services/Session/ConversationParser.swift

@@ -657,12 +657,12 @@ actor ConversationParser {
         isError: Bool
     ) -> ToolResultData {
         if toolName.hasPrefix("mcp__") {
-            let parts = toolName.dropFirst(5).split(separator: "_", maxSplits: 2)
-            let serverName = parts.count > 0 ? String(parts[0]) : "unknown"
-            let mcpToolName = parts.count > 1 ? String(parts[1].dropFirst()) : toolName
+            let parts = String(toolName.dropFirst(5)).components(separatedBy: "__")
+            let serverName = parts.first.flatMap { $0.isEmpty ? nil : $0 } ?? "unknown"
+            let mcpToolName = parts.dropFirst().joined(separator: "__")
             return .mcp(MCPResult(
                 serverName: serverName,
-                toolName: mcpToolName,
+                toolName: mcpToolName.isEmpty ? toolName : mcpToolName,
                 rawResult: toolUseResult
             ))
         }
@@ -1131,4 +1131,3 @@ extension ConversationParser {
         return tools
     }
 }
-

ClaudeIsland/Services/State/SessionStore.swift

@@ -1070,19 +1070,23 @@ actor SessionStore {
 
     /// Recheck status of all active sessions
     private func recheckAllSessions() {
-        for (sessionId, session) in sessions {
-            guard session.phase != .ended else { continue }
+        var removedSession = false
+
+        for (sessionId, session) in Array(sessions) {
+            if session.phase == .ended {
+                sessions.removeValue(forKey: sessionId)
+                cancelPendingSync(sessionId: sessionId)
+                removedSession = true
+                continue
+            }
 
             if let pid = session.pid {
                 let isRunning = isProcessRunning(pid: pid)
                 if !isRunning {
                     Self.logger.info("Process \(pid) no longer running, ending session \(sessionId.prefix(8))")
-                    var updatedSession = session
-                    if updatedSession.phase.canTransition(to: .ended) {
-                        updatedSession.phase = .ended
-                        sessions[sessionId] = updatedSession
-                        publishState()
-                    }
+                    sessions.removeValue(forKey: sessionId)
+                    cancelPendingSync(sessionId: sessionId)
+                    removedSession = true
                     continue
                 }
             }
@@ -1098,6 +1102,10 @@ actor SessionStore {
                 scheduleFileSync(sessionId: sessionId, cwd: session.cwd)
             }
         }
+
+        if removedSession {
+            publishState()
+        }
     }
 
     /// Check if a process is still running