diff --git a/agents/rui-do-one-ticket.md b/agents/rui-do-one-ticket.md index 3ccebf8..5adc916 100644 --- a/agents/rui-do-one-ticket.md +++ b/agents/rui-do-one-ticket.md @@ -11,7 +11,6 @@ permission: "rui-coding-standards": allow "rui-commit-standards": allow "rui-task-discovery": deny - "rui-parallel-agents": deny model: anthropic/claude-sonnet-4-6 temperature: 0.4 --- diff --git a/agents/rui-do-tickets.md b/agents/rui-do-tickets.md deleted file mode 100644 index 949824e..0000000 --- a/agents/rui-do-tickets.md +++ /dev/null @@ -1,84 +0,0 @@ ---- -description: Discovers all assigned Forgejo tickets, prioritizes them, presents them for confirmation, and dispatches each to a rui-do-one-ticket agent for implementation. -mode: primary -permission: - bash: - "*": allow - edit: deny - skill: - "rui-project-identity": allow - "rui-task-discovery": allow - "rui-parallel-agents": allow - "rui-coding-standards": deny - "rui-commit-standards": deny - "rui-task-workflow": deny - task: - "rui-do-one-ticket": allow -model: openrouter/deepseek/deepseek-v4-pro -temperature: 1.0 ---- - -You are a task orchestration agent. Your job is to find assigned work on Forgejo -and coordinate its execution by dispatching `rui-do-one-ticket` subagents. - -## Startup - -Load these skills immediately: - -1. `rui-project-identity` — Forgejo credentials and identity -2. `rui-task-discovery` — Rules for finding and prioritizing tasks -3. `rui-parallel-agents` — Coordination rules for parallel dispatch - -## Step 1: Discover Tasks - -Using the `rui-task-discovery` skill rules: - -- Query the Forgejo issue tracker for open issues assigned to you. -- Filter for `State/Verified` or `State/In Progress` labels only. -- Skip `State/Unverified` issues. -- Apply the priority ordering: In Progress first, then earliest milestone, - then Priority label, then MoSCoW label, then unblocking potential. -- Identify blocked issues and note why they are blocked. - -## Step 2: Present the Task List - -Before dispatching any work, present the user with: - -- A table of eligible issues: number, title, milestone, priority, MoSCoW, - state, and any blocking dependencies. -- Which issues are blocked and should be skipped. -- The recommended execution order. -- Which issues can be run in parallel (different branches). - -**Wait for user confirmation before proceeding.** The user may choose to work -on all issues, a subset, or adjust the order. - -## Step 3: Dispatch Work - -For each confirmed issue, invoke the `rui-do-one-ticket` subagent via the Task tool: - -- Pass the issue number and title in the task prompt. -- For issues on **different branches**: dispatch in parallel when possible. -- For issues that **depend on each other**: dispatch sequentially. -- Follow the `rui-parallel-agents` skill coordination rules (one agent per branch, - sequential within a branch). - -When dispatching parallel agents, include clone-to-`/tmp/` instructions per the -`rui-parallel-agents` skill so each agent works in an isolated directory. - -## Step 4: Monitor and Verify - -After each `rui-do-one-ticket` agent completes: - -- Review its summary output. -- Verify quality gate results. -- If any agent reports failures, investigate and decide whether to re-dispatch - or flag for manual intervention. - -## Step 5: Final Report - -When all dispatched agents are done, present: - -- **Per issue:** issue number, branch, PR link, quality gate pass/fail, coverage. -- **Overall:** total issues completed, any issues skipped or failed, follow-up - work noted by agents. diff --git a/agents/rui-fix-pr.md b/agents/rui-fix-pr.md index de938d4..49e4a1e 100644 --- a/agents/rui-fix-pr.md +++ b/agents/rui-fix-pr.md @@ -14,7 +14,6 @@ permission: "rui-task-workflow": allow "rui-find-failing-unit-tests": allow "rui-task-discovery": deny - "rui-parallel-agents": deny "rui-pr-review-process": deny model: openrouter/deepseek/deepseek-v4-pro temperature: 1.0 diff --git a/agents/rui-review-pr-focus.md b/agents/rui-review-pr-focus.md index 98c1f1d..97b2cba 100644 --- a/agents/rui-review-pr-focus.md +++ b/agents/rui-review-pr-focus.md @@ -13,7 +13,6 @@ permission: "rui-commit-standards": allow "rui-task-workflow": deny "rui-task-discovery": deny - "rui-parallel-agents": deny "rui-pr-fix-process": deny model: openrouter/moonshotai/kimi-k2.6 temperature: 1.0 @@ -49,8 +48,9 @@ Follow the `rui-pr-review-process` skill's review methodology: Forgejo API to understand the scope and what was implemented. 2. **Read the specification.** Review the relevant parts of `docs/specification.md` to understand the expected behavior. -3. **Checkout the PR branch.** Clone the repo to `/tmp/` and check out the PR - branch. Do NOT assume the current directory is on the correct branch. +3. **Check the PR branch.** Check the current folder's git branch. + Do NOT assume the current directory is on the correct branch. + If not match, stop and explicitly point out the error. 4. **Review the code** through your assigned focus area only. Go through the entire changed codebase, not just the diff. Pay attention to small details. @@ -75,7 +75,6 @@ For each issue found, provide: - **Do NOT give a final verdict.** The parent agent determines the overall verdict. - **Do NOT modify any code.** You are a read-only reviewer. - **Do NOT run any nox test sessions.** The CI will run them and block the merge if anything fails. -- **Clean up** your `/tmp/` clone when finished. ## Output diff --git a/agents/rui-review-pr.md b/agents/rui-review-pr.md index ca18428..1dc309c 100644 --- a/agents/rui-review-pr.md +++ b/agents/rui-review-pr.md @@ -9,7 +9,6 @@ permission: skill: "rui-project-identity": allow "rui-pr-review-process": allow - "rui-parallel-agents": allow "rui-coding-standards": deny "rui-commit-standards": deny "rui-task-workflow": deny @@ -34,7 +33,6 @@ Load these skills immediately: 1. `rui-project-identity` — Forgejo credentials, git identity, repo details 2. `rui-pr-review-process` — Review methodology, multi-agent strategy, reporting format -3. `rui-parallel-agents` — Coordination rules for parallel dispatch ## Step 1: Gather Context @@ -48,6 +46,8 @@ understand the scope. Read: This context helps you write better prompts for the sub-agents and evaluate their findings. +Checkout the correct feature branch. + ## Step 2: Dispatch 5 Review Agents Invoke 5 `rui-review-pr-focus` sub-agents in parallel via the Task tool. Each agent @@ -67,7 +67,6 @@ receives the PR number, ticket number, and one of these focus areas: When dispatching each agent, explicitly instruct it: - **Do NOT post findings to Forgejo.** Return findings to you only. -- Clone to `/tmp/` per the `rui-parallel-agents` skill setup. - Follow the `rui-pr-review-process` skill for methodology and reporting format. ## Step 3: Aggregate Findings diff --git a/agents/rui-self-qa.md b/agents/rui-self-qa.md index 00f336c..b668ba2 100644 --- a/agents/rui-self-qa.md +++ b/agents/rui-self-qa.md @@ -13,7 +13,6 @@ permission: "rui-commit-standards": deny "rui-task-workflow": deny "rui-task-discovery": deny - "rui-parallel-agents": deny task: "rui-review-pr": allow "rui-fix-pr": allow diff --git a/skills/rui-parallel-agents/SKILL.md b/skills/rui-parallel-agents/SKILL.md deleted file mode 100644 index f0ac607..0000000 --- a/skills/rui-parallel-agents/SKILL.md +++ /dev/null @@ -1,57 +0,0 @@ ---- -name: rui-parallel-agents -description: Multi-agent coordination strategy for parallel development across branches. Covers clone setup, git identity, branch isolation, push strategy, verification, and final reporting. ---- - -## Strategy - -Aggressively run as many parallel agents as possible while coordinating between them. -Distribute commits and branches to multiple parallel agents working independently. - -## Setup for Each Parallel Agent - -Each parallel agent must: - -1. **Clone the repository to `/tmp/`:** - ``` - git clone https://$FORGEJO_PAT@//.git /tmp/- - cd /tmp/- - ``` -2. **Set the remote origin** to the same origin as the main working directory: - ``` - git remote set-url origin https://$FORGEJO_PAT@//.git - ``` -3. **Add an upstream remote** pointing to the local working directory: - ``` - git remote add upstream /app - ``` -4. **Configure git identity** using the credentials from the `rui-project-identity` skill. -5. **Work on their assigned branch** following the full task execution workflow - (see `rui-task-workflow` skill). -6. **Push to both origin and upstream** when done: - ``` - git push -u origin - git push upstream - ``` -7. **Clean up** by deleting the `/tmp/` clone when finished. - -Note: when doing code review, the folder name under `/tmp/` could be: `-pr--`. -For example: `cleveragents-pr-123-quality`. - -## Coordination Rules - -- Commits within the same branch must be done **sequentially** (one agent per branch). -- Commits on **different branches** can be done in parallel (one agent per branch). -- Each parallel agent must receive the full set of relevant instructions so they adhere - to all rules (quality gates, commit format, issue updates, etc.). -- After each parallel agent completes, **verify their work**: check out their branch from - the local repo and run the full `nox` suite. Fix any failures within the respective - branch. - -## Final Report - -When all parallel agents complete, provide a detailed report: - -- For each branch: branch name, issues completed, all quality check pass/fail statistics. -- For each branch: a description suitable for the Pull Request. -- Overall summary of work completed. diff --git a/skills/rui-pr-review-process/SKILL.md b/skills/rui-pr-review-process/SKILL.md index 7fc50d7..5da2cb4 100644 --- a/skills/rui-pr-review-process/SKILL.md +++ b/skills/rui-pr-review-process/SKILL.md @@ -11,8 +11,8 @@ To review a PR, follow these four steps in order: scope and what has been implemented. 2. **Read the specification.** Review the relevant parts of `docs/specification.md` to understand what features and behaviors the ticket requires. -3. **Checkout the PR branch locally.** Clone the repo to a `/tmp/` directory and check out - the PR branch. Do NOT assume the current working directory is on the correct branch. +3. **Check the PR branch.** Check if the current folder has the correct feature branch. + Do NOT assume the current working directory is on the correct branch. 4. **Perform a thorough code review.** Review the entire changed codebase — not just the diff — to catch bugs, regressions, and issues that may exist beyond the immediate changes.