Claude code stop hook should not commit in other branches

Author: krlvi

crates/but-action/src/lib.rs

@@ -84,7 +84,7 @@ pub fn freestyle(
         2. Take a look at the project status and see what changes are present in the project. It's important to understand what stacks and branche are present, and what the file changes are.
         3. Try to correlate the prompt with the project status and determine what actions you can take to help the user.
         4. Use the tools provided to you to perform the actions.
-    
+
     ### Capabilities
     You can generally perform the normal Git operations, such as creating branches and committing to them.
     You can also perform more advanced operations, such as:
@@ -95,7 +95,7 @@ pub fn freestyle(
     - `split a branch`: Take an existing branch and split it into two branches. This basically takes a set of committed file changes and moves them to a new branch, removing them from the original branch.
         This is useful when you want to separate the changes into a new branch for further work.
         In order to do this, you will need to get the branch changes for the intended source branch (call the `get_branch_changes` tool), and then call the split branch tool with the changes you want to split off.
-    
+
     ### Important notes
     - Only perform the action on the file changes specified in the prompt.
     - If the prompt is not clear, ask the user for clarification.
@@ -167,11 +167,16 @@ pub fn handle_changes(
     external_prompt: Option<String>,
     handler: ActionHandler,
     source: Source,
+    exclusive_stack: Option<StackId>,
 ) -> anyhow::Result<(Uuid, Outcome)> {
     match handler {
-        ActionHandler::HandleChangesSimple => {
-            simple::handle_changes(ctx, change_summary, external_prompt, source)
-        }
+        ActionHandler::HandleChangesSimple => simple::handle_changes(
+            ctx,
+            change_summary,
+            external_prompt,
+            source,
+            exclusive_stack,
+        ),
     }
 }
 

crates/but-action/src/simple.rs

@@ -29,6 +29,7 @@ pub fn handle_changes(
     change_summary: &str,
     external_prompt: Option<String>,
     source: Source,
+    exclusive_stack: Option<StackId>,
 ) -> anyhow::Result<(Uuid, Outcome)> {
     let mut guard = ctx.project().exclusive_worktree_access();
     let perm = guard.write_permission();
@@ -43,8 +44,14 @@ pub fn handle_changes(
         )?
         .to_gix();
 
-    let response =
-        handle_changes_simple_inner(ctx, change_summary, external_prompt.clone(), vb_state, perm);
+    let response = handle_changes_simple_inner(
+        ctx,
+        change_summary,
+        external_prompt.clone(),
+        vb_state,
+        perm,
+        exclusive_stack,
+    );
 
     let snapshot_after = ctx
         .create_snapshot(
@@ -73,6 +80,7 @@ fn handle_changes_simple_inner(
     external_prompt: Option<String>,
     vb_state: &VirtualBranchesHandle,
     perm: &mut WorktreeWritePermission,
+    exclusive_stack: Option<StackId>,
 ) -> anyhow::Result<Outcome> {
     match gitbutler_operating_modes::operating_mode(ctx) {
         OperatingMode::OpenWorkspace => {
@@ -145,6 +153,11 @@ fn handle_changes_simple_inner(
         if diff_specs.is_empty() {
             continue;
         }
+        if let Some(exclusive_stack) = exclusive_stack {
+            if exclusive_stack != stack_id {
+                continue; // Skip stacks that are not the exclusive stack.
+            }
+        }
 
         let stack_branch_name = stacks
             .iter()

crates/but/src/command/claude.rs

@@ -103,12 +103,18 @@ pub(crate) async fn handle_stop() -> anyhow::Result<ClaudeHookOutput> {
         file_path: None,
     };
 
+    let session = list_sessions(defer.ctx)?
+        .into_iter()
+        .find(|s| s.id == input.session_id)
+        .ok_or_else(|| anyhow::anyhow!("Lane for session {} not found", input.session_id))?;
+
     let (id, outcome) = but_action::handle_changes(
         defer.ctx,
         &summary,
         Some(prompt.clone()),
         ActionHandler::HandleChangesSimple,
         Source::ClaudeCode(input.session_id),
+        Some(StackId::from_str(&session.stack_id)?),
     )?;
 
     let stacks = crate::log::stacks(defer.ctx)?;

crates/but/src/command/mod.rs

@@ -23,6 +23,7 @@ pub(crate) fn handle_changes(
         None,
         handler.into(),
         Source::ButCli,
+        None,
     )?;
     print(&response, json)
 }

crates/but/src/mcp/mod.rs

@@ -141,6 +141,7 @@ impl Mcp {
             Some(request.full_prompt.clone()),
             ActionHandler::HandleChangesSimple,
             Source::Mcp(client_info.clone().map(Into::into)),
+            None,
         )
         .map_err(|e| McpError::internal_error(e.to_string(), None))?;
         // Trigger commit message generation for newly created commits

crates/gitbutler-tauri/src/action.rs

@@ -36,6 +36,7 @@ pub fn handle_changes(
         None,
         handler,
         but_action::Source::GitButler,
+        None,
     )
     .map(|(_id, outcome)| outcome)
     .map_err(|e| Error::from(anyhow::anyhow!(e)))