deepflow 0.1.29 → 0.1.31

package/README.md

@@ -24,6 +24,7 @@
 - **Stay in flow** — Minimize context switches, maximize deep work
 - **Conversational ideation** with proactive gap discovery
 - **Specs define intent**, tasks close reality gaps
+- **Worktree isolation** — Main branch stays clean during execution
 - **Parallel execution** with context-aware checkpointing
 - **Atomic commits** for clean rollback
 
@@ -70,7 +71,7 @@ CONVERSATION
     │ Renames: feature.md → doing-feature.md
     ▼
 /df:execute
-    │ Follows existing patterns
+    │ Creates isolated worktree (main stays clean)
     │ Parallel agents, file conflicts serialize
     │ Context-aware (≥50% → checkpoint)
     │ Atomic commit per task
@@ -95,6 +96,14 @@ specs/
 
 **Ongoing:** Detects existing patterns, follows conventions, integrates with current code.
 
+## Worktree Isolation
+
+Execution happens in an isolated git worktree:
+- Main branch stays clean during execution
+- On failure, worktree preserved for debugging
+- Resume with `/df:execute --continue`
+- On success, changes merged back to main
+
 ## Context-Aware Execution
 
 Statusline shows context usage. At ≥50%:
@@ -124,7 +133,8 @@ your-project/
 └── .deepflow/
     ├── context.json      # context % for execution
     ├── checkpoint.json   # resume state
-    └── results/          # agent results
+    └── worktrees/        # isolated execution (main stays clean)
+        └── upload/       # one worktree per spec
 ```
 
 ## Configuration

package/package.json

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

package/src/commands/df/execute.md

@@ -94,8 +94,8 @@ experiment_file: ".deepflow/experiments/upload--streaming--failed.md"
 {
   "completed_tasks": ["T1", "T2"],
   "current_wave": 2,
-  "worktree_path": ".deepflow/worktrees/df/doing-upload/20260202-1430",
-  "worktree_branch": "df/doing-upload/20260202-1430"
+  "worktree_path": ".deepflow/worktrees/upload",
+  "worktree_branch": "df/upload"
 }
 ```
 
@@ -126,26 +126,22 @@ 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
+# Generate paths
 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}"
+BRANCH_NAME="df/${SPEC_NAME}"
+WORKTREE_PATH=".deepflow/worktrees/${SPEC_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
+# Create worktree (or reuse existing)
+if [ -d "${WORKTREE_PATH}" ]; then
+  echo "Reusing existing worktree"
+else
+  git worktree add -b "${BRANCH_NAME}" "${WORKTREE_PATH}"
+fi
 ```
 
-**Resume handling:**
-- If checkpoint has worktree_path → verify it exists, use it
-- If worktree missing → Error: "Worktree deleted. Use --fresh"
+**Existing worktree:** Reuse it (same spec = same worktree).
 
-**Existing worktree handling:**
-- If worktree exists for same spec → Prompt: "Resume existing worktree? (y/n/delete)"
+**--fresh flag:** Deletes existing worktree and creates new one.
 
 ### 2. LOAD PLAN
 
@@ -357,19 +353,17 @@ When a task fails and cannot be auto-fixed:
 ✗ Task T3 failed after retry
 
 Worktree preserved for debugging:
-  Path: .deepflow/worktrees/df/doing-upload/20260202-1430
-  Branch: df/doing-upload/20260202-1430
+  Path: .deepflow/worktrees/upload
+  Branch: df/upload
 
 To investigate:
-  cd .deepflow/worktrees/df/doing-upload/20260202-1430
+  cd .deepflow/worktrees/upload
   # 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
 ```
 

package/src/commands/df/verify.md

@@ -157,7 +157,7 @@ rm .deepflow/checkpoint.json
 
 **Output on success:**
 ```
-✓ Merged df/doing-upload/20260202-1430 to main
+✓ Merged df/upload to main
 ✓ Cleaned up worktree and branch
 ✓ Spec complete: doing-upload → done-upload