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

package/src/feishu/CardRenderer.ts

@@ -11,7 +11,7 @@ import type {
   ToolState,
 } from "../runtime/types.js";
 import type { TurnActivity, TurnViewState, TurnViewStatus } from "../presentation/turnViewTypes.js";
-import { truncateText } from "../utils/markdown.js";
+import { truncateMiddle, truncateText } from "../utils/markdown.js";
 import { localCardImage } from "./LocalCardImage.js";
 
 export interface StartupStatusView {
@@ -195,7 +195,6 @@ export interface DirectoryBrowserCardEntry {
   name: string;
   kind: "directory" | "drive" | "file" | "image" | "binary";
   openAction?: TaskListCardAction;
-  actions?: TaskListCardAction[];
 }
 
 export interface DirectoryBrowserCardView {
@@ -233,6 +232,17 @@ export interface DismissGroupCardView {
   requestedBy: string;
 }
 
+export interface ShellCommandCardView {
+  command: string;
+  cwd: string;
+  stdout: string;
+  stderr: string;
+  status: "running" | "completed" | "failed" | "timed_out";
+  exitCode?: number | null;
+  elapsedMs: number;
+  outputTruncated: boolean;
+}
+
 export class CardRenderer {
   private readonly thinkingCardLayout: ThinkingCardLayout;
 
@@ -240,6 +250,35 @@ export class CardRenderer {
     this.thinkingCardLayout = options.thinkingCardLayout ?? "grouped";
   }
 
+  renderShellCommandCard(view: ShellCommandCardView): Record<string, unknown> {
+    const stdout = normalizeTerminalOutput(view.stdout).trimEnd();
+    const stderr = normalizeTerminalOutput(view.stderr).trimEnd();
+    const rawOutput = [
+      stdout,
+      stderr ? `[stderr]\n${stderr}` : "",
+    ].filter(Boolean).join("\n");
+    const displayOutput = truncateMiddle(
+      rawOutput,
+      6_000,
+      "\n\n... 中间输出已截断 ...\n\n",
+    );
+    const command = truncateMiddle(view.command.trim(), 600, " ... ");
+    const output = displayOutput || (view.status === "running" ? "等待输出..." : "（无输出）");
+    const status = shellCommandStatus(view);
+    const outputWasTruncated = view.outputTruncated || rawOutput.length > 6_000;
+    return sectionCard(
+      status.title,
+      [
+        markdown(codeBlock(`$  ${command}\n${output}`, 6_700)),
+        markdown([
+          `${inlineCode(view.cwd)} · ${status.label} · ${formatTurnDuration(view.elapsedMs)}`,
+          ...(outputWasTruncated ? ["输出过长，已保留开头和结尾并截断中间内容。"] : []),
+        ].join("\n")),
+      ],
+      status.template,
+    );
+  }
+
   renderExecutionSettings(view: ExecutionSettingsCardView): Record<string, unknown> {
     const baseAction: Record<string, string> = {
       contextKey: view.contextKey,
@@ -803,7 +842,6 @@ export class CardRenderer {
       schema: "2.0",
       config: {
         update_multi: true,
-        width_mode: "fill",
       },
       header: {
         template: view.kind === "first" ? "turquoise" : view.kind === "upgrade" ? "blue" : "green",
@@ -869,7 +907,7 @@ export class CardRenderer {
       });
       elements.push(
         { tag: "hr" },
-        taskActionRow(footerActions),
+        taskActionRow(footerActions, renderTurnDuration(state)),
       );
     } else if (state.status === "completed") {
       footerActions.push({
@@ -880,6 +918,11 @@ export class CardRenderer {
         { tag: "hr" },
         taskActionRow(footerActions),
       );
+    } else if (state.status === "starting") {
+      elements.push(
+        { tag: "hr" },
+        taskActionRow([], renderTurnDuration(state)),
+      );
     }
     if (state.status === "completed") {
       elements.push(
@@ -1724,37 +1767,27 @@ function groupedLiveActivityPage(
   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<number>();
-  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: ReadonlySet<number>): LiveGroupedActivityPage => ({
-    groups: groupsWithGaps(groups, selection),
-    historyGroups: groups.filter((_group, index) => index < latestCommentary || !selection.has(index)),
-  });
-  const fits = (selection: ReadonlySet<number>): boolean => {
-    const view = renderSelection(selection);
-    return groupedActivityPageFits(view.groups, projectCwd, {});
+  const renderCutoff = (cutoff: number): LiveGroupedActivityPage => {
+    const selected = new Set<number>(commentaryIndexes
+      .filter((index) => index < cutoff)
+      .slice(-PINNED_LIVE_COMMENTARIES));
+    for (let index = cutoff; index < groups.length; index += 1) selected.add(index);
+    return {
+      groups: groupsWithGaps(groups, selected),
+      historyGroups: groups.slice(0, cutoff),
+    };
   };
 
-  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);
-    }
+  const executionCutoffs = groups
+    .map((group, index) => group.kind === "execution" && group.tools.length > 0 ? index : -1)
+    .filter((index) => index > 0);
+  for (const cutoff of executionCutoffs) {
+    const view = renderCutoff(cutoff);
+    if (groupedActivityPageFits(view.groups, projectCwd, {})) return view;
   }
 
-  return renderSelection(selected);
+  if (executionCutoffs.length > 0) return renderCutoff(executionCutoffs.at(-1)!);
+  return { groups: latest, historyGroups: groups.slice(0, latestStart) };
 }
 
 function isCommentaryGroup(group: GroupedTurnActivity): boolean {
@@ -1964,10 +1997,26 @@ function renderToolDetails(tool: ToolState, projectCwd?: string): string {
     ? unwrapShellCommand(normalizedCommand) ?? normalizedCommand
     : normalizedCommand;
   const commandText = truncateText(displayCommand, 600);
-  const resultText = result ? truncateToolResult(stripAnsi(result).trim()) : undefined;
+  const resultText = result ? truncateToolResult(normalizeTerminalOutput(result).trim()) : undefined;
   return codeBlock([`$ ${commandText}`, resultText].filter((part): part is string => part !== undefined).join("\n"), 2_003);
 }
 
+function normalizeTerminalOutput(value: string): string {
+  const clean = stripAnsi(value).replace(/\r\n/g, "\n");
+  return clean
+    .split("\n")
+    .map((line) => {
+      if (!line.includes("\r")) return line;
+      const updates = line.split("\r");
+      for (let index = updates.length - 1; index >= 0; index -= 1) {
+        const update = updates[index];
+        if (update) return update;
+      }
+      return "";
+    })
+    .join("\n");
+}
+
 function truncateToolResult(result: string): string {
   const maxLength = 900;
   const marker = "\n...\n";
@@ -2054,6 +2103,23 @@ function formatTurnDuration(durationMs: number): string {
   return `${seconds}s`;
 }
 
+function shellCommandStatus(view: ShellCommandCardView): {
+  title: string;
+  label: string;
+  template: string;
+} {
+  if (view.status === "running") {
+    return { title: "正在执行命令", label: "运行中", template: "blue" };
+  }
+  if (view.status === "timed_out") {
+    return { title: "命令执行超时", label: "已超时（120s）", template: "orange" };
+  }
+  if (view.status === "completed") {
+    return { title: "命令执行完成", label: `退出码 ${view.exitCode ?? 0}`, template: "green" };
+  }
+  return { title: "命令执行失败", label: `退出码 ${view.exitCode ?? "未知"}`, template: "red" };
+}
+
 function unwrapShellCommand(command: string): string | undefined {
   return unwrapPowerShellCommand(command) ?? unwrapPosixShellCommand(command);
 }
@@ -2415,18 +2481,29 @@ function resetHistoryEntryRow(
   };
 }
 
-function taskActionRow(actions: TaskListCardAction[]): Record<string, unknown> {
+function taskActionRow(actions: TaskListCardAction[], trailingText?: string): Record<string, unknown> {
+  const columns = actions.map((action) => ({
+    tag: "column",
+    width: "auto",
+    vertical_align: "center",
+    elements: [taskActionElement(action)],
+  }));
+  if (trailingText) {
+    columns.push({
+      tag: "column",
+      width: "auto",
+      vertical_align: "center",
+      elements: [markdown(
+        `<font color='grey'>${actions.length > 0 ? "· " : ""}${escapeCardHtml(trailingText)}</font>`,
+      )],
+    });
+  }
   return {
     tag: "column_set",
     flex_mode: "flow",
     horizontal_spacing: "8px",
     margin: "2px 0 0 0",
-    columns: actions.map((action) => ({
-      tag: "column",
-      width: "auto",
-      vertical_align: "center",
-      elements: [taskActionElement(action)],
-    })),
+    columns,
   };
 }
 
@@ -2448,12 +2525,6 @@ function directoryBrowserEntryRow(entry: DirectoryBrowserCardEntry): Record<stri
           ? [taskActionElement({ ...entry.openAction, text: label })]
           : [markdown(escapeCardHtml(label))],
       },
-      ...(entry.actions ?? []).map((action) => ({
-        tag: "column",
-        width: "auto",
-        vertical_align: "center",
-        elements: [taskActionElement(action)],
-      })),
     ],
   };
 }

package/src/feishu/FeishuConnector.ts

@@ -2,8 +2,9 @@ import type { Logger } from "pino";
 import type { AppConfig } from "../config/schema.js";
 import { threadContextKey } from "./contextKey.js";
 import { resolveFeishuBotOpenId } from "./FeishuBotIdentity.js";
+import { normalizeFeishuPostText } from "./InboundText.js";
 import { allowsFeishuUser } from "./ownerAccess.js";
-import type { ChatUpdatedEvent, FeishuEventHandler, IncomingMessage } from "./types.js";
+import type { CardAction, ChatUpdatedEvent, FeishuEventHandler, IncomingMessage } from "./types.js";
 
 type BotOpenIdResolver = (appId: string, appSecret: string) => Promise<string>;
 type BotOpenIdListener = (botOpenId: string) => void;
@@ -88,6 +89,7 @@ export class FeishuConnector {
           });
       },
       "card.action.trigger": async (data: unknown) => {
+        const receivedAt = Date.now();
         const operatorOpenId = getFeishuEvent(data)?.operator?.open_id;
         if (!allowsFeishuUser(this.config, operatorOpenId)) {
           this.logger.debug(
@@ -102,11 +104,11 @@ export class FeishuConnector {
           return {};
         }
 
-        void Promise.resolve()
-          .then(() => this.handler.onCardAction(action))
-          .catch((error: unknown) => {
-            this.logger.error({ error, actionId: action.actionId }, "Failed to handle Feishu card action.");
-          });
+        this.deferCardAction(action, receivedAt);
+        this.logger.debug(
+          { actionId: action.actionId, messageId: action.messageId, responsePreparedInMs: Date.now() - receivedAt },
+          "Prepared the Feishu card action acknowledgement.",
+        );
         return {
           toast: {
             type: "success",
@@ -122,6 +124,27 @@ export class FeishuConnector {
     await wsClient.start({ eventDispatcher });
     this.logger.info("Feishu WebSocket connector started.");
   }
+
+  private deferCardAction(action: CardAction, receivedAt: number): void {
+    setImmediate(() => {
+      const startedAt = Date.now();
+      this.logger.debug(
+        { actionId: action.actionId, messageId: action.messageId, dispatchDelayMs: startedAt - receivedAt },
+        "Started deferred Feishu card action handling.",
+      );
+      void Promise.resolve()
+        .then(() => this.handler.onCardAction(action))
+        .then(() => {
+          this.logger.debug(
+            { actionId: action.actionId, messageId: action.messageId, durationMs: Date.now() - startedAt },
+            "Completed Feishu card action handling.",
+          );
+        })
+        .catch((error: unknown) => {
+          this.logger.error({ error, actionId: action.actionId }, "Failed to handle Feishu card action.");
+        });
+    });
+  }
 }
 
 function toChatUpdatedEvent(data: unknown): ChatUpdatedEvent | undefined {
@@ -171,8 +194,9 @@ function toIncomingMessage(
     return undefined;
   }
 
+  const messageId = message.message_id ?? `${Date.now()}`;
   return {
-    messageId: message.message_id ?? `${Date.now()}`,
+    messageId,
     contextKey: chatId
       ? threadContext
         ? threadContextKey(chatId, threadId!)
@@ -189,6 +213,8 @@ function toIncomingMessage(
     ...(mentionedBot ? { mentionedBot: true as const } : {}),
     text: parsed.text,
     ...(parsed.images.length > 0 ? { images: parsed.images.map((imageKey) => ({ imageKey })) } : {}),
+    ...(parsed.files.length > 0 ? { files: parsed.files } : {}),
+    ...(parsed.mergedForward ? { mergedForwardMessageId: messageId } : {}),
   };
 }
 
@@ -201,21 +227,36 @@ function parseMessageContent(
   messageType: unknown,
   content: Record<string, unknown>,
   mentions: unknown,
-): { text: string; images: string[] } | undefined {
+): {
+  text: string;
+  images: string[];
+  files: Array<{ fileKey: string; fileName: string }>;
+  mergedForward?: true;
+} | undefined {
   if (messageType === "text") {
     const rawText = typeof content.text === "string" ? content.text : "";
-    return { text: stripLeadingMentions(rawText, mentions), images: [] };
+    return { text: normalizeFeishuPostText(stripLeadingMentions(rawText, mentions)), images: [], files: [] };
   }
   if (messageType === "image") {
     const imageKey = typeof content.image_key === "string" ? content.image_key : undefined;
-    return imageKey ? { text: "", images: [imageKey] } : undefined;
+    return imageKey ? { text: "", images: [imageKey], files: [] } : undefined;
+  }
+  if (messageType === "file") {
+    const fileKey = typeof content.file_key === "string" ? content.file_key : undefined;
+    const fileName = typeof content.file_name === "string" && content.file_name.trim()
+      ? content.file_name.trim()
+      : "file";
+    return fileKey ? { text: "", images: [], files: [{ fileKey, fileName }] } : undefined;
+  }
+  if (messageType === "merge_forward") {
+    return { text: "", images: [], files: [], mergedForward: true };
   }
   if (messageType !== "post") return undefined;
 
   const locale = selectPostLocale(content);
   if (!locale) return undefined;
   const paragraphs: string[] = [];
-  const title = typeof locale.title === "string" ? locale.title.trim() : "";
+  const title = typeof locale.title === "string" ? normalizeFeishuPostText(locale.title) : "";
   if (title) paragraphs.push(title);
   const images: string[] = [];
   if (Array.isArray(locale.content)) {
@@ -230,10 +271,11 @@ function parseMessageContent(
           images.push(element.image_key);
         }
       }
-      if (rowText.trim()) paragraphs.push(rowText.trim());
+      const normalizedRow = normalizeFeishuPostText(rowText);
+      if (normalizedRow) paragraphs.push(normalizedRow);
     }
   }
-  return { text: paragraphs.join("\n"), images: [...new Set(images)] };
+  return { text: paragraphs.join("\n"), images: [...new Set(images)], files: [] };
 }
 
 function selectPostLocale(content: Record<string, unknown>): Record<string, unknown> | undefined {

package/src/feishu/FeishuMarkdown.ts

@@ -1,3 +1,5 @@
+import path from "node:path";
+
 interface FenceState {
   indent: string;
   marker: "`" | "~";
@@ -9,7 +11,7 @@ const FENCE_OPENER = /^([ \t]*)((?:`{3,})|(?:~{3,}))(.*)$/;
 const MARKDOWN_LINK = /(!?)\[([^\]\r\n]*)\]\((<?[^)\r\n]+>?)\)/g;
 const LOCAL_FILE_LINE_REFERENCE = /(:\d+(?::\d+)?)$/;
 
-export function normalizeFeishuMarkdown(markdown: string): string {
+export function normalizeFeishuMarkdown(markdown: string, projectCwd?: string): string {
   const lines = markdown.match(/[^\r\n]*(?:\r\n|\n)|[^\r\n]+$/g) ?? [];
   let fence: FenceState | undefined;
 
@@ -19,7 +21,7 @@ export function normalizeFeishuMarkdown(markdown: string): string {
 
     if (!fence) {
       const opener = FENCE_OPENER.exec(body);
-      if (!opener?.[2]) return `${includeLocalFileLineReferences(body)}${ending}`;
+      if (!opener?.[2]) return `${includeLocalFileLineReferences(body, projectCwd)}${ending}`;
 
       const indent = opener[1] ?? "";
       const delimiter = opener[2];
@@ -40,7 +42,7 @@ export function normalizeFeishuMarkdown(markdown: string): string {
   }).join("");
 }
 
-function includeLocalFileLineReferences(markdown: string): string {
+function includeLocalFileLineReferences(markdown: string, projectCwd?: string): string {
   return markdown.replace(MARKDOWN_LINK, (link, imageMarker: string, label: string, rawTarget: string) => {
     if (imageMarker) return link;
 
@@ -48,11 +50,68 @@ function includeLocalFileLineReferences(markdown: string): string {
     if (!isLocalFileTarget(target)) return link;
 
     const reference = LOCAL_FILE_LINE_REFERENCE.exec(target)?.[1];
-    if (!reference || label.endsWith(reference)) return link;
-    return `[${label}${reference}](${rawTarget})`;
+    const projectPathLabel = projectCwd ? projectFilePathLabel(target, projectCwd, reference) : undefined;
+    const normalizedLabel = projectPathLabel
+      ?? (reference && !label.endsWith(reference) ? `${label}${reference}` : label);
+    return normalizedLabel === label ? link : `[${normalizedLabel}](${rawTarget})`;
   });
 }
 
+function projectFilePathLabel(
+  target: string,
+  projectCwd: string,
+  reference: string | undefined,
+): string | undefined {
+  const targetWithoutReference = reference ? target.slice(0, -reference.length) : target;
+  const filePath = localFilePath(targetWithoutReference);
+  if (!filePath) return undefined;
+  if (!isInsideProject(filePath, projectCwd)) {
+    return `${displayAbsolutePath(filePath)}${reference ?? ""}`;
+  }
+
+  const pathApi = usesWindowsPaths(filePath, projectCwd) ? path.win32 : path.posix;
+  const parsed = pathApi.parse(filePath);
+  if (Array.from(parsed.name).length > 5) return undefined;
+
+  const parentName = pathApi.basename(pathApi.dirname(filePath));
+  if (!parentName) return undefined;
+  return `${parentName}${pathApi.sep}${parsed.base}${reference ?? ""}`;
+}
+
+function localFilePath(target: string): string | undefined {
+  if (!/^file:\/\//i.test(target)) return normalizeWindowsDrivePrefix(target);
+
+  let value = target.slice("file://".length);
+  try {
+    value = decodeURIComponent(value);
+  } catch {
+    // Keep malformed percent escapes visible instead of dropping the link.
+  }
+  if (/^\/[a-z]:[\\/]/i.test(value)) return value.slice(1);
+  if (value.startsWith("/")) return value;
+  return `//${value}`;
+}
+
+function normalizeWindowsDrivePrefix(value: string): string {
+  return /^\/[a-z]:[\\/]/i.test(value) ? value.slice(1) : value;
+}
+
+function isInsideProject(filePath: string, projectCwd: string): boolean {
+  const pathApi = usesWindowsPaths(filePath, projectCwd) ? path.win32 : path.posix;
+  const relative = pathApi.relative(pathApi.resolve(projectCwd), pathApi.resolve(filePath));
+  return relative === ""
+    || (relative !== ".." && !relative.startsWith(`..${pathApi.sep}`) && !pathApi.isAbsolute(relative));
+}
+
+function displayAbsolutePath(filePath: string): string {
+  if (!usesWindowsPaths(filePath)) return path.posix.normalize(filePath);
+  return path.win32.normalize(filePath);
+}
+
+function usesWindowsPaths(...values: string[]): boolean {
+  return values.some((value) => /^\/?[a-z]:[\\/]/i.test(value) || /^\\\\/.test(value));
+}
+
 function unwrapMarkdownTarget(target: string): string {
   return target.startsWith("<") && target.endsWith(">") ? target.slice(1, -1) : target;
 }