fix: session ID collision in cmd_start by excluding pm_agent_session_id

When cmd_start forks a new session, the session detection logic now excludes both base_session_id AND pm_agent_session_id to prevent forked sessions from being misidentified as the pm-agent session. This addresses issue #81 where forked sessions were showing the same session ID as the pm-agent.
Merge pull request 'fix(kugetsu): set GIT_EDITOR=cat for non-interactive git operations (fixes #70 )' (#72 ) from fix/issue-70-git-editor into main
2026-04-01 23:35:57 +00:00 · 2026-04-01 10:54:59 +02:00 · 2026-04-01 08:49:57 +00:00
1 changed files with 5 additions and 1 deletions
--- a/skills/kugetsu/scripts/kugetsu
+++ b/skills/kugetsu/scripts/kugetsu
@@ -751,6 +751,10 @@ EOF
        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)
@@ -848,7 +852,7 @@ cmd_start() {
    local after_sessions=$(opencode session list 2>/dev/null | grep -oP '^ses_\w+' | sort)
    local new_session_id=""
    while IFS= read -r sess; do
-        if [[ ! "$before_set" =~ \|${sess}\| ]] && [[ "$sess" != "$base_session_id" ]]; then
+        if [[ ! "$before_set" =~ \|${sess}\| ]] && [[ "$sess" != "$base_session_id" ]] && [[ "$sess" != "$pm_agent_session_id" ]]; then
            new_session_id="$sess"
            break
        fi