@keyou007/agent-bot 0.1.24-alpha.5 → 0.1.24-alpha.7

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/TraePlanEntry.ts

@@ -0,0 +1,63 @@
+import { open } from "node:fs/promises";
+import { z } from "zod";
+
+const MAX_TAIL_BYTES = 256 * 1024;
+const mutation = z.object({
+  type: z.literal("history_mutation"),
+  payload: z.object({
+    version: z.literal(1),
+    turn_id: z.string(),
+    operation: z.string(),
+    items: z.array(z.object({
+      type: z.string(),
+      call_id: z.string().optional(),
+      name: z.string().optional(),
+      output: z.unknown().optional(),
+    })).optional(),
+  }),
+});
+
+// TraeX can finish EnterPlanMode without a mode/changeResolved notification.
+// Read only a bounded tail, and require the exact call and its successful result.
+export async function hasCompletedTraePlanEntry(
+  rolloutPath: string, turnId: string, toolCallId: string,
+): Promise<boolean> {
+  const file = await open(rolloutPath, "r");
+  try {
+    const { size } = await file.stat();
+    const start = Math.max(0, size - MAX_TAIL_BYTES);
+    const buffer = Buffer.alloc(size - start);
+    const { bytesRead } = await file.read(buffer, 0, buffer.length, start);
+    const text = buffer.subarray(0, bytesRead).toString("utf8");
+    const lines = text.split("\n");
+    if (start > 0) lines.shift();
+    lines.pop(); // Ignore an uncommitted/partial final record.
+    let entered = false;
+    let matchedCall = false;
+    for (const line of lines) {
+      let value: unknown;
+      try { value = JSON.parse(line); } catch { continue; }
+      const parsed = mutation.safeParse(value);
+      if (!parsed.success || parsed.data.payload.turn_id !== turnId) continue;
+      const payload = parsed.data.payload;
+      if (payload.operation !== "append") {
+        matchedCall = false;
+        entered = false;
+        continue;
+      }
+      for (const item of payload.items ?? []) {
+        if (item.call_id !== toolCallId) continue;
+        if (item.type === "function_call") {
+          matchedCall = item.name === "EnterPlanMode";
+          entered = false;
+        } else if (item.type === "function_call_output") {
+          entered = matchedCall && typeof item.output === "string"
+            && item.output.startsWith("Entered plan mode.");
+        }
+      }
+    }
+    return entered;
+  } finally {
+    await file.close();
+  }
+}

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,4 +1,5 @@
 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";
@@ -14,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 { ActiveTerminal, TerminalCardView } from "../terminal/TerminalServer.js";
 import { localCardImage } from "./LocalCardImage.js";
 
 export interface StartupStatusView {
@@ -58,6 +60,9 @@ export interface InitializationWelcomeView {
 }
 
 export interface SafeRestartStatusView {
+  activeTerminals?: number;
+  terminalBlockers?: ActiveTerminal[];
+  contextKey?: string;
   scheduleId: number;
   reason: string;
   phase: "waiting_tasks" | "waiting_delivery" | "countdown" | "restarting" | "cancelled" | "superseded";
@@ -85,6 +90,7 @@ export interface ModelSelectorCardView {
   sessionId: string;
   contextKey: string;
   currentModel?: string;
+  modelPage?: number;
   reasoningEffort?: string;
   models: ModelOption[];
   modelProvider?: string;
@@ -131,7 +137,7 @@ export type ExecutionSettingsTab = "agent" | "provider" | "model" | "thinking" |
 
 const EXECUTION_SETTING_EFFECTS: Record<ExecutionSettingsTab, string> = {
   agent: "只影响新建任务，不切换当前任务。",
-  provider: "只影响当前任务，需空闲时切换。",
+  provider: "只影响当前任务；运行中选择将在本轮结束后生效。",
   model: "只影响当前任务，下一轮生效。",
   thinking: "只影响当前任务，下一轮生效。",
   permission: "只影响当前任务，下一轮生效。",
@@ -143,6 +149,8 @@ export interface ExecutionSettingsAgentOption {
 }
 
 export interface ExecutionSettingsCardView {
+  pendingNotice?: string;
+  pendingFailed?: boolean;
   sessionId?: string;
   contextKey: string;
   activeTab: ExecutionSettingsTab;
@@ -152,6 +160,7 @@ export interface ExecutionSettingsCardView {
   runtimeSettingsAvailable: boolean;
   currentProvider?: string;
   currentModel?: string;
+  modelPage?: number;
   currentEffort?: string;
   currentPermissionMode: PermissionMode;
   providers: ModelProviderOption[];
@@ -263,6 +272,7 @@ export interface DismissGroupCardView {
 }
 
 export interface ShellCommandCardView {
+  terminalUrl?: string;
   jobId?: string;
   contextKey?: string;
   command: string;
@@ -508,6 +518,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",
@@ -553,6 +566,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")),
@@ -584,7 +598,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: {
@@ -599,18 +614,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) {
@@ -622,11 +643,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,
             },
@@ -637,6 +660,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: {
@@ -649,7 +673,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> {
@@ -785,7 +809,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",
@@ -823,6 +854,7 @@ export class CardRenderer {
           ],
         };
       }));
+      elements.push(...page.navigation);
     }
     if (view.unifiedSettings) {
       elements.push(
@@ -994,6 +1026,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"
@@ -1021,8 +1071,35 @@ 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.terminalBlockers?.length) {
+      elements.push({ tag: "hr" }, markdown(`**阻止重启的终端（${view.terminalBlockers.length}）**`));
+      for (const terminal of view.terminalBlockers) {
+        const command = terminal.state === "closing" ? "正在结束，等待 Shell 退出"
+          : terminal.state === "starting" ? "Shell 启动中"
+          : terminal.command.status === "idle" ? "无（Shell 空闲）"
+          : terminal.command.command ? inlineCode(escapeCardHtml(truncateText(terminal.command.command.replace(/\s+/gu, " "), 240)))
+          : terminal.command.status === "running" ? "命令执行中（命令内容不可用）"
+          : "未知（Shell 未提供命令信息）";
+        const connection = terminal.connected ? terminal.foreground ? "网页前台" : "网页已连接" : "网页已断开";
+        const label = `**终端**：${inlineCode(terminal.token)} · ${terminal.active ? "活跃" : "不活跃"} · ${connection}\n**目录**：${inlineCode(escapeCardHtml(truncateText(terminal.cwd, 240)))}\n**${terminal.command.source === "process" ? "前台进程" : "正在执行"}**：${command}`;
+        elements.push({
+          tag: "column_set", flex_mode: "none", horizontal_spacing: "8px",
+          columns: [
+            { tag: "column", width: "weighted", weight: 1, elements: [markdown(label)] },
+            ...(actionable && terminal.state !== "closing" ? [{
+              tag: "column", width: "auto", elements: [taskActionElement({
+                text: "结束终端", type: "danger",
+                value: { action: "safe_restart_terminal_stop", scheduleId: String(view.scheduleId), terminalId: terminal.terminalId, ...(view.contextKey ? { contextKey: view.contextKey } : {}) },
+              })],
+            }] : []),
+          ],
+        });
+      }
+      elements.push(markdown("活跃：前台连接、正在执行命令或最近 30 秒有输入输出。不活跃的 Shell 仍会阻止安全重启。"));
+    }
     if (view.waitingTasks.length > 0) {
       const visible = view.waitingTasks.slice(0, 10);
       elements.push({ tag: "hr" }, markdown(`**当前等待的任务（${view.waitingTasks.length}）**`));
@@ -1782,6 +1859,10 @@ function renderApprovalElements(state: TurnViewState, request: ApprovalRequest):
       request.reason,
     ].filter(Boolean).join("\n")));
   }
+  if (request.automatic) {
+    elements.push(markdown("自动执行模式：正在自动同意。"));
+    return elements;
+  }
   elements.push({
     tag: "column_set",
     flex_mode: "flow",
@@ -2246,7 +2327,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) {
@@ -2845,6 +2927,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>,
@@ -2918,6 +3018,7 @@ function settingsTabElement(
 function settingsOptionRow(input: {
   label: string;
   current: boolean;
+  currentLabel?: string;
   action: TaskListCardAction;
 }): Record<string, unknown> {
   return {
@@ -2937,7 +3038,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