@keyou007/agent-bot 0.1.20-alpha.1 → 0.1.21

package/dist/feishu/CardRenderer.js

@@ -2,6 +2,13 @@ import { createHash } from "node:crypto";
 import path from "node:path";
 import { truncateMiddle, truncateText } from "../utils/markdown.js";
 import { localCardImage } from "./LocalCardImage.js";
+const EXECUTION_SETTING_EFFECTS = {
+    agent: "只影响新建任务，不切换当前任务。",
+    provider: "只影响当前任务，需空闲时切换。",
+    model: "只影响当前任务，下一轮生效。",
+    thinking: "只影响当前任务，下一轮生效。",
+    permission: "只影响当前任务，下一轮生效。",
+};
 const DIRECTORY_BROWSER_ROW_COUNT = 16;
 export class CardRenderer {
     thinkingCardLayout;
@@ -234,7 +241,7 @@ export class CardRenderer {
         ];
         if (view.activeTab === "agent") {
             elements.push(...view.agents.map((agent) => settingsOptionRow({
-                label: `${inlineCode(agent.name)} · ${escapeCardHtml(agent.title)}`,
+                label: inlineCode(agent.name),
                 current: agent.name === view.currentAgent,
                 action: {
                     text: "Switch",
@@ -257,9 +264,6 @@ export class CardRenderer {
                 elements.push(...view.providers.map((provider) => settingsOptionRow({
                     label: [
                         inlineCode(provider.id),
-                        provider.displayName && provider.displayName !== provider.id
-                            ? ` · ${escapeCardHtml(provider.displayName)}`
-                            : "",
                         provider.isDefault ? " · 默认" : "",
                     ].join(""),
                     current: provider.id === view.currentProvider,
@@ -331,6 +335,7 @@ export class CardRenderer {
                 },
             })));
         }
+        elements.push(markdown(`> ${EXECUTION_SETTING_EFFECTS[view.activeTab]}`));
         return sectionCard("运行设置", elements, view.notice ? "green" : "blue");
     }
     renderProviderSelector(view) {
@@ -812,7 +817,7 @@ export class CardRenderer {
             },
         };
     }
-    renderTurn(state) {
+    renderTurn(state, previewUrl) {
         const elements = this.thinkingCardLayout === "timeline"
             ? renderTurnElements(state, "hidden")
             : renderGroupedTurnElements(state, "hidden");
@@ -823,17 +828,26 @@ export class CardRenderer {
                 type: "danger",
                 value: { action: "turn_cancel", sessionId: state.sessionId, turnId: state.turnId },
             });
-            elements.push({ tag: "hr" }, taskActionRow(footerActions, renderTurnDuration(state)));
+            if (previewUrl)
+                footerActions.push(turnPreviewAction(previewUrl));
+            elements.push({ tag: "hr" }, taskActionRow(footerActions, renderTurnDuration(state), true));
         }
         else if (state.status === "completed") {
             footerActions.push({
                 text: "Reset",
                 value: { action: "turn_reset", sessionId: state.sessionId, turnId: state.turnId },
             });
-            elements.push({ tag: "hr" }, taskActionRow(footerActions));
+            if (previewUrl)
+                footerActions.push(turnPreviewAction(previewUrl));
+            elements.push({ tag: "hr" }, taskActionRow(footerActions, undefined, true));
         }
         else if (state.status === "starting") {
-            elements.push({ tag: "hr" }, taskActionRow([], renderTurnDuration(state)));
+            if (previewUrl)
+                footerActions.push(turnPreviewAction(previewUrl));
+            elements.push({ tag: "hr" }, taskActionRow(footerActions, renderTurnDuration(state), true));
+        }
+        else if (previewUrl) {
+            elements.push({ tag: "hr" }, taskActionRow([turnPreviewAction(previewUrl)], renderTurnDuration(state)));
         }
         if (state.status === "completed") {
             elements.push({
@@ -843,11 +857,17 @@ export class CardRenderer {
         }
         return turnCard(turnTitle(state.status, state.prompt ?? state.taskTitle), turnTemplate(state.status), elements, renderTurnSubtitle(state));
     }
-    renderTurnDetails(state) {
+    renderTurnDetails(state, previewUrl) {
         const title = state.taskTitle
             ? `任务执行详情：${truncateText(state.taskTitle.replace(/\s+/g, " ").trim(), 60)}`
             : "任务执行详情";
-        return turnCard(title, "blue", renderTurnElements(state, "always"), renderTurnSubtitle(state));
+        const elements = [markdown(`Turn: \`${state.turnId}\``)];
+        if (state.prompt)
+            elements.push(markdown(`**Prompt**\n${truncateText(state.prompt, 1_000)}`));
+        elements.push(...renderTurnElements(state, "always"));
+        if (previewUrl)
+            elements.push(taskActionRow([turnPreviewAction(previewUrl)]));
+        return turnCard(title, "blue", elements, renderTurnSubtitle(state));
     }
     renderActivityHistory(state, requestedPage) {
         const grouped = this.thinkingCardLayout === "grouped";
@@ -1152,9 +1172,9 @@ export class CardRenderer {
             elements.push(markdown("当前任务还没有成功完成的 turn。"));
         }
         else {
+            const sequenceWidth = `${Math.max(16, ...view.entries.map((entry) => String(entry.sequence).length * 10))}px`;
             view.entries.forEach((entry) => {
-                const action = entry.actions?.[0];
-                elements.push(resetHistoryEntryRow(entry.graphNodeLine, entry.graphConnectorLine, entry.lines, entry.timestamp, action, entry.current === true, entry.running === true, entry.resetting === true));
+                elements.push(resetHistoryEntryRow(entry, sequenceWidth));
             });
         }
         if (view.footerLines.length > 0) {
@@ -1791,7 +1811,7 @@ function renderToolDetails(tool, projectCwd) {
     const resultText = result ? truncateToolResult(normalizeTerminalOutput(result).trim()) : undefined;
     return codeBlock([`$ ${commandText}`, resultText].filter((part) => part !== undefined).join("\n"), 2_003);
 }
-function formatShellCommandForDisplay(command) {
+export function formatShellCommandForDisplay(command) {
     const normalized = command.replace(/\r\n/g, "\n");
     let result = "";
     let quote;
@@ -1892,7 +1912,7 @@ function toolPanelTitle(tool) {
     const command = stripAnsi(tool.command ?? tool.title).trim();
     const meaningfulCommand = tool.kind === "web_search"
         ? tool.title
-        : unwrapShellCommand(command) ?? tool.title;
+        : displayToolCommand(command) ?? tool.title;
     const duration = toolDuration(tool);
     const prefix = `${icon} `;
     const suffix = duration ? ` · ${duration}` : "";
@@ -1957,6 +1977,10 @@ function shellCommandStatus(view) {
     }
     return { title: "命令执行失败", label: `退出码 ${view.exitCode ?? "未知"}`, template: "red" };
 }
+export function displayToolCommand(command) {
+    const clean = stripAnsi(command).trim();
+    return unwrapShellCommand(clean);
+}
 function unwrapShellCommand(command) {
     return unwrapPowerShellCommand(command) ?? unwrapPosixShellCommand(command);
 }
@@ -2295,16 +2319,29 @@ function settingsOptionRow(input) {
         ],
     };
 }
-function resetHistoryEntryRow(graphNodeLine, graphConnectorLine, lines, timestamp, action, current, running, resetting) {
+function resetHistoryEntryRow(entry, sequenceWidth) {
+    const { graphNodeLine, graphConnectorLine, lines, timestamp, current, running, resetting } = entry;
+    const action = entry.actions?.[0];
     const branchConnectorLine = graphConnectorLine && /[╱╲]/u.test(graphConnectorLine)
         ? graphConnectorLine
         : undefined;
-    const graph = [
-        `<font color='${current ? "green" : running || resetting ? "orange" : "blue"}'>${escapeCardHtml(graphNodeLine)}</font>`,
-        ...(branchConnectorLine
-            ? [`<font color='grey'>${escapeCardHtml(branchConnectorLine)}</font>`]
-            : []),
-    ].join("\n");
+    const color = current ? "green" : running || resetting ? "orange" : "blue";
+    const nodeLanes = graphNodeLine.match(/[●│]/gu) ?? [];
+    const connectorLanes = branchConnectorLine?.split(" ");
+    // Each lane has its own center; shorter connectors and wider turn numbers cannot shift it.
+    const graphColumns = nodeLanes.map((node, lane) => ({
+        tag: "column",
+        width: "16px",
+        vertical_align: "top",
+        padding: "0px",
+        elements: [{
+                ...markdown([
+                    `<font color='${color}'>${node}</font>`,
+                    ...(connectorLanes?.[lane] ? [`<font color='grey'>${escapeCardHtml(connectorLanes[lane])}</font>`] : []),
+                ].join("\n")),
+                text_align: "center",
+            }],
+    }));
     const trailingElements = current
         ? [markdown("✅ 当前")]
         : resetting
@@ -2325,8 +2362,20 @@ function resetHistoryEntryRow(graphNodeLine, graphConnectorLine, lines, timestam
                 width: "auto",
                 vertical_align: "top",
                 elements: [{
-                        ...markdown(graph),
-                        text_align: "center",
+                        tag: "column_set",
+                        flex_mode: "none",
+                        horizontal_spacing: "0px",
+                        horizontal_align: "left",
+                        columns: [
+                            ...graphColumns,
+                            {
+                                tag: "column",
+                                width: sequenceWidth,
+                                vertical_align: "top",
+                                padding: "0px",
+                                elements: [{ ...markdown(`<font color='${color}'>${entry.sequence}</font>`), text_align: "left" }],
+                            },
+                        ],
                     }],
             },
             {
@@ -2444,10 +2493,16 @@ function taskActionElement(action) {
         padding: "0px",
         has_border: false,
         elements: [markdown(`<font color='${action.type === "danger" ? "red" : "blue"}'>${escapeCardActionText(action.text)}</font>`)],
-        behaviors: [{
-                type: "callback",
-                value: action.value,
-            }],
+        behaviors: action.url
+            ? [{ type: "open_url", default_url: action.url }]
+            : [{ type: "callback", value: action.value }],
+    };
+}
+function turnPreviewAction(previewUrl) {
+    return {
+        text: "Preview",
+        value: {},
+        url: previewUrl,
     };
 }
 function escapeCardActionText(value) {