@wenbin_wb/dsh-bridge 2.8.5 → 2.8.6

package/lib/cloudflared-manager.mjs

@@ -1,7 +1,5 @@
-// DSH Bridge - Cloudflared Manager
-
-import { spawn } from 'node:child_process';
-import { createWriteStream, existsSync, mkdirSync } from 'node:fs';
+import { spawn, execSync } from 'node:child_process';
+import { createWriteStream, existsSync, mkdirSync, readFileSync } from 'node:fs';
 import { chmod, stat, unlink, rename } from 'node:fs/promises';
 import { homedir, platform, arch } from 'node:os';
 import { join } from 'node:path';
@@ -73,6 +71,27 @@ async function downloadFile(url, dest, onProgress) {
   });
 }
 
+function findSystemCloudflared() {
+  const isWin = platform() === 'win32';
+  const candidates = [];
+  if (isWin) {
+    candidates.push('cloudflared.exe', 'cloudflared', 'C:\\Program Files (x86)\\cloudflared\\cloudflared.exe', 'C:\\Program Files\\cloudflared\\cloudflared.exe');
+  } else {
+    candidates.push('cloudflared', '/opt/homebrew/bin/cloudflared', '/usr/local/bin/cloudflared', '/usr/bin/cloudflared', '/bin/cloudflared');
+  }
+
+  for (const bin of candidates) {
+    try {
+      if (bin.includes('/') || bin.includes('\\')) {
+        if (!existsSync(bin)) continue;
+      }
+      execSync(`"${bin}" --version`, { stdio: 'ignore', timeout: 3000 });
+      return bin;
+    } catch {}
+  }
+  return null;
+}
+
 export class CloudflaredManager {
   constructor({ port, home, token, hostname, onStateChange, logger }) {
     this.port = port;
@@ -104,19 +123,47 @@ export class CloudflaredManager {
   }
 
   async _ensureBinary() {
+    // 1. 优先使用系统环境变量或 Homebrew / 包管理器已安装的全局二进制
+    const systemBin = findSystemCloudflared();
+    if (systemBin) {
+      this.binaryPath = systemBin;
+      this.logger?.info('优先使用系统全局 cloudflared: %s', systemBin);
+      return;
+    }
+
     const { url, name } = getCloudflaredInfo();
     const binDir = join(this.home, 'bin');
     const binPath = join(binDir, name);
     this.binaryPath = binPath;
 
+    // 2. 检查本地 ~/.dsh-bridge/bin/cloudflared 是否已存在且可用
     if (existsSync(binPath)) {
       try {
         const s = await stat(binPath);
         if (s.size > MIN_BINARY_SIZE) { // >5MB 才视为有效二进制
-          this.logger?.info('cloudflared 已存在: %s', binPath);
-          return;
+          // 检查是否为历史残留未解压的 gzip 压缩包 (0x1f 0x8b)
+          const fd = readFileSync(binPath);
+          const isGzip = fd.length >= 2 && fd[0] === 0x1f && fd[1] === 0x8b;
+          if (isGzip) {
+            this.logger?.warn('检测到历史残留的未解压 cloudflared.tgz 压缩包，正在清理重新准备...');
+            await unlink(binPath).catch(() => {});
+          } else {
+            // macOS / Linux 赋予可执行权限并清除 Gatekeeper 隔离属性
+            if (platform() !== 'win32') {
+              await chmod(binPath, 0o755).catch(() => {});
+              if (platform() === 'darwin') {
+                try { execSync(`xattr -d com.apple.quarantine "${binPath}"`, { stdio: 'ignore' }); } catch {}
+              }
+            }
+            // 执行一次 --version 验证是否能正常 spawn
+            execSync(`"${binPath}" --version`, { stdio: 'ignore', timeout: 3000 });
+            this.logger?.info('cloudflared 已存在且验证通过: %s', binPath);
+            return;
+          }
         }
-      } catch {}
+      } catch (verifyErr) {
+        this.logger?.warn('现有 cloudflared 二进制验证失败 (%s)，准备重新下载', verifyErr.message);
+      }
       // 损坏文件，删掉重下
       await unlink(binPath).catch(() => {});
     }
@@ -135,16 +182,32 @@ export class CloudflaredManager {
         this._setState('downloading', `下载 cloudflared: ${mb}/${totalMb} MB (${percent}%)`);
       });
 
-      if (existsSync(binPath)) await unlink(binPath).catch(() => {});
-      await rename(tempPath, binPath);
+      if (url.endsWith('.tgz') || url.endsWith('.tar.gz')) {
+        try {
+          execSync(`tar -xzf "${tempPath}" -C "${binDir}"`);
+          await unlink(tempPath).catch(() => {});
+        } catch (tarErr) {
+          this.logger?.error('解压 cloudflared 压缩包失败: %s', tarErr.message);
+          throw new Error(`解压 cloudflared 失败: ${tarErr.message}`);
+        }
+      } else {
+        if (existsSync(binPath)) await unlink(binPath).catch(() => {});
+        await rename(tempPath, binPath);
+      }
 
       if (platform() !== 'win32') {
-        await chmod(binPath, 0o755);
+        await chmod(binPath, 0o755).catch(() => {});
+        if (platform() === 'darwin') {
+          try { execSync(`xattr -d com.apple.quarantine "${binPath}"`, { stdio: 'ignore' }); } catch {}
+        }
       }
-      this.logger?.info('cloudflared 下载完成');
+
+      // 执行 --version 最终确认
+      execSync(`"${binPath}" --version`, { stdio: 'ignore', timeout: 3000 });
+      this.logger?.info('cloudflared 下载并准备完成');
     } catch (err) {
       await unlink(tempPath).catch(() => {});
-      throw new Error(`下载失败: ${err.message}`);
+      throw new Error(`准备 cloudflared 失败: ${err.message}`);
     }
   }
 

package/lib/index.js

@@ -10,9 +10,10 @@ import { get as httpsGet } from 'node:https';
 import { networkInterfaces, homedir, totalmem, freemem, cpus, loadavg, platform, arch, release, hostname, uptime } from 'node:os';
 import { join, dirname, basename, resolve, normalize } from 'node:path';
 import { fileURLToPath } from 'node:url';
-import { readFileSync } from 'node:fs';
+import { readFileSync, existsSync } from 'node:fs';
 import { readFile, writeFile, mkdir, unlink, readdir, stat, access } from 'node:fs/promises';
 import { spawn } from 'node:child_process';
+import { createHash, createHmac } from 'node:crypto';
 import QRCode from 'qrcode';
 import { installBridgeRpc } from './bridge-rpc.js';
 import { CustomTunnelClient } from './tunnel-client.mjs';
@@ -42,23 +43,34 @@ function selectLanIPv4() {
   let best = null;
   let bestScore = -1;
 
+  const VIRTUAL_KEYWORDS = [
+    'vethernet', 'wsl', 'hyper-v', 'virtual', 'vmware', 'vbox', 'docker',
+    'tailscale', 'zerotier', 'tap', 'tun', 'utun', 'wireguard', 'loopback', 'bridge',
+  ];
+
   for (const [ifname, addrs] of Object.entries(interfaces)) {
     if (!addrs) continue;
+    const lower = ifname.toLowerCase();
+    const isVirtual = VIRTUAL_KEYWORDS.some((kw) => lower.includes(kw));
 
     for (const addr of addrs) {
       if (addr.family !== 'IPv4' || addr.internal) continue;
 
       let score = 0;
+      // 1. IP 网段优先（家庭/企业物理局域网最常用网段）
       if (addr.address.startsWith('192.168.')) score += 100;
       else if (addr.address.startsWith('10.')) score += 90;
-      else if (addr.address.match(/^172\.(1[6-9]|2[0-9]|3[0-1])\./)) score += 90;
+      else if (addr.address.match(/^172\.(1[6-9]|2[0-9]|3[0-1])\./)) score += 70;
+      else score += 10;
 
-      const lower = ifname.toLowerCase();
-      if (!lower.includes('virtual')) score += 50;
-      if (!lower.includes('vmware')) score += 50;
-      if (!lower.includes('vbox')) score += 50;
-      if (lower.includes('eth')) score += 20;
-      else if (lower.includes('en')) score += 10;
+      // 2. 物理网卡与名称特征优先
+      if (isVirtual) {
+        score -= 200; // 虚拟网卡大幅降权
+      } else {
+        score += 100;
+        if (lower.includes('wi-fi') || lower.includes('wlan') || lower.includes('wireless')) score += 50;
+        else if (lower.includes('ethernet') || lower.includes('以太网') || lower.includes('eth') || lower.includes('en')) score += 40;
+      }
 
       if (score > bestScore) {
         bestScore = score;
@@ -161,6 +173,37 @@ function isCompressed(headers) {
   return /(^|,\s*)(gzip|br|deflate)(\s*,|$)/i.test(String(headers['content-encoding'] ?? ''));
 }
 
+function encodeBase64Url(value) {
+  return Buffer.from(value).toString('base64url');
+}
+
+/**
+ * 读取 DSH 本地凭证并生成 loopback dsh-auth 认证签名 Cookie (适配 DSH 新版原生认证)
+ */
+function getDshLoopbackCookie(targetPort) {
+  try {
+    const dshHome = process.env.DSH_HOME ?? join(homedir(), '.dsh');
+    const credPath = join(dshHome, '.credentials.yaml');
+    if (!existsSync(credPath)) return '';
+    const content = readFileSync(credPath, 'utf8');
+    const match = content.match(/secret:\s*([A-Za-z0-9_-]+)/);
+    if (!match) return '';
+    const secret = Buffer.from(match[1], 'base64url');
+
+    const authority = `127.0.0.1:${targetPort}`;
+    const name = 'dsh-auth-' + encodeBase64Url(createHash('sha256').update(authority).digest());
+    const issuedAt = Date.now() - 1000;
+    const expiresAt = issuedAt + 30 * 24 * 3600 * 1000;
+    const body = encodeBase64Url(Buffer.from(JSON.stringify({
+      version: 1, authority, issuedAt, expiresAt,
+    }), 'utf8'));
+    const sig = encodeBase64Url(createHmac('sha256', secret).update(body).digest());
+    return `${name}=v1.${body}.${sig}`;
+  } catch {
+    return '';
+  }
+}
+
 /** 把请求头中的 Host 和 Origin 改写成 loopback，让 DSH 的安全栅栏放行 */
 function loopbackHeaders(headers, targetPort) {
   const authority = `127.0.0.1:${targetPort}`;
@@ -168,6 +211,19 @@ function loopbackHeaders(headers, targetPort) {
   out['host'] = authority;
   if (out['origin']) out['origin'] = `http://${authority}`;
   if (out['Origin']) out['Origin'] = `http://${authority}`;
+
+  // 1. 注入 DSH 本地认证签名（若有）
+  const dshCookie = getDshLoopbackCookie(targetPort);
+  if (dshCookie) {
+    const existing = out['cookie'] || out['Cookie'] || '';
+    out['cookie'] = existing ? `${existing}; ${dshCookie}` : dshCookie;
+    delete out['Cookie'];
+  }
+
+  // 2. 禁用内部代理流量压缩，确保代理层拿到未压缩 HTML 以稳定注入 ownsHost 和 Polyfill
+  delete out['accept-encoding'];
+  delete out['Accept-Encoding'];
+
   return out;
 }
 
@@ -1254,7 +1310,7 @@ class BridgeService {
  */
 function apply(ctx, config = {}) {
   const logger = ctx.logger(name);
-  const dshPort = ctx.webServer.port;
+  const dshPort = ctx.webServer?.port ?? config.targetPort ?? 3080;
 
   if (!dshPort) {
     logger.error('webServer port unavailable');

package/lib/platform/conversation-bridge.js

@@ -360,7 +360,9 @@ export class ConversationBridge {
     // 使用 DSH 原生格式 session-${uuid}，与 ctx.sessions 持久化系统兼容
     const sessionId = `session-${randomUUID()}`
     try {
-      const cwd = cwdOverride || this.config.cwd || process.cwd()
+      const workspaces = await listWorkspaces(this)
+      const defaultWsPath = workspaces.length > 0 ? workspaces[0].path : process.cwd()
+      const cwd = cwdOverride || this.config.cwd || defaultWsPath
       // 校验指定目录存在且是目录，防止路径遍历
       if (cwdOverride) {
         const validation = await validateWorkspacePath(this, cwdOverride)
@@ -388,13 +390,25 @@ export class ConversationBridge {
       // 注意：不预创建 ctx.sessions——agents.create 会自己 prepare+enter session
       const handle = await this.ctx.agents.create({ sessionId, meta, agentOptions })
       this.setActiveSession(handle.agent.session)
+
+      // 同步挂载进 DSH 工作区账本 (workspaceRegistry)，使新会话在 Web 侧边栏和 /list 中精准归组
+      try {
+        const reg = this.ctx.workspaceRegistry
+        const entities = reg?.list ? (await reg.list()) : []
+        const normCwd = normalize(cwd).toLowerCase()
+        const match = (entities || []).find((ws) => ws?.path && normalize(ws.path).toLowerCase() === normCwd)
+        if (match?.attachSession) await match.attachSession(sessionId)
+      } catch { /* 账本写入失败不影响会话创建 */ }
+
       if (prompt) {
+        const platformName = this.platform?.name || 'IM客户端'
+        const promptWithContext = `${prompt}\n\n<!-- [dsh-bridge 提示] 当前用户正通过【${platformName}】与你对话。若用户明确要求发送、导出或传送文件/图片/报表/代码脚本产物，请在本地生成/准备好文件后，在回复正文中附带明确发送指令：\n[SEND_FILE: <本地文件绝对路径>]\n例如：[SEND_FILE: C:\\path\\to\\report.xlsx]\n网关会自动解析该指令并将该文件直传至用户的聊天窗口，且在聊天文本中自动隐藏该指令。在日常编写代码、回复普通文本或未请求发送文件时，请勿输出此指令。 -->`
         handle.agent.followup(createUserMessage({
-          content: [{ type: 'text', text: prompt }],
+          content: [{ type: 'text', text: promptWithContext }],
           source: { kind: 'user' },
         }))
       }
-      const wsDetail = cwdOverride ? `\n- **工作区**：\`${cwdOverride}\`` : ''
+      const wsDetail = cwd ? `\n- **工作区**：\`${cwd}\`` : ''
       const hint = prompt ? '' : '\n\n> 💡 发送任意消息即可直接与 Agent 对话。'
       await this.sendText(`✓ **已创建新会话**\n- **会话 ID**：\`${fmtSessionId(handle.agent.session.id)}\`${wsDetail}${hint}`)
     } catch (error) {
@@ -489,146 +503,147 @@ export class ConversationBridge {
   //   'ignored'   消息被忽略（未授权/群消息/空消息）
   //   'routed'    消息已路由到 agent
   async handleInbound({ senderId, text, isGroup = false }) {
-    // 等待配置恢复完成（防止启动时竞态）
-    if (this._restoringConfig) {
-      await this._restoringConfig
-    }
+    try {
+      // 等待配置恢复完成（防止启动时竞态）
+      if (this._restoringConfig) {
+        await this._restoringConfig
+      }
 
-    const sender = String(senderId ?? '').trim()
-    if (!sender) return 'ignored'
-
-    if (!this.isAllowed(sender)) {
-      // 自动授权：
-      //  - 单聊：白名单为空时，首个发消息的真实用户自动纳入白名单
-      //  - 群聊：首次 @机器人 的群自动纳入（群维度授权，群内成员均可使用）
-      // 这是"登录后第一条消息/首次被 @即完成授权"的一步到位体验。
-      const shouldAutoApprove = Boolean(text?.trim()) && (
-        this.config.allowFrom.length === 0 || // 白名单为空：单聊/群聊都自动授权
-        isGroup                                // 群聊：始终自动授权群
-      )
-      if (shouldAutoApprove) {
-        this.config.allowFrom = Array.from(new Set([...this.config.allowFrom, sender]))
-        this.logger?.info?.(`[dsh-bridge ${this.platform.id}] auto-approved ${isGroup ? 'group' : 'sender'} ${sender} into allowlist`)
-        try {
-          await this.onFirstSender?.(sender)
-        } catch (err) {
-          this.logger?.warn?.(`[dsh-bridge ${this.platform.id}] failed to persist first sender: ${err instanceof Error ? err.message : String(err)}`)
+      const sender = String(senderId ?? '').trim()
+      if (!sender) return 'ignored'
+
+      if (!this.isAllowed(sender)) {
+        // 自动授权：
+        //  - 单聊：白名单为空时，首个发消息的真实用户自动纳入白名单
+        //  - 群聊：首次 @机器人 的群自动纳入（群维度授权，群内成员均可使用）
+        // 这是"登录后第一条消息/首次被 @即完成授权"的一步到位体验。
+        const shouldAutoApprove = Boolean(text?.trim()) && (
+          this.config.allowFrom.length === 0 || // 白名单为空：单聊/群聊都自动授权
+          isGroup                                // 群聊：始终自动授权群
+        )
+        if (shouldAutoApprove) {
+          this.config.allowFrom = Array.from(new Set([...this.config.allowFrom, sender]))
+          this.logger?.info?.(`[dsh-bridge ${this.platform.id}] auto-approved ${isGroup ? 'group' : 'sender'} ${sender} into allowlist`)
+          try {
+            await this.onFirstSender?.(sender)
+          } catch (err) {
+            this.logger?.warn?.(`[dsh-bridge ${this.platform.id}] failed to persist first sender: ${err instanceof Error ? err.message : String(err)}`)
+          }
+        } else {
+          this.logger?.info?.(`[dsh-bridge ${this.platform.id}] media-only first message from ${sender} not auto-approved (waiting for text)`)
+        }
+
+        // 如果仍未通过白名单，拒绝处理（防止绕过白名单）
+        if (!this.isAllowed(sender)) {
+          this.logger?.info?.(`[dsh-bridge ${this.platform.id}] ignore message from non-allowlisted sender ${sender} (never fed to model)`)
+          return 'ignored'
         }
-      } else {
-        this.logger?.info?.(`[dsh-bridge ${this.platform.id}] media-only first message from ${sender} not auto-approved (waiting for text)`)
       }
 
-      // 如果仍未通过白名单，拒绝处理（防止绕过白名单）
-      if (!this.isAllowed(sender)) {
-        this.logger?.info?.(`[dsh-bridge ${this.platform.id}] ignore message from non-allowlisted sender ${sender} (never fed to model)`)
+      // 仅在不支持群聊的平台忽略群消息（QQ 等支持群聊的平台放行）
+      if (isGroup && !this.platform?.capabilities?.supportsGroup) {
+        this.logger?.info?.(`[dsh-bridge ${this.platform.id}] ignore group message from ${sender} (no group support)`)
         return 'ignored'
       }
-    }
-
-    // 仅在不支持群聊的平台忽略群消息（QQ 等支持群聊的平台放行）
-    if (isGroup && !this.platform?.capabilities?.supportsGroup) {
-      this.logger?.info?.(`[dsh-bridge ${this.platform.id}] ignore group message from ${sender} (no group support)`)
-      return 'ignored'
-    }
 
-    const fullText = text?.trim() ?? ''
-    if (!fullText) {
-      this.logger?.info?.(`[dsh-bridge ${this.platform.id}] ignore empty message from ${sender}`)
-      return 'ignored'
-    }
+      const fullText = text?.trim() ?? ''
+      if (!fullText) {
+        this.logger?.info?.(`[dsh-bridge ${this.platform.id}] ignore empty message from ${sender}`)
+        return 'ignored'
+      }
 
-    this.peerId = sender
+      this.peerId = sender
 
-    if (await routeCommand(this, fullText)) return 'routed'
+      if (await routeCommand(this, fullText)) return 'routed'
 
-    let agent = this.activeAgent()
-    if (!agent && this.activeSessionId) {
-      const sessionId = this.activeSessionId
-      if (this._restoringSessionMap.has(sessionId)) {
-        try {
-          await this._restoringSessionMap.get(sessionId)
-        } catch { /* 错误已在原始 Promise 中捕获 */ }
-        agent = this.activeAgent()
-      } else {
-        const restorePromise = (async () => {
-          // agent 不在内存（DSH 重启后或切换到持久化会话）→ re-attach。
+      let agent = this.activeAgent()
+      if (!agent && this.activeSessionId) {
+        const sessionId = this.activeSessionId
+        if (this._restoringSessionMap.has(sessionId)) {
           try {
-            const agentOptions = {}
-            if (this.config.agentProvider) agentOptions.provider = this.config.agentProvider
-            if (this.config.agentModel) agentOptions.model = this.config.agentModel
-            if (!agentOptions.provider || !agentOptions.model) {
-              try {
-                const def = this.ctx.get?.('agentDefaultModel')?.currentSelection?.()
-                if (def) {
-                  if (!agentOptions.provider && def.provider) agentOptions.provider = def.provider
-                  if (!agentOptions.model && def.model) agentOptions.model = def.model
-                }
-              } catch { /* ignore */ }
-            }
-
-            // 判断该 session 是否已持久化：已持久化 → agents.resume（从持久化加载历史恢复，
-            // 避免 agents.create 用空 seed 与已持久化事件冲突）；未持久化 → agents.create。
-            let persisted = false
+            await this._restoringSessionMap.get(sessionId)
+          } catch { /* 错误已在原始 Promise 中捕获 */ }
+          agent = this.activeAgent()
+        } else {
+          const restorePromise = (async () => {
+            // agent 不在内存（DSH 重启后或切换到持久化会话）→ re-attach。
             try {
-              const headers = await this.ctx.sessionPersistence?.list?.()
-              persisted = Array.isArray(headers) && headers.some((h) => h?.id === sessionId)
-            } catch { /* 读取失败则按未持久化处理 */ }
-
-            let handle
-            if (persisted) {
-              handle = await this.ctx.agents.resume({
-                resumeSessionId: sessionId,
-                agentOptions,
-              })
-            } else {
-              // 读取持久化会话的 cwd 做 fallback（新建会话时用）
-              let sessionCwd = this.config.cwd || process.cwd()
-              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
+              if (!agentOptions.provider || !agentOptions.model) {
+                try {
+                  const def = this.ctx.get?.('agentDefaultModel')?.currentSelection?.()
+                  if (def) {
+                    if (!agentOptions.provider && def.provider) agentOptions.provider = def.provider
+                    if (!agentOptions.model && def.model) agentOptions.model = def.model
+                  }
+                } catch { /* ignore */ }
               }
-              handle = await this.ctx.agents.create({
-                sessionId: sessionId,
-                meta,
-                agentOptions,
-              })
-            }
-            const resumedAgent = handle?.agent
-            this.logger?.info?.(`[dsh-bridge ${this.platform.id}] re-attached agent to session ${sessionId} (${persisted ? 'resume' : 'create'})`)
-            return resumedAgent
-          } catch (err) {
-            const reason = err instanceof Error ? err.message : String(err)
-            this.logger?.warn?.(`[dsh-bridge ${this.platform.id}] failed to re-attach agent: ${reason}`)
-            // 清除失效的 activeSessionId，避免用户误以为还在旧会话中
-            if (this.activeSessionId === sessionId) {
-              this.activeSessionId = null
+
+              // 判断该 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 === sessionId)
+              } catch { /* 读取失败则按未持久化处理 */ }
+
+              let handle
+              if (persisted) {
+                handle = await this.ctx.agents.resume({
+                  resumeSessionId: sessionId,
+                  agentOptions,
+                })
+              } else {
+                handle = await this.ctx.agents.create({
+                  sessionId,
+                  meta: { cwd: this.config.cwd || process.cwd() },
+                  agentOptions,
+                })
+              }
+              const resumedAgent = handle?.agent
+              this.logger?.info?.(`[dsh-bridge ${this.platform.id}] re-attached agent to session ${sessionId} (${persisted ? 'resume' : 'create'})`)
+              return resumedAgent
+            } catch (err) {
+              const reason = err instanceof Error ? err.message : String(err)
+              this.logger?.warn?.(`[dsh-bridge ${this.platform.id}] failed to re-attach agent: ${reason}`)
+              // 清除失效的 activeSessionId，避免用户误以为还在旧会话中
+              if (this.activeSessionId === sessionId) {
+                this.activeSessionId = null
+              }
+              await this.sendText(`❌ **恢复会话失败**：${reason}\n\n> 发送 \`/new <提示词>\` 可新建一个会话。`)
+              return null
             }
-            await this.sendText(`❌ **恢复会话失败**：${reason}\n\n> 发送 \`/new <提示词>\` 可新建一个会话。`)
-            return null
-          }
-        })().finally(() => {
-          this._restoringSessionMap.delete(sessionId)
-        })
+          })().finally(() => {
+            this._restoringSessionMap.delete(sessionId)
+          })
 
-        this._restoringSessionMap.set(sessionId, restorePromise)
-        agent = await restorePromise
+          this._restoringSessionMap.set(sessionId, restorePromise)
+          agent = await restorePromise
+        }
+      }
+      if (!agent) {
+        await this.sendText(`> 💤 **当前没有活动会话**\n> 发送 \`/new <提示词>\` 开始新会话，或发送 \`/sessions\` 查看已有会话。`)
+        return 'routed'
       }
-    }
-    if (!agent) {
-      await this.sendText(`> 💤 **当前没有活动会话**\n> 发送 \`/new <提示词>\` 开始新会话，或发送 \`/sessions\` 查看已有会话。`)
-      return 'routed'
-    }
 
-    // 针对微信/IM客户端用户，注入上下文提示，规范 Agent 仅在需要向用户发送文件附件时输出 [SEND_FILE: <文件绝对路径>]
-    const promptWithContext = `${fullText}\n\n<!-- [dsh-bridge 提示] 当前用户正通过【${this.platform.name}】与你对话。若用户明确要求发送、导出或传送文件/图片/报表/代码脚本产物，请在本地生成/准备好文件后，在回复正文中附带明确发送指令：\n[SEND_FILE: <本地文件绝对路径>]\n例如：[SEND_FILE: C:\\path\\to\\report.xlsx]\n网关会自动解析该指令并将该文件直传至用户的聊天窗口，且在聊天文本中自动隐藏该指令。在日常编写代码、回复普通文本或未请求发送文件时，请勿输出此指令。 -->`
+      // 针对微信/IM客户端用户，注入上下文提示，规范 Agent 仅在需要向用户发送文件附件时输出 [SEND_FILE: <文件绝对路径>]
+      const promptWithContext = `${fullText}\n\n<!-- [dsh-bridge 提示] 当前用户正通过【${this.platform.name}】与你对话。若用户明确要求发送、导出或传送文件/图片/报表/代码脚本产物，请在本地生成/准备好文件后，在回复正文中附带明确发送指令：\n[SEND_FILE: <本地文件绝对路径>]\n例如：[SEND_FILE: C:\\path\\to\\report.xlsx]\n网关会自动解析该指令并将该文件直传至用户的聊天窗口，且在聊天文本中自动隐藏该指令。在日常编写代码、回复普通文本或未请求发送文件时，请勿输出此指令。 -->`
 
-    const messageValue = createUserMessage({
-      content: [{ type: 'text', text: promptWithContext }],
-      source: { kind: 'user' },
-    })
-    agent.followup(messageValue)
-    await this.sendTyping(1).catch(() => {})
-    return 'routed'
+      const messageValue = createUserMessage({
+        content: [{ type: 'text', text: promptWithContext }],
+        source: { kind: 'user' },
+      })
+      agent.followup(messageValue)
+      await this.sendTyping(1).catch(() => {})
+      return 'routed'
+    } catch (err) {
+      const errMsg = err instanceof Error ? err.message : String(err)
+      this.logger?.error?.(`[dsh-bridge ${this.platform.id}] unhandled error in handleInbound: ${errMsg}`)
+      await this.sendText(`❌ **执行出错**：${errMsg}`).catch(() => {})
+      return 'ignored'
+    }
   }
 
   // ---- 发送（子类必须实现）----
@@ -1027,6 +1042,15 @@ function isSubagentSession(cacheRow, liveSession) {
   return false
 }
 
+function formatGoalTitle(raw) {
+  if (typeof raw === 'string' && raw) return raw
+  if (raw && typeof raw === 'object') {
+    const obj = raw.objective ?? raw.goal?.objective ?? raw.title
+    if (typeof obj === 'string' && obj) return obj
+  }
+  return ''
+}
+
 // 列出会话：严格对齐 DSH Web 端侧边栏会话树逻辑。
 // 1. 过滤已归档会话 (archivedSessionIds)
 // 2. 过滤未发起提问的空白会话 (blank: true)
@@ -1060,7 +1084,7 @@ async function listSessions(node) {
           let title = s.title || (s.events ? foldTitle(s.events) : '')
           if (!title) {
             const cache = projCache[s.id]
-            title = cache?.rows?.title?.val || cache?.rows?.goal?.val
+            title = cache?.rows?.title?.val || formatGoalTitle(cache?.rows?.goal?.val)
           }
           result.push({
             id: s.id,
@@ -1090,7 +1114,7 @@ async function listSessions(node) {
           continue
         }
 
-        let title = cache?.rows?.title?.val || cache?.rows?.goal?.val
+        let title = cache?.rows?.title?.val || formatGoalTitle(cache?.rows?.goal?.val)
         let createdAt = cache?.identity?.createdAt || 0
         let cwd = ws.path
 
@@ -1453,7 +1477,8 @@ async function renderSessions(node) {
       const isActive = session.id === node.activeSessionId
       const statusTag = isActive ? '`[当前]`' : '-'
       const rawTitle = session.title || (session.events ? sessionLabel(session) : '')
-      const safeTitle = (rawTitle || '新会话').replace(/\|/g, '｜').replace(/\r?\n/g, ' ')
+      const titleText = formatGoalTitle(rawTitle) || (typeof rawTitle === 'string' ? rawTitle : '') || '新会话'
+      const safeTitle = String(titleText).replace(/\|/g, '｜').replace(/\r?\n/g, ' ')
       const when = session.createdAt ? fmtTime(session.createdAt) : '-'
       parts.push(`| **#${idx}** | ${safeTitle} | ${when} | ${statusTag} |`)
     }