@qduc/term2 0.30.0 → 0.31.1

package/dist/services/session/session-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-manager.js","sourceRoot":"","sources":["../../../source/services/session/session-manager.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAElF;;;;GAIG;AACH,MAAM,OAAO,cAAc;IAChB,kBAAkB,CAAoB;IACtC,YAAY,CAAqB;IACjC,MAAM,CAAmB;IACzB,mBAAmB,CAAqB;IACxC,YAAY,CAA0B;IACtC,gBAAgB,CAAoB;IACpC,aAAa,CAAsB;IAE5C,YAAY,IAQX;QACC,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,iBAAiB,CAAC;QACjD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,kBAAkB,CAAC;QACnD,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,eAAe,CAAC;QAC7C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC;IACzC,CAAC;IAED,qEAAqE;IAErE,KAAK;QACH,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC;IAC7B,CAAC;IAED,qEAAqE;IAErE,gBAAgB;QACd,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,CAAC;QAC7D,IAAI,OAAO,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAClC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACnB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,kBAAkB;QAOhB,oEAAoE;QACpE,uEAAuE;QACvE,kEAAkE;QAClE,oEAAoE;QACpE,8DAA8D;QAC9D,IAAI,CAAC,YAAY,CAAC,yBAAyB,EAAE,CAAC;QAC9C,OAAO,IAAI,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,CAAC;IACtD,CAAC;IAED,mBAAmB;QAOjB,iEAAiE;QACjE,IAAI,CAAC,YAAY,CAAC,yBAAyB,EAAE,CAAC;QAC9C,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,yBAAyB,EAAE,CAAC;QACpE,IAAI,OAAO,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAClC,IAAI,CAAC,eAAe,EAAE,CAAC;QACvB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,cAAc,CAAC,CAAS;QACtB,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;QAChE,IAAI,OAAO,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAClC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QACnB,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,aAAa;QACX,OAAO,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC;IACjD,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,CAAC;IACrD,CAAC;IAED;;;;OAIG;IACH,cAAc,CAAC,QAAwB;QACrC,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QACjE,IAAI,OAAO,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QAClC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QACxC,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IACvF,CAAC;IAED,qEAAqE;IAErE,kBAAkB;QAChB,MAAM,UAAU,GAAG,SAAS,CAAa,IAAI,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QAC3E,MAAM,QAAQ,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,EAAE,GAAG,CAAC,gBAAgB,CAAC,CAAC;QAChH,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,EAAE,GAAG,CAAC,aAAa,CAAC,CAAC;QACxD,OAAO,eAAe,CAAC;YACrB,OAAO,EAAE,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE;YAC7C,kBAAkB,EAAE,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC,kBAAkB;YACzE,UAAU,EAAE,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;YACtC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3B,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAClC,CAAC,CAAC;IACL,CAAC;IAED,0BAA0B;QACxB,OAAO,IAAI,CAAC,kBAAkB,CAAC,0BAA0B,EAAE,CAAC;IAC9D,CAAC;IAED,wBAAwB,CAAC,gBAAwB,EAAE,OAAqC;QACtF,OAAO,IAAI,CAAC,kBAAkB,CAAC,wBAAwB,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IACrF,CAAC;IAED,WAAW;QAKT,OAAO,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC;IAC5C,CAAC;IAED,WAAW,CAAC,KAKX;QACC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IAED,qEAAqE;IAErE,eAAe,CAAC,WAAmB;QACjC,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;IACvD,CAAC;IAED,eAAe,CAAC,IAAY;QAC1B,qEAAqE;QACrE,2EAA2E;QAC3E,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC;QAC/C,IAAI,CAAC,MAAM,CAAC,iBAAiB,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7E,CAAC;IAED,yBAAyB,CAAC,KAAwB,EAAE,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE;QAClE,OAAO,IAAI,CAAC,aAAa,CAAC,yBAAyB,CAAC,KAAK,EAAE,GAAG,EAAE;YAC9D,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;SACjD,CAAC,CAAC;IACL,CAAC;IAED,iBAAiB,CAAC,KAAwB;QACxC,OAAO,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,KAAK,EAAE;YACjD,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,iBAAiB;SACjD,CAAC,CAAC;IACL,CAAC;IAED,qEAAqE;IAErE,UAAU,CAAC,KAAa;QACtB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QACxB,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC,CAAC;IAC/G,CAAC;IAED,eAAe;QACb,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC;IAC/B,CAAC;CACF"}
+{"version":3,"file":"session-manager.js","sourceRoot":"","sources":["../../../source/services/session/session-manager.ts"],"names":[],"mappings":"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"}

package/dist/services/session/session-runtime-controller.d.ts

@@ -1,3 +1,4 @@
+import type { ModelSelection } from '../settings/model-selection.js';
 import type { ReasoningEffortSetting } from '../../contracts/conversation.js';
 import type { ConversationAgentClient } from '../conversation-agent-client.js';
 import type { SessionLifecycle } from './session-lifecycle.js';
@@ -15,12 +16,9 @@ export declare class SessionRuntimeController {
         agentClient: ConversationAgentClient;
         state: SessionLifecycle;
     });
-    setModel(model: string): void;
+    setModelSelection(selection: ModelSelection): void;
     setReasoningEffort(effort: ReasoningEffortSetting): void;
     setTemperature(temperature?: number): void;
-    setProvider(provider: string): void;
-    /** Alias for setProvider, kept for public API surface. */
-    switchProvider(provider: string): void;
     setRetryCallback(callback: () => void): void;
 }
 //# sourceMappingURL=session-runtime-controller.d.ts.map

package/dist/services/session/session-runtime-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-runtime-controller.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-runtime-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE/E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,wBAAwB;;IAInC,YAAY,IAAI,EAAE;QAAE,WAAW,EAAE,uBAAuB,CAAC;QAAC,KAAK,EAAE,gBAAgB,CAAA;KAAE,EAGlF;IAED,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAG5B;IAED,kBAAkB,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI,CAOvD;IAED,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAOzC;IAED,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAOlC;IAED,0DAA0D;IAC1D,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAErC;IAED,gBAAgB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAI3C;CACF"}
+{"version":3,"file":"session-runtime-controller.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-runtime-controller.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAC9E,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE/E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,wBAAwB;;IAInC,YAAY,IAAI,EAAE;QAAE,WAAW,EAAE,uBAAuB,CAAC;QAAC,KAAK,EAAE,gBAAgB,CAAA;KAAE,EAGlF;IAED,iBAAiB,CAAC,SAAS,EAAE,cAAc,GAAG,IAAI,CAGjD;IAED,kBAAkB,CAAC,MAAM,EAAE,sBAAsB,GAAG,IAAI,CAOvD;IAED,cAAc,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAOzC;IAED,gBAAgB,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,IAAI,CAI3C;CACF"}

package/dist/services/session/session-runtime-controller.js

@@ -14,9 +14,9 @@ export class SessionRuntimeController {
         this.#agentClient = deps.agentClient;
         this.#state = deps.state;
     }
-    setModel(model) {
+    setModelSelection(selection) {
         this.#state.afterProviderChanged();
-        this.#agentClient.setModel(model);
+        this.#agentClient.setModelSelection(selection);
     }
     setReasoningEffort(effort) {
         const setReasoningEffort = getMethod(this.#agentClient, 'setReasoningEffort');
@@ -34,18 +34,6 @@ export class SessionRuntimeController {
         this.#state.afterProviderChanged();
         setTemperature.call(this.#agentClient, temperature);
     }
-    setProvider(provider) {
-        const setProvider = getMethod(this.#agentClient, 'setProvider');
-        if (!setProvider) {
-            return;
-        }
-        this.#state.afterProviderChanged();
-        setProvider.call(this.#agentClient, provider);
-    }
-    /** Alias for setProvider, kept for public API surface. */
-    switchProvider(provider) {
-        this.setProvider(provider);
-    }
     setRetryCallback(callback) {
         if (typeof this.#agentClient.setRetryCallback === 'function') {
             this.#agentClient.setRetryCallback(callback);

package/dist/services/session/session-runtime-controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-runtime-controller.js","sourceRoot":"","sources":["../../../source/services/session/session-runtime-controller.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD;;;;;;;GAOG;AACH,MAAM,OAAO,wBAAwB;IAC1B,YAAY,CAA0B;IACtC,MAAM,CAAmB;IAElC,YAAY,IAAuE;QACjF,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC;IAC3B,CAAC;IAED,QAAQ,CAAC,KAAa;QACpB,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC;QACnC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED,kBAAkB,CAAC,MAA8B;QAC/C,MAAM,kBAAkB,GAAG,SAAS,CAAiC,IAAI,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;QAC9G,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IACrD,CAAC;IAED,cAAc,CAAC,WAAoB;QACjC,MAAM,cAAc,GAAG,SAAS,CAA6B,IAAI,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;QAClG,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC;QACnC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IACtD,CAAC;IAED,WAAW,CAAC,QAAgB;QAC1B,MAAM,WAAW,GAAG,SAAS,CAAiB,IAAI,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;QAChF,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC;QACnC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;IAChD,CAAC;IAED,0DAA0D;IAC1D,cAAc,CAAC,QAAgB;QAC7B,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC;IAED,gBAAgB,CAAC,QAAoB;QACnC,IAAI,OAAO,IAAI,CAAC,YAAY,CAAC,gBAAgB,KAAK,UAAU,EAAE,CAAC;YAC7D,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;CACF"}
+{"version":3,"file":"session-runtime-controller.js","sourceRoot":"","sources":["../../../source/services/session/session-runtime-controller.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAGpD;;;;;;;GAOG;AACH,MAAM,OAAO,wBAAwB;IAC1B,YAAY,CAA0B;IACtC,MAAM,CAAmB;IAElC,YAAY,IAAuE;QACjF,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC;IAC3B,CAAC;IAED,iBAAiB,CAAC,SAAyB;QACzC,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC;QACnC,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;IACjD,CAAC;IAED,kBAAkB,CAAC,MAA8B;QAC/C,MAAM,kBAAkB,GAAG,SAAS,CAAiC,IAAI,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;QAC9G,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC;QACnC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IACrD,CAAC;IAED,cAAc,CAAC,WAAoB;QACjC,MAAM,cAAc,GAAG,SAAS,CAA6B,IAAI,CAAC,YAAY,EAAE,gBAAgB,CAAC,CAAC;QAClG,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,oBAAoB,EAAE,CAAC;QACnC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;IACtD,CAAC;IAED,gBAAgB,CAAC,QAAoB;QACnC,IAAI,OAAO,IAAI,CAAC,YAAY,CAAC,gBAAgB,KAAK,UAAU,EAAE,CAAC;YAC7D,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC;CACF"}

package/dist/services/session/test-helpers/conversation-session-fixtures.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-session-fixtures.d.ts","sourceRoot":"","sources":["../../../../source/services/session/test-helpers/conversation-session-fixtures.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC7G,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAGlF,eAAO,MAAM,UAAU,EAAE,eASxB,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,sBAGnC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,eAAO,MAAM,yBAAyB,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAQ,gBAU7E,CAAC;AAEF,eAAO,MAAM,qBAAqB,eAAe,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAQ,uBAY/E,CAAC"}
+{"version":3,"file":"conversation-session-fixtures.d.ts","sourceRoot":"","sources":["../../../../source/services/session/test-helpers/conversation-session-fixtures.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC7G,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAGlF,eAAO,MAAM,UAAU,EAAE,eASxB,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,sBAGnC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,IAAI,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/E,eAAO,MAAM,yBAAyB,aAAa,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAQ,gBAa7E,CAAC;AAEF,eAAO,MAAM,qBAAqB,eAAe,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAQ,uBAY/E,CAAC"}

package/dist/services/session/test-helpers/conversation-session-fixtures.js

@@ -15,7 +15,10 @@ export const sessionContextService = {
     getContext: () => null,
 };
 export const createMockSettingsService = (entries = []) => {
-    const settings = new Map(entries);
+    const settings = new Map([
+        ['agent.modelSelection', { model: 'test-model', provider: 'openai' }],
+        ...entries,
+    ]);
     return {
         get: (key) => settings.get(key),
         getDynamic: (key) => settings.get(key),
@@ -31,7 +34,7 @@ export const createMockAgentClient = (overrides = {}) => {
         startStream: async () => new MockStream([]),
         continueRunStream: async () => new MockStream([]),
         abort: () => { },
-        setModel: () => { },
+        setModelSelection: () => { },
         addToolInterceptor: () => () => { },
         chat: async () => '',
         getApprovalPolicyRegistry: () => approvalPolicyRegistry,

package/dist/services/session/test-helpers/conversation-session-fixtures.js.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-session-fixtures.js","sourceRoot":"","sources":["../../../../source/services/session/test-helpers/conversation-session-fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAG/D,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAC;AAE7F,MAAM,CAAC,MAAM,UAAU,GAAoB;IACzC,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;IAClB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;IAC1B,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;IACjC,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;CAC7B,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAA2B;IAC3D,cAAc,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE;IACtC,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;CACvB,CAAC;AAIF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,OAAO,GAAwB,EAAE,EAAoB,EAAE;IAC/F,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;IAClC,OAAO;QACL,GAAG,EAAE,CAAC,GAAQ,EAAO,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC;QACzC,UAAU,EAAE,CAAC,GAAW,EAAW,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC;QACvD,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC;QACb,UAAU,EAAE,GAAG,EAAE,GAAE,CAAC;QACpB,aAAa,EAAE,GAAG,EAAE,GAAE,CAAC;QACvB,oBAAoB,EAAE,GAAG,EAAE,GAAE,CAAC;KAC/B,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,SAAS,GAA4B,EAAE,EAA2B,EAAE;IACxG,MAAM,sBAAsB,GAAG,IAAI,0BAA0B,EAAE,CAAC;IAChE,OAAO;QACL,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC;QAC3C,iBAAiB,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC;QACjD,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;QACf,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;QAClB,kBAAkB,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,GAAE,CAAC;QAClC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,EAAE;QACpB,yBAAyB,EAAE,GAAG,EAAE,CAAC,sBAAsB;QACvD,GAAG,SAAS;KACyB,CAAC;AAC1C,CAAC,CAAC"}
+{"version":3,"file":"conversation-session-fixtures.js","sourceRoot":"","sources":["../../../../source/services/session/test-helpers/conversation-session-fixtures.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAG/D,OAAO,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAC;AAE7F,MAAM,CAAC,MAAM,UAAU,GAAoB;IACzC,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,IAAI,EAAE,GAAG,EAAE,GAAE,CAAC;IACd,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;IACf,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC;IAClB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;IAC1B,gBAAgB,EAAE,GAAG,EAAE,CAAC,SAAS;IACjC,kBAAkB,EAAE,GAAG,EAAE,GAAE,CAAC;CAC7B,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAA2B;IAC3D,cAAc,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE;IACtC,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI;CACvB,CAAC;AAIF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,OAAO,GAAwB,EAAE,EAAoB,EAAE;IAC/F,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAkB;QACxC,CAAC,sBAAsB,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;QACrE,GAAG,OAAO;KACX,CAAC,CAAC;IACH,OAAO;QACL,GAAG,EAAE,CAAC,GAAQ,EAAO,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC;QACzC,UAAU,EAAE,CAAC,GAAW,EAAW,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC;QACvD,GAAG,EAAE,GAAG,EAAE,GAAE,CAAC;QACb,UAAU,EAAE,GAAG,EAAE,GAAE,CAAC;QACpB,aAAa,EAAE,GAAG,EAAE,GAAE,CAAC;QACvB,oBAAoB,EAAE,GAAG,EAAE,GAAE,CAAC;KAC/B,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,SAAS,GAA4B,EAAE,EAA2B,EAAE;IACxG,MAAM,sBAAsB,GAAG,IAAI,0BAA0B,EAAE,CAAC;IAChE,OAAO;QACL,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC;QAC3C,iBAAiB,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC;QACjD,KAAK,EAAE,GAAG,EAAE,GAAE,CAAC;QACf,iBAAiB,EAAE,GAAG,EAAE,GAAE,CAAC;QAC3B,kBAAkB,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,GAAE,CAAC;QAClC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,EAAE;QACpB,yBAAyB,EAAE,GAAG,EAAE,CAAC,sBAAsB;QACvD,GAAG,SAAS;KACyB,CAAC;AAC1C,CAAC,CAAC"}

package/dist/services/settings/ancillary-settings-migration.d.ts

@@ -1,4 +1,4 @@
-import type { SettingsData } from './settings-schema.js';
+import { type SettingsData } from './settings-schema.js';
 export declare function migrateLegacyAncillarySettings(config: Partial<SettingsData>, rawConfig: unknown): {
     config: Partial<SettingsData>;
     migrated: boolean;

package/dist/services/settings/ancillary-settings-migration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ancillary-settings-migration.d.ts","sourceRoot":"","sources":["../../../source/services/settings/ancillary-settings-migration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAwEzD,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,EAC7B,SAAS,EAAE,OAAO,GACjB;IAAE,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAqBtD"}
+{"version":3,"file":"ancillary-settings-migration.d.ts","sourceRoot":"","sources":["../../../source/services/settings/ancillary-settings-migration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAyCzD,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,EAC7B,SAAS,EAAE,OAAO,GACjB;IAAE,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAiBtD"}

package/dist/services/settings/ancillary-settings-migration.js

@@ -1,42 +1,12 @@
 const MIGRATIONS = [
-    { target: 'agent.smartModel', legacy: ['agent.capableModel', 'agent.mentorModel'] },
-    { target: 'agent.smartProvider', legacy: ['agent.mentorProvider'] },
     { target: 'agent.smartReasoningEffort', legacy: ['agent.mentorReasoningEffort'] },
-    {
-        target: 'agent.balancedModel',
-        legacy: ['agent.subagentWorkerModel'],
-    },
-    {
-        target: 'agent.balancedProvider',
-        legacy: ['agent.subagentWorkerProvider'],
-    },
-    {
-        target: 'agent.balancedReasoningEffort',
-        legacy: ['agent.subagentWorkerReasoningEffort'],
-    },
-    {
-        target: 'agent.cheapModel',
-        legacy: ['agent.efficientModel', 'agent.subagentExplorerModel', 'agent.subagentLibrarianModel'],
-    },
-    {
-        target: 'agent.cheapProvider',
-        legacy: ['agent.subagentExplorerProvider', 'agent.subagentLibrarianProvider'],
-    },
+    { target: 'agent.balancedReasoningEffort', legacy: ['agent.subagentWorkerReasoningEffort'] },
     {
         target: 'agent.cheapReasoningEffort',
         legacy: ['agent.subagentExplorerReasoningEffort', 'agent.subagentLibrarianReasoningEffort'],
     },
-    { target: 'agent.choreModel', legacy: ['agent.autoApproveModel', 'tools.editHealingModel'] },
-    { target: 'agent.choreProvider', legacy: ['agent.autoApproveProvider', 'tools.editHealingProvider'] },
-    {
-        target: 'agent.decisionModel',
-        legacy: ['agent.decisionShadowModel', 'agent.autoApproveDecisionShadowModel'],
-    },
+    { target: 'agent.decisionModel', legacy: ['agent.decisionShadowModel', 'agent.autoApproveDecisionShadowModel'] },
 ];
-// Tier model settings are model pools; a migrated legacy string value
-// normalizes to a single-entry pool so runtime reads see one consistent shape
-// (migration output is not re-parsed through the schema).
-const TIER_MODEL_TARGETS = new Set(['agent.smartModel', 'agent.balancedModel', 'agent.cheapModel', 'agent.choreModel']);
 function getOwnValue(object, path) {
     let current = object;
     for (const segment of path.split('.')) {
@@ -66,14 +36,11 @@ export function migrateLegacyAncillarySettings(config, rawConfig) {
         if (getOwnValue(rawConfig, migration.target).found)
             continue;
         const legacyValue = migration.legacy
-            .map((path) => getOwnValue(rawConfig, path))
+            .map((path) => ({ ...getOwnValue(rawConfig, path), path }))
             .find((candidate) => candidate.found && candidate.value !== undefined && candidate.value !== null);
         if (!legacyValue)
             continue;
-        const value = TIER_MODEL_TARGETS.has(migration.target) && !Array.isArray(legacyValue.value)
-            ? [legacyValue.value]
-            : legacyValue.value;
-        setValue(migratedConfig, migration.target, value);
+        setValue(migratedConfig, migration.target, legacyValue.value);
         migrated = true;
     }
     return { config: migratedConfig, migrated };

package/dist/services/settings/ancillary-settings-migration.js.map

@@ -1 +1 @@
-{"version":3,"file":"ancillary-settings-migration.js","sourceRoot":"","sources":["../../../source/services/settings/ancillary-settings-migration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ancillary-settings-migration.js","sourceRoot":"","sources":["../../../source/services/settings/ancillary-settings-migration.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,GAAgB;IAC9B,EAAE,MAAM,EAAE,4BAA4B,EAAE,MAAM,EAAE,CAAC,6BAA6B,CAAC,EAAE;IACjF,EAAE,MAAM,EAAE,+BAA+B,EAAE,MAAM,EAAE,CAAC,qCAAqC,CAAC,EAAE;IAC5F;QACE,MAAM,EAAE,4BAA4B;QACpC,MAAM,EAAE,CAAC,uCAAuC,EAAE,wCAAwC,CAAC;KAC5F;IACD,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,EAAE,CAAC,2BAA2B,EAAE,sCAAsC,CAAC,EAAE;CACjH,CAAC;AAEF,SAAS,WAAW,CAAC,MAAe,EAAE,IAAY;IAChD,IAAI,OAAO,GAAG,MAAM,CAAC;IACrB,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACtC,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;YACvF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QAC1B,CAAC;QACD,OAAO,GAAI,OAAmC,CAAC,OAAO,CAAC,CAAC;IAC1D,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AACzC,CAAC;AAED,SAAS,QAAQ,CAAC,MAA+B,EAAE,IAAY,EAAE,KAAc;IAC7E,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACjC,IAAI,OAAO,GAAG,MAAM,CAAC;IACrB,KAAK,MAAM,OAAO,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5C,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAI,KAAK,IAAI,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACvE,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QACxB,CAAC;QACD,OAAO,GAAG,OAAO,CAAC,OAAO,CAA4B,CAAC;IACxD,CAAC;IACD,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,GAAG,KAAK,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC5C,MAA6B,EAC7B,SAAkB;IAElB,MAAM,cAAc,GAAG,eAAe,CAAC,MAAM,CAA4B,CAAC;IAC1E,IAAI,QAAQ,GAAG,KAAK,CAAC;IAErB,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;QACnC,IAAI,WAAW,CAAC,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK;YAAE,SAAS;QAE7D,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM;aACjC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,WAAW,CAAC,SAAS,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;aAC1D,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,KAAK,KAAK,SAAS,IAAI,SAAS,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC;QACrG,IAAI,CAAC,WAAW;YAAE,SAAS;QAE3B,QAAQ,CAAC,cAAc,EAAE,SAAS,CAAC,MAAM,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;QAC9D,QAAQ,GAAG,IAAI,CAAC;IAClB,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,cAAuC,EAAE,QAAQ,EAAE,CAAC;AACvE,CAAC"}

package/dist/services/settings/model-selection.d.ts

@@ -0,0 +1,7 @@
+import { z } from 'zod';
+export declare const ModelSelectionSchema: z.ZodObject<{
+    model: z.ZodString;
+    provider: z.ZodString;
+}, z.core.$strip>;
+export type ModelSelection = z.infer<typeof ModelSelectionSchema>;
+//# sourceMappingURL=model-selection.d.ts.map

package/dist/services/settings/model-selection.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-selection.d.ts","sourceRoot":"","sources":["../../../source/services/settings/model-selection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,oBAAoB;;;iBAG/B,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC"}

package/dist/services/settings/model-selection.js

@@ -0,0 +1,6 @@
+import { z } from 'zod';
+export const ModelSelectionSchema = z.object({
+    model: z.string().trim().min(1),
+    provider: z.string().trim().min(1),
+});
+//# sourceMappingURL=model-selection.js.map

package/dist/services/settings/model-selection.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-selection.js","sourceRoot":"","sources":["../../../source/services/settings/model-selection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC3C,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/B,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;CACnC,CAAC,CAAC"}

package/dist/services/settings/persisted-selection-migration.d.ts

@@ -0,0 +1,9 @@
+/** File-only compatibility. Runtime writes must continue to use the strict schema.
+ * Bind each legacy model to its own provider before applying historical role
+ * precedence. Validate even superseded legacy values before removing them.
+ */
+export declare function migratePersistedSelections(raw: unknown): {
+    value: unknown;
+    migrated: boolean;
+};
+//# sourceMappingURL=persisted-selection-migration.d.ts.map

package/dist/services/settings/persisted-selection-migration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"persisted-selection-migration.d.ts","sourceRoot":"","sources":["../../../source/services/settings/persisted-selection-migration.ts"],"names":[],"mappings":"AAmBA;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,OAAO,GAAG;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAA;CAAE,CAiF9F"}

package/dist/services/settings/persisted-selection-migration.js

@@ -0,0 +1,109 @@
+import deepEqual from 'fast-deep-equal';
+import { z } from 'zod';
+import { ModelSelectionSchema } from './model-selection.js';
+const isRecord = (value) => value !== null && typeof value === 'object' && !Array.isArray(value);
+const providerSchema = z.string().trim().min(1);
+const roles = [
+    'efficient',
+    'capable',
+    'mentor',
+    'subagentExplorer',
+    'subagentWorker',
+    'subagentLibrarian',
+    'autoApprove',
+];
+const tiers = ['smart', 'balanced', 'cheap', 'chore'];
+/** File-only compatibility. Runtime writes must continue to use the strict schema.
+ * Bind each legacy model to its own provider before applying historical role
+ * precedence. Validate even superseded legacy values before removing them.
+ */
+export function migratePersistedSelections(raw) {
+    if (!isRecord(raw))
+        return { value: raw, migrated: false };
+    const value = structuredClone(raw);
+    const agent = isRecord(value.agent) ? value.agent : {};
+    const tools = isRecord(value.tools) ? value.tools : {};
+    const parentProvider = Object.hasOwn(agent, 'provider')
+        ? providerSchema.parse(agent.provider)
+        : isRecord(agent.modelSelection) && Object.hasOwn(agent.modelSelection, 'provider')
+            ? providerSchema.parse(agent.modelSelection.provider)
+            : 'openai';
+    if (Object.hasOwn(agent, 'model'))
+        providerSchema.parse(agent.model);
+    if (!Object.hasOwn(agent, 'modelSelection') && (Object.hasOwn(agent, 'model') || Object.hasOwn(agent, 'provider'))) {
+        agent.modelSelection = ModelSelectionSchema.parse({
+            model: Object.hasOwn(agent, 'model') ? agent.model : 'gpt-5.1',
+            provider: parentProvider,
+        });
+    }
+    const providerFor = (section, role) => Object.hasOwn(section, `${role}Provider`) ? providerSchema.parse(section[`${role}Provider`]) : parentProvider;
+    const bind = (entry, provider) => {
+        if (typeof entry === 'string')
+            return { model: entry, provider };
+        if (isRecord(entry) && !Object.hasOwn(entry, 'provider'))
+            return { ...entry, provider };
+        return entry;
+    };
+    const selections = {};
+    for (const role of roles) {
+        const provider = providerFor(agent, role);
+        const key = `${role}Model`;
+        if (!Object.hasOwn(agent, key))
+            continue;
+        // The old mentor scalar used an empty string to disable consultation.
+        if (role === 'mentor' && agent[key] === '')
+            continue;
+        selections[role] = ModelSelectionSchema.parse(typeof agent[key] === 'string' ? bind(agent[key], provider) : agent[key]);
+    }
+    const healingProvider = providerFor(tools, 'editHealing');
+    if (Object.hasOwn(tools, 'editHealingModel')) {
+        selections.editHealing = ModelSelectionSchema.parse(typeof tools.editHealingModel === 'string'
+            ? bind(tools.editHealingModel, healingProvider)
+            : tools.editHealingModel);
+    }
+    for (const tier of tiers) {
+        const provider = providerFor(agent, tier);
+        const key = `${tier}Model`;
+        if (Object.hasOwn(agent, key)) {
+            const pool = agent[key];
+            agent[key] = (Array.isArray(pool) ? pool : [pool]).map((entry) => bind(entry, provider));
+        }
+    }
+    const aliases = {
+        smart: ['capable', 'mentor'],
+        balanced: ['subagentWorker'],
+        cheap: ['efficient', 'subagentExplorer', 'subagentLibrarian'],
+        chore: ['autoApprove', 'editHealing'],
+    };
+    for (const [tier, candidates] of Object.entries(aliases)) {
+        if (Object.hasOwn(agent, `${tier}Model`))
+            continue;
+        const winner = candidates.find((role) => Object.hasOwn(selections, role));
+        if (winner)
+            agent[`${tier}Model`] = [selections[winner]];
+    }
+    if (Object.hasOwn(agent, 'mentorPool')) {
+        if (Array.isArray(agent.mentorPool)) {
+            agent.mentorPool = agent.mentorPool.map((entry) => bind(entry, providerFor(agent, 'mentor')));
+        }
+    }
+    else if (selections.mentor) {
+        agent.mentorPool = [selections.mentor];
+    }
+    for (const role of [...roles, ...tiers]) {
+        if (roles.includes(role))
+            delete agent[`${role}Model`];
+        delete agent[`${role}Provider`];
+    }
+    delete agent.model;
+    delete agent.provider;
+    delete tools.editHealingModel;
+    delete tools.editHealingProvider;
+    // Do not repair malformed section containers by replacing them with objects.
+    if (isRecord(value.agent))
+        value.agent = agent;
+    else if (!Object.hasOwn(value, 'agent') && Object.keys(agent).length)
+        value.agent = agent;
+    return { value, migrated: !deepEqual(raw, value) };
+}
+//# sourceMappingURL=persisted-selection-migration.js.map

package/dist/services/settings/persisted-selection-migration.js.map

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

package/dist/services/settings/setting-schema-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setting-schema-utils.d.ts","sourceRoot":"","sources":["../../../source/services/settings/setting-schema-utils.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CA0B7C;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAiBrD"}
+{"version":3,"file":"setting-schema-utils.d.ts","sourceRoot":"","sources":["../../../source/services/settings/setting-schema-utils.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CA6B7C;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAiBrD"}

package/dist/services/settings/setting-schema-utils.js

@@ -30,8 +30,11 @@ export function unwrapSchema(schema) {
             current = def.schema;
         }
         else if (typeName === 'pipe' || typeName === 'ZodPipe') {
-            // Zod v4: .transform() produces a ZodPipe; follow the input side.
-            current = def.in || def.schema;
+            // Preprocessing puts a transform on the input side; its output owns
+            // the settings shape. Ordinary transforms retain the input schema.
+            const input = def.in;
+            const inputType = input?.def?.type ?? input?._def?.typeName;
+            current = inputType === 'transform' || inputType === 'ZodTransform' ? def.out : input || def.schema;
         }
         else {
             break;

package/dist/services/settings/setting-schema-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"setting-schema-utils.js","sourceRoot":"","sources":["../../../source/services/settings/setting-schema-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD;;;;;;GAMG;AACH,MAAM,UAAU,YAAY,CAAC,MAAW;IACtC,IAAI,OAAO,GAAG,MAAM,CAAC;IACrB,OAAO,OAAO,EAAE,CAAC;QACf,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;QACxC,IAAI,CAAC,GAAG;YAAE,MAAM;QAChB,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,QAAQ,CAAC;QAC1C,MAAM,UAAU,GAAG,QAAQ,KAAK,UAAU,IAAI,QAAQ,KAAK,aAAa,CAAC;QACzE,MAAM,UAAU,GAAG,QAAQ,KAAK,UAAU,IAAI,QAAQ,KAAK,aAAa,CAAC;QACzE,IAAI,UAAU,IAAI,UAAU,EAAE,CAAC;YAC7B,IAAI,OAAO,OAAO,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;gBACzC,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;YAC7B,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC;YAC1B,CAAC;QACH,CAAC;aAAM,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;YAC/D,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC;QAC1B,CAAC;aAAM,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;YAC/D,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC;QACvB,CAAC;aAAM,IAAI,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzD,kEAAkE;YAClE,OAAO,GAAG,GAAG,CAAC,EAAE,IAAI,GAAG,CAAC,MAAM,CAAC;QACjC,CAAC;aAAM,CAAC;YACN,MAAM;QACR,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC9C,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAC3B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,OAAO,GAAQ,cAAc,CAAC;IAElC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QAE/B,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QAChC,IAAI,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QAE/B,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC;QACxD,MAAM,aAAa,GAAG,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;QACpE,OAAO,GAAG,aAAa,EAAE,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"setting-schema-utils.js","sourceRoot":"","sources":["../../../source/services/settings/setting-schema-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD;;;;;;GAMG;AACH,MAAM,UAAU,YAAY,CAAC,MAAW;IACtC,IAAI,OAAO,GAAG,MAAM,CAAC;IACrB,OAAO,OAAO,EAAE,CAAC;QACf,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;QACxC,IAAI,CAAC,GAAG;YAAE,MAAM;QAChB,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,QAAQ,CAAC;QAC1C,MAAM,UAAU,GAAG,QAAQ,KAAK,UAAU,IAAI,QAAQ,KAAK,aAAa,CAAC;QACzE,MAAM,UAAU,GAAG,QAAQ,KAAK,UAAU,IAAI,QAAQ,KAAK,aAAa,CAAC;QACzE,IAAI,UAAU,IAAI,UAAU,EAAE,CAAC;YAC7B,IAAI,OAAO,OAAO,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;gBACzC,OAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;YAC7B,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC;YAC1B,CAAC;QACH,CAAC;aAAM,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;YAC/D,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC;QAC1B,CAAC;aAAM,IAAI,QAAQ,KAAK,SAAS,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;YAC/D,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC;QACvB,CAAC;aAAM,IAAI,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACzD,oEAAoE;YACpE,mEAAmE;YACnE,MAAM,KAAK,GAAG,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,SAAS,GAAG,KAAK,EAAE,GAAG,EAAE,IAAI,IAAI,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC;YAC5D,OAAO,GAAG,SAAS,KAAK,WAAW,IAAI,SAAS,KAAK,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,CAAC,MAAM,CAAC;QACtG,CAAC;aAAM,CAAC;YACN,MAAM;QACR,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC9C,IAAI,CAAC,GAAG;QAAE,OAAO,SAAS,CAAC;IAC3B,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,OAAO,GAAQ,cAAc,CAAC;IAElC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QAE/B,OAAO,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;QAChC,IAAI,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QAE/B,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC;QACxD,MAAM,aAAa,GAAG,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;QACpE,OAAO,GAAG,aAAa,EAAE,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}

package/dist/services/settings/settings-env.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-env.d.ts","sourceRoot":"","sources":["../../../source/services/settings/settings-env.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,OAAO,GAChE,CAAC,GACD,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,CAAC,GACxB,KAAK,CAAC,CAAC,CAAC,GACR,CAAC,SAAS,MAAM,GAChB;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAE,GACtC,CAAC,CAAC;AAEN;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAAC,YAAY,CAAC,CA2DzD;AAED,eAAO,MAAM,eAAe,UAAW,OAAO,KAAG,OAOhD,CAAC;AAQF,eAAO,MAAM,iBAAiB,QAAO,OAQpC,CAAC"}
+{"version":3,"file":"settings-env.d.ts","sourceRoot":"","sources":["../../../source/services/settings/settings-env.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,OAAO,GAChE,CAAC,GACD,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,CAAC,GACxB,KAAK,CAAC,CAAC,CAAC,GACR,CAAC,SAAS,MAAM,GAChB;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAE,GACtC,CAAC,CAAC;AAEN;;;GAGG;AACH,wBAAgB,iBAAiB,IAAI,OAAO,CAAC,YAAY,CAAC,CA0DzD;AAED,eAAO,MAAM,eAAe,UAAW,OAAO,KAAG,OAOhD,CAAC;AAQF,eAAO,MAAM,iBAAiB,QAAO,OAQpC,CAAC"}

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

@@ -55,8 +55,6 @@ export function buildEnvOverrides() {
     if (env.OPENAI_API_KEY)
         openai.apiKey = env.OPENAI_API_KEY;
     const agent = { openrouter, openai };
-    if (env.OPENROUTER_MODEL)
-        agent.model = env.OPENROUTER_MODEL;
     return {
         agent,
         logging,

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

@@ -1 +1 @@
-{"version":3,"file":"settings-env.js","sourceRoot":"","sources":["../../../source/services/settings/settings-env.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings-env.js","sourceRoot":"","sources":["../../../source/services/settings/settings-env.ts"],"names":[],"mappings":"AAUA;;;GAGG;AACH,MAAM,UAAU,iBAAiB;IAC/B,MAAM,GAAG,GAAG,OAAO,OAAO,KAAK,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9D,MAAM,UAAU,GAAkE,EAAE,CAAC;IACrF,IAAI,GAAG,CAAC,kBAAkB;QAAE,UAAU,CAAC,MAAM,GAAG,GAAG,CAAC,kBAAkB,CAAC;IACvE,IAAI,GAAG,CAAC,mBAAmB;QAAE,UAAU,CAAC,OAAO,GAAG,GAAG,CAAC,mBAAmB,CAAC;IAC1E,IAAI,GAAG,CAAC,mBAAmB;QAAE,UAAU,CAAC,QAAQ,GAAG,GAAG,CAAC,mBAAmB,CAAC;IAC3E,IAAI,GAAG,CAAC,gBAAgB;QAAE,UAAU,CAAC,KAAK,GAAG,GAAG,CAAC,gBAAgB,CAAC;IAElE,MAAM,OAAO,GAAyC,EAAE,CAAC;IACzD,IAAI,GAAG,CAAC,SAAS;QAAE,OAAO,CAAC,QAAQ,GAAG,GAAG,CAAC,SAAgD,CAAC;IAC3F,IAAI,GAAG,CAAC,eAAe,KAAK,SAAS;QAAE,OAAO,CAAC,cAAc,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,MAAM,CAAC;IACvG,IAAI,GAAG,CAAC,aAAa,KAAK,SAAS;QAAE,OAAO,CAAC,YAAY,GAAG,IAAI,CAAC;IAEjE,MAAM,WAAW,GAA6C;QAC5D,OAAO,EAAE,GAAG,CAAC,QAAQ;KACtB,CAAC;IAEF,MAAM,GAAG,GAAqC;QAC5C,SAAS,EAAE,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,OAAO;KACpC,CAAC;IAEF,MAAM,KAAK,GAAuC,EAAE,CAAC;IACrD,IAAI,GAAG,CAAC,mBAAmB,KAAK,SAAS;QAAE,KAAK,CAAC,iBAAiB,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,KAAK,OAAO,CAAC;IAEjH,MAAM,KAAK,GAAuC,EAAE,CAAC;IACrD,IAAI,GAAG,CAAC,eAAe,KAAK,SAAS;QAAE,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC;IAElE,MAAM,SAAS,GAA2C,EAAE,CAAC;IAC7D,IAAI,GAAG,CAAC,cAAc,EAAE,CAAC;QACvB,SAAS,CAAC,MAAM,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,cAAc,EAAE,CAAC;IACpD,CAAC;IACD,IAAI,GAAG,CAAC,WAAW,EAAE,CAAC;QACpB,SAAS,CAAC,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC;IAC9C,CAAC;IACD,IAAI,GAAG,CAAC,iBAAiB,IAAI,GAAG,CAAC,kBAAkB,EAAE,CAAC;QACpD,SAAS,CAAC,SAAS,GAAG,EAAE,CAAC;QACzB,IAAI,GAAG,CAAC,iBAAiB;YAAE,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,GAAG,CAAC,iBAAiB,CAAC;QAC9E,IAAI,GAAG,CAAC,kBAAkB;YAAE,SAAS,CAAC,SAAS,CAAC,OAAO,GAAG,GAAG,CAAC,kBAAkB,CAAC;IACnF,CAAC;IACD,IAAI,GAAG,CAAC,gBAAgB;QAAE,SAAS,CAAC,OAAO,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,gBAAgB,EAAE,CAAC;IAChF,IAAI,GAAG,CAAC,mBAAmB,EAAE,CAAC;QAC5B,SAAS,CAAC,QAAQ,GAAG,GAAG,CAAC,mBAAmB,CAAC;IAC/C,CAAC;IAED,MAAM,MAAM,GAA8D,EAAE,CAAC;IAC7E,IAAI,GAAG,CAAC,cAAc;QAAE,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,cAAc,CAAC;IAE3D,MAAM,KAAK,GAAuC,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;IAEzE,OAAO;QACL,KAAK;QACL,OAAO;QACP,WAAW;QACX,GAAG;QACH,KAAK;QACL,KAAK;QACL,SAAS;KACe,CAAC;AAC7B,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAc,EAAW,EAAE;IACzD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC9C,OAAO,UAAU,KAAK,GAAG,IAAI,UAAU,KAAK,MAAM,IAAI,UAAU,KAAK,KAAK,CAAC;AAC7E,CAAC,CAAC;AAEF,yCAAyC;AACzC,EAAE;AACF,6EAA6E;AAC7E,4EAA4E;AAC5E,4EAA4E;AAC5E,qCAAqC;AACrC,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAY,EAAE;IAC7C,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM;QAC/B,OAAO,CAAC,GAAG,CAAC,MAAM,KAAK,SAAS;QAChC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,SAAS;QAClC,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,SAAS;QACxC,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,MAAM,CACvC,CAAC;AACJ,CAAC,CAAC"}

package/dist/services/settings/settings-merger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-merger.d.ts","sourceRoot":"","sources":["../../../source/services/settings/settings-merger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,KAAK,UAAU,GAAG;IAChB,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;CACjE,CAAC;AAEF;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,SAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAoBlF;AAuBD;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,YAAY,EACtB,UAAU,EAAE,WAAW,CAAC,YAAY,CAAC,EACrC,GAAG,EAAE,WAAW,CAAC,YAAY,CAAC,EAC9B,GAAG,EAAE,WAAW,CAAC,YAAY,CAAC,EAC9B,IAAI,CAAC,EAAE;IACL,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,UAAU,CAAC;CAC7B,GACA,YAAY,CAyEd;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,YAAY,EACtB,UAAU,EAAE,WAAW,CAAC,YAAY,CAAC,EACrC,GAAG,EAAE,WAAW,CAAC,YAAY,CAAC,EAC9B,GAAG,EAAE,WAAW,CAAC,YAAY,CAAC,GAC7B,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAsB5B"}
+{"version":3,"file":"settings-merger.d.ts","sourceRoot":"","sources":["../../../source/services/settings/settings-merger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAC7F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,KAAK,UAAU,GAAG;IAChB,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;CACjE,CAAC;AAEF;;GAEG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,SAAK,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsBlF;AA6BD;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,YAAY,EACtB,UAAU,EAAE,WAAW,CAAC,YAAY,CAAC,EACrC,GAAG,EAAE,WAAW,CAAC,YAAY,CAAC,EAC9B,GAAG,EAAE,WAAW,CAAC,YAAY,CAAC,EAC9B,IAAI,CAAC,EAAE;IACL,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,UAAU,CAAC;CAC7B,GACA,YAAY,CAyEd;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,QAAQ,EAAE,YAAY,EACtB,UAAU,EAAE,WAAW,CAAC,YAAY,CAAC,EACrC,GAAG,EAAE,WAAW,CAAC,YAAY,CAAC,EAC9B,GAAG,EAAE,WAAW,CAAC,YAAY,CAAC,GAC7B,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAsB5B"}

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

@@ -12,7 +12,10 @@ export function flattenSettings(obj, prefix = '') {
             continue;
         const value = record[key];
         const newKey = prefix ? `${prefix}.${key}` : key;
-        if (value && typeof value === 'object' && !Array.isArray(value)) {
+        if (newKey === 'agent.modelSelection') {
+            result[newKey] = value;
+        }
+        else if (value && typeof value === 'object' && !Array.isArray(value)) {
             Object.assign(result, flattenSettings(value, newKey));
         }
         else {
@@ -24,16 +27,20 @@ export function flattenSettings(obj, prefix = '') {
 /**
  * Deep merge source into target (mutates target).
  */
-function deepMerge(target, source) {
+function deepMerge(target, source, prefix = '') {
     for (const key in source) {
         if (!Object.prototype.hasOwnProperty.call(source, key))
             continue;
         const sourceValue = source[key];
-        if (sourceValue && typeof sourceValue === 'object' && !Array.isArray(sourceValue)) {
+        const settingPath = prefix ? `${prefix}.${key}` : key;
+        if (sourceValue &&
+            typeof sourceValue === 'object' &&
+            !Array.isArray(sourceValue) &&
+            settingPath !== 'agent.modelSelection') {
             if (!target[key] || typeof target[key] !== 'object' || Array.isArray(target[key])) {
                 target[key] = {};
             }
-            deepMerge(target[key], sourceValue);
+            deepMerge(target[key], sourceValue, settingPath);
         }
         else {
             target[key] = sourceValue;
@@ -80,7 +87,7 @@ export function mergeSettings(defaults, fileConfig, env, cli, opts) {
         return {
             providers: merged.providers,
             enable_agent_workflow: merged.enable_agent_workflow,
-            agent: merged.agent,
+            agent: validated.data.agent,
             shell: merged.shell,
             sandbox: merged.sandbox,
             agentWorkflow: merged.agentWorkflow,

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

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

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

@@ -46,6 +46,7 @@ export declare function loadSettingsFromFile(opts: {
     hadErrors: boolean;
     errorDetails?: string[];
     recovery?: SettingsFileRecovery;
+    migratedSelections?: boolean;
 };
 /**
  * Move a corrupt `settings.json` aside so its original bytes remain available

package/dist/services/settings/settings-persistence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-persistence.d.ts","sourceRoot":"","sources":["../../../source/services/settings/settings-persistence.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAGzD,KAAK,UAAU,GAAG;IAChB,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAChE,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;CAClE,CAAC;AAMF;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,IAAI,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CA4BrG;AAED,KAAK,gBAAgB,GAAG,CAAC,OAAO,EAAE,YAAY,KAAK,YAAY,CAAC;AAEhE,KAAK,WAAW,GAAG;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAMF,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAE,WAAgB,GAAG,MAAM,IAAI,CAsD9F;AAyBD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,UAAU,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,UAAU,CAAC;CAC7B,GAAG;IACF,SAAS,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IACjC,GAAG,EAAE,OAAO,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,oBAAoB,CAAC;CACjC,CAwFA;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CASrF;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,YAAY,CAAC;IACvB,MAAM,EAAE,gBAAgB,CAAC;IACzB,sBAAsB,EAAE,CAAC,QAAQ,EAAE,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAC1E,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,GAAG,YAAY,GAAG,SAAS,CAoG3B;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAqBpF;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,OAAO,EACf,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAC,EAChC,MAAM,GAAE,MAAW,GAClB,OAAO,CA0CT"}
+{"version":3,"file":"settings-persistence.d.ts","sourceRoot":"","sources":["../../../source/services/settings/settings-persistence.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,KAAK,CAAC;AACtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAKzD,KAAK,UAAU,GAAG;IAChB,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAChE,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;CAClE,CAAC;AAMF;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,IAAI,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,EAAE,MAAM,EAAE,CAAC;CAChC,CAAC;AAEF;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CA4BrG;AAED,KAAK,gBAAgB,GAAG,CAAC,OAAO,EAAE,YAAY,KAAK,YAAY,CAAC;AAEhE,KAAK,WAAW,GAAG;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAMF,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAE,WAAgB,GAAG,MAAM,IAAI,CAsD9F;AA0BD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IACzC,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,UAAU,CAAC;IACnB,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,UAAU,CAAC;CAC7B,GAAG;IACF,SAAS,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IACjC,GAAG,EAAE,OAAO,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,QAAQ,CAAC,EAAE,oBAAoB,CAAC;IAChC,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B,CAsGA;AAED;;;;;;GAMG;AACH,wBAAgB,6BAA6B,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CASrF;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,UAAU,CAAC;IACnB,QAAQ,EAAE,YAAY,CAAC;IACvB,MAAM,EAAE,gBAAgB,CAAC;IACzB,sBAAsB,EAAE,CAAC,QAAQ,EAAE,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAC1E,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,cAAc,CAAC,EAAE,UAAU,CAAC;IAC5B,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,GAAG,YAAY,GAAG,SAAS,CAoG3B;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,CAqBpF;AAED;;GAEG;AACH,wBAAgB,cAAc,CAC5B,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,OAAO,EACf,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAC,EAChC,MAAM,GAAE,MAAW,GAClB,OAAO,CA0CT"}