@wenbin_wb/dsh-bridge 1.2.2 → 1.2.4

package/client/client.js

@@ -77,7 +77,7 @@ var s = {
   muted: { color: "var(--dsw-alias-label-tertiary,#8b93a1)", fontSize: 12, lineHeight: 1.5 },
   label: { color: "var(--dsw-alias-label-primary,currentColor)", fontSize: 13, fontWeight: 500 },
   code: { fontFamily: "ui-monospace,Menlo,monospace", fontSize: 12, wordBreak: "break-all", color: "var(--dsw-alias-label-primary,currentColor)" },
-  btnPri: { font: "inherit", cursor: "pointer", border: "none", background: "var(--dsw-alias-button-primary-fill,var(--dsw-alias-brand-primary,#4f6ef7))", color: "#fff", height: 32, padding: "0 14px", borderRadius: 999, fontSize: 13, fontWeight: 500, display: "inline-flex", alignItems: "center", gap: 4 },
+  btnPri: { font: "inherit", cursor: "pointer", border: "none", background: "var(--dsw-alias-button-primary-fill,var(--dsw-alias-brand-primary,#4f6ef7))", color: "var(--dsw-alias-button-primary-label,#fff)", height: 32, padding: "0 14px", borderRadius: 999, fontSize: 13, fontWeight: 500, display: "inline-flex", alignItems: "center", gap: 4 },
   btnGhost: { font: "inherit", cursor: "pointer", border: "1px solid var(--dsw-alias-border-l2,#d1d5db)", background: "var(--dsw-alias-bg-layer-1,transparent)", color: "var(--dsw-alias-label-primary,currentColor)", height: 32, padding: "0 14px", borderRadius: 999, fontSize: 13, display: "inline-flex", alignItems: "center", gap: 4, textDecoration: "none" },
   btnLink: { font: "inherit", cursor: "pointer", border: "none", background: "none", color: "var(--dsw-alias-brand-primary,#4f6ef7)", fontSize: 12, padding: 0, display: "inline-flex", alignItems: "center", gap: 3, textDecoration: "none" },
   qr: { width: 200, height: 200, borderRadius: 10, border: "1px solid var(--dsw-alias-border-l2,#e5e7eb)", margin: "8px 0", display: "block" },
@@ -99,11 +99,28 @@ function QrBlock({ url, qr, onReset }) {
   const [copied, setCopied] = React.useState(false);
   const [showQr, setShowQr] = React.useState(true);
   const copy = React.useCallback(() => {
-    navigator.clipboard?.writeText(url).then(() => {
-      setCopied(true);
-      setTimeout(() => setCopied(false), 2e3);
-    }).catch(() => {
-    });
+    if (navigator.clipboard?.writeText) {
+      navigator.clipboard.writeText(url).then(() => {
+        setCopied(true);
+        setTimeout(() => setCopied(false), 2e3);
+      }).catch(() => fallbackCopy());
+    } else {
+      fallbackCopy();
+    }
+    function fallbackCopy() {
+      const textarea = document.createElement("textarea");
+      textarea.value = url;
+      textarea.style.position = "fixed";
+      textarea.style.opacity = "0";
+      document.body.appendChild(textarea);
+      textarea.select();
+      const success = document.execCommand("copy");
+      document.body.removeChild(textarea);
+      if (success) {
+        setCopied(true);
+        setTimeout(() => setCopied(false), 2e3);
+      }
+    }
   }, [url]);
   const toggleQr = React.useCallback(() => setShowQr((v) => !v), []);
   return React.createElement(
@@ -599,48 +616,50 @@ function VersionBanner({ rpcCall }) {
         "div",
         {
           style: {
-            display: "flex",
-            alignItems: "center",
-            gap: 12,
-            background: "linear-gradient(135deg, var(--dsw-alias-brand-primary,#4f6ef7) 0%, #6366f1 100%)",
-            borderRadius: 10,
+            ...s.card,
+            background: "var(--dsw-alias-state-info-bg,#eff6ff)",
+            border: "1px solid var(--dsw-alias-state-info-border,#bfdbfe)",
             padding: "12px 16px",
-            marginBottom: 8,
-            color: "#fff"
+            marginBottom: 8
           }
         },
-        React.createElement("span", { style: { fontSize: 20 } }, "\u{1F389}"),
         React.createElement(
           "div",
-          { style: { flex: 1 } },
+          { style: { display: "flex", alignItems: "center", gap: 12 } },
+          React.createElement("span", { style: { fontSize: 20 } }, "\u{1F389}"),
           React.createElement(
             "div",
-            { style: { fontSize: 13, fontWeight: 600 } },
-            `\u53D1\u73B0\u65B0\u7248\u672C v${info.latest}\uFF08\u5F53\u524D v${info.current}\uFF09`
+            { style: { flex: 1 } },
+            React.createElement("div", {
+              style: {
+                fontSize: 13,
+                fontWeight: 600,
+                color: "var(--dsw-alias-state-info-primary,#1e40af)",
+                marginBottom: 4
+              }
+            }, `\u53D1\u73B0\u65B0\u7248\u672C v${info.latest}\uFF08\u5F53\u524D v${info.current}\uFF09`),
+            React.createElement("code", {
+              style: {
+                ...s.code,
+                fontSize: 11,
+                color: "var(--dsw-alias-label-secondary,#6b7280)",
+                display: "block"
+              }
+            }, "dsh plugin --profile web update @wenbin_wb/dsh-bridge --latest")
           ),
-          React.createElement("code", {
-            style: { fontSize: 11, opacity: 0.85, fontFamily: "ui-monospace,Menlo,monospace", wordBreak: "break-all" }
-          }, "dsh plugin --profile web update @wenbin_wb/dsh-bridge --latest")
-        ),
-        React.createElement("button", {
-          style: {
-            font: "inherit",
-            cursor: "pointer",
-            border: "1px solid rgba(255,255,255,0.4)",
-            background: "rgba(255,255,255,0.15)",
-            color: "#fff",
-            height: 30,
-            padding: "0 12px",
-            borderRadius: 999,
-            fontSize: 12,
-            display: "inline-flex",
-            alignItems: "center",
-            opacity: loading ? 0.5 : 1,
-            flexShrink: 0
-          },
-          onClick: check,
-          disabled: loading
-        }, loading ? "\u2026" : "\u5237\u65B0")
+          React.createElement("button", {
+            style: {
+              ...s.btnGhost,
+              height: 30,
+              padding: "0 12px",
+              fontSize: 12,
+              opacity: loading ? 0.5 : 1,
+              flexShrink: 0
+            },
+            onClick: check,
+            disabled: loading
+          }, loading ? "\u2026" : "\u5237\u65B0")
+        )
       ),
       links
     );

package/client/index.js

@@ -31,7 +31,7 @@ const s = {
   muted:    { color: 'var(--dsw-alias-label-tertiary,#8b93a1)', fontSize: 12, lineHeight: 1.5 },
   label:    { color: 'var(--dsw-alias-label-primary,currentColor)', fontSize: 13, fontWeight: 500 },
   code:     { fontFamily: 'ui-monospace,Menlo,monospace', fontSize: 12, wordBreak: 'break-all', color: 'var(--dsw-alias-label-primary,currentColor)' },
-  btnPri:   { font: 'inherit', cursor: 'pointer', border: 'none', background: 'var(--dsw-alias-button-primary-fill,var(--dsw-alias-brand-primary,#4f6ef7))', color: '#fff', height: 32, padding: '0 14px', borderRadius: 999, fontSize: 13, fontWeight: 500, display: 'inline-flex', alignItems: 'center', gap: 4 },
+  btnPri:   { font: 'inherit', cursor: 'pointer', border: 'none', background: 'var(--dsw-alias-button-primary-fill,var(--dsw-alias-brand-primary,#4f6ef7))', color: 'var(--dsw-alias-button-primary-label,#fff)', height: 32, padding: '0 14px', borderRadius: 999, fontSize: 13, fontWeight: 500, display: 'inline-flex', alignItems: 'center', gap: 4 },
   btnGhost: { font: 'inherit', cursor: 'pointer', border: '1px solid var(--dsw-alias-border-l2,#d1d5db)', background: 'var(--dsw-alias-bg-layer-1,transparent)', color: 'var(--dsw-alias-label-primary,currentColor)', height: 32, padding: '0 14px', borderRadius: 999, fontSize: 13, display: 'inline-flex', alignItems: 'center', gap: 4, textDecoration: 'none' },
   btnLink:  { font: 'inherit', cursor: 'pointer', border: 'none', background: 'none', color: 'var(--dsw-alias-brand-primary,#4f6ef7)', fontSize: 12, padding: 0, display: 'inline-flex', alignItems: 'center', gap: 3, textDecoration: 'none' },
   qr:       { width: 200, height: 200, borderRadius: 10, border: '1px solid var(--dsw-alias-border-l2,#e5e7eb)', margin: '8px 0', display: 'block' },
@@ -58,10 +58,33 @@ function QrBlock({ url, qr, onReset }) {
   const [showQr, setShowQr] = React.useState(true);
 
   const copy = React.useCallback(() => {
-    navigator.clipboard?.writeText(url).then(() => {
-      setCopied(true);
-      setTimeout(() => setCopied(false), 2000);
-    }).catch(() => {});
+    // 优先使用现代 Clipboard API
+    if (navigator.clipboard?.writeText) {
+      navigator.clipboard.writeText(url)
+        .then(() => {
+          setCopied(true);
+          setTimeout(() => setCopied(false), 2000);
+        })
+        .catch(() => fallbackCopy());
+    } else {
+      fallbackCopy();
+    }
+    
+    // 降级方案：使用 document.execCommand (HTTP 环境下 Clipboard API 不可用)
+    function fallbackCopy() {
+      const textarea = document.createElement('textarea');
+      textarea.value = url;
+      textarea.style.position = 'fixed';
+      textarea.style.opacity = '0';
+      document.body.appendChild(textarea);
+      textarea.select();
+      const success = document.execCommand('copy');
+      document.body.removeChild(textarea);
+      if (success) {
+        setCopied(true);
+        setTimeout(() => setCopied(false), 2000);
+      }
+    }
   }, [url]);
 
   const toggleQr = React.useCallback(() => setShowQr(v => !v), []);
@@ -504,34 +527,51 @@ function VersionBanner({ rpcCall }) {  const [info, setInfo] = React.useState(nu
     }, '🐛 反馈 Bug'),
   );
 
-  // 有新版本：彩色横幅
+  // 有新版本：信息卡片
   if (hasUpdate) {
     return React.createElement('div', { style: { marginBottom: 16 } },
       React.createElement('div', {
         style: {
-          display: 'flex', alignItems: 'center', gap: 12,
-          background: 'linear-gradient(135deg, var(--dsw-alias-brand-primary,#4f6ef7) 0%, #6366f1 100%)',
-          borderRadius: 10, padding: '12px 16px', marginBottom: 8, color: '#fff',
+          ...s.card,
+          background: 'var(--dsw-alias-state-info-bg,#eff6ff)',
+          border: '1px solid var(--dsw-alias-state-info-border,#bfdbfe)',
+          padding: '12px 16px',
+          marginBottom: 8,
         },
       },
-        React.createElement('span', { style: { fontSize: 20 } }, '🎉'),
-        React.createElement('div', { style: { flex: 1 } },
-          React.createElement('div', { style: { fontSize: 13, fontWeight: 600 } },
-            `发现新版本 v${info.latest}（当前 v${info.current}）`
+        React.createElement('div', { style: { display: 'flex', alignItems: 'center', gap: 12 } },
+          React.createElement('span', { style: { fontSize: 20 } }, '🎉'),
+          React.createElement('div', { style: { flex: 1 } },
+            React.createElement('div', {
+              style: {
+                fontSize: 13,
+                fontWeight: 600,
+                color: 'var(--dsw-alias-state-info-primary,#1e40af)',
+                marginBottom: 4,
+              },
+            }, `发现新版本 v${info.latest}（当前 v${info.current}）`),
+            React.createElement('code', {
+              style: {
+                ...s.code,
+                fontSize: 11,
+                color: 'var(--dsw-alias-label-secondary,#6b7280)',
+                display: 'block',
+              },
+            }, 'dsh plugin --profile web update @wenbin_wb/dsh-bridge --latest'),
           ),
-          React.createElement('code', {
-            style: { fontSize: 11, opacity: 0.85, fontFamily: 'ui-monospace,Menlo,monospace', wordBreak: 'break-all' },
-          }, 'dsh plugin --profile web update @wenbin_wb/dsh-bridge --latest'),
+          React.createElement('button', {
+            style: {
+              ...s.btnGhost,
+              height: 30,
+              padding: '0 12px',
+              fontSize: 12,
+              opacity: loading ? 0.5 : 1,
+              flexShrink: 0,
+            },
+            onClick: check,
+            disabled: loading,
+          }, loading ? '…' : '刷新'),
         ),
-        React.createElement('button', {
-          style: {
-            font: 'inherit', cursor: 'pointer', border: '1px solid rgba(255,255,255,0.4)',
-            background: 'rgba(255,255,255,0.15)', color: '#fff', height: 30, padding: '0 12px',
-            borderRadius: 999, fontSize: 12, display: 'inline-flex', alignItems: 'center',
-            opacity: loading ? 0.5 : 1, flexShrink: 0,
-          },
-          onClick: check, disabled: loading,
-        }, loading ? '…' : '刷新'),
       ),
       links,
     );

package/lib/wechat/gateway.js

@@ -310,7 +310,10 @@ export class WechatGateway extends Service {
       rateLimitCircuitOpenMs: config.rateLimitCircuitOpenMs ?? 30_000,
       rateLimitCircuitWindowMs: config.rateLimitCircuitWindowMs ?? 30_000,
       rateLimitCircuitThreshold: config.rateLimitCircuitThreshold ?? 1,
-      allowCdnHosts: config.allowCdnHosts ?? [...DEFAULT_CDN_ALLOWLIST],
+      allowCdnHosts: [
+        ...DEFAULT_CDN_ALLOWLIST,
+        ...(config.allowCdnHosts ?? [])
+      ].filter((v, i, a) => a.indexOf(v) === i), // 去重
     }
     this.syncBuf = ''
     this.pollTask = null
@@ -322,6 +325,32 @@ export class WechatGateway extends Service {
     this.rateLimitHits = []
     this.rateLimitUntil = 0
     this._disposed = false
+    // 内存泄漏防护：每 5 分钟清理过期缓存
+    this.cleanupInterval = setInterval(() => this._cleanupMaps(), 300_000)
+  }
+
+  _cleanupMaps() {
+    const now = Date.now()
+    // 清理 contextTokens：超过 1 小时未使用的删除
+    const contextTokenTtl = 3600_000
+    // 清理 typingTickets：超过 30 秒的删除
+    const typingTicketTtl = 30_000
+    
+    // contextTokens 没有时间戳，保守策略：如果 Map 过大才清理（超过 100 个）
+    if (this.contextTokens.size > 100) {
+      this.logger?.warn(`contextTokens Map 过大 (${this.contextTokens.size})，清理旧数据`)
+      // 保留最近 50 个，删除其余
+      const entries = Array.from(this.contextTokens.entries())
+      this.contextTokens.clear()
+      entries.slice(-50).forEach(([k, v]) => this.contextTokens.set(k, v))
+    }
+    
+    // 清理 typingTickets
+    for (const [peerId, ticket] of this.typingTickets) {
+      if (now - ticket.at > typingTicketTtl) {
+        this.typingTickets.delete(peerId)
+      }
+    }
   }
 
   // ---- 状态访问器 ----------------------------------------------------------
@@ -337,6 +366,10 @@ export class WechatGateway extends Service {
   dispose() {
     this._disposed = true
     this.stopPollingLocal = true
+    if (this.cleanupInterval) {
+      clearInterval(this.cleanupInterval)
+      this.cleanupInterval = null
+    }
     void this.stop()
   }
 

package/lib/wechat/node.js

@@ -14,6 +14,7 @@
 import { createUserMessage } from '@deepseek-ai/dsh-llm'
 import { randomUUID } from 'node:crypto'
 import { statSync } from 'node:fs'
+import { resolve, normalize } from 'node:path'
 import { gatewayConstants } from './gateway.js'
 
 const MAX_MESSAGE_CHARS = gatewayConstants.MAX_MESSAGE_CHARS
@@ -117,6 +118,13 @@ function packBlocks(blocks, max) {
 }
 
 function splitForWechat(content, max = MAX_MESSAGE_CHARS) {
+  // 安全检查：防止畸形输入导致无限循环或崩溃
+  if (typeof content !== 'string' || content.length === 0) return []
+  if (content.length > 1_000_000) {
+    // 超过 1MB 文本，截断并警告
+    content = content.slice(0, 1_000_000) + '\n\n[已截断：内容过长]'
+  }
+  
   const normalized = normalizeMarkdownBlocks(content)
   if (!normalized) return []
   if (normalized.length <= max) return [normalized]
@@ -252,7 +260,9 @@ export class WechatConversationNode {
   }
 
   isAllowed(senderId) {
-    return Array.isArray(this.config.allowFrom) && this.config.allowFrom.includes(senderId)
+    if (!Array.isArray(this.config.allowFrom)) return false
+    if (this.config.allowFrom.length === 0) return false
+    return this.config.allowFrom.includes(senderId)
   }
 
   setActiveSession(session) {
@@ -279,12 +289,28 @@ export class WechatConversationNode {
     const sessionId = `session-${randomUUID()}`
     try {
       const cwd = cwdOverride || this.config.cwd || process.cwd()
-      // 校验指定目录存在且是目录
+      // 校验指定目录存在且是目录，防止路径遍历
       if (cwdOverride) {
+        // 规范化路径并检查是否在工作区白名单内（必须完全匹配）
+        const resolvedCwd = normalize(resolve(cwdOverride))
+        const workspaces = await this.ctx.workspaceRegistry.list()
+        const allowedPaths = workspaces.map(w => normalize(resolve(w.path)))
+        
+        if (!allowedPaths.includes(resolvedCwd)) {
+          const wsDisplay = allowedPaths.slice(0, 5).join('\n  ')
+          const more = allowedPaths.length > 5 ? `\n  ... 等 ${allowedPaths.length} 个工作区` : ''
+          await sendTextToPeer(this, 
+            `${MARK.err} 路径不在已注册工作区内: ${resolvedCwd}\n\n` +
+            `可用工作区：\n  ${wsDisplay}${more}\n\n` +
+            `提示：使用 /workspaces 查看完整列表`
+          )
+          return
+        }
+        
         let ok = false
-        try { ok = statSync(cwd).isDirectory() } catch { ok = false }
+        try { ok = statSync(resolvedCwd).isDirectory() } catch { ok = false }
         if (!ok) {
-          await sendTextToPeer(this, `${MARK.err} 工作区目录不存在: ${cwd}`)
+          await sendTextToPeer(this, `${MARK.err} 工作区目录不存在: ${resolvedCwd}`)
           return
         }
       }
@@ -338,6 +364,16 @@ export class WechatConversationNode {
     }
   }
 
+  // 取消并拒绝审批（用于 dispose 清理）
+  cancelApproval(number) {
+    const entry = this.pending.get(number)
+    if (entry) {
+      clearTimeout(entry.timer)
+      this.pending.delete(number)
+      entry.resolve('rejected')  // 触发 Promise，防止泄漏
+    }
+  }
+
   resolveApproval(text) {
     const entries = [...this.pending.entries()]
     if (entries.length === 0) return false
@@ -346,12 +382,16 @@ export class WechatConversationNode {
     else if (text === '/no') outcome = 'rejected'
     if (outcome) {
       const [number, entry] = entries[entries.length - 1]
+      // 双重检查：确保此 number 仍在 pending 中（防止超时竞态）
+      if (!this.pending.has(number)) return false
       this.clearApproval(number)
       entry.resolve(outcome)
       return true
     }
     if ((text === '1' || text === '2') && entries.length === 1) {
       const [number, entry] = entries[0]
+      // 双重检查：确保此 number 仍在 pending 中（防止超时竞态）
+      if (!this.pending.has(number)) return false
       this.clearApproval(number)
       entry.resolve(text === '1' ? 'allowed-once' : 'rejected')
       return true
@@ -364,7 +404,7 @@ export class WechatConversationNode {
       try { disposer() } catch { /* 忽略 */ }
     }
     this.disposers = []
-    for (const number of [...this.pending.keys()]) this.clearApproval(number)
+    for (const number of [...this.pending.keys()]) this.cancelApproval(number)
   }
 
   // ---- 入站 ----
@@ -386,11 +426,18 @@ export class WechatConversationNode {
         if (text0.trim()) {
           this.config.allowFrom = [sender]
           this.logger?.info?.(`[dsh-bridge wechat] auto-approved first sender ${sender} into allowlist (scan onboarding)`)
-          try { await this.onFirstSender?.(sender) } catch { /* 持久化失败不致命 */ }
+          try { 
+            await this.onFirstSender?.(sender) 
+          } catch (err) { 
+            this.logger?.warn?.(`[dsh-bridge wechat] failed to persist first sender: ${err instanceof Error ? err.message : String(err)}`)
+          }
         } else {
           this.logger?.info?.(`[dsh-bridge wechat] media-only first message from ${sender} not auto-approved (waiting for text)`)
         }
-      } else {
+      }
+      
+      // 如果仍未通过白名单，拒绝处理（防止绕过白名单）
+      if (!this.isAllowed(sender)) {
         this.logger?.info?.(`[dsh-bridge wechat] ignore message from non-allowlisted sender ${sender} (never fed to model)`)
         return
       }
@@ -495,6 +542,8 @@ export class WechatConversationNode {
       } catch (err) {
         const reason = err instanceof Error ? err.message : String(err)
         this.logger?.warn?.(`[dsh-bridge wechat] failed to re-attach agent: ${reason}`)
+        // 清除失效的 activeSessionId，避免用户误以为还在旧会话中
+        this.activeSessionId = null
         await sendTextToPeer(this, `${MARK.err} 恢复会话失败: ${reason}。发送 /new <提示词> 新建一个会话。`)
       }
     }
@@ -747,8 +796,10 @@ export class WechatConversationNode {
 
       void sendTextToPeer(this, prompt)
 
+      let timeoutFired = false
       const outcome = await new Promise((resolve) => {
         const timer = setTimeout(() => {
+          timeoutFired = true
           this.clearApproval(number)
           resolve('rejected')
         }, timeoutSec * 1000)
@@ -756,8 +807,11 @@ export class WechatConversationNode {
         this.registerApproval(number, { number, request: req, resolve, timer })
       })
 
-      const label = outcome === 'allowed-once' ? `${MARK.ok} 已同意` : outcome === 'rejected' ? `${MARK.err} 已拒绝` : `[${outcome}]`
-      void sendTextToPeer(this, `${label}（#${number}）`)
+      // 仅在非超时路径发送确认消息（超时时 resolve 已经发生在 timer 回调）
+      if (!timeoutFired) {
+        const label = outcome === 'allowed-once' ? `${MARK.ok} 已同意` : outcome === 'rejected' ? `${MARK.err} 已拒绝` : `[${outcome}]`
+        void sendTextToPeer(this, `${label}（#${number}）`)
+      }
       return outcome
     }
     const disposer = this.ctx.on('approval/request', listener)
@@ -867,9 +921,9 @@ async function listSessions(node) {
 }
 
 // 列出可用工作区：使用 DSH 官方 workspaceRegistry。返回 [{title, path}]。
-function listWorkspaces(node) {
+async function listWorkspaces(node) {
   try {
-    const list = node.ctx.workspaceRegistry?.list?.() ?? []
+    const list = await node.ctx.workspaceRegistry?.list?.() ?? []
     const out = []
     for (const ws of list) {
       if (ws && ws.path) out.push({ title: ws.title ?? ws.path, path: ws.path })
@@ -898,7 +952,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
@@ -909,7 +963,7 @@ async function routeCommand(node, text) {
       return true
     }
     case 'workspaces': {
-      const workspaces = listWorkspaces(node)
+      const workspaces = await listWorkspaces(node)
       if (workspaces.length === 0) {
         await sendTextToPeer(node, `${MARK.list} 没有可用的工作区。使用 /new <提示词> @<路径> 指定一个目录。`)
         return true
@@ -930,14 +984,27 @@ async function routeCommand(node, text) {
       if (atMatch) {
         prompt = args.slice(0, atMatch.index).trim()
         const sel = atMatch[1]
-        const workspaces = listWorkspaces(node)
+        const workspaces = await listWorkspaces(node)
         if (/^\d+$/.test(sel)) {
           const idx = Number(sel)
           const ws = workspaces[idx - 1]
           if (ws) cwd = ws.path
           else { await sendTextToPeer(node, `${MARK.err} 无效工作区编号 ${sel}。用 /workspaces 查看。`); return true }
         } else {
-          cwd = sel
+          // 直接指定路径时，规范化并校验（必须完全匹配已注册工作区）
+          const normalized = normalize(resolve(sel))
+          const allowedPaths = workspaces.map(w => normalize(resolve(w.path)))
+          if (!allowedPaths.includes(normalized)) {
+            const wsDisplay = allowedPaths.slice(0, 5).join('\n  ')
+            const more = allowedPaths.length > 5 ? `\n  ... 等 ${allowedPaths.length} 个工作区` : ''
+            await sendTextToPeer(node, 
+              `${MARK.err} 路径不在已注册工作区内: ${normalized}\n\n` +
+              `可用工作区：\n  ${wsDisplay}${more}\n\n` +
+              `提示：使用 /workspaces 查看完整列表`
+            )
+            return true
+          }
+          cwd = normalized
         }
       }
       await node.createSession(prompt, cwd)
@@ -1017,6 +1084,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 {
@@ -1056,6 +1136,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.2",
+  "version": "1.2.4",
   "description": "手机扫码即可在移动端/公网继续用 DeepSeek Harness，人不在电脑前也能接着干。一键局域网二维码、Cloudflare 公网隧道、自建隧道与微信 Bot（多工作区/会话持久化/媒体/审批），无需自己搭公网服务器。",
   "type": "module",
   "main": "lib/index.js",