Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
dc2254cfba | ||
|
|
91505345a2 | ||
| f7fe22de25 | |||
|
|
3ce43ffa65 | ||
|
|
416e8e5757 | ||
| 1c1d18b9ae | |||
|
|
8c639e2928 | ||
| c4c3556247 | |||
|
|
4342347ac6 | ||
| 7888a34bd9 | |||
|
|
e2a37cdbb9 |
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
@@ -394,6 +394,41 @@ kugetsu_get_pm_context() {
|
||||
fi
|
||||
}
|
||||
|
||||
kugetsu_get_fork_context() {
|
||||
local issue_ref="$1"
|
||||
local context=""
|
||||
|
||||
context="## IMPORTANT WORKING RULES
|
||||
|
||||
1. You are working on issue: $issue_ref
|
||||
2. If you encounter ANY error, blocker, or cannot complete the task:
|
||||
- STOP immediately
|
||||
- Log what happened and why you cannot proceed
|
||||
- Do NOT switch to other work or try alternative approaches
|
||||
3. Do NOT work on other issues or PRs unless explicitly asked
|
||||
4. Environment variables are available in ~/.kugetsu/env/
|
||||
|
||||
"
|
||||
|
||||
if [ -f "$REPOS_CONFIG" ]; then
|
||||
context="${context}
|
||||
## REPOSITORIES CONFIG
|
||||
$(cat "$REPOS_CONFIG")
|
||||
|
||||
"
|
||||
fi
|
||||
|
||||
if [ -f "$ENV_DIR/default.env" ]; then
|
||||
context="${context}
|
||||
## ENVIRONMENT (available at ~/.kugetsu/env/)
|
||||
Environment file exists at: $ENV_DIR/default.env
|
||||
Source it with: source ~/.kugetsu/env/default.env
|
||||
"
|
||||
fi
|
||||
|
||||
echo "$context"
|
||||
}
|
||||
|
||||
kugetsu_add_notification() {
|
||||
local type="$1"
|
||||
local message="$2"
|
||||
@@ -606,6 +641,99 @@ EOF
|
||||
fi
|
||||
}
|
||||
|
||||
parse_issue_ref_from_message() {
|
||||
local message="$1"
|
||||
|
||||
local gitserver=""
|
||||
local owner=""
|
||||
local repo=""
|
||||
local issue_number=""
|
||||
|
||||
if echo "$message" | grep -qE '[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+/(issues|pull)/[0-9]+'; then
|
||||
gitserver=$(echo "$message" | grep -oE '[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+' | head -1 | sed 's/\/[^/]*\/[^/]*$//')
|
||||
local full_path=$(echo "$message" | grep -oE '[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}/[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+/(issues|pull)/[0-9]+' | head -1)
|
||||
owner=$(echo "$full_path" | cut -d'/' -f2)
|
||||
repo=$(echo "$full_path" | cut -d'/' -f3)
|
||||
issue_number=$(echo "$full_path" | grep -oE '[0-9]+$' | head -1)
|
||||
elif echo "$message" | grep -qE '[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+#([0-9]+)'; then
|
||||
owner=$(echo "$message" | grep -oE '[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+#' | sed 's/#$//' | cut -d'/' -f1)
|
||||
repo=$(echo "$message" | grep -oE '[a-zA-Z0-9_.-]+/[a-zA-Z0-9_.-]+#' | sed 's/#$//' | cut -d'/' -f2)
|
||||
issue_number=$(echo "$message" | grep -oE '#[0-9]+' | grep -oE '[0-9]+' | head -1)
|
||||
fi
|
||||
|
||||
echo "${gitserver}|${owner}|${repo}|${issue_number}"
|
||||
}
|
||||
|
||||
get_missing_info() {
|
||||
local parsed="$1"
|
||||
local gitserver=$(echo "$parsed" | cut -d'|' -f1)
|
||||
local owner=$(echo "$parsed" | cut -d'|' -f2)
|
||||
local repo=$(echo "$parsed" | cut -d'|' -f3)
|
||||
local issue_number=$(echo "$parsed" | cut -d'|' -f4)
|
||||
|
||||
local missing=""
|
||||
[ -z "$gitserver" ] && missing="${missing}git server, "
|
||||
[ -z "$owner" ] && missing="${missing}owner, "
|
||||
[ -z "$repo" ] && missing="${missing}repository, "
|
||||
[ -z "$issue_number" ] && missing="${missing}issue number, "
|
||||
|
||||
echo "$missing" | sed 's/, $//'
|
||||
}
|
||||
|
||||
build_missing_info_context() {
|
||||
local missing="$1"
|
||||
if [ -n "$missing" ]; then
|
||||
echo ""
|
||||
echo "NOTE: This task delegation has no information about: ${missing}."
|
||||
echo "We need them if user wants to work on a specific issue. Otherwise we don't need it."
|
||||
fi
|
||||
}
|
||||
|
||||
find_worktrees_by_issue_number() {
|
||||
local issue_number="$1"
|
||||
local results=""
|
||||
|
||||
if [ ! -d "$WORKTREES_DIR/.kugetsu-worktrees" ]; then
|
||||
echo ""
|
||||
return
|
||||
fi
|
||||
|
||||
for wt in "$WORKTREES_DIR/.kugetsu-worktrees"/*; do
|
||||
if [ -d "$wt" ]; then
|
||||
local wt_issue_number=$(echo "$wt" | grep -oE '#?[0-9]+$' | grep -oE '[0-9]+' | head -1)
|
||||
if [ "$wt_issue_number" = "$issue_number" ]; then
|
||||
results="${results}${wt}:worktree
|
||||
"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
echo "$results"
|
||||
}
|
||||
|
||||
find_sessions_by_issue_number() {
|
||||
local issue_number="$1"
|
||||
local results=""
|
||||
|
||||
if [ ! -d "$SESSIONS_DIR" ]; then
|
||||
echo ""
|
||||
return
|
||||
fi
|
||||
|
||||
for session_file in "$SESSIONS_DIR"/*.json; do
|
||||
if [ -f "$session_file" ]; then
|
||||
local session_issue_ref=$(basename "$session_file" .json | sed 's/_/\//g')
|
||||
local session_issue_number=$(echo "$session_issue_ref" | grep -oE '#?[0-9]+$' | grep -oE '[0-9]+' | head -1)
|
||||
if [ "$session_issue_number" = "$issue_number" ]; then
|
||||
results="${results}${session_file}:session
|
||||
"
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
echo "$results"
|
||||
}
|
||||
|
||||
cmd_delegate() {
|
||||
local message="${1:-}"
|
||||
local verbosity="${KUGETSU_VERBOSITY:-default}"
|
||||
@@ -625,6 +753,70 @@ cmd_delegate() {
|
||||
mkdir -p "$LOGS_DIR"
|
||||
local log_file="$LOGS_DIR/delegate-$(date +%s).log"
|
||||
|
||||
local parsed=$(parse_issue_ref_from_message "$message")
|
||||
local gitserver=$(echo "$parsed" | cut -d'|' -f1)
|
||||
local owner=$(echo "$parsed" | cut -d'|' -f2)
|
||||
local repo=$(echo "$parsed" | cut -d'|' -f3)
|
||||
local issue_number=$(echo "$parsed" | cut -d'|' -f4)
|
||||
|
||||
local missing_info=$(get_missing_info "$parsed")
|
||||
local context_injection=""
|
||||
if [ -n "$missing_info" ]; then
|
||||
context_injection=$(build_missing_info_context "$missing_info")
|
||||
echo "NOTE: Delegation missing information: ${missing_info}"
|
||||
fi
|
||||
|
||||
local candidates=""
|
||||
local candidate_count=0
|
||||
|
||||
if [ -n "$issue_number" ]; then
|
||||
local worktrees=$(find_worktrees_by_issue_number "$issue_number")
|
||||
local sessions=$(find_sessions_by_issue_number "$issue_number")
|
||||
|
||||
while IFS=: read -r path type; do
|
||||
if [ -n "$path" ]; then
|
||||
candidate_count=$((candidate_count + 1))
|
||||
candidates="${candidates}${candidate_count}) ${path} (${type})
|
||||
"
|
||||
fi
|
||||
done <<< "$worktrees"
|
||||
|
||||
while IFS=: read -r path type; do
|
||||
if [ -n "$path" ]; then
|
||||
candidate_count=$((candidate_count + 1))
|
||||
candidates="${candidates}${candidate_count}) ${path} (${type})
|
||||
"
|
||||
fi
|
||||
done <<< "$sessions"
|
||||
fi
|
||||
|
||||
local use_worktree=""
|
||||
if [ $candidate_count -gt 0 ]; then
|
||||
echo "Found $candidate_count existing worktree(s)/session(s) for issue #${issue_number}:"
|
||||
echo "$candidates"
|
||||
echo "r) Delegate anyway (without routing)"
|
||||
echo "Which one to use? [1-${candidate_count}/r]: "
|
||||
read -r choice
|
||||
|
||||
if [ "$choice" = "r" ] || [ -z "$choice" ]; then
|
||||
use_worktree=""
|
||||
elif [ "$choice" -ge 1 ] && [ "$choice" -le "$candidate_count" ]; then
|
||||
local selected=$(echo "$candidates" | sed -n "${choice}p")
|
||||
use_worktree=$(echo "$selected" | sed 's/) .*//')
|
||||
fi
|
||||
fi
|
||||
|
||||
local final_message="${message}${context_injection}"
|
||||
|
||||
if [ -n "$use_worktree" ]; then
|
||||
if [ -d "$use_worktree" ]; then
|
||||
echo "Using worktree: $use_worktree"
|
||||
final_message="${final_message}
|
||||
|
||||
NOTE: Worktree selected: ${use_worktree}"
|
||||
fi
|
||||
fi
|
||||
|
||||
local temp_dir="${KUGETSU_TEMP_DIR:-$HOME/.local/share/opencode/tool-output}"
|
||||
|
||||
mkdir -p "$ENV_DIR"
|
||||
@@ -636,7 +828,7 @@ cmd_delegate() {
|
||||
fi
|
||||
env_sh="${env_sh}set +a; "
|
||||
|
||||
nohup sh -c "${env_sh}opencode run '$message' --continue --session '$pm_session' >> '$log_file' 2>&1" > /dev/null 2>&1 &
|
||||
nohup sh -c "${env_sh}opencode run '${final_message}' --continue --session '$pm_session' >> '$log_file' 2>&1" > /dev/null 2>&1 &
|
||||
disown
|
||||
echo "Delegated to PM agent (logged to $(basename "$log_file"))"
|
||||
echo "Verbosity: $verbosity"
|
||||
@@ -1088,6 +1280,11 @@ EOF
|
||||
echo "Created pm-agent env file: $ENV_DIR/pm-agent.env"
|
||||
fi
|
||||
|
||||
if [ -d "$LOGS_DIR" ]; then
|
||||
echo "Cleaning up old logs..."
|
||||
rm -rf "$LOGS_DIR"/*.log 2>/dev/null || true
|
||||
fi
|
||||
|
||||
local existing_base=$(get_base_session_id)
|
||||
local existing_pm=$(get_pm_agent_session_id)
|
||||
|
||||
@@ -1107,6 +1304,29 @@ EOF
|
||||
exit 1
|
||||
fi
|
||||
|
||||
local init_worktree_dir="$HOME/.kugetsu-worktrees"
|
||||
mkdir -p "$init_worktree_dir"
|
||||
cd "$init_worktree_dir"
|
||||
echo "Initialized kugetsu worktrees directory: $init_worktree_dir"
|
||||
echo "Base session will be created in this directory."
|
||||
echo ""
|
||||
|
||||
local cwd_files=$(ls -A "$PWD" 2>/dev/null | wc -l)
|
||||
local cwd_git=$(git rev-parse --is-inside-work-tree 2>/dev/null || echo "false")
|
||||
if [ "$cwd_files" -gt 0 ] || [ "$cwd_git" = "true" ]; then
|
||||
echo "Warning: Worktrees directory is not empty: $PWD" >&2
|
||||
echo "This may cause project context to contaminate the base session." >&2
|
||||
echo "Consider running kugetsu destroy --base -y and reinitializing." >&2
|
||||
echo "" >&2
|
||||
echo "Files in current directory: $cwd_files" >&2
|
||||
if [ "$cwd_git" = "true" ]; then
|
||||
echo "Git repository detected: $(git rev-parse --show-toplevel 2>/dev/null || echo 'unknown')" >&2
|
||||
fi
|
||||
echo "" >&2
|
||||
echo "Press Ctrl+C to cancel or wait 5 seconds to continue anyway..." >&2
|
||||
sleep 5
|
||||
fi
|
||||
|
||||
echo "Starting TUI to create base session..."
|
||||
echo "Press Ctrl+C to cancel or wait for session to be created"
|
||||
sleep 2
|
||||
@@ -1240,12 +1460,20 @@ cmd_start() {
|
||||
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 full_message="${fork_context}
|
||||
|
||||
## YOUR TASK
|
||||
$message"
|
||||
|
||||
fix_session_permissions
|
||||
|
||||
if [ "$DEBUG_MODE" = true ]; then
|
||||
(cd "$worktree_path" && opencode run "$message" --fork --session "$base_session_id" 2>&1) | tee "$fork_log" &
|
||||
(cd "$worktree_path" && opencode run "$full_message" --fork --session "$base_session_id" --dir "$worktree_path" 2>&1) | tee "$fork_log" &
|
||||
else
|
||||
(cd "$worktree_path" && opencode run "$message" --fork --session "$base_session_id" 2>&1) >> "$fork_log" &
|
||||
(cd "$worktree_path" && opencode run "$full_message" --fork --session "$base_session_id" --dir "$worktree_path" 2>&1) >> "$fork_log" &
|
||||
fi
|
||||
|
||||
local fork_pid=$!
|
||||
@@ -1368,12 +1596,13 @@ cmd_continue() {
|
||||
|
||||
echo "Continuing session for '$session_name'..."
|
||||
# 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 "$message" --continue --session "$opencode_session_id" 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 "$message" --continue --session "$opencode_session_id" 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
|
||||
@@ -1530,15 +1759,22 @@ cmd_destroy() {
|
||||
|
||||
if [ "$target" = "base" ]; then
|
||||
if [ "$force" = true ]; then
|
||||
local base_session_id=$(get_base_session_id)
|
||||
local pm_agent_session_id=$(get_pm_agent_session_id)
|
||||
rm -f "$SESSIONS_DIR/base.json"
|
||||
local pm_agent=$(get_pm_agent_session_id)
|
||||
if [ -n "$pm_agent" ] && [ "$pm_agent" != "null" ]; then
|
||||
rm -f "$SESSIONS_DIR/pm-agent.json"
|
||||
echo '{"base": null, "pm_agent": null, "issues": {}}' > "$INDEX_FILE"
|
||||
else
|
||||
echo '{"base": null, "pm_agent": null, "issues": {}}' > "$INDEX_FILE"
|
||||
rm -f "$SESSIONS_DIR/pm-agent.json"
|
||||
rm -f "$SESSIONS_DIR/issue-"*.json 2>/dev/null || true
|
||||
echo '{"base": null, "pm_agent": null, "issues": {}}' > "$INDEX_FILE"
|
||||
|
||||
if [ -n "$base_session_id" ] && [ "$base_session_id" != "null" ]; then
|
||||
echo "Deleting base session: $base_session_id"
|
||||
opencode session delete "$base_session_id" 2>/dev/null || echo "Warning: Could not delete base session"
|
||||
fi
|
||||
echo "Base session destroyed"
|
||||
if [ -n "$pm_agent_session_id" ] && [ "$pm_agent_session_id" != "null" ]; then
|
||||
echo "Deleting PM agent session: $pm_agent_session_id"
|
||||
opencode session delete "$pm_agent_session_id" 2>/dev/null || echo "Warning: Could not delete PM agent session"
|
||||
fi
|
||||
echo "Base and PM agent sessions destroyed"
|
||||
else
|
||||
echo "Error: destroying base session requires --base -y" >&2
|
||||
exit 1
|
||||
@@ -1548,6 +1784,7 @@ cmd_destroy() {
|
||||
|
||||
if [ "$target" = "pm-agent" ]; then
|
||||
if [ "$force" = true ]; then
|
||||
local pm_session_id=$(get_pm_agent_session_id)
|
||||
rm -f "$SESSIONS_DIR/pm-agent.json"
|
||||
local base=$(get_base_session_id)
|
||||
if [ -n "$base" ] && [ "$base" != "null" ]; then
|
||||
@@ -1555,6 +1792,10 @@ cmd_destroy() {
|
||||
else
|
||||
write_index "null" "null" "{}"
|
||||
fi
|
||||
if [ -n "$pm_session_id" ] && [ "$pm_session_id" != "null" ]; then
|
||||
echo "Deleting opencode session: $pm_session_id"
|
||||
opencode session delete "$pm_session_id" 2>/dev/null || echo "Warning: Could not delete session from opencode (may already be deleted)"
|
||||
fi
|
||||
echo "PM agent session destroyed"
|
||||
else
|
||||
echo "Error: destroying pm-agent session requires --pm-agent -y" >&2
|
||||
@@ -1631,6 +1872,9 @@ main() {
|
||||
env)
|
||||
cmd_env "$@"
|
||||
;;
|
||||
post-comment)
|
||||
cmd_post_comment "$@"
|
||||
;;
|
||||
doctor)
|
||||
cmd_doctor "$@"
|
||||
;;
|
||||
|
||||
Reference in New Issue
Block a user