@xiaoso/dsh-tool-plus 0.1.9 → 0.1.10-beta.1

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

@@ -1,16 +1,35 @@
 /**
- * Plugin-owned settings surface for the ported bash tool: the `bash-plus`
- * namespace, a FLAT settings schema (OMP `bash*`-style scalar keys — the
- * client scope writes scalar fields only), its defaults, the mapping onto the
- * nested {@link RuntimeConfig} the runtime consumes, and the optional-settings
- * consumer wiring. Keeping the whole config-export surface here lets the
- * ported OMP runtime stay pristine — the entry only calls
+ * Plugin-owned settings surface for the ported bash tool: the `tool-plus`
+ * namespace, a FLAT settings schema (OMP `bash*`-style scalar keys — the shared
+ * client configuration form writes scalar fields only), its defaults, the
+ * mapping onto the nested {@link RuntimeConfig} the runtime consumes, and the
+ * optional-settings consumer wiring. Keeping the whole config-export surface
+ * here lets the ported OMP runtime stay pristine — the entry only calls
  * {@link installBashPlusSettings} and re-exports this module's `Config`.
  * @module @xiaoso/dsh-tool-plus/settings
  */
 import type { Context } from '@deepseek-ai/cordis';
 import z from '@deepseek-ai/schemastery';
 import type { MinimizerConfig } from '../tools/bash/types.ts';
+/**
+ * The Loader commits a settings write into this plugin's live config
+ * references and announces the changed paths on the owning fiber
+ * (`@deepseek-ai/cordis-plugin-loader` declares this event). The declaration
+ * lives in the Loader package, which a business plugin does not depend on, so
+ * the one event this module consumes is spelled here — copied verbatim from the
+ * Loader's own declaration, so a future signature change fails loudly here
+ * instead of silently missing the notification.
+ */
+declare module '@deepseek-ai/cordis' {
+    interface Events {
+        /**
+         * Volatile config values were committed into the running fiber without a remount; dispatched to the owning fiber only.
+         * @param paths - changed config paths as key arrays; every value is committed before dispatch.
+         * @mode emit
+         */
+        'loader/volatile-update'(paths: readonly (readonly string[])[]): void;
+    }
+}
 /** Truncation strategy for background→foreground completion messages (OMP config parity). */
 export type OutputTruncateStrategy = 'bytes' | 'lines';
 /** Retention mode for a truncated completion message: head, tail, or middle (head+tail). */
@@ -125,8 +144,9 @@ export declare const DEFAULT_AUTO_BACKGROUND_MS = 60000;
 export declare const DEFAULT_MAX_BACKGROUND_JOBS = 15;
 /**
  * Plugin settings, one scalar key per option — every field is writable through
- * the client `SettingsScope.set`/`unset`. Defaults live in the {@link Config}
- * schema and in {@link resolveConfig}.
+ * the shared client configuration form (`ctx.configForms.get('tool-plus')`
+ * `.set`/`.unset`). Defaults live in the {@link Config} schema and in
+ * {@link resolveConfig}.
  */
 export interface Config {
     enableRunInBackground?: boolean;
@@ -193,28 +213,189 @@ export interface Config {
     imagesResizeJpegQuality?: number;
 }
 /**
- * Runtime configuration schema for the plugin. The namespace resolves through
- * this flat surface; {@link resolveConfig} maps it onto {@link RuntimeConfig}.
+ * Runtime configuration schema for the plugin, in the dsh 0.1.7 settings shape:
+ * EVERY field is declared `.volatile()`, because a settings namespace is the
+ * plugin's own entry and `SettingsForms.describe()` serves exactly the fields
+ * whose schema declares them live. {@link resolveConfig} maps the flat surface
+ * onto {@link RuntimeConfig}.
+ *
+ * The annotation is deliberately inferred rather than written as `z<Config>`:
+ * the schema's parsed output is {@link LiveConfig} (one stable reference per
+ * field), while {@link Config} stays the plain settings DOCUMENT the browser
+ * edits and the specs pass in.
+ */
+export declare const Config: z<Schemastery.ObjectS<NoInfer<{
+    enableRunInBackground: z<boolean, boolean, "volatile-defined">;
+    autoBackgroundMs: z<number, number, "volatile-defined">;
+    defaultTimeoutMs: z<number, number, "volatile-defined">;
+    maxTimeoutMs: z<number, number, "volatile-defined">;
+    outputMaxBytes: z<number, number, "volatile-defined">;
+    outputSinkTailBytes: z<number, number, "volatile-defined">;
+    outputSinkHeadBytes: z<number, number, "volatile-defined">;
+    minimizerEnabled: z<boolean, boolean, "volatile-defined">;
+    interceptorEnabled: z<boolean, boolean, "volatile-defined">;
+    nonInteractiveEnv: z<boolean, boolean, "volatile-defined">;
+    snapshotEnabled: z<boolean, boolean, "volatile-defined">;
+    rmSafe: z<boolean, boolean, "volatile-defined">;
+    useShellCommandWrapper: z<boolean, boolean, "volatile-defined">;
+    webCards: z<boolean, boolean, "volatile-defined">;
+    maxBackgroundJobs: z<number, number, "volatile-defined">;
+    outputTruncateStrategy: z<"lines" | "bytes", "lines" | "bytes", "volatile-defined">;
+    outputTruncateTriggerBytes: z<number, number, "volatile-defined">;
+    outputTruncateTriggerLines: z<number, number, "volatile-defined">;
+    outputTruncateByteMode: z<"middle" | "head" | "tail", "middle" | "head" | "tail", "volatile-defined">;
+    outputTruncateByteHeadBytes: z<number, number, "volatile-defined">;
+    outputTruncateByteTailBytes: z<number, number, "volatile-defined">;
+    outputTruncateLineMode: z<"middle" | "head" | "tail", "middle" | "head" | "tail", "volatile-defined">;
+    outputTruncateLineHeadLines: z<number, number, "volatile-defined">;
+    outputTruncateLineTailLines: z<number, number, "volatile-defined">;
+    editBlockAutoGenerated: z<boolean, boolean, "volatile-defined">;
+    readSummarizeEnabled: z<boolean, boolean, "volatile-defined">;
+    readSummarizeProse: z<boolean, boolean, "volatile-defined">;
+    readSummarizeMinBodyLines: z<number, number, "volatile-defined">;
+    readSummarizeMinCommentLines: z<number, number, "volatile-defined">;
+    readSummarizeMinTotalLines: z<number, number, "volatile-defined">;
+    readSummarizeUnfoldUntil: z<number, number, "volatile-defined">;
+    readSummarizeUnfoldLimit: z<number, number, "volatile-defined">;
+    editMode: z<"replace" | "patch" | "hashline" | "apply_patch", "replace" | "patch" | "hashline" | "apply_patch", "volatile-defined">;
+    editFuzzyMatch: z<boolean, boolean, "volatile-defined">;
+    editFuzzyThreshold: z<number, number, "volatile-defined">;
+    editEnforceSeenLines: z<boolean, boolean, "volatile-defined">;
+    readDefaultLimit: z<number, number, "volatile-defined">;
+    readLineNumbers: z<boolean, boolean, "volatile-defined">;
+    readRenderMarkdown: z<boolean, boolean, "volatile-defined">;
+    readConcurrentSafe: z<boolean, boolean, "volatile-defined">;
+    grepContextBefore: z<number, number, "volatile-defined">;
+    grepContextAfter: z<number, number, "volatile-defined">;
+    grepCaseDefault: z<boolean, boolean, "volatile-defined">;
+    grepGitignoreDefault: z<boolean, boolean, "volatile-defined">;
+    globGitignoreDefault: z<boolean, boolean, "volatile-defined">;
+    globHiddenDefault: z<boolean, boolean, "volatile-defined">;
+    astGrepEnabled: z<boolean, boolean, "volatile-defined">;
+    astEditEnabled: z<boolean, boolean, "volatile-defined">;
+    fetchEnabled: z<boolean, boolean, "volatile-defined">;
+    fetchMaxTimeoutSeconds: z<number, number, "volatile-defined">;
+    fetchReader: z<"trafilatura" | "lynx" | "auto" | "native" | "parallel" | "jina" | "browser", "trafilatura" | "lynx" | "auto" | "native" | "parallel" | "jina" | "browser", "volatile-defined">;
+    browserReaderEnabled: z<boolean, boolean, "volatile-defined">;
+    imagesAutoResize: z<boolean, boolean, "volatile-defined">;
+    imagesBlockImages: z<boolean, boolean, "volatile-defined">;
+    imagesExcludeWebp: z<boolean, boolean, "volatile-defined">;
+    imagesInputMaxBytes: z<number, number, "volatile-defined">;
+    imagesResizeMaxSide: z<number, number, "volatile-defined">;
+    imagesResizeMaxBytes: z<number, number, "volatile-defined">;
+    imagesResizeMinSide: z<number, number, "volatile-defined">;
+    imagesResizeJpegQuality: z<number, number, "volatile-defined">;
+}>>, Schemastery.ObjectT<NoInfer<{
+    enableRunInBackground: z<boolean, boolean, "volatile-defined">;
+    autoBackgroundMs: z<number, number, "volatile-defined">;
+    defaultTimeoutMs: z<number, number, "volatile-defined">;
+    maxTimeoutMs: z<number, number, "volatile-defined">;
+    outputMaxBytes: z<number, number, "volatile-defined">;
+    outputSinkTailBytes: z<number, number, "volatile-defined">;
+    outputSinkHeadBytes: z<number, number, "volatile-defined">;
+    minimizerEnabled: z<boolean, boolean, "volatile-defined">;
+    interceptorEnabled: z<boolean, boolean, "volatile-defined">;
+    nonInteractiveEnv: z<boolean, boolean, "volatile-defined">;
+    snapshotEnabled: z<boolean, boolean, "volatile-defined">;
+    rmSafe: z<boolean, boolean, "volatile-defined">;
+    useShellCommandWrapper: z<boolean, boolean, "volatile-defined">;
+    webCards: z<boolean, boolean, "volatile-defined">;
+    maxBackgroundJobs: z<number, number, "volatile-defined">;
+    outputTruncateStrategy: z<"lines" | "bytes", "lines" | "bytes", "volatile-defined">;
+    outputTruncateTriggerBytes: z<number, number, "volatile-defined">;
+    outputTruncateTriggerLines: z<number, number, "volatile-defined">;
+    outputTruncateByteMode: z<"middle" | "head" | "tail", "middle" | "head" | "tail", "volatile-defined">;
+    outputTruncateByteHeadBytes: z<number, number, "volatile-defined">;
+    outputTruncateByteTailBytes: z<number, number, "volatile-defined">;
+    outputTruncateLineMode: z<"middle" | "head" | "tail", "middle" | "head" | "tail", "volatile-defined">;
+    outputTruncateLineHeadLines: z<number, number, "volatile-defined">;
+    outputTruncateLineTailLines: z<number, number, "volatile-defined">;
+    editBlockAutoGenerated: z<boolean, boolean, "volatile-defined">;
+    readSummarizeEnabled: z<boolean, boolean, "volatile-defined">;
+    readSummarizeProse: z<boolean, boolean, "volatile-defined">;
+    readSummarizeMinBodyLines: z<number, number, "volatile-defined">;
+    readSummarizeMinCommentLines: z<number, number, "volatile-defined">;
+    readSummarizeMinTotalLines: z<number, number, "volatile-defined">;
+    readSummarizeUnfoldUntil: z<number, number, "volatile-defined">;
+    readSummarizeUnfoldLimit: z<number, number, "volatile-defined">;
+    editMode: z<"replace" | "patch" | "hashline" | "apply_patch", "replace" | "patch" | "hashline" | "apply_patch", "volatile-defined">;
+    editFuzzyMatch: z<boolean, boolean, "volatile-defined">;
+    editFuzzyThreshold: z<number, number, "volatile-defined">;
+    editEnforceSeenLines: z<boolean, boolean, "volatile-defined">;
+    readDefaultLimit: z<number, number, "volatile-defined">;
+    readLineNumbers: z<boolean, boolean, "volatile-defined">;
+    readRenderMarkdown: z<boolean, boolean, "volatile-defined">;
+    readConcurrentSafe: z<boolean, boolean, "volatile-defined">;
+    grepContextBefore: z<number, number, "volatile-defined">;
+    grepContextAfter: z<number, number, "volatile-defined">;
+    grepCaseDefault: z<boolean, boolean, "volatile-defined">;
+    grepGitignoreDefault: z<boolean, boolean, "volatile-defined">;
+    globGitignoreDefault: z<boolean, boolean, "volatile-defined">;
+    globHiddenDefault: z<boolean, boolean, "volatile-defined">;
+    astGrepEnabled: z<boolean, boolean, "volatile-defined">;
+    astEditEnabled: z<boolean, boolean, "volatile-defined">;
+    fetchEnabled: z<boolean, boolean, "volatile-defined">;
+    fetchMaxTimeoutSeconds: z<number, number, "volatile-defined">;
+    fetchReader: z<"trafilatura" | "lynx" | "auto" | "native" | "parallel" | "jina" | "browser", "trafilatura" | "lynx" | "auto" | "native" | "parallel" | "jina" | "browser", "volatile-defined">;
+    browserReaderEnabled: z<boolean, boolean, "volatile-defined">;
+    imagesAutoResize: z<boolean, boolean, "volatile-defined">;
+    imagesBlockImages: z<boolean, boolean, "volatile-defined">;
+    imagesExcludeWebp: z<boolean, boolean, "volatile-defined">;
+    imagesInputMaxBytes: z<number, number, "volatile-defined">;
+    imagesResizeMaxSide: z<number, number, "volatile-defined">;
+    imagesResizeMaxBytes: z<number, number, "volatile-defined">;
+    imagesResizeMinSide: z<number, number, "volatile-defined">;
+    imagesResizeJpegQuality: z<number, number, "volatile-defined">;
+}>>, "plain">;
+/**
+ * Live entry config: what the Loader hands `apply` for this entry, and what
+ * {@link installBashPlusSettings} re-reads after a settings write commits. One
+ * stable reference per schema field — read it through `.get()`, never as a
+ * plain value.
  */
-export declare const Config: z<Config>;
+export type LiveConfig = ReturnType<typeof Config>;
 /**
  * Resolve the flat settings (composition entry or the settings document) to
  * the nested runtime config the ported OMP runtime consumes. A direct mount
  * (`ctx.plugin`) skips the Loader's schema parse, so the `?? default` pass
  * mirrors the schema; the settings namespace resolution rides the same path.
- * @param config - flat settings, possibly partial and not schema-parsed.
+ * Accepts both shapes a caller can hold: the Loader's live entry config (one
+ * reference per field) and a plain settings document.
+ * @param input - the entry's live config, or a plain (possibly partial) document.
  * @returns the fully-defaulted nested runtime config.
  */
-export declare function resolveConfig(config: Config): RuntimeConfig;
+export declare function resolveConfig(input: Config | LiveConfig): RuntimeConfig;
 /**
- * Install the optional-settings consumer wiring for this plugin: while a
- * settings provider is mounted, resolve through the `tool-plus` namespace
- * (schema defaults → composition entry `base` → user document) and forward the
- * scope to `onSource`; when none is mounted, keep the composition entry, so
- * the tool keeps working exactly as composed. Mirrors the official bash-local
- * pattern so a committed change applies without a reload.
+ * Install the optional-settings consumer wiring for this plugin, in the dsh
+ * 0.1.7 shape.
+ *
+ * 0.1.7 deleted the namespace-registration API (`SettingsForms` no longer has
+ * `installSection`): a settings namespace is not something a plugin installs
+ * any more — it IS the plugin's own profile entry, and the service serves
+ * exactly the Config fields whose schema declares them live
+ * ({@link Config} declares every field `.volatile()`). The plugin therefore
+ * keeps one authoritative source, its own entry config:
+ *
+ *  - the Loader merges the composition layers and the profile override before
+ *    `apply` runs, so the entry already carries the effective settings;
+ *  - a settings write is committed INTO that entry's live references without a
+ *    remount, and the Loader then announces the changed paths on this fiber
+ *    (`loader/volatile-update`) — which is the signal for refreshing
+ *    registration facts (the `editMode`-sensitive descriptions and the AST
+ *    switches), exactly as the settings docs prescribe.
+ *
+ * The plugin ships its own settings pages in the browser half, so it owns its
+ * page policy: `configure({ auto: false })` tells the settings service not to
+ * auto-generate a schema page for this entry. That call rides an optional
+ * `ctx.inject(['settings'], ...)` child, so the plugin runs unchanged in a
+ * deployment that composes no settings service at all.
+ *
+ * Mirrors the official bash-local pattern (`packages/shell/bash-local`): the
+ * business plugin reads its own Config references and registers only its page
+ * policy; nothing re-registers the namespace.
  * @param ctx - plugin context owning the wiring.
- * @param entry - composition entry config declared by the caller.
+ * @param entry - the entry's config as the Loader resolved it (live references
+ * over the composition layers and the profile override), or a plain document.
  * @param onSource - receives a thunk of the currently authoritative runtime config.
  */
-export declare function installBashPlusSettings(ctx: Context, entry: Config, onSource: (current: () => RuntimeConfig) => void): void;
+export declare function installBashPlusSettings(ctx: Context, entry: Config | LiveConfig, onSource: (current: () => RuntimeConfig) => void): void;

package/lib/types/host/browser-probe-rpc.d.ts

@@ -6,7 +6,8 @@
  *
  * **Why this registers its own route instead of calling `connection.rpc.handle`.**
  * The documented helper is unusable from a plugin in a real web deployment on
- * dsh 0.1.5-rc.1: `HostConnectionService.rpc` builds its handle against
+ * dsh 0.1.5-rc.1 — and still on 0.1.7-rc.1, re-checked for this migration:
+ * `HostConnectionService.rpc` builds its handle against
  * `owner = this.ctx` (`rpc-host.ts: "Generic channel registry scoped to the
  * Context reading this service"`), and `register()` then evaluates
  * `owner.webServer.register(route)`. The client-connection row declares

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

@@ -0,0 +1,103 @@
+/**
+ * Host half of the preset surface: read the deployment's declared presets and
+ * apply the panel's three actions through the harness's own config editor.
+ *
+ * WHY WE DO NOT WRITE FILES OURSELVES: dsh 0.1.7 removed the directory preset
+ * mechanism and the `agent_preset` tool with it. The only supported programmatic
+ * write path is `ctx.configEditor.edit()`, and it is a better one than we had —
+ * it takes the profile lock, serializes with HMR, validates the next config
+ * through the Loader's own waterfall, writes atomically, rolls back on a failed
+ * reconcile, and refuses when a home patch or `--patch` overlay would defeat the
+ * edit. It also gives us "revert to the bundled declaration" for free: handing
+ * back the inherited config makes it delete the override's `config` key.
+ *
+ * The service is resolved per call, so a deployment that mounts the editor
+ * after this plugin still works instead of caching an early `undefined`.
+ *
+ * Everything here is a thin adapter; the decisions live in `src/presets/**`
+ * (pure, fs-free, unit-testable) and this module only resolves services and
+ * shapes results.
+ * @module @xiaoso/dsh-tool-plus/host/preset-host
+ */
+import { type PresetActionResultValue, type PresetCompareValue, type PresetStatusListValue } from '../tools/shared/browser-rpc-channel.ts';
+import { type PresetActionKind } from '../presets/plan.ts';
+/** The context slice this module needs: Cordis service lookup only. */
+export interface PresetHostCtx {
+    get(name: string): unknown;
+}
+/** Structural view of one addressable Loader entry. */
+interface EntryLike {
+    options: {
+        id: string;
+        name?: string;
+        config?: unknown;
+    };
+}
+/** One `configEditor.configuration()` row. */
+interface ConfigurationRowLike {
+    entry: EntryLike;
+    /** The bundled layer's config (our shipped declaration). */
+    inherited: Record<string, unknown>;
+    /** The profile layer's config; `{}` when the user never overrode the row. */
+    override: Record<string, unknown>;
+}
+/**
+ * The slice of `@deepseek-ai/dsh-config-editor` this plugin uses. Declared
+ * structurally so the plugin keeps zero build-time coupling to a package it
+ * never bundles.
+ */
+export interface ConfigEditorLike {
+    /** Absolute path of the profile patch this editor writes. */
+    readonly documentPath: string;
+    entries(): readonly EntryLike[];
+    configuration(): readonly ConfigurationRowLike[];
+    edit(entry: EntryLike, change: (current: Record<string, unknown>, inherited: Record<string, unknown>) => Record<string, unknown>): Promise<void>;
+}
+/** One roster entry as the registry reports it. */
+interface RosterRowLike {
+    readonly id?: unknown;
+    readonly name?: unknown;
+    readonly description?: unknown;
+    readonly broken?: unknown;
+    readonly isDefault?: unknown;
+}
+/**
+ * The slice of the preset registry this plugin uses.
+ *
+ * `remoteExportList()` is preferred: it is the roster the official client reads,
+ * and unlike `list()` it also carries `isDefault`. `list()` remains the fallback
+ * for a deployment whose registry predates the exported roster.
+ */
+export interface AgentPresetsLike {
+    list?(): Promise<readonly RosterRowLike[]>;
+    remoteExportList?(): Promise<{
+        readonly presets?: readonly RosterRowLike[];
+    } | undefined>;
+}
+/**
+ * Answer `presets/status`.
+ * @param ctx - context used to resolve the config editor and the registry.
+ * @returns the panel's full status payload.
+ */
+export declare function listPresetStatuses(ctx: PresetHostCtx): Promise<PresetStatusListValue>;
+/**
+ * Answer `presets/apply` by planning the action and, when it is worth writing,
+ * delegating the write to the harness's own config editor.
+ * @param ctx - context used to resolve the services.
+ * @param presetId - the preset to act on.
+ * @param action - `upgrade`, `align` or `revert`.
+ * @param templateId - the align target (required for `align`).
+ * @returns the action result, never throwing.
+ */
+export declare function applyPresetAction(ctx: PresetHostCtx, presetId: string, action: PresetActionKind, templateId?: string): Promise<PresetActionResultValue>;
+/**
+ * Answer `presets/compare`: one preset's effective plugins against one of our
+ * declared templates. Never throws; an unresolvable side reports `unreadable`
+ * (that is a state the panel renders as a red dot, not a failed call).
+ * @param ctx - context used to resolve the services.
+ * @param presetId - the preset being inspected.
+ * @param templateId - the template to compare it against.
+ * @returns the comparison.
+ */
+export declare function comparePresetAgainstTemplate(ctx: PresetHostCtx, presetId: string, templateId: string): Promise<PresetCompareValue>;
+export {};

package/lib/types/host/preset-rpc.d.ts

@@ -1,102 +1,67 @@
 /**
  * Host half of the preset endpoints: answers `presets/status` (roster +
- * conflicts + template diff) and `presets/apply` (disable conflicting rows /
- * reset from our template) for the settings panel's 「全局」tab.
+ * conflicts + template diff), `presets/apply` (upgrade / align / revert) and
+ * `presets/compare` for the settings panel's 「全局」tab.
  *
- * These endpoints live on the **same** `/tool-plus` channel registration as
- * `browser/detect` and `rmSafe/status` (see `browser-probe-rpc.ts`): a
- * Connection channel has exactly one handler, so a second
- * `connection.rpc.handle('/tool-plus', …)` never takes effect. That is why this
- * module exports an endpoint handler instead of installing a channel of its
- * own.
+ * These endpoints live on the **same** `/tool-plus` route as `browser/detect`
+ * and `rmSafe/status` (see `browser-probe-rpc.ts`). That route is a plain
+ * `webServer.register({ kind: 'prefix', path: '/tool-plus' })` registration, NOT
+ * `connection.rpc.handle`: in this deployment the Connection handler resolves
+ * its owner through `this.ctx` without the `webServer` injection, so a
+ * `rpc.handle` registration never takes effect. The Connection service is still
+ * used for its loopback trust fence (`connection.requestRejection`).
  *
- * The preset analysis itself lives in `src/presets/**` and is **injected**, so
- * this module stays a thin wire adapter and its helpers are testable without a
- * Connection service or a filesystem.
- *
- * Trust policy is `loopback` (the channel's own policy): these endpoints read
- * and write files under the user's DSH home, so they must never be reachable
- * from a non-loopback host.
+ * This module is a wire adapter only: payload validation plus dispatch into an
+ * injected {@link PresetRpcDeps}. The service lookup, the configuration reads
+ * and the writes live in `../host/preset-host.ts`; the decision logic lives in
+ * `src/presets/**`. Trust policy is `loopback` — these endpoints read the user's
+ * profile configuration and the write path edits it, so they must never be
+ * reachable from a non-loopback host.
  * @module @xiaoso/dsh-tool-plus/host/preset-rpc
  */
 import type { ConnectionRpcHandler } from '@deepseek-ai/dsh-client-connection';
-import { type PresetActionPayload, type PresetComparePayloadValue } from '../tools/shared/browser-rpc-channel.ts';
-import type { PresetInstallResult } from '../presets/install.ts';
-import type { PresetComparison, PresetTemplate } from '../presets/compare.ts';
-import type { PresetRosterEntry, PresetStatus } from '../presets/status.ts';
-/** Payload shape of a `presets/compare` call (shared contract). */
-type PresetComparePayload = PresetComparePayloadValue;
+import { type PresetActionPayload, type PresetActionResultValue, type PresetActionValue, type PresetComparePayloadValue, type PresetCompareValue, type PresetStatusListValue } from '../tools/shared/browser-rpc-channel.ts';
 /** Result shape of one Connection RPC call (official pattern in the gateway). */
 type ConnectionRpcResult = Awaited<ReturnType<ConnectionRpcHandler>>;
+/** The context slice this handler needs: pass-through to the injected deps. */
+export interface PresetEndpointCtx {
+    /** Cordis service lookup, forwarded to the host implementation. */
+    get(name: string): unknown;
+}
 /**
- * Structural view of one official `ctx.agentPresets.list()` entry. Declared
- * here instead of importing `@deepseek-ai/dsh-agent-presets` so the plugin
- * keeps zero build-time coupling to a package it never bundles — the service
- * is reached through the context, and every field is validated on the way in.
+ * Everything the endpoints need from the host plane. Injected so this module
+ * stays a thin wire adapter whose parsing helpers are testable without a
+ * Connection service, a Loader, or a profile.
  */
-interface RosterPresetLike {
-    readonly id?: unknown;
-    readonly trust?: unknown;
-    readonly path?: unknown;
-    readonly name?: unknown;
-    readonly description?: unknown;
-    readonly broken?: unknown;
-}
-/** The only slice of the official agent-presets service this plugin uses. */
-export interface AgentPresetsServiceLike {
-    list(): Promise<readonly RosterPresetLike[]>;
-}
-/** Install-time dependencies: the preset analysis owned by the host half. */
 export interface PresetRpcDeps {
-    /** Build one status row per roster entry (reads the user root, never writes). */
-    listStatuses: (roster: readonly PresetRosterEntry[]) => PresetStatus[];
-    /** Apply one action to one preset (the only endpoint that writes). */
-    applyAction: (id: string, action: PresetActionPayload['action'], templateId?: string) => PresetInstallResult;
-    /** Templates this package ships (the panel's "compare with" options). */
-    listTemplates: () => PresetTemplate[];
-    /**
-     * Read-only comparison between one roster preset and one of our templates.
-     * Returns `status: 'unreadable'` instead of throwing when a file cannot be
-     * read — that is a state the panel renders (red dot), not a failed call.
-     */
-    comparePreset: (preset: PresetRosterEntry, templateId: string) => PresetComparison;
+    /** Read every declared preset with its conflicts and template diff. */
+    listPresets: (ctx: PresetEndpointCtx) => Promise<PresetStatusListValue>;
+    /** Apply one action to one preset. The only path that writes. */
+    applyAction: (ctx: PresetEndpointCtx, id: string, action: PresetActionValue, templateId?: string) => Promise<PresetActionResultValue>;
+    /** Read-only comparison between one preset and one of our declarations. */
+    comparePreset: (ctx: PresetEndpointCtx, presetId: string, templateId: string) => Promise<PresetCompareValue>;
 }
 /**
  * Validate a `presets/compare` payload: two non-empty ids, nothing else.
  * @param payload - the raw RPC payload.
  * @returns the narrowed payload, or undefined when invalid.
  */
-export declare function parsePresetComparePayload(payload: unknown): PresetComparePayload | undefined;
+export declare function parsePresetComparePayload(payload: unknown): PresetComparePayloadValue | undefined;
 /**
  * Validate a `presets/apply` payload. Anything that is not exactly
- * `{ id: non-empty string, action: 'upgrade' | 'reset' }` is rejected, so the
- * write endpoint never receives a half-formed request.
+ * `{ id: non-empty string, action: 'upgrade' | 'align' | 'revert', templateId?: non-empty string }`
+ * is rejected, so the write endpoint never receives a half-formed request.
  * @param payload - the raw RPC payload.
  * @returns the narrowed payload, or undefined when invalid.
  */
 export declare function parsePresetActionPayload(payload: unknown): PresetActionPayload | undefined;
 /**
- * Narrow one roster entry coming from the official service. Unknown trust is
- * treated as `user` (the conservative side: it is a writable preset only when
- * the caller proves otherwise — the caller matches ids against our templates).
- * @param preset - raw entry from `ctx.agentPresets.list()`.
- * @returns the entry in our own shape.
- */
-export declare function toRosterEntry(preset: RosterPresetLike): PresetRosterEntry;
-/** The context slice this handler needs: service lookup only. */
-export interface PresetEndpointCtx {
-    /** Cordis service lookup; `agentPresets` is mounted by the harness. */
-    get(name: string): unknown;
-}
-/**
- * Answer one preset endpoint on the shared `/tool-plus` channel.
+ * Answer one preset endpoint on the shared `/tool-plus` route.
  *
  * Returns `undefined` for an endpoint this module does not own, so the caller
- * (the single channel handler) can keep serving its own families. The service
- * is resolved per call: a deployment that mounts `agent-presets` after this
- * plugin still gets a working endpoint instead of a stale `undefined`.
- * @param ctx - context used to resolve the `agentPresets` service.
- * @param deps - injected preset analysis.
+ * (the single route handler) can keep serving its own families.
+ * @param ctx - context forwarded to the injected host implementation.
+ * @param deps - injected host implementation.
  * @param endpoint - the requested endpoint name.
  * @param payload - the raw RPC payload.
  * @returns the RPC result, or undefined when the endpoint is not ours.

package/lib/types/presets/compare.d.ts

@@ -1,28 +1,22 @@
 /**
- * 预设比较：把"某份预设"和"我们随包的某个模板"放在一起看。
+ * 预设比较：把"某份 preset 生效的 plugins"和"某个随包声明的 plugins"放在一起看。
  *
- * 面板现在是两块信息、两个状态点：
- *   ①**工具行**：这份预设里我们那 4 个冲突行都禁用了吗（=`conflicts`）；
- *   ②**完整比较**：内容上和我们选的模板差多少（=`items`，弹窗里逐条展示）。
- * 这是只读操作，绝不写盘。比较一律**不跳过**冲突行的 `disabled` —— 第二个点
- * 要的是"完整的比较"，工具开关的不同也必须出现在差异清单里，否则会出现
- * "说内容一致、却说工具行没配好"这种自相矛盾的读数。
+ * 面板是两块信息、两个状态点：
+ *   ①**工具行**：这份 preset 里那 4 个冲突行都禁用了吗（=`conflicts`）；
+ *   ②**完整比较**：内容上和选中的模板差多少（=`items`，弹窗里逐条展示）。
+ * 只读，绝不写盘。比较一律**不跳过**冲突行的 `disabled` —— 第二个点要的是
+ * "完整的比较"，工具开关的不同也必须出现在差异清单里，否则会出现"说内容一致、
+ * 却说工具行没配好"这种自相矛盾的读数。
  * @module @xiaoso/dsh-tool-plus/presets/compare
  */
-import { type PresetDeps } from './paths.ts';
 import { type PresetDeltaItem } from './delta.ts';
-/** 面板"对比模板"下拉的一项：模板 id（可读性靠 name）。 */
-export interface PresetTemplate {
-    id: string;
-    name?: string;
-}
 /** 一次比较的结果（面板两个状态点 + 弹窗的全部数据）。 */
 export interface PresetComparison {
-    /** 任一侧读不到或形状不可识别 → `unreadable`，此时 `items` 为空。 */
+    /** 任一侧不是合法行列表 → `unreadable`，此时 `items` 为空。 */
     status: 'ok' | 'unreadable';
-    /** 这份预设里还没禁用的冲突行（空 = 我们的工具已生效）。 */
+    /** 这份 preset 里还没禁用的冲突行（空 = 本插件的工具已生效）。 */
     conflicts: string[];
-    /** 内容层面逐项一致（注释与排版差异不算，逐字节相同也不额外判断）。 */
+    /** 内容层面逐项一致（顺序不同不算差异，逐值比较）。 */
     identical: boolean;
     yoursCount: number;
     behindCount: number;
@@ -30,26 +24,9 @@ export interface PresetComparison {
     items: PresetDeltaItem[];
 }
 /**
- * 列出包里带模板的预设 id（面板"对比模板"下拉的选项）。只读目录，不抛。
- * @param deps - 路径注入（测试用）。
- * @returns 按 id 排序的模板清单（读不到目录时为空数组）。
- */
-export declare function listTemplates(deps?: PresetDeps): PresetTemplate[];
-/** 读一份模板的组合文件；不存在返回 undefined。 */
-export declare function readTemplateComposition(templateId: string, deps?: PresetDeps): string | undefined;
-/**
- * 比较两份组合文件文本（纯函数，只读）。
- * @param presetText - 所选预设的原文。
- * @param templateText - 所选模板的原文。
+ * 比较两份 `config.plugins`（纯函数，只读）。
+ * @param presetPlugins - 所选 preset 生效的 plugins。
+ * @param templatePlugins - 所选模板的 plugins（随包声明）。
  * @returns 两个状态点与弹窗需要的全部数据。
  */
-export declare function compareCompositions(presetText: string, templateText: string): PresetComparison;
-/**
- * 读盘版比较：预设一侧用 roster 给的组合文件路径，模板一侧按 id 去包里找。
- * 任一侧读不到都返回 `unreadable` —— 那是面板要渲染的红点，不是调用失败。
- * @param presetPath - 所选预设的组合文件绝对路径（来自 roster）。
- * @param templateId - 所选模板的 id。
- * @param deps - 路径注入（测试用）。
- * @returns 比较结果。
- */
-export declare function comparePresetFile(presetPath: string, templateId: string, deps?: PresetDeps): PresetComparison;
+export declare function comparePlugins(presetPlugins: unknown, templatePlugins: unknown): PresetComparison;