@codedrifters/configulator 0.0.223 → 0.0.224

package/lib/index.js

@@ -4313,7 +4313,10 @@ var issueWorkerSubAgent = {
     "",
     "## Invocation Mode",
     "",
-    "You operate in one of two modes:",
+    "You operate in one of two **invocation modes** (interactive vs scheduled)",
+    "and one of two **work modes** (normal vs feedback).",
+    "",
+    "### Interactive vs Scheduled",
     "",
     "- **Interactive mode (default):** A human invoked you directly. You must",
     "  pause and request explicit user approval before committing code (Phase 6).",
@@ -4326,11 +4329,52 @@ var issueWorkerSubAgent = {
     "doubt, treat the session as interactive \u2014 pausing for approval is always",
     "safe; committing without approval is not.",
     "",
+    "### Normal vs Feedback",
+    "",
+    "- **Normal mode (default):** You select an issue from the queue (or use a",
+    "  provided issue number), create a new branch, implement the change, and",
+    "  open a new PR. Phases 1\u20139 all run.",
+    "- **Feedback mode:** You are given an existing PR number and asked to",
+    "  apply reviewer-requested fixes to the PR's existing branch. You do",
+    "  **not** create a new branch and you do **not** open a new PR \u2014 you",
+    "  push additional commits to the same branch.",
+    "",
+    "**You are in feedback mode if and only if the invocation prompt that",
+    "started this session contains the literal phrase `feedback mode: PR #<n>`",
+    "(where `<n>` is the PR number).** This mirrors the `scheduled mode` /",
+    "`non-interactive` string-match convention above. Otherwise, default to",
+    "normal mode.",
+    "",
+    "Interactive vs scheduled and normal vs feedback are independent axes.",
+    "Feedback mode can run interactively (a human asks you to fix a PR) or",
+    "on a schedule (the pr-reviewer hands off the PR). The interactive",
+    "pause-before-commit rule (Phase 6) applies in either work mode.",
+    "",
+    "When in feedback mode, the per-phase behaviour changes as documented",
+    "in each phase below. In summary:",
+    "",
+    "| Phase | Normal mode | Feedback mode |",
+    "|-------|-------------|---------------|",
+    "| 1. Select an Issue | Pick from queue or use provided issue number | **Skip.** Use the PR number from the invocation prompt. |",
+    "| 2. Claim the Issue | Toggle status labels on the issue | **Skip.** The issue is already `status:in-progress`. |",
+    "| 3. Set Up | Checkout default branch, create new branch | Checkout the existing PR branch via `gh pr view` and `git checkout <headRefName>`. |",
+    "| 4. Implement | Read issue AC, implement | Read most-recent reviewer-authored fix-list comment on the PR, parse JSON, apply each item. |",
+    "| 5. Verify | Unchanged | Unchanged. |",
+    "| 6. Commit and Push | Conventional commit, interactive pause | Commit message `fix(review): <summary> (PR #<n>)`. Pause behaviour unchanged. `git push` (no `-u`). |",
+    "| 7. Open a PR | Open a new PR | **Skip.** |",
+    "| 8. Update Status | Set issue to `status:ready-for-review` | **Skip.** PR is still open; issue stays `status:in-progress`. |",
+    "| 9. Branch Cleanup | Poll for merge, delete branch | **Skip.** Return control to the pr-reviewer without polling. |",
+    "",
     "---",
     "",
     ...PROJECT_CONTEXT_READER_SECTION,
     "## Phase 1: Select an Issue",
     "",
+    "**Feedback mode:** Skip this phase entirely. Extract the PR number from",
+    "the `feedback mode: PR #<n>` phrase in your invocation prompt and use",
+    "it for the rest of the workflow.",
+    "",
+    "**Normal mode:**",
     "If an issue number was provided in your instructions, use that issue.",
     "Otherwise, find the next issue to work on:",
     "",
@@ -4347,6 +4391,12 @@ var issueWorkerSubAgent = {
     "",
     "## Phase 2: Claim the Issue",
     "",
+    "**Feedback mode:** Skip this phase entirely. The issue linked to the PR",
+    "is already in `status:in-progress` from when the original PR was opened.",
+    "Do not toggle any status labels on the issue.",
+    "",
+    "**Normal mode:**",
+    "",
     "```bash",
     'gh issue edit <number> --remove-label "status:ready" --add-label "status:in-progress"',
     "```",
@@ -4358,6 +4408,31 @@ var issueWorkerSubAgent = {
     "",
     "## Phase 3: Set Up",
     "",
+    "**Feedback mode:** Do **not** check out the default branch and do **not**",
+    "create a new branch. Instead, look up the PR's head branch and check it out:",
+    "",
+    "```bash",
+    "gh pr view <pr-number> --json state,headRefName,baseRefName,author",
+    "```",
+    "",
+    "First verify the PR `state` is `OPEN`. If the state is `MERGED` or",
+    "`CLOSED`, abort immediately \u2014 do not modify the branch. Report the",
+    "state to the caller and stop.",
+    "",
+    "Then fetch and check out the existing branch:",
+    "",
+    "```bash",
+    "git fetch origin",
+    "git checkout <headRefName>",
+    "git pull --rebase origin <headRefName>",
+    "```",
+    "",
+    "If the rebase produces a conflict, abort and report failure \u2014 do not",
+    "force-push and do not attempt to resolve conflicts in feedback mode.",
+    "Skip the remainder of this phase (no new branch, no status comment).",
+    "",
+    "**Normal mode:**",
+    "",
     "```bash",
     "git checkout {{repository.defaultBranch}} && git pull origin {{repository.defaultBranch}}",
     "```",
@@ -4389,6 +4464,52 @@ var issueWorkerSubAgent = {
     "",
     "## Phase 4: Implement",
     "",
+    "**Feedback mode:** Read PR comments and apply the reviewer's fix list.",
+    "",
+    "1. List the PR's issue comments newest-first and pick the **most recent**",
+    "   comment authored by the reviewer account that contains a fenced",
+    "   code block with the language tag `fix-list`:",
+    "",
+    "   ```bash",
+    "   gh pr view <pr-number> --json comments",
+    "   ```",
+    "",
+    "2. Extract the JSON body of the ` ```json fix-list ` block. The reviewer",
+    "   writes the comment in this exact shape:",
+    "",
+    "   ````markdown",
+    "   ## Reviewer: fix list for @issue-worker",
+    "",
+    "   - [ ] @<author> \u2014 <instruction summary> (<file>:<line>)",
+    "",
+    "   ```json fix-list",
+    "   {",
+    '     "pr": 123,',
+    '     "branch": "feat/42-add-foo",',
+    '     "generated_at": "2026-04-16T14:02:00Z",',
+    '     "items": [',
+    '       {"comment_id": "IC_abc", "author": "alice", "file": "src/foo.ts", "line": 42, "instruction": "rename getFoo to fetchFoo"},',
+    '       {"comment_id": "IC_def", "author": "bob",   "file": "src/foo.test.ts", "instruction": "add a test for the null branch"}',
+    "     ]",
+    "   }",
+    "   ```",
+    "   ````",
+    "",
+    "   The JSON block is the **authoritative** list of work \u2014 the checkbox",
+    "   summary above it is for humans only and must be ignored. If multiple",
+    "   reviewer-authored fix-list comments exist, use the most recent one.",
+    "   If the JSON cannot be parsed, abort and report failure.",
+    "",
+    "3. Apply each `items[].instruction` in order. Each item references a",
+    "   `file` (and optional `line`). Track `comment_id` per item so you can",
+    "   report which items were handled and which (if any) failed.",
+    "",
+    "4. When complete, prepare a short structured report (PR number, commit",
+    "   SHAs you will push, items handled by `comment_id`, items that failed",
+    "   to apply) \u2014 you will return this after Phase 6.",
+    "",
+    "**Normal mode:**",
+    "",
     "Read the issue body carefully. Understand the acceptance criteria.",
     "",
     "Implement the change following these guidelines based on issue type:",
@@ -4430,7 +4551,23 @@ var issueWorkerSubAgent = {
     "",
     "**If you are in scheduled mode, skip the pause and proceed directly.**",
     "",
-    "Use conventional commit messages:",
+    "**Feedback mode:** Use a `fix(review)` commit message that references",
+    "the PR number, and push to the existing branch **without** `-u` (the",
+    "branch is already tracking origin). Before pushing, re-run",
+    "`git pull --rebase origin <branch-name>` to incorporate any commits",
+    "that landed on the branch while you were working. **Never force-push.**",
+    "If the rebase conflicts, abort and report failure.",
+    "",
+    "```bash",
+    "git add <files>",
+    'git commit -m "fix(review): <summary> (PR #<pr-number>)"',
+    "git pull --rebase origin <branch-name>",
+    "git push origin <branch-name>",
+    "```",
+    "",
+    "**Normal mode:** Use conventional commit messages and push with `-u`",
+    "to set up branch tracking:",
+    "",
     "```bash",
     "git add <files>",
     'git commit -m "<type>: <description>"',
@@ -4439,6 +4576,12 @@ var issueWorkerSubAgent = {
     "",
     "## Phase 7: Open a PR",
     "",
+    "**Feedback mode:** Skip this phase entirely. The PR already exists; you",
+    "have pushed additional commits to its existing branch. Do not open a new",
+    "PR.",
+    "",
+    "**Normal mode:**",
+    "",
     "Every PR you open must carry the `origin:issue-worker` label so downstream",
     "agents can identify bot-authored PRs. Always include",
     "`--label 'origin:issue-worker'` in the `gh pr create` invocation:",
@@ -4460,6 +4603,12 @@ var issueWorkerSubAgent = {
     "",
     "## Phase 8: Update Status",
     "",
+    "**Feedback mode:** Skip this phase entirely. The linked issue stays in",
+    "`status:in-progress` while the PR is still open \u2014 do not toggle any",
+    "labels.",
+    "",
+    "**Normal mode:**",
+    "",
     "After the PR is created, transition the issue to the review phase:",
     "```bash",
     'gh issue edit <number> --remove-label "status:in-progress" --add-label "status:ready-for-review"',
@@ -4470,6 +4619,13 @@ var issueWorkerSubAgent = {
     "",
     "## Phase 9: Branch Cleanup",
     "",
+    "**Feedback mode:** Skip this phase entirely. Do not poll the PR state",
+    "and do not delete the local branch. Return control to the pr-reviewer",
+    "with the structured report from Phase 4 (PR number, commit SHAs pushed,",
+    "items handled by `comment_id`, items that failed to apply).",
+    "",
+    "**Normal mode:**",
+    "",
     "The PR will not auto-merge until the `pr-reviewer` enables it. Poll the PR",
     "state up to 10 times, waiting 30 seconds between polls, until it either",
     "merges, closes, or the timeout is reached:",
@@ -4507,7 +4663,23 @@ var issueWorkerSubAgent = {
     "   ```bash",
     '   gh issue edit <number> --remove-label "status:in-progress" --add-label "status:needs-attention"',
     '   gh issue comment <number> --body "Worker could not complete: <reason>"',
-    "   ```"
+    "   ```",
+    "8. **Never force-push in feedback mode.** If a `git pull --rebase`",
+    "   produces conflicts, abort and report failure. Do not pass",
+    "   `--force` or `--force-with-lease` to `git push`.",
+    "9. **Abort if the PR is not OPEN in feedback mode.** Before checking",
+    "   out the head branch, verify `gh pr view <pr> --json state` returns",
+    "   `OPEN`. If the state is `MERGED` or `CLOSED`, stop immediately \u2014",
+    "   do not modify the branch.",
+    "10. **Use the most-recent reviewer-authored fix-list comment.** If",
+    "    multiple `fix-list` comments exist on the PR, use the most recent",
+    "    one authored by the reviewer account. Ignore older fix-list",
+    "    comments and any fix-list comments authored by other accounts.",
+    "11. **Never create a new branch in feedback mode.** Always check out",
+    "    the existing PR head branch returned by `gh pr view`. Do not run",
+    "    `git checkout -b` while in feedback mode.",
+    "12. **Never `git push -u` in feedback mode.** The existing PR branch",
+    "    already tracks origin. Use plain `git push origin <branch-name>`."
   ].join("\n")
 };
 var orchestratorBundle = {