feat: add TUI model selection with execution preferences and loop improvements

- Add model selection dialog with favorites and recents support
- Add execution preferences persistence for per-loop settings
- Refactor TUI to use unified select dropdown for model and mode selection
- Add comprehensive test coverage for loop helpers, launch, and TUI utilities
- Fix TypeScript strict types by replacing explicit any with proper type annotations
- Improve loop-helpers with better plan extraction and sanitization
- Add tui-execution-preferences and tui-models utility modules

Author: chriswritescode-dev

src/hooks/loop.ts

@@ -4,7 +4,7 @@ import type { LoopService, LoopState } from '../services/loop'
 import { MAX_RETRIES, MAX_CONSECUTIVE_STALLS } from '../services/loop'
 import type { Logger, PluginConfig } from '../types'
 import { retryWithModelFallback } from '../utils/model-fallback'
-import { resolveLoopModel } from '../utils/loop-helpers'
+import { resolveLoopModel, resolveLoopAuditorModel } from '../utils/loop-helpers'
 import { execSync, spawnSync } from 'child_process'
 import { resolve } from 'path'
 import type { createSandboxManager } from '../sandbox/manager'
@@ -646,6 +646,9 @@ export function createLoopEventHandler(
       loopService.setState(loopName, { ...currentState, phase: 'auditing', errorCount: 0 })
       logger.log(`Loop iteration ${currentState.iteration ?? 0} complete, running auditor for session ${currentState.sessionId}`)
 
+      const currentConfig = getConfig()
+      const auditorModel = resolveLoopAuditorModel(currentConfig, loopService, loopName, logger)
+      
       const auditPrompt = {
         sessionID: currentState.sessionId,
         directory: currentState.worktreeDir,
@@ -654,6 +657,7 @@ export function createLoopEventHandler(
           agent: 'auditor',
           description: `Post-iteration ${currentState.iteration} code review`,
           prompt: loopService.buildAuditPrompt(currentState),
+          ...(auditorModel ? { model: auditorModel } : {}),
         }],
       }
 
@@ -670,9 +674,12 @@ export function createLoopEventHandler(
         return
       }
 
-      const currentConfig = getConfig()
-      const configuredModel = currentConfig.auditorModel ?? currentConfig.loop?.model ?? currentConfig.executionModel
-      logger.log(`auditor using agent-configured model: ${configuredModel ?? 'default'}`)
+      const modelSource = currentState.auditorModel
+        ? `loop state override: ${currentState.auditorModel}`
+        : currentConfig.auditorModel
+          ? `config.auditorModel: ${currentConfig.auditorModel}`
+          : 'default fallback'
+      logger.log(`auditor using model: ${modelSource}`)
 
       consecutiveStalls.set(loopName, 0)
       return

src/index.ts

@@ -244,12 +244,7 @@ export function createForgePlugin(config: PluginConfig): Plugin {
     return {
       getCleanup,
       tool: tools,
-      config: createConfigHandler(
-        config.auditorModel
-          ? { ...agents, auditor: { ...agents.auditor, defaultModel: config.auditorModel } }
-          : agents,
-        config.agents
-      ),
+      config: createConfigHandler(agents, config.agents),
       'chat.message': async (input, output) => {
         await sessionHooks.onMessage(input, output)
       },

src/services/loop.ts

@@ -71,6 +71,8 @@ export interface LoopState {
   sandbox?: boolean
   sandboxContainerName?: string
   completionSummary?: string
+  executionModel?: string
+  auditorModel?: string
 }
 
 export interface LoopService {

src/tools/loop.ts

@@ -29,6 +29,8 @@ interface LoopSetupOptions {
   agent?: string
   model?: { providerID: string; modelID: string }
   worktree?: boolean
+  executionModel?: string
+  auditorModel?: string
   onLoopStarted?: (loopName: string) => void
 }
 
@@ -196,6 +198,8 @@ export async function setupLoop(
     worktree: options.worktree,
     sandbox: sandboxEnabled,
     sandboxContainerName,
+    executionModel: options.executionModel,
+    auditorModel: options.auditorModel,
   }
 
   kvService.set(projectId, `plan:${uniqueLoopName}`, options.prompt)
@@ -359,6 +363,8 @@ export function createLoopTools(ctx: ToolContext): Record<string, ReturnType<typ
         const sessionTitle = args.title.length > 60 ? `${args.title.substring(0, 57)}...` : args.title
         const loopModel = parseModelString(config.loop?.model) ?? parseModelString(config.executionModel)
         const audit = config.loop?.defaultAudit ?? true
+        const executionModel = config.loop?.model ?? config.executionModel
+        const auditorModel = config.auditorModel ?? config.loop?.model ?? config.executionModel
 
         const loopName = args.loopName ? slugify(args.loopName) : slugify(sessionTitle)
 
@@ -373,6 +379,8 @@ export function createLoopTools(ctx: ToolContext): Record<string, ReturnType<typ
           agent: 'code',
           model: loopModel,
           worktree: args.worktree,
+          executionModel: executionModel,
+          auditorModel: auditorModel,
           onLoopStarted: (id) => loopHandler.startWatchdog(id),
         })
       },
@@ -545,6 +553,8 @@ export function createLoopTools(ctx: ToolContext): Record<string, ReturnType<typ
             sandboxContainerName: restartSandbox
                 ? ctx.sandboxManager?.docker.containerName(stoppedState.loopName!)
                 : undefined,
+            executionModel: stoppedState.executionModel,
+            auditorModel: stoppedState.auditorModel,
           }
 
           loopService.setState(stoppedState.loopName!, newState)
@@ -555,7 +565,9 @@ export function createLoopTools(ctx: ToolContext): Record<string, ReturnType<typ
             promptText += buildCompletionSignalInstructions(stoppedState.completionSignal)
           }
 
-          const loopModel = parseModelString(config.loop?.model) ?? parseModelString(config.executionModel)
+          const loopModel = parseModelString(stoppedState.executionModel)
+            ?? parseModelString(config.loop?.model)
+            ?? parseModelString(config.executionModel)
 
           const { result: promptResult } = await retryWithModelFallback(
             () => v2.session.promptAsync({
@@ -704,6 +716,10 @@ export function createLoopTools(ctx: ToolContext): Record<string, ReturnType<typ
             `Started: ${state.startedAt}`,
             ...(state.completedAt ? [`Completed: ${state.completedAt}`] : []),
           )
+          statusLines.push(
+            `Model: ${state.executionModel ?? config.loop?.model ?? config.executionModel ?? 'default'}`,
+            `Auditor model: ${state.auditorModel ?? config.auditorModel ?? state.executionModel ?? config.loop?.model ?? config.executionModel ?? 'default'}`,
+          )
 
           if (state.lastAuditResult) {
             statusLines.push(...formatAuditResult(state.lastAuditResult))
@@ -790,8 +806,8 @@ export function createLoopTools(ctx: ToolContext): Record<string, ReturnType<typ
           `Started: ${state.startedAt}`,
           ...(state.errorCount && state.errorCount > 0 ? [`Error count: ${state.errorCount} (retries before termination: ${MAX_RETRIES})`] : []),
           `Audit count: ${state.auditCount ?? 0}`,
-          `Model: ${config.loop?.model || config.executionModel || 'default'}`,
-          `Auditor model: ${config.auditorModel || 'default'}`,
+          `Model: ${state.executionModel ?? config.loop?.model ?? config.executionModel ?? 'default'}`,
+          `Auditor model: ${state.auditorModel ?? config.auditorModel ?? state.executionModel ?? config.loop?.model ?? config.executionModel ?? 'default'}`,
           ...(stallCount > 0 ? [`Stalls: ${stallCount}`] : []),
           ...(secondsSinceActivity !== null ? [`Last activity: ${secondsSinceActivity}s ago`] : []),
           '',

src/tools/plan-approval.ts

@@ -169,6 +169,8 @@ export function createToolExecuteAfterHook(ctx: ToolContext): Hooks['tool.execut
             kvService.delete(projectId, `plan:${input.sessionID}`)
 
             const loopModel = parseModelString(config.loop?.model) ?? parseModelString(config.executionModel)
+            const executionModel = config.loop?.model ?? config.executionModel
+            const auditorModel = config.auditorModel ?? config.loop?.model ?? config.executionModel
 
             setupLoop(ctx, {
               prompt: planText,
@@ -180,6 +182,8 @@ export function createToolExecuteAfterHook(ctx: ToolContext): Hooks['tool.execut
               agent: 'code',
               model: loopModel,
               worktree: isWorktree,
+              executionModel: executionModel,
+              auditorModel: auditorModel,
               onLoopStarted: (id) => ctx.loopHandler.startWatchdog(id),
             }).catch((err) => {
               logger.error('Plan approval: failed to start loop', err)