rafcode 2.3.0 → 2.4.1-0

package/dist/prompts/planning.js

@@ -68,9 +68,12 @@ After interviewing the user about all tasks, create plan files in the plans fold
 - ${projectPath}/plans/02-task-name.md
 - etc.
 
-Each plan file should follow this structure:
+Each plan file MUST have Obsidian-style frontmatter at the top, before the \`# Task:\` heading. The frontmatter uses standard YAML format with opening and closing \`---\` delimiters:
 
 \`\`\`markdown
+---
+effort: medium
+---
 # Task: [Task Name]
 
 ## Objective
@@ -105,6 +108,24 @@ Each plan file should follow this structure:
 [Any additional context, warnings, or considerations]
 \`\`\`
 
+### Frontmatter Requirements
+
+The \`effort\` field is REQUIRED in every plan file. It indicates task complexity and determines which Claude model will execute the task:
+- \`effort: low\` — Trivial/mechanical changes, simple one-file edits, config changes
+- \`effort: medium\` — Well-scoped feature work, bug fixes with clear plans, multi-file changes following existing patterns
+- \`effort: high\` — Architectural changes, complex logic, tasks requiring deep codebase understanding
+
+Optionally, you can add an explicit \`model\` field to override the effort-based model selection:
+\`\`\`markdown
+---
+effort: medium
+model: opus
+---
+# Task: ...
+\`\`\`
+
+This is rarely needed — prefer using the \`effort\` label so the user's config controls the actual model used.
+
 ### Step 4: Infer Task Dependencies
 
 For each task, analyze which other tasks must complete successfully before it can begin. Add a \`## Dependencies\` section to plan files that have prerequisites.
@@ -154,19 +175,15 @@ Planning complete! To exit this session and run your tasks:
 6. Only add Dependencies section when a task genuinely requires another to complete first
 7. Dependencies must only reference lower-numbered tasks to prevent circular dependencies
 8. Be specific - vague plans lead to poor execution
+9. ALWAYS include the \`effort\` frontmatter field in every plan file — assess each task's complexity
 
 ## Plan Output Style
 
-**CRITICAL**: Plans should be HIGH-LEVEL and CONCEPTUAL:
-- Describe WHAT needs to be done, not HOW to code it
-- Focus on architecture, data flow, and component interactions
-- NO code snippets or implementation details in plans
-- File paths ARE acceptable when referencing:
-  - Existing project files to modify
-  - Previous plan/outcome files for context
-  - Project structure and directories
-- Let the executing agent decide implementation specifics
-- Plans guide the work; they don't prescribe exact code`;
+Plans can include whatever level of detail you deem helpful for the executing agent. Use your judgment:
+- Include implementation details when they clarify the approach
+- Code snippets are acceptable when they help illustrate a specific pattern
+- File paths are helpful when referencing existing project files, patterns, or directories
+- Focus on clarity — the goal is for the executing agent to understand what needs to be done`;
     const userMessage = `Here is my project description:
 
 ${params.inputContent}

package/dist/prompts/planning.js.map

@@ -1 +1 @@
-{"version":3,"file":"planning.js","sourceRoot":"","sources":["../../src/prompts/planning.ts"],"names":[],"mappings":"AAWA;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAA4B;IAC5D,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IAC7C,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;IAEvD,MAAM,YAAY,GAAG;;;;;;;;;;kBAUL,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA8BzB,WAAW;;;;;;;;;;;;;;;;;;IAkBX,WAAW;IACX,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iCA4EkB,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;wDAyBW,CAAC;IAEvD,MAAM,WAAW,GAAG;;EAEpB,MAAM,CAAC,YAAY;;sDAEiC,CAAC;IAErD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC;AACvC,CAAC"}
+{"version":3,"file":"planning.js","sourceRoot":"","sources":["../../src/prompts/planning.ts"],"names":[],"mappings":"AAWA;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,MAA4B;IAC5D,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IAC7C,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;IAEvD,MAAM,YAAY,GAAG;;;;;;;;;;kBAUL,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA8BzB,WAAW;;;;;;;;;;;;;;;;;;IAkBX,WAAW;IACX,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iCAiGkB,YAAY;;;;;;;;;;;;;;;;;;;;;6FAqBgD,CAAC;IAE5F,MAAM,WAAW,GAAG;;EAEpB,MAAM,CAAC,YAAY;;sDAEiC,CAAC;IAErD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC;AACvC,CAAC"}

package/dist/types/config.d.ts

@@ -7,9 +7,9 @@ export type ClaudeModelAlias = 'sonnet' | 'haiku' | 'opus';
 export type ClaudeModelName = ClaudeModelAlias | (string & {
     __brand?: 'FullModelId';
 });
-export type EffortLevel = 'low' | 'medium' | 'high';
+/** Task complexity label for per-task effort frontmatter. Maps to models via effortMapping. */
+export type TaskEffortLevel = 'low' | 'medium' | 'high';
 export type ModelScenario = 'plan' | 'execute' | 'nameGeneration' | 'failureAnalysis' | 'prGeneration' | 'config';
-export type EffortScenario = ModelScenario;
 export type CommitFormatType = 'task' | 'plan' | 'amend';
 export interface ModelsConfig {
     plan: ClaudeModelName;
@@ -19,13 +19,14 @@ export interface ModelsConfig {
     prGeneration: ClaudeModelName;
     config: ClaudeModelName;
 }
-export interface EffortConfig {
-    plan: EffortLevel;
-    execute: EffortLevel;
-    nameGeneration: EffortLevel;
-    failureAnalysis: EffortLevel;
-    prGeneration: EffortLevel;
-    config: EffortLevel;
+/**
+ * Maps task complexity labels to model names.
+ * Used to resolve per-task effort frontmatter to a model.
+ */
+export interface EffortMappingConfig {
+    low: ClaudeModelName;
+    medium: ClaudeModelName;
+    high: ClaudeModelName;
 }
 export interface CommitFormatConfig {
     task: string;
@@ -48,16 +49,32 @@ export interface PricingConfig {
     sonnet: ModelPricing;
     haiku: ModelPricing;
 }
+/** Display options for token usage summaries. */
+export interface DisplayConfig {
+    /** Show estimated 5h rate limit window percentage. Default: true */
+    showRateLimitEstimate: boolean;
+    /** Show cache token counts in summaries. Default: true */
+    showCacheTokens: boolean;
+}
+/** Rate limit window configuration. */
+export interface RateLimitWindowConfig {
+    /** Sonnet-equivalent token cap for the 5h window. Default: 88000 */
+    sonnetTokenCap: number;
+}
 export interface RafConfig {
     models: ModelsConfig;
-    effort: EffortConfig;
+    /** Maps task complexity labels (low/medium/high) to models. Used for per-task effort frontmatter. */
+    effortMapping: EffortMappingConfig;
     timeout: number;
     maxRetries: number;
     autoCommit: boolean;
     worktree: boolean;
+    /** Sync main branch with remote before worktree/PR operations. Default: true */
+    syncMainBranch: boolean;
     commitFormat: CommitFormatConfig;
-    claudeCommand: string;
     pricing: PricingConfig;
+    display: DisplayConfig;
+    rateLimitWindow: RateLimitWindowConfig;
 }
 export declare const DEFAULT_CONFIG: RafConfig;
 /** Deep partial type for user config files — all fields optional at every level */
@@ -73,13 +90,13 @@ export declare const VALID_MODEL_ALIASES: readonly ClaudeModelAlias[];
 export declare const FULL_MODEL_ID_PATTERN: RegExp;
 /** @deprecated Use VALID_MODEL_ALIASES instead */
 export declare const VALID_MODELS: readonly ClaudeModelAlias[];
-export declare const VALID_EFFORTS: readonly EffortLevel[];
+/** Valid task effort levels for plan frontmatter. */
+export declare const VALID_TASK_EFFORTS: readonly TaskEffortLevel[];
 /** @deprecated Use DEFAULT_CONFIG instead */
 export declare const DEFAULT_RAF_CONFIG: {
     defaultTimeout: number;
     defaultMaxRetries: number;
     autoCommit: boolean;
-    claudeCommand: string;
 };
 export interface PlanCommandOptions {
     projectName?: string;

package/dist/types/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/types/config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/types/config.ts"],"names":[],"mappings":"AAAA,4CAA4C;AAC5C,MAAM,MAAM,gBAAgB,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;AAE3D;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,gBAAgB,GAAG,CAAC,MAAM,GAAG;IAAE,OAAO,CAAC,EAAE,aAAa,CAAA;CAAE,CAAC,CAAC;AAExF,+FAA+F;AAC/F,MAAM,MAAM,eAAe,GAAG,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;AAExD,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,SAAS,GAAG,gBAAgB,GAAG,iBAAiB,GAAG,cAAc,GAAG,QAAQ,CAAC;AAClH,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAEzD,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,eAAe,CAAC;IACtB,OAAO,EAAE,eAAe,CAAC;IACzB,cAAc,EAAE,eAAe,CAAC;IAChC,eAAe,EAAE,eAAe,CAAC;IACjC,YAAY,EAAE,eAAe,CAAC;IAC9B,MAAM,EAAE,eAAe,CAAC;CACzB;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,GAAG,EAAE,eAAe,CAAC;IACrB,MAAM,EAAE,eAAe,CAAC;IACxB,IAAI,EAAE,eAAe,CAAC;CACvB;AAED,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,uDAAuD;AACvD,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE1D,wFAAwF;AACxF,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,CAAC;IACzB,kBAAkB,EAAE,MAAM,CAAC;CAC5B;AAED,0EAA0E;AAC1E,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,YAAY,CAAC;IACnB,MAAM,EAAE,YAAY,CAAC;IACrB,KAAK,EAAE,YAAY,CAAC;CACrB;AAED,iDAAiD;AACjD,MAAM,WAAW,aAAa;IAC5B,oEAAoE;IACpE,qBAAqB,EAAE,OAAO,CAAC;IAC/B,0DAA0D;IAC1D,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,uCAAuC;AACvC,MAAM,WAAW,qBAAqB;IACpC,oEAAoE;IACpE,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,YAAY,CAAC;IACrB,qGAAqG;IACrG,aAAa,EAAE,mBAAmB,CAAC;IACnC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,gFAAgF;IAChF,cAAc,EAAE,OAAO,CAAC;IACxB,YAAY,EAAE,kBAAkB,CAAC;IACjC,OAAO,EAAE,aAAa,CAAC;IACvB,OAAO,EAAE,aAAa,CAAC;IACvB,eAAe,EAAE,qBAAqB,CAAC;CACxC;AAED,eAAO,MAAM,cAAc,EAAE,SAoD5B,CAAC;AAEF,mFAAmF;AACnF,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI;KAC1B,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAChE,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;AAEhD,eAAO,MAAM,mBAAmB,EAAE,SAAS,gBAAgB,EAAgC,CAAC;AAE5F;;;GAGG;AACH,eAAO,MAAM,qBAAqB,QAA+B,CAAC;AAElE,kDAAkD;AAClD,eAAO,MAAM,YAAY,6BAAsB,CAAC;AAEhD,qDAAqD;AACrD,eAAO,MAAM,kBAAkB,EAAE,SAAS,eAAe,EAA8B,CAAC;AAGxF,6CAA6C;AAC7C,eAAO,MAAM,kBAAkB;;;;CAI9B,CAAC;AAEF,MAAM,WAAW,kBAAkB;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,KAAK,CAAC,EAAE,eAAe,CAAC;IACxB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,qEAAqE;AACrE,MAAM,WAAW,eAAe;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,wBAAwB,EAAE,MAAM,CAAC;CAClC;AAED,2EAA2E;AAC3E,MAAM,WAAW,SAAS;IACxB,gDAAgD;IAChD,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,wBAAwB,EAAE,MAAM,CAAC;IACjC,kEAAkE;IAClE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAC7C"}

package/dist/types/config.js

@@ -7,25 +7,22 @@ export const DEFAULT_CONFIG = {
         prGeneration: 'sonnet',
         config: 'sonnet',
     },
-    effort: {
-        plan: 'high',
-        execute: 'medium',
-        nameGeneration: 'low',
-        failureAnalysis: 'low',
-        prGeneration: 'medium',
-        config: 'medium',
+    effortMapping: {
+        low: 'haiku',
+        medium: 'sonnet',
+        high: 'opus',
     },
     timeout: 60,
     maxRetries: 3,
     autoCommit: true,
     worktree: false,
+    syncMainBranch: true,
     commitFormat: {
         task: '{prefix}[{projectId}:{taskId}] {description}',
         plan: '{prefix}[{projectId}] Plan: {projectName}',
         amend: '{prefix}[{projectId}] Amend: {projectName}',
         prefix: 'RAF',
     },
-    claudeCommand: 'claude',
     pricing: {
         opus: {
             inputPerMTok: 15,
@@ -46,6 +43,13 @@ export const DEFAULT_CONFIG = {
             cacheCreatePerMTok: 1.25,
         },
     },
+    display: {
+        showRateLimitEstimate: true,
+        showCacheTokens: true,
+    },
+    rateLimitWindow: {
+        sonnetTokenCap: 88000,
+    },
 };
 export const VALID_MODEL_ALIASES = ['sonnet', 'haiku', 'opus'];
 /**
@@ -55,13 +59,13 @@ export const VALID_MODEL_ALIASES = ['sonnet', 'haiku', 'opus'];
 export const FULL_MODEL_ID_PATTERN = /^claude-[a-z]+-\d+(-\d+)*$/;
 /** @deprecated Use VALID_MODEL_ALIASES instead */
 export const VALID_MODELS = VALID_MODEL_ALIASES;
-export const VALID_EFFORTS = ['low', 'medium', 'high'];
+/** Valid task effort levels for plan frontmatter. */
+export const VALID_TASK_EFFORTS = ['low', 'medium', 'high'];
 // Keep backward-compat exports used by other modules
 /** @deprecated Use DEFAULT_CONFIG instead */
 export const DEFAULT_RAF_CONFIG = {
     defaultTimeout: DEFAULT_CONFIG.timeout,
     defaultMaxRetries: DEFAULT_CONFIG.maxRetries,
     autoCommit: DEFAULT_CONFIG.autoCommit,
-    claudeCommand: DEFAULT_CONFIG.claudeCommand,
 };
 //# sourceMappingURL=config.js.map

package/dist/types/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/types/config.ts"],"names":[],"mappings":"AAqEA,MAAM,CAAC,MAAM,cAAc,GAAc;IACvC,MAAM,EAAE;QACN,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,MAAM;QACf,cAAc,EAAE,QAAQ;QACxB,eAAe,EAAE,OAAO;QACxB,YAAY,EAAE,QAAQ;QACtB,MAAM,EAAE,QAAQ;KACjB;IACD,MAAM,EAAE;QACN,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,QAAQ;QACjB,cAAc,EAAE,KAAK;QACrB,eAAe,EAAE,KAAK;QACtB,YAAY,EAAE,QAAQ;QACtB,MAAM,EAAE,QAAQ;KACjB;IACD,OAAO,EAAE,EAAE;IACX,UAAU,EAAE,CAAC;IACb,UAAU,EAAE,IAAI;IAChB,QAAQ,EAAE,KAAK;IACf,YAAY,EAAE;QACZ,IAAI,EAAE,8CAA8C;QACpD,IAAI,EAAE,2CAA2C;QACjD,KAAK,EAAE,4CAA4C;QACnD,MAAM,EAAE,KAAK;KACd;IACD,aAAa,EAAE,QAAQ;IACvB,OAAO,EAAE;QACP,IAAI,EAAE;YACJ,YAAY,EAAE,EAAE;YAChB,aAAa,EAAE,EAAE;YACjB,gBAAgB,EAAE,GAAG;YACrB,kBAAkB,EAAE,KAAK;SAC1B;QACD,MAAM,EAAE;YACN,YAAY,EAAE,CAAC;YACf,aAAa,EAAE,EAAE;YACjB,gBAAgB,EAAE,GAAG;YACrB,kBAAkB,EAAE,IAAI;SACzB;QACD,KAAK,EAAE;YACL,YAAY,EAAE,CAAC;YACf,aAAa,EAAE,CAAC;YAChB,gBAAgB,EAAE,GAAG;YACrB,kBAAkB,EAAE,IAAI;SACzB;KACF;CACF,CAAC;AASF,MAAM,CAAC,MAAM,mBAAmB,GAAgC,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAE5F;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,4BAA4B,CAAC;AAElE,kDAAkD;AAClD,MAAM,CAAC,MAAM,YAAY,GAAG,mBAAmB,CAAC;AAChD,MAAM,CAAC,MAAM,aAAa,GAA2B,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AAE/E,qDAAqD;AACrD,6CAA6C;AAC7C,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,cAAc,EAAE,cAAc,CAAC,OAAO;IACtC,iBAAiB,EAAE,cAAc,CAAC,UAAU;IAC5C,UAAU,EAAE,cAAc,CAAC,UAAU;IACrC,aAAa,EAAE,cAAc,CAAC,aAAa;CAC5C,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/types/config.ts"],"names":[],"mappings":"AAyFA,MAAM,CAAC,MAAM,cAAc,GAAc;IACvC,MAAM,EAAE;QACN,IAAI,EAAE,MAAM;QACZ,OAAO,EAAE,MAAM;QACf,cAAc,EAAE,QAAQ;QACxB,eAAe,EAAE,OAAO;QACxB,YAAY,EAAE,QAAQ;QACtB,MAAM,EAAE,QAAQ;KACjB;IACD,aAAa,EAAE;QACb,GAAG,EAAE,OAAO;QACZ,MAAM,EAAE,QAAQ;QAChB,IAAI,EAAE,MAAM;KACb;IACD,OAAO,EAAE,EAAE;IACX,UAAU,EAAE,CAAC;IACb,UAAU,EAAE,IAAI;IAChB,QAAQ,EAAE,KAAK;IACf,cAAc,EAAE,IAAI;IACpB,YAAY,EAAE;QACZ,IAAI,EAAE,8CAA8C;QACpD,IAAI,EAAE,2CAA2C;QACjD,KAAK,EAAE,4CAA4C;QACnD,MAAM,EAAE,KAAK;KACd;IACD,OAAO,EAAE;QACP,IAAI,EAAE;YACJ,YAAY,EAAE,EAAE;YAChB,aAAa,EAAE,EAAE;YACjB,gBAAgB,EAAE,GAAG;YACrB,kBAAkB,EAAE,KAAK;SAC1B;QACD,MAAM,EAAE;YACN,YAAY,EAAE,CAAC;YACf,aAAa,EAAE,EAAE;YACjB,gBAAgB,EAAE,GAAG;YACrB,kBAAkB,EAAE,IAAI;SACzB;QACD,KAAK,EAAE;YACL,YAAY,EAAE,CAAC;YACf,aAAa,EAAE,CAAC;YAChB,gBAAgB,EAAE,GAAG;YACrB,kBAAkB,EAAE,IAAI;SACzB;KACF;IACD,OAAO,EAAE;QACP,qBAAqB,EAAE,IAAI;QAC3B,eAAe,EAAE,IAAI;KACtB;IACD,eAAe,EAAE;QACf,cAAc,EAAE,KAAK;KACtB;CACF,CAAC;AASF,MAAM,CAAC,MAAM,mBAAmB,GAAgC,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AAE5F;;;GAGG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,4BAA4B,CAAC;AAElE,kDAAkD;AAClD,MAAM,CAAC,MAAM,YAAY,GAAG,mBAAmB,CAAC;AAEhD,qDAAqD;AACrD,MAAM,CAAC,MAAM,kBAAkB,GAA+B,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;AAExF,qDAAqD;AACrD,6CAA6C;AAC7C,MAAM,CAAC,MAAM,kBAAkB,GAAG;IAChC,cAAc,EAAE,cAAc,CAAC,OAAO;IACtC,iBAAiB,EAAE,cAAc,CAAC,UAAU;IAC5C,UAAU,EAAE,cAAc,CAAC,UAAU;CACtC,CAAC"}

package/dist/utils/config.d.ts

@@ -1,4 +1,4 @@
-import { RafConfig, UserConfig, ClaudeModelName, EffortLevel, ModelScenario, EffortScenario, CommitFormatType, PricingCategory, ModelPricing, PricingConfig } from '../types/config.js';
+import { RafConfig, UserConfig, ClaudeModelName, TaskEffortLevel, ModelScenario, CommitFormatType, PricingCategory, ModelPricing, PricingConfig, DisplayConfig, RateLimitWindowConfig, EffortMappingConfig } from '../types/config.js';
 export declare function getConfigPath(): string;
 /**
  * Get the path to Claude CLI settings file.
@@ -24,7 +24,6 @@ export declare function loadConfig(_rafDir: string): {
     defaultTimeout: number;
     defaultMaxRetries: number;
     autoCommit: boolean;
-    claudeCommand: string;
 };
 export declare function saveConfig(configPath: string, config: UserConfig): void;
 /**
@@ -34,20 +33,44 @@ export declare function saveConfig(configPath: string, config: UserConfig): void
 export declare function getResolvedConfig(): RafConfig;
 export declare function resetConfigCache(): void;
 export declare function getModel(scenario: ModelScenario): ClaudeModelName;
-export declare function getEffort(scenario: EffortScenario): EffortLevel;
+/**
+ * Get the full effort mapping config.
+ */
+export declare function getEffortMapping(): EffortMappingConfig;
+/**
+ * Resolve a task effort level to a model name using the effort mapping config.
+ */
+export declare function resolveEffortToModel(effort: TaskEffortLevel): ClaudeModelName;
+/**
+ * Get the numeric tier of a model for comparison.
+ * Extracts family from full model IDs (e.g., 'claude-opus-4-6' -> 3).
+ * Unknown models default to highest tier (3) so they're never accidentally capped.
+ */
+export declare function getModelTier(modelName: string): number;
+/**
+ * Apply ceiling to a model based on the configured models.execute ceiling.
+ * Returns the lower-tier model between the input and the ceiling.
+ */
+export declare function applyModelCeiling(resolvedModel: string, ceiling?: string): string;
 export declare function getCommitFormat(type: CommitFormatType): string;
 export declare function getCommitPrefix(): string;
 export declare function getTimeout(): number;
 export declare function getMaxRetries(): number;
 export declare function getAutoCommit(): boolean;
 export declare function getWorktreeDefault(): boolean;
-export declare function getClaudeCommand(): string;
+export declare function getSyncMainBranch(): boolean;
 /**
  * Extract the short model alias (opus, sonnet, haiku) from a model ID.
  * Works with both full model IDs (e.g., "claude-sonnet-4-5-20250929") and already-short names ("sonnet").
  * Returns the original string if no known alias can be extracted.
  */
 export declare function getModelShortName(modelId: string): string;
+/**
+ * Resolve a model name to its full model ID.
+ * If already a full model ID, returns as-is.
+ * If a short alias (opus, sonnet, haiku), returns the corresponding full ID.
+ */
+export declare function resolveFullModelId(modelName: string): string;
 /**
  * Map a full model ID (e.g., `claude-opus-4-6`) or short alias to a pricing category.
  * Returns null if the model cannot be mapped.
@@ -61,6 +84,26 @@ export declare function getPricing(category: PricingCategory): ModelPricing;
  * Get the full pricing config.
  */
 export declare function getPricingConfig(): PricingConfig;
+/**
+ * Get the full display config.
+ */
+export declare function getDisplayConfig(): DisplayConfig;
+/**
+ * Get the full rate limit window config.
+ */
+export declare function getRateLimitWindowConfig(): RateLimitWindowConfig;
+/**
+ * Get whether to show rate limit estimate in token summaries.
+ */
+export declare function getShowRateLimitEstimate(): boolean;
+/**
+ * Get whether to show cache tokens in summaries.
+ */
+export declare function getShowCacheTokens(): boolean;
+/**
+ * Get the Sonnet-equivalent token cap for the 5h rate limit window.
+ */
+export declare function getSonnetTokenCap(): number;
 /**
  * Render a commit message template by replacing {placeholder} tokens with values.
  * Unknown placeholders are left as-is.

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

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,SAAS,EAGT,UAAU,EAIV,eAAe,EACf,WAAW,EACX,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,YAAY,EACZ,aAAa,EACd,MAAM,oBAAoB,CAAC;AAK5B,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAED;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAE9C;AAsBD,qBAAa,qBAAsB,SAAQ,KAAK;gBAClC,OAAO,EAAE,MAAM;CAI5B;AAUD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEvD;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,UAAU,CA6G1D;AAkCD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAW5D;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,cAAc,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,CAE7I;AAED,wBAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI,CAMvE;AAMD;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,SAAS,CAK7C;AAED,wBAAgB,gBAAgB,IAAI,IAAI,CAEvC;AAED,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,aAAa,GAAG,eAAe,CAEjE;AAED,wBAAgB,SAAS,CAAC,QAAQ,EAAE,cAAc,GAAG,WAAW,CAE/D;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,gBAAgB,GAAG,MAAM,CAE9D;AAED,wBAAgB,eAAe,IAAI,MAAM,CAExC;AAED,wBAAgB,UAAU,IAAI,MAAM,CAEnC;AAED,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAED,wBAAgB,aAAa,IAAI,OAAO,CAEvC;AAED,wBAAgB,kBAAkB,IAAI,OAAO,CAE5C;AAED,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAezD;AAED;;;GAGG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CAcnF;AAED;;GAEG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,eAAe,GAAG,YAAY,CAElE;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,aAAa,CAEhD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAI/F;AAED,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYnE;AAED;;GAEG;AACH,wBAAgB,SAAS,IAAI;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,CAOxF"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"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"}

package/dist/utils/config.js

@@ -1,7 +1,7 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as os from 'node:os';
-import { DEFAULT_CONFIG, DEFAULT_RAF_CONFIG, VALID_MODEL_ALIASES, FULL_MODEL_ID_PATTERN, VALID_EFFORTS, } from '../types/config.js';
+import { DEFAULT_CONFIG, DEFAULT_RAF_CONFIG, VALID_MODEL_ALIASES, FULL_MODEL_ID_PATTERN, } from '../types/config.js';
 const CONFIG_DIR = path.join(os.homedir(), '.raf');
 const CONFIG_FILENAME = 'raf.config.json';
 export function getConfigPath() {
@@ -15,18 +15,18 @@ export function getClaudeSettingsPath() {
 }
 // ---- Validation ----
 const VALID_TOP_LEVEL_KEYS = new Set([
-    'models', 'effort', 'timeout', 'maxRetries', 'autoCommit',
-    'worktree', 'commitFormat', 'claudeCommand', 'pricing',
+    'models', 'effortMapping', 'timeout', 'maxRetries', 'autoCommit',
+    'worktree', 'syncMainBranch', 'commitFormat', 'pricing', 'display', 'rateLimitWindow',
 ]);
 const VALID_PRICING_CATEGORIES = new Set(['opus', 'sonnet', 'haiku']);
 const VALID_PRICING_FIELDS = new Set(['inputPerMTok', 'outputPerMTok', 'cacheReadPerMTok', 'cacheCreatePerMTok']);
 const VALID_MODEL_KEYS = new Set([
     'plan', 'execute', 'nameGeneration', 'failureAnalysis', 'prGeneration', 'config',
 ]);
-const VALID_EFFORT_KEYS = new Set([
-    'plan', 'execute', 'nameGeneration', 'failureAnalysis', 'prGeneration', 'config',
-]);
+const VALID_EFFORT_MAPPING_KEYS = new Set(['low', 'medium', 'high']);
 const VALID_COMMIT_FORMAT_KEYS = new Set(['task', 'plan', 'amend', 'prefix']);
+const VALID_DISPLAY_KEYS = new Set(['showRateLimitEstimate', 'showCacheTokens']);
+const VALID_RATE_LIMIT_WINDOW_KEYS = new Set(['sonnetTokenCap']);
 export class ConfigValidationError extends Error {
     constructor(message) {
         super(message);
@@ -65,16 +65,16 @@ export function validateConfig(config) {
             }
         }
     }
-    // effort
-    if (obj.effort !== undefined) {
-        if (typeof obj.effort !== 'object' || obj.effort === null || Array.isArray(obj.effort)) {
-            throw new ConfigValidationError('effort must be an object');
+    // effortMapping
+    if (obj.effortMapping !== undefined) {
+        if (typeof obj.effortMapping !== 'object' || obj.effortMapping === null || Array.isArray(obj.effortMapping)) {
+            throw new ConfigValidationError('effortMapping must be an object');
         }
-        const effort = obj.effort;
-        checkUnknownKeys(effort, VALID_EFFORT_KEYS, 'effort');
-        for (const [key, val] of Object.entries(effort)) {
-            if (typeof val !== 'string' || !VALID_EFFORTS.includes(val)) {
-                throw new ConfigValidationError(`effort.${key} must be one of: ${VALID_EFFORTS.join(', ')}`);
+        const effortMapping = obj.effortMapping;
+        checkUnknownKeys(effortMapping, VALID_EFFORT_MAPPING_KEYS, 'effortMapping');
+        for (const [key, val] of Object.entries(effortMapping)) {
+            if (typeof val !== 'string' || !isValidModelName(val)) {
+                throw new ConfigValidationError(`effortMapping.${key} must be a short alias (${VALID_MODEL_ALIASES.join(', ')}) or a full model ID (e.g., claude-sonnet-4-5-20250929)`);
             }
         }
     }
@@ -102,6 +102,12 @@ export function validateConfig(config) {
             throw new ConfigValidationError('worktree must be a boolean');
         }
     }
+    // syncMainBranch
+    if (obj.syncMainBranch !== undefined) {
+        if (typeof obj.syncMainBranch !== 'boolean') {
+            throw new ConfigValidationError('syncMainBranch must be a boolean');
+        }
+    }
     // commitFormat
     if (obj.commitFormat !== undefined) {
         if (typeof obj.commitFormat !== 'object' || obj.commitFormat === null || Array.isArray(obj.commitFormat)) {
@@ -115,12 +121,6 @@ export function validateConfig(config) {
             }
         }
     }
-    // claudeCommand
-    if (obj.claudeCommand !== undefined) {
-        if (typeof obj.claudeCommand !== 'string' || obj.claudeCommand.trim() === '') {
-            throw new ConfigValidationError('claudeCommand must be a non-empty string');
-        }
-    }
     // pricing
     if (obj.pricing !== undefined) {
         if (typeof obj.pricing !== 'object' || obj.pricing === null || Array.isArray(obj.pricing)) {
@@ -141,6 +141,32 @@ export function validateConfig(config) {
             }
         }
     }
+    // display
+    if (obj.display !== undefined) {
+        if (typeof obj.display !== 'object' || obj.display === null || Array.isArray(obj.display)) {
+            throw new ConfigValidationError('display must be an object');
+        }
+        const display = obj.display;
+        checkUnknownKeys(display, VALID_DISPLAY_KEYS, 'display');
+        for (const [key, val] of Object.entries(display)) {
+            if (typeof val !== 'boolean') {
+                throw new ConfigValidationError(`display.${key} must be a boolean`);
+            }
+        }
+    }
+    // rateLimitWindow
+    if (obj.rateLimitWindow !== undefined) {
+        if (typeof obj.rateLimitWindow !== 'object' || obj.rateLimitWindow === null || Array.isArray(obj.rateLimitWindow)) {
+            throw new ConfigValidationError('rateLimitWindow must be an object');
+        }
+        const rlw = obj.rateLimitWindow;
+        checkUnknownKeys(rlw, VALID_RATE_LIMIT_WINDOW_KEYS, 'rateLimitWindow');
+        if (rlw.sonnetTokenCap !== undefined) {
+            if (typeof rlw.sonnetTokenCap !== 'number' || rlw.sonnetTokenCap <= 0 || !Number.isFinite(rlw.sonnetTokenCap)) {
+                throw new ConfigValidationError('rateLimitWindow.sonnetTokenCap must be a positive number');
+            }
+        }
+    }
     return config;
 }
 // ---- Deep merge ----
@@ -149,8 +175,8 @@ function deepMerge(defaults, overrides) {
     if (overrides.models) {
         result.models = { ...defaults.models, ...overrides.models };
     }
-    if (overrides.effort) {
-        result.effort = { ...defaults.effort, ...overrides.effort };
+    if (overrides.effortMapping) {
+        result.effortMapping = { ...defaults.effortMapping, ...overrides.effortMapping };
     }
     if (overrides.commitFormat) {
         result.commitFormat = { ...defaults.commitFormat, ...overrides.commitFormat };
@@ -162,6 +188,12 @@ function deepMerge(defaults, overrides) {
             haiku: { ...defaults.pricing.haiku, ...overrides.pricing.haiku },
         };
     }
+    if (overrides.display) {
+        result.display = { ...defaults.display, ...overrides.display };
+    }
+    if (overrides.rateLimitWindow) {
+        result.rateLimitWindow = { ...defaults.rateLimitWindow, ...overrides.rateLimitWindow };
+    }
     if (overrides.timeout !== undefined)
         result.timeout = overrides.timeout;
     if (overrides.maxRetries !== undefined)
@@ -170,8 +202,8 @@ function deepMerge(defaults, overrides) {
         result.autoCommit = overrides.autoCommit;
     if (overrides.worktree !== undefined)
         result.worktree = overrides.worktree;
-    if (overrides.claudeCommand !== undefined)
-        result.claudeCommand = overrides.claudeCommand;
+    if (overrides.syncMainBranch !== undefined)
+        result.syncMainBranch = overrides.syncMainBranch;
     return result;
 }
 // ---- Config loading ----
@@ -182,7 +214,14 @@ function deepMerge(defaults, overrides) {
 export function resolveConfig(configPath) {
     const filePath = configPath ?? getConfigPath();
     if (!fs.existsSync(filePath)) {
-        return { ...DEFAULT_CONFIG, models: { ...DEFAULT_CONFIG.models }, effort: { ...DEFAULT_CONFIG.effort }, commitFormat: { ...DEFAULT_CONFIG.commitFormat } };
+        return {
+            ...DEFAULT_CONFIG,
+            models: { ...DEFAULT_CONFIG.models },
+            effortMapping: { ...DEFAULT_CONFIG.effortMapping },
+            commitFormat: { ...DEFAULT_CONFIG.commitFormat },
+            display: { ...DEFAULT_CONFIG.display },
+            rateLimitWindow: { ...DEFAULT_CONFIG.rateLimitWindow },
+        };
     }
     const content = fs.readFileSync(filePath, 'utf-8');
     const parsed = JSON.parse(content);
@@ -220,8 +259,63 @@ export function resetConfigCache() {
 export function getModel(scenario) {
     return getResolvedConfig().models[scenario];
 }
-export function getEffort(scenario) {
-    return getResolvedConfig().effort[scenario];
+/**
+ * Get the full effort mapping config.
+ */
+export function getEffortMapping() {
+    return getResolvedConfig().effortMapping;
+}
+/**
+ * Resolve a task effort level to a model name using the effort mapping config.
+ */
+export function resolveEffortToModel(effort) {
+    return getResolvedConfig().effortMapping[effort];
+}
+/**
+ * Model tier ordering for ceiling comparison.
+ * Higher tier = more capable/expensive model.
+ * haiku (1) < sonnet (2) < opus (3)
+ */
+const MODEL_TIER_ORDER = {
+    haiku: 1,
+    sonnet: 2,
+    opus: 3,
+};
+/**
+ * Get the numeric tier of a model for comparison.
+ * Extracts family from full model IDs (e.g., 'claude-opus-4-6' -> 3).
+ * Unknown models default to highest tier (3) so they're never accidentally capped.
+ */
+export function getModelTier(modelName) {
+    // Check short aliases first
+    const tier = MODEL_TIER_ORDER[modelName];
+    if (tier !== undefined) {
+        return tier;
+    }
+    // Extract family from full model ID
+    const match = modelName.match(/^claude-([a-z]+)-/);
+    if (match && match[1]) {
+        const familyTier = MODEL_TIER_ORDER[match[1]];
+        if (familyTier !== undefined) {
+            return familyTier;
+        }
+    }
+    // Unknown model - default to highest tier (no cap)
+    return 3;
+}
+/**
+ * Apply ceiling to a model based on the configured models.execute ceiling.
+ * Returns the lower-tier model between the input and the ceiling.
+ */
+export function applyModelCeiling(resolvedModel, ceiling) {
+    const ceilingModel = ceiling ?? getModel('execute');
+    const resolvedTier = getModelTier(resolvedModel);
+    const ceilingTier = getModelTier(ceilingModel);
+    // If resolved model is above ceiling, use ceiling instead
+    if (resolvedTier > ceilingTier) {
+        return ceilingModel;
+    }
+    return resolvedModel;
 }
 export function getCommitFormat(type) {
     return getResolvedConfig().commitFormat[type];
@@ -241,8 +335,8 @@ export function getAutoCommit() {
 export function getWorktreeDefault() {
     return getResolvedConfig().worktree;
 }
-export function getClaudeCommand() {
-    return getResolvedConfig().claudeCommand;
+export function getSyncMainBranch() {
+    return getResolvedConfig().syncMainBranch;
 }
 /**
  * Extract the short model alias (opus, sonnet, haiku) from a model ID.
@@ -265,6 +359,28 @@ export function getModelShortName(modelId) {
     // Unknown format, return as-is
     return modelId;
 }
+/**
+ * Mapping of short model aliases to their current full model IDs.
+ * These should match the latest Claude model versions.
+ */
+const MODEL_ALIAS_TO_FULL_ID = {
+    opus: 'claude-opus-4-6',
+    sonnet: 'claude-sonnet-4-5-20250929',
+    haiku: 'claude-haiku-4-5-20251001',
+};
+/**
+ * Resolve a model name to its full model ID.
+ * If already a full model ID, returns as-is.
+ * If a short alias (opus, sonnet, haiku), returns the corresponding full ID.
+ */
+export function resolveFullModelId(modelName) {
+    const fullId = MODEL_ALIAS_TO_FULL_ID[modelName];
+    if (fullId) {
+        return fullId;
+    }
+    // Already a full ID or unknown, return as-is
+    return modelName;
+}
 /**
  * Map a full model ID (e.g., `claude-opus-4-6`) or short alias to a pricing category.
  * Returns null if the model cannot be mapped.
@@ -296,6 +412,36 @@ export function getPricing(category) {
 export function getPricingConfig() {
     return getResolvedConfig().pricing;
 }
+/**
+ * Get the full display config.
+ */
+export function getDisplayConfig() {
+    return getResolvedConfig().display;
+}
+/**
+ * Get the full rate limit window config.
+ */
+export function getRateLimitWindowConfig() {
+    return getResolvedConfig().rateLimitWindow;
+}
+/**
+ * Get whether to show rate limit estimate in token summaries.
+ */
+export function getShowRateLimitEstimate() {
+    return getResolvedConfig().display.showRateLimitEstimate;
+}
+/**
+ * Get whether to show cache tokens in summaries.
+ */
+export function getShowCacheTokens() {
+    return getResolvedConfig().display.showCacheTokens;
+}
+/**
+ * Get the Sonnet-equivalent token cap for the 5h rate limit window.
+ */
+export function getSonnetTokenCap() {
+    return getResolvedConfig().rateLimitWindow.sonnetTokenCap;
+}
 /**
  * Render a commit message template by replacing {placeholder} tokens with values.
  * Unknown placeholders are left as-is.