dsh-device-fleet 0.1.0-dev.5 → 0.1.0-dev.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-device-fleet",
-  "version": "0.1.0-dev.5",
+  "version": "0.1.0-dev.6",
   "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",

package/src/host/store.js

@@ -50,6 +50,7 @@ export function loadState({ dshHome, dataDir, name = 'device' } = {}) {
 
   const roster = readJson(path.join(dir, 'roster.json'), [])
   const config = readJson(path.join(dir, 'config.json'), {})
+  const peerHints = readJson(path.join(dir, 'peer-hints.json'), [])
   let enrollment = readJson(path.join(dir, 'enrollment.json'), null)
   let pendingEnrollment = readJson(path.join(dir, 'enrollment.pending.json'), null)
 
@@ -75,7 +76,32 @@ export function loadState({ dshHome, dataDir, name = 'device' } = {}) {
     }
   }
 
-  return { dataDir: dir, identity, fleet, roster: Array.isArray(roster) ? roster : [], config, enrollment, pendingEnrollment, createdFleet }
+  return {
+    dataDir: dir,
+    identity,
+    fleet,
+    roster: Array.isArray(roster) ? roster : [],
+    config,
+    enrollment,
+    pendingEnrollment,
+    peerHints: Array.isArray(peerHints) ? peerHints : [],
+    createdFleet,
+  }
+}
+
+/** Persist one manually supplied peer address (from fleet_connect) for reconnects. */
+export function savePeerHint(state, hint) {
+  if (!hint || typeof hint.host !== 'string' || !Number.isInteger(hint.port) || hint.port <= 0) return
+  const entry = {
+    host: hint.host,
+    port: hint.port,
+    ...(typeof hint.deviceId === 'string' ? { deviceId: hint.deviceId } : {}),
+  }
+  const hints = Array.isArray(state.peerHints) ? state.peerHints : []
+  const exists = hints.some((item) => item.host === entry.host && item.port === entry.port && item.deviceId === entry.deviceId)
+  if (!exists) hints.push(entry)
+  state.peerHints = hints
+  writeJsonAtomic(path.join(state.dataDir, 'peer-hints.json'), hints)
 }
 
 /** Queue an invite for the next plugin load (the running node keeps its fleet). */

package/src/host/tools.js

@@ -22,7 +22,7 @@ function fail(error) {
 }
 
 /** Pure handlers; wrapped into ToolDefinitions by `createFleetToolDefinitions`. */
-export function createFleetHandlers({ node, client = new DirectCallClient({ node }), pairing = null }) {
+export function createFleetHandlers({ node, client = new DirectCallClient({ node }), pairing = null, onPeerHint = null }) {
   return {
     async fleet_status() {
       if (typeof node.status !== 'function') return { text: 'Error: [unsupported] status is unavailable' }
@@ -34,6 +34,7 @@ export function createFleetHandlers({ node, client = new DirectCallClient({ node
       try {
         node.addPeerHint?.({ host, port })
         const peer = await node.connectAddress(host, port)
+        await onPeerHint?.({ host, port })
         return { text: `connected to ${peer.deviceId} (${peer.name ?? 'device'}) at ${host}:${port}` }
       } catch (error) {
         return fail(error)

package/src/net/fleet-node.js

@@ -281,6 +281,14 @@ export class FleetNode extends EventEmitter {
       if (current === channel) this.channels.delete(channel.peer.deviceId)
       this.rejectPendingForChannel(channel, Object.assign(new Error('peer connection closed'), { code: 'peer-offline' }))
       this.emit('peer-disconnected', { deviceId: channel.peer?.deviceId, via })
+      // Recover automatically: the peer may have restarted or moved; retry the
+      // known addresses instead of waiting for the next process start.
+      if (!this.closed && this.channels.size === 0 && this.peerHints.length > 0) {
+        clearTimeout(this.hintTimer)
+        this.hintTimer = null
+        this.hintAttempt = 0
+        this.scheduleHintConnects()
+      }
     })
   }
 

package/src/plugin/index.js

@@ -17,7 +17,7 @@ import { DelegationHost } from '../host/delegation.js'
 import { ExecutionSlot, DEFAULT_SHELL_TOOL } from '../host/execution-slot.js'
 import { ToolPolicy } from '../host/tool-policy.js'
 import { createFleetHandlers, createFleetToolDefinitions } from '../host/tools.js'
-import { accountMatches, createInvite, loadState, saveRoster, writePendingEnrollment } from '../host/store.js'
+import { accountMatches, createInvite, loadState, savePeerHint, saveRoster, writePendingEnrollment } from '../host/store.js'
 
 export const name = 'device-fleet'
 
@@ -147,7 +147,7 @@ export function apply(ctx, config) {
     discovery: config.discovery ? true : false,
     relay: config.relay ?? state.enrollment?.relay ?? null,
     roster: state.roster,
-    peerHints: state.enrollment?.endpoints ?? [],
+    peerHints: [...(state.enrollment?.endpoints ?? []), ...(state.peerHints ?? [])],
     pluginVersion,
     dshVersion,
     capabilities: CAPABILITIES,
@@ -268,7 +268,18 @@ export function apply(ctx, config) {
       writePendingEnrollment(state, code)
     },
   }
-  const handlers = createFleetHandlers({ node, client, pairing })
+  const handlers = createFleetHandlers({
+    node,
+    client,
+    pairing,
+    onPeerHint: async (hint) => {
+      try {
+        savePeerHint(state, hint)
+      } catch (error) {
+        logger.warn?.(`[device-fleet] cannot persist peer hint: ${String(error?.message ?? error)}`)
+      }
+    },
+  })
   const definitions = createFleetToolDefinitions({ defineTool, handlers })
   const wrapped = withManual(definitions.map((definition) => ({ ...definition, execute: safe(definition.execute) })))
   for (const definition of wrapped) ctx.tools.register(definition)