dsh-model-switch 0.4.21 → 0.4.23

package/lib/index.js

@@ -12,7 +12,83 @@ import { dirname, join } from "node:path";
 import { renderPrompt } from "@deepseek-ai/dsh-system-prompt";
 import { boundContextSummary, createMessage, createUserMessage } from "@deepseek-ai/dsh-llm";
 import { canonicalHeader } from "@deepseek-ai/dsh-session";
+//#region lib/types/provider-group.js
+/**
+* Provider configuration groups: per-provider presets for the compaction,
+* subagent, and auto-review routes.
+*
+* A group stores the exact flat settings fields it will write, so applying a
+* group is a plain settings-layer write: every capability consumer keeps
+* reading the live values unchanged. All functions here are pure and never
+* throw on malformed storage.
+*/
+const ROUTE_FIELDS = Object.freeze([
+	"compactProvider",
+	"compactModel",
+	"autoReviewProvider",
+	"autoReviewModel",
+	"subagentProvider",
+	"subagentModel",
+	"subagentReasoningEffort"
+]);
+/** Own data property, so a literal '__proto__' provider id can never touch a prototype. */
+function setKey(target, key, value) {
+	Object.defineProperty(target, key, {
+		value,
+		enumerable: true,
+		writable: true,
+		configurable: true
+	});
+}
+/** A non-blank string. Blank values behave exactly like an absent field. */
+function present(value) {
+	return typeof value === "string" && value.trim() !== "";
+}
+/** Normalize one raw entry to its owning provider and route view; undefined for non-object junk. */
+function normalizeEntry(value) {
+	if (value === null || typeof value !== "object" || Array.isArray(value)) return void 0;
+	const source = value;
+	const group = {};
+	for (const field of ROUTE_FIELDS) {
+		const item = source[field];
+		if (present(item)) group[field] = item;
+	}
+	return {
+		provider: present(source.provider) ? source.provider : "",
+		group
+	};
+}
+/**
+* Strip a raw stored value to well-formed groups; never throws. Both storage
+* shapes are accepted: the stored entry array (keys live in each entry's
+* `provider` field) and a hand-written provider → routes map (keys are the
+* providers). All-empty entries stay: they pin a provider to every default.
+*/
+function normalizeProviderGroups(raw) {
+	const groups = {};
+	if (Array.isArray(raw)) {
+		for (const entry of raw) {
+			const view = normalizeEntry(entry);
+			if (view === void 0 || view.provider === "") continue;
+			setKey(groups, view.provider, view.group);
+		}
+		return groups;
+	}
+	if (raw !== null && typeof raw === "object") for (const [key, value] of Object.entries(raw)) {
+		if (key.trim() === "") continue;
+		const view = normalizeEntry(value);
+		if (view === void 0) continue;
+		setKey(groups, key, view.group);
+	}
+	return groups;
+}
+//#endregion
 //#region lib/types/host-settings.js
+/**
+* Annotated rather than inferred: the nested entry schema's inferred type
+* expands to cosmokit internals (`Dict`) that cannot be named in the emitted
+* declaration, and the annotation pins the output shape to this interface.
+*/
 const Config = z.object({
 	subagentMode: z.union(["follow-main", "fixed"]).default("follow-main").volatile(),
 	subagentProvider: z.string().volatile(),
@@ -26,7 +102,17 @@ const Config = z.object({
 	autoReviewProvider: z.string().volatile(),
 	autoReviewModel: z.string().volatile(),
 	compactProvider: z.string().volatile(),
-	compactModel: z.string().volatile()
+	compactModel: z.string().volatile(),
+	providerGroups: z.array(z.object({
+		provider: z.string().default(""),
+		compactProvider: z.string().default(""),
+		compactModel: z.string().default(""),
+		autoReviewProvider: z.string().default(""),
+		autoReviewModel: z.string().default(""),
+		subagentProvider: z.string().default(""),
+		subagentModel: z.string().default(""),
+		subagentReasoningEffort: z.string().default("")
+	})).default([]).volatile()
 });
 function readConfig(config) {
 	const subagentProvider = config.subagentProvider.get();
@@ -40,6 +126,7 @@ function readConfig(config) {
 	const autoReviewModel = config.autoReviewModel.get();
 	const compactProvider = config.compactProvider.get();
 	const compactModel = config.compactModel.get();
+	const providerGroups = normalizeProviderGroups(config.providerGroups.get());
 	return {
 		subagentMode: config.subagentMode.get(),
 		...subagentProvider === void 0 ? {} : { subagentProvider },
@@ -53,7 +140,8 @@ function readConfig(config) {
 		...autoReviewProvider === void 0 || autoReviewProvider === "" ? {} : { autoReviewProvider },
 		...autoReviewModel === void 0 || autoReviewModel === "" ? {} : { autoReviewModel },
 		...compactProvider === void 0 || compactProvider === "" ? {} : { compactProvider },
-		...compactModel === void 0 || compactModel === "" ? {} : { compactModel }
+		...compactModel === void 0 || compactModel === "" ? {} : { compactModel },
+		...Object.keys(providerGroups).length === 0 ? {} : { providerGroups }
 	};
 }
 //#endregion
@@ -877,9 +965,8 @@ async function compactWithPrevious(ctx, agent, previous, signal) {
 }
 //#endregion
 //#region lib/types/host-runtime.js
-/** Host owner for Model Switch settings and the released Main-default adapter. */
+/** Host owner for Model Switch settings. */
 var ModelSwitchRuntime = class extends Service {
-	static inject = ["agentDefaultModel"];
 	static Config = Config;
 	get capabilities() {
 		const catalog = this.adapters.searchCatalog();
@@ -916,19 +1003,7 @@ var ModelSwitchRuntime = class extends Service {
 	currentSettings() {
 		return { ...this.source() };
 	}
-	currentMainSelection() {
-		return { ...this.ctx.agentDefaultModel.currentSelection() };
-	}
-	async saveMainSelection(selection) {
-		await this.ctx.agentDefaultModel.saveSelection(selection);
-	}
 };
-function mainDefaultPort(service) {
-	return {
-		currentSelection: () => ({ ...service.currentSelection() }),
-		saveSelection: async (selection) => service.saveSelection(selection)
-	};
-}
 const CONTEXT_SUFFIX = /-(\d+)(k|m)$/iu;
 /** Peel Fast and `-<n>k` / `-<n>m` in either order. Product names like `-max` stay. */
 function parsePickerId(id) {
@@ -1029,17 +1104,12 @@ function selectPlanReview(owner) {
 }
 async function approvePlanReview(args) {
 	const current = args.current;
-	const commit = current !== void 0 && current !== null && current.provider === args.selection.provider && current.model === args.selection.model && current.reasoningEffort === args.selection.reasoningEffort ? {
-		committed: true,
-		mainDefaultRestored: true
-	} : await args.select(args.selection);
-	if (!commit.committed) return false;
+	if (!(current !== void 0 && current !== null && current.provider === args.selection.provider && current.model === args.selection.model && current.reasoningEffort === args.selection.reasoningEffort ? { committed: true } : await args.select(args.selection)).committed) return false;
 	await args.answer();
-	if (!commit.mainDefaultRestored) args.onNotRestored?.(args.selection.model);
 	return true;
 }
 //#endregion
 //#region lib/types/index.js
 const name = "dsh-model-switch";
 //#endregion
-export { Config, ModelSwitchAdapterRegistry, ModelSwitchRuntime, ModelSwitchRuntime as default, RUNTIME_CAPABILITIES, approvePlanReview, groupFamilies, mainDefaultPort, name, parsePickerId, planReviewOf, readConfig, selectPlanReview };
+export { Config, ModelSwitchAdapterRegistry, ModelSwitchRuntime, ModelSwitchRuntime as default, RUNTIME_CAPABILITIES, approvePlanReview, groupFamilies, name, parsePickerId, planReviewOf, readConfig, selectPlanReview };

package/lib/types/client/ModelSwitchSettings.d.ts

@@ -2,7 +2,8 @@ import { type ReactNode } from 'react';
 import type { ModelProviderGroup } from '@deepseek-ai/dsh-api-session-controller/types';
 import type { ConfigForm } from '@deepseek-ai/dsh-client-ui-settings/client';
 import type { InjectFace, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots';
-import { type CapabilityRouteView, type MainSettingsView, type ModelSwitchSettingsView, type SubagentSettingsView } from '../client-contract.js';
+import { type CapabilityRouteView, type ModelSwitchSettingsView, type SubagentSettingsView } from '../client-contract.js';
+import { type ProviderGroupConfig } from '../provider-group.js';
 import type { RuntimeCapabilities } from '../runtime-capabilities.js';
 import { type CapabilitiesSnapshot } from './search-capabilities.js';
 import type { ModelSwitchLocaleKey } from './locales.js';
@@ -10,7 +11,6 @@ import type { ConfigViewForm } from './derived-config-form.js';
 export interface ModelSwitchSettingsFace {
     t: (key: ModelSwitchLocaleKey) => string;
     hooks: {
-        mainSettings: ConfigViewForm<MainSettingsView>;
         subagentSettings: ConfigViewForm<SubagentSettingsView>;
         searchSettings: ConfigViewForm<CapabilityRouteView>;
         imageSettings: ConfigViewForm<CapabilityRouteView>;
@@ -19,10 +19,11 @@ export interface ModelSwitchSettingsFace {
         switchSettings: Pick<ConfigForm<ModelSwitchSettingsView>, 'getSnapshot' | 'subscribe'>;
     };
     capabilities: RuntimeCapabilities;
-    saveMain: (next: MainSettingsView, expectedRevision: number) => Promise<number>;
     setSubagent: (field: 'mode' | 'provider' | 'model' | 'reasoningEffort', value: string | undefined) => Promise<void>;
     setCapability: (route: 'search' | 'image' | 'autoReview' | 'compaction', field: 'provider' | 'model', value: string | undefined) => Promise<void>;
     setCompactOnSwitch: (value: boolean) => Promise<void>;
+    /** Replace or remove (undefined) one provider's saved capability group. */
+    saveProviderGroup: (provider: string, group: ProviderGroupConfig | undefined) => Promise<void>;
     loadCatalog: () => Promise<readonly ModelProviderGroup[]>;
     /** Host capabilities long-poll; absent in legacy faces, which keep the static-capabilities path. */
     loadCapabilities?: (revision?: number, signal?: AbortSignal) => Promise<CapabilitiesSnapshot>;

package/lib/types/client/locales.d.ts

@@ -1,22 +1,21 @@
 export declare const zh: {
     readonly nav: "模型切换";
     readonly title: "模型切换";
-    readonly subtitle: "为主会话、子代理和能力工具设置默认模型。修改只影响新请求。";
+    readonly subtitle: "为子代理与能力路由设置固定模型；当前会话模型用输入框旁的选择器直接切换。";
     readonly conversationRoutes: "对话路由";
     readonly capabilityRoutes: "能力路由";
     readonly sendProtection: "发送保护";
     readonly settingsSynced: "设置已同步";
     readonly remoteSettingsUnavailable: "官方 DSH 在非本机浏览器禁用配置读取与写入；请在 Host 的 127.0.0.1 页面打开设置。";
-    readonly defaultBadge: "默认";
     readonly cancel: "取消";
     readonly compactOnSwitch: "切换时压缩";
     readonly compactOnSwitchHelp: "发送且换了模型时，先按目标窗口检查上下文；超了就用切换前的模型压一次历史，再继续请求。只选模型、不发送，不会压缩。官方自动压缩和 /compact 不受影响。压缩会产生额外模型用量，摘要可能省略细节。";
-    readonly main: "主模型";
     readonly provider: "提供商";
     readonly model: "模型";
     readonly providerDefault: "使用提供商默认值";
     readonly providerDefaultShort: "Provider 默认";
     readonly effort: "推理强度";
+    readonly effortPinned: "已固定";
     readonly save: "保存";
     readonly saving: "保存中…";
     readonly saved: "已保存";
@@ -30,10 +29,8 @@ export declare const zh: {
     readonly imageHelp: "统一 generate_image 会调用所选 Codex 或 Grok Adapter；Provider 原有图片工具仍保留。";
     readonly unavailable: "未接入";
     readonly loading: "正在加载设置…";
-    readonly readonly: "设置为只读";
     readonly requestFailed: "保存失败";
     readonly catalogFailed: "无法加载模型目录。";
-    readonly conflict: "设置已在其他位置更改，请检查最新值后重试。";
     readonly autoReview: "自动审查模型";
     readonly autoReviewFollow: "跟随会话模型";
     readonly autoReviewHelp: "为官方 auto-review（Auto 权限预设的逐调用审查）指定审查模型；需启用官方 auto-review 能力包。关闭时审查跟随当前会话模型。";
@@ -42,6 +39,13 @@ export declare const zh: {
     readonly compactionFollow: "跟随会话模型";
     readonly compactionHelp: "为官方压缩（/compact 与官方自动压缩）指定摘要模型；关闭（两个字段都留空）时使用官方默认，即当前会话的目标模型。";
     readonly compactionRouteHelp: "摘要请求固定使用这里的 Provider/模型，与会话目标模型无关；保存后对下一次压缩立即生效。保存时若恰有压缩进行中，可能被打断并在下次重试。";
+    readonly providerGroups: "供应商配置组";
+    readonly providerGroupsCard: "按供应商预设路由";
+    readonly providerGroupsSummary: "会话模型切换到该供应商时自动应用对应组";
+    readonly providerGroupsHelp: "为压缩、子代理、审查按供应商分别保存路由。";
+    readonly providerGroupsBodyHelp: "每个供应商保存一组压缩、子代理、审查路由；本会话的模型切换到该供应商时（无论通过插件的模型选择器还是 TUI 等其他界面），这三条路由自动写入上方对应卡片。切换到未配置的供应商时现有路由保持不变；应用会覆盖三张卡片的当前值（含手动修改）。";
+    readonly providerGroupPick: "选择供应商以编辑其配置组。";
+    readonly providerGroupDelete: "删除该组";
     readonly 'reason.central-subagent-routing': "Alpha.4 没有全局子代理启动路由接口。";
     readonly 'reason.packaged-preset-roots': "Alpha.4 不支持插件提供额外 preset root。";
     readonly 'reason.tool-owner-suppression': "Alpha.4 没有工具所有者或来源抑制接口。";

package/lib/types/client/main-row-controller.d.ts

@@ -1,49 +1,30 @@
 import type { ModelProviderGroup } from '@deepseek-ai/dsh-api-session-controller/types';
-import type { ConfigFormSnapshot } from '@deepseek-ai/dsh-client-ui-settings/client';
-import { type CapabilityRouteView, type MainSettingsView, type SubagentSettingsView } from '../client-contract.js';
+import type { CapabilityRouteView } from '../client-contract.js';
 import type { ModelSwitchLocaleKey } from './locales.js';
-type Share<T> = (selector: (snapshot: ConfigFormSnapshot<T>) => ConfigFormSnapshot<T>) => ConfigFormSnapshot<T>;
-export interface SettingsControllerInputs {
-    useMainSettings: Share<MainSettingsView>;
-    useSubagentSettings: Share<SubagentSettingsView>;
-    saveMain(next: MainSettingsView, expectedRevision: number): Promise<number>;
-    loadCatalog(): Promise<readonly ModelProviderGroup[]>;
-    subscribeProviderOrder?: (listener: () => void) => () => void;
-    t(key: ModelSwitchLocaleKey): string;
-}
 export interface Choice {
     id: string;
     name: string;
     unavailable?: true;
 }
+/** A concrete provider/model/effort triple; route editors copy these fields. */
+export interface RouteModelSelection {
+    provider: string;
+    model: string;
+    reasoningEffort?: string;
+}
 /** Build a settings route for a newly selected model using only that model's default effort. */
-export declare function selectRouteModel(groups: readonly ModelProviderGroup[], provider: string, model: string): MainSettingsView;
+export declare function selectRouteModel(groups: readonly ModelProviderGroup[], provider: string, model: string): RouteModelSelection;
 export declare function deriveRouteChoices(groups: readonly ModelProviderGroup[], route: CapabilityRouteView | undefined, allowedProviders?: readonly string[]): {
     providers: Choice[];
     models: Choice[];
 };
-export declare function expectedMainRevision(mirror: number, accepted?: number): number;
-export declare function acceptedRevisionAfterFailure(accepted: number | undefined, error: unknown): number | undefined;
-export declare function deriveMainChoices(groups: readonly ModelProviderGroup[], draft?: MainSettingsView): {
-    providers: Choice[];
-    models: Choice[];
-    efforts: Choice[];
-};
-export declare function useModelSwitchSettingsController(input: SettingsControllerInputs): {
-    main: ConfigFormSnapshot<MainSettingsView>;
-    subagent: ConfigFormSnapshot<SubagentSettingsView>;
-    draft: MainSettingsView | undefined;
+export interface SettingsCatalogInputs {
+    loadCatalog(): Promise<readonly ModelProviderGroup[]>;
+    subscribeProviderOrder?: (listener: () => void) => () => void;
+    t(key: ModelSwitchLocaleKey): string;
+}
+/** Load the model catalog backing every route editor, reloading on provider-order changes. */
+export declare function useSettingsCatalog(input: SettingsCatalogInputs): {
     groups: readonly ModelProviderGroup[];
-    providers: Choice[];
-    models: Choice[];
-    efforts: Choice[];
-    busy: boolean;
-    message: string | undefined;
-    disabled: boolean;
-    setProvider: (provider: string) => void;
-    setModel: (id: string) => void;
-    setReasoningEffort: (value: string) => void;
-    reset: () => void;
-    save: () => Promise<void>;
+    catalogError: string | undefined;
 };
-export {};

package/lib/types/client/picker/ComposerPicker.d.ts

@@ -13,8 +13,6 @@ interface ComposerPickerBaseProps {
     /** Hide/disable Agent-role groups on existing DSH sessions that are not native-bound. */
     agentLocked?: boolean;
     available: boolean;
-    /** Explain a disabled picker when the official Host has no persistent settings channel. */
-    unavailableReason?: string;
     directory: PickerDirectoryView;
     t: (key: PickerKey, params?: Record<string, string>) => string;
     embedded?: boolean;
@@ -44,4 +42,4 @@ export interface ModelPaneHeaderProps {
     onQueryChange: (query: string) => void;
 }
 export declare function ModelPaneHeader({ title, backLabel, searchLabel, closeSearchLabel, searchable, searching, query, onBack, onStartSearch, onCloseSearch, onQueryChange, }: ModelPaneHeaderProps): import("react").JSX.Element;
-export declare function ComposerPicker({ locked, providerLock, agentLocked, available, unavailableReason, directory, t, draft, onDraftChange, embedded, tone, resolveInteractionOperations, roleOf, }: ComposerPickerProps): import("react").JSX.Element | null;
+export declare function ComposerPicker({ locked, providerLock, agentLocked, available, directory, t, draft, onDraftChange, embedded, tone, resolveInteractionOperations, roleOf, }: ComposerPickerProps): import("react").JSX.Element | null;

package/lib/types/client/picker/PlanReviewCard.d.ts

@@ -1,7 +1,5 @@
 import type { PendingQuestion } from '@deepseek-ai/dsh-client-ui-user-questions/client';
-import type { ConfigFormSnapshot } from '@deepseek-ai/dsh-client-ui-settings/client';
 import type { InjectFace, PropsLocale, PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots';
-import type { MainSettingsView } from '../../client-contract.ts';
 import { type GoalRemote } from '../../picker/plan-goal.ts';
 import type { PlanPreviewBinding } from './plan-preview.ts';
 import { type PickerDirectoryFace } from './PickerDirectory.ts';
@@ -22,8 +20,6 @@ export interface PlanReviewFace extends PickerDirectoryFace {
     };
     /** Re-read the native binding now (mount, turn transitions, pre-selection). */
     refreshProviderLock: () => void;
-    subscribeMainDefaults: (listener: () => void) => () => void;
-    getMainDefaultsSnapshot: () => ConfigFormSnapshot<MainSettingsView>;
     /** Released goal remote; absent when this deployment mounts no goal service. */
     goalRemote: () => GoalRemote | undefined;
     /** Full-plan sidebar navigation (ui-plan's registered opener). */
@@ -34,8 +30,6 @@ export interface PlanReviewFace extends PickerDirectoryFace {
 export type PlanReviewCardProps = PropsRuntime<'conversation.composer'> & PropsLocale<'composer-picker'> & InjectFace<PlanReviewFace> & {
     matched: PendingQuestion;
 };
-/** Match the model seat's admission guard before letting either picker offer a change. */
-export declare function mainDefaultsUnavailableReason(snapshot: ConfigFormSnapshot<MainSettingsView>, t: PlanReviewCardProps['t']): string | undefined;
 /** Inline failed lock-read status; history and log reading stay unaffected. */
 export declare function ProviderLockHint(props: {
     t: PlanReviewCardProps['t'];

package/lib/types/client/picker/locales.d.ts

@@ -20,9 +20,6 @@ export declare const zh: {
     'thinking.off': string;
     'effort.providerDefault': string;
     'status.loading': string;
-    'settings.remoteUnavailable': string;
-    'settings.loading': string;
-    'settings.unavailable': string;
     'error.action': string;
     'error.picker': string;
     'action.reload': string;
@@ -43,7 +40,6 @@ export declare const zh: {
     'plan.pickerCrash': string;
     'plan.feedback': string;
     'plan.feedbackPlaceholder': string;
-    'plan.notRestored': string;
     'plan.dismissUnsupported': string;
     'plan.goalRun': string;
     'plan.goalFailed': string;
@@ -77,9 +73,6 @@ export declare const en: {
     'thinking.off': string;
     'effort.providerDefault': string;
     'status.loading': string;
-    'settings.remoteUnavailable': string;
-    'settings.loading': string;
-    'settings.unavailable': string;
     'error.action': string;
     'error.picker': string;
     'action.reload': string;
@@ -100,7 +93,6 @@ export declare const en: {
     'plan.pickerCrash': string;
     'plan.feedback': string;
     'plan.feedbackPlaceholder': string;
-    'plan.notRestored': string;
     'plan.dismissUnsupported': string;
     'plan.goalRun': string;
     'plan.goalFailed': string;

package/lib/types/client/picker/provider-group-watch.d.ts

@@ -0,0 +1,48 @@
+/**
+ * Apply a provider's saved capability group whenever the seat session's
+ * provider changes — on any switch surface.
+ *
+ * The official model-selection directory projects the Session's durable
+ * `model/selection` events into `store.current` (the sole emitter of those
+ * events is the `session.selectModel` RPC), so a switch performed through the
+ * TUI or any other client lands in the same store this plugin already reads.
+ * One watcher therefore covers every surface for sessions open in this Web
+ * UI, where the previous wiring only covered this plugin's own two call sites.
+ *
+ * Semantics stay exactly as before: a provider change applies the target
+ * provider's group when one exists; a provider without a group, a same-model
+ * change within one provider, and the subscription baseline itself write
+ * nothing. A failed apply is reported and never disturbs the switch.
+ */
+import type { ModelSelection } from '@deepseek-ai/dsh-api-session-controller/types';
+/** The directory store slice the watcher observes. */
+export interface DirectoryWatchSource {
+    subscribe: (listener: () => void) => () => void;
+    getSnapshot: () => {
+        current: ModelSelection | null;
+    };
+}
+export interface ProviderGroupWatchOptions {
+    source: DirectoryWatchSource;
+    /** Adopt the target provider's saved group; a group-less provider must write nothing. */
+    apply: (provider: string) => Promise<void>;
+    /** Reported apply failure; defaults to a console warning. */
+    onFailure?: (error: unknown) => void;
+}
+export interface ProviderGroupWatch {
+    /** Detach from the store; in-flight applies are left to finish. */
+    dispose: () => void;
+}
+/**
+ * Watch one directory store and apply groups on provider changes.
+ *
+ * - The first observed provider (or the one already loaded) is the baseline
+ *   and never triggers a write, so mounting and initial load stay silent.
+ * - Applies are serialized: a change arriving mid-apply coalesces to the
+ *   latest target and runs once the current apply finishes, so two writes
+ *   never interleave pair writes.
+ * - `current` being null (catalog still loading) is ignored, not a change.
+ * @param options - the store to watch and the apply to run.
+ * @returns the watch handle.
+ */
+export declare function createProviderGroupWatch(options: ProviderGroupWatchOptions): ProviderGroupWatch;

package/lib/types/client-contract.d.ts

@@ -1,14 +1,6 @@
+import type { ProviderGroupsStorage } from './provider-group.js';
 export declare const MODEL_SWITCH_CONFIG_ID = "model-switch";
-export declare const MAIN_DEFAULT_CONFIG_ID = "agent-default-model";
 export declare const PROVIDERS_CONFIG_ID = "llm-providers-ui";
-export interface MainSettingsView {
-    provider: string;
-    model: string;
-    reasoningEffort?: string;
-}
-export declare class MainSettingsConflictError extends Error {
-    readonly name = "MainSettingsConflictError";
-}
 export interface ModelSwitchSettingsView {
     subagentMode: 'follow-main' | 'fixed';
     subagentProvider?: string;
@@ -23,6 +15,8 @@ export interface ModelSwitchSettingsView {
     autoReviewModel?: string;
     compactProvider?: string;
     compactModel?: string;
+    /** Raw saved per-provider groups; edited whole through the provider-groups card. */
+    providerGroups?: ProviderGroupsStorage;
 }
 export interface SubagentSettingsView {
     mode: 'follow-main' | 'fixed';

package/lib/types/host-runtime.d.ts

@@ -1,7 +1,5 @@
 import { Context, Service } from '@deepseek-ai/cordis';
-import type { ModelSelection } from '@deepseek-ai/dsh-agent';
-import type { AgentDefaultModelConfig } from '@deepseek-ai/dsh-agent-default-model';
-import { type Config as ModelSwitchSettingsConfig, type ModelSwitchSettings } from './host-settings.js';
+import { Config, type Config as ModelSwitchSettingsConfig, type ModelSwitchSettings } from './host-settings.js';
 import { ModelSwitchAdapterRegistry } from './adapter-registry.js';
 declare module '@deepseek-ai/cordis' {
     interface Context {
@@ -12,38 +10,9 @@ declare module '@deepseek-ai/cordis' {
         'model-switch/settings-update'(): void;
     }
 }
-/** Host owner for Model Switch settings and the released Main-default adapter. */
+/** Host owner for Model Switch settings. */
 export declare class ModelSwitchRuntime extends Service {
-    static inject: string[];
-    static Config: import("@deepseek-ai/schemastery").default<Schemastery.ObjectS<NoInfer<{
-        subagentMode: import("@deepseek-ai/schemastery").default<"follow-main" | "fixed", "follow-main" | "fixed", "volatile-defined">;
-        subagentProvider: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        subagentModel: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        subagentReasoningEffort: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        searchProvider: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        searchModel: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        imageProvider: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        imageModel: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        compactOnSwitch: import("@deepseek-ai/schemastery").default<boolean, boolean, "volatile-defined">;
-        autoReviewProvider: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        autoReviewModel: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        compactProvider: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        compactModel: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-    }>>, Schemastery.ObjectT<NoInfer<{
-        subagentMode: import("@deepseek-ai/schemastery").default<"follow-main" | "fixed", "follow-main" | "fixed", "volatile-defined">;
-        subagentProvider: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        subagentModel: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        subagentReasoningEffort: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        searchProvider: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        searchModel: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        imageProvider: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        imageModel: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        compactOnSwitch: import("@deepseek-ai/schemastery").default<boolean, boolean, "volatile-defined">;
-        autoReviewProvider: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        autoReviewModel: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        compactProvider: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-        compactModel: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
-    }>>, "plain">;
+    static Config: import("@deepseek-ai/schemastery").default<any, Config, "plain">;
     get capabilities(): {
         searchProviderAdapters: {
             available: boolean;
@@ -80,11 +49,4 @@ export declare class ModelSwitchRuntime extends Service {
     private source;
     constructor(ctx: Context, entry: ModelSwitchSettingsConfig);
     currentSettings(): ModelSwitchSettings;
-    currentMainSelection(): ModelSelection;
-    saveMainSelection(selection: ModelSelection): Promise<void>;
 }
-export interface MainDefaultPort {
-    currentSelection(): ModelSelection;
-    saveSelection(selection: ModelSelection): Promise<void>;
-}
-export declare function mainDefaultPort(service: AgentDefaultModelConfig): MainDefaultPort;

package/lib/types/host-settings.d.ts

@@ -1,5 +1,6 @@
 import type { Volatile } from '@deepseek-ai/cordis';
 import z from '@deepseek-ai/schemastery';
+import { type ProviderGroupEntry, type ProviderGroups } from './provider-group.js';
 export type SubagentMode = 'follow-main' | 'fixed';
 /** Resolved live values consumed by Model Switch. */
 export interface ModelSwitchSettings {
@@ -20,6 +21,8 @@ export interface ModelSwitchSettings {
     compactProvider?: string;
     /** Summarization model for `/compact` and automatic compaction; set together with `compactProvider`. */
     compactModel?: string;
+    /** Per-provider compaction/subagent/review presets, keyed by provider id; absent when no group is saved. */
+    providerGroups?: ProviderGroups;
 }
 /** Loader-owned references; every field is directly editable in the profile form. */
 export interface Config {
@@ -36,34 +39,13 @@ export interface Config {
     autoReviewModel: Volatile<string | undefined>;
     compactProvider: Volatile<string | undefined>;
     compactModel: Volatile<string | undefined>;
+    /** Saved per-provider capability groups as one entry per provider; entry route fields are '' when the capability stays at its default. */
+    providerGroups: Volatile<readonly ProviderGroupEntry[]>;
 }
-export declare const Config: z<Schemastery.ObjectS<NoInfer<{
-    subagentMode: z<"follow-main" | "fixed", "follow-main" | "fixed", "volatile-defined">;
-    subagentProvider: z<string, string, "volatile">;
-    subagentModel: z<string, string, "volatile">;
-    subagentReasoningEffort: z<string, string, "volatile">;
-    searchProvider: z<string, string, "volatile">;
-    searchModel: z<string, string, "volatile">;
-    imageProvider: z<string, string, "volatile">;
-    imageModel: z<string, string, "volatile">;
-    compactOnSwitch: z<boolean, boolean, "volatile-defined">;
-    autoReviewProvider: z<string, string, "volatile">;
-    autoReviewModel: z<string, string, "volatile">;
-    compactProvider: z<string, string, "volatile">;
-    compactModel: z<string, string, "volatile">;
-}>>, Schemastery.ObjectT<NoInfer<{
-    subagentMode: z<"follow-main" | "fixed", "follow-main" | "fixed", "volatile-defined">;
-    subagentProvider: z<string, string, "volatile">;
-    subagentModel: z<string, string, "volatile">;
-    subagentReasoningEffort: z<string, string, "volatile">;
-    searchProvider: z<string, string, "volatile">;
-    searchModel: z<string, string, "volatile">;
-    imageProvider: z<string, string, "volatile">;
-    imageModel: z<string, string, "volatile">;
-    compactOnSwitch: z<boolean, boolean, "volatile-defined">;
-    autoReviewProvider: z<string, string, "volatile">;
-    autoReviewModel: z<string, string, "volatile">;
-    compactProvider: z<string, string, "volatile">;
-    compactModel: z<string, string, "volatile">;
-}>>, "plain">;
+/**
+ * Annotated rather than inferred: the nested entry schema's inferred type
+ * expands to cosmokit internals (`Dict`) that cannot be named in the emitted
+ * declaration, and the annotation pins the output shape to this interface.
+ */
+export declare const Config: z<any, Config, 'plain'>;
 export declare function readConfig(config: Config): ModelSwitchSettings;

package/lib/types/index.d.ts

@@ -1,5 +1,5 @@
 export { Config, readConfig, type ModelSwitchSettings } from './host-settings.js';
-export { mainDefaultPort, ModelSwitchRuntime, type MainDefaultPort } from './host-runtime.js';
+export { ModelSwitchRuntime } from './host-runtime.js';
 export { ModelSwitchAdapterRegistry, type ModelSwitchProviderAdapters, type ModelSwitchSearchAdapter, type ModelSwitchImageAdapter, type ModelSwitchImageRequest, type ModelSwitchGeneratedImage } from './adapter-registry.js';
 export { RUNTIME_CAPABILITIES, type RuntimeCapabilities, type RuntimeCapability } from './runtime-capabilities.js';
 export { parsePickerId, groupFamilies, planReviewOf, selectPlanReview, approvePlanReview, } from './picker/public.ts';

package/lib/types/picker/plan-review.d.ts

@@ -14,18 +14,12 @@ export declare class PlanApprovalResponseError extends Error {
 /**
  * Result of committing the draft execution model before answering a review.
  *
- * A commit and the compensation of the Host's own deployment-default write are
- * separate facts: only a failed commit may hold the answer back, because the
- * Host persists a Session selection as the deployment default on several
- * releases and this plugin restores the captured Main default afterwards. A
- * failed restore is announced, never fatal — the Session selection the human
- * asked for is already installed.
+ * Only a failed commit may hold the answer back: once `committed` is true the
+ * Session runs the requested selection, and the answer proceeds under it.
  */
 export interface PlanCommitOutcome {
     /** The Session now runs the requested provider/model/effort. */
     committed: boolean;
-    /** The captured Main default is the effective one again. */
-    mainDefaultRestored: boolean;
 }
 /**
  * Diagnostic text for one failed action, keeping the wire code visible.
@@ -41,8 +35,6 @@ export declare function approvePlanReview(args: {
     selection: ModelSelection;
     current?: ModelSelection | null;
     answer: () => Promise<void>;
-    /** Announced after a successful answer when the Main default could not be restored. */
-    onNotRestored?: (notice: string) => void;
 }): Promise<boolean>;
 export interface PlanActionState {
     busy: boolean;