@wenbin_wb/dsh-bridge 2.6.0 → 2.7.0

package/lib/index.js

@@ -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';
@@ -452,12 +452,14 @@ class ProxyServer {
  * Bridge Service
  */
 class BridgeService {
-  constructor({ dshPort, proxyPort, home, customTunnelConfig, authManager, logger }) {
+  constructor({ dshPort, proxyPort, home, cloudflaredConfig, customTunnelConfig, authManager, onPersist, logger }) {
     this.dshPort = dshPort;
     this.proxyPort = proxyPort;
     this.home = home;
+    this.cloudflaredConfig = cloudflaredConfig ?? { token: '', hostname: '', autoStart: false };
     this.customTunnelConfig = customTunnelConfig ?? null;
     this.authManager = authManager ?? null;
+    this.onPersist = onPersist ?? null;
     this.logger = logger;
 
     this.qrCache = new QrCache();
@@ -539,6 +541,10 @@ class BridgeService {
           ? await this.qrCache.get(cloudflaredUrl)
           : null,
         state: this.cloudflaredState,
+        tokenConfigured: !!this.cloudflaredConfig?.token,
+        token: adminAuthValid ? (this.cloudflaredConfig?.token || '') : (this.cloudflaredConfig?.token ? '******' : ''),
+        hostname: this.cloudflaredConfig?.hostname || '',
+        autoStart: Boolean(this.cloudflaredConfig?.autoStart),
       },
 
       customTunnel: {
@@ -551,14 +557,44 @@ class BridgeService {
           ? await this.qrCache.get(customUrl)
           : null,
         state: this.customTunnelState,
+        autoStart: Boolean(this.customTunnelConfig?.autoStart),
       },
 
       // 轻量摘要，供 UI Tab 状态点使用（完整状态由 wechatGetStatus 提供）
       wechat: this.wechat ? { status: this.wechat.gateway?.status ?? 'idle' } : null,
+
+      // 宿主系统运行监控指标
+      system: this.getSystemMetrics(),
+    };
+  }
+
+  async saveCloudflaredConfig({ token, hostname }) {
+    this.cloudflaredConfig = {
+      ...(this.cloudflaredConfig ?? {}),
+      token: token ? String(token).trim() : '',
+      hostname: hostname ? String(hostname).trim() : '',
     };
+    await this.onPersist?.({ cloudflared: this.cloudflaredConfig });
   }
 
-  async startCustomTunnel() {
+  async setTunnelAutoStart({ tunnel, autoStart }) {
+    const isAuto = Boolean(autoStart);
+    if (tunnel === 'cloudflared') {
+      this.cloudflaredConfig = {
+        ...(this.cloudflaredConfig ?? {}),
+        autoStart: isAuto,
+      };
+      await this.onPersist?.({ cloudflared: this.cloudflaredConfig });
+    } else if (tunnel === 'customTunnel' || tunnel === 'custom') {
+      this.customTunnelConfig = {
+        ...(this.customTunnelConfig ?? {}),
+        autoStart: isAuto,
+      };
+      await this.onPersist?.({ customTunnel: this.customTunnelConfig });
+    }
+  }
+
+  async startCustomTunnel({ autoStart = true } = {}) {
     if (this.customTunnel) {
       throw new Error('自建隧道已在运行');
     }
@@ -567,9 +603,15 @@ class BridgeService {
     const accessToken = this.customTunnelConfig?.accessToken;
 
     if (!serverUrl || !accessToken) {
-      throw new Error('缺少配置：请在 cordis.yml 中配置 customTunnel.serverUrl 和 customTunnel.accessToken');
+      throw new Error('缺少配置：请在控制台配置 customTunnel.serverUrl 和 customTunnel.accessToken');
     }
 
+    this.customTunnelConfig = {
+      ...(this.customTunnelConfig ?? {}),
+      autoStart: Boolean(autoStart),
+    };
+    await this.onPersist?.({ customTunnel: this.customTunnelConfig });
+
     this.customTunnel = new CustomTunnelClient({
       serverUrl,
       accessToken,
@@ -584,23 +626,36 @@ class BridgeService {
     await this.customTunnel.connect();
   }
 
-  stopCustomTunnel() {
+  async stopCustomTunnel() {
     if (this.customTunnel) {
       this.customTunnel.disconnect();
       this.customTunnel = null;
       this.customTunnelState = { phase: 'idle', detail: '' };
     }
+    this.customTunnelConfig = {
+      ...(this.customTunnelConfig ?? {}),
+      autoStart: false,
+    };
+    await this.onPersist?.({ customTunnel: this.customTunnelConfig });
   }
 
-  async startCloudflared() {
+  async startCloudflared({ autoStart = true } = {}) {
     if (this.cloudflared) {
       throw new Error('Cloudflare 隧道已在运行');
     }
 
+    this.cloudflaredConfig = {
+      ...(this.cloudflaredConfig ?? {}),
+      autoStart: Boolean(autoStart),
+    };
+    await this.onPersist?.({ cloudflared: this.cloudflaredConfig });
+
     this.cloudflaredState = { phase: 'connecting', detail: '正在初始化...' };
     this.cloudflared = new CloudflaredManager({
       port: this.proxyPort,
       home: this.home,
+      token: this.cloudflaredConfig?.token,
+      hostname: this.cloudflaredConfig?.hostname,
       onStateChange: (state) => {
         this.cloudflaredState = state;
         // 出错时自动清理，让用户可以重新开启
@@ -615,17 +670,22 @@ class BridgeService {
     this.cloudflared.start();
   }
 
-  stopCloudflared() {
+  async stopCloudflared() {
     if (this.cloudflared) {
       this.cloudflared.stop();
       this.cloudflared = null;
       this.cloudflaredState = { phase: 'idle', detail: '' };
     }
+    this.cloudflaredConfig = {
+      ...(this.cloudflaredConfig ?? {}),
+      autoStart: false,
+    };
+    await this.onPersist?.({ cloudflared: this.cloudflaredConfig });
   }
 
   // 重置 Cloudflare 隧道：关闭隧道 + 删除已下载的 cloudflared 二进制
   async resetCloudflared() {
-    this.stopCloudflared();
+    await this.stopCloudflared();
     const binDir = join(this.home ?? join(homedir(), '.dsh-bridge'), 'bin');
     const candidates = ['cloudflared.exe', 'cloudflared'];
     for (const name of candidates) {
@@ -730,6 +790,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();
@@ -835,15 +1103,38 @@ function apply(ctx, config = {}) {
     proxyPort,
     home: config.home,
     customTunnelConfig: config.customTunnel ?? null,
+    cloudflaredConfig: config.cloudflared ?? null,
     authManager,
+    onPersist: async (patch) => {
+      const stored = await loadConfig();
+      Object.assign(stored, patch);
+      await saveConfig(stored);
+    },
     logger,
   });
 
-  // 启动时读取已保存的自建隧道配置
-  loadConfig().then((stored) => {
-    if (stored?.customTunnel?.serverUrl) {
+  // 启动时读取已保存的公网隧道配置并按需自动拉起
+  loadConfig().then(async (stored) => {
+    if (stored?.cloudflared) {
+      service.cloudflaredConfig = stored.cloudflared;
+      logger.info('dsh-bridge: loaded saved cloudflared config (autoStart=%s, tokenConfigured=%s)', Boolean(service.cloudflaredConfig.autoStart), Boolean(service.cloudflaredConfig.token));
+      if (service.cloudflaredConfig.autoStart) {
+        logger.info('dsh-bridge: auto-starting cloudflared tunnel...');
+        service.startCloudflared({ autoStart: true }).catch((err) => {
+          logger.error('dsh-bridge: cloudflared auto-start failed: %s', err?.message ?? err);
+        });
+      }
+    }
+
+    if (stored?.customTunnel) {
       service.customTunnelConfig = stored.customTunnel;
-      logger.info('dsh-bridge: loaded saved custom tunnel config');
+      logger.info('dsh-bridge: loaded saved custom tunnel config (autoStart=%s)', Boolean(service.customTunnelConfig.autoStart));
+      if (service.customTunnelConfig.autoStart && service.customTunnelConfig.serverUrl) {
+        logger.info('dsh-bridge: auto-starting custom tunnel...');
+        service.startCustomTunnel({ autoStart: true }).catch((err) => {
+          logger.error('dsh-bridge: custom tunnel auto-start failed: %s', err?.message ?? err);
+        });
+      }
     }
   }).catch(() => {});
 
@@ -1067,6 +1358,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

@@ -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` |',
     '',

package/lib/qq/gateway.js

@@ -174,11 +174,14 @@ export class QqGateway extends Service {
   }
 
   async start() {
+    if (this._startingPromise) return this._startingPromise
     if (!this.configured) { this.setStatus('idle'); return }
-    if (!this.loopTask) {
+    if (this.loopTask) return
+    this._startingPromise = (async () => {
       this.stopRequested = false
       this.loopTask = this.runLoop().finally(() => { this.loopTask = null })
-    }
+    })().finally(() => { this._startingPromise = null })
+    return this._startingPromise
   }
 
   async persist(patch) {