dsh-plugin-mobile-link 0.7.0 → 0.8.1

package/lib/routes.js

@@ -86,6 +86,31 @@ function ttlFrom(value, fallbackMs) {
     : fallbackMs
 }
 
+/** Map an enrollment error code onto the HTTP status the panel sees. */
+export function enrollStatus(code) {
+  switch (code) {
+    case 'enroll/already-registered':
+    case 'enroll/disabled':
+      return 409
+    case 'enroll/timeout':
+      return 504
+    case 'enroll/rate-limited':
+      return 429
+    case 'enroll/state-write':
+    case 'enroll/internal':
+      return 500
+    case 'enroll/bad-request':
+    case 'enroll/invalid-relay':
+    case 'enroll/placeholder-relay':
+    case 'enroll/unknown':
+    case 'enroll/used':
+    case 'enroll/expired':
+      return 400
+    default:
+      return 502
+  }
+}
+
 /**
  * Register the routes.
  * @returns {Array<() => void>} disposers (already wrapped by the caller in ctx.effect).
@@ -93,6 +118,9 @@ function ttlFrom(value, fallbackMs) {
 export function registerMobileLinkRoutes(ctx, { agent, logger, config = {}, history }) {
   const guard = makeGuard(ctx, logger)
   const STATUS_ROUTE = '/mobile-link/status'
+  const ENROLL_ROUTE = '/mobile-link/enroll'
+  const REVOKE_ROUTE = '/mobile-link/devices/revoke'
+  const DEVICES_ROUTE = '/mobile-link/devices'
   const PAIR_ROUTE = '/mobile-link/pair-code'
   const REGENERATE_ROUTE = '/mobile-link/pair-code/regenerate'
   const disposers = []
@@ -116,6 +144,125 @@ export function registerMobileLinkRoutes(ctx, { agent, logger, config = {}, hist
     },
   }))
 
+  disposers.push(ctx.webServer.register({
+    kind: 'exact',
+    path: ENROLL_ROUTE,
+    handler: async (req, res) => {
+      if (guard(req, res, { requireFence: true })) return
+      if (req.method !== 'POST') {
+        res.statusCode = 405
+        res.setHeader('allow', 'POST')
+        res.end()
+        return
+      }
+      const body = await readJsonBody(req)
+      if (body === undefined) {
+        sendJson(res, 400, { ok: false, code: 'enroll/bad-request', message: 'invalid JSON body' })
+        return
+      }
+      const relayUrl = typeof body.relayUrl === 'string' ? body.relayUrl.trim() : ''
+      const inviteCode = typeof body.inviteCode === 'string' ? body.inviteCode.trim() : ''
+      const agentName = typeof body.agentName === 'string' ? body.agentName.trim() : ''
+      if (!relayUrl) {
+        sendJson(res, 400, {
+          ok: false,
+          code: 'enroll/bad-request',
+          message: 'relayUrl is required',
+        })
+        return
+      }
+      try {
+        // 开放登记：不需要邀请码；旧调用方仍可带（历史兼容）。
+        const settled = await agent.enroll({
+          inviteCode: inviteCode || undefined,
+          relayUrl,
+          agentName: agentName || undefined,
+        })
+        logger.info?.(`mobile-link: panel enrollment succeeded for ${settled.agentId}`)
+        // Never return `agentSecret`: the browser has no use for it, and one
+        // XSS in the panel would otherwise hand over the machine's credential.
+        sendJson(res, 200, {
+          ok: true,
+          agentId: settled.agentId,
+          agentName: settled.agentName,
+          relayUrl: settled.relayUrl,
+        })
+      } catch (error) {
+        // Read the code off the error rather than using `instanceof`: a hot
+        // reload can leave the route and the link on different module
+        // generations, and an identity check would then downgrade a precise
+        // "already registered" into a generic 500.
+        const code = typeof error?.code === 'string' && error.code.startsWith('enroll/')
+          ? error.code
+          : 'enroll/internal'
+        const status = enrollStatus(code)
+        if (code === 'enroll/internal') {
+          logger.warn?.(`mobile-link: panel enrollment failed: ${String(error?.message ?? error)}`)
+        }
+        sendJson(res, status, { ok: false, code, message: String(error?.message ?? error) })
+      }
+    },
+  }))
+
+  disposers.push(ctx.webServer.register({
+    kind: 'exact',
+    path: DEVICES_ROUTE,
+    handler: async (req, res) => {
+      if (guard(req, res, { requireFence: true })) return
+      if (req.method !== 'GET') {
+        res.statusCode = 405
+        res.setHeader('allow', 'GET')
+        res.end()
+        return
+      }
+      try {
+        const result = await agent.listPairedDevices()
+        sendJson(res, 200, { ok: true, ...result })
+      } catch (error) {
+        sendJson(res, 502, {
+          ok: false,
+          code: 'devices/list-failed',
+          message: String(error?.message ?? error),
+        })
+      }
+    },
+  }))
+
+  disposers.push(ctx.webServer.register({
+    kind: 'exact',
+    path: REVOKE_ROUTE,
+    handler: async (req, res) => {
+      if (guard(req, res, { requireFence: true })) return
+      if (req.method !== 'POST') {
+        res.statusCode = 405
+        res.setHeader('allow', 'POST')
+        res.end()
+        return
+      }
+      const body = await readJsonBody(req)
+      if (body === undefined) {
+        sendJson(res, 400, { ok: false, code: 'request/bad-request', message: 'invalid JSON body' })
+        return
+      }
+      const deviceId = typeof body.deviceId === 'string' ? body.deviceId.trim() : ''
+      if (!deviceId) {
+        sendJson(res, 400, { ok: false, code: 'request/device-id', message: 'deviceId is required' })
+        return
+      }
+      try {
+        const result = await agent.revokeDevice(deviceId)
+        logger.info?.(`mobile-link: revoked device ${result.deviceId}`)
+        sendJson(res, 200, { ok: true, deviceId: result.deviceId })
+      } catch (error) {
+        sendJson(res, 502, {
+          ok: false,
+          code: 'devices/revoke-failed',
+          message: String(error?.message ?? error),
+        })
+      }
+    },
+  }))
+
   disposers.push(ctx.webServer.register({
     kind: 'exact',
     path: PAIR_ROUTE,

package/lib/session-digest.js

@@ -133,11 +133,16 @@ export function digestFingerprint(item) {
   }
 }
 
-/** 一批会话的指纹表（id → 指纹）。 */
+/**
+ * 一批会话的指纹表（sessionId → 指纹）。
+ *
+ * 键是宿主 `SessionSummary.sessionId`——会话身份在宿主只有这一个名字。
+ * 这里不认 `id`：多认一个名字就是第二份身份，正是它让指纹表恒为空（2026-10-27）。
+ */
 export function digestFingerprints(items) {
   const map = new Map()
   for (const item of items ?? []) {
-    if (item && typeof item.id === 'string') map.set(item.id, digestFingerprint(item))
+    if (item && typeof item.sessionId === 'string') map.set(item.sessionId, digestFingerprint(item))
   }
   return map
 }
@@ -153,20 +158,29 @@ export function fingerprintsVersion(map) {
 /**
  * 相对上一次指纹表的增量。
  *
- * 入参 `previous` 为 Map 或 null；返回 changed（新增或内容变化的项）、
- * removed（消失的 id）与新版本。`previous` 为空时调用方应按全量处理。
+ * 入参 `previous` 为 Map 或 null。返回：
+ *   - `full`：能不能把这份结果当增量发；
+ *   - `changed`：新增或内容变化的项（`full` 时为整份 items）；
+ *   - `removed`：消失的 sessionId（`full` 时为空）；
+ *   - `version` / `fingerprints`：下一次比较用的版本与指纹表。
+ *
+ * **身份不可识别时退化为全量**：摘要是优化，不是事实来源。只要有一项没有 `sessionId`，
+ * 就没法证明其余项没变；此时宁可多发一份全量，也不能回空增量——后者不报错、不更新，
+ * 界面看起来正常却永远冻结（2026-10-27 的现场）。
  */
 export function digestDelta(previous, items) {
   const list = Array.isArray(items) ? items : []
+  const identifiable = list.every((item) => item && typeof item.sessionId === 'string')
   const next = digestFingerprints(list)
+  const version = fingerprintsVersion(next)
+  if (previous === null || !identifiable) {
+    return { full: true, changed: list, removed: [], version, fingerprints: next }
+  }
   const changed = []
   for (const item of list) {
-    if (!item || typeof item.id !== 'string') continue
-    if (!previous || previous.get(item.id) !== next.get(item.id)) changed.push(item)
+    if (previous.get(item.sessionId) !== next.get(item.sessionId)) changed.push(item)
   }
   const removed = []
-  if (previous) {
-    for (const id of previous.keys()) if (!next.has(id)) removed.push(id)
-  }
-  return { changed, removed, version: fingerprintsVersion(next), fingerprints: next }
+  for (const sessionId of previous.keys()) if (!next.has(sessionId)) removed.push(sessionId)
+  return { full: false, changed, removed, version, fingerprints: next }
 }

package/lib/session-scope.js

@@ -0,0 +1,89 @@
+/**
+ * 哪些会话值得提醒手机（SR-02.08 / SR-02.15）。
+ *
+ * 只有**正式会话**算数：属于某个工作区、未归档、且不是子会话。未分组、子会话与
+ * 已归档会在列表里以行、桶头或转写出现，但它们不该让手机弹窗，也不该进顶部的
+ * 「等你回应」计数——一个子智能体跑完或停下来问问题，不是用户要处理的事。
+ *
+ * 判据全部来自宿主自己的账本，不做目录推断：
+ * - 子会话：`Session.header.origin === 'subagent'`（历史 fork 也可能有
+ *   `parentSession`，所以只认 `origin`，与 `@deepseek-ai/dsh-session` 的分类口径一致）；
+ * - 归档：`workspaceRegistry.archivedSessionIds`；
+ * - 属于工作区：某个 `Workspace.sessionIds` 里含这个 id。
+ *
+ * 服务没绑上时返回 `true`（保持旧行为）：拿不到宿主账本就断言"非正式"会把正式会话的
+ * 提醒一起吞掉。两种失败模式里，漏一条提醒比整类提醒消失更容易被发现。
+ */
+
+function sessionFrom(sessions, sessionId) {
+  if (typeof sessions?.get === 'function') {
+    try {
+      const found = sessions.get(sessionId)
+      if (found !== undefined && found !== null) return found
+    } catch {
+      // 会话在枚举与读取之间消失：交给下面的 list 兜底。
+    }
+  }
+  if (typeof sessions?.list !== 'function') return undefined
+  try {
+    const listed = sessions.list()
+    if (!Array.isArray(listed)) return undefined
+    return listed.find((entry) => (entry?.id ?? entry?.sessionId) === sessionId)
+  } catch {
+    return undefined
+  }
+}
+
+function archivedIds(workspaces) {
+  try {
+    const ids = workspaces?.archivedSessionIds
+    return Array.isArray(ids) ? ids : []
+  } catch {
+    // 账本还没装好：按"没有归档"处理，不让一次读失败吞掉全部提醒。
+    return []
+  }
+}
+
+function workspaceMembers(workspaces) {
+  try {
+    const listed = workspaces?.list?.()
+    return Array.isArray(listed) ? listed : undefined
+  } catch {
+    return undefined
+  }
+}
+
+/**
+ * @param {{
+ *   sessions?: { get?: (id: string) => object | undefined, list?: () => object[] },
+ *   workspaces?: {
+ *     archivedSessionIds?: readonly string[],
+ *     list?: () => Array<{ sessionIds?: readonly string[] }>,
+ *   },
+ * }} [services]
+ * @returns {{ isFormal: (sessionId: string) => boolean }}
+ */
+export function createSessionScope({ sessions, workspaces } = {}) {
+  const canReadSessions = typeof sessions?.get === 'function' || typeof sessions?.list === 'function'
+  const canReadWorkspaces = typeof workspaces?.list === 'function'
+  const available = canReadSessions && canReadWorkspaces
+
+  function isFormal(sessionId) {
+    if (typeof sessionId !== 'string' || sessionId === '') return false
+    // 宿主服务还没绑上：保持旧行为，见文件头。
+    if (!available) return true
+
+    const session = sessionFrom(sessions, sessionId)
+    if (session === undefined) return false
+    if ((session?.header?.origin ?? session?.origin) === 'subagent') return false
+    if (archivedIds(workspaces).includes(sessionId)) return false
+    const members = workspaceMembers(workspaces)
+    // 工作区账本读不出来：无法判定，维持旧行为，别把整类提醒一起吞掉。
+    if (members === undefined) return true
+    return members.some((workspace) => (
+      Array.isArray(workspace?.sessionIds) && workspace.sessionIds.includes(sessionId)
+    ))
+  }
+
+  return { isFormal }
+}

package/lib/state.js

@@ -106,9 +106,9 @@ export async function resolveIdentity({ stateFile, agentId, agentSecret, relayUr
   }
   if (!resolved.agentId || !resolved.agentSecret) {
     throw new MissingIdentity(
-      `mobile-link: this computer is not registered yet. Run "dsh-mobile-link enroll`
-      + ` --invite <code> --relay <relay-url>" with the invite code you were given, or set`
-      + ` ${INVITE_ENV} and restart DSH. (Provisioning by hand is still possible:`
+      `mobile-link: this computer is not registered yet. Open the "移动端连接" panel`
+      + ` and click 登记, or run "dsh-mobile-link enroll --relay <relay-url>".`
+      + ` (Provisioning by hand is still possible:`
       + ` "dsh-relay admin agent-register --account <acc> --name <name>`
       + ` --write-config ${path}".)`,
       { stateFile: path },

package/lib/status.js

@@ -6,7 +6,11 @@
  * 函数只读 agent 的字段，不持有状态，因此可以直接被单测调用。
  */
 
+import { isPlaceholderRelayUrl } from './dlp.js'
 import { SERVER_CAPABILITIES, SERVER_VERSION, hostVersion } from './hello.js'
+import { T, setLanguage } from './i18n.js'
+
+if (process.env.DSH_LANG) setLanguage(process.env.DSH_LANG)
 
 const PROTOCOL_VERSION = 1
 
@@ -16,10 +20,10 @@ const PROTOCOL_VERSION = 1
  * 锚点标题与 `docs/ONBOARDING.md` 里的小节标题**逐字一致**，这样"锚点存在"可以机械核对。
  */
 export const DSH_HINTS = {
-  config: { hint: '你手工配置的本机地址不对或已失效', docAnchor: '手工指定本机地址' },
-  'host-service': { hint: '当前宿主没有把本机访问方式交给插件（多为插件没装进正在运行的宿主）', docAnchor: '装在哪里：档案与插件入口' },
-  DSH_WEB_URL: { hint: '环境变量里的本机地址已过期', docAnchor: '手工指定本机地址' },
-  unreachable: { hint: '本机 DSH 不可达；请确认宿主正在运行', docAnchor: '排查：连不上时看这里' },
+  config: { hint: '你手工配置的本机地址不对或已失效', i18n: 'status.config', docAnchor: '手工指定本机地址' },
+  'host-service': { hint: '当前宿主没有把本机访问方式交给插件（多为插件没装进正在运行的宿主）', i18n: 'status.hostService', docAnchor: '装在哪里：档案与插件入口' },
+  DSH_WEB_URL: { hint: '环境变量里的本机地址已过期', i18n: 'status.dshWebUrl', docAnchor: '手工指定本机地址' },
+  unreachable: { hint: '本机 DSH 不可达；请确认宿主正在运行', i18n: 'status.unreachable', docAnchor: '排查：连不上时看这里' },
 }
 
 /**
@@ -28,9 +32,9 @@ export const DSH_HINTS = {
  * 锚点标题与 `docs/ONBOARDING.md` 的小节标题逐字一致，`test/status.test.js` 会核对。
  */
 export const HOST_HINTS = {
-  desktop: { hint: '你正在用官方桌面版（连接器已装进它的档案）', docAnchor: '安装：官方桌面版' },
-  web: { hint: '你正在用命令行 web 版', docAnchor: '安装：命令行 web 版' },
-  unknown: { hint: '无法识别当前宿主；若连不上，请按"排查"一节处理', docAnchor: '排查：连不上时看这里' },
+  desktop: { hint: '你正在用官方桌面版（连接器已装进它的档案）', i18n: 'status.desktop', docAnchor: '安装：官方桌面版' },
+  web: { hint: '你正在用命令行 web 版', i18n: 'status.web', docAnchor: '安装：命令行 web 版' },
+  unknown: { hint: '无法识别当前宿主；若连不上，请按"排查"一节处理', i18n: 'status.unknown', docAnchor: '排查：连不上时看这里' },
 }
 
 /** 本机 DSH 侧的诊断块（老字段一个不少，新字段只增）。 */function dshBlock(agent) {
@@ -45,7 +49,7 @@ export const HOST_HINTS = {
     error: agent.dshError ?? null,
     // 新增（只增不改）：失败分类 + 用户可读的一句话 + 文档锚点。
     errorKind,
-    hint: entry?.hint ?? null,
+    hint: entry?.i18n ? T(entry.i18n) : entry?.hint ?? null,
     docAnchor: entry?.docAnchor ?? null,
   }
 }
@@ -81,13 +85,33 @@ const STATUS_JOURNAL_ENTRIES = 20
  */
 export function statusSnapshot(agent) {
   const hostEntry = HOST_HINTS[agent.hostForm] ?? HOST_HINTS.unknown
+  // One resolved view of the relay address, shared by the form and the panel:
+  // a configured address outranks the identity, but the repository placeholder
+  // is "unset", never a value to prefill. `relayLocked` says the address came
+  // from config/env, so the form must be read-only — otherwise the panel would
+  // enroll with one address and the next boot would dial another.
+  const configuredRelay = typeof agent.config?.relayUrl === 'string' ? agent.config.relayUrl : ''
+  const realConfiguredRelay = configuredRelay && !isPlaceholderRelayUrl(configuredRelay)
+    ? configuredRelay
+    : null
+  // `defaultRelayUrl` is a *form default*, not a dialing override: it only
+  // prefills the input, so the user can replace it and the identity file still
+  // wins on the next boot. A real `relayUrl` is the operator pin and locks it.
+  const configuredDefault = typeof agent.config?.defaultRelayUrl === 'string'
+    ? agent.config.defaultRelayUrl
+    : ''
+  const defaultRelay = configuredDefault && !isPlaceholderRelayUrl(configuredDefault)
+    ? configuredDefault
+    : null
+  const effectiveRelay = agent.identity?.relayUrl ?? realConfiguredRelay ?? null
+  const relayPrefill = realConfiguredRelay ?? defaultRelay ?? agent.identity?.relayUrl ?? null
   return {
     ok: true,
     enabled: agent.enabled !== false,
     // 新增（只增不改）：宿主形态 + 它对应的一句话与文档锚点，
     // 决定用户该按哪条说明安装/排障（FR-012）。
     host: agent.hostForm,
-    hostHint: hostEntry.hint,
+    hostHint: hostEntry.i18n ? T(hostEntry.i18n) : hostEntry.hint,
     hostDocAnchor: hostEntry.docAnchor,
     protocolVersion: PROTOCOL_VERSION,
     // Same facts as `_link/hello`, which is the channel the app actually uses:
@@ -102,11 +126,18 @@ export function statusSnapshot(agent) {
       // computer half is installed but not yet registered, and what to run.
       registered: !agent.needsEnroll,
       needsEnroll: agent.needsEnroll,
+      // `panel` is a host-UI capability, not a phone capability: an older
+      // connector omits it, and the panel falls back to the command. It is
+      // deliberately not in SERVER_CAPABILITIES (that list is what the app asks
+      // for over `_link/hello`; the phone has no use for a panel form).
+      panel: true,
       stateFile: agent.identity?.stateFile ?? agent.config.stateFile ?? null,
-      relayUrl: agent.config.relayUrl ?? null,
+      relayUrl: effectiveRelay,
+      relayPrefill,
+      relayLocked: Boolean(realConfiguredRelay),
       command: agent.needsEnroll ? agent.enrollHint() : null,
       hint: agent.needsEnroll
-        ? '这台电脑还没有登记到中转。请带上邀请码运行一次登记命令，然后重启 DSH。'
+        ? T('status.unregistered')
         : null,
     },
     state: agent.state,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-plugin-mobile-link",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "description": "Put your PC's DeepSeek Harness in your pocket: dials a relay over WSS so the native iOS client reaches this machine even without a public IP.",
   "keywords": [
     "dsh",