Honor iMessage workspace ordering and previews

Sources/ContentView.swift

@@ -11897,7 +11897,7 @@ struct SidebarWorkspaceSnapshotBuilder {
         let remoteConnectionStatusText: String
         let remoteStateHelpText: String
         let copyableSidebarSSHError: String?
-        let latestSubmittedMessage: String?
+        let latestConversationMessage: String?
         let metadataEntries: [SidebarStatusEntry]
         let metadataBlocks: [SidebarMetadataBlock]
         let latestLog: SidebarLogEntry?
@@ -12234,12 +12234,12 @@ private struct TabItemView: View, Equatable {
         let finderDirectoryPath = WorkspaceFinderDirectoryResolver.path(for: tab)
         let finderDirectoryCacheKey = WorkspaceFinderDirectoryCacheKey(path: finderDirectoryPath)
         let latestNotificationSubtitle = latestNotificationText
-        let submittedMessageSubtitle = !settings.hidesAllDetails && settings.iMessageModeEnabled
-            ? workspaceSnapshot.latestSubmittedMessage?
+        let conversationMessageSubtitle = !settings.hidesAllDetails && settings.iMessageModeEnabled
+            ? workspaceSnapshot.latestConversationMessage?
                 .trimmingCharacters(in: .whitespacesAndNewlines)
                 .nilIfEmpty
             : nil
-        let effectiveSubtitle = latestNotificationSubtitle ?? submittedMessageSubtitle
+        let effectiveSubtitle = latestNotificationSubtitle ?? conversationMessageSubtitle
         let detailVisibility = visibleAuxiliaryDetails
 
         VStack(alignment: .leading, spacing: 4) {
@@ -13240,7 +13240,7 @@ private struct TabItemView: View, Equatable {
             remoteConnectionStatusText: remoteConnectionStatusText,
             remoteStateHelpText: remoteStateHelpText,
             copyableSidebarSSHError: copyableSidebarSSHError,
-            latestSubmittedMessage: tab.latestSubmittedMessage,
+            latestConversationMessage: tab.latestConversationMessage,
             metadataEntries: detailVisibility.showsMetadata ? tab.sidebarStatusEntriesInDisplayOrder() : [],
             metadataBlocks: detailVisibility.showsMetadata ? tab.sidebarMetadataBlocksInDisplayOrder() : [],
             latestLog: detailVisibility.showsLog ? tab.logEntries.last : nil,

Sources/Search/GlobalSearchDocuments.swift

@@ -34,7 +34,7 @@ enum GlobalSearchDocuments {
             kind = .browser
         case .markdown:
             kind = .markdown
-        case .terminal, .filePreview:
+        case .terminal, .filePreview, .rightSidebarTool:
             kind = .title
         }
 

Sources/Sidebar/SidebarWorkspaceSnapshotRefreshPolicy.swift

@@ -27,7 +27,7 @@ extension SidebarWorkspaceSnapshotBuilder.Snapshot {
             remoteConnectionStatusText: remoteConnectionStatusText,
             remoteStateHelpText: remoteStateHelpText,
             copyableSidebarSSHError: copyableSidebarSSHError,
-            latestSubmittedMessage: latestSubmittedMessage,
+            latestConversationMessage: latestConversationMessage,
             metadataEntries: metadataEntries,
             metadataBlocks: metadataBlocks,
             latestLog: latestLog,

Sources/TabManager.swift

@@ -234,6 +234,19 @@ enum WorkspacePlacementSettings {
         return placement
     }
 
+    static func effectivePlacement(
+        placementOverride: NewWorkspacePlacement?,
+        defaults: UserDefaults = .standard
+    ) -> NewWorkspacePlacement {
+        if let placementOverride {
+            return placementOverride
+        }
+        if IMessageModeSettings.isEnabled(defaults: defaults) {
+            return .top
+        }
+        return current(defaults: defaults)
+    }
+
     static func insertionIndex(
         placement: NewWorkspacePlacement,
         selectedIndex: Int?,
@@ -3806,7 +3819,7 @@ class TabManager: ObservableObject {
         snapshot: WorkspaceCreationSnapshot,
         placementOverride: NewWorkspacePlacement? = nil
     ) -> Int {
-        let placement = placementOverride ?? WorkspacePlacementSettings.current()
+        let placement = WorkspacePlacementSettings.effectivePlacement(placementOverride: placementOverride)
         let liveTabs = orderedLiveWorkspaceCreationTabs(from: snapshot) ?? snapshot.tabs
         let pinnedCount = liveTabs.reduce(into: 0) { partial, tab in
             if tab.isPinned {

Sources/TerminalController.swift

@@ -4580,7 +4580,7 @@ class TerminalController {
                 iMessageModeEnabled: iMessageModeEnabled
             )
             if iMessageModeEnabled {
-                preview = tabManager.tabs.first(where: { $0.id == workspaceId })?.latestSubmittedMessage
+                preview = tabManager.tabs.first(where: { $0.id == workspaceId })?.latestConversationMessage
             }
         }
 
@@ -8413,7 +8413,7 @@ class TerminalController {
         }
 
         CmuxEventBus.shared.publishWorkstreamEvent(event, phase: "received")
-        v2ApplyPromptSubmitSideEffects(for: event)
+        v2ApplyIMessageModeSideEffects(for: event)
 
         let result = FeedCoordinator.shared.ingestBlocking(
             event: event,
@@ -8427,21 +8427,38 @@ class TerminalController {
         return .ok(FeedSocketEncoding.payload(for: result))
     }
 
-    private nonisolated func v2ApplyPromptSubmitSideEffects(for event: WorkstreamEvent) {
-        guard event.hookEventName == .userPromptSubmit,
+    private nonisolated func v2ApplyIMessageModeSideEffects(for event: WorkstreamEvent) {
+        guard event.hookEventName == .userPromptSubmit || event.hookEventName == .stop || event.hookEventName == .subagentStop,
               let rawWorkspaceId = event.workspaceId?.trimmingCharacters(in: .whitespacesAndNewlines),
               !rawWorkspaceId.isEmpty
         else { return }
 
         let iMessageModeEnabled = IMessageModeSettings.isEnabled()
-        v2MainSync {
-            guard let workspaceId = v2UUIDAny(rawWorkspaceId) else { return }
-            guard let tabManager = AppDelegate.shared?.tabManagerFor(tabId: workspaceId) else { return }
-            _ = tabManager.handlePromptSubmit(
-                workspaceId: workspaceId,
-                message: event.submittedPromptMessage,
-                iMessageModeEnabled: iMessageModeEnabled
-            )
+        switch event.hookEventName {
+        case .userPromptSubmit:
+            v2MainSync {
+                guard let workspaceId = v2UUIDAny(rawWorkspaceId) else { return }
+                guard let tabManager = AppDelegate.shared?.tabManagerFor(tabId: workspaceId) else { return }
+                _ = tabManager.handlePromptSubmit(
+                    workspaceId: workspaceId,
+                    message: event.submittedPromptMessage,
+                    iMessageModeEnabled: iMessageModeEnabled
+                )
+            }
+        case .stop, .subagentStop:
+            let assistantFinalMessage = event.assistantFinalMessage
+            Task { @MainActor [weak self, rawWorkspaceId, assistantFinalMessage, iMessageModeEnabled] in
+                guard let self,
+                      let workspaceId = self.v2UUIDAny(rawWorkspaceId) else { return }
+                guard let tabManager = AppDelegate.shared?.tabManagerFor(tabId: workspaceId) else { return }
+                _ = tabManager.handleAssistantFinalMessage(
+                    workspaceId: workspaceId,
+                    message: assistantFinalMessage,
+                    iMessageModeEnabled: iMessageModeEnabled
+                )
+            }
+        default:
+            break
         }
     }
 

Sources/Workspace.swift

@@ -7225,7 +7225,7 @@ final class Workspace: Identifiable, ObservableObject {
     nonisolated private static let manualUnreadClearDelayAfterFocusFlash: TimeInterval = 0.2
     @Published var statusEntries: [String: SidebarStatusEntry] = [:]
     @Published var metadataBlocks: [String: SidebarMetadataBlock] = [:]
-    @Published private(set) var latestSubmittedMessage: String?
+    @Published private(set) var latestConversationMessage: String?
     @Published var logEntries: [SidebarLogEntry] = []
     @Published var progress: SidebarProgressState?
     @Published var gitBranch: SidebarGitBranchState?
@@ -7314,7 +7314,7 @@ final class Workspace: Identifiable, ObservableObject {
             sidebarObservationSignal($isPinned),
             sidebarObservationSignal($customColor),
             sidebarObservationSignal($terminalScrollBarHidden),
-            sidebarObservationSignal($latestSubmittedMessage),
+            sidebarObservationSignal($latestConversationMessage),
         ]
 
         return Publishers.MergeMany(publishers).eraseToAnyPublisher()
@@ -8774,7 +8774,7 @@ final class Workspace: Identifiable, ObservableObject {
         agentPIDPanelIdsByKey.removeAll()
         agentPIDKeysByPanelId.removeAll()
         agentListeningPorts.removeAll()
-        latestSubmittedMessage = nil
+        latestConversationMessage = nil
         logEntries.removeAll()
         progress = nil
         gitBranch = nil
@@ -9084,13 +9084,18 @@ final class Workspace: Identifiable, ObservableObject {
     }
 
     @discardableResult
-    func recordSubmittedMessage(_ message: String?) -> Bool {
-        guard let preview = Self.submittedMessagePreview(from: message) else { return false }
-        guard latestSubmittedMessage != preview else { return false }
-        latestSubmittedMessage = preview
+    func recordConversationMessage(_ message: String?) -> Bool {
+        guard let preview = Self.conversationMessagePreview(from: message) else { return false }
+        guard latestConversationMessage != preview else { return false }
+        latestConversationMessage = preview
         return true
     }
 
+    @discardableResult
+    func recordSubmittedMessage(_ message: String?) -> Bool {
+        recordConversationMessage(message)
+    }
+
     var isRemoteWorkspace: Bool {
         remoteConfiguration != nil
     }

Sources/WorkspacePromptSubmit.swift

@@ -17,12 +17,30 @@ extension WorkstreamEvent {
     var submittedPromptMessage: String? {
         guard hookEventName == .userPromptSubmit else { return nil }
         let contextMessage = context?.lastUserMessage.flatMap(Self.normalizedPromptText)
-        return Self.promptText(fromJSON: toolInputJSON)
+        return Self.messageText(fromJSON: toolInputJSON, keys: Self.promptMessageKeys)
             ?? contextMessage
-            ?? Self.promptText(fromJSON: extraFieldsJSON)
+            ?? Self.messageText(fromJSON: extraFieldsJSON, keys: Self.promptMessageKeys)
     }
 
-    private static func promptText(fromJSON jsonString: String?) -> String? {
+    var assistantFinalMessage: String? {
+        guard hookEventName == .stop || hookEventName == .subagentStop else { return nil }
+        let contextMessage = context?.assistantPreamble.flatMap(Self.normalizedPromptText)
+        return contextMessage
+            ?? Self.messageText(fromJSON: extraFieldsJSON, keys: Self.assistantMessageKeys)
+            ?? Self.messageText(fromJSON: toolInputJSON, keys: Self.assistantMessageKeys)
+    }
+
+    private static let promptMessageKeys = ["prompt", "text", "message", "body"]
+    private static let assistantMessageKeys = [
+        "last_assistant_message",
+        "lastAssistantMessage",
+        "assistantPreamble",
+        "assistant_preamble",
+        "last_agent_message",
+        "lastAgentMessage",
+    ]
+
+    private static func messageText(fromJSON jsonString: String?, keys: [String]) -> String? {
         guard let jsonString else { return nil }
         guard let data = jsonString.data(using: .utf8),
               let value = try? JSONSerialization.jsonObject(with: data, options: [.fragmentsAllowed])
@@ -34,23 +52,23 @@ extension WorkstreamEvent {
             return normalizedPromptText(string)
         }
         guard let dict = value as? [String: Any] else { return nil }
-        return promptText(from: dict)
+        return messageText(from: dict, keys: keys)
     }
 
-    private static func promptText(from dict: [String: Any]) -> String? {
-        if let direct = firstPromptString(in: dict, keys: ["prompt", "text", "message", "body"]) {
+    private static func messageText(from dict: [String: Any], keys: [String]) -> String? {
+        if let direct = firstMessageString(in: dict, keys: keys) {
             return direct
         }
         for key in ["notification", "data"] {
             if let nested = dict[key] as? [String: Any],
-               let nestedPrompt = firstPromptString(in: nested, keys: ["prompt", "text", "message", "body"]) {
-                return nestedPrompt
+               let nestedMessage = firstMessageString(in: nested, keys: keys) {
+                return nestedMessage
             }
         }
         return nil
     }
 
-    private static func firstPromptString(in dict: [String: Any], keys: [String]) -> String? {
+    private static func firstMessageString(in dict: [String: Any], keys: [String]) -> String? {
         for key in keys {
             guard let value = dict[key] as? String,
                   let normalized = normalizedPromptText(value) else { continue }
@@ -74,6 +92,34 @@ extension TabManager {
         workspaceId: UUID,
         message: String?,
         iMessageModeEnabled: Bool = IMessageModeSettings.isEnabled()
+    ) -> (messageRecorded: Bool, reordered: Bool, index: Int)? {
+        handleConversationMessage(
+            workspaceId: workspaceId,
+            message: message,
+            iMessageModeEnabled: iMessageModeEnabled,
+            reorderWithoutMessage: true
+        )
+    }
+
+    @discardableResult
+    func handleAssistantFinalMessage(
+        workspaceId: UUID,
+        message: String?,
+        iMessageModeEnabled: Bool = IMessageModeSettings.isEnabled()
+    ) -> (messageRecorded: Bool, reordered: Bool, index: Int)? {
+        handleConversationMessage(
+            workspaceId: workspaceId,
+            message: message,
+            iMessageModeEnabled: iMessageModeEnabled,
+            reorderWithoutMessage: false
+        )
+    }
+
+    private func handleConversationMessage(
+        workspaceId: UUID,
+        message: String?,
+        iMessageModeEnabled: Bool,
+        reorderWithoutMessage: Bool
     ) -> (messageRecorded: Bool, reordered: Bool, index: Int)? {
         guard let originalIndex = tabs.firstIndex(where: { $0.id == workspaceId }) else {
             return nil
@@ -83,15 +129,19 @@ extension TabManager {
         }
 
         let workspace = tabs[originalIndex]
-        let messageRecorded = workspace.recordSubmittedMessage(message)
+        let hasMessage = Workspace.conversationMessagePreview(from: message) != nil
+        let messageRecorded = workspace.recordConversationMessage(message)
+        guard messageRecorded || reorderWithoutMessage || hasMessage else {
+            return (messageRecorded, false, originalIndex)
+        }
         moveTabToTop(workspaceId)
         let newIndex = tabs.firstIndex(where: { $0.id == workspaceId }) ?? originalIndex
         return (messageRecorded, newIndex != originalIndex, newIndex)
     }
 }
 
 extension Workspace {
-    static func submittedMessagePreview(from message: String?, maxLength: Int = 240) -> String? {
+    static func conversationMessagePreview(from message: String?, maxLength: Int = 240) -> String? {
         guard let message else { return nil }
         let collapsed = message
             .split(whereSeparator: { $0.isWhitespace })

cmuxTests/SidebarWorkspaceSnapshotRefreshPolicyTests.swift

@@ -15,15 +15,15 @@ final class SidebarWorkspaceSnapshotRefreshPolicyTests: XCTestCase {
             isPinned: false,
             customColorHex: nil,
             remoteConnectionStatusText: "Connected",
-            latestSubmittedMessage: "old message",
+            latestConversationMessage: "old message",
             listeningPorts: [3000]
         )
         let next = Self.snapshot(
             title: "lmao",
             isPinned: true,
             customColorHex: nil,
             remoteConnectionStatusText: "Disconnected",
-            latestSubmittedMessage: "new message",
+            latestConversationMessage: "new message",
             listeningPorts: [3000, 4000]
         )
 
@@ -39,7 +39,7 @@ final class SidebarWorkspaceSnapshotRefreshPolicyTests: XCTestCase {
         XCTAssertEqual(decision.workspaceSnapshotStorage, expectedDisplayed)
         XCTAssertTrue(decision.workspaceSnapshotStorage?.isPinned == true)
         XCTAssertEqual(decision.workspaceSnapshotStorage?.remoteConnectionStatusText, "Connected")
-        XCTAssertEqual(decision.workspaceSnapshotStorage?.latestSubmittedMessage, "old message")
+        XCTAssertEqual(decision.workspaceSnapshotStorage?.latestConversationMessage, "old message")
         XCTAssertEqual(decision.workspaceSnapshotStorage?.listeningPorts, [3000])
         XCTAssertEqual(decision.pendingWorkspaceSnapshot, next)
         XCTAssertTrue(decision.hasDeferredWorkspaceObservationInvalidation)
@@ -94,7 +94,7 @@ final class SidebarWorkspaceSnapshotRefreshPolicyTests: XCTestCase {
         isPinned: Bool = false,
         customColorHex: String? = nil,
         remoteConnectionStatusText: String = "Disconnected",
-        latestSubmittedMessage: String? = nil,
+        latestConversationMessage: String? = nil,
         listeningPorts: [Int] = []
     ) -> SidebarWorkspaceSnapshotBuilder.Snapshot {
         SidebarWorkspaceSnapshotBuilder.Snapshot(
@@ -107,7 +107,7 @@ final class SidebarWorkspaceSnapshotRefreshPolicyTests: XCTestCase {
             remoteConnectionStatusText: remoteConnectionStatusText,
             remoteStateHelpText: "",
             copyableSidebarSSHError: nil,
-            latestSubmittedMessage: latestSubmittedMessage,
+            latestConversationMessage: latestConversationMessage,
             metadataEntries: [],
             metadataBlocks: [],
             latestLog: nil,