prjct-cli 0.19.0 → 0.20.1

package/CHANGELOG.md

@@ -1,5 +1,65 @@
 # Changelog
 
+## [0.20.1] - 2025-12-26
+
+### Refactor: Type Consolidation
+
+Centralized ALL types in `core/types/` following DRY principles.
+
+**Changes:**
+- Moved types from `domain/task-stack.ts` → `types/domain.ts`
+- Moved types from `sync/*.ts` → `types/sync.ts`
+- Moved types from `storage/*.ts` → `types/storage.ts`
+- Moved types from `server/*.ts` → `types/server.ts`
+- Moved types from `utils/*.ts` → `types/utils.ts`
+- Added `types/plugin.ts` for webhook types
+- Updated all barrel exports to re-export from `core/types`
+- Renamed types to canonical names (TaskEntry → TaskStackEntry, etc.)
+
+**Stats:** 41 files changed, 606 insertions, 819 deletions (net -213 lines)
+
+## [0.20.0] - 2025-12-21
+
+### Feature: UX/UI Design Agent Integration
+
+Auto-generated UX/UI specialist agent for all frontend projects (web + mobile).
+
+**Priority: UX > UI** - Experience is more important than visuals.
+
+#### New Agent: `templates/agentic/agents/uxui.md`
+- **Part 1: UX Principles** - User analysis, clarity, feedback, reduced friction, error handling, accessibility (a11y)
+- **Part 2: UI Guidelines** - Aesthetic directions, typography trends (avoiding "AI slop"), color framework, purposeful animation
+- **Part 3: Quality Checklists** - Mandatory UX/UI gates before shipping
+
+#### Frontend Detection in `/p:sync`
+Auto-generates uxui.md when ANY frontend tech is detected:
+
+| Platform | Technologies |
+|----------|-------------|
+| Web | React, Vue, Svelte, Angular, Next.js, Nuxt |
+| Mobile | React Native, Expo, Flutter, SwiftUI, Jetpack Compose |
+
+#### Enhanced `/p:feature` Phase 4
+For frontend features, now includes:
+1. **UX Analysis** - Who, problem, happy path, edge cases
+2. **UX Requirements Checklist** - 6 mandatory accessibility/usability checks
+3. **Aesthetic Direction Selection** - Minimal, Bold, Soft, Brutalist
+4. **UI Guidelines Application** - Typography, color, animation, layout
+
+#### Anti-patterns Avoided ("AI Slop")
+- Generic fonts: Inter, Roboto, Arial, Space Grotesk
+- Purple/blue gradients on white
+- Centered layouts without personality
+- Unstyled component libraries
+
+**Files Added:**
+- `templates/agentic/agents/uxui.md` - Complete UX/UI specialist agent
+
+**Files Modified:**
+- `templates/commands/sync.md` - Frontend detection + uxui.md generation
+- `templates/commands/feature.md` - Phase 4.0 UX/UI analysis
+- `templates/commands/ship.md` - Pre-flight checks + confidence scoring
+
 ## [0.19.0] - 2025-12-21
 
 ### Breaking: Web Package Removed
@@ -1337,7 +1397,7 @@ The 3-tier help system solves the core user frustration: **users know WHAT they
 - **Comprehensive Testing Documentation** - Complete testing guide and setup documentation
   - **TESTING.md** - Full testing guide with:
     - Quick start commands for running tests
-    - Vitest workspace architecture (core + website)
+    - Bun-based testing setup (core)
     - Detailed configuration for both Node.js and React environments
     - Testing best practices and examples
     - CI/CD integration documentation
@@ -1360,7 +1420,7 @@ The 3-tier help system solves the core user frustration: **users know WHAT they
 
 ### Technical Details
 
-- **Testing Stack**: Vitest with workspace configuration for dual environments
+- **Testing Stack**: Bun test for unit tests
 - **Core Tests** (Node.js): 179 tests for agentic system, commands, and utilities
 - **Website Tests** (React): 104 tests with Testing Library for components
 - **CI/CD**: GitHub Actions workflow with parallel test execution
@@ -2265,7 +2325,7 @@ The 3-tier help system solves the core user frustration: **users know WHAT they
 
 - **Interactive Workflow System** - Intelligent agent workflows with user-guided capability installation
   - **Adaptive Workflows**: Workflows detect missing capabilities and prompt user for decisions
-  - **Smart Recommendations**: Stack-aware tool suggestions (React → Vitest, Vue → Vitest, Angular → Jest)
+  - **Smart Recommendations**: Stack-aware tool suggestions (React → Bun test, Vue → Bun test, Angular → Jest)
   - **Installation Tracking**: Every tool installation becomes a visible, tracked workflow task
   - **Interactive Prompts**: Never auto-skips steps - always asks user (install/skip/continue/pause)
   - **Capability Detection**: Automatically detects design systems, test frameworks, and documentation tools
@@ -2296,11 +2356,11 @@ The 3-tier help system solves the core user frustration: **users know WHAT they
 
 - **Stack Detection**: Identifies React/Vue/Angular, TypeScript, bundler (Vite/Webpack/esbuild)
 - **Tool Recommendations**:
-  - React + TS → Vitest + Testing Library
-  - Vue → Vitest + @vue/test-utils
+  - React + TS → Bun test + Testing Library
+  - Vue → Bun test + @vue/test-utils
   - Angular → Jest + @types/jest
 - **Auto-Configuration**:
-  - Creates config files (vitest.config.js, jest.config.js, jsdoc.json)
+  - Creates config files for the selected tooling (e.g., jest.config.js, jsdoc.json)
   - Updates package.json scripts
   - Verifies installation success
 - **Duration Tracking**: Installation tasks show completion time (e.g., "1.2 min")

package/CLAUDE.md

@@ -32,32 +32,55 @@ bun -e "console.log(crypto.randomUUID())" 2>/dev/null || node -e "console.log(re
 Designed for [Claude](https://www.anthropic.com/claude)
 ```
 
-## Architecture: Write-Through
+## Architecture: Write-Through Pattern
 
 ```
 User Action → Storage (JSON) → Context (MD) → Sync Events
 ```
 
+### Layer System (10 layers)
+
 | Layer | Path | Purpose |
 |-------|------|---------|
-| Storage | `storage/*.json` | Source of truth |
-| Context | `context/*.md` | Claude-readable (generated) |
-| Sync | `sync/pending.json` | Backend events |
-| Memory | `memory/events.jsonl` | Audit trail |
+| **Storage** | `storage/*.json` | Source of truth (state, queue, shipped) |
+| **Context** | `context/*.md` | Claude-readable generated files |
+| **Core** | `core/` | Current task data |
+| **Progress** | `progress/` | Historical progress tracking |
+| **Planning** | `planning/` | Ideas, roadmap, specs, tasks |
+| **Analysis** | `analysis/` | Repo analysis, tech stack |
+| **Memory** | `memory/` | Events, patterns, semantic memories |
+| **Agents** | `agents/` | Domain specialists (auto-generated) |
+| **Sessions** | `sessions/YYYY/MM/DD/` | Daily session logs |
+| **Sync** | `sync/` | Backend sync events |
 
 ### File Structure
 ```
 ~/.prjct-cli/projects/{projectId}/
+├── project.json           # Project config (authors, version)
 ├── storage/
 │   ├── state.json         # Current task (source of truth)
-│   ├── shipped.json       # Shipped features
-│   └── queue.json         # Task queue
+│   ├── queue.json         # Priority queue
+│   └── shipped.json       # Shipped features
 ├── context/
 │   ├── now.md             # Generated from state.json
+│   ├── next.md            # Generated from queue.json
 │   └── shipped.md         # Generated from shipped.json
-├── sync/pending.json      # Backend events
-├── memory/events.jsonl    # Audit trail
-└── agents/                # Domain specialists
+├── core/                  # Current task context
+├── progress/              # Historical metrics
+├── planning/
+│   ├── ideas.json         # Captured ideas
+│   ├── roadmap.json       # Feature roadmap
+│   └── tasks/             # Task breakdowns
+├── analysis/
+│   └── repo-analysis.json # Tech stack, patterns
+├── memory/
+│   ├── events.jsonl       # Audit trail
+│   └── context.jsonl      # Semantic memories
+├── agents/                # Auto-generated domain specialists
+├── sessions/              # Daily session logs (YYYY/MM/DD/)
+└── sync/
+    ├── pending.json       # Events pending sync
+    └── last-sync.json     # Last sync timestamp
 ```
 
 ## Core Workflow
@@ -68,15 +91,33 @@ User Action → Storage (JSON) → Context (MD) → Sync Events
 
 ## Commands
 
+### Core Commands (14)
 | Command | Purpose |
 |---------|---------|
-| `/p:sync` | Analyze repo, generate agents |
+| `/p:init` | Initialize project with deep analysis |
+| `/p:idea` | Transform ideas into architectures |
+| `/p:feature` | Add feature with value analysis |
+| `/p:spec` | Create detailed specifications |
 | `/p:now [task]` | Start/show current task |
+| `/p:pause` | Pause active task |
+| `/p:resume` | Resume paused task |
+| `/p:next` | Show priority queue |
 | `/p:done` | Complete current task |
-| `/p:ship [feature]` | Ship with quality checks |
-| `/p:feature` | Add to roadmap |
-| `/p:idea` | Quick idea capture |
-| `/p:recap` | Project overview |
+| `/p:ship` | Ship with quality checks |
+| `/p:bug` | Report bug with auto-priority |
+| `/p:dash` | Unified dashboard |
+| `/p:sync` | Analyze repo, generate agents |
+| `/p:suggest` | Context-aware recommendations |
+
+### Optional Commands
+| Command | Purpose |
+|---------|---------|
+| `/p:design` | System architecture design |
+| `/p:cleanup` | Clean temp files |
+| `/p:analyze` | Deep repo analysis |
+| `/p:undo` / `/p:redo` | Snapshot management |
+| `/p:git` | Smart git operations |
+| `/p:test` | Run tests with auto-fix |
 
 ## Natural Language Trigger
 

package/README.md

@@ -425,25 +425,24 @@ prjct recap                # Show progress
 
 ## 🧪 Testing
 
-prjct-cli uses **Vitest** with comprehensive test coverage for both the CLI core and website.
+prjct-cli uses **Bun** (`bun test`) for unit tests.
 
 ### Quick Start
 
 ```bash
 # Run all tests
-npm test
+bun test
 
 # Run tests in watch mode
-npm run test:watch
+bun test --watch
 
 # Generate coverage report
-npm run test:coverage
+bun test --coverage
 ```
 
 ### Test Suites
 
 - **Core CLI** (Node.js) - Agentic system, commands, and utilities
-- **Website** (React + TypeScript) - Component tests with Testing Library
 
 ### CI/CD
 
@@ -451,7 +450,7 @@ Tests run automatically on every push and pull request via GitHub Actions.
 
 [![Tests](https://github.com/jlopezlira/prjct-cli/actions/workflows/test.yml/badge.svg)](https://github.com/jlopezlira/prjct-cli/actions/workflows/test.yml)
 
-> 📖 **Full testing guide:** See [TESTING.md](TESTING.md) for detailed documentation, configuration, and best practices.
+> 📖 **Full testing guide:** See [docs/TESTING.md](docs/TESTING.md) for detailed documentation, configuration, and best practices.
 
 ## ❓ FAQ
 

package/bin/prjct

@@ -1,45 +1,62 @@
-#!/usr/bin/env bun
-
-/**
- * prjct CLI entry point
- *
- * Auto-setup on first use (like Astro, Vite, etc.)
- */
-
-import { VERSION } from '../core/utils/version.ts'
-import editorsConfig from '../core/infrastructure/editors-config.ts'
-
-// Check for special subcommands that bypass normal CLI
-const args = process.argv.slice(2)
-
-if (args[0] === 'dev') {
-  // Launch prjct dev environment
-  await import('./dev.js')
-  process.exitCode = 0
-} else if (args[0] === 'web' || args[0] === 'serve') {
-  // Launch prjct web server
-  await import('./serve.js')
-  process.exitCode = 0
-} else {
-  // Ensure setup has run for this version
-  try {
-    const lastVersion = await editorsConfig.getLastVersion()
-
-    if (!lastVersion || lastVersion !== VERSION) {
-      console.log('\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━')
-      console.log('🔧 One-time setup (v' + VERSION + ')...')
-      console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n')
-
-      const { default: setup } = await import('../core/infrastructure/setup.ts')
-      await setup.run()
-
-      console.log('✓ Setup complete!\n')
+#!/bin/sh
+
+# prjct CLI - Runtime-agnostic entry point
+#
+# Detects available runtime (bun preferred, node fallback)
+# and executes the appropriate entry point.
+#
+# @version 1.0.0
+
+# Get the directory where this script is located
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
+
+# Check if bun is available
+check_bun() {
+  command -v bun >/dev/null 2>&1
+}
+
+# Check if node is available
+check_node() {
+  command -v node >/dev/null 2>&1
+}
+
+# Run with bun (native TypeScript)
+run_with_bun() {
+  exec bun "$SCRIPT_DIR/prjct.ts" "$@"
+}
+
+# Run with node (compiled JavaScript)
+run_with_node() {
+  DIST_BIN="$ROOT_DIR/dist/bin/prjct.mjs"
+
+  # Check if compiled version exists
+  if [ ! -f "$DIST_BIN" ]; then
+    echo "Building for Node.js (first run)..."
+    node "$ROOT_DIR/scripts/build.js" || {
+      echo "Error: Build failed. Please ensure you have write permissions."
+      exit 1
     }
-  } catch (error) {
-    console.error('\n⚠️  Setup warning:', (error as Error).message)
-    console.error('You can run setup manually: prjct setup\n')
-  }
+  fi
 
-  // Continue to main CLI logic
-  await import('../core/index.ts')
+  exec node "$DIST_BIN" "$@"
 }
+
+# Main execution
+main() {
+  # Prefer bun if available (faster, native TS support)
+  if check_bun; then
+    run_with_bun "$@"
+  elif check_node; then
+    run_with_node "$@"
+  else
+    echo "Error: Neither bun nor node is installed."
+    echo ""
+    echo "Please install one of:"
+    echo "  - Bun (recommended): https://bun.sh"
+    echo "  - Node.js 18+: https://nodejs.org"
+    exit 1
+  fi
+}
+
+main "$@"

package/bin/prjct.ts

@@ -0,0 +1,60 @@
+/**
+ * prjct CLI entry point
+ *
+ * Auto-setup on first use (like Astro, Vite, etc.)
+ * Supports both Bun and Node.js runtimes.
+ */
+
+import { VERSION } from '../core/utils/version'
+import editorsConfig from '../core/infrastructure/editors-config'
+import { startServer, DEFAULT_PORT } from '../core/server/server'
+import configManager from '../core/infrastructure/config-manager'
+
+// Check for special subcommands that bypass normal CLI
+const args = process.argv.slice(2)
+
+if (args[0] === 'dev') {
+  // Dev mode - placeholder for future development server
+  console.log('Dev mode is not yet implemented.')
+  console.log('Use "prjct serve" to start the web server.')
+  process.exitCode = 0
+} else if (args[0] === 'web' || args[0] === 'serve') {
+  // Launch prjct web server
+  try {
+    const projectPath = process.cwd()
+    const projectId = await configManager.getProjectId(projectPath)
+
+    if (!projectId) {
+      console.error('No prjct project found. Run "prjct init" first.')
+      process.exitCode = 1
+    } else {
+      const port = parseInt(args[1]) || DEFAULT_PORT
+      await startServer(projectId, projectPath, port)
+    }
+  } catch (error) {
+    console.error('Server error:', (error as Error).message)
+    process.exitCode = 1
+  }
+} else {
+  // Ensure setup has run for this version
+  try {
+    const lastVersion = await editorsConfig.getLastVersion()
+
+    if (!lastVersion || lastVersion !== VERSION) {
+      console.log('\n━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━')
+      console.log('🔧 One-time setup (v' + VERSION + ')...')
+      console.log('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━\n')
+
+      const { default: setup } = await import('../core/infrastructure/setup')
+      await setup.run()
+
+      console.log('✓ Setup complete!\n')
+    }
+  } catch (error) {
+    console.error('\n⚠️  Setup warning:', (error as Error).message)
+    console.error('You can run setup manually: prjct setup\n')
+  }
+
+  // Continue to main CLI logic
+  await import('../core/index')
+}

package/core/__tests__/agentic/memory-system.test.ts

@@ -3,17 +3,24 @@
  * P3.3: Semantic Memory Database
  */
 
-import { describe, it, expect, beforeEach, afterEach } from 'bun:test'
+import { describe, it, expect, beforeEach, afterEach, beforeAll, afterAll } from 'bun:test'
 import memorySystem from '../../agentic/memory-system'
+import pathManager from '../../infrastructure/path-manager'
 import fs from 'fs/promises'
 import path from 'path'
-import os from 'os'
 
 let testCounter = 0
 const getTestProjectId = () => `test-memory-${Date.now()}-${++testCounter}`
 
 describe('MemorySystem P3.3', () => {
   let TEST_PROJECT_ID: string
+  const TEST_GLOBAL_BASE_DIR = path.join(process.cwd(), '.tmp', 'prjct-cli-tests')
+
+  beforeAll(async () => {
+    // Reason: In sandboxed test environments we can't write to "~/.prjct-cli".
+    pathManager.setGlobalBaseDir(TEST_GLOBAL_BASE_DIR)
+    await fs.mkdir(TEST_GLOBAL_BASE_DIR, { recursive: true })
+  })
 
   beforeEach(() => {
     TEST_PROJECT_ID = getTestProjectId()
@@ -244,10 +251,18 @@ describe('MemorySystem P3.3', () => {
 
   afterEach(async () => {
     try {
-      const testPath = path.join(os.homedir(), '.prjct-cli', 'projects', TEST_PROJECT_ID)
+      const testPath = pathManager.getGlobalProjectPath(TEST_PROJECT_ID)
       await fs.rm(testPath, { recursive: true, force: true })
     } catch {
       // Ignore cleanup errors
     }
   })
+
+  afterAll(async () => {
+    try {
+      await fs.rm(TEST_GLOBAL_BASE_DIR, { recursive: true, force: true })
+    } catch {
+      // Ignore cleanup errors
+    }
+  })
 })

package/core/__tests__/agentic/plan-mode.test.ts

@@ -10,6 +10,25 @@ import planMode, {
   DESTRUCTIVE_COMMANDS,
   PLANNING_TOOLS
 } from '../../agentic/plan-mode'
+import type { ProposedPlan, ApprovalContext, ChangedFile } from '../../types'
+
+// Helper to create complete ProposedPlan objects
+const createPlan = (overrides: Partial<ProposedPlan> = {}): ProposedPlan => ({
+  summary: 'Test summary',
+  approach: 'Test approach',
+  steps: [],
+  affectedFiles: [],
+  ...overrides,
+})
+
+// Helper to create complete ApprovalContext objects
+const createApprovalContext = (overrides: Partial<ApprovalContext> = {}): ApprovalContext => ({
+  changedFiles: [],
+  filesToDelete: [],
+  operation: 'modify_files',
+  warnings: [],
+  ...overrides,
+})
 
 describe('PlanMode P3.4', () => {
   const TEST_PROJECT_ID = 'test-plan-mode'
@@ -116,7 +135,7 @@ describe('PlanMode P3.4', () => {
 
     it('should return true when pending approval', () => {
       planMode.startPlanning(TEST_PROJECT_ID, 'feature', {})
-      planMode.proposePlan(TEST_PROJECT_ID, { summary: 'Test', steps: [] })
+      planMode.proposePlan(TEST_PROJECT_ID, createPlan())
 
       expect(planMode.isInPlanningMode(TEST_PROJECT_ID)).toBe(true)
     })
@@ -127,7 +146,7 @@ describe('PlanMode P3.4', () => {
 
     it('should return false when plan is executing', () => {
       planMode.startPlanning(TEST_PROJECT_ID, 'feature', {})
-      planMode.proposePlan(TEST_PROJECT_ID, { summary: 'Test', steps: [{ description: 'Step 1' }] })
+      planMode.proposePlan(TEST_PROJECT_ID, createPlan({ steps: [{ description: 'Step 1' }] }))
       planMode.approvePlan(TEST_PROJECT_ID)
       planMode.startExecution(TEST_PROJECT_ID)
 
@@ -138,22 +157,27 @@ describe('PlanMode P3.4', () => {
   describe('recordGatheredInfo', () => {
     it('should add info to gatheredInfo array', () => {
       planMode.startPlanning(TEST_PROJECT_ID, 'feature', {})
-      planMode.recordGatheredInfo(TEST_PROJECT_ID, { type: 'file', source: 'src/index.js', data: 'content' })
+      planMode.recordGatheredInfo(TEST_PROJECT_ID, {
+        type: 'file_content',
+        source: 'src/index.js',
+        data: 'content',
+        gatheredAt: new Date().toISOString()
+      })
 
       const plan = planMode.getActivePlan(TEST_PROJECT_ID)
       expect(plan!.gatheredInfo.length).toBe(1)
-      expect(plan!.gatheredInfo[0].type).toBe('file')
+      expect(plan!.gatheredInfo[0].type).toBe('file_content')
     })
   })
 
   describe('proposePlan', () => {
     it('should set status to pending approval', () => {
       planMode.startPlanning(TEST_PROJECT_ID, 'feature', {})
-      planMode.proposePlan(TEST_PROJECT_ID, {
+      planMode.proposePlan(TEST_PROJECT_ID, createPlan({
         summary: 'Add dark mode feature',
         approach: 'CSS variables with theme context',
         steps: [{ description: 'Create theme context' }, { description: 'Add toggle' }]
-      })
+      }))
 
       const plan = planMode.getActivePlan(TEST_PROJECT_ID)
       expect(plan!.status).toBe(PLAN_STATUS.PENDING_APPROVAL)
@@ -161,11 +185,11 @@ describe('PlanMode P3.4', () => {
 
     it('should return formatted plan for display', () => {
       planMode.startPlanning(TEST_PROJECT_ID, 'feature', {})
-      const formatted = planMode.proposePlan(TEST_PROJECT_ID, {
+      const formatted = planMode.proposePlan(TEST_PROJECT_ID, createPlan({
         summary: 'Test plan',
         approach: 'Test approach',
         steps: [{ description: 'Step 1' }]
-      })
+      }))
 
       expect(formatted!.summary).toBe('Test plan')
       expect(formatted!.approach).toBe('Test approach')
@@ -176,7 +200,7 @@ describe('PlanMode P3.4', () => {
   describe('approvePlan', () => {
     it('should change status to approved', () => {
       planMode.startPlanning(TEST_PROJECT_ID, 'feature', {})
-      planMode.proposePlan(TEST_PROJECT_ID, { steps: [{ description: 'Step 1' }] })
+      planMode.proposePlan(TEST_PROJECT_ID, createPlan({ steps: [{ description: 'Step 1' }] }))
       const result = planMode.approvePlan(TEST_PROJECT_ID)
 
       expect(result!.approved).toBe(true)
@@ -186,9 +210,9 @@ describe('PlanMode P3.4', () => {
 
     it('should convert proposed steps to executable steps', () => {
       planMode.startPlanning(TEST_PROJECT_ID, 'feature', {})
-      planMode.proposePlan(TEST_PROJECT_ID, {
+      planMode.proposePlan(TEST_PROJECT_ID, createPlan({
         steps: [{ description: 'Step 1' }, { description: 'Step 2' }]
-      })
+      }))
       const result = planMode.approvePlan(TEST_PROJECT_ID)
 
       expect(result!.steps.length).toBe(2)
@@ -206,7 +230,7 @@ describe('PlanMode P3.4', () => {
   describe('rejectPlan', () => {
     it('should mark plan as rejected', () => {
       planMode.startPlanning(TEST_PROJECT_ID, 'feature', {})
-      planMode.proposePlan(TEST_PROJECT_ID, { steps: [] })
+      planMode.proposePlan(TEST_PROJECT_ID, createPlan())
       const result = planMode.rejectPlan(TEST_PROJECT_ID, 'Not the right approach')
 
       expect(result!.rejected).toBe(true)
@@ -215,7 +239,7 @@ describe('PlanMode P3.4', () => {
 
     it('should clear active plan after rejection', () => {
       planMode.startPlanning(TEST_PROJECT_ID, 'feature', {})
-      planMode.proposePlan(TEST_PROJECT_ID, { steps: [] })
+      planMode.proposePlan(TEST_PROJECT_ID, createPlan())
       planMode.rejectPlan(TEST_PROJECT_ID)
 
       expect(planMode.getActivePlan(TEST_PROJECT_ID)).toBeNull()
@@ -225,12 +249,12 @@ describe('PlanMode P3.4', () => {
   describe('execution flow', () => {
     beforeEach(() => {
       planMode.startPlanning(TEST_PROJECT_ID, 'feature', {})
-      planMode.proposePlan(TEST_PROJECT_ID, {
+      planMode.proposePlan(TEST_PROJECT_ID, createPlan({
         steps: [
           { description: 'Step 1', tool: 'Write' },
           { description: 'Step 2', tool: 'Bash' }
         ]
-      })
+      }))
       planMode.approvePlan(TEST_PROJECT_ID)
     })
 
@@ -263,7 +287,7 @@ describe('PlanMode P3.4', () => {
   describe('abortPlan', () => {
     it('should abort and clear active plan', () => {
       planMode.startPlanning(TEST_PROJECT_ID, 'feature', {})
-      planMode.proposePlan(TEST_PROJECT_ID, { steps: [{ description: 'Step 1' }] })
+      planMode.proposePlan(TEST_PROJECT_ID, createPlan({ steps: [{ description: 'Step 1' }] }))
       planMode.approvePlan(TEST_PROJECT_ID)
       planMode.startExecution(TEST_PROJECT_ID)
 
@@ -277,11 +301,15 @@ describe('PlanMode P3.4', () => {
 
   describe('generateApprovalPrompt', () => {
     it('should generate ship approval prompt', () => {
-      const prompt = planMode.generateApprovalPrompt('ship', {
+      const prompt = planMode.generateApprovalPrompt('ship', createApprovalContext({
         branch: 'feature/dark-mode',
-        changedFiles: ['a.js', 'b.js'],
-        commitMessage: 'Add dark mode'
-      })
+        changedFiles: [
+          { path: 'a.js', action: 'modify' },
+          { path: 'b.js', action: 'modify' }
+        ],
+        commitMessage: 'Add dark mode',
+        operation: 'git_push'
+      }))
 
       expect(prompt.title).toBe('Ship Confirmation')
       expect(prompt.details).toContain('Branch: feature/dark-mode')
@@ -289,17 +317,18 @@ describe('PlanMode P3.4', () => {
     })
 
     it('should generate cleanup approval prompt', () => {
-      const prompt = planMode.generateApprovalPrompt('cleanup', {
+      const prompt = planMode.generateApprovalPrompt('cleanup', createApprovalContext({
         filesToDelete: ['temp.js'],
-        linesOfCode: 50
-      })
+        linesOfCode: 50,
+        operation: 'delete_files'
+      }))
 
       expect(prompt.title).toBe('Cleanup Confirmation')
       expect(prompt.message).toContain('delete')
     })
 
     it('should generate default prompt for unknown commands', () => {
-      const prompt = planMode.generateApprovalPrompt('unknown', {})
+      const prompt = planMode.generateApprovalPrompt('unknown', createApprovalContext())
 
       expect(prompt.title).toBe('Confirmation Required')
       expect(prompt.options.length).toBe(2)
@@ -318,9 +347,9 @@ describe('PlanMode P3.4', () => {
 
     it('should show progress during execution', () => {
       planMode.startPlanning(TEST_PROJECT_ID, 'feature', {})
-      planMode.proposePlan(TEST_PROJECT_ID, {
+      planMode.proposePlan(TEST_PROJECT_ID, createPlan({
         steps: [{ description: 'Step 1' }, { description: 'Step 2' }]
-      })
+      }))
       planMode.approvePlan(TEST_PROJECT_ID)
       planMode.startExecution(TEST_PROJECT_ID)