dsh-remote-control-plugin 0.3.4 → 0.3.6

package/INSTALL.md

@@ -4,12 +4,12 @@ Published as `dsh-remote-control-plugin`. Self-contained: no dependencies, no bu
 
 ## Install
 
-Web GUI: **Plugins → Add plugin**, enter `dsh-remote-control-plugin@0.3.4`, keep the official npm
+Web GUI: **Plugins → Add plugin**, enter `dsh-remote-control-plugin@0.3.6`, keep the official npm
 registry selected, then **Install** and **Enable now**. Restart DSH.
 
 From a chat (Standard or Creator preset — PTC disables `tool-plugin-manager`):
 
-> Install the DSH plugin bundle `dsh-remote-control-plugin@0.3.4` with plugin_manager.
+> Install the DSH plugin bundle `dsh-remote-control-plugin@0.3.6` with plugin_manager.
 
 ## Connect two machines
 
@@ -27,6 +27,7 @@ Same-LAN machines need no relay. No reachable machine? Run
 - Approvals live in `$DSH_HOME/remote-control-peers.json`; delete it to revoke.
 - Relay and control API share one port (default `57330`).
 - Peer traffic is signed but not encrypted; use a private network or TLS in front.
-- 0.3.4 fixes: ordered transcript chunks, hosted relay persistence, stale
-  relay peer pruning, relay fallback when a direct LAN route is blocked, and a
-  client module id that matches the package name.
+- 0.3.6 fixes: ordered transcript chunks, hosted relay persistence, stale
+  relay peer pruning, relay fallback when a direct LAN route is blocked, a client
+  module id that matches the package name, and a Devices config row for the
+  remote session's model, permission preset, and plan mode.

package/client.js

@@ -72,6 +72,10 @@ window.__ModuleLoader__.load({
         border: '1px solid var(--dsw-alias-border-l1)',
       },
       error: { fontSize: '12px', color: 'var(--dsw-alias-state-error-primary)', padding: '8px 18px' },
+      configBar: {
+        display: 'flex', gap: '8px', alignItems: 'center', flexWrap: 'wrap',
+        padding: '8px 14px', borderTop: '1px solid var(--dsw-alias-border-l1)',
+      },
     }
 
     async function api(path, body) {
@@ -125,6 +129,8 @@ window.__ModuleLoader__.load({
       const [error, setError] = useState(null)
       const [streamState, setStreamState] = useState('connecting')
       const [attempt, setAttempt] = useState(0)
+      const [config, setConfig] = useState(null)
+      const [configBusy, setConfigBusy] = useState(false)
       const seen = useRef(new Set())
       const logRef = useRef(null)
       const pinned = useRef(true)
@@ -212,6 +218,82 @@ window.__ModuleLoader__.load({
         }
       }, [peerId, sessionId])
 
+      const loadConfig = useCallback(async () => {
+        if (!peerId || !sessionId) return
+        try {
+          const value = await api(
+            `/remote-control/api/peer/${encodeURIComponent(peerId)}/session-config?sessionId=${encodeURIComponent(sessionId)}`,
+          )
+          setConfig(value)
+        } catch {
+          setConfig(null)
+        }
+      }, [peerId, sessionId])
+
+      useEffect(() => { loadConfig() }, [loadConfig])
+
+      const applyConfig = useCallback(async (patch) => {
+        setConfigBusy(true)
+        setError(null)
+        try {
+          const value = await api(`/remote-control/api/peer/${encodeURIComponent(peerId)}/session-config`, { sessionId, ...patch })
+          if (value && value.ok === false) throw new Error((value.failures || []).join('; ') || 'config rejected')
+          await loadConfig()
+        } catch (failure) {
+          setError(failure.message)
+        }
+        setConfigBusy(false)
+      }, [peerId, sessionId, loadConfig])
+
+      const models = config?.models ?? []
+      const permissions = config?.permission?.catalog?.options ?? []
+      const modelValue = config?.model ? `${config.model.provider}:${config.model.model}` : ''
+      const permissionValue = config?.permission?.current ?? config?.permission?.catalog?.defaultPreset ?? ''
+      const planActive = config?.plan?.active === true
+      const configBar = (models.length > 0 || permissions.length > 0)
+        ? h('div', { style: S.configBar },
+          models.length > 0
+            ? h('select', {
+              style: S.field,
+              value: modelValue,
+              disabled: configBusy,
+              onChange: (event) => {
+                const [provider, model] = event.target.value.split(':')
+                if (provider && model) applyConfig({ model: { provider, model } })
+              },
+            },
+              modelValue ? null : h('option', { value: '' }, 'Model'),
+              models.map((group) => h('optgroup', { key: group.provider, label: group.name },
+                group.models.map((model) => h('option', {
+                  key: `${group.provider}:${model.id}`,
+                  value: `${group.provider}:${model.id}`,
+                }, model.name)),
+              )),
+            )
+            : null,
+          permissions.length > 0
+            ? h('select', {
+              style: S.field,
+              value: permissionValue,
+              disabled: configBusy,
+              onChange: (event) => applyConfig({ permission: event.target.value }),
+            }, permissions.map((option) => h('option', {
+              key: option.value,
+              value: option.value,
+              title: option.description ?? '',
+            }, option.name)))
+            : null,
+          config?.plan
+            ? h('button', {
+              type: 'button',
+              disabled: configBusy,
+              style: { ...S.button, ...(planActive ? S.primary : {}) },
+              onClick: () => applyConfig({ plan: !planActive }),
+            }, planActive ? 'Plan on' : 'Plan off')
+            : null,
+        )
+        : null
+
       return h('div', { style: { ...S.column, flex: 1, minHeight: 0 } },
         h('div', {
           style: { padding: '10px 18px', borderBottom: '1px solid var(--dsw-alias-border-l1)', fontSize: '13px', fontWeight: 600 },
@@ -247,6 +329,7 @@ window.__ModuleLoader__.load({
             : null,
           live ? h('div', { style: { ...S.bubble, ...S.assistantBubble, opacity: 0.85 } }, live) : null,
         ),
+        configBar,
         h('div', { style: S.composer },
           h('textarea', {
             style: S.input,

package/host/fabric.js

@@ -286,6 +286,19 @@ export function createFabric({ log, config, self, sessions, stateFile }) {
     const verdict = verifyPeer(req, url)
     if (!verdict.ok) return json(res, 403, { error: verdict.error })
 
+    if (pathname === '/peer/session/config' && req.method === 'GET') {
+      const sessionId = String(url.searchParams.get('sessionId') || '')
+      if (!sessionId) return json(res, 400, { error: 'missing-session' })
+      if (typeof sessions.config !== 'function') return json(res, 503, { error: 'config-unavailable' })
+      return json(res, 200, await sessions.config(sessionId))
+    }
+    if (pathname === '/peer/session/config' && req.method === 'POST') {
+      const body = await readJson(req)
+      const sessionId = typeof body?.sessionId === 'string' ? body.sessionId : ''
+      if (!sessionId) return json(res, 400, { error: 'missing-session' })
+      if (typeof sessions.applyConfig !== 'function') return json(res, 503, { error: 'config-unavailable' })
+      return json(res, 200, await sessions.applyConfig(sessionId, body))
+    }
     if (pathname === '/peer/sessions' && req.method === 'GET') {
       const value = await sessions.list()
       return json(res, 200, { items: value.map((item) => ({ ...item, title: item.title })) })

package/index.js

@@ -87,6 +87,111 @@ export function apply(ctx, rawConfig) {
     cancel(sessionId) {
       return ctx.sessionController.cancel({ sessionId })
     },
+    /**
+     * Read a session's live configuration. Never resumes a cold session: a
+     * remote read must not have side effects on the target.
+     */
+    async config(sessionId) {
+      const out = { sessionId }
+      // Cordis throws when a service is read as a property without `inject`,
+      // so every optional service is reached through ctx.get inside a guard.
+      let liveSession
+      let agent
+      try { liveSession = ctx.get?.('sessions')?.get?.(sessionId) } catch { /* not injected */ }
+      try { agent = ctx.get?.('agents')?.get?.(sessionId) } catch { /* not injected */ }
+      out.live = Boolean(liveSession)
+      out.running = Boolean(agent)
+
+      try {
+        const catalog = await ctx.sessionController.modelCatalog()
+        out.models = (catalog?.groups ?? []).map((group) => ({
+          provider: group.id,
+          name: group.name,
+          models: (group.models ?? []).map((model) => ({ id: model.id, name: model.name })),
+        }))
+      } catch { /* catalog unavailable */ }
+
+      try {
+        const projections = await ctx.sessionController.projections({ sessionId })
+        const current = projections?.values?.modelSelection
+        if (current) out.model = { provider: current.provider, model: current.model, reasoningEffort: current.reasoningEffort }
+      } catch { /* no projection */ }
+
+      try {
+        const presets = ctx.get?.('permissionPresets')
+        if (presets) {
+          out.permission = {
+            current: liveSession ? presets.current(liveSession) : null,
+            catalog: presets.catalog(),
+          }
+        }
+      } catch { /* permission presets unavailable */ }
+
+      try {
+        const plan = ctx.get?.('planMode')
+        if (plan && agent) out.plan = plan.get(agent)
+      } catch { /* plan mode unavailable */ }
+
+      return out
+    },
+    /** Apply model / permission / plan to a peer session, resuming it if cold. */
+    async applyConfig(sessionId, patch) {
+      if (!patch || typeof patch !== 'object') return { ok: false, error: 'bad-request' }
+      const applied = {}
+      const failures = []
+
+      if (patch.model && typeof patch.model.provider === 'string' && typeof patch.model.model === 'string') {
+        try {
+          const selection = { provider: patch.model.provider, model: patch.model.model }
+          if (typeof patch.model.reasoningEffort === 'string') selection.reasoningEffort = patch.model.reasoningEffort
+          const result = await ctx.sessionController.selectModel({ sessionId, ...selection })
+          applied.model = result?.selected ?? selection
+        } catch (error) {
+          failures.push(`model: ${error?.message || error}`)
+        }
+      }
+
+      const needsLive = typeof patch.permission === 'string' || typeof patch.plan === 'boolean'
+      if (needsLive) {
+        let agent
+        let session
+        try { agent = ctx.get?.('agents')?.get?.(sessionId) } catch { /* not injected */ }
+        if (!agent) {
+          try {
+            const resolved = await ctx.sessionController.resolveAgent(sessionId)
+            agent = resolved?.agent
+          } catch (error) {
+            failures.push(`resume: ${error?.message || error}`)
+          }
+        }
+        try { session = ctx.get?.('sessions')?.get?.(sessionId) } catch { /* not injected */ }
+
+        if (typeof patch.permission === 'string') {
+          try {
+            const presets = ctx.get?.('permissionPresets')
+            if (!presets || !session) throw new Error('permission presets unavailable')
+            presets.set(session, patch.permission)
+            applied.permission = patch.permission
+          } catch (error) {
+            failures.push(`permission: ${error?.message || error}`)
+          }
+        }
+
+        if (typeof patch.plan === 'boolean') {
+          try {
+            const plan = ctx.get?.('planMode')
+            if (!plan || !agent) throw new Error('plan mode unavailable')
+            applied.plan = plan.set(agent, patch.plan)
+          } catch (error) {
+            failures.push(`plan: ${error?.message || error}`)
+          }
+        }
+      }
+
+      return failures.length > 0
+        ? { ok: false, applied, failures }
+        : { ok: true, applied }
+    },
   }
 
   fabric = createFabric({
@@ -349,10 +454,20 @@ export function apply(ctx, rawConfig) {
       return json(res, 200, await fabric.connect(String(body?.deviceId || '')))
     }
 
-    const match = action.match(/^\/peer\/([^/]+)\/(sessions|stream|prompt|cancel)$/)
+    const match = action.match(/^\/peer\/([^/]+)\/(sessions|stream|prompt|cancel|session-config)$/)
     if (match) {
       const deviceId = decodeURIComponent(match[1])
       const operation = match[2]
+      if (operation === 'session-config' && req.method === 'GET') {
+        const sessionId = String(url.searchParams.get('sessionId') || '')
+        const reply = await fabric.callPeer(deviceId, 'GET', `/peer/session/config?sessionId=${encodeURIComponent(sessionId)}`)
+        return json(res, reply.status ?? (reply.ok ? 200 : 502), reply.json ?? { error: reply.error })
+      }
+      if (operation === 'session-config' && req.method === 'POST') {
+        const body = await readJson(req)
+        const reply = await fabric.callPeer(deviceId, 'POST', '/peer/session/config', body)
+        return json(res, reply.status ?? (reply.ok ? 200 : 502), reply.json ?? { error: reply.error })
+      }
       if (operation === 'sessions' && req.method === 'GET') {
         const reply = await fabric.callPeer(deviceId, 'GET', '/peer/sessions')
         return json(res, reply.status ?? (reply.ok ? 200 : 502), reply.json ?? { error: reply.error })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote-control-plugin",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "type": "module",
   "description": "Remote control for DSH: a Devices panel that discovers other DSH desktops signed into the same account, pairs with them once, and drives their sessions.",
   "exports": {