Commit Graph

126 Commits

Author SHA1 Message Date
shokollm
bdcb7a476c fix(queue-daemon): add locking, proper state updates, and error handling
- Add acquire_lock/release_lock to prevent daemon vs manual conflicts
- Check cmd_start/cmd_continue success before updating state to 'notified'
- Set state to 'error' if command fails
- Track actual session_id from session file after cmd_start completes
- Release lock when task completes (success or error)
- Use load_agent_env 'pm-agent' for GITEA_TOKEN

Fixes critical race conditions and failure handling in queue processing
2026-04-06 00:01:41 +00:00
shokollm
5a0a54898b fix(kugetsu): kugetsu-session.sh needs to source required modules
When daemon sources kugetsu-session.sh to call cmd_start/cmd_continue,
it needs access to functions from kugetsu-config.sh, kugetsu-index.sh,
kugetsu-worktree.sh, and kugetsu-log.sh. Add sourcing at top of
kugetsu-session.sh.
2026-04-05 22:20:49 +00:00
shokollm
b1028a6556 fix(kugetsu): move queue functions to kugetsu-index.sh for daemon access
The daemon (kugetsu-queue-daemon.sh) sources kugetsu-index.sh but not the main kugetsu script.
Move update_queue_item_state and kugetsu_add_notification to kugetsu-index.sh
so the daemon can use these functions when processing tasks.
2026-04-05 22:17:59 +00:00
shokollm
270219873f fix(kugetsu): cmd_delegate should enqueue instead of calling cmd_start
When cmd_delegate detects an issue ref with number (e.g. git.fbrns.co/shoko/kugetsu#158),
it was calling cmd_start directly which tries to create worktree and clone.
This breaks the queue-based workflow where daemon should handle task execution.

Now cmd_delegate calls enqueue_task to add to queue, and daemon processes
tasks by calling cmd_start/cmd_continue as appropriate.
2026-04-05 22:05:18 +00:00
shokollm
cbfc8a0646 refactor(kugetsu): daemon uses cmd_start/cmd_continue instead of direct opencode calls
- Move issue_ref_to_filename and filename_to_issue_ref to kugetsu-index.sh
  (where they logically belong, instead of in main kugetsu script)
- Refactor queue daemon to use cmd_start/cmd_continue for session management
- Daemon now checks if worktree/session exists → cmd_continue, else → cmd_start
- Removes ~40 lines of direct opencode session forking logic from daemon
- cmd_start/cmd_continue handle worktree creation, session forking, and tracking

This simplifies the daemon significantly and centralizes session management
in kugetsu-session.sh where it belongs.
2026-04-05 21:29:34 +00:00
shokollm
7fa669b4c3 fix(kugetsu): queue daemon runs PM agent in correct worktree with proper token
- Load GITEA_TOKEN from ~/.kugetsu/env/default.env at daemon startup
- Use --fork --session --dir instead of --continue to run in correct directory
- Create worktree if it doesn't exist for the issue
- Track forked session ID (not parent pm_session) for completion detection
- Forked session ends when task completes, parent pm_session continues

Fixes #156
2026-04-05 20:57:51 +00:00
shokollm
1d4f190d97 fix(kugetsu): pass GITEA_TOKEN via env to subprocess instead of hardcoded value 2026-04-05 13:09:08 +00:00
shokollm
ab0c4e1448 fix: detect task completion by checking if session ended and has commits 2026-04-05 12:45:59 +00:00
shokollm
9bb8afe8c5 Merge origin/main into fix/issue-148-test-suite-index-corruption (fix CONTRIBUTING.md conflict) 2026-04-05 12:24:02 +00:00
shokollm
fd7a98b263 fix: validate sessions in cmd_status + use isolated test environment
1. cmd_status now validates session IDs against opencode session list
   - Reports 'error: base session X not found in opencode' if missing
   - Reports 'error: pm_agent session X not found in opencode' if missing

2. Test suite now uses isolated KUGETSU_DIR=/tmp/test-kugetsu-$$
   - All tests use separate test directory instead of ~/.kugetsu
   - Prevents test suite from corrupting real user data
   - Cleanup removes test directory entirely

Fixes #148
2026-04-05 12:10:55 +00:00
shokollm
1886c4a9c5 Merge origin/main into fix/issue-116-modularize-script (fix leftover conflict markers) 2026-04-05 10:57:46 +00:00
shokollm
d0b100fca8 fix: add support for gitserver/owner/repo#number issue ref format
Add third pattern to parse_issue_ref_from_message() to support the mixed
format 'gitserver/owner/repo#number' (e.g., git.fbrns.co/shoko/kugetsu#116).

Previously only two formats were supported:
1. Full URL: #116
2. Short format: shoko/kugetsu#116

Now supports:
3. Mixed format: git.fbrns.co/shoko/kugetsu#116

Fixes #144
2026-04-05 10:22:31 +00:00
shokollm
f61fbd6dd5 refactor: modularize kugetsu shell script
Split the monolithic kugetsu script into modular components:

Modules created:
- kugetsu-config.sh - Config/env loading and global variables
- kugetsu-index.sh - Index.json read/write via JSON
- kugetsu-worktree.sh - Git worktree operations
- kugetsu-log.sh - Structured logging and notifications
- kugetsu-session.sh - Session create/fork/destroy logic
- kugetsu-queue-daemon.sh - Queue daemon subprocess

Main script (kugetsu) is now a thin dispatcher that sources all modules.

Acceptance Criteria:
- All existing commands work exactly as before
- Main script sources modules
- Each module is independently testable

Fixes #116
2026-04-05 10:17:25 +00:00
shokollm
54aa6419eb fix(kugetsu): prevent excess agent spawning with flock + sequential processing
- count_active_dev_sessions() now excludes pm-agent.json from count
- process_queue() now calls kugetsu start directly (not opencode run)
- process_queue() uses dynamic batch size = available_slots
- process_queue() has retry logic (max 3 attempts) on failure
- cmd_start() now uses flock around critical section
- Added notification types: task_queued, task_dequeued, task_started, task_completed, task_error
- Removed QUEUE_DAEMON_BATCH_SIZE config (no longer needed)

Fixes issue #146
2026-04-05 08:44:45 +00:00
26346235c9 fix: add missing closing parenthesis in process_queue Python extraction
Fixes #142 - process_queue silently skips all queue items because
issue_ref and message Python extraction commands were missing a closing
parenthesis. The error was silently swallowed by 2>/dev/null causing
both variables to be empty, so every queue item was skipped.
2026-04-05 06:51:57 +00:00
shokollm
0fa778353b feat(timeout): add agent timeout handling
Implements #137 - Agent timeout handling.

Changes:
- Add TASK_TIMEOUT_HOURS config (default: 1 hour)
- Update queue item to track opencode_session_id and pid
- Add check_task_timeouts() function that:
  - Checks notified tasks against timeout threshold
  - Kills process if exceeded
  - Marks session as 'timeout' state
- Integrate timeout check into queue daemon loop

Timeout behavior:
- Task is marked 'notified' when PM receives it
- If not completed within TASK_TIMEOUT_HOURS, task is killed
- Queue item marked 'error', session marked 'timeout'
2026-04-05 04:53:27 +00:00
shokollm
379d53cedc docs: update SKILL.md with queue system documentation
- Update kugetsu delegate section to explain queue-based processing
- Add queue-daemon command documentation
- Update queue command with proper list/stats/clear/enqueue
- Add queue-related config options
- Update directory structure to include queue/
- Update workflow example with queue daemon setup
2026-04-05 04:45:56 +00:00
shokollm
043542344a feat(queue): add queue system with background daemon
Implements #134 - Queue system with background daemon.

## Changes

### Configuration
- QUEUE_DIR, QUEUE_ITEMS_DIR for queue storage
- QUEUE_DAEMON_PID_FILE, LOCK_FILE, LOG_FILE for daemon management
- QUEUE_DAEMON_INTERVAL_MINUTES (default: 5)
- QUEUE_DAEMON_BATCH_SIZE (default: 2)
- QUEUE_CLEANUP_AGE_DAYS (default: 7)

### Queue System
- File-based queue at ~/.kugetsu/queue/items/
- One JSON file per queue item
- States: pending, notified, completed, error

### New Commands
- kugetsu queue [list|stats|clear] - View queue status
- kugetsu queue enqueue <issue-ref> <message> - Manually enqueue
- kugetsu queue-daemon [start|stop|restart|status|logs] - Daemon management

### Behavior Change
- kugetsu delegate now always enqueues (fire-and-forget)
- Queue daemon polls queue and invokes PM when slots available

### Queue Item Format
```json
{
  "id": "q_xxx",
  "issue_ref": "github.com/user/repo#123",
  "message": "task description",
  "state": "pending",
  "pending_since": "...",
  "notified_at": null,
  "completed_at": null,
  "error": null
}
```

Closes #134
2026-04-05 04:28:41 +00:00
shokollm
61f06f825f Add context dump/load feature
Adds session context management to prevent session poisoning:
- CONTEXT_DIR and ENABLE_CONTEXT_DUMP config options
- issue_ref_to_context_file() - derive context file path
- kugetsu_context_load() - load previous context
- kugetsu_context_dump() - save context on session start
- kugetsu_context_update_message() - append to conversation history
- Integration in cmd_start and cmd_continue
- New 'kugetsu context' command
2026-04-05 04:23:26 +00:00
shokollm
ac850869fd fix(worktree-lifecycle): use github.com as example in set-pr help
- Remove accidentally committed worktree directory
2026-04-05 03:56:48 +00:00
shokollm
3107dbf1e5 fix(worktree-lifecycle): use GIT_SERVERS config for check_pr_status
- Extract hostname from pr_url instead of hardcoding domains
- Look up server base URL from GIT_SERVERS config
- Append /api/v1 to derive API URL (configurable per server)
- Works with any server configured in GIT_SERVERS
2026-04-05 03:41:41 +00:00
shokollm
b8b97e3c09 fix(worktree-lifecycle): address PR review feedback
- Rename update-pr to set-pr for clarity (it's setting the PR URL, not updating PR)
- Add optional pr-url argument to kugetsu start command
  Usage: kugetsu start <issue-ref> <message> [pr-url]
- If pr-url is provided at start, it's stored directly in session file
2026-04-05 03:16:05 +00:00
shokollm
d8af560e6d feat(worktree-lifecycle): add PR tracking and safe destroy
- Add WORKTREE_CHECK_PR_STATUS config (default: true)
- Add pr_url and branch_name fields to session files
- Add check_pr_status() to query PR status via API (Gitea/GitHub)
- Add update_session_pr_url() to update PR URL in session
- Add kugetsu update-pr command to set PR URL
- Modify cmd_destroy to check PR status before destroying worktree

Closes #135
2026-04-05 02:50:09 +00:00
shokollm
91505345a2 feat(kugetsu): smart delegate with worktree awareness
- Parse issue refs from message (gitserver.com/owner/repo/issues/123 or owner/repo#123)
- Find existing worktrees/sessions by issue number
- Ask user to confirm which worktree to use, or delegate anyway
- Inject missing info context to PM agent
- Inject selected worktree context to PM agent

Fixes #128
2026-04-03 14:20:48 +00:00
shokollm
3ce43ffa65 fix(kugetsu): wrap cmd_continue in subshell with cd for correct worktree dir
The --dir flag only sets directory for the subprocess, not the session's
stored directory in opencode's SQLite DB. This was already fixed for
cmd_start in v0.1.10, but cmd_continue still had the bug.

Fixes #127
2026-04-03 13:06:02 +00:00
shokollm
416e8e5757 fix(kugetsu): destroy --base now also deletes PM agent session
When destroying base session, we now also delete the PM agent session
and all issue session files. This ensures clean slate on re-init.
2026-04-02 14:47:40 +00:00
shokollm
8c639e2928 fix(kugetsu): init creates base session in ~/.kugetsu-worktrees, adds context to forked sessions, and clears logs
1. Init: cd to ~/.kugetsu-worktrees before creating base session
   This keeps all worktrees inside a predictable directory structure
   and avoids external_directory permission issues

2. Init: Clear old logs but keep repos.json, config, and env files

3. Fork context: Add kugetsu_get_fork_context() that provides:
   - Important working rules (stop on error, don't pivot)
   - Repository configuration from repos.json
   - Environment file location info

4. Fork message: Prepend context to user message when forking session
2026-04-02 14:32:07 +00:00
shokollm
4342347ac6 fix(kugetsu): destroy --base and --pm-agent actually delete opencode sessions
Previously destroy only removed local session files but didn't delete
the sessions from opencode's database. This caused init to reuse the
same session with old context.

Now destroy calls 'opencode session delete <id>' to properly remove
the session from opencode.
2026-04-02 13:28:47 +00:00
shokollm
e2a37cdbb9 fix(kugetsu): warn if init run from non-empty directory
Warn users if running kugetsu init from a directory with files or
git repository. This prevents project context from contaminating the
base session, which causes forked sessions to have unwanted context.
2026-04-02 13:19:49 +00:00
shokollm
6e9472b5e2 fix(kugetsu): detect session via DB query instead of opencode session list
opencode session list doesn't show sessions in ~/.kugetsu-worktrees/ directories.
This caused detection to fail even though sessions were being created.

Now we query the database directly for sessions matching the worktree path.
Also fixed database path in fix_session_permissions (was ~/.opencode/, should be ~/.local/share/opencode/).
2026-04-02 11:45:35 +00:00
shokollm
775f73348a fix(kugetsu): update forked session permissions after detection
Previously we only fixed base session permissions before forking.
But permissions are NOT inherited from parent to child.

Now we update the newly created session's permissions immediately
after detection, ensuring the forked session can access external
directories like ~/.kugetsu/worktrees/.
2026-04-02 11:15:27 +00:00
shokollm
f7ac2f35fe fix(kugetsu): call fix_session_permissions before forking
- Call fix_session_permissions in cmd_start before forking to ensure
  base session has correct permissions for external_directory access
- Add debug logging to show forked session's directory and permissions
  after creation to help diagnose permission inheritance issues
2026-04-02 11:08:30 +00:00
shokollm
cd12a0cda8 fix(kugetsu): fix session detection ordering and add DB debugging
1. Move session detection BEFORE checking if fork process is still running.
   Previous code broke out of loop if forked process exited, skipping detection.

2. Add database query debugging when detection fails to help diagnose
   why opencode session list might miss newly created sessions.
2026-04-02 09:57:27 +00:00
shokollm
b3ac73a283 Merge origin/main into fix/start-session-detection
Resolve conflict: use cd approach for worktree, keep retry logic
2026-04-02 09:39:45 +00:00
shokollm
1128b3dfa8 fix(kugetsu): improve session detection in cmd_start with retry logic and logging
- Capture fork output to log file for debugging
- Track fork PID to detect if process exits early
- Retry session detection up to 10 seconds instead of 1 second
- Show fork log output when session creation fails
- Improve error message to indicate timeout
2026-04-02 09:29:30 +00:00
shokollm
ede47439b0 fix: use cd + worktree inside parent dir instead of --dir flag
Issue #105: opencode run --fork/--continue --dir <path> fails to create sessions

Root cause: The --dir flag breaks session creation in opencode. Sessions
fail to be created when --dir is used with --fork or --continue.

Solution: Instead of using --dir flag, create worktrees inside the parent
session's directory and use 'cd $worktree_path && opencode run ...' to
change directory before running opencode.

Key changes:
- Worktrees now created at $PWD/.kugetsu-worktrees/{issue-ref}/ instead
  of $WORKTREES_DIR/{issue-ref}/
- .kugetsu-worktrees is a hidden directory (git ignored by default)
- cmd_start and cmd_continue now use 'cd && opencode run' instead of
  'opencode run --dir'

This approach works because:
1. Worktree is inside parent's directory tree (permission granted)
2. cd properly changes working directory before opencode runs
3. Session gets created with correct directory set
4. No .gitignore entry needed (. prefix makes it hidden from git)
2026-04-02 08:18:17 +00:00
shokollm
5f841e6e4a chore: documentation updates and quick fixes
- Add missing command docs to SKILL.md (delegate, logs, status, doctor, notify, server, queue)
- Add KUGETSU_VERBOSITY to config options table
- Delete outdated test-kugetsu.sh (tests non-existent resume/stop commands)
- Fix Phase 3 status in kugetsu-architecture.md (was In Progress, now Implemented)
- Fix env rm quote handling (use grep -v instead of sed)
- Add error handling for opencode init command
2026-04-02 04:06:39 +00:00
shokollm
538d9fba80 feat(kugetsu): add KUGETSU_VERBOSITY with verbose/default/quiet modes 2026-04-02 03:47:40 +00:00
shokollm
1e69b1abc4 Revert "feat(kugetsu): add lock mechanism for worktree coordination"
This reverts commit d62ecb884e.
2026-04-02 03:26:39 +00:00
shokollm
dbfd8e7028 Revert "feat(kugetsu): add queue infrastructure for autonomous PM"
This reverts commit 21a32cd937.
2026-04-02 03:25:56 +00:00
shokollm
d62ecb884e feat(kugetsu): add lock mechanism for worktree coordination 2026-04-02 03:18:36 +00:00
shokollm
21a32cd937 feat(kugetsu): add queue infrastructure for autonomous PM 2026-04-02 03:18:28 +00:00
shokollm
785e4edad5 feat(kugetsu): add KUGETSU_VERBOSITY for PM agent output control (total|verbose|hybrid) 2026-04-02 03:18:03 +00:00
caf1e9cdcd Merge pull request 'fix(kugetsu): add fix_session_permissions command for cmd_doctor' (#93) from fix/issue-36-permissions-v2 into main 2026-04-02 04:37:39 +02:00
shokollm
b2f2df7b06 test(kugetsu): add comprehensive tests for fix_session_permissions
- Test E7: verify fix_session_permissions function exists
- Test E8: verify cmd_doctor --fix-permissions flag is recognized
- Test E9: verify permission JSON is valid JSON
- Test E10: verify SQL UPDATE syntax works correctly

These tests verify the fix without requiring actual opencode installation.
2026-04-02 02:12:38 +00:00
shokollm
2060c4ffbe test: add fix_session_permissions tests
- Add test E7: verify fix_session_permissions function exists
- Add test E8: verify cmd_doctor --fix-permissions flag is recognized
- Add fix_session_permissions call to cmd_init to set permissions
  when initializing new sessions
2026-04-02 01:37:14 +00:00
shokollm
c0d4314933 test: add KUGETSU_TEMP_DIR export test
Add unit test to verify KUGETSU_TEMP_DIR is exported in cmd_delegate.
Also update SKILL.md to document KUGETSU_TEMP_DIR config option.
2026-04-02 01:18:49 +00:00
shokollm
74468af7c8 fix(kugetsu): add fix_session_permissions command for cmd_doctor
Add --fix-permissions flag to cmd_doctor:
  kugetsu doctor --fix-permissions

The fix_session_permissions() function:
- Updates base session and PM agent session permissions in SQLite
- Sets external_directory pattern to '*' with action 'allow'
- This fixes the issue where PM agent cannot access external directories

This addresses issue #36 where PM agent external_directory permission fails.

Fixes #36
2026-04-02 00:57:14 +00:00
shokollm
e184b1e5b0 fix(kugetsu): export KUGETSU_TEMP_DIR for subagent workflows
Export KUGETSU_TEMP_DIR in cmd_delegate so subagents can use it
instead of /tmp which may be blocked by opencode.

Default: ~/.local/share/opencode/tool-output

This allows agents to write temp files in an allowed directory
instead of /tmp which is blocked in headless mode.

Fixes #73
2026-04-02 00:55:41 +00:00
shokollm
454a019721 test: add env pass-through tests to test suite
Add tests for env pass-through feature:
- Test env command exists and lists files
- Test env set creates env file
- Test env show masks sensitive values (GITEA_TOKEN)
- Test set -a exports variables to child processes
- Test pm-agent.env takes precedence over default.env
- Test cmd_init creates env template files

These tests ensure the env pass-through mechanism works correctly
and that variables are properly exported to subagents.
2026-04-02 00:46:09 +00:00