@keyou007/agent-bot 0.1.20-alpha.0 → 0.1.20

package/src/codex/CodexVersion.ts

@@ -0,0 +1,18 @@
+import { compareSemanticVersions } from "../utils/semanticVersion.js";
+
+// Verified protocol baseline: paginated Turn summaries and excludeTurns.
+export const MINIMUM_CODEX_VERSION = "0.153.4";
+
+export class CodexVersionError extends Error {}
+
+export function codexVersionIssue(version: string | undefined): string | undefined {
+  if (version && /^\d+\.\d+\.\d+(?:-[\w.-]+)?(?:\+[\w.-]+)?$/u.test(version)
+    && compareSemanticVersions(version, MINIMUM_CODEX_VERSION) >= 0) return undefined;
+  return `Codex ${version ?? "版本未知"} 不受支持，AgentBot 需要 Codex >= ${MINIMUM_CODEX_VERSION}。`
+    + "请运行 codex update（或 npm install -g @openai/codex@latest）升级，然后安全重启 AgentBot。";
+}
+
+export function assertSupportedCodexVersion(version: string | undefined): void {
+  const issue = codexVersionIssue(version);
+  if (issue) throw new CodexVersionError(issue);
+}

package/src/codex/ProviderSwitch.ts

@@ -0,0 +1,36 @@
+import { AppServerRequestError } from "./AppServerConnection.js";
+import type { RuntimeExecutionSettings } from "../runtime/types.js";
+
+export const PROVIDER_SWITCH_BUSY = "当前任务正在执行，暂时不能切换 Provider。请等待任务完成，或停止任务后重试。";
+
+export function isMissingRolloutError(error: unknown): boolean {
+  if (error instanceof AppServerRequestError && error.method !== "thread/resume") return false;
+  const message = error instanceof AppServerRequestError ? error.serverMessage
+    : error instanceof Error ? error.message : String(error);
+  if (/paginated history lineage|missing source rollout/iu.test(message)) return false;
+  return /no rollout found|rollout[^\n]*(?:not found|missing)/iu.test(message);
+}
+
+export function assertProviderSettingsApplied(
+  actual: { modelProvider?: string; model?: string },
+  requested: Pick<RuntimeExecutionSettings, "modelProvider" | "model">,
+): void {
+  if (actual.modelProvider !== requested.modelProvider) {
+    throw new Error(`Provider 未生效：请求 ${requested.modelProvider}，实际返回 ${actual.modelProvider ?? "未知"}。`);
+  }
+  if (actual.model !== requested.model) {
+    throw new Error(`模型未生效：请求 ${requested.model}，实际返回 ${actual.model ?? "未知"}。请确认目标 Provider 支持该模型。`);
+  }
+}
+
+export function providerSwitchFailure(error: unknown): string {
+  const message = error instanceof Error ? error.message : String(error);
+  if (/active writer/iu.test(message)) return "任务被另一个 App Server 占用。请在原客户端释放任务后重试。";
+  if (/model[^\n]*(?:unsupported|not supported|not found|unavailable|does not exist)|unknown model/iu.test(message)) {
+    return `目标 Provider 不支持当前模型，请选择兼容的模型后重试。${message}`;
+  }
+  if (/unauthorized|forbidden|auth(?:entication|orization)|api.?key|provider[^\n]*(?:not found|unknown|not configured)/iu.test(message)) {
+    return `请检查目标 Provider 的配置和认证信息。${message}`;
+  }
+  return message;
+}

package/src/config/AgentExecutionDefaultsStore.ts

@@ -26,7 +26,7 @@ export function writeAgentExecutionDefaults(
   if (existingDefaults !== undefined && !isMap(existingDefaults)) {
     throw new Error(`Configuration agents.${agentName}.defaults must contain a YAML mapping: ${configPath}`);
   }
-  if (!isMap(existingDefaults)) agent.set("defaults", {});
+  if (!isMap(existingDefaults)) agent.set("defaults", document.createNode({}));
   const target = agent.get("defaults", true);
   if (!isMap(target)) throw new Error(`Could not create defaults for Agent: ${agentName}`);
 

package/src/feishu/CardRenderer.ts

@@ -1531,18 +1531,9 @@ export class CardRenderer {
     if (view.entries.length === 0) {
       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) {
@@ -2825,24 +2816,31 @@ function settingsOptionRow(input: {
 }
 
 function resetHistoryEntryRow(
-  graphNodeLine: string,
-  graphConnectorLine: string | undefined,
-  lines: string[],
-  timestamp: string | undefined,
-  action: TaskListCardAction | undefined,
-  current: boolean,
-  running: boolean,
-  resetting: boolean,
+  entry: ResetHistoryCardEntry,
+  sequenceWidth: string,
 ): Record<string, unknown> {
+  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
@@ -2863,8 +2861,20 @@ function resetHistoryEntryRow(
         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" }],
+            },
+          ],
         }],
       },
       {

package/src/feishu/FeishuConnector.ts

@@ -3,7 +3,7 @@ import type { WSClient as LarkWsClient, WSConnectionStatus } from "@larksuiteoap
 import type { AppConfig } from "../config/schema.js";
 import { threadContextKey } from "./contextKey.js";
 import { resolveFeishuBotOpenId } from "./FeishuBotIdentity.js";
-import { normalizeFeishuPostText } from "./InboundText.js";
+import { normalizeFeishuPostText, renderFeishuCodeBlock } from "./InboundText.js";
 import { allowsFeishuUser } from "./ownerAccess.js";
 import type { CardAction, ChatUpdatedEvent, FeishuEventHandler, IncomingMessage } from "./types.js";
 
@@ -327,19 +327,29 @@ function parseMessageContent(
   const title = typeof locale.title === "string" ? normalizeFeishuPostText(locale.title) : "";
   if (title) paragraphs.push(title);
   const images: string[] = [];
-  if (Array.isArray(locale.content)) {
-    for (const row of locale.content) {
+  const rows = Array.isArray(locale.content) ? locale.content : locale.content_v2;
+  if (Array.isArray(rows)) {
+    for (const row of rows) {
       if (!Array.isArray(row)) continue;
       let rowText = "";
+      let preserveFormatting = false;
       for (const element of row) {
         if (!isRecord(element)) continue;
         if ((element.tag === "text" || element.tag === "a") && typeof element.text === "string") {
           rowText += element.text;
+        } else if (element.tag === "md" && typeof element.text === "string") {
+          rowText += element.text;
+          preserveFormatting = true;
+        } else if (element.tag === "code_block" && typeof element.text === "string") {
+          rowText += renderFeishuCodeBlock(element.text, element.language);
+          preserveFormatting = true;
         } else if (element.tag === "img" && typeof element.image_key === "string") {
           images.push(element.image_key);
         }
       }
-      const normalizedRow = normalizeFeishuPostText(rowText);
+      const normalizedRow = preserveFormatting
+        ? rowText.replace(/\r\n?/gu, "\n").trim()
+        : normalizeFeishuPostText(rowText);
       if (normalizedRow) paragraphs.push(normalizedRow);
     }
   }
@@ -347,7 +357,7 @@ function parseMessageContent(
 }
 
 function selectPostLocale(content: Record<string, unknown>): Record<string, unknown> | undefined {
-  if (Array.isArray(content.content)) return content;
+  if (Array.isArray(content.content) || Array.isArray(content.content_v2)) return content;
   for (const locale of ["zh_cn", "en_us", "ja_jp"]) {
     if (isRecord(content[locale])) return content[locale];
   }

package/src/feishu/InboundText.ts

@@ -10,3 +10,14 @@ export function normalizeFeishuPostText(value: string): string {
     .replace(/\n{3,}/gu, "\n\n")
     .trim();
 }
+
+export function renderFeishuCodeBlock(text: string, language: unknown): string {
+  const code = text.replace(/\r\n?/gu, "\n").replace(/\n+$/gu, "");
+  if (!code) return "";
+  const longestBacktickRun = Math.max(0, ...[...code.matchAll(/`+/gu)].map((match) => match[0].length));
+  const fence = "`".repeat(Math.max(3, longestBacktickRun + 1));
+  const languageHint = typeof language === "string" && /^[A-Za-z0-9_+#.-]+$/u.test(language.trim())
+    ? language.trim().toLowerCase()
+    : "";
+  return `${fence}${languageHint}\n${code}\n${fence}`;
+}

package/src/feishu/MergedForwardMessage.ts

@@ -1,4 +1,4 @@
-import { normalizeFeishuPostText } from "./InboundText.js";
+import { normalizeFeishuPostText, renderFeishuCodeBlock } from "./InboundText.js";
 
 export const MAX_MERGED_FORWARD_PROMPT_CHARS = 48_000;
 
@@ -266,10 +266,12 @@ function renderPost(
   const paragraphs: string[] = [];
   const title = normalizeFeishuPostText(textValue(locale.title));
   if (title) paragraphs.push(title);
-  if (!Array.isArray(locale.content)) return paragraphs.join("\n");
-  for (const row of locale.content) {
+  const rows = Array.isArray(locale.content) ? locale.content : locale.content_v2;
+  if (!Array.isArray(rows)) return paragraphs.join("\n");
+  for (const row of rows) {
     if (!Array.isArray(row)) continue;
     let rowText = "";
+    let preserveFormatting = false;
     for (const rawElement of row) {
       if (!isRecord(rawElement)) continue;
       const tag = textValue(rawElement.tag);
@@ -279,6 +281,12 @@ function renderPost(
         const text = textValue(rawElement.text);
         const href = textValue(rawElement.href);
         rowText += href && href !== text ? `${text || href} (${href})` : text || href;
+      } else if (tag === "md") {
+        rowText += textValue(rawElement.text);
+        preserveFormatting = true;
+      } else if (tag === "code_block") {
+        rowText += renderFeishuCodeBlock(textValue(rawElement.text), rawElement.language);
+        preserveFormatting = true;
       } else if (tag === "at") {
         rowText += renderMention(rawElement, mentions);
       } else if (tag === "img") {
@@ -287,7 +295,9 @@ function renderPost(
         rowText += "[媒体]";
       }
     }
-    const normalized = normalizeFeishuPostText(rowText);
+    const normalized = preserveFormatting
+      ? rowText.replace(/\r\n?/gu, "\n").trim()
+      : normalizeFeishuPostText(rowText);
     if (normalized) paragraphs.push(normalized);
   }
   return paragraphs.join("\n");
@@ -314,7 +324,7 @@ function replaceMentions(text: string, mentions: MergedForwardMessageItem["menti
 }
 
 function selectPostLocale(content: Record<string, unknown>): Record<string, unknown> | undefined {
-  if (Array.isArray(content.content)) return content;
+  if (Array.isArray(content.content) || Array.isArray(content.content_v2)) return content;
   for (const locale of ["zh_cn", "en_us", "ja_jp"]) {
     if (isRecord(content[locale])) return content[locale];
   }

package/src/index.ts

@@ -483,7 +483,7 @@ async function handleControlRequest(request: ControlRequest): Promise<ControlRes
         ),
       };
     case "task_turns":
-      return { ok: true, data: controller.controlListTaskTurns(request.localSessionId) };
+      return { ok: true, data: await controller.controlListTaskTurns(request.localSessionId) };
     case "task_reset":
       return { ok: true, data: await controller.controlResetTaskToTurn(request.localSessionId, request.turnId) };
     case "task_mute":

package/src/local-files/LocalFileViewerServer.ts

@@ -7,6 +7,7 @@ import dos from "highlight.js/lib/languages/dos";
 import dockerfile from "highlight.js/lib/languages/dockerfile";
 import powershell from "highlight.js/lib/languages/powershell";
 import MarkdownIt from "markdown-it";
+import { isFileUrl, rewriteMarkdownFileLinks } from "./MarkdownFileLinks.js";
 import {
   selectPreferredNetworkAddress,
   type NetworkConnectionKind,
@@ -40,6 +41,11 @@ const MARKDOWN_RENDERER = new MarkdownIt({
     return `<pre class="markdown-code-block hljs"><code${languageAttribute}>${highlighted}</code></pre>`;
   },
 });
+MARKDOWN_RENDERER.renderer.rules.table_open = () =>
+  '<div class="markdown-table-scroll" role="region" aria-label="Markdown 表格" tabindex="0"><table>\n';
+MARKDOWN_RENDERER.renderer.rules.table_close = () => '</table></div>\n';
+const validateMarkdownLink = MARKDOWN_RENDERER.validateLink.bind(MARKDOWN_RENDERER);
+MARKDOWN_RENDERER.validateLink = (url) => isFileUrl(url) || validateMarkdownLink(url);
 
 const HIGHLIGHT_LANGUAGE_BY_EXTENSION: Readonly<Record<string, string>> = {
   ".bash": "bash", ".bat": "dos", ".c": "c", ".cc": "cpp", ".cmd": "dos", ".cpp": "cpp",
@@ -129,16 +135,22 @@ const VIEWER_CLIENT_SCRIPT = `(() => {
   if (typeof ResizeObserver === "function") {
     new ResizeObserver(updateHeaderOffset).observe(header);
   }
-  window.addEventListener("hashchange", () => requestAnimationFrame(positionHashTarget));
+  window.addEventListener("hashchange", () => {
+    if (/^#L\\d+$/u.test(window.location.hash)) setViewMode("code");
+    else requestAnimationFrame(positionHashTarget);
+  });
   requestAnimationFrame(positionHashTarget);
   if (!eventsUrl || typeof EventSource !== "function") return;
 
-  const restoreScroll = (top, left, atBottom, codeScrollLeft) => {
+  const restoreScroll = (top, left, atBottom, codeScrollLeft, tableScrollLeft) => {
     requestAnimationFrame(() => {
       const maxTop = Math.max(0, document.documentElement.scrollHeight - window.innerHeight);
       window.scrollTo(left, atBottom ? maxTop : Math.min(top, maxTop));
       const code = content.querySelector(".code");
       if (code) code.scrollLeft = codeScrollLeft;
+      content.querySelectorAll(".markdown-table-scroll").forEach((table, index) => {
+        table.scrollLeft = tableScrollLeft[index] ?? 0;
+      });
     });
   };
   const replaceContent = (nextContent, nextMetadata) => {
@@ -147,11 +159,12 @@ const VIEWER_CLIENT_SCRIPT = `(() => {
     const maxTop = Math.max(0, document.documentElement.scrollHeight - window.innerHeight);
     const atBottom = maxTop - top <= 24;
     const codeScrollLeft = content.querySelector(".code")?.scrollLeft ?? 0;
+    const tableScrollLeft = Array.from(content.querySelectorAll(".markdown-table-scroll"), (table) => table.scrollLeft);
     content.innerHTML = nextContent;
     metadata.innerHTML = nextMetadata;
     syncViewMode();
     highlightHashTarget();
-    restoreScroll(top, left, atBottom, codeScrollLeft);
+    restoreScroll(top, left, atBottom, codeScrollLeft, tableScrollLeft);
   };
 
   const source = new EventSource(eventsUrl);
@@ -489,7 +502,7 @@ export class LocalFileViewerServer {
     if (classification.kind === "text") {
       const preview = readTextPreview(filePath, stat.size, classification.encoding);
       const previewContent = isMarkdownFile(filePath)
-        ? renderMarkdownDocument(preview.text, filePath)
+        ? renderMarkdownDocument(preview.text, filePath, (target) => this.createPreviewUrl(target))
         : renderText(preview.text, filePath);
       content = `${preview.truncated ? '<div class="notice">文件较大，仅显示开头 2 MiB。可使用下方按钮查看或下载完整文件。</div>' : ""}${previewContent}`;
     } else if (contentType.startsWith("image/")) {
@@ -763,7 +776,9 @@ function renderViewerPage(input: {
     .markdown-body code { padding: .14em .35em; border-radius: 4px; background: #f2f3f5; font-family: var(--viewer-code-font); font-size: .9em; }
     .markdown-body .markdown-code-block { margin: 0 0 1em; padding: 14px 16px; overflow: auto; border-radius: 6px; background: #f6f8fa; line-height: 1.55; }
     .markdown-body .markdown-code-block code { padding: 0; background: transparent; font-size: 13px; }
-    .markdown-body table { display: block; max-width: 100%; overflow: auto; border-collapse: collapse; }
+    .markdown-table-scroll { max-width: 100%; margin: 0 0 1em; overflow-x: auto; }
+    .markdown-table-scroll:focus-visible { outline: 2px solid #1456f0; outline-offset: 2px; }
+    .markdown-body table { width: max-content; margin: 0; border-collapse: collapse; white-space: nowrap; overflow-wrap: normal; word-break: normal; }
     .markdown-body th, .markdown-body td { padding: 7px 12px; border: 1px solid #dfe3e8; text-align: left; }
     .markdown-body th { background: #f5f7fa; }
     .markdown-body img { max-width: 100%; height: auto; }
@@ -1075,8 +1090,12 @@ function renderText(value: string, filePath: string): string {
   }).join("")}</code></pre>`;
 }
 
-function renderMarkdownDocument(value: string, filePath: string): string {
-  return `<article class="markdown-body" data-view-panel="rendered">${MARKDOWN_RENDERER.render(value)}</article><section data-view-panel="code">${renderText(value, filePath)}</section>`;
+function renderMarkdownDocument(value: string, filePath: string, createPreviewUrl: (filePath: string) => URL): string {
+  const environment = {};
+  const tokens = MARKDOWN_RENDERER.parse(value, environment);
+  rewriteMarkdownFileLinks(tokens, filePath, createPreviewUrl);
+  const rendered = MARKDOWN_RENDERER.renderer.render(tokens, MARKDOWN_RENDERER.options, environment);
+  return `<article class="markdown-body" data-view-panel="rendered">${rendered}</article><section data-view-panel="code">${renderText(value, filePath)}</section>`;
 }
 
 function isMarkdownFile(filePath: string): boolean {

package/src/local-files/MarkdownFileLinks.ts

@@ -0,0 +1,64 @@
+import path from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import type { Token } from "markdown-it";
+
+export function isFileUrl(value: string): boolean {
+  return /^file:/iu.test(value);
+}
+
+export function rewriteMarkdownFileLinks(
+  tokens: Token[],
+  markdownPath: string,
+  createPreviewUrl: (filePath: string) => URL,
+): void {
+  for (const token of tokens) {
+    const attribute = token.type === "link_open" ? "href" : token.type === "image" ? "src" : undefined;
+    const target = attribute ? token.attrGet(attribute) : null;
+    if (attribute && typeof target === "string" && target) {
+      const local = resolveLocalTarget(target, markdownPath);
+      if (local) {
+        const url = createPreviewUrl(local.filePath);
+        url.hash = local.hash;
+        if (token.type === "image") url.searchParams.set("raw", "1");
+        token.attrSet(attribute, url.toString());
+      } else if (isFileUrl(target)) {
+        // File URLs are accepted by the parser only to convert them to signed HTTP URLs.
+        token.attrs = token.attrs?.filter(([name]) => name !== attribute) ?? null;
+      }
+    }
+    if (token.children) rewriteMarkdownFileLinks(token.children, markdownPath, createPreviewUrl);
+  }
+}
+
+function resolveLocalTarget(target: string, markdownPath: string): { filePath: string; hash: string } | undefined {
+  if (/^(?:#|\?|\/\/)/u.test(target)) return undefined;
+  const windows = process.platform === "win32";
+  const normalized = windows ? target.replace(/%5c/giu, "/").replaceAll("\\", "/") : target;
+  const drivePath = /^\/?[a-z]:\//iu.test(normalized);
+  const relativeFileWithLine = /^[^:/]+\.[^:/]+:\d+(?::\d+)?(?:#.*)?$/u.test(normalized);
+  if (!drivePath && !isFileUrl(normalized) && !relativeFileWithLine && /^[a-z][a-z\d+.-]*:/iu.test(normalized)) return undefined;
+  const pathEnd = normalized.search(/[?#]/u);
+  const pathTarget = pathEnd < 0 ? normalized : normalized.slice(0, pathEnd);
+  const reference = /:(\d+)(?::\d+)?$/u.exec(pathTarget);
+  const withoutReference = reference
+    ? normalized.slice(0, reference.index) + normalized.slice(reference.index + reference[0].length)
+    : normalized;
+  if (drivePath && !windows) return undefined;
+
+  try {
+    const url = drivePath
+      ? new URL(`file:///${withoutReference.replace(/^\//u, "")}`)
+      : new URL(withoutReference, pathToFileURL(markdownPath));
+    if (url.protocol !== "file:") return undefined;
+    const filePath = fileURLToPath(url);
+    if (!path.isAbsolute(filePath) || /[\x00-\x1f\x7f]/u.test(filePath)) return undefined;
+    const line = /^#L(\d+)(?:C\d+)?(?:-L?\d+(?:C\d+)?)?$/u.exec(url.hash)?.[1]
+      ?? (url.hash ? undefined : reference?.[1]);
+    const hash = line && Number.isSafeInteger(Number(line)) && Number(line) > 0
+      ? `#L${Number(line)}`
+      : url.hash;
+    return { filePath: path.resolve(filePath), hash };
+  } catch {
+    return undefined;
+  }
+}