dsh-model-switch 0.4.23 → 0.4.24

package/lib/types/session-route.d.ts

@@ -0,0 +1,111 @@
+/**
+ * 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.
+ */
+import type { Context } from '@deepseek-ai/cordis';
+import type { Session } from '@deepseek-ai/dsh-session';
+import { type ProviderGroups } from './provider-group.js';
+/** Capabilities whose route can be derived per session. */
+export type CapabilityId = 'compaction' | 'autoReview' | 'title' | 'subagent';
+/** A complete pinned route; either half missing means "follow the default". */
+export interface CapabilityRoute {
+    readonly provider: string;
+    readonly model: string;
+}
+/**
+ * Settings fields a route can be derived from. Structurally satisfied by
+ * {@link ModelSwitchSettings}; declared separately so the resolver stays pure
+ * and testable without a host runtime.
+ */
+export interface RouteBearingSettings {
+    readonly subagentMode?: string;
+    readonly subagentProvider?: string;
+    readonly subagentModel?: string;
+    readonly subagentReasoningEffort?: string;
+    readonly autoReviewProvider?: string;
+    readonly autoReviewModel?: string;
+    readonly compactProvider?: string;
+    readonly compactModel?: string;
+    readonly titleProvider?: string;
+    readonly titleModel?: string;
+    readonly providerGroups?: ProviderGroups;
+}
+/**
+ * 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.
+ */
+export declare function deploymentRoute(settings: RouteBearingSettings | undefined, capability: CapabilityId): CapabilityRoute | undefined;
+/** One capability's route plus the reasoning effort a subagent spawn also carries. */
+export interface SubagentRoute extends CapabilityRoute {
+    readonly reasoningEffort?: string;
+}
+/**
+ * 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.
+ */
+export declare function subagentRouteOf(settings: RouteBearingSettings | undefined, provider: string | undefined): SubagentRoute | undefined;
+/**
+ * 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.
+ */
+export declare function groupRoute(settings: RouteBearingSettings | undefined, provider: string | undefined, capability: CapabilityId): CapabilityRoute | undefined;
+/**
+ * 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.
+ */
+export declare function resolveCapabilityRoute(settings: RouteBearingSettings | undefined, provider: string | undefined, capability: CapabilityId): CapabilityRoute | undefined;
+/**
+ * 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.
+ */
+export declare function sessionProviderOf(ctx: Context, session: Session | undefined): string | undefined;
+/**
+ * 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.
+ */
+export declare function sessionSubagentRouteOf(ctx: Context, session: Session | undefined, settings: RouteBearingSettings | undefined): SubagentRoute | undefined;

package/lib/types/session-title.d.ts

@@ -0,0 +1,104 @@
+/**
+ * Model Switch-owned session-naming row.
+ *
+ * The official naming rows hardwire the naming route at registration time: the
+ * configured provider/model pair wins over the session's own logged route for
+ * every session in the profile. This row registers ONE provider of its own and
+ * resolves the route PER REQUEST instead, so a session whose provider has a
+ * saved group is named through that group's pair while every other session keeps
+ * following its own model.
+ *
+ * The call itself stays inside the official implementation: the exported
+ * `generateSessionTitleWithLlm` receives the session-resolved config and records
+ * exactly that route in `session/title-llm-request`, so the durable record and
+ * the actual request can never disagree. Nothing is remounted when settings
+ * change — the route is read through on every naming request — so a settings
+ * save can neither interrupt an in-flight naming request nor leave the profile
+ * without a registered provider.
+ *
+ * `cordis.patch.yml` disables the official row (the seam allows one registered
+ * provider per context), and this row mirrors the cadence the disabled row
+ * declared, so a profile that restated the row as all-prompts keeps its cadence.
+ *
+ * @module dsh-model-switch/session-title
+ */
+import type { Context } from '@deepseek-ai/cordis';
+import type { Entry, Loader } from '@deepseek-ai/cordis-plugin-loader';
+import type { SessionTitleAutomaticMode, SessionTitleProviderId, SessionTitleUserMessage } from '@deepseek-ai/dsh-session-title';
+import type { ResolvedSessionTitleLlmConfig, SessionTitleLlmConfig } from '@deepseek-ai/dsh-session-title-llm';
+import { type CapabilityRoute } from './session-route.js';
+/** Cordis plugin identity; matches the cordis.patch.yml insert row id. */
+export declare const name = "model-switch-session-title";
+/** The loader names the disabled row, and the seam services the call needs are awaited before the first naming request. */
+export declare const inject: string[];
+/** One official cadence package; the row's own package selects which one this profile runs. */
+export interface TitleCadence {
+    /** Official npm package that declares this cadence. */
+    readonly pkg: string;
+    /** Provider id recorded with every generated title; mirrors the official registration. */
+    readonly id: SessionTitleProviderId;
+    /** When the service starts automatic generation. */
+    readonly automatic: SessionTitleAutomaticMode;
+    /** Whether only the first human message is framed into the request. */
+    readonly firstPromptOnly: boolean;
+}
+/** Both official cadence packages, in the order a profile may declare them. */
+export declare const TITLE_CADENCES: readonly TitleCadence[];
+/**
+ * The cadence one official package name declares.
+ * @param pkg - the disabled row's package name.
+ * @returns The matching cadence, or undefined for a row this row cannot mirror.
+ */
+export declare function titleCadence(pkg: string | undefined): TitleCadence | undefined;
+/**
+ * Overlay the session-resolved route over the row's own validated policy.
+ *
+ * A resolved route always names both halves. When nothing resolves, the row's
+ * own policy is returned unchanged: an explicit pair the profile configured on
+ * the official row stays the deployment default, and a row without one keeps
+ * following each session's logged route.
+ * @param config - policy validated from the disabled official row.
+ * @param route - session-resolved naming route, or undefined for the row's own policy.
+ * @returns A detached config for one naming request.
+ */
+export declare function composeTitleRoute(config: ResolvedSessionTitleLlmConfig, route: CapabilityRoute | undefined): ResolvedSessionTitleLlmConfig;
+/**
+ * Frame the exact human messages one naming revision represents.
+ * @param messages - every eligible human message of the revision.
+ * @param firstPromptOnly - cadence flag: true mirrors the first-prompt provider.
+ * @returns The selected messages, in order.
+ * @throws when a first-prompt cadence receives an empty revision — the official provider's own contract.
+ */
+export declare function selectTitleMessages(messages: readonly SessionTitleUserMessage[], firstPromptOnly: boolean): readonly SessionTitleUserMessage[];
+/**
+ * Locate the official session-title provider row in the loader tree.
+ * Disabled entries stay in the tree, so a name-matched disable still matches.
+ * @param loader - the host loader, when one is reachable.
+ * @returns The official entry, or undefined when this profile has no such row.
+ */
+export declare function officialTitleEntry(loader: Loader | undefined): Entry | undefined;
+/**
+ * Copy the official row's stored config, ignoring non-object payloads.
+ * @param entry - the official session-title provider entry.
+ * @returns A plain object spread; missing or invalid configs become `{}`. The
+ * result is untrusted: the profile may be hand-edited, so the official policy
+ * validator runs over it before any naming request is served.
+ */
+export declare function forwardedConfig(entry: Entry): Partial<SessionTitleLlmConfig>;
+/**
+ * The official package name this row mounts (either cadence).
+ * @param entry - the official session-title provider entry.
+ * @returns The package name, or undefined when the row declares none.
+ */
+export declare function officialTitlePackage(entry: Entry): string | undefined;
+/**
+ * Mount the Model Switch session-naming row for this profile.
+ *
+ * A profile with no official naming row, an unrecognized row package, a missing
+ * auxiliary-LLM package, or an invalid stored policy keeps the session-title
+ * service's deterministic fallback titles and reports the lost capability
+ * explicitly instead of guessing a route. The registration is an effect of this
+ * row's fiber, so unloading the profile unregisters the provider.
+ * @param ctx - this row's context.
+ */
+export declare function apply(ctx: Context): Promise<void>;

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

@@ -1,6 +1,6 @@
 import { Context } from '@deepseek-ai/cordis';
 import OfficialSubagentRuntime, { type ContinuableStart, type ContinuableStartSpec, type SubagentRun, type SubagentStartRequest } from '@deepseek-ai/dsh-subagent';
-import type { ModelSwitchSettings } from './host-settings.js';
+import { type SubagentRoute } from './session-route.js';
 /** Raised only when an explicit startup check finds an unsupported public surface. */
 export declare class StartupIncompatibilityError extends Error {
     readonly name = "StartupIncompatibilityError";
@@ -21,8 +21,19 @@ export interface MountedStartup<T> {
     readonly dispose: () => Promise<void>;
 }
 type RoutableSubagentRequest = Pick<SubagentStartRequest, 'parent' | 'agentOptions'>;
-/** Inject a fixed Default Subagent route, or leave the request for Official inherit. */
-export declare function routeSubagentRequest<T extends RoutableSubagentRequest>(request: T, settings: ModelSwitchSettings): T;
+/**
+ * Inject one resolved route into a spawn that names none.
+ *
+ * A spawn that already names a provider, model, or effort keeps it: the caller's
+ * explicit selection outranks any profile policy. The route itself is derived
+ * from the DELEGATING session (its provider selects a saved group, else the flat
+ * Subagent card in `fixed` mode), so two sessions on different providers route
+ * their own spawns and neither can rewrite the other's policy.
+ * @param request - the caller's spawn request.
+ * @param route - the delegating session's resolved route, or undefined for official inherit.
+ * @returns The request to hand the official runtime.
+ */
+export declare function routeSubagentRequest<T extends RoutableSubagentRequest>(request: T, route: SubagentRoute | undefined): T;
 /**
  * Mount a candidate and use the fallback only for typed startup incompatibility.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-model-switch",
-  "version": "0.4.23",
+  "version": "0.4.24",
   "description": "Explicit model routing plus composer/Plan picker for DeepSeek Harness",
   "repository": {
     "type": "git",
@@ -46,6 +46,10 @@
       "types": "./lib/types/compaction.d.ts",
       "default": "./lib/compaction.js"
     },
+    "./session-title": {
+      "types": "./lib/types/session-title.d.ts",
+      "default": "./lib/session-title.js"
+    },
     "./subagent-runtime": {
       "types": "./lib/types/subagent-runtime.d.ts",
       "default": "./lib/subagent-runtime.js"
@@ -134,6 +138,10 @@
     "@deepseek-ai/dsh-permission-presets": ">=0.1.7-alpha.2",
     "@deepseek-ai/dsh-plan-mode": ">=0.1.7-alpha.2",
     "@deepseek-ai/dsh-session": ">=0.1.7-alpha.2",
+    "@deepseek-ai/dsh-session-title": ">=0.1.7-alpha.2",
+    "@deepseek-ai/dsh-session-title-all-prompts-llm": ">=0.1.7-alpha.2",
+    "@deepseek-ai/dsh-session-title-first-prompt-llm": ">=0.1.7-alpha.2",
+    "@deepseek-ai/dsh-session-title-llm": ">=0.1.7-alpha.2",
     "@deepseek-ai/dsh-settings": ">=0.1.7-alpha.2",
     "@deepseek-ai/dsh-subagent": ">=0.1.7-alpha.2",
     "@deepseek-ai/dsh-system-prompt": ">=0.1.7-alpha.2",
@@ -210,6 +218,9 @@
     "@deepseek-ai/dsh-session-query": ">=0.1.7-alpha.2",
     "@deepseek-ai/dsh-session-reference": ">=0.1.7-alpha.2",
     "@deepseek-ai/dsh-session-title": ">=0.1.7-alpha.2",
+    "@deepseek-ai/dsh-session-title-all-prompts-llm": ">=0.1.7-alpha.2",
+    "@deepseek-ai/dsh-session-title-first-prompt-llm": ">=0.1.7-alpha.2",
+    "@deepseek-ai/dsh-session-title-llm": ">=0.1.7-alpha.2",
     "@deepseek-ai/dsh-settings": ">=0.1.7-alpha.2",
     "@deepseek-ai/dsh-shell": ">=0.1.7-alpha.2",
     "@deepseek-ai/dsh-skill": ">=0.1.7-alpha.2",
@@ -323,6 +334,18 @@
     "@deepseek-ai/dsh-compaction-basic": {
       "optional": true
     },
+    "@deepseek-ai/dsh-session-title": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-session-title-all-prompts-llm": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-session-title-first-prompt-llm": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-session-title-llm": {
+      "optional": true
+    },
     "@deepseek-ai/dsh-settings": {
       "optional": true
     },