npm - @wenbin_wb/dsh-bridge - Versions diffs - 2.6.1 → 2.7.1 - Mend

@wenbin_wb/dsh-bridge 2.6.1 → 2.7.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (19) hide show

package/CHANGELOG.md +136 -0
package/README.en.md +40 -20
package/README.md +40 -20
package/client/client.js +568 -65
package/client/index.js +485 -39
package/docs/feishu-usage.md +1 -0
package/docs/qq-usage.md +1 -0
package/docs/telegram-usage.md +1 -0
package/docs/wechat-usage.md +1 -0
package/lib/auth/login-template.js +4 -0
package/lib/bridge-rpc-constants.js +5 -0
package/lib/bridge-rpc.js +38 -1
package/lib/cloudflared-manager.mjs +15 -1
package/lib/index.js +295 -29
package/lib/platform/conversation-bridge.js +92 -46
package/lib/qq/gateway.js +5 -2
package/lib/telegram/gateway.js +25 -17
package/lib/wechat/gateway.js +27 -13
package/package.json +3 -2

package/docs/wechat-usage.md CHANGED Viewed

@@ -37,6 +37,7 @@
 | `/new <提示词>` | 在**当前工作区**新建会话并开始 |
 | `/new <提示词> @N` | 在**编号 N 的工作区**新建会话 |
 | `/new <提示词> @路径` | 在**指定目录**新建会话 |
+| `/rename <新标题>` | 重命名当前活动会话 |
 | `/stop` | 停止当前任务 |
 | `/status` | 查看当前 agent 状态与会话摘要 |
 | `/yes` `/no`（或 `1`/`2`） | 回应权限审批请求 |

package/lib/auth/login-template.js CHANGED Viewed

@@ -7,6 +7,10 @@ export function renderLoginPage({ error = '', hasPassword = true, locked = false
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+  <meta name="mobile-web-app-capable" content="yes">
+  <meta name="theme-color" content="#121413">
   <title>远程访问认证 - DeepSeek Harness</title>
   <style>
     :root {

package/lib/bridge-rpc-constants.js CHANGED Viewed

@@ -14,6 +14,11 @@ export const BRIDGE_ENDPOINTS = {
   saveCustomTunnelConfig: 'saveCustomTunnelConfig',
   checkVersion: 'checkVersion',
   upgradePlugin: 'upgradePlugin',
+  restartDsh: 'restartDsh',
+  exportBackup: 'exportBackup',
+  importBackup: 'importBackup',
+  diagnoseNetwork: 'diagnoseNetwork',
+  getSystemMetrics: 'getSystemMetrics',
   // 访问安全认证（密码保护 / 扫码免密 Token）
   authGetStatus: 'authGetStatus',
   authUpdateConfig: 'authUpdateConfig',

package/lib/bridge-rpc.js CHANGED Viewed

@@ -70,7 +70,7 @@ function checkAdminAuth(authManager, payload) {
   return fail('bad-request', '操作已被拦截：需要管理员权限，请先在控制台输入管理密码解锁');
 }
-export function installBridgeRpc(ctx, { service, authManager, wechat, platformManager, logger, saveCustomTunnelConfig }) {
+export function installBridgeRpc(ctx, { service, authManager, wechat, platformManager, logger, saveCustomTunnelConfig, exportBackup, importBackup }) {
   if (!ctx?.connection?.rpc?.handle) {
     logger.warn('dsh-bridge: Connection RPC unavailable — UI will not work');
     return () => {};
@@ -232,6 +232,43 @@ export function installBridgeRpc(ctx, { service, authManager, wechat, platformMa
           return ok(result);
         }
+        if (endpoint === BRIDGE_ENDPOINTS.restartDsh) {
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+          const result = await service.restartDsh();
+          return ok(result);
+        }
+        if (endpoint === BRIDGE_ENDPOINTS.exportBackup) {
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+          if (!exportBackup) return fail('bad-request', '备份导出服务不可用');
+          const backup = await exportBackup();
+          return ok(backup);
+        }
+        if (endpoint === BRIDGE_ENDPOINTS.importBackup) {
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+          if (!importBackup) return fail('bad-request', '备份导入服务不可用');
+          const result = await importBackup(payload?.backup);
+          const status = await service.getStatus({ adminAuthValid: true });
+          return ok({ result, status });
+        }
+        if (endpoint === BRIDGE_ENDPOINTS.diagnoseNetwork) {
+          const result = await service.diagnoseNetwork();
+          return ok(result);
+        }
+        if (endpoint === BRIDGE_ENDPOINTS.getSystemMetrics) {
+          const metrics = service.getSystemMetrics();
+          return ok(metrics);
+        }
         // ---- 平台管理器（多 IM 平台）----
         if (endpoint === BRIDGE_ENDPOINTS.listPlatforms) {

package/lib/cloudflared-manager.mjs CHANGED Viewed

@@ -168,9 +168,15 @@ export class CloudflaredManager {
       let resolved = false;
+      let timeoutTimer = null;
       const tryResolve = () => {
         if (!resolved) {
           resolved = true;
+          if (timeoutTimer) {
+            clearTimeout(timeoutTimer);
+            timeoutTimer = null;
+          }
           resolve();
         }
       };
@@ -222,6 +228,10 @@ export class CloudflaredManager {
       });
       this.process.on('exit', (code) => {
+        if (timeoutTimer) {
+          clearTimeout(timeoutTimer);
+          timeoutTimer = null;
+        }
         this.process = null;
         this.url = null;
         if (!resolved) {
@@ -232,11 +242,15 @@ export class CloudflaredManager {
       });
       this.process.on('error', (err) => {
+        if (timeoutTimer) {
+          clearTimeout(timeoutTimer);
+          timeoutTimer = null;
+        }
         if (!resolved) reject(err);
       });
       // 连接超时 90 秒
-      setTimeout(() => {
+      timeoutTimer = setTimeout(() => {
         if (!resolved) {
           this.stop();
           reject(new Error('等待隧道 URL 超时（90秒）'));

package/lib/index.js CHANGED Viewed

@@ -5,9 +5,9 @@
 //   2. Cloudflare 隧道（一键获取公网地址）
 //   3. 自建隧道（WebSocket 反向隧道 + Token 认证）
-import { createServer, request as httpRequest } from 'node:http';
+import { createServer, request as httpRequest, get as httpGet } from 'node:http';
 import { get as httpsGet } from 'node:https';
-import { networkInterfaces, homedir } from 'node:os';
+import { networkInterfaces, homedir, totalmem, freemem, cpus, loadavg, platform, arch, release, hostname, uptime } from 'node:os';
 import { join, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { readFileSync } from 'node:fs';
@@ -562,6 +562,9 @@ class BridgeService {
       // 轻量摘要，供 UI Tab 状态点使用（完整状态由 wechatGetStatus 提供）
       wechat: this.wechat ? { status: this.wechat.gateway?.status ?? 'idle' } : null,
+      // 宿主系统运行监控指标
+      system: this.getSystemMetrics(),
     };
   }
@@ -739,9 +742,9 @@ class BridgeService {
     const isWin = process.platform === 'win32';
     const tasks = [
-      { cmd: isWin ? 'dsh.cmd' : 'dsh', fallbackCmd: 'dsh', args: ['plugin', '--profile', 'web', 'add', pkgSpec] },
-      { cmd: isWin ? 'npx.cmd' : 'npx', fallbackCmd: 'npx', args: ['--yes', '@deepseek-ai/dsh', 'plugin', '--profile', 'web', 'add', pkgSpec] },
-      { cmd: isWin ? 'npm.cmd' : 'npm', fallbackCmd: 'npm', args: ['install', pkgSpec] },
+      { cmd: 'dsh', args: ['plugin', '--profile', 'web', 'add', pkgSpec] },
+      { cmd: 'npx', args: ['--yes', '@deepseek-ai/dsh', 'plugin', '--profile', 'web', 'add', pkgSpec] },
+      { cmd: 'npm', args: ['install', pkgSpec] },
     ];
     let lastError = null;
@@ -749,32 +752,30 @@ class BridgeService {
     for (const task of tasks) {
       try {
         const res = await new Promise((resolve, reject) => {
-          const runExecutable = (executable) => {
-            const cp = spawn(executable, task.args, {
+          let cp;
+          try {
+            cp = spawn(task.cmd, task.args, {
               windowsHide: true,
-              shell: false,
-              timeout: 90000,
-            });
-            let stdout = '';
-            let stderr = '';
-            cp.stdout?.on('data', (d) => { stdout += d.toString(); });
-            cp.stderr?.on('data', (d) => { stderr += d.toString(); });
-            cp.on('error', (err) => {
-              if (executable !== task.fallbackCmd) {
-                runExecutable(task.fallbackCmd);
-              } else {
-                reject(err);
-              }
-            });
-            cp.on('close', (code) => {
-              if (code === 0) {
-                resolve({ stdout, stderr });
-              } else {
-                reject(new Error(stderr || stdout || `进程退出码 ${code}`));
-              }
+              shell: isWin ? true : false,
+              timeout: 120000,
             });
-          };
-          runExecutable(task.cmd);
+          } catch (spawnErr) {
+            return reject(spawnErr);
+          }
+          let stdout = '';
+          let stderr = '';
+          cp.stdout?.on('data', (d) => { stdout += d.toString(); });
+          cp.stderr?.on('data', (d) => { stderr += d.toString(); });
+          cp.on('error', (err) => {
+            reject(err);
+          });
+          cp.on('close', (code) => {
+            if (code === 0) {
+              resolve({ stdout, stderr });
+            } else {
+              reject(new Error(stderr || stdout || `进程退出码 ${code}`));
+            }
+          });
         });
         const output = res.stdout || res.stderr || '升级成功';
@@ -787,6 +788,214 @@ class BridgeService {
     return { ok: false, error: lastError?.message ?? '升级命令执行失败', version: targetVersion };
   }
+  // 优雅重启 DSH 服务（支持守护进程自动拉起或独立派生子进程重启）
+  async restartDsh() {
+    this.logger?.info('收到 DSH 重启请求，正在调度重启...');
+    setTimeout(() => {
+      try {
+        if (process.env.DSH_DAEMON || process.env.PM2_HOME) {
+          process.exit(0);
+        } else {
+          // 常规 Node/CLI 模式：派生与当前参数一致的独立后台子进程并退出当前进程
+          const child = spawn(process.execPath, process.argv.slice(1), {
+            cwd: process.cwd(),
+            env: process.env,
+            detached: true,
+            stdio: 'ignore',
+            windowsHide: false,
+          });
+          child.unref();
+          process.exit(0);
+        }
+      } catch (err) {
+        this.logger?.error('派生重启进程失败: %s，执行直接退出', err.message);
+        process.exit(0);
+      }
+    }, 600);
+    return { ok: true, message: 'DSH 服务正在重启中，前端将在几秒后自动重新连接…' };
+  }
+  getSystemMetrics() {
+    try {
+      const totalMem = totalmem();
+      const freeMem = freemem();
+      const usedMem = totalMem - freeMem;
+      const memUsage = process.memoryUsage();
+      const cpusList = cpus() || [];
+      const cpuCount = cpusList.length;
+      const cpuModel = cpusList[0]?.model || 'Generic CPU';
+      return {
+        os: {
+          platform: platform(),
+          arch: arch(),
+          release: release(),
+          hostname: hostname(),
+          nodeVersion: process.version,
+        },
+        uptime: {
+          processSec: Math.floor(process.uptime()),
+          systemSec: Math.floor(uptime()),
+        },
+        cpu: {
+          model: cpuModel,
+          cores: cpuCount,
+          loadAvg: typeof loadavg === 'function' ? loadavg() : [0, 0, 0],
+        },
+        memory: {
+          totalBytes: totalMem,
+          freeBytes: freeMem,
+          usedBytes: usedMem,
+          usedPercent: Math.round((usedMem / totalMem) * 100),
+          processHeapUsed: memUsage.heapUsed,
+          processRss: memUsage.rss,
+        },
+      };
+    } catch {
+      return null;
+    }
+  }
+  async diagnoseNetwork() {
+    const results = [];
+    // 1. 本地代理端口检测
+    results.push({
+      item: 'local_proxy',
+      name: `本地反向代理端口 (${this.proxyPort})`,
+      status: this.proxy ? 'pass' : 'fail',
+      detail: this.proxy ? `正常运行中 (代理目标端口: ${this.dshPort})` : '代理未启动',
+    });
+    // 2. 局域网网卡检测
+    const lanIp = selectLanIPv4();
+    results.push({
+      item: 'lan_interface',
+      name: '局域网 IP 分配与可用性',
+      status: lanIp ? 'pass' : 'warn',
+      detail: lanIp ? `检测到有效局域网 IPv4: ${lanIp}` : '未检测到活跃局域网 IPv4 地址 (可能未连接 Wi-Fi/以太网)',
+    });
+    // 3. Cloudflare 边缘连通性测试
+    const cfStart = Date.now();
+    try {
+      await new Promise((resolve, reject) => {
+        const req = httpsGet('https://1.1.1.1', { timeout: 3500 }, (res) => {
+          res.resume();
+          resolve();
+        });
+        req.on('error', reject);
+        req.on('timeout', () => { req.destroy(); reject(new Error('连接超时 (3.5s)')); });
+      });
+      const cfLatency = Date.now() - cfStart;
+      results.push({
+        item: 'cloudflare_edge',
+        name: 'Cloudflare Anycast 边缘网络',
+        status: 'pass',
+        latencyMs: cfLatency,
+        detail: `连接畅通 (延迟 ${cfLatency}ms)`,
+      });
+    } catch (err) {
+      results.push({
+        item: 'cloudflare_edge',
+        name: 'Cloudflare Anycast 边缘网络',
+        status: 'warn',
+        detail: `连接异常: ${err.message} (临时公网隧道可能受阻)`,
+      });
+    }
+    // 4. 国内 npm 高速镜像源 (npmmirror)
+    const npmStart = Date.now();
+    try {
+      await new Promise((resolve, reject) => {
+        const req = httpsGet('https://registry.npmmirror.com', { timeout: 3500 }, (res) => {
+          res.resume();
+          resolve();
+        });
+        req.on('error', reject);
+        req.on('timeout', () => { req.destroy(); reject(new Error('连接超时 (3.5s)')); });
+      });
+      const npmLatency = Date.now() - npmStart;
+      results.push({
+        item: 'npmmirror',
+        name: '国内 npm 高速镜像源 (npmmirror)',
+        status: 'pass',
+        latencyMs: npmLatency,
+        detail: `连接畅通 (延迟 ${npmLatency}ms)`,
+      });
+    } catch (err) {
+      results.push({
+        item: 'npmmirror',
+        name: '国内 npm 高速镜像源 (npmmirror)',
+        status: 'warn',
+        detail: `连接超时或异常: ${err.message}`,
+      });
+    }
+    // 5. 自建隧道部署服务器连通性检测
+    const customServerUrl = this.customTunnelConfig?.serverUrl?.trim();
+    if (customServerUrl) {
+      const isRunning = Boolean(this.customTunnelClient?.running);
+      const ctStart = Date.now();
+      try {
+        const parsedUrl = new URL(customServerUrl);
+        const isSecure = parsedUrl.protocol === 'https:' || parsedUrl.protocol === 'wss:';
+        const getter = isSecure ? httpsGet : httpGet;
+        const probeUrl = new URL(customServerUrl);
+        probeUrl.protocol = isSecure ? 'https:' : 'http:';
+        await new Promise((resolve, reject) => {
+          const req = getter(probeUrl.toString(), { timeout: 4000 }, (res) => {
+            res.resume();
+            resolve();
+          });
+          req.on('error', reject);
+          req.on('timeout', () => { req.destroy(); reject(new Error('连接超时 (4.0s)')); });
+        });
+        const ctLatency = Date.now() - ctStart;
+        results.push({
+          item: 'custom_tunnel_server',
+          name: `自建隧道部署服务器 (${parsedUrl.hostname}${parsedUrl.port ? `:${parsedUrl.port}` : ''})`,
+          status: 'pass',
+          latencyMs: ctLatency,
+          detail: `服务器连通良好 (延迟 ${ctLatency}ms · 状态: ${isRunning ? '客户端在线运行中' : '待连接/就绪'})`,
+        });
+      } catch (err) {
+        if (isRunning) {
+          results.push({
+            item: 'custom_tunnel_server',
+            name: `自建隧道部署服务器 (${customServerUrl})`,
+            status: 'pass',
+            detail: '客户端在线运行中 (WebSocket 通道已建立)',
+          });
+        } else {
+          results.push({
+            item: 'custom_tunnel_server',
+            name: `自建隧道部署服务器 (${customServerUrl})`,
+            status: 'warn',
+            detail: `无法连通自建服务器: ${err.message}`,
+          });
+        }
+      }
+    } else {
+      results.push({
+        item: 'custom_tunnel_server',
+        name: '自建隧道部署服务器',
+        status: 'pass',
+        detail: '未配置自建服务器（若已部署自建隧道可在「公网隧道」中配置）',
+      });
+    }
+    const allPassed = results.every(r => r.status === 'pass');
+    return {
+      ok: true,
+      timestamp: new Date().toISOString(),
+      overall: allPassed ? 'healthy' : 'warning',
+      results,
+    };
+  }
   async dispose() {
     this.stopCustomTunnel();
     this.stopCloudflared();
@@ -1147,6 +1356,63 @@ function apply(ctx, config = {}) {
       await saveConfig(stored);
       service.customTunnelConfig = { serverUrl, accessToken };
     },
+    exportBackup: async () => {
+      const stored = await loadConfig();
+      return {
+        version: VERSION,
+        exportedAt: new Date().toISOString(),
+        config: stored,
+      };
+    },
+    importBackup: async (backup) => {
+      if (!backup || typeof backup !== 'object' || !backup.config || typeof backup.config !== 'object') {
+        throw new Error('无效的备份数据结构：缺少 config 节点');
+      }
+      const incoming = backup.config;
+      await saveConfig(incoming);
+      // 重新载入 Auth
+      if (incoming.auth) {
+        if (incoming.auth.enabled != null) authManager.enabled = Boolean(incoming.auth.enabled);
+        if (incoming.auth.mode) authManager.mode = incoming.auth.mode;
+        if (incoming.auth.scope) authManager.scope = incoming.auth.scope;
+        if (incoming.auth.adminPolicy) authManager.adminPolicy = incoming.auth.adminPolicy;
+        if (incoming.auth.passwordHash) authManager.passwordHash = incoming.auth.passwordHash;
+        if (incoming.auth.passwordSalt) authManager.passwordSalt = incoming.auth.passwordSalt;
+        if (incoming.auth.adminPasswordHash) authManager.adminPasswordHash = incoming.auth.adminPasswordHash;
+        if (incoming.auth.adminPasswordSalt) authManager.adminPasswordSalt = incoming.auth.adminPasswordSalt;
+        if (incoming.auth.secretToken) authManager.secretToken = incoming.auth.secretToken;
+      }
+      // 重新载入 Tunnels
+      if (incoming.cloudflared) {
+        service.cloudflaredConfig = incoming.cloudflared;
+      }
+      if (incoming.customTunnel) {
+        service.customTunnelConfig = incoming.customTunnel;
+      }
+      // 重新载入各 IM 平台白名单与配置
+      if (incoming.wechat) wechat.node.config.allowFrom = incoming.wechat.allowFrom ?? [];
+      if (incoming.qq) {
+        qq.node.config.allowFrom = incoming.qq.allowFrom ?? [];
+        if (incoming.qq.appId && incoming.qq.clientSecret) {
+          qq.gateway.setCredentials({ appId: incoming.qq.appId, clientSecret: incoming.qq.clientSecret });
+        }
+      }
+      if (incoming.feishu) {
+        feishu.node.config.allowFrom = incoming.feishu.allowFrom ?? [];
+        if (incoming.feishu.appId && incoming.feishu.appSecret) {
+          feishu.gateway.setCredentials({ appId: incoming.feishu.appId, appSecret: incoming.feishu.appSecret });
+        }
+      }
+      if (incoming.telegram) {
+        telegram.node.config.allowFrom = incoming.telegram.allowFrom ?? [];
+        if (incoming.telegram.botToken) {
+          telegram.gateway.setCredentials({ botToken: incoming.telegram.botToken, proxy: incoming.telegram.proxy || '' });
+        }
+      }
+      return { ok: true, message: '配置已成功导入并刷新生效！' };
+    },
   });
   // 代理随插件自动启动

package/lib/platform/conversation-bridge.js CHANGED Viewed

@@ -241,6 +241,7 @@ export class ConversationBridge {
     // 配置恢复状态追踪（用于防止 handleInbound 在配置加载前处理消息）
     this._configRestored = false
     this._restoringConfig = null
+    this._restoringSessionMap = new Map() // sessionId -> Promise<Agent|null>
     this.mark = BRIDGE_MARK
     this._attachOutbound()
@@ -478,56 +479,75 @@ export class ConversationBridge {
     let agent = this.activeAgent()
     if (!agent && this.activeSessionId) {
-      // agent 不在内存（DSH 重启后或切换到持久化会话）→ re-attach。
-      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) {
+      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。
           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
+            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 */ }
             }
-          } catch { /* ignore */ }
-        }
-        // 判断该 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',
+            // 判断该 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 {
+              // 读取持久化会话的 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: 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
+            }
+            await this.sendText(`❌ **恢复会话失败**：${reason}\n\n> 发送 \`/new <提示词>\` 可新建一个会话。`)
+            return null
           }
-          handle = await this.ctx.agents.create({
-            sessionId: this.activeSessionId,
-            meta,
-            agentOptions,
-          })
-        }
-        agent = handle.agent
-        this.logger?.info?.(`[dsh-bridge ${this.platform.id}] re-attached agent to session ${this.activeSessionId} (${persisted ? 'resume' : 'create'})`)
-      } 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，避免用户误以为还在旧会话中
-        this.activeSessionId = null
-        await this.sendText(`❌ **恢复会话失败**：${reason}\n\n> 发送 \`/new <提示词>\` 可新建一个会话。`)
+        })().finally(() => {
+          this._restoringSessionMap.delete(sessionId)
+        })
+        this._restoringSessionMap.set(sessionId, restorePromise)
+        agent = await restorePromise
       }
     }
     if (!agent) {
@@ -908,6 +928,31 @@ async function routeCommand(node, text) {
       await node.sendText(`✓ **已切换到会话 #${index}**${titleLine}\n- **会话 ID**：\`${fmtSessionId(session.id)}\``)
       return true
     }
+    case 'rename': {
+      if (!node.activeSessionId) {
+        await node.sendText(`❌ **当前没有活动会话**\n\n> 请先使用 \`/sessions\` 查看会话列表并通过 \`/use 编号\` 切换到目标会话，或通过 \`/new <提示词>\` 创建新会话。`)
+        return true
+      }
+      const newTitle = rest.join(' ').trim()
+      if (!newTitle) {
+        await node.sendText(`❌ **缺少新标题参数**\n\n> 用法：\`/rename <新标题>\`\n> 示例：\`/rename 优化登录交互逻辑\``)
+        return true
+      }
+      try {
+        const session = node.activeSession()
+        if (session) {
+          session.title = newTitle
+        }
+        if (node.ctx.sessionPersistence?.update) {
+          await node.ctx.sessionPersistence.update(node.activeSessionId, { title: newTitle }).catch(() => {})
+        }
+        await node.sendText(`✓ **会话重命名成功**\n- **会话 ID**：\`${fmtSessionId(node.activeSessionId)}\`\n- **新标题**：${newTitle}`)
+      } catch (err) {
+        await node.sendText(`❌ **重命名失败**：${err instanceof Error ? err.message : String(err)}`)
+      }
+      return true
+    }
     case 'workspaces': {
       const workspaces = await listWorkspaces(node)
       if (workspaces.length === 0) {
@@ -1125,6 +1170,7 @@ function helpText() {
     '| `/use <编号>` | 切换到指定编号会话 | `/use 1` 或 `/resume 1` |',
     '| `/new <提示词>` | 在当前工作区新建会话 | `/new 帮我写个脚本` |',
     '| `/new <词> @N` | 在指定工作区新建会话 | `/new 帮我写个脚本 @1` |',
+    '| `/rename <新标题>` | 重命名当前活动会话 | `/rename 优化登录交互` |',
     '| `/stop` | 中断停止当前正在执行的任务 | `/stop` |',
     '| `/end` | 结束当前会话（回到空闲） | `/end` |',
     '',