Merge pull request #57 from mcintyre94/chat-session-state-issue-f108b1db

Fix chat showing thinking shimmer instead of reconnecting state on reopen

Author: mcintyre94

Wisp/ViewModels/ChatViewModel.swift

@@ -17,6 +17,11 @@ enum ChatStatus: Sendable {
         if case .connecting = self { return true }
         return false
     }
+
+    var isReconnecting: Bool {
+        if case .reconnecting = self { return true }
+        return false
+    }
 }
 
 struct AttachedFile: Identifiable {
@@ -994,7 +999,6 @@ final class ChatViewModel {
                 serviceName: serviceName
             )
 
-            status = .streaming
             let streamResult = await processServiceStream(
                 stream: stream,
                 modelContext: modelContext

Wisp/Views/SpriteDetail/Chat/ChatView.swift

@@ -36,7 +36,7 @@ struct ChatView: View {
                     ForEach(viewModel.messages) { message in
                         messageView(message)
                     }
-                    if viewModel.isStreaming && viewModel.pendingWispAskCard == nil {
+                    if viewModel.isStreaming && !viewModel.status.isReconnecting && viewModel.pendingWispAskCard == nil {
                         ThinkingShimmerView(label: viewModel.status.isConnecting ? "Connecting…" : (viewModel.activeToolLabel ?? "Thinking…"))
                             .transition(.opacity.combined(with: .move(edge: .bottom)))
                             .id("shimmer")

WispTests/ChatViewModelTests.swift

@@ -629,6 +629,44 @@ struct ChatViewModelTests {
         #expect(vm.processedEventUUIDs.isEmpty)
     }
 
+    // MARK: - ChatStatus computed properties
+
+    @Test func chatStatus_isConnecting_onlyForConnecting() {
+        #expect(ChatStatus.connecting.isConnecting == true)
+        #expect(ChatStatus.streaming.isConnecting == false)
+        #expect(ChatStatus.reconnecting.isConnecting == false)
+        #expect(ChatStatus.idle.isConnecting == false)
+        #expect(ChatStatus.error("x").isConnecting == false)
+    }
+
+    @Test func chatStatus_isReconnecting_onlyForReconnecting() {
+        #expect(ChatStatus.reconnecting.isReconnecting == true)
+        #expect(ChatStatus.connecting.isReconnecting == false)
+        #expect(ChatStatus.streaming.isReconnecting == false)
+        #expect(ChatStatus.idle.isReconnecting == false)
+        #expect(ChatStatus.error("x").isReconnecting == false)
+    }
+
+    @Test func chatStatus_isStreaming_trueForActiveStates() throws {
+        let ctx = try makeModelContext()
+        let (vm, _) = makeChatViewModel(modelContext: ctx)
+
+        vm.status = .connecting
+        #expect(vm.isStreaming == true)
+
+        vm.status = .streaming
+        #expect(vm.isStreaming == true)
+
+        vm.status = .reconnecting
+        #expect(vm.isStreaming == true)
+
+        vm.status = .idle
+        #expect(vm.isStreaming == false)
+
+        vm.status = .error("oops")
+        #expect(vm.isStreaming == false)
+    }
+
     // MARK: - Streaming state (single source of truth)
 
     @Test func currentAssistantMessageId_tracksCurrentMessage() throws {