dsh-device-fleet 0.1.0-dev.1 → 0.1.0-dev.3

package/README.md

@@ -9,6 +9,44 @@ DeepSeek Harness 的设备联邦插件：把登录同一账号、且都安装本
 - ✅ **Host 插件 + 直调 MVP（代码完成、单测通过，待真实 DSH 安装联调）**：`fleet_list` / `fleet_tools` / `fleet_call` + `fleet_read` / `fleet_fetch` / `fleet_run`、Tool Policy、Execution Slot、审批 fail-closed
 - ⏳ Room / Room Board、委派、审批收件箱 UI、设备页/配对/房间 UI（下一步）
 
+## 安装（开发版）
+
+已发布到 npm：**`dsh-device-fleet@0.1.0-dev.2`**（dist-tag `dev`）。
+
+```sh
+# CLI / web profile
+dsh plugin --profile web add dsh-device-fleet@dev
+
+# 桌面 app：先完全退出 app，再安装，然后重新打开
+dsh plugin --profile desktop add dsh-device-fleet@dev
+
+# 离线安装包（拷到另一台设备）
+dsh plugin --profile desktop add C:/path/to/dsh-device-fleet-0.1.0-dev.2.tgz
+```
+
+两台设备的 **DSH 版本与插件版本必须一致**（ADR-0024）；不一致会在握手时直接拒绝。
+
+### 配对（Fleet 入网）
+
+1. 设备 A：对 agent 说“生成 Fleet 邀请码” → 模型调用 `fleet_invite`，拿到一次性邀请码（含 fleetKey，注意保密）。
+2. 设备 B：安装并重启后，对 agent 说“加入 Fleet：`<code>`” → `fleet_join` 把邀请排队；**重启 DSH** 后生效。
+3. 两台设备各自在 profile patch 里配置 `policy.allowedRoots` 与 `execution.cwd`（不配时直调读取一律被拒）。
+4. 设备 B：`fleet_list` 看到设备 A → `fleet_read(device=A, path="A 允许根内的文件")` 验证。
+
+```yaml
+# 两个 profile 的 cordis.patch.yml 里给 device-fleet 行追加 config：
+- id: device-fleet
+  config:
+    deviceName: desktop
+    execution:
+      cwd: D:/work
+      agentPreset: standard
+    policy:
+      allowedRoots: [D:/work]
+```
+
+`fleet_run` 默认需要目标设备本机审批；审批收件箱 UI 尚未实现（当前 fail-closed）。第一阶段建议先用 `fleet_read` / `fleet_fetch` 验证链路。
+
 ## 设计文档
 
 - 术语表：[CONTEXT.md](./CONTEXT.md)

package/cordis.patch.yml

@@ -1,4 +1,4 @@
-# dsh-device-fleet bundle patch — mounts the Host plugin. The settings below are
+# dsh-device-fleet bundle patch 鈥?mounts the Host plugin. The settings below are
 # safe defaults; real values (relay address, allowed roots, execution cwd) are
 # meant to be edited in the profile or through the plugin settings page.
 - insert:
@@ -22,3 +22,5 @@
           allowedTools: []
         promptSection: true
         autoApproveAsk: false
+
+

package/docs/notes/dev-release.md

@@ -0,0 +1,36 @@
+# 开发版发布记录
+
+- 包名：`dsh-device-fleet`
+- 版本：`0.1.0-dev.2`
+- dist-tag：`dev`（同时也可用精确版本安装）
+- registry：<https://registry.npmjs.org/dsh-device-fleet>
+- tarball：<https://registry.npmjs.org/dsh-device-fleet/-/dsh-device-fleet-0.1.0-dev.2.tgz>
+- 本地离线包：`dsh-device-fleet-0.1.0-dev.2.tgz`（仓库根目录，可拷贝安装）
+- 发布时间：2026-11-09（Asia/Shanghai）
+- 内容：网络层 v1/v2 + Host 插件 + 直调 MVP（`fleet_invite/join/list/tools/call/read/fetch/run`）；Room/Board/委派/审批 UI 未包含。
+
+## 安装
+
+```sh
+dsh plugin --profile web add dsh-device-fleet@dev
+# 桌面 app：完全退出后
+dsh plugin --profile desktop add dsh-device-fleet@dev
+```
+
+发布时 npm 对新包做了短暂的处理/占位（`0.0.0-stage`），约几分钟后真实版本生效；后续版本号递增、tag 复用 `dev`。
+
+## 已知限制
+
+- 严格同版本：两台设备必须安装同一 `0.1.0-dev.2`，DSH 版本也要同一发布线；
+- `fleet_run` 的 `ask` 审批目前 fail-closed（审批收件箱未实现）；
+- `fleet_fetch` 仅返回文本；
+- 首次加载会在 `$DSH_HOME/device-fleet/` 自动创建身份与独立 Fleet；加入已有 Fleet 需要先 `fleet_join` 再重启；
+- 默认 `direct.host=0.0.0.0` + UDP 组播发现；Windows 防火墙可能弹窗，需允许。
+
+## 安装激活记录（本机 desktop profile，2026-11-09）
+
+- 第一次 install_bundle 被拒：`package.json` 带 UTF-8 BOM → 去掉 BOM 后通过；
+- 第一次 activate 失败：`@deepseek-ai/schemastery` 只有默认导出（`import Schema from ...`），改为默认导入；
+- 第二次 activate 失败：Cordis 直接访问未 inject 的服务会抛错 → 可选服务统一走 `ctx.get(name)`；
+- 最终 `set_plugin include:device-fleet enabled=true` → `application: applied`，8 个 `fleet_*` 工具出现在模型工具表，`fleet_list` 返回本机 device id，`taskui_probe` 仍为 v0.4.2 / tasks=247（与 task-list 无冲突）。
+- 已发布 `0.1.0-dev.2`（包含上述激活修复）；`0.1.0-dev.1` 会激活失败，不要使用。

package/package.json

@@ -1,45 +1,45 @@
-{
-    "name":  "dsh-device-fleet",
-    "version":  "0.1.0-dev.1",
-    "description":  "DeepSeek Harness device fleet: enroll devices, direct-call remote tools, shared Rooms with lazy-woken agents, and delegated subagents across devices.",
-    "type":  "module",
-    "main":  "src/plugin/index.js",
-    "exports":  {
-                    ".":  "./src/plugin/index.js",
-                    "./net":  "./src/net/index.js",
-                    "./host":  "./src/host/index.js",
-                    "./package.json":  "./package.json"
-                },
-    "engines":  {
-                    "node":  "\u003e=22"
-                },
-    "dsh":  {
-                "bundle":  {
-                               "patch":  "./cordis.patch.yml"
-                           }
-            },
-    "peerDependencies":  {
-                             "@deepseek-ai/cordis":  "~4.1.0",
-                             "@deepseek-ai/dsh-tools":  "^0.2.2-rc.1",
-                             "@deepseek-ai/dsh-llm":  "^0.2.2-rc.1",
-                             "@deepseek-ai/schemastery":  "~3.19.0"
-                         },
-    "scripts":  {
-                    "test":  "node test/net.test.mjs \u0026\u0026 node test/host.test.mjs",
-                    "test:net":  "node test/net.test.mjs",
-                    "test:host":  "node test/host.test.mjs"
-                },
-    "files":  [
-                  "src",
-                  "cordis.patch.yml",
-                  "README.md",
-                  "CONTEXT.md",
-                  "docs",
-                  "LICENSE"
-              ],
-    "publishConfig":  {
-                          "access":  "public",
-                          "tag":  "dev"
-                      },
-    "license":  "MIT"
-}
+{
+  "name": "dsh-device-fleet",
+  "version": "0.1.0-dev.3",
+  "description": "DeepSeek Harness device fleet: enroll devices, direct-call remote tools, shared Rooms with lazy-woken agents, and delegated subagents across devices.",
+  "type": "module",
+  "main": "src/plugin/index.js",
+  "exports": {
+    ".": "./src/plugin/index.js",
+    "./net": "./src/net/index.js",
+    "./host": "./src/host/index.js",
+    "./package.json": "./package.json"
+  },
+  "engines": {
+    "node": ">=22"
+  },
+  "dsh": {
+    "bundle": {
+      "patch": "./cordis.patch.yml"
+    }
+  },
+  "peerDependencies": {
+    "@deepseek-ai/cordis": "~4.1.0",
+    "@deepseek-ai/dsh-tools": "^0.2.2-rc.1",
+    "@deepseek-ai/dsh-llm": "^0.2.2-rc.1",
+    "@deepseek-ai/schemastery": "~3.19.0"
+  },
+  "scripts": {
+    "test": "node test/net.test.mjs && node test/host.test.mjs",
+    "test:net": "node test/net.test.mjs",
+    "test:host": "node test/host.test.mjs"
+  },
+  "files": [
+    "src",
+    "cordis.patch.yml",
+    "README.md",
+    "CONTEXT.md",
+    "docs",
+    "LICENSE"
+  ],
+  "publishConfig": {
+    "access": "public",
+    "tag": "dev"
+  },
+  "license": "MIT"
+}

package/src/host/store.js

@@ -64,6 +64,7 @@ export function loadState({ dshHome, dataDir, name = 'device' } = {}) {
         joinedAt: Date.now(),
         accountFingerprint: decoded.accountFingerprint ?? null,
         relay: decoded.relay ?? null,
+        endpoints: decoded.endpoints ?? [],
       }
       writeJsonAtomic(path.join(dir, 'fleet.json'), fleet)
       writeJsonAtomic(path.join(dir, 'enrollment.json'), enrollment)
@@ -102,8 +103,8 @@ export function saveConfig(state, config) {
 }
 
 /** Create an invite for this device's fleet. */
-export function createInvite(state, { accountFingerprint = null, relay = null } = {}) {
-  return encodeInvite({ fleet: state.fleet, accountFingerprint, relay })
+export function createInvite(state, { accountFingerprint = null, relay = null, endpoints = [] } = {}) {
+  return encodeInvite({ fleet: state.fleet, accountFingerprint, relay, endpoints })
 }
 
 /** Join a fleet from an invite code (overwrites fleet/enrollment, keeps identity). */
@@ -114,6 +115,7 @@ export function enrollFromInvite(state, code) {
     joinedAt: Date.now(),
     accountFingerprint: decoded.accountFingerprint ?? null,
     relay: decoded.relay ?? null,
+    endpoints: decoded.endpoints ?? [],
   }
   saveFleet(state)
   writeJsonAtomic(path.join(state.dataDir, 'enrollment.json'), state.enrollment)

package/src/host/tools.js

@@ -24,6 +24,22 @@ function fail(error) {
 /** Pure handlers; wrapped into ToolDefinitions by `createFleetToolDefinitions`. */
 export function createFleetHandlers({ node, client = new DirectCallClient({ node }), pairing = null }) {
   return {
+    async fleet_status() {
+      if (typeof node.status !== 'function') return { text: 'Error: [unsupported] status is unavailable' }
+      return { text: JSON.stringify(node.status(), null, 2) }
+    },
+
+    async fleet_connect({ host, port }) {
+      if (typeof node.connectAddress !== 'function') return { text: 'Error: [unsupported] manual connect is unavailable' }
+      try {
+        node.addPeerHint?.({ host, port })
+        const peer = await node.connectAddress(host, port)
+        return { text: `connected to ${peer.deviceId} (${peer.name ?? 'device'}) at ${host}:${port}` }
+      } catch (error) {
+        return fail(error)
+      }
+    },
+
     async fleet_invite() {
       if (!pairing?.invite) return { text: 'Error: [unsupported] this device cannot create an invite' }
       try {
@@ -130,6 +146,25 @@ export function createFleetToolDefinitions({ defineTool, handlers }) {
   const output = textOutput()
   const commonDevice = { type: 'string', required: true, description: 'Target device id from `fleet_list`.' }
   return [
+    defineTool({
+      name: 'fleet_status',
+      description:
+        'Show this device\'s Fleet network status for troubleshooting: device id, direct listener address/port, discovery, connected peers, roster and invite/manual address hints. Use it when discovery does not find the other device.',
+      parameters: {},
+      output,
+      execute: () => handlers.fleet_status(),
+    }),
+    defineTool({
+      name: 'fleet_connect',
+      description:
+        'Connect to another device by explicit host and port when LAN discovery is unavailable. Use it with the port printed by that device\'s `fleet_status`; the peer id is learned from the authenticated handshake.',
+      parameters: {
+        host: { type: 'string', required: true, description: 'Target host/IP address on the LAN or VPN.' },
+        port: { type: 'number', required: true, description: 'Target device\'s Fleet direct port (from its fleet_status).' },
+      },
+      output,
+      execute: (args) => handlers.fleet_connect(args),
+    }),
     defineTool({
       name: 'fleet_invite',
       description:

package/src/net/fleet-node.js

@@ -45,6 +45,7 @@ export class FleetNode extends EventEmitter {
     discovery = false,
     relay = null,
     roster = [],
+    peerHints = [],
     trustOnFirstUse = true,
     acceptRelayConnections = true,
     connectTimeoutMs = DEFAULT_CONNECT_TIMEOUT_MS,
@@ -74,6 +75,10 @@ export class FleetNode extends EventEmitter {
     this.roster = new Map()
     for (const entry of roster) this.roster.set(entry.deviceId, { name: 'device', ...entry })
     this.discovered = new Map()
+    this.peerHints = []
+    for (const hint of peerHints) this.addPeerHint(hint)
+    this.hintTimer = null
+    this.hintAttempt = 0
     this.channels = new Map()
     this.pendingRpc = new Map()
     this.requestHandler = null
@@ -163,9 +168,81 @@ export class FleetNode extends EventEmitter {
     }
 
     this.emit('started', { direct: this.directAddress ?? null })
+    this.scheduleHintConnects()
     return this
   }
 
+  /** Remember an address hint for a peer (from an invite or a manual `fleet_connect`). */
+  addPeerHint(hint) {
+    if (!hint || typeof hint.host !== 'string' || !Number.isInteger(hint.port) || hint.port <= 0) return
+    const entry = {
+      deviceId: typeof hint.deviceId === 'string' ? hint.deviceId : undefined,
+      host: hint.host,
+      port: hint.port,
+    }
+    if (entry.deviceId === this.identity.deviceId) return
+    const exists = this.peerHints.some(
+      (item) => item.host === entry.host && item.port === entry.port && item.deviceId === entry.deviceId,
+    )
+    if (!exists) this.peerHints.push(entry)
+  }
+
+  /** Connect to a raw address; learns the peer id from the handshake. */
+  async connectAddress(host, port, { expectedDeviceId = null, timeoutMs = this.connectTimeoutMs } = {}) {
+    if (!host || !Number.isInteger(port) || port <= 0) throw new Error('connectAddress needs host and port')
+    const expected = expectedDeviceId ? { deviceId: expectedDeviceId } : null
+    const socket = await connectDirect({ host, port, timeoutMs })
+    const channel = this.createInitiator(socket, expected)
+    await this.waitReady(channel, timeoutMs)
+    return channel.peer
+  }
+
+  /** Retry the invite/manual hints in the background until one peer connects. */
+  scheduleHintConnects() {
+    if (this.hintTimer || this.closed) return
+    const attempt = async () => {
+      this.hintTimer = null
+      if (this.closed) return
+      if (this.peerHints.length === 0 || this.channels.size > 0) return
+      try {
+        for (const hint of this.peerHints) {
+          if (this.closed || this.channels.size > 0) return
+          try {
+            const peer = await this.connectAddress(hint.host, hint.port, { expectedDeviceId: hint.deviceId })
+            this.emit('hint-connected', { hint, peer })
+            return
+          } catch {
+            // try the next hint; the timer below retries
+          }
+        }
+      } finally {
+        if (!this.closed && this.channels.size === 0) {
+          this.hintAttempt += 1
+          const delay = Math.min(10_000, 1000 * 2 ** Math.min(this.hintAttempt, 4))
+          this.hintTimer = setTimeout(() => void attempt(), delay)
+          this.hintTimer.unref?.()
+        }
+      }
+    }
+    this.hintTimer = setTimeout(() => void attempt(), 1500)
+    this.hintTimer.unref?.()
+  }
+
+  status() {
+    return {
+      deviceId: this.identity.deviceId,
+      name: this.name,
+      pluginVersion: this.pluginVersion,
+      dshVersion: this.dshVersion,
+      direct: this.directAddress ? { host: this.directAddress.host, port: this.directAddress.port } : null,
+      relay: this.relayClient ? { online: this.relayClient.online === true } : null,
+      discovery: this.discovery ? { enabled: true, peers: [...this.discovered.keys()] } : { enabled: false, peers: [] },
+      roster: this.rosterEntries().map((entry) => ({ deviceId: entry.deviceId, name: entry.name ?? 'device' })),
+      connected: this.peerIds(),
+      peerHints: [...this.peerHints],
+    }
+  }
+
   async acceptIncomingRelay(controller) {
     if (!this.acceptRelayConnections) {
       controller.reject()
@@ -238,7 +315,15 @@ export class FleetNode extends EventEmitter {
 
     const expected = this.roster.get(deviceId) ?? { deviceId }
     const discovered = this.discovered.get(deviceId)
-    const endpoint = host && port ? { host, port } : discovered ? { host: discovered.host, port: discovered.port } : null
+    const hinted = this.peerHints.find((entry) => entry.deviceId === deviceId)
+    const endpoint =
+      host && port
+        ? { host, port }
+        : discovered
+          ? { host: discovered.host, port: discovered.port }
+          : hinted
+            ? { host: hinted.host, port: hinted.port }
+            : null
     let directError = null
     if (endpoint) {
       try {
@@ -398,6 +483,8 @@ export class FleetNode extends EventEmitter {
 
   async close() {
     this.closed = true
+    clearTimeout(this.hintTimer)
+    this.hintTimer = null
     for (const channel of this.channels.values()) channel.close()
     this.channels.clear()
     for (const [id, pending] of this.pendingRpc) {

package/src/net/identity.js

@@ -70,7 +70,7 @@ export function createFleet({ name = 'fleet' } = {}) {
   }
 }
 
-export function encodeInvite({ fleet, accountFingerprint = null, relay = null }) {
+export function encodeInvite({ fleet, accountFingerprint = null, relay = null, endpoints = [] }) {
   const payload = {
     v: 1,
     fleetId: fleet.fleetId,
@@ -78,6 +78,7 @@ export function encodeInvite({ fleet, accountFingerprint = null, relay = null })
     name: fleet.name,
     accountFingerprint,
     relay,
+    endpoints: Array.isArray(endpoints) ? endpoints : [],
     createdAt: Date.now(),
   }
   return INVITE_PREFIX + Buffer.from(JSON.stringify(payload)).toString('base64url')
@@ -99,6 +100,16 @@ export function decodeInvite(code) {
     fleet: { fleetId: payload.fleetId, fleetKey: payload.fleetKey, name: payload.name ?? 'fleet' },
     accountFingerprint: payload.accountFingerprint ?? null,
     relay: payload.relay ?? null,
+    endpoints: Array.isArray(payload.endpoints)
+      ? payload.endpoints.filter(
+          (entry) =>
+            entry &&
+            typeof entry.host === 'string' &&
+            Number.isInteger(entry.port) &&
+            entry.port > 0 &&
+            (entry.deviceId === undefined || typeof entry.deviceId === 'string'),
+        )
+      : [],
     createdAt: payload.createdAt ?? null,
   }
 }

package/src/plugin/index.js

@@ -5,10 +5,11 @@
 // land now (a prompt section and a first-use manual + orchestration nudge).
 // Room, Room Board, delegation and the UI land in later steps.
 import { readFileSync } from 'node:fs'
+import { networkInterfaces } from 'node:os'
 import { fileURLToPath } from 'node:url'
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import { createUserMessage } from '@deepseek-ai/dsh-llm'
-import { Schema } from '@deepseek-ai/schemastery'
+import Schema from '@deepseek-ai/schemastery'
 import { FleetNode } from '../net/fleet-node.js'
 import { accountFingerprint } from '../net/identity.js'
 import { DirectCallClient, DirectCallHost } from '../host/direct-call.js'
@@ -115,7 +116,16 @@ function withManual(definitions) {
 export function apply(ctx, config) {
   const pluginVersion = packageVersion()
   const dshVersion = process.env.DSH_CLIENT_VERSION ?? 'unknown'
-  const logger = ctx.logger ?? console
+  // Optional services: Cordis throws on direct property access for services the
+  // plugin did not inject, so every optional service goes through get().
+  const service = (name) => {
+    try {
+      return ctx.get?.(name)
+    } catch {
+      return undefined
+    }
+  }
+  const logger = service('logger') ?? console
 
   let state
   try {
@@ -134,14 +144,15 @@ export function apply(ctx, config) {
     discovery: config.discovery ? true : false,
     relay: config.relay ?? state.enrollment?.relay ?? null,
     roster: state.roster,
+    peerHints: state.enrollment?.endpoints ?? [],
     pluginVersion,
     dshVersion,
     capabilities: CAPABILITIES,
   })
 
   const policy = new ToolPolicy(config.policy)
-  const sessionController = ctx.sessionController ?? ctx.get?.('sessionController')
-  const fs = ctx.fs ?? ctx.get?.('fs')
+  const sessionController = service('sessionController')
+  const fs = service('fs')
   if (!sessionController) logger.warn?.('[device-fleet] sessionController unavailable: direct calls to stateful tools will fail')
   const slot = sessionController
     ? new ExecutionSlot({ sessionController, tools: ctx.tools, config: config.execution })
@@ -186,7 +197,7 @@ export function apply(ctx, config) {
   })
 
   // Bind the local account fingerprint when the account service is composed.
-  const account = ctx.get?.('deepseekAccount')
+  const account = service('deepseekAccount')
   if (account && typeof account.getDeviceIdentity === 'function') {
     void account
       .getDeviceIdentity()
@@ -204,6 +215,18 @@ export function apply(ctx, config) {
   }
 
   const client = new DirectCallClient({ node })
+  const localEndpoints = () => {
+    const port = node.directAddress?.port
+    if (!Number.isInteger(port) || port <= 0) return []
+    const endpoints = []
+    for (const entries of Object.values(networkInterfaces())) {
+      for (const entry of entries ?? []) {
+        if (entry.family !== 'IPv4' || entry.internal) continue
+        endpoints.push({ deviceId: state.identity.deviceId, host: entry.address, port })
+      }
+    }
+    return endpoints
+  }
   const pairing = {
     async invite() {
       const fingerprint =
@@ -213,6 +236,7 @@ export function apply(ctx, config) {
       return createInvite(state, {
         accountFingerprint: fingerprint,
         relay: config.relay ?? state.enrollment?.relay ?? null,
+        endpoints: localEndpoints(),
       })
     },
     async join(code) {
@@ -225,7 +249,7 @@ export function apply(ctx, config) {
   for (const definition of wrapped) ctx.tools.register(definition)
 
   // Adoption layer 2: one sentence, only when the Fleet has members.
-  const systemPrompt = ctx.get?.('systemPrompt') ?? ctx.systemPrompt
+  const systemPrompt = service('systemPrompt')
   if (systemPrompt && config.promptSection !== false) {
     const order = systemPrompt.getSectionOrder?.('TOOL_SUBAGENT') ?? PROMPT_SECTION_ORDER
     ctx.effect(() =>
@@ -271,6 +295,6 @@ export function apply(ctx, config) {
     void node.close()
   })
 
-  ctx.logger?.info?.(`[device-fleet] v${pluginVersion} device ${state.identity.deviceId} (${config.deviceName})`)
+  logger.info?.(`[device-fleet] v${pluginVersion} device ${state.identity.deviceId} (${config.deviceName})`)
   void ready
 }