From 68f989d75ec0c103ccf38999a014782b6121064e Mon Sep 17 00:00:00 2001
From: shokollm <270575765+shokollm@users.noreply.github.com>
Date: Sun, 5 Apr 2026 04:12:31 +0000
Subject: [PATCH] Merge feat/context-dump-load with feat/worktree-lifecycle
 changes

Combines context dump/load feature with worktree lifecycle features:
- CONTEXT_DIR and ENABLE_CONTEXT_DUMP config
- Context functions: kugetsu_context_load/dump/update_message
- WORKTREE_CHECK_PR_STATUS config
- check_pr_status() and update_session_pr_url() functions
- set-pr and context commands
---
 skills/kugetsu/scripts/kugetsu | 103 ++++++++++++++++++++++++++++++++-
 1 file changed, 102 insertions(+), 1 deletion(-)

diff --git a/skills/kugetsu/scripts/kugetsu b/skills/kugetsu/scripts/kugetsu
index c3afb44..e23c7a3 100755
--- a/skills/kugetsu/scripts/kugetsu
+++ b/skills/kugetsu/scripts/kugetsu
@@ -13,8 +13,9 @@ VERBOSITY_DIR="$KUGETSU_DIR/verbosity"
 
 MAX_CONCURRENT_AGENTS="${MAX_CONCURRENT_AGENTS:-3}"
 KUGETSU_VERBOSITY="${KUGETSU_VERBOSITY:-default}"
-CONTEXT_DIR="${CONTEXT_DIR:-$KUGETSU_DIR/context}"
+CONTEXT_DIR="${CONTEXT_DIR:-$KUETSU_DIR/context}"
 ENABLE_CONTEXT_DUMP="${ENABLE_CONTEXT_DUMP:-true}"
+WORKTREE_CHECK_PR_STATUS="${WORKTREE_CHECK_PR_STATUS:-true}"
 
 # Load user config overrides (~/.kugetsu/config)
 if [ -f "$KUGETSU_DIR/config" ]; then
@@ -79,6 +80,7 @@ Usage:
     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 set-pr <issue-ref> <pr-url>            Set PR URL for session (for PR tracking)
     kugetsu context <issue-ref>                        Show context for issue
     kugetsu help                                     Show this help
 
@@ -427,6 +429,94 @@ except Exception as e:
 PYEOF
 }
 
+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
+}
+
+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
+}
+
 read_index() {
     if [ -f "$INDEX_FILE" ]; then
         cat "$INDEX_FILE"
@@ -2061,6 +2151,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"
+            ;;
         context)
             local issue_ref="${1:-}"
             if [ -z "$issue_ref" ]; then