dsh-trellis 0.1.2 → 0.1.3

package/README.md

@@ -44,12 +44,12 @@ dsh plugin --profile headless add file:C:/path/to/dsh-trellis
 
 `file:` 插件会作为 profile 内的 pnpm 快照安装；拉取源码更新后，尤其是版本新增文件时，需要先 remove 再 add 刷新该 profile。
 
-配套要求：项目的 Trellis 平台需包含 dsh（`trellis init --dsh`，见 Trellis-DeepSeekHarness 适配分支），且 `.trellis/scripts` 需包含读取原生 `DSH_SESSION_ID` 的适配（已含在同一分支）。插件以 DSH `0.1.0-rc.8` 作为开发/测试基线；Host 功能的 peer dependency 下限仍是 `rc.6`，用于兼容已安装的旧 profile，Web 配置卡片则只在具备 settings/client surface 的 rc.8 profile 中加载。
+配套要求：项目的 Trellis 平台需包含 dsh（`trellis init --dsh`，见 Trellis-DeepSeekHarness 适配分支），且 `.trellis/scripts` 需包含读取原生 `DSH_SESSION_ID` 的适配（已含在同一分支）。v0.1.3 的 Host peer 范围显式覆盖 DSH `0.1.0-rc.6+`、`0.1.1-rc.1+` 与 `0.1.2-alpha.1+` 三条已知预发布线，避免 npm 的 prerelease 语义把新版 Host 误判为不兼容；Host 侧 Settings 桥同时兼容 rc.8 的包级 helper 与 alpha.2/alpha.3 的 provider 方法。本仓开发依赖仍固定在 `0.1.0-rc.8`，Web 配置卡片只在具备 settings/client surface 的 profile 中加载。
 
 ### DSH rc.8 对齐说明
 
 - 已采用：command lifecycle 的 `recordInput`、command attachment envelope 的 fail-closed 输入检查、`subagent/end` 的 run/provider/final-output 元数据、rc.8 的 report-before-settlement 与 idle-parent 原生唤醒语义。
-- 已接入：Host `dsh-trellis` settings namespace 与 `dsh.client` 浏览器卡片。保存值写入 DSH 的 `settings.yaml` 用户层，并实时重挂插件 runtime；rc.6 不具备该服务时自动退回原有 loader 配置，不影响 Host 插件加载。
+- 已接入：Host `dsh-trellis` settings namespace 与 `dsh.client` 浏览器卡片。保存值写入 DSH 的 `settings.yaml` 用户层，并实时重挂插件 runtime；settings provider 单独重载时退回 loader 配置，插件自身卸载时则不会错误重挂 runtime。没有 settings 服务的 profile 继续使用原有 loader 配置。DSH 0.1.2 alpha 已将可选 Settings 生命周期迁到 `settings.installSection()`；插件会在运行时选择对应 API，不再静态导入已移除的 helper。
 - 保持可选：`trellis_wait` 仍是“父会话还在当前轮里、需要明确同步点”时的工具；已经 yield 的父会话直接由 DSH 原生 settlement notice 唤醒。
 - 暂不接入：Agent Teams 在 rc.8 仍位于 `packages/experimental` 且不随正式 npm family 发布。Trellis 不应为此引入私有依赖；等它进入公开稳定面后再评估共享 task board / mailbox 映射。
 

package/lib/config.js

@@ -6,7 +6,7 @@
 import z from "@deepseek-ai/schemastery";
 
 export const Config = z.object({
-  /** Runtime master switch; the rc.8 settings namespace remains available for re-enabling. */
+  /** Runtime master switch; the settings namespace remains available for re-enabling. */
   enabled: z
     .boolean()
     .default(true)

package/lib/index.js

@@ -19,15 +19,17 @@
  *
  * @module dsh-trellis
  */
-import { isDeepStrictEqual } from "node:util";
-import { Config, resolveConfig } from "./config.js";
-import { createBreadcrumbComposer, isBreadcrumbMessage } from "./breadcrumb.js";
-import { registerCommands } from "./commands.js";
-import { registerSessionEnv } from "./session-env.js";
-import { registerWaitTool } from "./wait-tool.js";
-
-export const name = "dsh-trellis";
-export const SETTINGS_NAMESPACE = "dsh-trellis";
+import { isDeepStrictEqual } from "node:util";
+import * as settingsModule from "@deepseek-ai/dsh-settings";
+import { Config, resolveConfig } from "./config.js";
+import { createBreadcrumbComposer, isBreadcrumbMessage } from "./breadcrumb.js";
+import { registerCommands } from "./commands.js";
+import { registerSessionEnv } from "./session-env.js";
+import { installSettingsSectionCompat } from "./settings-compat.js";
+import { registerWaitTool } from "./wait-tool.js";
+
+export const name = "dsh-trellis";
+export const SETTINGS_NAMESPACE = "dsh-trellis";
 
 /** @type {string[]} */
 export const inject = ["commands", "shellEnv", "subagents", "tools"];
@@ -46,9 +48,10 @@ function sameBreadcrumbPayload(left, right) {
 }
 
 /** @param {import("@deepseek-ai/cordis").Context} ctx */
-export function apply(ctx, config = {}) {
-  let stopped = false;
-  let disposeRuntime = () => {};
+export function apply(ctx, config = {}) {
+  let stopped = false;
+  let disposeRuntime = () => {};
+  let currentConfig = () => config;
 
   const mountRuntime = (nextConfig) => {
     if (stopped) return;
@@ -74,37 +77,55 @@ export function apply(ctx, config = {}) {
     disposeRuntime = () => stopAll(disposers);
   };
 
-  // Keep the composition entry working when no settings provider is mounted.
-  // Once rc.8's settings service appears, its resolved section becomes the
-  // live source and a saved Web card edit remounts only this plugin's runtime.
-  ctx.effect(() => {
-    mountRuntime(config);
-    return () => {
-      stopped = true;
-      disposeRuntime();
+  // Keep the composition entry working when no settings provider is mounted.
+  // Once the service appears, its resolved section becomes the live source and
+  // a saved Web card edit remounts only this plugin's runtime.
+  ctx.effect(() => {
+    mountRuntime(currentConfig());
+    return () => {
+      stopped = true;
+      disposeRuntime();
     };
   }, "dsh-trellis.runtime");
 
-  // Optional by design: rc.6 profiles have no settings service and retain the
-  // loader-config behavior, while rc.8 Web profiles expose this namespace.
-  ctx.inject(["settings"], (settingsCtx) => {
-    const scope = settingsCtx.settings.register(
-      SETTINGS_NAMESPACE,
-      Config,
-      { base: config, applies: "live" },
-    );
-    const adopt = () => mountRuntime(scope.get());
-    adopt();
-    const unwatch = scope.watch(adopt);
-    settingsCtx.effect(
-      () => () => {
-        unwatch();
-        mountRuntime(config);
-      },
-      "dsh-trellis.settings",
-    );
-  });
-}
+  // Optional by design: profiles without a settings service retain the
+  // loader-config behavior. The canonical bridge also distinguishes a settings
+  // provider reload (fall back to config) from this plugin's own teardown
+  // (leave the runtime alone until its owning effect disposes it).
+  installSettingsSectionCompat(
+    ctx,
+    settingsModule,
+    SETTINGS_NAMESPACE,
+    Config,
+    config,
+    {
+      setSource(source) {
+        currentConfig = source;
+      },
+      onChange() {
+        mountRuntime(currentConfig());
+      },
+    },
+  );
+}
+
+/**
+ * Insert a breadcrumb without discarding decision metadata added by DSH or
+ * another pre-step participant (for example `startsRequestSeries`).
+ *
+ * @param {{ messages: unknown[], [key: string]: unknown }} decision
+ * @param {unknown[]} claimedMessages
+ * @param {unknown} desired
+ */
+export function insertBreadcrumbDecision(decision, claimedMessages, desired) {
+  const lastClaimedIndex = decision.messages.findLastIndex((message) =>
+    claimedMessages.includes(message),
+  );
+  return {
+    ...decision,
+    messages: decision.messages.toSpliced(lastClaimedIndex + 1, 0, desired),
+  };
+}
 
 function registerBreadcrumb(ctx, resolved) {
   const { compose } = createBreadcrumbComposer(resolved, ctx);
@@ -175,12 +196,6 @@ function registerBreadcrumb(ctx, resolved) {
     ) {
       return decision;
     }
-    const lastClaimedIndex = decision.messages.findLastIndex((message) =>
-      messages.includes(message),
-    );
-    return {
-      kind: "enter",
-      messages: decision.messages.toSpliced(lastClaimedIndex + 1, 0, desired),
-    };
-  });
-}
+    return insertBreadcrumbDecision(decision, messages, desired);
+  });
+}

package/lib/settings-compat.js

@@ -0,0 +1,50 @@
+/**
+ * Install an optional settings section across the two published DSH APIs.
+ *
+ * DSH through 0.1.1 exposes `installSettingsSection` as a package helper.
+ * The 0.1.2 alpha line moved the same lifecycle onto
+ * `SettingsProvider.installSection` and removed the helper export. A namespace
+ * import keeps this module loadable on both lines while the provider remains
+ * optional for profiles that do not mount settings.
+ *
+ * @param {import("@deepseek-ai/cordis").Context} ctx
+ * @param {{ installSettingsSection?: Function }} settingsModule
+ * @param {string} namespace
+ * @param {unknown} schema
+ * @param {unknown} entry
+ * @param {{ setSource: Function, onChange: Function, validate?: Function }} hooks
+ */
+export function installSettingsSectionCompat(
+  ctx,
+  settingsModule,
+  namespace,
+  schema,
+  entry,
+  hooks,
+) {
+  if (typeof settingsModule.installSettingsSection === "function") {
+    settingsModule.installSettingsSection(
+      ctx,
+      namespace,
+      schema,
+      entry,
+      hooks,
+    );
+    return;
+  }
+
+  ctx.inject(["settings"], (settingsCtx) => {
+    if (typeof settingsCtx.settings?.installSection !== "function") {
+      throw new TypeError(
+        "The mounted DSH settings service does not expose installSection().",
+      );
+    }
+    settingsCtx.settings.installSection(
+      ctx,
+      namespace,
+      schema,
+      entry,
+      hooks,
+    );
+  });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-trellis",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Trellis workflow integration for DeepSeek Harness: per-turn workflow-state breadcrumbs, utility commands, and native session identity.",
   "type": "module",
   "main": "lib/index.js",
@@ -54,14 +54,15 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-commands": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-client-ui-settings": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-client-ui-settings-plugins": "^0.1.0-rc.8",
-    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-shell-env": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-subagent": "^0.1.0-rc.6",
-    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6",
+    "@deepseek-ai/dsh-commands": "^0.1.0-rc.6 || ^0.1.1-rc.1 || ^0.1.2-alpha.1",
+    "@deepseek-ai/dsh-client-locale": "^0.1.0-rc.8 || ^0.1.1-rc.1 || ^0.1.2-alpha.1",
+    "@deepseek-ai/dsh-client-ui-settings": "^0.1.0-rc.8 || ^0.1.1-rc.1 || ^0.1.2-alpha.1",
+    "@deepseek-ai/dsh-client-ui-settings-plugins": "^0.1.0-rc.8 || ^0.1.1-rc.1 || ^0.1.2-alpha.1",
+    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6 || ^0.1.1-rc.1 || ^0.1.2-alpha.1",
+    "@deepseek-ai/dsh-settings": "^0.1.0-rc.6 || ^0.1.1-rc.1 || ^0.1.2-alpha.1",
+    "@deepseek-ai/dsh-shell-env": "^0.1.0-rc.6 || ^0.1.1-rc.1 || ^0.1.2-alpha.1",
+    "@deepseek-ai/dsh-subagent": "^0.1.0-rc.6 || ^0.1.1-rc.1 || ^0.1.2-alpha.1",
+    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6 || ^0.1.1-rc.1 || ^0.1.2-alpha.1",
     "@deepseek-ai/schemastery": "^3.18.1",
     "react": "^18.2.0"
   },
@@ -81,9 +82,12 @@
     "@deepseek-ai/dsh-client-ui-settings-plugins": {
       "optional": true
     },
-    "@deepseek-ai/dsh-llm": {
-      "optional": true
-    },
+    "@deepseek-ai/dsh-llm": {
+      "optional": true
+    },
+    "@deepseek-ai/dsh-settings": {
+      "optional": true
+    },
     "@deepseek-ai/dsh-shell-env": {
       "optional": true
     },
@@ -103,7 +107,8 @@
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
     "@deepseek-ai/dsh-commands": "0.1.0-rc.8",
-    "@deepseek-ai/dsh-llm": "0.1.0-rc.8",
+    "@deepseek-ai/dsh-llm": "0.1.0-rc.8",
+    "@deepseek-ai/dsh-settings": "0.1.0-rc.8",
     "@deepseek-ai/dsh-shell-env": "0.1.0-rc.8",
     "@deepseek-ai/dsh-subagent": "0.1.0-rc.8",
     "@deepseek-ai/dsh-tools": "0.1.0-rc.8",