rafcode 2.5.1-0 → 3.0.0

package/src/utils/paths.ts

@@ -1,96 +1,36 @@
 import * as fs from 'node:fs';
+import * as os from 'node:os';
 import * as path from 'node:path';
 
 export const RAF_DIR = 'RAF';
 
-/** RAF epoch: 2026-01-01T00:00:00Z */
-export const RAF_EPOCH = 1767225600;
+/** Regex pattern matching a numeric project folder: digits followed by hyphen and name */
+const PROJECT_FOLDER_PATTERN = /^(\d+)-(.+)$/;
 
-/** ID width: 6 characters, 'a'-padded base26 */
-const ID_WIDTH = 6;
-
-/** Base26 alphabet: a=0, b=1, ..., z=25 */
-const BASE26_ALPHABET = 'abcdefghijklmnopqrstuvwxyz';
-
-/** Task ID width: 2 characters, zero-padded base36 */
-const TASK_ID_WIDTH = 2;
-
-/** Regex pattern for matching base36 task IDs (2-char: 00-zz) */
-export const TASK_ID_PATTERN = '[0-9a-z]{2}';
+/** Regex pattern for matching numeric task IDs (1, 2, 12, etc.) */
+export const TASK_ID_PATTERN = '\\d+';
 
 /**
- * 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"
+ * Encode a task number to its string representation.
+ * E.g., 1 -> "1", 5 -> "5", 12 -> "12"
  */
 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');
+  return num.toString();
 }
 
 /**
- * Decode a 2-character base36 task ID string back to a number.
- * E.g., "01" -> 1, "0a" -> 10, "10" -> 36
+ * Decode a numeric task ID string back to a number.
+ * E.g., "1" -> 1, "12" -> 12
  * Returns null if invalid format.
  */
 export function decodeTaskId(str: string): number | null {
-  if (str.length !== TASK_ID_WIDTH) {
-    return null;
-  }
-  if (!/^[0-9a-z]{2}$/.test(str.toLowerCase())) {
-    return null;
-  }
-  return parseInt(str.toLowerCase(), 36);
-}
-
-/**
- * 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;
-}
-
-/**
- * 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) {
+  if (!/^\d+$/.test(str)) {
     return null;
   }
-  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 6-character base26 project prefix (a-z only).
- */
-export function isBase26Prefix(str: string): boolean {
-  if (str.length !== ID_WIDTH) {
-    return false;
-  }
-  return /^[a-z]{6}$/.test(str.toLowerCase());
+  return parseInt(str, 10);
 }
 
 export function getRafDir(): string {
@@ -105,40 +45,78 @@ export function ensureRafDir(): string {
   return rafDir;
 }
 
-export function getNextProjectNumber(rafDir: string): number {
-  const id = Math.floor(Date.now() / 1000) - RAF_EPOCH;
-
-  if (!fs.existsSync(rafDir)) {
-    return id;
+/**
+ * Scan a directory for project folders and extract their numeric IDs.
+ */
+function scanForProjectIds(dir: string): number[] {
+  if (!fs.existsSync(dir)) {
+    return [];
   }
 
-  // Collect existing IDs for collision detection
-  const existingIds = new Set<number>();
-  const entries = fs.readdirSync(rafDir, { withFileTypes: true });
+  const ids: number[] = [];
+  try {
+    const entries = fs.readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+      if (entry.isDirectory()) {
+        const match = entry.name.match(PROJECT_FOLDER_PATTERN);
+        if (match && match[1]) {
+          ids.push(parseInt(match[1], 10));
+        }
+      }
+    }
+  } catch {
+    // Directory doesn't exist or can't be read
+  }
+  return ids;
+}
 
-  for (const entry of entries) {
-    if (entry.isDirectory()) {
-      const match = entry.name.match(/^([a-z]{6})-/i);
-      if (match && match[1]) {
-        const decoded = decodeBase26(match[1].toLowerCase());
-        if (decoded !== null) {
-          existingIds.add(decoded);
+/**
+ * Get the next sequential project number by scanning all worktrees + main repo.
+ * Returns max(existing IDs) + 1, or 1 if no projects exist.
+ *
+ * @param rafDir - The main repo's RAF directory
+ * @param repoBasename - Optional repo basename for scanning worktrees
+ */
+export function getNextProjectNumber(rafDir: string, repoBasename?: string): number {
+  const allIds: number[] = [];
+
+  // Scan main repo RAF dir
+  allIds.push(...scanForProjectIds(rafDir));
+
+  // Scan all worktree directories
+  if (repoBasename) {
+    const worktreeBaseDir = path.join(os.homedir(), '.raf', 'worktrees', repoBasename);
+    if (fs.existsSync(worktreeBaseDir)) {
+      try {
+        const wtEntries = fs.readdirSync(worktreeBaseDir, { withFileTypes: true });
+        for (const wtEntry of wtEntries) {
+          if (wtEntry.isDirectory()) {
+            // Each worktree has an RAF dir at the same relative path
+            const wtRafDir = path.join(worktreeBaseDir, wtEntry.name, path.basename(path.dirname(rafDir)) === '.' ? RAF_DIR : path.relative(path.resolve(rafDir, '..', '..'), rafDir).split(path.sep).slice(0).join(path.sep));
+            allIds.push(...scanForProjectIds(wtRafDir));
+
+            // Also check if the worktree directory name itself is a project folder
+            const wtMatch = wtEntry.name.match(PROJECT_FOLDER_PATTERN);
+            if (wtMatch && wtMatch[1]) {
+              allIds.push(parseInt(wtMatch[1], 10));
+            }
+          }
         }
+      } catch {
+        // Worktree base dir doesn't exist or can't be read
       }
     }
   }
 
-  // Increment until we find a free slot
-  let candidate = id;
-  while (existingIds.has(candidate)) {
-    candidate++;
+  if (allIds.length === 0) {
+    return 1;
   }
 
-  return candidate;
+  return Math.max(...allIds) + 1;
 }
 
 export function formatProjectNumber(num: number): string {
-  return encodeBase26(num);
+  return String(num);
 }
 
 export function getProjectDir(rafDir: string, projectName: string): string | null {
@@ -150,8 +128,8 @@ export function getProjectDir(rafDir: string, projectName: string): string | nul
 
   for (const entry of entries) {
     if (entry.isDirectory()) {
-      const match = entry.name.match(/^[a-z]{6}-(.+)$/i);
-      if (match && match[1] === projectName) {
+      const match = entry.name.match(PROJECT_FOLDER_PATTERN);
+      if (match && match[2] === projectName) {
         return path.join(rafDir, entry.name);
       }
     }
@@ -161,41 +139,42 @@ export function getProjectDir(rafDir: string, projectName: string): string | nul
 }
 
 /**
- * Extract project number prefix from a project path.
- * E.g., "/Users/foo/RAF/abcdef-my-project" -> "abcdef"
- * Returns the 6-char base26 prefix string or null if not found.
+ * Extract the numeric project ID prefix from a project path or folder name.
+ * E.g., "/Users/foo/RAF/3-my-project" -> "3"
+ * E.g., "12-auth-system" -> "12"
+ * Returns the numeric prefix string or null if not found.
  */
 export function extractProjectNumber(projectPath: string): string | null {
   const folderName = path.basename(projectPath);
-  const match = folderName.match(/^([a-z]{6})-/i);
+  const match = folderName.match(/^(\d+)-/);
   if (match && match[1]) {
-    return match[1].toLowerCase();
+    return match[1];
   }
   return null;
 }
 
 /**
  * Parse a project prefix string to its numeric value.
- * Accepts a 6-character base26 string (a-z only).
+ * Accepts a numeric string (e.g., "3", "12").
  * Returns the numeric project number or null if invalid.
  */
 export function parseProjectPrefix(prefix: string): number | null {
-  if (isBase26Prefix(prefix)) {
-    return decodeBase26(prefix);
+  if (/^\d+$/.test(prefix)) {
+    return parseInt(prefix, 10);
   }
   return null;
 }
 
 /**
  * Extract project name from a project path (without number prefix).
- * E.g., "/Users/foo/RAF/abcdef-my-project" -> "my-project"
+ * E.g., "/Users/foo/RAF/3-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);
-  const match = folderName.match(/^[a-z]{6}-(.+)$/i);
-  if (match && match[1]) {
-    return match[1];
+  const match = folderName.match(PROJECT_FOLDER_PATTERN);
+  if (match && match[2]) {
+    return match[2];
   }
   return null;
 }
@@ -207,7 +186,7 @@ export function extractProjectName(projectPath: string): string | null {
  */
 export function extractTaskNameFromPlanFile(planFilename: string): string | null {
   const basename = path.basename(planFilename, '.md');
-  const match = basename.match(/^[0-9a-z]{2}-(.+)$/);
+  const match = basename.match(/^\d+-(.+)$/);
   return match && match[1] ? match[1] : null;
 }
 
@@ -221,16 +200,13 @@ export function listProjects(rafDir: string): Array<{ number: number; name: stri
 
   for (const entry of entries) {
     if (entry.isDirectory()) {
-      const match = entry.name.match(/^([a-z]{6})-(.+)$/i);
+      const match = entry.name.match(PROJECT_FOLDER_PATTERN);
       if (match && match[1] && match[2]) {
-        const decoded = decodeBase26(match[1].toLowerCase());
-        if (decoded !== null) {
-          projects.push({
-            number: decoded,
-            name: match[2],
-            path: path.join(rafDir, entry.name),
-          });
-        }
+        projects.push({
+          number: parseInt(match[1], 10),
+          name: match[2],
+          path: path.join(rafDir, entry.name),
+        });
       }
     }
   }
@@ -282,19 +258,15 @@ function parseProjectFolder(
   rafDir: string,
   folderName: string
 ): { number: number; name: string; path: string; folder: string } | null {
-  const match = folderName.match(/^([a-z]{6})-(.+)$/i);
+  const match = folderName.match(PROJECT_FOLDER_PATTERN);
   if (match && match[1] && match[2]) {
-    const decoded = decodeBase26(match[1].toLowerCase());
-    if (decoded !== null) {
-      return {
-        number: decoded,
-        name: match[2],
-        path: path.join(rafDir, folderName),
-        folder: folderName,
-      };
-    }
+    return {
+      number: parseInt(match[1], 10),
+      name: match[2],
+      path: path.join(rafDir, folderName),
+      folder: folderName,
+    };
   }
-
   return null;
 }
 
@@ -302,19 +274,15 @@ 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., "abcdef-fix-stuff")
+ * 1. Full folder name (e.g., "3-fix-stuff")
  *    - Must be an exact match to an existing folder
- *    - Pattern: 6-char base26 prefix, followed by hyphen and name
- * 2. Base26 prefix (e.g., "abcdef")
- *    - Looks up by decoded project number
+ *    - Pattern: numeric prefix, followed by hyphen and name
+ * 2. Numeric prefix (e.g., "3", "12")
+ *    - Looks up by 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
- *
- * @param rafDir - The RAF directory containing project folders
- * @param identifier - The identifier to resolve
- * @returns Resolution result with path, error type, and matches for ambiguous cases
  */
 export function resolveProjectIdentifierWithDetails(
   rafDir: string,
@@ -324,8 +292,8 @@ export function resolveProjectIdentifierWithDetails(
     return { path: null, error: 'not_found' };
   }
 
-  // Pattern to match full folder names: XXXXXX-name (6-char base26 prefix)
-  const fullFolderPattern = /^[a-z]{6}-(.+)$/i;
+  // Pattern to match full folder names: N-name (numeric prefix)
+  const fullFolderPattern = /^\d+-(.+)$/;
   const fullFolderMatch = identifier.match(fullFolderPattern);
 
   // Check if identifier is a full folder name (exact match required)
@@ -340,12 +308,10 @@ export function resolveProjectIdentifierWithDetails(
     // Fall through to name-based matching.
   }
 
-  // Check if it's a base26 identifier (e.g., "abcdef")
-  const isBase26 = isBase26Prefix(identifier);
-
+  // Check if it's a numeric identifier (e.g., "3", "12")
   let targetNumber: number | null = null;
-  if (isBase26) {
-    targetNumber = decodeBase26(identifier);
+  if (/^\d+$/.test(identifier)) {
+    targetNumber = parseInt(identifier, 10);
   }
 
   const entries = fs.readdirSync(rafDir, { withFileTypes: true });
@@ -357,7 +323,7 @@ export function resolveProjectIdentifierWithDetails(
 
       if (project) {
         if (targetNumber !== null && project.number === targetNumber) {
-          // Match by number (base26 identifier)
+          // Match by number
           return { path: project.path };
         }
         // Also collect name matches (for fallback if number match fails)
@@ -387,21 +353,9 @@ 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., "abcdef-fix-stuff")
- *    - Must be an exact match to an existing folder
- *    - 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.
- *
- * @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)
+ * 1. Full folder name (e.g., "3-fix-stuff")
+ * 2. Numeric prefix (e.g., "3")
+ * 3. Project name (e.g., "my-project")
  */
 export function resolveProjectIdentifier(
   rafDir: string,

package/src/utils/token-tracker.ts

@@ -69,23 +69,23 @@ export function accumulateUsage(attempts: UsageData[]): UsageData {
 }
 
 /**
- * Accumulates token usage across multiple task executions using Claude-provided cost data.
+ * Accumulates token usage across multiple task executions using CLI-provided cost data.
  */
 export class TokenTracker {
   private entries: TaskUsageEntry[] = [];
 
   constructor() {
-    // No pricing config needed - costs come from Claude
+    // No pricing config needed - costs come from the CLI
   }
 
   /**
    * Record usage data from a completed task.
    * Accepts an array of UsageData (one per attempt) and accumulates them.
-   * Costs are summed from Claude-provided totalCostUsd values.
+   * Costs are summed from CLI-provided totalCostUsd values.
    */
   addTask(taskId: string, attempts: UsageData[]): TaskUsageEntry {
     const usage = accumulateUsage(attempts);
-    // Sum costs from Claude-provided totalCostUsd
+    // Sum costs from CLI-provided totalCostUsd
     const totalCost = attempts.reduce((sum, attempt) => sum + attempt.totalCostUsd, 0);
     const cost: CostBreakdown = { totalCost };
     const entry: TaskUsageEntry = { taskId, usage, cost, attempts };

package/src/utils/validation.ts

@@ -3,8 +3,8 @@ import * as path from 'node:path';
 import { execSync } from 'node:child_process';
 import { logger } from './logger.js';
 import type { ClaudeModelName, ModelScenario } from '../types/config.js';
-import { VALID_MODEL_ALIASES, FULL_MODEL_ID_PATTERN } from '../types/config.js';
-import { getModel } from './config.js';
+import { VALID_MODEL_ALIASES } from '../types/config.js';
+import { getModel, isValidModelName } from './config.js';
 
 export interface ValidationResult {
   valid: boolean;
@@ -19,12 +19,12 @@ export function validateEnvironment(): ValidationResult {
     errors: [],
   };
 
-  // Check Claude CLI is installed
+  // Check CLI provider is installed
   try {
     execSync('which claude', { encoding: 'utf-8', stdio: 'pipe' });
   } catch {
     result.valid = false;
-    result.errors.push('Claude CLI not found. Please install it first.');
+    result.errors.push('CLI provider not found. Please install Claude CLI or Codex CLI first.');
   }
 
   // Check for git repo (warning only)
@@ -61,7 +61,7 @@ export function validateProjectExists(rafDir: string, projectName: string): stri
 
   for (const entry of entries) {
     if (entry.isDirectory()) {
-      const match = entry.name.match(/^[a-z]{6}-(.+)$/i);
+      const match = entry.name.match(/^\d+-(.+)$/);
       if (match && match[1] === projectName) {
         return path.join(rafDir, entry.name);
       }
@@ -96,10 +96,7 @@ export type ValidModelName = ClaudeModelName;
 
 export function validateModelName(model: string): ClaudeModelName | null {
   const normalized = model.toLowerCase();
-  if ((VALID_MODEL_ALIASES as readonly string[]).includes(normalized)) {
-    return normalized as ClaudeModelName;
-  }
-  if (FULL_MODEL_ID_PATTERN.test(normalized)) {
+  if (isValidModelName(normalized)) {
     return normalized as ClaudeModelName;
   }
   return null;
@@ -120,7 +117,7 @@ export function resolveModelOption(model?: string, sonnet?: boolean, scenario: M
   if (model) {
     const validated = validateModelName(model);
     if (!validated) {
-      throw new Error(`Invalid model name: "${model}". Valid options: ${VALID_MODEL_ALIASES.join(', ')} or a full model ID (e.g., claude-sonnet-4-5-20250929)`);
+      throw new Error(`Invalid model name: "${model}". Valid options: ${VALID_MODEL_ALIASES.join(', ')} or a full model ID (e.g., claude-sonnet-4-5-20250929), or harness-prefixed (e.g., codex/gpt-5.4)`);
     }
     return validated;
   }

package/tests/unit/commit-planning-artifacts-worktree.test.ts

@@ -100,7 +100,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
   }
 
   it('should commit input.md and decisions.md changes in worktree', async () => {
-    const projectFolder = 'aatest-my-project';
+    const projectFolder = '1-my-project';
 
     // Create initial project and commit
     createInitialProject(repoDir, projectFolder);
@@ -128,7 +128,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
 
     // Verify commit was made
     const lastMsg = getLastCommitMessage(worktreePath);
-    expect(lastMsg).toMatch(/RAF\[aatest\] Plan: my-project/);
+    expect(lastMsg).toMatch(/RAF\[1\] Plan: my-project/);
 
     // Verify both files are in the commit
     const committedFiles = getLastCommitFiles(worktreePath);
@@ -137,7 +137,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
   });
 
   it('should commit amend artifacts with additional plan files in worktree', async () => {
-    const projectFolder = 'aatest-my-project';
+    const projectFolder = '1-my-project';
 
     // Create initial project and commit
     createInitialProject(repoDir, projectFolder);
@@ -170,7 +170,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
 
     // Verify commit was made with Amend prefix
     const lastMsg = getLastCommitMessage(worktreePath);
-    expect(lastMsg).toMatch(/RAF\[aatest\] Amend: my-project/);
+    expect(lastMsg).toMatch(/RAF\[1\] Amend: my-project/);
 
     // Verify only input.md and decisions.md are in the commit (not plan files)
     const committedFiles = getLastCommitFiles(worktreePath);
@@ -180,7 +180,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
   });
 
   it('should commit amend artifacts with plan files as additionalFiles in worktree', async () => {
-    const projectFolder = 'aatest-my-project';
+    const projectFolder = '1-my-project';
 
     // Create initial project and commit
     createInitialProject(repoDir, projectFolder);
@@ -214,7 +214,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
 
     // Verify commit was made with Amend prefix
     const lastMsg = getLastCommitMessage(worktreePath);
-    expect(lastMsg).toMatch(/RAF\[aatest\] Amend: my-project/);
+    expect(lastMsg).toMatch(/RAF\[1\] Amend: my-project/);
 
     // Verify all files are in the commit (input, decisions, AND plan files)
     const committedFiles = getLastCommitFiles(worktreePath);
@@ -224,7 +224,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
   });
 
   it('should commit after worktree recreation from branch', async () => {
-    const projectFolder = 'aatest-my-project';
+    const projectFolder = '1-my-project';
 
     // Create initial project, commit, and create initial worktree
     createInitialProject(repoDir, projectFolder);
@@ -282,7 +282,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
 
     // Verify commit was made
     const lastMsg = getLastCommitMessage(recreatedWtPath);
-    expect(lastMsg).toMatch(/RAF\[aatest\] Amend: my-project/);
+    expect(lastMsg).toMatch(/RAF\[1\] Amend: my-project/);
 
     // Verify only input.md and decisions.md are in the commit (not plan files)
     const committedFiles = getLastCommitFiles(recreatedWtPath);
@@ -292,7 +292,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
   });
 
   it('should commit all artifacts after worktree recreation with additionalFiles', async () => {
-    const projectFolder = 'aatest-my-project';
+    const projectFolder = '1-my-project';
 
     // Create initial project, commit, and create initial worktree
     createInitialProject(repoDir, projectFolder);
@@ -351,7 +351,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
 
     // Verify commit was made
     const lastMsg = getLastCommitMessage(recreatedWtPath);
-    expect(lastMsg).toMatch(/RAF\[aatest\] Amend: my-project/);
+    expect(lastMsg).toMatch(/RAF\[1\] Amend: my-project/);
 
     // Verify all files are in the commit (including plan files)
     const committedFiles = getLastCommitFiles(recreatedWtPath);
@@ -361,7 +361,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
   });
 
   it('should work when only some files have changed', async () => {
-    const projectFolder = 'aatest-my-project';
+    const projectFolder = '1-my-project';
 
     // Create initial project and commit
     createInitialProject(repoDir, projectFolder);
@@ -384,7 +384,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
 
     // Verify commit was made
     const lastMsg = getLastCommitMessage(worktreePath);
-    expect(lastMsg).toMatch(/RAF\[aatest\] Plan: my-project/);
+    expect(lastMsg).toMatch(/RAF\[1\] Plan: my-project/);
 
     // Only input.md should be in the commit (decisions.md unchanged)
     const committedFiles = getLastCommitFiles(worktreePath);
@@ -393,7 +393,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
   });
 
   it('should handle non-worktree commit (standard mode) correctly', async () => {
-    const projectFolder = 'aatest-my-project';
+    const projectFolder = '1-my-project';
 
     // Create initial project and commit
     createInitialProject(repoDir, projectFolder);
@@ -423,7 +423,7 @@ describe('commitPlanningArtifacts - worktree integration', () => {
 
     // Verify commit
     const lastMsg = getLastCommitMessage(repoDir);
-    expect(lastMsg).toMatch(/RAF\[aatest\] Plan: my-project/);
+    expect(lastMsg).toMatch(/RAF\[1\] Plan: my-project/);
 
     const committedFiles = getLastCommitFiles(repoDir);
     expect(committedFiles).toContain(`RAF/${projectFolder}/input.md`);