dsh-remote-plugin 0.7.0 → 0.7.2

package/client.js

@@ -20,7 +20,11 @@ window.__ModuleLoader__.load({
     }
 
     var DRAWER_STYLE = {
-      position: 'fixed', top: 12, right: 12, bottom: 12, zIndex: 2147483000,
+      // Desktop's hidden title bar overlays the page (40px on Windows).
+      // Electron exposes its current height through the CSS environment value;
+      // keep a safe fallback for Desktop hosts without that value.
+      position: 'fixed', top: window.location && window.location.protocol === 'dsh-app:' ? 'calc(12px + env(titlebar-area-height, 40px))' : 12,
+      right: 12, bottom: 12, zIndex: 2147483000,
       width: 'min(520px, calc(100vw - 24px))', background: '#0b0e1a',
       border: '1px solid rgba(125, 207, 255, .22)', borderRadius: 24, overflow: 'hidden',
       boxShadow: '-16px 18px 48px rgba(0,0,0,.46), 0 0 0 1px rgba(91,140,255,.08)',
@@ -141,7 +145,13 @@ window.__ModuleLoader__.load({
       }, [])
       return React.createElement('div', {
         'aria-hidden': !open,
-        style: Object.assign({}, DRAWER_STYLE, { transform: open ? 'translateX(0)' : 'translateX(102%)' }),
+        style: Object.assign({}, DRAWER_STYLE, {
+          transform: open ? 'translateX(0)' : 'translateX(102%)',
+          boxShadow: open ? DRAWER_STYLE.boxShadow : 'none',
+          pointerEvents: open ? 'auto' : 'none',
+          visibility: open ? 'visible' : 'hidden',
+          transition: open ? 'transform .22s ease' : 'transform .22s ease, visibility 0s linear .22s',
+        }),
       },
         loaded.current ? React.createElement('iframe', {
           src: '/remote/plugin.html',

package/gateway.cjs

@@ -1703,6 +1703,12 @@ async function translateModernRpc(method, payload, rpcId) {
     if (!['create', 'rename', 'delete', 'insertBefore', 'insertSessionBefore', 'archiveSession'].includes(verb)) return legacyFallback('no generated RPC adapter')
     endpoint = 'workspace/' + verb
     args = { request: payload }
+    if (verb === 'archiveSession') transform = value => {
+      // The HTTP receipt precedes workspace/follow on another connection.
+      // Publish the committed archive set before a client's immediate refresh.
+      if (Array.isArray(value?.archivedSessionIds)) applyModernWorkspaceFrame({ type: 'archived', ...value })
+      return value
+    }
   } else if (method.startsWith('goal.')) {
     const verb = method.slice('goal.'.length)
     if (!['create', 'edit', 'pause', 'resume', 'complete', 'clear'].includes(verb)) return legacyFallback('no generated RPC adapter')
@@ -1767,6 +1773,31 @@ async function translateModernRpc(method, payload, rpcId) {
       return legacyEnvelope(rpcId, modernError(error.message, 'image-vision-failed'))
     }
   }
+  if (method === 'subagent.list' && modernResponseNeedsLegacyFallback(response)) {
+    // DSH 0.2 removed subagents/list; discovery is now a non-activating
+    // read of the parent's durable catalog and each child's projections.
+    const parent = await callUpstreamRemote('session/projections', { request: { sessionId: payload.parentSessionId } }, rpcId)
+    if (modernResponseNeedsLegacyFallback(parent)) return legacyFallback('generated subagent catalog unavailable')
+    if (!parent.body?.result?.ok) return parent.body || legacyEnvelope(rpcId, modernError('DSH subagent catalog read failed'))
+    const catalog = parent.body.result.value?.values?.subagentCatalog
+    if (!Array.isArray(catalog)) return legacyEnvelope(rpcId, modernError('DSH did not expose a subagent catalog projection', 'subagent/projections-unavailable'))
+    await refreshModernSessions()
+    const entries = await Promise.all(catalog.map(async child => {
+      if (!['one-shot', 'continuable'].includes(child.mode)) return { kind: 'diagnostic', id: child.id, reason: 'unsupported' }
+      try {
+        const read = await callUpstreamRemote('session/projections', { request: { sessionId: child.id } })
+        if (!read.body?.result?.ok || !read.body.result.value) return { kind: 'diagnostic', id: child.id, reason: 'unavailable' }
+        const values = read.body.result.value.values
+        const identity = values?.subagent
+        if (!identity || identity.mode !== child.mode) return { kind: 'diagnostic', id: child.id, reason: 'corrupt' }
+        return { kind: 'child', id: child.id, mode: identity.mode,
+          ...(identity.label === undefined ? {} : { label: identity.label }),
+          activity: modernState.sessions.get(child.id)?.running ? 'running' : 'inactive',
+          hasChildren: Array.isArray(values.subagentCatalog) && values.subagentCatalog.length > 0 }
+      } catch { return { kind: 'diagnostic', id: child.id, reason: 'unavailable' } }
+    }))
+    return legacyEnvelope(rpcId, { ok: true, value: { entries, parentAvailable: !!modernState.sessions.get(payload.parentSessionId)?.agentAvailable } })
+  }
   if (modernResponseNeedsLegacyFallback(response)) return legacyFallback(`generated RPC ${endpoint} unavailable`)
   if (!response.body?.result?.ok) {
     recordCompatibility('generated-rpc-error', { method, status: response.status, detail: remoteFailureKind(response) })
@@ -1818,6 +1849,8 @@ function rememberCollectorReplay(kind, full, raw) {
   let key = ''
   if (payload.type === 'session/subscribed' && payload.sessionId) key = `session:${payload.sessionId}`
   else if (payload.type === 'session/reasoning' && payload.sessionId) key = `reasoning:${payload.sessionId}`
+  else if (payload.type === 'session/queue' && payload.sessionId) key = `queue:${payload.sessionId}`
+  else if (payload.type === 'session/jobs' && payload.sessionId) key = `jobs:${payload.sessionId}`
   else if (payload.type === 'approval/requested' && payload.approvalId) key = `approval:${payload.approvalId}`
   else if (payload.type === 'question/requested' && full.rpcId) key = `question:${full.rpcId}`
   else if (payload.type === 'approval/resolved' && payload.approvalId) replay.delete(`approval:${payload.approvalId}`)
@@ -2095,6 +2128,28 @@ function openModernSessionStream(ws, sessionId) {
     type: 'open', streamId, endpoint: 'session/follow',
     payload: { args: { request: { address: { kind: 'session', sessionId }, assistantStream: true } } },
   }))
+  ws.send(JSON.stringify({
+    type: 'open', streamId: 'jobs:' + sessionId, endpoint: 'job/list',
+    payload: { args: { request: { sessionId } } },
+  }))
+}
+
+function applyModernProjection(sessionId, key, value, seq) {
+  legacyPush('mux', { type: 'session/projection', sessionId, key, value, seq })
+  if (key === 'inbox') {
+    // DSH 0.2 stores queue/steer state in the durable Inbox projection.
+    const items = ['next-turn', 'next-step'].flatMap(target =>
+      (Array.isArray(value?.[target]) ? value[target] : []).filter(message => message?.id).map(message => ({
+        id: message.id, placement: target === 'next-turn' ? 'queued' : 'context', message,
+      })))
+    legacyPush('mux', { type: 'session/queue', sessionId, items })
+  }
+}
+
+function applyModernJobFrame(sessionId, value) {
+  if (value?.type === 'rows' && Array.isArray(value.jobs)) {
+    legacyPush('mux', { type: 'session/jobs', sessionId, jobs: value.jobs })
+  }
 }
 
 function applyModernControlFrame(value) {
@@ -2107,16 +2162,14 @@ function applyModernControlFrame(value) {
     }
     for (const [sessionId, block] of Object.entries(value.value?.projections || {})) {
       for (const [key, projection] of Object.entries(block?.values || {})) {
-        legacyPush('mux', { type: 'session/projection', sessionId, key, value: projection, seq: block?.asOfSeq ?? 0 })
+        applyModernProjection(sessionId, key, projection, block?.asOfSeq ?? 0)
       }
     }
     return
   }
   if (value?.type === 'queue') legacyPush('mux', { type: 'session/queue', sessionId: value.sessionId, items: value.items || [] })
   else if (value?.type === 'jobs') legacyPush('mux', { type: 'session/jobs', sessionId: value.sessionId, jobs: value.jobs || [] })
-  else if (value?.type === 'projection') legacyPush('mux', {
-    type: 'session/projection', sessionId: value.sessionId, key: value.key, value: value.value, seq: value.seq,
-  })
+  else if (value?.type === 'projection') applyModernProjection(value.sessionId, value.key, value.value, value.seq)
 }
 
 function applyModernWorkspaceFrame(value) {
@@ -2209,7 +2262,7 @@ function applyModernSessionFrame(sessionId, value) {
       if (record?.event) legacyPush('mux', { type: 'session/event', sessionId, event: record.event })
     }
     for (const [key, projection] of Object.entries(value.projections?.values || {})) {
-      legacyPush('mux', { type: 'session/projection', sessionId, key, value: projection, seq: value.projections?.asOfSeq ?? value.cursor })
+      applyModernProjection(sessionId, key, projection, value.projections?.asOfSeq ?? value.cursor)
     }
     return
   }
@@ -2282,7 +2335,11 @@ function applyModernRemoteEvent(ws, value) {
     modernState.sessionCursors.delete(args[0])
     modernState.assistantStreams.delete(args[0])
     collectorReplay.mux.delete(`reasoning:${args[0]}`)
+    collectorReplay.mux.delete(`session:${args[0]}`)
+    collectorReplay.mux.delete(`queue:${args[0]}`)
+    collectorReplay.mux.delete(`jobs:${args[0]}`)
     try { ws.send(JSON.stringify({ type: 'cancel', streamId: 'session:' + args[0] })) } catch {}
+    try { ws.send(JSON.stringify({ type: 'cancel', streamId: 'jobs:' + args[0] })) } catch {}
     legacyPush('host', { type: 'host/session-removed', sessionId: args[0] })
   } else if (value.event === 'api-session/status') {
     legacyPush('host', { type: 'host/session-status', sessionId: args[0], running: !!args[1] })
@@ -2371,6 +2428,9 @@ function startModernEventCollector() {
         const data = typeof ev.data === 'string' ? ev.data : Buffer.isBuffer(ev.data) ? ev.data.toString() : String(ev.data)
         const frame = JSON.parse(data)
         if (frame.type === 'error') {
+          // Old generated-RPC Hosts may have no job namespace. This optional
+          // roster must not degrade the working session and approval streams.
+          if (frame.streamId?.startsWith('jobs:') && ['gateway/definition-unavailable', 'gateway/invocation-unavailable', 'gateway/service-unavailable', 'gateway/method-unavailable', 'method-unavailable', 'not-found'].includes(frame.error?.code)) return
           const message = frame.error?.message || 'modern stream error'
           for (const state of Object.values(eventCollectorState)) state.lastError = message
           legacyPush('mux', { type: 'stream/error', error: frame.error || { message } })
@@ -2380,6 +2440,7 @@ function startModernEventCollector() {
         if (frame.streamId === 'events') applyModernRemoteEvent(current, frame.value)
         else if (frame.streamId === 'control') applyModernControlFrame(frame.value)
         else if (frame.streamId === 'workspaces') applyModernWorkspaceFrame(frame.value)
+        else if (frame.streamId.startsWith('jobs:')) applyModernJobFrame(frame.streamId.slice(5), frame.value)
         else if (frame.streamId.startsWith('session:')) applyModernSessionFrame(frame.streamId.slice(8), frame.value)
       } catch {}
     }
@@ -4197,11 +4258,14 @@ function serveHandoff(req, res, url) {
       fsJson(res, 400, { error: 'sessionId required' })
       return
     }
+    // 白名单字段只接受字符串：对象/数字/数组等一律按空串处理，
+    // 避免 String({}) 产出 '[object Object]' 之类垃圾落盘并广播到其他设备
+    const str = (v) => typeof v === 'string' ? v : ''
     handoffSave({
       sessionId: sessionId.slice(0, 128),
-      title: String(payload.title || '').slice(0, 200),
-      device: String(payload.device || '').slice(0, 80),
-      clientId: String(payload.clientId || '').slice(0, 96),
+      title: str(payload.title).slice(0, 200),
+      device: str(payload.device).slice(0, 80),
+      clientId: str(payload.clientId).slice(0, 96),
       at: Date.now()
     })
     fsJson(res, 200, { ok: true })
@@ -4440,6 +4504,8 @@ async function proxyLegacyRpcWithModernFallback(req, res, url) {
 
 async function proxyModernApi(req, res, url) {
   if (req.method !== 'POST' || url.pathname.startsWith('/remote/')) return false
+  // dsh-context is a Connection Fetch route with its own JSON contract, not RPC.
+  if (url.pathname === '/api/dsh-context/detail') return false
   if (await detectUpstreamApiFlavor() !== 'modern') return false
   let raw = ''
   try {
@@ -4560,7 +4626,13 @@ function proxyApi(req, res, url) {
     res.end()
     return
   }
-  const ok = authorized(req, url)
+  // Credential exchange is restricted to named client endpoints. Administrative
+  // plugin routes must authenticate the master token before reaching DSH.
+  const remoteClientPath = ['/remote/api/command', '/remote/api/command-status', '/remote/admin/api/dsh'].includes(url.pathname)
+    || (url.pathname === '/remote/api/insights/cost' && req.method === 'GET')
+    || /^\/remote\/api\/plugins\/(state|details|market|operations|recover)$/.test(url.pathname)
+  const remoteAdminPath = url.pathname.startsWith('/remote/') && !remoteClientPath
+  const ok = remoteAdminPath ? adminAuthorized(req, url) : remoteClientPath ? controlAuthorized(req, url) : authorized(req, url)
   touchDevice(req, ok ? {} : { failedAuth: true })
   if (!ok) {
     authFailures++

package/index.mjs

@@ -13,6 +13,7 @@ import { homedir, hostname, networkInterfaces } from 'node:os'
 import { dirname, extname, normalize, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { createPluginCenter, detectProfile } from './plugin-center.mjs'
+import { readCostInsights } from './insights.mjs'
 
 export const name = 'dsh-remote'
 export const inject = ['webServer', 'commands', 'agents', 'connection']
@@ -637,6 +638,15 @@ async function resolveFile(pathname) {
 
 async function serveStatic(req, res, ctx) {
   const pathname = new URL(req.url ?? '/', 'http://x').pathname
+  if (pathname === `${MOUNT}/api/insights/cost`) {
+    if (!remoteCommandAuthorized(req)) return sendJson(res, 401, { ok: false, code: 'unauthorized' })
+    if (req.method !== 'GET') return sendJson(res, 405, { ok: false, code: 'read-only' })
+    const query = new URL(req.url, 'http://x').searchParams
+    if ([...query.keys()].some(key => key !== 'sessionId') || query.getAll('sessionId').length > 1) return sendJson(res, 400, { ok: false, code: 'invalid-query' })
+    const result = await readCostInsights(ctx, query.get('sessionId') || '')
+    res.setHeader('cache-control', 'no-store')
+    return sendJson(res, result.status, result.body)
+  }
   if (pathname.startsWith(`${MOUNT}/api/plugins/`)) {
     if (!remoteCommandAuthorized(req)) return sendJson(res, 401, { ok: false, message: 'unauthorized' })
     try {

package/insights.mjs

@@ -0,0 +1,73 @@
+// Read-only, bounded adapter for dsh-cost-meter 1.8.x. Never forward its config.
+const states = new WeakMap()
+const record = value => value && typeof value === 'object' && !Array.isArray(value) ? value : {}
+const number = value => typeof value === 'number' && Number.isFinite(value) && value >= 0 ? value : null
+const text = (value, max = 80) => typeof value === 'string' ? value.slice(0, max) : ''
+const status = value => ['ok', 'off', 'error', 'stale', 'loading'].includes(value) ? value : 'unknown'
+function amount(value) {
+  const row = record(value)
+  return { cost: number(row.cost), apiCost: number(row.apiCost ?? row.cost), calls: number(row.calls) }
+}
+function windows(value) {
+  return Object.entries(record(value)).slice(0, 8).map(([key, raw]) => {
+    const row = record(raw), percent = number(row.percent)
+    return { name: text(key), percent: percent !== null && percent <= 100 ? percent : null,
+      resetsAt: text(row.resetsAt), unlimited: row.unlimited === true }
+  })
+}
+export function summarizeCost(state, session, sessionId) {
+  const raw = record(state), config = record(raw.config), balance = record(raw.balance)
+  const plans = Object.entries(record(raw.codingPlans)).slice(0, 20)
+    .filter(([, row]) => record(row).enabled === true && record(row).display !== 'off')
+    .map(([name, value]) => {
+      const row = record(value)
+      return { name: text(name), status: status(row.status), fetchedAt: number(row.fetchedAt), windows: windows(row.windows) }
+    })
+  const go = record(raw.goQuota)
+  if (record(config.goQuota).enabled === true && record(config.goQuota).display !== 'off') {
+    plans.unshift({ name: 'OpenCode Go', status: status(go.status), fetchedAt: number(go.fetchedAt),
+      windows: windows({ rolling: go.rolling, weekly: go.weekly, monthly: go.monthly }).filter(row => row.percent !== null) })
+  }
+  const s = record(session)
+  return { schema: 1, available: true, source: 'dsh-cost-meter', generatedAt: Date.now(), currency: 'USD',
+    day: text(record(raw.runtime).dayKey || record(raw.today).date, 10),
+    today: config.hideTodayCost === true ? null : amount(raw.today),
+    session: sessionId ? { found: s.found === true, own: s.found === true ? amount(s.own) : null,
+      subagents: s.found === true ? amount(s.subagents) : null, subagentCount: number(s.subagentCount) } : null,
+    balance: config.hideOfficialBalance === true || record(config.balance).display === 'off' ? null : {
+      status: status(balance.status), fetchedAt: number(balance.fetchedAt),
+      currency: /^[A-Z]{3}$/.test(balance.currency) ? balance.currency : '', total: number(balance.totalBalance) }, plans }
+}
+function bounded(task, ms = 20000) {
+  let timer
+  return Promise.race([task, new Promise((_, reject) => { timer = setTimeout(() => reject(new Error('timeout')), ms) })])
+    .finally(() => clearTimeout(timer))
+}
+export async function readCostInsights(ctx, sessionId = '') {
+  if (typeof sessionId !== 'string' || sessionId.length > 200 || /[\s\x00-\x1f\x7f]/.test(sessionId)) {
+    return { status: 400, body: { ok: false, code: 'invalid-session' } }
+  }
+  let service
+  try { service = ctx.get?.('costMeter') } catch {}
+  if (!service) return { status: 200, body: { ok: true, schema: 1, available: false, code: 'not-installed' } }
+  if (typeof service.getState !== 'function') return { status: 200, body: { ok: true, schema: 1, available: false, code: 'unsupported' } }
+  try {
+    // A short shared cache coalesces device reads; no credentials or settings are sent.
+    let cache = states.get(ctx)
+    const identity = service[Symbol.for('cordis.original')] ?? service
+    if (!cache || cache.service !== identity) { cache = { service: identity, at: 0 }; states.set(ctx, cache) }
+    if (!cache.task && (!cache.value || Date.now() - cache.at > 15000)) {
+      cache.task = bounded(Promise.resolve().then(() => service.getState())).then(value => {
+        if (!value || typeof value !== 'object' || !value.today) throw new Error('unsupported')
+        cache.value = value; cache.at = Date.now(); return value
+      }).finally(() => { cache.task = null })
+    }
+    const raw = cache.task ? await cache.task : cache.value
+    const session = sessionId && typeof service.getSessionCost === 'function'
+      ? await bounded(Promise.resolve().then(() => service.getSessionCost(sessionId))) : null
+    return { status: 200, body: { ok: true, ...summarizeCost(raw, session, sessionId) } }
+  } catch {
+    // Plugin failures may mention credentials, URLs or paths. Return a fixed code.
+    return { status: 502, body: { ok: false, code: 'cost-unavailable' } }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-remote-plugin",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "DSH Remote 官方 bundle 插件：DSH 左侧原生边栏入口 + 右侧抽屉内嵌管理控制台；内置网关随 DSH 自动启停(systemd 独立单元)，抽屉直显令牌与设备监控；网关提供 /fs/* 文件传输端点(列表/断点下载/上传)，配合 Android App 远程操控会话/审批/提问/goal 与文件互传(多服务器测速切换、聊天记录离线缓存)。",
   "type": "module",
   "main": "./index.mjs",
@@ -19,7 +19,8 @@
     "apk",
     "cordis.patch.yml",
     "*.md",
-    "plugin-center.mjs"
+    "plugin-center.mjs",
+    "insights.mjs"
   ],
   "keywords": [
     "dsh-plugin",

package/plugin-center.mjs

@@ -1,5 +1,5 @@
 /* Profile-scoped plugin management. No shell input, dependencies or client-selected paths. */
-import { readFileSync, writeFileSync, renameSync, mkdirSync, existsSync, readdirSync, copyFileSync, unlinkSync, realpathSync } from 'node:fs'
+import { readFileSync, writeFileSync, renameSync, mkdirSync, existsSync, readdirSync, copyFileSync, unlinkSync, realpathSync, openSync, closeSync } from 'node:fs'
 import { dirname, basename, join, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { createHash } from 'node:crypto'
@@ -20,19 +20,66 @@ const fail = (message, status = 400) => Object.assign(new Error(message), { stat
 const protectedPackage = name => name === 'dsh-remote-plugin' || name.startsWith('@deepseek-ai/')
 const revision = path => createHash('sha256').update(readFileSync(path)).digest('hex')
 
-export function detectProfile(ctx, cli = process.argv[1]) {
+function alive(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) return false
+  try { process.kill(pid, 0); return true } catch (error) { return error.code !== 'ESRCH' }
+}
+
+// Never clear a live worker or its package-manager child. PID reuse fails closed.
+function recoverDeadLock(storage) {
+  const path = join(storage, 'lock.json')
+  if (!existsSync(path)) return
+  const owner = read(path)
+  if (!idPattern.test(owner.id || '')) throw fail('插件任务锁损坏，请在主机检查', 409)
+  const launchPath = join(storage, 'launch-' + owner.id + '.json')
+  const workerPid = owner.workerPid || (existsSync(launchPath) ? read(launchPath).pid : null)
+  if (alive(workerPid) || alive(owner.cliPid)) return
+  if (!workerPid && (!owner.launcherPid || alive(owner.launcherPid) || Date.now() - owner.createdAt < 30000)) return
+  const jobPath = join(storage, 'job-' + owner.id + '.json')
+  if (existsSync(jobPath)) {
+    const job = read(jobPath)
+    if (['queued', 'running'].includes(job.phase)) {
+      job.phase = 'interrupted'; job.endedAt = Date.now(); job.restartRequired = true
+      job.message = '任务进程已退出，已解除锁定。文件可能已改变，请核对插件状态；未执行自动回滚。'
+      atomic(jobPath, job)
+    }
+  }
+  // All reads/writes here are synchronous; recheck ownership before unlinking.
+  if (read(path).id === owner.id) unlinkSync(path)
+}
+
+export function detectProfile(ctx, cli = process.argv[1], runtime = process) {
   try {
     const dir = realpathSync(fileURLToPath(ctx.root?.baseUrl || ctx.baseUrl))
     const manifest = read(join(dir, 'package.json'))
     if (basename(dirname(dir)) !== 'profiles' || !Array.isArray(manifest.dsh?.profile?.bundles)) return null
     const name = basename(dir)
     if (!/^[a-zA-Z0-9][a-zA-Z0-9_-]*(?![\s\S])/.test(name)) return null
-    let root = dirname(realpathSync(cli))
+    const base = { dir, name, home: dirname(dirname(dir)), cli: null }
+    // Desktop reserves this profile for its installation-owned carrier CLI.
+    // Bind to the host that booted this root, never a global CLI or PATH entry.
+    if (name === 'desktop') {
+      try {
+        const entry = realpathSync(cli), hostRoot = dirname(dirname(entry))
+        const host = read(join(hostRoot, 'package.json'))
+        const runtimeDir = realpathSync(resolve(hostRoot, '../../..'))
+        const bundled = read(join(runtimeDir, 'package.json'))
+        const carrier = join(hostRoot, 'lib', 'cli.js')
+        if (runtime.versions?.electron && host.name === '@deepseek-ai/dsh-desktop-host'
+          && entry === realpathSync(join(hostRoot, 'lib', 'index.js'))
+          && bundled.name === '@deepseek-ai/dsh-desktop-runtime' && bundled.version === host.version
+          && runtimeDir === realpathSync(runtime.argv[2]) && dir === realpathSync(runtime.argv[3])
+          && existsSync(carrier)) return { ...base, cli: carrier, cliMode: 'desktop' }
+      } catch {}
+      return base
+    }
+    let root
+    try { root = dirname(realpathSync(cli)) } catch { return base }
     let found = null
     for (let i = 0; i < 5; i++, root = dirname(root)) {
       try { if (read(join(root, 'package.json')).name === '@deepseek-ai/dsh') { found = join(root, 'lib', 'bin.js'); break } } catch {}
     }
-    return { dir, name, home: dirname(dirname(dir)), cli: found && existsSync(found) ? found : null }
+    return { ...base, cli: found && existsSync(found) ? found : null }
   } catch { return null }
 }
 
@@ -68,10 +115,18 @@ export function createPluginCenter(ctx, options = {}) {
   const profile = options.profile === undefined ? detectProfile(ctx) : options.profile
   const details = options.details || pluginDetails
   const launch = options.launch || (args => {
-    const child = spawn(process.execPath, [SELF, '--worker', ...args], { detached: true, windowsHide: true, stdio: 'ignore' })
+    const desktop = profile?.cliMode === 'desktop'
+    const errorLog = openSync(join(profile.dir, '.remote-plugin-center', 'worker-' + args[2] + '.log'), 'a', 0o600)
+    let child
+    try {
+      child = spawn(process.execPath, [...(desktop ? ['--expose-internals'] : []), SELF, '--worker', ...args], {
+        detached: true, windowsHide: true, stdio: ['ignore', 'ignore', errorLog],
+        env: { ...process.env, ...(desktop ? { ELECTRON_RUN_AS_NODE: '1' } : {}) },
+      })
+    } finally { closeSync(errorLog) }
     return new Promise((resolveLaunch, reject) => {
       child.once('error', reject)
-      child.once('spawn', () => { child.unref(); resolveLaunch() })
+      child.once('spawn', () => { child.unref(); resolveLaunch(child.pid) })
     })
   })
   const manifestPath = profile && join(profile.dir, 'package.json')
@@ -79,6 +134,7 @@ export function createPluginCenter(ctx, options = {}) {
   const storage = profile && join(profile.dir, '.remote-plugin-center')
   let submitting = false
   async function inventory() {
+    if (storage) recoverDeadLock(storage)
     let runtime = [], runtimeAvailable = false
     const loader = ctx.get?.('loader') || ctx.loader
     if (loader?.entries) {
@@ -97,19 +153,46 @@ export function createPluginCenter(ctx, options = {}) {
       if (packagePattern.test(name)) {
         try { pkg = read(join(profile.dir, 'node_modules', ...name.split('/'), 'package.json')) } catch {}
       }
-      return { name, version: pkg?.version || '', requested: manifest.dependencies?.[name] || '',
+      const displayName = typeof pkg?.displayName === 'string' ? pkg.displayName : typeof pkg?.dsh?.displayName === 'string' ? pkg.dsh.displayName : name
+      return { name, displayName, version: pkg?.version || '', requested: manifest.dependencies?.[name] || '',
         enabled: bundles.includes(name), bundle: !!pkg?.dsh?.bundle?.patch || bundles.includes(name),
         managed: !!manifest.dependencies?.[name] && !protectedPackage(name),
-        description: pkg?.description || '' }
+      description: pkg?.description || '', runtime: runtime.filter(entry => entry.name === name) }
     })
     let operations = []
     if (existsSync(storage)) operations = readdirSync(storage).filter(name => /^job-[a-zA-Z0-9-]+\.json$/.test(name)).map(name => {
       try { return read(join(storage, name)) } catch { return null }
     }).filter(Boolean).sort((a, b) => b.startedAt - a.startedAt).slice(0, 20).map(publicJob)
+    const lockPath = join(storage, 'lock.json')
+    const owner = existsSync(lockPath) ? read(lockPath) : null
+    const legacyLock = owner && idPattern.test(owner.id || '') && !owner.launcherPid && !owner.workerPid && !owner.cliPid && !existsSync(join(storage, 'launch-' + owner.id + '.json'))
     return { ok: true, profile: profile.name, revision: revision(manifestPath), writable: !!profile.cli,
-      reason: profile.cli ? '' : '当前启动方式没有可验证的 DSH CLI，管理操作不可用。',
-      pendingRestart: revision(manifestPath) !== initialRevision,
-      busy: submitting || existsSync(join(storage, 'lock.json')), items, runtime, runtimeAvailable, operations }
+      reason: profile.cli ? '' : profile.name === 'desktop'
+        ? '未能验证当前桌面安装的插件管理入口；仅显示状态，请检查 DSH Desktop 版本与安装完整性。'
+        : '当前启动方式没有可验证的 DSH CLI，管理操作不可用。',
+      pendingRestart: revision(manifestPath) !== initialRevision || operations.some(job => job.phase === 'interrupted' && job.restartRequired),
+      busy: submitting || !!owner, recovery: legacyLock ? { id: owner.id, reason: '旧任务锁没有进程信息，需在主机核对后手动解除。' } : null,
+      items, runtime, runtimeAvailable, operations }
+  }
+  function recoverLegacy(body) {
+    if (!profile?.cli || submitting) throw fail('当前不能恢复任务', 409)
+    const lockPath = join(storage, 'lock.json')
+    if (!existsSync(lockPath)) throw fail('任务锁已变化，请刷新', 409)
+    const owner = read(lockPath)
+    if (!idPattern.test(body.id || '') || body.id !== owner.id || owner.launcherPid || owner.workerPid || owner.cliPid || existsSync(join(storage, 'launch-' + owner.id + '.json'))) throw fail('仅支持人工恢复无进程信息的旧任务锁', 409)
+    if (revision(manifestPath) !== body.revision) throw fail('插件列表已变化，请刷新', 409)
+    if (body.confirmNoRunningProcess !== true) throw fail('请先在主机确认插件安装进程已退出', 409)
+    const jobPath = join(storage, 'job-' + owner.id + '.json')
+    if (existsSync(jobPath)) {
+      const job = read(jobPath)
+      if (['queued', 'running'].includes(job.phase)) {
+        job.phase = 'interrupted'; job.endedAt = Date.now(); job.restartRequired = true
+        job.message = '用户核对进程后解除了旧任务锁；保留现有文件和备份，未执行自动回滚。'
+        atomic(jobPath, job)
+      }
+    }
+    renameSync(lockPath, join(storage, 'recovered-lock-' + owner.id + '.json'))
+    return { ok: true }
   }
   async function submit(body) {
     if (!profile?.cli) throw fail('Current DSH profile is read-only', 409)
@@ -118,6 +201,7 @@ export function createPluginCenter(ctx, options = {}) {
     if (!idPattern.test(id || '') || !packagePattern.test(name || '') || !['install', 'update', 'remove', 'enable', 'disable'].includes(action)) throw fail('Invalid operation')
     if (protectedPackage(name)) throw fail('核心插件与 Remote 自身请通过主机维护流程管理', 409)
     mkdirSync(storage, { recursive: true, mode: 0o700 })
+    recoverDeadLock(storage)
     const jobPath = join(storage, 'job-' + id + '.json')
     if (existsSync(jobPath)) {
       const previous = read(jobPath)
@@ -142,12 +226,14 @@ export function createPluginCenter(ctx, options = {}) {
       }
       if (revision(manifestPath) !== body.revision) throw fail('插件配置已变化，请刷新', 409)
       const lock = join(storage, 'lock.json')
-      try { writeFileSync(lock, JSON.stringify({ id }), { flag: 'wx', mode: 0o600 }) }
+      try { writeFileSync(lock, JSON.stringify({ id, launcherPid: process.pid, createdAt: Date.now() }), { flag: 'wx', mode: 0o600 }) }
       catch (error) { if (error.code === 'EEXIST') throw fail('已有插件任务运行中；请查看操作记录', 409); throw error }
       const job = { id, action, name, version: version || '', revision: body.revision, profile: profile.name, phase: 'queued', startedAt: Date.now(), log: '', restartRequired: false }
       try {
         atomic(jobPath, job)
-        await launch([profile.dir, profile.cli, id])
+        const pid = await launch([profile.dir, profile.cli, id, profile.cliMode || 'node'])
+        // Separate ledger: the launcher must never overwrite a worker's CLI PID.
+        if (Number.isInteger(pid) && pid > 0) atomic(join(storage, 'launch-' + id + '.json'), { pid })
       } catch (error) {
         job.phase = 'failed'; job.message = '无法启动插件任务'; job.endedAt = Date.now()
         atomic(jobPath, job); unlinkSync(lock); throw error
@@ -167,6 +253,7 @@ export function createPluginCenter(ctx, options = {}) {
       return { ok: true, source: REGISTRY, total: data.total || 0, items: (data.objects || []).map(({ package: p }) => ({ name: p.name, version: p.version, description: p.description || '' })) }
     }
     if (method === 'POST' && sub === '/operations') return { ok: true, operation: await submit(body) }
+    if (method === 'POST' && sub === '/recover') return recoverLegacy(body)
     throw fail('Unknown plugin endpoint', 404)
   }
   return { handle, inventory, submit }
@@ -177,11 +264,13 @@ function publicJob(job) {
   return { id, action, name, version, profile, phase, startedAt, endedAt, log, message, restartRequired }
 }
 
-export async function runWorker(dir, cli, id, execute = runCli) {
+export async function runWorker(dir, cli, id, execute = runCli, cliMode = 'node') {
   if (!idPattern.test(id || '')) throw fail('Invalid worker id')
   const storage = join(dir, '.remote-plugin-center')
   const lock = join(storage, 'lock.json')
-  if (read(lock).id !== id) throw fail('Worker does not own lock')
+  const owner = read(lock)
+  if (owner.id !== id || owner.workerPid && owner.workerPid !== process.pid) throw fail('Worker does not own lock')
+  atomic(lock, { ...owner, workerPid: process.pid })
   const jobPath = join(storage, 'job-' + id + '.json')
   const job = read(jobPath)
   const manifestPath = join(dir, 'package.json')
@@ -199,11 +288,11 @@ export async function runWorker(dir, cli, id, execute = runCli) {
     }
     if (existsSync(disabledPath)) copyFileSync(disabledPath, join(backup, 'disabled.json'))
     if (['install', 'update', 'remove'].includes(job.action)) {
-      const args = job.action === 'remove' ? ['remove', job.name, '--ignore-scripts'] : ['add', job.name + '@' + job.version, '--save-exact', '--ignore-scripts', '--registry=' + REGISTRY]
+      const args = job.action === 'remove' ? ['remove', job.name, '--config.ignore-scripts=true'] : ['add', job.name + '@' + job.version, '--save-exact', '--ignore-scripts', '--registry=' + REGISTRY]
       await execute(cli, ['plugin', '--profile', basename(dir), ...args], dir, chunk => {
         job.log = (job.log + chunk.replace(/\x1b\[[0-9;]*m/g, '').replace(/(token|password|authorization)\s*[=:]\s*\S+/gi, '$1=[redacted]')).slice(-12000)
         save()
-      })
+      }, pid => atomic(lock, { ...read(lock), cliPid: pid }), cliMode)
     }
     if (job.action === 'disable') disabled.add(job.name)
     if (job.action === 'enable' || job.action === 'remove') disabled.delete(job.name)
@@ -230,10 +319,18 @@ export async function runWorker(dir, cli, id, execute = runCli) {
   }
 }
 
-function runCli(cli, args, dir, output) {
+export function cliInvocation(cli, args, dir, cliMode = 'node', runtime = process) {
+  if (!['node', 'desktop'].includes(cliMode)) throw fail('Unsupported CLI mode')
+  return { command: runtime.execPath, args: [...(cliMode === 'desktop' ? ['--expose-internals'] : []), cli, ...args],
+    env: { ...runtime.env, DSH_HOME: dirname(dirname(dir)), npm_config_ignore_scripts: 'true',
+      ...(cliMode === 'desktop' ? { ELECTRON_RUN_AS_NODE: '1' } : {}) } }
+}
+
+function runCli(cli, args, dir, output, onSpawn, cliMode) {
   return new Promise((resolveRun, reject) => {
-    const env = { ...process.env, DSH_HOME: dirname(dirname(dir)), npm_config_ignore_scripts: 'true' }
-    const child = spawn(process.execPath, [cli, ...args], { cwd: dir, env, windowsHide: true, stdio: ['ignore', 'pipe', 'pipe'] })
+    const invocation = cliInvocation(cli, args, dir, cliMode)
+    const child = spawn(invocation.command, invocation.args, { cwd: dir, env: invocation.env, windowsHide: true, stdio: ['ignore', 'pipe', 'pipe'] })
+    child.once('spawn', () => onSpawn(child.pid))
     child.stdout.on('data', chunk => output(chunk.toString()))
     child.stderr.on('data', chunk => output(chunk.toString()))
     child.once('error', reject)
@@ -242,5 +339,5 @@ function runCli(cli, args, dir, output) {
 }
 
 if (process.argv[1] && resolve(process.argv[1]) === SELF && process.argv[2] === '--worker') {
-  await runWorker(process.argv[3], process.argv[4], process.argv[5])
+  await runWorker(process.argv[3], process.argv[4], process.argv[5], undefined, process.argv[6])
 }

package/public/admin.html

@@ -342,6 +342,7 @@
     <div class="admin-title">
       <div class="left">
         <a id="btn-console" class="mini-btn tb-btn" href="../" data-i18n-title="consoleTitle">‹ <span data-i18n="console">控制台</span></a>
+        <a id="btn-plugin-panel" class="mini-btn tb-btn hidden" href="../plugin.html" data-i18n-title="pluginPanel">‹ <span data-i18n="pluginPanel">状态面板</span></a>
         <button id="btn-close-drawer" class="mini-btn tb-btn hidden" data-i18n-title="collapse">‹ <span data-i18n="collapse">收起面板</span></button>
         <h1>DSH Remote <span data-i18n="admin">管理</span></h1>
       </div>
@@ -542,6 +543,7 @@
       zh: {
         'console': '控制台',
         'consoleTitle': '返回控制台',
+        'pluginPanel': '状态面板',
         'collapse': '收起面板',
         'admin': '管理',
         'hero.eyebrow': 'GATEWAY CONTROL', 'hero.running': '网关运行正常', 'hero.attention': '网关需要关注', 'hero.plugin': 'DSH 插件已连接', 'hero.offline': '网关未运行', 'hero.checking': '正在检查网关',
@@ -652,6 +654,7 @@
       en: {
         'console': 'Console',
         'consoleTitle': 'Back to console',
+        'pluginPanel': 'Status panel',
         'collapse': 'Collapse panel',
         'admin': 'Admin',
         'hero.eyebrow': 'GATEWAY CONTROL', 'hero.running': 'Gateway is healthy', 'hero.attention': 'Gateway needs attention', 'hero.plugin': 'DSH plugin connected', 'hero.offline': 'Gateway is not running', 'hero.checking': 'Checking gateway',

package/public/admin.js

@@ -1028,6 +1028,7 @@ function start(showLogin) {
 if (pluginMode) {
   $('login-view').classList.add('hidden')
   $('btn-console').classList.add('hidden')
+  if (location.protocol === 'dsh-app:' && window.parent !== window) $('btn-plugin-panel').classList.remove('hidden')
   $('btn-close-drawer').classList.remove('hidden')
   start(false)
 } else if (token) {