create-claude-workspace 1.1.24 → 1.1.26

package/dist/template/.claude/agents/orchestrator.md

@@ -310,13 +310,13 @@ To determine if a task is frontend, backend, or fullstack, use this heuristic:
 - **First, update tracking files** (so they are included in the same commit):
   - **TODO.md**: Check off the completed task: `- [x] **Task** — description ([date])`
     - For skipped tasks: `- [~] ~~**Task**~~ — SKIPPED: [brief reason]`
-  - **MEMORY.md**:
+  - **MEMORY.md** — set the FINAL state here (no further commits after merge):
     - Move item from "Next" to "Done" (with date)
     - Set new "Next" item (= next unchecked task in TODO.md with all dependencies met, skipping `[~]` tasks)
     - Update "Current Phase" if the phase changed
     - Update `Complexity This Session` (add S=1, M=2, L=4 for completed task)
     - Set `Current Task` to `(none)`
-    - Set `Current Step` to `12 — POST-MERGE (pending)`
+    - Set `Current Step` to `(none)`
     - Decisions, Blockers, Notes sections
 - **Stage ALL files in a single commit** — NEVER `git add -A`:
   ```bash
@@ -340,7 +340,8 @@ To determine if a task is frontend, backend, or fullstack, use this heuristic:
   4. Commit is still local and safe — do NOT reset or amend without reason
 
 **STEP 12: POST-MERGE & NEXT ITEM**
-- Working tree is now **clean** (everything committed in STEP 11, including `Current Step: 12 — POST-MERGE (pending)` in MEMORY.md).
+- Working tree is now **clean** (everything committed in STEP 11, including final MEMORY.md state).
+- **ZERO commits in this step** — all tracking was already committed in STEP 11. This step only performs git operations (merge, checkout, push, branch delete) and delegates issue status updates. Do NOT create any "chore: update progress tracking" commits.
 - **Worktree handling**: If any `git checkout main` below fails with "already checked out at" error (you're in a git worktree while main is checked out elsewhere):
   1. Merge without checkout: `git fetch . feat/{branch-name}:main` (fast-forwards local main). If not a fast-forward (main diverged), rebase first: `git rebase main && git fetch . HEAD:main`.
   2. Detach HEAD: `git checkout --detach`
@@ -366,7 +367,7 @@ To determine if a task is frontend, backend, or fullstack, use this heuristic:
       git pull --rebase origin HEAD
       git branch -d feat/{branch-name} 2>/dev/null || true
       ```
-    - Delegate to `devops-integrator`: "Update issue #N status to done. Do NOT perform any git operations — already handled."
+    - Delegate to `devops-integrator`: "Update issue #N status to done. Do NOT perform any git operations or file edits — already handled."
   - **If no git integration** (no MR/PR):
     - Merge locally:
       ```bash
@@ -379,7 +380,7 @@ To determine if a task is frontend, backend, or fullstack, use this heuristic:
     - Delete merged branch: `git branch -d feat/{branch-name}`
   - If platform merge fails (auth, permissions):
     - Fall back to local merge (same as no-git-integration path above)
-    - Delegate to `devops-integrator`: "Update issue #N status to done. Do NOT perform any git operations — already handled."
+    - Delegate to `devops-integrator`: "Update issue #N status to done. Do NOT perform any git operations or file edits — already handled."
 - **Team workflow** (CLAUDE.md `Workflow: team`):
   - If remote exists: push the branch:
     ```bash
@@ -390,7 +391,6 @@ To determine if a task is frontend, backend, or fullstack, use this heuristic:
     git checkout main 2>/dev/null || git checkout master
     ```
   - If remote exists: `git pull --rebase origin HEAD`
-  - Note in MEMORY.md: "MR/PR #N pending review for [task]"
   - If git integration active: delegate to `devops-integrator`: "Update issue #N status to in-review. Do NOT perform any git operations."
   - Start next task:
     - If the next task depends on the previous (unmerged) MR/PR:
@@ -399,7 +399,7 @@ To determine if a task is frontend, backend, or fullstack, use this heuristic:
       - When the previous MR/PR is merged, rebase: `git rebase --onto main feat/{previous} feat/{next}`
     - Otherwise: `git checkout -b feat/{next-task-slug}`
 - **If no `[ ]` tasks remain in current phase AND at least one `[~]` exists** (all remaining were skipped): do NOT auto-advance. Delegate to `product-owner`: "All tasks in Phase [N] are blocked/skipped. The autonomous loop cannot proceed. Options: (1) ADD replacement tasks that unblock progress, (2) REPRIORITIZE to skip this phase entirely and move to next, (3) declare a BLOCKER requiring human intervention." If product-owner returns only CONFIRM with no actionable changes, STOP the autonomous loop and log: "Phase [N] fully blocked — requires human intervention. Run orchestrator manually after resolving blockers."
-- One task per invocation — after post-merge, update MEMORY.md and end session. The external loop will start the next invocation.
+- One task per invocation — after post-merge, end session. The external loop will start the next invocation. Do NOT update MEMORY.md here (already done in STEP 11).
 - **If no `[ ]` tasks remain in current phase AND zero `[~]` exist** (all completed) -> phase transition (handled at start of STEP 1)
 - **If no `[ ]` tasks remain in ALL phases AND zero `[~]` exist** (everything completed) -> final completion sequence:
   1. Delegate to `product-owner` agent:
@@ -438,16 +438,11 @@ For critical production bugs (outside normal TODO.md flow):
 4. Build, lint & test (STEP 5)
 5. Code review (STEP 7 — cannot be skipped). **Include in reviewer prompt**: "NOTE: This is a hotfix. Test writing was intentionally deferred — do not flag missing test coverage for this change."
 6. If reviewer finds CRITICAL or WARN issues: set `Current Step: 7 — REVIEW (hotfix rework)`, fix them and re-review (max 2 cycles for hotfixes). If still failing, commit anyway with a note in MEMORY.md — hotfix urgency takes priority.
-7. Commit & push (STEP 11)
-8. Post-merge: follow STEP 12 logic (solo: merge to main, team: MR/PR)
-9. After merge, on main: add a note to MEMORY.md under "Notes": `Hotfix: [description] — [commit-hash] ([date])`. Reset `Current Task` to `(none)` and `Current Step` to `(none)`.
-10. Do NOT update TODO.md checkboxes unless the fix corresponds to an existing task. Commit the MEMORY.md update:
-    ```bash
-    git add MEMORY.md && git commit -m "chore: log hotfix"
-    # push only if remote exists:
-    git remote -v | grep -q origin && git push origin HEAD
-    ```
-11. **Patch release**: if git integration active, delegate to `devops-integrator`: "Hotfix merged. Create a patch release with changelog."
+7. Commit & push (STEP 11) — include in the SAME commit:
+   - MEMORY.md: add note under "Notes": `Hotfix: [description] ([date])`, set `Current Task` to `(none)`, `Current Step` to `(none)`
+   - Do NOT update TODO.md checkboxes unless the fix corresponds to an existing task
+8. Post-merge: follow STEP 12 logic (solo: merge to main, team: MR/PR). No additional commits.
+9. **Patch release**: if git integration active, delegate to `devops-integrator`: "Hotfix merged. Create a patch release with changelog."
 
 **Skipped steps:** STEP 4 (tests — unless the bug reveals missing test coverage), STEP 6 (visual verification).
 

package/dist/template/.claude/scripts/lib/claude-runner.mjs

@@ -191,12 +191,15 @@ export function runClaude(opts, log, runOpts = {}) {
             flags.push('--dangerously-skip-permissions');
         // Reset stream state for this invocation
         resetStreamState();
-        // Spawn
+        // Spawn — detached on both platforms to isolate child from CTRL+C.
+        // First CTRL+C sets stopping flag (parent only); child finishes current step.
+        // Second CTRL+C force-kills the child via killProcessTree.
         const child = isWin
-            ? spawn('claude', flags, {
+            ? spawn(process.env.ComSpec ?? 'cmd.exe', ['/c', 'claude', ...flags], {
                 cwd: opts.projectDir,
                 stdio: ['pipe', 'pipe', 'pipe'],
-                shell: true,
+                detached: true,
+                windowsHide: true,
             })
             : spawn('claude', [...flags, prompt], {
                 cwd: opts.projectDir,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-claude-workspace",
-  "version": "1.1.24",
+  "version": "1.1.26",
   "description": "Scaffold a project with Claude Code agents for autonomous AI-driven development",
   "type": "module",
   "bin": {