agileflow 2.83.0 → 2.84.1

package/src/core/commands/babysit.md

@@ -184,6 +184,47 @@ When `VISUAL=true` is specified, the loop adds screenshot verification:
 **Setup requirement:**
 Run `/agileflow:configure` and select "Set up Visual E2E testing" to install Playwright and create e2e tests.
 
+### Visual Mode Auto-Detection (IMPORTANT)
+
+**Check the context output** from `obtain-context.js` for Visual E2E status.
+
+**If "📸 VISUAL E2E TESTING: ENABLED" appears:**
+
+When presenting task options for UI-focused work, **proactively suggest VISUAL mode**:
+
+```
+This epic involves UI work. Visual E2E is configured.
+
+Suggested command:
+/agileflow:babysit EPIC=EP-0042 MODE=loop VISUAL=true
+
+Visual Mode ensures:
+- Screenshots are captured and verified
+- Minimum 2 iterations (prevents premature completion)
+- Both tests AND visual verification must pass
+```
+
+**Detection criteria for suggesting VISUAL=true:**
+| Indicator | Suggest VISUAL? |
+|-----------|-----------------|
+| Epic mentions "UI", "component", "styling" | Yes |
+| Stories have owner: AG-UI | Yes |
+| Files involve src/components/, *.css, *.tsx | Yes |
+| Work is API/backend only | No |
+| Work is CLI/scripts only | No |
+
+**If "VISUAL E2E TESTING: NOT CONFIGURED" appears:**
+
+For UI work, suggest setup:
+```
+This is UI work. Visual E2E not configured.
+
+To enable screenshot verification:
+/agileflow:configure → Visual E2E testing
+
+This helps catch visual issues that tests miss (wrong colors, broken layouts).
+```
+
 ### Loop Control Commands
 
 ```bash
@@ -662,6 +703,7 @@ Based on your project state:
 - Delegate complex work to experts
 - If stuck 2+ times → research prompt
 - Use state narration markers (📍🔀🔄⚠️✅) for visibility
+- **STORY CLAIMING**: Claim stories before working, skip 🔒 claimed stories in suggestions
 
 <!-- COMPACT_SUMMARY_END -->
 
@@ -1096,6 +1138,82 @@ After loading context, analyze and present ranked options:
 
 ---
 
+## STORY CLAIMING (Multi-Session Coordination)
+
+When multiple Claude Code sessions work in the same repo, story claiming prevents conflicts.
+
+### How It Works
+
+1. **Claim on Selection**: When user selects a story to work on, claim it:
+   ```bash
+   node .agileflow/scripts/lib/story-claiming.js claim US-0042
+   ```
+
+2. **Check Before Suggesting**: Filter out claimed stories from suggestions:
+   - Stories with 🔒 badge are claimed by OTHER sessions
+   - Stories with ✓ badge are claimed by THIS session (can continue)
+   - Stories without badge are available
+
+3. **Release on Completion**: When story is marked "done", release claim:
+   ```bash
+   node .agileflow/scripts/lib/story-claiming.js release US-0042
+   ```
+
+### Story Badges in AskUserQuestion
+
+| Badge | Meaning | Action |
+|-------|---------|--------|
+| ⭐ | Ready, available | Can select |
+| 🔒 | Claimed by other session | **DO NOT suggest** (or show as disabled) |
+| ✓ | Claimed by this session | Continue working |
+
+### Claiming Flow
+
+```
+User: "Work on US-0042"
+     ↓
+Check: Is US-0042 claimed?
+     ↓
+┌──────────────┐    ┌──────────────────┐
+│ Not claimed  │    │ Claimed by other │
+└──────────────┘    └──────────────────┘
+     ↓                      ↓
+Claim it, proceed     Show warning:
+                      "US-0042 is being worked on
+                       by Session 2 (../project-auth).
+
+                       Pick a different story to
+                       avoid merge conflicts."
+```
+
+### Commands
+
+```bash
+# Claim a story
+node .agileflow/scripts/lib/story-claiming.js claim US-0042
+
+# Release a story
+node .agileflow/scripts/lib/story-claiming.js release US-0042
+
+# Check if claimed
+node .agileflow/scripts/lib/story-claiming.js check US-0042
+
+# List stories claimed by others
+node .agileflow/scripts/lib/story-claiming.js others
+
+# Clean stale claims (dead PIDs)
+node .agileflow/scripts/lib/story-claiming.js cleanup
+```
+
+### Important Rules
+
+- **Always claim before working**: Prevents conflicts
+- **Stale claims auto-expire**: If session PID dies or 4 hours pass
+- **Force claim available**: `--force` flag overrides (use sparingly)
+- **Release on completion**: Or let auto-expiry handle it
+
+---
+
 ## KNOWLEDGE INDEX
 
 **Context script provides:**

package/src/core/commands/session/end.md

@@ -190,7 +190,7 @@ If `hasConflicts: true`:
 ```
 ⚠️ Merge conflicts detected!
 
-This branch has conflicts with {mainBranch} that need to be resolved manually.
+This branch has conflicts with {mainBranch}. Smart merge can attempt automatic resolution.
 ```
 
 Then show conflict options:
@@ -201,6 +201,8 @@ AskUserQuestion:
   header: "Merge conflicts"
   multiSelect: false
   options:
+    - label: "Auto-resolve conflicts (Recommended)"
+      description: "Smart merge will resolve based on file types automatically"
     - label: "Resolve manually"
       description: "Keep session active and resolve conflicts yourself"
     - label: "End session without merging"
@@ -209,6 +211,40 @@ AskUserQuestion:
       description: "Keep session as-is"
 ```
 
+If "Auto-resolve conflicts" selected:
+```bash
+node .agileflow/scripts/session-manager.js smart-merge {session_id} --strategy={squash|merge}
+```
+
+The smart merge will:
+1. Categorize conflicting files by type (docs, tests, schema, config, source)
+2. Apply appropriate resolution strategy per file type
+3. Log all auto-resolutions for audit
+
+Display result:
+```
+✓ Conflicts auto-resolved!
+
+Files resolved:
+  📄 docs/README.md → accept_both (Documentation kept from both)
+  🧪 tests/api.test.ts → accept_both (Tests kept from both)
+  ⚙️ package.json → merge_keys (Config merged)
+  📝 src/api.ts → intelligent_merge (Source merged)
+
+Merge log saved to: .agileflow/sessions/merge-log.json
+```
+
+If auto-resolution fails:
+```
+⚠️ Some conflicts could not be auto-resolved:
+
+  ❌ src/complex.ts → Changes overlap in same code block
+
+Options:
+  • Resolve manually (see instructions below)
+  • End session without merging
+```
+
 If "Resolve manually" selected, show instructions:
 ```
 To resolve conflicts manually:
@@ -409,7 +445,13 @@ node .agileflow/scripts/session-manager.js merge-preview {session_id}
 Display commits and files to be merged.
 
 **Step 3: Check conflicts**
-If `hasConflicts: true` → Show conflict options → EXIT or manual resolution
+If `hasConflicts: true` → Show conflict options (auto-resolve/manual/end/cancel)
+
+**Step 3a: If auto-resolve selected**
+```bash
+node .agileflow/scripts/session-manager.js smart-merge {session_id} --strategy={squash|merge}
+```
+Smart merge auto-resolves by file type: docs→accept_both, tests→accept_both, config→merge_keys, source→theirs
 
 **Step 4: Choose strategy**
 ```xml