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

package/lib/index.mjs

@@ -3,24 +3,24 @@ __installBunShim();
 import { n as fs_promises_shim_exports, t as exists } from "./fs-promises-shim-Bx0fpxuk.mjs";
 import { i as setRuntimeLogger, n as systemChromiumCandidatesForTest, r as runtimeLogger } from "./launch-Uq7920ng.mjs";
 import { $ as isEnoent, A as formatCount, C as warn, D as installBunShim, F as $flag, N as $env, O as formatAge, P as $envpos, Q as hasFsCode, U as getAutoQaDbPath, V as VERSION, X as getRemoteDir, Y as getPuppeteerDir, at as findOnPath, b as debug, c as combineSignals, d as $which, et as isEnotdir, it as untilAborted, k as formatBytes$1, l as exec, m as readImageMetadata, nt as peekFile, q as getInstallId, tt as isProbablyBinary, u as render, x as error } from "./src-DUUqyo9y.mjs";
-import { C as truncateToWidth$1, S as replaceTabs, _ as formatCodeFrameLine, a as fetchBinary, b as LRUCache, c as getParallelExtractContent, d as convertFileWithMarkit, f as Settings, g as capParseErrors, h as OMP_DEFAULTS, i as convertWithMarkit, l as ensureTool, m as settings, o as extractWithParallel, p as isSettingsInitialized, s as findParallelApiKey, u as CONVERTIBLE_EXTENSIONS, v as formatParseErrors, x as padding, y as shortenPath } from "./utils-eiUz9n8I.mjs";
+import { C as truncateToWidth$1, S as replaceTabs, _ as formatCodeFrameLine, a as fetchBinary, b as LRUCache, c as getParallelExtractContent, d as convertFileWithMarkit, f as Settings, g as capParseErrors, h as OMP_DEFAULTS, i as convertWithMarkit, l as ensureTool, m as settings, o as extractWithParallel, p as isSettingsInitialized, s as findParallelApiKey, u as CONVERTIBLE_EXTENSIONS, v as formatParseErrors, x as padding, y as shortenPath } from "./utils-D80w8vry.mjs";
 import { t as sanitizeText } from "./sanitize-text-BCf5KmCf.mjs";
 import { n as isRecord$5 } from "./type-guards-CttAANEx.mjs";
 import { n as ToolError, r as throwIfAborted, t as ToolAbortError } from "./tool-errors-DoyxivAR.mjs";
 import { a as openArchive, c as sniffArchiveFormat, d as writeArchive, i as listArchiveRoot, o as parseArchivePathCandidates, r as formatArchiveEntryLines, s as readArchiveEntries, t as archiveFormatFromPath } from "./zip-CNtIFfyV.mjs";
 import { a as finalizeOutput, d as looksLikeHtml, n as MAX_OUTPUT_CHARS, t as MAX_BYTES, u as loadPage } from "./types-DT9vgZ3S.mjs";
 import * as fs from "node:fs";
-import { existsSync } from "node:fs";
+import { copyFileSync, existsSync, readFileSync, readdirSync } from "node:fs";
 import { TOOL_ABORTED, defineTool } from "@deepseek-ai/dsh-tools";
 import { HarnessError } from "@deepseek-ai/dsh-llm";
 import { DSH_ENV_PREFIX, parseExitStatus } from "@deepseek-ai/dsh-shell";
 import * as natives from "@oh-my-pi/pi-natives";
 import { EditSession, EditStore, FileType, GrepOutputMode, Shell, astEdit, astGrep, diffLines, editDescription, enclosingBlockBoundaries, glob, grep, hashlineFormatHeader, hashlineFormatNumberedLines, hashlineStripPrefixes, htmlToMarkdown, invalidateFsScanCache, listWorkspace, notebookToEditableText, structuredPatchHunks, summarizeCode } from "@oh-my-pi/pi-natives";
 import * as path$1 from "node:path";
-import path from "node:path";
+import path, { join } from "node:path";
 import { spawn } from "node:child_process";
 import * as os from "node:os";
-import { tmpdir } from "node:os";
+import { homedir, tmpdir } from "node:os";
 import * as url from "node:url";
 import { fileURLToPath } from "node:url";
 import { scheduler } from "node:timers/promises";
@@ -1966,8 +1966,10 @@ var OutputSink = class extends OutputSink$1 {
 };
 /**
 * Composition wrapper over the verbatim {@link TailBuffer}, adding the DSH
-* `reset()` increment. The verbatim class keeps its state in private fields,
-* so reset is modeled as a fresh window with the same budget.
+* `reset()` increment: the consuming-read cursor reset the bash background
+* producer used while `JobHooks.readOutput` existed. 0.1.7 moves the model's
+* cursor onto the job registry's output ring, so the increment is no longer
+* part of that path; the preview buffer still offers it.
 */
 var TailBuffer = class {
 	#inner;
@@ -2651,25 +2653,25 @@ function sweepStaleSpillFiles(now = Date.now()) {
 * Background-job adaptation for the `ctx.jobs` seam: one managed job runs its
 * command on its OWN `:async:` Shell (never the session's persistent shell),
 * so background work never blocks the foreground session. The registry owns
-* identity, lifecycle state, and completion notices (`dsh-tool-jobs` injects
-* them); this module owns the execution resources and their hooks.
+* identity, lifecycle state, the output ring, and completion notices
+* (`dsh-tool-jobs` injects them); this module owns the execution resources,
+* streams the run into that ring, and appends the plugin's completion message
+* once the run ends.
 * @module @xiaoso/dsh-tool-plus/background
 */
 /**
 * Start one managed background bash job. The producer owns a per-job
-* `AbortController` (cancellation kills only this job's shell), a bounded
-* preview tail, and a consuming delta cursor for `readOutput`.
+* `AbortController` (cancellation kills only this job's shell) and a bounded
+* preview tail; the registry owns the model's consuming cursor over the ring
+* this job writes to.
 * @param options - job identity and execution parameters.
 * @returns the registry hooks plus the tool-result completion promise.
 */
 function startBashJob(options) {
-	const { sessionId, command, cwd, timeoutMs, env, config } = options;
+	const { sessionId, command, cwd, timeoutMs, env, config, job } = options;
 	const shellKey = `${sessionId}:async:${randomBytes(4).toString("hex")}`;
 	const abortController = new AbortController();
 	const preview = new TailBuffer(config.outputMaxBytes);
-	const delta = new TailBuffer(config.outputMaxBytes);
-	let settled = false;
-	let settledText = "";
 	const completion = (async () => {
 		const startedAt = performance.now();
 		const spillPath = allocateSpillFile();
@@ -2699,11 +2701,9 @@ function startBashJob(options) {
 			onMinimizedSave: (originalText) => saveOriginalText(originalText),
 			onChunk: (chunk) => {
 				preview.append(chunk);
-				delta.append(chunk);
+				job?.append(chunk);
 			}
 		});
-		settled = true;
-		settledText = preview.text();
 		const wallTimeMs = performance.now() - startedAt;
 		const aborted = result.cancelled && abortController.signal.aborted;
 		const timedOut = result.timedOut ?? (result.cancelled && !aborted);
@@ -2712,6 +2712,9 @@ function startBashJob(options) {
 			const seconds = Math.max(1, Math.round((timeoutMs ?? 0) / 1e3));
 			if (!text.includes("[Command timed out after")) text = `[Command timed out after ${seconds} seconds]\n\n${text}`;
 		}
+		const previewText = preview.text();
+		const message = options.formatCompletion?.(previewText, result.spillPath) ?? previewText;
+		if (job !== void 0 && message !== previewText) job.append(message);
 		return {
 			kind: "foreground",
 			exitCode: result.exitCode ?? null,
@@ -2756,13 +2759,7 @@ function startBashJob(options) {
 			}, (error) => ({
 				status: "failed",
 				detail: error instanceof Error ? error.message : String(error)
-			})),
-			readOutput: () => {
-				if (settled) return settledText;
-				const text = delta.text();
-				delta.reset();
-				return text;
-			}
+			}))
 		},
 		completion
 	};
@@ -4887,8 +4884,24 @@ function toolPlusField(name) {
 TOOL_PLUS_FIELDS.map((field) => field.name);
 //#endregion
 //#region src/config/settings.ts
-/** Settings namespace of this plugin, served to the web Plugins page. */
-const BASH_PLUS_SETTINGS_NS = "tool-plus";
+/**
+* Protocol key `@deepseek-ai/cosmokit` stamps on a live config reference.
+* `Symbol.for` keeps the check valid across copies of the shared library — the
+* reason cosmokit's own `isVolatile` resolves the same key.
+*/
+const VOLATILE_WRITE = Symbol.for("cosmokit.volatile.write");
+/**
+* Whether a parsed value is one of the Loader's live config references.
+*
+* `@deepseek-ai/cordis` re-exports the `Volatile` TYPE only, and cosmokit —
+* which owns the runtime check — is not a dependency of this package, so the
+* protocol is read here instead of imported.
+* @param value - a parsed config value.
+* @returns whether the value is a live reference.
+*/
+function isLiveField(value) {
+	return typeof value === "object" && value !== null && VOLATILE_WRITE in value;
+}
 /** OMP-parity defaults for the completion-message truncation policy. */
 const DEFAULT_OUTPUT_TRUNCATE = {
 	strategy: "bytes",
@@ -4923,73 +4936,81 @@ function fieldDefault(name, fallback) {
 	return value === void 0 ? fallback : value;
 }
 /**
-* 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.
 */
 const Config = z.object({
-	enableRunInBackground: z.boolean().default(fieldDefault("enableRunInBackground", true)),
-	autoBackgroundMs: z.number().default(fieldDefault("autoBackgroundMs", DEFAULT_AUTO_BACKGROUND_MS)),
-	defaultTimeoutMs: z.number().default(fieldDefault("defaultTimeoutMs", DEFAULT_TIMEOUT_MS)),
-	maxTimeoutMs: z.number().default(fieldDefault("maxTimeoutMs", DEFAULT_MAX_TIMEOUT_MS)),
-	outputMaxBytes: z.number().default(fieldDefault("outputMaxBytes", 51200)),
-	outputSinkTailBytes: z.number().default(fieldDefault("outputSinkTailBytes", 51200)),
-	outputSinkHeadBytes: z.number().default(fieldDefault("outputSinkHeadBytes", 20480)),
-	minimizerEnabled: z.boolean().default(fieldDefault("minimizerEnabled", true)),
-	interceptorEnabled: z.boolean().default(fieldDefault("interceptorEnabled", true)),
-	nonInteractiveEnv: z.boolean().default(fieldDefault("nonInteractiveEnv", true)),
-	snapshotEnabled: z.boolean().default(fieldDefault("snapshotEnabled", true)),
-	rmSafe: z.boolean().default(fieldDefault("rmSafe", true)),
-	useShellCommandWrapper: z.boolean().default(fieldDefault("useShellCommandWrapper", false)),
-	webCards: z.boolean().default(fieldDefault("webCards", true)),
-	maxBackgroundJobs: z.number().default(fieldDefault("maxBackgroundJobs", 15)),
-	outputTruncateStrategy: z.union(["bytes", "lines"]).default(fieldDefault("outputTruncateStrategy", "bytes")),
-	outputTruncateTriggerBytes: z.number().default(fieldDefault("outputTruncateTriggerBytes", 10240)),
-	outputTruncateTriggerLines: z.number().default(fieldDefault("outputTruncateTriggerLines", 100)),
+	enableRunInBackground: z.boolean().default(fieldDefault("enableRunInBackground", true)).volatile(),
+	autoBackgroundMs: z.number().default(fieldDefault("autoBackgroundMs", DEFAULT_AUTO_BACKGROUND_MS)).volatile(),
+	defaultTimeoutMs: z.number().default(fieldDefault("defaultTimeoutMs", DEFAULT_TIMEOUT_MS)).volatile(),
+	maxTimeoutMs: z.number().default(fieldDefault("maxTimeoutMs", DEFAULT_MAX_TIMEOUT_MS)).volatile(),
+	outputMaxBytes: z.number().default(fieldDefault("outputMaxBytes", 51200)).volatile(),
+	outputSinkTailBytes: z.number().default(fieldDefault("outputSinkTailBytes", 51200)).volatile(),
+	outputSinkHeadBytes: z.number().default(fieldDefault("outputSinkHeadBytes", 20480)).volatile(),
+	minimizerEnabled: z.boolean().default(fieldDefault("minimizerEnabled", true)).volatile(),
+	interceptorEnabled: z.boolean().default(fieldDefault("interceptorEnabled", true)).volatile(),
+	nonInteractiveEnv: z.boolean().default(fieldDefault("nonInteractiveEnv", true)).volatile(),
+	snapshotEnabled: z.boolean().default(fieldDefault("snapshotEnabled", true)).volatile(),
+	rmSafe: z.boolean().default(fieldDefault("rmSafe", true)).volatile(),
+	useShellCommandWrapper: z.boolean().default(fieldDefault("useShellCommandWrapper", false)).volatile(),
+	webCards: z.boolean().default(fieldDefault("webCards", true)).volatile(),
+	maxBackgroundJobs: z.number().default(fieldDefault("maxBackgroundJobs", 15)).volatile(),
+	outputTruncateStrategy: z.union(["bytes", "lines"]).default(fieldDefault("outputTruncateStrategy", "bytes")).volatile(),
+	outputTruncateTriggerBytes: z.number().default(fieldDefault("outputTruncateTriggerBytes", 10240)).volatile(),
+	outputTruncateTriggerLines: z.number().default(fieldDefault("outputTruncateTriggerLines", 100)).volatile(),
 	outputTruncateByteMode: z.union([
 		"head",
 		"tail",
 		"middle"
-	]).default(fieldDefault("outputTruncateByteMode", "middle")),
-	outputTruncateByteHeadBytes: z.number().default(fieldDefault("outputTruncateByteHeadBytes", 4096)),
-	outputTruncateByteTailBytes: z.number().default(fieldDefault("outputTruncateByteTailBytes", 4096)),
+	]).default(fieldDefault("outputTruncateByteMode", "middle")).volatile(),
+	outputTruncateByteHeadBytes: z.number().default(fieldDefault("outputTruncateByteHeadBytes", 4096)).volatile(),
+	outputTruncateByteTailBytes: z.number().default(fieldDefault("outputTruncateByteTailBytes", 4096)).volatile(),
 	outputTruncateLineMode: z.union([
 		"head",
 		"tail",
 		"middle"
-	]).default(fieldDefault("outputTruncateLineMode", "middle")),
-	outputTruncateLineHeadLines: z.number().default(fieldDefault("outputTruncateLineHeadLines", 50)),
-	outputTruncateLineTailLines: z.number().default(fieldDefault("outputTruncateLineTailLines", 100)),
-	editBlockAutoGenerated: z.boolean().default(fieldDefault("editBlockAutoGenerated", true)),
-	readSummarizeEnabled: z.boolean().default(fieldDefault("readSummarizeEnabled", true)),
-	readSummarizeProse: z.boolean().default(fieldDefault("readSummarizeProse", false)),
-	readSummarizeMinBodyLines: z.number().default(fieldDefault("readSummarizeMinBodyLines", 4)),
-	readSummarizeMinCommentLines: z.number().default(fieldDefault("readSummarizeMinCommentLines", 6)),
-	readSummarizeMinTotalLines: z.number().default(fieldDefault("readSummarizeMinTotalLines", 100)),
-	readSummarizeUnfoldUntil: z.number().default(fieldDefault("readSummarizeUnfoldUntil", 50)),
-	readSummarizeUnfoldLimit: z.number().default(fieldDefault("readSummarizeUnfoldLimit", 100)),
+	]).default(fieldDefault("outputTruncateLineMode", "middle")).volatile(),
+	outputTruncateLineHeadLines: z.number().default(fieldDefault("outputTruncateLineHeadLines", 50)).volatile(),
+	outputTruncateLineTailLines: z.number().default(fieldDefault("outputTruncateLineTailLines", 100)).volatile(),
+	editBlockAutoGenerated: z.boolean().default(fieldDefault("editBlockAutoGenerated", true)).volatile(),
+	readSummarizeEnabled: z.boolean().default(fieldDefault("readSummarizeEnabled", true)).volatile(),
+	readSummarizeProse: z.boolean().default(fieldDefault("readSummarizeProse", false)).volatile(),
+	readSummarizeMinBodyLines: z.number().default(fieldDefault("readSummarizeMinBodyLines", 4)).volatile(),
+	readSummarizeMinCommentLines: z.number().default(fieldDefault("readSummarizeMinCommentLines", 6)).volatile(),
+	readSummarizeMinTotalLines: z.number().default(fieldDefault("readSummarizeMinTotalLines", 100)).volatile(),
+	readSummarizeUnfoldUntil: z.number().default(fieldDefault("readSummarizeUnfoldUntil", 50)).volatile(),
+	readSummarizeUnfoldLimit: z.number().default(fieldDefault("readSummarizeUnfoldLimit", 100)).volatile(),
 	editMode: z.union([
 		"replace",
 		"patch",
 		"hashline",
 		"apply_patch"
-	]).default(fieldDefault("editMode", "replace")),
-	editFuzzyMatch: z.boolean().default(fieldDefault("editFuzzyMatch", true)),
-	editFuzzyThreshold: z.number().default(fieldDefault("editFuzzyThreshold", .95)),
-	editEnforceSeenLines: z.boolean().default(fieldDefault("editEnforceSeenLines", false)),
-	readDefaultLimit: z.number().default(fieldDefault("readDefaultLimit", 300)),
-	readLineNumbers: z.boolean().default(fieldDefault("readLineNumbers", false)),
-	readRenderMarkdown: z.boolean().default(fieldDefault("readRenderMarkdown", false)),
-	readConcurrentSafe: z.boolean().default(fieldDefault("readConcurrentSafe", true)),
-	grepContextBefore: z.number().default(fieldDefault("grepContextBefore", 1)),
-	grepContextAfter: z.number().default(fieldDefault("grepContextAfter", 3)),
-	grepCaseDefault: z.boolean().default(fieldDefault("grepCaseDefault", true)),
-	grepGitignoreDefault: z.boolean().default(fieldDefault("grepGitignoreDefault", true)),
-	globGitignoreDefault: z.boolean().default(fieldDefault("globGitignoreDefault", true)),
-	globHiddenDefault: z.boolean().default(fieldDefault("globHiddenDefault", true)),
-	astGrepEnabled: z.boolean().default(fieldDefault("astGrepEnabled", false)),
-	astEditEnabled: z.boolean().default(fieldDefault("astEditEnabled", true)),
-	fetchEnabled: z.boolean().default(fieldDefault("fetchEnabled", true)),
-	fetchMaxTimeoutSeconds: z.number().default(fieldDefault("fetchMaxTimeoutSeconds", 0)),
+	]).default(fieldDefault("editMode", "replace")).volatile(),
+	editFuzzyMatch: z.boolean().default(fieldDefault("editFuzzyMatch", true)).volatile(),
+	editFuzzyThreshold: z.number().default(fieldDefault("editFuzzyThreshold", .95)).volatile(),
+	editEnforceSeenLines: z.boolean().default(fieldDefault("editEnforceSeenLines", false)).volatile(),
+	readDefaultLimit: z.number().default(fieldDefault("readDefaultLimit", 300)).volatile(),
+	readLineNumbers: z.boolean().default(fieldDefault("readLineNumbers", false)).volatile(),
+	readRenderMarkdown: z.boolean().default(fieldDefault("readRenderMarkdown", false)).volatile(),
+	readConcurrentSafe: z.boolean().default(fieldDefault("readConcurrentSafe", true)).volatile(),
+	grepContextBefore: z.number().default(fieldDefault("grepContextBefore", 1)).volatile(),
+	grepContextAfter: z.number().default(fieldDefault("grepContextAfter", 3)).volatile(),
+	grepCaseDefault: z.boolean().default(fieldDefault("grepCaseDefault", true)).volatile(),
+	grepGitignoreDefault: z.boolean().default(fieldDefault("grepGitignoreDefault", true)).volatile(),
+	globGitignoreDefault: z.boolean().default(fieldDefault("globGitignoreDefault", true)).volatile(),
+	globHiddenDefault: z.boolean().default(fieldDefault("globHiddenDefault", true)).volatile(),
+	astGrepEnabled: z.boolean().default(fieldDefault("astGrepEnabled", false)).volatile(),
+	astEditEnabled: z.boolean().default(fieldDefault("astEditEnabled", true)).volatile(),
+	fetchEnabled: z.boolean().default(fieldDefault("fetchEnabled", true)).volatile(),
+	fetchMaxTimeoutSeconds: z.number().default(fieldDefault("fetchMaxTimeoutSeconds", 0)).volatile(),
 	fetchReader: z.union([
 		"auto",
 		"native",
@@ -4998,26 +5019,39 @@ const Config = z.object({
 		"parallel",
 		"jina",
 		"browser"
-	]).default(fieldDefault("fetchReader", "auto")),
-	browserReaderEnabled: z.boolean().default(fieldDefault("browserReaderEnabled", true)),
-	imagesAutoResize: z.boolean().default(fieldDefault("imagesAutoResize", true)),
-	imagesBlockImages: z.boolean().default(fieldDefault("imagesBlockImages", false)),
-	imagesExcludeWebp: z.boolean().default(fieldDefault("imagesExcludeWebp", false)),
-	imagesInputMaxBytes: z.number().default(fieldDefault("imagesInputMaxBytes", 20971520)),
-	imagesResizeMaxSide: z.number().default(fieldDefault("imagesResizeMaxSide", 1568)),
-	imagesResizeMaxBytes: z.number().default(fieldDefault("imagesResizeMaxBytes", 512e3)),
-	imagesResizeMinSide: z.number().default(fieldDefault("imagesResizeMinSide", 200)),
-	imagesResizeJpegQuality: z.number().default(fieldDefault("imagesResizeJpegQuality", 80))
+	]).default(fieldDefault("fetchReader", "auto")).volatile(),
+	browserReaderEnabled: z.boolean().default(fieldDefault("browserReaderEnabled", true)).volatile(),
+	imagesAutoResize: z.boolean().default(fieldDefault("imagesAutoResize", true)).volatile(),
+	imagesBlockImages: z.boolean().default(fieldDefault("imagesBlockImages", false)).volatile(),
+	imagesExcludeWebp: z.boolean().default(fieldDefault("imagesExcludeWebp", false)).volatile(),
+	imagesInputMaxBytes: z.number().default(fieldDefault("imagesInputMaxBytes", 20971520)).volatile(),
+	imagesResizeMaxSide: z.number().default(fieldDefault("imagesResizeMaxSide", 1568)).volatile(),
+	imagesResizeMaxBytes: z.number().default(fieldDefault("imagesResizeMaxBytes", 512e3)).volatile(),
+	imagesResizeMinSide: z.number().default(fieldDefault("imagesResizeMinSide", 200)).volatile(),
+	imagesResizeJpegQuality: z.number().default(fieldDefault("imagesResizeJpegQuality", 80)).volatile()
 });
 /**
+* Unwrap the Loader's live field references into a plain settings document.
+* @param input - the entry's live config, or an already-plain document.
+* @returns a plain copy carrying the fields the input has.
+*/
+function plainFields(input) {
+	const out = {};
+	for (const [field, value] of Object.entries(input)) Object.assign(out, { [field]: isLiveField(value) ? value.get() : value });
+	return out;
+}
+/**
 * 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.
 */
-function resolveConfig(config) {
+function resolveConfig(input) {
+	const config = plainFields(input);
 	const resolveMinimizer = () => ({
 		enabled: config.minimizerEnabled ?? fieldDefault("minimizerEnabled", true),
 		only: [],
@@ -5094,29 +5128,46 @@ function resolveConfig(config) {
 	};
 }
 /**
-* 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.
 */
 function installBashPlusSettings(ctx, entry, onSource) {
-	let currentSource;
+	const current = () => resolveConfig(entry);
+	onSource(current);
+	ctx.on("loader/volatile-update", () => {
+		onSource(current);
+	});
 	ctx.inject(["settings"], (settingsCtx) => {
-		settingsCtx.settings.installSection(ctx, BASH_PLUS_SETTINGS_NS, Config, entry, {
-			setSource: (current) => {
-				currentSource = current;
-				onSource(() => resolveConfig(current()));
-			},
-			onChange: () => {
-				const source = currentSource;
-				if (source) onSource(() => resolveConfig(source()));
-			}
-		});
+		settingsCtx.effect(() => settingsCtx.settings.configure({ auto: false }, ctx.fiber), "tool-plus: own settings pages");
 	});
 }
 //#endregion
@@ -5135,13 +5186,27 @@ function installBashPlusSettings(ctx, entry, onSource) {
 /** Logical RPC channel registered by the host half of this plugin. */
 const TOOL_PLUS_RPC_CHANNEL = "/tool-plus";
 /**
-* The preset ids this plugin ships a template for. Single source of truth for
-* both halves: the host uses it for the startup bootstrap and the template
-* lookup, the panel uses it to synthesize the "not installed" rows for a
-* deployment whose roster does not carry them yet.
+* The preset ids this plugin **declares**. Single source of truth for both
+* halves: the host picks its own declarations out of the profile's composed
+* configuration, and the panel uses the list to tell "ours" from everything else.
+*
+* They ship as `@deepseek-ai/dsh-agent-preset` declaration rows in this
+* package's own bundle patches (`presets/<id>.patch.yml`), so installing the
+* plugin as a profile bundle declares them: no install step, no file copy, and
+* nothing written at startup.
 */
 const BUNDLED_PRESET_IDS = ["tool-plus-standard", "tool-plus-ptc"];
 /**
+* Loader row id a preset declaration is addressed by. A profile patch overrides
+* a declaration **by this id** — the harness's config editor locates the row by
+* id, and the override replaces the row's whole `config`.
+* @param presetId - The preset identity (the declaration's `config.id`).
+* @returns The row id as it appears in profile patches.
+*/
+function profileRowId(presetId) {
+	return `preset-${presetId}`;
+}
+/**
 * Whether one difference belongs to the "yours" group (you added or changed it)
 * rather than the "behind" group (the template has it, you do not). Lives in the
 * shared contract so host and client group the exact same way.
@@ -5288,8 +5353,8 @@ function parsePresetComparePayload(payload) {
 }
 /**
 * 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.
 */
@@ -5297,7 +5362,7 @@ function parsePresetActionPayload(payload) {
 	if (typeof payload !== "object" || payload === null || Array.isArray(payload)) return void 0;
 	const { id, action, templateId } = payload;
 	if (typeof id !== "string" || id.length === 0) return void 0;
-	if (action !== "upgrade" && action !== "reset") return void 0;
+	if (action !== "upgrade" && action !== "align" && action !== "revert") return void 0;
 	if (templateId !== void 0 && (typeof templateId !== "string" || templateId.length === 0)) return void 0;
 	return templateId === void 0 ? {
 		id,
@@ -5308,26 +5373,8 @@ function parsePresetActionPayload(payload) {
 		templateId
 	};
 }
-/**
-* 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.
-*/
-function toRosterEntry(preset) {
-	const text = (value) => typeof value === "string" && value.length > 0 ? value : void 0;
-	return {
-		id: text(preset.id) ?? "",
-		trust: preset.trust === "system" ? "system" : "user",
-		path: text(preset.path) ?? "",
-		name: text(preset.name),
-		description: text(preset.description),
-		broken: text(preset.broken)
-	};
-}
 /** One RPC error result in the gateway's shape. */
-function failure$1(error, code = "internal") {
+function failure$2(error, code = "internal") {
 	return {
 		ok: false,
 		error: {
@@ -5338,62 +5385,47 @@ function failure$1(error, code = "internal") {
 	};
 }
 /**
-* 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.
 */
 async function handlePresetEndpoint(ctx, deps, endpoint, payload) {
 	if (endpoint !== "presets/status" && endpoint !== "presets/apply" && endpoint !== "presets/compare") return;
-	const service = ctx.get("agentPresets");
-	if (!service || typeof service.list !== "function") return failure$1("agent presets are not available in this deployment");
 	if (endpoint === "presets/status") try {
-		const roster = await service.list();
 		return {
 			ok: true,
-			value: {
-				presets: deps.listStatuses(roster.map(toRosterEntry)),
-				templates: deps.listTemplates()
-			}
+			value: await deps.listPresets(ctx)
 		};
 	} catch (error) {
-		return failure$1(error);
+		return failure$2(error);
 	}
 	if (endpoint === "presets/compare") {
 		const parsed = parsePresetComparePayload(payload);
-		if (!parsed) return failure$1("presets/compare expects { presetId: string, templateId: string }", "bad-request");
+		if (!parsed) return failure$2("presets/compare expects { presetId: string, templateId: string }", "bad-request");
 		try {
-			const preset = (await service.list()).map(toRosterEntry).find((entry) => entry.id === parsed.presetId);
-			if (preset === void 0) return failure$1(`unknown preset: ${parsed.presetId}`, "bad-request");
-			if (!deps.listTemplates().some((template) => template.id === parsed.templateId)) return failure$1(`unknown template: ${parsed.templateId}`, "bad-request");
 			return {
 				ok: true,
-				value: {
-					presetId: parsed.presetId,
-					templateId: parsed.templateId,
-					...deps.comparePreset(preset, parsed.templateId)
-				}
+				value: await deps.comparePreset(ctx, parsed.presetId, parsed.templateId)
 			};
 		} catch (error) {
-			return failure$1(error);
+			return failure$2(error);
 		}
 	}
 	const parsed = parsePresetActionPayload(payload);
-	if (!parsed) return failure$1("presets/apply expects { id: string, action: \"upgrade\" | \"reset\", templateId?: string }", "bad-request");
+	if (!parsed) return failure$2("presets/apply expects { id: string, action: \"upgrade\" | \"align\" | \"revert\", templateId?: string }", "bad-request");
 	try {
 		return {
 			ok: true,
-			value: deps.applyAction(parsed.id, parsed.action, parsed.templateId)
+			value: await deps.applyAction(ctx, parsed.id, parsed.action, parsed.templateId)
 		};
 	} catch (error) {
-		return failure$1(error);
+		return failure$2(error);
 	}
 }
 //#endregion
@@ -5511,7 +5543,8 @@ async function queryRmSafeStatus(deps) {
 *
 * **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
@@ -5542,7 +5575,7 @@ async function queryRmSafeStatus(deps) {
 /** Cap on one request body; every legitimate payload here is a few hundred bytes. */
 const MAX_BODY_BYTES = 1048576;
 /** One internal error result in the gateway's shape. */
-function failure(error) {
+function failure$1(error) {
 	return {
 		ok: false,
 		error: {
@@ -5626,7 +5659,7 @@ function installBrowserProbeRpc(ctx, deps) {
 						value: { found: probeBrowsers() }
 					};
 				} catch (error) {
-					return failure(error);
+					return failure$1(error);
 				}
 				if (endpoint === "rmSafe/status") {
 					if (!deps.getRmSafe()) return {
@@ -5647,7 +5680,7 @@ function installBrowserProbeRpc(ctx, deps) {
 							})
 						};
 					} catch (error) {
-						return failure(error);
+						return failure$1(error);
 					}
 				}
 				if (deps.presets !== void 0) {
@@ -5733,772 +5766,295 @@ function installBrowserProbeRpc(ctx, deps) {
 	};
 }
 //#endregion
-//#region src/presets/paths.ts
-/**
-* preset 安装路径解析：`<dshHome>`、用户根预设目录、包内模板目录。
-*
-* 三处路径各有唯一来源：
-* - `<dshHome>`：`PresetDeps.homeDir`（测试注入）→ `$DSH_HOME`（trim 后非空）
-*   → `~/.dsh`。规则与官方 `@deepseek-ai/dsh-home-paths` 的
-*   `defaultDshHome()` / `DSH_HOME_ENV`（`'DSH_HOME'`）/ 目录名 `.dsh`
-*   完全一致；这里就地实现而不 import 该包——它在插件安装树里解析不到，
-*   静态 import 一个解析不到的模块会让整个插件加载失败。
-* - 用户根：`<dshHome>/.agent-presets`（与 `dsh-agent-presets` 的
-*   `USER_PRESET_DIR` 同值，所有 profile 共享）。
-* - 模板：插件包内 `presets/<id>/`，用 `import.meta.url` 相对解析（与
-*   `rmSafeCliPath()` 同一手法，见 src/tools/bash/rm-safe.ts）。构建后入口
-*   是单文件 `lib/index.mjs`，源码期是 `src/presets/paths.ts`，两者到包根的
-*   相对深度不同，所以向上探两个候选、取同时含 `package.json` 与 `presets/`
-*   的那个。
-* @module @xiaoso/dsh-tool-plus/presets/paths
-*/
-/** 用户根预设目录名（`dsh-agent-presets` 的 `USER_PRESET_DIR` 同值）。 */
-const PRESET_DIR_NAME = ".agent-presets";
-/** 让一个目录成为 preset 的组合文件名。 */
-const COMPOSITION_FILE_NAME = "agent.cordis.yml";
-/** 组合文件旁的可选展示元数据文件名。 */
-const METADATA_FILE_NAME = "preset.yml";
-/**
-* 本插件随包的两个预设 id（启动补缺只认它们）。名单的单一来源是共享契约
-* 模块 {@link BUNDLED_PRESET_IDS}，这里只做本模块语义下的别名。
-*/
-const DEFAULT_PRESET_IDS = BUNDLED_PRESET_IDS;
-/** 覆盖 `DSH_HOME` 的环境变量名（与官方 `DSH_HOME_ENV` 同值）。 */
-const DSH_HOME_ENV = "DSH_HOME";
-/** 默认 harness home 的目录名（与官方 `DSH_HOME_DIR_NAME` 同值）。 */
-const DSH_HOME_DIR_NAME = ".dsh";
-/**
-* 解析 `<dshHome>`。优先级：注入的 `homeDir` → `$DSH_HOME`（trim 后非空）
-* → `~/.dsh`，与官方 `@deepseek-ai/dsh-home-paths` 的 `defaultDshHome()` 同规则。
-* @param deps - 可选的注入覆盖。
-* @returns 绝对路径的 harness home。
-*/
-function dshHomeDir(deps = {}) {
-	if (deps.homeDir !== void 0 && deps.homeDir.trim().length > 0) return path$1.resolve(deps.homeDir);
-	const env = process.env[DSH_HOME_ENV];
-	return env !== void 0 && env.trim().length > 0 ? path$1.resolve(env) : path$1.join(os.homedir(), DSH_HOME_DIR_NAME);
-}
-/** 用户根预设目录：`<dshHome>/.agent-presets`（所有 profile 共享的写入根）。 */
-function userPresetRoot(deps = {}) {
-	return path$1.join(dshHomeDir(deps), PRESET_DIR_NAME);
-}
-/** 某个预设的用户根目录：`<dshHome>/.agent-presets/<id>`。 */
-function userPresetDir(id, deps = {}) {
-	return path$1.join(userPresetRoot(deps), id);
-}
-/**
-* 插件包根：注入的 `packageRoot` 优先，否则按 `import.meta.url` 向上探。
-* 构建后入口是 `lib/index.mjs`（`..` 即包根），源码期是
-* `src/presets/paths.ts`（`../..` 即包根），两个候选都试、取同时含
-* `package.json` 与 `presets/` 的那个；都不命中时返回 `../..` 候选。
-*/
-function packageRootDir(deps = {}) {
-	if (deps.packageRoot !== void 0 && deps.packageRoot.trim().length > 0) return path$1.resolve(deps.packageRoot);
-	const here = path$1.dirname(fileURLToPath(import.meta.url));
-	const candidates = [path$1.resolve(here, "..", ".."), path$1.resolve(here, "..")];
-	for (const candidate of candidates) if (fs.existsSync(path$1.join(candidate, "package.json")) && fs.existsSync(path$1.join(candidate, "presets"))) return candidate;
-	return candidates[0];
-}
-/** 包内模板目录：`<包根>/presets/<id>`。 */
-function templateDir(id, deps = {}) {
-	return path$1.join(packageRootDir(deps), "presets", id);
+//#region src/presets/rows.ts
+/** 行 id 的取值（非空字符串才认，与官方对 `name` 的要求同款）。 */
+function rowId(row) {
+	return typeof row.id === "string" && row.id.length > 0 ? row.id : void 0;
 }
-//#endregion
-//#region src/presets/rewrite.ts
-/**
-* preset 组合改写：纯函数，文本进文本出，零 I/O。
-*
-* 一个预设要"支持本插件的工具"，只需让官方 4 个冲突行 id 处于「不存在」或
-* `disabled: true` 状态（插件已在宿主面全局接管这 4 个工具；预设里再挂一份
-* 会造成 per-session 影子实例）。本模块只做这一件事：
-*
-* - 只认**顶层**行 `- id: <target>`（`-` 在第 0 列），嵌套子行一律不碰；
-* - 行块已有 `disabled: true` → no-op；`disabled: false`（或任何非 `true`
-*   标量）→ 就地改成 `true`；没有 `disabled` → 在行块末尾追加一行
-*   `  disabled: true`（缩进与行内其它键对齐）；行块不存在 → 不动；
-* - 注释、空行、缩进、CRLF/LF、YAML 顺序、用户的本地调参全部逐字节保留；
-* - 输出与输入逐字节相同时 `changes` 为空——调用方以字节相等判定是否写盘
-*   （preset 代际以 `agent.cordis.yml` 的 mtime 为键，白写一次就白造一代）；
-* - 文本不构成顶层行列表 → `shape: 'unrecognized'`，一律不改写。
-*
-* `PresetChange.action` 的 `'absent'` 供 RPC 摘要层描述"这行本来就不挂"，
-* 改写本身只报告真实发生的改动（否则"幂等时 changes 为空"不成立）。
-* @module @xiaoso/dsh-tool-plus/presets/rewrite
-*/
-/** 默认冲突行 id：官方 standard / ptc / cordis 挂的 4 个官方工具行。 */
-const PRESET_CONFLICT_IDS = [
-	"tool-bash",
-	"tool-pwsh",
-	"tool-fs",
-	"tool-fs-search"
-];
-/** 顶层 `- id: <value>` 行（允许尾随注释；忽略缩进的同名行）。 */
-const TOP_ID_ROW = /^-[ \t]+id:[ \t]*([^#\s]+)[ \t]*(?:#.*)?$/;
-/** 任意顶层行（块边界判定）。 */
-const TOP_ROW = /^-(?:[ \t]|$)/;
-/** 行内键：`disabled: <value>`（任意缩进，缩进另判）。 */
-const DISABLED_KEY = /^([ \t]*)disabled[ \t]*:[ \t]*(.*)$/;
-/** 注释行（含缩进的纯注释行）。 */
-const COMMENT_LINE = /^[ \t]*#/;
-/** 空行（含仅空白行）。 */
-const BLANK_LINE = /^[ \t]*$/;
-/**
-* 无损拆行：每行保留自己的行尾符，`joinLines` 后与原文逐字节相同。
-* 只区分 LF 与 CRLF（YAML 组合文件的两种现实写法）；孤立 `\r` 当内容。
-*/
-function splitLines(text) {
-	const lines = [];
-	let start = 0;
-	for (let i = 0; i < text.length; i++) {
-		if (text[i] !== "\n") continue;
-		const crlf = i > start && text[i - 1] === "\r";
-		lines.push({
-			text: text.slice(start, crlf ? i - 1 : i),
-			eol: crlf ? "\r\n" : "\n"
-		});
-		start = i + 1;
-	}
-	if (start < text.length) lines.push({
-		text: text.slice(start),
-		eol: ""
-	});
-	return lines;
-}
-/** 逐字节重建（`splitLines` 的逆运算）。 */
-function joinLines(lines) {
-	return lines.map((line) => line.text + line.eol).join("");
+/** 行模块名（官方 entry-list 要求每行都有非空 `name`）。 */
+function rowName(row) {
+	return typeof row.name === "string" && row.name.length > 0 ? row.name : void 0;
 }
-/** 文件的行尾风格：取第一个带行尾符的行，缺省 LF。 */
-function fileEol(lines) {
-	for (const line of lines) if (line.eol !== "") return line.eol;
-	return "\n";
-}
-/** 去掉 YAML 单双引号（`- id: 'tool-bash'`）。 */
-function stripQuotes(value) {
-	if (value.length >= 2) {
-		const first = value[0];
-		const last = value[value.length - 1];
-		if (first === "'" && last === "'" || first === "\"" && last === "\"") return value.slice(1, -1);
-	}
-	return value;
-}
-/** 缩进宽度（空格与制表符都按 1 计）。 */
-function indentWidth(line) {
-	return line.length - line.trimStart().length;
+/** 这一行是不是 group 载体（group 的子行在 `config` 里）。 */
+function isGroupRow(row) {
+	return row.group === true && Array.isArray(row.config);
 }
 /**
-* 形状防护：文本必须构成"顶层行列表"。
-* 判据：至少一行有效内容；**首个**有效行是顶层 `- `；所有第 0 列有效行都是
-* 顶层 `- `（映射、仅注释的空文件、被破坏的片段、只有一段缩进嵌套的片段
-* 都会落在这里）。
+* 判定一份 `plugins` 值是不是合法的顶层行列表。规则与官方
+* `entryListProblem` 一致：必须是数组，每一项必须是带非空 `name` 的映射。
+* @param value - 待判定的值（来自宿主配置或测试注入）。
+* @returns 合法时为 true。
 */
-function detectShape(lines) {
-	const significant = lines.filter((line) => !BLANK_LINE.test(line.text) && !COMMENT_LINE.test(line.text));
-	if (significant.length === 0) return "unrecognized";
-	if (!TOP_ROW.test(significant[0].text)) return "unrecognized";
-	for (const line of significant) if (line.text.trimStart() === line.text && !TOP_ROW.test(line.text)) return "unrecognized";
-	return "ok";
+function isRowList(value) {
+	if (!Array.isArray(value)) return false;
+	return value.every((row) => typeof row === "object" && row !== null && !Array.isArray(row) && rowName(row) !== void 0);
 }
-/** 扫出全部顶层行块（含块内键缩进），按出现顺序。 */
-function scanRows(lines) {
-	const starts = [];
-	for (let i = 0; i < lines.length; i++) {
-		const match = TOP_ID_ROW.exec(lines[i].text);
-		if (match === null) continue;
-		const id = stripQuotes(match[1]);
-		if (id.length === 0) continue;
-		starts.push({
-			index: i,
-			id
-		});
+/**
+* 展平一棵行树（含 group 嵌套），键为 `父/子` 形式的路径。
+*
+* 路径是**给面板看的标识**，也用于我们自己的差异比较；官方
+* `compositionInventory()` 回的行没有路径（它压平后只剩 entryId/moduleName），
+* 所以需要分组结构时只能从声明本身取。
+* @param rows - 顶层行列表。
+* @param prefix - 递归时的父路径。
+* @returns 路径 → 行。
+*/
+function flattenRows(rows, prefix = "") {
+	const out = /* @__PURE__ */ new Map();
+	for (const row of rows) {
+		const id = rowId(row);
+		if (id === void 0) continue;
+		const path = prefix.length > 0 ? `${prefix}/${id}` : id;
+		out.set(path, row);
+		if (isGroupRow(row)) for (const [nested, nestedRow] of flattenRows(row.config, path)) out.set(nested, nestedRow);
 	}
-	return starts.map((row) => {
-		let end = lines.length;
-		for (let i = row.index + 1; i < lines.length; i++) if (TOP_ROW.test(lines[i].text)) {
-			end = i;
-			break;
-		}
-		let keyIndent;
-		let keyIndentText;
-		for (let i = row.index + 1; i < end; i++) {
-			const text = lines[i].text;
-			if (BLANK_LINE.test(text) || COMMENT_LINE.test(text)) continue;
-			keyIndent = indentWidth(text);
-			keyIndentText = text.slice(0, keyIndent);
-			break;
-		}
-		return {
-			id: row.id,
-			start: row.index,
-			end,
-			keyIndent,
-			keyIndentText
-		};
-	});
+	return out;
 }
 /**
-* 行块自身的 `disabled:` 键行下标（只认与行内其它键同缩进的那一行；
-* 嵌套子行的 `disabled` 不算）。返回 undefined 表示该行块没有禁用键。
+* `!!js` 表达式标记：entry-list 方言把它解析成 `{ __jsExpr: <源码> }`（见
+* `vendor/include/src/index.ts` 的 `JsExpr`）。它对我们是**标量**——一整段待求值的
+* 源码，不是可以逐键比较的结构。漏了这一步会造出 `disabled.__jsExpr` 这种假叶子，
+* 顺带让"冲突行的 disabled 归 conflicts 管"这条跳过规则失效。
+* @param value - 待判定的值。
+* @returns 是表达式标记时为 true。
 */
-function findDisabledLine(lines, row) {
-	for (let i = row.start + 1; i < row.end; i++) {
-		const text = lines[i].text;
-		if (BLANK_LINE.test(text) || COMMENT_LINE.test(text)) continue;
-		if (row.keyIndent === void 0 || indentWidth(text) !== row.keyIndent) continue;
-		if (DISABLED_KEY.test(text)) return i;
-	}
+function isJsExpr(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value) && Object.keys(value).length === 1 && typeof value.__jsExpr === "string";
 }
-/** `disabled:` 键的值是否已是 `true`（尾随注释忽略）。 */
-function disabledValue(line) {
-	const match = DISABLED_KEY.exec(line);
-	if (match === null) return "";
-	return match[2].replace(/[ \t]+#.*$/, "").trim();
+/** 规范化一个标量用于比较与展示。 */
+function canonical(value) {
+	if (value === void 0) return "";
+	if (isJsExpr(value)) return `!!js ${value.__jsExpr}`;
+	return JSON.stringify(value) ?? String(value);
 }
 /**
-* 把一整行 `disabled: <值>` 换成**整值** `true`，原有尾随注释保留。
+* 收集一行自己的叶子路径（不含 `id`，不含 group 的子行）。
 *
-* 官方随附预设会用 `!!js` 表达式值（`standard` 的 tool-bash 是
-* `disabled: !!js process.platform === 'win32'`）。表达式既不是 `true` 也不是
-* `false`，我们无从判断它当前是否生效，所以只能整值替换；替换时把旧值以
-* `# was: …` 备注留在行尾（信息不丢，且下一轮 `disabledValue` 读到的是 `true`，
-* 幂等仍然成立）。逐 token 替换是错的：会把值拼成
-* `true process.platform === 'win32'`，表达式被破坏、`!!js` 标签也丢了。
-* @param line - 原始 `disabled:` 行（含缩进与可能的尾随注释）。
-* @returns 改写后的行。
-*/
-function flipDisabledLine(line) {
-	const match = DISABLED_KEY.exec(line);
-	if (match === null) return line;
-	const indent = match[1];
-	const rest = match[2];
-	const commentPart = /([ \t]+#.*)$/.exec(rest)?.[1] ?? "";
-	const value = (commentPart === "" ? rest : rest.slice(0, rest.length - commentPart.length)).trim();
-	const note = value === "" || value === "false" ? "" : `; was: ${value}`;
-	if (commentPart !== "") return `${indent}disabled: true${commentPart}${note}`;
-	return note === "" ? `${indent}disabled: true` : `${indent}disabled: true # was: ${value}`;
-}
-/**
-* 追加位置：行块末尾最后一处"内容行"之后（跳过尾随空行与注释行，
-* 免得把 `disabled` 插到下一行块的说明注释之后）。
-*/
-function appendIndex(lines, row) {
-	let last = row.start;
-	for (let i = row.start + 1; i < row.end; i++) {
-		const text = lines[i].text;
-		if (BLANK_LINE.test(text) || COMMENT_LINE.test(text)) continue;
-		last = i;
-	}
-	return last + 1;
-}
-/** 去重后按出现顺序的冲突 id。 */
-function normalizeIds(conflictIds) {
-	return [...new Set((conflictIds ?? PRESET_CONFLICT_IDS).filter((id) => id.length > 0))];
-}
-/** 逐个目标 id 定处置（不改动文本）。 */
-function plan(lines, rows, ids) {
-	const plans = [];
-	for (const id of ids) {
-		const row = rows.find((candidate) => candidate.id === id);
-		if (row === void 0) continue;
-		const disabledAt = findDisabledLine(lines, row);
-		if (disabledAt !== void 0) {
-			if (disabledValue(lines[disabledAt].text) === "true") continue;
-			plans.push({
-				kind: "flip",
-				id,
-				line: disabledAt
+* 用规范化 JSON 而不是 `String()`：Loader 对 `disabled` 的语义是
+* "布尔取 Boolean(value)"，所以字符串 `"false"` 与布尔 `false` **语义相反**；
+* 两者若都显示成 `false`，面板就会把一处真实差异藏起来。
+* @param row - 目标行。
+* @param base - 递归时的前缀。
+* @returns 该行的叶子清单（顺序为键的声明顺序）。
+*/
+function rowLeaves(row, base = "") {
+	const out = [];
+	const walk = (value, path) => {
+		if (isJsExpr(value)) {
+			out.push({
+				path,
+				value: canonical(value)
 			});
-			continue;
+			return;
 		}
-		const indent = row.keyIndentText ?? "  ";
-		plans.push({
-			kind: "append",
-			id,
-			at: appendIndex(lines, row),
-			indent
+		if (Array.isArray(value)) {
+			value.forEach((item, index) => walk(item, `${path}[${index}]`));
+			return;
+		}
+		if (value !== null && typeof value === "object") {
+			for (const [key, nested] of Object.entries(value)) walk(nested, path.length > 0 ? `${path}.${key}` : key);
+			return;
+		}
+		out.push({
+			path,
+			value: canonical(value)
 		});
+	};
+	for (const [key, value] of Object.entries(row)) {
+		if (key === "id") continue;
+		if (key === "config" && isGroupRow(row)) continue;
+		walk(value, base.length > 0 ? `${base}.${key}` : key);
 	}
-	return plans;
+	return out;
+}
+/** 规范化的深比较（两侧都是 YAML/JSON 值，无函数与原型差异）。 */
+function sameValue(a, b) {
+	return JSON.stringify(a ?? null) === JSON.stringify(b ?? null);
 }
+//#endregion
+//#region src/presets/conflicts.ts
 /**
-* 把官方冲突行改写成"不存在或 disabled: true"。
+* 冲突不变式：一个 preset「接上了本插件的工具」当且仅当官方那 4 个工具行
+* 处于**不存在**或 **`disabled: true`** 状态。
 *
-* `changes` 只含真实发生的改动（幂等跑第二次必为空）；`shape: 'unrecognized'`
-* 时原文本原样返回。
-* @param text - `agent.cordis.yml` 的原文。
-* @param conflictIds - 冲突行 id，缺省 {@link PRESET_CONFLICT_IDS}。
-* @returns 最终文本与实际改动清单。
-*/
-function rewritePresetComposition(text, conflictIds) {
-	const lines = splitLines(text);
-	if (detectShape(lines) === "unrecognized") return {
-		text,
-		changes: []
-	};
-	const ids = normalizeIds(conflictIds);
-	const plans = plan(lines, scanRows(lines), ids);
-	const changes = [];
-	const eol = fileEol(lines);
-	const inserts = [];
-	for (const entry of plans) if (entry.kind === "flip") {
-		lines[entry.line] = {
-			text: flipDisabledLine(lines[entry.line].text),
-			eol: lines[entry.line].eol
-		};
-		changes.push({
-			id: entry.id,
-			action: "flipped"
-		});
-	} else inserts.push({
-		at: entry.at,
-		indent: entry.indent,
-		id: entry.id
-	});
-	for (const insert of inserts.sort((a, b) => b.at - a.at)) {
-		if (insert.at === lines.length && lines.length > 0 && lines[lines.length - 1].eol === "") {
-			lines[lines.length - 1] = {
-				text: lines[lines.length - 1].text,
-				eol
-			};
-			lines.push({
-				text: `${insert.indent}disabled: true`,
-				eol: ""
-			});
-		} else lines.splice(insert.at, 0, {
-			text: `${insert.indent}disabled: true`,
-			eol
-		});
-		changes.push({
-			id: insert.id,
-			action: "disabled"
-		});
-	}
-	const ordered = ids.map((id) => changes.find((change) => change.id === id)).filter((change) => change !== void 0);
-	return {
-		text: joinLines(lines),
-		changes: ordered
-	};
+* 原因（这套设计的地基，别丢）：`@xiaoso/dsh-tool-plus` 作为包在**宿主面**
+* 加载时，它自己的 profile 补丁已经禁用了这 4 行并插入**一行全局** `tool-plus`；
+* 注册表按 scope 分层、就近优先，所以宿主面那一份已经服务所有会话。若某个
+* preset 又在 **agent 面**挂一份同名工具行，就会用**第二个 `apply()` 影子实例**
+* 盖掉健康的宿主实例，而那个实例的 settings 注入永不触发（cfg 退化成
+* replace-mode 读取 —— 2026-08-25 hashline 事故的根因）。
+*
+* 与旧文本实现的唯一区别是**载体**：以前逐行读 `agent.cordis.yml` 的文本，
+* 现在直接看宿主交给我们的行对象。判定规则一字不改：
+* - 只认**顶层**行；group 里嵌套的同名行不碰；
+* - `disabled` 严格等于布尔 `true` 才算已处理 —— 缺席、`false`、字符串、
+*   `!!js` 表达式统统算冲突（`!!js` 在挂载时才求值，我们要的是无条件关闭，
+*   所以和旧实现一样整值翻成 `true`）；
+* - 输出恒为新数组，输入不变；结果与输入逐值相同时 `changes` 为空（调用方以
+*   此判定"不写盘"）。
+* @module @xiaoso/dsh-tool-plus/presets/conflicts
+*/
+/** 官方 standard / ptc / cordis 会挂的 4 个工具行 id。 */
+const PRESET_CONFLICT_IDS = [
+	"tool-bash",
+	"tool-pwsh",
+	"tool-fs",
+	"tool-fs-search"
+];
+/** 该行是否已被无条件关闭（只有布尔 `true` 算）。 */
+function disabled(row) {
+	return row.disabled === true;
+}
+/** 顶层行里按 id 找第一行（只看顶层，与不变式一致）。 */
+function topRow(rows, id) {
+	return rows.find((row) => rowId(row) === id);
 }
 /**
-* 只读判定：该组合还有哪些冲突行没被禁用。
-* @param text - `agent.cordis.yml` 的原文。
-* @param conflictIds - 冲突行 id，缺省 {@link PRESET_CONFLICT_IDS}。
-* @returns 冲突清单、是否干净、形状结论。
+* 只读分析一份 `plugins` 值。
+* @param plugins - 声明的子插件列表（来自宿主配置，形状未知）。
+* @param conflictIds - 冲突行清单，默认 {@link PRESET_CONFLICT_IDS}。
+* @returns 冲突清单、是否干净、形状是否可识别。
 */
-function analyzePresetComposition(text, conflictIds) {
-	const lines = splitLines(text);
-	const shape = detectShape(lines);
-	if (shape === "unrecognized") return {
+function analyzePlugins(plugins, conflictIds = PRESET_CONFLICT_IDS) {
+	if (!isRowList(plugins)) return {
 		conflicts: [],
 		clean: false,
-		shape
-	};
-	const rows = scanRows(lines);
-	const conflicts = normalizeIds(conflictIds).filter((id) => {
-		const row = rows.find((candidate) => candidate.id === id);
-		if (row === void 0) return false;
-		const disabledAt = findDisabledLine(lines, row);
-		return disabledAt === void 0 || disabledValue(lines[disabledAt].text) !== "true";
+		shape: "unrecognized"
+	};
+	const conflicts = conflictIds.filter((id) => {
+		const row = topRow(plugins, id);
+		return row !== void 0 && !disabled(row);
 	});
 	return {
 		conflicts,
 		clean: conflicts.length === 0,
-		shape
+		shape: "ok"
 	};
 }
-/** 行内 `key: value`（顶层键；嵌套子键缩进更大，不在这里取）。 */
-const ROW_KEY = /^[ \t]*([^#\s:][^:]*):[ \t]*(.*)$/;
-/** 去掉行尾注释与引号，得到可比的值。 */
-function leafValue(text) {
-	return stripQuotes(text.replace(/[ \t]+#.*$/, "").trim());
-}
 /**
-* 把一个行块按缩进展开成叶子路径：容器键（`config:`）只做路径前缀，列表项
-* 以 `[i]` 编号。只读、不修改原文；识别不了的行原样当叶子。
+* 把那 4 个仍挂着的冲突行翻成 `disabled: true`（不改别的行、不删行）。
+* @param plugins - 合法顶层行列表。
+* @param conflictIds - 冲突行清单，默认 {@link PRESET_CONFLICT_IDS}。
+* @returns 新列表与实际改动清单（无改动时 `changes` 为空且列表为原引用）。
 */
-function walkRowLeaves(lines, row) {
-	const out = [];
-	const stack = [];
-	const counters = /* @__PURE__ */ new Map();
-	for (let i = row.start + 1; i < row.end; i += 1) {
-		const raw = lines[i].text;
-		if (COMMENT_LINE.test(raw) || BLANK_LINE.test(raw)) continue;
-		const indent = indentWidth(raw);
-		const trimmed = raw.trim();
-		while (stack.length > 0 && stack[stack.length - 1].indent >= indent) stack.pop();
-		const prefix = stack.length === 0 ? "" : stack[stack.length - 1].path;
-		if (trimmed === "-" || trimmed.startsWith("- ")) {
-			const index = counters.get(prefix) ?? 0;
-			counters.set(prefix, index + 1);
-			const itemPath = prefix === "" ? `[${index}]` : `${prefix}[${index}]`;
-			stack.push({
-				indent,
-				path: itemPath
-			});
-			const body = trimmed.replace(/^-[ \t]*/, "");
-			const match = ROW_KEY.exec(`  ${body}`);
-			if (match === null) {
-				out.push({
-					path: itemPath,
-					value: leafValue(body)
-				});
-				continue;
-			}
-			const value = leafValue(match[2]);
-			if (value !== "") out.push({
-				path: `${itemPath}.${match[1].trim()}`,
-				value
-			});
-			continue;
-		}
-		const match = ROW_KEY.exec(trimmed);
-		if (match === null) continue;
-		const key = match[1].trim();
-		const path = prefix === "" ? key : `${prefix}.${key}`;
-		const value = leafValue(match[2]);
-		if (value === "") stack.push({
-			indent,
-			path
-		});
-		else out.push({
-			path,
-			value
+function disableConflicts(plugins, conflictIds = PRESET_CONFLICT_IDS) {
+	const changes = [];
+	let touched = false;
+	const next = plugins.map((row) => {
+		const id = rowId(row);
+		if (id === void 0 || !conflictIds.includes(id) || disabled(row)) return row;
+		changes.push({
+			id,
+			action: Object.hasOwn(row, "disabled") ? "flipped" : "disabled"
 		});
-	}
-	return out;
-}
-/**
-* 只读读出顶层行的键值对与展开叶子。形状不可识别时返回 undefined（不猜、不修）。
-*
-* 与 {@link analyzePresetComposition} 共用同一套扫描器（`splitLines` /
-* `detectShape` / `scanRows`）：解析只有一份，差异视图与改写视图永远同源。
-* @param text - `agent.cordis.yml` 原文。
-* @returns 逐行视图，或形状不可识别时的 undefined。
-*/
-function readPresetRows(text) {
-	const lines = splitLines(text);
-	if (detectShape(lines) !== "ok") return void 0;
-	return scanRows(lines).map((row) => {
-		const keys = [];
-		if (row.keyIndent !== void 0) for (let i = row.start; i < row.end; i += 1) {
-			const line = lines[i].text;
-			if (COMMENT_LINE.test(line) || BLANK_LINE.test(line)) continue;
-			if (indentWidth(line) !== row.keyIndent) continue;
-			const match = ROW_KEY.exec(line);
-			if (match === null) continue;
-			keys.push({
-				key: match[1].trim(),
-				value: leafValue(match[2])
-			});
-		}
+		touched = true;
 		return {
-			id: row.id,
-			keys,
-			leaves: walkRowLeaves(lines, row)
+			...row,
+			disabled: true
 		};
 	});
-}
-//#endregion
-//#region src/presets/install.ts
-/**
-* preset 安装 fs 层：启动补缺、升级（只改冲突行）、重置（整份覆盖）。
-*
-* 三条纪律：
-* - **启动唯一自动动作**是"目录不存在才整份写入"；目录已存在则一个字节都不碰
-*   （不检查、不补文件、不更新），失败绝不抛出、绝不阻塞启动。
-* - **内容相同就不写盘**：preset 代际以 `agent.cordis.yml` 的 mtime 为键，
-*   白写一次就白造一代 + 白起 watcher。判定一律用"写前先读回比较字节"。
-* - **写盘一律原子**：同目录临时文件 + `rename`；替换前若同名备份不存在，
-*   先落一份 `agent.cordis.yml.bak-<插件版本>`（改写前的内容，同名不覆盖）。
-* @module @xiaoso/dsh-tool-plus/presets/install
-*/
-/**
-* 读取包内模板目录的全部常规文件（"整份写入"的来源）。
-* 模板目录不存在、或里面没有 `agent.cordis.yml` → 抛错，由调用方收进 reason。
-*/
-function readTemplateFiles(id, deps) {
-	const dir = templateDir(id, deps);
-	const names = fs.readdirSync(dir, { withFileTypes: true }).filter((entry) => entry.isFile()).map((entry) => entry.name);
-	if (!names.includes("agent.cordis.yml")) throw new Error(`preset template is incomplete: ${path$1.join(dir, COMPOSITION_FILE_NAME)} not found`);
-	return names.map((name) => ({
-		name,
-		content: fs.readFileSync(path$1.join(dir, name))
-	}));
-}
-/** 把异常收成一句人话（启动路径永不抛）。 */
-function reasonOf(error) {
-	return error instanceof Error ? error.message : String(error);
-}
-/** 只读文本文件；读不到返回 undefined（不抛）。 */
-function readTextFile$1(file) {
-	try {
-		return fs.readFileSync(file, "utf8");
-	} catch {
-		return;
-	}
-}
-/** 只读原始字节；读不到返回 undefined（不抛）。 */
-function readFile(file) {
-	try {
-		return fs.readFileSync(file);
-	} catch {
-		return;
-	}
-}
-/**
-* 启动补缺：`<dshHome>/.agent-presets/<id>` 目录不存在时，从包内模板整份写入
-* （`mkdir -p` + 模板目录里的每个文件）。
-*
-* 目录已存在 → 一律不碰（含"目录存在但缺文件"的情形，那种只在设置页状态里
-* 显示）。整个流程每个 id 单独 try/catch，**永不抛**。
-* @param deps - 路径注入（fs 层测试用）。
-* @returns 新建成功的 id 列表与失败原因列表（顺序均为 {@link DEFAULT_PRESET_IDS}）。
-*/
-function ensureDefaultPresets(deps = {}) {
-	const created = [];
-	const failed = [];
-	for (const id of DEFAULT_PRESET_IDS) try {
-		const dir = userPresetDir(id, deps);
-		if (fs.existsSync(dir)) continue;
-		const files = readTemplateFiles(id, deps);
-		fs.mkdirSync(dir, { recursive: true });
-		for (const file of files) fs.writeFileSync(path$1.join(dir, file.name), file.content);
-		created.push(id);
-	} catch (error) {
-		failed.push({
-			id,
-			reason: reasonOf(error)
-		});
-	}
-	return {
-		created,
-		failed
-	};
-}
-/** 本插件的版本号（备份名后缀）：读包根 package.json，读不到就退化成 `unknown`。 */
-function pluginVersion(deps) {
-	try {
-		const raw = JSON.parse(fs.readFileSync(path$1.join(packageRootDir(deps), "package.json"), "utf8"));
-		if (typeof raw.version === "string" && raw.version.length > 0) return raw.version;
-	} catch {}
-	return "unknown";
-}
-/** 备份路径：与被替换的文件同目录，`<文件>.bak-<插件版本>`。 */
-function backupFileFor(file, deps) {
-	return `${file}.bak-${pluginVersion(deps)}`;
-}
-/**
-* 替换前落一份"改写前内容"的备份；同名备份已存在则不覆盖（返回既有路径）。
-* 备份是纯新增文件，不参与写入链的原子性。
-*/
-function writeBackup(file, content, deps) {
-	const backup = backupFileFor(file, deps);
-	if (!fs.existsSync(backup)) fs.writeFileSync(backup, content);
-	return backup;
-}
-/** 同目录临时文件 + `rename` 的原子替换；失败时清掉临时文件再把错抛出去。 */
-function writeFileAtomic(file, content) {
-	const temp = path$1.join(path$1.dirname(file), `.${path$1.basename(file)}.${process.pid}.${Date.now().toString(36)}.tmp`);
-	fs.writeFileSync(temp, content);
-	try {
-		fs.renameSync(temp, file);
-	} catch (error) {
-		try {
-			fs.unlinkSync(temp);
-		} catch {}
-		throw error;
-	}
-}
-/**
-* 升级：只改冲突行（追加 `disabled: true` 或把既有值翻成 `true`）。
-* 形状无法识别 → 不写；内容逐字节相同 → 不写盘、不备份。
-*/
-function upgrade(id, deps) {
-	const file = path$1.join(userPresetDir(id, deps), COMPOSITION_FILE_NAME);
-	const original = readTextFile$1(file);
-	if (original === void 0) return {
-		ok: false,
-		changed: false,
-		reason: `preset is not installed: ${file} cannot be read`,
-		changes: []
-	};
-	if (analyzePresetComposition(original).shape === "unrecognized") return {
-		ok: false,
-		changed: false,
-		reason: `composition shape is unrecognized, nothing was written: ${file}`,
+	if (!touched) return {
+		plugins,
 		changes: []
 	};
-	const { text, changes } = rewritePresetComposition(original);
-	if (text === original) return {
-		ok: true,
-		changed: false,
-		changes: []
-	};
-	const backupPath = writeBackup(file, original, deps);
-	writeFileAtomic(file, text);
+	changes.sort((a, b) => conflictIds.indexOf(a.id) - conflictIds.indexOf(b.id));
 	return {
-		ok: true,
-		changed: true,
-		backupPath,
+		plugins: next,
 		changes
 	};
 }
-/**
-* 重置：用**指定的**模板整份覆盖该预设目录（组合文件 + 元数据等每个模板文件）。
-*
-* 模板来源按用户所选：`templateId` 给了就用它（可以把 A 预设对齐到 B 模板），
-* 没给才退回"同名模板"（历史行为）。内容相同则一个字节都不写；组合文件被改写
-* 前先落备份。`changes` 恒为空：重置不是"逐行改写"，行级摘要不在它的契约里。
-*/
-function reset(id, deps, templateId) {
-	const source = templateId ?? id;
-	const sourceComposition = path$1.join(templateDir(source, deps), COMPOSITION_FILE_NAME);
-	if (!fs.existsSync(sourceComposition)) return {
-		ok: false,
-		changed: false,
-		reason: `template is missing: ${sourceComposition}`,
-		changes: []
-	};
-	const dir = userPresetDir(id, deps);
-	const files = readTemplateFiles(source, deps);
-	path$1.join(dir, COMPOSITION_FILE_NAME);
-	let changed = false;
-	let backupPath;
-	for (const file of files) {
-		const target = path$1.join(dir, file.name);
-		const current = readFile(target);
-		if (current !== void 0 && current.equals(file.content)) continue;
-		if (current !== void 0 && file.name === "agent.cordis.yml") backupPath = writeBackup(target, current, deps);
-		if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
-		writeFileAtomic(target, file.content);
-		changed = true;
-	}
-	return {
-		ok: true,
-		changed,
-		backupPath,
-		changes: []
-	};
-}
-/**
-* 用户在设置页对某个预设执行的动作。
-*
-* - `upgrade`：只改官方冲突行（面板上叫「最小更新」）；
-* - `reset`：用**所选模板**整份覆盖该预设（先备份）。模板由 `templateId` 指定，
-*   缺省才是同名模板 —— 面板总是把用户挑的那份模板传进来。
-*
-* 永不抛：任何异常收进 `ok: false` + `reason`。
-* @param id - 预设 id（目录名）。
-* @param action - `upgrade` 或 `reset`。
-* @param deps - 路径注入（fs 层测试用）。
-* @param templateId - `reset` 的模板来源（默认同名模板）。
-* @returns 结果（`changed: false` = 一个字节都没写）。
-*/
-function applyPresetAction(id, action, deps = {}, templateId) {
-	try {
-		return action === "reset" ? reset(id, deps, templateId) : upgrade(id, deps);
-	} catch (error) {
-		return {
-			ok: false,
-			changed: false,
-			reason: reasonOf(error),
-			changes: []
-		};
-	}
-}
 //#endregion
 //#region src/presets/delta.ts
 /**
-* 预设差异清单：只读地说清"用户这份和随包模板差在哪"。
+* 差异清单：只读地说清"这份 preset 与另一份（通常是随包声明）差在哪"。
 *
 * 为什么需要它：`templateDiffers: boolean` 只能说"不一样"，而面板上紧挨着的
-* 是"工具冲突行都已禁用、无需调整"。两句都对，但读起来打架 —— 前者说的是
-* **你改过内容**，后者说的是**我们自己那 4 个冲突行**。把差异逐条列出来，
-* 面板才不需要用户自己猜"到底哪里不同、更新会不会动它"。
+* 是"冲突行都已禁用、无需调整"。两句都对，读起来却打架 —— 前者说的是
+* **内容被改过**，后者说的是**我们自己那 4 个冲突行**。把差异逐条列出来，
+* 用户才不用猜"到底哪里不同、对齐会不会动它"。
 *
-* 契约：①比**展开到叶子的点号路径**（`config.thresholdRatio`，列表项带 `[i]`）——
-* 真实漂移常藏在嵌套键里，只比顶层键会得出"没有差异"的错误结论；②冲突行的
-* `disabled` 由 `conflicts` 负责，不在差异里重复报；③形状不可识别 → 空清单，
-* 绝不猜；④顺序＝用户这份的行序在前，模板独有的行补在后；⑤`total` 是全量，
-* `items` 可被 `limit` 截断（面板据此说"等 N 项"）。
+* 契约（自旧文本实现原样继承，语义未变）：
+* - 比**展开到叶子的点号路径**（`config.thresholdRatio`、`config.models[0].id`）——
+*   真实漂移常藏在嵌套键里，只比顶层键会得出"没有差异"的错误结论；
+* - 冲突行的 `disabled` 由 `conflicts` 负责，不在差异里重复报；
+* - 形状不可识别 → 空清单，绝不猜；
+* - 顺序 = 你这份的行序在前（含 group 内子行），对方独有的行补在后；
+* - `total` 是全量，`items` 可被 `limit` 截断（面板据此说"等 N 项"）。
 * @module @xiaoso/dsh-tool-plus/presets/delta
 */
-/** 默认最多列几条（再多就该去看文件本身了）。 */
+/** 默认最多列几条（再多就该去看配置本身了）。 */
 const DEFAULT_LIMIT$1 = 6;
-/** 某个路径是不是"我们自己的冲突行开关"——那属于 conflicts 的话题。 */
-function isConflictSwitch(row, path, conflictIds) {
-	return path === "disabled" && conflictIds.includes(row);
-}
-/** 把行视图折成 `路径 → 值`（重复路径以最后一个为准，与 YAML 一致）。 */
-function leafMap(row) {
-	return new Map(row.leaves.map((entry) => [entry.path, entry.value]));
+/** 空结果（任一侧形状不可识别时）。 */
+const EMPTY = {
+	items: [],
+	total: 0,
+	yoursCount: 0,
+	behindCount: 0
+};
+/** 某个叶子的 `disabled` 是不是"我们自己的冲突行开关"——那属于 conflicts 的话题。 */
+function isConflictSwitch(rowPath, leafPath, conflictIds) {
+	return leafPath === "disabled" && !rowPath.includes("/") && conflictIds.includes(rowPath);
 }
 /**
-* 比较两份组合文件，列出差异（只读，不改任何字节）。
-* @param userText - 用户这份的 `agent.cordis.yml` 原文。
-* @param templateText - 随包模板的同一文件原文。
+* 比较两份 `config.plugins`，列出差异（只读，不改任何值）。
+* @param yours - 你这一侧的 plugins（形状未知）。
+* @param theirs - 对方的 plugins（形状未知）。
 * @param options - `conflictIds`（默认 {@link PRESET_CONFLICT_IDS}）与 `limit`（默认 6）。
-* @returns 差异清单；两侧任一不可识别时为空清单。
-*/
-function presetDelta(userText, templateText, options = {}) {
-	const yours = readPresetRows(userText);
-	const theirs = readPresetRows(templateText);
-	if (yours === void 0 || theirs === void 0) return {
-		items: [],
-		total: 0,
-		yoursCount: 0,
-		behindCount: 0
-	};
+* @returns 差异清单；两侧任一形状不可识别时为空清单。
+*/
+function presetDelta(yours, theirs, options = {}) {
+	if (!isRowList(yours) || !isRowList(theirs)) return EMPTY;
 	const conflictIds = options.conflictIds ?? PRESET_CONFLICT_IDS;
 	const limit = options.limit ?? DEFAULT_LIMIT$1;
-	const theirRows = new Map(theirs.map((row) => [row.id, row]));
-	const myRowIds = new Set(yours.map((row) => row.id));
+	const mine = flattenRows(yours);
+	const other = flattenRows(theirs);
 	const items = [];
-	for (const row of yours) {
-		const counterpart = theirRows.get(row.id);
+	const leavesOf = (row) => new Map(rowLeaves(row).map((leaf) => [leaf.path, leaf.value]));
+	for (const [path, row] of mine) {
+		const counterpart = other.get(path);
 		if (counterpart === void 0) {
 			items.push({
 				kind: "row-only-yours",
-				row: row.id,
+				row: path,
 				path: ""
 			});
 			continue;
 		}
-		const mine = leafMap(row);
-		const other = leafMap(counterpart);
-		for (const [path, value] of mine) {
-			if (isConflictSwitch(row.id, path, conflictIds)) continue;
-			if (!other.has(path)) {
+		const a = leavesOf(row);
+		const b = leavesOf(counterpart);
+		for (const [leaf, value] of a) {
+			if (isConflictSwitch(path, leaf, conflictIds)) continue;
+			if (!b.has(leaf)) {
 				items.push({
 					kind: "only-yours",
-					row: row.id,
-					path,
+					row: path,
+					path: leaf,
 					yours: value
 				});
 				continue;
 			}
-			const theirValue = other.get(path) ?? "";
-			if (theirValue !== value) items.push({
+			const theirsValue = b.get(leaf) ?? "";
+			if (theirsValue !== value) items.push({
 				kind: "changed",
-				row: row.id,
-				path,
+				row: path,
+				path: leaf,
 				yours: value,
-				template: theirValue
+				template: theirsValue
 			});
 		}
-		for (const [path, value] of other) {
-			if (isConflictSwitch(row.id, path, conflictIds)) continue;
-			if (!mine.has(path)) items.push({
+		for (const [leaf, value] of b) {
+			if (isConflictSwitch(path, leaf, conflictIds)) continue;
+			if (!a.has(leaf)) items.push({
 				kind: "only-template",
-				row: row.id,
-				path,
+				row: path,
+				path: leaf,
 				template: value
 			});
 		}
 	}
-	for (const row of theirs) if (!myRowIds.has(row.id)) items.push({
+	for (const path of other.keys()) if (!mine.has(path)) items.push({
 		kind: "row-only-template",
-		row: row.id,
+		row: path,
 		path: ""
 	});
 	const yoursCount = items.filter((item) => isYoursDelta(item.kind)).length;
@@ -6510,99 +6066,19 @@ function presetDelta(userText, templateText, options = {}) {
 	};
 }
 //#endregion
-//#region src/presets/status.ts
-/**
-* preset 状态探测：把 roster 变成设置页要的清单。同步、只读。
-*
-* roster 由调用方（RPC 层）从 `ctx.agentPresets.list()` 映射后传入——本模块
-* 不依赖 cordis 类型，只吃一个最小结构，因此可以纯 fs 单测。三种来源按设计
-* 文档 §4.2 区分：
-* - `ours`：本插件随包的两个预设（id 在 {@link DEFAULT_PRESET_IDS} 里），
-*   可"更新"（只改冲突行）与"重置"（整份对齐模板）；
-* - `user`：用户根里的其它预设，只能"升级"（只改冲突行）；
-* - `shipped`：随部署提供的官方预设（`trust: 'system'`），只读展示。
-*
-* 判定只读文件、绝不写入：官方随附根与用户根在这里都只是被读。
-* @module @xiaoso/dsh-tool-plus/presets/status
-*/
-/** 读组合文件；绝不抛。ENOENT/ENOTDIR 归为"不存在"，其余归为"读不了"。 */
-function readComposition(file) {
-	try {
-		return {
-			kind: "ok",
-			text: fs.readFileSync(file, "utf8")
-		};
-	} catch (error) {
-		const code = error.code;
-		return code === "ENOENT" || code === "ENOTDIR" ? { kind: "missing" } : { kind: "unreadable" };
-	}
-}
-/** 只读文本文件；读不到返回 undefined（不抛）。 */
-function readTextFile(file) {
-	try {
-		return fs.readFileSync(file, "utf8");
-	} catch {
-		return;
-	}
-}
-/**
-* 列出每个 roster 行的状态（顺序与入参一致）。
-* @param roster - 调用方映射好的预设清单（`path` = 组合文件路径）。
-* @param deps - 路径注入（fs 层测试用）。
-* @returns 逐行的设置页状态。
-*/
-function listPresetStatuses(roster, deps = {}) {
-	return roster.map((entry) => {
-		const source = DEFAULT_PRESET_IDS.includes(entry.id) ? "ours" : entry.trust === "system" ? "shipped" : "user";
-		const installed = fs.existsSync(userPresetDir(entry.id, deps));
-		const templateFile = path$1.join(templateDir(entry.id, deps), COMPOSITION_FILE_NAME);
-		const templatePresent = fs.existsSync(templateFile);
-		const read = readComposition(entry.path);
-		const analysis = read.kind === "ok" ? analyzePresetComposition(read.text) : {
-			conflicts: [],
-			clean: false,
-			shape: read.kind === "unreadable" ? "unrecognized" : "ok"
-		};
-		const unrecognized = read.kind === "missing" ? false : analysis.shape === "unrecognized";
-		const templateText = installed && templatePresent ? readTextFile(templateFile) : void 0;
-		const templateDiffers = templateText !== void 0 && read.kind === "ok" && templateText !== read.text;
-		const templateDelta = templateDiffers && templateText !== void 0 && read.kind === "ok" ? presetDelta(read.text, templateText) : void 0;
-		const delta = templateDelta !== void 0 && templateDelta.total > 0 ? templateDelta : void 0;
-		return {
-			id: entry.id,
-			name: entry.name,
-			description: entry.description,
-			source,
-			path: entry.path,
-			conflicts: analysis.conflicts,
-			clean: analysis.clean,
-			unrecognized,
-			broken: entry.broken,
-			installed,
-			templatePresent,
-			templateDiffers,
-			templateDelta: delta
-		};
-	});
-}
-//#endregion
 //#region src/presets/compare.ts
 /**
-* 预设比较：把"某份预设"和"我们随包的某个模板"放在一起看。
+* 预设比较：把"某份 preset 生效的 plugins"和"某个随包声明的 plugins"放在一起看。
 *
-* 面板现在是两块信息、两个状态点：
-*   ①**工具行**：这份预设里我们那 4 个冲突行都禁用了吗（=`conflicts`）；
-*   ②**完整比较**：内容上和我们选的模板差多少（=`items`，弹窗里逐条展示）。
-* 这是只读操作，绝不写盘。比较一律**不跳过**冲突行的 `disabled` —— 第二个点
-* 要的是"完整的比较"，工具开关的不同也必须出现在差异清单里，否则会出现
-* "说内容一致、却说工具行没配好"这种自相矛盾的读数。
+* 面板是两块信息、两个状态点：
+*   ①**工具行**：这份 preset 里那 4 个冲突行都禁用了吗（=`conflicts`）；
+*   ②**完整比较**：内容上和选中的模板差多少（=`items`，弹窗里逐条展示）。
+* 只读，绝不写盘。比较一律**不跳过**冲突行的 `disabled` —— 第二个点要的是
+* "完整的比较"，工具开关的不同也必须出现在差异清单里，否则会出现"说内容一致、
+* 却说工具行没配好"这种自相矛盾的读数。
 * @module @xiaoso/dsh-tool-plus/presets/compare
 */
-/** 模板根目录：`<packageRoot>/presets`。 */
-function templatesRoot(deps) {
-	return path$1.join(packageRootDir(deps), "presets");
-}
-/** 读不到/不可识别时的统一结果（面板渲染红点，不抛）。 */
+/** 任一侧不可比较时的统一结果（面板渲染红点，不抛）。 */
 const UNREADABLE_COMPARISON = {
 	status: "unreadable",
 	conflicts: [],
@@ -6611,56 +6087,17 @@ const UNREADABLE_COMPARISON = {
 	behindCount: 0,
 	items: []
 };
-/** 只读文本文件；读不到返回 undefined（不抛）。 */
-function readText(file) {
-	try {
-		return fs.readFileSync(file, "utf8");
-	} catch {
-		return;
-	}
-}
-/** 模板元数据里的 `name:`（一行，去掉引号）；读不到就退回 id。 */
-function templateName(id, deps) {
-	const text = readText(path$1.join(templatesRoot(deps), id, METADATA_FILE_NAME));
-	if (text === void 0) return void 0;
-	const match = /^name[ \t]*:[ \t]*(.+)$/m.exec(text);
-	if (match === null) return void 0;
-	return match[1].trim().replace(/^['"]|['"]$/g, "");
-}
-/**
-* 列出包里带模板的预设 id（面板"对比模板"下拉的选项）。只读目录，不抛。
-* @param deps - 路径注入（测试用）。
-* @returns 按 id 排序的模板清单（读不到目录时为空数组）。
-*/
-function listTemplates(deps = {}) {
-	let entries;
-	try {
-		entries = fs.readdirSync(templatesRoot(deps), { withFileTypes: true });
-	} catch {
-		return [];
-	}
-	return entries.filter((entry) => entry.isDirectory()).map((entry) => entry.name).filter((id) => fs.existsSync(path$1.join(templatesRoot(deps), id, COMPOSITION_FILE_NAME))).sort().map((id) => {
-		const name = templateName(id, deps);
-		return name === void 0 ? { id } : {
-			id,
-			name
-		};
-	});
-}
-/** 读一份模板的组合文件；不存在返回 undefined。 */
-function readTemplateComposition(templateId, deps = {}) {
-	return readText(path$1.join(templatesRoot(deps), templateId, COMPOSITION_FILE_NAME));
-}
 /**
-* 比较两份组合文件文本（纯函数，只读）。
-* @param presetText - 所选预设的原文。
-* @param templateText - 所选模板的原文。
+* 比较两份 `config.plugins`（纯函数，只读）。
+* @param presetPlugins - 所选 preset 生效的 plugins。
+* @param templatePlugins - 所选模板的 plugins（随包声明）。
 * @returns 两个状态点与弹窗需要的全部数据。
 */
-function compareCompositions(presetText, templateText) {
-	const analysis = analyzePresetComposition(presetText);
+function comparePlugins(presetPlugins, templatePlugins) {
+	if (!isRowList(presetPlugins) || !isRowList(templatePlugins)) return UNREADABLE_COMPARISON;
+	const analysis = analyzePlugins(presetPlugins);
 	if (analysis.shape === "unrecognized") return UNREADABLE_COMPARISON;
-	const delta = presetDelta(presetText, templateText, {
+	const delta = presetDelta(presetPlugins, templatePlugins, {
 		conflictIds: [],
 		limit: Number.MAX_SAFE_INTEGER
 	});
@@ -6673,19 +6110,420 @@ function compareCompositions(presetText, templateText) {
 		items: delta.items
 	};
 }
+//#endregion
+//#region src/presets/plan.ts
+/** 生效的 plugins（覆盖优先）。 */
+function effectivePlugins$1(input) {
+	const plugins = input.effective?.plugins;
+	return isRowList(plugins) ? plugins : void 0;
+}
+/**
+* 判定一个动作该不该写、会改什么。
+* @param input - 判定所需的事实。
+* @returns 计划；`noop` 时调用方**不要**调用 `configEditor.edit`。
+*/
+function planPresetAction(input) {
+	if (input.action === "revert") {
+		if (!input.customized) return {
+			kind: "noop",
+			reason: "this preset carries no profile override to remove"
+		};
+		return { kind: "revert" };
+	}
+	if (input.action === "align") {
+		if (!input.ours) return {
+			kind: "noop",
+			reason: "only presets this plugin declares can be aligned"
+		};
+		if (input.templateId === void 0) return {
+			kind: "noop",
+			reason: "align needs a template id"
+		};
+		if (!isRowList(input.templatePlugins)) return {
+			kind: "noop",
+			reason: `template ${input.templateId} has no readable plugin list`
+		};
+		if (sameValue(input.templatePlugins, input.inherited?.plugins)) {
+			if (!input.customized) return {
+				kind: "noop",
+				reason: "this preset already matches the bundled declaration"
+			};
+			return { kind: "revert" };
+		}
+		if (sameValue(input.templatePlugins, input.effective?.plugins)) return {
+			kind: "noop",
+			reason: `this preset already matches template ${input.templateId}`
+		};
+		return { kind: "align" };
+	}
+	const plugins = effectivePlugins$1(input);
+	if (plugins === void 0) return {
+		kind: "noop",
+		reason: "the plugin list is not a readable row list, nothing was written"
+	};
+	if (analyzePlugins(plugins).conflicts.length === 0) return {
+		kind: "noop",
+		reason: "no official tool row needs disabling"
+	};
+	const { changes } = disableConflicts(plugins);
+	if (changes.length === 0) return {
+		kind: "noop",
+		reason: "no official tool row needs disabling"
+	};
+	return {
+		kind: "upgrade",
+		changes
+	};
+}
+//#endregion
+//#region src/presets/status.ts
+/** 生效的 plugins：宿主的生效 config 优先，回落到覆盖层、再回落到随包声明。 */
+function effectivePlugins(facts) {
+	if (facts.effective?.plugins !== void 0) return facts.effective.plugins;
+	const overridePlugins = facts.override?.plugins;
+	if (overridePlugins !== void 0) return overridePlugins;
+	return facts.inherited?.plugins;
+}
+/** 覆盖里是不是真带了内容（`{}` 表示没有覆盖行）。 */
+function isCustomized(facts) {
+	return facts.override !== void 0 && Object.keys(facts.override).length > 0;
+}
+/**
+* 把一个 preset 折成面板状态。
+* @param facts - 宿主收集的原始事实。
+* @param templateIds - 随包声明的模板清单（用于"与随包声明是否一致"）。
+* @returns 面板状态行。
+*/
+function toPresetStatus(facts, templateIds) {
+	const plugins = effectivePlugins(facts);
+	const analysis = analyzePlugins(plugins);
+	const customized = isCustomized(facts);
+	const rows = isRowList(plugins) ? flattenRows(plugins).size : 0;
+	const templateDiffers = facts.ours && templateIds.includes(facts.id) && isRowList(plugins) && isRowList(facts.inherited?.plugins) && presetDelta(plugins, facts.inherited?.plugins, { limit: Number.MAX_SAFE_INTEGER }).total > 0;
+	const templateDelta = templateDiffers ? presetDelta(plugins, facts.inherited?.plugins) : void 0;
+	const delta = templateDelta !== void 0 && templateDelta.total > 0 ? templateDelta : void 0;
+	return {
+		id: facts.id,
+		...facts.entryId === void 0 ? {} : { entryId: facts.entryId },
+		...facts.name === void 0 ? {} : { name: facts.name },
+		...facts.description === void 0 ? {} : { description: facts.description },
+		source: facts.ours ? "ours" : "other",
+		isDefault: facts.isDefault,
+		conflicts: analysis.conflicts,
+		clean: analysis.clean,
+		unrecognized: analysis.shape === "unrecognized",
+		...facts.broken === void 0 ? {} : { broken: facts.broken },
+		customized,
+		templateDiffers,
+		...delta === void 0 ? {} : { templateDelta: delta },
+		rowCount: rows
+	};
+}
+/**
+* 列出每个事实的状态，并给出模板清单。
+* @param facts - 宿主收集的原始事实（顺序即面板顺序）。
+* @param writable - 本部署有没有可编辑的 profile（`configEditor` 是否在场）。
+* @returns `presets/status` 的完整返回值。
+*/
+function listPresetStatuses$1(facts, writable) {
+	const templateIds = facts.filter((item) => item.ours).map((item) => item.id);
+	const templates = facts.filter((item) => item.ours).map((item) => item.name === void 0 ? { id: item.id } : {
+		id: item.id,
+		name: item.name
+	});
+	return {
+		presets: facts.map((item) => toPresetStatus(item, templateIds)),
+		templates,
+		writable
+	};
+}
 /**
-* 读盘版比较：预设一侧用 roster 给的组合文件路径，模板一侧按 id 去包里找。
-* 任一侧读不到都返回 `unreadable` —— 那是面板要渲染的红点，不是调用失败。
-* @param presetPath - 所选预设的组合文件绝对路径（来自 roster）。
-* @param templateId - 所选模板的 id。
-* @param deps - 路径注入（测试用）。
-* @returns 比较结果。
+* 取某个模板声明的 plugins（面板"对比 / 对齐"的右侧）。
+* @param facts - 同一个事实集合。
+* @param templateId - 模板 id（本插件声明的某个 preset）。
+* @returns 该模板的 plugins；不是我们的模板时 undefined。
 */
-function comparePresetFile(presetPath, templateId, deps = {}) {
-	const presetText = readText(presetPath);
-	const templateText = readTemplateComposition(templateId, deps);
-	if (presetText === void 0 || templateText === void 0) return UNREADABLE_COMPARISON;
-	return compareCompositions(presetText, templateText);
+function templatePlugins(facts, templateId) {
+	return facts.find((item) => item.ours && item.id === templateId)?.inherited?.plugins;
+}
+//#endregion
+//#region src/host/preset-host.ts
+/**
+* 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
+*/
+/** Narrow a non-empty string, else undefined. */
+function text(value) {
+	return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+/** `{ key: value }` only when the value is present, so optional fields stay absent. */
+function optional(key, value) {
+	return value === void 0 ? {} : { [key]: value };
+}
+/** Read a service only when it actually looks like the one we need. */
+function configEditorOf(ctx) {
+	const service = ctx.get("configEditor");
+	return service !== void 0 && typeof service.edit === "function" && typeof service.configuration === "function" ? service : void 0;
+}
+/** Read the preset registry roster only when it exposes one of its two readers. */
+async function rosterOf(ctx) {
+	const service = ctx.get("agentPresets");
+	if (service === void 0) return void 0;
+	try {
+		if (typeof service.remoteExportList === "function") {
+			const exported = await service.remoteExportList();
+			if (Array.isArray(exported?.presets)) return exported.presets;
+		}
+		if (typeof service.list === "function") return await service.list();
+		return;
+	} catch {
+		return;
+	}
+}
+/**
+* Collect every declared preset this deployment can see.
+*
+* Ordering is OURS FIRST (the panel's primary subject), then the rest in the
+* registry's own order — which the registry sorts by each declaration's `order`.
+* @param ctx - context used to resolve the services.
+* @returns the facts, the editor (when present) and the row→entry map.
+*/
+async function collect(ctx) {
+	const editor = configEditorOf(ctx);
+	const roster = await rosterOf(ctx);
+	const byId = /* @__PURE__ */ new Map();
+	const entries = /* @__PURE__ */ new Map();
+	if (editor !== void 0) for (const row of editor.configuration()) {
+		const entryId = text(row.entry.options.id);
+		if (entryId === void 0 || !entryId.startsWith("preset-")) continue;
+		const effective = row.entry.options.config ?? {};
+		const id = text(row.inherited.id) ?? text(row.override.id) ?? text(effective.id) ?? entryId.slice(7);
+		entries.set(entryId, row.entry);
+		byId.set(id, {
+			id,
+			entryId,
+			...optional("name", text(row.inherited.name) ?? text(effective.name)),
+			...optional("description", text(row.inherited.description) ?? text(effective.description)),
+			isDefault: false,
+			effective,
+			inherited: row.inherited,
+			override: row.override,
+			ours: BUNDLED_PRESET_IDS.includes(id)
+		});
+	}
+	const rosterOrder = [];
+	for (const row of roster ?? []) {
+		const id = text(row.id);
+		if (id === void 0) continue;
+		rosterOrder.push(id);
+		const existing = byId.get(id);
+		byId.set(id, {
+			id,
+			...existing?.entryId === void 0 ? {} : { entryId: existing.entryId },
+			...optional("name", text(row.name) ?? existing?.name),
+			...optional("description", text(row.description) ?? existing?.description),
+			isDefault: row.isDefault === true,
+			...optional("broken", text(row.broken)),
+			...existing?.effective === void 0 ? {} : { effective: existing.effective },
+			...existing?.inherited === void 0 ? {} : { inherited: existing.inherited },
+			...existing?.override === void 0 ? {} : { override: existing.override },
+			ours: BUNDLED_PRESET_IDS.includes(id)
+		});
+	}
+	const ours = BUNDLED_PRESET_IDS.map((id) => byId.get(id) ?? {
+		id,
+		isDefault: false,
+		ours: true
+	});
+	const others = rosterOrder.filter((id) => !BUNDLED_PRESET_IDS.includes(id)).map((id) => byId.get(id)).filter((fact) => fact !== void 0);
+	return {
+		facts: [...ours, ...others],
+		editor,
+		entries
+	};
+}
+/**
+* The pre-0.1.7 user preset directory, reported ONLY as a cleanup hint.
+*
+* dsh reads no directory any more ("Definitions are ordinary plugin rows; the
+* registry neither scans directories nor accepts preset paths"), so a leftover
+* `$DSH_HOME/.agent-presets` is dead weight. We surface its path so the panel can
+* tell the user it is safe to delete; we never read or write presets through it.
+* @returns the absolute path when the directory exists and holds entries.
+*/
+function legacyPresetRoot() {
+	const home = process.env.DSH_HOME?.trim() || join(homedir(), ".dsh");
+	const dir = join(home, ".agent-presets");
+	try {
+		return readdirSync(dir).length > 0 ? dir : void 0;
+	} catch {
+		return;
+	}
+}
+/**
+* This plugin's own version, for the backup file name.
+*
+* Probes two candidates because the module URL differs between the built single
+* file (`lib/index.mjs` → `../package.json` is the package root) and the source
+* tree under test (`src/host/…` → `../../package.json`). Falls back to
+* `'unknown'` rather than failing an action over a cosmetic label.
+* @returns the version string, or `'unknown'`.
+*/
+function pluginVersion() {
+	for (const candidate of ["../package.json", "../../package.json"]) try {
+		const raw = JSON.parse(readFileSync(fileURLToPath(new URL(candidate, import.meta.url)), "utf8"));
+		if (typeof raw.version === "string" && raw.version.length > 0) return raw.version;
+	} catch {}
+	return "unknown";
+}
+/**
+* Copy the profile patch aside before we change it.
+*
+* The config editor already gives us atomicity and rollback, but NOT a durable
+* "what it looked like before" artifact — and `align` overwrites content the
+* user may have written there. This restores the pre-0.1.10 affordance exactly:
+* one `<patch>.bak-<plugin version>` beside the patch, written once and never
+* overwritten, so the earliest pre-change state survives repeated actions.
+* @param documentPath - the profile patch the editor is about to rewrite.
+* @returns the backup path, or undefined when there was nothing to copy.
+*/
+function backupProfilePatch(documentPath) {
+	if (!existsSync(documentPath)) return void 0;
+	const target = `${documentPath}.bak-${pluginVersion()}`;
+	if (existsSync(target)) return target;
+	copyFileSync(documentPath, target);
+	return target;
+}
+/** One failure in the gateway's shape. */
+function failure(reason) {
+	return {
+		ok: false,
+		changed: false,
+		reason,
+		changes: []
+	};
+}
+/**
+* Answer `presets/status`.
+* @param ctx - context used to resolve the config editor and the registry.
+* @returns the panel's full status payload.
+*/
+async function listPresetStatuses(ctx) {
+	const { facts, editor } = await collect(ctx);
+	const list = listPresetStatuses$1(facts, editor !== void 0);
+	const legacy = legacyPresetRoot();
+	return legacy === void 0 ? list : {
+		...list,
+		legacyPresetRoot: legacy
+	};
+}
+/**
+* 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.
+*/
+async function applyPresetAction(ctx, presetId, action, templateId) {
+	try {
+		const { facts, editor, entries } = await collect(ctx);
+		const fact = facts.find((item) => item.id === presetId);
+		if (fact === void 0) return failure(`unknown preset: ${presetId}`);
+		const wanted = templateId === void 0 ? void 0 : templatePlugins(facts, templateId);
+		const plan = planPresetAction({
+			action,
+			ours: fact.ours,
+			customized: fact.override !== void 0 && Object.keys(fact.override).length > 0,
+			effective: fact.effective,
+			inherited: fact.inherited,
+			...wanted === void 0 ? {} : { templatePlugins: wanted },
+			...templateId === void 0 ? {} : { templateId }
+		});
+		if (plan.kind === "noop") return {
+			ok: true,
+			changed: false,
+			reason: plan.reason,
+			changes: []
+		};
+		if (editor === void 0) return failure("this deployment has no editable profile: ctx.configEditor is unavailable");
+		const entry = fact.entryId === void 0 ? void 0 : entries.get(fact.entryId);
+		if (entry === void 0) return failure(`this profile has no addressable row for ${presetId} (expected id ${profileRowId(presetId)}); install the plugin as a profile bundle so its patch declares the preset`);
+		const backupPath = backupProfilePatch(editor.documentPath);
+		if (plan.kind === "revert") await editor.edit(entry, (_current, inherited) => inherited);
+		else if (plan.kind === "align") await editor.edit(entry, (current) => ({
+			...current,
+			plugins: wanted
+		}));
+		else await editor.edit(entry, (current) => {
+			if (!isRowList(current.plugins)) return current;
+			return {
+				...current,
+				plugins: disableConflicts(current.plugins).plugins
+			};
+		});
+		return {
+			ok: true,
+			changed: true,
+			...backupPath === void 0 ? {} : { backupPath },
+			changes: plan.kind === "upgrade" ? plan.changes : []
+		};
+	} catch (error) {
+		return failure(error instanceof Error ? error.message : String(error));
+	}
+}
+/**
+* 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.
+*/
+async function comparePresetAgainstTemplate(ctx, presetId, templateId) {
+	const empty = {
+		presetId,
+		templateId,
+		status: "unreadable",
+		conflicts: [],
+		identical: false,
+		yoursCount: 0,
+		behindCount: 0,
+		items: []
+	};
+	try {
+		const { facts } = await collect(ctx);
+		const fact = facts.find((item) => item.id === presetId);
+		if (fact === void 0) return empty;
+		const template = templatePlugins(facts, templateId);
+		if (template === void 0) return empty;
+		return {
+			presetId,
+			templateId,
+			...comparePlugins(fact.effective?.plugins, template)
+		};
+	} catch {
+		return empty;
+	}
 }
 //#endregion
 //#region src/web/host/bash.ts
@@ -11558,7 +11396,7 @@ let specialHandlersPromise;
 * requires a special handler, so we keep them out of the cold-startup graph.
 */
 function loadSpecialHandlers() {
-	specialHandlersPromise ??= import("./scrapers-mhvFrvjH.mjs").then((m) => m.specialHandlers);
+	specialHandlersPromise ??= import("./scrapers-DODCPcZW.mjs").then((m) => m.specialHandlers);
 	return specialHandlersPromise;
 }
 /**
@@ -23738,19 +23576,11 @@ function apply(ctx, config = {}) {
 	const disposeBrowserProbe = installBrowserProbeRpc(ctx, {
 		getRmSafe: () => cfg.rmSafe,
 		presets: {
-			listStatuses: (roster) => listPresetStatuses(roster),
-			applyAction: (id, action, templateId) => applyPresetAction(id, action, {}, templateId),
-			listTemplates: () => listTemplates(),
-			comparePreset: (preset, templateId) => comparePresetFile(preset.path, templateId)
+			listPresets: (presetCtx) => listPresetStatuses(presetCtx),
+			applyAction: (presetCtx, id, action, templateId) => applyPresetAction(presetCtx, id, action, templateId),
+			comparePreset: (presetCtx, presetId, templateId) => comparePresetAgainstTemplate(presetCtx, presetId, templateId)
 		}
 	});
-	try {
-		const { created, failed } = ensureDefaultPresets();
-		if (created.length > 0) runtimeLogger().info(`preset templates installed: ${created.join(", ")}`);
-		for (const item of failed) runtimeLogger().warn(`preset template ${item.id} not installed: ${item.reason}`);
-	} catch (error) {
-		runtimeLogger().warn(`preset bootstrap skipped: ${error instanceof Error ? error.message : String(error)}`);
-	}
 	ctx.systemPrompt.section({
 		name: "tool:bash",
 		order: 105,
@@ -23928,72 +23758,47 @@ function apply(ctx, config = {}) {
 				...commandEnv
 			};
 			const jobs = ctx.get("jobs");
+			const owner = exec.agent?.id;
 			const backgroundSlotsAvailable = () => {
 				if (jobs === void 0 || cfg.maxBackgroundJobs <= 0) return true;
-				return jobs.list(exec.agent).filter((j) => j.status === "running" || j.status === "stopping").length < cfg.maxBackgroundJobs;
-			};
-			const startManagedJob = () => {
-				const managed = startBashJob({
-					sessionId,
-					command,
-					cwd: commandCwd,
-					timeoutMs: args.timeoutMs ?? 0,
-					env,
-					config: cfg
-				});
-				let settled = false;
-				let settledSpillPath;
-				managed.completion.then((value) => {
-					settled = true;
-					settledSpillPath = value.output.spillPath;
-				}, () => {
-					settled = true;
-					settledSpillPath = void 0;
-				});
-				return {
-					hooks: {
-						...managed.hooks,
-						readOutput: () => {
-							const text = managed.hooks.readOutput?.() ?? "";
-							return settled ? applyConfiguredTruncation(text, settledSpillPath, cfg.outputTruncate) : text;
-						}
-					},
-					completion: managed.completion
-				};
+				return jobs.list(owner).filter((j) => j.status === "running" || j.status === "stopping").length < cfg.maxBackgroundJobs;
 			};
+			const startManagedJob = (job) => startBashJob({
+				sessionId,
+				command,
+				cwd: commandCwd,
+				timeoutMs: args.timeoutMs ?? 0,
+				env,
+				config: cfg,
+				...job !== void 0 ? { job } : {},
+				formatCompletion: (text, spillPath) => applyConfiguredTruncation(text, spillPath, cfg.outputTruncate)
+			});
+			const jobSpec = (run) => ({
+				kind: "bash",
+				label: command,
+				...owner !== void 0 ? { owner } : {},
+				...Number.isSafeInteger(cfg.outputMaxBytes) && cfg.outputMaxBytes > 0 ? { outputLimitBytes: cfg.outputMaxBytes } : {},
+				run
+			});
 			if (args.run_in_background === true) {
 				if (!cfg.enableRunInBackground) throw new Error("run_in_background is disabled for this deployment (enableRunInBackground: false)");
 				if (jobs === void 0) throw new Error("background jobs unavailable: load @deepseek-ai/dsh-jobs and @deepseek-ai/dsh-tool-jobs");
 				if (!backgroundSlotsAvailable()) throw new Error(`background jobs at capacity (maxBackgroundJobs: ${cfg.maxBackgroundJobs})`);
 				if (exec.signal.aborted) throw abortError();
-				let managed;
 				return {
 					kind: "background",
-					jobId: jobs.start({
-						kind: "bash",
-						label: command,
-						...exec.agent !== void 0 ? { owner: exec.agent } : {},
-						run: () => {
-							managed = startManagedJob();
-							return managed.hooks;
-						}
-					})
+					jobId: jobs.start(jobSpec((job) => startManagedJob(job).hooks))
 				};
 			}
 			if (cfg.autoBackgroundMs > 0 && jobs !== void 0 && backgroundSlotsAvailable() && !exec.signal.aborted) {
-				const autoBgWaitMs = timeoutMs === 0 ? cfg.autoBackgroundMs : Math.max(0, Math.min(cfg.autoBackgroundMs, timeoutMs - 1e3));
+				const autoBgWaitMs = Math.max(1, timeoutMs === 0 ? cfg.autoBackgroundMs : Math.min(cfg.autoBackgroundMs, timeoutMs - 1e3));
 				let managed;
 				let id;
 				try {
-					id = jobs.start({
-						kind: "bash",
-						label: command,
-						...exec.agent !== void 0 ? { owner: exec.agent } : {},
-						run: () => {
-							managed = startManagedJob();
-							return managed.hooks;
-						}
-					});
+					id = jobs.start(jobSpec((job) => {
+						managed = startManagedJob(job);
+						return managed.hooks;
+					}));
 				} catch {
 					const startedAt = performance.now();
 					const result = await executeBash(command, {
@@ -24025,34 +23830,23 @@ function apply(ctx, config = {}) {
 					if (result.workingDir !== void 0) state.cwd = result.workingDir;
 					return buildForeground(result, performance.now() - startedAt, timeoutMs);
 				}
-				const completion = managed.completion;
-				const window = await Promise.race([
-					completion.then((value) => ({
-						kind: "completed",
-						value
-					})),
-					new Promise((resolve) => {
-						setTimeout(() => resolve({ kind: "window" }), autoBgWaitMs).unref?.();
-					}),
-					new Promise((_, reject) => {
-						if (exec.signal.aborted) {
-							reject(abortError());
-							return;
-						}
-						exec.signal.addEventListener("abort", () => reject(abortError()), { once: true });
-					})
-				]);
-				if (window.kind === "window") return {
+				let settled = false;
+				try {
+					const view = await jobs.wait(id, autoBgWaitMs, owner, exec.signal);
+					settled = view.status !== "running" && view.status !== "stopping";
+				} catch {
+					jobs.kill(id, owner, "tool call aborted");
+					await jobs.wait(id, Math.max(1e3, timeoutMs), owner);
+					throw abortError();
+				}
+				if (!settled) return {
 					kind: "background",
 					jobId: id
 				};
-				if (window.kind === "aborted") {
-					jobs.kill(id, exec.agent, "tool call aborted");
-					throw abortError();
-				}
-				jobs.read(id, exec.agent);
-				if (window.value.workingDir !== void 0) state.cwd = window.value.workingDir;
-				return window.value;
+				const value = await managed.completion;
+				jobs.remove(id, owner);
+				if (value.workingDir !== void 0) state.cwd = value.workingDir;
+				return value;
 			}
 			const startedAt = performance.now();
 			const result = await executeBash(command, {