@wenbin_wb/dsh-bridge 2.7.0 → 2.8.0

package/docs/feishu-usage.md

@@ -86,6 +86,7 @@
 | `/new <词> @N` | 在指定工作区新建会话 | `/new 帮我写个脚本 @1` |
 | `/rename <新标题>` | 重命名当前活动会话 | `/rename 优化登录交互` |
 | `/workspaces` | 查看所有已注册的工作区列表 | `/workspaces` |
+| `/addworkspace <路径>` | 注册添加新的电脑工作区目录 | `/addworkspace D:\projects\app` |
 | `/status` | 查看 Agent 运行状态看板 | `/status` |
 | `/stop` | 中断停止当前正在执行的任务 | `/stop` |
 | `/end` | 结束当前会话回到空闲状态 | `/end` |

package/docs/qq-usage.md

@@ -189,6 +189,7 @@ AI 生成过程中，QQ 会显示机器人的"正在输入"状态：
 - `/stop` - 停止当前任务
 - `/status` - 查看状态与会话摘要
 - `/workspaces` - 列出可用工作区
+- `/addworkspace <路径>` - 注册添加新的电脑工作区目录
 - `/help` - 显示帮助
 
 ### 支持的消息类型

package/docs/telegram-usage.md

@@ -73,6 +73,7 @@
 | `/sessions`（或 `/list`） | 查看所有会话列表 | 附带一键切换按键 |
 | `/use N`（或 `/resume N`） | 切换活动会话至序号 N | 快速切换上下文 |
 | `/workspaces` | 列出本地所有可用项目工作区 | 查看工作区路径 |
+| `/addworkspace <路径>` | 注册添加新的电脑工作区目录 | 自动绑定并生成快捷序号 |
 | `/status` | 查看当前 Agent 运行状态看板 | 附带刷新/停止/结束按键 |
 | `/stop` | 强制停止当前正在运行的 Agent 任务 | 即刻中断执行 |
 | `/end` | 结束当前活动会话 | 挂载快捷开始按键 |

package/docs/wechat-usage.md

@@ -33,7 +33,9 @@
 | *(普通文本)* | 发给当前活动 agent |
 | `/sessions` | 列出所有会话（按**工作区**分组，显示**会话标题**） |
 | `/use N` | 切换到会话 N |
+| `/rename <新标题>` | 重命名当前活动会话 |
 | `/workspaces` | 列出可用工作区 |
+| `/addworkspace <路径>` | 注册添加新的电脑工作区目录 |
 | `/new <提示词>` | 在**当前工作区**新建会话并开始 |
 | `/new <提示词> @N` | 在**编号 N 的工作区**新建会话 |
 | `/new <提示词> @路径` | 在**指定目录**新建会话 |

package/lib/bridge-rpc-constants.js

@@ -19,6 +19,10 @@ export const BRIDGE_ENDPOINTS = {
   importBackup: 'importBackup',
   diagnoseNetwork: 'diagnoseNetwork',
   getSystemMetrics: 'getSystemMetrics',
+  // 远程工作区管理与目录浏览
+  listRemoteDirectories: 'listRemoteDirectories',
+  addRemoteWorkspace: 'addRemoteWorkspace',
+  listWorkspaces: 'listWorkspaces',
   // 访问安全认证（密码保护 / 扫码免密 Token）
   authGetStatus: 'authGetStatus',
   authUpdateConfig: 'authUpdateConfig',

package/lib/bridge-rpc.js

@@ -3,9 +3,12 @@
 
 import QRCode from 'qrcode';
 import { BRIDGE_RPC_CHANNEL, BRIDGE_ENDPOINTS } from './bridge-rpc-constants.js';
+import { RateLimiter } from './security/rate-limiter.js';
 
 export { BRIDGE_RPC_CHANNEL, BRIDGE_ENDPOINTS };
 
+const rpcRateLimiter = new RateLimiter({ maxRequests: 30, windowMs: 60000 });
+
 function ok(value) {
   return { ok: true, value };
 }
@@ -269,6 +272,44 @@ export function installBridgeRpc(ctx, { service, authManager, wechat, platformMa
           return ok(metrics);
         }
 
+        // ---- 远程工作区管理与目录浏览 ----
+
+        if (endpoint === BRIDGE_ENDPOINTS.listRemoteDirectories) {
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
+          const clientKey = payload?.clientIp || payload?.adminToken || 'default';
+          const rateCheck = rpcRateLimiter.check(clientKey, 30);
+          if (!rateCheck.allowed) {
+            return fail('bad-request', `请求过于频繁，请等待 ${rateCheck.retryAfterSec} 秒后再试`);
+          }
+
+          const result = await service.listRemoteDirectories(payload?.path);
+          return ok(result);
+        }
+
+        if (endpoint === BRIDGE_ENDPOINTS.addRemoteWorkspace) {
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
+          const clientKey = payload?.clientIp || payload?.adminToken || 'default';
+          const rateCheck = rpcRateLimiter.check(clientKey, 20);
+          if (!rateCheck.allowed) {
+            return fail('bad-request', `添加工作区请求过于频繁，请等待 ${rateCheck.retryAfterSec} 秒后再试`);
+          }
+
+          const result = await service.addWorkspace(payload?.path);
+          return ok(result);
+        }
+
+        if (endpoint === BRIDGE_ENDPOINTS.listWorkspaces) {
+          const adminErr = checkAdminAuth(authManager, payload);
+          if (adminErr) return adminErr;
+
+          const result = await service.getWorkspaces();
+          return ok(result);
+        }
+
         // ---- 平台管理器（多 IM 平台）----
 
         if (endpoint === BRIDGE_ENDPOINTS.listPlatforms) {

package/lib/index.js

@@ -8,10 +8,10 @@
 import { createServer, request as httpRequest, get as httpGet } from 'node:http';
 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 } from 'node:path';
+import { join, dirname, basename, resolve, normalize } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { readFileSync } from 'node:fs';
-import { readFile, writeFile, mkdir, unlink } from 'node:fs/promises';
+import { readFile, writeFile, mkdir, unlink, readdir, stat, access } from 'node:fs/promises';
 import { spawn } from 'node:child_process';
 import QRCode from 'qrcode';
 import { installBridgeRpc } from './bridge-rpc.js';
@@ -24,6 +24,7 @@ import { FeishuService } from './feishu/index.js';
 import { TelegramService } from './telegram/index.js';
 import { AuthManager } from './auth/manager.js';
 import { renderLoginPage } from './auth/login-template.js';
+import { isSafeWorkspacePath, isSensitiveFolderName } from './security/path-validator.js';
 
 const name = 'dsh-bridge';
 // 微信 Bot 会话桥依赖 DSH 提供的会话/agent/审批/工作区/持久化服务，需显式 inject
@@ -742,9 +743,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;
@@ -752,32 +753,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);
-              }
+              shell: isWin ? true : false,
+              timeout: 120000,
             });
-            cp.on('close', (code) => {
-              if (code === 0) {
-                resolve({ stdout, stderr });
-              } else {
-                reject(new Error(stderr || stdout || `进程退出码 ${code}`));
-              }
-            });
-          };
-          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 || '升级成功';
@@ -859,6 +858,247 @@ class BridgeService {
     }
   }
 
+  // 获取当前所有已注册的工作区
+  async getWorkspaces() {
+    try {
+      const list = await this.ctx?.workspaceRegistry?.list?.() ?? [];
+      const out = [];
+      for (const ws of list) {
+        if (ws && ws.path) {
+          out.push({
+            id: ws.id,
+            title: ws.title ?? basename(ws.path),
+            path: ws.path,
+          });
+        }
+      }
+      return out.sort((a, b) => String(a.path).localeCompare(String(b.path)));
+    } catch {
+      return [];
+    }
+  }
+
+  // 远程添加工作区目录到 DSH 体系
+  async addWorkspace(workspacePath) {
+    if (!workspacePath || typeof workspacePath !== 'string') {
+      return { ok: false, error: '缺少工作区目录路径' };
+    }
+    const safetyCheck = await isSafeWorkspacePath(workspacePath);
+    if (!safetyCheck.valid) {
+      return { ok: false, error: safetyCheck.error || '路径安全校验未通过' };
+    }
+    const resolved = safetyCheck.path;
+
+    const title = basename(resolved) || resolved;
+    let added = false;
+    let workspaceId = null;
+
+    if (this.ctx?.workspaceRegistry) {
+      if (typeof this.ctx.workspaceRegistry.create === 'function') {
+        try {
+          const entity = await this.ctx.workspaceRegistry.create(resolved, title);
+          added = true;
+          workspaceId = entity?.id ?? null;
+        } catch (e) {
+          this.logger?.warn?.('workspaceRegistry.create 失败: %s', e.message);
+        }
+      } else if (typeof this.ctx.workspaceRegistry.add === 'function') {
+        try {
+          const res = await this.ctx.workspaceRegistry.add({ path: resolved, title });
+          added = true;
+          workspaceId = res?.id ?? null;
+        } catch (e) {
+          this.logger?.warn?.('workspaceRegistry.add 失败: %s', e.message);
+        }
+      } else if (typeof this.ctx.workspaceRegistry.register === 'function') {
+        try {
+          const res = await this.ctx.workspaceRegistry.register({ path: resolved, title });
+          added = true;
+          workspaceId = res?.id ?? null;
+        } catch (e) {
+          this.logger?.warn?.('workspaceRegistry.register 失败: %s', e.message);
+        }
+      }
+    }
+
+    const list = await this.getWorkspaces();
+    if (!workspaceId) {
+      const match = list.find(w => w.path === resolved || (w.path && w.path.toLowerCase() === resolved.toLowerCase()));
+      if (match) workspaceId = match.id;
+    }
+
+    let sessionId = null;
+    if (this.ctx?.sessions && typeof this.ctx.sessions.create === 'function') {
+      try {
+        const session = this.ctx.sessions.create(undefined, { meta: { cwd: resolved } });
+        if (session?.id) {
+          sessionId = session.id;
+          if (workspaceId && this.ctx?.workspaceRegistry?.get) {
+            const entity = this.ctx.workspaceRegistry.get(workspaceId);
+            if (entity && typeof entity.attachSession === 'function') {
+              await entity.attachSession(session.id).catch(() => {});
+            }
+          }
+        }
+      } catch (e) {
+        this.logger?.debug?.('sessions.create 初始化 session 提示: %s', e.message);
+      }
+    }
+
+    return {
+      ok: true,
+      path: resolved,
+      title,
+      workspaceId,
+      sessionId,
+      workspaces: list,
+      registered: added
+    };
+  }
+
+  // 远程目录列表浏览与常用路径推荐
+  async listRemoteDirectories(targetPath) {
+    const isWin = process.platform === 'win32';
+    const home = homedir();
+
+    // 1. 获取快速访问常用根目录
+    const roots = [
+      { name: '🏠 用户主目录', path: home },
+    ];
+    const commonSubdirs = [
+      { name: '💻 桌面', sub: 'Desktop' },
+      { name: '📁 文档', sub: 'Documents' },
+      { name: '📥 下载', sub: 'Downloads' },
+      { name: '💡 IdeaProjects', sub: 'IdeaProjects' },
+      { name: '🔨 Projects', sub: 'Projects' },
+      { name: '📦 workspace', sub: 'workspace' },
+      { name: '💻 code', sub: 'code' },
+      { name: '💻 src', sub: 'src' },
+    ];
+    for (const item of commonSubdirs) {
+      const fullPath = join(home, item.sub);
+      try {
+        const s = await stat(fullPath);
+        if (s.isDirectory()) {
+          roots.push({ name: item.name, path: fullPath });
+        }
+      } catch {}
+    }
+
+    // 2. Windows 盘符探测
+    const drives = [];
+    if (isWin) {
+      const letters = 'CDEFGHIJKLMNOPQRSTUVWXYZ'.split('');
+      for (const letter of letters) {
+        const driveRoot = `${letter}:\\`;
+        try {
+          await access(driveRoot);
+          drives.push({ name: `${letter}: 盘`, path: driveRoot });
+        } catch {}
+      }
+      if (drives.length === 0) drives.push({ name: 'C: 盘', path: 'C:\\' });
+    } else {
+      drives.push({ name: '根目录 /', path: '/' });
+    }
+
+    // 3. 解析当前请求路径并进行安全校验
+    let rawTarget = targetPath && typeof targetPath === 'string' ? targetPath.trim() : '';
+    if (isWin && /^[A-Za-z]:$/.test(rawTarget)) {
+      rawTarget = `${rawTarget}\\`;
+    }
+    let candidatePath = rawTarget ? resolve(rawTarget) : home;
+    
+    // 安全校验：遇非法或黑名单目录时安全回退至用户主目录
+    let currentPath = home;
+    const pathCheck = await isSafeWorkspacePath(candidatePath);
+    if (pathCheck.valid && pathCheck.path) {
+      currentPath = pathCheck.path;
+    }
+
+    // 4. 读取子文件夹列表（过滤敏感目录与不安全软链接）
+    const entries = [];
+    let readError = null;
+    try {
+      const dirents = await readdir(currentPath, { withFileTypes: true });
+      for (const d of dirents) {
+        if (isSensitiveFolderName(d.name)) continue;
+
+        let isDir = d.isDirectory();
+        const targetEntryPath = join(currentPath, d.name);
+
+        // 如果是符号链接，安全探测其真实目标
+        if (d.isSymbolicLink()) {
+          try {
+            const symCheck = await isSafeWorkspacePath(targetEntryPath);
+            if (!symCheck.valid) continue;
+            isDir = true;
+          } catch {
+            continue;
+          }
+        }
+
+        if (isDir) {
+          entries.push({
+            name: d.name,
+            path: targetEntryPath,
+            isDirectory: true,
+          });
+        }
+      }
+    } catch (err) {
+      readError = err.message;
+    }
+
+    entries.sort((a, b) => a.name.localeCompare(b.name, undefined, { sensitivity: 'base' }));
+
+    const parentPath = dirname(currentPath) !== currentPath ? dirname(currentPath) : null;
+
+    // 5. 生成结构化面包屑导航路径
+    const breadcrumbs = [];
+    if (isWin) {
+      const match = currentPath.match(/^([A-Za-z]:)(?:\\(.*))?$/);
+      if (match) {
+        const driveLetter = match[1];
+        const rest = match[2] || '';
+        breadcrumbs.push({ name: `${driveLetter}`, path: `${driveLetter}\\` });
+        if (rest) {
+          const parts = rest.split('\\').filter(Boolean);
+          let curr = `${driveLetter}\\`;
+          for (const p of parts) {
+            curr = join(curr, p);
+            breadcrumbs.push({ name: p, path: curr });
+          }
+        }
+      } else {
+        breadcrumbs.push({ name: currentPath, path: currentPath });
+      }
+    } else {
+      breadcrumbs.push({ name: '根目录 /', path: '/' });
+      const parts = currentPath.split('/').filter(Boolean);
+      let curr = '/';
+      for (const p of parts) {
+        curr = join(curr, p);
+        breadcrumbs.push({ name: p, path: curr });
+      }
+    }
+
+    // 6. 获取当前已注册的工作区作为快捷参考
+    const currentWorkspaces = await this.getWorkspaces();
+
+    return {
+      ok: !readError,
+      error: readError ? `读取文件夹失败: ${readError}` : undefined,
+      currentPath,
+      parentPath,
+      breadcrumbs,
+      entries: entries.slice(0, 150),
+      totalEntries: entries.length,
+      roots,
+      drives,
+      workspaces: currentWorkspaces,
+    };
+  }
+
   async diagnoseNetwork() {
     const results = [];
 

package/lib/platform/conversation-bridge.js

@@ -20,7 +20,9 @@
 import { createUserMessage } from '@deepseek-ai/dsh-llm'
 import { randomUUID } from 'node:crypto'
 import { statSync } from 'node:fs'
-import { resolve, normalize } from 'node:path'
+import { stat } from 'node:fs/promises'
+import { resolve, normalize, basename } from 'node:path'
+import { isSafeWorkspacePath } from '../security/path-validator.js'
 
 // 纯文本标记（用户偏好不用 emoji）
 export const BRIDGE_MARK = {
@@ -974,6 +976,41 @@ async function routeCommand(node, text) {
       ].join('\n'))
       return true
     }
+    case 'addworkspace': {
+      const targetPath = rest.join(' ').trim()
+      if (!targetPath) {
+        await node.sendText(`❌ **缺少工作区路径**\n\n> 用法：\`/addworkspace <电脑绝对路径>\`\n> 示例：\`/addworkspace D:\\IdeaProjects\\my-app\``)
+        return true
+      }
+      try {
+        const safetyCheck = await isSafeWorkspacePath(targetPath)
+        if (!safetyCheck.valid) {
+          await node.sendText(`⚠️ **${safetyCheck.error || '路径安全校验未通过'}**：\`${targetPath}\`\n\n> 出于安全考虑，禁止将系统关键目录或敏感配置文件所在路径登记为工作区。`)
+          return true
+        }
+        const resolved = safetyCheck.path
+        const title = basename(resolved) || resolved
+        if (node.ctx.workspaceRegistry?.add) {
+          await node.ctx.workspaceRegistry.add({ path: resolved, title }).catch(() => {})
+        } else if (node.ctx.workspaceRegistry?.register) {
+          await node.ctx.workspaceRegistry.register({ path: resolved, title }).catch(() => {})
+        }
+        const workspaces = await listWorkspaces(node)
+        const foundIndex = workspaces.findIndex(w => normalize(w.path) === normalize(resolved))
+        const numStr = foundIndex >= 0 ? `@${foundIndex + 1}` : ''
+        await node.sendText([
+          `✓ **工作区添加成功**！`,
+          `- **名称**：${title}`,
+          `- **路径**：\`${resolved}\``,
+          foundIndex >= 0 ? `- **快捷编号**：\`${numStr}\`` : '',
+          '',
+          `> 发送 \`/new <提示词> ${numStr || '@' + resolved}\` 即可直接在此工作区创建会话。`,
+        ].filter(Boolean).join('\n'))
+      } catch (err) {
+        await node.sendText(`❌ **添加工作区失败**：${err instanceof Error ? err.message : String(err)}`)
+      }
+      return true
+    }
     case 'new': {
       // 解析尾部 @N 或 @路径 作为工作区 cwd
       const args = rest.join(' ').trim()
@@ -1178,6 +1215,7 @@ function helpText() {
     '| 指令 | 说明 |',
     '| :--- | :--- |',
     '| `/workspaces` | 查看可用工作区表格列表 |',
+    '| `/addworkspace <路径>` | 注册添加新的电脑工作区目录 |',
     '| `/status` | 查看 Agent 运行状态看板 |',
     '| `/help` | 查看此帮助菜单 |',
     '',