lark-remote 0.5.20 → 0.5.21

package/dist/message-handlers.js

@@ -18,260 +18,277 @@ function isStopCommand(text) {
     const t = text.trim().toLowerCase();
     return t === '/stop' || t === '/t';
 }
-export function setupMessageHandlers(deps) {
-    const { connector, router, bridge, sessionStore, workspaceStore, binder, logger, config, cloneSession, } = deps;
-    // 入站统一装配器：图/文任意顺序 → 同一个 turn、同一个 prompt。
-    const assembler = new InboundTurnAssembler({
-        onCommit: (turn, prompt) => {
-            const messageId = turn.messageIds[turn.messageIds.length - 1] ?? '';
-            const ctx = {
-                userId: turn.userId,
-                chatId: turn.chatId,
-                messageId,
-                turnMessageIds: turn.messageIds,
-            };
-            let cwd = sessionStore.getCwd(turn.userId) ?? '';
-            if (!cwd) {
-                const recent = [...workspaceStore.list()].sort((a, b) => b.lastUsedAt - a.lastUsedAt);
-                if (recent.length > 0)
-                    cwd = recent[0].path;
-            }
-            const binding = bridge.currentBinding(turn.userId);
-            bridge.enqueue(cwd, async () => {
-                await router.handle(prompt, ctx, {
-                    cwdOverride: cwd,
-                    binding,
-                    allowCommandPrefix: false,
-                });
-            }, {
-                taskMeta: {
-                    userId: turn.userId,
-                    chatId: turn.chatId,
-                    messageId,
-                    messagePreview: prompt.slice(0, 3000),
-                    binding,
-                },
-            });
-        },
-        onReceipt: async (ctx, text) => {
-            await bridge.sendResult({ text }, ctx);
+/** 入站统一装配器 commit：图/文组装成 turn → 进 agent 队列。 */
+function handleTurnCommit(ctx, turn, prompt) {
+    const messageId = turn.messageIds[turn.messageIds.length - 1] ?? '';
+    const taskCtx = {
+        userId: turn.userId,
+        chatId: turn.chatId,
+        messageId,
+        turnMessageIds: turn.messageIds,
+    };
+    let cwd = ctx.sessionStore.getCwd(turn.userId) ?? '';
+    if (!cwd) {
+        const recent = [...ctx.workspaceStore.list()].sort((a, b) => b.lastUsedAt - a.lastUsedAt);
+        if (recent.length > 0)
+            cwd = recent[0].path;
+    }
+    const binding = ctx.bridge.currentBinding(turn.userId);
+    ctx.bridge.enqueue(cwd, async () => {
+        await ctx.router.handle(prompt, taskCtx, {
+            cwdOverride: cwd,
+            binding,
+            allowCommandPrefix: false,
+        });
+    }, {
+        taskMeta: {
+            userId: turn.userId,
+            chatId: turn.chatId,
+            messageId,
+            messagePreview: prompt.slice(0, 3000),
+            binding,
         },
     });
-    router.setInboundFlusher(() => assembler.flushAll('flush'));
-    const authorizer = new InboundAuthorizer({
-        binder,
-        onBind: (userId, chatId) => {
-            let resolvedCwd;
-            try {
-                resolvedCwd = fs.realpathSync(process.cwd());
-            }
-            catch {
-                resolvedCwd = process.cwd();
-            }
-            if (!sessionStore.getCwd(userId)) {
-                sessionStore.setCwd(userId, resolvedCwd);
+}
+/** 入站回执（无文本纯附件 / rejected 项）：面向用户的提示。 */
+async function handleTurnReceipt(ctx, receiptCtx, text) {
+    await ctx.bridge.sendResult({ text }, receiptCtx);
+}
+/** owner 绑定成功后的 onboarding 消息（fire-and-forget）。 */
+function handleBind(ctx, userId, chatId) {
+    let resolvedCwd;
+    try {
+        resolvedCwd = fs.realpathSync(process.cwd());
+    }
+    catch {
+        resolvedCwd = process.cwd();
+    }
+    if (!ctx.sessionStore.getCwd(userId)) {
+        ctx.sessionStore.setCwd(userId, resolvedCwd);
+    }
+    return (async () => {
+        try {
+            await ctx.connector.sendWithRetry(chatId, {
+                text: `✅ 已绑定到本账号，此后仅你可使用本应用\n` +
+                    `📂 当前工作目录: \`${resolvedCwd}\`\n` +
+                    `🤖 默认 Agent: ${agentDisplayName(ctx.config.defaultAgent)}\n` +
+                    `💡 直接输入消息即可开始对话，或 /cd 切换目录`,
+            });
+            const helpResult = ctx.router.cmdHelp();
+            if (helpResult.card) {
+                await ctx.connector.sendWithRetry(chatId, { card: helpResult.card });
             }
-            return (async () => {
-                try {
-                    await connector.sendWithRetry(chatId, {
-                        text: `✅ 已绑定到本账号，此后仅你可使用本应用\n` +
-                            `📂 当前工作目录: \`${resolvedCwd}\`\n` +
-                            `🤖 默认 Agent: ${agentDisplayName(config.defaultAgent)}\n` +
-                            `💡 直接输入消息即可开始对话，或 /cd 切换目录`,
-                    });
-                    const helpResult = router.cmdHelp();
-                    if (helpResult.card) {
-                        await connector.sendWithRetry(chatId, { card: helpResult.card });
-                    }
-                }
-                catch (err) {
-                    logger.error('[binder] onboarding send failed:', err);
-                }
-            })();
-        },
-    });
-    connector.setInboundMediaDetectedHandler((msg) => {
-        const authorization = authorizer.authorize(msg.userId, msg.chatId);
-        if (authorization === 'rejected') {
-            logger.warn(`[media] rejected inbound media from non-owner ${msg.userId}`);
-            return;
         }
-        if (cloneSession.isActive()) {
-            logger.info(`[media] dropped inbound media during clone session ${msg.messageId}`);
-            return;
+        catch (err) {
+            ctx.logger.error('[binder] onboarding send failed:', err);
         }
-        if (!router.config.inboundMedia.enabled) {
-            assembler.ingest({
-                kind: 'rejected',
-                userId: msg.userId,
-                chatId: msg.chatId,
-                messageId: msg.messageId,
-                replyToMessageId: msg.replyToMessageId,
-                rawContentType: msg.rawContentType,
-                rejectedKind: 'file',
-                reason: '入站媒体保存已关闭（inboundMedia.enabled: false），未保存文件。' +
-                    '如需自动保存图片/文件，请开启后重试',
-            });
-            return;
-        }
-        const outcome = (async () => {
-            const payload = await connector.downloadInboundMedia(msg, {
-                maxFileSizeMb: router.config.inboundMedia.maxFileSizeMb,
-            });
-            try {
-                return await bridge.saveInboundMedia(payload);
-            }
-            catch (err) {
-                for (const item of payload.media)
-                    bestEffortUnlink(item.tempPath);
-                throw err;
-            }
-        })();
-        assembler.ingest({
-            kind: 'media',
+    })();
+}
+/** 入站媒体（image/file）检测：鉴权 → clone 拦截 → 落盘或 rejected 回执。 */
+function handleInboundMedia(ctx, msg) {
+    const authorization = ctx.authorizer.authorize(msg.userId, msg.chatId);
+    if (authorization === 'rejected') {
+        ctx.logger.warn(`[media] rejected inbound media from non-owner ${msg.userId}`);
+        return;
+    }
+    if (ctx.cloneSession.isActive()) {
+        ctx.logger.info(`[media] dropped inbound media during clone session ${msg.messageId}`);
+        return;
+    }
+    if (!ctx.router.config.inboundMedia.enabled) {
+        ctx.assembler.ingest({
+            kind: 'rejected',
             userId: msg.userId,
             chatId: msg.chatId,
             messageId: msg.messageId,
             replyToMessageId: msg.replyToMessageId,
             rawContentType: msg.rawContentType,
-            outcome,
+            rejectedKind: 'file',
+            reason: '入站媒体保存已关闭（inboundMedia.enabled: false），未保存文件。' +
+                '如需自动保存图片/文件，请开启后重试',
         });
-    });
-    connector.setMessageHandler((msg) => {
-        const decision = authorizer.authorize(msg.userId, msg.chatId);
-        if (decision === 'rejected' || decision === 'bind_success')
-            return;
-        logger.info(`message from ${msg.userId} (${msg.rawContentType}): ${msg.content.slice(0, 100)}`);
-        void connector.addReaction(msg.messageId, 'Typing');
-        if (cloneSession.isActive() && !isStopCommand(msg.content)) {
-            void cloneSession
-                .handleMessage(msg.content, {
-                userId: msg.userId,
-                chatId: msg.chatId,
-                messageId: msg.messageId,
-            })
-                .catch((err) => logger.error('[clone] message handling failed:', err));
-            return;
-        }
-        const content = router.expandAliasMessage(msg.content);
-        if (isStopCommand(content)) {
-            void (async () => {
-                const interrupt = await bridge.interruptCurrentRunDetailed({
-                    userId: msg.userId,
-                    chatId: msg.chatId,
-                });
-                const ctx = { userId: msg.userId, chatId: msg.chatId, messageId: msg.messageId };
-                if (!interrupt.stopped) {
-                    await bridge.sendResult({ text: '当前没有运行中的进程' }, ctx);
-                }
-                else if ((interrupt.stoppedCount ?? 1) > 1) {
-                    await bridge.sendResult({ text: `✅ 已停止 ${interrupt.stoppedCount} 个运行中的任务` }, ctx);
-                }
-            })().catch((err) => logger.error('[control] /stop failed:', err));
-            return;
-        }
-        const stripped = stripPlaceholders(content);
-        if (stripped.unknownTags.length > 0) {
-            logger.warn(`[inbound] unknown placeholder tags stripped: ${stripped.unknownTags.join(', ')} ` +
-                `(msg_type=${msg.rawContentType})`);
+        return;
+    }
+    const outcome = (async () => {
+        const payload = await ctx.connector.downloadInboundMedia(msg, {
+            maxFileSizeMb: ctx.router.config.inboundMedia.maxFileSizeMb,
+        });
+        try {
+            return await ctx.bridge.saveInboundMedia(payload);
         }
-        const commandEligible = msg.rawContentType === 'text' && stripped.kinds.length === 0 && stripped.clean !== '';
-        if (commandEligible && (stripped.clean.startsWith('/') || stripped.clean.startsWith('!'))) {
-            void (async () => {
-                await assembler.flush(msg.userId, msg.chatId, 'flush');
-                await router.handle(stripped.clean, {
-                    userId: msg.userId,
-                    chatId: msg.chatId,
-                    messageId: msg.messageId,
-                }, { allowCommandPrefix: true });
-            })().catch((err) => logger.error('[control] command failed:', err));
-            return;
+        catch (err) {
+            for (const item of payload.media)
+                bestEffortUnlink(item.tempPath);
+            throw err;
         }
-        assembler.ingest({
-            kind: 'text',
+    })();
+    ctx.assembler.ingest({
+        kind: 'media',
+        userId: msg.userId,
+        chatId: msg.chatId,
+        messageId: msg.messageId,
+        replyToMessageId: msg.replyToMessageId,
+        rawContentType: msg.rawContentType,
+        outcome,
+    });
+}
+/** 普通入站消息：鉴权 → clone 拦截 → /stop → 命令前缀 → 装配器。 */
+function handleInboundMessage(ctx, msg) {
+    const decision = ctx.authorizer.authorize(msg.userId, msg.chatId);
+    if (decision === 'rejected' || decision === 'bind_success')
+        return;
+    ctx.logger.info(`message from ${msg.userId} (${msg.rawContentType}): ${msg.content.slice(0, 100)}`);
+    void ctx.connector.addReaction(msg.messageId, 'Typing');
+    if (ctx.cloneSession.isActive() && !isStopCommand(msg.content)) {
+        void ctx.cloneSession
+            .handleMessage(msg.content, {
             userId: msg.userId,
             chatId: msg.chatId,
             messageId: msg.messageId,
-            replyToMessageId: msg.replyToMessageId,
-            rawContentType: msg.rawContentType,
-            text: stripped.clean,
-            placeholders: stripped.kinds,
-            unknownTags: stripped.unknownTags,
-        });
+        })
+            .catch((err) => ctx.logger.error('[clone] message handling failed:', err));
+        return;
+    }
+    const content = ctx.router.expandAliasMessage(msg.content);
+    if (isStopCommand(content)) {
+        void (async () => {
+            const interrupt = await ctx.bridge.interruptCurrentRunDetailed({
+                userId: msg.userId,
+                chatId: msg.chatId,
+            });
+            const stopCtx = { userId: msg.userId, chatId: msg.chatId, messageId: msg.messageId };
+            if (!interrupt.stopped) {
+                await ctx.bridge.sendResult({ text: '当前没有运行中的进程' }, stopCtx);
+            }
+            else if ((interrupt.stoppedCount ?? 1) > 1) {
+                await ctx.bridge.sendResult({ text: `✅ 已停止 ${interrupt.stoppedCount} 个运行中的任务` }, stopCtx);
+            }
+        })().catch((err) => ctx.logger.error('[control] /stop failed:', err));
+        return;
+    }
+    const stripped = stripPlaceholders(content);
+    if (stripped.unknownTags.length > 0) {
+        ctx.logger.warn(`[inbound] unknown placeholder tags stripped: ${stripped.unknownTags.join(', ')} ` +
+            `(msg_type=${msg.rawContentType})`);
+    }
+    const commandEligible = msg.rawContentType === 'text' && stripped.kinds.length === 0 && stripped.clean !== '';
+    if (commandEligible && (stripped.clean.startsWith('/') || stripped.clean.startsWith('!'))) {
+        void (async () => {
+            await ctx.assembler.flush(msg.userId, msg.chatId, 'flush');
+            await ctx.router.handle(stripped.clean, {
+                userId: msg.userId,
+                chatId: msg.chatId,
+                messageId: msg.messageId,
+            }, { allowCommandPrefix: true });
+        })().catch((err) => ctx.logger.error('[control] command failed:', err));
+        return;
+    }
+    ctx.assembler.ingest({
+        kind: 'text',
+        userId: msg.userId,
+        chatId: msg.chatId,
+        messageId: msg.messageId,
+        replyToMessageId: msg.replyToMessageId,
+        rawContentType: msg.rawContentType,
+        text: stripped.clean,
+        placeholders: stripped.kinds,
+        unknownTags: stripped.unknownTags,
     });
-    connector.setCardActionHandler(async (action) => {
-        if (!binder.isOwner(action.operator.openId)) {
-            binder.recordRejectedCardAction(action.operator.openId);
-            return;
-        }
-        const actionValue = action.action.value;
-        if (!actionValue?.cmd)
-            return;
-        logger.info(actionValue.cmd === 'stop'
-            ? `card action: stop runId=${actionValue.runId ?? '(none)'} messageId=${action.messageId}`
-            : `card action: ${actionValue.cmd}`);
-        const userId = action.operator.openId;
-        const chatId = action.chatId;
-        const messageId = action.messageId;
-        void connector.addReaction(messageId, 'Typing');
-        if (actionValue.cmd === 'stop') {
-            void router
-                .handleCardAction({ ...actionValue, cmd: 'stop' }, { userId, chatId, messageId })
-                .catch((err) => logger.error('[control] card stop failed:', err));
-            return;
-        }
-        const isImmediate = isImmediateAction(actionValue.cmd);
-        const cwd = sessionStore.getCwd(userId) ?? '';
-        const fullValue = buildCardActionFullValue(actionValue, action);
-        if (SESSION_MUTATING_ACTION_CMDS.has(actionValue.cmd)) {
-            const flushP = assembler
-                .flush(userId, chatId, 'flush')
-                .catch((err) => logger.error('[control] inbound flush failed:', err));
-            await Promise.race([flushP, sleep(SESSION_MUTATING_FLUSH_BUDGET_MS)]);
-        }
-        if (DIRECT_RETURN_CMDS.has(actionValue.cmd)) {
-            return router.handleCardAction(fullValue, { userId, chatId, messageId });
-        }
-        if (actionValue.cmd === 'order.exec') {
-            void dispatchOrderExecForQueue({
-                router,
-                bridge,
-                cwd,
-                orderId: actionValue.orderId,
-                ctx: { userId, chatId, messageId },
-            }).catch((err) => logger.error('[control] order.exec dispatch failed:', err));
+}
+/** 卡片动作：鉴权 → stop/直返/order.exec → immediate 或普通队列。 */
+async function handleCardAction(ctx, action) {
+    if (!ctx.binder.isOwner(action.operator.openId)) {
+        ctx.binder.recordRejectedCardAction(action.operator.openId);
+        return;
+    }
+    const actionValue = action.action.value;
+    if (!actionValue?.cmd)
+        return;
+    ctx.logger.info(actionValue.cmd === 'stop'
+        ? `card action: stop runId=${actionValue.runId ?? '(none)'} messageId=${action.messageId}`
+        : `card action: ${actionValue.cmd}`);
+    const userId = action.operator.openId;
+    const chatId = action.chatId;
+    const messageId = action.messageId;
+    void ctx.connector.addReaction(messageId, 'Typing');
+    if (actionValue.cmd === 'stop') {
+        void ctx.router
+            .handleCardAction({ ...actionValue, cmd: 'stop' }, { userId, chatId, messageId })
+            .catch((err) => ctx.logger.error('[control] card stop failed:', err));
+        return;
+    }
+    const isImmediate = isImmediateAction(actionValue.cmd);
+    const cwd = ctx.sessionStore.getCwd(userId) ?? '';
+    const fullValue = buildCardActionFullValue(actionValue, action);
+    if (SESSION_MUTATING_ACTION_CMDS.has(actionValue.cmd)) {
+        const flushP = ctx.assembler
+            .flush(userId, chatId, 'flush')
+            .catch((err) => ctx.logger.error('[control] inbound flush failed:', err));
+        await Promise.race([flushP, sleep(SESSION_MUTATING_FLUSH_BUDGET_MS)]);
+    }
+    if (DIRECT_RETURN_CMDS.has(actionValue.cmd)) {
+        return ctx.router.handleCardAction(fullValue, { userId, chatId, messageId });
+    }
+    if (actionValue.cmd === 'order.exec') {
+        void dispatchOrderExecForQueue({
+            router: ctx.router,
+            bridge: ctx.bridge,
+            cwd,
+            orderId: actionValue.orderId,
+            ctx: { userId, chatId, messageId },
+        }).catch((err) => ctx.logger.error('[control] order.exec dispatch failed:', err));
+        return;
+    }
+    const forwardActionFeedback = (res) => {
+        const text = actionFeedbackText(res);
+        if (!text)
             return;
-        }
-        const forwardActionFeedback = (res) => {
-            const text = actionFeedbackText(res);
-            if (!text)
-                return;
-            void bridge
-                .sendResult({ text }, { userId, chatId, messageId })
-                .catch((err) => logger.error('[control] card action feedback failed:', err));
-        };
-        if (isImmediate) {
-            bridge.enqueueImmediate(cwd, async () => {
-                const res = await router.handleCardAction(fullValue, { userId, chatId, messageId });
-                forwardActionFeedback(res);
-            });
-        }
-        else {
-            bridge.enqueue(cwd, async () => {
-                const res = await router.handleCardAction(fullValue, { userId, chatId, messageId });
-                forwardActionFeedback(res);
-            }, {
-                taskMeta: {
-                    userId,
-                    chatId,
-                    messageId: router.mintQueueTaskKey('card', actionValue.cmd),
-                    feishuReplyTo: messageId,
-                    messagePreview: `card action: ${actionValue.cmd}`,
-                    kind: COMPACT_ACTION_CMDS.has(actionValue.cmd) ? 'compact' : 'command',
-                    editable: !COMPACT_ACTION_CMDS.has(actionValue.cmd),
-                },
-            });
-        }
+        void ctx.bridge
+            .sendResult({ text }, { userId, chatId, messageId })
+            .catch((err) => ctx.logger.error('[control] card action feedback failed:', err));
+    };
+    if (isImmediate) {
+        ctx.bridge.enqueueImmediate(cwd, async () => {
+            const res = await ctx.router.handleCardAction(fullValue, { userId, chatId, messageId });
+            forwardActionFeedback(res);
+        });
+    }
+    else {
+        ctx.bridge.enqueue(cwd, async () => {
+            const res = await ctx.router.handleCardAction(fullValue, { userId, chatId, messageId });
+            forwardActionFeedback(res);
+        }, {
+            taskMeta: {
+                userId,
+                chatId,
+                messageId: ctx.router.mintQueueTaskKey('card', actionValue.cmd),
+                feishuReplyTo: messageId,
+                messagePreview: `card action: ${actionValue.cmd}`,
+                kind: COMPACT_ACTION_CMDS.has(actionValue.cmd) ? 'compact' : 'command',
+                editable: !COMPACT_ACTION_CMDS.has(actionValue.cmd),
+            },
+        });
+    }
+}
+export function setupMessageHandlers(deps) {
+    // ctx 在 assembler/authorizer 创建后填充；转发箭头只在事件触发时读它。
+    // 所有决策逻辑都在模块级 handler 中，本函数只做注册，圈复杂度保持最低。
+    // 循环初始化：两个实例的回调捕获 ctx，而 ctx 又需要这两个实例，无法在
+    // 声明处一次性初始化；回调只在事件到达时执行，那时填充早已完成。
+    // eslint-disable-next-line prefer-const
+    let ctx;
+    const assembler = new InboundTurnAssembler({
+        onCommit: (turn, prompt) => handleTurnCommit(ctx, turn, prompt),
+        onReceipt: (receiptCtx, text) => handleTurnReceipt(ctx, receiptCtx, text),
+    });
+    deps.router.setInboundFlusher(() => assembler.flushAll('flush'));
+    const authorizer = new InboundAuthorizer({
+        binder: deps.binder,
+        onBind: (userId, chatId) => handleBind(ctx, userId, chatId),
     });
+    ctx = { ...deps, assembler, authorizer };
+    deps.connector.setInboundMediaDetectedHandler((msg) => handleInboundMedia(ctx, msg));
+    deps.connector.setMessageHandler((msg) => handleInboundMessage(ctx, msg));
+    deps.connector.setCardActionHandler((action) => handleCardAction(ctx, action));
 }
 //# sourceMappingURL=message-handlers.js.map

package/dist/router/commands/ls.d.ts

@@ -6,4 +6,7 @@ export interface LsCommandOptions {
     rootDir?: string;
     q?: string;
 }
+/** `...(filter ? { q: filter } : {})` 单源：q 恒为最后一个字段。
+ *  ls / ws 两个命令共用（ws.ts 从本模块 import），避免同形实现两处维护。 */
+export declare function withQuery(value: Record<string, unknown>, filter: string | undefined): Record<string, unknown>;
 export declare function buildLsCommand(args: string[], _ctx: CommandContext, options: LsCommandOptions): CommandResult;