diff --git a/agentydragon/README.md b/agentydragon/README.md index 7c276236eb..9c56c20e8c 100644 --- a/agentydragon/README.md +++ b/agentydragon/README.md @@ -24,7 +24,7 @@ Tasks live under `agentydragon/tasks/` as individual Markdown files. Please upda ### Branch & Worktree Workflow -- **Branch convention**: work on each task in its own branch named `agentydragon/-`. +- **Branch convention**: work on each task in its own branch named `agentydragon--`, to avoid refname conflicts. - **Worktree helper**: in `agentydragon/tasks/`, run: - - ```sh diff --git a/agentydragon/prompts/manager.md b/agentydragon/prompts/manager.md index 2446226eb7..60157e4c77 100644 --- a/agentydragon/prompts/manager.md +++ b/agentydragon/prompts/manager.md @@ -6,10 +6,14 @@ You are the **Project Manager** Codex agent for the `codex` repository. Your re - **Task orchestration**: Maintain the list of tasks, statuses, and dependencies; plan waves of work; and generate shell commands to launch work on tasks in parallel using `create-task-worktree.sh` with `--agent` and `--tmux`. - **Live coordination**: Continuously monitor and report progress, adjust the plan as tasks complete or new ones appear, and surface any blockers. +- **Background polling**: On user request, enter a sleep‑and‑scan loop (e.g. 5 min interval) to detect tasks marked “Done” in their Markdown; only prepare review/merge steps for those completed tasks. + ### First Actions 1. Summarize the current tasks directory (`agentydragon/tasks/`): list each task number, title, status, and dependencies. 2. Produce a one‑line tmux launch command that will spin up all unblocked tasks in parallel (using the two‑digit IDs and `--agent --tmux`). 3. Describe the high‑level wave‑by‑wave plan and explain which tasks can run in parallel. -More functionality and refinements will be added later. Begin by executing these steps and await further instructions. \ No newline at end of file +More functionality and refinements will be added later. Begin by executing these steps and await further instructions. + +*If instructed, enter a background polling loop (sleep for a configured interval, e.g. 5 minutes) to watch for tasks whose Markdown status is updated to “Done” and then prepare review/merge steps for only those branches.* \ No newline at end of file diff --git a/agentydragon/tasks/create-task-worktree.sh b/agentydragon/tasks/create-task-worktree.sh index 9f738b5862..746e19684e 100755 --- a/agentydragon/tasks/create-task-worktree.sh +++ b/agentydragon/tasks/create-task-worktree.sh @@ -72,7 +72,7 @@ task_input="${task_inputs[0]}" repo_root=$(git rev-parse --show-toplevel) tasks_dir="$repo_root/agentydragon/tasks" -# If given only a two-digit ID, resolve to the full task slug + # If given only a two-digit ID, resolve to the full task slug if [[ "$task_input" =~ ^[0-9]{2}$ ]]; then matches=( "$tasks_dir/${task_input}-"*.md ) if [ "${#matches[@]}" -eq 1 ]; then @@ -85,7 +85,8 @@ if [[ "$task_input" =~ ^[0-9]{2}$ ]]; then else task_slug="$task_input" fi -branch="agentydragon/$task_slug" +# Use dash-separated branch name to avoid ref-dir conflicts +branch="agentydragon-$task_slug" worktrees_dir="$tasks_dir/.worktrees" worktree_path="$worktrees_dir/$task_slug"