Merge origin/main into fix/issue-160-queue-daemon-gitea-token

docs/CHANGELOG.md

@@ -6,25 +6,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
 
-## [v0.2.4] - 2026-04-06
-
-### Fixed
-- Queue daemon: Locking to prevent daemon vs manual conflicts
-- Queue daemon: Proper error handling for failed tasks
-- Queue daemon: Fix GITEA_TOKEN loading from pm-agent.env
-- cmd_delegate: Enqueue tasks instead of bypassing queue
-- Notifications: Call kugetsu_add_notification from bash instead of os.system()
-- kugetsu: Remove duplicate update_queue_item_state that overwrote fixed version
-
-### Added
-- Queue functions moved to kugetsu-index.sh for daemon access
-- kugetsu-session.sh sources required modules for daemon use
-
-## [v0.2.3] - 2026-04-06
-
-### Fixed
-- get_pending_tasks() returns proper JSON array instead of concatenated JSON objects
-
 ## [v0.2.1] - 2026-04-03
 
 ### Fixed

skills/kugetsu/scripts/kugetsu

@@ -93,10 +93,6 @@ EOF
 
 ensure_dirs() {
     mkdir -p "$SESSIONS_DIR"
-    mkdir -p "$LOGS_DIR"
-    mkdir -p "$WORKTREES_DIR"
-    mkdir -p "$QUEUE_DIR"
-    mkdir -p "$QUEUE_ITEMS_DIR"
 }
 
 ensure_worktree_dir() {
@@ -261,9 +257,7 @@ PYEOF
 }
 
 ensure_queue_dirs() {
-    mkdir -p "$QUEUE_DIR"
     mkdir -p "$QUEUE_ITEMS_DIR"
-    mkdir -p "$LOGS_DIR"
 }
 
 generate_queue_id() {
@@ -316,31 +310,12 @@ get_pending_tasks() {
         return
     fi
     
-    python3 -c "
+    find "$QUEUE_ITEMS_DIR" -name "*.json" -type f 2>/dev/null | while read -r file; do
-import json
+        local state=$(python3 -c "import json; print(json.load(open('$file')).get('state', ''))" 2>/dev/null || echo "")
-import os
+        if [ "$state" = "pending" ]; then
-import sys
+            cat "$file"
-
+        fi
-queue_dir = os.environ.get('QUEUE_ITEMS_DIR', '')
+    done | head -"$limit"
-limit = int(sys.argv[1]) if len(sys.argv) > 1 else 10
-
-items = []
-if os.path.isdir(queue_dir):
-    for filename in os.listdir(queue_dir):
-        if filename.endswith('.json'):
-            filepath = os.path.join(queue_dir, filename)
-            try:
-                with open(filepath) as f:
-                    data = json.load(f)
-                    if data.get('state') == 'pending':
-                        items.append(data)
-                        if len(items) >= limit:
-                            break
-            except:
-                pass
-
-print(json.dumps(items))
-" "$limit"
 }
 
 get_queue_stats() {
@@ -367,6 +342,55 @@ get_queue_stats() {
     echo "{\"total\": $total, \"pending\": $pending, \"notified\": $notified, \"completed\": $completed, \"error\": $error}"
 }
 
+update_queue_item_state() {
+    local queue_id="$1"
+    local new_state="$2"
+    local session_id="${3:-}"
+    local pid="${4:-}"
+    
+    local item_file="$QUEUE_ITEMS_DIR/${queue_id}.json"
+    if [ ! -f "$item_file" ]; then
+        echo "Error: Queue item not found: $queue_id" >&2
+        return 1
+    fi
+    
+    python3 << PYEOF
+import json
+import os
+from datetime import datetime
+
+item_file = "$item_file"
+new_state = "$new_state"
+session_id = "$session_id"
+pid = "$pid"
+
+with open(item_file, 'r') as f:
+    item = json.load(f)
+
+issue_ref = item.get('issue_ref', '')
+
+item['state'] = new_state
+
+if new_state == "notified":
+    item['notified_at'] = datetime.now().isoformat() + "Z"
+    if session_id:
+        item['opencode_session_id'] = session_id
+    if pid:
+        item['pid'] = int(pid) if pid.isdigit() else None
+elif new_state == "completed":
+    item['completed_at'] = datetime.now().isoformat() + "Z"
+    os.system(f"kugetsu_add_notification 'task_completed' 'Task completed: {issue_ref}' '{issue_ref}'")
+elif new_state == "error":
+    item['error'] = datetime.now().isoformat() + "Z"
+    os.system(f"kugetsu_add_notification 'task_error' 'Task error: {issue_ref}' '{issue_ref}'")
+
+with open(item_file, 'w') as f:
+    json.dump(item, f, indent=2)
+
+print(f"Updated $queue_id to state: $new_state")
+PYEOF
+}
+
 check_task_timeouts() {
     if [ ! -d "$QUEUE_ITEMS_DIR" ]; then
         return
@@ -854,11 +878,6 @@ EOF
 }
 
 parse_issue_ref_from_message() {
-    # DEPRECATED: This function is not called anywhere.
-    # The active implementation is extract_issue_ref_from_message()
-    # in kugetsu-session.sh which is used by cmd_delegate.
-    # This function is kept for backwards compatibility and will
-    # be removed in a future release.
     local message="$1"
     
     local gitserver=""
@@ -866,20 +885,21 @@ parse_issue_ref_from_message() {
     local repo=""
     local issue_number=""
     
-    if [[ "$message" =~ (https?://)?([a-zA-Z0-9.-]+\.[a-zA-Z]{2,})/([a-zA-Z0-9._-]+)/([a-zA-Z0-9._-]+)/(issues|pull)/([0-9]+) ]]; then
+    if echo "$message" | grep -qE '[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+/(issues|pull)/[0-9]+'; then
-        gitserver="${BASH_REMATCH[2]}"
+        gitserver=$(echo "$message" | grep -oE '[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+' | head -1 | sed 's/\/[^/]*\/[^/]*$//')
-        owner="${BASH_REMATCH[3]}"
+        local full_path=$(echo "$message" | grep -oE '[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+/(issues|pull)/[0-9]+' | head -1)
-        repo="${BASH_REMATCH[4]}"
+        owner=$(echo "$full_path" | cut -d'/' -f2)
-        issue_number="${BASH_REMATCH[6]}"
+        repo=$(echo "$full_path" | cut -d'/' -f3)
-    elif [[ "$message" =~ (https?://)?([a-zA-Z0-9.-]+\.[a-zA-Z]{2,})/([a-zA-Z0-9._-]+)/([a-zA-Z0-9._-]+)#([0-9]+) ]]; then
+        issue_number=$(echo "$full_path" | grep -oE '[0-9]+$' | head -1)
-        gitserver="${BASH_REMATCH[2]}"
+    elif echo "$message" | grep -qE '[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+#[0-9]+'; then
-        owner="${BASH_REMATCH[3]}"
+        gitserver=$(echo "$message" | grep -oE '[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+' | head -1)
-        repo="${BASH_REMATCH[4]}"
+        owner=$(echo "$gitserver" | cut -d'/' -f2)
-        issue_number="${BASH_REMATCH[5]}"
+        repo=$(echo "$gitserver" | cut -d'/' -f3)
-    elif [[ "$message" =~ ([a-zA-Z0-9._-]+)/([a-zA-Z0-9._-]+)#([0-9]+) ]]; then
+        issue_number=$(echo "$message" | grep -oE '#[0-9]+' | grep -oE '[0-9]+' | head -1)
-        owner="${BASH_REMATCH[1]}"
+    elif echo "$message" | grep -qE '[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+#([0-9]+)'; then
-        repo="${BASH_REMATCH[2]}"
+        owner=$(echo "$message" | grep -oE '[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+#' | sed 's/#$//' | cut -d'/' -f1)
-        issue_number="${BASH_REMATCH[3]}"
+        repo=$(echo "$message" | grep -oE '[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+#' | sed 's/#$//' | cut -d'/' -f2)
+        issue_number=$(echo "$message" | grep -oE '#[0-9]+' | grep -oE '[0-9]+' | head -1)
     fi
     
     echo "${gitserver}|${owner}|${repo}|${issue_number}"

skills/kugetsu/scripts/kugetsu-index.sh

@@ -146,98 +146,3 @@ filename_to_issue_ref() {
     local name="${filename%.json}"
     echo "$name" | sed 's-\([0-9]*\)$-#\1-' | sed 's/-/\//g'
 }
-
-# Add notification to notifications file
-kugetsu_add_notification() {
-    local type="$1"
-    local message="$2"
-    local issue_ref="${3:-}"
-    local gitea_url="${4:-}"
-    
-    mkdir -p "$(dirname "$NOTIFICATIONS_FILE")"
-    
-    python3 << PYEOF
-import json
-import os
-from datetime import datetime
-
-notification = {
-    "type": "$type",
-    "message": "$message",
-    "issue_ref": "$issue_ref" if "$issue_ref" else None,
-    "gitea_url": "$gitea_url" if "$gitea_url" else None,
-    "timestamp": datetime.now().isoformat(),
-    "read": False
-}
-
-file_path = os.path.expanduser("$NOTIFICATIONS_FILE")
-notifications = []
-
-if os.path.exists(file_path):
-    try:
-        with open(file_path, 'r') as f:
-            notifications = json.load(f)
-    except:
-        notifications = []
-
-notifications.append(notification)
-
-with open(file_path, 'w') as f:
-    json.dump(notifications, f, indent=2)
-
-print("Notification added")
-PYEOF
-}
-
-# Update queue item state
-update_queue_item_state() {
-    local queue_id="$1"
-    local new_state="$2"
-    local session_id="${3:-}"
-    local pid="${4:-}"
-    
-    local item_file="$QUEUE_ITEMS_DIR/${queue_id}.json"
-    if [ ! -f "$item_file" ]; then
-        echo "Error: Queue item not found: $queue_id" >&2
-        return 1
-    fi
-    
-    local issue_ref=$(python3 -c "import json; print(json.load(open('$item_file')).get('issue_ref', ''))" 2>/dev/null || echo "")
-    
-    python3 << PYEOF
-import json
-from datetime import datetime
-
-item_file = "$item_file"
-new_state = "$new_state"
-session_id = "$session_id"
-pid = "$pid"
-
-with open(item_file, 'r') as f:
-    item = json.load(f)
-
-item['state'] = new_state
-
-if new_state == "notified":
-    item['notified_at'] = datetime.now().isoformat() + "Z"
-    if session_id:
-        item['opencode_session_id'] = session_id
-    if pid:
-        item['pid'] = int(pid) if pid.isdigit() else None
-elif new_state == "completed":
-    item['completed_at'] = datetime.now().isoformat() + "Z"
-elif new_state == "error":
-    item['error'] = datetime.now().isoformat() + "Z"
-
-with open(item_file, 'w') as f:
-    json.dump(item, f, indent=2)
-
-print(f"Updated $queue_id to state: $new_state")
-PYEOF
-    
-    if [ "$new_state" = "completed" ]; then
-        kugetsu_add_notification "task_completed" "Task completed: $issue_ref" "$issue_ref"
-    elif [ "$new_state" = "error" ]; then
-        kugetsu_add_notification "task_error" "Task error: $issue_ref" "$issue_ref"
-    fi
-}

skills/kugetsu/scripts/kugetsu-log.sh

@@ -43,24 +43,15 @@ kugetsu_add_notification() {
         notifications=$(cat "$NOTIFICATIONS_FILE")
     fi
     
-    notifications=$(echo "$notifications" | python3 -c "
+    local new_notification=$(python3 -c "import json; print(json.dumps({
-import json
-import sys
-
-notifications = json.load(sys.stdin)
-new_notification = {
         'type': '$notification_type',
-    'message': '''$message'''.replace('\"', '\"'),
+        'message': '$message',
-    'issue_ref': '$issue_ref' if '$issue_ref' else None,
+        'issue_ref': '$issue_ref',
         'timestamp': '$timestamp',
         'read': False
-}
+    }))")
     
-notifications.append(new_notification)
+    notifications=$(python3 -c "import json; n=json.loads('$notifications'); n.append(json.loads('$new_notification')); print(json.dumps(n[-50:] if len(n)>50 else n, indent=2))")
-notifications = notifications[-50:] if len(notifications) > 50 else notifications
-
-print(json.dumps(notifications, indent=2))
-")
     
     echo "$notifications" > "$NOTIFICATIONS_FILE"
 }

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

@@ -8,29 +8,12 @@ source "$SCRIPT_DIR/kugetsu-index.sh"
 source "$SCRIPT_DIR/kugetsu-worktree.sh"
 source "$SCRIPT_DIR/kugetsu-log.sh"
 
-load_agent_env "pm-agent"
+# Load GITEA_TOKEN from default.env
-
+if [ -f "$HOME/.kugetsu/env/default.env" ]; then
-acquire_lock() {
+    source "$HOME/.kugetsu/env/default.env"
-    local issue_ref="$1"
+fi
-    local lock_file="$QUEUE_DIR/locks/$(echo "$issue_ref" | sed 's/[\/:]/-/g' | sed 's/#/-/').lock"
-    mkdir -p "$(dirname "$lock_file")"
-    if [ -f "$lock_file" ]; then
-        local pid=$(cat "$lock_file" 2>/dev/null || echo "")
-        if [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null; then
-            return 1
-        fi
-        rm -f "$lock_file"
-    fi
-    echo $$ > "$lock_file"
-    return 0
-}
-
-release_lock() {
-    local issue_ref="$1"
-    local lock_file="$QUEUE_DIR/locks/$(echo "$issue_ref" | sed 's/[\/:]/-/g' | sed 's/#/-/').lock"
-    rm -f "$lock_file"
-}
 
+# 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)
@@ -38,16 +21,21 @@ check_task_completion() {
     
     [ "$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)
-    local pid=$(python3 -c "import json; print(json.load(open('$item')).get('pid', ''))" 2>/dev/null)
     
-    if [ -n "$pid" ] && [ "$pid" != "None" ]; then
+    # If no session tracked, skip
-        if ! kill -0 "$pid" 2>/dev/null; then
+    [ -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
@@ -60,94 +48,44 @@ check_task_completion() {
             update_queue_item_state "$queue_id" "error"
             echo "Task $queue_id ($issue_ref) marked error — no commits found after session ended"
         fi
-            release_lock "$issue_ref"
     fi
-    else
-        if [ -n "$session_id" ] && ! opencode session list 2>/dev/null | grep -q "$session_id"; then
-            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
-                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
-            release_lock "$issue_ref"
-        fi
-    fi
-}
-
-get_session_id_for_issue() {
-    local issue_ref="$1"
-    local session_file=$(issue_ref_to_filename "$issue_ref")
-    local session_path="$SESSIONS_DIR/$session_file"
-    if [ -f "$session_path" ]; then
-        python3 -c "import json; print(json.load(open('$session_path')).get('opencode_session_id', ''))" 2>/dev/null || echo ""
-    else
-        echo ""
-    fi
-}
-
-process_task() {
-    local item="$1"
-    local queue_id=$(basename "$item" .json)
-    local issue_ref=$(python3 -c "import json; print(json.load(open('$item')).get('issue_ref', ''))" 2>/dev/null)
-    local message=$(python3 -c "import json; print(json.load(open('$item')).get('message', ''))" 2>/dev/null)
-
-    if ! acquire_lock "$issue_ref"; then
-        echo "Task $queue_id ($issue_ref) skipped — another process is handling it"
-        return
-    fi
-
-    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
-        log_file="$LOGS_DIR/delegate-$(date +%s).log"
-        if cmd_continue "$issue_ref" "$message" >> "$log_file" 2>&1; then
-            sleep 1
-            local session_id=$(get_session_id_for_issue "$issue_ref")
-            update_queue_item_state "$queue_id" "notified" "$session_id" ""
-            echo "Task $queue_id continued for $issue_ref"
-        else
-            update_queue_item_state "$queue_id" "error"
-            echo "Task $queue_id ($issue_ref) failed to continue"
-        fi
-    else
-        log_file="$LOGS_DIR/delegate-$(date +%s).log"
-        if cmd_start "$issue_ref" "$message" >> "$log_file" 2>&1; then
-            sleep 1
-            local session_id=$(get_session_id_for_issue "$issue_ref")
-            update_queue_item_state "$queue_id" "notified" "$session_id" ""
-            echo "Task $queue_id started for $issue_ref"
-        else
-            update_queue_item_state "$queue_id" "error"
-            echo "Task $queue_id ($issue_ref) failed to start"
-        fi
-    fi
-
-    release_lock "$issue_ref"
 }
 
 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)
             if [ "$state" = "pending" ]; then
-                process_task "$item"
+                queue_id=$(basename "$item" .json)
+                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)
+                
+                # 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"
+                    cmd_continue "$issue_ref" "$message" >> "$log_file" 2>&1 &
+                    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
     fi

skills/kugetsu/scripts/kugetsu-session.sh

@@ -1,13 +1,6 @@
 #!/bin/bash
 set -euo pipefail
 
-# Source required modules for session management functions
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "$SCRIPT_DIR/kugetsu-config.sh"
-source "$SCRIPT_DIR/kugetsu-index.sh"
-source "$SCRIPT_DIR/kugetsu-worktree.sh"
-source "$SCRIPT_DIR/kugetsu-log.sh"
-
 count_active_dev_sessions() {
     local count=0
     if [ -d "$SESSIONS_DIR" ]; then
@@ -81,20 +74,9 @@ EOF
     echo "Press Ctrl+C to cancel or wait for session to be created"
     sleep 2
 
-    local before_sessions=$(opencode session list 2>/dev/null | grep -E '^ses_' | awk '{print $1}' || true)
-
     opencode
 
-    local after_sessions=$(opencode session list 2>/dev/null | grep -E '^ses_' | awk '{print $1}' || true)
+    local session_ids=$(opencode session list 2>/dev/null | grep -E '^ses_' | awk '{print $1}' | tail -1)
-    local session_ids=""
-    while IFS= read -r line; do
-        local sid=$(echo "$line" | awk '{print $1}')
-        if [ -n "$sid" ] && ! echo "$before_sessions" | grep -q "^${sid}$"; then
-            session_ids="$sid"
-            break
-        fi
-    done <<< "$after_sessions"
-
     if [ -z "$session_ids" ]; then
         echo "Error: Could not find newly created session" >&2
         exit 1
@@ -106,20 +88,9 @@ EOF
     echo "Base session created: $session_ids"
     echo "Starting PM agent..."
 
-    before_sessions="$after_sessions"
-
     opencode
 
-    after_sessions=$(opencode session list 2>/dev/null | grep -E '^ses_' | awk '{print $1}' || true)
+    local pm_session_ids=$(opencode session list 2>/dev/null | grep -E '^ses_' | grep -v "$session_ids" | tail -1)
-    local pm_session_ids=""
-    while IFS= read -r line; do
-        local sid=$(echo "$line" | awk '{print $1}')
-        if [ -n "$sid" ] && ! echo "$before_sessions" | grep -q "^${sid}$"; then
-            pm_session_ids="$sid"
-            break
-        fi
-    done <<< "$after_sessions"
-
     if [ -z "$pm_session_ids" ]; then
         echo "Warning: Could not find separate PM agent session" >&2
         pm_session_ids="$session_ids"
@@ -156,11 +127,13 @@ extract_issue_ref_from_message() {
         return
     fi
     
-    if [[ "$message" =~ (https?://)?([a-zA-Z0-9.-]+)/([a-zA-Z0-9._-]+)/([a-zA-Z0-9._-]+)/(issues|pull)/([0-9]+) ]]; then
+    if [[ "$message" =~ (https?://[a-zA-Z0-9.-]+/[a-zA-Z0-9._-]+/[a-zA-Z0-9._-]+/(issues|pull)/[0-9]+) ]]; then
-        local instance="${BASH_REMATCH[2]}"
+        local url="${BASH_REMATCH[1]}"
-        local owner="${BASH_REMATCH[3]}"
+        local path=$(echo "$url" | sed 's|https\?://||' | cut -d'/' -f2-)
-        local repo="${BASH_REMATCH[4]}"
+        local instance=$(echo "$path" | cut -d'/' -f1)
-        local num="${BASH_REMATCH[6]}"
+        local owner=$(echo "$path" | cut -d'/' -f2)
+        local repo=$(echo "$path" | cut -d'/' -f3)
+        local num=$(echo "$path" | grep -oE '[0-9]+$')
         echo "${instance}/${owner}/${repo}#${num}"
         return
     fi
@@ -180,12 +153,10 @@ cmd_delegate() {
     local issue_ref=$(extract_issue_ref_from_message "$message")
     
     if [ -n "$issue_ref" ] && [[ "$issue_ref" =~ \#[0-9]+$ ]]; then
-        # Enqueue for daemon to process via cmd_start/cmd_continue
+        cmd_start "$issue_ref" "$message"
-        enqueue_task "$issue_ref" "$message"
         return
     fi
     
-    # No issue ref detected — delegate directly to PM agent (legacy path)
     local pm_session=$(get_pm_agent_session_id)
     if [ -z "$pm_session" ] || [ "$pm_session" = "null" ] || [ "$pm_session" = "None" ]; then
         echo "Error: PM agent session not found. Run 'kugetsu init' first." >&2
@@ -194,7 +165,7 @@ cmd_delegate() {
     
     mkdir -p "$LOGS_DIR"
     local log_file="$LOGS_DIR/delegate-$(date +%s).log"
-    nohup sh -c "GITEA_TOKEN='***' opencode run '$message' --continue --session '$pm_session' >> '$log_file' 2>&1" > /dev/null 2>&1 &
+    nohup sh -c "GITEA_TOKEN='${GITEA_TOKEN:-}' opencode run '$message' --continue --session '$pm_session' >> '$log_file' 2>&1" > /dev/null 2>&1 &
     disown
     echo "Delegated to PM agent (logged to $(basename "$log_file"))"
 }
@@ -479,6 +450,10 @@ cmd_destroy() {
     local target="${1:-}"
     local force=false
     
+    if [ "$target" = "--base" ]; then
+        target=""
+    fi
+    
     if [ "$2" = "-y" ]; then
         force=true
     fi

skills/kugetsu/scripts/kugetsu-worktree.sh

@@ -10,7 +10,7 @@ issue_ref_to_worktree_path() {
     local issue_ref="$1"
     local parent_dir="${2:-$WORKTREES_DIR}"
     local worktree_name=$(issue_ref_to_worktree_name "$issue_ref")
-    echo "$parent_dir/$worktree_name"
+    echo "$parent_dir/.kugetsu-worktrees/$worktree_name"
 }
 
 issue_ref_to_branch_name() {
@@ -41,7 +41,7 @@ get_repo_url() {
     fi
     
     local instance=$(echo "$issue_ref" | cut -d'/' -f1 | cut -d'#' -f1)
-    local rest=$(echo "$issue_ref" | sed 's/^[^\/]*\///' | sed 's/#.*//')
+    local rest=$(echo "$issue_ref" | sed 's/.*\///' | sed 's/#.*//')
     
     if [ -n "${GIT_SERVERS[$instance]:-}" ]; then
         echo "${GIT_SERVERS[$instance]}/${rest}.git"

skills/kugetsu/tests/test-git-url-parsing.sh

@@ -1,298 +0,0 @@
-#!/bin/bash
-# Git URL Parsing Tests for kugetsu
-# Tests all functions that parse or construct git URLs and issue refs
-#
-# Run with: bash skills/kugetsu/tests/test-git-url-parsing.sh
-
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-source "$SCRIPT_DIR/../scripts/kugetsu-config.sh"
-source "$SCRIPT_DIR/../scripts/kugetsu-worktree.sh"
-source "$SCRIPT_DIR/../scripts/kugetsu-session.sh"
-
-PASS=0
-FAIL=0
-
-pass() {
-    echo "PASS: $1"
-    PASS=$((PASS + 1))
-}
-
-fail() {
-    echo "FAIL: $1"
-    echo "  Expected: $2"
-    echo "  Got: $3"
-    FAIL=$((FAIL + 1))
-}
-
-echo "=== Git URL Parsing Test Suite ==="
-echo ""
-
-# Test: get_repo_url with standard GitHub issue ref
-echo "--- Test: get_repo_url with github.com ---"
-result=$(get_repo_url "github.com/shoko/kugetsu#14")
-expected="https://github.com/shoko/kugetsu.git"
-if [ "$result" = "$expected" ]; then
-    pass "get_repo_url standard github issue ref"
-else
-    fail "get_repo_url standard github issue ref" "$expected" "$result"
-fi
-
-# Test: get_repo_url with custom instance
-echo "--- Test: get_repo_url with git.fbrns.co ---"
-result=$(get_repo_url "git.fbrns.co/shoko/kugetsu#158")
-expected="https://git.fbrns.co/shoko/kugetsu.git"
-if [ "$result" = "$expected" ]; then
-    pass "get_repo_url custom instance issue ref (ISSUE #181)"
-else
-    fail "get_repo_url custom instance issue ref (ISSUE #181)" "$expected" "$result"
-fi
-
-# Test: get_repo_url with gitlab.com (if configured)
-echo "--- Test: get_repo_url with gitlab.com ---"
-if [ -n "${GIT_SERVERS[gitlab.com]:-}" ]; then
-    result=$(get_repo_url "gitlab.com/someuser/somerepo#42")
-    expected="https://gitlab.com/someuser/somerepo.git"
-    if [ "$result" = "$expected" ]; then
-        pass "get_repo_url gitlab.com issue ref"
-    else
-        fail "get_repo_url gitlab.com issue ref" "$expected" "$result"
-    fi
-else
-    echo "SKIP: get_repo_url gitlab.com (not configured in GIT_SERVERS)"
-fi
-
-# Test: get_repo_url with bitbucket.org (if configured)
-echo "--- Test: get_repo_url with bitbucket.org ---"
-if [ -n "${GIT_SERVERS[bitbucket.org]:-}" ]; then
-    result=$(get_repo_url "bitbucket.org/myteam/myproject#7")
-    expected="https://bitbucket.org/myteam/myproject.git"
-    if [ "$result" = "$expected" ]; then
-        pass "get_repo_url bitbucket.org issue ref"
-    else
-        fail "get_repo_url bitbucket.org issue ref" "$expected" "$result"
-    fi
-else
-    echo "SKIP: get_repo_url bitbucket.org (not configured in GIT_SERVERS)"
-fi
-
-# Test: get_repo_url with large issue number
-echo "--- Test: get_repo_url with large issue number ---"
-result=$(get_repo_url "github.com/shoko/kugetsu#999999")
-expected="https://github.com/shoko/kugetsu.git"
-if [ "$result" = "$expected" ]; then
-    pass "get_repo_url with large issue number"
-else
-    fail "get_repo_url with large issue number" "$expected" "$result"
-fi
-
-# Test: issue_ref_to_worktree_name standard
-echo "--- Test: issue_ref_to_worktree_name standard ---"
-result=$(issue_ref_to_worktree_name "github.com/shoko/kugetsu#14")
-expected="github.com-shoko-kugetsu-14"
-if [ "$result" = "$expected" ]; then
-    pass "issue_ref_to_worktree_name standard"
-else
-    fail "issue_ref_to_worktree_name standard" "$expected" "$result"
-fi
-
-# Test: issue_ref_to_worktree_name with custom instance
-echo "--- Test: issue_ref_to_worktree_name custom instance ---"
-result=$(issue_ref_to_worktree_name "git.fbrns.co/shoko/kugetsu#158")
-expected="git.fbrns.co-shoko-kugetsu-158"
-if [ "$result" = "$expected" ]; then
-    pass "issue_ref_to_worktree_name custom instance"
-else
-    fail "issue_ref_to_worktree_name custom instance" "$expected" "$result"
-fi
-
-# Test: issue_ref_to_branch_name with number
-echo "--- Test: issue_ref_to_branch_name with number ---"
-result=$(issue_ref_to_branch_name "github.com/shoko/kugetsu#14")
-expected="fix/issue-14"
-if [ "$result" = "$expected" ]; then
-    pass "issue_ref_to_branch_name with number"
-else
-    fail "issue_ref_to_branch_name with number" "$expected" "$result"
-fi
-
-# Test: issue_ref_to_branch_name with discuss suffix
-# Note: #-discuss falls through to fix/issue-temp because #[^-]+$ doesn't match #-<text-with-hyphens>
-echo "--- Test: issue_ref_to_branch_name with discuss suffix ---"
-result=$(issue_ref_to_branch_name "github.com/shoko/kugetsu#-discuss")
-expected="fix/issue-temp"
-if [ "$result" = "$expected" ]; then
-    pass "issue_ref_to_branch_name with discuss suffix"
-else
-    fail "issue_ref_to_branch_name with discuss suffix" "$expected" "$result"
-fi
-
-# Test: issue_ref_to_branch_name with identifier that has no hyphens
-echo "--- Test: issue_ref_to_branch_name with pure identifier ---"
-result=$(issue_ref_to_branch_name "github.com/shoko/kugetsu#someid")
-expected="fix/someid"
-if [ "$result" = "$expected" ]; then
-    pass "issue_ref_to_branch_name with pure identifier"
-else
-    fail "issue_ref_to_branch_name with pure identifier" "$expected" "$result"
-fi
-
-# Test: issue_ref_to_branch_name without number
-echo "--- Test: issue_ref_to_branch_name without number ---"
-result=$(issue_ref_to_branch_name "github.com/shoko/kugetsu#abc")
-expected="fix/abc"
-if [ "$result" = "$expected" ]; then
-    pass "issue_ref_to_branch_name without number"
-else
-    fail "issue_ref_to_branch_name without number" "$expected" "$result"
-fi
-
-# Test: extract_issue_ref_from_message with short form
-echo "--- Test: extract_issue_ref_from_message short form ---"
-result=$(extract_issue_ref_from_message "github.com/shoko/kugetsu#14")
-expected="github.com/shoko/kugetsu#14"
-if [ "$result" = "$expected" ]; then
-    pass "extract_issue_ref_from_message short form"
-else
-    fail "extract_issue_ref_from_message short form" "$expected" "$result"
-fi
-
-# Test: extract_issue_ref_from_message with https URL
-echo "--- Test: extract_issue_ref_from_message with https URL ---"
-result=$(extract_issue_ref_from_message "https://github.com/shoko/kugetsu/issues/14")
-expected="github.com/shoko/kugetsu#14"
-if [ "$result" = "$expected" ]; then
-    pass "extract_issue_ref_from_message with https URL"
-else
-    fail "extract_issue_ref_from_message with https URL" "$expected" "$result"
-fi
-
-# Test: extract_issue_ref_from_message with custom instance
-echo "--- Test: extract_issue_ref_from_message custom instance ---"
-result=$(extract_issue_ref_from_message "https://git.fbrns.co/shoko/kugetsu/issues/158")
-expected="git.fbrns.co/shoko/kugetsu#158"
-if [ "$result" = "$expected" ]; then
-    pass "extract_issue_ref_from_message custom instance"
-else
-    fail "extract_issue_ref_from_message custom instance" "$expected" "$result"
-fi
-
-# Test: extract_issue_ref_from_message with empty message
-echo "--- Test: extract_issue_ref_from_message empty message ---"
-result=$(extract_issue_ref_from_message "")
-expected=""
-if [ "$result" = "$expected" ]; then
-    pass "extract_issue_ref_from_message empty message"
-else
-    fail "extract_issue_ref_from_message empty message" "$expected" "$result"
-fi
-
-# Test: extract_issue_ref_from_message with no issue ref
-echo "--- Test: extract_issue_ref_from_message no issue ref ---"
-result=$(extract_issue_ref_from_message "Just a regular message without any issue reference")
-expected=""
-if [ "$result" = "$expected" ]; then
-    pass "extract_issue_ref_from_message no issue ref"
-else
-    fail "extract_issue_ref_from_message no issue ref" "$expected" "$result"
-fi
-
-# Test: extract_issue_ref_from_message with gitlab URL
-echo "--- Test: extract_issue_ref_from_message gitlab URL ---"
-result=$(extract_issue_ref_from_message "https://gitlab.com/someuser/somerepo/issues/42")
-expected="gitlab.com/someuser/somerepo#42"
-if [ "$result" = "$expected" ]; then
-    pass "extract_issue_ref_from_message gitlab URL"
-else
-    fail "extract_issue_ref_from_message gitlab URL" "$expected" "$result"
-fi
-
-# Test: validate_issue_ref valid format
-echo "--- Test: validate_issue_ref valid format ---"
-if validate_issue_ref "github.com/shoko/kugetsu#14" 2>/dev/null; then
-    pass "validate_issue_ref valid format"
-else
-    fail "validate_issue_ref valid format" "exit 0" "exit non-zero"
-fi
-
-# Test: validate_issue_ref invalid format (missing parts)
-echo "--- Test: validate_issue_ref invalid format ---"
-if ! validate_issue_ref "invalid-ref" 2>/dev/null; then
-    pass "validate_issue_ref invalid format"
-else
-    fail "validate_issue_ref invalid format" "exit non-zero" "exit 0"
-fi
-
-# Test: issue_ref_to_filename
-echo "--- Test: issue_ref_to_filename ---"
-result=$(issue_ref_to_filename "github.com/shoko/kugetsu#14")
-expected="github.com-shoko-kugetsu-14.json"
-if [ "$result" = "$expected" ]; then
-    pass "issue_ref_to_filename"
-else
-    fail "issue_ref_to_filename" "$expected" "$result"
-fi
-
-# Test: filename_to_issue_ref
-echo "--- Test: filename_to_issue_ref ---"
-result=$(filename_to_issue_ref "github.com-shoko-kugetsu-14.json")
-expected="github.com/shoko/kugetsu#14"
-if [ "$result" = "$expected" ]; then
-    pass "filename_to_issue_ref"
-else
-    fail "filename_to_issue_ref" "$expected" "$result"
-fi
-
-# Test: get_repo_url with org having hyphen
-echo "--- Test: get_repo_url with hyphenated org ---"
-result=$(get_repo_url "github.com/my-org/my-repo#1")
-expected="https://github.com/my-org/my-repo.git"
-if [ "$result" = "$expected" ]; then
-    pass "get_repo_url with hyphenated org"
-else
-    fail "get_repo_url with hyphenated org" "$expected" "$result"
-fi
-
-# Test: get_repo_url with repo having dots
-echo "--- Test: get_repo_url with dotted repo ---"
-result=$(get_repo_url "github.com/shoko/kugetsu.utils#5")
-expected="https://github.com/shoko/kugetsu.utils.git"
-if [ "$result" = "$expected" ]; then
-    pass "get_repo_url with dotted repo"
-else
-    fail "get_repo_url with dotted repo" "$expected" "$result"
-fi
-
-# Test: get_repo_url with underscore in username
-echo "--- Test: get_repo_url with underscore in user ---"
-result=$(get_repo_url "github.com/my_user/my_repo#10")
-expected="https://github.com/my_user/my_repo.git"
-if [ "$result" = "$expected" ]; then
-    pass "get_repo_url with underscore in user"
-else
-    fail "get_repo_url with underscore in user" "$expected" "$result"
-fi
-
-# Test: get_repo_url with instance not in GIT_SERVERS (fallback)
-echo "--- Test: get_repo_url with unknown instance ---"
-result=$(get_repo_url "unknown.example.com/owner/repo#1")
-expected="https://unknown.example.com/owner/repo.git"
-if [ "$result" = "$expected" ]; then
-    pass "get_repo_url with unknown instance"
-else
-    fail "get_repo_url with unknown instance" "$expected" "$result"
-fi
-
-echo ""
-echo "=== Test Results ==="
-echo "Passed: $PASS"
-echo "Failed: $FAIL"
-
-if [ $FAIL -eq 0 ]; then
-    echo "All tests passed!"
-    exit 0
-else
-    echo "Some tests failed!"
-    exit 1
-fi