shoko/kugetsu
1
0
Fork 0
Code Issues 17 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge pull request 'fix(kugetsu): improve session detection in cmd_start with retry logic and logging' (#107) from fix/start-session-detection into main

Browse Source
This commit was merged in pull request #107.
This commit is contained in:
shoko
2026-04-02 11:41:52 +02:00
parent 90f46a778a b3ac73a283
commit ffdf5e34c8
1 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
skills/kugetsu/scripts/kugetsu
View File

@@ -1243,40 +1243,62 @@ cmd_start() {
exit 1 exit 1
fi fi
local fork_log="$SESSIONS_DIR/$session_file.fork.log"
if [ "$DEBUG_MODE" = true ]; then if [ "$DEBUG_MODE" = true ]; then
(cd "$worktree_path" && opencode run "$message" --fork --session "$base_session_id" 2>&1) | tee "$SESSIONS_DIR/$session_file.debug.log" & (cd "$worktree_path" && opencode run "$message" --fork --session "$base_session_id" 2>&1) | tee "$fork_log" &
else else
(cd "$worktree_path" && opencode run "$message" --fork --session "$base_session_id" 2>&1) & (cd "$worktree_path" && opencode run "$message" --fork --session "$base_session_id" 2>&1) >> "$fork_log" &
fi fi
# Wait briefly for session to be created local fork_pid=$!
sleep 1
# Find the new session by comparing before/after lists local max_attempts=10
# Skip any session that existed before the fork and skip base/pm-agent local attempt=1
local new_session_id="" local new_session_id=""
while IFS= read -r sess; do
# Skip base and pm-agent
[ "$sess" = "$base_session_id" ] && continue
[ "$sess" = "$pm_agent_session_id" ] && continue
# Check if this session existed before while [ $attempt -le $max_attempts ]; do
local existed_before=false sleep 1
for before_sess in "${before_sessions[@]}"; do
if [ "$sess" = "$before_sess" ]; then if ! kill -0 $fork_pid 2>/dev/null; then
existed_before=true if [ -s "$fork_log" ]; then
break echo "Fork command exited. Log output:" >&2
tail -20 "$fork_log" >&2
fi fi
done
if [ "$existed_before" = false ]; then
new_session_id="$sess"
break break
fi fi
done < <(opencode session list 2>/dev/null | grep -oP '^ses_\w+')
while IFS= read -r sess; do
[ "$sess" = "$base_session_id" ] && continue
[ "$sess" = "$pm_agent_session_id" ] && continue
local existed_before=false
for before_sess in "${before_sessions[@]}"; do
if [ "$sess" = "$before_sess" ]; then
existed_before=true
break
fi
done
if [ "$existed_before" = false ]; then
new_session_id="$sess"
break
fi
done < <(opencode session list 2>/dev/null | grep -oP '^ses_\w+')
if [ -n "$new_session_id" ]; then
break
fi
attempt=$((attempt + 1))
done
if [ -z "$new_session_id" ]; then if [ -z "$new_session_id" ]; then
echo "Error: Could not find newly created session" >&2 echo "Error: Could not find newly created session after ${max_attempts}s" >&2
if [ -f "$fork_log" ] && [ -s "$fork_log" ]; then
echo "Fork log:" >&2
tail -30 "$fork_log" >&2
fi
remove_worktree_for_issue "$issue_ref" remove_worktree_for_issue "$issue_ref"
exit 1 exit 1
fi fi