rafcode 2.3.0 → 2.4.0

package/dist/utils/token-tracker.js

@@ -1,4 +1,24 @@
-import { resolveModelPricingCategory, getPricingConfig } from './config.js';
+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,
+    };
+    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;
+    }
+    return result;
+}
 /**
  * Merge multiple UsageData objects into a single accumulated UsageData.
  * Sums all token fields and merges modelUsage maps.
@@ -45,10 +65,15 @@ export class TokenTracker {
     /**
      * 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.
      */
     addTask(taskId, attempts) {
         const usage = accumulateUsage(attempts);
-        const cost = this.calculateCost(usage);
+        // 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);
         const entry = { taskId, usage, cost, attempts };
         this.entries.push(entry);
         return entry;
@@ -138,5 +163,35 @@ export class TokenTracker {
         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":"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"}
+{"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.3.0",
+  "version": "2.4.0",
   "description": "Automated Task Planning & Execution with Claude Code",
   "type": "module",
   "bin": {

package/src/commands/config.ts

@@ -9,7 +9,6 @@ import { logger } from '../utils/logger.js';
 import {
   getConfigPath,
   getModel,
-  getEffort,
   getModelShortName,
   validateConfig,
   ConfigValidationError,
@@ -160,17 +159,14 @@ async function runConfigSession(initialPrompt?: string): Promise<void> {
   // Try to load config, but fall back to defaults if it's broken
   // This allows raf config to be used to fix a broken config file
   let model: string;
-  let effort: string;
   let configError: Error | null = null;
 
   try {
     model = getModel('config');
-    effort = getEffort('config');
   } catch (error) {
     // Config file has errors - fall back to defaults so the session can launch
     configError = error instanceof Error ? error : new Error(String(error));
     model = DEFAULT_CONFIG.models.config;
-    effort = DEFAULT_CONFIG.effort.config;
     // Clear the cached config so subsequent calls don't use the broken cache
     resetConfigCache();
   }
@@ -182,9 +178,6 @@ async function runConfigSession(initialPrompt?: string): Promise<void> {
     logger.newline();
   }
 
-  // Set effort level env var for the Claude session
-  process.env['CLAUDE_CODE_EFFORT_LEVEL'] = effort;
-
   // Load config docs
   let configDocs: string;
   try {

package/src/commands/do.ts

@@ -13,7 +13,9 @@ 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, getEffort, getWorktreeDefault, getModel, getModelShortName } from '../utils/config.js';
+import { getConfig, getWorktreeDefault, getModel, getModelShortName, resolveFullModelId, getSyncMainBranch, resolveEffortToModel, applyModelCeiling } from '../utils/config.js';
+import type { PlanFrontmatter } from '../utils/frontmatter.js';
+import { getVersion } from '../utils/version.js';
 import { createTaskTimer, formatElapsedTime } from '../utils/timer.js';
 import { createStatusLine } from '../utils/status-line.js';
 import {
@@ -49,6 +51,8 @@ import {
   mergeWorktreeBranch,
   removeWorktree,
   resolveWorktreeProjectByIdentifier,
+  pushMainBranch,
+  pullMainBranch,
 } from '../core/worktree.js';
 import { createPullRequest, prPreflight } from '../core/pull-request.js';
 import type { DoCommandOptions } from '../types/config.js';
@@ -61,6 +65,74 @@ import type { DoCommandOptions } from '../types/config.js';
  */
 export type PostExecutionAction = 'merge' | 'pr' | 'leave';
 
+/**
+ * Result of resolving a task's model from frontmatter.
+ */
+interface TaskModelResolution {
+  /** The resolved model (after ceiling is applied). */
+  model: string;
+  /** Whether a warning should be logged about missing frontmatter. */
+  missingFrontmatter: boolean;
+  /** Frontmatter parsing warnings to log. */
+  warnings: string[];
+}
+
+/**
+ * Resolve the execution model for a task from its frontmatter metadata.
+ *
+ * Resolution order:
+ * 1. Explicit `model` in frontmatter (subject to ceiling)
+ * 2. `effort` in frontmatter resolved via effortMapping (subject to ceiling)
+ * 3. Fallback to models.execute (the ceiling, with a warning)
+ *
+ * @param frontmatter - Parsed frontmatter from the plan file
+ * @param frontmatterWarnings - Warnings from frontmatter parsing
+ * @param ceilingModel - The ceiling model (usually models.execute from config)
+ * @param isRetry - Whether this is a retry attempt (escalates to ceiling)
+ */
+function resolveTaskModel(
+  frontmatter: PlanFrontmatter | undefined,
+  frontmatterWarnings: string[] | undefined,
+  ceilingModel: string,
+  isRetry: boolean,
+): TaskModelResolution {
+  const warnings = frontmatterWarnings ? [...frontmatterWarnings] : [];
+
+  // Retry escalation: always use the ceiling model on retry
+  if (isRetry) {
+    return { model: ceilingModel, missingFrontmatter: false, warnings };
+  }
+
+  // No frontmatter - fallback to ceiling with warning
+  if (!frontmatter) {
+    return {
+      model: ceilingModel,
+      missingFrontmatter: true,
+      warnings,
+    };
+  }
+
+  // Explicit model in frontmatter - apply ceiling
+  if (frontmatter.model) {
+    const model = applyModelCeiling(frontmatter.model, ceilingModel);
+    return { model, missingFrontmatter: false, warnings };
+  }
+
+  // Effort-based resolution - apply ceiling
+  if (frontmatter.effort) {
+    const mappedModel = resolveEffortToModel(frontmatter.effort);
+    const model = applyModelCeiling(mappedModel, ceilingModel);
+    return { model, missingFrontmatter: false, warnings };
+  }
+
+  // Frontmatter present but no effort or model - fallback to ceiling with warning
+  return {
+    model: ceilingModel,
+    missingFrontmatter: true,
+    warnings,
+  };
+}
+
 /**
  * Format failure history for console output.
  * Shows attempts that failed before eventual success or final failure.
@@ -166,6 +238,18 @@ async function runDoCommand(projectIdentifierArg: string | undefined, options: D
     // Record original branch before any worktree operations
     originalBranch = getCurrentBranch() ?? undefined;
 
+    // Sync main branch before worktree operations (if enabled)
+    if (getSyncMainBranch()) {
+      const syncResult = pullMainBranch();
+      if (syncResult.success) {
+        if (syncResult.hadChanges) {
+          logger.info(`Synced ${syncResult.mainBranch} from remote`);
+        }
+      } else {
+        logger.warn(`Could not sync main branch: ${syncResult.error}`);
+      }
+    }
+
     if (!projectIdentifier) {
       // Auto-discovery flow
       const selected = await discoverAndPickWorktreeProject(repoBasename, rafDir, rafRelativePath);
@@ -394,7 +478,6 @@ async function runDoCommand(projectIdentifierArg: string | undefined, options: D
         force,
         maxRetries,
         autoCommit,
-        showModel: true,
         model,
         worktreeCwd: worktreeRoot,
       }
@@ -500,6 +583,19 @@ async function executePostAction(
 
     case 'pr': {
       logger.newline();
+
+      // Push main branch to remote before PR creation (if enabled)
+      if (getSyncMainBranch()) {
+        const syncResult = pushMainBranch();
+        if (syncResult.success) {
+          if (syncResult.hadChanges) {
+            logger.info(`Pushed ${syncResult.mainBranch} to remote`);
+          }
+        } else {
+          logger.warn(`Could not push main branch: ${syncResult.error}`);
+        }
+      }
+
       logger.info(`Creating PR for branch "${worktreeBranch}"...`);
 
       const prResult = await createPullRequest(worktreeBranch, projectPath, { cwd: worktreeRoot });
@@ -658,7 +754,6 @@ interface SingleProjectOptions {
   force: boolean;
   maxRetries: number;
   autoCommit: boolean;
-  showModel: boolean;
   model: string;
   /** Worktree root directory. When set, Claude runs with cwd in the worktree. */
   worktreeCwd?: string;
@@ -669,7 +764,7 @@ async function executeSingleProject(
   projectName: string,
   options: SingleProjectOptions
 ): Promise<ProjectExecutionResult> {
-  const { timeout, verbose, debug, force, maxRetries, autoCommit, showModel, model, worktreeCwd } = options;
+  const { timeout, verbose, debug, force, maxRetries, autoCommit, model, worktreeCwd } = options;
 
   if (!validatePlansExist(projectPath)) {
     return {
@@ -709,11 +804,12 @@ async function executeSingleProject(
       : state.tasks.filter((t) => t.status !== 'completed').map((t) => t.id)
   );
 
-  // Set up shutdown handler
-  const claudeRunner = new ClaudeRunner({ model });
+  // Set up shutdown handler - we'll register runners dynamically per-task
   const projectManager = new ProjectManager();
   shutdownHandler.init();
-  shutdownHandler.registerClaudeRunner(claudeRunner);
+
+  // The ceiling model for all tasks (can be overridden per-task, subject to this ceiling)
+  const ceilingModel = model;
 
   // Initialize token tracker for usage reporting
   const tokenTracker = new TokenTracker();
@@ -725,15 +821,13 @@ async function executeSingleProject(
   // Start project timer
   const projectStartTime = Date.now();
 
+  // Resolve and display version + ceiling model info (before any tasks run)
+  const fullCeilingModelId = resolveFullModelId(ceilingModel);
+  logger.dim(`RAF v${getVersion()} | Ceiling: ${fullCeilingModelId}`);
+
   if (verbose) {
     logger.info(`Executing project: ${projectName}`);
     logger.info(`Tasks: ${state.tasks.length}, Task timeout: ${timeout} minutes`);
-
-    // Log Claude model name
-    if (showModel && model) {
-      logger.info(`Using model: ${model}`);
-    }
-
     logger.newline();
   } else {
     // Minimal mode: show project header
@@ -923,16 +1017,45 @@ async function executeSingleProject(
     });
     timer.start();
 
+    // Log frontmatter warnings once before the retry loop
+    if (task.frontmatterWarnings && task.frontmatterWarnings.length > 0) {
+      for (const warning of task.frontmatterWarnings) {
+        logger.warn(`  Frontmatter warning: ${warning}`);
+      }
+    }
+
     while (!success && attempts < maxRetries) {
       attempts++;
+      const isRetry = attempts > 1;
+
+      // Resolve the model for this attempt (escalates to ceiling on retry)
+      const modelResolution = resolveTaskModel(
+        task.frontmatter,
+        undefined, // warnings already logged above
+        ceilingModel,
+        isRetry,
+      );
+
+      // Log missing frontmatter warning on first attempt only
+      if (!isRetry && modelResolution.missingFrontmatter) {
+        logger.warn(`  No effort frontmatter found — using ceiling model`);
+      }
+
+      // Create a runner for this attempt's model
+      const taskRunner = new ClaudeRunner({ model: modelResolution.model });
+      shutdownHandler.registerClaudeRunner(taskRunner);
 
-      if (verbose && attempts > 1) {
-        logger.info(`  Retry ${attempts}/${maxRetries} for task ${taskLabel}...`);
+      if (verbose && isRetry) {
+        const retryModel = resolveFullModelId(modelResolution.model);
+        logger.info(`  Retry ${attempts}/${maxRetries} for task ${taskLabel} (model: ${retryModel})...`);
+      } else if (verbose && !isRetry) {
+        const taskModel = resolveFullModelId(modelResolution.model);
+        logger.info(`  Model: ${taskModel}`);
       }
 
       // Build execution prompt (inside loop to include retry context on retries)
       // Check if previous outcome file exists for retry context
-      const previousOutcomeFileForRetry = attempts > 1 && fs.existsSync(outcomeFilePath)
+      const previousOutcomeFileForRetry = isRetry && fs.existsSync(outcomeFilePath)
         ? outcomeFilePath
         : undefined;
 
@@ -961,18 +1084,16 @@ 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, runnerOptions)
-        : await claudeRunner.run(prompt, runnerOptions);
+        ? await taskRunner.runVerbose(prompt, runnerOptions)
+        : await taskRunner.run(prompt, runnerOptions);
 
       lastOutput = result.output;
       if (result.usageData) {

package/src/commands/plan.ts

@@ -1,5 +1,6 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
+import * as crypto from 'node:crypto';
 import { Command } from 'commander';
 import { ProjectManager } from '../core/project-manager.js';
 import { ClaudeRunner } from '../core/claude-runner.js';
@@ -15,7 +16,10 @@ import {
   resolveModelOption,
 } from '../utils/validation.js';
 import { logger } from '../utils/logger.js';
-import { getWorktreeDefault, getModel, getModelShortName } from '../utils/config.js';
+import { getWorktreeDefault, getModel, getModelShortName, getDisplayConfig, getPricingConfig, getSyncMainBranch } from '../utils/config.js';
+import { TokenTracker } from '../utils/token-tracker.js';
+import { parseSessionById } from '../utils/session-parser.js';
+import { formatTokenTotalSummary, TokenSummaryOptions } from '../utils/terminal-symbols.js';
 import { generateProjectNames } from '../utils/name-generator.js';
 import { pickProjectName } from '../ui/name-picker.js';
 import {
@@ -48,6 +52,7 @@ import {
   validateWorktree,
   removeWorktree,
   computeWorktreeBaseDir,
+  pullMainBranch,
 } from '../core/worktree.js';
 
 interface PlanCommandOptions {
@@ -185,6 +190,18 @@ async function runPlanCommand(projectName?: string, model?: string, autoMode: bo
     const repoRoot = getRepoRoot()!;
     const rafDir = getRafDir();
 
+    // Sync main branch before creating worktree (if enabled)
+    if (getSyncMainBranch()) {
+      const syncResult = pullMainBranch();
+      if (syncResult.success) {
+        if (syncResult.hadChanges) {
+          logger.info(`Synced ${syncResult.mainBranch} from remote`);
+        }
+      } else {
+        logger.warn(`Could not sync main branch: ${syncResult.error}`);
+      }
+    }
+
     // Compute project number from main repo's RAF directory
     const projectNumber = getNextProjectNumber(rafDir);
     const sanitizedName = sanitizeProjectName(finalProjectName);
@@ -272,17 +289,25 @@ async function runPlanCommand(projectName?: string, model?: string, autoMode: bo
     worktreeMode,
   });
 
+  // Generate session ID for token tracking
+  const sessionId = crypto.randomUUID();
+  const sessionCwd = worktreePath ?? process.cwd();
+
   try {
     const exitCode = await claudeRunner.runInteractive(systemPrompt, userMessage, {
       dangerouslySkipPermissions: autoMode,
       // Run Claude session in the worktree root if in worktree mode
       cwd: worktreePath ?? undefined,
+      sessionId,
     });
 
     if (exitCode !== 0) {
       logger.warn(`Claude exited with code ${exitCode}`);
     }
 
+    // Parse session file and display token usage summary
+    displayPlanSessionTokenSummary(sessionId, sessionCwd);
+
     // Check for created plan files
     const plansDir = getPlansDir(projectPath);
     const planFiles = fs.existsSync(plansDir)
@@ -412,6 +437,18 @@ async function runAmendCommand(identifier: string, model?: string, autoMode: boo
         logger.info(`Recreated worktree from branch: ${folderName}`);
       } else {
         // No branch — create fresh worktree and copy project files
+        // Sync main branch before creating worktree (if enabled)
+        if (getSyncMainBranch()) {
+          const syncResult = pullMainBranch();
+          if (syncResult.success) {
+            if (syncResult.hadChanges) {
+              logger.info(`Synced ${syncResult.mainBranch} from remote`);
+            }
+          } else {
+            logger.warn(`Could not sync main branch: ${syncResult.error}`);
+          }
+        }
+
         const result = createWorktree(repoBasename, folderName);
         if (!result.success) {
           logger.error(`Failed to create worktree: ${result.error}`);
@@ -567,17 +604,25 @@ async function runAmendCommand(identifier: string, model?: string, autoMode: boo
     worktreeMode,
   });
 
+  // Generate session ID for token tracking
+  const sessionId = crypto.randomUUID();
+  const sessionCwd = worktreePath ?? process.cwd();
+
   try {
     const exitCode = await claudeRunner.runInteractive(systemPrompt, userMessage, {
       dangerouslySkipPermissions: autoMode,
       // Run Claude session in the worktree root if in worktree mode
       cwd: worktreePath ?? undefined,
+      sessionId,
     });
 
     if (exitCode !== 0) {
       logger.warn(`Claude exited with code ${exitCode}`);
     }
 
+    // Parse session file and display token usage summary
+    displayPlanSessionTokenSummary(sessionId, sessionCwd);
+
     // Check for new plan files
     const allPlanFiles = fs.existsSync(plansDir)
       ? fs.readdirSync(plansDir).filter((f) => f.endsWith('.md')).sort()
@@ -653,3 +698,44 @@ ${taskList}
 # Describe what you want to add below:
 `;
 }
+
+/**
+ * Display token usage summary for a plan/amend session.
+ * Parses the Claude session file and displays formatted usage data.
+ */
+function displayPlanSessionTokenSummary(sessionId: string, cwd: string): void {
+  const result = parseSessionById(sessionId, cwd);
+
+  if (!result.success) {
+    // Session file not found or couldn't be parsed - just log debug and continue
+    logger.debug(`Could not parse session file: ${result.error}`);
+    return;
+  }
+
+  // Check if there's any usage data
+  const totalTokens = result.usage.inputTokens + result.usage.outputTokens;
+  if (totalTokens === 0) {
+    logger.debug('No token usage data found in session file');
+    return;
+  }
+
+  // Create tracker and add the session as a single "task"
+  const pricingConfig = getPricingConfig();
+  const tracker = new TokenTracker(pricingConfig);
+  const entry = tracker.addTask('plan', [result.usage]);
+
+  // Get display options
+  const displayConfig = getDisplayConfig();
+  const options: TokenSummaryOptions = {
+    showCacheTokens: displayConfig.showCacheTokens,
+    showRateLimitEstimate: displayConfig.showRateLimitEstimate,
+    rateLimitPercentage: displayConfig.showRateLimitEstimate
+      ? tracker.calculateRateLimitPercentage(entry.cost.totalCost)
+      : undefined,
+  };
+
+  // Display the summary
+  logger.newline();
+  const summary = formatTokenTotalSummary(result.usage, entry.cost, options);
+  console.log(summary);
+}

package/src/core/claude-runner.ts

@@ -6,12 +6,11 @@ import { logger } from '../utils/logger.js';
 import { renderStreamEvent } from '../parsers/stream-renderer.js';
 import type { UsageData } from '../types/config.js';
 import { getHeadCommitHash, getHeadCommitMessage, isFileCommittedInHead } from './git.js';
-import { getClaudeCommand, getModel } from '../utils/config.js';
+import { getModel } from '../utils/config.js';
 
 function getClaudePath(): string {
-  const cmd = getClaudeCommand();
   try {
-    return execSync(`which ${cmd}`, { encoding: 'utf-8' }).trim();
+    return execSync('which claude', { encoding: 'utf-8' }).trim();
   } catch {
     throw new Error('Claude CLI not found. Please ensure it is installed and in your PATH.');
   }
@@ -32,6 +31,12 @@ export interface ClaudeRunnerOptions {
    * Claude will still ask planning interview questions.
    */
   dangerouslySkipPermissions?: boolean;
+  /**
+   * Session ID for Claude CLI. When provided, passed as --session-id to enable
+   * locating the session file after the session ends for token tracking.
+   * Only used in interactive mode (runInteractive).
+   */
+  sessionId?: string;
   /**
    * Path to the outcome file. When provided, enables completion detection:
    * - Monitors stdout for completion markers (<promise>COMPLETE/FAILED</promise>)
@@ -53,12 +58,6 @@ export interface ClaudeRunnerOptions {
     /** Path to the outcome file that should be committed. */
     outcomeFilePath: string;
   };
-  /**
-   * Claude Code reasoning effort level.
-   * Sets CLAUDE_CODE_EFFORT_LEVEL env var for the spawned process.
-   * Only applied in non-interactive modes (run, runVerbose).
-   */
-  effortLevel?: 'low' | 'medium' | 'high';
   /**
    * Dynamic verbose display callback. When provided, called for each stream event
    * to determine whether to write display output to stdout. Overrides the static
@@ -287,7 +286,7 @@ export class ClaudeRunner {
     userMessage: string,
     options: ClaudeRunnerOptions = {}
   ): Promise<number> {
-    const { cwd = process.cwd(), dangerouslySkipPermissions = false } = options;
+    const { cwd = process.cwd(), dangerouslySkipPermissions = false, sessionId } = options;
 
     return new Promise((resolve) => {
       const args = ['--model', this.model];
@@ -297,6 +296,11 @@ export class ClaudeRunner {
         args.push('--dangerously-skip-permissions');
       }
 
+      // Add --session-id if provided (for token tracking)
+      if (sessionId) {
+        args.push('--session-id', sessionId);
+      }
+
       // System instructions via --append-system-prompt
       args.push('--append-system-prompt', systemPrompt);
 
@@ -415,7 +419,7 @@ export class ClaudeRunner {
     options: ClaudeRunnerOptions,
     verbose: boolean,
   ): Promise<RunResult> {
-    const { timeout = 60, cwd = process.cwd(), outcomeFilePath, commitContext, effortLevel, verboseCheck } = options;
+    const { timeout = 60, cwd = process.cwd(), outcomeFilePath, commitContext, verboseCheck } = options;
     // Ensure timeout is a positive number, fallback to 60 minutes
     const validatedTimeout = Number(timeout) > 0 ? Number(timeout) : 60;
     const timeoutMs = validatedTimeout * 60 * 1000;
@@ -437,11 +441,6 @@ export class ClaudeRunner {
       logger.debug(`Prompt length: ${prompt.length}, timeout: ${timeoutMs}ms, cwd: ${cwd}`);
       logger.debug(`Claude path: ${claudePath}`);
 
-      // Build env, optionally injecting effort level
-      const env = effortLevel
-        ? { ...process.env, CLAUDE_CODE_EFFORT_LEVEL: effortLevel }
-        : process.env;
-
       logger.debug('Spawning process...');
       // Use --output-format stream-json --verbose to get real-time streaming events
       // including tool calls, file operations, and token usage in the result event.
@@ -460,7 +459,7 @@ export class ClaudeRunner {
         'Execute the task as described in the system prompt.',
       ], {
         cwd,
-        env,
+        env: process.env,
         stdio: ['ignore', 'pipe', 'pipe'], // no stdin needed
       });