@keyou007/agent-bot 0.1.15-alpha.0 → 0.1.15-alpha.1

package/dist/proxy/ProxySessionController.js

@@ -6,12 +6,13 @@ import { resolveUserPath } from "../config/paths.js";
 import { CommandRouter } from "../commands/CommandRouter.js";
 import { baseChatContextKey, isThreadContextKey } from "../feishu/contextKey.js";
 import { CardRenderer, } from "../feishu/CardRenderer.js";
+import { CardUpdateScheduler } from "../feishu/CardUpdateScheduler.js";
 import { generateGroupAvatarPng, resolveGroupAvatarProjectName } from "../feishu/GroupAvatarGenerator.js";
 import { normalizeFeishuPostText } from "../feishu/InboundText.js";
 import { allowsFeishuUser } from "../feishu/ownerAccess.js";
 import { buildTurnGraphRows } from "../presentation/turnGraph.js";
 import { createId } from "../utils/id.js";
-import { asInlineCode, codeBlock, truncateMiddle, truncateText } from "../utils/markdown.js";
+import { truncateMiddle, truncateText } from "../utils/markdown.js";
 import { normalizeTaskTitle } from "../utils/taskTitle.js";
 import { executeShellCommand, } from "../utils/executeShellCommand.js";
 const MESSAGE_RECEIVED_REACTION = "OnIt";
@@ -24,6 +25,7 @@ const RESET_HISTORY_PAGE_SIZE = 10;
 const MAX_LLM_TURN_RETRIES = 3;
 const RECOVERY_ACTIVITY_WINDOW_MS = 5 * 60 * 1_000;
 const RECOVERY_HEARTBEAT_INTERVAL_MS = 60 * 1_000;
+const SHELL_COMMAND_ELAPSED_UPDATE_INTERVAL_MS = 3_000;
 const FORWARD_ATTACHMENT_WINDOW_MS = 800;
 const DEFAULT_MERGED_FORWARD_INSTRUCTION = "请参考以下内容回复用户";
 const DEFAULT_REFERENCED_MESSAGE_INSTRUCTION = "请参考引用消息回复用户";
@@ -417,7 +419,7 @@ export class ProxySessionController {
         if (isQueueIndependentCommand(command)) {
             await this.outbound.withReplyTarget(message.contextKey, replyTarget, async () => {
                 try {
-                    if (command.type !== "forkgroup" && command.type !== "dismiss")
+                    if (command.type === "prompt")
                         await this.ensureThreadFork(message);
                     await this.execute(message.contextKey, command, message.messageId, replyTarget, localImagePaths, message.userId, message);
                     if (!isPromptCommand(command))
@@ -433,7 +435,7 @@ export class ProxySessionController {
         const previous = this.messageQueues.get(message.contextKey) ?? Promise.resolve();
         const next = previous.catch(() => undefined).then(() => this.outbound.withReplyTarget(message.contextKey, replyTarget, async () => {
             try {
-                if (command.type !== "forkgroup")
+                if (command.type === "prompt")
                     await this.ensureThreadFork(message);
                 await this.execute(message.contextKey, command, message.messageId, replyTarget, localImagePaths, message.userId, message);
                 if (!isPromptCommand(command))
@@ -1095,8 +1097,7 @@ export class ProxySessionController {
         if (!session.remoteSessionId || !this.isCodexSession(session)) {
             throw new Error("The task is not an App Server task that can be reset.");
         }
-        const contextKey = this.controlSessionContextKey(session);
-        const rows = this.store.listCompletedTurnGraph(session.localSessionId, contextKey);
+        const rows = this.store.listTaskTurnGraph(session.localSessionId);
         const graph = buildTurnGraphRows(rows.map((turn) => ({ turnId: turn.turnId, parentTurnId: turn.parentTurnId })));
         return {
             session,
@@ -1219,6 +1220,9 @@ export class ProxySessionController {
     }
     async execute(contextKey, command, messageId, replyTarget, localImagePaths, userId, incomingMessage) {
         const context = this.store.getOrCreateUserContext(contextKey, this.config.defaults.agent);
+        if (!this.currentSession(contextKey) && isThreadContextKey(contextKey) && commandRequiresCurrentSession(command)) {
+            throw new Error(unboundThreadTaskMessage());
+        }
         switch (command.type) {
             case "shell":
                 await this.runShellCommand(contextKey, command.command);
@@ -2501,8 +2505,13 @@ export class ProxySessionController {
         if (existing)
             return { record, runtime, session: existing };
         const pending = this.sessionLoads.get(record.localSessionId);
-        if (pending)
-            return pending;
+        if (pending) {
+            const loaded = await pending;
+            return {
+                ...loaded,
+                record: { ...loaded.record, contextKey: record.contextKey },
+            };
+        }
         this.outbound.registerSession(record.localSessionId, record.contextKey, record.title, record.cwd, this.agentLabel(record.agentName));
         const loading = (async () => {
             if (record.lastTurnId) {
@@ -2566,7 +2575,11 @@ export class ProxySessionController {
             }
             this.persistRuntimeSession(record, session, session.activeTurnId ? "running" : "ready");
             const saved = this.store.getSession(record.localSessionId) ?? record;
-            return { record: saved, runtime, session };
+            return {
+                record: { ...saved, contextKey: record.contextKey },
+                runtime,
+                session,
+            };
         })();
         this.sessionLoads.set(record.localSessionId, loading);
         try {
@@ -2653,6 +2666,7 @@ export class ProxySessionController {
             presentationError = error;
         }
         if (event.type === "turn_completed" || event.type === "turn_cancelled" || event.type === "turn_failed") {
+            await this.refreshGoalCards(event.sessionId);
             const terminalStatus = event.type === "turn_completed"
                 ? "completed"
                 : event.type === "turn_cancelled"
@@ -2994,8 +3008,10 @@ export class ProxySessionController {
         if (!current.remoteSessionId || !this.isCodexSession(current)) {
             throw new Error("当前任务不是可 Reset 的 App Server 任务。");
         }
-        const snapshot = turnViewSnapshot(this.store.getTurnSnapshot(turnId));
-        if (!snapshot || snapshot.sessionId !== current.localSessionId || snapshot.status !== "completed") {
+        const historyTurn = this.store.listTaskTurnGraph(current.localSessionId)
+            .find((turn) => turn.turnId === turnId);
+        const snapshot = turnViewSnapshot(historyTurn?.snapshot);
+        if (!snapshot || snapshot.status !== "completed") {
             throw new Error("只能将当前任务 Reset 到已成功完成的轮次。");
         }
         if (current.lastTurnId === turnId && current.lastTurnStatus === "completed") {
@@ -3015,7 +3031,7 @@ export class ProxySessionController {
             throw new Error("当前任务仍在执行。请等待任务完成或先停止任务，再点击 Reset。");
         }
         const origin = this.store.getTurnRuntimeOrigin(turnId);
-        if (origin && (origin.localSessionId !== current.localSessionId || origin.agentName !== current.agentName)) {
+        if (origin && origin.agentName !== current.agentName) {
             throw new Error("这张思考卡片与当前任务不匹配，已拒绝 Reset。");
         }
         const sourceRemoteSessionId = origin?.remoteSessionId ?? current.remoteSessionId;
@@ -3383,6 +3399,21 @@ export class ProxySessionController {
         await this.sendGoalCard(contextKey, goal, command.action === "edit" ? "Goal 已更新。" : "Goal 已启动，Agent 会持续执行直到完成、暂停或遇到阻塞。", record);
     }
     async sendGoalCard(contextKey, goal, notice, record = this.currentSession(contextKey)) {
+        const card = this.renderGoalCard(goal, notice, record);
+        if (!record) {
+            await this.outbound.sendInteractiveCard(contextKey, card);
+            return;
+        }
+        const existing = this.store.getGoalCardDelivery(record.localSessionId, contextKey);
+        if (existing) {
+            await this.outbound.updateInteractiveCard(contextKey, existing.messageId, card);
+            return;
+        }
+        const messageId = await this.outbound.sendInteractiveCard(contextKey, card);
+        if (messageId)
+            this.store.saveGoalCardDelivery(record.localSessionId, contextKey, messageId);
+    }
+    renderGoalCard(goal, notice, record) {
         const sections = [];
         if (notice)
             sections.push({ lines: [cardText(notice)] });
@@ -3405,23 +3436,133 @@ export class ProxySessionController {
                 "**/goal edit <新目标>**　修改　　**/goal clear**　清除",
             ],
         });
-        await this.outbound.sendInteractiveCard(contextKey, this.cardRenderer.renderSectionsCard("Agent Goal", sections));
+        const title = goal ? `Agent Goal · ${goalStatusLabel(goal.status)}` : "Agent Goal";
+        return this.cardRenderer.renderSectionsCard(title, sections);
+    }
+    async refreshGoalCards(localSessionId) {
+        const deliveries = this.store.listGoalCardDeliveries(localSessionId);
+        if (deliveries.length === 0)
+            return;
+        const record = this.store.getSession(localSessionId);
+        if (!record)
+            return;
+        const runtime = this.runtimes.forAgent(record.agentName);
+        if (runtime.kind !== "codex" || !runtime.getGoal)
+            return;
+        try {
+            const loaded = runtime.getSession(localSessionId) ?? (await this.loadSession(record)).session;
+            const goal = await runtime.getGoal(loaded.localSessionId);
+            const card = this.renderGoalCard(goal, undefined, record);
+            await Promise.all(deliveries.map(async (delivery) => {
+                try {
+                    await this.outbound.updateInteractiveCard(delivery.contextKey, delivery.messageId, card);
+                }
+                catch (error) {
+                    this.logger.warn({ error, localSessionId, contextKey: delivery.contextKey, messageId: delivery.messageId }, "Failed to refresh an Agent Goal card.");
+                }
+            }));
+        }
+        catch (error) {
+            this.logger.warn({ error, localSessionId }, "Failed to read the latest Agent Goal status.");
+        }
     }
     async runShellCommand(contextKey, command) {
         const cwd = this.currentSession(contextKey)?.cwd ?? this.config.defaults.cwd;
-        const result = await this.shellCommandExecutor(command, cwd);
-        const outputParts = [
-            result.stdout.trimEnd(),
-            result.stderr.trimEnd() ? `[stderr]\n${result.stderr.trimEnd()}` : "",
-        ].filter(Boolean);
-        const output = truncateMiddle(outputParts.join("\n"), 6_000);
-        const status = result.timedOut
-            ? "已超时（120s）"
-            : `退出码 ${result.exitCode ?? "未知"}`;
-        await this.outbound.sendMarkdown(contextKey, [
-            codeBlock(`$  ${command.trim()}\n${output || "（无输出）"}`, "text"),
-            `${asInlineCode(cwd)} · ${status}${result.outputTruncated ? " · 输出已截断" : ""}`,
-        ].join("\n"));
+        const startedAt = Date.now();
+        let latestOutput = {
+            stdout: "",
+            stderr: "",
+            outputTruncated: false,
+        };
+        let runningState = {
+            command,
+            cwd,
+            ...latestOutput,
+            status: "running",
+            elapsedMs: 0,
+        };
+        const cardMessageId = await this.outbound.sendInteractiveCard(contextKey, this.cardRenderer.renderShellCommandCard(runningState));
+        const scheduler = cardMessageId
+            ? new CardUpdateScheduler({
+                render: (state) => this.cardRenderer.renderShellCommandCard(state),
+                write: (card) => this.outbound.updateInteractiveCard(contextKey, cardMessageId, card),
+                onError: (error) => this.logger.warn({ error, contextKey, messageId: cardMessageId }, "Failed to update a shell command card."),
+            })
+            : undefined;
+        scheduler?.seed(runningState);
+        const elapsedTimer = scheduler ? setInterval(() => {
+            runningState = { ...runningState, elapsedMs: Date.now() - startedAt };
+            scheduler.update(runningState);
+        }, SHELL_COMMAND_ELAPSED_UPDATE_INTERVAL_MS) : undefined;
+        elapsedTimer?.unref?.();
+        const updateRunningOutput = (snapshot) => {
+            latestOutput = snapshot;
+            runningState = {
+                ...runningState,
+                ...snapshot,
+                elapsedMs: Date.now() - startedAt,
+            };
+            scheduler?.update(runningState);
+        };
+        let result;
+        try {
+            result = await this.shellCommandExecutor(command, cwd, { onOutput: updateRunningOutput });
+        }
+        catch (error) {
+            if (elapsedTimer)
+                clearInterval(elapsedTimer);
+            const failedCard = this.cardRenderer.renderShellCommandCard({
+                command,
+                cwd,
+                ...latestOutput,
+                stderr: [latestOutput.stderr.trimEnd(), runtimeErrorMessage(error)].filter(Boolean).join("\n"),
+                status: "failed",
+                elapsedMs: Date.now() - startedAt,
+            });
+            if (scheduler) {
+                try {
+                    await scheduler.flush({
+                        ...runningState,
+                        stderr: [latestOutput.stderr.trimEnd(), runtimeErrorMessage(error)].filter(Boolean).join("\n"),
+                        status: "failed",
+                        elapsedMs: Date.now() - startedAt,
+                    });
+                }
+                catch (cardError) {
+                    this.logger.warn({ error: cardError, contextKey, messageId: cardMessageId }, "Failed to finalize a shell command card.");
+                }
+                finally {
+                    scheduler.dispose();
+                }
+            }
+            else {
+                await this.outbound.sendInteractiveCard(contextKey, failedCard);
+            }
+            throw error;
+        }
+        if (elapsedTimer)
+            clearInterval(elapsedTimer);
+        const finalState = {
+            command,
+            cwd,
+            stdout: result.stdout,
+            stderr: result.stderr,
+            status: result.timedOut ? "timed_out" : result.exitCode === 0 ? "completed" : "failed",
+            exitCode: result.exitCode,
+            elapsedMs: Date.now() - startedAt,
+            outputTruncated: result.outputTruncated,
+        };
+        if (scheduler) {
+            try {
+                await scheduler.flush(finalState);
+            }
+            finally {
+                scheduler.dispose();
+            }
+        }
+        else {
+            await this.outbound.sendInteractiveCard(contextKey, this.cardRenderer.renderShellCommandCard(finalState));
+        }
     }
     async setTitle(contextKey, title) {
         const normalizedTitle = normalizeTaskTitle(title);
@@ -3532,7 +3673,7 @@ export class ProxySessionController {
         if (!current.remoteSessionId || !this.isCodexSession(current)) {
             throw new Error("当前任务不是可 Reset 的 App Server 任务。");
         }
-        const allTurns = this.store.listCompletedTurnGraph(current.localSessionId, contextKey);
+        const allTurns = this.store.listTaskTurnGraph(current.localSessionId);
         const graphRows = buildTurnGraphRows(allTurns.map((turn) => ({
             turnId: turn.turnId,
             parentTurnId: turn.parentTurnId,
@@ -3668,7 +3809,6 @@ export class ProxySessionController {
                             contextKey,
                         },
                     },
-                    actions: directoryCreationActions(entry.path, contextKey),
                 }
                 : {
                     name: entry.name,
@@ -3693,7 +3833,7 @@ export class ProxySessionController {
             footerLines: [
                 `第 ${page + 1}/${totalPages} 页 · ${directoryCount} 个目录 · ${entries.length - directoryCount} 个文件`,
                 "",
-                "> 点击目录名称进入，点击文件名称发送到当前会话；**New** 在该目录创建任务，**NewGroup** 在该目录创建新群和任务。",
+                "> 点击目录名称进入，点击文件名称发送到当前会话；卡片顶部的 **New** 和 **NewGroup** 使用当前目录。",
             ],
         });
         if (options.updateMessageId) {
@@ -3722,7 +3862,6 @@ export class ProxySessionController {
                     contextKey,
                 },
             },
-            actions: directoryCreationActions(drive.root, contextKey),
         }));
         const card = this.cardRenderer.renderDirectoryBrowserCard({
             directory: "此电脑",
@@ -3732,7 +3871,7 @@ export class ProxySessionController {
             footerLines: [
                 `第 ${page + 1}/${totalPages} 页 · ${drives.length} 个磁盘`,
                 "",
-                "> 点击磁盘名称进入；**New** 在磁盘根目录创建任务，**NewGroup** 在磁盘根目录创建新群和任务。",
+                "> 点击磁盘名称进入。",
             ],
         });
         if (options.updateMessageId) {
@@ -4350,7 +4489,9 @@ export class ProxySessionController {
         let activeTurnId;
         let queued = 0;
         if (!current) {
-            taskLines.push("无。直接发送消息即可创建一个未指定项目的 Agent 任务。");
+            taskLines.push(isThreadContextKey(contextKey)
+                ? unboundThreadTaskMessage()
+                : "无。直接发送消息即可创建一个未指定项目的 Agent 任务。");
         }
         else {
             const agent = this.ensureAgent(current.agentName);
@@ -4581,8 +4722,11 @@ export class ProxySessionController {
     }
     requireCurrentSession(contextKey) {
         const record = this.currentSession(contextKey);
-        if (!record)
-            throw new Error("当前没有任务，直接发送一条消息即可自动创建。");
+        if (!record) {
+            throw new Error(isThreadContextKey(contextKey)
+                ? unboundThreadTaskMessage()
+                : "当前没有任务，直接发送一条消息即可自动创建。");
+        }
         return record;
     }
     requireSession(contextKey, sessionId) {
@@ -5050,6 +5194,19 @@ function isQueueIndependentCommand(command) {
         return true;
     return false;
 }
+function commandRequiresCurrentSession(command) {
+    if (["dismiss", "stop", "title", "turns", "model", "provider", "thinking", "permissions", "nosteer"].includes(command.type)) {
+        return true;
+    }
+    if (command.type === "archive" || command.type === "fork")
+        return command.sessionId === undefined;
+    if (command.type === "goal")
+        return command.action !== "set";
+    return false;
+}
+function unboundThreadTaskMessage() {
+    return "当前话题尚未绑定任务。发送普通消息后，Agent Bot 会从可识别的原始轮次创建分支；没有原始轮次时会创建全新任务。也可以使用 /new 创建全新任务，或使用 /sessions 绑定现有任务。";
+}
 function parseSessionPage(value) {
     const parsed = typeof value === "string" || typeof value === "number" ? Number(value) : Number.NaN;
     return Number.isSafeInteger(parsed) && parsed >= 0 ? parsed : 0;
@@ -5348,14 +5505,13 @@ const FEISHU_GROUP_NAME_MAX_LENGTH = 60;
 const GROUP_PROJECT_DIRECTORY_MAX_LENGTH = 15;
 function formatGroupProjectDirectory(projectCwd) {
     const value = abbreviateHomeDirectory(projectCwd);
-    if (Array.from(value).length <= GROUP_PROJECT_DIRECTORY_MAX_LENGTH)
-        return `[${value}]`;
     const levels = value
         .replace(/[\\/]+$/, "")
         .split(/[\\/]+/)
         .filter(Boolean)
         .slice(-2);
-    return `[${fitTrailingPathLevels(levels, GROUP_PROJECT_DIRECTORY_MAX_LENGTH, path.sep)}]`;
+    const separator = value.includes("\\") ? path.win32.sep : path.posix.sep;
+    return `[${fitTrailingPathLevels(levels, GROUP_PROJECT_DIRECTORY_MAX_LENGTH, separator)}]`;
 }
 function abbreviateHomeDirectory(value) {
     const homeDirectory = os.homedir();