Compare commits

..

3 Commits

Author SHA1 Message Date
shokollm
66bbe53d3d Fix typo: KUETSU_DIR -> KUGETSU_DIR 2026-04-05 04:13:59 +00:00
shokollm
68f989d75e 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
2026-04-05 04:12:31 +00:00
shokollm
b72bf8e3c4 feat(context): add context dump/load for session isolation
- Add CONTEXT_DIR and ENABLE_CONTEXT_DUMP config options
- Add issue_ref_to_context_file() to derive context file path
- Add kugetsu_context_load() to load previous context
- Add kugetsu_context_dump() to save context on start
- Add kugetsu_context_update_message() to append to history
- Integrate context loading into cmd_start and cmd_continue
- Add kugetsu context command to view context for issue

Context is stored in ~/.kugetsu/context/<issue-ref>.json with:
- issue_ref, current_branch, updated_at
- last_message summary
- conversation_history (last 20 messages)

Closes #136
2026-04-05 02:54:55 +00:00

View File

@@ -261,54 +261,6 @@ get_worktree_path_for_session() {
fi 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() { issue_ref_to_filename() {
local issue_ref="$1" local issue_ref="$1"
echo "$issue_ref" | sed 's/[\/:]/-/g' | sed 's/#/-/' echo "$issue_ref" | sed 's/[\/:]/-/g' | sed 's/#/-/'
@@ -517,6 +469,54 @@ print(f"Updated pr_url to: {pr_url}")
PYEOF 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() { read_index() {
if [ -f "$INDEX_FILE" ]; then if [ -f "$INDEX_FILE" ]; then
cat "$INDEX_FILE" cat "$INDEX_FILE"
@@ -1651,7 +1651,6 @@ EOF
cmd_start() { cmd_start() {
local issue_ref="" local issue_ref=""
local message="" local message=""
local pr_url=""
local args=("$@") local args=("$@")
args=$(set_debug_mode "${args[@]}") args=$(set_debug_mode "${args[@]}")
@@ -1661,14 +1660,11 @@ cmd_start() {
issue_ref="$arg" issue_ref="$arg"
elif [ -z "$message" ]; then elif [ -z "$message" ]; then
message="$arg" message="$arg"
elif [ -z "$pr_url" ]; then
pr_url="$arg"
fi fi
done done
if [ -z "$issue_ref" ] || [ -z "$message" ]; then if [ -z "$issue_ref" ] || [ -z "$message" ]; then
echo "Error: start requires <issue-ref> and <message>" >&2 echo "Error: start requires <issue-ref> and <message>" >&2
echo "Usage: kugetsu start <issue-ref> <message> [pr-url]" >&2
exit 1 exit 1
fi fi
@@ -1711,14 +1707,14 @@ cmd_start() {
exit 1 exit 1
fi 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" > "$fork_log"
local fork_context=$(kugetsu_get_fork_context "$issue_ref") local fork_context=$(kugetsu_get_fork_context "$issue_ref")
local previous_context=$(kugetsu_context_load "$issue_ref") local previous_context=$(kugetsu_context_load "$issue_ref")
local branch_name=$(issue_ref_to_branch_name "$issue_ref") local branch_name=$(issue_ref_to_branch_name "$issue_ref")
local full_message="${fork_context} local full_message="${fork_context}
${previous_context} ${previous_context}
@@ -1800,25 +1796,8 @@ for row in cursor.fetchall():
" 2>/dev/null || echo " (failed to query DB)" " 2>/dev/null || echo " (failed to query DB)"
fi fi
local branch_name=$(issue_ref_to_branch_name "$issue_ref") 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"
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" add_issue_to_index "$issue_ref" "$session_file"
@@ -2105,25 +2084,6 @@ cmd_destroy() {
remove_issue_from_index "$target" remove_issue_from_index "$target"
echo "Session for '$target' destroyed" echo "Session for '$target' destroyed"
else 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] " echo "Delete session and worktree for '$target'? [y/N] "
local reply local reply
read reply read reply