Restore terminal-only tab icons

Sources/ContentView+ForkAgentConversation.swift

@@ -42,7 +42,8 @@ extension ContentView {
             panelId: panelId
         )
 
-        let fallbackSnapshot = currentContext.workspace.restoredAgentSnapshotsByPanelId[panelId]
+        let allowsAgentContinuation = currentContext.workspace.allowsAgentContinuation(forPanelId: panelId)
+        let fallbackSnapshot = currentContext.workspace.restoredAgentSnapshotForContinuation(panelId: panelId)
         let isRemoteContext = currentContext.workspace.isRemoteTerminalSurface(panelId)
         let selection = Self.commandPaletteImmediateForkExecutionSnapshotSelection(
             workspaceId: workspaceId,
@@ -52,7 +53,8 @@ extension ContentView {
             supportedRemoteContextsByPanelKey: commandPaletteForkableAgentRemoteContextsByPanelKey,
             snapshotFingerprintsByPanelKey: commandPaletteForkableAgentSnapshotFingerprintsByPanelKey,
             fallbackSnapshot: fallbackSnapshot,
-            cachedSnapshot: commandPaletteForkableAgentSnapshotsByPanelKey[panelKey]
+            cachedSnapshot: commandPaletteForkableAgentSnapshotsByPanelKey[panelKey],
+            allowsAgentContinuation: allowsAgentContinuation
         )
         guard let selection else {
             clearCommandPaletteForkableAgentCache(panelKey: panelKey)
@@ -149,6 +151,36 @@ extension ContentView {
         let usedFallbackSnapshot: Bool
     }
 
+    static func commandPalettePanelHasForkableAgent(
+        workspaceId: UUID,
+        panelId: UUID,
+        supportedPanelKeys: Set<String>,
+        supportedRemoteContextsByPanelKey: [String: Bool] = [:],
+        fallbackSnapshot: SessionRestorableAgentSnapshot?,
+        isRemoteTerminal: Bool = false,
+        allowsAgentContinuation: Bool = true
+    ) -> Bool {
+        guard allowsAgentContinuation else { return false }
+        let panelKey = commandPaletteForkableAgentPanelKey(
+            workspaceId: workspaceId,
+            panelId: panelId
+        )
+        if supportedPanelKeys.contains(panelKey) {
+            if let supportedRemoteContext = supportedRemoteContextsByPanelKey[panelKey],
+               supportedRemoteContext != isRemoteTerminal {
+                return false
+            }
+            if let fallbackSnapshot {
+                return commandPaletteSnapshotForkAvailability(
+                    fallbackSnapshot,
+                    isRemoteTerminal: isRemoteTerminal
+                ) != .unsupported
+            }
+            return true
+        }
+        return false
+    }
+
     static func commandPaletteImmediateForkExecutionSnapshot(
         workspaceId: UUID,
         panelId: UUID,
@@ -157,7 +189,8 @@ extension ContentView {
         supportedRemoteContextsByPanelKey: [String: Bool],
         snapshotFingerprintsByPanelKey: [String: String],
         fallbackSnapshot: SessionRestorableAgentSnapshot?,
-        cachedSnapshot: SessionRestorableAgentSnapshot?
+        cachedSnapshot: SessionRestorableAgentSnapshot?,
+        allowsAgentContinuation: Bool = true
     ) -> SessionRestorableAgentSnapshot? {
         commandPaletteImmediateForkExecutionSnapshotSelection(
             workspaceId: workspaceId,
@@ -167,7 +200,8 @@ extension ContentView {
             supportedRemoteContextsByPanelKey: supportedRemoteContextsByPanelKey,
             snapshotFingerprintsByPanelKey: snapshotFingerprintsByPanelKey,
             fallbackSnapshot: fallbackSnapshot,
-            cachedSnapshot: cachedSnapshot
+            cachedSnapshot: cachedSnapshot,
+            allowsAgentContinuation: allowsAgentContinuation
         )?.snapshot
     }
 
@@ -179,8 +213,10 @@ extension ContentView {
         supportedRemoteContextsByPanelKey: [String: Bool],
         snapshotFingerprintsByPanelKey: [String: String],
         fallbackSnapshot: SessionRestorableAgentSnapshot?,
-        cachedSnapshot: SessionRestorableAgentSnapshot?
+        cachedSnapshot: SessionRestorableAgentSnapshot?,
+        allowsAgentContinuation: Bool = true
     ) -> CommandPaletteForkSnapshotSelection? {
+        guard allowsAgentContinuation else { return nil }
         let panelKey = commandPaletteForkableAgentPanelKey(
             workspaceId: workspaceId,
             panelId: panelId

Sources/ContentView.swift

@@ -5687,34 +5687,6 @@ struct ContentView: View {
         cachedResultHadFallback ?? true
     }
 
-    static func commandPalettePanelHasForkableAgent(
-        workspaceId: UUID,
-        panelId: UUID,
-        supportedPanelKeys: Set<String>,
-        supportedRemoteContextsByPanelKey: [String: Bool] = [:],
-        fallbackSnapshot: SessionRestorableAgentSnapshot?,
-        isRemoteTerminal: Bool = false
-    ) -> Bool {
-        let panelKey = commandPaletteForkableAgentPanelKey(
-            workspaceId: workspaceId,
-            panelId: panelId
-        )
-        if supportedPanelKeys.contains(panelKey) {
-            if let supportedRemoteContext = supportedRemoteContextsByPanelKey[panelKey],
-               supportedRemoteContext != isRemoteTerminal {
-                return false
-            }
-            if let fallbackSnapshot {
-                return commandPaletteSnapshotForkAvailability(
-                    fallbackSnapshot,
-                    isRemoteTerminal: isRemoteTerminal
-                ) != .unsupported
-            }
-            return true
-        }
-        return false
-    }
-
     private func refreshCommandPaletteForkableAgentAvailabilityIfNeeded(scope: CommandPaletteListScope) {
         guard scope == .commands,
               let panelContext = focusedPanelContext,
@@ -5730,7 +5702,17 @@ struct ContentView: View {
         let panelKey = Self.commandPaletteForkableAgentPanelKey(workspaceId: workspaceId, panelId: panelId)
         let panelChanged = commandPaletteForkableAgentActivePanelKey != panelKey
         commandPaletteForkableAgentActivePanelKey = panelKey
-        let fallbackSnapshot = panelContext.workspace.restoredAgentSnapshotsByPanelId[panelId]
+        let allowsAgentContinuation = panelContext.workspace.allowsAgentContinuation(forPanelId: panelId)
+        guard allowsAgentContinuation else {
+            cancelCommandPaletteForkableAgentAvailabilityProbe(for: panelKey)
+            commandPaletteForkableAgentSupportedPanelKeys.remove(panelKey)
+            commandPaletteForkableAgentSnapshotsByPanelKey.removeValue(forKey: panelKey)
+            commandPaletteForkableAgentSnapshotFingerprintsByPanelKey.removeValue(forKey: panelKey)
+            commandPaletteForkableAgentRemoteContextsByPanelKey.removeValue(forKey: panelKey)
+            commandPaletteForkableAgentResultHadFallbackByPanelKey.removeValue(forKey: panelKey)
+            return
+        }
+        let fallbackSnapshot = panelContext.workspace.restoredAgentSnapshotForContinuation(panelId: panelId)
 
         if let fallbackSnapshot {
             let fallbackFingerprint = Self.commandPaletteForkSnapshotFingerprint(fallbackSnapshot)
@@ -5920,7 +5902,7 @@ struct ContentView: View {
                    let currentContext = focusedPanelContext,
                    currentContext.workspace.id == workspaceId,
                    currentContext.panelId == panelId,
-                   let currentFallbackSnapshot = currentContext.workspace.restoredAgentSnapshotsByPanelId[panelId],
+                   let currentFallbackSnapshot = currentContext.workspace.restoredAgentSnapshotForContinuation(panelId: panelId),
                    Self.commandPaletteForkSnapshotFingerprint(currentFallbackSnapshot) != fallbackFingerprint {
                     commandPaletteForkableAgentProbeIDsByPanelKey.removeValue(forKey: panelKey)
                     commandPaletteForkableAgentProbeFingerprintsByPanelKey.removeValue(forKey: panelKey)
@@ -6203,7 +6185,8 @@ struct ContentView: View {
             )
             snapshot.setBool(CommandPaletteContextKeys.panelIsTerminal, panelIsTerminal)
             snapshot.setBool(CommandPaletteContextKeys.panelHasPane, workspace.paneId(forPanelId: panelId) != nil)
-            let fallbackForkableSnapshot = workspace.restoredAgentSnapshotsByPanelId[panelId]
+            let allowsAgentContinuation = workspace.allowsAgentContinuation(forPanelId: panelId)
+            let fallbackForkableSnapshot = workspace.restoredAgentSnapshotForContinuation(panelId: panelId)
             snapshot.setBool(
                 CommandPaletteContextKeys.panelHasForkableAgent,
                 Self.commandPalettePanelHasForkableAgent(
@@ -6212,7 +6195,8 @@ struct ContentView: View {
                     supportedPanelKeys: commandPaletteForkableAgentSupportedPanelKeys,
                     supportedRemoteContextsByPanelKey: commandPaletteForkableAgentRemoteContextsByPanelKey,
                     fallbackSnapshot: fallbackForkableSnapshot,
-                    isRemoteTerminal: panelIsRemoteTerminal
+                    isRemoteTerminal: panelIsRemoteTerminal,
+                    allowsAgentContinuation: allowsAgentContinuation
                 )
             )
             snapshot.setBool(CommandPaletteContextKeys.panelHasCustomName, workspace.panelCustomTitles[panelId] != nil)

Sources/DockSplitStore+SurfaceTransfer.swift

@@ -143,17 +143,13 @@ extension DockSplitStore {
         panelCancellables.removeValue(forKey: panelId)
         surfaceIdToPanelId.removeValue(forKey: tabId)
         panels.removeValue(forKey: panelId)
-        let preservedTitleDerivedAgentStatusKey = titleDerivedAgentStatusKeysByPanelId.removeValue(forKey: panelId)
 
         forceCloseDockTabIds.insert(tabId)
         defer { forceCloseDockTabIds.remove(tabId) }
         guard bonsplitController.closeTab(tabId) else {
             // Close rejected: re-take ownership so the Dock stays consistent.
             panels[panelId] = panel
             surfaceIdToPanelId[tabId] = panelId
-            if let preservedTitleDerivedAgentStatusKey {
-                titleDerivedAgentStatusKeysByPanelId[panelId] = preservedTitleDerivedAgentStatusKey
-            }
             if let preservedTransfer {
                 detachedSurfaceTransfersByPanelId[panelId] = preservedTransfer
             }
@@ -226,22 +222,11 @@ extension DockSplitStore {
         // read is unavailable.
         detachedSurfaceTransfersByPanelId[detached.panelId] = detached
         let kind = detached.kind ?? ((panel.panelType == .browser) ? "browser" : "terminal")
-        if kind == "terminal" {
-            _ = updateTitleDerivedTerminalAgentStatusKey(
-                forPanelId: detached.panelId,
-                title: detached.cachedTitle ?? detached.panel.displayTitle
-            )
-        }
-        let restoredIconPayload: (imageData: Data?, assetName: String?) = {
-            guard detached.panel is TerminalPanel else { return (detached.iconImageData, nil) }
-            let payload = terminalTabAgentIconPayload(forPanelId: detached.panelId)
-            return (payload.imageData, payload.assetName)
-        }()
+        let restoredIconImageData = detached.panel is TerminalPanel ? nil : detached.iconImageData
         guard let newTabId = bonsplitController.createTab(
             title: detached.title,
             icon: detached.icon,
-            iconImageData: restoredIconPayload.imageData,
-            iconAsset: restoredIconPayload.assetName,
+            iconImageData: restoredIconImageData,
             kind: kind,
             isDirty: panel.isDirty,
             isLoading: detached.isLoading,

Sources/DockSplitStore.swift

@@ -36,8 +36,6 @@ final class DockSplitStore: BonsplitDelegate {
     var panels: [UUID: any Panel] = [:]
     var surfaceIdToPanelId: [TabID: UUID] = [:]
     var panelCancellables: [UUID: AnyCancellable] = [:]
-    @ObservationIgnored
-    var titleDerivedAgentStatusKeysByPanelId: [UUID: String] = [:]
     @ObservationIgnored var detachedSurfaceTransfersByPanelId: [UUID: Workspace.DetachedSurfaceTransfer] = [:]
     private var hasLoadedConfiguration = false
     private var configurationLoadTask: Task<Void, Never>?
@@ -599,19 +597,8 @@ final class DockSplitStore: BonsplitDelegate {
                     // unchanged, so a terminal re-emitting the same title does not
                     // re-render the Dock tree.
                     let resolvedTitle = terminal.displayTitle
-                    let didMutateTitleDerivedAgent = self.updateTitleDerivedTerminalAgentStatusKey(
-                        forPanelId: terminal.id,
-                        title: resolvedTitle
-                    )
-                    let titleUpdate: String? = existing.title == resolvedTitle ? nil : resolvedTitle
-                    let iconPayloadUpdate = didMutateTitleDerivedAgent ? self.terminalTabAgentIconPayload(forPanelId: terminal.id) : nil
-                    guard titleUpdate != nil || iconPayloadUpdate != nil else { return }
-                    self.bonsplitController.updateTab(
-                        tabId,
-                        title: titleUpdate,
-                        iconImageData: iconPayloadUpdate.map(\.imageData),
-                        iconAsset: iconPayloadUpdate.map(\.assetName)
-                    )
+                    guard existing.title != resolvedTitle else { return }
+                    self.bonsplitController.updateTab(tabId, title: resolvedTitle)
                 }
             panelCancellables[panel.id] = cancellable
         }
@@ -630,7 +617,6 @@ final class DockSplitStore: BonsplitDelegate {
             panelCancellables.removeValue(forKey: panelId)
             AppDelegate.shared?.notificationStore?.clearNotifications(forTabId: workspaceId, surfaceId: panelId)
             detachedSurfaceTransfersByPanelId.removeValue(forKey: panelId)
-            titleDerivedAgentStatusKeysByPanelId.removeValue(forKey: panelId)
             if let panel = panels.removeValue(forKey: panelId) { panel.close() }
         }
     }
@@ -674,7 +660,6 @@ final class DockSplitStore: BonsplitDelegate {
         for panel in panels.values { panel.close() }
         panels.removeAll(); surfaceIdToPanelId.removeAll()
         detachedSurfaceTransfersByPanelId.removeAll()
-        titleDerivedAgentStatusKeysByPanelId.removeAll()
         panelCancellables.values.forEach { $0.cancel() }
         panelCancellables.removeAll()
     }