diff --git a/skills/kugetsu/scripts/kugetsu b/skills/kugetsu/scripts/kugetsu
index 32cb19e..75fe5c2 100755
--- a/skills/kugetsu/scripts/kugetsu
+++ b/skills/kugetsu/scripts/kugetsu
@@ -734,6 +734,10 @@ cmd_init() {
         pm_prompt="You are a PM (Project Manager) agent. Your role is to coordinate task delegation and review PRs. $pm_context"
     fi
     
+    # Set GIT_EDITOR to cat for non-interactive git operations (rebase, etc.)
+    export GIT_EDITOR=cat
+    export EDITOR=cat
+    
     opencode run "$pm_prompt" --fork --session "$new_session_id" 2>&1 || true
     
     local after_sessions=$(opencode session list 2>/dev/null | grep -oP '^ses_\w+' | sort)