added editing of messages

Author: Xpitfire

interview_coder/AppModel.swift

@@ -71,6 +71,10 @@ final class AppModel: NSObject, ObservableObject {
     // Session preview overlays
     @Published var previewImported: ImportedFile? = nil
     @Published var previewText: String? = nil
+
+    // Inline edit for latest user message
+    @Published var editingLatestUser: Bool = false
+    @Published var editingLatestUserText: String = ""
     // Config UI state
     @Published var cfgModel: String = ConfigService.openAIModel()
     @Published var cfgReasoning: String = ConfigService.openAIReasoningEffort()
@@ -440,6 +444,48 @@ final class AppModel: NSObject, ObservableObject {
     }
     func closePreviewOverlay() { previewImported = nil; previewText = nil }
 
+    // MARK: - Edit latest user message
+    func beginEditLatestUser() {
+        guard let idx = conversation.lastIndex(where: { $0.role == .user }) else { return }
+        // Initialize editor with user text only (strip any leading "User:" UI label)
+        editingLatestUserText = stripUserPrefix(conversation[idx].text)
+        editingLatestUser = true
+    }
+
+    func cancelEditLatestUser() { editingLatestUser = false; editingLatestUserText = "" }
+
+    func commitEditLatestUser() {
+        guard editingLatestUser, let idx = conversation.lastIndex(where: { $0.role == .user }) else { return }
+        let cur = conversation[idx]
+        let newText = stripUserPrefix(editingLatestUserText)
+        conversation[idx] = ConversationEntry(id: cur.id, createdAt: cur.createdAt, role: .user, text: newText, images: cur.images, audio: cur.audio)
+        editingLatestUser = false
+        editingLatestUserText = ""
+        // Append a new JSONL record reflecting the updated messages
+        Task { @MainActor in if !privateMode { await logJSONLTurn() } }
+        showToast = .init(message: "Edited last message")
+    }
+
+    // Commit edit and immediately retry generation using the updated latest user message.
+    // Note: This is intentionally scoped to the inline-edit context in the transcript and
+    // is bound to Cmd+Enter only there, to avoid clashing with the global Cmd+Enter handler
+    // used by the manual input composer.
+    func commitEditLatestUserAndRegenerate() async {
+        guard !isGenerating else { showToast = .init(message: "Already generating"); return }
+        commitEditLatestUser()
+        await retryLastGeneration()
+    }
+
+    private func stripUserPrefix(_ s: String) -> String {
+        let trimmed = s.trimmingCharacters(in: .whitespacesAndNewlines)
+        let prefix = "User:"
+        if trimmed.hasPrefix(prefix) {
+            let rest = trimmed.dropFirst(prefix.count)
+            return String(rest).trimmingCharacters(in: .whitespacesAndNewlines)
+        }
+        return s
+    }
+
     // MARK: - Session deletion
     func deleteCurrentSession() {
         let target = selectedSessionURL ?? jsonlURL

interview_coder/PanelView.swift

@@ -1063,9 +1063,9 @@ private var headerBar: some View { DragHost { headerContent }.zIndex(2) }
                 if isDroppingIntoManual {
                     RoundedRectangle(cornerRadius: 6)
                         .fill(Color.accentColor.opacity(0.08))
+                    RoundedRectangle(cornerRadius: 6)
+                        .strokeBorder(Color.accentColor, style: StrokeStyle(lineWidth: 2, dash: [6,4]))
                 }
-                RoundedRectangle(cornerRadius: 6)
-                    .strokeBorder(isDroppingIntoManual ? Color.accentColor : Color.gray.opacity(0.2), style: StrokeStyle(lineWidth: isDroppingIntoManual ? 2 : 1, dash: isDroppingIntoManual ? [6,4] : []))
             }
         )
         .onDrop(of: [UTType.fileURL], isTargeted: $isDroppingIntoManual) { providers in
@@ -1590,6 +1590,8 @@ private extension PanelView {
             var highlightIDs: Set<UUID>
             var activeID: UUID?
             var searchQuery: String?
+            @State private var hoveringUser: Bool = false
+            @FocusState private var editFocused: Bool
 
             var body: some View {
                 VStack(alignment: .leading, spacing: 8) {
@@ -1600,12 +1602,59 @@ private extension PanelView {
                             .padding(.horizontal, 8)
                         Spacer()
                         if let u = item.user {
-                            Text(TranscriptListView.previewText(u.text))
-                                .font(.callout)
-                                .foregroundStyle(.secondary)
-                                .lineLimit(2)
-                                .multilineTextAlignment(.trailing)
-                                .frame(maxWidth: 420, alignment: .trailing)
+                            let isLatestUser = (model.conversation.lastIndex(where: { $0.role == .user }) != nil) && (model.conversation.last(where: { $0.role == .user })?.id == u.id)
+                            if model.editingLatestUser && isLatestUser {
+                                // Inline editor for the latest user message
+                                VStack(alignment: .trailing, spacing: 6) {
+                                    // Keep provided style; enforce readable text color via NSView-backed editor
+                                    ManualTextView(text: $model.editingLatestUserText, isFocused: $editFocused, fontSize: model.uiBodyPointSize, textColor: NSColor.white.withAlphaComponent(0.85))
+                                        .background(.ultraThinMaterial.opacity(0.2))
+                                        .frame(minHeight: 80, maxHeight: 120)
+                                        .overlay(RoundedRectangle(cornerRadius: 6).stroke(Color.gray.opacity(0.2)))
+                                        .frame(maxWidth: 560)
+                                        .onAppear { editFocused = true }
+                                    HStack(spacing: 8) {
+                                        Text("⌘↩: save & regenerate • ESC: cancel").font(.caption2).foregroundStyle(.secondary)
+                                    }
+                                }
+                                .padding(8)
+                                .frame(maxWidth: 560, alignment: .trailing)
+                                .background(
+                                    Group {
+                                        // Cmd+Enter: commit and retry generation ONLY in this context
+                                        // This is intentionally scoped here to avoid clashing with the
+                                        // global manual input handler for Cmd+Enter.
+                                        Button("") { Task { await model.commitEditLatestUserAndRegenerate() } }
+                                            .keyboardShortcut(.return, modifiers: [.command])
+                                            .frame(width: 0, height: 0)
+                                            .opacity(0)
+                                            .allowsHitTesting(false)
+                                        // ESC: cancel edit without persisting
+                                        Button("") { model.cancelEditLatestUser() }
+                                            .keyboardShortcut(.escape, modifiers: [])
+                                            .frame(width: 0, height: 0)
+                                            .opacity(0)
+                                            .allowsHitTesting(false)
+                                    }
+                                )
+                            } else {
+                                HStack(alignment: .firstTextBaseline, spacing: 6) {
+                                    Text(TranscriptListView.previewText(u.text))
+                                        .font(.callout)
+                                        .foregroundStyle(.secondary)
+                                        .lineLimit(2)
+                                        .multilineTextAlignment(.trailing)
+                                        .frame(maxWidth: 420, alignment: .trailing)
+                                        .contentShape(Rectangle())
+                                        .onHover { hovering in hoveringUser = hovering }
+                                        .onTapGesture { if isLatestUser { model.beginEditLatestUser() } }
+                                    if isLatestUser {
+                                        Button(action: { model.beginEditLatestUser() }) { Image(systemName: "pencil").font(.caption) }
+                                            .buttonStyle(.plain)
+                                            .opacity(hoveringUser ? 1 : 0)
+                                    }
+                                }
+                            }
                         }
                     }
 
@@ -2830,6 +2879,7 @@ private struct ManualTextView: NSViewRepresentable {
     @Binding var text: String
     var isFocused: FocusState<Bool>.Binding
     var fontSize: Double = 13.0
+    var textColor: NSColor? = nil
 
     final class Coordinator: NSObject, NSTextViewDelegate {
         var parent: ManualTextView
@@ -2856,6 +2906,7 @@ private struct ManualTextView: NSViewRepresentable {
         tv.isRichText = false
         tv.isContinuousSpellCheckingEnabled = false
         tv.font = .systemFont(ofSize: CGFloat(fontSize))
+        if let c = textColor { tv.textColor = c; tv.insertionPointColor = c }
         tv.string = text
         tv.delegate = context.coordinator
         tv.textContainerInset = NSSize(width: 4, height: 4)
@@ -2874,6 +2925,7 @@ private struct ManualTextView: NSViewRepresentable {
             tv.scrollRangeToVisible(tv.selectedRange())
         }
         tv.font = .systemFont(ofSize: CGFloat(fontSize))
+        if let c = textColor { tv.textColor = c; tv.insertionPointColor = c }
         if isFocused.wrappedValue, let window = nsView.window, window.firstResponder !== tv {
             window.makeFirstResponder(tv)
             tv.scrollRangeToVisible(tv.selectedRange())