refactor: change verify directory base path from CLAUDE_PROJECT_DIR to WORKTREE_PATH

Author: cowwoc

.cat/issues/v2/v2.1/refactor-work-verify-to-cat-verify/index.json

@@ -1,5 +1,7 @@
 {
-  "status" : "open",
+  "status" : "closed",
+  "resolution" : "implemented",
   "dependencies" : [ ],
-  "blocks" : [ ]
-}
+  "blocks" : [ ],
+  "target_branch" : "v2.1"
+}

.cat/issues/v2/v2.1/refactor-work-verify-to-cat-verify/plan.md

@@ -2,15 +2,60 @@
 
 ## Goal
 
-Move the work verify directory from `.cat/work/verify` to `.cat/verify` inside the worktree. This refactoring improves directory organization by consolidating CAT-managed state under the `.cat/` directory hierarchy and clarifies the semantic separation between implementation work (`.cat/work/`) and verification state (`.cat/verify/`).
+Change the VERIFY_DIR base path from `${CLAUDE_PROJECT_DIR}` to `${WORKTREE_PATH}` in all files that reference
+`.cat/work/verify`. The directory name `.cat/work/verify` stays the same — only the base path variable changes. This
+ensures verify files are written inside the issue worktree rather than the main project directory, maintaining worktree
+isolation.
+
+## Research Findings
+
+Codebase analysis identified 5 files that reference the VERIFY_DIR path using `${CLAUDE_PROJECT_DIR}/.cat/work/verify`:
+1. `plugin/concepts/work.md` — Concept documentation describing VERIFY_DIR path
+2. `plugin/skills/work-merge-agent/first-use.md` — Skill implementation setting VERIFY_DIR
+3. `plugin/skills/work-confirm-agent/first-use.md` — Skill implementation setting VERIFY_DIR
+4. `plugin/agents/work-verify.md` — Agent documentation setting VERIFY_DIR
+5. `plugin/migrations/2.1.sh` — Migration script (directory name unchanged, no base path variable)
+
+All references are string literals in shell/Markdown files. The migration script uses the relative path
+`.cat/work/verify` without a base path variable, so it requires no change.
 
 ## Pre-conditions
 
 (none)
 
 ## Post-conditions
 
-- [ ] User-visible behavior unchanged
+- [ ] All 4 identified plugin files updated from `${CLAUDE_PROJECT_DIR}/.cat/work/verify` to `${WORKTREE_PATH}/.cat/work/verify`
+- [ ] Migration script unchanged (already uses relative path `.cat/work/verify`)
+- [ ] No references to `${CLAUDE_PROJECT_DIR}/.cat/work/verify` remain in plugin source files
+- [ ] The directory name `.cat/work/verify` is preserved (not renamed)
 - [ ] Tests passing
-- [ ] Code quality improved
-- [ ] E2E verification — verify the new directory structure works as expected
+
+## Execution Steps
+
+1. **Update plugin/concepts/work.md**
+   - Change: `${CLAUDE_PROJECT_DIR}/.cat/work/verify/${CLAUDE_SESSION_ID}/` to `${WORKTREE_PATH}/.cat/work/verify/${CLAUDE_SESSION_ID}/`
+   - Rationale: Verify files should be written inside the worktree
+
+2. **Update plugin/skills/work-merge-agent/first-use.md**
+   - Change: `VERIFY_DIR="${CLAUDE_PROJECT_DIR}/.cat/work/verify/${CLAUDE_SESSION_ID}"` to `VERIFY_DIR="${WORKTREE_PATH}/.cat/work/verify/${CLAUDE_SESSION_ID}"`
+   - Rationale: Merge-agent reads verify files from the worktree
+
+3. **Update plugin/skills/work-confirm-agent/first-use.md**
+   - Change: `VERIFY_DIR="${CLAUDE_PROJECT_DIR}/.cat/work/verify/${CLAUDE_SESSION_ID}"` to `VERIFY_DIR="${WORKTREE_PATH}/.cat/work/verify/${CLAUDE_SESSION_ID}"`
+   - Rationale: Confirm-agent writes verify files inside the worktree
+
+4. **Update plugin/agents/work-verify.md**
+   - Change: `VERIFY_DIR="${CLAUDE_PROJECT_DIR}/.cat/work/verify/${CLAUDE_SESSION_ID}"` to `VERIFY_DIR="${WORKTREE_PATH}/.cat/work/verify/${CLAUDE_SESSION_ID}"`
+   - Rationale: Verify agent writes analysis files inside the worktree
+
+5. **Verify migration script unchanged**
+   - Confirm `plugin/migrations/2.1.sh` still has `new_verify_base=".cat/work/verify"` (relative path, no base variable)
+
+6. **Verify no remaining CLAUDE_PROJECT_DIR references to .cat/work/verify**
+   - Run: `grep -r "CLAUDE_PROJECT_DIR.*\.cat/work/verify" plugin/`
+   - Expected: No output
+
+7. **Run tests**
+   - Command: `mvn -f client/pom.xml test`
+   - Rationale: Ensures refactoring doesn't break existing functionality

plugin/agents/work-verify.md

@@ -26,7 +26,7 @@ You receive a prompt containing:
 Write detailed analysis to files in the external session-scoped CAT directory:
 ```bash
 source "${CLAUDE_PLUGIN_ROOT}/scripts/cat-env.sh"
-VERIFY_DIR="${CLAUDE_PROJECT_DIR}/.cat/work/verify/${CLAUDE_SESSION_ID}"
+VERIFY_DIR="${WORKTREE_PATH}/.cat/work/verify/${CLAUDE_SESSION_ID}"
 mkdir -p "${VERIFY_DIR}"
 ```
 - Criterion-level verification details: `${VERIFY_DIR}/criteria-analysis.json`

plugin/concepts/work.md

@@ -176,7 +176,7 @@ Main agent tracks lock status but doesn't manage locks directly.
 
 Work phases write output files to two distinct locations based on ownership and lifecycle:
 
-**Verify files** — `${CLAUDE_PROJECT_DIR}/.cat/work/verify/${CLAUDE_SESSION_ID}/`
+**Verify files** — `${WORKTREE_PATH}/.cat/work/verify/${CLAUDE_SESSION_ID}/`
 - Owner: verify subagent; Scope: session-scoped
 - Ephemeral scratch files (`criteria-analysis.json`, `e2e-test-output.json`) written during confirm phase
 - Read by fix subagents to understand what failed; never committed to the issue branch

plugin/skills/work-confirm-agent/first-use.md

@@ -130,7 +130,7 @@ Task tool:
     3. Create the verify output directory and write detailed analysis files:
        ```bash
        source "${CLAUDE_PLUGIN_ROOT}/scripts/cat-env.sh"
-       VERIFY_DIR="${CLAUDE_PROJECT_DIR}/.cat/work/verify/${CLAUDE_SESSION_ID}"
+       VERIFY_DIR="${WORKTREE_PATH}/.cat/work/verify/${CLAUDE_SESSION_ID}"
        mkdir -p "${VERIFY_DIR}"
        ```
        - Write criterion-level details to: ${VERIFY_DIR}/criteria-analysis.json

plugin/skills/work-merge-agent/first-use.md

@@ -47,7 +47,7 @@ result is not in context, treat as State 1 and run the full merge workflow.
 ## Step 7: Post-Condition Gate Check (MANDATORY — BLOCKING)
 
 ```bash
-VERIFY_DIR="${CLAUDE_PROJECT_DIR}/.cat/work/verify/${CLAUDE_SESSION_ID}"
+VERIFY_DIR="${WORKTREE_PATH}/.cat/work/verify/${CLAUDE_SESSION_ID}"
 CRITERIA_FILE="${VERIFY_DIR}/criteria-analysis.json"
 ```