Merge pull request #9934 from gitbutlerapp/track-claude-session-ids

Track all claude session ids and fall back if not found

Author: Caleb-T-Owens

apps/desktop/src/lib/codegen/types.ts

@@ -71,6 +71,8 @@ export interface ClaudeSession {
 	id: string;
 	/** The most recent session ID. If a session is stopped and resumed, Claude will copy over the past context into a new session. This value is unique. */
 	currentId: string;
+	/** All session IDs that have been used for this session, including the current one. */
+	sessionIds: string[];
 	/** The timestamp when the first session was created. */
 	createdAt: string;
 	/** The timestamp when the session was last updated. */

crates/but-claude/src/bridge.rs

@@ -20,7 +20,7 @@
 //!   more complex with more unknowns.
 
 use crate::{
-    ClaudeMessage, ClaudeMessageContent, UserInput,
+    ClaudeMessage, ClaudeMessageContent, Transcript, UserInput,
     claude_config::{fmt_claude_mcp, fmt_claude_settings},
     db,
     rules::{create_claude_assignment_rule, list_claude_assignment_rules},
@@ -32,6 +32,7 @@ use gitbutler_command_context::CommandContext;
 use serde_json::json;
 use std::{
     collections::HashMap,
+    fs,
     io::{BufRead, BufReader, PipeReader, Read as _},
     process::ExitStatus,
     sync::Arc,
@@ -296,7 +297,19 @@ async fn spawn_command(
     if create_new {
         command.arg(format!("--session-id={}", session.id));
     } else {
-        command.arg(format!("--resume={}", session.current_id));
+        let mut session_ids = session.session_ids.clone();
+        let mut current_id = session_ids.pop().unwrap_or(session.current_id);
+
+        while !session_ids.is_empty()
+            && !dbg!(fs::exists(Transcript::get_transcript_path(
+                &project_path,
+                current_id
+            )?)?)
+        {
+            current_id = session_ids.pop().unwrap_or(session.current_id);
+        }
+
+        command.arg(format!("--resume={}", current_id));
     }
     command.arg(message);
     Ok(command.spawn()?)

crates/but-claude/src/db.rs

@@ -19,6 +19,7 @@ pub fn save_new_session_with_gui_flag(
     let session = ClaudeSession {
         id,
         current_id: id,
+        session_ids: vec![id],
         created_at: now,
         updated_at: now,
         in_gui,
@@ -41,6 +42,30 @@ pub fn set_session_current_id(
     Ok(())
 }
 
+/// Adds a session ID to the list of session IDs for a given session.
+pub fn add_session_id(
+    ctx: &mut CommandContext,
+    session_id: Uuid,
+    new_session_id: Uuid,
+) -> anyhow::Result<()> {
+    if let Some(mut session) = get_session_by_id(ctx, session_id)? {
+        if !session.session_ids.contains(&new_session_id) {
+            session.session_ids.push(new_session_id);
+            session.current_id = new_session_id;
+
+            let json = serde_json::to_string(&session.session_ids)?;
+
+            ctx.db()?
+                .claude_sessions()
+                .update_session_ids(&session_id.to_string(), &json)?;
+            ctx.db()?
+                .claude_sessions()
+                .update_current_id(&session_id.to_string(), &new_session_id.to_string())?;
+        }
+    }
+    Ok(())
+}
+
 /// Updates the current session ID for a given session in the database.
 pub fn set_session_in_gui(
     ctx: &mut CommandContext,
@@ -157,9 +182,11 @@ pub fn update_permission_request(
 impl TryFrom<but_db::ClaudeSession> for crate::ClaudeSession {
     type Error = anyhow::Error;
     fn try_from(value: but_db::ClaudeSession) -> Result<Self, Self::Error> {
+        let session_ids: Vec<Uuid> = serde_json::from_str(&value.session_ids)?;
         Ok(crate::ClaudeSession {
             id: Uuid::parse_str(&value.id)?,
             current_id: Uuid::parse_str(&value.current_id)?,
+            session_ids,
             created_at: value.created_at,
             updated_at: value.updated_at,
             in_gui: value.in_gui,
@@ -170,9 +197,11 @@ impl TryFrom<but_db::ClaudeSession> for crate::ClaudeSession {
 impl TryFrom<crate::ClaudeSession> for but_db::ClaudeSession {
     type Error = anyhow::Error;
     fn try_from(value: crate::ClaudeSession) -> Result<Self, Self::Error> {
+        let session_ids = serde_json::to_string(&value.session_ids)?;
         Ok(but_db::ClaudeSession {
             id: value.id.to_string(),
             current_id: value.current_id.to_string(),
+            session_ids,
             created_at: value.created_at,
             updated_at: value.updated_at,
             in_gui: value.in_gui,

crates/but-claude/src/lib.rs

@@ -19,6 +19,8 @@ pub struct ClaudeSession {
     id: Uuid,
     /// The most recent session ID. If a session is stopped and resumed, Claude will copy over the past context into a new session. This value is unique.
     current_id: Uuid,
+    /// All session IDs that have been used for this session, including the current one.
+    session_ids: Vec<Uuid>,
     /// The timestamp when the first session was created.
     created_at: chrono::NaiveDateTime,
     /// The timestamp when the session was last updated.

crates/but-db/migrations/2025-08-21-142109_add_session_ids_to_claude_sessions/down.sql

@@ -0,0 +1,2 @@
+-- Remove session_ids column from claude_sessions table
+ALTER TABLE claude_sessions DROP COLUMN session_ids;

crates/but-db/migrations/2025-08-21-142109_add_session_ids_to_claude_sessions/up.sql

@@ -0,0 +1,5 @@
+-- Add session_ids column to claude_sessions table to track all session IDs used
+ALTER TABLE claude_sessions ADD COLUMN session_ids TEXT NOT NULL DEFAULT '[]';
+
+-- Initialize existing sessions with their current_id in the session_ids array
+UPDATE claude_sessions SET session_ids = json_array(current_id);

crates/but-db/src/claude.rs

@@ -16,6 +16,7 @@ use serde::{Deserialize, Serialize};
 pub struct ClaudeSession {
     pub id: String,
     pub current_id: String,
+    pub session_ids: String,
     pub created_at: chrono::NaiveDateTime,
     pub updated_at: chrono::NaiveDateTime,
     pub in_gui: bool,
@@ -177,6 +178,20 @@ impl ClaudeSessionsHandle<'_> {
         Ok(())
     }
 
+    pub fn update_session_ids(
+        &mut self,
+        id: &str,
+        session_ids: &str,
+    ) -> Result<(), diesel::result::Error> {
+        diesel::update(claude_sessions.filter(crate::schema::claude_sessions::id.eq(id)))
+            .set((
+                crate::schema::claude_sessions::session_ids.eq(session_ids),
+                crate::schema::claude_sessions::updated_at.eq(chrono::Local::now().naive_local()),
+            ))
+            .execute(&mut self.db.conn)?;
+        Ok(())
+    }
+
     pub fn update_in_gui(&mut self, id: &str, in_gui: bool) -> Result<(), diesel::result::Error> {
         diesel::update(claude_sessions.filter(crate::schema::claude_sessions::id.eq(id)))
             .set((

crates/but-db/src/schema.rs

@@ -59,6 +59,7 @@ diesel::table! {
     claude_sessions (id) {
         id -> Text,
         current_id -> Text,
+        session_ids -> Text,
         created_at -> Timestamp,
         updated_at -> Timestamp,
         in_gui -> Bool,