Merge pull request 'fix(queue-daemon): make base branch configurable via KUGETSU_BASE_BRANCH' (#257) from fix/issue-165 into main

- Add KUGETSU_BASE_BRANCH env var (default: origin/main)
- Update check_task_completion() to use configurable base branch
- Update create_worktree() to use configurable base branch

Closes #165

skills/kugetsu/SKILL.md

@@ -364,10 +364,14 @@ kugetsu queue-daemon logs       # Show recent daemon logs
 
 **Daemon Behavior:**
 1. Runs at configurable interval (default: 5 minutes)
-2. Checks if active agents < MAX_CONCURRENT_AGENTS
+2. Checks queue for pending items
-3. Picks 1-N pending items (configurable batch size)
+3. For each pending item:
-4. Forks PM session for each picked item
+   - Acquires lock to prevent duplicate processing
-5. PM decides whether to use `start` or `continue`
+   - Sources kugetsu-session.sh and calls `cmd_continue`
+   - `cmd_continue` handles worktree/session creation and forks dev agent from base session
+   - Updates queue item state to "notified"
+4. Uses per-issue locking to prevent race conditions
+5. Implements timeout for tasks that don't complete (marks as "error" after TASK_TIMEOUT_HOURS)
 
 **Queue Directory:**
 ```
@@ -526,6 +530,13 @@ The script will:
 
 See [docs/kugetsu-setup.md](../../docs/kugetsu-setup.md) for full Tailscale setup documentation.
 
+## Version History
+
+### v0.2.3
+- **Queue daemon context drift fix** (issue #156): Daemon now sources kugetsu-session.sh and calls `cmd_continue` directly instead of forking PM session. This fixes context drift where daemon would lose track of task state.
+- **Daemon locking**: Added per-issue locking to prevent race conditions when multiple daemon instances run.
+- **Timeout handling**: Tasks that don't complete within TASK_TIMEOUT_HOURS are marked as "error".
+
 ## Without kugetsu
 
 If kugetsu is not available, use opencode directly:

skills/kugetsu/scripts/kugetsu

@@ -56,21 +56,14 @@ Usage:
     kugetsu queue [subcommand]
 
 Subcommands:
-    list [--limit=N] [--format=json]                 Show pending tasks (default: 10 items, text format)
+    list                                               Show pending tasks (default)
     stats                                              Show queue statistics
     clear                                              Clear all queue items
     enqueue <issue-ref> <message>                      Enqueue a task
     help                                               Show this help
 
-Options for list:
-    --limit=N         Number of items to return (default: 10)
-    --format=json     Output in JSON format with stats
-
 Examples:
     kugetsu queue list
-    kugetsu queue list --limit=50
-    kugetsu queue list --format=json
-    kugetsu queue list --limit=20 --format=json
     kugetsu queue stats
     kugetsu queue clear
     kugetsu queue enqueue github.com/shoko/kugetsu#14 "fix bug"
@@ -362,25 +355,19 @@ PYEOF
 
 get_pending_tasks() {
     local limit="${1:-10}"
-    local format="${2:-text}"
     
     if [ ! -d "$QUEUE_ITEMS_DIR" ]; then
-        if [ "$format" = "json" ]; then
+        echo "[]"
-            echo '{"items": [], "total": 0, "pending": 0}'
-        else
-            echo "No pending tasks in queue."
-        fi
         return
     fi
     
-    python3 << PYEOF
+    python3 -c "
 import json
 import os
 import sys
 
 queue_dir = os.environ.get('QUEUE_ITEMS_DIR', '')
 limit = int(sys.argv[1]) if len(sys.argv) > 1 else 10
-format_type = sys.argv[2] if len(sys.argv) > 2 else 'text'
 
 items = []
 if os.path.isdir(queue_dir):
@@ -392,27 +379,13 @@ if os.path.isdir(queue_dir):
                     data = json.load(f)
                     if data.get('state') == 'pending':
                         items.append(data)
+                        if len(items) >= limit:
+                            break
             except:
                 pass
 
-items.sort(key=lambda x: x.get('pending_since', ''))
+print(json.dumps(items))
-
+" "$limit"
-if format_type == 'json':
-    output = {
-        "items": items[:limit],
-        "total": len(items),
-        "pending": len(items)
-    }
-    print(json.dumps(output))
-else:
-    if not items:
-        print("No pending tasks in queue.")
-    else:
-        print("Pending tasks:")
-        for t in items[:limit]:
-            msg = t.get('message', '')[:50]
-            print(f"  {t.get('id')}: {t.get('issue_ref')} - {msg}...")
-PYEOF
 }
 
 get_queue_stats() {
@@ -947,24 +920,13 @@ cmd_queue() {
             usage_queue
             ;;
         list)
-            local limit="10"
+            local pending_tasks=$(get_pending_tasks 10)
-            local format="text"
+            if [ "$pending_tasks" = "[]" ]; then
-            
+                echo "No pending tasks in queue."
-            while [ $# -gt 0 ]; do
+            else
-                case "$1" in
+                echo "Pending tasks:"
-                    --limit=*)
+                echo "$pending_tasks" | python3 -c "import sys, json; [print(f\"  {t.get('id')}: {t.get('issue_ref')} - {t.get('message', '')[:50]}...\") for t in json.load(sys.stdin)]"
-                        limit="${1#*=}"
+            fi
-                        ;;
-                    --format=json)
-                        format="json"
-                        ;;
-                    *)
-                        ;;
-                esac
-                shift
-            done
-            
-            get_pending_tasks "$limit" "$format"
             ;;
         stats)
             local stats=$(get_queue_stats)

skills/kugetsu/scripts/kugetsu-config.sh

@@ -28,6 +28,7 @@ TASK_TIMEOUT_HOURS="${TASK_TIMEOUT_HOURS:-1}"
 
 NETWORK_RETRY_ATTEMPTS="${NETWORK_RETRY_ATTEMPTS:-3}"
 NETWORK_RETRY_DELAY_SECONDS="${NETWORK_RETRY_DELAY_SECONDS:-5}"
+KUGETSU_BASE_BRANCH="${KUGETSU_BASE_BRANCH:-origin/main}"
 
 # Load user config overrides (~/.kugetsu/config)
 if [ -f "$KUGETSU_DIR/config" ]; then

skills/kugetsu/scripts/kugetsu-queue-daemon.sh

@@ -75,7 +75,7 @@ check_task_completion() {
             local has_commits=false
 
             if [ -d "$worktree_path" ] && [ -d "$worktree_path/.git" ]; then
-                if [ -n "$(git -C "$worktree_path" log --oneline origin/main..HEAD 2>/dev/null)" ]; then
+                if [ -n "$(git -C "$worktree_path" log --oneline "$KUGETSU_BASE_BRANCH..HEAD" 2>/dev/null)" ]; then
                     has_commits=true
                 fi
             fi
@@ -95,7 +95,7 @@ check_task_completion() {
             local has_commits=false
 
             if [ -d "$worktree_path" ] && [ -d "$worktree_path/.git" ]; then
-                if [ -n "$(git -C "$worktree_path" log --oneline origin/main..HEAD 2>/dev/null)" ]; then
+                if [ -n "$(git -C "$worktree_path" log --oneline "$KUGETSU_BASE_BRANCH..HEAD" 2>/dev/null)" ]; then
                     has_commits=true
                 fi
             fi

skills/kugetsu/scripts/kugetsu-worktree.sh

@@ -109,7 +109,7 @@ create_worktree() {
     fi
     
     echo "Creating branch '$branch_name'..."
-    if git -C "$worktree_path" checkout -b "$branch_name" origin/main 2>/dev/null; then
+    if git -C "$worktree_path" checkout -b "$branch_name" "$KUGETSU_BASE_BRANCH" 2>/dev/null; then
         :
     elif git -C "$worktree_path" checkout -b "$branch_name" main 2>/dev/null; then
         :