@fonlan/dsh-model-router 0.1.0 → 0.2.1

package/lib/index.js

@@ -5,25 +5,52 @@ import { LlmAdapter, LlmError } from "@deepseek-ai/dsh-llm";
 //#region src/shared/config.ts
 const ROUTER_PROVIDER_ID = "model-router";
 const ROUTER_SETTINGS_NS = "model-router";
-/** Merge every provider's models into one entry per exact model id. */
-function mergeModels(providers) {
+/**
+* Strip the first path segment (`vendor/`) from a model id, case-sensitively.
+* Inert for ids without a prefix: no slash, an empty first segment, or an
+* empty remainder all return the input unchanged. `a/b/c` becomes `b/c`.
+*/
+function stripModelIdPrefix(id) {
+	const slash = id.indexOf("/");
+	if (slash <= 0 || slash === id.length - 1) return id;
+	return id.slice(slash + 1);
+}
+/**
+* Merge every provider's models into one entry per model id. With
+* `ignorePrefix` the group key is the prefix-stripped id and the merged id is
+* that stripped id, while each provider entry keeps its raw local id. When a
+* single provider advertises both a prefixed and the unprefixed raw id for the
+* same group (a same-provider collision), the unprefixed raw id wins (it is
+* the canonical form); otherwise the first-seen raw id wins.
+*/
+function mergeModels(providers, options = {}) {
 	const byId = /* @__PURE__ */ new Map();
-	for (const provider of providers) for (const model of provider.models) {
-		let merged = byId.get(model.id);
-		if (merged === void 0) {
-			merged = {
+	for (const provider of providers) {
+		const chosen = /* @__PURE__ */ new Map();
+		for (const model of provider.models) {
+			const key = options.ignorePrefix ? stripModelIdPrefix(model.id) : model.id;
+			const prev = chosen.get(key);
+			if (prev === void 0 || prev !== key && model.id === key) chosen.set(key, model.id);
+		}
+		for (const model of provider.models) {
+			const key = options.ignorePrefix ? stripModelIdPrefix(model.id) : model.id;
+			if (chosen.get(key) !== model.id) continue;
+			let merged = byId.get(key);
+			if (merged === void 0) {
+				merged = {
+					id: key,
+					providers: []
+				};
+				byId.set(key, merged);
+			}
+			merged.providers.push({
+				provider: provider.id,
 				id: model.id,
-				providers: []
-			};
-			byId.set(model.id, merged);
+				name: model.name,
+				contextWindow: model.contextWindow,
+				maxTokens: model.maxTokens
+			});
 		}
-		merged.providers.push({
-			provider: provider.id,
-			id: model.id,
-			name: model.name,
-			contextWindow: model.contextWindow,
-			maxTokens: model.maxTokens
-		});
 	}
 	return [...byId.values()];
 }
@@ -109,6 +136,76 @@ function syncConfig(config, modelId, catalogProviderIds) {
 		changed
 	};
 }
+function sameModels(a, b) {
+	const aKeys = Object.keys(a);
+	const bKeys = Object.keys(b);
+	if (aKeys.length !== bKeys.length) return false;
+	for (const key of aKeys) {
+		const x = a[key];
+		const y = b[key];
+		if (y === void 0 || x.active !== y.active || x.order.length !== y.order.length) return false;
+		if (!x.order.every((id, i) => id === y.order[i])) return false;
+	}
+	return true;
+}
+/**
+* Reconcile the stored config document against the live merged catalog.
+*
+* Beyond the per-model sync of {@link syncConfig}, this remaps stored entries
+* to their merged ids: with prefix-ignore on, an entry keyed by a raw id that
+* now strips to a merged id (e.g. `deepseek/deepseek-v4-flash` →
+* `deepseek-v4-flash`) migrates to that merged id. When several stored keys
+* collapse onto one merged id, the entry keyed by the merged id itself wins
+* for `active`, and `order` becomes the deduped union in exact-key-first
+* order. Stored keys no longer mapping to any merged model are dropped (this
+* also covers turning the flag off — split models re-initialize fresh).
+*/
+function reconcileConfig(config, models) {
+	const keyToMerged = /* @__PURE__ */ new Map();
+	for (const model of models) {
+		keyToMerged.set(model.id, model.id);
+		if (!config.ignoreModelIdPrefix) continue;
+		for (const provider of model.providers) if (stripModelIdPrefix(provider.id) === model.id && !keyToMerged.has(provider.id)) keyToMerged.set(provider.id, model.id);
+	}
+	const grouped = /* @__PURE__ */ new Map();
+	for (const [key, entry] of Object.entries(config.models)) {
+		const mergedId = keyToMerged.get(key);
+		if (mergedId === void 0) continue;
+		const list = grouped.get(mergedId) ?? [];
+		list.push({
+			key,
+			entry
+		});
+		grouped.set(mergedId, list);
+	}
+	const next = {};
+	for (const model of models) {
+		const ids = model.providers.map((provider) => provider.provider);
+		const list = grouped.get(model.id);
+		let base;
+		if (list !== void 0 && list.length > 0) {
+			const exact = list.find((group) => group.key === model.id);
+			const ordered = exact === void 0 ? list : [exact, ...list.filter((group) => group.key !== model.id)];
+			const order = [];
+			for (const group of ordered) for (const id of group.entry.order) if (!order.includes(id)) order.push(id);
+			base = {
+				order,
+				active: exact?.entry.active ?? ordered[0].entry.active
+			};
+		}
+		const view = {
+			...config,
+			models: { ...next }
+		};
+		if (base !== void 0) view.models[model.id] = base;
+		const entry = syncConfig(view, model.id, ids).models[model.id];
+		if (entry !== void 0) next[model.id] = entry;
+	}
+	return {
+		models: next,
+		changed: !sameModels(next, config.models)
+	};
+}
 /** Switch a model's active provider (no-op when already active). */
 function setActive(config, modelId, providerId, catalogProviderIds) {
 	if (!catalogProviderIds.includes(providerId)) throw new Error(`provider ${providerId} is not in the catalog for model ${modelId}`);
@@ -160,9 +257,20 @@ function setOrder(config, modelId, order, catalogProviderIds) {
 /** Shape-validate an unknown value as a RouterConfigShape (lenient). */
 function normalizeConfig(value) {
 	const models = {};
-	if (typeof value !== "object" || value === null) return { models };
-	const raw = value.models;
-	if (typeof raw !== "object" || raw === null) return { models };
+	if (typeof value !== "object" || value === null) return {
+		models,
+		showQuickSwitch: true,
+		ignoreModelIdPrefix: true
+	};
+	const root = value;
+	const showQuickSwitch = root.showQuickSwitch !== false;
+	const ignoreModelIdPrefix = root.ignoreModelIdPrefix !== false;
+	const raw = root.models;
+	if (typeof raw !== "object" || raw === null) return {
+		models,
+		showQuickSwitch,
+		ignoreModelIdPrefix
+	};
 	for (const [id, entry] of Object.entries(raw)) {
 		if (typeof entry !== "object" || entry === null) continue;
 		const e = entry;
@@ -174,7 +282,11 @@ function normalizeConfig(value) {
 			active
 		};
 	}
-	return { models };
+	return {
+		models,
+		showQuickSwitch,
+		ignoreModelIdPrefix
+	};
 }
 //#endregion
 //#region src/server/catalog.ts
@@ -220,7 +332,7 @@ async function detectCredentialConfigured(ctx, entry) {
 	}
 }
 /** Rebuild the live router catalog from the LLM registry. */
-async function buildCatalog(ctx) {
+async function buildCatalog(ctx, ignorePrefix = false) {
 	const routes = ctx.llm.listProviders().filter((provider) => provider.id !== ROUTER_PROVIDER_ID);
 	const directory = new Map(ctx.llm.listConfigurableProviders().map((entry) => [entry.provider, {
 		provider: entry.provider,
@@ -253,7 +365,7 @@ async function buildCatalog(ctx) {
 		});
 		credentialConfigured.set(route.id, await detectCredentialConfigured(ctx, entry));
 	}
-	const models = mergeModels(providers);
+	const models = mergeModels(providers, { ignorePrefix });
 	return {
 		providers,
 		providerNames,
@@ -269,20 +381,42 @@ async function buildCatalog(ctx) {
 * route `model-router`, it advertises the merged catalog and, at request time,
 * rewrites the provider field to the model's currently active provider and
 * delegates in-process to `ctx.llm.stream` — credentials, retry, streaming
-* and metering all stay inside the real adapter's pipeline.
+* and metering all stay inside the real adapter's pipeline. Incoming model
+* ids are matched with the leading vendor prefix ignored when the settings
+* flag is on, and delegation always uses the active provider's raw local id.
 */
 /**
+* Find the merged model for an incoming model id. Exact lookup first; when
+* prefix-ignore is on, a miss falls back to the prefix-stripped id so a raw
+* `deepseek/deepseek-v4-flash` request matches the merged `deepseek-v4-flash`
+* (advertised ids are already stripped and hit exactly). Unadvertised ids do
+* not match.
+*/
+function mergedFor(facts, modelId) {
+	const byId = facts.catalog().byId;
+	const direct = byId.get(modelId);
+	if (direct !== void 0) return direct;
+	if (!facts.config().ignoreModelIdPrefix) return null;
+	const stripped = stripModelIdPrefix(modelId);
+	if (stripped === modelId) return null;
+	return byId.get(stripped) ?? null;
+}
+/**
 * Resolve the effective route for one model id: the stored active provider
 * when still present, otherwise the first remaining order entry, otherwise
 * the catalog head. Unadvertised model ids do not route.
 */
 function routeFor(facts, modelId) {
-	const merged = facts.catalog().byId.get(modelId);
-	if (merged === void 0) return null;
+	const merged = mergedFor(facts, modelId);
+	if (merged === null) return null;
 	const ids = merged.providers.map((provider) => provider.provider);
-	const active = resolveActive(facts.config(), modelId, ids);
+	const active = resolveActive(facts.config(), merged.id, ids);
 	return active === null ? null : { provider: active };
 }
+/** The raw provider-local id of one provider entry inside a merged model. */
+function entryRawId(merged, providerId) {
+	return merged.providers.find((provider) => provider.provider === providerId)?.id ?? merged.id;
+}
 var ModelRouterAdapter = class extends LlmAdapter {
 	facts;
 	constructor(facts) {
@@ -313,18 +447,25 @@ var ModelRouterAdapter = class extends LlmAdapter {
 	}
 	async resolveModel(_provider, model, signal) {
 		const route = routeFor(this.facts, model);
-		if (route === null) throw new LlmError(`model-router: no provider serves model "${model}"`, "NO_ADAPTER");
+		const merged = route === null ? null : mergedFor(this.facts, model);
+		if (route === null || merged === null) throw new LlmError(`model-router: no provider serves model "${model}"`, "NO_ADAPTER");
+		const resolved = await this.facts.llm().resolveModelInfo(route.provider, entryRawId(merged, route.provider), signal);
+		const display = displayProvider(merged, route.provider);
 		return {
-			...await this.facts.llm().resolveModelInfo(route.provider, model, signal),
-			provider: ROUTER_PROVIDER_ID
+			...resolved,
+			provider: ROUTER_PROVIDER_ID,
+			id: merged.id,
+			name: display?.name ?? resolved.name
 		};
 	}
 	async *stream(options) {
 		const route = routeFor(this.facts, options.model);
-		if (route === null) throw new LlmError(`model-router: no provider serves model "${options.model}"`, "NO_ADAPTER");
+		const merged = route === null ? null : mergedFor(this.facts, options.model);
+		if (route === null || merged === null) throw new LlmError(`model-router: no provider serves model "${options.model}"`, "NO_ADAPTER");
 		yield* this.facts.llm().stream({
 			...options,
-			provider: route.provider
+			provider: route.provider,
+			model: entryRawId(merged, route.provider)
 		});
 	}
 };
@@ -332,11 +473,19 @@ var ModelRouterAdapter = class extends LlmAdapter {
 //#region src/server/service.ts
 const NS = settingsNamespace(ROUTER_SETTINGS_NS);
 /** Settings document schema: one entry per model id. */
-const RouterConfigSchema = z.object({ models: z.dict(z.object({
-	order: z.array(z.string()),
-	active: z.string()
-})) });
-const EMPTY_CONFIG = { models: {} };
+const RouterConfigSchema = z.object({
+	models: z.dict(z.object({
+		order: z.array(z.string()),
+		active: z.string()
+	})),
+	showQuickSwitch: z.boolean(),
+	ignoreModelIdPrefix: z.boolean()
+});
+const EMPTY_CONFIG = {
+	models: {},
+	showQuickSwitch: true,
+	ignoreModelIdPrefix: true
+};
 var ModelRouterService = class {
 	ctx;
 	cached = {
@@ -391,7 +540,7 @@ var ModelRouterService = class {
 	/** Rebuild the catalog (in-flight dedupe; failures keep the last good one). */
 	refreshCatalog() {
 		if (this.inflight !== null) return this.inflight;
-		this.inflight = buildCatalog(this.ctx).then((catalog) => {
+		this.inflight = buildCatalog(this.ctx, this.config().ignoreModelIdPrefix).then((catalog) => {
 			this.cached = catalog;
 			return catalog;
 		}).catch((error) => {
@@ -402,27 +551,19 @@ var ModelRouterService = class {
 		});
 		return this.inflight;
 	}
-	/** Refresh, then persist any config drift (new providers/models, vanish). */
+	/** Refresh, then persist any config drift (migration, new/vanished models). */
 	async refreshAndReconcile() {
 		const catalog = await this.refreshCatalog();
 		if (this.scope === void 0) return;
 		const current = this.config();
-		const next = { ...current.models };
-		let changed = false;
-		for (const model of catalog.models) {
-			const ids = model.providers.map((provider) => provider.provider);
-			const result = syncConfig(current, model.id, ids);
-			if (result.changed) changed = true;
-			for (const [id, entry] of Object.entries(result.models)) if (entry === void 0) delete next[id];
-			else next[id] = entry;
-		}
-		for (const id of Object.keys(next)) if (!catalog.byId.has(id)) {
-			delete next[id];
-			changed = true;
-		}
+		const { models, changed } = reconcileConfig(current, catalog.models);
 		if (!changed) return;
 		try {
-			await this.scope.replace({ models: next });
+			await this.scope.replace({
+				models,
+				showQuickSwitch: current.showQuickSwitch,
+				ignoreModelIdPrefix: current.ignoreModelIdPrefix
+			});
 		} catch (error) {
 			this.ctx.logger.warn(`model-router: reconcile persist failed: ${error instanceof Error ? error.message : String(error)}`);
 		}
@@ -440,6 +581,8 @@ var ModelRouterService = class {
 		const names = catalog.providerNames;
 		const creds = catalog.credentialConfigured;
 		return {
+			showQuickSwitch: config.showQuickSwitch,
+			ignoreModelIdPrefix: config.ignoreModelIdPrefix,
 			providers: catalog.providers.map((provider) => ({
 				id: provider.id,
 				name: names.get(provider.id) ?? provider.id,
@@ -482,9 +625,42 @@ var ModelRouterService = class {
 		if (!changed) return;
 		await this.persist(models);
 	}
+	/** Toggle the composer quick route-switcher button (global, persisted). */
+	async setShowQuickSwitch(value) {
+		if (this.scope === void 0) throw new Error("model-router: settings service is not available in this profile");
+		const current = this.config();
+		if (current.showQuickSwitch === value) return;
+		await this.scope.replace({
+			models: current.models,
+			showQuickSwitch: value,
+			ignoreModelIdPrefix: current.ignoreModelIdPrefix
+		});
+	}
+	/**
+	* Toggle prefix-ignored model matching (global, persisted). Persists the
+	* flag first, then rebuilds the catalog with the new merge rule and
+	* reconciles stored config (migrates prefixed keys to merged ids when
+	* turning on; split models re-initialize when turning off).
+	*/
+	async setIgnoreModelIdPrefix(value) {
+		if (this.scope === void 0) throw new Error("model-router: settings service is not available in this profile");
+		const current = this.config();
+		if (current.ignoreModelIdPrefix === value) return;
+		await this.scope.replace({
+			models: current.models,
+			showQuickSwitch: current.showQuickSwitch,
+			ignoreModelIdPrefix: value
+		});
+		await this.refreshAndReconcile();
+	}
 	async persist(models) {
 		if (this.scope === void 0) throw new Error("model-router: settings service is not available in this profile");
-		await this.scope.replace({ models });
+		const current = this.config();
+		await this.scope.replace({
+			models,
+			showQuickSwitch: current.showQuickSwitch,
+			ignoreModelIdPrefix: current.ignoreModelIdPrefix
+		});
 	}
 };
 //#endregion
@@ -599,6 +775,16 @@ function registerApiRoutes(ctx, service) {
 		await service.refreshAndReconcile();
 		return service.state();
 	});
+	route("set-show-quick-switch", async (p) => {
+		if (typeof p.value !== "boolean") throw new Error("value 必须是布尔值");
+		await service.setShowQuickSwitch(p.value);
+		return service.state();
+	});
+	route("set-ignore-model-id-prefix", async (p) => {
+		if (typeof p.value !== "boolean") throw new Error("value 必须是布尔值");
+		await service.setIgnoreModelIdPrefix(p.value);
+		return service.state();
+	});
 	return () => {
 		for (const dispose of disposers) dispose();
 	};

package/lib/types/server/adapter.d.ts

@@ -3,7 +3,9 @@
  * route `model-router`, it advertises the merged catalog and, at request time,
  * rewrites the provider field to the model's currently active provider and
  * delegates in-process to `ctx.llm.stream` — credentials, retry, streaming
- * and metering all stay inside the real adapter's pipeline.
+ * and metering all stay inside the real adapter's pipeline. Incoming model
+ * ids are matched with the leading vendor prefix ignored when the settings
+ * flag is on, and delegation always uses the active provider's raw local id.
  */
 import { LlmAdapter, type LlmRuntime } from '@deepseek-ai/dsh-llm';
 import type { GenerateOptions, LlmModelInfo, LlmProviderInfo, LlmResolvedModelInfo, StreamChunk } from '@deepseek-ai/dsh-llm';
@@ -26,12 +28,22 @@ export interface RouterFacts {
 export interface ResolvedRoute {
     provider: string;
 }
+/**
+ * Find the merged model for an incoming model id. Exact lookup first; when
+ * prefix-ignore is on, a miss falls back to the prefix-stripped id so a raw
+ * `deepseek/deepseek-v4-flash` request matches the merged `deepseek-v4-flash`
+ * (advertised ids are already stripped and hit exactly). Unadvertised ids do
+ * not match.
+ */
+export declare function mergedFor(facts: RouterFacts, modelId: string): MergedModel | null;
 /**
  * Resolve the effective route for one model id: the stored active provider
  * when still present, otherwise the first remaining order entry, otherwise
  * the catalog head. Unadvertised model ids do not route.
  */
 export declare function routeFor(facts: RouterFacts, modelId: string): ResolvedRoute | null;
+/** The raw provider-local id of one provider entry inside a merged model. */
+export declare function entryRawId(merged: MergedModel, providerId: string): string;
 export declare class ModelRouterAdapter extends LlmAdapter {
     private readonly facts;
     constructor(facts: RouterFacts);

package/lib/types/server/catalog.d.ts

@@ -1,9 +1,9 @@
 /**
  * Provider discovery for the router: every registered LLM provider route
- * (minus the router itself) becomes a ProviderInfo, models merge by exact id
- * through the shared core, and per-provider credential status is detected
- * generically through the configurable-provider directory + the credentials
- * seam.
+ * (minus the router itself) becomes a ProviderInfo, models merge through the
+ * shared core (by exact id, or by prefix-stripped id when `ignorePrefix` is
+ * on), and per-provider credential status is detected generically through the
+ * configurable-provider directory + the credentials seam.
  */
 import type { Context } from '@deepseek-ai/cordis';
 import { type MergedModel, type ProviderInfo } from '../shared/config.js';
@@ -13,7 +13,7 @@ export interface RouterCatalog {
     providers: ProviderInfo[];
     /** Provider id → human display name (configurable-directory name when known). */
     providerNames: Map<string, string>;
-    /** Models merged by exact id across providers. */
+    /** Models merged across providers (exact id, or stripped when flag on). */
     models: MergedModel[];
     /** Model id → merged model. */
     byId: Map<string, MergedModel>;
@@ -21,4 +21,4 @@ export interface RouterCatalog {
     credentialConfigured: Map<string, boolean>;
 }
 /** Rebuild the live router catalog from the LLM registry. */
-export declare function buildCatalog(ctx: Context): Promise<RouterCatalog>;
+export declare function buildCatalog(ctx: Context, ignorePrefix?: boolean): Promise<RouterCatalog>;

package/lib/types/server/service.d.ts

@@ -13,6 +13,10 @@ export declare const NS: import("@deepseek-ai/dsh-settings").SettingsNamespace;
 export declare const RouterConfigSchema: z<RouterConfigShape>;
 /** The settings-page state view served by the API. */
 export interface ModelRouterState {
+    /** Whether the composer quick route-switcher button is enabled. */
+    showQuickSwitch: boolean;
+    /** Whether model ids are matched with their leading vendor/ prefix ignored. */
+    ignoreModelIdPrefix: boolean;
     providers: Array<{
         id: string;
         name: string;
@@ -52,7 +56,7 @@ export declare class ModelRouterService implements RouterFacts {
     llm(): import("@deepseek-ai/dsh-llm").LlmRuntime;
     /** Rebuild the catalog (in-flight dedupe; failures keep the last good one). */
     refreshCatalog(): Promise<RouterCatalog>;
-    /** Refresh, then persist any config drift (new providers/models, vanish). */
+    /** Refresh, then persist any config drift (migration, new/vanished models). */
     refreshAndReconcile(): Promise<void>;
     /** Effective active provider for one model id (null when unroutable). */
     activeFor(modelId: string): string | null;
@@ -62,5 +66,14 @@ export declare class ModelRouterService implements RouterFacts {
     switchActive(modelId: string, providerId: string): Promise<void>;
     /** Replace the preference order for one model (active left untouched). */
     reorder(modelId: string, order: string[]): Promise<void>;
+    /** Toggle the composer quick route-switcher button (global, persisted). */
+    setShowQuickSwitch(value: boolean): Promise<void>;
+    /**
+     * Toggle prefix-ignored model matching (global, persisted). Persists the
+     * flag first, then rebuilds the catalog with the new merge rule and
+     * reconciles stored config (migrates prefixed keys to merged ids when
+     * turning on; split models re-initialize when turning off).
+     */
+    setIgnoreModelIdPrefix(value: boolean): Promise<void>;
     private persist;
 }

package/lib/types/shared/config.d.ts

@@ -5,7 +5,11 @@
  * (settings page rendering).
  *
  * Decided semantics (grilling session, all recommendations accepted):
- * - Strict merge: models are merged across providers by exact model id only.
+ * - Merge: models are merged across providers by model id — by exact id, or
+ *   (when ignoreModelIdPrefix is on) by id with the first `vendor/` segment
+ *   stripped, so `deepseek/deepseek-v4-flash` and `deepseek-v4-flash` are the
+ *   same model. Display always uses the merged (prefix-free) id; each provider
+ *   entry keeps its own raw local id for delegation.
  * - Per-model provider config: an order[] (future auto-failover preference)
  *   plus an independent active provider (what requests actually route to).
  * - First-seen provider order: for a never-configured model the initial
@@ -14,12 +18,17 @@
  *   the first remaining provider automatically.
  * - New providers for a known model: appended at the end of order; active
  *   untouched.
+ * - Prefix-ignore migration: stored config keyed by a now-stripped raw id
+ *   moves to the merged id (unprefixed entry wins when both exist; order is a
+ *   deduped union). Turning the flag off does not migrate back — the split
+ *   models re-initialize from discovery order.
  */
 /** One provider's view of one model. */
 export interface ProviderModelInfo {
     /** Provider id the model belongs to. */
     provider: string;
-    /** Provider-local model id (== merged model id, strict merge). */
+    /** Provider-local raw model id, exactly as the provider advertises it
+     *  (may carry a `vendor/` prefix; this is the id delegation must use). */
     id: string;
     /** Provider-local display name. */
     name: string;
@@ -35,13 +44,15 @@ export interface ProviderInfo {
     name?: string;
     models: Array<Omit<ProviderModelInfo, 'provider'>>;
 }
-/** One merged model across all providers (strict id merge). */
+/** One merged model across all providers. */
 export interface MergedModel {
+    /** Merged display id — the raw id with the leading segment stripped when
+     *  prefix-ignore is on, so it is always shown without a vendor prefix. */
     id: string;
-    /** Per-provider entries in provider discovery order. */
+    /** Per-provider entries in provider discovery order (raw local ids). */
     providers: ProviderModelInfo[];
 }
-/** Router configuration for one model. */
+/** Router configuration for one model (keyed by merged id). */
 export interface RouterModelConfig {
     /** Provider ids in preference order (future auto-failover). */
     order: string[];
@@ -51,11 +62,42 @@ export interface RouterModelConfig {
 /** The whole router config document. */
 export interface RouterConfigShape {
     models: Record<string, RouterModelConfig>;
+    /**
+     * Whether the quick route-switcher button is shown beside the composer
+     * model selector (settings → 模型路由 → 显示快速路由切换按钮). Stored
+     * globally; absent/unknown documents normalize to `true`.
+     */
+    showQuickSwitch: boolean;
+    /**
+     * Whether model ids are matched with their leading `vendor/` segment
+     * ignored (settings → 模型路由 → 匹配时忽略模型 ID 前缀), so
+     * `deepseek/deepseek-v4-flash` and `deepseek-v4-flash` merge into one model
+     * displayed as `deepseek-v4-flash`. Absent/unknown documents normalize to
+     * `true`.
+     */
+    ignoreModelIdPrefix: boolean;
 }
 export declare const ROUTER_PROVIDER_ID = "model-router";
 export declare const ROUTER_SETTINGS_NS = "model-router";
-/** Merge every provider's models into one entry per exact model id. */
-export declare function mergeModels(providers: readonly ProviderInfo[]): MergedModel[];
+/**
+ * Strip the first path segment (`vendor/`) from a model id, case-sensitively.
+ * Inert for ids without a prefix: no slash, an empty first segment, or an
+ * empty remainder all return the input unchanged. `a/b/c` becomes `b/c`.
+ */
+export declare function stripModelIdPrefix(id: string): string;
+export interface MergeOptions {
+    /** Group by prefix-stripped id instead of the exact raw id. */
+    ignorePrefix?: boolean;
+}
+/**
+ * Merge every provider's models into one entry per model id. With
+ * `ignorePrefix` the group key is the prefix-stripped id and the merged id is
+ * that stripped id, while each provider entry keeps its raw local id. When a
+ * single provider advertises both a prefixed and the unprefixed raw id for the
+ * same group (a same-provider collision), the unprefixed raw id wins (it is
+ * the canonical form); otherwise the first-seen raw id wins.
+ */
+export declare function mergeModels(providers: readonly ProviderInfo[], options?: MergeOptions): MergedModel[];
 /** The provider view a merged model should display for (follows active). */
 export declare function displayProvider(merged: MergedModel, active: string | undefined): ProviderModelInfo | null;
 /** Initial config for a model the user never configured: first in order wins. */
@@ -78,6 +120,22 @@ export declare function syncConfig(config: RouterConfigShape, modelId: string, c
     models: Record<string, RouterModelConfig>;
     changed: boolean;
 };
+/**
+ * Reconcile the stored config document against the live merged catalog.
+ *
+ * Beyond the per-model sync of {@link syncConfig}, this remaps stored entries
+ * to their merged ids: with prefix-ignore on, an entry keyed by a raw id that
+ * now strips to a merged id (e.g. `deepseek/deepseek-v4-flash` →
+ * `deepseek-v4-flash`) migrates to that merged id. When several stored keys
+ * collapse onto one merged id, the entry keyed by the merged id itself wins
+ * for `active`, and `order` becomes the deduped union in exact-key-first
+ * order. Stored keys no longer mapping to any merged model are dropped (this
+ * also covers turning the flag off — split models re-initialize fresh).
+ */
+export declare function reconcileConfig(config: RouterConfigShape, models: readonly MergedModel[]): {
+    models: Record<string, RouterModelConfig>;
+    changed: boolean;
+};
 /** Switch a model's active provider (no-op when already active). */
 export declare function setActive(config: RouterConfigShape, modelId: string, providerId: string, catalogProviderIds: readonly string[]): {
     models: Record<string, RouterModelConfig>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonlan/dsh-model-router",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "DSH plugin: a virtual model-router provider that aggregates every configured provider and model, routes each request to the model's currently active provider, and ships a settings page for per-model provider ordering and switching.",
   "license": "MIT",
   "repository": {
@@ -61,7 +61,9 @@
         "@deepseek-ai/dsh-client-locale",
         "@deepseek-ai/dsh-client-ui-slots",
         "@deepseek-ai/dsh-client-ui-primitives",
-        "@deepseek-ai/dsh-client-ui-settings"
+        "@deepseek-ai/dsh-client-ui-settings",
+        "@deepseek-ai/dsh-client-ui-conversation",
+        "@deepseek-ai/dsh-client-ui-model-selection"
       ]
     }
   },
@@ -75,6 +77,8 @@
     "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-ui-slots": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-ui-primitives": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-ui-model-selection": "^0.1.0-rc.6",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
@@ -93,6 +97,8 @@
     "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-ui-primitives": "^0.1.0-rc.6",
     "@deepseek-ai/dsh-client-ui-settings": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-ui-conversation": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-client-ui-model-selection": "^0.1.0-rc.6",
     "vitest": "^3.2.0"
   },
   "packageManager": "pnpm@11.21.0"