rafcode 2.5.1-0 → 3.0.0

package/dist/utils/token-tracker.js.map

@@ -1 +1 @@
-{"version":3,"file":"token-tracker.js","sourceRoot":"","sources":["../../src/utils/token-tracker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"token-tracker.js","sourceRoot":"","sources":["../../src/utils/token-tracker.ts"],"names":[],"mappings":"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"}

package/dist/utils/validation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAIzE,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,wBAAgB,mBAAmB,IAAI,gBAAgB,CA4BtD;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAIzD;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAMxD;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAaxF;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAQ/D;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAQ/D;AAED,mEAAmE;AACnE,MAAM,MAAM,cAAc,GAAG,eAAe,CAAC;AAE7C,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CASvE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,QAAQ,GAAE,aAAyB,GAAG,eAAe,CAsBzH"}
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAIzE,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,wBAAgB,mBAAmB,IAAI,gBAAgB,CA4BtD;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAIzD;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAMxD;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAaxF;AAED,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAQ/D;AAED,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,GAAG,IAAI,CAQ/D;AAED,mEAAmE;AACnE,MAAM,MAAM,cAAc,GAAG,eAAe,CAAC;AAE7C,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CAMvE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,QAAQ,GAAE,aAAyB,GAAG,eAAe,CAsBzH"}

package/dist/utils/validation.js

@@ -2,21 +2,21 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { execSync } from 'node:child_process';
 import { logger } from './logger.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 function validateEnvironment() {
     const result = {
         valid: true,
         warnings: [],
         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)
     try {
@@ -47,7 +47,7 @@ export function validateProjectExists(rafDir, projectName) {
     const entries = fs.readdirSync(rafDir, { withFileTypes: true });
     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);
             }
@@ -73,10 +73,7 @@ export function reportValidation(result) {
 }
 export function validateModelName(model) {
     const normalized = model.toLowerCase();
-    if (VALID_MODEL_ALIASES.includes(normalized)) {
-        return normalized;
-    }
-    if (FULL_MODEL_ID_PATTERN.test(normalized)) {
+    if (isValidModelName(normalized)) {
         return normalized;
     }
     return null;
@@ -94,7 +91,7 @@ export function resolveModelOption(model, sonnet, scenario = 'execute') {
     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/dist/utils/validation.js.map

@@ -1 +1 @@
-{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/utils/validation.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rafcode",
-  "version": "2.5.1-0",
+  "version": "3.0.0",
   "description": "Automated Task Planning & Execution with Claude Code",
   "type": "module",
   "bin": {

package/src/commands/config.ts

@@ -3,7 +3,7 @@ import * as path from 'node:path';
 import * as readline from 'node:readline';
 import { fileURLToPath } from 'node:url';
 import { Command } from 'commander';
-import { ClaudeRunner } from '../core/claude-runner.js';
+import { createRunner } from '../core/runner-factory.js';
 import { shutdownHandler } from '../core/shutdown-handler.js';
 import { logger } from '../utils/logger.js';
 import {
@@ -53,7 +53,7 @@ function getCurrentConfigState(configPath: string): string {
 }
 
 /**
- * Build the system prompt for the config editing Claude session.
+ * Build the system prompt for the config editing session.
  */
 function buildConfigSystemPrompt(configDocs: string, configState: string): string {
   return [
@@ -69,7 +69,7 @@ function buildConfigSystemPrompt(configDocs: string, configState: string): strin
 }
 
 /**
- * Validate the config file after the Claude session ends and report results.
+ * Validate the config file after the editing session ends and report results.
  */
 function postSessionValidation(configPath: string): void {
   if (!fs.existsSync(configPath)) {
@@ -336,7 +336,7 @@ function handleSet(args: string[]): void {
 
 export function createConfigCommand(): Command {
   const command = new Command('config')
-    .description('View and edit RAF configuration with Claude')
+    .description('View and edit RAF configuration interactively')
     .argument('[prompt...]', 'Optional initial prompt for the config session')
     .option('--reset', 'Delete config file and restore all defaults')
     .option('--get [key]', 'Show config value (all config if no key, or specific dot-notation key)')
@@ -437,8 +437,8 @@ async function runConfigSession(initialPrompt?: string): Promise<void> {
   const userMessage = initialPrompt
     ?? 'Show me my current config and help me make changes.';
 
-  // Set up Claude runner
-  const claudeRunner = new ClaudeRunner({ model });
+  // Set up runner
+  const claudeRunner = createRunner({ model });
   shutdownHandler.init();
   shutdownHandler.registerClaudeRunner(claudeRunner);
 
@@ -452,7 +452,7 @@ async function runConfigSession(initialPrompt?: string): Promise<void> {
     });
 
     if (exitCode !== 0) {
-      logger.warn(`Claude exited with code ${exitCode}`);
+      logger.warn(`Process exited with code ${exitCode}`);
     }
 
     // Post-session validation

package/src/commands/do.ts

@@ -3,14 +3,14 @@ import * as path from 'node:path';
 import { Command } from 'commander';
 import { select } from '@inquirer/prompts';
 import { ProjectManager } from '../core/project-manager.js';
-import { ClaudeRunner } from '../core/claude-runner.js';
+import { createRunner } from '../core/runner-factory.js';
 import { shutdownHandler } from '../core/shutdown-handler.js';
 import { stashChanges, hasUncommittedChanges, isGitRepo, getHeadCommitHash } from '../core/git.js';
 import { getExecutionPrompt } from '../prompts/execution.js';
 import { parseOutput, isRetryableFailure } from '../parsers/output-parser.js';
 import { validatePlansExist, resolveModelOption } from '../utils/validation.js';
-import { getRafDir, extractProjectNumber, extractProjectName, extractTaskNameFromPlanFile, resolveProjectIdentifierWithDetails, getOutcomeFilePath, parseProjectPrefix } from '../utils/paths.js';
-import { pickPendingProject, getPendingProjects, getPendingWorktreeProjects } from '../ui/project-picker.js';
+import { getRafDir, extractProjectNumber, extractProjectName, extractTaskNameFromPlanFile, resolveProjectIdentifierWithDetails, getOutcomeFilePath } from '../utils/paths.js';
+import { pickPendingProject, getPendingProjects, getPendingWorktreeProjects, formatProjectChoice } from '../ui/project-picker.js';
 import type { PendingProjectInfo } from '../ui/project-picker.js';
 import { logger } from '../utils/logger.js';
 import { getConfig, getWorktreeDefault, getModel, getModelShortName, resolveFullModelId, getSyncMainBranch, resolveEffortToModel, applyModelCeiling, getShowCacheTokens } from '../utils/config.js';
@@ -196,13 +196,14 @@ export function createDoCommand(): Command {
     .alias('act')
     .argument('[project]', 'Project identifier: ID (00j3k1), name (my-project), or folder (00j3k1-my-project)')
     .option('-t, --timeout <minutes>', 'Timeout per task in minutes', '60')
-    .option('-v, --verbose', 'Show full Claude output')
+    .option('-v, --verbose', 'Show full LLM output')
     .option('-d, --debug', 'Save all logs and show debug output')
     .option('-f, --force', 'Re-run all tasks regardless of status')
-    .option('-m, --model <name>', 'Claude model to use (sonnet, haiku, opus)')
+    .option('-m, --model <name>', 'Model to use (sonnet, haiku, opus)')
     .option('--sonnet', 'Use Sonnet model (shorthand for --model sonnet)')
     .option('-w, --worktree', 'Execute tasks in a git worktree')
     .option('--no-worktree', 'Disable worktree mode (overrides config)')
+    .option('-p, --provider <provider>', 'CLI provider to use (claude, codex)')
     .action(async (project: string | undefined, options: DoCommandOptions) => {
       await runDoCommand(project, options);
     });
@@ -651,8 +652,9 @@ async function executePostAction(
 
 /**
  * Auto-discovery flow for `raf do --worktree` without a project identifier.
- * Lists worktree projects, finds latest completed main-tree project, filters,
- * and shows an interactive picker.
+ * Shows both worktree AND main-repo pending projects in an interactive picker.
+ * Worktree projects above a threshold filter are included; main-repo projects
+ * are always included. Duplicates are deduped with worktree taking precedence.
  *
  * @returns Selected project info or null if cancelled/no projects
  */
@@ -660,16 +662,11 @@ async function discoverAndPickWorktreeProject(
   repoBasename: string,
   rafDir: string,
   rafRelativePath: string,
-): Promise<{ worktreeRoot: string; projectFolder: string } | null> {
-  // List all worktree projects for this repo
-  const wtProjects = listWorktreeProjects(repoBasename);
+): Promise<{ worktreeRoot?: string; projectFolder: string } | null> {
+  // Get worktree pending projects (uses shared utility from project-picker)
+  const wtPendingProjects = getPendingWorktreeProjects(repoBasename, rafRelativePath);
 
-  if (wtProjects.length === 0) {
-    logger.error('No worktree projects found. Did you plan with --worktree?');
-    process.exit(1);
-  }
-
-  // Find the highest-numbered completed project in the MAIN tree
+  // Find the highest-numbered completed project in the MAIN tree for threshold filter
   const mainProjects = discoverProjects(rafDir);
   let highestCompletedNumber = 0;
 
@@ -685,71 +682,40 @@ async function discoverAndPickWorktreeProject(
   // Filter threshold: highest completed - 3 (or 0 if none completed)
   const threshold = highestCompletedNumber > 3 ? highestCompletedNumber - 3 : 0;
 
-  // Filter worktree projects by number threshold and completion status
-  const uncompletedProjects: Array<{
-    folder: string;
-    worktreeRoot: string;
-    projectPath: string;
-    completedTasks: number;
-    totalTasks: number;
-    projectNumber: number;
-  }> = [];
-
-  for (const wtProjectDir of wtProjects) {
-    // Extract project number from the worktree directory name
-    const numPrefix = extractProjectNumber(wtProjectDir);
-    if (!numPrefix) continue;
-    const projectNumber = parseProjectPrefix(numPrefix);
-    if (projectNumber === null) continue;
-
-    // Apply threshold filter
-    if (projectNumber < threshold) continue;
+  // Apply threshold filter to worktree projects only
+  const filteredWtProjects = wtPendingProjects.filter((p) => p.number >= threshold);
 
-    // Check if this worktree has a valid project
-    const wtPath = computeWorktreePath(repoBasename, wtProjectDir);
-    const wtProjectPath = path.join(wtPath, rafRelativePath, wtProjectDir);
+  // Get main-repo pending projects (no threshold filter)
+  const mainPendingProjects = getPendingProjects(rafDir);
 
-    if (!fs.existsSync(wtProjectPath)) continue;
-
-    // Derive project state from worktree
-    const state = deriveProjectState(wtProjectPath);
-    if (state.tasks.length === 0) continue;
-
-    // Keep only uncompleted projects
-    if (isProjectComplete(state)) continue;
-
-    const stats = getDerivedStats(state);
-    uncompletedProjects.push({
-      folder: wtProjectDir,
-      worktreeRoot: wtPath,
-      projectPath: wtProjectPath,
-      completedTasks: stats.completed,
-      totalTasks: stats.total,
-      projectNumber,
-    });
+  // Merge and deduplicate: worktree versions take precedence
+  const allProjects = [...mainPendingProjects, ...filteredWtProjects];
+  const seen = new Map<string, PendingProjectInfo>();
+  for (const project of allProjects) {
+    const existing = seen.get(project.folder);
+    if (!existing || project.source === 'worktree') {
+      seen.set(project.folder, project);
+    }
   }
+  const deduped = Array.from(seen.values());
 
-  if (uncompletedProjects.length === 0) {
-    logger.info('All worktree projects are completed.');
+  // Sort by project number
+  deduped.sort((a, b) => a.number - b.number);
+
+  if (deduped.length === 0) {
+    logger.info('No pending projects found.');
     return null;
   }
 
-  // Sort by project number
-  uncompletedProjects.sort((a, b) => a.projectNumber - b.projectNumber);
-
-  // Show interactive picker (even if only one project)
-  const choices = uncompletedProjects.map((p) => {
-    const name = extractProjectName(p.folder) ?? p.folder;
-    const numPrefix = extractProjectNumber(p.folder) ?? '';
-    return {
-      name: `${numPrefix} ${name} (${p.completedTasks}/${p.totalTasks} tasks)`,
-      value: p,
-    };
-  });
+  // Show interactive picker
+  const choices = deduped.map((p) => ({
+    name: formatProjectChoice(p),
+    value: p,
+  }));
 
   try {
     const selected = await select({
-      message: 'Select a worktree project to execute:',
+      message: 'Select a project to execute:',
       choices,
     });
 
@@ -774,7 +740,7 @@ interface SingleProjectOptions {
   maxRetries: number;
   autoCommit: boolean;
   model: string;
-  /** Worktree root directory. When set, Claude runs with cwd in the worktree. */
+  /** Worktree root directory. When set, the runner uses cwd in the worktree. */
   worktreeCwd?: string;
 }
 
@@ -953,7 +919,7 @@ async function executeSingleProject(
     const taskId = task.id;  // Capture for closure
     const taskLabel = displayName !== task.id ? `${task.id} (${displayName})` : task.id;
 
-    // Handle blocked tasks separately - skip Claude execution
+    // Handle blocked tasks separately - skip LLM execution
     if (task.status === 'blocked') {
       // Find which dependency caused the block for the message
       const failedOrBlockedDeps = task.dependencies.filter((depId) => {
@@ -1067,7 +1033,7 @@ async function executeSingleProject(
       }
 
       // Create a runner for this attempt's model
-      const taskRunner = new ClaudeRunner({ model: modelResolution.model });
+      const taskRunner = createRunner({ model: modelResolution.model });
       shutdownHandler.registerClaudeRunner(taskRunner);
 
       if (verbose && isRetry) {
@@ -1108,7 +1074,7 @@ async function executeSingleProject(
         outcomeFilePath,
       } : undefined;
 
-      // Run Claude (use worktree root as cwd if in worktree mode)
+      // Run task (use worktree root as cwd if in worktree mode)
       const runnerOptions = {
         timeout,
         outcomeFilePath,
@@ -1194,18 +1160,18 @@ async function executeSingleProject(
     }
 
     if (success) {
-      // Check if Claude wrote an outcome file with valid marker
+      // Check if the LLM wrote an outcome file with valid marker
       // If so, keep it as-is; otherwise create fallback
       // NOTE: Successful outcomes do NOT get ## Details section appended
       let outcomeContent: string;
-      const claudeWroteOutcome = fs.existsSync(outcomeFilePath);
+      const llmWroteOutcome = fs.existsSync(outcomeFilePath);
 
-      if (claudeWroteOutcome) {
+      if (llmWroteOutcome) {
         const existingContent = fs.readFileSync(outcomeFilePath, 'utf-8');
         const status = parseOutcomeStatus(existingContent);
 
         if (status === 'completed') {
-          // Claude wrote a valid outcome - keep it as-is (no metadata added)
+          // LLM wrote a valid outcome - keep it as-is (no metadata added)
           outcomeContent = existingContent;
         } else {
           // Outcome file exists but no valid COMPLETE marker - create fallback

package/src/commands/plan.ts

@@ -1,8 +1,9 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { Command } from 'commander';
+import { select } from '@inquirer/prompts';
 import { ProjectManager } from '../core/project-manager.js';
-import { ClaudeRunner } from '../core/claude-runner.js';
+import { createRunner } from '../core/runner-factory.js';
 import { openEditor, getInputTemplate } from '../core/editor.js';
 import { shutdownHandler } from '../core/shutdown-handler.js';
 import { commitPlanningArtifacts } from '../core/git.js';
@@ -23,7 +24,6 @@ import {
   getRafDir,
   getNextProjectNumber,
   formatProjectNumber,
-  resolveProjectIdentifier,
   resolveProjectIdentifierWithDetails,
   getInputPath,
   getDecisionsPath,
@@ -59,22 +59,24 @@ interface PlanCommandOptions {
   auto?: boolean;
   worktree?: boolean;
   resume?: string;
+  provider?: string;
 }
 
 export function createPlanCommand(): Command {
   const command = new Command('plan')
-    .description('Create a new project and interactively plan tasks with Claude')
+    .description('Create a new project and interactively plan tasks')
     .argument('[projectName]', 'Optional project name (will be prompted if not provided)')
     .option(
       '-a, --amend',
       'Add tasks to an existing project (requires project identifier as argument)'
     )
-    .option('-m, --model <name>', 'Claude model to use (sonnet, haiku, opus)')
+    .option('-m, --model <name>', 'Model to use (sonnet, haiku, opus)')
     .option('--sonnet', 'Use Sonnet model (shorthand for --model sonnet)')
-    .option('-y, --auto', "Skip Claude's permission prompts for file operations")
+    .option('-y, --auto', 'Skip permission prompts for file operations')
     .option('-w, --worktree', 'Create a git worktree for isolated planning')
     .option('--no-worktree', 'Disable worktree mode (overrides config)')
     .option('-r, --resume <identifier>', 'Resume a planning session for an existing project')
+    .option('-p, --provider <provider>', 'CLI provider to use (claude, codex)')
     .action(async (projectName: string | undefined, options: PlanCommandOptions) => {
       // Validate and resolve model option
       let model: string;
@@ -116,13 +118,48 @@ async function runPlanCommand(projectName?: string, model?: string, autoMode: bo
   }
 
   // Check if project name matches an existing project
+  // This runs even in auto mode — silently duplicating a project is worse than interrupting
   if (projectName) {
     const rafDir = getRafDir();
-    const existingProject = resolveProjectIdentifier(rafDir, projectName);
-    if (existingProject) {
-      logger.error(`Project already exists: ${existingProject}`);
-      logger.error(`To add tasks to an existing project, use: raf plan --amend ${projectName}`);
-      process.exit(1);
+    const mainResult = resolveProjectIdentifierWithDetails(rafDir, projectName);
+
+    let existingFolder: string | null = null;
+    let existingWorktreeMode = false;
+
+    if (mainResult.path) {
+      existingFolder = path.basename(mainResult.path);
+    } else {
+      const repoBasename = getRepoBasename();
+      if (repoBasename) {
+        const wtResult = resolveWorktreeProjectByIdentifier(repoBasename, projectName);
+        if (wtResult) {
+          existingFolder = wtResult.folder;
+          existingWorktreeMode = true;
+        }
+      }
+    }
+
+    if (existingFolder) {
+      const numMatch = existingFolder.match(/^(\d+)-/);
+      const projectId = numMatch ? numMatch[1] : existingFolder;
+
+      const answer = await select({
+        message: `Project '${projectName}' already exists (ID: ${projectId}). Did you want to amend it?`,
+        choices: [
+          { name: 'Yes, amend it', value: 'amend' },
+          { name: 'No, create a new project', value: 'create' },
+          { name: 'Cancel', value: 'cancel' },
+        ],
+      });
+
+      if (answer === 'amend') {
+        await runAmendCommand(existingFolder, model, autoMode, existingWorktreeMode);
+        return;
+      } else if (answer === 'cancel') {
+        logger.info('Aborted.');
+        process.exit(0);
+      }
+      // 'create': fall through to normal project creation
     }
   }
 
@@ -204,8 +241,8 @@ async function runPlanCommand(projectName?: string, model?: string, autoMode: bo
       }
     }
 
-    // Compute project number from main repo's RAF directory
-    const projectNumber = getNextProjectNumber(rafDir);
+    // Compute project number from main repo's RAF directory (scan worktrees too)
+    const projectNumber = getNextProjectNumber(rafDir, repoBasename);
     const sanitizedName = sanitizeProjectName(finalProjectName);
     const folderName = `${formatProjectNumber(projectNumber)}-${sanitizedName}`;
 
@@ -249,7 +286,7 @@ async function runPlanCommand(projectName?: string, model?: string, autoMode: bo
   }
 
   // Set up shutdown handler
-  const claudeRunner = new ClaudeRunner({ model });
+  const claudeRunner = createRunner({ model });
   shutdownHandler.init();
   shutdownHandler.registerClaudeRunner(claudeRunner);
 
@@ -275,8 +312,8 @@ async function runPlanCommand(projectName?: string, model?: string, autoMode: bo
   });
 
   // Run planning session
-  logger.info('Starting planning session with Claude...');
-  logger.info('Claude will interview you about each task.');
+  logger.info('Starting planning session...');
+  logger.info('The planner will interview you about each task.');
   if (model) {
     logger.info(`Using model: ${model}`);
   }
@@ -294,12 +331,12 @@ async function runPlanCommand(projectName?: string, model?: string, autoMode: bo
   try {
     const exitCode = await claudeRunner.runInteractive(systemPrompt, userMessage, {
       dangerouslySkipPermissions: autoMode,
-      // Run Claude session in the worktree root if in worktree mode
+      // Run session in the worktree root if in worktree mode
       cwd: worktreePath ?? undefined,
     });
 
     if (exitCode !== 0) {
-      logger.warn(`Claude exited with code ${exitCode}`);
+      logger.warn(`Process exited with code ${exitCode}`);
     }
 
     // Check for created plan files
@@ -518,7 +555,7 @@ async function runAmendCommand(identifier: string, model?: string, autoMode: boo
     }
   );
 
-  // Calculate next task number (decode base36 task IDs)
+  // Calculate next task number (numeric task IDs)
   const maxTaskNumber = Math.max(
     ...projectState.tasks.map((t) => decodeTaskId(t.id) ?? 0)
   );
@@ -579,13 +616,13 @@ async function runAmendCommand(identifier: string, model?: string, autoMode: boo
   fs.writeFileSync(inputPath, updatedInput);
 
   // Set up shutdown handler
-  const claudeRunner = new ClaudeRunner({ model });
+  const claudeRunner = createRunner({ model });
   shutdownHandler.init();
   shutdownHandler.registerClaudeRunner(claudeRunner);
 
   // Run amend planning session
-  logger.info('Starting amendment session with Claude...');
-  logger.info('Claude will interview you about each new task.');
+  logger.info('Starting amendment session...');
+  logger.info('The planner will interview you about each new task.');
   if (model) {
     logger.info(`Using model: ${model}`);
   }
@@ -605,12 +642,12 @@ async function runAmendCommand(identifier: string, model?: string, autoMode: boo
   try {
     const exitCode = await claudeRunner.runInteractive(systemPrompt, userMessage, {
       dangerouslySkipPermissions: autoMode,
-      // Run Claude session in the worktree root if in worktree mode
+      // Run session in the worktree root if in worktree mode
       cwd: worktreePath ?? undefined,
     });
 
     if (exitCode !== 0) {
-      logger.warn(`Claude exited with code ${exitCode}`);
+      logger.warn(`Process exited with code ${exitCode}`);
     }
 
     // Check for new plan files
@@ -636,15 +673,18 @@ async function runAmendCommand(identifier: string, model?: string, autoMode: boo
       for (const planFile of newPlanFiles) {
         logger.info(`  - plans/${planFile}`);
       }
+    }
 
-      // Commit planning artifacts (input.md, decisions.md, and new plan files)
-      const newPlanAbsolutePaths = newPlanFiles.map((f) => path.join(plansDir, f));
-      await commitPlanningArtifacts(projectPath, {
-        cwd: worktreePath ?? undefined,
-        isAmend: true,
-        additionalFiles: newPlanAbsolutePaths,
-      });
+    // Commit planning artifacts (input.md, decisions.md, and all plan files)
+    // Always attempt commit — even without new plans, existing files may have been updated
+    const allPlanAbsolutePaths = allPlanFiles.map((f) => path.join(plansDir, f));
+    await commitPlanningArtifacts(projectPath, {
+      cwd: worktreePath ?? undefined,
+      isAmend: true,
+      additionalFiles: allPlanAbsolutePaths,
+    });
 
+    if (newPlanFiles.length > 0) {
       logger.newline();
       logger.info(`Total tasks: ${allPlanFiles.length}`);
       if (worktreeMode) {
@@ -759,19 +799,19 @@ async function runResumeCommand(identifier: string, model?: string): Promise<voi
   logger.newline();
 
   // Set up shutdown handler
-  const claudeRunner = new ClaudeRunner({ model });
+  const claudeRunner = createRunner({ model });
   shutdownHandler.init();
   shutdownHandler.registerClaudeRunner(claudeRunner);
 
-  // Launch Claude's resume picker
-  logger.info('Starting Claude session resume picker...');
+  // Launch session resume picker
+  logger.info('Starting session resume picker...');
   logger.newline();
 
   try {
     const exitCode = await claudeRunner.runResume({ cwd: resumeCwd });
 
     if (exitCode !== 0) {
-      logger.warn(`Claude exited with code ${exitCode}`);
+      logger.warn(`Process exited with code ${exitCode}`);
     }
 
     // Check for created/updated plan files after resume session

package/src/commands/status.ts

@@ -26,7 +26,7 @@ const MAX_DISPLAYED_PROJECTS = 10;
 export function createStatusCommand(): Command {
   const command = new Command('status')
     .description('Show status of a project or list all projects')
-    .argument('[identifier]', 'Project identifier: ID (00j3k1), name (my-project), or folder (00j3k1-my-project)')
+    .argument('[identifier]', 'Project identifier: number (3), name (my-project), or folder (3-my-project)')
     .option('--json', 'Output as JSON')
     .action(async (identifier?: string, options?: StatusCommandOptions) => {
       await runStatusCommand(identifier, options);