rafcode 2.1.1 → 2.2.0

package/dist/utils/verbose-toggle.d.ts

@@ -0,0 +1,33 @@
+/**
+ * Runtime verbose toggle for task execution.
+ *
+ * Listens for Tab keypress on process.stdin to toggle verbose display on/off.
+ * When verbose is on, tool-use activity lines from stream-json are displayed.
+ * When verbose is off, they are suppressed (but data is still captured).
+ *
+ * Requires a TTY stdin. Silently skips setup when stdin is not a TTY (e.g., piped input).
+ */
+export declare class VerboseToggle {
+    private _verbose;
+    private _active;
+    private _dataHandler;
+    constructor(initialVerbose: boolean);
+    /** Current verbose display state. */
+    get isVerbose(): boolean;
+    /** Whether the toggle listener is currently active. */
+    get isActive(): boolean;
+    /**
+     * Start listening for Tab keypress on stdin.
+     * Sets stdin to raw mode to capture individual keypresses.
+     * Shows a hint message about the toggle.
+     *
+     * No-op if stdin is not a TTY or if already active.
+     */
+    start(): void;
+    /**
+     * Stop listening and restore stdin to normal mode.
+     * Safe to call multiple times.
+     */
+    stop(): void;
+}
+//# sourceMappingURL=verbose-toggle.d.ts.map

package/dist/utils/verbose-toggle.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"verbose-toggle.d.ts","sourceRoot":"","sources":["../../src/utils/verbose-toggle.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,qBAAa,aAAa;IACxB,OAAO,CAAC,QAAQ,CAAU;IAC1B,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,YAAY,CAAyC;gBAEjD,cAAc,EAAE,OAAO;IAInC,qCAAqC;IACrC,IAAI,SAAS,IAAI,OAAO,CAEvB;IAED,uDAAuD;IACvD,IAAI,QAAQ,IAAI,OAAO,CAEtB;IAED;;;;;;OAMG;IACH,KAAK,IAAI,IAAI;IAoCb;;;OAGG;IACH,IAAI,IAAI,IAAI;CAwBb"}

package/dist/utils/verbose-toggle.js

@@ -0,0 +1,94 @@
+/**
+ * Runtime verbose toggle for task execution.
+ *
+ * Listens for Tab keypress on process.stdin to toggle verbose display on/off.
+ * When verbose is on, tool-use activity lines from stream-json are displayed.
+ * When verbose is off, they are suppressed (but data is still captured).
+ *
+ * Requires a TTY stdin. Silently skips setup when stdin is not a TTY (e.g., piped input).
+ */
+import { logger } from './logger.js';
+export class VerboseToggle {
+    _verbose;
+    _active = false;
+    _dataHandler = null;
+    constructor(initialVerbose) {
+        this._verbose = initialVerbose;
+    }
+    /** Current verbose display state. */
+    get isVerbose() {
+        return this._verbose;
+    }
+    /** Whether the toggle listener is currently active. */
+    get isActive() {
+        return this._active;
+    }
+    /**
+     * Start listening for Tab keypress on stdin.
+     * Sets stdin to raw mode to capture individual keypresses.
+     * Shows a hint message about the toggle.
+     *
+     * No-op if stdin is not a TTY or if already active.
+     */
+    start() {
+        if (this._active)
+            return;
+        if (!process.stdin.isTTY)
+            return;
+        try {
+            process.stdin.setRawMode(true);
+        }
+        catch {
+            // Cannot set raw mode — skip
+            return;
+        }
+        process.stdin.resume();
+        this._dataHandler = (data) => {
+            for (let i = 0; i < data.length; i++) {
+                const byte = data[i];
+                if (byte === 0x09) {
+                    // Tab key
+                    this._verbose = !this._verbose;
+                    const state = this._verbose ? 'on' : 'off';
+                    logger.dim(`  [verbose: ${state}]`);
+                }
+                else if (byte === 0x03) {
+                    // Ctrl+C — re-emit SIGINT so the shutdown handler catches it
+                    process.emit('SIGINT');
+                }
+            }
+        };
+        process.stdin.on('data', this._dataHandler);
+        this._active = true;
+        // Show toggle hint
+        logger.dim('  Press Tab to toggle verbose mode');
+    }
+    /**
+     * Stop listening and restore stdin to normal mode.
+     * Safe to call multiple times.
+     */
+    stop() {
+        if (!this._active)
+            return;
+        if (this._dataHandler) {
+            process.stdin.off('data', this._dataHandler);
+            this._dataHandler = null;
+        }
+        try {
+            if (process.stdin.isTTY) {
+                process.stdin.setRawMode(false);
+            }
+        }
+        catch {
+            // Ignore — stdin may already be closed
+        }
+        try {
+            process.stdin.pause();
+        }
+        catch {
+            // Ignore
+        }
+        this._active = false;
+    }
+}
+//# sourceMappingURL=verbose-toggle.js.map

package/dist/utils/verbose-toggle.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"verbose-toggle.js","sourceRoot":"","sources":["../../src/utils/verbose-toggle.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,OAAO,aAAa;IAChB,QAAQ,CAAU;IAClB,OAAO,GAAG,KAAK,CAAC;IAChB,YAAY,GAAoC,IAAI,CAAC;IAE7D,YAAY,cAAuB;QACjC,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC;IACjC,CAAC;IAED,qCAAqC;IACrC,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,uDAAuD;IACvD,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED;;;;;;OAMG;IACH,KAAK;QACH,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QACzB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK;YAAE,OAAO;QAEjC,IAAI,CAAC;YACH,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACjC,CAAC;QAAC,MAAM,CAAC;YACP,6BAA6B;YAC7B,OAAO;QACT,CAAC;QAED,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;QAEvB,IAAI,CAAC,YAAY,GAAG,CAAC,IAAY,EAAE,EAAE;YACnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrC,MAAM,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;gBAErB,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;oBAClB,UAAU;oBACV,IAAI,CAAC,QAAQ,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;oBAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;oBAC3C,MAAM,CAAC,GAAG,CAAC,eAAe,KAAK,GAAG,CAAC,CAAC;gBACtC,CAAC;qBAAM,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;oBACzB,6DAA6D;oBAC7D,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACzB,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QAEF,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,mBAAmB;QACnB,MAAM,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;IACnD,CAAC;IAED;;;OAGG;IACH,IAAI;QACF,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,OAAO;QAE1B,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;YAC7C,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QAC3B,CAAC;QAED,IAAI,CAAC;YACH,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;gBACxB,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,uCAAuC;QACzC,CAAC;QAED,IAAI,CAAC;YACH,OAAO,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACxB,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACvB,CAAC;CACF"}

package/package.json

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

package/src/commands/config.ts

@@ -0,0 +1,204 @@
+import * as fs from 'node:fs';
+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 { shutdownHandler } from '../core/shutdown-handler.js';
+import { logger } from '../utils/logger.js';
+import {
+  getConfigPath,
+  getModel,
+  getEffort,
+  validateConfig,
+  ConfigValidationError,
+} from '../utils/config.js';
+
+interface ConfigCommandOptions {
+  reset?: boolean;
+}
+
+/**
+ * Load the config documentation markdown from src/prompts/config-docs.md.
+ * Resolved relative to this file's location in the dist/ tree.
+ */
+function loadConfigDocs(): string {
+  const __filename = fileURLToPath(import.meta.url);
+  const __dirname = path.dirname(__filename);
+  // From dist/commands/config.js -> ../../src/prompts/config-docs.md
+  const docsPath = path.join(__dirname, '..', '..', 'src', 'prompts', 'config-docs.md');
+  return fs.readFileSync(docsPath, 'utf-8');
+}
+
+/**
+ * Read the current user config file contents, or a message indicating no file exists.
+ */
+function getCurrentConfigState(configPath: string): string {
+  if (!fs.existsSync(configPath)) {
+    return 'No config file exists yet. All settings use defaults. The file will be created at: ' + configPath;
+  }
+  try {
+    const content = fs.readFileSync(configPath, 'utf-8');
+    return `Current config file (${configPath}):\n\`\`\`json\n${content}\`\`\``;
+  } catch {
+    return 'Config file exists but could not be read: ' + configPath;
+  }
+}
+
+/**
+ * Build the system prompt for the config editing Claude session.
+ */
+function buildConfigSystemPrompt(configDocs: string, configState: string): string {
+  return [
+    'You are helping the user edit their RAF configuration.',
+    'You have full permission to read and write ~/.raf/raf.config.json.',
+    '',
+    '# Current Config State',
+    configState,
+    '',
+    '# Config Documentation',
+    configDocs,
+  ].join('\n');
+}
+
+/**
+ * Validate the config file after the Claude session ends and report results.
+ */
+function postSessionValidation(configPath: string): void {
+  if (!fs.existsSync(configPath)) {
+    logger.info('No config file exists — using all defaults.');
+    return;
+  }
+
+  try {
+    const content = fs.readFileSync(configPath, 'utf-8');
+    const parsed: unknown = JSON.parse(content);
+    validateConfig(parsed);
+    logger.success('Config updated successfully.');
+
+    // Show a summary of what's set
+    const userConfig = parsed as Record<string, unknown>;
+    const keys = Object.keys(userConfig);
+    if (keys.length > 0) {
+      logger.info(`Custom settings: ${keys.join(', ')}`);
+    }
+  } catch (error) {
+    if (error instanceof ConfigValidationError) {
+      logger.warn(`Config validation warning: ${error.message}`);
+      logger.warn('The file was not deleted — you can fix it manually or run `raf config` again.');
+    } else if (error instanceof SyntaxError) {
+      logger.warn('Config file contains invalid JSON.');
+      logger.warn('The file was not deleted — you can fix it manually or run `raf config` again.');
+    } else {
+      logger.warn(`Could not validate config: ${error}`);
+    }
+  }
+}
+
+/**
+ * Prompt the user for Y/N confirmation via readline.
+ */
+async function confirm(message: string): Promise<boolean> {
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+  });
+
+  return new Promise((resolve) => {
+    rl.question(message, (answer) => {
+      rl.close();
+      resolve(answer.trim().toLowerCase() === 'y');
+    });
+  });
+}
+
+export function createConfigCommand(): Command {
+  const command = new Command('config')
+    .description('View and edit RAF configuration with Claude')
+    .argument('[prompt...]', 'Optional initial prompt for the config session')
+    .option('--reset', 'Delete config file and restore all defaults')
+    .action(async (promptParts: string[], options: ConfigCommandOptions) => {
+      if (options.reset) {
+        await handleReset();
+        return;
+      }
+
+      const initialPrompt = promptParts.length > 0 ? promptParts.join(' ') : undefined;
+      await runConfigSession(initialPrompt);
+    });
+
+  return command;
+}
+
+async function handleReset(): Promise<void> {
+  const configPath = getConfigPath();
+
+  if (!fs.existsSync(configPath)) {
+    logger.info('No config file exists — already using defaults.');
+    return;
+  }
+
+  const confirmed = await confirm(
+    'This will delete ~/.raf/raf.config.json and restore all defaults. Continue? [y/N] '
+  );
+
+  if (!confirmed) {
+    logger.info('Cancelled.');
+    return;
+  }
+
+  fs.unlinkSync(configPath);
+  logger.success('Config file deleted. All settings restored to defaults.');
+}
+
+async function runConfigSession(initialPrompt?: string): Promise<void> {
+  const configPath = getConfigPath();
+  const model = getModel('config');
+  const effort = getEffort('config');
+
+  // Set effort level env var for the Claude session
+  process.env['CLAUDE_CODE_EFFORT_LEVEL'] = effort;
+
+  // Load config docs
+  let configDocs: string;
+  try {
+    configDocs = loadConfigDocs();
+  } catch (error) {
+    logger.error(`Failed to load config documentation: ${error}`);
+    process.exit(1);
+  }
+
+  // Build system prompt
+  const configState = getCurrentConfigState(configPath);
+  const systemPrompt = buildConfigSystemPrompt(configDocs, configState);
+
+  // Build user message
+  const userMessage = initialPrompt
+    ?? 'Show me my current config and help me make changes.';
+
+  // Set up Claude runner
+  const claudeRunner = new ClaudeRunner({ model });
+  shutdownHandler.init();
+  shutdownHandler.registerClaudeRunner(claudeRunner);
+
+  logger.info('Starting config session with Claude...');
+  logger.info(`Using model: ${model}`);
+  logger.newline();
+
+  try {
+    const exitCode = await claudeRunner.runInteractive(systemPrompt, userMessage, {
+      dangerouslySkipPermissions: true,
+    });
+
+    if (exitCode !== 0) {
+      logger.warn(`Claude exited with code ${exitCode}`);
+    }
+
+    // Post-session validation
+    logger.newline();
+    postSessionValidation(configPath);
+  } catch (error) {
+    logger.error(`Config session failed: ${error}`);
+    throw error;
+  }
+}

package/src/commands/do.ts

@@ -13,14 +13,18 @@ import { getRafDir, extractProjectNumber, extractProjectName, extractTaskNameFro
 import { pickPendingProject, getPendingProjects, getPendingWorktreeProjects } from '../ui/project-picker.js';
 import type { PendingProjectInfo } from '../ui/project-picker.js';
 import { logger } from '../utils/logger.js';
-import { getConfig } from '../utils/config.js';
+import { getConfig, getEffort, getWorktreeDefault } from '../utils/config.js';
 import { createTaskTimer, formatElapsedTime } from '../utils/timer.js';
 import { createStatusLine } from '../utils/status-line.js';
 import {
   formatProjectHeader,
   formatSummary,
   formatTaskProgress,
+  formatTaskTokenSummary,
+  formatTokenTotalSummary,
 } from '../utils/terminal-symbols.js';
+import { TokenTracker } from '../utils/token-tracker.js';
+import { VerboseToggle } from '../utils/verbose-toggle.js';
 import {
   deriveProjectState,
   discoverProjects,
@@ -134,12 +138,12 @@ export function createDoCommand(): Command {
 async function runDoCommand(projectIdentifierArg: string | undefined, options: DoCommandOptions): Promise<void> {
   const rafDir = getRafDir();
   let projectIdentifier = projectIdentifierArg;
-  let worktreeMode = options.worktree ?? false;
+  let worktreeMode = options.worktree ?? getWorktreeDefault();
 
   // Validate and resolve model option
   let model: string;
   try {
-    model = resolveModelOption(options.model as string | undefined, options.sonnet);
+    model = resolveModelOption(options.model as string | undefined, options.sonnet, 'execute');
   } catch (error) {
     logger.error((error as Error).message);
     process.exit(1);
@@ -711,6 +715,13 @@ async function executeSingleProject(
   shutdownHandler.init();
   shutdownHandler.registerClaudeRunner(claudeRunner);
 
+  // Initialize token tracker for usage reporting
+  const tokenTracker = new TokenTracker();
+
+  // Set up runtime verbose toggle (Tab key to toggle during execution)
+  const verboseToggle = new VerboseToggle(verbose);
+  shutdownHandler.onShutdown(() => verboseToggle.stop());
+
   // Start project timer
   const projectStartTime = Date.now();
 
@@ -816,6 +827,9 @@ async function executeSingleProject(
     return lines.join('\n');
   }
 
+  // Start verbose toggle listener (Tab key)
+  verboseToggle.start();
+
   let task = getNextTaskToProcess(state);
 
   while (task) {
@@ -891,6 +905,7 @@ async function executeSingleProject(
     let attempts = 0;
     let lastOutput = '';
     let failureReason = '';
+    let lastUsageData: import('../types/config.js').UsageData | undefined;
     // Track failure history for each attempt (attempt number -> reason)
     const failureHistory: Array<{ attempt: number; reason: string }> = [];
 
@@ -940,11 +955,23 @@ async function executeSingleProject(
       } : undefined;
 
       // Run Claude (use worktree root as cwd if in worktree mode)
+      const executeEffort = getEffort('execute');
+      const runnerOptions = {
+        timeout,
+        outcomeFilePath,
+        commitContext,
+        cwd: worktreeCwd,
+        effortLevel: executeEffort,
+        verboseCheck: () => verboseToggle.isVerbose,
+      };
       const result = verbose
-        ? await claudeRunner.runVerbose(prompt, { timeout, outcomeFilePath, commitContext, cwd: worktreeCwd, effortLevel: 'medium' })
-        : await claudeRunner.run(prompt, { timeout, outcomeFilePath, commitContext, cwd: worktreeCwd, effortLevel: 'medium' });
+        ? await claudeRunner.runVerbose(prompt, runnerOptions)
+        : await claudeRunner.run(prompt, runnerOptions);
 
       lastOutput = result.output;
+      if (result.usageData) {
+        lastUsageData = result.usageData;
+      }
 
       // Parse result
       const parsed = parseOutput(result.output);
@@ -1059,6 +1086,13 @@ Task completed. No detailed report provided.
         // Minimal mode: show completed task line
         logger.info(formatTaskProgress(taskNumber, totalTasks, 'completed', displayName, elapsedMs, task.id));
       }
+
+      // Track and display token usage for this task
+      if (lastUsageData) {
+        const entry = tokenTracker.addTask(task.id, lastUsageData);
+        logger.dim(formatTaskTokenSummary(entry.usage, entry.cost));
+      }
+
       completedInSession.add(task.id);
     } else {
       // Stash any uncommitted changes on complete failure
@@ -1080,6 +1114,12 @@ Task completed. No detailed report provided.
         logger.info(formatTaskProgress(taskNumber, totalTasks, 'failed', displayName, elapsedMs, task.id));
       }
 
+      // Track token usage even for failed tasks (partial data still useful for totals)
+      if (lastUsageData) {
+        const entry = tokenTracker.addTask(task.id, lastUsageData);
+        logger.dim(formatTaskTokenSummary(entry.usage, entry.cost));
+      }
+
       // Analyze failure and generate structured report
       const analysisReport = await analyzeFailure(lastOutput, failureReason, task.id);
 
@@ -1114,6 +1154,9 @@ ${stashName ? `- Stash: ${stashName}` : ''}
     task = getNextTaskToProcess(state);
   }
 
+  // Stop verbose toggle listener before summary output
+  verboseToggle.stop();
+
   // Ensure context is cleared for summary
   logger.clearContext();
 
@@ -1182,6 +1225,14 @@ ${stashName ? `- Stash: ${stashName}` : ''}
     }
   }
 
+  // Show token usage summary if any tasks reported usage data
+  const trackerEntries = tokenTracker.getEntries();
+  if (trackerEntries.length > 0) {
+    logger.newline();
+    const totals = tokenTracker.getTotals();
+    logger.dim(formatTokenTotalSummary(totals.usage, totals.cost));
+  }
+
   // Show retry history for tasks that had failures (even if eventually successful)
   if (projectRetryHistory.length > 0) {
     logger.newline();

package/src/commands/plan.ts

@@ -15,6 +15,7 @@ import {
   resolveModelOption,
 } from '../utils/validation.js';
 import { logger } from '../utils/logger.js';
+import { getWorktreeDefault } from '../utils/config.js';
 import { generateProjectNames } from '../utils/name-generator.js';
 import { pickProjectName } from '../ui/name-picker.js';
 import {
@@ -73,14 +74,14 @@ export function createPlanCommand(): Command {
       // Validate and resolve model option
       let model: string;
       try {
-        model = resolveModelOption(options.model, options.sonnet);
+        model = resolveModelOption(options.model, options.sonnet, 'plan');
       } catch (error) {
         logger.error((error as Error).message);
         process.exit(1);
       }
 
       const autoMode = options.auto ?? false;
-      const worktreeMode = options.worktree ?? false;
+      const worktreeMode = options.worktree ?? getWorktreeDefault();
 
       if (options.amend) {
         if (!projectName) {