Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3ce43ffa65 | ||
|
|
416e8e5757 | ||
| 1c1d18b9ae | |||
|
|
8c639e2928 | ||
| c4c3556247 | |||
|
|
4342347ac6 | ||
| 7888a34bd9 | |||
|
|
e2a37cdbb9 |
@@ -394,6 +394,41 @@ kugetsu_get_pm_context() {
|
|||||||
fi
|
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() {
|
kugetsu_add_notification() {
|
||||||
local type="$1"
|
local type="$1"
|
||||||
local message="$2"
|
local message="$2"
|
||||||
@@ -1088,6 +1123,11 @@ EOF
|
|||||||
echo "Created pm-agent env file: $ENV_DIR/pm-agent.env"
|
echo "Created pm-agent env file: $ENV_DIR/pm-agent.env"
|
||||||
fi
|
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_base=$(get_base_session_id)
|
||||||
local existing_pm=$(get_pm_agent_session_id)
|
local existing_pm=$(get_pm_agent_session_id)
|
||||||
|
|
||||||
@@ -1107,6 +1147,29 @@ EOF
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
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 "Starting TUI to create base session..."
|
||||||
echo "Press Ctrl+C to cancel or wait for session to be created"
|
echo "Press Ctrl+C to cancel or wait for session to be created"
|
||||||
sleep 2
|
sleep 2
|
||||||
@@ -1240,12 +1303,20 @@ cmd_start() {
|
|||||||
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}"
|
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
|
fix_session_permissions
|
||||||
|
|
||||||
if [ "$DEBUG_MODE" = true ]; then
|
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
|
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
|
fi
|
||||||
|
|
||||||
local fork_pid=$!
|
local fork_pid=$!
|
||||||
@@ -1368,12 +1439,13 @@ cmd_continue() {
|
|||||||
|
|
||||||
echo "Continuing session for '$session_name'..."
|
echo "Continuing session for '$session_name'..."
|
||||||
# Note: --continue always allowed (existing sessions don't count toward limit)
|
# 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
|
if [ -n "$worktree_path" ] && [ -d "$worktree_path" ]; then
|
||||||
echo "Using worktree: $worktree_path"
|
echo "Using worktree: $worktree_path"
|
||||||
if [ "$DEBUG_MODE" = true ]; then
|
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
|
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
|
fi
|
||||||
else
|
else
|
||||||
if [ "$DEBUG_MODE" = true ]; then
|
if [ "$DEBUG_MODE" = true ]; then
|
||||||
@@ -1530,15 +1602,22 @@ cmd_destroy() {
|
|||||||
|
|
||||||
if [ "$target" = "base" ]; then
|
if [ "$target" = "base" ]; then
|
||||||
if [ "$force" = true ]; 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"
|
rm -f "$SESSIONS_DIR/base.json"
|
||||||
local pm_agent=$(get_pm_agent_session_id)
|
rm -f "$SESSIONS_DIR/pm-agent.json"
|
||||||
if [ -n "$pm_agent" ] && [ "$pm_agent" != "null" ]; then
|
rm -f "$SESSIONS_DIR/issue-"*.json 2>/dev/null || true
|
||||||
rm -f "$SESSIONS_DIR/pm-agent.json"
|
echo '{"base": null, "pm_agent": null, "issues": {}}' > "$INDEX_FILE"
|
||||||
echo '{"base": null, "pm_agent": null, "issues": {}}' > "$INDEX_FILE"
|
|
||||||
else
|
if [ -n "$base_session_id" ] && [ "$base_session_id" != "null" ]; then
|
||||||
echo '{"base": null, "pm_agent": null, "issues": {}}' > "$INDEX_FILE"
|
echo "Deleting base session: $base_session_id"
|
||||||
|
opencode session delete "$base_session_id" 2>/dev/null || echo "Warning: Could not delete base session"
|
||||||
fi
|
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
|
else
|
||||||
echo "Error: destroying base session requires --base -y" >&2
|
echo "Error: destroying base session requires --base -y" >&2
|
||||||
exit 1
|
exit 1
|
||||||
@@ -1548,6 +1627,7 @@ cmd_destroy() {
|
|||||||
|
|
||||||
if [ "$target" = "pm-agent" ]; then
|
if [ "$target" = "pm-agent" ]; then
|
||||||
if [ "$force" = true ]; then
|
if [ "$force" = true ]; then
|
||||||
|
local pm_session_id=$(get_pm_agent_session_id)
|
||||||
rm -f "$SESSIONS_DIR/pm-agent.json"
|
rm -f "$SESSIONS_DIR/pm-agent.json"
|
||||||
local base=$(get_base_session_id)
|
local base=$(get_base_session_id)
|
||||||
if [ -n "$base" ] && [ "$base" != "null" ]; then
|
if [ -n "$base" ] && [ "$base" != "null" ]; then
|
||||||
@@ -1555,6 +1635,10 @@ cmd_destroy() {
|
|||||||
else
|
else
|
||||||
write_index "null" "null" "{}"
|
write_index "null" "null" "{}"
|
||||||
fi
|
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"
|
echo "PM agent session destroyed"
|
||||||
else
|
else
|
||||||
echo "Error: destroying pm-agent session requires --pm-agent -y" >&2
|
echo "Error: destroying pm-agent session requires --pm-agent -y" >&2
|
||||||
|
|||||||
Reference in New Issue
Block a user