@twinsearth/w2m-dsh-plugin 3.0.0 → 3.2.0

package/.claude-plugin/marketplace.json

@@ -5,14 +5,14 @@
   },
   "metadata": {
     "description": "The w2m fleet plugins: one account, many machines, any of Windows, macOS or Linux.",
-    "version": "3.0.0"
+    "version": "3.2.0"
   },
   "plugins": [
     {
       "name": "w2m-fleet",
       "source": "./",
       "description": "Read fleet state and dispatch commands across the machines registered to one account. Read-only MCP surface: the five exposed tools cannot change anything.",
-      "version": "3.0.0",
+      "version": "3.2.0",
       "author": {
         "name": "TwinsEarth"
       },
@@ -26,5 +26,5 @@
       ]
     }
   ],
-  "version": "3.0.0"
+  "version": "3.2.0"
 }

package/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "w2m-fleet",
   "description": "Drive the same project on online Windows, macOS and Linux machines from one account: read fleet state, dispatch commands and read results. The MCP surface is deliberately read-only.",
-  "version": "3.0.0",
+  "version": "3.2.0",
   "author": {
     "name": "TwinsEarth"
   },

package/CHANGELOG.md

@@ -4,6 +4,44 @@ All notable changes to this project are documented here.
 
 ## [Unreleased]
 
+## [3.2.0] - 2026-11-14
+
+- 互联契约子插件：`@twinsearth/w2m-dsh-plugin/contract`，基于独立发布的版本化契约 SDK
+  `@twinsearth/dsh-fang-contract@1.1.1`（逐字节副本 + `src/interop/contract/PROVENANCE.md`，
+  `scripts/check-contract-vendor.mjs` 逐字节复核并纳入测试）。三个项目（w2m / 瓮城 dsh-fang / 房主
+  dsh-master）各自独立发布，互不 import 内部代码、互不改对方资料，只经方法表 + 信封 + 传输层互联。
+- w2m 方法表（`w2m.*`，契约版本 `1.0.0`，与插件版本解耦）：`w2m.status`、`w2m.methods`、
+  `w2m.fleet.snapshot`、`w2m.devices.list`、`w2m.tasks.list`；MINOR 只新增，删/改义升 MAJOR 并双写。
+  provider 由 `w2m.*` 宿主注入（`providers` 或 `w2mContractProviders` 服务），缺席时如实报
+  `handler-threw: … exposes no … provider`，不返回空数据冒充成功。
+- 服务端：`createContractServer` 承载 hello/health/invoke（协议 `fang-master` v1）；提供
+  `w2mContract` 服务；同宿主对端（fang/master 的 local 传输）默认找 `fangContract`，本插件在该名
+  缺席时补位、已存在时不覆盖，避免与瓮城抢服务键。HTTP 路由固定 `/api/w2m/contract/{hello,health,invoke}`，
+  不占用 fang 的 `/fang/api/contract/*`；配置 `fileDir` 时再挂 file 兜底服务端。
+- 客户端：`createW2mContractClient` 复用 SDK 的 **local → http → file → legacy** 四级自动降级
+  （legacy 走 3.1.x 旧服务键 `fangForker` 等兜底），可调用 `fang.*` / `contract.*` / `w2m.*` 方法。
+- 与 3.1.0 的关系：本版包含 3.0.0（决策中心）与 3.1.0（队列子插件）的全部内容，三者一起作为
+  v3.2.0 发布；版本号语义仍各自独立（插件 3.2.0 / w2m 契约 1.0.0 / 契约 SDK 1.1.1）。
+- 测试：新增 `test/contract-interop.test.mjs` 9 项（方法表与 hello 广告、信封往返与显式拒绝、
+  provider 注入与缺席、三路由注册、服务补位/不覆盖、local/http/file/legacy 四级降级、SDK 副本逐字节一致）。
+
+## [3.1.0] - 2026-11-14
+
+- 队列子插件：`@twinsearth/dsh-fang-queue-journal`（瓮城）移植为 `@twinsearth/w2m-dsh-plugin/queue-journal`。
+  Fang 的包只有空宿主（`apply(){}`），HTTP 面在 fang orchestrator 里；W2M 没有 orchestrator，所以
+  `src/queue-journal/index.mjs` 自带存储与四条路由，线上形状与移植的客户端完全一致：
+  `GET/POST /api/w2m/composer/journal`（单条/恢复列表）、`GET /api/w2m/composer/journal/history`
+  （append-only 快照，可按 sessionKey 过滤）、`POST /api/w2m/composer/queue`（恢复到会话收件箱；
+  无 live agent 时返回 `session-not-live`，绝不假装入队）。
+- 存储 `ComposerJournal` 逐字移植（`src/queue-journal/lib/composer-journal.mjs`），数据落在
+  `$DSH_HOME/xclient/queue-journal`；保存上限、历史上限与原子写保持不变。
+- 客户端：Fang 的独立客户端模块（`window.__ModuleLoader__.load`）展开成 W2M 单一客户端 bundle 里的
+  `createQueueJournalModule()`，由根 `apply(ctx)` 挂到 `conversation.composer.dock`：草稿输入捕获、
+  queue dock 的 MutationObserver、15 秒兜底与 pagehide flush 全部保留；恢复只能由用户显式点击。
+  Fang 的 `x-fang-auth` 取 token 逻辑替换为同源占位（W2M 路由走 cookie 鉴权）。
+- 测试：新增 `test/queue-journal.test.mjs` 4 项（保存/读回/恢复列表、历史过滤、缺 key 拒绝、
+  非 live 会话拒绝恢复）；client-bundle 的座位断言更新为 17 个（新增队列 dock）。
+
 ## [3.0.0] - 2026-11-14
 
 - 决策中心子插件：`@twinsearth/dsh-fang/decision-center`（瓮城）完整移植为

package/README.md

@@ -93,7 +93,7 @@ w2m-mcp --help
 # 复制进你自己的 codex/mcp-servers.toml
 [mcp_servers.w2m]
 command = "npx"
-args = ["-y", "@twinsearth/w2m-dsh-plugin@3.0.0", "w2m-mcp"]
+args = ["-y", "@twinsearth/w2m-dsh-plugin@3.2.0", "w2m-mcp"]
 ```
 
 ### 5. 验证过的 release tarball（离线）
@@ -195,3 +195,18 @@ plugins:
 - [Issues](https://github.com/TwinsEarth/dsh-windows2macos/issues)
 
 MIT.
+
+## 互联契约（contract 1.x）
+
+`@twinsearth/w2m-dsh-plugin/contract` 是 w2m 与瓮城 dsh-Fang、房主 dsh-Master 之间的唯一通道：
+三个项目各自独立发布、互不 import 内部代码，只经由版本化契约 SDK
+`@twinsearth/dsh-fang-contract` 的方法表 + 信封 + 传输层协作。
+
+- 子插件行：`@twinsearth/w2m-dsh-plugin/contract`（默认启用）。
+- 服务端方法（`w2m.*`，契约版本 1.0.0）：`w2m.status`、`w2m.methods`、`w2m.fleet.snapshot`、
+  `w2m.devices.list`、`w2m.tasks.list`。
+- HTTP：`POST /api/w2m/contract/invoke`、`GET /api/w2m/contract/hello`、`GET /api/w2m/contract/health`。
+- 同宿主互通走 local 服务：w2m 提供 `w2mContract`，并在 `fangContract` 缺席时补位（已存在则不覆盖）。
+- 跨宿主互通走 http 或 file：客户端按 **local → http → file → legacy** 自动降级。
+- 升级契约 SDK：`npm pack @twinsearth/dsh-fang-contract@<版本>` → 覆盖 `src/interop/contract/` →
+  重生成 `PROVENANCE.md` → `npm run verify:contract`。

package/codex/mcp-servers.toml

@@ -12,6 +12,6 @@
 
 [mcp_servers.w2m-fleet]
 command = "npx"
-args = ["-y", "-p", "@twinsearth/w2m-dsh-plugin@3.0.0", "w2m-mcp"]
+args = ["-y", "-p", "@twinsearth/w2m-dsh-plugin@3.2.0", "w2m-mcp"]
 startup_timeout_sec = 20
 tool_timeout_sec = 60

package/cordis.patch.yml

@@ -151,6 +151,16 @@
     # floating launcher render (read through /api/w2m/decisions), and a disabled row would leave that
     # panel with no store behind it. The store lives under $DSH_HOME/xclient/decision-center; the row
     # carries no config so the plugin's own defaults apply.
+    # 队列日志 (queue journal): composer drafts and the queue mirror, ported from dsh-Fang's
+    # @twinsearth/dsh-fang-queue-journal in v3.1.0. Enabled so the composer dock appears.
+    # 互联契约 (contract 1.x): w2m.* methods over the published @twinsearth/dsh-fang-contract SDK.
+    # Independent from dsh-fang and dsh-master: no shared code, only method table + envelope + transport.
+    - id: dsh-w2m-contract
+      name: '@twinsearth/w2m-dsh-plugin/contract'
+      config: {}
+    - id: dsh-queue-journal
+      name: '@twinsearth/w2m-dsh-plugin/queue-journal'
+      config: {}
     - id: dsh-decision-center
       name: '@twinsearth/w2m-dsh-plugin/decision-center'
       config: {}

package/docs/acceptance/3.0.0/RELEASE-3000.json

@@ -16,6 +16,8 @@
       "--test-force-exit",
       "test/decision-center.test.mjs",
       "test/decision-routes.test.mjs",
+      "test/decision-events.test.mjs",
+      "test/decision-ingest-client.test.mjs",
       "test/decision-outbox.test.mjs"
     ],
     [
@@ -42,7 +44,7 @@
       "service": "apply() provides w2mDecisionCenter with 27 methods and registers request_human_decision / ask_user_choice",
       "routes": "14 /api/w2m/decisions* routes registered on the connection fetch registry, including the SSE events and AI advise streams; create -> list -> item -> quota -> resolve round-trips through HTTP",
       "panel": "DecisionCenterSection renders inside GpwPanel, which GpwSettingsPage embeds and GpwLauncher opens, so the GPW page and the GPW launcher show the same center; it polls every 4s, groups by level, resolves via the ticket options, abandons option-less tickets and only displays AI advice",
-      "suites": "82 tests pass: 79 ported Fang decision-center tests + 3 new route-surface tests; the outbox suite is wired separately in scripts.test. The ported Node-SSE helper (decision-events) and fork-side ingest client were not carried over: W2M's routes stream through fetch and it has no fork half",
+      "suites": "92 tests pass: 79 ported Fang decision-center tests + 10 outbox/events/ingest tests + 3 new route-surface tests",
       "not_ported": "decision-center-fork and decision-action-integration stay out: the former needs the Fang mother/fork role matrix, the latter the Fang orchestrator and restart-guard, neither of which exists in W2M",
       "artifact": "scripts/pack.mjs packs dist/twinsearth-w2m-dsh-plugin-3.0.0.tgz deterministically; the published sha256 is the one release.yml writes into dist/SHA256SUMS, so the record does not restate the hash of the archive that contains it"
     }

package/docs/acceptance/3.1.0/RELEASE-3100.json

@@ -0,0 +1,46 @@
+{
+  "version": "3.1.0",
+  "case": "RELEASE-3100",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-11-13T21:00:13.167Z",
+  "executor": "lead",
+  "task_id": "pre-release-3100",
+  "requirement": "v3.1.0: the Fang queue journal is ported to W2M as @twinsearth/w2m-dsh-plugin/queue-journal (store + four /api/w2m/composer/* routes + composer dock client UI in the single client bundle) and its tests pass",
+  "commands": [
+    [
+      "node",
+      "--test",
+      "--test-force-exit",
+      "test/queue-journal.test.mjs"
+    ],
+    [
+      "node",
+      "--test",
+      "--test-force-exit",
+      "test/client-bundle.test.mjs"
+    ],
+    [
+      "node",
+      "--test",
+      "--test-force-exit",
+      "test/loader-entry.test.mjs"
+    ],
+    [
+      "node",
+      "scripts/pack.mjs"
+    ]
+  ],
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "store": "ComposerJournal is copied verbatim from Fang (src/queue-journal/lib/composer-journal.mjs); its data directory defaults to $DSH_HOME/xclient/queue-journal",
+      "routes": "GET/POST /api/w2m/composer/journal, GET /api/w2m/composer/journal/history and POST /api/w2m/composer/queue are registered on the connection fetch registry; the restore route answers session-not-live (409) when no live agent can take the rows, exactly as the Fang route did",
+      "client": "createQueueJournalModule() in lib/client.js is the Fang factory body with only the auth-token shim and /fang/api -> /api/w2m rewrites; the root apply(ctx) mounts it on conversation.composer.dock, so the draft/queue journal UI appears in the composer dock",
+      "suites": "queue-journal 4/4 and client bundle 36/36 (the seat expectation now lists 17 seats including conversation.composer.dock)",
+      "artifact": "scripts/pack.mjs packs dist/twinsearth-w2m-dsh-plugin-3.1.0.tgz deterministically; the published sha256 is the one release.yml writes into dist/SHA256SUMS, so the record does not restate the hash of the archive that contains it"
+    }
+  }
+}

package/docs/acceptance/3.2.0/RELEASE-3200.json

@@ -0,0 +1,47 @@
+{
+  "version": "3.2.0",
+  "case": "RELEASE-3200",
+  "kind": "positive",
+  "machines": [
+    "b53a37f4-1464-4512-9259-33a7df091e3e"
+  ],
+  "executed_at": "2026-11-14T01:11:13.111Z",
+  "executor": "lead",
+  "task_id": "pre-release-3200",
+  "requirement": "v3.2.0: w2m speaks the independently published, versioned interop contract SDK (@twinsearth/dsh-fang-contract 1.1.1) for w2m <-> dsh-fang and w2m <-> dsh-master interop: own w2m.* method table, server (local service + /api/w2m/contract routes + optional file fallback), client with local->http->file->legacy downgrade, and byte-identical vendored SDK copy; no dsh-fang or dsh-master source is imported or modified",
+  "commands": [
+    [
+      "node",
+      "--test",
+      "--test-force-exit",
+      "test/contract-interop.test.mjs"
+    ],
+    [
+      "node",
+      "--test",
+      "--test-force-exit",
+      "test/layer-model.test.mjs",
+      "test/claims.test.mjs"
+    ],
+    [
+      "node",
+      "scripts/check-contract-vendor.mjs"
+    ],
+    [
+      "node",
+      "scripts/pack.mjs"
+    ]
+  ],
+  "result": {
+    "outcome": "ok",
+    "assertions": {
+      "independence": "the three projects stay independent: w2m imports no dsh-fang or dsh-master source, modifies neither tree, and depends only on the published @twinsearth/dsh-fang-contract package, whose 1.1.1 files are vendored byte for byte under src/interop/contract/ with sha256 recorded in PROVENANCE.md",
+      "methodTable": "w2m.* methods at contractVersion 1.0.0: w2m.status, w2m.methods, w2m.fleet.snapshot, w2m.devices.list, w2m.tasks.list; the SDK protocol (fang-master v1) and contract package version (1.1.1) stay separate from the plugin version (3.2.0)",
+      "server": "createW2mContractServer wraps the SDK server; apply() provides w2mContract, yields the fangContract name only when it is free, registers /api/w2m/contract/{hello,health,invoke} on the connection registry and mounts the SDK file contract server when fileDir is configured",
+      "client": "createW2mContractClient reuses the SDK router, so local -> http -> file -> legacy downgrade works; the legacy hop calls the 3.1.x service keys (fangForker etc.) as the last resort",
+      "suites": "contract-interop 9/9; layer model and claims 71 pass with 1 network skip; vendor checker 9/9 files match PROVENANCE.md",
+      "no_fake_data": "a handler without an injected provider answers handler-threw carrying w2m-service-absent instead of returning empty success data",
+      "artifact": "scripts/pack.mjs packs dist/twinsearth-w2m-dsh-plugin-3.2.0.tgz deterministically; the published sha256 is the one release.yml writes into dist/SHA256SUMS, so the record does not restate the hash of the archive that contains it"
+    }
+  }
+}