@khorsheed/dsh-local-agent-dsh 0.2.0 → 0.2.2

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/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/tool.d.ts

@@ -0,0 +1,52 @@
+/**
+ * The session-granted `subagent_dsh` delegation tool — this package's
+ * `./tool` composition entry (the worktrees 0.3.0 / room 0.2.0 fold pattern)
+ * for agent-preset compositions. The row provides NO service (the
+ * preset-mount isolate-realm rule forbids service rows); it registers the
+ * model-facing tool into the host tools registry through the family factory
+ * (`@khorsheed/dsh-local-agent/tool-factory`), delegating to the `dsh-cli`
+ * provider this package's main row registers at the profile root — the
+ * official tool-row shape (the shipped `tool-bash` rows work the same way).
+ * Granting is therefore per-session: a preset names the row
+ * (`- id: tool-subagent-dsh / name: '@khorsheed/dsh-local-agent-dsh/tool'`),
+ * its sessions get the tool; every other preset's sessions do not.
+ *
+ * This row replaced the dsh package's own dynamic mount: the tool used to
+ * mount at the profile root while the card's 启用 switch was on, which granted
+ * every session. With the switch gone (the harness is always registered), the
+ * tool follows the other providers — a preset names the row to grant it.
+ *
+ * @module @khorsheed/dsh-local-agent-dsh/tool
+ */
+import type { Context } from '@deepseek-ai/cordis';
+import type z from '@deepseek-ai/schemastery';
+/** Cordis plugin name used by loader diagnostics. */
+export declare 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.
+ */
+export declare const inject: string[];
+/** Config: every field optional, defaulting to THIS provider's own values. */
+export interface Config {
+    /** The `ctx.subagents` provider name to delegate to (default `dsh-cli`). */
+    provider?: string;
+    /** Model-facing tool name (default `subagent_dsh`). */
+    toolName?: string;
+}
+export declare const Config: z;
+/**
+ * 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).
+ */
+export declare function apply(ctx: Context, config: Config): void;
+//# sourceMappingURL=tool.d.ts.map

package/lib/types/tool.js

@@ -0,0 +1,34 @@
+import { mountSubagentDelegationTool, subagentToolConfigSchema } from '@khorsheed/dsh-local-agent/tool-factory';
+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. */
+export 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.
+ */
+export const inject = ['tools', 'subagents', 'localAgent'];
+// Bare `z` annotation per the shared helper's variance note.
+export 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).
+ */
+export function apply(ctx, config) {
+    const resolved = {
+        provider: config.provider ?? DEFAULT_PROVIDER,
+        toolName: config.toolName ?? DEFAULT_TOOL_NAME,
+    };
+    mountSubagentDelegationTool(ctx, resolved, PACKAGE_NAME);
+}

package/package.json

@@ -8,7 +8,7 @@
     "local-agent",
     "subagent"
   ],
-  "version": "0.2.0",
+  "version": "0.2.2",
   "type": "module",
   "main": "lib/index.js",
   "types": "lib/types/index.d.ts",
@@ -29,6 +29,10 @@
       "types": "./lib/types/dsh-cli-provider.d.ts",
       "default": "./lib/dsh-cli-provider.js"
     },
+    "./tool": {
+      "types": "./lib/types/tool.d.ts",
+      "default": "./lib/tool.js"
+    },
     "./client": {
       "types": "./lib/types/client/index.d.ts",
       "default": "./lib/client.js"
@@ -36,7 +40,8 @@
     "./src/*": "./src/*",
     "./cordis.patch.yml": "./cordis.patch.yml",
     "./package.json": "./package.json",
-    "./locale/*.json": "./locale/*.json"
+    "./locale/*.json": "./locale/*.json",
+    "./tool/locale/*.json": "./locale/*.json"
   },
   "dsh": {
     "references": [
@@ -75,8 +80,8 @@
     "dsh": ">=0.1.5-rc.1 <0.3.0-0"
   },
   "dependencies": {
-    "@khorsheed/dsh-local-agent": "^0.2.0",
-    "@khorsheed/dsh-local-agent-dsh-headless": "^0.2.0",
+    "@khorsheed/dsh-local-agent": "^0.2.2",
+    "@khorsheed/dsh-local-agent-dsh-headless": "^0.2.2",
     "js-yaml": "^4.3.1"
   },
   "peerDependencies": {