deepflow 0.1.26 → 0.1.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deepflow",
-  "version": "0.1.26",
+  "version": "0.1.27",
   "description": "Stay in flow state - lightweight spec-driven task orchestration for Claude Code",
   "keywords": [
     "claude",

package/src/commands/df/execute.md

@@ -59,22 +59,66 @@ summary: "one line"
 
 ## Checkpoint & Resume
 
-**File:** `.deepflow/checkpoint.json` — stores completed tasks, current wave.
+**File:** `.deepflow/checkpoint.json` — stored in WORKTREE directory, not main.
+
+**Schema:**
+```json
+{
+  "completed_tasks": ["T1", "T2"],
+  "current_wave": 2,
+  "worktree_path": ".deepflow/worktrees/df/doing-upload/20260202-1430",
+  "worktree_branch": "df/doing-upload/20260202-1430"
+}
+```
 
-**On checkpoint:** Complete wave → update PLAN.md → save → exit.
-**Resume:** `--continue` loads checkpoint, skips completed tasks.
+**On checkpoint:** Complete wave → update PLAN.md → save to worktree → exit.
+**Resume:** `--continue` loads checkpoint, verifies worktree, skips completed tasks.
 
 ## Behavior
 
 ### 1. CHECK CHECKPOINT
 
 ```
---continue → Load and resume
+--continue → Load checkpoint
+  → If worktree_path exists:
+    → Verify worktree still exists on disk
+    → If missing: Error "Worktree deleted. Use --fresh"
+    → If exists: Use it, skip worktree creation
+  → Resume execution with completed tasks
 --fresh → Delete checkpoint, start fresh
 checkpoint exists → Prompt: "Resume? (y/n)"
 else → Start fresh
 ```
 
+### 1.5. CREATE WORKTREE
+
+Before spawning any agents, create an isolated worktree:
+
+```
+# Check main is clean (ignore untracked)
+git diff --quiet HEAD || Error: "Main has uncommitted changes. Commit or stash first."
+
+# Generate worktree path
+SPEC_NAME=$(basename spec/doing-*.md .md | sed 's/doing-//')
+TIMESTAMP=$(date +%Y%m%d-%H%M)
+BRANCH_NAME="df/${SPEC_NAME}/${TIMESTAMP}"
+WORKTREE_PATH=".deepflow/worktrees/${BRANCH_NAME}"
+
+# Create worktree
+git worktree add -b "${BRANCH_NAME}" "${WORKTREE_PATH}"
+
+# Store in checkpoint for resume
+checkpoint.worktree_path = WORKTREE_PATH
+checkpoint.worktree_branch = BRANCH_NAME
+```
+
+**Resume handling:**
+- If checkpoint has worktree_path → verify it exists, use it
+- If worktree missing → Error: "Worktree deleted. Use --fresh"
+
+**Existing worktree handling:**
+- If worktree exists for same spec → Prompt: "Resume existing worktree? (y/n/delete)"
+
 ### 2. LOAD PLAN
 
 ```
@@ -178,8 +222,17 @@ Task tool parameters:
 Files: {target files}
 Spec: {spec_name}
 
+**IMPORTANT: Working Directory**
+All file operations MUST use this absolute path as base:
+{worktree_absolute_path}
+
+Example: To edit src/foo.ts, use:
+{worktree_absolute_path}/src/foo.ts
+
+Do NOT write files to the main project directory.
+
 Implement, test, commit as feat({spec}): {description}.
-Write result to .deepflow/results/{task_id}.yaml
+Write result to {worktree_absolute_path}/.deepflow/results/{task_id}.yaml
 ```
 
 **Spike Task:**
@@ -189,9 +242,18 @@ Type: spike
 Method: {minimal steps to validate}
 Success criteria: {how to know it passed}
 Time-box: {duration}
-Experiment file: {.deepflow/experiments/{topic}--{hypothesis}--active.md}
+Experiment file: {worktree_absolute_path}/.deepflow/experiments/{topic}--{hypothesis}--active.md
 Spec: {spec_name}
 
+**IMPORTANT: Working Directory**
+All file operations MUST use this absolute path as base:
+{worktree_absolute_path}
+
+Example: To edit src/foo.ts, use:
+{worktree_absolute_path}/src/foo.ts
+
+Do NOT write files to the main project directory.
+
 Execute the minimal validation:
 1. Follow the method steps exactly
 2. Measure against success criteria
@@ -199,21 +261,56 @@ Execute the minimal validation:
    - If passed: rename to --passed.md, record findings
    - If failed: rename to --failed.md, record conclusion with "next hypothesis"
 4. Commit as spike({spec}): validate {hypothesis}
-5. Write result to .deepflow/results/{task_id}.yaml
+5. Write result to {worktree_absolute_path}/.deepflow/results/{task_id}.yaml
 
 Result status:
 - success = hypothesis validated (passed)
 - failed = hypothesis invalidated (failed experiment, NOT agent error)
 ```
 
-### 8. COMPLETE SPECS
+### 8. FAILURE HANDLING
+
+When a task fails and cannot be auto-fixed:
+
+**Behavior:**
+1. Leave worktree intact at `{worktree_path}`
+2. Keep checkpoint.json for potential resume
+3. Output debugging instructions
+
+**Output:**
+```
+✗ Task T3 failed after retry
+
+Worktree preserved for debugging:
+  Path: .deepflow/worktrees/df/doing-upload/20260202-1430
+  Branch: df/doing-upload/20260202-1430
+
+To investigate:
+  cd .deepflow/worktrees/df/doing-upload/20260202-1430
+  # examine files, run tests, etc.
+
+To resume after fixing:
+  /df:execute --continue
+
+To discard and start fresh:
+  git worktree remove --force .deepflow/worktrees/df/doing-upload/20260202-1430
+  git branch -D df/doing-upload/20260202-1430
+  /df:execute --fresh
+```
+
+**Key points:**
+- Never auto-delete worktree on failure (cleanup_on_fail: false by default)
+- Always provide the exact cleanup commands
+- Checkpoint remains so --continue can work after manual fix
+
+### 9. COMPLETE SPECS
 
 When all tasks done for a `doing-*` spec:
 1. Embed history in spec: `## Completed` section
 2. Rename: `doing-upload.md` → `done-upload.md`
 3. Remove section from PLAN.md
 
-### 9. ITERATE
+### 10. ITERATE
 
 Repeat until: all done, all blocked, or checkpoint.
 

package/src/commands/df/verify.md

@@ -115,3 +115,46 @@ Learnings captured:
   → experiments/perf--streaming-upload--success.md
   → experiments/auth--jwt-refresh-rotation--success.md
 ```
+
+## Post-Verification: Worktree Merge & Cleanup
+
+After all verification passes:
+
+### 1. MERGE TO MAIN
+
+```bash
+# Get worktree info from checkpoint
+WORKTREE_BRANCH=$(cat .deepflow/checkpoint.json | jq -r '.worktree_branch')
+
+# Switch to main and merge
+git checkout main
+git merge "${WORKTREE_BRANCH}" --no-ff -m "feat({spec}): merge verified changes"
+```
+
+**On merge conflict:**
+- Keep worktree intact for manual resolution
+- Output: "Merge conflict detected. Resolve manually, then run /df:verify --merge-only"
+- Exit without cleanup
+
+### 2. CLEANUP WORKTREE
+
+After successful merge:
+
+```bash
+# Get worktree path from checkpoint
+WORKTREE_PATH=$(cat .deepflow/checkpoint.json | jq -r '.worktree_path')
+
+# Remove worktree and branch
+git worktree remove --force "${WORKTREE_PATH}"
+git branch -d "${WORKTREE_BRANCH}"
+
+# Remove checkpoint
+rm .deepflow/checkpoint.json
+```
+
+**Output on success:**
+```
+✓ Merged df/doing-upload/20260202-1430 to main
+✓ Cleaned up worktree and branch
+✓ Spec complete: doing-upload → done-upload
+```

package/templates/config-template.yaml

@@ -43,3 +43,21 @@ commits:
   format: "feat({spec}): {description}"
   atomic: true         # One task = one commit
   push_after: complete # Or "each" for every commit
+
+# Worktree isolation for /df:execute
+# Isolates all agent work in a git worktree, keeping main clean
+worktree:
+  # Enable worktree isolation (default: true)
+  enabled: true
+
+  # Base path for worktrees relative to project root
+  base_path: .deepflow/worktrees
+
+  # Branch name prefix for worktree branches
+  branch_prefix: df/
+
+  # Automatically cleanup worktree after successful verify
+  cleanup_on_success: true
+
+  # Keep worktree after failed execution for debugging
+  cleanup_on_fail: false