Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 97d7511e56 | |||
|
|
cd12a0cda8 | ||
| ffdf5e34c8 | |||
|
|
b3ac73a283 | ||
|
|
1128b3dfa8 | ||
| 90f46a778a |
@@ -1243,40 +1243,76 @@ cmd_start() {
|
||||
exit 1
|
||||
fi
|
||||
|
||||
local fork_log="$SESSIONS_DIR/$session_file.fork.log"
|
||||
local opencode_db="${OPENCODE_DB:-$HOME/.local/share/opencode/opencode.db}"
|
||||
|
||||
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
|
||||
(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
|
||||
|
||||
# Wait briefly for session to be created
|
||||
sleep 1
|
||||
|
||||
# Find the new session by comparing before/after lists
|
||||
# Skip any session that existed before the fork and skip base/pm-agent
|
||||
local fork_pid=$!
|
||||
|
||||
local max_attempts=10
|
||||
local attempt=1
|
||||
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
|
||||
local fork_log_output=""
|
||||
|
||||
while [ $attempt -le $max_attempts ]; do
|
||||
sleep 1
|
||||
|
||||
# Check if this session existed before
|
||||
local existed_before=false
|
||||
for before_sess in "${before_sessions[@]}"; do
|
||||
if [ "$sess" = "$before_sess" ]; then
|
||||
existed_before=true
|
||||
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
|
||||
done < <(opencode session list 2>/dev/null | grep -oP '^ses_\w+')
|
||||
|
||||
if [ "$existed_before" = false ]; then
|
||||
new_session_id="$sess"
|
||||
if [ -n "$new_session_id" ]; then
|
||||
break
|
||||
fi
|
||||
done < <(opencode session list 2>/dev/null | grep -oP '^ses_\w+')
|
||||
|
||||
if ! kill -0 $fork_pid 2>/dev/null; then
|
||||
fork_log_output=$(tail -20 "$fork_log" 2>/dev/null || echo "(log empty or unavailable)")
|
||||
break
|
||||
fi
|
||||
|
||||
attempt=$((attempt + 1))
|
||||
done
|
||||
|
||||
if [ -z "$new_session_id" ]; then
|
||||
echo "Error: Could not find newly created session" >&2
|
||||
if [ -f "$opencode_db" ]; then
|
||||
local db_sessions=$(python3 -c "
|
||||
import sqlite3
|
||||
conn = sqlite3.connect('$opencode_db')
|
||||
cursor = conn.cursor()
|
||||
cursor.execute(\"SELECT id FROM session WHERE parent_id IS NOT NULL ORDER BY time_created DESC LIMIT 5\")
|
||||
for row in cursor.fetchall():
|
||||
print(row[0])
|
||||
" 2>/dev/null || echo "")
|
||||
if [ -n "$db_sessions" ]; then
|
||||
echo "Recent forked sessions in DB:" >&2
|
||||
echo "$db_sessions" >&2
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "Error: Could not find newly created session after ${max_attempts}s" >&2
|
||||
if [ -n "$fork_log_output" ]; then
|
||||
echo "Fork log output:" >&2
|
||||
echo "$fork_log_output" >&2
|
||||
fi
|
||||
remove_worktree_for_issue "$issue_ref"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user