@wenbin_wb/dsh-bridge 1.2.1 → 1.2.3

package/lib/wechat/node.js

@@ -449,20 +449,7 @@ export class WechatConversationNode {
     let agent = this.activeAgent()
     if (!agent && this.activeSessionId) {
       // agent 不在内存（DSH 重启后或切换到持久化会话）→ re-attach。
-      // agents.create(sessionId) 对已持久化的 session 会自动采纳其历史，对不存在的则新建。
       try {
-        // 读取持久化会话的 cwd，避免 cwd 冲突
-        let sessionCwd = this.config.cwd || process.cwd()
-        try {
-          const headers = await this.ctx.sessionPersistence?.list?.()
-          const header = headers?.find?.((h) => h?.id === this.activeSessionId)
-          if (header?.cwd) sessionCwd = header.cwd
-        } catch { /* 读取失败则用 fallback */ }
-
-        const meta = {
-          cwd: sessionCwd,
-          agentPreset: this.config.agentPreset || 'routing-suite',
-        }
         const agentOptions = {}
         if (this.config.agentProvider) agentOptions.provider = this.config.agentProvider
         if (this.config.agentModel) agentOptions.model = this.config.agentModel
@@ -475,15 +462,40 @@ export class WechatConversationNode {
             }
           } catch { /* ignore */ }
         }
-        const handle = await this.ctx.agents.create({
-          sessionId: this.activeSessionId,
-          meta,
-          agentOptions,
-        })
+
+        // 判断该 session 是否已持久化：已持久化 → agents.resume（从持久化加载历史恢复，
+        // 避免 agents.create 用空 seed 与已持久化事件冲突）；未持久化 → agents.create。
+        let persisted = false
+        try {
+          const headers = await this.ctx.sessionPersistence?.list?.()
+          persisted = Array.isArray(headers) && headers.some((h) => h?.id === this.activeSessionId)
+        } catch { /* 读取失败则按未持久化处理 */ }
+
+        let handle
+        if (persisted) {
+          handle = await this.ctx.agents.resume({
+            resumeSessionId: this.activeSessionId,
+            agentOptions,
+          })
+        } else {
+          // 读取持久化会话的 cwd 做 fallback（新建会话时用）
+          let sessionCwd = this.config.cwd || process.cwd()
+          const meta = {
+            cwd: sessionCwd,
+            agentPreset: this.config.agentPreset || 'routing-suite',
+          }
+          handle = await this.ctx.agents.create({
+            sessionId: this.activeSessionId,
+            meta,
+            agentOptions,
+          })
+        }
         agent = handle.agent
-        this.logger?.info?.(`[dsh-bridge wechat] re-attached agent to session ${this.activeSessionId}`)
+        this.logger?.info?.(`[dsh-bridge wechat] re-attached agent to session ${this.activeSessionId} (${persisted ? 'resume' : 'create'})`)
       } catch (err) {
-        this.logger?.warn?.(`[dsh-bridge wechat] failed to re-attach agent: ${err?.message ?? err}`)
+        const reason = err instanceof Error ? err.message : String(err)
+        this.logger?.warn?.(`[dsh-bridge wechat] failed to re-attach agent: ${reason}`)
+        await sendTextToPeer(this, `${MARK.err} 恢复会话失败: ${reason}。发送 /new <提示词> 新建一个会话。`)
       }
     }
     if (!agent) {
@@ -886,7 +898,7 @@ async function routeCommand(node, text) {
       return true
     case 'use': {
       const index = Number(rest[0])
-      const sessions = await listSessions(node)
+      const sessions = sessionsInDisplayOrder(await listSessions(node))
       if (!Number.isInteger(index) || index < 1 || index > sessions.length) {
         await sendTextToPeer(node, `${MARK.err} 无效编号。可用: 1–${sessions.length}（/sessions 查看列表）`)
         return true
@@ -1005,6 +1017,19 @@ async function renderSessions(node) {
   return `${MARK.list}\n${parts.join('\n')}`
 }
 
+// 与 renderSessions 完全一致的显示顺序：按工作区字母序分组、组内保持 listSessions 顺序。
+// /use N 用这个数组索引，保证显示的编号 N 与切换的会话一一对应。
+function sessionsInDisplayOrder(all) {
+  const groups = new Map()
+  for (const s of all) {
+    const key = s.cwd || '(未指定)'
+    if (!groups.has(key)) groups.set(key, [])
+    groups.get(key).push(s)
+  }
+  const sortedGroups = [...groups.entries()].sort((a, b) => String(a[0]).localeCompare(String(b[0])))
+  return sortedGroups.flatMap(([, sessions]) => sessions)
+}
+
 // 时间戳 → 可读时间
 function fmtTime(ms) {
   try {
@@ -1044,6 +1069,7 @@ export const wechatNodeHelpers = {
   extractText,
   isGroupMessage,
   listSessions,
+  sessionsInDisplayOrder,
 }
 
 function sleep(ms) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wenbin_wb/dsh-bridge",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "手机扫码即可在移动端/公网继续用 DeepSeek Harness，人不在电脑前也能接着干。一键局域网二维码、Cloudflare 公网隧道、自建隧道与微信 Bot（多工作区/会话持久化/媒体/审批），无需自己搭公网服务器。",
   "type": "module",
   "main": "lib/index.js",