rafcode 2.1.1 → 2.3.0

package/dist/types/config.d.ts

@@ -1,12 +1,86 @@
+/** Short alias for a Claude model family */
+export type ClaudeModelAlias = 'sonnet' | 'haiku' | 'opus';
+/**
+ * Accepts short aliases (`sonnet`, `haiku`, `opus`) or full model IDs
+ * matching the pattern `claude-{family}-{version}` (e.g., `claude-opus-4-5-20251101`).
+ */
+export type ClaudeModelName = ClaudeModelAlias | (string & {
+    __brand?: 'FullModelId';
+});
+export type EffortLevel = '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;
+    execute: ClaudeModelName;
+    nameGeneration: ClaudeModelName;
+    failureAnalysis: ClaudeModelName;
+    prGeneration: ClaudeModelName;
+    config: ClaudeModelName;
+}
+export interface EffortConfig {
+    plan: EffortLevel;
+    execute: EffortLevel;
+    nameGeneration: EffortLevel;
+    failureAnalysis: EffortLevel;
+    prGeneration: EffortLevel;
+    config: EffortLevel;
+}
+export interface CommitFormatConfig {
+    task: string;
+    plan: string;
+    amend: string;
+    prefix: string;
+}
+/** Pricing category derived from model family name. */
+export type PricingCategory = 'opus' | 'sonnet' | 'haiku';
+/** Per-direction pricing for a single model category, in dollars per million tokens. */
+export interface ModelPricing {
+    inputPerMTok: number;
+    outputPerMTok: number;
+    cacheReadPerMTok: number;
+    cacheCreatePerMTok: number;
+}
+/** Pricing config: per-category pricing in dollars per million tokens. */
+export interface PricingConfig {
+    opus: ModelPricing;
+    sonnet: ModelPricing;
+    haiku: ModelPricing;
+}
 export interface RafConfig {
+    models: ModelsConfig;
+    effort: EffortConfig;
+    timeout: number;
+    maxRetries: number;
+    autoCommit: boolean;
+    worktree: boolean;
+    commitFormat: CommitFormatConfig;
+    claudeCommand: string;
+    pricing: PricingConfig;
+}
+export declare const DEFAULT_CONFIG: RafConfig;
+/** Deep partial type for user config files — all fields optional at every level */
+export type DeepPartial<T> = {
+    [P in keyof T]?: T[P] extends object ? DeepPartial<T[P]> : T[P];
+};
+export type UserConfig = DeepPartial<RafConfig>;
+export declare const VALID_MODEL_ALIASES: readonly ClaudeModelAlias[];
+/**
+ * Regex for full Claude model IDs (e.g., `claude-sonnet-4-5-20250929`, `claude-opus-4-5-20251101`).
+ * Pattern: claude-{family}-{major}(-{minor})?(-{date})?
+ */
+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[];
+/** @deprecated Use DEFAULT_CONFIG instead */
+export declare const DEFAULT_RAF_CONFIG: {
     defaultTimeout: number;
     defaultMaxRetries: number;
     autoCommit: boolean;
     claudeCommand: string;
-    editor?: string;
-}
-export declare const DEFAULT_RAF_CONFIG: RafConfig;
-export type ClaudeModelName = 'sonnet' | 'haiku' | 'opus';
+};
 export interface PlanCommandOptions {
     projectName?: string;
     model?: ClaudeModelName;
@@ -28,4 +102,21 @@ export interface MigrateCommandOptions {
     dryRun?: boolean;
     worktree?: boolean;
 }
+/** Per-model token usage breakdown from stream-json result event. */
+export interface ModelTokenUsage {
+    inputTokens: number;
+    outputTokens: number;
+    cacheReadInputTokens: number;
+    cacheCreationInputTokens: number;
+}
+/** Token usage data extracted from Claude CLI stream-json result event. */
+export interface UsageData {
+    /** Aggregate token counts across all models. */
+    inputTokens: number;
+    outputTokens: number;
+    cacheReadInputTokens: number;
+    cacheCreationInputTokens: number;
+    /** Per-model breakdown (e.g., { "claude-opus-4-6": { ... } }). */
+    modelUsage: Record<string, ModelTokenUsage>;
+}
 //# sourceMappingURL=config.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/types/config.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAS;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,kBAAkB,EAAE,SAKhC,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;AAE1D,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"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/types/config.ts"],"names":[],"mappings":"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"}

package/dist/types/config.js

@@ -1,7 +1,67 @@
-export const DEFAULT_RAF_CONFIG = {
-    defaultTimeout: 60,
-    defaultMaxRetries: 3,
+export const DEFAULT_CONFIG = {
+    models: {
+        plan: 'opus',
+        execute: 'opus',
+        nameGeneration: 'sonnet',
+        failureAnalysis: 'haiku',
+        prGeneration: 'sonnet',
+        config: 'sonnet',
+    },
+    effort: {
+        plan: 'high',
+        execute: 'medium',
+        nameGeneration: 'low',
+        failureAnalysis: 'low',
+        prGeneration: 'medium',
+        config: 'medium',
+    },
+    timeout: 60,
+    maxRetries: 3,
     autoCommit: true,
+    worktree: false,
+    commitFormat: {
+        task: '{prefix}[{projectId}:{taskId}] {description}',
+        plan: '{prefix}[{projectId}] Plan: {projectName}',
+        amend: '{prefix}[{projectId}] Amend: {projectName}',
+        prefix: 'RAF',
+    },
     claudeCommand: 'claude',
+    pricing: {
+        opus: {
+            inputPerMTok: 15,
+            outputPerMTok: 75,
+            cacheReadPerMTok: 1.5,
+            cacheCreatePerMTok: 18.75,
+        },
+        sonnet: {
+            inputPerMTok: 3,
+            outputPerMTok: 15,
+            cacheReadPerMTok: 0.3,
+            cacheCreatePerMTok: 3.75,
+        },
+        haiku: {
+            inputPerMTok: 1,
+            outputPerMTok: 5,
+            cacheReadPerMTok: 0.1,
+            cacheCreatePerMTok: 1.25,
+        },
+    },
+};
+export const VALID_MODEL_ALIASES = ['sonnet', 'haiku', 'opus'];
+/**
+ * Regex for full Claude model IDs (e.g., `claude-sonnet-4-5-20250929`, `claude-opus-4-5-20251101`).
+ * Pattern: claude-{family}-{major}(-{minor})?(-{date})?
+ */
+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'];
+// 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":"AAQA,MAAM,CAAC,MAAM,kBAAkB,GAAc;IAC3C,cAAc,EAAE,EAAE;IAClB,iBAAiB,EAAE,CAAC;IACpB,UAAU,EAAE,IAAI;IAChB,aAAa,EAAE,QAAQ;CACxB,CAAC"}
+{"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"}

package/dist/utils/config.d.ts

@@ -1,20 +1,78 @@
-import { RafConfig } from '../types/config.js';
+import { RafConfig, UserConfig, ClaudeModelName, EffortLevel, ModelScenario, EffortScenario, CommitFormatType, PricingCategory, ModelPricing, PricingConfig } from '../types/config.js';
+export declare function getConfigPath(): string;
 /**
  * Get the path to Claude CLI settings file.
  */
 export declare function getClaudeSettingsPath(): string;
-export declare function loadConfig(rafDir: string): RafConfig;
-export declare function saveConfig(rafDir: string, config: RafConfig): void;
+export declare class ConfigValidationError extends Error {
+    constructor(message: string);
+}
+/**
+ * Check whether a string is a valid model name — either a short alias or a full model ID.
+ */
+export declare function isValidModelName(value: string): boolean;
+export declare function validateConfig(config: unknown): UserConfig;
+/**
+ * Resolve the final config by loading from ~/.raf/raf.config.json and merging with defaults.
+ * Throws ConfigValidationError if the file contains invalid values.
+ */
+export declare function resolveConfig(configPath?: string): RafConfig;
+/**
+ * @deprecated Use resolveConfig() instead. Kept for backward compatibility.
+ */
+export declare function loadConfig(_rafDir: string): {
+    defaultTimeout: number;
+    defaultMaxRetries: number;
+    autoCommit: boolean;
+    claudeCommand: string;
+};
+export declare function saveConfig(configPath: string, config: UserConfig): void;
+/**
+ * Get the resolved config, caching the result for the process lifetime.
+ * Call resetConfigCache() in tests to clear.
+ */
+export declare function getResolvedConfig(): RafConfig;
+export declare function resetConfigCache(): void;
+export declare function getModel(scenario: ModelScenario): ClaudeModelName;
+export declare function getEffort(scenario: EffortScenario): EffortLevel;
+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;
+/**
+ * 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;
+/**
+ * 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.
+ */
+export declare function resolveModelPricingCategory(modelId: string): PricingCategory | null;
+/**
+ * Get pricing config for a specific model category.
+ */
+export declare function getPricing(category: PricingCategory): ModelPricing;
+/**
+ * Get the full pricing config.
+ */
+export declare function getPricingConfig(): PricingConfig;
+/**
+ * Render a commit message template by replacing {placeholder} tokens with values.
+ * Unknown placeholders are left as-is.
+ */
+export declare function renderCommitMessage(template: string, variables: Record<string, string>): string;
 export declare function getEditor(): string;
 /**
  * Get the Claude model name from Claude CLI settings.
- * Returns the model name or null if not found.
- * @param settingsPath Optional path to settings file (for testing)
  */
 export declare function getClaudeModel(settingsPath?: string): string | null;
 /**
- * Get runtime configuration for task execution.
- * Returns default values which can be overridden by command line options.
+ * @deprecated Use getTimeout(), getMaxRetries(), getAutoCommit() instead.
  */
 export declare function getConfig(): {
     timeout: number;

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,EAAE,SAAS,EAAsB,MAAM,oBAAoB,CAAC;AAInE;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAE9C;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAcpD;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,CAGlE;AAED,wBAAgB,SAAS,IAAI,MAAM,CAElC;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYnE;AAED;;;GAGG;AACH,wBAAgB,SAAS,IAAI;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,OAAO,CAAA;CAAE,CAMxF"}
+{"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"}

package/dist/utils/config.js

@@ -1,39 +1,315 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import * as os from 'node:os';
-import { DEFAULT_RAF_CONFIG } from '../types/config.js';
+import { DEFAULT_CONFIG, DEFAULT_RAF_CONFIG, VALID_MODEL_ALIASES, FULL_MODEL_ID_PATTERN, VALID_EFFORTS, } from '../types/config.js';
+const CONFIG_DIR = path.join(os.homedir(), '.raf');
 const CONFIG_FILENAME = 'raf.config.json';
+export function getConfigPath() {
+    return path.join(CONFIG_DIR, CONFIG_FILENAME);
+}
 /**
  * Get the path to Claude CLI settings file.
  */
 export function getClaudeSettingsPath() {
     return path.join(os.homedir(), '.claude', 'settings.json');
 }
-export function loadConfig(rafDir) {
-    const configPath = path.join(rafDir, CONFIG_FILENAME);
-    if (!fs.existsSync(configPath)) {
-        return { ...DEFAULT_RAF_CONFIG };
+// ---- Validation ----
+const VALID_TOP_LEVEL_KEYS = new Set([
+    'models', 'effort', 'timeout', 'maxRetries', 'autoCommit',
+    'worktree', 'commitFormat', 'claudeCommand', 'pricing',
+]);
+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_COMMIT_FORMAT_KEYS = new Set(['task', 'plan', 'amend', 'prefix']);
+export class ConfigValidationError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'ConfigValidationError';
     }
-    try {
-        const content = fs.readFileSync(configPath, 'utf-8');
-        const userConfig = JSON.parse(content);
-        return { ...DEFAULT_RAF_CONFIG, ...userConfig };
+}
+function checkUnknownKeys(obj, validKeys, prefix) {
+    for (const key of Object.keys(obj)) {
+        if (!validKeys.has(key)) {
+            throw new ConfigValidationError(`Unknown config key: ${prefix ? `${prefix}.` : ''}${key}`);
+        }
     }
-    catch {
-        return { ...DEFAULT_RAF_CONFIG };
+}
+/**
+ * Check whether a string is a valid model name — either a short alias or a full model ID.
+ */
+export function isValidModelName(value) {
+    return VALID_MODEL_ALIASES.includes(value) || FULL_MODEL_ID_PATTERN.test(value);
+}
+export function validateConfig(config) {
+    if (config === null || typeof config !== 'object' || Array.isArray(config)) {
+        throw new ConfigValidationError('Config must be a JSON object');
+    }
+    const obj = config;
+    checkUnknownKeys(obj, VALID_TOP_LEVEL_KEYS, '');
+    // models
+    if (obj.models !== undefined) {
+        if (typeof obj.models !== 'object' || obj.models === null || Array.isArray(obj.models)) {
+            throw new ConfigValidationError('models must be an object');
+        }
+        const models = obj.models;
+        checkUnknownKeys(models, VALID_MODEL_KEYS, 'models');
+        for (const [key, val] of Object.entries(models)) {
+            if (typeof val !== 'string' || !isValidModelName(val)) {
+                throw new ConfigValidationError(`models.${key} must be a short alias (${VALID_MODEL_ALIASES.join(', ')}) or a full model ID (e.g., claude-sonnet-4-5-20250929)`);
+            }
+        }
+    }
+    // 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');
+        }
+        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(', ')}`);
+            }
+        }
+    }
+    // timeout
+    if (obj.timeout !== undefined) {
+        if (typeof obj.timeout !== 'number' || obj.timeout <= 0 || !Number.isFinite(obj.timeout)) {
+            throw new ConfigValidationError('timeout must be a positive number');
+        }
+    }
+    // maxRetries
+    if (obj.maxRetries !== undefined) {
+        if (typeof obj.maxRetries !== 'number' || obj.maxRetries < 0 || !Number.isInteger(obj.maxRetries)) {
+            throw new ConfigValidationError('maxRetries must be a non-negative integer');
+        }
+    }
+    // autoCommit
+    if (obj.autoCommit !== undefined) {
+        if (typeof obj.autoCommit !== 'boolean') {
+            throw new ConfigValidationError('autoCommit must be a boolean');
+        }
+    }
+    // worktree
+    if (obj.worktree !== undefined) {
+        if (typeof obj.worktree !== 'boolean') {
+            throw new ConfigValidationError('worktree must be a boolean');
+        }
+    }
+    // commitFormat
+    if (obj.commitFormat !== undefined) {
+        if (typeof obj.commitFormat !== 'object' || obj.commitFormat === null || Array.isArray(obj.commitFormat)) {
+            throw new ConfigValidationError('commitFormat must be an object');
+        }
+        const cf = obj.commitFormat;
+        checkUnknownKeys(cf, VALID_COMMIT_FORMAT_KEYS, 'commitFormat');
+        for (const [key, val] of Object.entries(cf)) {
+            if (typeof val !== 'string') {
+                throw new ConfigValidationError(`commitFormat.${key} must be a string`);
+            }
+        }
+    }
+    // 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)) {
+            throw new ConfigValidationError('pricing must be an object');
+        }
+        const pricing = obj.pricing;
+        checkUnknownKeys(pricing, VALID_PRICING_CATEGORIES, 'pricing');
+        for (const [category, catVal] of Object.entries(pricing)) {
+            if (typeof catVal !== 'object' || catVal === null || Array.isArray(catVal)) {
+                throw new ConfigValidationError(`pricing.${category} must be an object`);
+            }
+            const fields = catVal;
+            checkUnknownKeys(fields, VALID_PRICING_FIELDS, `pricing.${category}`);
+            for (const [field, val] of Object.entries(fields)) {
+                if (typeof val !== 'number' || val < 0 || !Number.isFinite(val)) {
+                    throw new ConfigValidationError(`pricing.${category}.${field} must be a non-negative number`);
+                }
+            }
+        }
+    }
+    return config;
+}
+// ---- Deep merge ----
+function deepMerge(defaults, overrides) {
+    const result = { ...defaults };
+    if (overrides.models) {
+        result.models = { ...defaults.models, ...overrides.models };
+    }
+    if (overrides.effort) {
+        result.effort = { ...defaults.effort, ...overrides.effort };
+    }
+    if (overrides.commitFormat) {
+        result.commitFormat = { ...defaults.commitFormat, ...overrides.commitFormat };
+    }
+    if (overrides.pricing) {
+        result.pricing = {
+            opus: { ...defaults.pricing.opus, ...overrides.pricing.opus },
+            sonnet: { ...defaults.pricing.sonnet, ...overrides.pricing.sonnet },
+            haiku: { ...defaults.pricing.haiku, ...overrides.pricing.haiku },
+        };
+    }
+    if (overrides.timeout !== undefined)
+        result.timeout = overrides.timeout;
+    if (overrides.maxRetries !== undefined)
+        result.maxRetries = overrides.maxRetries;
+    if (overrides.autoCommit !== undefined)
+        result.autoCommit = overrides.autoCommit;
+    if (overrides.worktree !== undefined)
+        result.worktree = overrides.worktree;
+    if (overrides.claudeCommand !== undefined)
+        result.claudeCommand = overrides.claudeCommand;
+    return result;
+}
+// ---- Config loading ----
+/**
+ * Resolve the final config by loading from ~/.raf/raf.config.json and merging with defaults.
+ * Throws ConfigValidationError if the file contains invalid values.
+ */
+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 } };
     }
+    const content = fs.readFileSync(filePath, 'utf-8');
+    const parsed = JSON.parse(content);
+    const validated = validateConfig(parsed);
+    return deepMerge(DEFAULT_CONFIG, validated);
 }
-export function saveConfig(rafDir, config) {
-    const configPath = path.join(rafDir, CONFIG_FILENAME);
-    fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
+/**
+ * @deprecated Use resolveConfig() instead. Kept for backward compatibility.
+ */
+export function loadConfig(_rafDir) {
+    return { ...DEFAULT_RAF_CONFIG };
+}
+export function saveConfig(configPath, config) {
+    const dir = path.dirname(configPath);
+    if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true });
+    }
+    fs.writeFileSync(configPath, JSON.stringify(config, null, 2) + '\n');
+}
+// ---- Helper accessors ----
+let _cachedConfig = null;
+/**
+ * Get the resolved config, caching the result for the process lifetime.
+ * Call resetConfigCache() in tests to clear.
+ */
+export function getResolvedConfig() {
+    if (!_cachedConfig) {
+        _cachedConfig = resolveConfig();
+    }
+    return _cachedConfig;
+}
+export function resetConfigCache() {
+    _cachedConfig = null;
+}
+export function getModel(scenario) {
+    return getResolvedConfig().models[scenario];
+}
+export function getEffort(scenario) {
+    return getResolvedConfig().effort[scenario];
+}
+export function getCommitFormat(type) {
+    return getResolvedConfig().commitFormat[type];
+}
+export function getCommitPrefix() {
+    return getResolvedConfig().commitFormat.prefix;
+}
+export function getTimeout() {
+    return getResolvedConfig().timeout;
+}
+export function getMaxRetries() {
+    return getResolvedConfig().maxRetries;
+}
+export function getAutoCommit() {
+    return getResolvedConfig().autoCommit;
+}
+export function getWorktreeDefault() {
+    return getResolvedConfig().worktree;
+}
+export function getClaudeCommand() {
+    return getResolvedConfig().claudeCommand;
+}
+/**
+ * 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 function getModelShortName(modelId) {
+    // Already a short alias
+    if (modelId === 'opus' || modelId === 'sonnet' || modelId === 'haiku') {
+        return modelId;
+    }
+    // Extract family from full model ID: claude-{family}-{version}
+    const match = modelId.match(/^claude-([a-z]+)-/);
+    if (match) {
+        const family = match[1];
+        if (family === 'opus' || family === 'sonnet' || family === 'haiku') {
+            return family;
+        }
+    }
+    // Unknown format, return as-is
+    return modelId;
+}
+/**
+ * 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.
+ */
+export function resolveModelPricingCategory(modelId) {
+    // Short aliases map directly
+    if (modelId === 'opus' || modelId === 'sonnet' || modelId === 'haiku') {
+        return modelId;
+    }
+    // Full model IDs: extract family from `claude-{family}-{version}`
+    const match = modelId.match(/^claude-([a-z]+)-/);
+    if (match) {
+        const family = match[1];
+        if (family === 'opus' || family === 'sonnet' || family === 'haiku') {
+            return family;
+        }
+    }
+    return null;
+}
+/**
+ * Get pricing config for a specific model category.
+ */
+export function getPricing(category) {
+    return getResolvedConfig().pricing[category];
+}
+/**
+ * Get the full pricing config.
+ */
+export function getPricingConfig() {
+    return getResolvedConfig().pricing;
+}
+/**
+ * Render a commit message template by replacing {placeholder} tokens with values.
+ * Unknown placeholders are left as-is.
+ */
+export function renderCommitMessage(template, variables) {
+    return template.replace(/\{(\w+)\}/g, (match, key) => {
+        return variables[key] ?? match;
+    });
 }
 export function getEditor() {
     return process.env['EDITOR'] ?? process.env['VISUAL'] ?? 'vi';
 }
 /**
  * Get the Claude model name from Claude CLI settings.
- * Returns the model name or null if not found.
- * @param settingsPath Optional path to settings file (for testing)
  */
 export function getClaudeModel(settingsPath) {
     const filePath = settingsPath ?? getClaudeSettingsPath();
@@ -50,14 +326,14 @@ export function getClaudeModel(settingsPath) {
     }
 }
 /**
- * Get runtime configuration for task execution.
- * Returns default values which can be overridden by command line options.
+ * @deprecated Use getTimeout(), getMaxRetries(), getAutoCommit() instead.
  */
 export function getConfig() {
+    const config = getResolvedConfig();
     return {
-        timeout: DEFAULT_RAF_CONFIG.defaultTimeout,
-        maxRetries: DEFAULT_RAF_CONFIG.defaultMaxRetries,
-        autoCommit: DEFAULT_RAF_CONFIG.autoCommit,
+        timeout: config.timeout,
+        maxRetries: config.maxRetries,
+        autoCommit: config.autoCommit,
     };
 }
 //# sourceMappingURL=config.js.map