feat(goose2): inline edit & retry

crates/goose-acp/src/server.rs

@@ -1691,6 +1691,43 @@ impl GooseAcpAgent {
             .get_session_agent(&thread_id, Some(cancel_token.clone()))
             .await?;
 
+        // Handle edit/retry truncation — if the client requests it via _meta,
+        // truncate both storage layers before appending the new message.
+        // The two tables use different ID schemes (tmsg_ vs msg_), so we use
+        // a timestamp bridge: truncate thread_messages by message_id to get
+        // the timestamp, then truncate messages by that timestamp.
+        if let Some(truncate_id) = args
+            .meta
+            .as_ref()
+            .and_then(|m| m.get("truncate_before_message_id"))
+            .and_then(|v| v.as_str())
+        {
+            let (rows_deleted, created_ts) = self
+                .thread_manager
+                .truncate_from_message(&thread_id, truncate_id)
+                .await
+                .map_err(|e| {
+                    sacp::Error::internal_error().data(format!("Failed to truncate thread: {}", e))
+                })?;
+
+            if created_ts > 0 {
+                self.session_manager
+                    .truncate_conversation(&internal_session_id, created_ts)
+                    .await
+                    .map_err(|e| {
+                        sacp::Error::internal_error()
+                            .data(format!("Failed to truncate session: {}", e))
+                    })?;
+            }
+
+            tracing::info!(
+                thread_id = %thread_id,
+                truncate_id = %truncate_id,
+                rows_deleted = rows_deleted,
+                "Truncated conversation for edit/retry"
+            );
+        }
+
         let user_message = self.convert_acp_prompt_to_message(args.prompt);
 
         self.thread_manager

crates/goose/src/session/thread_manager.rs

@@ -378,6 +378,43 @@ impl ThreadManager {
         self.get_thread(&new_id).await
     }
 
+    /// Truncate a thread from a specific message onward (inclusive).
+    /// Returns (rows_deleted, created_timestamp) so callers can bridge
+    /// into session-level truncation which uses timestamps.
+    pub async fn truncate_from_message(
+        &self,
+        thread_id: &str,
+        message_id: &str,
+    ) -> Result<(u64, i64)> {
+        let pool = self.storage.pool().await?;
+
+        // Find the target message's autoincrement id and timestamp
+        let row = sqlx::query_as::<_, (i64, i64)>(
+            "SELECT id, created_timestamp FROM thread_messages WHERE thread_id = ? AND message_id = ? LIMIT 1",
+        )
+        .bind(thread_id)
+        .bind(message_id)
+        .fetch_optional(pool)
+        .await?;
+
+        let Some((row_id, created_ts)) = row else {
+            return Ok((0, 0));
+        };
+
+        let result = sqlx::query("DELETE FROM thread_messages WHERE thread_id = ? AND id >= ?")
+            .bind(thread_id)
+            .bind(row_id)
+            .execute(pool)
+            .await?;
+
+        sqlx::query("UPDATE threads SET updated_at = CURRENT_TIMESTAMP WHERE id = ?")
+            .bind(thread_id)
+            .execute(pool)
+            .await?;
+
+        Ok((result.rows_affected(), created_ts))
+    }
+
     pub async fn list_messages(&self, thread_id: &str) -> Result<Vec<Message>> {
         let pool = self.storage.pool().await?;
         let rows = sqlx::query_as::<_, (Option<String>, String, Option<String>, String, i64, String)>(

ui/goose2/scripts/check-file-sizes.mjs

@@ -11,9 +11,29 @@ const EXCEPTIONS = {
       "Drag-and-drop handlers for session-to-project moves and project reorder, plus activeProjectId highlight.",
   },
   "src/features/chat/ui/ChatView.tsx": {
-    limit: 535,
+    limit: 600,
     justification:
-      "ACP prewarm guards, project-aware working dir selection, working context sync, and chat bootstrapping still live together here.",
+      "ACP prewarm guards, project-aware working dir selection, working context sync, chat bootstrapping, and inline edit/retry orchestration still live together here.",
+  },
+  "src/features/chat/hooks/__tests__/useChat.test.ts": {
+    limit: 840,
+    justification:
+      "Edit/retry integration tests cover attachment preservation, persona round-tripping, truncation, and draft lifecycle in one cohesive suite.",
+  },
+  "src/features/chat/stores/chatStore.ts": {
+    limit: 520,
+    justification:
+      "Edit-mode draft state, per-session editing message tracking, and cleanup logic added for inline edit/retry.",
+  },
+  "src/features/chat/ui/MessageBubble.tsx": {
+    limit: 610,
+    justification:
+      "Inline edit textarea, save/cancel controls, and attachment re-display for edit/retry colocated with message rendering.",
+  },
+  "src/features/chat/ui/__tests__/MessageBubble.test.tsx": {
+    limit: 560,
+    justification:
+      "Edit/retry button visibility, inline edit save/cancel, and attachment preservation tests added to existing bubble suite.",
   },
   "src/features/chat/ui/__tests__/ContextPanel.test.tsx": {
     limit: 550,