agileflow 2.94.1 → 2.95.1

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

@@ -7,7 +7,8 @@ compact_context:
     - "ACTIVE COMMAND: /agileflow:session:end - Terminate current session"
     - "For NON-MAIN sessions: 4 options (merge/end/delete/cancel)"
     - "For MAIN sessions: 2 options (end/cancel)"
-    - "Merge flow: check uncommitted → preview → check conflicts → strategy → confirm → execute"
+    - "Uncommitted changes: INLINE options (commit/commit-custom/stash/discard/cancel) - NOT blocking!"
+    - "Merge flow: check uncommitted → handle inline → preview → conflicts → strategy → confirm → execute → unstash if stashed"
     - "Main session can only be marked inactive, not deleted or merged"
     - "Use AskUserQuestion for all user choices"
   state_fields:
@@ -15,6 +16,7 @@ compact_context:
     - is_main_session
     - user_choice
     - merge_strategy
+    - stash_used
 ---
 
 # /agileflow:session:end
@@ -178,17 +180,123 @@ node .agileflow/scripts/session-manager.js check-merge {session_id}
 
 If response contains `reason: "uncommitted_changes"`:
 
+**Display change summary:**
 ```
 ⚠️ You have uncommitted changes in this session.
 
-Please commit your changes before merging:
-  git add .
-  git commit -m "your message"
+{details_from_response}
 
-Or discard changes:
-  git checkout -- .
+```
+
+**Present inline options with AskUserQuestion:**
 
-Then run /agileflow:session:end again.
+```
+AskUserQuestion:
+  question: "How would you like to handle these uncommitted changes?"
+  header: "Uncommitted changes"
+  multiSelect: false
+  options:
+    - label: "Commit all changes (Recommended)"
+      description: "Create a commit with auto-generated message"
+    - label: "Commit with custom message"
+      description: "Enter your own commit message"
+    - label: "Stash changes temporarily"
+      description: "Stash, merge, then restore after merge"
+    - label: "Discard all changes"
+      description: "Discard local changes and continue with merge"
+    - label: "Cancel"
+      description: "Keep session active with uncommitted changes"
+```
+
+#### If "Commit all changes" selected:
+
+```bash
+node .agileflow/scripts/session-manager.js commit-changes {session_id}
+```
+
+Display:
+```
+✓ Changes committed: {commitHash}
+  Message: {message}
+```
+
+Continue to **Merge Step 2**.
+
+#### If "Commit with custom message" selected:
+
+First, ask for the commit message:
+```
+AskUserQuestion:
+  question: "Enter your commit message:"
+  header: "Commit message"
+  multiSelect: false
+  options:
+    - label: "feat: ..."
+      description: "New feature"
+    - label: "fix: ..."
+      description: "Bug fix"
+    - label: "chore: ..."
+      description: "Maintenance/cleanup"
+```
+
+The user will select "Other" to enter a custom message. Then:
+
+```bash
+node .agileflow/scripts/session-manager.js commit-changes {session_id} --message="{user_message}"
+```
+
+Display:
+```
+✓ Changes committed: {commitHash}
+  Message: {message}
+```
+
+Continue to **Merge Step 2**.
+
+#### If "Stash changes temporarily" selected:
+
+```bash
+node .agileflow/scripts/session-manager.js stash {session_id}
+```
+
+Display:
+```
+✓ Changes stashed: {message}
+
+Note: After merge completes, stash will be restored on main branch.
+```
+
+Continue to **Merge Step 2**.
+
+**IMPORTANT**: After the merge completes successfully (at the end of Merge Step 7), run:
+```bash
+node .agileflow/scripts/session-manager.js unstash {session_id}
+```
+
+Display:
+```
+✓ Stashed changes restored to main branch.
+```
+
+#### If "Discard all changes" selected:
+
+```bash
+node .agileflow/scripts/session-manager.js discard-changes {session_id}
+```
+
+Display:
+```
+✓ All uncommitted changes discarded.
+
+⚠️ Note: Untracked files were NOT deleted.
+```
+
+Continue to **Merge Step 2**.
+
+#### If "Cancel" selected:
+
+```
+Session remains active with uncommitted changes.
 ```
 
 **Exit the flow here.** Do not continue to merge.
@@ -485,7 +593,30 @@ node .agileflow/scripts/session-manager.js status
 ```bash
 node .agileflow/scripts/session-manager.js check-merge {session_id}
 ```
-If `reason: "uncommitted_changes"` → Show commit instructions → EXIT
+If `reason: "uncommitted_changes"` → Show inline options (5 choices):
+```xml
+<invoke name="AskUserQuestion">
+<parameter name="questions">[{
+  "question": "How would you like to handle these uncommitted changes?",
+  "header": "Uncommitted changes",
+  "multiSelect": false,
+  "options": [
+    {"label": "Commit all changes (Recommended)", "description": "Create a commit with auto-generated message"},
+    {"label": "Commit with custom message", "description": "Enter your own commit message"},
+    {"label": "Stash changes temporarily", "description": "Stash, merge, then restore after merge"},
+    {"label": "Discard all changes", "description": "Discard local changes and continue"},
+    {"label": "Cancel", "description": "Keep session active with uncommitted changes"}
+  ]
+}]</parameter>
+</invoke>
+```
+
+**Step 1a: Handle uncommitted choice**
+- "Commit all": `node .agileflow/scripts/session-manager.js commit-changes {id}` → continue
+- "Commit custom": Ask for message → `commit-changes {id} --message="..."` → continue
+- "Stash": `node .agileflow/scripts/session-manager.js stash {id}` → continue (unstash after merge)
+- "Discard": `node .agileflow/scripts/session-manager.js discard-changes {id}` → continue
+- "Cancel": EXIT
 
 **Step 2: Get preview**
 ```bash
@@ -621,13 +752,15 @@ tmux kill-window
 2. Check is_main
 3. Show options (4 for non-main, 2 for main)
 4. If merge selected:
-   a. Check uncommitted → block if dirty
-   b. Preview commits/files
-   c. Check conflicts → offer alternatives if conflicts
-   d. Choose strategy (squash/merge)
-   e. Confirm cleanup
-   f. Execute integrate
-   g. Show success with cd command
+   a. Check uncommitted → show inline options (commit/stash/discard/cancel)
+   b. Handle uncommitted (commit-changes, stash, or discard-changes)
+   c. Preview commits/files
+   d. Check conflicts → offer alternatives if conflicts
+   e. Choose strategy (squash/merge)
+   f. Confirm cleanup
+   g. Execute integrate
+   h. If stash was used → unstash on main
+   i. Show success with cd command
 5. If end/delete → Execute and show result
 6. If in tmux → Offer to close tab
 ```
@@ -638,18 +771,22 @@ tmux kill-window
 
 ❌ Show merge option for main session
 ❌ Skip uncommitted check before merge
+❌ Block and exit on uncommitted changes (use inline options instead!)
 ❌ Merge without showing preview
 ❌ Merge when conflicts exist without warning
 ❌ Delete worktree before merge completes
+❌ Forget to unstash after merge if stash was used
 
 ### DO THESE
 
 ✅ Always check is_main first
-✅ Check uncommitted changes before anything
+✅ Check uncommitted changes and offer inline options
+✅ Handle uncommitted with commit-changes, stash, or discard-changes
 ✅ Show preview before merge
 ✅ Handle conflicts gracefully
 ✅ Squash as default strategy
 ✅ Show cd command after successful merge
+✅ If stash was used, unstash after merge completes
 
 ---
 
@@ -658,7 +795,8 @@ tmux kill-window
 - `/agileflow:session:end` IS ACTIVE
 - Non-main: 4 options (merge first!)
 - Main: 2 options only
-- Merge flow: uncommitted → preview → conflicts → strategy → confirm → execute
+- Uncommitted changes: inline options (commit/stash/discard/cancel) - NOT blocking!
+- Merge flow: uncommitted → handle → preview → conflicts → strategy → confirm → execute → unstash if needed
 - Default strategy: squash
 - Always show cd command to return to main
 - **After session ends: Offer to close tmux tab (if in tmux)**

package/src/core/commands/sprint.md

@@ -630,6 +630,78 @@ After displaying plan, ask:
 
 ---
 
+## Expected Output
+
+### Success - Sprint Planning
+
+```
+📅 Sprint Planning: Sprint 13
+══════════════════════════════════════════════════════════════
+
+📊 Capacity Analysis
+┌────────────────────────────────────────────────────────────┐
+│ Team Velocity (avg last 3 sprints): 38 points              │
+│ Available capacity: 36 points (1 dev on PTO)               │
+│ Recommended commitment: 32-36 points                       │
+└────────────────────────────────────────────────────────────┘
+
+📋 Suggested Sprint Backlog
+┌────────────────────────────────────────────────────────────┐
+│ MUST HAVE (P0-P1) - 24 points                              │
+├────────────────────────────────────────────────────────────┤
+│ US-0060: OAuth completion (8 pts) - AG-API                 │
+│ US-0061: Rate limiting (5 pts) - AG-CI                     │
+│ US-0062: Session security fix (3 pts) - AG-SECURITY        │
+│ US-0063: Dashboard updates (8 pts) - AG-UI                 │
+├────────────────────────────────────────────────────────────┤
+│ SHOULD HAVE (P2) - 12 points                               │
+├────────────────────────────────────────────────────────────┤
+│ US-0064: Email notifications (5 pts) - AG-API              │
+│ US-0065: Metrics dashboard (4 pts) - AG-UI                 │
+│ US-0066: Documentation update (3 pts) - AG-DOCS            │
+└────────────────────────────────────────────────────────────┘
+
+⚠️ Dependency Alert:
+US-0060 must complete before US-0064 can start
+
+Total: 36 points | Risk: Low
+
+Commit this sprint plan? [Y/n]
+```
+
+### Success - Sprint Started
+
+```
+📅 Sprint 13 Started
+══════════════════════════════════════════════════════════════
+
+Duration: 2026-01-29 to 2026-02-12 (14 days)
+Commitment: 7 stories (36 points)
+Goal: Complete OAuth and security hardening
+
+✓ Status.json updated
+✓ Sprint created in milestones.md
+✓ Stories moved to 'in_progress' column
+
+Next: /agileflow:board to see sprint view
+```
+
+### Error - Active Sprint Exists
+
+```
+❌ Error: Sprint 12 is still active
+
+Stories remaining: 2 (4 points)
+Days remaining: 1
+
+Options:
+1. Complete current sprint: /agileflow:sprint ACTION=end
+2. Carry over stories: /agileflow:sprint ACTION=carryover
+3. Force new sprint: /agileflow:sprint ACTION=start FORCE=true
+```
+
+---
+
 ## Related Commands
 
 - `/agileflow:board` - Visual kanban board

package/src/core/commands/story-validate.md

@@ -413,6 +413,74 @@ After validation completes, offer context-aware next steps:
 
 ---
 
+## Expected Output
+
+### Success - Story Valid
+
+```
+✅ Story Validation: US-0050
+══════════════════════════════════════════════════════════════
+
+Checking story completeness...
+
+✓ Title: Clear and descriptive
+✓ Description: Contains user value
+✓ Acceptance Criteria: 5 criteria in Given/When/Then format
+✓ Estimate: 1.5d (within range)
+✓ Owner: AG-API (valid agent)
+✓ Dependencies: None or all exist
+✓ Epic: EP-0010 (linked)
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+✅ Story is ready for development
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+INVEST Score: 9/10
+- Independent: ✓
+- Negotiable: ✓
+- Valuable: ✓
+- Estimable: ✓
+- Small: ✓
+- Testable: ✓
+```
+
+### Partial Success - Issues Found
+
+```
+⚠️ Story Validation: US-0051
+══════════════════════════════════════════════════════════════
+
+Issues found (2):
+
+🔴 CRITICAL:
+1. Acceptance criteria missing Given/When/Then format
+   Found: "Login should work"
+   Expected: "Given a registered user, When they submit valid credentials, Then they receive a JWT token"
+
+🟡 WARNING:
+2. Estimate missing
+   Add estimate: 0.5d, 1d, 1.5d, or 2d
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+⚠️ Story needs fixes before development
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+Fix issues now? [Y/n]
+```
+
+### Error - Story Not Found
+
+```
+❌ Error: Story not found: US-9999
+
+Check story ID and try again.
+
+List available stories:
+/agileflow:story:list STATUS=ready
+```
+
+---
+
 ## Related Commands
 
 - `/agileflow:story:view` - View story details with contextual actions

package/src/core/commands/template.md

@@ -566,6 +566,75 @@ OUTPUT
 
 ---
 
+## Expected Output
+
+### Success - List Templates
+
+```
+📋 Available Templates
+══════════════════════════════════════════════════════════════
+
+Built-in Templates (docs/00-meta/templates/):
+  • story-template.md      User stories with AC
+  • epic-template.md       Epics with milestones
+  • adr-template.md        Architecture Decision Records
+  • agent-profile-template.md  Agent profiles
+  • research-template.md   Research notes
+
+Custom Templates (docs/00-meta/templates/custom/):
+  • meeting-notes.md       (created 2025-10-15)
+  • incident-report.md     (created 2025-10-10)
+  • sprint-retro.md        (created 2025-10-01)
+
+Usage: /agileflow:template ACTION=use TYPE=custom NAME=meeting-notes
+```
+
+### Success - Create Template
+
+```
+📝 Creating Template: sprint-retro
+══════════════════════════════════════════════════════════════
+
+Template type: Sprint Retrospective
+Variables detected: {{SPRINT_NUMBER}}, {{START_DATE}}, {{END_DATE}}, {{TEAM}}
+
+Preview:
+─────────────────────────────────────────
+# Sprint {{SPRINT_NUMBER}} Retrospective
+
+**Dates**: {{START_DATE}} to {{END_DATE}}
+**Team**: {{TEAM}}
+
+## What Went Well?
+1.
+
+## What Didn't Go Well?
+1.
+
+## Action Items
+- [ ] {{ACTION_1}}
+─────────────────────────────────────────
+
+Save to: docs/00-meta/templates/custom/sprint-retro.md
+Proceed? (YES/NO)
+```
+
+### Error - Template Not Found
+
+```
+❌ Template not found: my-template
+
+Available templates:
+  • story-template
+  • epic-template
+  • adr-template
+  • meeting-notes (custom)
+
+Create new: /agileflow:template ACTION=create NAME=my-template
+```
+
+---
+
 ## Related Commands
 
 - `/agileflow:configure` - Manage AgileFlow features and hooks

package/src/core/commands/tests.md

@@ -638,6 +638,89 @@ OUTPUT
 
 ---
 
+## Expected Output
+
+### Success - Test Setup Complete
+
+```
+🧪 Test Infrastructure Setup
+══════════════════════════════════════════════════════════════
+
+Detected: Node.js (TypeScript)
+Framework: Jest
+
+✅ Installed dependencies:
+   • jest @types/jest ts-jest
+   • @testing-library/react @testing-library/jest-dom
+
+✅ Created configuration:
+   • jest.config.js (coverage threshold: 70%)
+
+✅ Created example tests:
+   • tests/unit/example.test.ts (2 tests)
+   • tests/integration/api.test.ts (2 tests)
+
+✅ Updated package.json scripts:
+   • test, test:watch, test:coverage, test:unit, test:integration
+
+✅ Updated CI workflow:
+   • .github/workflows/ci.yml (test job added)
+
+✅ Created documentation:
+   • docs/02-practices/testing.md
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+Running verification...
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+$ npm test
+PASS  tests/unit/example.test.ts (4 tests)
+PASS  tests/integration/api.test.ts (2 tests)
+
+Tests: 6 passed, 6 total
+Time: 2.3s
+
+✅ Test infrastructure ready!
+
+Try running: npm test
+```
+
+### Error - Tests Already Exist
+
+```
+⚠️ Existing Test Setup Detected
+══════════════════════════════════════════════════════════════
+
+Found:
+  • jest.config.js (existing configuration)
+  • tests/ directory (14 test files)
+  • package.json test script
+
+Current coverage: 72%
+
+Options:
+1. Skip setup (tests already configured)
+2. Add missing components only
+3. Reset and reconfigure
+
+What would you like to do?
+```
+
+### Error - Unknown Project Type
+
+```
+❌ Could not detect project type
+
+No package.json, requirements.txt, Gemfile, or go.mod found.
+
+Please specify framework manually:
+  /agileflow:tests FRAMEWORK=jest
+  /agileflow:tests FRAMEWORK=pytest
+  /agileflow:tests FRAMEWORK=rspec
+```
+
+---
+
 ## Related Commands
 
 - `/agileflow:configure` - Manage AgileFlow features and hooks

package/src/core/commands/update.md

@@ -523,6 +523,65 @@ OUTPUT
 
 ---
 
+## Expected Output
+
+### Success - Update Generated
+
+```
+📊 Stakeholder Update Generated
+══════════════════════════════════════════════════════════════
+
+Period: Oct 9-16, 2025 (Week)
+Audience: Executive
+Format: Markdown
+
+Data collected from:
+  ✓ status.json (45 stories)
+  ✓ 3 epics
+  ✓ Git history (28 commits)
+  ✓ Bus log (142 events)
+  ✓ 2 ADRs
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+Preview
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+## Executive Summary
+**Status**: 🟢 On Track
+
+We completed the user authentication epic this week,
+delivering all planned features on schedule.
+
+**Key Highlights**:
+- ✅ 12 stories completed (velocity: 18 points)
+- 🎯 Payment integration on track for end-of-month
+
+━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+Save to: docs/08-project/updates/20251016-update.md
+
+Send update? (YES/NO/EDIT)
+```
+
+### Error - No Data for Period
+
+```
+⚠️ Insufficient data for update
+
+Period: Oct 1-7, 2025
+Stories completed: 0
+Commits: 3
+
+Not enough activity to generate meaningful update.
+
+Options:
+1. Expand period to last 2 weeks
+2. Generate minimal status report
+3. Cancel
+```
+
+---
+
 ## Related Commands
 
 - `/agileflow:docs` - Synchronize documentation with code

package/src/core/commands/validate-expertise.md

@@ -221,6 +221,82 @@ RULES
 
 ---
 
+## Expected Output
+
+### Success - All Validations Pass
+
+```
+======================================
+EXPERTISE VALIDATION REPORT
+======================================
+
+Validating: database
+  [PASS] File exists: expertise.yaml
+  [PASS] Required sections present
+  [PASS] No stale learnings
+  [PASS] File size OK (142 lines)
+  [PASS] All referenced files exist
+
+Validating: api
+  [PASS] All checks passed
+
+Validating: ui
+  [PASS] All checks passed
+
+--------------------------------------
+SUMMARY
+--------------------------------------
+Total domains: 25
+Passed: 25
+Warnings: 0
+Failures: 0
+
+✅ All expertise files are valid and up-to-date.
+```
+
+### Success - Issues Found
+
+```
+======================================
+EXPERTISE VALIDATION REPORT
+======================================
+
+Validating: database
+  [PASS] File exists: expertise.yaml
+  [PASS] Required sections present
+  [WARN] 2 stale learnings (>30 days)
+  [FAIL] DRIFT: src/old/database.ts not found
+  [FAIL] DRIFT: lib/deprecated/orm.js not found
+
+Validating: api
+  [PASS] All checks passed
+
+--------------------------------------
+SUMMARY
+--------------------------------------
+Total domains: 25
+Passed: 23
+Warnings: 1
+Failures: 2
+
+RECOMMENDED ACTIONS:
+1. Update database expertise - remove reference to src/old/database.ts
+2. Update database expertise - remove reference to lib/deprecated/orm.js
+3. Review stale learnings in database domain
+```
+
+### Error - Expertise Not Found
+
+```
+❌ Expertise file not found: .agileflow/experts/mobile/expertise.yaml
+
+The 'mobile' domain has no expertise file.
+
+Create one with: /agileflow:agent mobile
+```
+
+---
+
 ## Related Commands
 
 - `/agileflow:diagnose` - System health diagnostics