rafcode 2.4.0 → 2.5.0-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.0",
+  "version": "2.5.0-0",
   "description": "Automated Task Planning & Execution with Claude Code",
   "type": "module",
   "bin": {

package/src/commands/config.ts

@@ -13,11 +13,16 @@ import {
   validateConfig,
   ConfigValidationError,
   resetConfigCache,
+  resolveConfig,
+  saveConfig,
 } from '../utils/config.js';
 import { DEFAULT_CONFIG } from '../types/config.js';
+import type { UserConfig } from '../types/config.js';
 
 interface ConfigCommandOptions {
   reset?: boolean;
+  get?: true | string;  // true when --get with no key, string when --get <key>
+  set?: string[];       // [key, value]
 }
 
 /**
@@ -114,17 +119,254 @@ async function confirm(message: string): Promise<boolean> {
   });
 }
 
+// ---- Helper functions for nested config access ----
+
+/**
+ * Get a nested value from an object using dot notation.
+ * Returns undefined if the path doesn't exist.
+ */
+function getNestedValue(obj: unknown, dotPath: string): unknown {
+  const keys = dotPath.split('.');
+  let current: unknown = obj;
+
+  for (const key of keys) {
+    if (current === null || typeof current !== 'object') {
+      return undefined;
+    }
+    current = (current as Record<string, unknown>)[key];
+  }
+
+  return current;
+}
+
+/**
+ * Set a nested value in an object using dot notation.
+ * Creates intermediate objects as needed.
+ */
+function setNestedValue(obj: Record<string, unknown>, dotPath: string, value: unknown): void {
+  const keys = dotPath.split('.');
+  let current: Record<string, unknown> = obj;
+
+  for (let i = 0; i < keys.length - 1; i++) {
+    const key = keys[i]!;
+    if (!(key in current) || typeof current[key] !== 'object' || current[key] === null) {
+      current[key] = {};
+    }
+    current = current[key] as Record<string, unknown>;
+  }
+
+  const lastKey = keys[keys.length - 1]!;
+  current[lastKey] = value;
+}
+
+/**
+ * Delete a nested value from an object using dot notation.
+ * Cleans up empty parent objects after deletion.
+ */
+function deleteNestedValue(obj: Record<string, unknown>, dotPath: string): void {
+  const keys = dotPath.split('.');
+
+  // Navigate to parent and delete the key
+  if (keys.length === 1) {
+    delete obj[keys[0]!];
+    return;
+  }
+
+  // Build path to parent
+  let current: Record<string, unknown> = obj;
+  const path: Array<{ obj: Record<string, unknown>; key: string }> = [];
+
+  for (let i = 0; i < keys.length - 1; i++) {
+    const key = keys[i]!;
+    path.push({ obj: current, key });
+
+    if (typeof current[key] !== 'object' || current[key] === null) {
+      return; // Path doesn't exist
+    }
+    current = current[key] as Record<string, unknown>;
+  }
+
+  // Delete the leaf value
+  const lastKey = keys[keys.length - 1]!;
+  delete current[lastKey];
+
+  // Clean up empty parents
+  for (let i = path.length - 1; i >= 0; i--) {
+    const { obj, key } = path[i]!;
+    const child = obj[key] as Record<string, unknown>;
+    if (Object.keys(child).length === 0) {
+      delete obj[key];
+    } else {
+      break; // Stop if we find a non-empty parent
+    }
+  }
+}
+
+/**
+ * Get the default value at a dot-notation path from DEFAULT_CONFIG.
+ */
+function getDefaultValue(dotPath: string): unknown {
+  return getNestedValue(DEFAULT_CONFIG, dotPath);
+}
+
+/**
+ * Parse a string value, attempting JSON.parse for numbers/booleans, falling back to string.
+ */
+function parseValue(value: string): unknown {
+  // Try JSON.parse for numbers, booleans, null
+  try {
+    return JSON.parse(value);
+  } catch {
+    // Fall back to string
+    return value;
+  }
+}
+
+/**
+ * Format a value for console output.
+ * Strings are printed plain, objects/arrays as JSON.
+ */
+function formatValue(value: unknown): string {
+  if (typeof value === 'string') {
+    return value;
+  }
+  if (typeof value === 'number' || typeof value === 'boolean') {
+    return String(value);
+  }
+  if (value === null || value === undefined) {
+    return String(value);
+  }
+  return JSON.stringify(value, null, 2);
+}
+
+// ---- Config get/set handlers ----
+
+/**
+ * Handle --get flag: print config value(s).
+ */
+function handleGet(key: true | string): void {
+  const config = resolveConfig();
+
+  if (key === true) {
+    // No key specified: print full config
+    console.log(JSON.stringify(config, null, 2));
+    return;
+  }
+
+  // Specific key requested
+  const value = getNestedValue(config, key);
+
+  if (value === undefined) {
+    logger.error(`Config key not found: ${key}`);
+    process.exit(1);
+  }
+
+  console.log(formatValue(value));
+}
+
+/**
+ * Handle --set flag: update config file with a new value.
+ */
+function handleSet(args: string[]): void {
+  if (args.length !== 2) {
+    logger.error('--set requires exactly 2 arguments: key and value');
+    process.exit(1);
+  }
+
+  const [key, rawValue] = args as [string, string];
+  const value = parseValue(rawValue);
+  const configPath = getConfigPath();
+
+  // Read current user config (or start with empty)
+  let userConfig: UserConfig = {};
+  if (fs.existsSync(configPath)) {
+    try {
+      const content = fs.readFileSync(configPath, 'utf-8');
+      userConfig = JSON.parse(content) as UserConfig;
+    } catch (error) {
+      logger.error(`Failed to read config file: ${error}`);
+      process.exit(1);
+    }
+  }
+
+  // Check if value matches default
+  const defaultValue = getDefaultValue(key);
+
+  if (defaultValue === undefined) {
+    logger.error(`Config key not found in schema: ${key}`);
+    process.exit(1);
+  }
+
+  // Deep equality check for objects
+  const valuesMatch = JSON.stringify(value) === JSON.stringify(defaultValue);
+
+  if (valuesMatch) {
+    // Remove from config file (keep config minimal)
+    deleteNestedValue(userConfig as Record<string, unknown>, key);
+    logger.info(`Value matches default, removing ${key} from config`);
+  } else {
+    // Set the value
+    setNestedValue(userConfig as Record<string, unknown>, key, value);
+    logger.info(`Set ${key} = ${formatValue(value)}`);
+  }
+
+  // Validate the resulting config
+  try {
+    validateConfig(userConfig);
+  } catch (error) {
+    if (error instanceof ConfigValidationError) {
+      logger.error(`Validation error: ${error.message}`);
+      process.exit(1);
+    }
+    throw error;
+  }
+
+  // Save or delete config file
+  if (Object.keys(userConfig).length === 0) {
+    // Config is empty, delete the file
+    if (fs.existsSync(configPath)) {
+      fs.unlinkSync(configPath);
+      logger.info('Config is empty, removed file');
+    }
+  } else {
+    saveConfig(configPath, userConfig);
+    logger.success('Config updated successfully');
+  }
+}
+
 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')
+    .option('--get [key]', 'Show config value (all config if no key, or specific dot-notation key)')
+    .option('--set <items...>', 'Set a config value using dot-notation key and value')
     .action(async (promptParts: string[], options: ConfigCommandOptions) => {
+      // --reset takes precedence
       if (options.reset) {
         await handleReset();
         return;
       }
 
+      // --get and --set are mutually exclusive
+      if (options.get !== undefined && options.set !== undefined) {
+        logger.error('Cannot use --get and --set together');
+        process.exit(1);
+      }
+
+      // Handle --get
+      if (options.get !== undefined) {
+        handleGet(options.get);
+        return;
+      }
+
+      // Handle --set
+      if (options.set !== undefined) {
+        handleSet(options.set);
+        return;
+      }
+
+      // Default: run interactive session
       const initialPrompt = promptParts.length > 0 ? promptParts.join(' ') : undefined;
       await runConfigSession(initialPrompt);
     });

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 } 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';
@@ -53,6 +53,8 @@ import {
   resolveWorktreeProjectByIdentifier,
   pushMainBranch,
   pullMainBranch,
+  detectMainBranch,
+  rebaseOntoMain,
 } from '../core/worktree.js';
 import { createPullRequest, prPreflight } from '../core/pull-request.js';
 import type { DoCommandOptions } from '../types/config.js';
@@ -224,6 +226,7 @@ async function runDoCommand(projectIdentifierArg: string | undefined, options: D
   // Variables for worktree context (set when --worktree is used)
   let worktreeRoot: string | undefined;
   let originalBranch: string | undefined;
+  let mainBranchName: string | null = null;
 
   if (worktreeMode) {
     // Validate git repo
@@ -241,6 +244,7 @@ async function runDoCommand(projectIdentifierArg: string | undefined, options: D
     // Sync main branch before worktree operations (if enabled)
     if (getSyncMainBranch()) {
       const syncResult = pullMainBranch();
+      mainBranchName = syncResult.mainBranch;
       if (syncResult.success) {
         if (syncResult.hadChanges) {
           logger.info(`Synced ${syncResult.mainBranch} from remote`);
@@ -462,6 +466,20 @@ async function runDoCommand(projectIdentifierArg: string | undefined, options: D
       }
       throw error;
     }
+
+    // Rebase worktree branch onto main before execution (if sync is enabled)
+    if (getSyncMainBranch()) {
+      const mainBranch = mainBranchName ?? detectMainBranch();
+      if (mainBranch) {
+        const rebaseResult = rebaseOntoMain(mainBranch, worktreeRoot);
+        if (rebaseResult.success) {
+          logger.info(`Rebased onto ${mainBranch}`);
+        } else {
+          logger.warn(`Could not rebase onto ${mainBranch}: ${rebaseResult.error}`);
+          logger.warn('Continuing with current branch state.');
+        }
+      }
+    }
   }
 
   // Execute project
@@ -1003,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();
@@ -1013,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();
 
@@ -1036,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`);
@@ -1211,13 +1235,16 @@ 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);
-        logger.dim(formatTaskTokenSummary(entry, (u) => tokenTracker.calculateCost(u)));
+        logger.dim(formatTaskTokenSummary(entry, {
+          showCacheTokens: getShowCacheTokens(),
+        }));
       }
 
       completedInSession.add(task.id);
@@ -1239,13 +1266,16 @@ 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);
-        logger.dim(formatTaskTokenSummary(entry, (u) => tokenTracker.calculateCost(u)));
+        logger.dim(formatTaskTokenSummary(entry, {
+          showCacheTokens: getShowCacheTokens(),
+        }));
       }
 
       // Analyze failure and generate structured report
@@ -1358,7 +1388,9 @@ ${stashName ? `- Stash: ${stashName}` : ''}
   if (trackerEntries.length > 0) {
     logger.newline();
     const totals = tokenTracker.getTotals();
-    logger.dim(formatTokenTotalSummary(totals.usage, totals.cost));
+    logger.dim(formatTokenTotalSummary(totals.usage, totals.cost, {
+      showCacheTokens: getShowCacheTokens(),
+    }));
   }
 
   // Show retry history for tasks that had failures (even if eventually successful)