@keyou007/agent-bot 0.1.24-alpha.4 → 0.1.24-alpha.6

package/src/codex/ProviderSwitch.ts

@@ -1,24 +1,23 @@
-import { AppServerRequestError } from "./AppServerConnection.js";
 import type { RuntimeExecutionSettings } from "../runtime/types.js";
 
 export const PROVIDER_SWITCH_BUSY = "当前任务正在执行，暂时不能切换 Provider。请等待任务完成，或停止任务后重试。";
+export const PROVIDER_SWITCH_EMPTY = "App Server 尚未保存此空会话，无法在保留任务 ID 的前提下切换 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 class ProviderSwitchError extends Error {
+  constructor(message: string, readonly previousSettingsRestored: boolean, options?: ErrorOptions) {
+    super(message, options);
+    this.name = "ProviderSwitchError";
+  }
 }
 
 export function assertProviderSettingsApplied(
   actual: { modelProvider?: string; model?: string },
-  requested: Pick<RuntimeExecutionSettings, "modelProvider" | "model">,
+  requested: Partial<Pick<RuntimeExecutionSettings, "modelProvider" | "model">>,
 ): void {
-  if (actual.modelProvider !== requested.modelProvider) {
-    throw new Error(`Provider 未生效：请求 ${requested.modelProvider}，实际返回 ${actual.modelProvider ?? "未知"}。`);
+  if (requested.modelProvider !== undefined && actual.modelProvider !== requested.modelProvider) {
+    throw new Error(`Provider 未生效：请求 ${requested.modelProvider}，实际返回 ${actual.modelProvider ?? "未知"}。App Server 未应用设置；可在任务空闲后安全重启再重试，不会自动 Fork 或更改历史。`);
   }
-  if (actual.model !== requested.model) {
+  if (requested.model !== undefined && actual.model !== requested.model) {
     throw new Error(`模型未生效：请求 ${requested.model}，实际返回 ${actual.model ?? "未知"}。请确认目标 Provider 支持该模型。`);
   }
 }
@@ -29,7 +28,7 @@ export function providerSwitchFailure(error: unknown): string {
   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)) {
+  if (/unauthorized|forbidden|auth(?:enticat(?:e|ion)|orization)|api.?key|provider[^\n]*(?:not found|unknown|not configured)/iu.test(message)) {
     return `请检查目标 Provider 的配置和认证信息。${message}`;
   }
   return message;

package/src/codex/ThreadWriterProcess.ts

@@ -29,8 +29,9 @@ export class SystemThreadWriterProcessController implements ThreadWriterProcessC
   async inspect(lockPath: string): Promise<ThreadWriterProcess[]> {
     try {
       await access(lockPath);
-    } catch {
-      return [];
+    } catch (error) {
+      if ((error as NodeJS.ErrnoException).code === "ENOENT") return [];
+      throw error;
     }
     return process.platform === "win32"
       ? inspectWindowsLockOwners(lockPath)
@@ -134,12 +135,15 @@ async function inspectWindowsLockOwners(lockPath: string): Promise<ThreadWriterP
 async function inspectPosixLockOwners(lockPath: string): Promise<ThreadWriterProcess[]> {
   const pids = await posixLockOwnerPids(lockPath);
   const owners = await Promise.all(pids.map((pid) => inspectPosixProcess(pid)));
+  if (owners.some((owner) => !owner)) throw new Error("Cannot identify a reported thread writer; retry the inspection.");
   return owners.filter((owner): owner is ThreadWriterProcess => owner !== undefined);
 }
 
 async function posixLockOwnerPids(lockPath: string): Promise<number[]> {
   const lsof = await tryExecuteFile("lsof", ["-t", "--", lockPath]);
-  const raw = lsof.ok ? lsof.stdout : (await tryExecuteFile("fuser", [lockPath])).stdout;
+  const result = lsof.ok || lsof.noMatches ? lsof : await tryExecuteFile("fuser", [lockPath]);
+  if (!result.ok && !result.noMatches) throw new Error("Cannot inspect thread writers: lsof and fuser failed.");
+  const raw = result.stdout;
   return [...new Set(raw.match(/\d+/gu)?.map(Number).filter((pid) => Number.isSafeInteger(pid) && pid > 0) ?? [])];
 }
 
@@ -233,11 +237,15 @@ function executeFile(command: string, args: string[], extraEnv: Record<string, s
   });
 }
 
-function tryExecuteFile(command: string, args: string[]): Promise<{ ok: boolean; stdout: string }> {
-  return executeFile(command, args).then(
-    (stdout) => ({ ok: true, stdout }),
-    () => ({ ok: false, stdout: "" }),
-  );
+function tryExecuteFile(command: string, args: string[]): Promise<{ ok: boolean; stdout: string; noMatches: boolean }> {
+  return new Promise((resolve) => {
+    execFile(command, args, {
+      timeout: PROCESS_INSPECTION_TIMEOUT_MS, maxBuffer: MAX_PROCESS_OUTPUT_BYTES, windowsHide: true, encoding: "utf8",
+    }, (error, stdout, stderr) => resolve({
+      ok: !error, stdout,
+      noMatches: error?.code === 1 && !error.killed && !stdout.trim() && !stderr.trim(),
+    }));
+  });
 }
 
 function positiveInteger(value: unknown): number | undefined {
@@ -352,7 +360,7 @@ try {
   for ($index = 0; $index -lt $count; $index++) {
     $writerPid = $items[$index].Process.dwProcessId
     $writer = Get-AgentBotProcess $writerPid
-    if ($null -eq $writer) { continue }
+    if ($null -eq $writer) { throw "Cannot identify reported thread writer PID $writerPid; retry the inspection." }
     $application = $writer
     $cursor = $writer
     for ($depth = 0; $depth -lt 8 -and $cursor.ParentProcessId -gt 1; $depth++) {

package/src/config/AgentExecutionDefaultsStore.ts

@@ -33,7 +33,9 @@ export function writeAgentExecutionDefaults(
   for (const key of DEFAULT_KEYS) {
     const value = defaults[key];
     if (value !== undefined) target.set(key, value);
+    else target.delete(key);
   }
+  if (target.items.length === 0) agent.delete("defaults");
 
   const updated = document.toString();
   if (updated === original) return false;

package/src/config/loadConfig.ts

@@ -30,6 +30,10 @@ updates:
   # Daily stable update check, private 60-second cancellation window, then safe update.
   enabled: true
 
+terminal:
+  enabled: true
+  # Shares fileViewer host, port and publicBaseUrl; keeps independent owner authorization.
+
 fileViewer:
   enabled: true
   # Use 0.0.0.0 to accept LAN connections and automatically prefer

package/src/config/schema.ts

@@ -57,6 +57,9 @@ export const agentConfigSchema = z.object({
 });
 
 export const appConfigSchema = z.object({
+  terminal: z.object({
+    enabled: z.boolean().default(true),
+  }).default({ enabled: true }),
   updates: z.object({ enabled: z.boolean().default(true) }).default({ enabled: true }),
   console: z
     .object({
@@ -108,6 +111,7 @@ export type AgentConfig = Omit<ParsedAgentConfig, "defaults"> & {
   defaults?: AgentExecutionDefaults;
 };
 export type GroupNameFormatConfig = z.infer<typeof groupNameFormatSchema>;
-export type AppConfig = Omit<z.infer<typeof appConfigSchema>, "updates"> & {
+export type AppConfig = Omit<z.infer<typeof appConfigSchema>, "updates" | "terminal"> & {
   updates?: { enabled: boolean };
+  terminal?: z.infer<typeof appConfigSchema>["terminal"];
 };

package/src/feishu/CardRenderer.ts

@@ -1,9 +1,11 @@
 import { createHash } from "node:crypto";
+import { approvalActivityId } from "../presentation/TurnStateReducer.js";
 import path from "node:path";
 import type { JsonValue } from "../acp/acpTypes.js";
 import type { RuntimeSession } from "../acp/AcpSessionManager.js";
 import type {
   ApprovalDecision,
+  ApprovalRequest,
   ModelOption,
   ModelProviderOption,
   PermissionMode,
@@ -13,6 +15,7 @@ import type {
 import type { TurnActivity, TurnViewState, TurnViewStatus } from "../presentation/turnViewTypes.js";
 import { truncateMiddle, truncateText } from "../utils/markdown.js";
 import type { UpdateNotice } from "../updates/types.js";
+import type { TerminalCardView } from "../terminal/TerminalServer.js";
 import { localCardImage } from "./LocalCardImage.js";
 
 export interface StartupStatusView {
@@ -57,6 +60,7 @@ export interface InitializationWelcomeView {
 }
 
 export interface SafeRestartStatusView {
+  activeTerminals?: number;
   scheduleId: number;
   reason: string;
   phase: "waiting_tasks" | "waiting_delivery" | "countdown" | "restarting" | "cancelled" | "superseded";
@@ -84,6 +88,7 @@ export interface ModelSelectorCardView {
   sessionId: string;
   contextKey: string;
   currentModel?: string;
+  modelPage?: number;
   reasoningEffort?: string;
   models: ModelOption[];
   modelProvider?: string;
@@ -130,7 +135,7 @@ export type ExecutionSettingsTab = "agent" | "provider" | "model" | "thinking" |
 
 const EXECUTION_SETTING_EFFECTS: Record<ExecutionSettingsTab, string> = {
   agent: "只影响新建任务，不切换当前任务。",
-  provider: "只影响当前任务，需空闲时切换。",
+  provider: "只影响当前任务；运行中选择将在本轮结束后生效。",
   model: "只影响当前任务，下一轮生效。",
   thinking: "只影响当前任务，下一轮生效。",
   permission: "只影响当前任务，下一轮生效。",
@@ -142,6 +147,8 @@ export interface ExecutionSettingsAgentOption {
 }
 
 export interface ExecutionSettingsCardView {
+  pendingNotice?: string;
+  pendingFailed?: boolean;
   sessionId?: string;
   contextKey: string;
   activeTab: ExecutionSettingsTab;
@@ -151,6 +158,7 @@ export interface ExecutionSettingsCardView {
   runtimeSettingsAvailable: boolean;
   currentProvider?: string;
   currentModel?: string;
+  modelPage?: number;
   currentEffort?: string;
   currentPermissionMode: PermissionMode;
   providers: ModelProviderOption[];
@@ -197,6 +205,7 @@ export interface SessionTaskCardEntry {
   reference: string;
   summary: string;
   detailLines: string[];
+  stopAction?: TaskListCardAction;
   actions?: TaskListCardAction[];
   current?: boolean;
 }
@@ -261,6 +270,7 @@ export interface DismissGroupCardView {
 }
 
 export interface ShellCommandCardView {
+  terminalUrl?: string;
   jobId?: string;
   contextKey?: string;
   command: string;
@@ -506,6 +516,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",
@@ -551,6 +564,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")),
@@ -582,7 +596,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: {
@@ -597,18 +612,24 @@ export class CardRenderer {
       if (view.models.length === 0) {
         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") {
       if (!view.currentModel) {
@@ -620,11 +641,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,
             },
@@ -635,6 +658,7 @@ export class CardRenderer {
       elements.push(...(["auto", "confirm"] as PermissionMode[]).map((mode) => settingsOptionRow({
         label: `${inlineCode(mode)} · ${permissionModeLabel(mode)}`,
         current: mode === view.currentPermissionMode,
+        currentLabel: view.pendingNotice ? "待生效" : undefined,
         action: {
           text: "Switch",
           value: {
@@ -647,7 +671,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: ProviderSelectorCardView): Record<string, unknown> {
@@ -783,7 +807,14 @@ export class CardRenderer {
     if (view.models.length === 0) {
       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",
@@ -821,6 +852,7 @@ export class CardRenderer {
           ],
         };
       }));
+      elements.push(...page.navigation);
     }
     if (view.unifiedSettings) {
       elements.push(
@@ -992,6 +1024,24 @@ export class CardRenderer {
       view.status === "completed" ? "green" : view.status === "cancelled" ? "grey" : "blue");
   }
 
+  renderTerminalAuthorization(view: TerminalCardView): Record<string, unknown> {
+    const action = (decision: string) => ({ action: "terminal_authorize", contextKey: view.contextKey, requestId: view.requestId, token: view.approvalToken, decision });
+    const elements: Record<string, unknown>[] = [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: SafeRestartStatusView): Record<string, unknown> {
     const actionable = view.phase !== "restarting" && view.phase !== "cancelled" && view.phase !== "superseded";
     const countdown = view.phase === "countdown"
@@ -1019,6 +1069,7 @@ export class CardRenderer {
       `**重启原因**：${inlineCode(view.reason)}`,
       `**重启倒计时**：${countdown}`,
       `**待投递结果**：${view.pendingFinalDeliveries} 条`,
+      ...(view.activeTerminals ? [`**活动终端**：${view.activeTerminals} 个，请在网页或原会话的终端管理卡中关闭。ForceRestart 会中断终端。`] : []),
     ];
     const elements: Record<string, unknown>[] = [markdown(lines.join("\n"))];
     if (view.waitingTasks.length > 0) {
@@ -1698,38 +1749,7 @@ function renderTurnElements(
   elements.push(...renderActivities(visibleActivities, state.projectCwd));
   if (state.fileSummary.length > 0) elements.push(fileSummaryPanel(state));
 
-  if (state.approval) {
-    const request = state.approval;
-    elements.push(markdown([
-      `**${request.title}**`,
-      request.command ? codeBlock(request.command, 800) : undefined,
-      request.reason,
-    ].filter(Boolean).join("\n")));
-    elements.push({
-      tag: "column_set",
-      flex_mode: "flow",
-      horizontal_spacing: "8px",
-      columns: request.options.map((option) => ({
-        tag: "column",
-        width: "auto",
-        elements: [{
-          tag: "button",
-          text: { tag: "plain_text", content: request.kind === "mode_change" ? option.label : approvalDecisionLabel(option.id) },
-          type: option.id === "accept" || option.id === "acceptForSession" ? "primary" : option.id === "cancel" ? "danger" : "default",
-          behaviors: [{
-            type: "callback",
-            value: {
-              action: "approval",
-              sessionId: state.sessionId,
-              turnId: state.turnId,
-              requestId: request.id,
-              decision: option.id,
-            },
-          }],
-        }],
-      })),
-    });
-  }
+  if (state.approval) elements.push(...renderApprovalElements(state, state.approval));
   if (state.error) elements.push(markdown(codeBlock(state.error, 2_000)));
   const showAssistantText = state.assistantText && assistantTextMode === "always";
   if (showAssistantText) {
@@ -1769,38 +1789,7 @@ function renderGroupedTurnElements(
   elements.push(...renderGroupedActivityGroups(visibleGroups, state.projectCwd));
   if (state.fileSummary.length > 0) elements.push(fileSummaryPanel(state));
 
-  if (state.approval) {
-    const request = state.approval;
-    elements.push(markdown([
-      `**${request.title}**`,
-      request.command ? codeBlock(request.command, 800) : undefined,
-      request.reason,
-    ].filter(Boolean).join("\n")));
-    elements.push({
-      tag: "column_set",
-      flex_mode: "flow",
-      horizontal_spacing: "8px",
-      columns: request.options.map((option) => ({
-        tag: "column",
-        width: "auto",
-        elements: [{
-          tag: "button",
-          text: { tag: "plain_text", content: request.kind === "mode_change" ? option.label : approvalDecisionLabel(option.id) },
-          type: option.id === "accept" || option.id === "acceptForSession" ? "primary" : option.id === "cancel" ? "danger" : "default",
-          behaviors: [{
-            type: "callback",
-            value: {
-              action: "approval",
-              sessionId: state.sessionId,
-              turnId: state.turnId,
-              requestId: request.id,
-              decision: option.id,
-            },
-          }],
-        }],
-      })),
-    });
-  }
+  if (state.approval) elements.push(...renderApprovalElements(state, state.approval));
   if (state.error) elements.push(markdown(codeBlock(state.error, 2_000)));
   const showAssistantText = state.assistantText && assistantTextMode === "always";
   if (showAssistantText) {
@@ -1812,6 +1801,83 @@ function renderGroupedTurnElements(
   return elements;
 }
 
+function renderApprovalElements(state: TurnViewState, request: ApprovalRequest): Record<string, unknown>[] {
+  const elements: Record<string, unknown>[] = [];
+  const command = request.command?.trim();
+  if (command && request.kind !== "mode_change") {
+    elements.push(markdown("**命令执行确认**"));
+    const reason = request.reason?.trim()
+      || (request.title.trim() !== command ? request.title.trim() : "");
+    if (reason && reason !== command) {
+      const preview = approvalTextPreview(reason, 1_000, escapeApprovalText);
+      elements.push(markdown(escapeApprovalText(preview)));
+      if (preview !== reason) elements.push(markdown("<font color='grey'>说明较长，请在 Preview 中查看完整内容。</font>"));
+    }
+    const display = displayToolCommand(command) ?? command;
+    const summary = truncateText(display.replace(/\s+/gu, " "), 64);
+    const preview = approvalTextPreview(command, 2_200);
+    elements.push(collapsiblePanel(`查看命令 · ${summary}`, [
+      markdown(codeBlock(preview, preview.length)),
+      ...(preview !== command ? [markdown("<font color='grey'>命令过长，卡片仅显示开头。请在 Preview 中查看完整命令后再授权。</font>")] : []),
+    ], {
+      elementId: `approval_${createHash("sha256").update(request.id).digest("hex").slice(0, 11)}`,
+      compact: true,
+      borderColor: "grey",
+    }));
+  } else {
+    elements.push(markdown([
+      `**${request.title}**`,
+      request.command ? codeBlock(request.command, 800) : undefined,
+      request.reason,
+    ].filter(Boolean).join("\n")));
+  }
+  if (request.automatic) {
+    elements.push(markdown("自动执行模式：正在自动同意。"));
+    return elements;
+  }
+  elements.push({
+    tag: "column_set",
+    flex_mode: "flow",
+    horizontal_spacing: "8px",
+    columns: request.options.map((option) => ({
+      tag: "column",
+      width: "auto",
+      elements: [{
+        tag: "button",
+        text: { tag: "plain_text", content: request.kind === "mode_change" ? option.label : approvalDecisionLabel(option.id) },
+        type: option.id === "accept" || option.id === "acceptForSession" ? "primary" : option.id === "cancel" ? "danger" : "default",
+        behaviors: [{
+          type: "callback",
+          value: {
+            action: "approval",
+            sessionId: state.sessionId,
+            turnId: state.turnId,
+            requestId: request.id,
+            decision: option.id,
+          },
+        }],
+      }],
+    })),
+  });
+  return elements;
+}
+
+function approvalTextPreview(value: string, maxBytes: number, encode = (text: string): string => text): string {
+  if (Buffer.byteLength(JSON.stringify(encode(value)), "utf8") <= maxBytes) return value;
+  let bytes = 5;
+  let result = "";
+  for (const character of value) {
+    bytes += Buffer.byteLength(JSON.stringify(encode(character)), "utf8") - 2;
+    if (bytes > maxBytes) break;
+    result += character;
+  }
+  return `${result}...`;
+}
+
+function escapeApprovalText(value: string): string {
+  return escapeCardHtml(value).replace(/[\\`*_[\]#]/gu, (character) => `&#${character.codePointAt(0)};`);
+}
+
 function emptyTurnText(status: TurnViewStatus, agentLabel?: string): string {
   const label = agentLabel?.trim().replace(/[\r\n]+/g, " ") || "Agent";
   if (status === "starting") return `正在连接 ${label}…`;
@@ -2233,7 +2299,8 @@ function removeMarkdownBold(value: string): string {
 }
 
 function turnActivities(state: TurnViewState): TurnActivity[] {
-  if (state.activities?.length) return state.activities;
+  if (state.activities?.length) return state.approval
+    ? state.activities.filter((a) => a.id !== approvalActivityId(state.turnId, state.approval!.id)) : state.activities;
 
   const activities: TurnActivity[] = [];
   if (state.progressText) {
@@ -2298,6 +2365,7 @@ function collapsiblePanel(
 
 function sessionTaskPanel(entry: SessionTaskCardEntry): Record<string, unknown> {
   const elements: Record<string, unknown>[] = [markdown(entry.detailLines.join("\n"))];
+  if (entry.stopAction) elements.push(sessionActionButton(entry.stopAction));
   if (entry.actions?.length) elements.push(sessionActionOverflow(entry.actions));
   return collapsiblePanel(entry.summary, elements, {
     elementId: sessionTaskPanelElementId(entry.reference),
@@ -2831,6 +2899,24 @@ function acpPermissionOptionLabel(option: { name: string; kind: string }): strin
   return labels[option.kind] ?? (/^[\x20-\x7E]+$/.test(option.name) ? option.name : "Select");
 }
 
+const MODEL_PAGE_SIZE = 20;
+
+function paginateModels(
+  models: ModelOption[],
+  currentModel: string | undefined,
+  requestedPage: number | undefined,
+  action: Record<string, string>,
+): { models: ModelOption[]; navigation: Record<string, unknown>[] } {
+  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: ExecutionSettingsTab,
   baseAction: Record<string, string>,
@@ -2904,6 +2990,7 @@ function settingsTabElement(
 function settingsOptionRow(input: {
   label: string;
   current: boolean;
+  currentLabel?: string;
   action: TaskListCardAction;
 }): Record<string, unknown> {
   return {
@@ -2923,7 +3010,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)],
       },
     ],
   };

package/src/feishu/FeishuConnector.ts

@@ -262,6 +262,7 @@ function toIncomingMessage(
   const messageId = message.message_id ?? `${Date.now()}`;
   return {
     messageId,
+    ...(typeof messageType === "string" ? { messageType } : {}),
     ...(Number.isFinite(Number(message.create_time)) && Number(message.create_time) > 0
       ? { createdAt: Number(message.create_time) } : {}),
     contextKey: chatId