@keyou007/agent-bot 0.1.14-alpha.1 → 0.1.14-alpha.2

package/dist/feishu/CardRenderer.js

@@ -1,6 +1,6 @@
 import { createHash } from "node:crypto";
 import path from "node:path";
-import { truncateMiddle, truncateText } from "../utils/markdown.js";
+import { truncateText } from "../utils/markdown.js";
 import { localCardImage } from "./LocalCardImage.js";
 const DIRECTORY_BROWSER_ROW_COUNT = 16;
 export class CardRenderer {
@@ -630,15 +630,22 @@ export class CardRenderer {
     }
     renderActivityHistory(state, requestedPage) {
         const grouped = this.thinkingCardLayout === "grouped";
+        const activities = turnActivities(state);
+        const allGroups = grouped ? groupTurnActivities(activities).flatMap(splitGroupedExecutionActivity) : [];
+        const historyGroups = grouped
+            ? groupedLiveActivityPage(groupedActivityPagesFromGroups(allGroups, state.projectCwd), state.projectCwd).historyGroups
+            : [];
+        const usesHistoricalPrefixPages = historyGroups.length > 0;
         const pages = grouped
-            ? groupedActivityPages(turnActivities(state), state.projectCwd, {
+            ? groupedActivityPagesFromGroups(usesHistoricalPrefixPages ? historyGroups : allGroups, state.projectCwd, {
                 fullActivityText: true,
                 includeReasoningHistory: true,
             })
-            : activityPages(turnActivities(state));
+            : activityPages(activities);
         if (pages.length === 0) {
             return this.renderSectionsCard("思考活动历史", [{ lines: ["没有保存到活动记录。"] }]);
         }
+        const totalPages = usesHistoricalPrefixPages ? pages.length + 1 : pages.length;
         const page = Math.max(0, Math.min(Math.trunc(requestedPage), pages.length - 1));
         const actions = [
             ...(pages.length > 1 ? [{
@@ -649,7 +656,7 @@ export class CardRenderer {
                     text: "上一页",
                     value: { action: "activity_history", turnId: state.turnId, page: String(page - 1) },
                 }] : []),
-            ...(page < pages.length - 2 ? [{
+            ...(page < pages.length - (usesHistoricalPrefixPages ? 1 : 2) ? [{
                     text: "下一页",
                     value: { action: "activity_history", turnId: state.turnId, page: String(page + 1) },
                 }] : []),
@@ -663,7 +670,7 @@ export class CardRenderer {
                 includeReasoningHistory: true,
             })
             : renderActivities(pages[page] ?? [], state.projectCwd, true)));
-        return sectionCard(`思考活动历史 · ${page + 1}/${pages.length}`, elements.length > 0 ? elements : [markdown("无")]);
+        return sectionCard(`思考活动历史 · ${page + 1}/${totalPages}`, elements.length > 0 ? elements : [markdown("无")]);
     }
     renderSessionStarted(session) {
         return this.baseCard("ACP 会话已创建", "green", [
@@ -953,26 +960,26 @@ function renderGroupedTurnElements(state, assistantTextMode) {
     const elements = [];
     const allActivities = turnActivities(state);
     const livePages = groupedActivityPages(allActivities, state.projectCwd);
-    const historyPages = groupedActivityPages(allActivities, state.projectCwd, {
+    const visible = groupedLiveActivityPage(livePages, state.projectCwd);
+    const historyPages = groupedActivityPagesFromGroups(visible.historyGroups, state.projectCwd, {
         fullActivityText: true,
         includeReasoningHistory: true,
     });
-    const visibleGroups = livePages.at(-1) ?? [];
     if (state.plan.length > 0)
         elements.push(planPanel(state.plan));
-    if (historyPages.length > 1) {
+    if (historyPages.length > 0) {
         elements.push(taskActionRow([{
-                text: `查看历史思考（共 ${historyPages.length} 页）`,
+                text: `查看历史思考（共 ${historyPages.length + 1} 页）`,
                 value: {
                     action: "activity_history",
                     turnId: state.turnId,
-                    page: String(historyPages.length - 2),
+                    page: String(historyPages.length - 1),
                 },
             }]));
     }
-    if (state.activitiesTruncated || livePages.length > 1 || historyPages.length > 1)
+    if (state.activitiesTruncated && visible.groups[0]?.kind !== "gap")
         elements.push(markdown("…"));
-    elements.push(...renderGroupedActivityGroups(visibleGroups, state.projectCwd));
+    elements.push(...renderGroupedActivityGroups(visible.groups, state.projectCwd));
     if (state.fileSummary.length > 0)
         elements.push(fileSummaryPanel(state));
     if (state.approval) {
@@ -1101,6 +1108,8 @@ function renderActivities(activities, projectCwd, fullAssistantText = false) {
 }
 function renderGroupedActivityGroups(groups, projectCwd, options = {}) {
     return groups.flatMap((group) => {
+        if (group.kind === "gap")
+            return [markdown("…")];
         if (group.kind === "activity") {
             return renderActivity(group.activity, projectCwd, options.fullActivityText === true);
         }
@@ -1169,19 +1178,17 @@ function executionActivityPanel(group, projectCwd, includeReasoningHistory = fal
     return collapsiblePanel(executionActivityTitle(group, status), elements, {
         elementId: executionActivityPanelElementId(group.id),
         expanded: false,
-        borderColor: status === "failed" ? "red" : status === "running" ? "blue" : "grey",
+        borderColor: status === "running" ? "blue" : "grey",
         compact: true,
     });
 }
 function executionActivityStatus(tools) {
     if (tools.some((tool) => tool.status === "running"))
         return "running";
-    if (tools.some((tool) => tool.status === "failed"))
-        return "failed";
     return "completed";
 }
 function executionActivityTitle(group, status) {
-    const icon = status === "running" ? "⏳" : status === "failed" ? "❌" : "💭";
+    const icon = status === "running" ? "⏳" : "💭";
     const latestReasoning = group.latestReasoning?.text
         ? removeMarkdownBold(group.latestReasoning.text).replace(/\s+/g, " ").trim()
         : "";
@@ -1189,9 +1196,7 @@ function executionActivityTitle(group, status) {
         ? truncateText(latestReasoning, 90)
         : status === "running"
             ? "正在执行工具"
-            : status === "failed"
-                ? "工具执行失败"
-                : "已执行工具";
+            : "已执行工具";
     return `${icon} ${summary} · ${group.tools.length} 个工具`;
 }
 function executionActivityPanelElementId(activityId) {
@@ -1217,6 +1222,7 @@ const ACTIVITIES_PER_PAGE = 40;
 const GROUPED_TOOLS_PER_PANEL = 8;
 const GROUPED_PAGE_ACTIVITY_BYTES = 24 * 1024;
 const GROUPED_PAGE_ACTIVITY_COMPONENTS = 160;
+const PINNED_LIVE_COMMENTARIES = 3;
 const MAX_LIVE_ASSISTANT_TEXT = 2_000;
 const ACTIVITY_TEXT_CHUNK = 2_500;
 function activityPages(activities) {
@@ -1234,6 +1240,9 @@ function activityPages(activities) {
 }
 function groupedActivityPages(activities, projectCwd, renderOptions = {}) {
     const groups = groupTurnActivities(activities).flatMap(splitGroupedExecutionActivity);
+    return groupedActivityPagesFromGroups(groups, projectCwd, renderOptions);
+}
+function groupedActivityPagesFromGroups(groups, projectCwd, renderOptions = {}) {
     if (groups.length === 0)
         return [];
     const newestFirst = [];
@@ -1256,6 +1265,69 @@ function groupedActivityPageFits(groups, projectCwd, renderOptions) {
     return Buffer.byteLength(JSON.stringify(elements), "utf8") <= GROUPED_PAGE_ACTIVITY_BYTES
         && countCardComponents(elements) <= GROUPED_PAGE_ACTIVITY_COMPONENTS;
 }
+function groupedLiveActivityPage(pages, projectCwd) {
+    const latest = pages.at(-1) ?? [];
+    if (pages.length <= 1)
+        return { groups: latest, historyGroups: [] };
+    const groups = pages.flat();
+    const latestStart = groups.length - latest.length;
+    const commentaryIndexes = groups
+        .map((group, index) => isCommentaryGroup(group) ? index : -1)
+        .filter((index) => index >= 0);
+    if (commentaryIndexes.length === 0) {
+        return { groups: latest, historyGroups: groups.slice(0, latestStart) };
+    }
+    const selected = new Set();
+    const pinnedCommentaries = commentaryIndexes.slice(0, PINNED_LIVE_COMMENTARIES);
+    for (const index of pinnedCommentaries)
+        selected.add(index);
+    const latestCommentary = commentaryIndexes.at(-1);
+    for (let index = latestCommentary; index < groups.length; index += 1)
+        selected.add(index);
+    const renderSelection = (selection) => ({
+        groups: groupsWithGaps(groups, selection),
+        historyGroups: groups.filter((_group, index) => index < latestCommentary || !selection.has(index)),
+    });
+    const fits = (selection) => {
+        const view = renderSelection(selection);
+        return groupedActivityPageFits(view.groups, projectCwd, {});
+    };
+    if (!fits(selected)) {
+        const latestExecutions = [...selected]
+            .filter((index) => index > latestCommentary && groups[index]?.kind === "execution")
+            .sort((left, right) => left - right);
+        const newestExecution = latestExecutions.at(-1);
+        for (const index of latestExecutions) {
+            if (fits(selected) || index === newestExecution)
+                break;
+            selected.delete(index);
+        }
+    }
+    return renderSelection(selected);
+}
+function isCommentaryGroup(group) {
+    return group.kind === "activity" && isCommentaryActivity(group.activity);
+}
+function groupsWithGaps(groups, selected) {
+    const indexes = [...selected].sort((left, right) => left - right);
+    const visible = [];
+    const append = (group) => {
+        if (group.kind === "gap" && visible.at(-1)?.kind === "gap")
+            return;
+        visible.push(group);
+    };
+    let previous = -1;
+    for (const index of indexes) {
+        if (previous >= 0 && index > previous + 1) {
+            append({ kind: "gap", id: `gap:${previous}:${index}` });
+        }
+        const group = groups[index];
+        if (group)
+            append(group);
+        previous = index;
+    }
+    return visible;
+}
 function countCardComponents(value) {
     if (Array.isArray(value)) {
         return value.reduce((total, entry) => total + countCardComponents(entry), 0);
@@ -1415,12 +1487,21 @@ function renderToolDetails(tool, projectCwd) {
     const result = tool.error ?? tool.output ?? fileSummary;
     const normalizedCommand = stripAnsi(command).trim();
     const displayCommand = tool.kind === "command"
-        ? unwrapPowerShellCommand(normalizedCommand) ?? normalizedCommand
+        ? unwrapShellCommand(normalizedCommand) ?? normalizedCommand
         : normalizedCommand;
-    const commandText = truncateText(displayCommand, 800);
-    const resultText = result ? truncateMiddle(stripAnsi(result).trim(), 1_200) : undefined;
+    const commandText = truncateText(displayCommand, 600);
+    const resultText = result ? truncateToolResult(stripAnsi(result).trim()) : undefined;
     return codeBlock([`$ ${commandText}`, resultText].filter((part) => part !== undefined).join("\n"), 2_003);
 }
+function truncateToolResult(result) {
+    const maxLength = 900;
+    const marker = "\n...\n";
+    const tailLength = 600;
+    if (result.length <= maxLength)
+        return result;
+    const headLength = maxLength - marker.length - tailLength;
+    return `${result.slice(0, headLength)}${marker}${result.slice(-tailLength)}`;
+}
 function displayFilePath(filePath, projectCwd) {
     if (!projectCwd)
         return filePath;
@@ -1447,7 +1528,7 @@ function toolPanelTitle(tool) {
     const command = stripAnsi(tool.command ?? tool.title).trim();
     const meaningfulCommand = tool.kind === "web_search"
         ? tool.title
-        : unwrapPowerShellCommand(command) ?? tool.title;
+        : unwrapShellCommand(command) ?? tool.title;
     const duration = toolDuration(tool);
     const prefix = `${icon} `;
     const suffix = duration ? ` · ${duration}` : "";
@@ -1494,6 +1575,9 @@ function formatTurnDuration(durationMs) {
         return `${String(totalMinutes).padStart(2, "0")}:${String(seconds).padStart(2, "0")}`;
     return `${seconds}s`;
 }
+function unwrapShellCommand(command) {
+    return unwrapPowerShellCommand(command) ?? unwrapPosixShellCommand(command);
+}
 function unwrapPowerShellCommand(command) {
     const executable = command.match(/^(?:"[^"]*(?:pwsh|powershell)\.exe"|(?:\S*[\\/])?(?:pwsh|powershell)(?:\.exe)?)(?=\s|$)/i);
     if (!executable)
@@ -1505,6 +1589,71 @@ function unwrapPowerShellCommand(command) {
     const payload = args.slice(commandFlag.index + commandFlag[0].length).trim();
     if (!payload)
         return undefined;
+    return unwrapQuotedPayload(payload);
+}
+function unwrapPosixShellCommand(command) {
+    let executable = readCommandWord(command, 0);
+    if (!executable)
+        return undefined;
+    if (posixExecutableName(executable.value) === "env") {
+        let cursor = executable.end;
+        while (true) {
+            const candidate = readCommandWord(command, cursor);
+            if (!candidate)
+                return undefined;
+            const name = posixExecutableName(candidate.value);
+            if (isPosixShell(name)) {
+                executable = candidate;
+                break;
+            }
+            if (!candidate.value.startsWith("-") && !/^[A-Za-z_][A-Za-z0-9_]*=/.test(candidate.value)) {
+                return undefined;
+            }
+            cursor = candidate.end;
+        }
+    }
+    else if (!isPosixShell(posixExecutableName(executable.value))) {
+        return undefined;
+    }
+    const args = command.slice(executable.end);
+    const commandFlag = /(?:^|\s)(?:-[A-Za-z]*c[A-Za-z]*|--command)(?:\s+|=)/.exec(args);
+    if (!commandFlag)
+        return undefined;
+    const payload = args.slice(commandFlag.index + commandFlag[0].length).trim();
+    if (!payload)
+        return undefined;
+    return unwrapQuotedPayload(payload);
+}
+function readCommandWord(command, start) {
+    let cursor = start;
+    while (cursor < command.length && /\s/.test(command[cursor] ?? ""))
+        cursor += 1;
+    if (cursor >= command.length)
+        return undefined;
+    const quote = command[cursor];
+    if (quote === "\"" || quote === "'") {
+        const endQuote = command.indexOf(quote, cursor + 1);
+        if (endQuote < 0)
+            return undefined;
+        return { value: command.slice(cursor + 1, endQuote), end: endQuote + 1 };
+    }
+    const word = /^\S+/.exec(command.slice(cursor));
+    if (!word)
+        return undefined;
+    return { value: word[0], end: cursor + word[0].length };
+}
+function posixExecutableName(executable) {
+    return executable.replaceAll("\\", "/").split("/").at(-1)?.toLowerCase() ?? "";
+}
+function isPosixShell(executable) {
+    return executable === "sh"
+        || executable === "bash"
+        || executable === "zsh"
+        || executable === "dash"
+        || executable === "ksh"
+        || executable === "fish";
+}
+function unwrapQuotedPayload(payload) {
     const quote = payload[0];
     if ((quote === "\"" || quote === "'") && payload.at(-1) === quote)
         return payload.slice(1, -1).trim();