dsh-device-fleet 0.1.0-dev.12 → 0.1.0-dev.14

package/src/host/ui-web.js

@@ -0,0 +1,78 @@
+// Read-model HTTP surface for the Fleet console (dev.13): device overview,
+// room list and room detail. The approval routes stay in approval-web.js.
+function json(res, status, value) {
+  res.statusCode = status
+  res.setHeader('content-type', 'application/json; charset=utf-8')
+  res.setHeader('cache-control', 'no-store')
+  res.end(JSON.stringify(value))
+}
+
+function pathOf(request) {
+  try {
+    return new URL(request.url ?? '/', 'http://local').pathname
+  } catch {
+    return '/'
+  }
+}
+
+/**
+ * @param {object} options
+ * @param {object} options.webServer ctx.webServer
+ * @param {object} options.inbox ApprovalInbox
+ * @param {object} options.rooms RoomService
+ * @param {() => object} options.getOverview
+ * @returns {() => void} disposer
+ */
+export function registerUiRoutes({ webServer, inbox, rooms, getOverview, logger = null }) {
+  if (!webServer?.register || !rooms) return () => {}
+  const disposers = []
+  disposers.push(
+    webServer.register({
+      kind: 'exact',
+      path: '/device-fleet/overview',
+      handler: async (req, res) => {
+        if (req.method !== 'GET') return json(res, 405, { error: 'method not allowed' })
+        try {
+          json(res, 200, { ...getOverview(), approvals: inbox?.list?.() ?? [] })
+        } catch (error) {
+          logger?.warn?.(`[device-fleet] overview failed: ${String(error?.message ?? error)}`)
+          json(res, 500, { error: 'internal error' })
+        }
+      },
+    }),
+  )
+  disposers.push(
+    webServer.register({
+      kind: 'exact',
+      path: '/device-fleet/rooms',
+      handler: async (req, res) => {
+        if (req.method !== 'GET') return json(res, 405, { error: 'method not allowed' })
+        try {
+          json(res, 200, { rooms: rooms.list() })
+        } catch (error) {
+          json(res, 500, { error: String(error?.message ?? error) })
+        }
+      },
+    }),
+  )
+  disposers.push(
+    webServer.register({
+      kind: 'prefix',
+      path: '/device-fleet/rooms/',
+      handler: async (req, res) => {
+        if (req.method !== 'GET') return json(res, 405, { error: 'method not allowed' })
+        const path = pathOf(req)
+        const roomId = decodeURIComponent(path.slice('/device-fleet/rooms/'.length))
+        if (roomId === '') return json(res, 400, { error: 'room id is required' })
+        try {
+          json(res, 200, { room: rooms.detail(roomId, { limit: 100 }) })
+        } catch (error) {
+          json(res, error?.code === 'unknown-room' ? 404 : 500, { error: String(error?.message ?? error), code: error?.code ?? 'error' })
+        }
+      },
+    }),
+  )
+  return () => {
+    for (const dispose of disposers) dispose()
+  }
+}

package/src/net/fleet-node.js

@@ -489,6 +489,28 @@ export class FleetNode extends EventEmitter {
     return [...this.channels.keys()]
   }
 
+  /** Apply live network changes without recreating the node or its identity. */
+  async reconfigure({ name, direct, discovery, relay } = {}) {
+    if (this.closed) return
+    if (typeof name === 'string' && name !== '') this.name = name
+    const networkChanged = direct !== undefined || discovery !== undefined || relay !== undefined
+    if (!networkChanged) return
+    const wasStarted = this.started
+    await this.close()
+    this.closed = false
+    this.started = false
+    this.hintAttempt = 0
+    this.discovered.clear()
+    if (direct !== undefined) this.directConfig = direct
+    if (discovery !== undefined) this.discoveryConfig = discovery
+    if (relay !== undefined) this.relayConfig = relay
+    this.directServer = null
+    this.discovery = null
+    this.relayClient = null
+    this.directAddress = null
+    if (wasStarted) await this.start()
+  }
+
   async close() {
     this.closed = true
     clearTimeout(this.hintTimer)

package/src/plugin/index.js

@@ -6,6 +6,7 @@
 // Room, Room Board, delegation and the UI land in later steps.
 import { readFileSync } from 'node:fs'
 import { networkInterfaces } from 'node:os'
+import { join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { defineTool } from '@deepseek-ai/dsh-tools'
 import { createUserMessage } from '@deepseek-ai/dsh-llm'
@@ -17,6 +18,9 @@ import { DelegationHost } from '../host/delegation.js'
 import { ApprovalInbox } from '../host/approval-inbox.js'
 import { RoomService } from '../host/room-service.js'
 import { registerApprovalRoutes } from '../host/approval-web.js'
+import { registerUiRoutes } from '../host/ui-web.js'
+import { registerConfigRoutes } from '../host/config-web.js'
+import { RuntimeConfig } from '../host/runtime-config.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'
@@ -126,7 +130,7 @@ function withManual(definitions) {
   }))
 }
 
-export function apply(ctx, config) {
+export function apply(ctx, profileConfig) {
   const pluginVersion = packageVersion()
   const dshVersion = process.env.DSH_CLIENT_VERSION ?? 'unknown'
   // Optional services: Cordis throws on direct property access for services the
@@ -142,12 +146,20 @@ export function apply(ctx, config) {
 
   let state
   try {
-    state = loadState({ dshHome: process.env.DSH_HOME, dataDir: config.dataDir, name: config.deviceName })
+    state = loadState({ dshHome: process.env.DSH_HOME, dataDir: profileConfig?.dataDir, name: profileConfig?.deviceName })
   } catch (error) {
     logger.error?.(`[device-fleet] cannot load state: ${String(error?.message ?? error)}`)
     return
   }
 
+  // Runtime config: profile patch is the base, UI edits are persisted in the
+  // state dir and applied live (no plugin/DSH restart).
+  const runtime = new RuntimeConfig({
+    base: profileConfig ?? {},
+    overridesFile: join(state.dataDir, 'config-overrides.json'),
+  })
+  const config = runtime.current
+
   const node = new FleetNode({
     identity: state.identity,
     fleet: state.fleet,
@@ -163,7 +175,7 @@ export function apply(ctx, config) {
     capabilities: CAPABILITIES,
   })
 
-  const policy = new ToolPolicy(config.policy)
+  let policy = new ToolPolicy(config.policy)
   const sessionController = service('sessionController')
   const fs = service('fs')
   const subagents = service('subagents')
@@ -176,34 +188,52 @@ export function apply(ctx, config) {
     list: () => inbox.list(),
     approve: (id, options) => inbox.approve(id, options),
     deny: (id, reason) => inbox.deny(id, reason),
-    simulate: config.approvals?.simulation
-      ? async ({ fromDeviceId, capability, tool, reason }) => {
-          const promise = inbox.request({
-            fromDeviceId: fromDeviceId ?? 'simulated-device',
-            capability: capability ?? 'run',
-            tool: tool ?? null,
-            reason: reason ?? 'simulated approval request',
-            args: {},
-          })
-          const summary = inbox.list().at(-1)
-          // Keep the promise from becoming an unhandled rejection when the
-          // request expires without an answer; the demo only inspects the inbox.
-          promise.catch(() => {})
-          return `simulated approval request ${summary?.id ?? '?'} created; use fleet_approvals / fleet_approve / fleet_deny`
-        }
-      : null,
+    simulate: async ({ fromDeviceId, capability, tool, reason }) => {
+      if (runtime.current.approvals?.simulation !== true) {
+        throw Object.assign(new Error('approval simulation is disabled'), { code: 'unsupported' })
+      }
+      const promise = inbox.request({
+        fromDeviceId: fromDeviceId ?? 'simulated-device',
+        capability: capability ?? 'run',
+        tool: tool ?? null,
+        reason: reason ?? 'simulated approval request',
+        args: {},
+      })
+      const summary = inbox.list().at(-1)
+      // Keep the promise from becoming an unhandled rejection when the
+      // request expires without an answer; the demo only inspects the inbox.
+      promise.catch(() => {})
+      return `simulated approval request ${summary?.id ?? '?'} created; use fleet_approvals / fleet_approve / fleet_deny`
+    },
   }
-  const requestApproval = config.autoApproveAsk
-    ? async () => ({ approved: true, scope: 'once' })
-    : async (request) => inbox.request(request)
+  const requestApproval = async (request) =>
+    runtime.current.autoApproveAsk === true ? { approved: true, scope: 'once' } : inbox.request(request)
 
-  const rooms = new RoomService({ sessionController, createUserMessage })
+  const rooms = new RoomService({
+    sessionController,
+    createUserMessage,
+    stateFile: join(state.dataDir, 'rooms.json'),
+  })
 
   // Client approval panel data plane (dev.9). Optional service: host-only
   // deployments simply do not expose the panel routes.
   const webServer = service('webServer')
   if (webServer) {
     ctx.effect(() => registerApprovalRoutes({ webServer, inbox, logger }))
+    ctx.effect(() => registerConfigRoutes({ webServer, runtime, logger }))
+    ctx.effect(() =>
+      registerUiRoutes({
+        webServer,
+        inbox,
+        rooms,
+        logger,
+        getOverview: () => ({
+          ...(node.status?.() ?? {}),
+          rooms: rooms.list(),
+          approvals: inbox.list(),
+        }),
+      }),
+    )
   }
   if (!sessionController) logger.warn?.('[device-fleet] sessionController unavailable: direct calls to stateful tools will fail')
   const slot = sessionController
@@ -298,7 +328,7 @@ export function apply(ctx, config) {
           : (state.enrollment?.accountFingerprint ?? null)
       return createInvite(state, {
         accountFingerprint: fingerprint,
-        relay: config.relay ?? state.enrollment?.relay ?? null,
+        relay: runtime.current.relay ?? state.enrollment?.relay ?? null,
         endpoints: localEndpoints(),
       })
     },
@@ -326,13 +356,14 @@ export function apply(ctx, config) {
 
   // Adoption layer 2: one sentence, only when the Fleet has members.
   const systemPrompt = service('systemPrompt')
-  if (systemPrompt && config.promptSection !== false) {
+  if (systemPrompt) {
     const order = systemPrompt.getSectionOrder?.('TOOL_SUBAGENT') ?? PROMPT_SECTION_ORDER
     ctx.effect(() =>
       systemPrompt.section({
         name: 'device-fleet:members',
         order,
         text: () => {
+          if (runtime.current.promptSection === false) return ''
           const members = node.rosterEntries().length
           if (members === 0) return ''
           return `This DSH instance is part of a device Fleet with ${members} other device(s). Use fleet_list/fleet_read/fleet_fetch/fleet_run for work that belongs on another device; direct calls fail fast when that device is offline.`
@@ -341,6 +372,48 @@ export function apply(ctx, config) {
     )
   }
 
+  // Live config application: every UI save runs these handlers in-process.
+  runtime.onChange(async (next, previous) => {
+    if (JSON.stringify(next.policy) !== JSON.stringify(previous?.policy)) {
+      policy = new ToolPolicy(next.policy)
+      if (host) host.policy = policy
+      if (delegation) delegation.policy = policy
+    }
+    if (JSON.stringify(next.execution) !== JSON.stringify(previous?.execution)) {
+      slot?.setConfig(next.execution)
+      if (host) {
+        host.shellTool = next.execution?.shellTool ?? DEFAULT_SHELL_TOOL
+        host.approvalTimeoutMs = next.execution?.approvalTimeoutMs ?? 60_000
+      }
+      if (delegation) {
+        delegation.defaultCwd = next.execution?.cwd
+        delegation.defaultAgentPreset = next.execution?.agentPreset
+        delegation.provider = next.execution?.subagentProvider ?? 'spawn'
+        delegation.timeoutMs = next.execution?.delegateTimeoutMs ?? 180_000
+      }
+    }
+    if (JSON.stringify(next.approvals) !== JSON.stringify(previous?.approvals)) {
+      if (Number.isInteger(next.approvals?.ttlMs) && next.approvals.ttlMs >= 1000) inbox.ttlMs = next.approvals.ttlMs
+      if (Number.isInteger(next.approvals?.maxPending) && next.approvals.maxPending >= 1) inbox.maxPending = next.approvals.maxPending
+    }
+    if (next.deviceName !== previous?.deviceName) {
+      node.name = next.deviceName
+      if (host) host.name = next.deviceName
+    }
+    const networkChanged =
+      JSON.stringify(next.direct) !== JSON.stringify(previous?.direct) ||
+      next.discovery !== previous?.discovery ||
+      JSON.stringify(next.relay) !== JSON.stringify(previous?.relay)
+    if (networkChanged) {
+      await node.reconfigure({
+        name: next.deviceName,
+        direct: next.direct,
+        discovery: next.discovery ? true : false,
+        relay: next.relay ?? null,
+      })
+    }
+  })
+
   // Adoption layer 4: one-line nudge when the model starts orchestrating.
   ctx.on?.('tools/post-execute', async (exec, _result, next) => {
     const decision = await next()
@@ -369,9 +442,8 @@ export function apply(ctx, config) {
 
   ctx.effect(() => () => {
     inbox.close()
-    for (const roomId of rooms.openRooms()) {
-      void rooms.close({ roomId, reason: 'plugin unloaded' }).catch(() => {})
-    }
+    // Rooms are intentionally left open (and persisted) so a plugin reload can
+    // rehydrate them instead of destroying a running collaboration.
     void node.close()
   })