@keyou007/agent-bot 0.1.24-alpha.5 → 0.1.24-alpha.7

package/dist/feishu/CardRenderer.js

@@ -1,10 +1,11 @@
 import { createHash } from "node:crypto";
+import { approvalActivityId } from "../presentation/TurnStateReducer.js";
 import path from "node:path";
 import { truncateMiddle, truncateText } from "../utils/markdown.js";
 import { localCardImage } from "./LocalCardImage.js";
 const EXECUTION_SETTING_EFFECTS = {
     agent: "只影响新建任务，不切换当前任务。",
-    provider: "只影响当前任务，需空闲时切换。",
+    provider: "只影响当前任务；运行中选择将在本轮结束后生效。",
     model: "只影响当前任务，下一轮生效。",
     thinking: "只影响当前任务，下一轮生效。",
     permission: "只影响当前任务，下一轮生效。",
@@ -199,6 +200,9 @@ export class CardRenderer {
                 ...(outputWasTruncated ? ["输出过长，已保留开头和结尾并截断中间内容。"] : []),
             ].join("\n")),
         ];
+        if (view.terminalUrl) {
+            elements.push(markdown(`[Open Terminal](${view.terminalUrl}) · 独立终端，需在本会话由所有者授权`));
+        }
         if (view.status === "running" && view.jobId && view.contextKey) {
             elements.push({
                 tag: "button",
@@ -234,6 +238,7 @@ export class CardRenderer {
                         `**思考强度 / 权限**：${inlineCode(view.currentEffort ?? "自动")} / ${inlineCode(permissionModeLabel(view.currentPermissionMode))}`,
                     ]
                     : []),
+                ...(view.pendingNotice ? [view.pendingNotice] : []),
                 ...(view.notice ? [view.notice] : []),
                 ...(view.warning ? [`**提示**：${escapeCardHtml(view.warning)}`] : []),
             ].join("\n")),
@@ -267,7 +272,8 @@ export class CardRenderer {
                         inlineCode(provider.id),
                         provider.isDefault ? " · 默认" : "",
                     ].join(""),
-                    current: provider.id === view.currentProvider,
+                    current: provider.id === view.currentProvider && !view.pendingFailed,
+                    currentLabel: view.pendingNotice ? "待生效" : undefined,
                     action: {
                         text: "Switch",
                         value: {
@@ -284,18 +290,24 @@ export class CardRenderer {
                 elements.push(markdown("当前运行时未返回可用模型。"));
             }
             else {
-                elements.push(...view.models.map((model) => settingsOptionRow({
+                const page = paginateModels(view.models, view.currentModel, view.modelPage, {
+                    action: "settings_tab_open", ...baseAction, tab: "model", provider: view.currentProvider ?? "",
+                });
+                elements.push(...page.models.map((model) => settingsOptionRow({
                     label: `${inlineCode(model.id)}${model.isDefault ? " · 默认" : ""}`,
-                    current: model.id === view.currentModel,
+                    current: model.id === view.currentModel && !view.pendingFailed,
+                    currentLabel: view.pendingNotice ? "待生效" : undefined,
                     action: {
                         text: "Switch",
                         value: {
                             action: "settings_model_select",
                             ...baseAction,
+                            provider: view.currentProvider ?? "",
                             model: model.id,
                         },
                     },
                 })));
+                elements.push(...page.navigation);
             }
         }
         else if (view.activeTab === "thinking") {
@@ -310,11 +322,13 @@ export class CardRenderer {
                 elements.push(...view.reasoningOptions.map((option) => settingsOptionRow({
                     label: inlineCode(option.value),
                     current: option.value === view.currentEffort,
+                    currentLabel: view.pendingNotice ? "待生效" : undefined,
                     action: {
                         text: "Switch",
                         value: {
                             action: "settings_thinking_select",
                             ...baseAction,
+                            provider: view.currentProvider ?? "",
                             model: currentModel,
                             effort: option.value,
                         },
@@ -326,6 +340,7 @@ export class CardRenderer {
             elements.push(...["auto", "confirm"].map((mode) => settingsOptionRow({
                 label: `${inlineCode(mode)} · ${permissionModeLabel(mode)}`,
                 current: mode === view.currentPermissionMode,
+                currentLabel: view.pendingNotice ? "待生效" : undefined,
                 action: {
                     text: "Switch",
                     value: {
@@ -337,7 +352,7 @@ export class CardRenderer {
             })));
         }
         elements.push(markdown(`> ${EXECUTION_SETTING_EFFECTS[view.activeTab]}`));
-        return sectionCard("运行设置", elements, view.warning ? "orange" : view.notice ? "green" : "blue");
+        return sectionCard("运行设置", elements, view.warning || view.pendingFailed ? "orange" : view.notice ? "green" : "blue");
     }
     renderProviderSelector(view) {
         const elements = [
@@ -470,7 +485,14 @@ export class CardRenderer {
             elements.push(markdown("当前运行时未返回可用模型。"));
         }
         else {
-            elements.push(...view.models.map((model) => {
+            const page = paginateModels(view.models, view.currentModel, view.modelPage, {
+                action: view.unifiedSettings ? "provider_model_open" : "model_open",
+                sessionId: view.sessionId,
+                contextKey: view.contextKey,
+                ...(view.modelProvider ? { provider: view.modelProvider } : {}),
+                ...(view.permissionMode ? { permissionMode: view.permissionMode } : {}),
+            });
+            elements.push(...page.models.map((model) => {
                 const isCurrent = model.id === view.currentModel;
                 return {
                     tag: "column_set",
@@ -506,6 +528,7 @@ export class CardRenderer {
                     ],
                 };
             }));
+            elements.push(...page.navigation);
         }
         if (view.unifiedSettings) {
             elements.push({ tag: "hr" }, taskActionRow([{
@@ -665,6 +688,24 @@ export class CardRenderer {
         }
         return sectionCard("Agent Bot 更新提醒", elements, view.status === "completed" ? "green" : view.status === "cancelled" ? "grey" : "blue");
     }
+    renderTerminalAuthorization(view) {
+        const action = (decision) => ({ action: "terminal_authorize", contextKey: view.contextKey, requestId: view.requestId, token: view.approvalToken, decision });
+        const elements = [markdown(`**目录**：${inlineCode(view.cwd)}\n**终端**：${inlineCode(view.reopenToken)}`)];
+        if (view.state === "pending") {
+            elements.push(markdown(`**验证码**：${inlineCode(view.code)}\n仅 AgentBot 所有者可授权。授权后，该浏览器可在本机执行任意命令，拥有 AgentBot 的系统用户权限。请核对网页验证码，仅批准本人发起的请求。5 分钟内有效。${view.recovery ? (view.shellStarted ? "恢复原 Shell，不创建新终端；授权后旧网页失去访问权限。拒绝不影响原终端。" : "继续打开同一个终端；授权后旧网页失去访问权限，Shell 在连接成功后启动。拒绝不影响原授权。") : "不执行原卡片命令。"}`), taskActionRow([{ text: "Allow", value: action("allow") }, { text: "Deny", type: "danger", value: action("deny") }, { text: "刷新", value: action("refresh") }]));
+        }
+        else if (view.state === "closed") {
+            elements.push(markdown(`**状态**：${view.message ? escapeCardHtml(view.message) : "已关闭"}\n原终端已结束时，请从命令卡片创建新终端。`));
+        }
+        else {
+            const waiting = view.state === "approved";
+            const label = waiting ? "打开终端" : "重新打开终端";
+            elements.push(markdown(`**状态**：${waiting ? "已授权，等待网页连接" : view.connected ? "已连接" : "网页已断开，Shell 仍在运行"}\n${waiting ? "请返回原网页连接；原网页已关闭时，点击下方“打开终端”。Shell 尚未启动。" : "点击下方“重新打开终端”恢复原 Shell。前台连接时不因空闲关闭；后台空闲 30 分钟或网页断开 3 分钟后会自动关闭 Shell，成功重连取消断开计时并重置空闲计时；“关闭终端”会中断其中的命令。"}`));
+            elements.push(markdown(`[${label}](${view.reopenUrl}) · 新网页需核对验证码重新授权${waiting ? "，连接成功后启动 Shell" : "，恢复原 Shell"}`));
+            elements.push(taskActionRow([{ text: "关闭终端", type: "danger", value: action("close") }, { text: "刷新", value: action("refresh") }]));
+        }
+        return sectionCard(view.state === "pending" ? "网页终端授权" : "网页终端管理", elements, view.state === "closed" ? "grey" : view.state === "pending" ? "orange" : "blue");
+    }
     renderSafeRestartStatus(view) {
         const actionable = view.phase !== "restarting" && view.phase !== "cancelled" && view.phase !== "superseded";
         const countdown = view.phase === "countdown"
@@ -692,8 +733,35 @@ export class CardRenderer {
             `**重启原因**：${inlineCode(view.reason)}`,
             `**重启倒计时**：${countdown}`,
             `**待投递结果**：${view.pendingFinalDeliveries} 条`,
+            ...(view.activeTerminals ? [`**活动终端**：${view.activeTerminals} 个。结束终端会中断其中的命令；ForceRestart 会中断所有终端。`] : []),
         ];
         const elements = [markdown(lines.join("\n"))];
+        if (view.terminalBlockers?.length) {
+            elements.push({ tag: "hr" }, markdown(`**阻止重启的终端（${view.terminalBlockers.length}）**`));
+            for (const terminal of view.terminalBlockers) {
+                const command = terminal.state === "closing" ? "正在结束，等待 Shell 退出"
+                    : terminal.state === "starting" ? "Shell 启动中"
+                        : terminal.command.status === "idle" ? "无（Shell 空闲）"
+                            : terminal.command.command ? inlineCode(escapeCardHtml(truncateText(terminal.command.command.replace(/\s+/gu, " "), 240)))
+                                : terminal.command.status === "running" ? "命令执行中（命令内容不可用）"
+                                    : "未知（Shell 未提供命令信息）";
+                const connection = terminal.connected ? terminal.foreground ? "网页前台" : "网页已连接" : "网页已断开";
+                const label = `**终端**：${inlineCode(terminal.token)} · ${terminal.active ? "活跃" : "不活跃"} · ${connection}\n**目录**：${inlineCode(escapeCardHtml(truncateText(terminal.cwd, 240)))}\n**${terminal.command.source === "process" ? "前台进程" : "正在执行"}**：${command}`;
+                elements.push({
+                    tag: "column_set", flex_mode: "none", horizontal_spacing: "8px",
+                    columns: [
+                        { tag: "column", width: "weighted", weight: 1, elements: [markdown(label)] },
+                        ...(actionable && terminal.state !== "closing" ? [{
+                                tag: "column", width: "auto", elements: [taskActionElement({
+                                        text: "结束终端", type: "danger",
+                                        value: { action: "safe_restart_terminal_stop", scheduleId: String(view.scheduleId), terminalId: terminal.terminalId, ...(view.contextKey ? { contextKey: view.contextKey } : {}) },
+                                    })],
+                            }] : []),
+                    ],
+                });
+            }
+            elements.push(markdown("活跃：前台连接、正在执行命令或最近 30 秒有输入输出。不活跃的 Shell 仍会阻止安全重启。"));
+        }
         if (view.waitingTasks.length > 0) {
             const visible = view.waitingTasks.slice(0, 10);
             elements.push({ tag: "hr" }, markdown(`**当前等待的任务（${view.waitingTasks.length}）**`));
@@ -1396,6 +1464,10 @@ function renderApprovalElements(state, request) {
             request.reason,
         ].filter(Boolean).join("\n")));
     }
+    if (request.automatic) {
+        elements.push(markdown("自动执行模式：正在自动同意。"));
+        return elements;
+    }
     elements.push({
         tag: "column_set",
         flex_mode: "flow",
@@ -1781,7 +1853,8 @@ function removeMarkdownBold(value) {
 }
 function turnActivities(state) {
     if (state.activities?.length)
-        return state.activities;
+        return state.approval
+            ? state.activities.filter((a) => a.id !== approvalActivityId(state.turnId, state.approval.id)) : state.activities;
     const activities = [];
     if (state.progressText) {
         activities.push({ kind: "reasoning", id: "legacy-progress", text: state.progressText });
@@ -2334,6 +2407,17 @@ function acpPermissionOptionLabel(option) {
     };
     return labels[option.kind] ?? (/^[\x20-\x7E]+$/.test(option.name) ? option.name : "Select");
 }
+const MODEL_PAGE_SIZE = 20;
+function paginateModels(models, currentModel, requestedPage, action) {
+    const totalPages = Math.max(1, Math.ceil(models.length / MODEL_PAGE_SIZE));
+    const currentPage = Math.floor(models.findIndex((model) => model.id === currentModel) / MODEL_PAGE_SIZE);
+    const page = Math.max(0, Math.min(requestedPage ?? currentPage, totalPages - 1));
+    const navigation = totalPages > 1 ? [taskActionRow([
+            ...(page > 0 ? [{ text: "上一页", value: { ...action, page: String(page - 1) } }] : []),
+            ...(page < totalPages - 1 ? [{ text: "下一页", value: { ...action, page: String(page + 1) } }] : []),
+        ], `第 ${page + 1}/${totalPages} 页 · 共 ${models.length} 个模型`)] : [];
+    return { models: models.slice(page * MODEL_PAGE_SIZE, (page + 1) * MODEL_PAGE_SIZE), navigation };
+}
 function settingsTabRow(activeTab, baseAction, showAgentTab, showRuntimeTabs) {
     const tabs = [
         ...(showAgentTab ? [{ id: "agent", label: "Agent" }] : []),
@@ -2412,7 +2496,7 @@ function settingsOptionRow(input) {
                 tag: "column",
                 width: "auto",
                 vertical_align: "center",
-                elements: input.current ? [markdown("✅ 当前")] : [taskActionElement(input.action)],
+                elements: input.current ? [markdown(`✅ ${input.currentLabel ?? "当前"}`)] : [taskActionElement(input.action)],
             },
         ],
     };