dsh-mini-remote 0.1.7 → 0.1.9

package/lib/tree.js

@@ -15,6 +15,7 @@
  * 它的会话（要读日志折标题，贵）。
  */
 import { basename } from 'node:path'
+import { readTailEvents } from './log-tail.js'
 
 /** 一个工作区默认最多列多少会话。手机上再多也划不动。 */
 export const SESSIONS_PER_WORKSPACE = 20
@@ -128,6 +129,8 @@ function rememberTitle(cache, id, title, persisted) {
  * 手机页面自己）抢。而且这些标题本来就没人等着，晚几百毫秒没有任何代价。
  */
 export const TITLE_CONCURRENCY = 2
+const TITLE_READ_TIMEOUT_MS = 8_000
+const TITLE_RETRY_MS = 60_000
 
 let titleRunning = 0
 const titleWaiting = []
@@ -192,6 +195,42 @@ function cachedTitle(cache, id, persisted) {
  * 同一批冷会话会被读两遍。这里挡住重复的在途请求，读完即释放（失败也释放）。
  */
 const titleInflight = new WeakMap()
+const titleFailures = new WeakMap()
+
+function legacyTitle(sessionId) {
+  if (typeof sessionId !== 'string' || !sessionId.startsWith('import-')) return null
+  try {
+    const result = readTailEvents(sessionId, { windowBytes: 1024 * 1024, maxEvents: 1000 })
+    for (const event of result?.events ?? []) {
+      if (event?.type !== 'session/title') continue
+      const title = event.data?.title ?? event.data?.text
+      if (typeof title === 'string') return title.trim()
+    }
+    return ''
+  } catch {
+    return ''
+  }
+}
+
+function markTitleFailure(query, ids) {
+  let cache = titleFailures.get(query)
+  if (!cache) {
+    cache = new Map()
+    titleFailures.set(query, cache)
+  }
+  const until = Date.now() + TITLE_RETRY_MS
+  for (const id of ids) cache.set(id, until)
+}
+
+function failedTitle(query, id) {
+  const until = titleFailures.get(query)?.get(id)
+  if (!until) return false
+  if (until <= Date.now()) {
+    titleFailures.get(query).delete(id)
+    return false
+  }
+  return true
+}
 
 /**
  * 后台把缺的标题读出来，写进缓存。**调用方不 await 它**。
@@ -200,7 +239,7 @@ const titleInflight = new WeakMap()
  * 而读它要加载会话日志——实测一个工作区里几条冷会话就是十几秒。那十几秒是用户在
  * 盯着"正在读取…"干等，不该发生。
  */
-async function fillTitles(query, cache, ids, persisted) {
+async function fillTitles(query, cache, ids, persisted, workspaceId, onTitle) {
   if (!query?.readTitleSnapshots || !ids.length) return
   let flying = titleInflight.get(query)
   if (!flying) {
@@ -212,33 +251,72 @@ async function fillTitles(query, cache, ids, persisted) {
   for (const id of todo) flying.add(id)
   try {
     // 读之前先过全局闸门（见 TITLE_CONCURRENCY）：这一步是这次改动里唯一真正吃 CPU 的地方。
-    const items = await withTitleSlot(() => query.readTitleSnapshots(todo))
+    let timer
+    const controller = new AbortController()
+    let items
+    try {
+      timer = setTimeout(() => controller.abort(), TITLE_READ_TIMEOUT_MS)
+      items = await withTitleSlot(() => Promise.race([
+        query.readTitleSnapshots(todo, controller.signal),
+        new Promise((_, reject) => controller.signal.addEventListener(
+          'abort', () => reject(new Error('标题读取超时')), { once: true },
+        )),
+      ]))
+    } catch {
+      markTitleFailure(query, todo)
+      return
+    } finally {
+      if (timer) clearTimeout(timer)
+    }
     for (const item of items ?? []) {
-      if (item?.status !== 'fulfilled') continue   // 读失败不进缓存，下次还会重试
-      rememberTitle(cache, item.sessionId, titleText(item.value?.title), persisted)
+      if (item?.status !== 'fulfilled') {
+        markTitleFailure(query, [item?.sessionId].filter(Boolean))
+        continue
+      }
+      const title = titleText(item.value?.title)
+      rememberTitle(cache, item.sessionId, title, persisted)
+      if (typeof onTitle === 'function') onTitle({ workspaceId, sessionId: item.sessionId, title })
     }
   } catch (err) {
-    // 读不出来就没有标题，界面退回用日期，不影响切换。
+    markTitleFailure(query, todo)
   } finally {
     for (const id of todo) flying.delete(id)
   }
 }
 
-async function safeRecords(query, { force = false } = {}) {
+async function safeRecords(query, { force = false, meta } = {}) {
   if (!query) return []
   let entry = caches.get(query)
   if (!entry) {
     entry = { at: 0, records: null, inflight: null }
     caches.set(query, entry)
   }
+  if (!force && !entry.records && meta?.all) {
+    const cached = meta.all()
+    if (cached.length) {
+      entry.records = cached
+      // 这份数据只负责冷启动首屏，后台立刻用 DSH 清单校正。
+      entry.at = 0
+    }
+  }
   if (!force && entry.records && Date.now() - entry.at < CACHE_TTL_MS) return entry.records
-  // 同一时刻来两个请求就共用一趟，别让它们各扫一遍盘。
+  // 有旧记录时直接返回，同时只启动一趟后台校正；没有旧记录才等待首次读取。
+  if (entry.records && !force) {
+    if (!entry.inflight) entry.inflight = refreshRecords(query, entry, meta)
+    return entry.records
+  }
   if (entry.inflight) return entry.inflight
+  entry.inflight = refreshRecords(query, entry, meta)
+  return entry.inflight
+}
+
+async function refreshRecords(query, entry, meta) {
   entry.inflight = (async () => {
     try {
       const records = (await query.listSessions()) ?? []
       entry.at = Date.now()
       entry.records = records
+      meta?.replace(records)
       return records
     } catch (err) {
       // 读不到就当作没有：导航栏少几项，不该影响遥控本身。失败不进缓存，下次还会重试。
@@ -290,8 +368,8 @@ function titleText(value) {
  * （闸门脚本就是这么逮到的：接口回 created=true，列表里却找不到。）
  * 默认仍然是「滤掉」，桌面端那些老调用方的行为一点不变。
  */
-export async function listWorkspaces({ registry, query, runningIds, force, includeEmpty }) {
-  const byId = toRecordMap(await safeRecords(query, { force }))
+export async function listWorkspaces({ registry, query, runningIds, force, includeEmpty, meta }) {
+  const byId = toRecordMap(await safeRecords(query, { force, meta }))
   const out = []
   for (const ws of safeList(registry)) {
     const ids = (ws.sessionIds ?? []).filter((id) => visible(byId.get(id)))
@@ -328,7 +406,7 @@ export async function listWorkspaces({ registry, query, runningIds, force, inclu
  *   - `no-workspace`  工作区不在了（桌面端刚把它删掉）
  *   - `failed`        DSH 拒绝了，原因原样带回
  */
-export async function createSessionIn({ controller, registry, workspaceId }) {
+export async function createSessionIn({ controller, registry, workspaceId, agentPreset }) {
   if (!controller || typeof controller.create !== 'function') {
     return { ok: false, reason: 'no-controller' }
   }
@@ -337,7 +415,11 @@ export async function createSessionIn({ controller, registry, workspaceId }) {
 
   let created
   try {
-    created = await controller.create({ workspaceId })
+    // agentPreset（2026-10-04，手机上也能选模式）：**选了才带**——没选就让 DSH 用它
+    // 自己的默认，不猜、不塞一个假值。
+    created = await controller.create(agentPreset
+      ? { workspaceId, agentPreset }
+      : { workspaceId })
   } catch (err) {
     return { ok: false, reason: 'failed', error: String(err?.message ?? err) }
   }
@@ -419,12 +501,12 @@ function shapeWorkspace(ws) {
  */
 export async function listSessionsOf({
   registry, query, agents, knownTitles, persisted, workspaceId,
-  limit = SESSIONS_PER_WORKSPACE, force,
+  limit = SESSIONS_PER_WORKSPACE, force, onTitle, meta,
 }) {
   const ws = safeList(registry).find((w) => w.id === workspaceId)
   if (!ws) return null
 
-  const byId = toRecordMap(await safeRecords(query, { force }))
+  const byId = toRecordMap(await safeRecords(query, { force, meta }))
   const rows = (ws.sessionIds ?? [])
     .map((id) => byId.get(id))
     .filter(visible)
@@ -443,6 +525,16 @@ export async function listSessionsOf({
       rememberTitle(cache, id, known, persisted)
       continue
     }
+    const legacy = legacyTitle(id)
+    if (legacy !== null) {
+      titles.set(id, legacy)
+      rememberTitle(cache, id, legacy, persisted)
+      continue
+    }
+    if (failedTitle(query, id)) {
+      titles.set(id, '')
+      continue
+    }
     const hit = cachedTitle(cache, id, persisted)
     if (hit === null) missing.push(id)
     else if (hit) titles.set(id, hit)
@@ -451,7 +543,7 @@ export async function listSessionsOf({
   // 那几条先显示日期。缓存里已有的照旧直接用，所以反复展开同一个工作区始终是快的。
   if (missing.length && query?.readTitleSnapshots) {
     await Promise.race([
-      fillTitles(query, cache, missing, persisted),
+      fillTitles(query, cache, missing, persisted, workspaceId, onTitle),
       new Promise((resolve) => setTimeout(resolve, TITLE_WAIT_MS)),
     ])
     for (const id of missing) {
@@ -476,7 +568,7 @@ export async function listSessionsOf({
   if (typeof query?.readTitleSnapshots === 'function') {
     for (const r of rows) {
       const id = r.header.id
-      if (!titles.has(id) && cachedTitle(cache, id, persisted) === null) pending += 1
+      if (!titles.has(id) && !failedTitle(query, id) && cachedTitle(cache, id, persisted) === null) pending += 1
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-mini-remote",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "DSH 极简移动端遥控器：只把「你的指令」和「AI 的最终回复」送到手机，屏蔽全部中间过程。",
   "type": "module",
   "main": "lib/index.js",
@@ -78,6 +78,7 @@
     }
   },
   "dependencies": {
+    "@larksuiteoapi/node-sdk": "^1.74.0",
     "qrcode": "^1.5.4"
   }
 }