Merge branch 'feature/terminal-tab' into develop

Author: intitni

Core/Sources/ChatGPTChatTab/ChatGPTChatTab.swift

@@ -46,6 +46,16 @@ public class ChatGPTChatTab: ChatTab {
         ChatTabItemView(chat: chat)
     }
 
+    public func buildIcon() -> any View {
+        WithViewStore(chat, observe: \.isReceivingMessage) { viewStore in
+            if viewStore.state {
+                Image(systemName: "ellipsis.message")
+            } else {
+                Image(systemName: "message")
+            }
+        }
+    }
+
     public func buildMenu() -> any View {
         ChatContextMenu(store: chat.scope(state: \.chatMenu, action: Chat.Action.chatMenu))
     }
@@ -125,3 +135,4 @@ public class ChatGPTChatTab: ChatTab {
             }.store(in: &cancellable)
     }
 }
+

Core/Sources/Service/GUI/ChatTabFactory.swift

@@ -31,6 +31,7 @@ enum ChatTabFactory {
                 ),
                 title: BrowserChatTab.name
             ),
+            folderIfNeeded(TerminalChatTab.chatBuilders(), title: TerminalChatTab.name),
         ].compactMap { $0 }
 
         return collection

Core/Sources/Service/GUI/GraphicalUserInterfaceController.swift

@@ -388,6 +388,12 @@ extension ChatTabPool {
                 externalDependency: ChatTabFactory.externalDependenciesForBrowserChatTab()
             ) else { break }
             return await createTab(id: data.id, from: builder)
+        case TerminalChatTab.name:
+            guard let builder = try? await TerminalChatTab.restore(
+                from: data.data,
+                externalDependency: ()
+            ) else { break }
+            return await createTab(id: data.id, from: builder)
         default:
             break
         }
@@ -397,7 +403,7 @@ extension ChatTabPool {
         ) else {
             return nil
         }
-        return await createTab(from: builder)
+        return await createTab(id: data.id, from: builder)
     }
     #endif
 }

Core/Sources/SuggestionWidget/ChatWindowView.swift

@@ -177,6 +177,7 @@ struct ChatTabBar: View {
                                         store: store,
                                         info: info,
                                         content: { tab.tabItem },
+                                        icon: { tab.icon },
                                         isSelected: info.id == viewStore.state.selectedTabId
                                     )
                                     .contextMenu {
@@ -280,7 +281,7 @@ struct ChatTabBarDropDelegate: DropDelegate {
     let tabs: IdentifiedArray<String, ChatTabInfo>
     let itemId: String
     @Binding var draggingTabId: String?
-    
+
     func dropUpdated(info: DropInfo) -> DropProposal? {
         return DropProposal(operation: .move)
     }
@@ -299,20 +300,24 @@ struct ChatTabBarDropDelegate: DropDelegate {
     }
 }
 
-struct ChatTabBarButton<Content: View>: View {
+struct ChatTabBarButton<Content: View, Icon: View>: View {
     let store: StoreOf<ChatPanelFeature>
     let info: ChatTabInfo
     let content: () -> Content
+    let icon: () -> Icon
     let isSelected: Bool
     @State var isHovered: Bool = false
 
     var body: some View {
         HStack(spacing: 0) {
-            content()
+            HStack(spacing: 4) {
+                icon().foregroundColor(.secondary)
+                content()
+            }
                 .font(.callout)
                 .lineLimit(1)
                 .frame(maxWidth: 120)
-                .padding(.horizontal, 32)
+                .padding(.horizontal, 28)
                 .contentShape(Rectangle())
                 .onTapGesture {
                     store.send(.tabClicked(id: info.id))

Core/Sources/SuggestionWidget/FeatureReducers/ChatPanelFeature.swift

@@ -218,6 +218,11 @@ public struct ChatPanelFeature: ReducerProtocol {
                 state.chatTabGroup.tabInfo.insert(tab, at: to)
                 return .none
 
+            case let .chatTab(id, .close):
+                return .run { send in
+                    await send(.closeTabButtonClicked(id: id))
+                }
+                
             case .chatTab:
                 return .none
             }

Pro

@@ -26,6 +26,9 @@ public protocol ChatTabType {
     /// Build the tabItem for this chat tab.
     @ViewBuilder
     func buildTabItem() -> any View
+    /// Build the icon for this chat tab.
+    @ViewBuilder
+    func buildIcon() -> any View
     /// Build the menu for this chat tab.
     @ViewBuilder
     func buildMenu() -> any View
@@ -88,7 +91,7 @@ open class BaseChatTab {
     /// The tab item for this chat tab.
     @ViewBuilder
     public var tabItem: some View {
-        let id = "ChatTabMenu\(id)"
+        let id = "ChatTabTab\(id)"
         if let tab = self as? (any ChatTabType) {
             ContentView(buildView: tab.buildTabItem).id(id)
                 .onAppear {
@@ -99,6 +102,17 @@ open class BaseChatTab {
         }
     }
 
+    /// The icon for this chat tab.
+    @ViewBuilder
+    public var icon: some View {
+        let id = "ChatTabIcon\(id)"
+        if let tab = self as? (any ChatTabType) {
+            ContentView(buildView: tab.buildIcon).id(id)
+        } else {
+            EmptyView().id(id)
+        }
+    }
+    
     /// The tab item for this chat tab.
     @ViewBuilder
     public var menu: some View {
@@ -183,6 +197,10 @@ public class EmptyChatTab: ChatTab {
         Text("Empty-\(id)")
     }
 
+    public func buildIcon() -> any View {
+        Image(systemName: "square")
+    }
+    
     public func buildMenu() -> any View {
         Text("Empty-\(id)")
     }

Tool/Sources/ChatTab/ChatTab.swift

@@ -20,6 +20,7 @@ public struct ChatTabItem: ReducerProtocol {
         case updateTitle(String)
         case openNewTab(AnyChatTabBuilder)
         case tabContentUpdated
+        case close
     }
 
     public init() {}
@@ -34,6 +35,8 @@ public struct ChatTabItem: ReducerProtocol {
                 return .none
             case .tabContentUpdated:
                 return .none
+            case .close:
+                return .none
             }
         }
     }