Merge pull request #81 from mcintyre94/chat-with-claude-about-command-outputs-e3bc1cba

Add "Start Chat" button to Bash quick actions outside of chat context

Author: mcintyre94

Wisp/Views/QuickActions/BashQuickView.swift

@@ -4,6 +4,7 @@ struct BashQuickView: View {
     @Environment(SpritesAPIClient.self) private var apiClient
     @Bindable var viewModel: BashQuickViewModel
     var onInsert: ((String) -> Void)? = nil
+    var onStartChat: ((String) -> Void)? = nil
     @FocusState private var isInputFocused: Bool
 
     private let shellChars = ["/", "-", "|", ">", "~", "`", "$", "&", "*", "."]
@@ -109,12 +110,20 @@ struct BashQuickView: View {
             .padding(.vertical, 8)
             .padding(.bottom, isRunningOnMac ? 12 : 0)
 
-            if let onInsert, !viewModel.output.isEmpty, !viewModel.isRunning {
-                Button("Insert into chat") {
-                    onInsert(viewModel.insertFormatted())
+            if !viewModel.output.isEmpty, !viewModel.isRunning {
+                if let onInsert {
+                    Button("Insert into chat") {
+                        onInsert(viewModel.insertFormatted())
+                    }
+                    .buttonStyle(.borderedProminent)
+                    .padding(.bottom, 8)
+                } else if let onStartChat {
+                    Button("Start Chat") {
+                        onStartChat(viewModel.insertFormatted())
+                    }
+                    .buttonStyle(.borderedProminent)
+                    .padding(.bottom, 8)
                 }
-                .buttonStyle(.borderedProminent)
-                .padding(.bottom, 8)
             }
         }
         .background(Color(.systemBackground))
@@ -124,7 +133,7 @@ struct BashQuickView: View {
     }
 }
 
-#Preview {
+#Preview("No callback") {
     BashQuickView(
         viewModel: BashQuickViewModel(
             spriteName: "my-sprite",
@@ -133,3 +142,25 @@ struct BashQuickView: View {
     )
     .environment(SpritesAPIClient())
 }
+
+#Preview("Insert into chat") {
+    BashQuickView(
+        viewModel: BashQuickViewModel(
+            spriteName: "my-sprite",
+            workingDirectory: "/home/sprite/project"
+        ),
+        onInsert: { _ in }
+    )
+    .environment(SpritesAPIClient())
+}
+
+#Preview("Start Chat") {
+    BashQuickView(
+        viewModel: BashQuickViewModel(
+            spriteName: "my-sprite",
+            workingDirectory: "/home/sprite/project"
+        ),
+        onStartChat: { _ in }
+    )
+    .environment(SpritesAPIClient())
+}

Wisp/Views/QuickActions/QuickActionsView.swift

@@ -5,6 +5,7 @@ struct QuickActionsView: View {
     @Environment(\.dismiss) private var dismiss
     let viewModel: QuickActionsViewModel
     var insertCallback: ((String) -> Void)? = nil
+    var startChatCallback: ((String) -> Void)? = nil
 
     @State private var selectedTab = 0
 
@@ -43,10 +44,15 @@ struct QuickActionsView: View {
 
     @ViewBuilder private var bashTab: some View {
         if let cb = insertCallback {
-            BashQuickView(viewModel: viewModel.bashViewModel) { text in
+            BashQuickView(viewModel: viewModel.bashViewModel, onInsert: { text in
                 cb(text)
                 dismiss()
-            }
+            })
+        } else if let cb = startChatCallback {
+            BashQuickView(viewModel: viewModel.bashViewModel, onStartChat: { text in
+                cb(text)
+                dismiss()
+            })
         } else {
             BashQuickView(viewModel: viewModel.bashViewModel)
         }
@@ -59,7 +65,7 @@ struct QuickActionsView: View {
     }
 }
 
-#Preview {
+#Preview("No callback") {
     QuickActionsView(
         viewModel: QuickActionsViewModel(
             spriteName: "my-sprite",
@@ -69,3 +75,27 @@ struct QuickActionsView: View {
     )
     .environment(SpritesAPIClient())
 }
+
+#Preview("Insert into chat") {
+    QuickActionsView(
+        viewModel: QuickActionsViewModel(
+            spriteName: "my-sprite",
+            sessionId: nil,
+            workingDirectory: "/home/sprite/project"
+        ),
+        insertCallback: { _ in }
+    )
+    .environment(SpritesAPIClient())
+}
+
+#Preview("Start Chat") {
+    QuickActionsView(
+        viewModel: QuickActionsViewModel(
+            spriteName: "my-sprite",
+            sessionId: nil,
+            workingDirectory: "/home/sprite/project"
+        ),
+        startChatCallback: { _ in }
+    )
+    .environment(SpritesAPIClient())
+}

Wisp/Views/SpriteDetail/Chat/ChatInputBar.swift

@@ -20,7 +20,6 @@ struct ChatInputBar: View {
     var isFocused: FocusState<Bool>.Binding
 
     @State private var showStopConfirmation = false
-    @State private var textInputHeight: CGFloat = 36
 
     private var isEmpty: Bool {
         text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty && attachedFiles.isEmpty
@@ -75,10 +74,8 @@ struct ChatInputBar: View {
                     isFocused: isFocused,
                     isDisabled: hasQueuedMessage,
                     placeholder: "Message...",
-                    onPasteNonText: onPasteFromClipboard,
-                    dynamicHeight: $textInputHeight
+                    onPasteNonText: onPasteFromClipboard
                 )
-                .frame(height: max(textInputHeight, 36))
                 .padding(.horizontal, 16)
                 .padding(.vertical, 8)
                 .glassEffect(in: .rect(cornerRadius: 20))
@@ -119,9 +116,6 @@ struct ChatInputBar: View {
                 .buttonStyle(.glass)
             }
         }
-        .onChange(of: text) { _, newValue in
-            if newValue.isEmpty { textInputHeight = 36 }
-        }
         .animation(.easeInOut(duration: 0.2), value: attachedFiles.count)
         .animation(.easeInOut(duration: 0.2), value: lastUploadedFileName)
         .padding(.horizontal)

Wisp/Views/SpriteDetail/Chat/PasteInterceptingTextInput.swift

@@ -84,7 +84,9 @@ struct PasteInterceptingTextInput: UIViewRepresentable {
     var isDisabled: Bool
     var placeholder: String
     var onPasteNonText: (() -> Void)?
-    @Binding var dynamicHeight: CGFloat
+
+    private static let maxHeight: CGFloat = 120
+    private static let minHeight: CGFloat = 36
 
     func makeUIView(context: Context) -> PasteTextView {
         let textView = PasteTextView()
@@ -100,10 +102,22 @@ struct PasteInterceptingTextInput: UIViewRepresentable {
         return textView
     }
 
+    func sizeThatFits(_ proposal: ProposedViewSize, uiView: PasteTextView, context: Context) -> CGSize? {
+        let width = proposal.width ?? uiView.frame.width
+        guard width > 0 else { return nil }
+        let fits = uiView.sizeThatFits(CGSize(width: width, height: .infinity))
+        let height = max(min(fits.height, Self.maxHeight), Self.minHeight)
+        uiView.isScrollEnabled = fits.height > Self.maxHeight
+        return CGSize(width: width, height: height)
+    }
+
     func updateUIView(_ textView: PasteTextView, context: Context) {
+        context.coordinator.parent = self
         if textView.text != text {
             textView.text = text
             textView.updatePlaceholderVisibility()
+            // Invalidate so SwiftUI calls sizeThatFits again with the updated text
+            textView.invalidateIntrinsicContentSize()
         }
         textView.isUserInteractionEnabled = !isDisabled
         textView.placeholder = placeholder
@@ -128,7 +142,6 @@ struct PasteInterceptingTextInput: UIViewRepresentable {
     final class Coordinator: NSObject, UITextViewDelegate {
         var parent: PasteInterceptingTextInput
         var isEditing = false
-        private let maxHeight: CGFloat = 120
 
         init(_ parent: PasteInterceptingTextInput) {
             self.parent = parent
@@ -137,13 +150,8 @@ struct PasteInterceptingTextInput: UIViewRepresentable {
         func textViewDidChange(_ textView: UITextView) {
             parent.text = textView.text
             (textView as? PasteTextView)?.updatePlaceholderVisibility()
-
-            let fitsSize = textView.sizeThatFits(CGSize(width: textView.frame.width, height: .infinity))
-            let newHeight = min(fitsSize.height, maxHeight)
-            if newHeight != parent.dynamicHeight {
-                parent.dynamicHeight = newHeight
-            }
-            textView.isScrollEnabled = fitsSize.height > maxHeight
+            // Signal SwiftUI to re-query sizeThatFits with the new content
+            textView.invalidateIntrinsicContentSize()
         }
 
         func textViewDidBeginEditing(_ textView: UITextView) {
@@ -160,16 +168,13 @@ struct PasteInterceptingTextInput: UIViewRepresentable {
 
 #Preview {
     @Previewable @State var text = ""
-    @Previewable @State var height: CGFloat = 36
     @Previewable @FocusState var focused: Bool
     PasteInterceptingTextInput(
         text: $text,
         isFocused: $focused,
         isDisabled: false,
-        placeholder: "Message...",
-        dynamicHeight: $height
+        placeholder: "Message..."
     )
-    .frame(height: max(height, 36))
     .padding(.horizontal, 16)
     .padding(.vertical, 8)
     .glassEffect(in: .rect(cornerRadius: 20))

Wisp/Views/SpriteDetail/SpriteDetailView.swift

@@ -234,10 +234,18 @@ struct SpriteDetailView: View {
             ChatSwitcherSheet(viewModel: chatListViewModel)
         }
         .sheet(item: $spriteQuickActionsViewModel) { vm in
-            QuickActionsView(viewModel: vm)
-                .environment(apiClient)
-                .presentationDetents([.medium, .large])
-                .presentationDragIndicator(.visible)
+            QuickActionsView(
+                viewModel: vm,
+                startChatCallback: { text in
+                    guard let chatViewModel else { return }
+                    chatViewModel.inputText += (chatViewModel.inputText.isEmpty ? "" : "\n") + text
+                    selectedTab = .chat
+                    spriteQuickActionsViewModel = nil
+                }
+            )
+            .environment(apiClient)
+            .presentationDetents([.medium, .large])
+            .presentationDragIndicator(.visible)
         }
         .alert("Sprite Recreated", isPresented: $showStaleChatsAlert) {
             Button("Start Fresh", role: .destructive) {