Merge pull request #9929 from gitbutlerapp/add-clause-session-in-gui-flag

Fix existing hooker configs screwing up when working through the gui

Author: Caleb-T-Owens

crates/but-claude/src/bridge.rs

@@ -311,9 +311,10 @@ async fn upsert_session(
 ) -> Result<crate::ClaudeSession> {
     let mut ctx = ctx.lock().await;
     let session = if let Some(session) = db::get_session_by_id(&mut ctx, session_id)? {
+        db::set_session_in_gui(&mut ctx, session_id, true)?;
         session
     } else {
-        let session = db::save_new_session(&mut ctx, session_id)?;
+        let session = db::save_new_session_with_gui_flag(&mut ctx, session_id, true)?;
         create_claude_assignment_rule(&mut ctx, session_id, stack_id)?;
         session
     };

crates/but-claude/src/claude_config.rs

@@ -6,7 +6,10 @@ use serde_json::json;
 
 /// Formats the claude code config
 pub fn fmt_claude_settings() -> Result<String> {
-    let cli_cmd = format!("\"{}\"", get_cli_path()?.to_string_lossy());
+    let cli_cmd = format!(
+        "GITBUTLER_IN_GUI=1 \"{}\"",
+        get_cli_path()?.to_string_lossy()
+    );
     let pre_cmd = format!("{cli_cmd} claude pre-tool");
     let post_cmd = format!("{cli_cmd} claude post-tool");
     let stop_cmd = format!("{cli_cmd} claude stop");

crates/but-claude/src/db.rs

@@ -6,12 +6,22 @@ use crate::{ClaudePermissionRequest, ClaudeSession};
 
 /// Creates a new ClaudeSession with the session_id provided and saves it to the database.
 pub fn save_new_session(ctx: &mut CommandContext, id: Uuid) -> anyhow::Result<ClaudeSession> {
+    save_new_session_with_gui_flag(ctx, id, false)
+}
+
+/// Creates a new ClaudeSession with the session_id provided and saves it to the database.
+pub fn save_new_session_with_gui_flag(
+    ctx: &mut CommandContext,
+    id: Uuid,
+    in_gui: bool,
+) -> anyhow::Result<ClaudeSession> {
     let now = chrono::Utc::now().naive_utc();
     let session = ClaudeSession {
         id,
         current_id: id,
         created_at: now,
         updated_at: now,
+        in_gui,
     };
     ctx.db()?
         .claude_sessions()
@@ -27,7 +37,19 @@ pub fn set_session_current_id(
 ) -> anyhow::Result<()> {
     ctx.db()?
         .claude_sessions()
-        .update(&session_id.to_string(), &current_id.to_string())?;
+        .update_current_id(&session_id.to_string(), &current_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,
+    session_id: Uuid,
+    in_gui: bool,
+) -> anyhow::Result<()> {
+    ctx.db()?
+        .claude_sessions()
+        .update_in_gui(&session_id.to_string(), in_gui)?;
     Ok(())
 }
 
@@ -140,6 +162,7 @@ impl TryFrom<but_db::ClaudeSession> for crate::ClaudeSession {
             current_id: Uuid::parse_str(&value.current_id)?,
             created_at: value.created_at,
             updated_at: value.updated_at,
+            in_gui: value.in_gui,
         })
     }
 }
@@ -152,6 +175,7 @@ impl TryFrom<crate::ClaudeSession> for but_db::ClaudeSession {
             current_id: value.current_id.to_string(),
             created_at: value.created_at,
             updated_at: value.updated_at,
+            in_gui: value.in_gui,
         })
     }
 }

crates/but-claude/src/hooks/mod.rs

@@ -88,6 +88,7 @@ pub struct ClaudeStopInput {
 pub async fn handle_stop() -> anyhow::Result<ClaudeHookOutput> {
     let input: ClaudeStopInput = serde_json::from_str(&stdin()?)
         .map_err(|e| anyhow::anyhow!("Failed to parse input JSON: {}", e))?;
+
     let transcript = Transcript::from_file(Path::new(&input.transcript_path))?;
     let cwd = transcript.dir()?;
     let repo = gix::discover(cwd)?;
@@ -119,6 +120,14 @@ pub async fn handle_stop() -> anyhow::Result<ClaudeHookOutput> {
     let ctx = &mut CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
     let session_id = original_session_id(ctx, input.session_id.clone())?;
 
+    if should_exit_early(ctx, &input.session_id)? {
+        return Ok(ClaudeHookOutput {
+            do_continue: true,
+            stop_reason: "Session running in GUI, skipping hook".to_string(),
+            suppress_output: true,
+        });
+    }
+
     let defer = ClearLocksGuard {
         ctx,
         session_id: session_id.clone(),
@@ -295,6 +304,7 @@ pub struct ClaudePreToolUseInput {
 pub fn handle_pre_tool_call() -> anyhow::Result<ClaudeHookOutput> {
     let mut input: ClaudePreToolUseInput = serde_json::from_str(&stdin()?)
         .map_err(|e| anyhow::anyhow!("Failed to parse input JSON: {}", e))?;
+
     let dir = std::path::Path::new(&input.tool_input.file_path)
         .parent()
         .ok_or(anyhow!("Failed to get parent directory of file path"))?;
@@ -312,6 +322,14 @@ pub fn handle_pre_tool_call() -> anyhow::Result<ClaudeHookOutput> {
     let ctx = &mut CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
     let session_id = original_session_id(ctx, input.session_id.clone())?;
 
+    if should_exit_early(ctx, &input.session_id)? {
+        return Ok(ClaudeHookOutput {
+            do_continue: true,
+            stop_reason: "Session running in GUI, skipping hook".to_string(),
+            suppress_output: true,
+        });
+    }
+
     file_lock::obtain(ctx, session_id, input.tool_input.file_path.clone())?;
 
     Ok(ClaudeHookOutput {
@@ -356,6 +374,15 @@ pub fn handle_post_tool_call() -> anyhow::Result<ClaudeHookOutput> {
     input.tool_response.file_path = relative_file_path;
 
     let ctx = &mut CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
+
+    if should_exit_early(ctx, &input.session_id)? {
+        return Ok(ClaudeHookOutput {
+            do_continue: true,
+            stop_reason: "Session running in GUI, skipping hook".to_string(),
+            suppress_output: true,
+        });
+    }
+
     let session_id = original_session_id(ctx, input.session_id.clone())?;
 
     let defer = ClearLocksGuard {
@@ -542,3 +569,18 @@ fn list_stacks(ctx: &CommandContext) -> anyhow::Result<Vec<StackEntry>> {
         but_workspace::stacks(ctx, &ctx.project().gb_dir(), &repo, StacksFilter::default())
     }
 }
+
+/// Returns true if the session has `is_gui` set to true, and `GUTBUTLER_IN_GUI` is unset
+fn should_exit_early(ctx: &mut CommandContext, session_id: &str) -> anyhow::Result<bool> {
+    let in_gui = std::env::var("GITBUTLER_IN_GUI").unwrap_or("0".into()) == "1";
+    if in_gui {
+        return Ok(false);
+    }
+
+    let session_uuid = Uuid::parse_str(session_id)?;
+    if let Ok(Some(session)) = crate::db::get_session_by_current_id(ctx, session_uuid) {
+        return Ok(session.in_gui);
+    }
+
+    Ok(false)
+}

crates/but-claude/src/lib.rs

@@ -23,6 +23,8 @@ pub struct ClaudeSession {
     created_at: chrono::NaiveDateTime,
     /// The timestamp when the session was last updated.
     updated_at: chrono::NaiveDateTime,
+    /// Whether this session is used by the GUI.
+    in_gui: bool,
 }
 
 /// Represents a message in a Claude session, referencing the stable session ID.

crates/but-db/Cargo.toml

@@ -23,7 +23,7 @@ anyhow = "1.0.98"
 diesel_migrations = { version = "2.0.0", features = ["sqlite"] }
 chrono = { version = "0.4.41", features = ["serde"] }
 # other things
-tokio = { workspace = true, features = ["rt-multi-thread", "parking_lot", "time", "sync"] }
+tokio = { workspace = true, features = ["rt-multi-thread", "parking_lot", "time", "sync", "macros"] }
 tracing.workspace = true
 
 [dev-dependencies]

crates/but-db/migrations/2025-08-21-095340_add_in_gui_to_claude_sessions/down.sql

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

crates/but-db/migrations/2025-08-21-095340_add_in_gui_to_claude_sessions/up.sql

@@ -0,0 +1,2 @@
+-- Add inGui column to claude_sessions table
+ALTER TABLE claude_sessions ADD COLUMN in_gui BOOLEAN NOT NULL DEFAULT FALSE;

crates/but-db/src/claude.rs

@@ -18,6 +18,7 @@ pub struct ClaudeSession {
     pub current_id: String,
     pub created_at: chrono::NaiveDateTime,
     pub updated_at: chrono::NaiveDateTime,
+    pub in_gui: bool,
 }
 
 #[derive(
@@ -162,7 +163,11 @@ impl ClaudeSessionsHandle<'_> {
         Ok(())
     }
 
-    pub fn update(&mut self, id: &str, current_id: &str) -> Result<(), diesel::result::Error> {
+    pub fn update_current_id(
+        &mut self,
+        id: &str,
+        current_id: &str,
+    ) -> Result<(), diesel::result::Error> {
         diesel::update(claude_sessions.filter(crate::schema::claude_sessions::id.eq(id)))
             .set((
                 crate::schema::claude_sessions::current_id.eq(current_id),
@@ -172,6 +177,16 @@ impl ClaudeSessionsHandle<'_> {
         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((
+                crate::schema::claude_sessions::in_gui.eq(in_gui),
+                crate::schema::claude_sessions::updated_at.eq(chrono::Local::now().naive_local()),
+            ))
+            .execute(&mut self.db.conn)?;
+        Ok(())
+    }
+
     /// If you intend delete the messages AND the session, you should use `delete_session_and_messages` instead, which does it all in a single transaction.
     pub fn delete(&mut self, id: &str) -> Result<(), diesel::result::Error> {
         diesel::delete(claude_sessions.filter(crate::schema::claude_sessions::id.eq(id)))

crates/but-db/src/schema.rs

@@ -61,6 +61,7 @@ diesel::table! {
         current_id -> Text,
         created_at -> Timestamp,
         updated_at -> Timestamp,
+        in_gui -> Bool,
     }
 }