feat(companion): add iPhone Buddy app and watch sync

.gitignore

@@ -13,6 +13,8 @@ docs/superpowers/
 # IDE vscode/cursor
 .vscode/
 .cursor/
+xcuserdata/
+*.xcuserstate
 
 # Tmp files
 *.log
@@ -25,7 +27,45 @@ android-watch/local.properties
 android-watch/**/build/
 
 # Code agents config files
+.adal/
+.aider-desk/
 .agents/
+.augment/
+.bob/
 .claude/
+.codeartsdoer/
+.codebuddy/
+.codemaker/
+.codestudio/
+.commandcode/
+.continue/
+.cortex/
+.crush/
+.devin/
+.factory/
+.forge/
+.goose/
+.hermes/
+.iflow/
+.junie/
+.kilocode/
+.kiro/
+.kode/
+.mcpjam/
+.mux/
+.neovate/
+.openhands/
+.pi/
+.pochi/
+.qoder/
+.qwen/
+.roo/
+.rovodev/
+.tabnine/
+.trae/
+.vibe/
+.windsurf/
+.zencoder/
+skills/
 skills-lock.json
 CLAUDE.md

CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [v1.0.27] - 2026-05-30
+
+### English
+- Fix Cursor / Trae / Qoder / Factory click-to-jump raising the most-recently-used window instead of the one running the clicked session — now matches the workspace window by project folder (#199)
+- Install custom CLI hooks on SSH remote hosts too (claude / nested hook formats) — previously only the built-in CLIs were configured remotely (#192)
+
+### 中文
+- 修复 Cursor / Trae / Qoder / Factory 点击灵动岛跳到"最近用过的窗口"而不是正在对话的那个——现在按项目目录匹配对应 workspace 窗口 (#199)
+- SSH 远程主机也会安装自定义 CLI 的 hooks（claude / nested 格式）——此前远程只配置内置 CLI (#192)
+
+## [v1.0.26] - 2026-05-30
+
+### English
+- Add pi / Oh My Pi (OMP) coding agent integration — auto-install the bundled extension into `~/.pi/agent/extensions` and `~/.omp/agent/extensions` (#197)
+- Isolate the remote SSH socket per user (`/tmp/codeisland-<uid>.sock`) so multiple OS users on a shared host no longer collide or steal each other's events (#193)
+- Fix the SSH tunnel being misreported as `ssh exited (0)` when ControlMaster multiplexing makes `ssh -N` hand off the forward and exit immediately — force a dedicated connection (#190)
+- Fix iTerm2 click-to-jump landing on the wrong window when the target session is fullscreen or on another Space — select the owning window so macOS switches to its Space (#198)
+
+### 中文
+- 新增 pi / Oh My Pi (OMP) 编码 agent 集成——自动把扩展装到 `~/.pi/agent/extensions` 和 `~/.omp/agent/extensions` (#197)
+- 远程 SSH socket 改为按用户隔离（`/tmp/codeisland-<uid>.sock`），多用户共享主机不再互相串话或抢占事件 (#193)
+- 修复 SSH 隧道在 ControlMaster 多路复用下 `ssh -N` 立即退出、被误报为 `ssh exited (0)` 的问题——强制独占连接 (#190)
+- 修复 iTerm2 全屏 / 跨 Space 时点击会话跳到错误窗口——命中后选中目标窗口以触发 Space 切换 (#198)
+
 ## [v1.0.23] - 2026-04-25
 
 ### English

Info.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.24</string>
+	<string>1.0.27</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.24</string>
+	<string>1.0.27</string>
 	<key>LSUIElement</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
@@ -27,6 +27,8 @@
 	</dict>
 	<key>NSAppleEventsUsageDescription</key>
 	<string>CodeIsland needs to control terminal apps to jump to the correct window and tab when you click a session.</string>
+	<key>NSBluetoothAlwaysUsageDescription</key>
+	<string>CodeIsland uses Bluetooth to mirror the island onto Buddy.</string>
 	<key>SUAutomaticallyUpdate</key>
 	<false/>
 	<key>SUEnableAutomaticChecks</key>
@@ -37,7 +39,11 @@
 	<string>oqLtx5s2hc8Xgsp4rEuTwnQ8UGRT4ma4tjlf+1i3YHA=</string>
 	<key>SUScheduledCheckInterval</key>
 	<integer>14400</integer>
-	<key>NSBluetoothAlwaysUsageDescription</key>
-	<string>CodeIsland uses Bluetooth to mirror the island onto Buddy.</string>
+	<key>NSBonjourServices</key>
+	<array>
+		<string>_codeisland._tcp</string>
+	</array>
+	<key>NSLocalNetworkUsageDescription</key>
+	<string>CodeIsland advertises itself on the local network so iPhone can mirror the island state.</string>
 </dict>
 </plist>

README.md

@@ -81,7 +81,7 @@ Requires **macOS 14+** and **Swift 5.9+**.
 git clone https://github.com/wxtsky/CodeIsland.git
 cd CodeIsland
 
-# Development (debug build + launch)
+# Development (debug build + launch; Buddy Bluetooth needs the .app below)
 swift build && ./.build/debug/CodeIsland
 
 # Release (universal binary: Apple Silicon + Intel)

README.zh-CN.md

@@ -81,7 +81,7 @@ brew install --cask codeisland
 git clone https://github.com/wxtsky/CodeIsland.git
 cd CodeIsland
 
-# 开发模式（debug 构建 + 启动）
+# 开发模式（debug 构建 + 启动；Buddy 蓝牙需要下面的 .app）
 swift build && ./.build/debug/CodeIsland
 
 # 发布模式（通用二进制：Apple Silicon + Intel）

Sources/CodeIsland/AntiGravityView.swift

@@ -1,10 +1,9 @@
 import SwiftUI
-import CodeIslandCore
 
 /// AntiGravityBot — AntiGravity mascot, rainbow gradient swoosh character.
 /// Multicolor gradient inspired by the AntiGravity "A" logo.
 struct AntiGravityView: View {
-    let status: AgentStatus
+    let status: MascotAgentStatus
     var size: CGFloat = 27
     @State private var alive = false
     @Environment(\.mascotSpeed) private var speed

Sources/CodeIsland/AppDelegate.swift

@@ -61,6 +61,19 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             guard let appState else { return }
             appState.handleBuddyControlCommand(command)
         }
+        AppleCompanionPublisher.shared.attach(appState)
+        AppleCompanionPublisher.shared.onFocusRequest = { [weak appState] mascot in
+            guard let appState else { return }
+            ESP32FocusCoordinator.handle(mascot: mascot, appState: appState)
+        }
+        AppleCompanionPublisher.shared.onControlCommand = { [weak appState] command in
+            guard let appState else { return }
+            appState.handleBuddyControlCommand(command)
+        }
+        AppleCompanionPublisher.shared.onQuestionAnswer = { [weak appState] answer in
+            guard let appState else { return }
+            appState.answerCompanionQuestion(answer)
+        }
         let buddyEnabled = UserDefaults.standard.bool(forKey: SettingsKey.esp32BridgeEnabled)
         let buddySyncInterval = UserDefaults.standard.double(forKey: SettingsKey.esp32HeartbeatSeconds)
         let buddyBrightness = UserDefaults.standard.double(forKey: SettingsKey.buddyScreenBrightnessPercent)
@@ -73,6 +86,12 @@ class AppDelegate: NSObject, NSApplicationDelegate {
             brightnessPercent: buddyBrightness > 0 ? buddyBrightness : SettingsDefaults.buddyScreenBrightnessPercent,
             screenOrientation: buddyScreenOrientation
         )
+        let appleCompanionEnabled = UserDefaults.standard.bool(forKey: SettingsKey.appleCompanionEnabled)
+        let appleCompanionHeartbeat = UserDefaults.standard.double(forKey: SettingsKey.appleCompanionHeartbeatSeconds)
+        AppleCompanionPublisher.shared.configure(
+            enabled: appleCompanionEnabled,
+            heartbeatSeconds: appleCompanionHeartbeat > 0 ? appleCompanionHeartbeat : SettingsDefaults.appleCompanionHeartbeatSeconds
+        )
 
         // Hooks auto-recovery: periodic + app activation trigger
         hookRecoveryTimer = Timer.scheduledTimer(withTimeInterval: 300, repeats: true) { [weak self] _ in

Sources/CodeIsland/AppState+ToolUseCache.swift

@@ -97,6 +97,17 @@ extension AppState {
         else { return false }
 
         let existing = permissionQueue[existingIndex]
+        // #169: a shared tool_use_id alone is not enough to call this a replay.
+        // Claude Code can emit several *parallel* tool calls (e.g. reading 4
+        // files at once); if they carry the same id but different inputs they are
+        // distinct requests and each needs its own decision. Treat it as a replay
+        // — deny the old waiter, keep the new one in place — only when the tool
+        // inputs match. Otherwise let the new request enqueue on its own.
+        let existingInput = existing.event.toolInput ?? [:]
+        let newInput = request.event.toolInput ?? [:]
+        guard NSDictionary(dictionary: existingInput).isEqual(to: NSDictionary(dictionary: newInput)) else {
+            return false
+        }
         log.notice("⚠️ permission deny reason=mergeDuplicatePermissionRequest session=\(existing.event.sessionId ?? "nil", privacy: .public) toolUseId=\(toolUseId, privacy: .public) tool=\(existing.event.toolName ?? "nil", privacy: .public)")
         let denyBody = #"{"hookSpecificOutput":{"hookEventName":"PermissionRequest","decision":{"behavior":"deny"}}}"#
         existing.continuation.resume(returning: Data(denyBody.utf8))

Sources/CodeIsland/AppState.swift

@@ -625,6 +625,7 @@ final class AppState {
             rotatingSessionId = cachedActiveIds.first
         }
         ESP32StatePublisher.shared.notifyDirty()
+        AppleCompanionPublisher.shared.notifyDirty()
     }
 
     /// Start monitoring the CLI process for a session.
@@ -875,6 +876,7 @@ final class AppState {
         if activeSessionCount != summary.activeSessionCount { activeSessionCount = summary.activeSessionCount }
         if totalSessionCount != summary.totalSessionCount { totalSessionCount = summary.totalSessionCount }
         ESP32StatePublisher.shared.notifyDirty()
+        AppleCompanionPublisher.shared.notifyDirty()
     }
 
     private func refreshProviderTitle(for trackedSessionId: String, providerSessionId: String? = nil) {
@@ -1153,6 +1155,38 @@ final class AppState {
         }
     }
 
+    func answerCompanionQuestion(_ answer: String) {
+        guard !questionQueue.isEmpty else {
+            log.info("Ignored companion question answer because question queue is empty")
+            return
+        }
+
+        if questionQueue[0].isFromPermission,
+           var askState = questionQueue[0].askUserQuestionState {
+            guard let index = askState.items.firstIndex(where: { askState.answers[$0.answerKey] == nil }) else {
+                answerQuestionMulti(askState.items.map {
+                    (question: $0.payload.question, answer: askState.answers[$0.answerKey] ?? "")
+                })
+                return
+            }
+
+            let item = askState.items[index]
+            askState.answers[item.answerKey] = answer
+            questionQueue[0].askUserQuestionState = askState
+
+            if askState.canConfirm {
+                answerQuestionMulti(askState.items.map {
+                    (question: $0.payload.question, answer: askState.answers[$0.answerKey] ?? "")
+                })
+            } else {
+                refreshDerivedState()
+            }
+            return
+        }
+
+        answerQuestion(answer)
+    }
+
     /// Find an existing session whose source matches and whose CLI PID equals
     /// the supplied ppid. Used by HookServer to merge plugin-proxied events
     /// (e.g. omo) into their main session when pluginSessionMode == "merge". (#123)
@@ -1303,8 +1337,10 @@ final class AppState {
                     descriptions: optionDescs,
                     header: header
                 )
-                let trimmedHeader = header?.trimmingCharacters(in: .whitespacesAndNewlines)
-                let baseKey = (trimmedHeader?.isEmpty == false ? trimmedHeader : nil) ?? "answer_\(index + 1)"
+                // Claude Code's mapToolResultToToolResultBlockParam looks up answers by
+                // question text: `answers[question.question]`. Using header as the key
+                // causes a mismatch and all answers arrive as empty strings.
+                let baseKey = questionText
                 var answerKey = baseKey
                 if usedAnswerKeys.contains(answerKey) {
                     var suffix = 2
@@ -1481,9 +1517,12 @@ final class AppState {
         originalQuestions: [[String: Any]]?
     ) -> [String: Any] {
         var updatedInput = event.toolInput ?? [:]
-        if let originalQuestions {
-            updatedInput["questions"] = originalQuestions
-        }
+        // `questions` must always be present in updatedInput. Claude Code's
+        // mapToolResultToToolResultBlockParam calls H.map() on it directly;
+        // if the key is absent H is undefined and the call crashes with
+        // "undefined is not an object (evaluating 'H.map')".
+        // Fall back to the raw toolInput value when the [[String:Any]] cast fails.
+        updatedInput["questions"] = originalQuestions ?? (event.toolInput?["questions"] ?? [] as [[String: Any]])
         updatedInput["answers"] = answers
         if let answer {
             updatedInput["answer"] = answer