@khorsheed/dsh-local-agent-dsh 0.1.0-rc.8 → 0.2.0-rc.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # 变更记录
 
+## 0.2.0-rc.1（2026-09-30）
+
+- **家族折叠：`subagent_dsh` 改挂家族核的 `./tool-factory`**。开关 ON 时的动态挂载从已退役的 `@khorsheed/dsh-local-agent-tool-subagent` 包改为 `@khorsheed/dsh-local-agent/tool-factory` 的 `mountSubagentDelegationTool`（内联插件对象，owner 传本包包名），行为与生命周期不变（设置开关独占挂载/卸载）。依赖同步移除。
+
+## 0.1.0-rc.9（2026-09-30）
+
+- **修复同款跨实例 home 回退**：`defaultPresetRoot()` 的兜底从硬编码 `~/.dsh-official` 改为非空白 `$DSH_HOME` → `~/.dsh`（官方 `resolveDshHome` 优先级），桌面 app 上不再误读其他实例的 preset 根
+
 ## 0.1.0-rc.8（2026-09-30）
 
 家族同版联动：加宽 `@deepseek-ai/dsh-*` peer 区间以覆盖宿主 0.2.0（0.2.0 的兼容闸会禁用 peer 区间不覆盖宿主版本的已装插件）。无功能变更。

package/lib/client.js

@@ -255,30 +255,30 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var ProviderAuthBlock_module_css_default = {
+			"rowHead": "On5p7W_rowHead",
+			"rows": "On5p7W_rows",
+			"rowTag": "On5p7W_rowTag",
+			"status": "On5p7W_status",
 			"intro": "On5p7W_intro",
 			"section": "On5p7W_section",
-			"dotOff": "On5p7W_dotOff",
-			"dotOn": "On5p7W_dotOn",
-			"rosterError": "On5p7W_rosterError",
-			"loginButton": "On5p7W_loginButton",
+			"rowCard": "On5p7W_rowCard",
 			"title": "On5p7W_title",
 			"dotPending": "On5p7W_dotPending",
-			"rowHead": "On5p7W_rowHead",
-			"rowName": "On5p7W_rowName",
-			"rowCard": "On5p7W_rowCard",
-			"rowPending": "On5p7W_rowPending",
-			"rowIdentity": "On5p7W_rowIdentity",
-			"status": "On5p7W_status",
-			"rowActions": "On5p7W_rowActions",
-			"credentialDot": "On5p7W_credentialDot",
+			"rosterError": "On5p7W_rosterError",
+			"retryButton": "On5p7W_retryButton",
 			"loginPrompt": "On5p7W_loginPrompt",
 			"codeInput": "On5p7W_codeInput",
+			"logoutButton": "On5p7W_logoutButton",
+			"loginButton": "On5p7W_loginButton",
+			"rowActions": "On5p7W_rowActions",
 			"promptText": "On5p7W_promptText",
-			"rows": "On5p7W_rows",
+			"rowPending": "On5p7W_rowPending",
 			"openPage": "On5p7W_openPage",
-			"rowTag": "On5p7W_rowTag",
-			"retryButton": "On5p7W_retryButton",
-			"logoutButton": "On5p7W_logoutButton"
+			"dotOff": "On5p7W_dotOff",
+			"dotOn": "On5p7W_dotOn",
+			"credentialDot": "On5p7W_credentialDot",
+			"rowName": "On5p7W_rowName",
+			"rowIdentity": "On5p7W_rowIdentity"
 		};
 		//#endregion
 		//#region ../local-agent/src/client/ProviderAuthBlock.tsx
@@ -553,8 +553,8 @@ window.__ModuleLoader__.load({
 		var AuthStatusDot_module_css_default = {
 			"dotOn": "OFjNUG_dotOn",
 			"credentialDot": "OFjNUG_credentialDot",
-			"dotPending": "OFjNUG_dotPending",
-			"dotOff": "OFjNUG_dotOff"
+			"dotOff": "OFjNUG_dotOff",
+			"dotPending": "OFjNUG_dotPending"
 		};
 		//#endregion
 		//#region ../local-agent/src/client/AuthStatusDot.tsx
@@ -580,40 +580,40 @@ window.__ModuleLoader__.load({
 			document.head.appendChild(tag);
 		}
 		var SettingsCard_module_css_default = {
-			"modelItemCurrent": "_3LBPpW_modelItemCurrent",
-			"headText": "_3LBPpW_headText",
-			"modelMenuChevronOpen": "_3LBPpW_modelMenuChevronOpen",
-			"chevron": "_3LBPpW_chevron",
-			"hint": "_3LBPpW_hint",
+			"modelMenuButton": "_3LBPpW_modelMenuButton",
+			"modelMenuUp": "_3LBPpW_modelMenuUp",
 			"modelField": "_3LBPpW_modelField",
-			"body": "_3LBPpW_body",
+			"modelItemLabel": "_3LBPpW_modelItemLabel",
+			"modelSave": "_3LBPpW_modelSave",
+			"chevron": "_3LBPpW_chevron",
+			"modelItemCurrent": "_3LBPpW_modelItemCurrent",
 			"switch": "_3LBPpW_switch",
-			"header": "_3LBPpW_header",
-			"rowLabel": "_3LBPpW_rowLabel",
+			"name": "_3LBPpW_name",
 			"modelMenuChevron": "_3LBPpW_modelMenuChevron",
-			"modelSave": "_3LBPpW_modelSave",
-			"description": "_3LBPpW_description",
-			"card": "_3LBPpW_card",
+			"row": "_3LBPpW_row",
 			"cardOpen": "_3LBPpW_cardOpen",
+			"block": "_3LBPpW_block",
 			"saved": "_3LBPpW_saved",
-			"modelItemLabel": "_3LBPpW_modelItemLabel",
-			"info": "_3LBPpW_info",
-			"row": "_3LBPpW_row",
+			"card": "_3LBPpW_card",
+			"rowLabel": "_3LBPpW_rowLabel",
+			"headText": "_3LBPpW_headText",
+			"modelInput": "_3LBPpW_modelInput",
 			"modelItemDefault": "_3LBPpW_modelItemDefault",
-			"nameRow": "_3LBPpW_nameRow",
+			"body": "_3LBPpW_body",
 			"chevronOpen": "_3LBPpW_chevronOpen",
-			"modelItemCheck": "_3LBPpW_modelItemCheck",
-			"switchOn": "_3LBPpW_switchOn",
-			"block": "_3LBPpW_block",
-			"modelInput": "_3LBPpW_modelInput",
-			"name": "_3LBPpW_name",
-			"modelMenuUp": "_3LBPpW_modelMenuUp",
-			"knob": "_3LBPpW_knob",
-			"errorText": "_3LBPpW_errorText",
 			"blockTitle": "_3LBPpW_blockTitle",
+			"errorText": "_3LBPpW_errorText",
+			"nameRow": "_3LBPpW_nameRow",
+			"modelMenuChevronOpen": "_3LBPpW_modelMenuChevronOpen",
 			"modelMenu": "_3LBPpW_modelMenu",
-			"modelMenuButton": "_3LBPpW_modelMenuButton",
-			"modelItem": "_3LBPpW_modelItem"
+			"modelItem": "_3LBPpW_modelItem",
+			"modelItemCheck": "_3LBPpW_modelItemCheck",
+			"header": "_3LBPpW_header",
+			"info": "_3LBPpW_info",
+			"knob": "_3LBPpW_knob",
+			"description": "_3LBPpW_description",
+			"switchOn": "_3LBPpW_switchOn",
+			"hint": "_3LBPpW_hint"
 		};
 		//#endregion
 		//#region src/client/SettingsCard.tsx

package/lib/index.js

@@ -5,7 +5,7 @@ import { join } from "node:path";
 import z from "@deepseek-ai/schemastery";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
 import { ModelDirectoryCache, extendModelDirectory, settingsFace, vol } from "@khorsheed/dsh-local-agent";
-import * as toolModule from "@khorsheed/dsh-local-agent-tool-subagent";
+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
@@ -445,6 +445,32 @@ const DSH_SETTINGS_NAMESPACE = "local-agent-dsh";
 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). Duplicated from src/invariant.ts, 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);
+	}
+};
 /** Resolve the sub-dsh credential or report unconfigured. */
 async function resolveApiKey(ctx, config) {
 	return ctx.credentials.resolve(credentialRef(config.apiKeyRef ?? "DEEPSEEK_API_KEY"));
@@ -593,10 +619,7 @@ function apply(ctx, config) {
 				if (currentLiveSwitch === liveSwitch) currentLiveSwitch = void 0;
 				liveSwitch.dispose();
 			});
-			ctx.plugin(toolModule, {
-				provider: "dsh-cli",
-				toolName: DSH_TOOL_NAME
-			}).then((fiber) => {
+			ctx.plugin(dshSubagentTool).then((fiber) => {
 				if (gen !== generation) {
 					fiber.dispose();
 					return;

package/lib/provision.js

@@ -558,11 +558,15 @@ function snapshotScopePreset(homeDir, presetRoot, id, options = {}) {
 *
 * The roster's own derivation, repeated here because the provisioning paths
 * that heal a scope (a host round, a live runtime) have no settings service
-* in reach: the harness home from the environment, else the installation
-* default.
+* in reach: a non-blank `$DSH_HOME`, else the `~/.dsh` installation default
+* (the precedence of `resolveDshHome` in `@deepseek-ai/dsh-home-paths` —
+* the default was once hardcoded to `.dsh-official`, pointing a desktop
+* instance at another instance's home; 2026-09-30).
 */
 function defaultPresetRoot() {
-	return join(process.env["DSH_HOME"] ?? join(homedir(), ".dsh-official"), USER_PRESET_DIR);
+	const fromEnv = process.env["DSH_HOME"];
+	const home = fromEnv !== void 0 && fromEnv.trim().length > 0 ? fromEnv : join(homedir(), ".dsh");
+	return join(home, USER_PRESET_DIR);
 }
 /**
 * Provision one scope: its own preset copy, its declaration, and the

package/lib/types/index.js

@@ -26,7 +26,7 @@ import { join } from 'node:path';
 import z from '@deepseek-ai/schemastery';
 import { credentialRef } from '@deepseek-ai/dsh-credentials';
 import { settingsFace, vol } from '@khorsheed/dsh-local-agent';
-import * as toolModule from '@khorsheed/dsh-local-agent-tool-subagent';
+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';
@@ -97,6 +97,25 @@ export const DSH_SETTINGS_NAMESPACE = 'local-agent-dsh';
 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). Duplicated from src/invariant.ts, 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);
+    },
+};
 /** Resolve the sub-dsh credential or report unconfigured. */
 async function resolveApiKey(ctx, config) {
     return ctx.credentials.resolve(credentialRef(config.apiKeyRef ?? 'DEEPSEEK_API_KEY'));
@@ -322,7 +341,7 @@ export function apply(ctx, config) {
             });
             // The family delegation tool is mounted dynamically so the toggle owns
             // its lifecycle — while OFF the model never sees `subagent_dsh`.
-            void ctx.plugin(toolModule, { provider: 'dsh-cli', toolName: DSH_TOOL_NAME }).then((fiber) => {
+            void ctx.plugin(dshSubagentTool).then((fiber) => {
                 if (gen !== generation) {
                     void fiber.dispose();
                     return;

package/lib/types/provision.d.ts

@@ -334,8 +334,10 @@ export declare function snapshotScopePreset(homeDir: string, presetRoot: string,
  *
  * The roster's own derivation, repeated here because the provisioning paths
  * that heal a scope (a host round, a live runtime) have no settings service
- * in reach: the harness home from the environment, else the installation
- * default.
+ * in reach: a non-blank `$DSH_HOME`, else the `~/.dsh` installation default
+ * (the precedence of `resolveDshHome` in `@deepseek-ai/dsh-home-paths` —
+ * the default was once hardcoded to `.dsh-official`, pointing a desktop
+ * instance at another instance's home; 2026-09-30).
  */
 export declare function defaultPresetRoot(): string;
 /** Per-scope inputs {@link provisionDshScope} takes. */

package/lib/types/provision.js

@@ -613,11 +613,15 @@ export function snapshotScopePreset(homeDir, presetRoot, id, options = {}) {
  *
  * The roster's own derivation, repeated here because the provisioning paths
  * that heal a scope (a host round, a live runtime) have no settings service
- * in reach: the harness home from the environment, else the installation
- * default.
+ * in reach: a non-blank `$DSH_HOME`, else the `~/.dsh` installation default
+ * (the precedence of `resolveDshHome` in `@deepseek-ai/dsh-home-paths` —
+ * the default was once hardcoded to `.dsh-official`, pointing a desktop
+ * instance at another instance's home; 2026-09-30).
  */
 export function defaultPresetRoot() {
-    return join(process.env['DSH_HOME'] ?? join(homedir(), '.dsh-official'), USER_PRESET_DIR);
+    const fromEnv = process.env['DSH_HOME'];
+    const home = fromEnv !== undefined && fromEnv.trim().length > 0 ? fromEnv : join(homedir(), '.dsh');
+    return join(home, USER_PRESET_DIR);
 }
 /**
  * Provision one scope: its own preset copy, its declaration, and the

package/package.json

@@ -8,7 +8,7 @@
     "local-agent",
     "subagent"
   ],
-  "version": "0.1.0-rc.8",
+  "version": "0.2.0-rc.1",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",
@@ -73,9 +73,8 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@khorsheed/dsh-local-agent": "^0.1.0-rc.8",
-    "@khorsheed/dsh-local-agent-dsh-headless": "^0.1.0-rc.8",
-    "@khorsheed/dsh-local-agent-tool-subagent": "^0.1.0-rc.8"
+    "@khorsheed/dsh-local-agent": "^0.2.0-rc.1",
+    "@khorsheed/dsh-local-agent-dsh-headless": "^0.2.0-rc.1"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",