Compare commits

..

5 Commits

Author SHA1 Message Date
shokollm
cbfc8a0646 refactor(kugetsu): daemon uses cmd_start/cmd_continue instead of direct opencode calls
- Move issue_ref_to_filename and filename_to_issue_ref to kugetsu-index.sh
  (where they logically belong, instead of in main kugetsu script)
- Refactor queue daemon to use cmd_start/cmd_continue for session management
- Daemon now checks if worktree/session exists → cmd_continue, else → cmd_start
- Removes ~40 lines of direct opencode session forking logic from daemon
- cmd_start/cmd_continue handle worktree creation, session forking, and tracking

This simplifies the daemon significantly and centralizes session management
in kugetsu-session.sh where it belongs.
2026-04-05 21:29:34 +00:00
shokollm
7fa669b4c3 fix(kugetsu): queue daemon runs PM agent in correct worktree with proper token
- Load GITEA_TOKEN from ~/.kugetsu/env/default.env at daemon startup
- Use --fork --session --dir instead of --continue to run in correct directory
- Create worktree if it doesn't exist for the issue
- Track forked session ID (not parent pm_session) for completion detection
- Forked session ends when task completes, parent pm_session continues

Fixes #156
2026-04-05 20:57:51 +00:00
acb503471d Merge pull request 'fix(kugetsu): detect task completion and queue state updates' (#154) from fix/issue-150 into main 2026-04-05 15:10:48 +02:00
shokollm
1d4f190d97 fix(kugetsu): pass GITEA_TOKEN via env to subprocess instead of hardcoded value 2026-04-05 13:09:08 +00:00
shokollm
ab0c4e1448 fix: detect task completion by checking if session ended and has commits 2026-04-05 12:45:59 +00:00
3 changed files with 79 additions and 16 deletions

View File

@@ -99,17 +99,6 @@ ensure_worktree_dir() {
mkdir -p "$WORKTREES_DIR"
}
issue_ref_to_filename() {
local issue_ref="$1"
echo "$issue_ref" | sed 's/[\/:]/-/g' | sed 's/#/-/'
}
filename_to_issue_ref() {
local filename="$1"
local name="${filename%.json}"
echo "$name" | sed 's/-\([0-9]*\)$/#\1/' | sed 's/-/\//g'
}
issue_ref_to_context_file() {
local issue_ref="$1"
local context_filename=$(issue_ref_to_filename "$issue_ref")

View File

@@ -133,3 +133,16 @@ with open(session_path, 'w') as f:
print(f"Updated PR URL for $issue_ref: $pr_url")
PYEOF
}
# Convert issue ref to session filename
issue_ref_to_filename() {
local issue_ref="$1"
echo "$issue_ref" | sed 's/[\/:]/-/g' | sed 's/#/-/'
}
# Convert session filename back to issue ref
filename_to_issue_ref() {
local filename="$1"
local name="${filename%.json}"
echo "$name" | sed 's-\([0-9]*\)$-#\1-' | sed 's/-/\//g'
}

69
skills/kugetsu/scripts/kugetsu-queue-daemon.sh Executable file → Normal file
View File

@@ -8,8 +8,58 @@ source "$SCRIPT_DIR/kugetsu-index.sh"
source "$SCRIPT_DIR/kugetsu-worktree.sh"
source "$SCRIPT_DIR/kugetsu-log.sh"
# Load GITEA_TOKEN from default.env
if [ -f "$HOME/.kugetsu/env/default.env" ]; then
source "$HOME/.kugetsu/env/default.env"
fi
# Check if a notified task has completed (forked session ended or has new commits)
check_task_completion() {
local item="$1"
local queue_id=$(basename "$item" .json)
local state=$(python3 -c "import json; print(json.load(open('$item')).get('state', ''))" 2>/dev/null)
[ "$state" = "notified" ] || return 0
# Use opencode_session_id (the forked session, not the parent pm_session)
local session_id=$(python3 -c "import json; print(json.load(open('$item')).get('opencode_session_id', ''))" 2>/dev/null)
local issue_ref=$(python3 -c "import json; print(json.load(open('$item')).get('issue_ref', ''))" 2>/dev/null)
# If no session tracked, skip
[ -n "$session_id" ] || return 0
# Check if forked session still exists in opencode
if ! opencode session list 2>/dev/null | grep -q "$session_id"; then
# Forked session ended — check if work was done
local worktree_path=$(issue_ref_to_worktree_path "$issue_ref" "$HOME/.kugetsu-worktrees")
local has_commits=false
if [ -d "$worktree_path" ] && [ -d "$worktree_path/.git" ]; then
# Check if worktree has new commits beyond origin/main
if [ -n "$(git -C "$worktree_path" log --oneline origin/main..HEAD 2>/dev/null)" ]; then
has_commits=true
fi
fi
if [ "$has_commits" = true ]; then
update_queue_item_state "$queue_id" "completed"
echo "Task $queue_id ($issue_ref) completed — new commits found"
else
update_queue_item_state "$queue_id" "error"
echo "Task $queue_id ($issue_ref) marked error — no commits found after session ended"
fi
fi
}
while true; do
# Check completion of notified tasks
if [ -d "$QUEUE_ITEMS_DIR" ]; then
for item in "$QUEUE_ITEMS_DIR"/*.json; do
[ -f "$item" ] || continue
check_task_completion "$item"
done
# Process pending tasks
for item in "$QUEUE_ITEMS_DIR"/*.json; do
[ -f "$item" ] || continue
state=$(python3 -c "import json; print(json.load(open('$item')).get('state', ''))" 2>/dev/null)
@@ -18,12 +68,23 @@ while true; do
issue_ref=$(python3 -c "import json; print(json.load(open('$item')).get('issue_ref', ''))" 2>/dev/null)
message=$(python3 -c "import json; print(json.load(open('$item')).get('message', ''))" 2>/dev/null)
pm_session=$(get_pm_agent_session_id)
if [ -n "$pm_session" ] && [ "$pm_session" != "null" ]; then
# Source session management and use cmd_start/cmd_continue
source "$SCRIPT_DIR/kugetsu-session.sh"
if worktree_exists "$issue_ref" "$HOME/.kugetsu-worktrees" || [ -f "$SESSIONS_DIR/$(issue_ref_to_filename "$issue_ref").json" ]; then
# Continue existing session
log_file="$LOGS_DIR/delegate-$(date +%s).log"
GITEA_TOKEN="${GITEA_TOKEN:-}" nohup sh -c "opencode run '$message' --continue --session '$pm_session' >> '$log_file' 2>&1" > /dev/null 2>&1 &
cmd_continue "$issue_ref" "$message" >> "$log_file" 2>&1 &
pid=$!
update_queue_item_state "$queue_id" "notified" "$pm_session" "$pid"
update_queue_item_state "$queue_id" "notified" "" "$pid"
echo "Task $queue_id continued for $issue_ref"
else
# Start new session
log_file="$LOGS_DIR/delegate-$(date +%s).log"
cmd_start "$issue_ref" "$message" >> "$log_file" 2>&1 &
pid=$!
update_queue_item_state "$queue_id" "notified" "" "$pid"
echo "Task $queue_id started for $issue_ref"
fi
fi
done