rafcode 2.4.1-0 → 2.5.0

package/dist/utils/token-tracker.js

@@ -1,23 +1,12 @@
-import { resolveModelPricingCategory, getPricingConfig, getRateLimitWindowConfig } from './config.js';
 /**
  * Sum multiple CostBreakdown objects into a single total.
  */
 export function sumCostBreakdowns(costs) {
-    const result = {
-        inputCost: 0,
-        outputCost: 0,
-        cacheReadCost: 0,
-        cacheCreateCost: 0,
-        totalCost: 0,
-    };
+    let totalCost = 0;
     for (const cost of costs) {
-        result.inputCost += cost.inputCost;
-        result.outputCost += cost.outputCost;
-        result.cacheReadCost += cost.cacheReadCost;
-        result.cacheCreateCost += cost.cacheCreateCost;
-        result.totalCost += cost.totalCost;
+        totalCost += cost.totalCost;
     }
-    return result;
+    return { totalCost };
 }
 /**
  * Merge multiple UsageData objects into a single accumulated UsageData.
@@ -30,6 +19,7 @@ export function accumulateUsage(attempts) {
         cacheReadInputTokens: 0,
         cacheCreationInputTokens: 0,
         modelUsage: {},
+        totalCostUsd: 0,
     };
     for (const attempt of attempts) {
         result.inputTokens += attempt.inputTokens;
@@ -44,36 +34,35 @@ export function accumulateUsage(attempts) {
                 existing.outputTokens += modelUsage.outputTokens;
                 existing.cacheReadInputTokens += modelUsage.cacheReadInputTokens;
                 existing.cacheCreationInputTokens += modelUsage.cacheCreationInputTokens;
+                existing.costUsd += modelUsage.costUsd;
             }
             else {
                 result.modelUsage[modelId] = { ...modelUsage };
             }
         }
+        // Sum totalCostUsd across attempts
+        result.totalCostUsd += attempt.totalCostUsd;
     }
     return result;
 }
 /**
- * Accumulates token usage across multiple task executions and calculates costs
- * using configurable per-model pricing.
+ * Accumulates token usage across multiple task executions using Claude-provided cost data.
  */
 export class TokenTracker {
     entries = [];
-    pricingConfig;
-    constructor(pricingConfig) {
-        this.pricingConfig = pricingConfig ?? getPricingConfig();
+    constructor() {
+        // No pricing config needed - costs come from Claude
     }
     /**
      * Record usage data from a completed task.
      * Accepts an array of UsageData (one per attempt) and accumulates them.
-     * Cost is calculated per-attempt to avoid underreporting when some attempts
-     * have modelUsage and others only have aggregate fields.
+     * Costs are summed from Claude-provided totalCostUsd values.
      */
     addTask(taskId, attempts) {
         const usage = accumulateUsage(attempts);
-        // Calculate cost per-attempt, then sum. This ensures attempts with only
-        // aggregate fields use sonnet fallback pricing independently.
-        const perAttemptCosts = attempts.map((attempt) => this.calculateCost(attempt));
-        const cost = sumCostBreakdowns(perAttemptCosts);
+        // Sum costs from Claude-provided totalCostUsd
+        const totalCost = attempts.reduce((sum, attempt) => sum + attempt.totalCostUsd, 0);
+        const cost = { totalCost };
         const entry = { taskId, usage, cost, attempts };
         this.entries.push(entry);
         return entry;
@@ -94,12 +83,9 @@ export class TokenTracker {
             cacheReadInputTokens: 0,
             cacheCreationInputTokens: 0,
             modelUsage: {},
+            totalCostUsd: 0,
         };
         const totalCost = {
-            inputCost: 0,
-            outputCost: 0,
-            cacheReadCost: 0,
-            cacheCreateCost: 0,
             totalCost: 0,
         };
         for (const entry of this.entries) {
@@ -107,6 +93,7 @@ export class TokenTracker {
             totalUsage.outputTokens += entry.usage.outputTokens;
             totalUsage.cacheReadInputTokens += entry.usage.cacheReadInputTokens;
             totalUsage.cacheCreationInputTokens += entry.usage.cacheCreationInputTokens;
+            totalUsage.totalCostUsd += entry.usage.totalCostUsd;
             // Merge per-model usage
             for (const [modelId, modelUsage] of Object.entries(entry.usage.modelUsage)) {
                 const existing = totalUsage.modelUsage[modelId];
@@ -115,83 +102,15 @@ export class TokenTracker {
                     existing.outputTokens += modelUsage.outputTokens;
                     existing.cacheReadInputTokens += modelUsage.cacheReadInputTokens;
                     existing.cacheCreationInputTokens += modelUsage.cacheCreationInputTokens;
+                    existing.costUsd += modelUsage.costUsd;
                 }
                 else {
                     totalUsage.modelUsage[modelId] = { ...modelUsage };
                 }
             }
-            totalCost.inputCost += entry.cost.inputCost;
-            totalCost.outputCost += entry.cost.outputCost;
-            totalCost.cacheReadCost += entry.cost.cacheReadCost;
-            totalCost.cacheCreateCost += entry.cost.cacheCreateCost;
             totalCost.totalCost += entry.cost.totalCost;
         }
         return { usage: totalUsage, cost: totalCost };
     }
-    /**
-     * Calculate cost for a given UsageData using per-model pricing.
-     * Uses per-model breakdown when available, falls back to aggregate with sonnet pricing.
-     */
-    calculateCost(usage) {
-        const result = {
-            inputCost: 0,
-            outputCost: 0,
-            cacheReadCost: 0,
-            cacheCreateCost: 0,
-            totalCost: 0,
-        };
-        const modelEntries = Object.entries(usage.modelUsage);
-        if (modelEntries.length > 0) {
-            // Use per-model breakdown for accurate pricing
-            for (const [modelId, modelUsage] of modelEntries) {
-                const category = resolveModelPricingCategory(modelId);
-                const pricing = this.pricingConfig[category ?? 'sonnet'];
-                result.inputCost += (modelUsage.inputTokens / 1_000_000) * pricing.inputPerMTok;
-                result.outputCost += (modelUsage.outputTokens / 1_000_000) * pricing.outputPerMTok;
-                result.cacheReadCost += (modelUsage.cacheReadInputTokens / 1_000_000) * pricing.cacheReadPerMTok;
-                result.cacheCreateCost += (modelUsage.cacheCreationInputTokens / 1_000_000) * pricing.cacheCreatePerMTok;
-            }
-        }
-        else {
-            // Fallback: use aggregate totals with sonnet pricing
-            const pricing = this.pricingConfig.sonnet;
-            result.inputCost = (usage.inputTokens / 1_000_000) * pricing.inputPerMTok;
-            result.outputCost = (usage.outputTokens / 1_000_000) * pricing.outputPerMTok;
-            result.cacheReadCost = (usage.cacheReadInputTokens / 1_000_000) * pricing.cacheReadPerMTok;
-            result.cacheCreateCost = (usage.cacheCreationInputTokens / 1_000_000) * pricing.cacheCreatePerMTok;
-        }
-        result.totalCost = result.inputCost + result.outputCost + result.cacheReadCost + result.cacheCreateCost;
-        return result;
-    }
-    /**
-     * Calculate the 5h rate limit window percentage for a given cost.
-     * Converts cost to Sonnet-equivalent tokens using the configured Sonnet pricing,
-     * then divides by the configured cap.
-     *
-     * @param totalCost - The total cost in dollars
-     * @param sonnetTokenCap - Optional override for the Sonnet-equivalent token cap (defaults to config value)
-     * @returns The percentage of the 5h window consumed (0-100+)
-     */
-    calculateRateLimitPercentage(totalCost, sonnetTokenCap) {
-        if (totalCost === 0)
-            return 0;
-        // Get the configured cap or use the provided override
-        const cap = sonnetTokenCap ?? getRateLimitWindowConfig().sonnetTokenCap;
-        // Calculate the average Sonnet cost per token
-        // Using the average of input and output pricing (simplified approach)
-        const sonnetPricing = this.pricingConfig.sonnet;
-        const avgSonnetCostPerToken = (sonnetPricing.inputPerMTok + sonnetPricing.outputPerMTok) / 2 / 1_000_000;
-        // Convert cost to Sonnet-equivalent tokens
-        const sonnetEquivalentTokens = totalCost / avgSonnetCostPerToken;
-        // Calculate percentage
-        return (sonnetEquivalentTokens / cap) * 100;
-    }
-    /**
-     * Get the cumulative 5h window percentage across all recorded tasks.
-     */
-    getCumulativeRateLimitPercentage(sonnetTokenCap) {
-        const totals = this.getTotals();
-        return this.calculateRateLimitPercentage(totals.cost.totalCost, sonnetTokenCap);
-    }
 }
 //# sourceMappingURL=token-tracker.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"token-tracker.js","sourceRoot":"","sources":["../../src/utils/token-tracker.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,2BAA2B,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAsBtG;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,KAAsB;IACtD,MAAM,MAAM,GAAkB;QAC5B,SAAS,EAAE,CAAC;QACZ,UAAU,EAAE,CAAC;QACb,aAAa,EAAE,CAAC;QAChB,eAAe,EAAE,CAAC;QAClB,SAAS,EAAE,CAAC;KACb,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC;QACnC,MAAM,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC;QACrC,MAAM,CAAC,aAAa,IAAI,IAAI,CAAC,aAAa,CAAC;QAC3C,MAAM,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC;QAC/C,MAAM,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC;IACrC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,QAAqB;IACnD,MAAM,MAAM,GAAc;QACxB,WAAW,EAAE,CAAC;QACd,YAAY,EAAE,CAAC;QACf,oBAAoB,EAAE,CAAC;QACvB,wBAAwB,EAAE,CAAC;QAC3B,UAAU,EAAE,EAAE;KACf,CAAC;IAEF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,CAAC,WAAW,IAAI,OAAO,CAAC,WAAW,CAAC;QAC1C,MAAM,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC;QAC5C,MAAM,CAAC,oBAAoB,IAAI,OAAO,CAAC,oBAAoB,CAAC;QAC5D,MAAM,CAAC,wBAAwB,IAAI,OAAO,CAAC,wBAAwB,CAAC;QAEpE,wBAAwB;QACxB,KAAK,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YACvE,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YAC5C,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,CAAC,WAAW,IAAI,UAAU,CAAC,WAAW,CAAC;gBAC/C,QAAQ,CAAC,YAAY,IAAI,UAAU,CAAC,YAAY,CAAC;gBACjD,QAAQ,CAAC,oBAAoB,IAAI,UAAU,CAAC,oBAAoB,CAAC;gBACjE,QAAQ,CAAC,wBAAwB,IAAI,UAAU,CAAC,wBAAwB,CAAC;YAC3E,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,UAAU,EAAE,CAAC;YACjD,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;GAGG;AACH,MAAM,OAAO,YAAY;IACf,OAAO,GAAqB,EAAE,CAAC;IAC/B,aAAa,CAAgB;IAErC,YAAY,aAA6B;QACvC,IAAI,CAAC,aAAa,GAAG,aAAa,IAAI,gBAAgB,EAAE,CAAC;IAC3D,CAAC;IAED;;;;;OAKG;IACH,OAAO,CAAC,MAAc,EAAE,QAAqB;QAC3C,MAAM,KAAK,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;QACxC,wEAAwE;QACxE,8DAA8D;QAC9D,MAAM,eAAe,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC;QAC/E,MAAM,IAAI,GAAG,iBAAiB,CAAC,eAAe,CAAC,CAAC;QAChD,MAAM,KAAK,GAAmB,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;QAChE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzB,OAAO,KAAK,CAAC;IACf,CAAC;IAED;;OAEG;IACH,UAAU;QACR,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAED;;OAEG;IACH,SAAS;QACP,MAAM,UAAU,GAAc;YAC5B,WAAW,EAAE,CAAC;YACd,YAAY,EAAE,CAAC;YACf,oBAAoB,EAAE,CAAC;YACvB,wBAAwB,EAAE,CAAC;YAC3B,UAAU,EAAE,EAAE;SACf,CAAC;QACF,MAAM,SAAS,GAAkB;YAC/B,SAAS,EAAE,CAAC;YACZ,UAAU,EAAE,CAAC;YACb,aAAa,EAAE,CAAC;YAChB,eAAe,EAAE,CAAC;YAClB,SAAS,EAAE,CAAC;SACb,CAAC;QAEF,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACjC,UAAU,CAAC,WAAW,IAAI,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC;YAClD,UAAU,CAAC,YAAY,IAAI,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC;YACpD,UAAU,CAAC,oBAAoB,IAAI,KAAK,CAAC,KAAK,CAAC,oBAAoB,CAAC;YACpE,UAAU,CAAC,wBAAwB,IAAI,KAAK,CAAC,KAAK,CAAC,wBAAwB,CAAC;YAE5E,wBAAwB;YACxB,KAAK,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC3E,MAAM,QAAQ,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBAChD,IAAI,QAAQ,EAAE,CAAC;oBACb,QAAQ,CAAC,WAAW,IAAI,UAAU,CAAC,WAAW,CAAC;oBAC/C,QAAQ,CAAC,YAAY,IAAI,UAAU,CAAC,YAAY,CAAC;oBACjD,QAAQ,CAAC,oBAAoB,IAAI,UAAU,CAAC,oBAAoB,CAAC;oBACjE,QAAQ,CAAC,wBAAwB,IAAI,UAAU,CAAC,wBAAwB,CAAC;gBAC3E,CAAC;qBAAM,CAAC;oBACN,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,UAAU,EAAE,CAAC;gBACrD,CAAC;YACH,CAAC;YAED,SAAS,CAAC,SAAS,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;YAC5C,SAAS,CAAC,UAAU,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC;YAC9C,SAAS,CAAC,aAAa,IAAI,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC;YACpD,SAAS,CAAC,eAAe,IAAI,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC;YACxD,SAAS,CAAC,SAAS,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;QAC9C,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAChD,CAAC;IAED;;;OAGG;IACH,aAAa,CAAC,KAAgB;QAC5B,MAAM,MAAM,GAAkB;YAC5B,SAAS,EAAE,CAAC;YACZ,UAAU,EAAE,CAAC;YACb,aAAa,EAAE,CAAC;YAChB,eAAe,EAAE,CAAC;YAClB,SAAS,EAAE,CAAC;SACb,CAAC;QAEF,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAEtD,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,+CAA+C;YAC/C,KAAK,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,YAAY,EAAE,CAAC;gBACjD,MAAM,QAAQ,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC;gBACtD,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAC;gBAEzD,MAAM,CAAC,SAAS,IAAI,CAAC,UAAU,CAAC,WAAW,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;gBAChF,MAAM,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,YAAY,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;gBACnF,MAAM,CAAC,aAAa,IAAI,CAAC,UAAU,CAAC,oBAAoB,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC;gBACjG,MAAM,CAAC,eAAe,IAAI,CAAC,UAAU,CAAC,wBAAwB,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;YAC3G,CAAC;QACH,CAAC;aAAM,CAAC;YACN,qDAAqD;YACrD,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;YAC1C,MAAM,CAAC,SAAS,GAAG,CAAC,KAAK,CAAC,WAAW,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;YAC1E,MAAM,CAAC,UAAU,GAAG,CAAC,KAAK,CAAC,YAAY,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,aAAa,CAAC;YAC7E,MAAM,CAAC,aAAa,GAAG,CAAC,KAAK,CAAC,oBAAoB,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAC3F,MAAM,CAAC,eAAe,GAAG,CAAC,KAAK,CAAC,wBAAwB,GAAG,SAAS,CAAC,GAAG,OAAO,CAAC,kBAAkB,CAAC;QACrG,CAAC;QAED,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,GAAG,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC;QACxG,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;;;;;;;OAQG;IACH,4BAA4B,CAAC,SAAiB,EAAE,cAAuB;QACrE,IAAI,SAAS,KAAK,CAAC;YAAE,OAAO,CAAC,CAAC;QAE9B,sDAAsD;QACtD,MAAM,GAAG,GAAG,cAAc,IAAI,wBAAwB,EAAE,CAAC,cAAc,CAAC;QAExE,8CAA8C;QAC9C,sEAAsE;QACtE,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC;QAChD,MAAM,qBAAqB,GAAG,CAAC,aAAa,CAAC,YAAY,GAAG,aAAa,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;QAEzG,2CAA2C;QAC3C,MAAM,sBAAsB,GAAG,SAAS,GAAG,qBAAqB,CAAC;QAEjE,uBAAuB;QACvB,OAAO,CAAC,sBAAsB,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;IAC9C,CAAC;IAED;;OAEG;IACH,gCAAgC,CAAC,cAAuB;QACtD,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC,4BAA4B,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IAClF,CAAC;CACF"}
+{"version":3,"file":"token-tracker.js","sourceRoot":"","sources":["../../src/utils/token-tracker.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/commands/do.ts

@@ -13,7 +13,7 @@ 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, getWorktreeDefault, getModel, getModelShortName, resolveFullModelId, getSyncMainBranch, resolveEffortToModel, applyModelCeiling, getShowRateLimitEstimate, getShowCacheTokens } from '../utils/config.js';
+import { getConfig, getWorktreeDefault, getModel, getModelShortName, resolveFullModelId, getSyncMainBranch, resolveEffortToModel, applyModelCeiling, getShowCacheTokens } from '../utils/config.js';
 import type { PlanFrontmatter } from '../utils/frontmatter.js';
 import { getVersion } from '../utils/version.js';
 import { createTaskTimer, formatElapsedTime } from '../utils/timer.js';
@@ -1021,6 +1021,8 @@ async function executeSingleProject(
     const attemptUsageData: import('../types/config.js').UsageData[] = [];
     // Track failure history for each attempt (attempt number -> reason)
     const failureHistory: Array<{ attempt: number; reason: string }> = [];
+    // Track current model for display in status line (updated in retry loop)
+    let currentModel: string | undefined;
 
     // Set up timer for elapsed time tracking
     const statusLine = createStatusLine();
@@ -1031,7 +1033,8 @@ async function executeSingleProject(
         return;
       }
       // Show running status with task name and timer (updates in place)
-      statusLine.update(formatTaskProgress(taskNumber, totalTasks, 'running', displayName, elapsed, taskId));
+      const modelShortName = currentModel ? getModelShortName(currentModel) : undefined;
+      statusLine.update(formatTaskProgress(taskNumber, totalTasks, 'running', displayName, elapsed, taskId, modelShortName));
     });
     timer.start();
 
@@ -1054,6 +1057,9 @@ async function executeSingleProject(
         isRetry,
       );
 
+      // Update current model for timer callback display
+      currentModel = modelResolution.model;
+
       // Log missing frontmatter warning on first attempt only
       if (!isRetry && modelResolution.missingFrontmatter) {
         logger.warn(`  No effort frontmatter found — using ceiling model`);
@@ -1229,17 +1235,15 @@ Task completed. No detailed report provided.
         logger.success(`  Task ${taskLabel} completed (${elapsedFormatted})`);
       } else {
         // Minimal mode: show completed task line
-        logger.info(formatTaskProgress(taskNumber, totalTasks, 'completed', displayName, elapsedMs, task.id));
+        const modelShortName = currentModel ? getModelShortName(currentModel) : undefined;
+        logger.info(formatTaskProgress(taskNumber, totalTasks, 'completed', displayName, elapsedMs, task.id, modelShortName));
       }
 
       // Track and display token usage for this task
       if (attemptUsageData.length > 0) {
         const entry = tokenTracker.addTask(task.id, attemptUsageData);
-        const taskRateLimitPct = tokenTracker.getCumulativeRateLimitPercentage();
-        logger.dim(formatTaskTokenSummary(entry, (u) => tokenTracker.calculateCost(u), {
+        logger.dim(formatTaskTokenSummary(entry, {
           showCacheTokens: getShowCacheTokens(),
-          showRateLimitEstimate: getShowRateLimitEstimate(),
-          rateLimitPercentage: taskRateLimitPct,
         }));
       }
 
@@ -1262,17 +1266,15 @@ Task completed. No detailed report provided.
         logger.info(`  Analyzing failure with ${analysisModel}...`);
       } else {
         // Minimal mode: show failed task line
-        logger.info(formatTaskProgress(taskNumber, totalTasks, 'failed', displayName, elapsedMs, task.id));
+        const modelShortName = currentModel ? getModelShortName(currentModel) : undefined;
+        logger.info(formatTaskProgress(taskNumber, totalTasks, 'failed', displayName, elapsedMs, task.id, modelShortName));
       }
 
       // Track token usage even for failed tasks (partial data still useful for totals)
       if (attemptUsageData.length > 0) {
         const entry = tokenTracker.addTask(task.id, attemptUsageData);
-        const taskRateLimitPct = tokenTracker.getCumulativeRateLimitPercentage();
-        logger.dim(formatTaskTokenSummary(entry, (u) => tokenTracker.calculateCost(u), {
+        logger.dim(formatTaskTokenSummary(entry, {
           showCacheTokens: getShowCacheTokens(),
-          showRateLimitEstimate: getShowRateLimitEstimate(),
-          rateLimitPercentage: taskRateLimitPct,
         }));
       }
 
@@ -1386,11 +1388,8 @@ ${stashName ? `- Stash: ${stashName}` : ''}
   if (trackerEntries.length > 0) {
     logger.newline();
     const totals = tokenTracker.getTotals();
-    const totalRateLimitPct = tokenTracker.getCumulativeRateLimitPercentage();
     logger.dim(formatTokenTotalSummary(totals.usage, totals.cost, {
       showCacheTokens: getShowCacheTokens(),
-      showRateLimitEstimate: getShowRateLimitEstimate(),
-      rateLimitPercentage: totalRateLimitPct,
     }));
   }
 

package/src/commands/plan.ts

@@ -49,6 +49,7 @@ import {
   removeWorktree,
   computeWorktreeBaseDir,
   pullMainBranch,
+  resolveWorktreeProjectByIdentifier,
 } from '../core/worktree.js';
 
 interface PlanCommandOptions {
@@ -57,6 +58,7 @@ interface PlanCommandOptions {
   sonnet?: boolean;
   auto?: boolean;
   worktree?: boolean;
+  resume?: string;
 }
 
 export function createPlanCommand(): Command {
@@ -71,6 +73,7 @@ export function createPlanCommand(): Command {
     .option('--sonnet', 'Use Sonnet model (shorthand for --model sonnet)')
     .option('-y, --auto', "Skip Claude's permission prompts for file operations")
     .option('-w, --worktree', 'Create a git worktree for isolated planning')
+    .option('-r, --resume <identifier>', 'Resume a planning session for an existing project')
     .action(async (projectName: string | undefined, options: PlanCommandOptions) => {
       // Validate and resolve model option
       let model: string;
@@ -84,7 +87,9 @@ export function createPlanCommand(): Command {
       const autoMode = options.auto ?? false;
       const worktreeMode = options.worktree ?? getWorktreeDefault();
 
-      if (options.amend) {
+      if (options.resume) {
+        await runResumeCommand(options.resume, model);
+      } else if (options.amend) {
         if (!projectName) {
           logger.error('--amend requires a project identifier');
           logger.error('Usage: raf plan <project> --amend');
@@ -676,3 +681,109 @@ ${taskList}
 # Describe what you want to add below:
 `;
 }
+
+async function runResumeCommand(identifier: string, model?: string): Promise<void> {
+  // Validate environment
+  const validation = validateEnvironment();
+  reportValidation(validation);
+
+  if (!validation.valid) {
+    process.exit(1);
+  }
+
+  // Try to resolve the project from worktrees first, then fall back to main repo
+  const repoBasename = getRepoBasename();
+  const rafDir = getRafDir();
+
+  let projectPath: string | undefined;
+  let resumeCwd: string | undefined;
+  let folderName: string | undefined;
+
+  // 1. Try worktree resolution first (if we're in a git repo)
+  if (repoBasename) {
+    const worktreeResolution = resolveWorktreeProjectByIdentifier(repoBasename, identifier);
+
+    if (worktreeResolution) {
+      // Found in worktree - validate and use it
+      const wtValidation = validateWorktree(worktreeResolution.worktreeRoot, '');
+
+      if (wtValidation.isValidWorktree) {
+        folderName = worktreeResolution.folder;
+        const repoRoot = getRepoRoot()!;
+        const rafRelativePath = path.relative(repoRoot, rafDir);
+        projectPath = path.join(worktreeResolution.worktreeRoot, rafRelativePath, folderName);
+        resumeCwd = worktreeResolution.worktreeRoot;
+        logger.info(`Resuming session in worktree: ${resumeCwd}`);
+      } else {
+        logger.warn(`Worktree found but invalid: ${worktreeResolution.worktreeRoot}`);
+        logger.warn('Falling back to main repo resolution.');
+        // Fall through to main repo resolution
+      }
+    }
+  }
+
+  // 2. If not found in worktree (or invalid), try main repo
+  if (!projectPath) {
+    const mainResolution = resolveProjectIdentifierWithDetails(rafDir, identifier);
+
+    if (!mainResolution.path) {
+      if (mainResolution.error === 'ambiguous' && mainResolution.matches) {
+        logger.error(`Ambiguous project name: ${identifier}`);
+        logger.error('Multiple projects match:');
+        for (const match of mainResolution.matches) {
+          logger.error(`  - ${match.folder}`);
+        }
+        logger.error('Please specify the project ID or full folder name.');
+      } else {
+        logger.error(`Project not found: ${identifier}`);
+      }
+      process.exit(1);
+    }
+
+    projectPath = mainResolution.path;
+    folderName = path.basename(projectPath);
+    resumeCwd = projectPath; // Use main repo project path as CWD
+  }
+
+  logger.info(`Project: ${folderName}`);
+  if (model) {
+    logger.info(`Model: ${model}`);
+  }
+  logger.newline();
+
+  // Set up shutdown handler
+  const claudeRunner = new ClaudeRunner({ model });
+  shutdownHandler.init();
+  shutdownHandler.registerClaudeRunner(claudeRunner);
+
+  // Launch Claude's resume picker
+  logger.info('Starting Claude session resume picker...');
+  logger.newline();
+
+  try {
+    const exitCode = await claudeRunner.runResume({ cwd: resumeCwd });
+
+    if (exitCode !== 0) {
+      logger.warn(`Claude exited with code ${exitCode}`);
+    }
+
+    // Check for created/updated plan files after resume session
+    const plansDir = getPlansDir(projectPath);
+    const planFiles = fs.existsSync(plansDir)
+      ? fs.readdirSync(plansDir).filter((f) => f.endsWith('.md')).sort()
+      : [];
+
+    if (planFiles.length > 0) {
+      logger.newline();
+      logger.success(`Session complete! Project has ${planFiles.length} plan(s).`);
+      logger.newline();
+      logger.info('Plans:');
+      for (const planFile of planFiles) {
+        logger.info(`  - plans/${planFile}`);
+      }
+    }
+  } catch (error) {
+    logger.error(`Resume session failed: ${error}`);
+    throw error;
+  }
+}

package/src/core/claude-runner.ts

@@ -364,6 +364,87 @@ export class ClaudeRunner {
     });
   }
 
+  /**
+   * Resume a Claude planning session using the interactive session picker.
+   * Launches `claude --resume` (or `claude -r`) to show available sessions for the CWD.
+   * Minimal approach - no system prompt or user message injection.
+   *
+   * @param options - Runner options (cwd)
+   */
+  async runResume(options: ClaudeRunnerOptions = {}): Promise<number> {
+    const { cwd = process.cwd() } = options;
+
+    return new Promise((resolve) => {
+      const args = ['--resume', '--model', this.model];
+
+      logger.debug(`Starting Claude session resume picker with model: ${this.model}`);
+
+      this.activeProcess = pty.spawn(getClaudePath(), args, {
+        name: 'xterm-256color',
+        cols: process.stdout.columns ?? 80,
+        rows: process.stdout.rows ?? 24,
+        cwd,
+        env: process.env as Record<string, string>,
+      });
+
+      // Set raw mode to pass through all input
+      if (process.stdin.isTTY) {
+        process.stdin.setRawMode(true);
+      }
+      process.stdin.resume();
+
+      // Pipe input to Claude
+      const onData = (data: Buffer): void => {
+        if (this.activeProcess && !this.killed) {
+          this.activeProcess.write(data.toString());
+        }
+      };
+      process.stdin.on('data', onData);
+
+      // Store disposables for proper cleanup
+      const disposables: IDisposable[] = [];
+
+      // Pipe output to stdout
+      disposables.push(this.activeProcess.onData((data) => {
+        process.stdout.write(data);
+      }));
+
+      disposables.push(this.activeProcess.onExit(({ exitCode }) => {
+        // Cleanup stdin
+        process.stdin.off('data', onData);
+        if (process.stdin.isTTY) {
+          process.stdin.setRawMode(false);
+        }
+        process.stdin.pause();
+
+        // Dispose all event listeners to prevent FD leaks
+        for (const disposable of disposables) {
+          try {
+            disposable.dispose();
+          } catch {
+            // Ignore disposal errors
+          }
+        }
+
+        // Ensure PTY is fully cleaned up
+        if (this.activeProcess) {
+          try {
+            this.activeProcess.kill();
+          } catch {
+            // Ignore - process may already be dead
+          }
+          this.activeProcess = null;
+        }
+
+        if (this.killed) {
+          resolve(130); // SIGINT exit code
+        } else {
+          resolve(exitCode);
+        }
+      }));
+    });
+  }
+
   /**
    * Run Claude non-interactively and collect output.
    * Uses stream-json format internally to capture token usage data.

package/src/index.ts

@@ -4,7 +4,6 @@ import { Command } from 'commander';
 import { createPlanCommand } from './commands/plan.js';
 import { createDoCommand } from './commands/do.js';
 import { createStatusCommand } from './commands/status.js';
-import { createMigrateCommand } from './commands/migrate.js';
 import { createConfigCommand } from './commands/config.js';
 import { getVersion } from './utils/version.js';
 
@@ -18,7 +17,6 @@ program
 program.addCommand(createPlanCommand());
 program.addCommand(createDoCommand());
 program.addCommand(createStatusCommand());
-program.addCommand(createMigrateCommand());
 program.addCommand(createConfigCommand());
 
 program.parse();

package/src/parsers/stream-renderer.ts

@@ -23,11 +23,13 @@ export interface StreamEvent {
     cache_read_input_tokens?: number;
     cache_creation_input_tokens?: number;
   };
+  total_cost_usd?: number;
   modelUsage?: Record<string, {
     inputTokens?: number;
     outputTokens?: number;
     cacheReadInputTokens?: number;
     cacheCreationInputTokens?: number;
+    costUSD?: number;
   }>;
   tool_use_result?: {
     type?: string;
@@ -175,6 +177,7 @@ function extractUsageData(event: StreamEvent): UsageData | undefined {
         outputTokens: data.outputTokens ?? 0,
         cacheReadInputTokens: data.cacheReadInputTokens ?? 0,
         cacheCreationInputTokens: data.cacheCreationInputTokens ?? 0,
+        costUsd: data.costUSD ?? 0,
       };
     }
   }
@@ -185,5 +188,6 @@ function extractUsageData(event: StreamEvent): UsageData | undefined {
     cacheReadInputTokens: usage?.cache_read_input_tokens ?? 0,
     cacheCreationInputTokens: usage?.cache_creation_input_tokens ?? 0,
     modelUsage,
+    totalCostUsd: event.total_cost_usd ?? 0,
   };
 }

package/src/prompts/amend.ts

@@ -200,7 +200,9 @@ This is rarely needed — prefer using the \`effort\` label so the user's config
 
 After creating all new plan files:
 1. Provide a summary of:
-   - The new tasks you've created
+   - The new tasks you've created, including the effort level for each task. Example format:
+     - Task 02: add-caching (effort: medium)
+     - Task 03: update-docs (effort: low)
    - How they relate to existing tasks
    - Total task count in the project
 2. Display this exit message to the user: