Compare commits

..

6 Commits

Author SHA1 Message Date
shokollm
61f06f825f Add context dump/load feature
Adds session context management to prevent session poisoning:
- CONTEXT_DIR and ENABLE_CONTEXT_DUMP config options
- issue_ref_to_context_file() - derive context file path
- kugetsu_context_load() - load previous context
- kugetsu_context_dump() - save context on session start
- kugetsu_context_update_message() - append to conversation history
- Integration in cmd_start and cmd_continue
- New 'kugetsu context' command
2026-04-05 04:23:26 +00:00
b76a9b883a Merge pull request 'feat(worktree-lifecycle): add PR tracking and safe destroy' (#138) from feat/worktree-lifecycle into main 2026-04-05 06:00:15 +02:00
shokollm
ac850869fd fix(worktree-lifecycle): use github.com as example in set-pr help
- Remove accidentally committed worktree directory
2026-04-05 03:56:48 +00:00
shokollm
3107dbf1e5 fix(worktree-lifecycle): use GIT_SERVERS config for check_pr_status
- Extract hostname from pr_url instead of hardcoding domains
- Look up server base URL from GIT_SERVERS config
- Append /api/v1 to derive API URL (configurable per server)
- Works with any server configured in GIT_SERVERS
2026-04-05 03:41:41 +00:00
shokollm
b8b97e3c09 fix(worktree-lifecycle): address PR review feedback
- Rename update-pr to set-pr for clarity (it's setting the PR URL, not updating PR)
- Add optional pr-url argument to kugetsu start command
  Usage: kugetsu start <issue-ref> <message> [pr-url]
- If pr-url is provided at start, it's stored directly in session file
2026-04-05 03:16:05 +00:00
shokollm
d8af560e6d feat(worktree-lifecycle): add PR tracking and safe destroy
- Add WORKTREE_CHECK_PR_STATUS config (default: true)
- Add pr_url and branch_name fields to session files
- Add check_pr_status() to query PR status via API (Gitea/GitHub)
- Add update_session_pr_url() to update PR URL in session
- Add kugetsu update-pr command to set PR URL
- Modify cmd_destroy to check PR status before destroying worktree

Closes #135
2026-04-05 02:50:09 +00:00

View File

@@ -261,6 +261,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/#/-/'
@@ -469,54 +517,6 @@ 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"
@@ -1651,6 +1651,7 @@ EOF
cmd_start() {
local issue_ref=""
local message=""
local pr_url=""
local args=("$@")
args=$(set_debug_mode "${args[@]}")
@@ -1660,11 +1661,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
@@ -1707,14 +1711,14 @@ cmd_start() {
exit 1
fi
local fork_log="$SESSIONS_DIR/$session_file.fork.log"
local fork_log="$SESSIONS_DIR/$session_file.fork.log"
local opencode_db="${OPENCODE_DB:-$HOME/.local/share/opencode/opencode.db}"
> "$fork_log"
local fork_context=$(kugetsu_get_fork_context "$issue_ref")
local previous_context=$(kugetsu_context_load "$issue_ref")
local branch_name=$(issue_ref_to_branch_name "$issue_ref")
local full_message="${fork_context}
${previous_context}
@@ -1796,8 +1800,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"
@@ -2084,6 +2105,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