@wenbin_wb/dsh-bridge 1.2.0 → 1.2.2

package/lib/wechat/node.js

@@ -449,12 +449,7 @@ export class WechatConversationNode {
     let agent = this.activeAgent()
     if (!agent && this.activeSessionId) {
       // agent 不在内存（DSH 重启后或切换到持久化会话）→ re-attach。
-      // agents.create(sessionId) 对已持久化的 session 会自动采纳其历史，对不存在的则新建。
       try {
-        const meta = {
-          cwd: this.config.cwd || process.cwd(),
-          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
@@ -467,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) {
@@ -811,9 +831,12 @@ function foldTitle(events) {
 }
 
 // 列出会话：使用 DSH 官方 API（ctx.sessions + sessionPersistence），与 web 端一致。
-// 返回 [{ id, createdAt, events?, seq?, cwd?, title? }]，按时间倒序。
+// 屏蔽已归档会话。返回 [{ id, createdAt, events?, seq?, cwd?, title? }]，按时间倒序。
 async function listSessions(node) {
-  const live = [...(node.ctx.sessions?.list() ?? [])]
+  // 归档会话 ID 集合
+  let archived = new Set()
+  try { archived = new Set(node.ctx.workspaceRegistry?.archivedSessionIds ?? []) } catch { /* ignore */ }
+  const live = [...(node.ctx.sessions?.list() ?? [])].filter((s) => !archived.has(s.id))
   const liveIds = new Set(live.map((s) => s.id))
   // 内存活跃会话（带完整 events/title）
   const liveMapped = live.map((s) => {
@@ -828,7 +851,7 @@ async function listSessions(node) {
   try {
     const headers = await node.ctx.sessionPersistence?.list?.()
     if (Array.isArray(headers)) {
-      const coldHeaders = headers.filter((h) => h && h.id && !liveIds.has(h.id) && h.cwd !== undefined)
+      const coldHeaders = headers.filter((h) => h && h.id && !liveIds.has(h.id) && h.cwd !== undefined && !archived.has(h.id))
       // 并行加载每个冷会话的 events 以提取标题
       cold = await Promise.all(coldHeaders.map(async (h) => {
         let title

package/package.json

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