fix: set isRemote on resume and add mutagen flush + uname preamble

rogeriochaves · rogeriochaves · commit 716435b6dcd4 · 2026-03-04T12:06:20.000Z
resumeCompleted was missing the isRemote flag, so resumed cards never
showed the remote icon. Now mirrors launchCompleted behavior.

Both launch and resume now inject a shell preamble for remote sessions
that flushes mutagen sync and runs uname on the remote host, giving
early visual feedback before claude starts.
diff --git a/Sources/KanbanCode/ContentView.swift b/Sources/KanbanCode/ContentView.swift
@@ -1567,6 +1567,7 @@ struct ContentView: View {
                 let shellOverride: String?
                 let extraEnv: [String: String]
                 let isRemote: Bool
+                let preamble: String?
 
                 let globalRemote = settings?.remote
                 if runRemotely, let remote = globalRemote, projectPath.hasPrefix(remote.localPath) {
@@ -1584,10 +1585,13 @@ struct ContentView: View {
                         name: syncName,
                         ignores: ignores
                     )
+
+                    preamble = Self.remotePreamble(host: remote.host)
                 } else {
                     shellOverride = nil
                     extraEnv = [:]
                     isRemote = false
+                    preamble = nil
                 }
 
                 // Snapshot existing .jsonl files for session detection
@@ -1622,7 +1626,8 @@ struct ContentView: View {
                     shellOverride: shellOverride,
                     extraEnv: extraEnv,
                     commandOverride: commandOverride,
-                    skipPermissions: skipPermissions
+                    skipPermissions: skipPermissions,
+                    preamble: preamble
                 )
                 KanbanCodeLog.info("launch", "Tmux session created: \(tmuxName)")
 
@@ -1718,6 +1723,12 @@ struct ContentView: View {
         return WorktreeLink(path: worktreePath, branch: branchName)
     }
 
+    /// Build a shell preamble that flushes mutagen and shows remote uname before launching claude.
+    private static func remotePreamble(host: String) -> String {
+        // Use ; instead of && so a flush failure doesn't block claude from starting
+        "printf '\\e[2mSyncing files...\\e[0m' && mutagen sync flush 2>/dev/null; printf '\\e[2mRemote: %s\\e[0m\\n' \"$(ssh -o ConnectTimeout=5 \(host) uname -snr 2>/dev/null || echo 'unavailable')\""
+    }
+
     @State private var pendingWorktreeCleanup: WorktreeCleanupInfo?
     @State private var pendingDeleteCardId: String?
     @State private var pendingArchiveCardId: String?
@@ -1928,12 +1939,15 @@ struct ContentView: View {
 
                 let shellOverride: String?
                 let extraEnv: [String: String]
+                let isRemote: Bool
+                let preamble: String?
 
                 let globalRemote = settings?.remote
                 if runRemotely, let remote = globalRemote, projectPath.hasPrefix(remote.localPath) {
                     try? RemoteShellManager.deploy()
                     shellOverride = RemoteShellManager.shellOverridePath()
                     extraEnv = RemoteShellManager.setupEnvironment(remote: remote, projectPath: projectPath)
+                    isRemote = true
 
                     let syncName = "kanban-code-\((projectPath as NSString).lastPathComponent)"
                     let remoteDest = "\(remote.host):\(remote.remotePath)"
@@ -1944,9 +1958,13 @@ struct ContentView: View {
                         name: syncName,
                         ignores: ignores
                     )
+
+                    preamble = Self.remotePreamble(host: remote.host)
                 } else {
                     shellOverride = nil
                     extraEnv = [:]
+                    isRemote = false
+                    preamble = nil
                 }
 
                 let actualTmuxName = try await launcher.resume(
@@ -1955,11 +1973,12 @@ struct ContentView: View {
                     shellOverride: shellOverride,
                     extraEnv: extraEnv,
                     commandOverride: commandOverride,
-                    skipPermissions: skipPermissions
+                    skipPermissions: skipPermissions,
+                    preamble: preamble
                 )
                 KanbanCodeLog.info("resume", "Resume launched for card=\(cardId.prefix(12)) actualTmux=\(actualTmuxName)")
 
-                store.dispatch(.resumeCompleted(cardId: cardId, tmuxName: actualTmuxName))
+                store.dispatch(.resumeCompleted(cardId: cardId, tmuxName: actualTmuxName, isRemote: isRemote))
             } catch {
                 KanbanCodeLog.info("resume", "Resume failed for card=\(cardId.prefix(12)): \(error.localizedDescription)")
                 store.dispatch(.resumeFailed(cardId: cardId, error: error.localizedDescription))
diff --git a/Sources/KanbanCodeCore/Domain/Ports/SessionLauncher.swift b/Sources/KanbanCodeCore/Domain/Ports/SessionLauncher.swift
@@ -11,7 +11,8 @@ public protocol SessionLauncher: Sendable {
         shellOverride: String?,
         extraEnv: [String: String],
         commandOverride: String?,
-        skipPermissions: Bool
+        skipPermissions: Bool,
+        preamble: String?
     ) async throws -> String // returns tmux session name
 
     /// Resume an existing session by its ID.
@@ -21,7 +22,8 @@ public protocol SessionLauncher: Sendable {
         shellOverride: String?,
         extraEnv: [String: String],
         commandOverride: String?,
-        skipPermissions: Bool
+        skipPermissions: Bool,
+        preamble: String?
     ) async throws -> String // returns tmux session name
 }
 
@@ -42,7 +44,8 @@ extension SessionLauncher {
             shellOverride: shellOverride,
             extraEnv: [:],
             commandOverride: nil,
-            skipPermissions: false
+            skipPermissions: false,
+            preamble: nil
         )
     }
 
@@ -59,7 +62,8 @@ extension SessionLauncher {
             shellOverride: shellOverride,
             extraEnv: extraEnv,
             commandOverride: commandOverride,
-            skipPermissions: false
+            skipPermissions: false,
+            preamble: nil
         )
     }
 }
diff --git a/Sources/KanbanCodeCore/UseCases/BoardStore.swift b/Sources/KanbanCodeCore/UseCases/BoardStore.swift
@@ -156,7 +156,7 @@ public enum Action: Sendable {
     case launchCompleted(cardId: String, tmuxName: String, sessionLink: SessionLink?, worktreeLink: WorktreeLink?, isRemote: Bool)
     case launchTmuxReady(cardId: String)
     case launchFailed(cardId: String, error: String)
-    case resumeCompleted(cardId: String, tmuxName: String)
+    case resumeCompleted(cardId: String, tmuxName: String, isRemote: Bool)
     case resumeFailed(cardId: String, error: String)
     case terminalCreated(cardId: String, tmuxName: String)
     case terminalFailed(cardId: String, error: String)
@@ -639,10 +639,11 @@ public enum Reducer {
             state.error = "Launch failed: \(error)"
             return [.upsertLink(link)]
 
-        case .resumeCompleted(let cardId, let tmuxName):
+        case .resumeCompleted(let cardId, let tmuxName, let isRemote):
             guard var link = state.links[cardId] else { return [] }
             let existingExtras = link.tmuxLink?.extraSessions
             link.tmuxLink = TmuxLink(sessionName: tmuxName, extraSessions: existingExtras)
+            link.isRemote = isRemote
             link.isLaunching = nil
             link.lastActivity = .now
             link.updatedAt = .now
diff --git a/Sources/KanbanCodeCore/UseCases/LaunchSession.swift b/Sources/KanbanCodeCore/UseCases/LaunchSession.swift
@@ -17,7 +17,8 @@ public final class LaunchSession: SessionLauncher, @unchecked Sendable {
         shellOverride: String?,
         extraEnv: [String: String] = [:],
         commandOverride: String? = nil,
-        skipPermissions: Bool = false
+        skipPermissions: Bool = false,
+        preamble: String? = nil
     ) async throws -> String {
 
         let cmd: String
@@ -47,7 +48,11 @@ public final class LaunchSession: SessionLauncher, @unchecked Sendable {
         }
 
         // Prepend cd to ensure we're in the right directory even if zshrc changes it
-        let fullCmd = "cd \(shellEscape(projectPath)) && \(cmd)"
+        var fullCmd = "cd \(shellEscape(projectPath))"
+        if let preamble, !preamble.isEmpty {
+            fullCmd += " && \(preamble)"
+        }
+        fullCmd += " && \(cmd)"
 
         // Kill any stale session with the same name before launching.
         // This handles disconnected cards where the old tmux session lingers.
@@ -63,7 +68,8 @@ public final class LaunchSession: SessionLauncher, @unchecked Sendable {
         shellOverride: String?,
         extraEnv: [String: String] = [:],
         commandOverride: String? = nil,
-        skipPermissions: Bool = false
+        skipPermissions: Bool = false,
+        preamble: String? = nil
     ) async throws -> String {
         // Check if there's already a tmux session for this
         let existing = try await tmux.listSessions()
@@ -88,7 +94,11 @@ public final class LaunchSession: SessionLauncher, @unchecked Sendable {
         }
 
         // Prepend cd to ensure we're in the right directory even if zshrc changes it
-        let fullCmd = "cd \(shellEscape(projectPath)) && \(cmd)"
+        var fullCmd = "cd \(shellEscape(projectPath))"
+        if let preamble, !preamble.isEmpty {
+            fullCmd += " && \(preamble)"
+        }
+        fullCmd += " && \(cmd)"
 
         try await tmux.createSession(name: sessionName, path: projectPath, command: fullCmd)
         return sessionName
diff --git a/Tests/KanbanCodeCoreTests/ReducerTests.swift b/Tests/KanbanCodeCoreTests/ReducerTests.swift
@@ -168,13 +168,14 @@ struct ReducerTests {
         var state = stateWith([link])
 
         let _ = Reducer.reduce(state: &state, action: .resumeCompleted(
-            cardId: "card_r3", tmuxName: "claude-sess_abc"
+            cardId: "card_r3", tmuxName: "claude-sess_abc", isRemote: false
         ))
 
         // isLaunching cleared immediately — terminal shows without waiting for reconciliation
         #expect(state.links["card_r3"]?.isLaunching == nil)
         #expect(state.links["card_r3"]?.column == .inProgress)
         #expect(state.links["card_r3"]?.lastActivity != nil)
+        #expect(state.links["card_r3"]?.isRemote == false)
     }
 
     // MARK: - Launch Failure
@@ -1130,11 +1131,12 @@ struct ReducerTests {
         var state = stateWith([link])
 
         let _ = Reducer.reduce(state: &state, action: .resumeCompleted(
-            cardId: "card_ti7", tmuxName: "claude-sess_abc"
+            cardId: "card_ti7", tmuxName: "claude-sess_abc", isRemote: true
         ))
 
         #expect(state.links["card_ti7"]?.tmuxLink?.extraSessions == ["claude-sess_abc-sh1"])
         #expect(state.links["card_ti7"]?.isLaunching == nil)
+        #expect(state.links["card_ti7"]?.isRemote == true)
     }
 
     @Test("launchCompleted preserves extras")

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ public protocol SessionLauncher: Sendable {`
`11`	`11`	`shellOverride: String?,`
`12`	`12`	`extraEnv: [String: String],`
`13`	`13`	`commandOverride: String?,`
`14`		`- skipPermissions: Bool`
	`14`	`+ skipPermissions: Bool,`
	`15`	`+ preamble: String?`
`15`	`16`	`) async throws -> String // returns tmux session name`
`16`	`17`
`17`	`18`	`/// Resume an existing session by its ID.`
`@@ -21,7 +22,8 @@ public protocol SessionLauncher: Sendable {`
`21`	`22`	`shellOverride: String?,`
`22`	`23`	`extraEnv: [String: String],`
`23`	`24`	`commandOverride: String?,`
`24`		`- skipPermissions: Bool`
	`25`	`+ skipPermissions: Bool,`
	`26`	`+ preamble: String?`
`25`	`27`	`) async throws -> String // returns tmux session name`
`26`	`28`	`}`
`27`	`29`
`@@ -42,7 +44,8 @@ extension SessionLauncher {`
`42`	`44`	`shellOverride: shellOverride,`
`43`	`45`	`extraEnv: [:],`
`44`	`46`	`commandOverride: nil,`
`45`		`- skipPermissions: false`
	`47`	`+ skipPermissions: false,`
	`48`	`+ preamble: nil`
`46`	`49`	`)`
`47`	`50`	`}`
`48`	`51`
`@@ -59,7 +62,8 @@ extension SessionLauncher {`
`59`	`62`	`shellOverride: shellOverride,`
`60`	`63`	`extraEnv: extraEnv,`
`61`	`64`	`commandOverride: commandOverride,`
`62`		`- skipPermissions: false`
	`65`	`+ skipPermissions: false,`
	`66`	`+ preamble: nil`
`63`	`67`	`)`
`64`	`68`	`}`
`65`	`69`	`}`