cc-workspace 4.7.0 → 5.2.1

package/global-skills/rules/model-routing.md

@@ -1,28 +1,33 @@
 ---
-description: Model routing rules. The orchestrator never writes in repos — it delegates to teammates. Can write in orchestrator/.
+description: Model routing rules. The orchestrator never writes application code in repos — it delegates to teammates. Can write in orchestrator/, run git commands, and run test commands in /tmp/ worktrees.
 globs: ["workspace.md", "plans/**", "constitution.md", "templates/**"]
 ---
 
 # Model Routing
 
 ## Golden rule
-The orchestrator NEVER writes code in repos. It describes what teammates must do.
+The orchestrator NEVER writes application code in repos. It describes what teammates must do.
 Writing plans, workspace.md, constitution.md in orchestrator/ is expected and normal.
-If you write code for a repo (not a markdown plan), you have failed — delegate.
+Running git commands (branch, worktree, log) and test/typecheck in /tmp/ worktrees is expected (micro-QA).
+If you write application code in a repo (not a markdown plan, not a git command, not a test run), you have failed — delegate.
 
-## Security layers (3 layers in agent frontmatter — no settings.json pollution)
-1. **Agent frontmatter**: `disallowedTools` — refused at model level
-2. **Agent frontmatter**: `tools` — whitelist of permitted tools (note: `allowed-tools` is for skills only)
-3. **Agent hook**: `PreToolUse` in frontmatter — structured deny response
+## Security layers (3 layers in agent frontmatter)
+1. **Agent frontmatter**: `tools` — whitelist of permitted tools
+2. **Agent frontmatter hooks**: `PreToolUse` Write|Edit|MultiEdit — path-aware deny for writes outside orchestrator/
+3. **Agent frontmatter hooks**: `PreToolUse` Bash (implementer only) — blocks git checkout on main working trees
 
 ## Routing table
 | Role | Model | Mechanism |
 |------|-------|-----------|
-| Orchestrator | **Opus 4.6** | `claude --agent team-lead` (frontmatter `model: opus`) |
-| Implementation teammates | **Sonnet 4.6** | `CLAUDE_CODE_SUBAGENT_MODEL=sonnet` |
-| QA investigators | **Sonnet 4.6** | Same |
-| Data extractors / explorers | **Haiku** | Task subagents with `model: haiku` — raw data only, no reasoning |
-| Gatherers (cross-check, debug, retro) | **Haiku** | Task subagents — raw data extraction only |
+| Orchestrator | **Opus** | `claude --agent team-lead` (frontmatter `model: opus`) |
+| Implementation teammates | **Sonnet** | `Teammate` tool via Agent Teams |
+| QA orchestration | **Opus** | `qa-ruthless` skill (frontmatter `model: opus`) |
+| QA investigators | **Sonnet** | `Teammate` tool via Agent Teams (spawned by qa-ruthless) |
+| Code reviewer | **Opus** | `claude --agent reviewer` (evidence-based review, architecture judgment) |
+| Security auditor | **Opus** | `claude --agent security-auditor` (auth flows, tenant isolation, secrets, CVEs) |
+| Plan review | **Sonnet** | `plan-review` skill (constitution compliance needs reasoning) |
+| Micro-QA diff review | **Haiku** | `Task(Explore, model: haiku)` — structured diff check only |
+| Data extractors (cross-check, debug, retro) | **Haiku** | `Task(Explore, model: haiku)` — raw data extraction only |
 
 ## Gather → Reason pattern
 
@@ -36,11 +41,19 @@ Skills that need both data collection and analysis use a two-phase approach:
    the raw data and performs all analysis: comparison, correlation, judgment, diagnosis,
    and report writing.
 
-This pattern applies to: `cross-service-check`, `incident-debug`, `cycle-retrospective`.
+This pattern applies to: `cross-service-check`, `incident-debug`, `cycle-retrospective`,
+and micro-QA diff review in dispatch-feature Phase 4.
+
 It does NOT apply to: `qa-ruthless` (QA investigators are Sonnet — they need to run tests
-and reason about code quality), `plan-review` (structural checklist, Haiku is sufficient).
+and reason about code quality), `plan-review` (Sonnet — constitution compliance requires reasoning).
+
+## dispatch-feature Phase 1 exception
+
+In `dispatch-feature` Phase 1, Opus explores repos **directly** using Read/Glob/Grep.
+There is NO upfront Haiku explorer scan.
+Rationale: Opus knows what to look for based on the feature. Haiku summaries lose critical context.
+Constraint: Opus reads only files directly related to the feature scope.
 
-## Custom agent `implementer`
-For Task subagents that need to write code in an isolated worktree,
-use `@implementer` (frontmatter with `isolation: worktree`).
-Agent Teams teammates (Teammate tool) get automatic isolation.
+## Implementer model
+Implementation teammates use **Sonnet** via the `Teammate` tool.
+One teammate per repo. The teammate handles all commit units for its repo sequentially.

package/global-skills/session/SKILL.md

@@ -1,10 +1,11 @@
 ---
 name: session
+prompt_version: 5.2.1
 description: >
   Manage parallel feature sessions. List active sessions, show detailed status
-  with commits per repo, or close a session (PRs + branch cleanup).
-  Use: /session, /session status <name>, /session close <name>.
-argument-hint: "[list | status <name> | close <name>]"
+  with commits per repo, or close a session (PRs + branch cleanup + worktree removal).
+  Use: /session, /session status <n>, /session close <n>.
+argument-hint: "[list | status <n> | close <n>]"
 context: fork
 allowed-tools: Bash, Read, Glob, Grep
 ---
@@ -29,50 +30,70 @@ List all sessions with their status:
 ```
 For each .sessions/*.json:
   - Name, status (active/closed), created date
-  - For each repo: session branch, branch_created status
+  - For each repo: session branch, worktree_path, worktree exists?
   - Commit count on session branch vs source branch
 ```
 
 Run for each active session repo:
 ```bash
-git -C ../[repo] log session/[name] --oneline --not [source_branch] 2>/dev/null | wc -l
+git -C ../{repo} log session/{name} --oneline --not {source_branch} 2>/dev/null | wc -l
+# Check worktree exists
+ls -d {worktree_path} 2>/dev/null && echo "exists" || echo "missing"
 ```
 
 Present as a clean table.
 
-### /session status <name>
+### /session status <n>
 Detailed view of one session:
 ```bash
 # For each repo in the session JSON:
-git -C ../[repo] log session/[name] --oneline --not [source_branch] 2>/dev/null
-git -C ../[repo] diff --stat [source_branch]..session/[name] 2>/dev/null
+git -C ../{repo} log session/{name} --oneline --not {source_branch} 2>/dev/null
+git -C ../{repo} diff --stat {source_branch}..session/{name} 2>/dev/null
+# Worktree status
+git -C ../{repo} worktree list 2>/dev/null | grep session/{name}
 ```
 
-Show: commits list, files changed, lines added/removed.
+Show: commits list, files changed, lines added/removed, worktree path and status.
 
-### /session close <name>
-Interactive close — ask before EACH action:
+### /session close <n>
+Interactive close — ask before EACH action.
+
+**IMPORTANT**: Worktrees are cleaned up HERE (not during the session). This is the
+designated cleanup point for session worktrees.
 
 1. **For each repo**: offer to create PR
    ```bash
-   gh pr create --repo [remote] --base [source_branch] --head session/[name] \
-     --title "[session-name]: [repo]" --body "Session: [session-name]"
+   gh pr create --repo {remote} --base {source_branch} --head session/{name} \
+     --title "{session-name}: {repo}" --body "Session: {session-name}"
+   ```
+   Ask: "Create PR session/{name} → {source_branch} in {repo}? [y/N]"
+   Note: PR target is the effective source_branch stored in session JSON (respects overrides).
+
+2. **For each repo**: offer to remove worktree
+   First check for uncommitted changes:
+   ```bash
+   git -C {worktree_path} status --short 2>/dev/null
+   ```
+   If dirty: warn before removal.
+   Ask: "Remove worktree {worktree_path} for {repo}? [y/N]"
+   ```bash
+   git -C ../{repo} worktree remove {worktree_path} --force
+   git -C ../{repo} worktree prune
    ```
-   Ask: "Create PR session/X → source in [repo]? [y/N]"
 
-2. **For each repo**: offer to delete session branch
+3. **For each repo**: offer to delete session branch
    First check for unpushed commits:
    ```bash
-   git -C ../[repo] log session/[name] --oneline --not --remotes 2>/dev/null
+   git -C ../{repo} log session/{name} --oneline --not --remotes 2>/dev/null
    ```
    If unpushed: warn before deletion.
-   Ask: "Delete branch session/X in [repo]? [y/N]"
+   Ask: "Delete branch session/{name} in {repo}? [y/N]"
    ```bash
-   git -C ../[repo] branch -D session/[name]
+   git -C ../{repo} branch -D session/{name}
    ```
 
-3. **Session file**: offer to delete or mark closed
-   Ask: "Delete .sessions/[name].json? [y/N]"
+4. **Session file**: offer to delete or mark closed
+   Ask: "Delete .sessions/{name}.json? [y/N]"
    If no → mark status as "closed" in the JSON.
 
 ## Output format

package/global-skills/templates/workspace.template.md

@@ -1,6 +1,6 @@
 # Workspace: [PROJECT_NAME]
 > Configured on: [DATE]
-> Orchestrator v4.0
+> Orchestrator v5.2
 
 ## Project
 <!-- What does this project do? Who is it for? Scale? -->

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cc-workspace",
-  "version": "4.7.0",
-  "description": "Claude Code multi-workspace orchestrator — skills, hooks, agents, and templates for multi-service projects",
+  "version": "5.2.1",
+  "description": "Claude Code multi-workspace orchestrator \u2014 skills, hooks, agents, and templates for multi-service projects",
   "bin": {
     "cc-workspace": "./bin/cli.js"
   },
@@ -9,7 +9,8 @@
     "bin/",
     "global-skills/",
     "LICENSE",
-    "README.md"
+    "README.md",
+    "CHANGELOG.md"
   ],
   "keywords": [
     "claude",