Compare commits
3 Commits
61f06f825f
...
66bbe53d3d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
66bbe53d3d | ||
|
|
68f989d75e | ||
|
|
b72bf8e3c4 |
@@ -261,54 +261,6 @@ 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/#/-/'
|
||||
@@ -517,6 +469,54 @@ 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,7 +1651,6 @@ EOF
|
||||
cmd_start() {
|
||||
local issue_ref=""
|
||||
local message=""
|
||||
local pr_url=""
|
||||
local args=("$@")
|
||||
|
||||
args=$(set_debug_mode "${args[@]}")
|
||||
@@ -1661,14 +1660,11 @@ 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
|
||||
|
||||
@@ -1711,14 +1707,14 @@ cmd_start() {
|
||||
exit 1
|
||||
fi
|
||||
|
||||
local fork_log="$SESSIONS_DIR/$session_file.fork.log"
|
||||
local opencode_db="${OPENCODE_DB:-$HOME/.local/share/opencode/opencode.db}"
|
||||
local fork_log="$SESSIONS_DIR/$session_file.fork.log"
|
||||
|
||||
> "$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}
|
||||
|
||||
@@ -1800,25 +1796,8 @@ for row in cursor.fetchall():
|
||||
" 2>/dev/null || echo " (failed to query DB)"
|
||||
fi
|
||||
|
||||
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
|
||||
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"
|
||||
|
||||
add_issue_to_index "$issue_ref" "$session_file"
|
||||
|
||||
@@ -2105,25 +2084,6 @@ 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
|
||||
|
||||
Reference in New Issue
Block a user