@khorsheed/dsh-local-agent-dsh 0.2.0-rc.3 → 0.2.1

package/lib/dsh-cli-provider.js

@@ -1,3 +1,3 @@
-import { a as MEMBER_BRIDGE_ENTRY_ENV, c as dshTextTask, d as startDshCliRun, i as DshCliProvider, l as registerMemberRun, n as DEFAULT_DISPOSE_GRACE_MS, o as dshCliVersion, r as DEFAULT_LIVE_MIRROR_INTERVAL_MS, s as dshLaunchArgv, t as CONTAINER_NODE_OPTIONS, u as resolveApiKey } from "./dsh-cli-provider-B7s3zH0m.js";
+import { a as MEMBER_BRIDGE_ENTRY_ENV, c as dshTextTask, d as startDshCliRun, i as DshCliProvider, l as registerMemberRun, n as DEFAULT_DISPOSE_GRACE_MS, o as dshCliVersion, r as DEFAULT_LIVE_MIRROR_INTERVAL_MS, s as dshLaunchArgv, t as CONTAINER_NODE_OPTIONS, u as resolveApiKey } from "./dsh-cli-provider-DYRuRpVz.js";
 import "./provision.js";
 export { CONTAINER_NODE_OPTIONS, DEFAULT_DISPOSE_GRACE_MS, DEFAULT_LIVE_MIRROR_INTERVAL_MS, DshCliProvider, MEMBER_BRIDGE_ENTRY_ENV, dshCliVersion, dshLaunchArgv, dshTextTask, registerMemberRun, resolveApiKey, startDshCliRun };

package/lib/index.js

@@ -1,11 +1,10 @@
-import { f as DEFAULT_LIVE_IDLE_MS, h as localModelLaunch, i as DshCliProvider, m as canInheritModelProvider, o as dshCliVersion, p as DshLiveDriver, t as CONTAINER_NODE_OPTIONS } from "./dsh-cli-provider-B7s3zH0m.js";
+import { f as DEFAULT_LIVE_IDLE_MS, h as localModelLaunch, i as DshCliProvider, m as canInheritModelProvider, o as dshCliVersion, p as DshLiveDriver, t as CONTAINER_NODE_OPTIONS } from "./dsh-cli-provider-DYRuRpVz.js";
 import { DEFAULT_SUB_PROFILE_NAME, provisionDshScope } from "./provision.js";
 import { listDshSessions } from "./records.js";
 import { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import z from "@deepseek-ai/schemastery";
 import { ModelDirectoryCache, extendModelDirectory, settingsFace, vol } from "@khorsheed/dsh-local-agent";
-import { mountSubagentDelegationTool } from "@khorsheed/dsh-local-agent/tool-factory";
 //#region lib/types/live-switch.js
 /**
 * The settings-driven live-driver switch: owns the active driver generation
@@ -404,7 +403,7 @@ const inject = [
 */
 const SETTINGS_FIELDS = {
 	enabled: z.boolean().default(false),
-	live: z.boolean().default(false),
+	live: z.boolean().default(true),
 	liveMirrorGranularity: z.union([z.const("event"), z.const("token")]).default("token"),
 	model: z.string(),
 	recentModels: z.array(z.string()).default([])
@@ -446,34 +445,6 @@ const DSH_SETTINGS_NAMESPACE = "local-agent-dsh";
 * the YAML config's deployment defaults through the composition base.
 */
 const DSH_SETTINGS_SCHEMA = z.object(SETTINGS_FIELDS);
-/** The delegation tool the toggle mounts while ON. */
-const DSH_TOOL_NAME = "subagent_dsh";
-/**
-* This package's own name, passed to the family tool factory as the
-* tool-origin owner (AGENTS.md § Tool origin tagging — a shared factory never
-* hardcodes an owner), the same pattern the worktrees/room `./tool` entries
-* use.
-*/
-const PACKAGE_NAME = "@khorsheed/dsh-local-agent-dsh";
-/**
-* The `subagent_dsh` mount, as a plugin object over the family factory: the
-* toggle owns its lifecycle, so it mounts dynamically through `ctx.plugin`
-* instead of shipping a `./tool` composition row like the CLI providers.
-*/
-const dshSubagentTool = {
-	name: "local-agent-dsh-tool",
-	inject: [
-		"tools",
-		"subagents",
-		"localAgent"
-	],
-	apply: (toolCtx) => {
-		mountSubagentDelegationTool(toolCtx, {
-			provider: "dsh-cli",
-			toolName: DSH_TOOL_NAME
-		}, PACKAGE_NAME);
-	}
-};
 /**
 * Mount the toggle controller: register the settings namespace, then mirror
 * its value into harness/provider/tool registrations, live.
@@ -485,7 +456,7 @@ function apply(ctx, config) {
 	ctx.effect(() => {
 		const readSettings = () => ({
 			enabled: vol(config.enabled) ?? false,
-			live: vol(config.live) ?? false,
+			live: vol(config.live) ?? true,
 			liveMirrorGranularity: vol(config.liveMirrorGranularity) ?? "token",
 			model: vol(config.model),
 			recentModels: vol(config.recentModels) ?? []
@@ -502,6 +473,7 @@ function apply(ctx, config) {
 		}
 		const face = settingsFace(ctx, {
 			namespace: DSH_SETTINGS_NAMESPACE,
+			harness: "dsh",
 			legacySchema: DSH_SETTINGS_SCHEMA,
 			legacyBase,
 			read: readSettings
@@ -620,7 +592,6 @@ function apply(ctx, config) {
 			if (enabled === currentEnabled) return;
 			currentEnabled = enabled;
 			generation += 1;
-			const gen = generation;
 			for (const dispose of disposers.splice(0)) dispose();
 			if (!enabled) return;
 			provisionDshScope(homeDir, config, profileDirOption());
@@ -632,25 +603,10 @@ function apply(ctx, config) {
 				if (currentLiveSwitch === liveSwitch) currentLiveSwitch = void 0;
 				liveSwitch.dispose();
 			});
-			ctx.plugin(dshSubagentTool).then((fiber) => {
-				if (gen !== generation) {
-					fiber.dispose();
-					return;
-				}
-				disposers.push(() => {
-					fiber.dispose();
-				});
-			}, (error) => {
-				ctx.logger.warn(`local-agent-dsh: delegation tool mount failed: ${error instanceof Error ? error.message : String(error)}`);
-			});
 		};
-		sync(face.get().enabled);
-		const unwatch = face.watch((next) => {
-			sync(next.enabled);
-		});
+		sync(true);
 		return () => {
 			modelCatalog.dispose();
-			unwatch();
 			generation += 1;
 			for (const dispose of disposers.splice(0)) dispose();
 		};

package/lib/tool.js

@@ -0,0 +1,40 @@
+import { mountSubagentDelegationTool, subagentToolConfigSchema } from "@khorsheed/dsh-local-agent/tool-factory";
+//#region lib/types/tool.js
+const PACKAGE_NAME = "@khorsheed/dsh-local-agent-dsh";
+/** This entry's own defaults: a preset row needs no config. */
+const DEFAULT_PROVIDER = "dsh-cli";
+const DEFAULT_TOOL_NAME = "subagent_dsh";
+/** Cordis plugin name used by loader diagnostics. */
+const name = "local-agent-dsh-tool";
+/**
+* The family core's `localAgent` service is a declared inject (the
+* owning-family companion exception to the community-service probe rule): a
+* preset's standing scope mounts at registry-activation time, BEFORE the
+* profile's later bundle rows provide the core, so a one-shot ctx.get probe
+* at apply saw ABSENT there and nothing re-ran the row (rc.1 boot order; the
+* worktrees `./tool` entry documents the incident). The declared inject pends
+* the row until the core provides, then the body applies.
+*/
+const inject = [
+	"tools",
+	"subagents",
+	"localAgent"
+];
+const Config = subagentToolConfigSchema(DEFAULT_PROVIDER, DEFAULT_TOOL_NAME);
+/**
+* Plugin body: mount the delegation tool through the family factory, stamped
+* with THIS package as the tool-origin owner (AGENTS.md § Tool origin
+* tagging — the shared factory never hardcodes an owner).
+* @param ctx - Cordis context (the preset's agent-plane mount).
+* @param config - row config (schema defaults already applied; the `??`
+* fallbacks cover a direct ctx.plugin caller that bypassed validation).
+*/
+function apply(ctx, config) {
+	const resolved = {
+		provider: config.provider ?? DEFAULT_PROVIDER,
+		toolName: config.toolName ?? DEFAULT_TOOL_NAME
+	};
+	mountSubagentDelegationTool(ctx, resolved, PACKAGE_NAME);
+}
+//#endregion
+export { Config, apply, inject, name };

package/lib/types/client/SettingsCard.js

@@ -78,7 +78,11 @@ function useCardState(active, useSettings, scope, harnessModel, t) {
     const write = (field, value) => {
         setSaved(false);
         setError(false);
-        void scope.set(field, value).then(() => { setSaved(true); }, () => { setError(true); });
+        // The host answers a refused write with `false` (ConfigForm), not a rejection.
+        void scope.set(field, value).then((accepted) => { if (accepted === false)
+            setError(true);
+        else
+            setSaved(true); }, () => { setError(true); });
     };
     // The suggestion vocabulary: the broker's deduped union (settings + host
     // default selection + recent) when the surface answered, the card's own
@@ -152,13 +156,13 @@ function useCardState(active, useSettings, scope, harnessModel, t) {
 }
 /** The card body both settings surfaces share: the auth block, the delegation switch, the default-model block, and the resident-mode block. */
 function CardBody({ state, auth, authT, renderModelPicker, useSessions, t }) {
-    const { snapshot, saved, error, ready, enabled, live, storedModel, modelValue, modelSaved, modelError, choices, modelMenuOpen, modelMenuUp, modelFieldRef, modelPlaceholder, modelDefaultItem, saveModel, write, toggleModelMenu, setModelDraft, setModelMenuOpen, } = state;
+    const { snapshot, saved, error, ready, live, storedModel, modelValue, modelSaved, modelError, choices, modelMenuOpen, modelMenuUp, modelFieldRef, modelPlaceholder, modelDefaultItem, saveModel, write, toggleModelMenu, setModelDraft, setModelMenuOpen, } = state;
     // The free-text input, single-sourced for both presentations: bare when no
     // vocabulary exists (a fresh install degrades to exactly the pre-picker
     // field), or inside the select-like field next to its chevron. No datalist:
     // the chevron menu is the single choice list.
     const modelInputElement = (_jsx("input", { type: "text", className: css.modelInput, value: modelValue, placeholder: modelPlaceholder, "aria-label": t('model.title'), disabled: !ready, onChange: (event) => { setModelDraft(event.target.value); } }));
-    return (_jsxs("div", { className: css.body, children: [_jsxs("section", { className: css.block, children: [_jsx("h3", { className: css.blockTitle, children: t('auth.title') }), _jsx(ProviderAuthBlock, { harness: { id: 'dsh', label: 'dsh' }, useSessions: useSessions, status: auth.status, runCommand: auth.runCommand, t: authT }), _jsx("span", { className: css.hint, children: t('auth.host') })] }), _jsxs("section", { className: css.block, children: [_jsx("h3", { className: css.blockTitle, children: t('enable.title') }), _jsxs("div", { className: css.row, children: [_jsx("span", { className: css.rowLabel, children: t('enable.switch') }), _jsx("button", { type: "button", role: "switch", "aria-checked": enabled, "aria-label": t('enable.switch.aria'), className: enabled ? `${css.switch} ${css.switchOn}` : css.switch, disabled: !ready, onClick: () => { write('enabled', !enabled); }, children: _jsx("span", { className: css.knob }) })] }), _jsx("span", { className: css.hint, children: t(enabled ? 'enable.on' : 'enable.off') })] }), _jsxs("section", { className: css.block, children: [_jsxs("h3", { className: css.blockTitle, children: [t('model.title'), _jsx(Tooltip, { label: t('model.info'), side: "bottom", maxWidth: 360, children: _jsx("button", { type: "button", className: css.info, "aria-label": t('model.info.aria'), children: "\u24D8" }) })] }), _jsxs("div", { className: css.row, children: [renderModelPicker?.({ value: modelValue, onChange: setModelDraft, disabled: !ready, defaultLabel: modelDefaultItem }) ?? (choices.length > 0 ? (_jsxs("div", { className: css.modelField, ref: modelFieldRef, children: [modelInputElement, _jsx("button", { type: "button", className: css.modelMenuButton, "aria-label": t('model.menu'), "aria-haspopup": "menu", "aria-expanded": modelMenuOpen, disabled: !ready, onClick: () => { toggleModelMenu(); }, children: _jsx(IconChevronDownOutlineMedium, { className: modelMenuOpen ? `${css.modelMenuChevron} ${css.modelMenuChevronOpen}` : css.modelMenuChevron }) }), modelMenuOpen && (_jsxs("div", { className: modelMenuUp ? `${css.modelMenu} ${css.modelMenuUp}` : css.modelMenu, role: "menu", "aria-label": t('model.menu'), children: [_jsxs("button", { type: "button", role: "menuitemradio", "aria-checked": modelValue.trim() === '', className: modelValue.trim() === '' ? `${css.modelItemDefault} ${css.modelItemCurrent}` : css.modelItemDefault, onClick: () => { setModelDraft(''); setModelMenuOpen(false); }, children: [_jsx("span", { className: css.modelItemLabel, children: modelDefaultItem }), _jsx("span", { className: css.modelItemCheck, "aria-hidden": true, children: modelValue.trim() === '' ? '✓' : '' })] }), choices.map(choice => (_jsxs("button", { type: "button", role: "menuitemradio", "aria-checked": choice === modelValue, className: choice === modelValue ? css.modelItemCurrent : css.modelItem, onClick: () => { setModelDraft(choice); setModelMenuOpen(false); }, children: [_jsx("span", { className: css.modelItemLabel, children: choice }), _jsx("span", { className: css.modelItemCheck, "aria-hidden": true, children: choice === modelValue ? '✓' : '' })] }, choice)))] }))] })) : modelInputElement), _jsx("button", { type: "button", className: css.modelSave, disabled: !ready || modelValue.trim() === storedModel, onClick: () => { saveModel(); }, children: t('model.save') })] }), modelSaved && _jsx("span", { className: css.saved, children: t('model.applied') }), modelError && _jsx("span", { className: css.errorText, children: t('model.error') })] }), _jsxs("section", { className: css.block, children: [_jsxs("div", { className: css.row, children: [_jsxs("span", { className: css.rowLabel, children: [t('live.title'), _jsx(Tooltip, { label: t('live.info'), side: "bottom", maxWidth: 360, children: _jsx("button", { type: "button", className: css.info, "aria-label": t('live.info.aria'), children: "\u24D8" }) })] }), _jsx("button", { type: "button", role: "switch", "aria-checked": live, "aria-label": t('live.title'), className: live ? `${css.switch} ${css.switchOn}` : css.switch, disabled: !ready, onClick: () => { write('live', !live); }, children: _jsx("span", { className: css.knob }) })] }), snapshot.status === 'unavailable' && (_jsx("span", { className: css.hint, children: t('live.unavailable') }))] }), saved && _jsx("span", { className: css.saved, children: t('live.applied') }), error && _jsx("span", { className: css.errorText, children: t('live.error') })] }));
+    return (_jsxs("div", { className: css.body, children: [_jsxs("section", { className: css.block, children: [_jsx("h3", { className: css.blockTitle, children: t('auth.title') }), _jsx(ProviderAuthBlock, { harness: { id: 'dsh', label: 'dsh' }, useSessions: useSessions, status: auth.status, runCommand: auth.runCommand, t: authT }), _jsx("span", { className: css.hint, children: t('auth.host') })] }), _jsxs("section", { className: css.block, children: [_jsxs("h3", { className: css.blockTitle, children: [t('model.title'), _jsx(Tooltip, { label: t('model.info'), side: "bottom", maxWidth: 360, children: _jsx("button", { type: "button", className: css.info, "aria-label": t('model.info.aria'), children: "\u24D8" }) })] }), _jsxs("div", { className: css.row, children: [renderModelPicker?.({ value: modelValue, onChange: setModelDraft, disabled: !ready, defaultLabel: modelDefaultItem }) ?? (choices.length > 0 ? (_jsxs("div", { className: css.modelField, ref: modelFieldRef, children: [modelInputElement, _jsx("button", { type: "button", className: css.modelMenuButton, "aria-label": t('model.menu'), "aria-haspopup": "menu", "aria-expanded": modelMenuOpen, disabled: !ready, onClick: () => { toggleModelMenu(); }, children: _jsx(IconChevronDownOutlineMedium, { className: modelMenuOpen ? `${css.modelMenuChevron} ${css.modelMenuChevronOpen}` : css.modelMenuChevron }) }), modelMenuOpen && (_jsxs("div", { className: modelMenuUp ? `${css.modelMenu} ${css.modelMenuUp}` : css.modelMenu, role: "menu", "aria-label": t('model.menu'), children: [_jsxs("button", { type: "button", role: "menuitemradio", "aria-checked": modelValue.trim() === '', className: modelValue.trim() === '' ? `${css.modelItemDefault} ${css.modelItemCurrent}` : css.modelItemDefault, onClick: () => { setModelDraft(''); setModelMenuOpen(false); }, children: [_jsx("span", { className: css.modelItemLabel, children: modelDefaultItem }), _jsx("span", { className: css.modelItemCheck, "aria-hidden": true, children: modelValue.trim() === '' ? '✓' : '' })] }), choices.map(choice => (_jsxs("button", { type: "button", role: "menuitemradio", "aria-checked": choice === modelValue, className: choice === modelValue ? css.modelItemCurrent : css.modelItem, onClick: () => { setModelDraft(choice); setModelMenuOpen(false); }, children: [_jsx("span", { className: css.modelItemLabel, children: choice }), _jsx("span", { className: css.modelItemCheck, "aria-hidden": true, children: choice === modelValue ? '✓' : '' })] }, choice)))] }))] })) : modelInputElement), _jsx("button", { type: "button", className: css.modelSave, disabled: !ready || modelValue.trim() === storedModel, onClick: () => { saveModel(); }, children: t('model.save') })] }), modelSaved && _jsx("span", { className: css.saved, children: t('model.applied') }), modelError && _jsx("span", { className: css.errorText, children: t('model.error') })] }), _jsxs("section", { className: css.block, children: [_jsxs("div", { className: css.row, children: [_jsxs("span", { className: css.rowLabel, children: [t('live.title'), _jsx(Tooltip, { label: t('live.info'), side: "bottom", maxWidth: 360, children: _jsx("button", { type: "button", className: css.info, "aria-label": t('live.info.aria'), children: "\u24D8" }) })] }), _jsx("button", { type: "button", role: "switch", "aria-checked": live, "aria-label": t('live.title'), className: live ? `${css.switch} ${css.switchOn}` : css.switch, disabled: !ready, onClick: () => { write('live', !live); }, children: _jsx("span", { className: css.knob }) })] }), snapshot.status === 'unavailable' && (_jsx("span", { className: css.hint, children: t('live.unavailable') }))] }), saved && _jsx("span", { className: css.saved, children: t('live.applied') }), error && _jsx("span", { className: css.errorText, children: t('live.error') })] }));
 }
 /**
  * The dsh harness settings card of the retired 0.1.5 plugin configuration

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

@@ -1,6 +1,6 @@
 /**
  * Generated by scripts/sync-icon-artwork.mts from @deepseek-ai/dsh-client-ui-primitives
- * (v0.1.7-rc.1, harness 46a7f68b09) — do not edit by hand. The 0.1.5 and rc.1 host lines
+ * (v0.2.1-rc.1, harness 1600d8a1e1) — do not edit by hand. The 0.1.5 and rc.1 host lines
  * share no icon export name, so the rc.1 artwork is inlined here: pure SVG,
  * no host runtime identity, identical on every line. Re-run the generator
  * after adding an icon import or bumping the harness checkout.

package/lib/types/client/index.js

@@ -1,4 +1,4 @@
-import { bindSettingsScope } from '@khorsheed/dsh-local-agent/src/client/settings-scope.ts';
+import { bindCardSettingsScope } from '@khorsheed/dsh-local-agent/src/client/settings-scope.ts';
 /**
  * Local-agent-dsh plugin, browser half: the dsh settings card — a section of
  * the family core's「本机 Agent 委派」family card on the Plugins page
@@ -45,7 +45,7 @@ export const inject = ['slots', 'remote', 'remote.commands', 'locale'];
 export function apply(ctx) {
     ctx.effect(() => ctx.locale.register(NS, { zh, en }), 'local-agent-dsh: dictionaries');
     const t = ctx.locale.bind(NS);
-    const scope = bindSettingsScope(ctx, 'local-agent-dsh');
+    const scope = bindCardSettingsScope(ctx, 'dsh', 'local-agent-dsh');
     // The auth block's copy lives in the family core's dictionary; binding is
     // stable per namespace and late dictionary registration still resolves.
     const authT = ctx.locale.bind('local-agent');

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

@@ -21,11 +21,6 @@ export declare const zh: {
     'model.applied': string;
     'model.error': string;
     'auth.host': string;
-    'enable.title': string;
-    'enable.switch': string;
-    'enable.switch.aria': string;
-    'enable.on': string;
-    'enable.off': string;
     'live.title': string;
     'live.info.aria': string;
     'live.info': string;
@@ -61,11 +56,6 @@ export declare const en: {
     'model.applied': string;
     'model.error': string;
     'auth.host': string;
-    'enable.title': string;
-    'enable.switch': string;
-    'enable.switch.aria': string;
-    'enable.on': string;
-    'enable.off': string;
     'live.title': string;
     'live.info.aria': string;
     'live.info': string;

package/lib/types/client/locales.js

@@ -21,11 +21,6 @@ export const zh = {
     'model.applied': '已保存，下一轮委派生效；进行中的轮次不受影响',
     'model.error': '保存失败，请重试',
     'auth.host': 'dsh 凭据走宿主实例的凭证设置，无需单独登录。',
-    'enable.title': 'DeepSeek 委派',
-    'enable.switch': '启用',
-    'enable.switch.aria': 'DeepSeek 委派开关',
-    'enable.on': '已开启：模型可使用 subagent_dsh 委派给本机 dsh',
-    'enable.off': '已关闭：委派只走官方内置子代理工具',
     'live.title': '常驻模式（live）',
     'live.info.aria': '常驻模式说明',
     'live.info': '常驻模式 = 成员进程常驻：输出实时流入成员会话、取消不杀进程、崩溃后自动续上原会话；关闭则每轮独立进程，跑完一次性出结果。设置为全局偏好，对所有后续委派生效。',
@@ -53,11 +48,6 @@ export const en = {
     'model.applied': 'Saved — takes effect on the next delegation round; rounds in flight are unaffected',
     'model.error': 'Save failed, please retry',
     'auth.host': 'dsh authenticates through the host instance’s credential settings — no separate sign-in.',
-    'enable.title': 'DeepSeek delegation',
-    'enable.switch': 'Enabled',
-    'enable.switch.aria': 'DeepSeek delegation switch',
-    'enable.on': 'ON: the model can delegate to the local dsh via subagent_dsh',
-    'enable.off': 'OFF: delegation goes through the official in-process subagent tool only',
     'live.title': 'Resident mode (live)',
     'live.info.aria': 'About resident mode',
     'live.info': 'Resident mode keeps the member process alive: output streams into the member session in real time, cancelling does not kill the process, and a crash resumes the same session. Off means every round runs as an independent one-shot process. The setting is global and applies to every later delegation.',

package/lib/types/dsh-cli-provider.js

@@ -15,11 +15,11 @@ import { randomUUID } from 'node:crypto';
 import { credentialRef } from '@deepseek-ai/dsh-credentials';
 import { SessionId } from '@deepseek-ai/dsh-session';
 import { NO_START_CAPABILITIES, SUBAGENT_DESCRIPTOR_VERSION, settleRunResult, subprocessRunHandle, } from '@deepseek-ai/dsh-subagent';
-import { assertResumeCwdUnchanged, assertResumeScopeUnchanged, resolveRoundModel, containerExecSpawn, containerScopedHome, delegationEnv, establishSubagentCatalogChild, probeCliVersion, resolveChildCwd, subagentDelegationLabel, } from '@khorsheed/dsh-local-agent';
+import { assertResumeCwdUnchanged, assertResumeScopeUnchanged, resolveRoundModel, containerExecSpawn, containerScopedHome, delegationEnv, establishSubagentCatalogChild, persistChildSession, probeCliVersion, resolveChildCwd, subagentDelegationLabel, } from '@khorsheed/dsh-local-agent';
 import { MEMBER_BRIDGE_SOCKET_ENV, MEMBER_BRIDGE_TOKEN_ENV } from '@khorsheed/dsh-local-agent/types';
 import { LiveChannelUnavailableError } from './live-driver.js';
 import { DEFAULT_SUB_PROFILE_NAME, provisionDshScope, unitSubProfileName } from './provision.js';
-import { mirrorDshSession } from './session-mirror.js';
+import { closeMirroredOpenStep, mirrorDshSession } from './session-mirror.js';
 /**
  * Spawn-env name carrying the bridge entry path into the sub-dsh process,
  * where the headless bundle's mcp-client row reads it (`!!js`). The name is a
@@ -685,39 +685,61 @@ export async function startDshCliRun(request, spec) {
         // reached its endpoint and produced an answer.
         if (settled.stopReason === 'completed')
             markCredentialVerified(ctx, spec.scope);
-        // The turn closes at the real settle moment, so the timing projection's
-        // duration equals the actual CLI runtime. Every terminal path closes the
-        // window — a failed or cancelled run settles 'error'/'aborted' instead of
-        // leaving the turn open with a distorted tiny duration.
-        if (spec.childSession !== undefined) {
-            if (settled.stopReason === 'completed') {
-                spec.childSession.append('turn/end', { turn, reason: { kind: 'completed' } });
-            }
-            else if (settled.stopReason === 'aborted') {
-                spec.childSession.append('turn/end', { turn, reason: { kind: 'aborted', reason: { kind: 'parent' } } });
-            }
-            else {
-                spec.childSession.append('turn/end', {
-                    turn,
-                    reason: { kind: 'error', error: { message: 'dsh exited before the run completed', code: 'UNKNOWN' } },
-                });
-            }
-        }
+        // The turn does NOT close here: turn/end lands in the mirror queue after
+        // the settle pass (see below), so every mirrored event precedes it in the
+        // stored log — the released-log reader rejects content outside an open
+        // turn on every cold read.
         return settled;
     });
     // After the child EXITS — however it ended (completed, killed by dispose, or
     // crashed) — mirror whatever the sub-dsh session already produced into the
     // dsh subagent session, so every round preserves its conversation and real
     // token usage instead of showing turn boundaries only. Waits for the settle
-    // chain first (so turn/end is already appended) AND for the process to
-    // actually exit (the sub-dsh flushed its session before exiting) before
-    // reading.
+    // chain first AND for the process to actually exit (the sub-dsh flushed its
+    // session before exiting) before reading. The turn closes INSIDE the mirror
+    // queue, after the settle pass: the copied tail's open step first receives
+    // its closure (an interrupted sub-dsh leaves its step — and any advertised
+    // tool calls — open, and the released-log reader rejects a turn/end over
+    // it), then turn/end lands and is persisted explicitly (the mirror's own
+    // persist skips a no-op pass, which is exactly the case that needs the
+    // boundary written). Every terminal path closes the window — a failed or
+    // cancelled run settles 'error'/'aborted' instead of leaving the turn open.
     void result.then(() => child.done).then(() => {
         if (spec.childSession !== undefined) {
             const childSession = spec.childSession;
             // The settle pass reports the final mirror count even when polling
             // already covered the round (empty delta): it is authoritative.
-            return enqueueMirror(() => mirrorAndReport(childSession, true));
+            return enqueueMirror(async () => {
+                const settled = await result;
+                try {
+                    await mirrorAndReport(childSession, true);
+                }
+                catch (error) {
+                    // The mirror degrades to a warn; the turn boundary still closes —
+                    // an open turn at EOF reads as an interrupted tail only until the
+                    // next resume round tries to open its turn over it.
+                    ctx.logger.warn(`subagent-dsh: settle mirror failed: ${error instanceof Error ? error.message : String(error)}`);
+                }
+                closeMirroredOpenStep(childSession);
+                // The turn closes at the real settle moment (plus the settle-mirror
+                // quiescence), so the timing projection's duration equals the actual
+                // CLI runtime.
+                if (settled.stopReason === 'completed') {
+                    childSession.append('turn/end', { turn, reason: { kind: 'completed' } });
+                }
+                else if (settled.stopReason === 'aborted') {
+                    childSession.append('turn/end', { turn, reason: { kind: 'aborted', reason: { kind: 'parent' } } });
+                }
+                else {
+                    childSession.append('turn/end', {
+                        turn,
+                        reason: { kind: 'error', error: { message: 'dsh exited before the run completed', code: 'UNKNOWN' } },
+                    });
+                }
+                await persistChildSession(ctx, childSession).catch((error) => {
+                    ctx.logger.warn(`subagent-dsh: turn/end persistence failed: ${error instanceof Error ? error.message : String(error)}`);
+                });
+            });
         }
         return undefined;
     }, () => { });

package/lib/types/index.js

@@ -26,7 +26,6 @@ import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import z from '@deepseek-ai/schemastery';
 import { settingsFace, vol } from '@khorsheed/dsh-local-agent';
-import { mountSubagentDelegationTool } from '@khorsheed/dsh-local-agent/tool-factory';
 import { CONTAINER_NODE_OPTIONS, DshCliProvider, dshCliVersion } from './dsh-cli-provider.js';
 import { DEFAULT_LIVE_IDLE_MS } from './live-driver.js';
 import { LiveDriverSwitch } from './live-switch.js';
@@ -57,7 +56,7 @@ export const inject = ['localAgent', 'subagents', 'subprocess', 'credentials', '
  */
 const SETTINGS_FIELDS = {
     enabled: z.boolean().default(false),
-    live: z.boolean().default(false),
+    live: z.boolean().default(true),
     liveMirrorGranularity: z.union([z.const('event'), z.const('token')]).default('token'),
     // `model` deliberately carries NO default: an unset key must resolve to
     // undefined, which is what keeps the pre-key behavior byte-identical.
@@ -97,27 +96,6 @@ export const DSH_SETTINGS_NAMESPACE = 'local-agent-dsh';
  * the YAML config's deployment defaults through the composition base.
  */
 const DSH_SETTINGS_SCHEMA = z.object(SETTINGS_FIELDS);
-/** The delegation tool the toggle mounts while ON. */
-const DSH_TOOL_NAME = 'subagent_dsh';
-/**
- * This package's own name, passed to the family tool factory as the
- * tool-origin owner (AGENTS.md § Tool origin tagging — a shared factory never
- * hardcodes an owner), the same pattern the worktrees/room `./tool` entries
- * use.
- */
-const PACKAGE_NAME = '@khorsheed/dsh-local-agent-dsh';
-/**
- * The `subagent_dsh` mount, as a plugin object over the family factory: the
- * toggle owns its lifecycle, so it mounts dynamically through `ctx.plugin`
- * instead of shipping a `./tool` composition row like the CLI providers.
- */
-const dshSubagentTool = {
-    name: 'local-agent-dsh-tool',
-    inject: ['tools', 'subagents', 'localAgent'],
-    apply: (toolCtx) => {
-        mountSubagentDelegationTool(toolCtx, { provider: 'dsh-cli', toolName: DSH_TOOL_NAME }, PACKAGE_NAME);
-    },
-};
 /**
  * Mount the toggle controller: register the settings namespace, then mirror
  * its value into harness/provider/tool registrations, live.
@@ -133,7 +111,7 @@ export function apply(ctx, config) {
         // card's writes without a reload.
         const readSettings = () => ({
             enabled: vol(config.enabled) ?? false,
-            live: vol(config.live) ?? false,
+            live: vol(config.live) ?? true,
             liveMirrorGranularity: vol(config.liveMirrorGranularity) ?? 'token',
             model: vol(config.model),
             recentModels: vol(config.recentModels) ?? [],
@@ -146,6 +124,8 @@ export function apply(ctx, config) {
         }
         const face = settingsFace(ctx, {
             namespace: DSH_SETTINGS_NAMESPACE,
+            // Card writes live in the harness's own store (card-settings.ts), never the profile patch.
+            harness: 'dsh',
             legacySchema: DSH_SETTINGS_SCHEMA,
             legacyBase,
             read: readSettings,
@@ -326,7 +306,6 @@ export function apply(ctx, config) {
                 return;
             currentEnabled = enabled;
             generation += 1;
-            const gen = generation;
             for (const dispose of disposers.splice(0))
                 dispose();
             if (!enabled)
@@ -353,20 +332,13 @@ export function apply(ctx, config) {
                     currentLiveSwitch = undefined;
                 liveSwitch.dispose();
             });
-            // The family delegation tool is mounted dynamically so the toggle owns
-            // its lifecycle — while OFF the model never sees `subagent_dsh`.
-            void ctx.plugin(dshSubagentTool).then((fiber) => {
-                if (gen !== generation) {
-                    void fiber.dispose();
-                    return;
-                }
-                disposers.push(() => { void fiber.dispose(); });
-            }, (error) => {
-                ctx.logger.warn(`local-agent-dsh: delegation tool mount failed: ${error instanceof Error ? error.message : String(error)}`);
-            });
+            // The delegation tool is this package's `./tool` entry, granted per
+            // session by a preset (src/tool.ts) — never mounted at the profile root.
         };
-        sync(face.get().enabled);
-        const unwatch = face.watch((next) => { sync(next.enabled); });
+        // Always on: installing the plugin is the intent (the card's 启用 switch
+        // is gone); a preset still decides which sessions see `subagent_dsh`.
+        sync(true);
+        const unwatch = () => { };
         return () => {
             modelCatalog.dispose();
             unwatch();

package/lib/types/live-driver.js

@@ -28,7 +28,7 @@ import { LIVE_SERVER_NAME, LIVE_WIRE_PROTOCOL_VERSION, } from '@khorsheed/dsh-lo
 import { DEFAULT_DISPOSE_GRACE_MS, dshLaunchArgv, dshTextTask, registerMemberRun, } from './dsh-cli-provider.js';
 import { localModelLaunch } from './model-launch.js';
 import { DEFAULT_SUB_PROFILE_NAME, provisionDshScope } from './provision.js';
-import { mirrorDshLiveEvent, mirrorDshSession } from './session-mirror.js';
+import { mirrorDshLiveEvent, mirrorDshSession, closeMirroredOpenStep, mirroredOpenStep } from './session-mirror.js';
 /** Default idle lifetime of an unused resident runtime before reclaim. */
 export const DEFAULT_LIVE_IDLE_MS = 30 * 60_000;
 /** Default timeout for a wire request acknowledgement. */
@@ -785,7 +785,13 @@ export class DshLiveDriver {
         }).then(async (settled) => {
             roundSettled = true;
             liveFlush.dispose();
-            if (turnOpened && streaming !== undefined && streamPublisher !== undefined) {
+            // The interrupted stream's partial content folds durably only while its
+            // step is still OPEN: a graceful sub-dsh unwind writes its own
+            // interrupted assistant/message and step/end (both crossed the wire),
+            // and an append at the closed step would fail the released-log reader.
+            const openStep = turnOpened ? mirroredOpenStep(childSession) : undefined;
+            if (turnOpened && streaming !== undefined && streamPublisher !== undefined
+                && openStep !== undefined && openStep.step === streaming.step) {
                 const blocks = streaming.assembler.interruptedBlocks();
                 if (blocks.length > 0) {
                     childSession.append('assistant/message', {
@@ -798,22 +804,6 @@ export class DshLiveDriver {
                 }
             }
             streamPublisher?.dispose();
-            // Identical turn/end bookkeeping to the exec path — but only for a turn
-            // that actually opened (a pre-accept cancel records no turn at all).
-            if (turnOpened) {
-                if (settled.stopReason === 'completed') {
-                    childSession.append('turn/end', { turn, reason: { kind: 'completed' } });
-                }
-                else if (settled.stopReason === 'aborted') {
-                    childSession.append('turn/end', { turn, reason: { kind: 'aborted', reason: { kind: 'parent' } } });
-                }
-                else {
-                    childSession.append('turn/end', {
-                        turn,
-                        reason: { kind: 'error', error: nativeFailure ?? { message: 'the live round did not complete', code: 'UNKNOWN' } },
-                    });
-                }
-            }
             // Settlement clears the round's handlers: a late notification drops at
             // the runtime frame instead of landing in a dead closure.
             if (runtime !== undefined) {
@@ -821,24 +811,18 @@ export class DshLiveDriver {
                 runtime.onEvent = undefined;
                 runtime.onIdle = undefined;
             }
-            // A completed answer is not a durable turn until its final boundary
-            // and any closing stream checkpoints have reached the child store.
             if (turnOpened) {
-                persist();
-                await persistQueue;
-            }
-            return settled;
-        });
-        // Settle reconciliation: the file-based mirror pass (the serve side flushed
-        // before its idle notification) dedupes against the live-mirrored prefix
-        // and catches anything the wire dropped; the final mirror progress report
-        // is authoritative, exactly as in the exec path. Then re-arm the reaper. A
-        // round that never opened owns no span — skip the pass entirely (it would
-        // re-scan the previous round or, under exec fallback, fight its polling).
-        void result.then(async () => {
-            try {
-                if (turnOpened) {
-                    await persistQueue;
+                // Settle reconciliation IN-CHAIN: the file-based mirror pass (the serve
+                // side flushed before its idle notification) dedupes against the
+                // live-mirrored prefix and catches anything the wire dropped; the
+                // final mirror progress report is authoritative, exactly as in the
+                // exec path. It runs before turn/end so every mirrored event lands
+                // inside the turn window — the released-log reader rejects content
+                // outside an open turn on every cold read — and inside the result
+                // chain so the round serializer (and a resume round's turn/start)
+                // never overtakes the boundary. A mirror fault degrades to a warn;
+                // the boundary still closes.
+                try {
                     if (mirroredMessages > 0)
                         persist();
                     await persistQueue.catch(() => { });
@@ -863,13 +847,35 @@ export class DshLiveDriver {
                         registry?.recordRoundSettled?.(childSession.id, round);
                     }
                 }
+                catch (error) {
+                    this.ctx.logger.warn(`subagent-dsh: live settle mirror failed: ${thrown(error).message}`);
+                }
+                // The copied tail's open step (an interrupted round leaves it open —
+                // the reader rejects a turn/end over it) receives its closure first.
+                closeMirroredOpenStep(childSession);
+                // Identical turn/end bookkeeping to the exec path — a completed,
+                // interrupted, or failed round each closes its window.
+                if (settled.stopReason === 'completed') {
+                    childSession.append('turn/end', { turn, reason: { kind: 'completed' } });
+                }
+                else if (settled.stopReason === 'aborted') {
+                    childSession.append('turn/end', { turn, reason: { kind: 'aborted', reason: { kind: 'parent' } } });
+                }
+                else {
+                    childSession.append('turn/end', {
+                        turn,
+                        reason: { kind: 'error', error: nativeFailure ?? { message: 'the live round did not complete', code: 'UNKNOWN' } },
+                    });
+                }
+                // A completed answer is not a durable turn until its final boundary
+                // and any closing stream checkpoints have reached the child store.
+                persist();
+                await persistQueue;
             }
-            catch (error) {
-                this.ctx.logger.warn(`subagent-dsh: live settle mirror failed: ${thrown(error).message}`);
-            }
-            finally {
-                this.armIdleTimer(spec.sessionId);
-            }
+            // Re-arm the idle reaper for every settled round — including one that
+            // never opened its turn (the runtime is up and must not leak).
+            this.armIdleTimer(spec.sessionId);
+            return settled;
         });
         // Publication gate: hold start() until the turn is accepted (channel
         // errors still throw for the provider's exec fallback), but NEVER hold it