|
|
|
|
@@ -83,6 +83,10 @@ EOF
|
|
|
|
|
if [ -n "$existing_base" ] && [ "$existing_base" != "null" ]; then
|
|
|
|
|
if [ "$force" = true ]; then
|
|
|
|
|
echo "Warning: Reinitializing sessions (force mode)" >&2
|
|
|
|
|
echo "Destroying all sessions, worktrees, and logs..." >&2
|
|
|
|
|
cmd_destroy --base -y 2>/dev/null || true
|
|
|
|
|
cmd_destroy --pm-agent -y 2>/dev/null || true
|
|
|
|
|
rm -f "$LOGS_DIR"/*.log 2>/dev/null || true
|
|
|
|
|
else
|
|
|
|
|
echo "Error: Base session already exists: $existing_base" >&2
|
|
|
|
|
echo "Use --force to reinitialize" >&2
|
|
|
|
|
@@ -221,7 +225,10 @@ cmd_delegate() {
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
nohup sh -c "GITEA_TOKEN='${GITEA_TOKEN:-}' opencode run '$message' --session '$new_session'" >> "$log_file" 2>&1 &
|
|
|
|
|
local msg_file="$LOGS_DIR/msg-$new_session.txt"
|
|
|
|
|
printf '%s' "$message" > "$msg_file"
|
|
|
|
|
nohup sh -c "GITEA_TOKEN='${GITEA_TOKEN:-}' opencode run '@$msg_file' --session '$new_session'" >> "$log_file" 2>&1 &
|
|
|
|
|
rm -f "$msg_file"
|
|
|
|
|
echo "Delegated to new session (logged to $(basename "$log_file"))"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -234,20 +241,22 @@ create_session() {
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
local before_json=$(opencode session list --format=json 2>/dev/null)
|
|
|
|
|
local before_ids=$(echo "$before_json" | python3 -c "import sys,json; sessions=json.load(sys.stdin); print(' '.join(s['id'] for s in sessions))" 2>/dev/null || echo "")
|
|
|
|
|
local before_set=$(echo "$before_json" | python3 -c "import sys,json; sessions=json.load(sys.stdin); print('|'.join(s['id'] for s in sessions))" 2>/dev/null || echo "|")
|
|
|
|
|
|
|
|
|
|
opencode run --fork --session "$base_session" "new session" 2>/dev/null
|
|
|
|
|
opencode run --fork --session "$base_session" "new session" >/dev/null 2>&1
|
|
|
|
|
|
|
|
|
|
sleep 1
|
|
|
|
|
|
|
|
|
|
local after_json=$(opencode session list --format=json 2>/dev/null)
|
|
|
|
|
local after_ids=$(echo "$after_json" | python3 -c "import sys,json; sessions=json.load(sys.stdin); print(' '.join(s['id'] for s in sessions))" 2>/dev/null || echo "")
|
|
|
|
|
local after_sessions=$(echo "$after_json" | python3 -c "import sys,json; sessions=json.load(sys.stdin); [print(s['id']) for s in sessions]" 2>/dev/null || true)
|
|
|
|
|
|
|
|
|
|
local new_session_id=""
|
|
|
|
|
for sess in $after_ids; do
|
|
|
|
|
if [[ ! " $before_ids " =~ " $sess " ]] && [[ "$sess" != "$base_session" ]]; then
|
|
|
|
|
while IFS= read -r sess; do
|
|
|
|
|
if [[ -n "$sess" ]] && [[ ! "$before_set" =~ \|${sess}\| ]]; then
|
|
|
|
|
new_session_id="$sess"
|
|
|
|
|
break
|
|
|
|
|
fi
|
|
|
|
|
done
|
|
|
|
|
done <<< "$after_sessions"
|
|
|
|
|
|
|
|
|
|
echo "$new_session_id"
|
|
|
|
|
}
|
|
|
|
|
@@ -309,26 +318,44 @@ cmd_start() {
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
local session_file=$(issue_ref_to_filename "$issue_ref")
|
|
|
|
|
local session_path="$SESSIONS_DIR/$session_file"
|
|
|
|
|
local worktree_exists=false
|
|
|
|
|
|
|
|
|
|
if worktree_exists "$issue_ref"; then
|
|
|
|
|
echo "Issue '$issue_ref' already has a worktree. Use 'kugetsu continue' instead."
|
|
|
|
|
worktree_exists=true
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
local session_exists=false
|
|
|
|
|
if [ -f "$session_path" ]; then
|
|
|
|
|
session_exists=true
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if $worktree_exists && $session_exists; then
|
|
|
|
|
echo "Issue '$issue_ref' already has a worktree and session." >&2
|
|
|
|
|
echo "Use 'kugetsu continue $issue_ref' to continue work." >&2
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if $worktree_exists && ! $session_exists; then
|
|
|
|
|
echo "Warning: Worktree exists but session is missing. Removing worktree to recreate both..." >&2
|
|
|
|
|
remove_worktree_for_issue "$issue_ref"
|
|
|
|
|
worktree_exists=false
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if ! $worktree_exists && $session_exists; then
|
|
|
|
|
echo "Warning: Session exists but worktree is missing. Removing stale session to recreate both..." >&2
|
|
|
|
|
rm -f "$session_path"
|
|
|
|
|
remove_issue_from_index "$issue_ref"
|
|
|
|
|
session_exists=false
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
local active_count=$(count_active_dev_sessions)
|
|
|
|
|
if [ "$active_count" -ge "${MAX_CONCURRENT_AGENTS:-3}" ]; then
|
|
|
|
|
echo "Error: Max concurrent agents (${MAX_CONCURRENT_AGENTS:-3}) reached. Use 'kugetsu continue' or wait for an agent to finish." >&2
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
local session_file=$(issue_ref_to_filename "$issue_ref")
|
|
|
|
|
local session_path="$SESSIONS_DIR/$session_file"
|
|
|
|
|
|
|
|
|
|
if [ -f "$session_path" ]; then
|
|
|
|
|
echo "Session file already exists: $session_file"
|
|
|
|
|
echo "Use 'kugetsu continue $issue_ref' to continue work."
|
|
|
|
|
exit 1
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
create_worktree "$issue_ref" "$WORKTREES_DIR"
|
|
|
|
|
|
|
|
|
|
local new_session_id=$(create_session "$base_session_id")
|
|
|
|
|
@@ -351,7 +378,11 @@ cmd_start() {
|
|
|
|
|
load_agent_env "dev"
|
|
|
|
|
|
|
|
|
|
cd "$worktree_path"
|
|
|
|
|
nohup sh -c "GITEA_TOKEN='${GITEA_TOKEN:-}' opencode run '$dev_message' --session '$new_session_id'" >> "$LOGS_DIR/dev-$new_session_id.log" 2>&1 &
|
|
|
|
|
local sanitized_id=$(echo "$new_session_id" | sed 's/[^a-zA-Z0-9_-]/_/g')
|
|
|
|
|
local msg_file="$worktree_path/.kugetsu-msg.txt"
|
|
|
|
|
printf '%s' "$dev_message" > "$msg_file"
|
|
|
|
|
nohup sh -c "GITEA_TOKEN='${GITEA_TOKEN:-}' opencode run '@$msg_file' --session '$new_session_id'" >> "$LOGS_DIR/dev-$sanitized_id.log" 2>&1 &
|
|
|
|
|
rm -f "$msg_file"
|
|
|
|
|
|
|
|
|
|
echo "Session started for '$issue_ref': $new_session_id"
|
|
|
|
|
echo "Worktree: $worktree_path"
|
|
|
|
|
@@ -400,16 +431,25 @@ cmd_continue() {
|
|
|
|
|
local worktree_path=$(python3 -c "import json; print(json.load(open('$session_path')).get('worktree_path', ''))" 2>/dev/null || echo "")
|
|
|
|
|
local issue_ref=$(python3 -c "import json; print(json.load(open('$session_path')).get('issue_ref', ''))" 2>/dev/null || echo "")
|
|
|
|
|
|
|
|
|
|
if [ -z "$worktree_path" ] || [ ! -d "$worktree_path" ]; then
|
|
|
|
|
echo "Warning: Worktree is missing for '$session_name'. Recovering..." >&2
|
|
|
|
|
rm -f "$session_path"
|
|
|
|
|
remove_issue_from_index "$session_name"
|
|
|
|
|
echo "Calling cmd_start to create new session and worktree..." >&2
|
|
|
|
|
cmd_start "$session_name" "$message"
|
|
|
|
|
return $?
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if [ -z "$message" ]; then
|
|
|
|
|
message=$(build_dev_agent_message "$issue_ref" "")
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if [ -n "$worktree_path" ] && [ -d "$worktree_path" ]; then
|
|
|
|
|
cd "$worktree_path"
|
|
|
|
|
nohup sh -c "GITEA_TOKEN='${GITEA_TOKEN:-}' opencode run '$message' --session '$opencode_session_id'" >> "$LOGS_DIR/dev-$opencode_session_id.log" 2>&1 &
|
|
|
|
|
else
|
|
|
|
|
nohup sh -c "GITEA_TOKEN='${GITEA_TOKEN:-}' opencode run '$message' --session '$opencode_session_id'" >> "$LOGS_DIR/dev-$opencode_session_id.log" 2>&1 &
|
|
|
|
|
fi
|
|
|
|
|
local sanitized_id=$(echo "$opencode_session_id" | sed 's/[^a-zA-Z0-9_-]/_/g')
|
|
|
|
|
local msg_file="$worktree_path/.kugetsu-msg.txt"
|
|
|
|
|
printf '%s' "$message" > "$msg_file"
|
|
|
|
|
nohup sh -c "GITEA_TOKEN='${GITEA_TOKEN:-}' opencode run '@$msg_file' --session '$opencode_session_id'" >> "$LOGS_DIR/dev-$sanitized_id.log" 2>&1 &
|
|
|
|
|
rm -f "$msg_file"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
cmd_list() {
|
|
|
|
|
|