dsh-trellis 0.1.2 → 0.1.4

package/README.md

@@ -44,18 +44,21 @@ 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 中加载。
-
-### 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 插件加载。
-- 保持可选：`trellis_wait` 仍是“父会话还在当前轮里、需要明确同步点”时的工具；已经 yield 的父会话直接由 DSH 原生 settlement notice 唤醒。
-- 暂不接入：Agent Teams 在 rc.8 仍位于 `packages/experimental` 且不随正式 npm family 发布。Trellis 不应为此引入私有依赖；等它进入公开稳定面后再评估共享 task board / mailbox 映射。
-
-## 配置
-
-DSH rc.8 Web profile 直接打开“设置 → 插件 → 插件配置 → Trellis 工作流”。保存内容进入该 DSH_HOME 的 `settings.yaml`，优先级高于 profile 组合层并立即生效。
+配套要求：项目的 Trellis 平台需包含 dsh（`trellis init --dsh`，见 Trellis-DeepSeekHarness 适配分支），且 `.trellis/scripts` 需包含读取原生 `DSH_SESSION_ID` 的适配（已含在同一分支）。Host peer 范围显式覆盖 DSH `0.1.0-rc.6+`、`0.1.1-rc.1+`、`0.1.2-alpha.1+`、`0.1.3-alpha.1+` 与 `0.1.5-alpha.1+` 五条已知预发布线，避免 npm 的 prerelease 语义把新版 Host 误判为不兼容；本仓开发与回归基线固定在 `0.1.5-alpha.2`。Host 侧 Settings 桥同时兼容旧版包级 helper 与当前 provider 方法，Web 配置卡片只在具备 settings/client surface 的 profile 中加载。
+
+### DSH 0.1.5-alpha.2 对齐说明
+
+- 已适配：Session V3 通过 `eventAt()` / `snapshotEvents()` 读取可见事件，并保留旧 session collection 回退；插件不直接读取磁盘会话日志，因此不需要自行迁移 V3 文件格式。
+- 已核对：插件不依赖 0.1.5 移除的 `ctx.agent` 或可构造 `Inbox`；pre-step 从事件载荷取得 agent，工具从 `exec.agent` 取得调用方，待处理消息只使用 `agent.inbox` 当前公开的 `nextStep`、`prepend`、`replace` 与 `remove`。
+- 已采用：command lifecycle 的 `recordInput`、command attachment envelope 的 fail-closed 输入检查、`subagent/end` 的 run/provider/final-output 元数据，以及 report-before-settlement 与 idle-parent 原生唤醒语义。
+- 已接入：Host `dsh-trellis` settings namespace 与 `dsh.client` 浏览器卡片。保存值写入 DSH 的 `settings.yaml` 用户层，并实时重挂插件 runtime；settings provider 单独重载时退回 loader 配置，插件自身卸载时则不会错误重挂 runtime。没有 settings 服务的 profile 继续使用原有 loader 配置。当前可选 Settings 生命周期由 `settings.installSection()` 承担；插件仍在运行时兼容旧版 helper。
+- 已对齐：`dsh.client.inject` 指向的三个 DSH client 包与 React 都只作为浏览器构建输入保留在 `devDependencies`，发布安装不会重复解析 Web 壳已经提供的模块。
+- 保持可选：`trellis_wait` 仍是“父会话还在当前轮里、需要明确同步点”时的工具；已经 yield 的父会话直接由 DSH 原生 settlement notice 唤醒。
+- 保持直接归属：`trellis_wait` 继续使用 `listChildren(parent.id)` 验证 direct continuable child；这与 0.1.5 修正后的可继续子代理归属一致，不会把子代理误当作根会话参与调度。
+
+## 配置
+
+支持 Settings provider 的 DSH Web profile 可直接打开“设置 → 插件 → 插件配置 → Trellis 工作流”。保存内容进入该 DSH_HOME 的 `settings.yaml`，优先级高于 profile 组合层并立即生效。
 
 Headless、rc.6 或需要声明部署默认值时，仍可在 profile 的 `cordis.patch.yml` 里覆盖（整行替换）；Web 卡片的“恢复配置文件值”会清除用户层字段并重新继承这里的值：
 

package/lib/breadcrumb.js

@@ -61,10 +61,26 @@ export function isBreadcrumbMessage(message) {
   );
 }
 
+/** Read one session event across the current and legacy DSH session APIs. */
+export function sessionEventAt(session, seq) {
+  if (typeof session.eventAt === "function") return session.eventAt(seq);
+  if (typeof session.events?.get === "function") return session.events.get(seq);
+  return session.events?.[seq];
+}
+
 /** Whether the same breadcrumb payload is already visible in the session surface. */
 export function isBreadcrumbVisible(agent, digest) {
-  const visibleSeqs = new Set(agent.session.surface.nodes);
-  for (const [seq, event] of agent.session.events.entries()) {
+  const { session } = agent;
+  const visibleSeqs = new Set(session.surface.nodes);
+  // Current DSH sessions, including Session V3, expose an immutable on-demand
+  // snapshot. Keep the legacy collection fallback for older versions covered
+  // by our peer range.
+  const events =
+    typeof session.snapshotEvents === "function"
+      ? session.snapshotEvents()
+      : session.events;
+  for (const [fallbackSeq, event] of events.entries()) {
+    const seq = event?.seq ?? fallbackSeq;
     if (!visibleSeqs.has(seq) || event.type !== "user/message") continue;
     const source = event.data?.source;
     if (

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,21 @@
  *
  * @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,
+  sessionEventAt,
+} 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 +52,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 +81,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);
@@ -112,9 +137,9 @@ function registerBreadcrumb(ctx, resolved) {
   const syncInbox = (agent, desired) => {
     const pending = agent.inbox.nextStep.filter(isBreadcrumbMessage);
     const alreadySupplied =
-      desired === undefined ||
-      agent.session.surface.nodes.some((seq) => {
-        const event = agent.session.events[seq];
+      desired === undefined ||
+      agent.session.surface.nodes.some((seq) => {
+        const event = sessionEventAt(agent.session, seq);
         return (
           event?.type === "user/message" &&
           event.data !== undefined &&
@@ -175,12 +200,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.4",
   "description": "Trellis workflow integration for DeepSeek Harness: per-turn workflow-state breadcrumbs, utility commands, and native session identity.",
   "type": "module",
   "main": "lib/index.js",
@@ -53,17 +53,14 @@
     "prepack": "pnpm run build:client"
   },
   "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/schemastery": "^3.18.1",
-    "react": "^18.2.0"
+    "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh-commands": "^0.1.0-rc.6 || ^0.1.1-rc.1 || ^0.1.2-alpha.1 || ^0.1.3-alpha.1 || ^0.1.5-alpha.1",
+    "@deepseek-ai/dsh-llm": "^0.1.0-rc.6 || ^0.1.1-rc.1 || ^0.1.2-alpha.1 || ^0.1.3-alpha.1 || ^0.1.5-alpha.1",
+    "@deepseek-ai/dsh-settings": "^0.1.0-rc.6 || ^0.1.1-rc.1 || ^0.1.2-alpha.1 || ^0.1.3-alpha.1 || ^0.1.5-alpha.1",
+    "@deepseek-ai/dsh-shell-env": "^0.1.0-rc.6 || ^0.1.1-rc.1 || ^0.1.2-alpha.1 || ^0.1.3-alpha.1 || ^0.1.5-alpha.1",
+    "@deepseek-ai/dsh-subagent": "^0.1.0-rc.6 || ^0.1.1-rc.1 || ^0.1.2-alpha.1 || ^0.1.3-alpha.1 || ^0.1.5-alpha.1",
+    "@deepseek-ai/dsh-tools": "^0.1.0-rc.6 || ^0.1.1-rc.1 || ^0.1.2-alpha.1 || ^0.1.3-alpha.1 || ^0.1.5-alpha.1",
+    "@deepseek-ai/schemastery": "^3.18.2"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/cordis": {
@@ -72,18 +69,12 @@
     "@deepseek-ai/dsh-commands": {
       "optional": true
     },
-    "@deepseek-ai/dsh-client-locale": {
-      "optional": true
-    },
-    "@deepseek-ai/dsh-client-ui-settings": {
-      "optional": true
-    },
-    "@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
     },
@@ -93,22 +84,38 @@
     "@deepseek-ai/dsh-tools": {
       "optional": true
     },
-    "@deepseek-ai/schemastery": {
-      "optional": true
-    },
-    "react": {
-      "optional": true
-    }
+    "@deepseek-ai/schemastery": {
+      "optional": true
+    }
   },
-  "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-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",
-    "@deepseek-ai/schemastery": "^3.18.1",
-    "react": "^18.2.0",
+  "devDependencies": {
+    "@deepseek-ai/cordis": "^4.0.2",
+    "@deepseek-ai/dsh-attachment": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-agent": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-locale": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-ui-settings": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-client-ui-settings-plugins": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-code-runtime": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-commands": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-home-paths": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-invariants": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-llm": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-sandbox": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-scope": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-session": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-session-persistence": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-session-projection": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-shell": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-settings": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-shell-env": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-subprocess": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-subagent": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-system-prompt": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-tools": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-user-approval": "0.1.5-alpha.2",
+    "@deepseek-ai/dsh-util-time": "0.1.5-alpha.2",
+    "@deepseek-ai/schemastery": "^3.18.2",
+    "react": "19.2.8",
     "tsdown": "^0.22.2"
   }
 }