dsh-model-switch 0.4.40 → 0.4.42

package/lib/types/automode-compat.d.ts

@@ -0,0 +1,152 @@
+/**
+ * Adapt the third-party `@log.li/dsh-automode` row to this plugin's routes.
+ *
+ * ## Why this exists
+ *
+ * `dsh-automode` owns a completely different decision pipeline: its own
+ * `auto-mode` permission preset, a `tools/pre-execute` gate, and a two-stage
+ * classifier that calls `ctx.llm.stream()` with
+ * `classifier.provider` / `classifier.model` (`resolveRoute`, falling back to
+ * the session header when both are empty). It reads the pure-read allowance from
+ * `config.readOnlyTools` with an exact `includes()` match
+ * (`src/pre-execute.ts`), so a call that hits it is allowed before the
+ * classifier runs — still after the plugin's own hard-deny regex band.
+ *
+ * Both knobs live in that row's own config. There is no public seam to inject a
+ * route or a tool list from outside, and the user asked for the adaptation to
+ * happen inside the plugin layer: no profile editing, no second plugin. This
+ * module is that adapter. It rewrites the automode row's **runtime** option
+ * object right before the loader mounts it and on every remount:
+ *
+ * - `classifier.provider` / `classifier.model` are filled from this plugin's
+ *   Auto-review route **only when the row leaves them empty**; an explicit route
+ *   in the profile always wins.
+ * - `readOnlyTools` is the union of the row's own list and this plugin's
+ *   allowlist — but only while the "skip pure-read tools" switch is on. Entries
+ *   that carry a `*` cannot transfer (the third-party check is exact-match) and
+ *   are reported instead of silently dropped.
+ *
+ * Nothing is persisted: `entry.options` is the loader's live options object, and
+ * `Entry.update()` (which writes the profile layer) is deliberately never called
+ * here. Restarting the Host re-applies the same in-memory view.
+ *
+ * Every failure is contained. If the row shape or the loader internals change,
+ * this adapter logs one warning and the rest of the plugin keeps working.
+ *
+ * @module
+ */
+import type { Context } from '@deepseek-ai/cordis';
+import type { Loader } from '@deepseek-ai/cordis-plugin-loader';
+import type { ModelSwitchSettings } from './host-settings.js';
+/** Cordis plugin identity; matches the `cordis.patch.yml` insert row id. */
+export declare const name = "model-switch-automode-compat";
+/** The loader is the only seam this row needs besides this plugin's settings. */
+export declare const inject: string[];
+/** Third-party package this row adapts (strict package identity, never a prefix). */
+export declare const AUTOMODE_PACKAGE = "@log.li/dsh-automode";
+/**
+ * Why the route was not injected.
+ *
+ * - `user-set`: the row already names a provider and a model.
+ * - `no-route`: this plugin has no Auto-review route configured right now.
+ */
+export type AutomodeRouteSkip = 'user-set' | 'no-route';
+/** Result of adapting one row's config object. */
+export interface AutomodeCompatApplied {
+    /** `provider/model` written into the row, when it was empty before. */
+    readonly route?: string | undefined;
+    /** Set when the route was left alone. */
+    readonly routeSkipped?: AutomodeRouteSkip | undefined;
+    /** Allowlist entries merged into `readOnlyTools`. */
+    readonly added: readonly string[];
+    /** Allowlist entries that cannot transfer because they are pattern-shaped. */
+    readonly skipped: readonly string[];
+}
+/** One adaptation result: the config to install plus what changed. */
+export interface AutomodeCompatPlan {
+    /** The config object to assign to the row. */
+    readonly config: Record<string, unknown>;
+    /** Whether `config` differs from the input (false means "leave it alone"). */
+    readonly changed: boolean;
+    /** What was applied, for the status line and the log. */
+    readonly applied: AutomodeCompatApplied;
+}
+/** Live adapter state, surfaced next to the allowlist editor. */
+export declare const automodeCompatStatus: {
+    /** A `@log.li/dsh-automode` row exists in this Host. */
+    installed: boolean;
+    /** `provider/model` this adapter wrote, when it wrote one. */
+    route: string | undefined;
+    /** Why the route was skipped, when it was. */
+    routeSkipped: AutomodeRouteSkip | undefined;
+    /** Tools merged into the row's `readOnlyTools`. */
+    added: string[];
+    /** Pattern-shaped entries that cannot transfer. */
+    skipped: string[];
+    /** How many rows were rewritten (remounts included). */
+    applied: number;
+};
+/**
+ * Whether one loader entry is the third-party auto-mode row.
+ * @param entry - anything the loader hands over (an entry, or an event payload).
+ * @returns true only for the exact package name.
+ */
+export declare function isAutomodeEntry(entry: unknown): boolean;
+/**
+ * Decide the config one automode row should run with.
+ *
+ * Pure and side-effect free so the policy is unit-testable.
+ *
+ * @param config - the row's current config (any JSON-ish value).
+ * @param route - this plugin's Auto-review route; empty strings mean "unset".
+ * @param allowlist - tool names to merge into `readOnlyTools`; pass an empty
+ *   list while the skip switch is off.
+ * @param adoptedRoute - a `provider/model` this adapter wrote on an earlier
+ *   pass; seeing it again means the row is still ours to rewrite.
+ * @returns the config to install, whether it changed, and what was applied.
+ */
+export declare function planAutomodeCompat(config: unknown, route: {
+    readonly provider?: string;
+    readonly model?: string;
+}, allowlist: readonly string[], adoptedRoute?: string): AutomodeCompatPlan;
+/** One-line human summary of a plan, for the startup log. */
+export declare function describeAutomodePlan(plan: AutomodeCompatPlan): string;
+/** Shape the settings card renders for the third-party row, or undefined when absent. */
+export interface AutomodeCompatView {
+    readonly installed: boolean;
+    /** `provider/model` written into the row, when one was. */
+    readonly route?: string | undefined;
+    /** Why no route was written, when none was. */
+    readonly routeSkipped?: AutomodeRouteSkip | undefined;
+    /** How many tools were merged in. */
+    readonly added: number;
+    /** How many pattern-shaped entries could not transfer. */
+    readonly skipped: number;
+}
+/**
+ * Snapshot for the RPC/UI layer.
+ * @returns the view, or undefined when this Host has no automode row.
+ */
+export declare function automodeCompatView(): AutomodeCompatView | undefined;
+/**
+ * Install the adapter: adapt live rows now, and every row the loader mounts later.
+ *
+ * The loader applies the profile patch layer and mounts the entry's plugin right
+ * after the `loader/patch-context` waterfall returns, so rewriting the entry's
+ * `options.config` from that waterfall is what makes the adapted values the ones
+ * the plugin activates with. No profile write happens here.
+ *
+ * @param ctx - this row's context.
+ * @param loader - the loader service, when the Host provides it.
+ * @param settings - reads the current plugin settings.
+ * @returns a disposer that detaches the listeners, plus a replay for live rows.
+ */
+export declare function installAutomodeCompat(ctx: Context, loader: Loader | undefined, settings: () => ModelSwitchSettings): {
+    dispose: () => void;
+    replay: () => boolean;
+};
+/**
+ * Row entry point: adapt the third-party row on activation and on remount.
+ * @param ctx - this row's context.
+ */
+export declare function apply(ctx: Context): void;

package/lib/types/capabilities-rpc.d.ts

@@ -8,6 +8,14 @@ export interface ReviewStatus {
     readonly held: boolean;
     readonly allowedCalls: number;
     readonly skippedReadOnly: number;
+    /** Third-party `@log.li/dsh-automode` row, when this Host mounts one. */
+    readonly automode?: {
+        readonly installed: boolean;
+        readonly route?: string | undefined;
+        readonly routeSkipped?: string | undefined;
+        readonly added: number;
+        readonly skipped: number;
+    } | undefined;
 }
 export declare const CAPABILITIES_RPC_METHOD = "plugin-rpc/model-switch";
 export interface CapabilitiesSnapshot {

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

@@ -71,6 +71,9 @@ export declare const zh: {
     readonly reviewAllowlistAvailable: "本机存在但未放行的工具：";
     readonly reviewAllowlistRepo: "仓库";
     readonly reviewAllowlistSkipped: "本 Host 进程已为纯读调用跳过 {count} 次审查。";
+    readonly reviewAutomodeLinked: "Auto mode 已接入：审查路由 {route}，直通 +{added} 个纯读工具（{skipped} 条通配未同步）。";
+    readonly reviewAutomodeRouteOwn: "沿用其自身配置";
+    readonly reviewAutomodeRouteUnset: "未配置（沿用会话模型）";
     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-contract.d.ts

@@ -94,6 +94,13 @@ export interface ReviewStatusView {
     readonly held: boolean;
     readonly allowedCalls: number;
     readonly skippedReadOnly: number;
+    /** Third-party `@log.li/dsh-automode` row this Host adapted, when present. */
+    readonly automode?: {
+        readonly route?: string | undefined;
+        readonly routeSkipped?: string | undefined;
+        readonly added: number;
+        readonly skipped: number;
+    } | undefined;
 }
 /**
  * Decode the reviewer counters from a `tools` RPC payload.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-model-switch",
-  "version": "0.4.40",
+  "version": "0.4.42",
   "description": "Explicit model routing plus composer/Plan picker for DeepSeek Harness",
   "repository": {
     "type": "git",
@@ -58,6 +58,10 @@
       "types": "./lib/types/adapter-registry.d.ts",
       "default": "./lib/adapter-registry.js"
     },
+    "./automode-compat": {
+      "types": "./lib/types/automode-compat.d.ts",
+      "default": "./lib/automode-compat.js"
+    },
     "./package.json": "./package.json"
   },
   "files": [
@@ -107,7 +111,8 @@
         "0.1.7-rc.1": "compatible",
         "0.1.7-rc.2": "compatible",
         "0.2.0-rc.2": "compatible",
-        "0.2.1-rc.2": "compatible"
+        "0.2.1-rc.2": "compatible",
+        "0.2.1-rc.3": "compatible"
       }
     }
   },

package/lib/session-route-BCQFzqRP.js

@@ -1,172 +0,0 @@
-import { t as groupOf } from "./provider-group-CwadImhH.js";
-//#region lib/types/session-route.js
-/**
-* Per-session capability route derivation.
-*
-* Model Switch stores one deployment-wide route per capability (the flat
-* settings fields) plus, per provider, a saved provider group. Nothing is
-* written when a session changes provider: this module DERIVES the route a
-* capability should use for one session from (a) the session's own provider and
-* (b) the stored group table. Two sessions on different providers therefore
-* resolve independently, and no session's actions rewrite another session's
-* route.
-*
-* The session's provider is read from durable, official state in this order:
-* the `modelSelection` session projection (`pending` before `lastUsed`, so a
-* selection the user just made counts), then the latest logged request-context
-* route, then the latest `request/header` route. Every read is optional: a
-* session with no observable provider, an unregistered projection, or a
-* profile without the projection package all resolve to the deployment default,
-* which is exactly the pre-derivation behavior.
-*
-* All functions are pure except the readers, which never throw and never write.
-*/
-/** Flat deployment-default fields per capability, in group-storage field names. */
-const CAPABILITY_FIELDS = Object.freeze({
-	compaction: {
-		provider: "compactProvider",
-		model: "compactModel"
-	},
-	autoReview: {
-		provider: "autoReviewProvider",
-		model: "autoReviewModel"
-	},
-	title: {
-		provider: "titleProvider",
-		model: "titleModel"
-	},
-	subagent: {
-		provider: "subagentProvider",
-		model: "subagentModel"
-	}
-});
-/** A non-blank string; blank values behave exactly like an absent field. */
-function present(value) {
-	return typeof value === "string" && value.trim() !== "";
-}
-/** Read one capability's pair from a flat route record; undefined unless both halves are present. */
-function pairOf(source, fields) {
-	if (source === void 0) return void 0;
-	const record = source;
-	const provider = record[fields.provider];
-	const model = record[fields.model];
-	if (!present(provider) || !present(model)) return void 0;
-	return {
-		provider,
-		model
-	};
-}
-/**
-* The deployment-wide route for one capability: the flat settings pair.
-* @param settings - live Model Switch settings; undefined means none are reachable.
-* @param capability - capability whose flat pair is read.
-* @returns The complete pair, or undefined when the capability stays at its official/derived default.
-*/
-function deploymentRoute(settings, capability) {
-	return pairOf(settings, CAPABILITY_FIELDS[capability]);
-}
-/**
-* The route a subagent spawn should use for one parent-session provider.
-*
-* A saved group for that provider pins the spawn; otherwise the flat Subagent
-* card pins it, but only in `fixed` mode — `follow-main` IS the official inherit
-* path, expressed by leaving the request untouched rather than by naming it.
-* @param settings - live Model Switch settings.
-* @param provider - the delegating session's provider, when one is observable.
-* @returns The complete route, or undefined for official inherit.
-*/
-function subagentRouteOf(settings, provider) {
-	const group = groupRoute(settings, provider, "subagent");
-	if (group !== void 0) {
-		const effort = groupOf(settings?.providerGroups, provider ?? "")?.subagentReasoningEffort;
-		return present(effort) ? {
-			...group,
-			reasoningEffort: effort
-		} : group;
-	}
-	if (settings?.subagentMode !== "fixed") return void 0;
-	const fixed = deploymentRoute(settings, "subagent");
-	if (fixed === void 0) return void 0;
-	return present(settings.subagentReasoningEffort) ? {
-		...fixed,
-		reasoningEffort: settings.subagentReasoningEffort
-	} : fixed;
-}
-/**
-* One provider's saved route for one capability.
-* @param settings - live Model Switch settings carrying the group table.
-* @param provider - the session's provider; blank or unknown resolves to undefined.
-* @param capability - capability whose group pin is read.
-* @returns The complete group pair, or undefined when the group pins nothing here.
-*/
-function groupRoute(settings, provider, capability) {
-	if (!present(provider)) return void 0;
-	return pairOf(groupOf(settings?.providerGroups, provider), CAPABILITY_FIELDS[capability]);
-}
-/**
-* The route one capability should use for one session.
-*
-* A saved provider group for the session's provider wins; otherwise the flat
-* deployment default applies. An unknown session provider skips every group, so
-* a session Model Switch cannot attribute keeps the deployment default.
-* @param settings - live Model Switch settings.
-* @param provider - the session's provider, when one is observable.
-* @param capability - capability being resolved.
-* @returns The complete pair, or undefined for the capability's official default.
-*/
-function resolveCapabilityRoute(settings, provider, capability) {
-	return groupRoute(settings, provider, capability) ?? deploymentRoute(settings, capability);
-}
-/**
-* Read the provider from the durable model-selection projection.
-* @param ctx - context that may expose `sessionProjections`.
-* @param session - the session whose selection is read.
-* @returns The pending provider, else the last-used provider, else undefined.
-*/
-function projectionProvider(ctx, session) {
-	let state;
-	try {
-		state = ctx.get("sessionProjections", false)?.stateOf(session, "modelSelection");
-	} catch {
-		state = void 0;
-	}
-	if (state === void 0) return void 0;
-	if (present(state.pending?.provider)) return state.pending.provider;
-	if (present(state.lastUsed?.provider)) return state.lastUsed.provider;
-}
-/**
-* The provider one session is using, from official durable state.
-*
-* Preferred source is the session's own model selection (it covers a switch the
-* client has sent but no request has consumed yet); the logged request-context
-* and request-header routes cover profiles without the projection package and
-* replayed sessions that never emitted a selection.
-* @param ctx - context used for the optional projection read.
-* @param session - the session to resolve; undefined resolves to undefined.
-* @returns The provider, or undefined when nothing durable names one.
-*/
-function sessionProviderOf(ctx, session) {
-	if (session === void 0) return void 0;
-	const selected = projectionProvider(ctx, session);
-	if (selected !== void 0) return selected;
-	try {
-		const context = session.requestContext()?.provider;
-		if (present(context)) return context;
-		const header = session.requestHeader()?.config.provider;
-		if (present(header)) return header;
-	} catch {
-		return;
-	}
-}
-/**
-* The subagent route one exact session's spawns should use.
-* @param ctx - context used for the optional session reads.
-* @param session - the delegating session; undefined keeps official inherit.
-* @param settings - live Model Switch settings.
-* @returns The complete route, or undefined for official inherit.
-*/
-function sessionSubagentRouteOf(ctx, session, settings) {
-	return subagentRouteOf(settings, sessionProviderOf(ctx, session));
-}
-//#endregion
-export { sessionProviderOf as n, sessionSubagentRouteOf as r, resolveCapabilityRoute as t };

package/lib/session-route-BjNPlliu.js

@@ -1,172 +0,0 @@
-import { t as groupOf } from "./provider-group-CwadImhH.js";
-//#region lib/types/session-route.js
-/**
-* Per-session capability route derivation.
-*
-* Model Switch stores one deployment-wide route per capability (the flat
-* settings fields) plus, per provider, a saved provider group. Nothing is
-* written when a session changes provider: this module DERIVES the route a
-* capability should use for one session from (a) the session's own provider and
-* (b) the stored group table. Two sessions on different providers therefore
-* resolve independently, and no session's actions rewrite another session's
-* route.
-*
-* The session's provider is read from durable, official state in this order:
-* the `modelSelection` session projection (`pending` before `lastUsed`, so a
-* selection the user just made counts), then the latest logged request-context
-* route, then the latest `request/header` route. Every read is optional: a
-* session with no observable provider, an unregistered projection, or a
-* profile without the projection package all resolve to the deployment default,
-* which is exactly the pre-derivation behavior.
-*
-* All functions are pure except the readers, which never throw and never write.
-*/
-/** Flat deployment-default fields per capability, in group-storage field names. */
-const CAPABILITY_FIELDS = Object.freeze({
-	compaction: {
-		provider: "compactProvider",
-		model: "compactModel"
-	},
-	autoReview: {
-		provider: "autoReviewProvider",
-		model: "autoReviewModel"
-	},
-	title: {
-		provider: "titleProvider",
-		model: "titleModel"
-	},
-	subagent: {
-		provider: "subagentProvider",
-		model: "subagentModel"
-	}
-});
-/** A non-blank string; blank values behave exactly like an absent field. */
-function present(value) {
-	return typeof value === "string" && value.trim() !== "";
-}
-/** Read one capability's pair from a flat route record; undefined unless both halves are present. */
-function pairOf(source, fields) {
-	if (source === void 0) return void 0;
-	const record = source;
-	const provider = record[fields.provider];
-	const model = record[fields.model];
-	if (!present(provider) || !present(model)) return void 0;
-	return {
-		provider,
-		model
-	};
-}
-/**
-* The deployment-wide route for one capability: the flat settings pair.
-* @param settings - live Model Switch settings; undefined means none are reachable.
-* @param capability - capability whose flat pair is read.
-* @returns The complete pair, or undefined when the capability stays at its official/derived default.
-*/
-function deploymentRoute(settings, capability) {
-	return pairOf(settings, CAPABILITY_FIELDS[capability]);
-}
-/**
-* The route a subagent spawn should use for one parent-session provider.
-*
-* A saved group for that provider pins the spawn; otherwise the flat Subagent
-* card pins it, but only in `fixed` mode — `follow-main` IS the official inherit
-* path, expressed by leaving the request untouched rather than by naming it.
-* @param settings - live Model Switch settings.
-* @param provider - the delegating session's provider, when one is observable.
-* @returns The complete route, or undefined for official inherit.
-*/
-function subagentRouteOf(settings, provider) {
-	const group = groupRoute(settings, provider, "subagent");
-	if (group !== void 0) {
-		const effort = groupOf(settings?.providerGroups, provider ?? "")?.subagentReasoningEffort;
-		return present(effort) ? {
-			...group,
-			reasoningEffort: effort
-		} : group;
-	}
-	if (settings?.subagentMode !== "fixed") return void 0;
-	const fixed = deploymentRoute(settings, "subagent");
-	if (fixed === void 0) return void 0;
-	return present(settings.subagentReasoningEffort) ? {
-		...fixed,
-		reasoningEffort: settings.subagentReasoningEffort
-	} : fixed;
-}
-/**
-* One provider's saved route for one capability.
-* @param settings - live Model Switch settings carrying the group table.
-* @param provider - the session's provider; blank or unknown resolves to undefined.
-* @param capability - capability whose group pin is read.
-* @returns The complete group pair, or undefined when the group pins nothing here.
-*/
-function groupRoute(settings, provider, capability) {
-	if (!present(provider)) return void 0;
-	return pairOf(groupOf(settings?.providerGroups, provider), CAPABILITY_FIELDS[capability]);
-}
-/**
-* The route one capability should use for one session.
-*
-* A saved provider group for the session's provider wins; otherwise the flat
-* deployment default applies. An unknown session provider skips every group, so
-* a session Model Switch cannot attribute keeps the deployment default.
-* @param settings - live Model Switch settings.
-* @param provider - the session's provider, when one is observable.
-* @param capability - capability being resolved.
-* @returns The complete pair, or undefined for the capability's official default.
-*/
-function resolveCapabilityRoute(settings, provider, capability) {
-	return groupRoute(settings, provider, capability) ?? deploymentRoute(settings, capability);
-}
-/**
-* Read the provider from the durable model-selection projection.
-* @param ctx - context that may expose `sessionProjections`.
-* @param session - the session whose selection is read.
-* @returns The pending provider, else the last-used provider, else undefined.
-*/
-function projectionProvider(ctx, session) {
-	let state;
-	try {
-		state = ctx.get("sessionProjections", false)?.stateOf(session, "modelSelection");
-	} catch {
-		state = void 0;
-	}
-	if (state === void 0) return void 0;
-	if (present(state.pending?.provider)) return state.pending.provider;
-	if (present(state.lastUsed?.provider)) return state.lastUsed.provider;
-}
-/**
-* The provider one session is using, from official durable state.
-*
-* Preferred source is the session's own model selection (it covers a switch the
-* client has sent but no request has consumed yet); the logged request-context
-* and request-header routes cover profiles without the projection package and
-* replayed sessions that never emitted a selection.
-* @param ctx - context used for the optional projection read.
-* @param session - the session to resolve; undefined resolves to undefined.
-* @returns The provider, or undefined when nothing durable names one.
-*/
-function sessionProviderOf(ctx, session) {
-	if (session === void 0) return void 0;
-	const selected = projectionProvider(ctx, session);
-	if (selected !== void 0) return selected;
-	try {
-		const context = session.requestContext()?.provider;
-		if (present(context)) return context;
-		const header = session.requestHeader()?.config.provider;
-		if (present(header)) return header;
-	} catch {
-		return;
-	}
-}
-/**
-* The subagent route one exact session's spawns should use.
-* @param ctx - context used for the optional session reads.
-* @param session - the delegating session; undefined keeps official inherit.
-* @param settings - live Model Switch settings.
-* @returns The complete route, or undefined for official inherit.
-*/
-function sessionSubagentRouteOf(ctx, session, settings) {
-	return subagentRouteOf(settings, sessionProviderOf(ctx, session));
-}
-//#endregion
-export { sessionSubagentRouteOf as a, sessionProviderOf as i, groupRoute as n, resolveCapabilityRoute as r, deploymentRoute as t };