rafcode 1.2.0 → 2.0.0

package/src/utils/paths.ts

@@ -3,94 +3,94 @@ import * as path from 'node:path';
 
 export const RAF_DIR = 'RAF';
 
-// Base36 constants
-const BASE36_CHARS = '0123456789abcdefghijklmnopqrstuvwxyz';
-const BASE36_START = 1000; // First base36 project number
-const MAX_NUMERIC = 999; // Last numeric project number
+/** RAF epoch: 2026-01-01T00:00:00Z */
+export const RAF_EPOCH = 1767225600;
 
-/**
- * Encode a project number >= 1000 to a 3-character base36 string.
- * The encoding offsets by 1000, so:
- * - 1000 -> 'a00'
- * - 1001 -> 'a01'
- * - 1035 -> 'a0z'
- * - 1036 -> 'a10'
- * - etc.
- *
- * First character uses a-z (10-35 in base36, letters only).
- * Second and third characters use 0-9a-z (0-35 in base36).
- */
-export function encodeBase36(num: number): string {
-  if (num < BASE36_START) {
-    throw new Error(`encodeBase36 only accepts numbers >= ${BASE36_START}, got ${num}`);
-  }
+/** ID width: 6 characters, 'a'-padded base26 */
+const ID_WIDTH = 6;
 
-  // Offset to get the base36 representation starting at 'a00' for 1000
-  const offset = num - BASE36_START;
+/** Base26 alphabet: a=0, b=1, ..., z=25 */
+const BASE26_ALPHABET = 'abcdefghijklmnopqrstuvwxyz';
 
-  // First character: 'a' + (offset / 36^2), uses only letters a-z
-  // This gives us 26 possible first characters (a-z)
-  const firstCharIndex = Math.floor(offset / (36 * 36));
-  if (firstCharIndex >= 26) {
-    throw new Error(`Project number ${num} exceeds maximum base36 capacity (max: ${BASE36_START + 26 * 36 * 36 - 1})`);
-  }
-  const firstChar = BASE36_CHARS[10 + firstCharIndex]; // Start from 'a' (index 10)
-
-  // Second and third characters: remaining value in base36
-  const remainder = offset % (36 * 36);
-  const secondCharIndex = Math.floor(remainder / 36);
-  const thirdCharIndex = remainder % 36;
+/** Task ID width: 2 characters, zero-padded base36 */
+const TASK_ID_WIDTH = 2;
 
-  const secondChar = BASE36_CHARS[secondCharIndex];
-  const thirdChar = BASE36_CHARS[thirdCharIndex];
+/** Regex pattern for matching base36 task IDs (2-char: 00-zz) */
+export const TASK_ID_PATTERN = '[0-9a-z]{2}';
 
-  return `${firstChar}${secondChar}${thirdChar}`;
+/**
+ * Encode a task number (0-based or 1-based) to a 2-character zero-padded base36 string.
+ * E.g., 1 -> "01", 10 -> "0a", 36 -> "10", 1295 -> "zz"
+ */
+export function encodeTaskId(num: number): string {
+  if (num < 0) {
+    throw new Error(`encodeTaskId only accepts non-negative integers, got ${num}`);
+  }
+  if (num > 36 * 36 - 1) {
+    throw new Error(`encodeTaskId: value ${num} exceeds max 2-char base36 (1295)`);
+  }
+  return num.toString(36).padStart(TASK_ID_WIDTH, '0');
 }
 
 /**
- * Decode a 3-character base36 string to a project number.
- * Returns the decoded number >= 1000, or null if invalid format.
+ * Decode a 2-character base36 task ID string back to a number.
+ * E.g., "01" -> 1, "0a" -> 10, "10" -> 36
+ * Returns null if invalid format.
  */
-export function decodeBase36(str: string): number | null {
-  if (str.length !== 3) {
+export function decodeTaskId(str: string): number | null {
+  if (str.length !== TASK_ID_WIDTH) {
     return null;
   }
-
-  const lower = str.toLowerCase();
-  const firstChar = lower.charAt(0);
-  const secondChar = lower.charAt(1);
-  const thirdChar = lower.charAt(2);
-
-  // First character must be a letter (a-z)
-  const firstIndex = BASE36_CHARS.indexOf(firstChar);
-  if (firstIndex < 10 || firstIndex > 35) {
-    return null; // Not a letter
+  if (!/^[0-9a-z]{2}$/.test(str.toLowerCase())) {
+    return null;
   }
+  return parseInt(str.toLowerCase(), 36);
+}
 
-  // Second and third characters can be 0-9 or a-z
-  const secondIndex = BASE36_CHARS.indexOf(secondChar);
-  const thirdIndex = BASE36_CHARS.indexOf(thirdChar);
+/**
+ * Encode a non-negative integer to a 6-character 'a'-padded base26 string (a-z alphabet).
+ * E.g., 0 → "aaaaaa", 1 → "aaaaab", 25 → "aaaaaz", 26 → "aaaaba"
+ */
+export function encodeBase26(num: number): string {
+  if (num < 0) {
+    throw new Error(`encodeBase26 only accepts non-negative integers, got ${num}`);
+  }
+  let result = '';
+  let remaining = num;
+  for (let i = 0; i < ID_WIDTH; i++) {
+    result = BASE26_ALPHABET[remaining % 26]! + result;
+    remaining = Math.floor(remaining / 26);
+  }
+  return result;
+}
 
-  if (secondIndex === -1 || thirdIndex === -1) {
+/**
+ * Decode a 6-character base26 string (a-z alphabet) back to a non-negative integer.
+ * Returns the decoded number, or null if invalid format.
+ */
+export function decodeBase26(str: string): number | null {
+  if (str.length !== ID_WIDTH) {
     return null;
   }
-
-  // Calculate the offset from 1000
-  const letterOffset = firstIndex - 10; // 'a' = 0, 'b' = 1, etc.
-  const offset = letterOffset * 36 * 36 + secondIndex * 36 + thirdIndex;
-
-  return BASE36_START + offset;
+  if (!/^[a-z]{6}$/.test(str.toLowerCase())) {
+    return null;
+  }
+  const lower = str.toLowerCase();
+  let result = 0;
+  for (let i = 0; i < ID_WIDTH; i++) {
+    result = result * 26 + (lower.charCodeAt(i) - 97); // 'a' = 97
+  }
+  return result;
 }
 
 /**
- * Check if a string is a valid base36 project prefix.
- * Valid format: starts with a-z, followed by two base36 chars (0-9, a-z).
+ * Check if a string is a valid 6-character base26 project prefix (a-z only).
  */
-export function isBase36Prefix(str: string): boolean {
-  if (str.length !== 3) {
+export function isBase26Prefix(str: string): boolean {
+  if (str.length !== ID_WIDTH) {
     return false;
   }
-  return /^[a-z][0-9a-z]{2}$/.test(str.toLowerCase());
+  return /^[a-z]{6}$/.test(str.toLowerCase());
 }
 
 export function getRafDir(): string {
@@ -106,45 +106,39 @@ export function ensureRafDir(): string {
 }
 
 export function getNextProjectNumber(rafDir: string): number {
+  const id = Math.floor(Date.now() / 1000) - RAF_EPOCH;
+
   if (!fs.existsSync(rafDir)) {
-    return 1;
+    return id;
   }
 
+  // Collect existing IDs for collision detection
+  const existingIds = new Set<number>();
   const entries = fs.readdirSync(rafDir, { withFileTypes: true });
-  const numbers: number[] = [];
 
   for (const entry of entries) {
     if (entry.isDirectory()) {
-      // Try numeric format first (2-3 digits)
-      const numericMatch = entry.name.match(/^(\d{2,3})-/);
-      if (numericMatch && numericMatch[1]) {
-        numbers.push(parseInt(numericMatch[1], 10));
-        continue;
-      }
-
-      // Try base36 format
-      const base36Match = entry.name.match(/^([a-z][0-9a-z]{2})-/i);
-      if (base36Match && base36Match[1]) {
-        const decoded = decodeBase36(base36Match[1].toLowerCase());
+      const match = entry.name.match(/^([a-z]{6})-/i);
+      if (match && match[1]) {
+        const decoded = decodeBase26(match[1].toLowerCase());
         if (decoded !== null) {
-          numbers.push(decoded);
+          existingIds.add(decoded);
         }
       }
     }
   }
 
-  if (numbers.length === 0) {
-    return 1;
+  // Increment until we find a free slot
+  let candidate = id;
+  while (existingIds.has(candidate)) {
+    candidate++;
   }
 
-  return Math.max(...numbers) + 1;
+  return candidate;
 }
 
 export function formatProjectNumber(num: number): string {
-  if (num <= MAX_NUMERIC) {
-    return num.toString().padStart(3, '0');
-  }
-  return encodeBase36(num);
+  return encodeBase26(num);
 }
 
 export function getProjectDir(rafDir: string, projectName: string): string | null {
@@ -156,15 +150,8 @@ export function getProjectDir(rafDir: string, projectName: string): string | nul
 
   for (const entry of entries) {
     if (entry.isDirectory()) {
-      // Try numeric format first
-      const numericMatch = entry.name.match(/^\d{2,3}-(.+)$/);
-      if (numericMatch && numericMatch[1] === projectName) {
-        return path.join(rafDir, entry.name);
-      }
-
-      // Try base36 format
-      const base36Match = entry.name.match(/^[a-z][0-9a-z]{2}-(.+)$/i);
-      if (base36Match && base36Match[1] === projectName) {
+      const match = entry.name.match(/^[a-z]{6}-(.+)$/i);
+      if (match && match[1] === projectName) {
         return path.join(rafDir, entry.name);
       }
     }
@@ -175,81 +162,52 @@ export function getProjectDir(rafDir: string, projectName: string): string | nul
 
 /**
  * Extract project number prefix from a project path.
- * Supports both numeric (001-999) and base36 (a00-zzz) formats.
- * E.g., "/Users/foo/RAF/001-my-project" -> "001"
- * E.g., "/Users/foo/RAF/a00-my-project" -> "a00"
- * Returns the prefix string (e.g., "001" or "a00") or null if not found.
+ * E.g., "/Users/foo/RAF/abcdef-my-project" -> "abcdef"
+ * Returns the 6-char base26 prefix string or null if not found.
  */
 export function extractProjectNumber(projectPath: string): string | null {
   const folderName = path.basename(projectPath);
-
-  // Try numeric format first (2-3 digits)
-  const numericMatch = folderName.match(/^(\d{2,3})-/);
-  if (numericMatch && numericMatch[1]) {
-    return numericMatch[1];
-  }
-
-  // Try base36 format (letter followed by two alphanumeric chars)
-  const base36Match = folderName.match(/^([a-z][0-9a-z]{2})-/i);
-  if (base36Match && base36Match[1]) {
-    return base36Match[1].toLowerCase();
+  const match = folderName.match(/^([a-z]{6})-/i);
+  if (match && match[1]) {
+    return match[1].toLowerCase();
   }
-
   return null;
 }
 
 /**
  * Parse a project prefix string to its numeric value.
- * Handles both numeric (001-999) and base36 (a00-zzz) formats.
+ * Accepts a 6-character base26 string (a-z only).
  * Returns the numeric project number or null if invalid.
  */
 export function parseProjectPrefix(prefix: string): number | null {
-  // Try numeric first
-  if (/^\d{2,3}$/.test(prefix)) {
-    return parseInt(prefix, 10);
+  if (isBase26Prefix(prefix)) {
+    return decodeBase26(prefix);
   }
-
-  // Try base36
-  if (isBase36Prefix(prefix)) {
-    return decodeBase36(prefix);
-  }
-
   return null;
 }
 
 /**
  * Extract project name from a project path (without number prefix).
- * Supports both numeric (001-999) and base36 (a00-zzz) formats.
- * E.g., "/Users/foo/RAF/001-my-project" -> "my-project"
- * E.g., "/Users/foo/RAF/a00-my-project" -> "my-project"
+ * E.g., "/Users/foo/RAF/abcdef-my-project" -> "my-project"
  * Returns the project name or null if not found.
  */
 export function extractProjectName(projectPath: string): string | null {
   const folderName = path.basename(projectPath);
-
-  // Try numeric format first
-  const numericMatch = folderName.match(/^\d{2,3}-(.+)$/);
-  if (numericMatch && numericMatch[1]) {
-    return numericMatch[1];
-  }
-
-  // Try base36 format
-  const base36Match = folderName.match(/^[a-z][0-9a-z]{2}-(.+)$/i);
-  if (base36Match && base36Match[1]) {
-    return base36Match[1];
+  const match = folderName.match(/^[a-z]{6}-(.+)$/i);
+  if (match && match[1]) {
+    return match[1];
   }
-
   return null;
 }
 
 /**
  * Extract task name from a plan filename (without number prefix and extension).
- * E.g., "002-fix-login-bug.md" -> "fix-login-bug"
+ * E.g., "02-fix-login-bug.md" -> "fix-login-bug"
  * Returns the task name or null if not found.
  */
 export function extractTaskNameFromPlanFile(planFilename: string): string | null {
   const basename = path.basename(planFilename, '.md');
-  const match = basename.match(/^\d{2,3}-(.+)$/);
+  const match = basename.match(/^[0-9a-z]{2}-(.+)$/);
   return match && match[1] ? match[1] : null;
 }
 
@@ -263,25 +221,13 @@ export function listProjects(rafDir: string): Array<{ number: number; name: stri
 
   for (const entry of entries) {
     if (entry.isDirectory()) {
-      // Try numeric format first
-      const numericMatch = entry.name.match(/^(\d{2,3})-(.+)$/);
-      if (numericMatch && numericMatch[1] && numericMatch[2]) {
-        projects.push({
-          number: parseInt(numericMatch[1], 10),
-          name: numericMatch[2],
-          path: path.join(rafDir, entry.name),
-        });
-        continue;
-      }
-
-      // Try base36 format
-      const base36Match = entry.name.match(/^([a-z][0-9a-z]{2})-(.+)$/i);
-      if (base36Match && base36Match[1] && base36Match[2]) {
-        const decoded = decodeBase36(base36Match[1].toLowerCase());
+      const match = entry.name.match(/^([a-z]{6})-(.+)$/i);
+      if (match && match[1] && match[2]) {
+        const decoded = decodeBase26(match[1].toLowerCase());
         if (decoded !== null) {
           projects.push({
             number: decoded,
-            name: base36Match[2],
+            name: match[2],
             path: path.join(rafDir, entry.name),
           });
         }
@@ -336,25 +282,13 @@ function parseProjectFolder(
   rafDir: string,
   folderName: string
 ): { number: number; name: string; path: string; folder: string } | null {
-  // Try numeric format first
-  const numericMatch = folderName.match(/^(\d{2,3})-(.+)$/);
-  if (numericMatch && numericMatch[1] && numericMatch[2]) {
-    return {
-      number: parseInt(numericMatch[1], 10),
-      name: numericMatch[2],
-      path: path.join(rafDir, folderName),
-      folder: folderName,
-    };
-  }
-
-  // Try base36 format
-  const base36Match = folderName.match(/^([a-z][0-9a-z]{2})-(.+)$/i);
-  if (base36Match && base36Match[1] && base36Match[2]) {
-    const decoded = decodeBase36(base36Match[1].toLowerCase());
+  const match = folderName.match(/^([a-z]{6})-(.+)$/i);
+  if (match && match[1] && match[2]) {
+    const decoded = decodeBase26(match[1].toLowerCase());
     if (decoded !== null) {
       return {
         number: decoded,
-        name: base36Match[2],
+        name: match[2],
         path: path.join(rafDir, folderName),
         folder: folderName,
       };
@@ -368,14 +302,12 @@ function parseProjectFolder(
  * Resolve a project identifier with detailed result including ambiguity detection.
  *
  * Supported identifier formats (checked in this order):
- * 1. Full folder name (e.g., "001-fix-stuff", "a01-important-project")
+ * 1. Full folder name (e.g., "abcdef-fix-stuff")
  *    - Must be an exact match to an existing folder
- *    - Pattern: numeric prefix (2-3 digits) or base36 prefix, followed by hyphen and name
- * 2. Numeric ID (e.g., "003", "3", "1000")
- *    - Looks up by project number
- * 3. Base36 prefix (e.g., "a00", "a01")
- *    - Looks up by base36 project number (for projects >= 1000)
- * 4. Project name (e.g., "my-project", "fix-stuff")
+ *    - Pattern: 6-char base26 prefix, followed by hyphen and name
+ * 2. Base26 prefix (e.g., "abcdef")
+ *    - Looks up by decoded project number
+ * 3. Project name (e.g., "my-project", "fix-stuff")
  *    - Looks up by the name portion of the folder (after the prefix)
  *    - Case-insensitive matching
  *    - Returns error if multiple projects have the same name
@@ -392,14 +324,12 @@ export function resolveProjectIdentifierWithDetails(
     return { path: null, error: 'not_found' };
   }
 
-  // Pattern to match full folder names: NNN-name or XXX-name (base36)
-  // Supports 2-3 digit numeric prefixes or 3-char base36 prefixes
-  const fullFolderPattern = /^(\d{2,3}|[a-z][0-9a-z]{2})-(.+)$/i;
+  // Pattern to match full folder names: XXXXXX-name (6-char base26 prefix)
+  const fullFolderPattern = /^[a-z]{6}-(.+)$/i;
   const fullFolderMatch = identifier.match(fullFolderPattern);
 
   // Check if identifier is a full folder name (exact match required)
   if (fullFolderMatch) {
-    // Check for exact case-insensitive match by listing directory
     const entries = fs.readdirSync(rafDir, { withFileTypes: true });
     for (const entry of entries) {
       if (entry.isDirectory() && entry.name.toLowerCase() === identifier.toLowerCase()) {
@@ -407,22 +337,15 @@ export function resolveProjectIdentifierWithDetails(
       }
     }
     // Full folder name format but doesn't exist as a folder.
-    // Fall through to name-based matching - the entire identifier might be a project name
-    // (e.g., "fix-double-summary-headers" looks like "fix-xxx" but is actually a name).
+    // Fall through to name-based matching.
   }
 
-  // Check if it's a numeric identifier (e.g., "003", "3", "1000")
-  const isNumeric = /^\d+$/.test(identifier);
+  // Check if it's a base26 identifier (e.g., "abcdef")
+  const isBase26 = isBase26Prefix(identifier);
 
-  // Check if it's a base36 identifier (e.g., "a00", "a01")
-  const isBase36 = isBase36Prefix(identifier);
-
-  // Convert base36 to numeric for matching
   let targetNumber: number | null = null;
-  if (isNumeric) {
-    targetNumber = parseInt(identifier, 10);
-  } else if (isBase36) {
-    targetNumber = decodeBase36(identifier);
+  if (isBase26) {
+    targetNumber = decodeBase26(identifier);
   }
 
   const entries = fs.readdirSync(rafDir, { withFileTypes: true });
@@ -433,16 +356,13 @@ export function resolveProjectIdentifierWithDetails(
       const project = parseProjectFolder(rafDir, entry.name);
 
       if (project) {
-        if (targetNumber !== null) {
-          // Match by number (either numeric or base36 identifier)
-          if (project.number === targetNumber) {
-            return { path: project.path };
-          }
-        } else {
-          // Match by name (case-insensitive)
-          if (project.name.toLowerCase() === identifier.toLowerCase()) {
-            nameMatches.push(project);
-          }
+        if (targetNumber !== null && project.number === targetNumber) {
+          // Match by number (base26 identifier)
+          return { path: project.path };
+        }
+        // Also collect name matches (for fallback if number match fails)
+        if (project.name.toLowerCase() === identifier.toLowerCase()) {
+          nameMatches.push(project);
         }
       }
     }
@@ -467,23 +387,18 @@ export function resolveProjectIdentifierWithDetails(
  * Resolve a project identifier to a full project path.
  *
  * Supported identifier formats (checked in this order):
- * 1. Full folder name (e.g., "001-fix-stuff", "a01-important-project")
+ * 1. Full folder name (e.g., "abcdef-fix-stuff")
  *    - Must be an exact match to an existing folder
- *    - Pattern: numeric prefix (2-3 digits) or base36 prefix, followed by hyphen and name
- * 2. Numeric ID (e.g., "003", "3", "1000")
- *    - Looks up by project number
- * 3. Base36 prefix (e.g., "a00", "a01")
- *    - Looks up by base36 project number (for projects >= 1000)
- * 4. Project name (e.g., "my-project", "fix-stuff")
+ *    - Pattern: 6-char base26 prefix, followed by hyphen and name
+ * 2. Base26 prefix (e.g., "abcdef")
+ *    - Looks up by decoded project number
+ * 3. Project name (e.g., "my-project", "fix-stuff")
  *    - Looks up by the name portion of the folder (after the prefix)
  *    - Case-insensitive matching
  *
  * Note: For ambiguity detection (multiple projects with same name), use
  * resolveProjectIdentifierWithDetails instead.
  *
- * This function is designed to be extensible for future task-level references
- * like "001-project/002-task".
- *
  * @param rafDir - The RAF directory containing project folders
  * @param identifier - The identifier to resolve
  * @returns The full project path or null if not found (or ambiguous)

package/src/utils/terminal-symbols.ts

@@ -36,8 +36,8 @@ function truncate(str: string, maxLength: number): string {
  * @param status - Task status
  * @param name - Task name
  * @param elapsedMs - Optional elapsed time in milliseconds
- * @param taskId - Optional task ID for [NNN] prefix display
- * @returns Formatted string like "● [001] auth-login 1:23" or "✓ [001] auth-login 1/5"
+ * @param taskId - Optional task ID prefix display
+ * @returns Formatted string like "● 001-auth-login 1:23" or "✓ 001-auth-login 1/5"
  */
 export function formatTaskProgress(
   current: number,
@@ -49,7 +49,7 @@ export function formatTaskProgress(
 ): string {
   const symbol = SYMBOLS[status];
   const displayName = truncate(name || 'task', 40);
-  const idPrefix = taskId ? `[${taskId}] ` : '';
+  const idPrefix = taskId ? `${taskId}-` : '';
 
   // Show elapsed time for running tasks, completed tasks, and failed tasks
   if (elapsedMs !== undefined) {

package/src/utils/validation.ts

@@ -58,15 +58,8 @@ export function validateProjectExists(rafDir: string, projectName: string): stri
 
   for (const entry of entries) {
     if (entry.isDirectory()) {
-      // Match numeric pattern like "001-project-name" (or legacy 01-project-name)
-      const numericMatch = entry.name.match(/^\d{2,3}-(.+)$/);
-      if (numericMatch && numericMatch[1] === projectName) {
-        return path.join(rafDir, entry.name);
-      }
-
-      // Match base36 pattern like "a00-project-name"
-      const base36Match = entry.name.match(/^[a-z][0-9a-z]{2}-(.+)$/i);
-      if (base36Match && base36Match[1] === projectName) {
+      const match = entry.name.match(/^[a-z]{6}-(.+)$/i);
+      if (match && match[1] === projectName) {
         return path.join(rafDir, entry.name);
       }
     }

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

@@ -0,0 +1,85 @@
+import { getAmendPrompt, AmendPromptParams } from '../../src/prompts/amend.js';
+
+describe('Amend Prompt', () => {
+  const baseParams: AmendPromptParams = {
+    projectPath: '/test/project',
+    existingTasks: [
+      {
+        id: '01',
+        status: 'completed',
+        planFile: 'plans/01-setup.md',
+        taskName: 'setup',
+      },
+      {
+        id: '02',
+        status: 'pending',
+        planFile: 'plans/02-feature.md',
+        taskName: 'feature',
+      },
+    ],
+    nextTaskNumber: 3,
+    newTaskDescription: 'Add a new feature',
+  };
+
+  describe('getAmendPrompt', () => {
+    it('should return systemPrompt and userMessage', () => {
+      const result = getAmendPrompt(baseParams);
+
+      expect(result).toHaveProperty('systemPrompt');
+      expect(result).toHaveProperty('userMessage');
+      expect(typeof result.systemPrompt).toBe('string');
+      expect(typeof result.userMessage).toBe('string');
+    });
+
+    it('should include project path in system prompt', () => {
+      const { systemPrompt } = getAmendPrompt(baseParams);
+
+      expect(systemPrompt).toContain('/test/project');
+    });
+
+    it('should include existing tasks in system prompt', () => {
+      const { systemPrompt } = getAmendPrompt(baseParams);
+
+      expect(systemPrompt).toContain('Task 01');
+      expect(systemPrompt).toContain('Task 02');
+      expect(systemPrompt).toContain('[COMPLETED]');
+      expect(systemPrompt).toContain('[PENDING]');
+    });
+
+    it('should show raf do without --worktree when worktreeMode is false', () => {
+      const params: AmendPromptParams = {
+        ...baseParams,
+        worktreeMode: false,
+      };
+
+      const { systemPrompt } = getAmendPrompt(params);
+
+      expect(systemPrompt).toContain('raf do <project>');
+      expect(systemPrompt).not.toContain('--worktree');
+    });
+
+    it('should show raf do without --worktree when worktreeMode is undefined', () => {
+      const { systemPrompt } = getAmendPrompt(baseParams);
+
+      expect(systemPrompt).toContain('raf do <project>');
+      expect(systemPrompt).not.toContain('--worktree');
+    });
+
+    it('should show raf do with --worktree when worktreeMode is true', () => {
+      const params: AmendPromptParams = {
+        ...baseParams,
+        worktreeMode: true,
+      };
+
+      const { systemPrompt } = getAmendPrompt(params);
+
+      expect(systemPrompt).toContain('raf do <project> --worktree');
+    });
+
+    it('should include new task description in user message', () => {
+      const { userMessage } = getAmendPrompt(baseParams);
+
+      expect(userMessage).toContain('Add a new feature');
+    });
+  });
+});