Merge branch 'main' of https://github.com/Pyiner/garyx

Author: Pyiner

mobile/garyx-mobile/App/GaryxMobile/GaryxMobileAutomationViews.swift

@@ -873,6 +873,7 @@ struct GaryxAutomationThreadPickerSheet: View {
     let onSelect: (GaryxThreadSummary) -> Void
     @State private var searchText = ""
     @State private var isRefreshing = false
+    @State private var openSwipeActionRowId: String?
 
     var body: some View {
         VStack(spacing: 0) {
@@ -944,6 +945,7 @@ struct GaryxAutomationThreadPickerSheet: View {
         .presentationDetents([.fraction(0.93), .large])
         .presentationDragIndicator(.hidden)
         .presentationCornerRadius(38)
+        .environment(\.garyxOpenSwipeActionRowId, $openSwipeActionRowId)
         .task {
             await refreshThreadOptions()
         }
@@ -1011,7 +1013,7 @@ struct GaryxAutomationThreadPickerRow: View {
 
     var body: some View {
         VStack(spacing: 0) {
-            GaryxSwipeActionRow(actions: threadSwipeActions) {
+            GaryxSwipeActionRow(id: "thread:\(thread.id)", actions: threadSwipeActions) {
                 GaryxSidebarThreadRowView(
                     model: GaryxSidebarThreadRowPresentation(
                         thread: thread,

mobile/garyx-mobile/App/GaryxMobile/GaryxMobileConversationViews.swift

@@ -117,6 +117,29 @@ private final class GaryxConversationScrollStateBox {
     var state = GaryxConversationScrollState()
 }
 
+private struct GaryxMessageBubbleActions {
+    var model: GaryxMobileModel?
+    var localFilePreview: @MainActor (_ target: String, _ reportsError: Bool) async -> GaryxWorkspaceFilePreview?
+    var retryFailedUserMessage: @MainActor (_ messageId: String) async -> Bool
+
+    static let empty = GaryxMessageBubbleActions(
+        model: nil,
+        localFilePreview: { _, _ in nil },
+        retryFailedUserMessage: { _ in false }
+    )
+}
+
+private struct GaryxMessageBubbleActionsKey: EnvironmentKey {
+    static let defaultValue = GaryxMessageBubbleActions.empty
+}
+
+private extension EnvironmentValues {
+    var garyxMessageBubbleActions: GaryxMessageBubbleActions {
+        get { self[GaryxMessageBubbleActionsKey.self] }
+        set { self[GaryxMessageBubbleActionsKey.self] = newValue }
+    }
+}
+
 struct GaryxConversationView: View {
     @EnvironmentObject private var model: GaryxMobileModel
     @Environment(\.garyxSidebarDragActive) private var sidebarDragActive
@@ -246,6 +269,19 @@ struct GaryxConversationView: View {
         .garyxAdaptiveTopBar {
             GaryxConversationHeader()
         }
+        .environment(\.garyxMessageBubbleActions, messageBubbleActions)
+    }
+
+    private var messageBubbleActions: GaryxMessageBubbleActions {
+        GaryxMessageBubbleActions(
+            model: model,
+            localFilePreview: { target, reportsError in
+                await model.localFilePreview(target, reportsError: reportsError)
+            },
+            retryFailedUserMessage: { messageId in
+                await model.retryFailedUserMessage(messageId)
+            }
+        )
     }
 
     private func messageScroll(proxy: ScrollViewProxy) -> some View {
@@ -309,12 +345,10 @@ struct GaryxConversationView: View {
             .padding(.top, 18)
             .padding(.bottom, 24)
             .garyxVerticalScrollContentWidth(alignment: .topLeading)
-            // A short entrance animation keyed to cheap insertion signals
-            // (message count, indicator visibility), so new bubbles and tool
-            // rows ease in instead of popping. Streaming text growth and
-            // scroll measurements never re-key it.
-            .animation(.easeOut(duration: 0.2), value: model.messages.count)
-            .animation(.easeOut(duration: 0.2), value: model.showsTailThinkingIndicator)
+            // Do not attach a count-driven animation to the transcript
+            // container. A send changes the message count, composer height,
+            // spacer, and bottom anchor in the same layout pass; animating the
+            // whole stack makes the scroll view visibly wobble.
 
             Color.clear
                 .frame(height: conversationBottomChromeClearance)
@@ -459,10 +493,7 @@ struct GaryxConversationView: View {
         let identity = conversationScrollIdentity
         // Long transcripts re-layout while scrolling, so a single scrollTo
         // can land short; the later attempts converge on the true bottom.
-        let delays: [DispatchTimeInterval] = [
-            .milliseconds(0), .milliseconds(16), .milliseconds(40), .milliseconds(140),
-            .milliseconds(320), .milliseconds(650), .milliseconds(1_000),
-        ]
+        let delays = tailScrollRetryDelays(for: request.reason)
 
         for (index, delay) in delays.enumerated() {
             DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
@@ -484,6 +515,23 @@ struct GaryxConversationView: View {
         }
     }
 
+    private func tailScrollRetryDelays(
+        for reason: GaryxConversationScrollState.TailScrollReason
+    ) -> [DispatchTimeInterval] {
+        switch reason {
+        case .tailUpdate:
+            // Ordinary tail growth during send/streaming should stay pinned,
+            // but long retry chains make the transcript visibly wobble while
+            // the composer and bottom spacer are also settling.
+            return [.milliseconds(0), .milliseconds(40), .milliseconds(140)]
+        case .openingThread, .manual, .repair:
+            return [
+                .milliseconds(0), .milliseconds(16), .milliseconds(40), .milliseconds(140),
+                .milliseconds(320), .milliseconds(650), .milliseconds(1_000),
+            ]
+        }
+    }
+
     private var conversationScrollIdentity: String {
         model.selectedThread?.id ?? "garyx-draft-thread"
     }
@@ -1573,6 +1621,15 @@ private func garyxConfiguredBot(
 }
 
 private extension View {
+    @ViewBuilder
+    func garyxOptionalEnvironmentObject<Object: ObservableObject>(_ object: Object?) -> some View {
+        if let object {
+            environmentObject(object)
+        } else {
+            self
+        }
+    }
+
     /// Opens the transcript anchored to its bottom from the very first
     /// layout pass and keeps the tail pinned through content growth while
     /// positioned there — no post-load programmatic scroll-down. The
@@ -1767,7 +1824,7 @@ private struct GaryxSelectedThreadEmptyConversationView: View {
 struct GaryxMessageBubble: View {
     let message: GaryxMobileMessage
     @Environment(\.colorScheme) private var colorScheme
-    @EnvironmentObject private var model: GaryxMobileModel
+    @Environment(\.garyxMessageBubbleActions) private var actions
     @State private var retrying = false
     @State private var filePreviewSheet: GaryxMessageFilePreviewSheet?
 
@@ -1784,7 +1841,7 @@ struct GaryxMessageBubble: View {
             GaryxFullscreenWorkspaceFilePreview(preview: sheet.preview) {
                 filePreviewSheet = nil
             }
-            .environmentObject(model)
+            .garyxOptionalEnvironmentObject(actions.model)
         }
     }
 
@@ -1954,14 +2011,14 @@ struct GaryxMessageBubble: View {
 
     private func openMessageFileLink(_ target: String) {
         Task {
-            guard let preview = await model.localFilePreview(target) else { return }
+            guard let preview = await actions.localFilePreview(target, true) else { return }
             filePreviewSheet = GaryxMessageFilePreviewSheet(preview: preview)
         }
     }
 
     @MainActor
     private func messageImageFilePreview(_ target: String) async -> GaryxWorkspaceFilePreview? {
-        await model.localFilePreview(target, reportsError: false)
+        await actions.localFilePreview(target, false)
     }
 
     @ViewBuilder
@@ -1973,7 +2030,7 @@ struct GaryxMessageBubble: View {
                 guard !retrying else { return }
                 retrying = true
                 Task {
-                    _ = await model.retryFailedUserMessage(message.id)
+                    _ = await actions.retryFailedUserMessage(message.id)
                     retrying = false
                 }
             } label: {

mobile/garyx-mobile/App/GaryxMobile/GaryxMobileListComponents.swift

@@ -257,17 +257,32 @@ struct GaryxRowActionMenu<Content: View>: View {
     }
 }
 
+private struct GaryxOpenSwipeActionRowIdKey: EnvironmentKey {
+    static let defaultValue: Binding<String?> = .constant(nil)
+}
+
+extension EnvironmentValues {
+    var garyxOpenSwipeActionRowId: Binding<String?> {
+        get { self[GaryxOpenSwipeActionRowIdKey.self] }
+        set { self[GaryxOpenSwipeActionRowIdKey.self] = newValue }
+    }
+}
+
 struct GaryxSwipeActionRow<Content: View>: View {
+    var id: String?
     let actions: [GaryxRowAction]
     let content: Content
+    @Environment(\.garyxOpenSwipeActionRowId) private var openSwipeActionRowId
     @GestureState private var dragTranslation: CGFloat = 0
-    @State private var settledOffset: CGFloat = 0
+    @State private var localIsOpen = false
+    @State private var didPlayFullRevealFeedback = false
 
     private let actionButtonDiameter: CGFloat = 38
     private let actionButtonSpacing: CGFloat = 10
     private let actionTrailingPadding: CGFloat = 10
 
-    init(actions: [GaryxRowAction], @ViewBuilder content: () -> Content) {
+    init(id: String? = nil, actions: [GaryxRowAction], @ViewBuilder content: () -> Content) {
+        self.id = id
         self.actions = actions
         self.content = content()
     }
@@ -282,10 +297,16 @@ struct GaryxSwipeActionRow<Content: View>: View {
                 content
                     .background(GaryxTheme.surface)
                     .offset(x: currentOffset)
+                    .animation(GaryxMobileMotion.rowSwipe, value: isOpen)
             }
             .contentShape(Rectangle())
             .clipped()
             .simultaneousGesture(rowDragGesture)
+            .onChange(of: isOpen) { _, open in
+                if !open {
+                    didPlayFullRevealFeedback = false
+                }
+            }
             .accessibilityHint("Swipe left for thread actions.")
             .modifier(GaryxRowMenuAccessibilityActions(actions: actions, onAction: perform))
         }
@@ -300,6 +321,7 @@ struct GaryxSwipeActionRow<Content: View>: View {
                     Image(systemName: action.systemImage)
                         .font(GaryxFont.system(size: 15, weight: .semibold))
                         .foregroundStyle(Color.white)
+                        .rotationEffect(.degrees(action.iconRotationDegrees))
                         .frame(width: actionButtonDiameter, height: actionButtonDiameter)
                         .background(action.tone.background, in: Circle())
                         .contentShape(Circle())
@@ -317,19 +339,41 @@ struct GaryxSwipeActionRow<Content: View>: View {
             .updating($dragTranslation) { value, state, _ in
                 state = horizontalSwipeTranslation(value.translation)
             }
+            .onChanged { value in
+                let translation = horizontalSwipeTranslation(value.translation)
+                closeOtherOpenRowIfNeeded(translation: translation)
+                updateFullRevealFeedback(for: clampedOffset(baseOffset + translation))
+            }
             .onEnded { value in
                 let translation = horizontalSwipeTranslation(value.translation)
-                guard translation != 0 || settledOffset != 0 else { return }
+                guard translation != 0 || isOpen else { return }
                 let predicted = horizontalSwipeTranslation(value.predictedEndTranslation)
-                let projectedOffset = clampedOffset(settledOffset + (predicted == 0 ? translation : predicted))
+                let projectedOffset = clampedOffset(baseOffset + (predicted == 0 ? translation : predicted))
+                let nextIsOpen = projectedOffset < -maxRevealWidth * 0.35
                 withAnimation(GaryxMobileMotion.rowSwipe) {
-                    settledOffset = projectedOffset < -maxRevealWidth * 0.35 ? -maxRevealWidth : 0
+                    setOpen(nextIsOpen)
+                }
+                if nextIsOpen {
+                    playFullRevealFeedbackIfNeeded()
+                } else {
+                    didPlayFullRevealFeedback = false
                 }
             }
     }
 
     private var currentOffset: CGFloat {
-        clampedOffset(settledOffset + dragTranslation)
+        clampedOffset(baseOffset + dragTranslation)
+    }
+
+    private var baseOffset: CGFloat {
+        isOpen ? -maxRevealWidth : 0
+    }
+
+    private var isOpen: Bool {
+        if let id {
+            return openSwipeActionRowId.wrappedValue == id
+        }
+        return localIsOpen
     }
 
     private var maxRevealWidth: CGFloat {
@@ -344,7 +388,7 @@ struct GaryxSwipeActionRow<Content: View>: View {
         let horizontalMagnitude = abs(horizontal)
         let verticalMagnitude = abs(vertical)
         guard horizontalMagnitude > verticalMagnitude * 1.15 else { return 0 }
-        if settledOffset == 0 {
+        if !isOpen {
             return min(0, horizontal)
         }
         return horizontal
@@ -356,10 +400,48 @@ struct GaryxSwipeActionRow<Content: View>: View {
 
     private func perform(_ action: GaryxRowAction) {
         withAnimation(GaryxMobileMotion.rowSwipe) {
-            settledOffset = 0
+            setOpen(false)
         }
         action.action()
     }
+
+    private func setOpen(_ open: Bool) {
+        if let id {
+            if open {
+                openSwipeActionRowId.wrappedValue = id
+            } else if openSwipeActionRowId.wrappedValue == id {
+                openSwipeActionRowId.wrappedValue = nil
+            }
+        } else {
+            localIsOpen = open
+        }
+    }
+
+    private func closeOtherOpenRowIfNeeded(translation: CGFloat) {
+        guard let id,
+              translation < -4,
+              let openId = openSwipeActionRowId.wrappedValue,
+              openId != id else {
+            return
+        }
+        withAnimation(GaryxMobileMotion.rowSwipe) {
+            openSwipeActionRowId.wrappedValue = nil
+        }
+    }
+
+    private func updateFullRevealFeedback(for offset: CGFloat) {
+        if offset <= -maxRevealWidth + 0.5 {
+            playFullRevealFeedbackIfNeeded()
+        } else if offset > -maxRevealWidth + 8 {
+            didPlayFullRevealFeedback = false
+        }
+    }
+
+    private func playFullRevealFeedbackIfNeeded() {
+        guard !didPlayFullRevealFeedback else { return }
+        didPlayFullRevealFeedback = true
+        UIImpactFeedbackGenerator(style: .medium).impactOccurred()
+    }
 }
 
 struct GaryxItemActionMenuButtonStyle: ButtonStyle {
@@ -377,6 +459,10 @@ private extension GaryxRowAction {
     var menuRole: ButtonRole? {
         tone == .destructive ? .destructive : nil
     }
+
+    var iconRotationDegrees: Double {
+        systemImage.hasPrefix("pin") ? -28 : 0
+    }
 }
 
 private struct GaryxRowMenuAccessibilityActions: ViewModifier {