Compare commits
1 Commits
61f06f825f
...
v0.1.12
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dc2254cfba |
1
.kugetsu-worktrees/git.fbrns.co-shoko-jigaido-2
Submodule
1
.kugetsu-worktrees/git.fbrns.co-shoko-jigaido-2
Submodule
Submodule .kugetsu-worktrees/git.fbrns.co-shoko-jigaido-2 added at 332d7fc60a
@@ -13,9 +13,6 @@ VERBOSITY_DIR="$KUGETSU_DIR/verbosity"
|
||||
|
||||
MAX_CONCURRENT_AGENTS="${MAX_CONCURRENT_AGENTS:-3}"
|
||||
KUGETSU_VERBOSITY="${KUGETSU_VERBOSITY:-default}"
|
||||
CONTEXT_DIR="${CONTEXT_DIR:-$KUGETSU_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,9 +76,7 @@ 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 set-pr <issue-ref> <pr-url> Set PR URL for session (for PR tracking)
|
||||
kugetsu context <issue-ref> Show context for issue
|
||||
kugetsu destroy --base [-y] Delete base session
|
||||
kugetsu help Show this help
|
||||
|
||||
Issue Ref Format:
|
||||
@@ -261,54 +256,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/#/-/'
|
||||
@@ -320,203 +267,6 @@ filename_to_issue_ref() {
|
||||
echo "$name" | sed 's/-\([0-9]*\)$/#\1' | sed 's/-/\//g'
|
||||
}
|
||||
|
||||
issue_ref_to_context_file() {
|
||||
local issue_ref="$1"
|
||||
local context_filename=$(issue_ref_to_filename "$issue_ref")
|
||||
echo "$CONTEXT_DIR/${context_filename}.json"
|
||||
}
|
||||
|
||||
kugetsu_context_load() {
|
||||
local issue_ref="$1"
|
||||
|
||||
if [ "$ENABLE_CONTEXT_DUMP" != "true" ]; then
|
||||
echo ""
|
||||
return
|
||||
fi
|
||||
|
||||
local context_file=$(issue_ref_to_context_file "$issue_ref")
|
||||
|
||||
if [ ! -f "$context_file" ]; then
|
||||
echo ""
|
||||
return
|
||||
fi
|
||||
|
||||
python3 << PYEOF
|
||||
import json
|
||||
import sys
|
||||
|
||||
context_file = "$context_file"
|
||||
|
||||
try:
|
||||
with open(context_file, 'r') as f:
|
||||
ctx = json.load(f)
|
||||
|
||||
lines = []
|
||||
lines.append("## PREVIOUS CONTEXT")
|
||||
lines.append(f"Issue: {ctx.get('issue_ref', 'unknown')}")
|
||||
lines.append(f"Last updated: {ctx.get('updated_at', 'unknown')}")
|
||||
lines.append(f"Current branch: {ctx.get('current_branch', 'unknown')}")
|
||||
lines.append("")
|
||||
lines.append("### Previous work summary:")
|
||||
lines.append(ctx.get('last_message', '(no previous message)'))
|
||||
lines.append("")
|
||||
|
||||
history = ctx.get('conversation_history', [])
|
||||
if history:
|
||||
lines.append("### Conversation history:")
|
||||
for msg in history[-5:]:
|
||||
role = msg.get('role', 'unknown')
|
||||
content = msg.get('content', '')
|
||||
ts = msg.get('timestamp', '')
|
||||
lines.append(f"- [{ts}] {role}: {content[:200]}...")
|
||||
|
||||
print('\n'.join(lines))
|
||||
|
||||
except Exception as e:
|
||||
print(f"Warning: Failed to load context: {e}", file=sys.stderr)
|
||||
print("", file=sys.stderr)
|
||||
PYEOF
|
||||
}
|
||||
|
||||
kugetsu_context_dump() {
|
||||
local issue_ref="$1"
|
||||
local message="$2"
|
||||
local branch_name="${3:-}"
|
||||
|
||||
if [ "$ENABLE_CONTEXT_DUMP" != "true" ]; then
|
||||
return
|
||||
fi
|
||||
|
||||
local context_file=$(issue_ref_to_context_file "$issue_ref")
|
||||
mkdir -p "$CONTEXT_DIR"
|
||||
|
||||
python3 << PYEOF
|
||||
import json
|
||||
import os
|
||||
from datetime import datetime
|
||||
|
||||
context_file = "$context_file"
|
||||
issue_ref = "$issue_ref"
|
||||
message = """$message"""
|
||||
branch_name = "$branch_name"
|
||||
|
||||
context = {
|
||||
"issue_ref": issue_ref,
|
||||
"current_branch": branch_name,
|
||||
"updated_at": datetime.now().isoformat() + "Z",
|
||||
"last_message": message[:500] if message else "",
|
||||
"conversation_history": []
|
||||
}
|
||||
|
||||
if os.path.exists(context_file):
|
||||
try:
|
||||
with open(context_file, 'r') as f:
|
||||
existing = json.load(f)
|
||||
|
||||
history = existing.get('conversation_history', [])
|
||||
history.append({
|
||||
"role": "user",
|
||||
"content": message[:1000] if message else "",
|
||||
"timestamp": datetime.now().isoformat() + "Z"
|
||||
})
|
||||
history = history[-20:]
|
||||
|
||||
context["conversation_history"] = history
|
||||
context["created_at"] = existing.get("created_at", context["updated_at"])
|
||||
except:
|
||||
context["created_at"] = datetime.now().isoformat() + "Z"
|
||||
else:
|
||||
context["created_at"] = datetime.now().isoformat() + "Z"
|
||||
|
||||
with open(context_file, 'w') as f:
|
||||
json.dump(context, f, indent=2)
|
||||
PYEOF
|
||||
}
|
||||
|
||||
kugetsu_context_update_message() {
|
||||
local issue_ref="$1"
|
||||
local message="$2"
|
||||
|
||||
if [ "$ENABLE_CONTEXT_DUMP" != "true" ]; then
|
||||
return
|
||||
fi
|
||||
|
||||
local context_file=$(issue_ref_to_context_file "$issue_ref")
|
||||
|
||||
if [ ! -f "$context_file" ]; then
|
||||
return
|
||||
fi
|
||||
|
||||
python3 << PYEOF
|
||||
import json
|
||||
from datetime import datetime
|
||||
|
||||
context_file = "$context_file"
|
||||
message = """$message"""
|
||||
|
||||
try:
|
||||
with open(context_file, 'r') as f:
|
||||
ctx = json.load(f)
|
||||
|
||||
history = ctx.get('conversation_history', [])
|
||||
history.append({
|
||||
"role": "assistant",
|
||||
"content": message[:1000] if message else "",
|
||||
"timestamp": datetime.now().isoformat() + "Z"
|
||||
})
|
||||
history = history[-20:]
|
||||
|
||||
ctx["conversation_history"] = history
|
||||
ctx["last_message"] = message[:500] if message else ""
|
||||
ctx["updated_at"] = datetime.now().isoformat() + "Z"
|
||||
|
||||
with open(context_file, 'w') as f:
|
||||
json.dump(ctx, f, indent=2)
|
||||
except Exception as e:
|
||||
pass
|
||||
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
|
||||
}
|
||||
|
||||
read_index() {
|
||||
if [ -f "$INDEX_FILE" ]; then
|
||||
cat "$INDEX_FILE"
|
||||
@@ -1651,7 +1401,6 @@ EOF
|
||||
cmd_start() {
|
||||
local issue_ref=""
|
||||
local message=""
|
||||
local pr_url=""
|
||||
local args=("$@")
|
||||
|
||||
args=$(set_debug_mode "${args[@]}")
|
||||
@@ -1661,14 +1410,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
|
||||
|
||||
@@ -1717,10 +1463,7 @@ cmd_start() {
|
||||
> "$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}
|
||||
|
||||
## YOUR TASK
|
||||
$message"
|
||||
@@ -1800,29 +1543,10 @@ 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"
|
||||
|
||||
kugetsu_context_dump "$issue_ref" "$message" "$branch_name"
|
||||
|
||||
echo "Session started for '$issue_ref': $new_session_id"
|
||||
echo "Worktree: $worktree_path"
|
||||
@@ -1871,31 +1595,22 @@ cmd_continue() {
|
||||
local worktree_path=$(python3 -c "import json; print(json.load(open('$session_path')).get('worktree_path', ''))" 2>/dev/null || echo "")
|
||||
|
||||
echo "Continuing session for '$session_name'..."
|
||||
|
||||
local previous_context=$(kugetsu_context_load "$session_name")
|
||||
local full_message="${previous_context}
|
||||
|
||||
## CONTINUE TASK
|
||||
$message"
|
||||
|
||||
# Note: --continue always allowed (existing sessions don't count toward limit)
|
||||
# Wrap in subshell with cd to ensure worktree directory is set correctly in session DB
|
||||
if [ -n "$worktree_path" ] && [ -d "$worktree_path" ]; then
|
||||
echo "Using worktree: $worktree_path"
|
||||
if [ "$DEBUG_MODE" = true ]; then
|
||||
(cd "$worktree_path" && opencode run "$full_message" --continue --session "$opencode_session_id" --dir "$worktree_path" 2>&1) | tee "$session_path.debug.log" &
|
||||
(cd "$worktree_path" && opencode run "$message" --continue --session "$opencode_session_id" --dir "$worktree_path" 2>&1) | tee "$session_path.debug.log" &
|
||||
else
|
||||
(cd "$worktree_path" && opencode run "$full_message" --continue --session "$opencode_session_id" --dir "$worktree_path" 2>&1) &
|
||||
(cd "$worktree_path" && opencode run "$message" --continue --session "$opencode_session_id" --dir "$worktree_path" 2>&1) &
|
||||
fi
|
||||
else
|
||||
if [ "$DEBUG_MODE" = true ]; then
|
||||
opencode run "$full_message" --continue --session "$opencode_session_id" 2>&1 | tee "$session_path.debug.log" &
|
||||
opencode run "$message" --continue --session "$opencode_session_id" 2>&1 | tee "$session_path.debug.log" &
|
||||
else
|
||||
opencode run "$full_message" --continue --session "$opencode_session_id" 2>&1 &
|
||||
opencode run "$message" --continue --session "$opencode_session_id" 2>&1 &
|
||||
fi
|
||||
fi
|
||||
|
||||
kugetsu_context_update_message "$session_name" "$message"
|
||||
}
|
||||
|
||||
cmd_list() {
|
||||
@@ -2105,25 +1820,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
|
||||
@@ -2176,6 +1872,9 @@ main() {
|
||||
env)
|
||||
cmd_env "$@"
|
||||
;;
|
||||
post-comment)
|
||||
cmd_post_comment "$@"
|
||||
;;
|
||||
doctor)
|
||||
cmd_doctor "$@"
|
||||
;;
|
||||
@@ -2191,33 +1890,6 @@ 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
|
||||
echo "Usage: kugetsu context <issue-ref>" >&2
|
||||
echo "Show context for an issue" >&2
|
||||
exit 1
|
||||
fi
|
||||
validate_issue_ref "$issue_ref"
|
||||
local context_file=$(issue_ref_to_context_file "$issue_ref")
|
||||
if [ -f "$context_file" ]; then
|
||||
cat "$context_file"
|
||||
else
|
||||
echo "No context found for '$issue_ref'" >&2
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
echo "Error: unknown command '$command'" >&2
|
||||
usage
|
||||
|
||||
Reference in New Issue
Block a user