@lanbaolu/dsh-wechat-bridge 0.5.0 → 0.7.0

package/lib/index.js

@@ -24,6 +24,9 @@ import { createApprovalManager } from './approval.js';
 import { createWechatAgentSetup } from './agent-setup.js';
 import { startQrLogin, checkQrStatus } from './bridge/wechat/login.js';
 import { loadJson, saveJson, validateAccountId } from './bridge/store.js';
+import { loadTrust, saveTrust, addTrusted, removeTrusted, setTrustMode, listTrusted, isPlausibleUserId } from './bridge/trust.js';
+import { parseSessionKey } from './bridge/session-key.js';
+import { parseCalmConfig } from './bridge/config.js';
 export const name = '@lanbaolu/dsh-wechat-bridge';
 /** Host services the plugin needs. `webServer` is optional (headless profiles). */
 export const inject = ['tools', 'agents', 'agentDefaultModel', 'agentPresets'];
@@ -103,6 +106,32 @@ export function apply(ctx, config) {
             saveSessionIdMap(map);
         }
     }
+    /**
+     * 多用户迁移（P1-2 / M2）：旧单用户时代 session-ids.json 的 key 是 bot accountId，
+     * 新版统一为 `${accountId}::${userId}`。能确定 owner 的条目一次性改名为新 key
+     * （owner 的 DSH 会话无缝续上）；不能确定的保留原样不动（绝不丢历史，
+     * 只是该条目不会再被命中，新消息走新 key）。
+     */
+    function migrateSessionIdMap() {
+        const map = loadSessionIdMap();
+        let changed = false;
+        for (const key of Object.keys(map)) {
+            if (key.includes('::'))
+                continue;
+            const owner = ownerUserIdOf(key);
+            if (!owner)
+                continue;
+            const newKey = `${key}::${owner}`;
+            if (!(newKey in map)) {
+                map[newKey] = map[key];
+                delete map[key];
+                changed = true;
+                debugLog('session-ids.json migrated to per-user key', { oldKey: key, newKey });
+            }
+        }
+        if (changed)
+            saveSessionIdMap(map);
+    }
     // -------------------------------------------------------------------------
     // Explicit project-conversation binding (Web panel selection)
     // -------------------------------------------------------------------------
@@ -134,8 +163,54 @@ export function apply(ctx, config) {
         }
     }
     const selectedSessionIds = new Map(Object.entries(loadSelectedSessionIds()));
-    function newDshSessionId(accountId) {
-        return `wb-${accountId}-${Date.now()}-${randomBytes(4).toString('hex')}`;
+    function newDshSessionId(key) {
+        // 多用户 key 形如 ${botAccountId}::${userId}——DSH 会话 ID 会进文件路径，
+        // ':' 在 Windows 上是非法文件名字符，统一清洗为 '-'。
+        const safe = key.replace(/[^A-Za-z0-9_.@-]/g, '-');
+        return `wb-${safe}-${Date.now()}-${randomBytes(4).toString('hex')}`;
+    }
+    /** session key 的 bot 账号前缀（'::' 之前；单段 key 原样返回）。 */
+    function botPrefixOf(key) {
+        const i = key.indexOf('::');
+        return i === -1 ? key : key.slice(0, i);
+    }
+    /** 从 session key 解出微信用户 ID（单段旧 key 返回空）。 */
+    function userIdOfKey(key) {
+        return parseSessionKey(key)?.userId || '';
+    }
+    // -------------------------------------------------------------------------
+    // 信任集（多用户支持 P1-2 / M1）——trust.json 是唯一真相源
+    // -------------------------------------------------------------------------
+    function trustPath() {
+        return join(dataDir, 'trust.json');
+    }
+    function loadTrustFile() {
+        return loadTrust(trustPath());
+    }
+    function saveTrustFile(file) {
+        saveTrust(file, trustPath());
+    }
+    /** owner userId：最新绑定账号的 userId（用于面板展示与账号级会话文件定位）。 */
+    function ownerUserIdOf(accountId) {
+        try {
+            const acc = loadJson(join(dataDir, 'accounts', `${accountId}.json`), {});
+            return typeof acc.userId === 'string' ? acc.userId : '';
+        }
+        catch {
+            return '';
+        }
+    }
+    /**
+     * daemon 侧会话文件名：session key `${bot}::${user}` → `${bot}__${user}`；
+     * 账号级 key（面板操作）→ 定位 owner 的 per-user 文件，找不到才退回旧文件名。
+     */
+    function bridgeSessionStem(key) {
+        if (key.includes('::'))
+            return key.replace(/::/g, '__');
+        const owner = ownerUserIdOf(key);
+        if (owner && /^[A-Za-z0-9_.\-@=]+$/.test(owner))
+            return `${key}__${owner}`;
+        return key;
     }
     // -------------------------------------------------------------------------
     // Agent management
@@ -169,7 +244,13 @@ export function apply(ctx, config) {
             // when there is no mapping, the old log is gone/corrupt, or the requested
             // workspace differs from the persisted session's cwd (unless the user
             // explicitly bound the bridge to a project conversation).
-            const selectedSessionId = selectedSessionIds.get(accountId);
+            //
+            // 项目绑定两级粒度：
+            //  - session key 级（微信内 /session 绑定）：只对当前用户生效；
+            //  - 账号级（Web 面板选择）：对该 bot 下所有用户生效（前缀回退查找）。
+            const selectedSessionId = selectedSessionIds.get(accountId)
+                ?? (accountId.includes('::') ? selectedSessionIds.get(botPrefixOf(accountId)) : undefined);
+            const selectedIsAccountLevel = !!selectedSessionId && !selectedSessionIds.has(accountId);
             let dshSessionId = sessionIds.get(accountId);
             let handle;
             let resumed = false;
@@ -246,10 +327,10 @@ export function apply(ctx, config) {
             const finalSessionId = dshSessionId;
             sessionIds.set(accountId, finalSessionId);
             persistSessionId(accountId, finalSessionId);
-            if (isSelected) {
+            if (isSelected && !selectedIsAccountLevel) {
                 persistSelectedSessionId(accountId, finalSessionId);
             }
-            else if (selectedSessionIds.has(accountId)) {
+            else if (!selectedIsAccountLevel && selectedSessionIds.has(accountId)) {
                 selectedSessionIds.delete(accountId);
                 removeSelectedSessionId(accountId);
             }
@@ -450,20 +531,22 @@ export function apply(ctx, config) {
             message: `已进入项目 ${item.workspaceTitle}（${item.path}），后续对话会记录到这个项目。`,
         };
     }
-    function readBridgeAccountSession(accountId) {
-        validateAccountId(accountId);
-        return loadJson(join(dataDir, 'sessions', `${accountId}.json`), {});
+    function readBridgeAccountSession(key) {
+        const stem = bridgeSessionStem(key);
+        validateAccountId(stem);
+        return loadJson(join(dataDir, 'sessions', `${stem}.json`), {});
     }
-    function writeBridgeAccountSession(accountId, session) {
-        validateAccountId(accountId);
-        saveJson(join(dataDir, 'sessions', `${accountId}.json`), session);
+    function writeBridgeAccountSession(key, session) {
+        const stem = bridgeSessionStem(key);
+        validateAccountId(stem);
+        saveJson(join(dataDir, 'sessions', `${stem}.json`), session);
     }
-    function resetBridgeAccountSession(accountId, cwd) {
-        const session = readBridgeAccountSession(accountId);
+    function resetBridgeAccountSession(key, cwd) {
+        const session = readBridgeAccountSession(key);
         session.workingDirectory = cwd;
         session.state = 'idle';
         session.chatHistory = [];
-        writeBridgeAccountSession(accountId, session);
+        writeBridgeAccountSession(key, session);
     }
     async function selectProjectSession(dshSessionId, accountId) {
         const target = accountId || latestAccountId();
@@ -492,11 +575,10 @@ export function apply(ctx, config) {
         if (sessionsService?.get(SessionId(dshSessionId))) {
             return { ok: false, error: '该会话当前正在 DSH 中打开，请先在 DSH 中关闭该会话后再绑定。' };
         }
-        // Drop the current bridge-owned agent so the next message resumes the
+        // Drop the current bridge-owned agent(s) so the next message resumes the
         // selected project conversation instead of the previous bridge session.
-        if (agents.has(target) || sessionIds.has(target)) {
-            await disposeAgent(target);
-        }
+        // 多用户：账号级绑定影响该 bot 下所有 per-user agent。
+        await disposeKeysUnder(target);
         selectedSessionIds.set(target, dshSessionId);
         persistSelectedSessionId(target, dshSessionId);
         resetBridgeAccountSession(target, item.path);
@@ -513,12 +595,19 @@ export function apply(ctx, config) {
         const target = accountId || latestAccountId();
         if (!target)
             return { ok: false, error: '没有已绑定的微信账号。' };
-        await disposeAgent(target);
+        await disposeKeysUnder(target);
         const config = readBridgeConfig();
         resetBridgeAccountSession(target, config.workingDirectory);
         const daemonResult = daemonRunning() ? await restartDaemon() : { ok: true, message: '守护进程未运行，解除绑定将在下次启动时生效。' };
         return { ok: true, accountId: target, daemon: daemonResult.message };
     }
+    /** dispose 精确匹配 key 及其 `${key}::` 前缀下的全部 agent（账号级操作用于多用户）。 */
+    async function disposeKeysUnder(key) {
+        const targets = [...agents.keys()].filter((k) => k === key || k.startsWith(`${key}::`));
+        for (const k of targets) {
+            await disposeAgent(k);
+        }
+    }
     // -------------------------------------------------------------------------
     // SSE broadcast
     // -------------------------------------------------------------------------
@@ -774,6 +863,11 @@ export function apply(ctx, config) {
             cwd: dirname(script),
             env: {
                 ...process.env,
+                // 宿主是 Electron（DSH Desktop）时 process.execPath 是 Electron 二进制：
+                // 必须用 ELECTRON_RUN_AS_NODE=1 让它以纯 Node 模式执行 daemon 脚本，
+                // 否则每次拉起都会启动一个 Electron 实例（窗口闪现后秒退，watchdog 无限循环）。
+                // 纯 node 宿主（npx dsh web）下该变量无害。
+                ELECTRON_RUN_AS_NODE: '1',
                 DSH_HOME: dshHome,
                 DSH_BRIDGE_DATA_DIR: dataDir,
                 DSH_BRIDGE_API_BASE: `http://127.0.0.1:${internalPort}`,
@@ -846,6 +940,9 @@ export function apply(ctx, config) {
                 workingDirectory: raw.workingDirectory || join(homedir(), 'Documents', 'DSH'),
                 model: raw.model,
                 systemPrompt: raw.systemPrompt,
+                notifyRejected: raw.notifyRejected === true || raw.notifyRejected === 'true',
+                usageFooter: raw.usageFooter === undefined ? undefined : (raw.usageFooter === true || raw.usageFooter === 'true'),
+                calm: raw.calm && typeof raw.calm === 'object' ? raw.calm : undefined,
             };
         }
         catch {
@@ -856,13 +953,28 @@ export function apply(ctx, config) {
     }
     function saveBridgeConfig(config) {
         mkdirSync(dataDir, { recursive: true });
+        // 合并写回：不覆盖 daemon 侧写入的其他字段（如 usageFooter）。
+        let existing = {};
+        try {
+            const raw = JSON.parse(readFileSync(bridgeConfigPath(), 'utf8'));
+            if (raw && typeof raw === 'object')
+                existing = raw;
+        }
+        catch {
+            // 首次写入
+        }
         const data = {
+            ...existing,
             workingDirectory: config.workingDirectory,
         };
         if (config.model)
             data.model = config.model;
         if (config.systemPrompt)
             data.systemPrompt = config.systemPrompt;
+        if (config.notifyRejected !== undefined)
+            data.notifyRejected = config.notifyRejected;
+        if (config.calm !== undefined)
+            data.calm = config.calm;
         writeFileSync(bridgeConfigPath(), JSON.stringify(data, null, 2) + '\n', 'utf8');
         if (process.platform !== 'win32') {
             chmodSync(bridgeConfigPath(), 0o600);
@@ -954,9 +1066,63 @@ export function apply(ctx, config) {
             accounts: accountFiles,
             sessions: [...sessionIds.keys()],
             selectedProject: await selectedProjectPayload(),
+            trust: trustPayload(),
         };
     }
     // -------------------------------------------------------------------------
+    // 信任集管理（P1-2 / M4：面板 + 内部 API）
+    // -------------------------------------------------------------------------
+    function trustPayload() {
+        const file = loadTrustFile();
+        const latest = latestAccountId();
+        return {
+            mode: file.mode,
+            bootstrapConsumed: file.bootstrapConsumed === true,
+            owner: latest ? ownerUserIdOf(latest) : '',
+            notifyRejected: readBridgeConfig().notifyRejected === true,
+            trusted: listTrusted(file),
+        };
+    }
+    function trustAdd(userId, note) {
+        const id = String(userId || '').trim();
+        if (!isPlausibleUserId(id)) {
+            return { ok: false, error: 'userId 格式不合法（应为 4-64 位字母/数字/_ . @ = -）' };
+        }
+        const file = loadTrustFile();
+        const latest = latestAccountId();
+        if (latest && id === ownerUserIdOf(latest)) {
+            return { ok: false, error: 'owner 永远放行，不需要加入信任集' };
+        }
+        saveTrustFile(addTrusted(file, id, 'owner', note?.trim() || undefined));
+        debugLog('trust add via panel', { userId: id });
+        return { ok: true };
+    }
+    function trustRemove(userId) {
+        const id = String(userId || '').trim();
+        const file = loadTrustFile();
+        if (!file.trusted[id]) {
+            return { ok: false, error: `${id} 不在信任集中` };
+        }
+        saveTrustFile(removeTrusted(file, id));
+        debugLog('trust remove via panel', { userId: id });
+        return { ok: true };
+    }
+    function trustSetMode(mode) {
+        if (mode !== 'owner-only' && mode !== 'bootstrap' && mode !== 'manual') {
+            return { ok: false, error: '模式必须是 owner-only / bootstrap / manual' };
+        }
+        saveTrustFile(setTrustMode(loadTrustFile(), mode));
+        debugLog('trust mode set via panel', { mode });
+        return { ok: true };
+    }
+    function trustSetNotifyRejected(enabled) {
+        const config = readBridgeConfig();
+        config.notifyRejected = enabled;
+        saveBridgeConfig(config);
+        debugLog('notifyRejected set via panel', { enabled });
+        return { ok: true };
+    }
+    // -------------------------------------------------------------------------
     // Optional Web panel routes (same origin, no token)
     // -------------------------------------------------------------------------
     function registerWebRoutes() {
@@ -1091,6 +1257,116 @@ export function apply(ctx, config) {
                 res.end(JSON.stringify(result));
             },
         }));
+        // ---- 信任集管理（P1-2 / M4）----
+        disposers.push(webServer.register({
+            kind: 'exact',
+            path: '/@lanbaolu/dsh-wechat-bridge/trust',
+            handler: async (_req, res) => {
+                res.writeHead(200, { 'Content-Type': 'application/json' });
+                res.end(JSON.stringify({ ok: true, ...trustPayload() }));
+            },
+        }));
+        disposers.push(webServer.register({
+            kind: 'exact',
+            path: '/@lanbaolu/dsh-wechat-bridge/trust/add',
+            handler: async (req, res) => {
+                try {
+                    const body = await readBody(req);
+                    const result = trustAdd(String(body.userId || ''), typeof body.note === 'string' ? body.note : undefined);
+                    res.writeHead(result.ok ? 200 : 400, { 'Content-Type': 'application/json' });
+                    res.end(JSON.stringify({ ...result, ...trustPayload() }));
+                }
+                catch (err) {
+                    res.writeHead(400, { 'Content-Type': 'application/json' });
+                    res.end(JSON.stringify({ ok: false, error: err instanceof Error ? err.message : String(err) }));
+                }
+            },
+        }));
+        disposers.push(webServer.register({
+            kind: 'exact',
+            path: '/@lanbaolu/dsh-wechat-bridge/trust/remove',
+            handler: async (req, res) => {
+                try {
+                    const body = await readBody(req);
+                    const result = trustRemove(String(body.userId || ''));
+                    res.writeHead(result.ok ? 200 : 400, { 'Content-Type': 'application/json' });
+                    res.end(JSON.stringify({ ...result, ...trustPayload() }));
+                }
+                catch (err) {
+                    res.writeHead(400, { 'Content-Type': 'application/json' });
+                    res.end(JSON.stringify({ ok: false, error: err instanceof Error ? err.message : String(err) }));
+                }
+            },
+        }));
+        disposers.push(webServer.register({
+            kind: 'exact',
+            path: '/@lanbaolu/dsh-wechat-bridge/trust/config',
+            handler: async (req, res) => {
+                try {
+                    const body = await readBody(req);
+                    let result = { ok: true };
+                    if (typeof body.mode === 'string') {
+                        result = trustSetMode(body.mode);
+                    }
+                    if (result.ok && typeof body.notifyRejected === 'boolean') {
+                        result = trustSetNotifyRejected(body.notifyRejected);
+                    }
+                    res.writeHead(result.ok ? 200 : 400, { 'Content-Type': 'application/json' });
+                    res.end(JSON.stringify({ ...result, ...trustPayload() }));
+                }
+                catch (err) {
+                    res.writeHead(400, { 'Content-Type': 'application/json' });
+                    res.end(JSON.stringify({ ok: false, error: err instanceof Error ? err.message : String(err) }));
+                }
+            },
+        }));
+        // 桥接配置读写（面板「超时安抚」等设置）：GET 读全部配置，POST 按字段合并写回。
+        // config.json 由 host 与 daemon 共享，写盘后 daemon 侧最多延迟一个轮询周期生效。
+        disposers.push(webServer.register({
+            kind: 'exact',
+            path: '/@lanbaolu/dsh-wechat-bridge/config',
+            handler: async (req, res) => {
+                try {
+                    if (req.method === 'GET' || req.method === undefined) {
+                        const config = readBridgeConfig();
+                        res.writeHead(200, { 'Content-Type': 'application/json' });
+                        res.end(JSON.stringify({
+                            ok: true,
+                            workingDirectory: config.workingDirectory,
+                            model: config.model ?? null,
+                            usageFooter: config.usageFooter ?? undefined,
+                            notifyRejected: config.notifyRejected ?? false,
+                            calm: config.calm ?? {},
+                        }));
+                        return;
+                    }
+                    if (req.method === 'POST') {
+                        const body = await readBody(req);
+                        const config = readBridgeConfig();
+                        if (body.calm !== undefined) {
+                            if (!body.calm || typeof body.calm !== 'object') {
+                                res.writeHead(400, { 'Content-Type': 'application/json' });
+                                res.end(JSON.stringify({ ok: false, error: 'calm 必须是对象' }));
+                                return;
+                            }
+                            // 写盘前清洗（非法字段丢弃），daemon 读取时还会再兜底一次。
+                            const parsed = parseCalmConfig(body.calm);
+                            config.calm = parsed ?? {};
+                        }
+                        saveBridgeConfig(config);
+                        res.writeHead(200, { 'Content-Type': 'application/json' });
+                        res.end(JSON.stringify({ ok: true, calm: config.calm ?? {} }));
+                        return;
+                    }
+                    res.writeHead(405, { 'Content-Type': 'application/json' });
+                    res.end(JSON.stringify({ ok: false, error: 'method not allowed' }));
+                }
+                catch (err) {
+                    res.writeHead(400, { 'Content-Type': 'application/json' });
+                    res.end(JSON.stringify({ ok: false, error: err instanceof Error ? err.message : String(err) }));
+                }
+            },
+        }));
         return disposers;
     }
     // -------------------------------------------------------------------------
@@ -1131,8 +1407,10 @@ export function apply(ctx, config) {
     /**
      * Deliver a proactive notification to the bound WeChat account via the
      * daemon's throttled notify endpoint (daemon-port.json).
+     * 多用户（P1-2 / M3）：可指定目标用户（发起任务的微信用户本人）；
+     * 缺省时由 daemon 回退到最近活跃用户。
      */
-    async function sendWechatNotify(message) {
+    async function sendWechatNotify(message, userId) {
         const portPath = join(dataDir, 'daemon-port.json');
         let info = null;
         try {
@@ -1153,7 +1431,7 @@ export function apply(ctx, config) {
                     'Content-Type': 'application/json',
                     'x-dsh-bridge-token': info.token,
                 },
-                body: JSON.stringify({ message }),
+                body: JSON.stringify(userId ? { message, userId } : { message }),
                 signal: controller.signal,
             });
             clearTimeout(timer);
@@ -1178,8 +1456,9 @@ export function apply(ctx, config) {
      * Push an urgent approval question to the bound WeChat account via the
      * daemon's direct (non-throttled) /approval endpoint. Resolves false when
      * the daemon is unreachable so callers can fall back to other answerers.
+     * 多用户：`key` 是审批归属的 session key，解出 userId 后把审批推给本人。
      */
-    async function pushApprovalMessage(message) {
+    async function pushApprovalMessage(message, key) {
         const portPath = join(dataDir, 'daemon-port.json');
         let info = null;
         try {
@@ -1191,6 +1470,7 @@ export function apply(ctx, config) {
         if (!info?.port || !info?.token)
             return false;
         try {
+            const userId = userIdOfKey(key);
             const controller = new AbortController();
             const timer = setTimeout(() => controller.abort(), 10_000);
             const resp = await fetch(`http://127.0.0.1:${info.port}/approval`, {
@@ -1199,7 +1479,7 @@ export function apply(ctx, config) {
                     'Content-Type': 'application/json',
                     'x-dsh-bridge-token': info.token,
                 },
-                body: JSON.stringify({ message }),
+                body: JSON.stringify(userId ? { message, userId } : { message }),
                 signal: controller.signal,
             });
             clearTimeout(timer);
@@ -1389,8 +1669,11 @@ export function apply(ctx, config) {
                 message: { type: 'string', description: '要发送给微信的通知内容，简洁明确，避免模板化重复措辞。' },
             },
             output: simpleOutput,
-            execute: async (args) => {
-                const result = await sendWechatNotify(args.message);
+            execute: async (args, exec) => {
+                // 多用户：把通知推给发起当前任务的微信用户本人（解 agent → session key → userId）。
+                const key = accountIdForAgent(exec?.agent);
+                const userId = key ? userIdOfKey(key) : '';
+                const result = await sendWechatNotify(args.message, userId || undefined);
                 if (!result.ok)
                     throw new Error(result.message);
                 return { ok: true, message: result.message };
@@ -1401,6 +1684,8 @@ export function apply(ctx, config) {
     // Lifecycle
     // -------------------------------------------------------------------------
     ctx.effect(() => {
+        // 多用户迁移（幂等）：旧单用户 session-ids.json key → per-user key。
+        migrateSessionIdMap();
         const server = createServer((req, res) => {
             handleInternal(req, res).catch((err) => {
                 const message = err instanceof Error ? err.message : String(err);