Merge pull request 'feat(worktree-lifecycle): add PR tracking and safe destroy' (#138) from feat/worktree-lifecycle into main

skills/kugetsu/scripts/kugetsu

@@ -13,6 +13,7 @@ VERBOSITY_DIR="$KUGETSU_DIR/verbosity"
 
 MAX_CONCURRENT_AGENTS="${MAX_CONCURRENT_AGENTS:-3}"
 KUGETSU_VERBOSITY="${KUGETSU_VERBOSITY:-default}"
+WORKTREE_CHECK_PR_STATUS="${WORKTREE_CHECK_PR_STATUS:-true}"
 
 # Load user config overrides (~/.kugetsu/config)
 if [ -f "$KUGETSU_DIR/config" ]; then
@@ -76,7 +77,8 @@ Usage:
     kugetsu prune [--force]                          Remove orphaned sessions (keeps base + pm-agent)
     kugetsu destroy <issue-ref> [-y]                  Delete session for issue
     kugetsu destroy --pm-agent [-y]                   Delete pm-agent session (not recommended)
-    kugetsu destroy --base [-y]                       Delete base session
+    kugetsu destroy --base [-y]                      Delete base session
+    kugetsu set-pr <issue-ref> <pr-url>            Set PR URL for session (for PR tracking)
     kugetsu help                                     Show this help
 
 Issue Ref Format:
@@ -256,6 +258,54 @@ get_worktree_path_for_session() {
     fi
 }
 
+check_pr_status() {
+    local pr_url="$1"
+    
+    if [ -z "$pr_url" ]; then
+        echo "no_pr_url"
+        return 1
+    fi
+    
+    local hostname=$(echo "$pr_url" | sed -E 's|https://([^/]+)/.*|\1|')
+    
+    local server_base="${GIT_SERVERS[$hostname]:-}"
+    if [ -z "$server_base" ]; then
+        echo "unknown_server"
+        return 1
+    fi
+    
+    local api_base="${server_base}/api/v1"
+    
+    local api_url=$(echo "$pr_url" | sed -E 's|https://[^/]+/([^/]+)/([^/]+)/(pulls|merge_requests)/([0-9]+)|'"${api_base}"'/repos/\1/\2/\3/\4|')
+    
+    local token=""
+    if [[ "$hostname" == "github.com" ]]; then
+        token="${GITHUB_TOKEN:-}"
+    else
+        token="${GITEA_TOKEN:-}"
+    fi
+    
+    local response
+    if [ -n "$token" ]; then
+        response=$(curl -s -H "Authorization: token $token" "$api_url" 2>/dev/null || echo "{}")
+    else
+        response=$(curl -s "$api_url" 2>/dev/null || echo "{}")
+    fi
+    
+    local state=$(echo "$response" | python3 -c "import json, sys; d=json.load(sys.stdin); print(d.get('state', 'unknown'))" 2>/dev/null || echo "unknown")
+    local merged=$(echo "$response" | python3 -c "import json, sys; d=json.load(sys.stdin); print('true' if d.get('merged', False) else 'false')" 2>/dev/null || echo "false")
+    
+    if [ "$merged" = "true" ]; then
+        echo "merged"
+    elif [ "$state" = "closed" ]; then
+        echo "closed"
+    elif [ "$state" = "open" ]; then
+        echo "open"
+    else
+        echo "unknown"
+    fi
+}
+
 issue_ref_to_filename() {
     local issue_ref="$1"
     echo "$issue_ref" | sed 's/[\/:]/-/g' | sed 's/#/-/'
@@ -267,6 +317,46 @@ filename_to_issue_ref() {
     echo "$name" | sed 's/-\([0-9]*\)$/#\1' | sed 's/-/\//g'
 }
 
+update_session_pr_url() {
+    local issue_ref="$1"
+    local pr_url="$2"
+    
+    if [ -z "$issue_ref" ] || [ -z "$pr_url" ]; then
+        echo "Error: update_session_pr_url requires <issue-ref> and <pr-url>" >&2
+        return 1
+    fi
+    
+    local session_file=$(get_session_for_issue "$issue_ref")
+    if [ -z "$session_file" ] || [ "$session_file" = "null" ]; then
+        echo "Error: No session found for '$issue_ref'" >&2
+        return 1
+    fi
+    
+    local session_path="$SESSIONS_DIR/$session_file"
+    
+    if [ ! -f "$session_path" ]; then
+        echo "Error: Session file not found: $session_path" >&2
+        return 1
+    fi
+    
+    python3 << PYEOF
+import json
+
+session_path = "$session_path"
+pr_url = "$pr_url"
+
+with open(session_path, 'r') as f:
+    session = json.load(f)
+
+session['pr_url'] = pr_url
+
+with open(session_path, 'w') as f:
+    json.dump(session, f, indent=2)
+
+print(f"Updated pr_url to: {pr_url}")
+PYEOF
+}
+
 read_index() {
     if [ -f "$INDEX_FILE" ]; then
         cat "$INDEX_FILE"
@@ -1401,6 +1491,7 @@ EOF
 cmd_start() {
     local issue_ref=""
     local message=""
+    local pr_url=""
     local args=("$@")
 
     args=$(set_debug_mode "${args[@]}")
@@ -1410,11 +1501,14 @@ cmd_start() {
             issue_ref="$arg"
         elif [ -z "$message" ]; then
             message="$arg"
+        elif [ -z "$pr_url" ]; then
+            pr_url="$arg"
         fi
     done
 
     if [ -z "$issue_ref" ] || [ -z "$message" ]; then
         echo "Error: start requires <issue-ref> and <message>" >&2
+        echo "Usage: kugetsu start <issue-ref> <message> [pr-url]" >&2
         exit 1
     fi
 
@@ -1543,8 +1637,25 @@ for row in cursor.fetchall():
 " 2>/dev/null || echo "  (failed to query DB)"
     fi
 
-    printf '{"type": "forked", "issue_ref": "%s", "opencode_session_id": "%s", "worktree_path": "%s", "created_at": "%s", "state": "idle"}\n' \
-        "$issue_ref" "$new_session_id" "$worktree_path" "$(date -Iseconds)" > "$SESSIONS_DIR/$session_file"
+    local branch_name=$(issue_ref_to_branch_name "$issue_ref")
+    
+    python3 << PYEOF > "$SESSIONS_DIR/$session_file"
+import json
+
+session = {
+    "type": "forked",
+    "issue_ref": "$issue_ref",
+    "opencode_session_id": "$new_session_id",
+    "worktree_path": "$worktree_path",
+    "created_at": "$(date -Iseconds)",
+    "state": "idle",
+    "branch_name": "$branch_name",
+    "pr_url": "$pr_url" if "$pr_url" else None
+}
+
+with open("$SESSIONS_DIR/$session_file", "w") as f:
+    json.dump(session, f, indent=2)
+PYEOF
 
     add_issue_to_index "$issue_ref" "$session_file"
 
@@ -1820,6 +1931,25 @@ cmd_destroy() {
         remove_issue_from_index "$target"
         echo "Session for '$target' destroyed"
     else
+        if [ "$WORKTREE_CHECK_PR_STATUS" = "true" ]; then
+            local pr_url=$(python3 -c "import json; print(json.load(open('$session_path')).get('pr_url', '') or '')" 2>/dev/null || echo "")
+            if [ -n "$pr_url" ] && [ "$pr_url" != "None" ]; then
+                echo "Checking PR status at '$pr_url'..."
+                local pr_status=$(check_pr_status "$pr_url")
+                if [ "$pr_status" = "open" ]; then
+                    echo "Error: PR is still open at $pr_url" >&2
+                    echo "Use --force to destroy anyway, or close the PR first" >&2
+                    exit 1
+                elif [ "$pr_status" = "merged" ]; then
+                    echo "PR has been merged. Safe to destroy."
+                elif [ "$pr_status" = "closed" ]; then
+                    echo "PR has been closed. Safe to destroy."
+                else
+                    echo "Warning: Could not determine PR status (got: $pr_status). Proceeding anyway." >&2
+                fi
+            fi
+        fi
+        
         echo "Delete session and worktree for '$target'? [y/N] "
         local reply
         read reply
@@ -1887,6 +2017,17 @@ main() {
         destroy)
             cmd_destroy "$@"
             ;;
+        set-pr)
+            local issue_ref="${1:-}"
+            local pr_url="${2:-}"
+            if [ -z "$issue_ref" ] || [ -z "$pr_url" ]; then
+                echo "Usage: kugetsu set-pr <issue-ref> <pr-url>" >&2
+                echo "Example: kugetsu set-pr github.com/shoko/kugetsu#14 https://github.com/shoko/kugetsu/pulls/123" >&2
+                exit 1
+            fi
+            validate_issue_ref "$issue_ref"
+            update_session_pr_url "$issue_ref" "$pr_url"
+            ;;
         *)
             echo "Error: unknown command '$command'" >&2
             usage