rafcode 1.2.0 → 2.0.0

package/tests/unit/plan-command.test.ts

@@ -28,32 +28,32 @@ describe('Plan Command - Amend Functionality', () => {
   describe('Project Resolution for Amend', () => {
     beforeEach(() => {
       // Create a project with tasks
-      const projectDir = path.join(tempDir, '003-my-project');
+      const projectDir = path.join(tempDir, 'aaaaad-my-project');
       fs.mkdirSync(projectDir);
       fs.mkdirSync(path.join(projectDir, 'plans'));
       fs.writeFileSync(
-        path.join(projectDir, 'plans', '001-first-task.md'),
+        path.join(projectDir, 'plans', '01-first-task.md'),
         '# Task: First Task\n'
       );
       fs.writeFileSync(
-        path.join(projectDir, 'plans', '002-second-task.md'),
+        path.join(projectDir, 'plans', '02-second-task.md'),
         '# Task: Second Task\n'
       );
     });
 
-    it('should resolve project by numeric ID for amend', () => {
-      const result = resolveProjectIdentifier(tempDir, '3');
-      expect(result).toBe(path.join(tempDir, '003-my-project'));
+    it('should resolve project by 6-char base26 ID for amend', () => {
+      const result = resolveProjectIdentifier(tempDir, 'aaaaad');
+      expect(result).toBe(path.join(tempDir, 'aaaaad-my-project'));
     });
 
     it('should resolve project by name for amend', () => {
       const result = resolveProjectIdentifier(tempDir, 'my-project');
-      expect(result).toBe(path.join(tempDir, '003-my-project'));
+      expect(result).toBe(path.join(tempDir, 'aaaaad-my-project'));
     });
 
     it('should resolve project by full folder name for amend', () => {
-      const result = resolveProjectIdentifier(tempDir, '003-my-project');
-      expect(result).toBe(path.join(tempDir, '003-my-project'));
+      const result = resolveProjectIdentifier(tempDir, 'aaaaad-my-project');
+      expect(result).toBe(path.join(tempDir, 'aaaaad-my-project'));
     });
 
     it('should return null for non-existent project', () => {
@@ -62,39 +62,39 @@ describe('Plan Command - Amend Functionality', () => {
     });
   });
 
-  describe('Base36 Project Resolution for Amend', () => {
+  describe('Base26 Project Resolution for Amend', () => {
     beforeEach(() => {
-      const projectDir = path.join(tempDir, 'a01-important-project');
+      const projectDir = path.join(tempDir, 'abcdef-important-project');
       fs.mkdirSync(projectDir);
       fs.mkdirSync(path.join(projectDir, 'plans'));
       fs.writeFileSync(
-        path.join(projectDir, 'plans', '001-initial-task.md'),
+        path.join(projectDir, 'plans', '01-initial-task.md'),
         '# Task: Initial Task\n'
       );
     });
 
-    it('should resolve project by base36 prefix for amend', () => {
-      const result = resolveProjectIdentifier(tempDir, 'a01');
-      expect(result).toBe(path.join(tempDir, 'a01-important-project'));
+    it('should resolve project by 6-char base26 prefix for amend', () => {
+      const result = resolveProjectIdentifier(tempDir, 'abcdef');
+      expect(result).toBe(path.join(tempDir, 'abcdef-important-project'));
     });
 
-    it('should resolve project by full base36 folder name for amend', () => {
-      const result = resolveProjectIdentifier(tempDir, 'a01-important-project');
-      expect(result).toBe(path.join(tempDir, 'a01-important-project'));
+    it('should resolve project by full base26 folder name for amend', () => {
+      const result = resolveProjectIdentifier(tempDir, 'abcdef-important-project');
+      expect(result).toBe(path.join(tempDir, 'abcdef-important-project'));
     });
   });
 
   describe('Existing Project State Loading', () => {
     it('should load pending tasks', () => {
-      const projectDir = path.join(tempDir, '001-test-project');
+      const projectDir = path.join(tempDir, 'aaaaab-test-project');
       fs.mkdirSync(projectDir);
       fs.mkdirSync(path.join(projectDir, 'plans'));
       fs.writeFileSync(
-        path.join(projectDir, 'plans', '001-task-one.md'),
+        path.join(projectDir, 'plans', '01-task-one.md'),
         '# Task: Task One\n'
       );
       fs.writeFileSync(
-        path.join(projectDir, 'plans', '002-task-two.md'),
+        path.join(projectDir, 'plans', '02-task-two.md'),
         '# Task: Task Two\n'
       );
 
@@ -105,16 +105,16 @@ describe('Plan Command - Amend Functionality', () => {
     });
 
     it('should load completed tasks', () => {
-      const projectDir = path.join(tempDir, '001-test-project');
+      const projectDir = path.join(tempDir, 'aaaaab-test-project');
       fs.mkdirSync(projectDir);
       fs.mkdirSync(path.join(projectDir, 'plans'));
       fs.mkdirSync(path.join(projectDir, 'outcomes'));
       fs.writeFileSync(
-        path.join(projectDir, 'plans', '001-task-one.md'),
+        path.join(projectDir, 'plans', '01-task-one.md'),
         '# Task: Task One\n'
       );
       fs.writeFileSync(
-        path.join(projectDir, 'outcomes', '001-task-one.md'),
+        path.join(projectDir, 'outcomes', '01-task-one.md'),
         'Task completed.\n\n<promise>COMPLETE</promise>'
       );
 
@@ -124,16 +124,16 @@ describe('Plan Command - Amend Functionality', () => {
     });
 
     it('should load failed tasks', () => {
-      const projectDir = path.join(tempDir, '001-test-project');
+      const projectDir = path.join(tempDir, 'aaaaab-test-project');
       fs.mkdirSync(projectDir);
       fs.mkdirSync(path.join(projectDir, 'plans'));
       fs.mkdirSync(path.join(projectDir, 'outcomes'));
       fs.writeFileSync(
-        path.join(projectDir, 'plans', '001-task-one.md'),
+        path.join(projectDir, 'plans', '01-task-one.md'),
         '# Task: Task One\n'
       );
       fs.writeFileSync(
-        path.join(projectDir, 'outcomes', '001-task-one.md'),
+        path.join(projectDir, 'outcomes', '01-task-one.md'),
         'Task failed.\n\n<promise>FAILED</promise>'
       );
 
@@ -143,28 +143,28 @@ describe('Plan Command - Amend Functionality', () => {
     });
 
     it('should load mixed task statuses', () => {
-      const projectDir = path.join(tempDir, '001-test-project');
+      const projectDir = path.join(tempDir, 'aaaaab-test-project');
       fs.mkdirSync(projectDir);
       fs.mkdirSync(path.join(projectDir, 'plans'));
       fs.mkdirSync(path.join(projectDir, 'outcomes'));
       fs.writeFileSync(
-        path.join(projectDir, 'plans', '001-task-one.md'),
+        path.join(projectDir, 'plans', '01-task-one.md'),
         '# Task: Task One\n'
       );
       fs.writeFileSync(
-        path.join(projectDir, 'plans', '002-task-two.md'),
+        path.join(projectDir, 'plans', '02-task-two.md'),
         '# Task: Task Two\n'
       );
       fs.writeFileSync(
-        path.join(projectDir, 'plans', '003-task-three.md'),
+        path.join(projectDir, 'plans', '03-task-three.md'),
         '# Task: Task Three\n'
       );
       fs.writeFileSync(
-        path.join(projectDir, 'outcomes', '001-task-one.md'),
+        path.join(projectDir, 'outcomes', '01-task-one.md'),
         'Task completed.\n\n<promise>COMPLETE</promise>'
       );
       fs.writeFileSync(
-        path.join(projectDir, 'outcomes', '002-task-two.md'),
+        path.join(projectDir, 'outcomes', '02-task-two.md'),
         'Task failed.\n\n<promise>FAILED</promise>'
       );
       // Task three has no outcome - pending
@@ -179,24 +179,24 @@ describe('Plan Command - Amend Functionality', () => {
 
   describe('Fully Completed Project Detection', () => {
     it('should detect fully completed project', () => {
-      const projectDir = path.join(tempDir, '001-test-project');
+      const projectDir = path.join(tempDir, 'aaaaab-test-project');
       fs.mkdirSync(projectDir);
       fs.mkdirSync(path.join(projectDir, 'plans'));
       fs.mkdirSync(path.join(projectDir, 'outcomes'));
       fs.writeFileSync(
-        path.join(projectDir, 'plans', '001-task-one.md'),
+        path.join(projectDir, 'plans', '01-task-one.md'),
         '# Task: Task One\n'
       );
       fs.writeFileSync(
-        path.join(projectDir, 'plans', '002-task-two.md'),
+        path.join(projectDir, 'plans', '02-task-two.md'),
         '# Task: Task Two\n'
       );
       fs.writeFileSync(
-        path.join(projectDir, 'outcomes', '001-task-one.md'),
+        path.join(projectDir, 'outcomes', '01-task-one.md'),
         'Task completed.\n\n<promise>COMPLETE</promise>'
       );
       fs.writeFileSync(
-        path.join(projectDir, 'outcomes', '002-task-two.md'),
+        path.join(projectDir, 'outcomes', '02-task-two.md'),
         'Task completed.\n\n<promise>COMPLETE</promise>'
       );
 
@@ -205,20 +205,20 @@ describe('Plan Command - Amend Functionality', () => {
     });
 
     it('should not mark project as complete with pending tasks', () => {
-      const projectDir = path.join(tempDir, '001-test-project');
+      const projectDir = path.join(tempDir, 'aaaaab-test-project');
       fs.mkdirSync(projectDir);
       fs.mkdirSync(path.join(projectDir, 'plans'));
       fs.mkdirSync(path.join(projectDir, 'outcomes'));
       fs.writeFileSync(
-        path.join(projectDir, 'plans', '001-task-one.md'),
+        path.join(projectDir, 'plans', '01-task-one.md'),
         '# Task: Task One\n'
       );
       fs.writeFileSync(
-        path.join(projectDir, 'plans', '002-task-two.md'),
+        path.join(projectDir, 'plans', '02-task-two.md'),
         '# Task: Task Two\n'
       );
       fs.writeFileSync(
-        path.join(projectDir, 'outcomes', '001-task-one.md'),
+        path.join(projectDir, 'outcomes', '01-task-one.md'),
         'Task completed.\n\n<promise>COMPLETE</promise>'
       );
 
@@ -227,16 +227,16 @@ describe('Plan Command - Amend Functionality', () => {
     });
 
     it('should not mark project as complete with failed tasks', () => {
-      const projectDir = path.join(tempDir, '001-test-project');
+      const projectDir = path.join(tempDir, 'aaaaab-test-project');
       fs.mkdirSync(projectDir);
       fs.mkdirSync(path.join(projectDir, 'plans'));
       fs.mkdirSync(path.join(projectDir, 'outcomes'));
       fs.writeFileSync(
-        path.join(projectDir, 'plans', '001-task-one.md'),
+        path.join(projectDir, 'plans', '01-task-one.md'),
         '# Task: Task One\n'
       );
       fs.writeFileSync(
-        path.join(projectDir, 'outcomes', '001-task-one.md'),
+        path.join(projectDir, 'outcomes', '01-task-one.md'),
         'Task failed.\n\n<promise>FAILED</promise>'
       );
 
@@ -247,12 +247,12 @@ describe('Plan Command - Amend Functionality', () => {
 
   describe('Task Name Extraction', () => {
     it('should extract task name from plan file', () => {
-      const name = extractTaskNameFromPlanFile('001-fix-login-bug.md');
+      const name = extractTaskNameFromPlanFile('01-fix-login-bug.md');
       expect(name).toBe('fix-login-bug');
     });
 
     it('should extract task name from plan file with multiple hyphens', () => {
-      const name = extractTaskNameFromPlanFile('002-add-user-registration-flow.md');
+      const name = extractTaskNameFromPlanFile('02-add-user-registration-flow.md');
       expect(name).toBe('add-user-registration-flow');
     });
 
@@ -269,19 +269,19 @@ describe('Plan Command - Amend Functionality', () => {
 
   describe('Next Task Number Calculation', () => {
     it('should calculate next task number correctly', () => {
-      const projectDir = path.join(tempDir, '001-test-project');
+      const projectDir = path.join(tempDir, 'aaaaab-test-project');
       fs.mkdirSync(projectDir);
       fs.mkdirSync(path.join(projectDir, 'plans'));
       fs.writeFileSync(
-        path.join(projectDir, 'plans', '001-task-one.md'),
+        path.join(projectDir, 'plans', '01-task-one.md'),
         '# Task: Task One\n'
       );
       fs.writeFileSync(
-        path.join(projectDir, 'plans', '002-task-two.md'),
+        path.join(projectDir, 'plans', '02-task-two.md'),
         '# Task: Task Two\n'
       );
       fs.writeFileSync(
-        path.join(projectDir, 'plans', '003-task-three.md'),
+        path.join(projectDir, 'plans', '03-task-three.md'),
         '# Task: Task Three\n'
       );
 
@@ -294,11 +294,11 @@ describe('Plan Command - Amend Functionality', () => {
     });
 
     it('should handle single task project', () => {
-      const projectDir = path.join(tempDir, '001-test-project');
+      const projectDir = path.join(tempDir, 'aaaaab-test-project');
       fs.mkdirSync(projectDir);
       fs.mkdirSync(path.join(projectDir, 'plans'));
       fs.writeFileSync(
-        path.join(projectDir, 'plans', '001-task-one.md'),
+        path.join(projectDir, 'plans', '01-task-one.md'),
         '# Task: Task One\n'
       );
 
@@ -316,8 +316,8 @@ describe('Plan Command - Amend Functionality', () => {
       const params: AmendPromptParams = {
         projectPath: '/test/project',
         existingTasks: [
-          { id: '001', planFile: 'plans/001-first.md', status: 'completed', taskName: 'first' },
-          { id: '002', planFile: 'plans/002-second.md', status: 'pending', taskName: 'second' },
+          { id: '01', planFile: 'plans/01-first.md', status: 'completed', taskName: 'first' },
+          { id: '02', planFile: 'plans/02-second.md', status: 'pending', taskName: 'second' },
         ],
         nextTaskNumber: 3,
         newTaskDescription: 'Add new feature X',
@@ -335,8 +335,8 @@ describe('Plan Command - Amend Functionality', () => {
       const params: AmendPromptParams = {
         projectPath: '/test/project',
         existingTasks: [
-          { id: '001', planFile: 'plans/001-first.md', status: 'completed', taskName: 'first' },
-          { id: '002', planFile: 'plans/002-second.md', status: 'pending', taskName: 'second' },
+          { id: '01', planFile: 'plans/01-first.md', status: 'completed', taskName: 'first' },
+          { id: '02', planFile: 'plans/02-second.md', status: 'pending', taskName: 'second' },
         ],
         nextTaskNumber: 3,
         newTaskDescription: 'Add new feature X',
@@ -345,9 +345,9 @@ describe('Plan Command - Amend Functionality', () => {
       const { systemPrompt } = getAmendPrompt(params);
 
       expect(systemPrompt).toContain('AMENDMENT MODE');
-      expect(systemPrompt).toContain('Task 001: first [COMPLETED] [PROTECTED]');
-      expect(systemPrompt).toContain('Task 002: second [PENDING] [MODIFIABLE]');
-      expect(systemPrompt).toContain('starting from number 003');
+      expect(systemPrompt).toContain('Task 01: first [COMPLETED] [PROTECTED]');
+      expect(systemPrompt).toContain('Task 02: second [PENDING] [MODIFIABLE]');
+      expect(systemPrompt).toContain('starting from number 03');
       expect(systemPrompt).toContain('/test/project');
     });
 
@@ -369,7 +369,7 @@ describe('Plan Command - Amend Functionality', () => {
       const params: AmendPromptParams = {
         projectPath: '/test/project',
         existingTasks: [
-          { id: '001', planFile: 'plans/001-first.md', status: 'completed', taskName: 'first' },
+          { id: '01', planFile: 'plans/01-first.md', status: 'completed', taskName: 'first' },
         ],
         nextTaskNumber: 2,
         newTaskDescription: 'New tasks',
@@ -388,7 +388,7 @@ describe('Plan Command - Amend Functionality', () => {
       const params: AmendPromptParams = {
         projectPath: '/test/project',
         existingTasks: [
-          { id: '001', planFile: 'plans/001-first.md', status: 'failed', taskName: 'first' },
+          { id: '01', planFile: 'plans/01-first.md', status: 'failed', taskName: 'first' },
         ],
         nextTaskNumber: 2,
         newTaskDescription: 'New tasks',
@@ -396,16 +396,16 @@ describe('Plan Command - Amend Functionality', () => {
 
       const { systemPrompt } = getAmendPrompt(params);
 
-      expect(systemPrompt).toContain('Task 001: first [FAILED] [MODIFIABLE]');
+      expect(systemPrompt).toContain('Task 01: first [FAILED] [MODIFIABLE]');
     });
 
     it('should list protected tasks separately', () => {
       const params: AmendPromptParams = {
         projectPath: '/test/project',
         existingTasks: [
-          { id: '001', planFile: 'plans/001-first.md', status: 'completed', taskName: 'first' },
-          { id: '002', planFile: 'plans/002-second.md', status: 'completed', taskName: 'second' },
-          { id: '003', planFile: 'plans/003-third.md', status: 'pending', taskName: 'third' },
+          { id: '01', planFile: 'plans/01-first.md', status: 'completed', taskName: 'first' },
+          { id: '02', planFile: 'plans/02-second.md', status: 'completed', taskName: 'second' },
+          { id: '03', planFile: 'plans/03-third.md', status: 'pending', taskName: 'third' },
         ],
         nextTaskNumber: 4,
         newTaskDescription: 'New tasks',
@@ -414,17 +414,17 @@ describe('Plan Command - Amend Functionality', () => {
       const { systemPrompt } = getAmendPrompt(params);
 
       expect(systemPrompt).toContain('### Protected Tasks (COMPLETED - cannot be modified)');
-      expect(systemPrompt).toContain('- Task 001: first');
-      expect(systemPrompt).toContain('- Task 002: second');
+      expect(systemPrompt).toContain('- Task 01: first');
+      expect(systemPrompt).toContain('- Task 02: second');
     });
 
     it('should list modifiable tasks separately', () => {
       const params: AmendPromptParams = {
         projectPath: '/test/project',
         existingTasks: [
-          { id: '001', planFile: 'plans/001-first.md', status: 'completed', taskName: 'first' },
-          { id: '002', planFile: 'plans/002-second.md', status: 'pending', taskName: 'second' },
-          { id: '003', planFile: 'plans/003-third.md', status: 'failed', taskName: 'third' },
+          { id: '01', planFile: 'plans/01-first.md', status: 'completed', taskName: 'first' },
+          { id: '02', planFile: 'plans/02-second.md', status: 'pending', taskName: 'second' },
+          { id: '03', planFile: 'plans/03-third.md', status: 'failed', taskName: 'third' },
         ],
         nextTaskNumber: 4,
         newTaskDescription: 'New tasks',
@@ -433,15 +433,15 @@ describe('Plan Command - Amend Functionality', () => {
       const { systemPrompt } = getAmendPrompt(params);
 
       expect(systemPrompt).toContain('### Modifiable Tasks (PENDING/FAILED - can be modified if requested)');
-      expect(systemPrompt).toContain('- Task 002: second');
-      expect(systemPrompt).toContain('- Task 003: third');
+      expect(systemPrompt).toContain('- Task 02: second');
+      expect(systemPrompt).toContain('- Task 03: third');
     });
 
     it('should show (none) when there are no protected tasks', () => {
       const params: AmendPromptParams = {
         projectPath: '/test/project',
         existingTasks: [
-          { id: '001', planFile: 'plans/001-first.md', status: 'pending', taskName: 'first' },
+          { id: '01', planFile: 'plans/01-first.md', status: 'pending', taskName: 'first' },
         ],
         nextTaskNumber: 2,
         newTaskDescription: 'New tasks',
@@ -456,7 +456,7 @@ describe('Plan Command - Amend Functionality', () => {
       const params: AmendPromptParams = {
         projectPath: '/test/project',
         existingTasks: [
-          { id: '001', planFile: 'plans/001-first.md', status: 'completed', taskName: 'first' },
+          { id: '01', planFile: 'plans/01-first.md', status: 'completed', taskName: 'first' },
         ],
         nextTaskNumber: 2,
         newTaskDescription: 'New tasks',
@@ -471,10 +471,10 @@ describe('Plan Command - Amend Functionality', () => {
       const params: AmendPromptParams = {
         projectPath: '/test/project',
         existingTasks: [
-          { id: '001', planFile: 'plans/001-first.md', status: 'completed', taskName: 'setup' },
-          { id: '002', planFile: 'plans/002-second.md', status: 'completed', taskName: 'database' },
-          { id: '003', planFile: 'plans/003-third.md', status: 'failed', taskName: 'api' },
-          { id: '004', planFile: 'plans/004-fourth.md', status: 'pending', taskName: 'tests' },
+          { id: '01', planFile: 'plans/01-first.md', status: 'completed', taskName: 'setup' },
+          { id: '02', planFile: 'plans/02-second.md', status: 'completed', taskName: 'database' },
+          { id: '03', planFile: 'plans/03-third.md', status: 'failed', taskName: 'api' },
+          { id: '04', planFile: 'plans/04-fourth.md', status: 'pending', taskName: 'tests' },
         ],
         nextTaskNumber: 5,
         newTaskDescription: 'New tasks',
@@ -483,10 +483,10 @@ describe('Plan Command - Amend Functionality', () => {
       const { systemPrompt } = getAmendPrompt(params);
 
       // Check summary list
-      expect(systemPrompt).toContain('Task 001: setup [COMPLETED] [PROTECTED]');
-      expect(systemPrompt).toContain('Task 002: database [COMPLETED] [PROTECTED]');
-      expect(systemPrompt).toContain('Task 003: api [FAILED] [MODIFIABLE]');
-      expect(systemPrompt).toContain('Task 004: tests [PENDING] [MODIFIABLE]');
+      expect(systemPrompt).toContain('Task 01: setup [COMPLETED] [PROTECTED]');
+      expect(systemPrompt).toContain('Task 02: database [COMPLETED] [PROTECTED]');
+      expect(systemPrompt).toContain('Task 03: api [FAILED] [MODIFIABLE]');
+      expect(systemPrompt).toContain('Task 04: tests [PENDING] [MODIFIABLE]');
 
       // Check separate lists
       expect(systemPrompt).toContain('### Protected Tasks (COMPLETED - cannot be modified)');
@@ -497,7 +497,7 @@ describe('Plan Command - Amend Functionality', () => {
       const params: AmendPromptParams = {
         projectPath: '/my/project/path',
         existingTasks: [
-          { id: '001', planFile: 'plans/001-task.md', status: 'pending', taskName: 'task' },
+          { id: '01', planFile: 'plans/01-task.md', status: 'pending', taskName: 'task' },
         ],
         nextTaskNumber: 2,
         newTaskDescription: 'New tasks',
@@ -505,8 +505,8 @@ describe('Plan Command - Amend Functionality', () => {
 
       const { systemPrompt } = getAmendPrompt(params);
 
-      expect(systemPrompt).toContain('/my/project/path/plans/002-task-name.md');
-      expect(systemPrompt).toContain('/my/project/path/plans/003-task-name.md');
+      expect(systemPrompt).toContain('/my/project/path/plans/02-task-name.md');
+      expect(systemPrompt).toContain('/my/project/path/plans/03-task-name.md');
     });
 
     it('should include new task description in user message', () => {
@@ -550,29 +550,80 @@ describe('Plan Command - Amend Functionality', () => {
       expect(userMessage).toContain('Add a caching layer for API responses');
       expect(userMessage).toContain('planning interview');
     });
+
+    it('should include outcome file paths for completed tasks in task summary', () => {
+      const params: AmendPromptParams = {
+        projectPath: '/test/project',
+        existingTasks: [
+          { id: '01', planFile: 'plans/01-setup.md', status: 'completed', taskName: 'setup' },
+          { id: '02', planFile: 'plans/02-database.md', status: 'completed', taskName: 'database' },
+        ],
+        nextTaskNumber: 3,
+        newTaskDescription: 'Fix setup issues',
+      };
+
+      const { systemPrompt } = getAmendPrompt(params);
+
+      expect(systemPrompt).toContain('Outcome: /test/project/outcomes/01-setup.md');
+      expect(systemPrompt).toContain('Outcome: /test/project/outcomes/02-database.md');
+    });
+
+    it('should not include outcome file paths for non-completed tasks', () => {
+      const params: AmendPromptParams = {
+        projectPath: '/test/project',
+        existingTasks: [
+          { id: '01', planFile: 'plans/01-pending-task.md', status: 'pending', taskName: 'pending-task' },
+          { id: '02', planFile: 'plans/02-failed-task.md', status: 'failed', taskName: 'failed-task' },
+        ],
+        nextTaskNumber: 3,
+        newTaskDescription: 'New tasks',
+      };
+
+      const { systemPrompt } = getAmendPrompt(params);
+
+      expect(systemPrompt).not.toContain('Outcome: /test/project/outcomes/01-pending-task.md');
+      expect(systemPrompt).not.toContain('Outcome: /test/project/outcomes/02-failed-task.md');
+    });
+
+    it('should include follow-up task instructions in system prompt', () => {
+      const params: AmendPromptParams = {
+        projectPath: '/test/project',
+        existingTasks: [
+          { id: '01', planFile: 'plans/01-first.md', status: 'completed', taskName: 'first' },
+        ],
+        nextTaskNumber: 2,
+        newTaskDescription: 'Fix issues from first task',
+      };
+
+      const { systemPrompt } = getAmendPrompt(params);
+
+      expect(systemPrompt).toContain('Identifying Follow-up Tasks');
+      expect(systemPrompt).toContain('follow-up to task NN');
+      expect(systemPrompt).toContain('outcome file paths for completed tasks are listed above');
+    });
   });
 
   describe('Existing Project Detection Without Amend Flag', () => {
     it('should find existing project by name', () => {
-      fs.mkdirSync(path.join(tempDir, '001-existing-project'));
+      fs.mkdirSync(path.join(tempDir, 'aaaaab-existing-project'));
       const result = resolveProjectIdentifier(tempDir, 'existing-project');
       expect(result).not.toBeNull();
     });
 
-    it('should find existing project by number', () => {
-      fs.mkdirSync(path.join(tempDir, '001-existing-project'));
-      const result = resolveProjectIdentifier(tempDir, '1');
+    it('should find existing project by 6-char base26 ID', () => {
+      fs.mkdirSync(path.join(tempDir, 'aaaaab-existing-project'));
+      const result = resolveProjectIdentifier(tempDir, 'aaaaab');
       expect(result).not.toBeNull();
     });
 
     it('should find existing project by full folder name', () => {
-      fs.mkdirSync(path.join(tempDir, '001-existing-project'));
-      const result = resolveProjectIdentifier(tempDir, '001-existing-project');
+      fs.mkdirSync(path.join(tempDir, 'aaaaab-existing-project'));
+      const result = resolveProjectIdentifier(tempDir, 'aaaaab-existing-project');
       expect(result).not.toBeNull();
     });
 
     it('should return null for non-existing project', () => {
-      fs.mkdirSync(path.join(tempDir, '001-existing-project'));
+      fs.mkdirSync(path.join(tempDir, 'aaaaab-existing-project'));
       const result = resolveProjectIdentifier(tempDir, 'new-project');
       expect(result).toBeNull();
     });

package/tests/unit/planning-prompt.test.ts

@@ -76,8 +76,8 @@ describe('Planning Prompt', () => {
 
       const { systemPrompt } = getPlanningPrompt(params);
 
-      expect(systemPrompt).toContain('/test/project/plans/001-task-name.md');
-      expect(systemPrompt).toContain('/test/project/plans/002-task-name.md');
+      expect(systemPrompt).toContain('/test/project/plans/01-task-name.md');
+      expect(systemPrompt).toContain('/test/project/plans/02-task-name.md');
     });
 
     it('should include task guidelines in system prompt', () => {
@@ -88,7 +88,7 @@ describe('Planning Prompt', () => {
 
       const { systemPrompt } = getPlanningPrompt(params);
 
-      expect(systemPrompt).toContain('3-8 distinct');
+      expect(systemPrompt).toContain('identify distinct');
       expect(systemPrompt).toContain('independently completable');
       expect(systemPrompt).toContain('10-30 minutes');
     });
@@ -117,10 +117,47 @@ describe('Planning Prompt', () => {
       const { systemPrompt } = getPlanningPrompt(params);
 
       expect(systemPrompt).toContain('ALWAYS interview the user before creating plans');
-      expect(systemPrompt).toContain('numbered order (001, 002, 003');
+      expect(systemPrompt).toContain('numbered order (01, 02, 03');
       expect(systemPrompt).toContain('kebab-case names');
     });
 
+    it('should show raf do without --worktree when worktreeMode is false', () => {
+      const params: PlanningPromptParams = {
+        projectPath: '/test/project',
+        inputContent: 'Some project',
+        worktreeMode: false,
+      };
+
+      const { systemPrompt } = getPlanningPrompt(params);
+
+      expect(systemPrompt).toContain('raf do <project>');
+      expect(systemPrompt).not.toContain('--worktree');
+    });
+
+    it('should show raf do without --worktree when worktreeMode is undefined', () => {
+      const params: PlanningPromptParams = {
+        projectPath: '/test/project',
+        inputContent: 'Some project',
+      };
+
+      const { systemPrompt } = getPlanningPrompt(params);
+
+      expect(systemPrompt).toContain('raf do <project>');
+      expect(systemPrompt).not.toContain('--worktree');
+    });
+
+    it('should show raf do with --worktree when worktreeMode is true', () => {
+      const params: PlanningPromptParams = {
+        projectPath: '/test/project',
+        inputContent: 'Some project',
+        worktreeMode: true,
+      };
+
+      const { systemPrompt } = getPlanningPrompt(params);
+
+      expect(systemPrompt).toContain('raf do <project> --worktree');
+    });
+
     it('should include project description in user message', () => {
       const params: PlanningPromptParams = {
         projectPath: '/test/project',