dsh-model-switch 0.4.20 → 0.4.21

package/lib/types/client/remote-settings-scope.d.ts

@@ -1,45 +1,45 @@
-import type { SettingsPathOpView } from '@deepseek-ai/dsh-api-remotes/client';
-import type { SettingsScope, SettingsScopeSnapshot } from '@deepseek-ai/dsh-client-ui-settings/client';
-interface RemoteError {
-    code: string;
-    message: string;
-}
-interface RemoteResult<T> {
-    ok: boolean;
-    value?: T;
-    error?: RemoteError;
-}
-interface NamespaceView {
-    ns: string;
-    value: unknown;
-    base?: unknown;
-    user?: unknown;
-    revision: number;
-}
-interface DescribeValue {
-    writable: boolean;
-    namespaces: readonly NamespaceView[];
-}
-export interface RemoteSettingsFace {
-    describe(): Promise<RemoteResult<DescribeValue>>;
-    mutate(ns: string, ops: readonly unknown[], expectedRevision: number | undefined): Promise<RemoteResult<NamespaceView>>;
-}
-/** Host-backed settings scope used by this plugin on authenticated remote browsers. */
-export declare class RemoteSettingsScope<T> implements SettingsScope<T> {
-    private readonly api;
-    private readonly namespace;
-    private readonly decode;
-    private snapshot;
-    private readonly listeners;
-    constructor(api: RemoteSettingsFace, namespace: string, decode: (value: unknown) => T | undefined);
-    getSnapshot: () => SettingsScopeSnapshot<T>;
-    subscribe: (listener: () => void) => (() => void);
-    reload(): Promise<void>;
-    set(field: string, value: unknown): Promise<void>;
-    unset(field: string): Promise<void>;
-    mutate(ops: readonly SettingsPathOpView[], expectedRevision?: number): Promise<void>;
-    private write;
-    private accept;
-    private publish;
-}
-export {};
+import type { SettingsPathOpView } from '@deepseek-ai/dsh-api-remotes/client';
+import type { SettingsScope, SettingsScopeSnapshot } from '@deepseek-ai/dsh-client-ui-settings/client';
+interface RemoteError {
+    code: string;
+    message: string;
+}
+interface RemoteResult<T> {
+    ok: boolean;
+    value?: T;
+    error?: RemoteError;
+}
+interface NamespaceView {
+    ns: string;
+    value: unknown;
+    base?: unknown;
+    user?: unknown;
+    revision: number;
+}
+interface DescribeValue {
+    writable: boolean;
+    namespaces: readonly NamespaceView[];
+}
+export interface RemoteSettingsFace {
+    describe(): Promise<RemoteResult<DescribeValue>>;
+    mutate(ns: string, ops: readonly unknown[], expectedRevision: number | undefined): Promise<RemoteResult<NamespaceView>>;
+}
+/** Host-backed settings scope used by this plugin on authenticated remote browsers. */
+export declare class RemoteSettingsScope<T> implements SettingsScope<T> {
+    private readonly api;
+    private readonly namespace;
+    private readonly decode;
+    private snapshot;
+    private readonly listeners;
+    constructor(api: RemoteSettingsFace, namespace: string, decode: (value: unknown) => T | undefined);
+    getSnapshot: () => SettingsScopeSnapshot<T>;
+    subscribe: (listener: () => void) => (() => void);
+    reload(): Promise<void>;
+    set(field: string, value: unknown): Promise<void>;
+    unset(field: string): Promise<void>;
+    mutate(ops: readonly SettingsPathOpView[], expectedRevision?: number): Promise<void>;
+    private write;
+    private accept;
+    private publish;
+}
+export {};

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

@@ -21,8 +21,8 @@ export interface ModelSwitchSettingsView {
     compactOnSwitch?: boolean;
     autoReviewProvider?: string;
     autoReviewModel?: string;
-    /** Plan-exit compaction threshold in tokens; absent = the shipped default. */
-    planCompactThreshold?: number;
+    compactProvider?: string;
+    compactModel?: string;
 }
 export interface SubagentSettingsView {
     mode: 'follow-main' | 'fixed';
@@ -55,9 +55,15 @@ export declare const AUTO_REVIEW_SETTINGS_FIELDS: Readonly<{
     readonly provider: "autoReviewProvider";
     readonly model: "autoReviewModel";
 }>;
+/** Compaction summarization route for `/compact` and automatic compaction; both unset means the official default (the conversation target). */
+export declare const COMPACTION_SETTINGS_FIELDS: Readonly<{
+    readonly provider: "compactProvider";
+    readonly model: "compactModel";
+}>;
 export declare function deriveSubagentSettings(settings: ModelSwitchSettingsView): SubagentSettingsView;
 export declare function deriveSearchSettings(settings: ModelSwitchSettingsView): CapabilityRouteView;
 export declare function deriveImageSettings(settings: ModelSwitchSettingsView): CapabilityRouteView;
 export declare function deriveAutoReviewSettings(settings: ModelSwitchSettingsView): CapabilityRouteView;
-/** Whether both reviewer fields form a complete route; an incomplete pair still follows the session model. */
-export declare function autoReviewRouteConfigured(route: CapabilityRouteView | undefined): boolean;
+export declare function deriveCompactionSettings(settings: ModelSwitchSettingsView): CapabilityRouteView;
+/** Whether both fields of a model route form a complete pair; an incomplete pair stays off. */
+export declare function routePairConfigured(route: CapabilityRouteView | undefined): boolean;

package/lib/types/compaction.d.ts

@@ -0,0 +1,56 @@
+import type { Context } from '@deepseek-ai/cordis';
+import type { Entry, Loader } from '@deepseek-ai/cordis-plugin-loader';
+import type { BasicCompactionConfig } from '@deepseek-ai/dsh-compaction-basic';
+/** Cordis plugin identity; matches the cordis.patch.yml insert row id. */
+export declare const name = "model-switch-compaction";
+/** The loader is awaited at row activation; settings and the official row are still read structurally so stock compaction survives a disabled Model Switch row. */
+export declare const inject: string[];
+/** Both identifiers trimmed and non-empty; undefined means "official default". */
+export interface CompactionRoute {
+    readonly provider: string;
+    readonly model: string;
+}
+/**
+ * Resolve the configurable summarization route from live settings.
+ * @param settings - Model Switch settings carrying the optional compaction pair.
+ * @returns Both identifiers trimmed and non-empty, or undefined (official default).
+ */
+export declare function compactionRouteOf(settings: {
+    readonly compactProvider?: string;
+    readonly compactModel?: string;
+} | undefined): CompactionRoute | undefined;
+/**
+ * Merge the resolved route over the official row's own config.
+ * @param forwarded - config the official compaction-basic row was configured with.
+ * @param route - resolved summarization route; undefined keeps official behavior.
+ * @returns A detached config safe to hand to a fresh engine construction.
+ */
+export declare function composeCompactionConfig(forwarded: BasicCompactionConfig, route: CompactionRoute | undefined): BasicCompactionConfig;
+/**
+ * Locate the official compaction 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 officialCompactionEntry(loader: Loader | undefined): Entry | undefined;
+/**
+ * Copy the official row's stored config, ignoring non-object payloads.
+ * @param entry - the official compaction entry.
+ * @returns A plain object spread; missing or invalid configs become `{}`.
+ */
+export declare function forwardedConfig(entry: Entry): BasicCompactionConfig;
+/**
+ * Mount the Model Switch compaction engine for this profile.
+ *
+ * Installs a sibling row that replaces the official compaction-basic engine
+ * with the same package under the configurable summarization route. Host
+ * settings and the loader are read structurally so a disabled `model-switch`
+ * row leaves official compaction untouched. Reconciles run on
+ * `model-switch/settings-update` (emitted by the host on volatile commits and
+ * ordinary saves); the listener is global so instances of this row inside
+ * agent-preset realms still hear the host row's emission. The initial
+ * reconcile is awaited so `/compact` resolves the service as soon as this row
+ * completes.
+ * @param ctx - this row's context.
+ */
+export declare function apply(ctx: Context): Promise<void>;

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

@@ -7,6 +7,10 @@ declare module '@deepseek-ai/cordis' {
     interface Context {
         modelSwitch: ModelSwitchRuntime;
     }
+    interface Events {
+        /** Model Switch settings changed; reread via `modelSwitch.currentSettings()`. */
+        'model-switch/settings-update'(): void;
+    }
 }
 /** Host owner for Model Switch settings and the released Main-default adapter. */
 export declare class ModelSwitchRuntime extends Service {
@@ -23,7 +27,8 @@ export declare class ModelSwitchRuntime extends Service {
         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">;
-        planCompactThreshold: import("@deepseek-ai/schemastery").default<number, number, "volatile-defined">;
+        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">;
@@ -36,7 +41,8 @@ export declare class ModelSwitchRuntime extends Service {
         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">;
-        planCompactThreshold: import("@deepseek-ai/schemastery").default<number, number, "volatile-defined">;
+        compactProvider: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
+        compactModel: import("@deepseek-ai/schemastery").default<string, string, "volatile">;
     }>>, "plain">;
     get capabilities(): {
         searchProviderAdapters: {

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

@@ -16,8 +16,10 @@ export interface ModelSwitchSettings {
     autoReviewProvider?: string;
     /** Reviewer model for the Auto preset; set together with `autoReviewProvider`. */
     autoReviewModel?: string;
-    /** Plan-exit compaction threshold in tokens; 0 disables the mechanism. */
-    planCompactThreshold: number;
+    /** Summarization provider for `/compact` and automatic compaction; both fields unset = official default (the conversation target). */
+    compactProvider?: string;
+    /** Summarization model for `/compact` and automatic compaction; set together with `compactProvider`. */
+    compactModel?: string;
 }
 /** Loader-owned references; every field is directly editable in the profile form. */
 export interface Config {
@@ -32,7 +34,8 @@ export interface Config {
     compactOnSwitch: Volatile<boolean>;
     autoReviewProvider: Volatile<string | undefined>;
     autoReviewModel: Volatile<string | undefined>;
-    planCompactThreshold: Volatile<number>;
+    compactProvider: Volatile<string | undefined>;
+    compactModel: Volatile<string | undefined>;
 }
 export declare const Config: z<Schemastery.ObjectS<NoInfer<{
     subagentMode: z<"follow-main" | "fixed", "follow-main" | "fixed", "volatile-defined">;
@@ -46,7 +49,8 @@ export declare const Config: z<Schemastery.ObjectS<NoInfer<{
     compactOnSwitch: z<boolean, boolean, "volatile-defined">;
     autoReviewProvider: z<string, string, "volatile">;
     autoReviewModel: z<string, string, "volatile">;
-    planCompactThreshold: z<number, number, "volatile-defined">;
+    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">;
@@ -59,6 +63,7 @@ export declare const Config: z<Schemastery.ObjectS<NoInfer<{
     compactOnSwitch: z<boolean, boolean, "volatile-defined">;
     autoReviewProvider: z<string, string, "volatile">;
     autoReviewModel: z<string, string, "volatile">;
-    planCompactThreshold: z<number, number, "volatile-defined">;
+    compactProvider: z<string, string, "volatile">;
+    compactModel: z<string, string, "volatile">;
 }>>, "plain">;
 export declare function readConfig(config: Config): ModelSwitchSettings;

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

@@ -61,8 +61,33 @@ export type GoalHandoff = {
     readonly code?: string;
     readonly message: string;
 };
+/** Identity of the plan document under review, for its durable address. */
+export interface PlanDocumentRef {
+    /** Logged tool invocation that owns the plan; absent while only the review is pending. */
+    readonly callId?: string;
+    /** Browser-unique pending request identity (the review card's key). */
+    readonly requestKey: string;
+}
+/**
+ * Address the plan document exactly as the official opener does.
+ *
+ * A logged plan (`callId` present) resolves from `dsh-resource://plan/...`
+ * for as long as the session log holds the call; before that the pending
+ * review's own `dsh-resource://plan-review/...` address is the one that
+ * opens its preview.
+ *
+ * @param sessionId - the session that owns the review.
+ * @param ref - logged call identity plus the pending request key.
+ * @returns The plan resource address.
+ */
+export declare function planDocumentAddress(sessionId: string, ref: PlanDocumentRef): string;
 /**
- * Make the plan text this session's armed goal, replacing any unfinished goal.
+ * Make this plan the session's armed goal, replacing any unfinished goal.
+ *
+ * The objective is a short instruction carrying the plan document's address,
+ * not the plan's raw markdown: goal objectives are injected into every round,
+ * and a full plan would be truncated by length limits mid-sentence. The round
+ * driver reads the plan from the address instead.
  *
  * Ordering mirrors the card's own commit-then-answer rule: a refusal here keeps
  * the Plan pending instead of approving work that no goal tracks. The replace
@@ -71,7 +96,8 @@ export type GoalHandoff = {
  *
  * @param remote - the released goal remote, absent when no goal package is mounted.
  * @param sessionId - the session that owns both the review and the goal.
- * @param plan - the plan markdown under review.
+ * @param plan - the plan markdown under review (validated non-empty).
+ * @param ref - the plan document identity used for its address.
  * @returns Whether the goal now tracks this plan, or why it does not.
  */
-export declare function setPlanAsGoal(remote: GoalRemote | undefined, sessionId: string, plan: string): Promise<GoalHandoff>;
+export declare function setPlanAsGoal(remote: GoalRemote | undefined, sessionId: string, plan: string, ref: PlanDocumentRef): Promise<GoalHandoff>;