feat(goose2): inline edit & retry

crates/goose-acp/src/server.rs

@@ -1523,12 +1523,17 @@ impl GooseAcpAgent {
                 continue;
             }
 
+            let msg_id = message.id.clone();
+
             for content_item in &message.content {
                 match content_item {
                     MessageContent::Text(text) => {
-                        let chunk = ContentChunk::new(ContentBlock::Text(TextContent::new(
+                        let mut chunk = ContentChunk::new(ContentBlock::Text(TextContent::new(
                             text.text.clone(),
                         )));
+                        if let Some(ref id) = msg_id {
+                            chunk = chunk.message_id(id.clone());
+                        }
                         let update = match message.role {
                             Role::User => SessionUpdate::UserMessageChunk(chunk),
                             Role::Assistant => SessionUpdate::AgentMessageChunk(chunk),
@@ -1691,14 +1696,63 @@ impl GooseAcpAgent {
             .get_session_agent(&thread_id, Some(cancel_token.clone()))
             .await?;
 
-        let user_message = self.convert_acp_prompt_to_message(args.prompt);
+        let mut user_message = self.convert_acp_prompt_to_message(args.prompt);
+        if let Some(client_msg_id) = args.message_id {
+            user_message.id = Some(client_msg_id);
+        }
 
-        self.thread_manager
-            .append_message(&thread_id, Some(&internal_session_id), &user_message)
-            .await
-            .map_err(|e| {
-                sacp::Error::internal_error().data(format!("Failed to persist message: {}", e))
-            })?;
+        // Handle edit/retry: atomically truncate + append in one transaction,
+        // or just append for normal prompts.
+        tracing::warn!(
+            has_meta = args.meta.is_some(),
+            meta_keys = ?args.meta.as_ref().map(|m| m.keys().collect::<Vec<_>>()),
+            user_msg_id = ?user_message.id,
+            "EDIT/RETRY: on_prompt received"
+        );
+        let truncate_id = args
+            .meta
+            .as_ref()
+            .and_then(|m| m.get("truncate_before_message_id"))
+            .and_then(|v| v.as_str())
+            .map(String::from);
+
+        if let Some(ref truncate_id) = truncate_id {
+            tracing::warn!(
+                thread_id = %thread_id,
+                session_id = %internal_session_id,
+                truncate_id = %truncate_id,
+                user_msg_id = ?user_message.id,
+                "EDIT/RETRY: attempting truncation"
+            );
+            let (_, rows_deleted) = self
+                .thread_manager
+                .truncate_and_append(
+                    &thread_id,
+                    truncate_id,
+                    &internal_session_id,
+                    &user_message,
+                )
+                .await
+                .map_err(|e| {
+                    sacp::Error::internal_error()
+                        .data(format!("Failed to truncate and append: {}", e))
+                })?;
+
+            tracing::warn!(
+                thread_id = %thread_id,
+                truncate_id = %truncate_id,
+                rows_deleted = rows_deleted,
+                "EDIT/RETRY: truncation complete"
+            );
+        } else {
+            self.thread_manager
+                .append_message(&thread_id, Some(&internal_session_id), &user_message)
+                .await
+                .map_err(|e| {
+                    sacp::Error::internal_error()
+                        .data(format!("Failed to persist message: {}", e))
+                })?;
+        }
 
         let session_config = SessionConfig {
             id: internal_session_id.clone(),

crates/goose/src/session/session_manager.rs

@@ -1590,11 +1590,17 @@ impl SessionStorage {
 
     async fn truncate_conversation(&self, session_id: &str, timestamp: i64) -> Result<()> {
         let pool = self.pool().await?;
-        sqlx::query("DELETE FROM messages WHERE session_id = ? AND created_timestamp >= ?")
-            .bind(session_id)
-            .bind(timestamp)
-            .execute(pool)
-            .await?;
+        // Use autoincrement id for precise ordering — timestamps have only
+        // second resolution and multiple messages can share the same second.
+        sqlx::query(
+            "DELETE FROM messages WHERE session_id = ? AND id >= \
+             (SELECT id FROM messages WHERE session_id = ? AND created_timestamp >= ? ORDER BY id ASC LIMIT 1)",
+        )
+        .bind(session_id)
+        .bind(session_id)
+        .bind(timestamp)
+        .execute(pool)
+        .await?;
 
         Ok(())
     }