@qduc/term2 0.30.0 → 0.31.1

package/dist/services/settings/settings-persistence.js

@@ -3,6 +3,8 @@ import path from 'node:path';
 import { randomUUID } from 'node:crypto';
 import deepEqual from 'fast-deep-equal';
 import { mergeSettings } from './settings-merger.js';
+import { unwrapSchema } from './setting-schema-utils.js';
+import { migratePersistedSelections } from './persisted-selection-migration.js';
 const LOCK_RETRY_MS = 10;
 const LOCK_TIMEOUT_MS = 2_000;
 const STALE_LOCK_MS = 30_000;
@@ -112,9 +114,10 @@ function parsePartialSections(parsed, schema) {
     if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
         return {};
     const record = parsed;
-    if (!('shape' in schema) || !schema.shape || typeof schema.shape !== 'object')
+    const objectSchema = unwrapSchema(schema);
+    if (!objectSchema?.shape || typeof objectSchema.shape !== 'object')
         return {};
-    const shape = schema.shape;
+    const shape = objectSchema.shape;
     const partial = {};
     for (const [key, sectionSchema] of Object.entries(shape)) {
         if (!Object.prototype.hasOwnProperty.call(record, key))
@@ -166,8 +169,22 @@ export function loadSettingsFromFile(opts) {
                 });
             }
         }
-        // Validate and parse with Zod
-        const validated = opts.schema.safeParse(parsed);
+        // Both startup and locked save reloads pass this file-only boundary.
+        // Keep raw bytes/values available for migration detection and diagnosis.
+        let migration;
+        try {
+            migration = migratePersistedSelections(parsed);
+        }
+        catch (error) {
+            return {
+                validated: parsePartialSections(parsed, opts.schema),
+                raw: parsed,
+                hadErrors: true,
+                errorDetails: [...errorDetails, error instanceof Error ? error.message : String(error)],
+                recovery,
+            };
+        }
+        const validated = opts.schema.safeParse(migration.value);
         if (!validated.success) {
             const schemaIssues = validated.error.issues.map((issue) => `${issue.path.join('.')}: ${issue.message}`);
             if (!opts.disableLogging) {
@@ -181,7 +198,7 @@ export function loadSettingsFromFile(opts) {
             // Preserve valid top-level sections; invalid sections fall back to defaults
             // via mergeSettings. The file is left unchanged for the user to fix.
             return {
-                validated: parsePartialSections(parsed, opts.schema),
+                validated: parsePartialSections(migration.value, opts.schema),
                 raw: parsed,
                 hadErrors: true,
                 errorDetails: [...errorDetails, ...schemaIssues],
@@ -196,6 +213,7 @@ export function loadSettingsFromFile(opts) {
             hadErrors: recovery !== undefined,
             errorDetails: recovery ? errorDetails : undefined,
             recovery,
+            migratedSelections: migration.migrated,
         };
     }
     catch (error) {

package/dist/services/settings/settings-persistence.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings-persistence.js","sourceRoot":"","sources":["../../../source/services/settings/settings-persistence.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings-persistence.js","sourceRoot":"","sources":["../../../source/services/settings/settings-persistence.ts"],"names":[],"mappings":"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"}

package/dist/services/settings/settings-schema.d.ts

@@ -1,18 +1,34 @@
 import { z } from 'zod';
-export declare const TierModelPoolEntrySchema: z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
+import { type ModelSelection } from './model-selection.js';
+import { type ThemeSetting } from '../../theme/resolve-theme.js';
+import { type SkinName } from '../../skins/names.js';
+export declare const SubagentPoolEntrySchema: z.ZodObject<{
     model: z.ZodString;
-    provider: z.ZodOptional<z.ZodString>;
-}, z.core.$strip>]>;
+    provider: z.ZodString;
+    reasoningEffort: z.ZodOptional<z.ZodEnum<{
+        default: "default";
+        high: "high";
+        low: "low";
+        medium: "medium";
+        minimal: "minimal";
+        none: "none";
+        xhigh: "xhigh";
+    }>>;
+}, z.core.$strip>;
+export declare const TierModelPoolEntrySchema: z.ZodObject<{
+    model: z.ZodString;
+    provider: z.ZodString;
+}, z.core.$strip>;
 export type TierModelPoolSetting = z.infer<typeof TierModelPoolEntrySchema>[];
-export declare const AgentSettingsSchema: z.ZodObject<{
-    model: z.ZodDefault<z.ZodString>;
-    efficientModel: z.ZodOptional<z.ZodString>;
-    capableModel: z.ZodOptional<z.ZodString>;
-    smartModel: z.ZodPipe<z.ZodTransform<any[] | undefined, unknown>, z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
+export declare const AgentSettingsSchema: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodObject<{
+    modelSelection: z.ZodDefault<z.ZodObject<{
         model: z.ZodString;
-        provider: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>]>>>>;
-    smartProvider: z.ZodOptional<z.ZodString>;
+        provider: z.ZodString;
+    }, z.core.$strip>>;
+    smartModel: z.ZodOptional<z.ZodArray<z.ZodObject<{
+        model: z.ZodString;
+        provider: z.ZodString;
+    }, z.core.$strip>>>;
     smartReasoningEffort: z.ZodOptional<z.ZodEnum<{
         default: "default";
         high: "high";
@@ -22,11 +38,10 @@ export declare const AgentSettingsSchema: z.ZodObject<{
         none: "none";
         xhigh: "xhigh";
     }>>;
-    balancedModel: z.ZodPipe<z.ZodTransform<any[] | undefined, unknown>, z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
+    balancedModel: z.ZodOptional<z.ZodArray<z.ZodObject<{
         model: z.ZodString;
-        provider: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>]>>>>;
-    balancedProvider: z.ZodOptional<z.ZodString>;
+        provider: z.ZodString;
+    }, z.core.$strip>>>;
     balancedReasoningEffort: z.ZodOptional<z.ZodEnum<{
         default: "default";
         high: "high";
@@ -36,11 +51,10 @@ export declare const AgentSettingsSchema: z.ZodObject<{
         none: "none";
         xhigh: "xhigh";
     }>>;
-    cheapModel: z.ZodPipe<z.ZodTransform<any[] | undefined, unknown>, z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
+    cheapModel: z.ZodOptional<z.ZodArray<z.ZodObject<{
         model: z.ZodString;
-        provider: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>]>>>>;
-    cheapProvider: z.ZodOptional<z.ZodString>;
+        provider: z.ZodString;
+    }, z.core.$strip>>>;
     cheapReasoningEffort: z.ZodOptional<z.ZodEnum<{
         default: "default";
         high: "high";
@@ -50,11 +64,10 @@ export declare const AgentSettingsSchema: z.ZodObject<{
         none: "none";
         xhigh: "xhigh";
     }>>;
-    choreModel: z.ZodPipe<z.ZodTransform<any[] | undefined, unknown>, z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
+    choreModel: z.ZodOptional<z.ZodArray<z.ZodObject<{
         model: z.ZodString;
-        provider: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>]>>>>;
-    choreProvider: z.ZodOptional<z.ZodString>;
+        provider: z.ZodString;
+    }, z.core.$strip>>>;
     reasoningEffort: z.ZodDefault<z.ZodEnum<{
         default: "default";
         high: "high";
@@ -105,7 +118,6 @@ export declare const AgentSettingsSchema: z.ZodObject<{
         milestones: z.ZodDefault<z.ZodArray<z.ZodNumber>>;
         autoBrief: z.ZodDefault<z.ZodBoolean>;
     }, z.core.$strip>>;
-    provider: z.ZodDefault<z.ZodString>;
     favoriteModels: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString>>>;
     modelNicknames: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>>;
     disabledProviders: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString>>>;
@@ -122,8 +134,6 @@ export declare const AgentSettingsSchema: z.ZodObject<{
         websocketFirstFrameTimeoutMs: z.ZodDefault<z.ZodNumber>;
         websocketInterFrameTimeoutMs: z.ZodDefault<z.ZodNumber>;
     }, z.core.$strip>>;
-    mentorModel: z.ZodOptional<z.ZodString>;
-    mentorProvider: z.ZodOptional<z.ZodString>;
     mentorReasoningEffort: z.ZodDefault<z.ZodEnum<{
         default: "default";
         high: "high";
@@ -136,7 +146,7 @@ export declare const AgentSettingsSchema: z.ZodObject<{
     mentorSamples: z.ZodDefault<z.ZodNumber>;
     mentorPool: z.ZodDefault<z.ZodArray<z.ZodObject<{
         model: z.ZodString;
-        provider: z.ZodOptional<z.ZodString>;
+        provider: z.ZodString;
         reasoningEffort: z.ZodOptional<z.ZodEnum<{
             default: "default";
             high: "high";
@@ -158,8 +168,6 @@ export declare const AgentSettingsSchema: z.ZodObject<{
         compactThreshold: z.ZodDefault<z.ZodNumber>;
         compactThresholdTokens: z.ZodDefault<z.ZodNullable<z.ZodNumber>>;
     }, z.core.$strip>>;
-    autoApproveModel: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-    autoApproveProvider: z.ZodOptional<z.ZodString>;
     autoApproveReasoningEffort: z.ZodDefault<z.ZodEnum<{
         high: "high";
         low: "low";
@@ -169,8 +177,6 @@ export declare const AgentSettingsSchema: z.ZodObject<{
         xhigh: "xhigh";
     }>>;
     decisionModel: z.ZodOptional<z.ZodString>;
-    subagentExplorerModel: z.ZodOptional<z.ZodString>;
-    subagentExplorerProvider: z.ZodOptional<z.ZodString>;
     subagentExplorerReasoningEffort: z.ZodOptional<z.ZodEnum<{
         default: "default";
         high: "high";
@@ -180,8 +186,6 @@ export declare const AgentSettingsSchema: z.ZodObject<{
         none: "none";
         xhigh: "xhigh";
     }>>;
-    subagentWorkerModel: z.ZodOptional<z.ZodString>;
-    subagentWorkerProvider: z.ZodOptional<z.ZodString>;
     subagentWorkerReasoningEffort: z.ZodOptional<z.ZodEnum<{
         default: "default";
         high: "high";
@@ -191,8 +195,6 @@ export declare const AgentSettingsSchema: z.ZodObject<{
         none: "none";
         xhigh: "xhigh";
     }>>;
-    subagentLibrarianModel: z.ZodOptional<z.ZodString>;
-    subagentLibrarianProvider: z.ZodOptional<z.ZodString>;
     subagentLibrarianReasoningEffort: z.ZodOptional<z.ZodEnum<{
         default: "default";
         high: "high";
@@ -202,7 +204,7 @@ export declare const AgentSettingsSchema: z.ZodObject<{
         none: "none";
         xhigh: "xhigh";
     }>>;
-}, z.core.$strip>;
+}, z.core.$strip>>;
 export declare const ShellSettingsSchema: z.ZodObject<{
     timeout: z.ZodDefault<z.ZodNumber>;
     backgroundTimeout: z.ZodDefault<z.ZodNumber>;
@@ -244,6 +246,20 @@ export declare const UISettingsSchema: z.ZodObject<{
         concise: "concise";
         standard: "standard";
     }>>;
+    theme: z.ZodDefault<z.ZodEnum<{
+        auto: "auto";
+        dark: "dark";
+        "high-contrast": "high-contrast";
+        light: "light";
+        mono: "mono";
+    }>>;
+    skin: z.ZodDefault<z.ZodEnum<{
+        cards: "cards";
+        classic: "classic";
+        ledger: "ledger";
+        rail: "rail";
+        zen: "zen";
+    }>>;
 }, z.core.$strip>;
 export declare const LoggingSettingsSchema: z.ZodObject<{
     logLevel: z.ZodDefault<z.ZodEnum<{
@@ -276,11 +292,9 @@ export declare const AppSettingsSchema: z.ZodObject<{
         on: "on";
     }>]>, z.ZodTransform<"auto" | "off" | "on", "auto" | "off" | "on" | boolean>>>>;
 }, z.core.$strip>;
-export declare const ToolsSettingsSchema: z.ZodObject<{
+export declare const ToolsSettingsSchema: z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodObject<{
     logFileOperations: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     enableEditHealing: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    editHealingModel: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-    editHealingProvider: z.ZodOptional<z.ZodString>;
     shell: z.ZodDefault<z.ZodOptional<z.ZodObject<{
         enabled: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, z.core.$strip>>>;
@@ -317,7 +331,7 @@ export declare const ToolsSettingsSchema: z.ZodObject<{
     codeContext: z.ZodDefault<z.ZodOptional<z.ZodObject<{
         enabled: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, z.core.$strip>>>;
-}, z.core.$strip>;
+}, z.core.$strip>>;
 export declare const DebugSettingsSchema: z.ZodObject<{
     debugBashTool: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
 }, z.core.$strip>;
@@ -424,15 +438,15 @@ export declare const SettingsSchema: z.ZodObject<{
         apiKey?: string | undefined;
     }>>>>>;
     enable_agent_workflow: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-    agent: z.ZodOptional<z.ZodObject<{
-        model: z.ZodDefault<z.ZodString>;
-        efficientModel: z.ZodOptional<z.ZodString>;
-        capableModel: z.ZodOptional<z.ZodString>;
-        smartModel: z.ZodPipe<z.ZodTransform<any[] | undefined, unknown>, z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
+    agent: z.ZodOptional<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodObject<{
+        modelSelection: z.ZodDefault<z.ZodObject<{
             model: z.ZodString;
-            provider: z.ZodOptional<z.ZodString>;
-        }, z.core.$strip>]>>>>;
-        smartProvider: z.ZodOptional<z.ZodString>;
+            provider: z.ZodString;
+        }, z.core.$strip>>;
+        smartModel: z.ZodOptional<z.ZodArray<z.ZodObject<{
+            model: z.ZodString;
+            provider: z.ZodString;
+        }, z.core.$strip>>>;
         smartReasoningEffort: z.ZodOptional<z.ZodEnum<{
             default: "default";
             high: "high";
@@ -442,11 +456,10 @@ export declare const SettingsSchema: z.ZodObject<{
             none: "none";
             xhigh: "xhigh";
         }>>;
-        balancedModel: z.ZodPipe<z.ZodTransform<any[] | undefined, unknown>, z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
+        balancedModel: z.ZodOptional<z.ZodArray<z.ZodObject<{
             model: z.ZodString;
-            provider: z.ZodOptional<z.ZodString>;
-        }, z.core.$strip>]>>>>;
-        balancedProvider: z.ZodOptional<z.ZodString>;
+            provider: z.ZodString;
+        }, z.core.$strip>>>;
         balancedReasoningEffort: z.ZodOptional<z.ZodEnum<{
             default: "default";
             high: "high";
@@ -456,11 +469,10 @@ export declare const SettingsSchema: z.ZodObject<{
             none: "none";
             xhigh: "xhigh";
         }>>;
-        cheapModel: z.ZodPipe<z.ZodTransform<any[] | undefined, unknown>, z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
+        cheapModel: z.ZodOptional<z.ZodArray<z.ZodObject<{
             model: z.ZodString;
-            provider: z.ZodOptional<z.ZodString>;
-        }, z.core.$strip>]>>>>;
-        cheapProvider: z.ZodOptional<z.ZodString>;
+            provider: z.ZodString;
+        }, z.core.$strip>>>;
         cheapReasoningEffort: z.ZodOptional<z.ZodEnum<{
             default: "default";
             high: "high";
@@ -470,11 +482,10 @@ export declare const SettingsSchema: z.ZodObject<{
             none: "none";
             xhigh: "xhigh";
         }>>;
-        choreModel: z.ZodPipe<z.ZodTransform<any[] | undefined, unknown>, z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
+        choreModel: z.ZodOptional<z.ZodArray<z.ZodObject<{
             model: z.ZodString;
-            provider: z.ZodOptional<z.ZodString>;
-        }, z.core.$strip>]>>>>;
-        choreProvider: z.ZodOptional<z.ZodString>;
+            provider: z.ZodString;
+        }, z.core.$strip>>>;
         reasoningEffort: z.ZodDefault<z.ZodEnum<{
             default: "default";
             high: "high";
@@ -525,7 +536,6 @@ export declare const SettingsSchema: z.ZodObject<{
             milestones: z.ZodDefault<z.ZodArray<z.ZodNumber>>;
             autoBrief: z.ZodDefault<z.ZodBoolean>;
         }, z.core.$strip>>;
-        provider: z.ZodDefault<z.ZodString>;
         favoriteModels: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString>>>;
         modelNicknames: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>>;
         disabledProviders: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString>>>;
@@ -542,8 +552,6 @@ export declare const SettingsSchema: z.ZodObject<{
             websocketFirstFrameTimeoutMs: z.ZodDefault<z.ZodNumber>;
             websocketInterFrameTimeoutMs: z.ZodDefault<z.ZodNumber>;
         }, z.core.$strip>>;
-        mentorModel: z.ZodOptional<z.ZodString>;
-        mentorProvider: z.ZodOptional<z.ZodString>;
         mentorReasoningEffort: z.ZodDefault<z.ZodEnum<{
             default: "default";
             high: "high";
@@ -556,7 +564,7 @@ export declare const SettingsSchema: z.ZodObject<{
         mentorSamples: z.ZodDefault<z.ZodNumber>;
         mentorPool: z.ZodDefault<z.ZodArray<z.ZodObject<{
             model: z.ZodString;
-            provider: z.ZodOptional<z.ZodString>;
+            provider: z.ZodString;
             reasoningEffort: z.ZodOptional<z.ZodEnum<{
                 default: "default";
                 high: "high";
@@ -578,8 +586,6 @@ export declare const SettingsSchema: z.ZodObject<{
             compactThreshold: z.ZodDefault<z.ZodNumber>;
             compactThresholdTokens: z.ZodDefault<z.ZodNullable<z.ZodNumber>>;
         }, z.core.$strip>>;
-        autoApproveModel: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-        autoApproveProvider: z.ZodOptional<z.ZodString>;
         autoApproveReasoningEffort: z.ZodDefault<z.ZodEnum<{
             high: "high";
             low: "low";
@@ -589,8 +595,6 @@ export declare const SettingsSchema: z.ZodObject<{
             xhigh: "xhigh";
         }>>;
         decisionModel: z.ZodOptional<z.ZodString>;
-        subagentExplorerModel: z.ZodOptional<z.ZodString>;
-        subagentExplorerProvider: z.ZodOptional<z.ZodString>;
         subagentExplorerReasoningEffort: z.ZodOptional<z.ZodEnum<{
             default: "default";
             high: "high";
@@ -600,8 +604,6 @@ export declare const SettingsSchema: z.ZodObject<{
             none: "none";
             xhigh: "xhigh";
         }>>;
-        subagentWorkerModel: z.ZodOptional<z.ZodString>;
-        subagentWorkerProvider: z.ZodOptional<z.ZodString>;
         subagentWorkerReasoningEffort: z.ZodOptional<z.ZodEnum<{
             default: "default";
             high: "high";
@@ -611,8 +613,6 @@ export declare const SettingsSchema: z.ZodObject<{
             none: "none";
             xhigh: "xhigh";
         }>>;
-        subagentLibrarianModel: z.ZodOptional<z.ZodString>;
-        subagentLibrarianProvider: z.ZodOptional<z.ZodString>;
         subagentLibrarianReasoningEffort: z.ZodOptional<z.ZodEnum<{
             default: "default";
             high: "high";
@@ -622,7 +622,7 @@ export declare const SettingsSchema: z.ZodObject<{
             none: "none";
             xhigh: "xhigh";
         }>>;
-    }, z.core.$strip>>;
+    }, z.core.$strip>>>;
     shell: z.ZodOptional<z.ZodObject<{
         timeout: z.ZodDefault<z.ZodNumber>;
         backgroundTimeout: z.ZodDefault<z.ZodNumber>;
@@ -664,6 +664,20 @@ export declare const SettingsSchema: z.ZodObject<{
             concise: "concise";
             standard: "standard";
         }>>;
+        theme: z.ZodDefault<z.ZodEnum<{
+            auto: "auto";
+            dark: "dark";
+            "high-contrast": "high-contrast";
+            light: "light";
+            mono: "mono";
+        }>>;
+        skin: z.ZodDefault<z.ZodEnum<{
+            cards: "cards";
+            classic: "classic";
+            ledger: "ledger";
+            rail: "rail";
+            zen: "zen";
+        }>>;
     }, z.core.$strip>>;
     logging: z.ZodOptional<z.ZodObject<{
         logLevel: z.ZodDefault<z.ZodEnum<{
@@ -696,11 +710,9 @@ export declare const SettingsSchema: z.ZodObject<{
             on: "on";
         }>]>, z.ZodTransform<"auto" | "off" | "on", "auto" | "off" | "on" | boolean>>>>;
     }, z.core.$strip>>;
-    tools: z.ZodOptional<z.ZodObject<{
+    tools: z.ZodOptional<z.ZodPipe<z.ZodTransform<unknown, unknown>, z.ZodObject<{
         logFileOperations: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         enableEditHealing: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
-        editHealingModel: z.ZodDefault<z.ZodOptional<z.ZodString>>;
-        editHealingProvider: z.ZodOptional<z.ZodString>;
         shell: z.ZodDefault<z.ZodOptional<z.ZodObject<{
             enabled: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         }, z.core.$strip>>>;
@@ -737,7 +749,7 @@ export declare const SettingsSchema: z.ZodObject<{
         codeContext: z.ZodDefault<z.ZodOptional<z.ZodObject<{
             enabled: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
         }, z.core.$strip>>>;
-    }, z.core.$strip>>;
+    }, z.core.$strip>>>;
     debug: z.ZodOptional<z.ZodObject<{
         debugBashTool: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, z.core.$strip>>;
@@ -811,20 +823,14 @@ export interface SettingWithSource<T = any> {
 }
 export interface SettingsWithSources {
     agent: {
-        model: SettingWithSource<string>;
-        efficientModel: SettingWithSource<string | undefined>;
-        capableModel: SettingWithSource<string | undefined>;
+        modelSelection: SettingWithSource<ModelSelection>;
         smartModel: SettingWithSource<TierModelPoolSetting | undefined>;
-        smartProvider: SettingWithSource<string | undefined>;
         smartReasoningEffort: SettingWithSource<string | undefined>;
         balancedModel: SettingWithSource<TierModelPoolSetting | undefined>;
-        balancedProvider: SettingWithSource<string | undefined>;
         balancedReasoningEffort: SettingWithSource<string | undefined>;
         cheapModel: SettingWithSource<TierModelPoolSetting | undefined>;
-        cheapProvider: SettingWithSource<string | undefined>;
         cheapReasoningEffort: SettingWithSource<string | undefined>;
         choreModel: SettingWithSource<TierModelPoolSetting | undefined>;
-        choreProvider: SettingWithSource<string | undefined>;
         reasoningEffort: SettingWithSource<string>;
         temperature: SettingWithSource<number | undefined>;
         maxTurns: SettingWithSource<number>;
@@ -860,7 +866,6 @@ export interface SettingsWithSources {
             milestones: SettingWithSource<number[]>;
             autoBrief: SettingWithSource<boolean>;
         };
-        provider: SettingWithSource<string>;
         favoriteModels: SettingWithSource<string[]>;
         modelNicknames: SettingWithSource<Record<string, string>>;
         disabledProviders: SettingWithSource<string[]>;
@@ -870,13 +875,11 @@ export interface SettingsWithSources {
             websocketFirstFrameTimeoutMs: number;
             websocketInterFrameTimeoutMs: number;
         }>;
-        mentorModel: SettingWithSource<string | undefined>;
-        mentorProvider: SettingWithSource<string | undefined>;
         mentorReasoningEffort: SettingWithSource<string>;
         mentorSamples: SettingWithSource<number>;
         mentorPool: SettingWithSource<{
             model: string;
-            provider?: string;
+            provider: string;
             reasoningEffort?: string;
         }[]>;
         useFlexServiceTier: SettingWithSource<boolean>;
@@ -886,18 +889,10 @@ export interface SettingsWithSources {
             compactThreshold: SettingWithSource<number>;
             compactThresholdTokens: SettingWithSource<number | null>;
         };
-        autoApproveModel: SettingWithSource<string>;
-        autoApproveProvider: SettingWithSource<string | undefined>;
         autoApproveReasoningEffort: SettingWithSource<string>;
         decisionModel: SettingWithSource<string | undefined>;
-        subagentExplorerModel: SettingWithSource<string | undefined>;
-        subagentExplorerProvider: SettingWithSource<string | undefined>;
         subagentExplorerReasoningEffort: SettingWithSource<string | undefined>;
-        subagentWorkerModel: SettingWithSource<string | undefined>;
-        subagentWorkerProvider: SettingWithSource<string | undefined>;
         subagentWorkerReasoningEffort: SettingWithSource<string | undefined>;
-        subagentLibrarianModel: SettingWithSource<string | undefined>;
-        subagentLibrarianProvider: SettingWithSource<string | undefined>;
         subagentLibrarianReasoningEffort: SettingWithSource<string | undefined>;
     };
     shell: {
@@ -922,6 +917,8 @@ export interface SettingsWithSources {
         historySize: SettingWithSource<number>;
         pasteThreshold: SettingWithSource<number | undefined>;
         displayMode: SettingWithSource<'standard' | 'concise'>;
+        theme: SettingWithSource<ThemeSetting>;
+        skin: SettingWithSource<SkinName>;
     };
     logging: {
         logLevel: SettingWithSource<string>;
@@ -947,8 +944,6 @@ export interface SettingsWithSources {
     tools: {
         logFileOperations: SettingWithSource<boolean>;
         enableEditHealing: SettingWithSource<boolean>;
-        editHealingModel: SettingWithSource<string>;
-        editHealingProvider: SettingWithSource<string | undefined>;
         shell: {
             enabled: SettingWithSource<boolean>;
         };
@@ -1039,23 +1034,16 @@ export interface SettingsWithSources {
  */
 export declare const SETTING_KEYS: {
     readonly ENABLE_AGENT_WORKFLOW: 'enable_agent_workflow';
-    readonly AGENT_MODEL: 'agent.model';
-    readonly AGENT_EFFICIENT_MODEL: 'agent.efficientModel';
-    readonly AGENT_CAPABLE_MODEL: 'agent.capableModel';
+    readonly AGENT_MODEL_SELECTION: 'agent.modelSelection';
     readonly AGENT_SMART_MODEL: 'agent.smartModel';
-    readonly AGENT_SMART_PROVIDER: 'agent.smartProvider';
     readonly AGENT_SMART_REASONING_EFFORT: 'agent.smartReasoningEffort';
     readonly AGENT_BALANCED_MODEL: 'agent.balancedModel';
-    readonly AGENT_BALANCED_PROVIDER: 'agent.balancedProvider';
     readonly AGENT_BALANCED_REASONING_EFFORT: 'agent.balancedReasoningEffort';
     readonly AGENT_CHEAP_MODEL: 'agent.cheapModel';
-    readonly AGENT_CHEAP_PROVIDER: 'agent.cheapProvider';
     readonly AGENT_CHEAP_REASONING_EFFORT: 'agent.cheapReasoningEffort';
     readonly AGENT_CHORE_MODEL: 'agent.choreModel';
-    readonly AGENT_CHORE_PROVIDER: 'agent.choreProvider';
     readonly AGENT_REASONING_EFFORT: 'agent.reasoningEffort';
     readonly AGENT_TEMPERATURE: 'agent.temperature';
-    readonly AGENT_PROVIDER: 'agent.provider';
     readonly AGENT_FAVORITE_MODELS: 'agent.favoriteModels';
     readonly AGENT_MODEL_NICKNAMES: 'agent.modelNicknames';
     readonly AGENT_DISABLED_PROVIDERS: 'agent.disabledProviders';
@@ -1093,8 +1081,6 @@ export declare const SETTING_KEYS: {
     readonly AGENT_OPENROUTER_TITLE: 'agent.openrouter.title';
     readonly AGENT_CODEX_WEBSOCKET_FIRST_FRAME_TIMEOUT_MS: 'agent.codex.websocketFirstFrameTimeoutMs';
     readonly AGENT_CODEX_WEBSOCKET_INTER_FRAME_TIMEOUT_MS: 'agent.codex.websocketInterFrameTimeoutMs';
-    readonly AGENT_MENTOR_MODEL: 'agent.mentorModel';
-    readonly AGENT_MENTOR_PROVIDER: 'agent.mentorProvider';
     readonly AGENT_MENTOR_REASONING_EFFORT: 'agent.mentorReasoningEffort';
     readonly AGENT_MENTOR_SAMPLES: 'agent.mentorSamples';
     readonly AGENT_MENTOR_POOL: 'agent.mentorPool';
@@ -1113,24 +1099,18 @@ export declare const SETTING_KEYS: {
     readonly SANDBOX_ALLOW_READ_EXTRA: 'sandbox.allowReadExtra';
     readonly SANDBOX_DOCKER_HOST_CONTROL_PROJECTS: 'sandbox.dockerHostControlProjects';
     readonly SANDBOX_ALLOW_NETWORKING: 'sandbox.allowNetworking';
-    readonly AGENT_AUTO_APPROVE_MODEL: 'agent.autoApproveModel';
-    readonly AGENT_AUTO_APPROVE_PROVIDER: 'agent.autoApproveProvider';
     readonly AGENT_AUTO_APPROVE_REASONING_EFFORT: 'agent.autoApproveReasoningEffort';
     readonly AGENT_DECISION_MODEL: 'agent.decisionModel';
-    readonly AGENT_SUBAGENT_EXPLORER_MODEL: 'agent.subagentExplorerModel';
-    readonly AGENT_SUBAGENT_EXPLORER_PROVIDER: 'agent.subagentExplorerProvider';
     readonly AGENT_SUBAGENT_EXPLORER_REASONING_EFFORT: 'agent.subagentExplorerReasoningEffort';
-    readonly AGENT_SUBAGENT_WORKER_MODEL: 'agent.subagentWorkerModel';
-    readonly AGENT_SUBAGENT_WORKER_PROVIDER: 'agent.subagentWorkerProvider';
     readonly AGENT_SUBAGENT_WORKER_REASONING_EFFORT: 'agent.subagentWorkerReasoningEffort';
-    readonly AGENT_SUBAGENT_LIBRARIAN_MODEL: 'agent.subagentLibrarianModel';
-    readonly AGENT_SUBAGENT_LIBRARIAN_PROVIDER: 'agent.subagentLibrarianProvider';
     readonly AGENT_SUBAGENT_LIBRARIAN_REASONING_EFFORT: 'agent.subagentLibrarianReasoningEffort';
     readonly SUBAGENT_ASYNC_SESSION_TTL_MS: 'subagent.asyncSessionTtlMs';
     readonly SUBAGENT_ASYNC_MESSAGE_CAP: 'subagent.asyncMessageCap';
     readonly UI_HISTORY_SIZE: 'ui.historySize';
     readonly UI_PASTE_THRESHOLD: 'ui.pasteThreshold';
     readonly UI_DISPLAY_MODE: 'ui.displayMode';
+    readonly UI_THEME: 'ui.theme';
+    readonly UI_SKIN: 'ui.skin';
     readonly LOGGING_LOG_LEVEL: 'logging.logLevel';
     readonly LOGGING_DISABLE: 'logging.disableLogging';
     readonly LOGGING_DEBUG: 'logging.debugLogging';
@@ -1148,8 +1128,6 @@ export declare const SETTING_KEYS: {
     readonly APP_SEARCH_VIA_SHELL: 'app.searchViaShell';
     readonly TOOLS_LOG_FILE_OPS: 'tools.logFileOperations';
     readonly TOOLS_ENABLE_EDIT_HEALING: 'tools.enableEditHealing';
-    readonly TOOLS_EDIT_HEALING_MODEL: 'tools.editHealingModel';
-    readonly TOOLS_EDIT_HEALING_PROVIDER: 'tools.editHealingProvider';
     readonly TOOLS_SHELL_ENABLED: 'tools.shell.enabled';
     readonly TOOLS_WEB_ENABLED: 'tools.web.enabled';
     readonly TOOLS_FILE_READ_ENABLED: 'tools.fileRead.enabled';