@keyou007/agent-bot 0.1.24-alpha.0 → 0.1.24-alpha.2

package/src/feishu/FeishuMarkdown.ts

@@ -54,11 +54,25 @@ function includeLocalFileLineReferences(
   projectCwd?: string,
   localFileUrl?: LocalFileUrlResolver,
 ): string {
-  return markdown.replace(MARKDOWN_LINK, (link, imageMarker: string, label: string, rawTarget: string) => {
-    if (imageMarker) return link;
+  const codeSpans = inlineCodeSpans(markdown);
+  return markdown.replace(MARKDOWN_LINK, (link, imageMarker: string, label: string, rawTarget: string, offset: number) => {
+    if (imageMarker || codeSpans.some(([start, end]) => offset >= start && offset < end)) return link;
 
     const target = unwrapMarkdownTarget(rawTarget.trim());
-    if (!isLocalFileTarget(target)) return link;
+    if (!isLocalFileTarget(target)) {
+      const relative = resolveRelativeFileTarget(target, projectCwd);
+      if (!relative || isLocalImageTarget(relative.filePath)) return link;
+      const viewerUrl = localFileUrl?.(relative.filePath, relative.reference);
+      if (!viewerUrl) {
+        const displayPath = displayAbsolutePath(relative.filePath) + (relative.reference ?? "");
+        return label ? `${label}(${inlineCode(displayPath)})` : inlineCode(displayPath);
+      }
+      const url = new URL(viewerUrl);
+      if (relative.hash) url.hash = relative.hash;
+      const normalizedLabel = relative.reference && !label.endsWith(relative.reference)
+        ? `${label}${relative.reference}` : label;
+      return `[${normalizedLabel}](${url.toString()})`;
+    }
     if (isLocalImageTarget(target)) return link;
 
     const reference = LOCAL_FILE_LINE_REFERENCE.exec(target)?.[1];
@@ -84,6 +98,58 @@ function includeLocalFileLineReferences(
   });
 }
 
+interface RelativeFileTarget {
+  filePath: string;
+  reference?: string;
+  hash?: string;
+}
+
+function resolveRelativeFileTarget(target: string, projectCwd?: string): RelativeFileTarget | undefined {
+  if (!projectCwd || !target || /^(?:#|\?|\/\/)/u.test(target)) return undefined;
+  const pathApi = usesWindowsPaths(projectCwd) ? path.win32 : path.posix;
+  if (!pathApi.isAbsolute(projectCwd)) return undefined;
+  const suffixStart = target.search(/[?#]/u);
+  const pathTarget = suffixStart < 0 ? target : target.slice(0, suffixStart);
+  const lineSuffix = LOCAL_FILE_LINE_REFERENCE.exec(pathTarget)?.[1];
+  // A basename with a line suffix (report.md:12) is a file, not a URI scheme.
+  const fileWithLine = /^[^:/\\]+\.[^:/\\]+:\d+(?::\d+)?$/u.test(pathTarget);
+  if (!fileWithLine && /^[a-z][a-z\d+.-]*:/iu.test(target)) return undefined;
+  const encodedPath = lineSuffix ? pathTarget.slice(0, -lineSuffix.length) : pathTarget;
+  try {
+    const decodedPath = decodeURIComponent(encodedPath);
+    if (!decodedPath || /[\x00-\x1f\x7f]/u.test(decodedPath)
+      || pathApi.isAbsolute(decodedPath) || /^[a-z]:/iu.test(decodedPath)) return undefined;
+    const filePath = pathApi.resolve(projectCwd, decodedPath);
+    const hashStart = target.indexOf("#");
+    const hash = hashStart < 0 ? undefined : new URL(target.slice(hashStart), "http://localhost/").hash;
+    const hashLine = /^#L(\d+)(?:C\d+)?(?:-L?\d+(?:C\d+)?)?$/u.exec(hash ?? "")?.[1];
+    const validHashLine = hashLine && Number.isSafeInteger(Number(hashLine)) && Number(hashLine) > 0;
+    return {
+      filePath,
+      reference: validHashLine ? `:${Number(hashLine)}` : hash ? undefined : lineSuffix,
+      hash: validHashLine ? `#L${Number(hashLine)}` : hash,
+    };
+  } catch {
+    return undefined;
+  }
+}
+
+function inlineCodeSpans(markdown: string): Array<[number, number]> {
+  const runs = [...markdown.matchAll(/`+/gu)];
+  const spans: Array<[number, number]> = [];
+  for (let index = 0; index < runs.length; index += 1) {
+    const opener = runs[index]!;
+    const backslashes = /\\*$/u.exec(markdown.slice(0, opener.index))?.[0].length ?? 0;
+    if (backslashes % 2 !== 0) continue;
+    const closing = runs.findIndex((run, candidate) => candidate > index && run[0].length === opener[0].length);
+    if (closing < 0) continue;
+    const closer = runs[closing]!;
+    spans.push([opener.index, closer.index + closer[0].length]);
+    index = closing;
+  }
+  return spans;
+}
+
 function projectFilePathLabel(
   target: string,
   projectCwd: string,

package/src/feishu/FeishuTurnPresenter.ts

@@ -684,6 +684,7 @@ function eventPriority(event: AgentEvent): "normal" | "critical" {
     || event.type === "approval_resolved"
     || event.type === "tool_started"
     || event.type === "context_compaction"
+    || (event.type === "progress" && event.severity === "warning")
   ) {
     return "critical";
   }

package/src/index.ts

@@ -192,6 +192,10 @@ if (feishuOutbound && config.updates?.enabled !== false) {
 const controller = new ProxySessionController(config, store, runtimes, outbound, logger, {
   supervised,
   restart: requestRestart,
+  forceSafeRestart: async (scheduleId) => {
+    if (shuttingDown || restartRequested) return false;
+    return safeRestart.forceScheduled(scheduleId);
+  },
   cancelAutomaticUpdate: async (action) => {
     if (!dailyUpdateMonitor) throw new Error("自动更新功能未启用。");
     await dailyUpdateMonitor.cancel(action);

package/src/local-files/TurnPreviewPage.ts

@@ -46,6 +46,9 @@ const PREVIEW_LABELS = {
     model: "模型",
     tools: "个工具",
     turnTokens: "本轮",
+    totalTokens: "总计",
+    cachedTokens: "缓存命中",
+    nonCachedTokens: "非缓存",
     compactionTokens: "压缩",
     compactionAfterTokens: "压缩后",
     characters: "字符",
@@ -84,6 +87,9 @@ const PREVIEW_LABELS = {
     model: "Model",
     tools: "tools",
     turnTokens: "Turn",
+    totalTokens: "Total",
+    cachedTokens: "Cache hit",
+    nonCachedTokens: "Non-cached",
     compactionTokens: "Compaction",
     compactionAfterTokens: "After compaction",
     characters: "characters",
@@ -302,6 +308,7 @@ export function renderTurnPreviewSnapshot(
       : "",
     timeline ? `<section class="timeline">${timeline}</section>` : `<div class="empty">${escapeHtml(language === "zh" ? "正在等待 Agent 返回进度…" : "Waiting for Agent progress…")}</div>`,
     state.fileSummary.length > 0 ? renderFileSummary(state, language, resolveFileUrl) : "",
+    state.approval ? `<section class="notice"><h2>${escapeHtml(state.approval.title)}</h2><div class="markdown">${renderText(state.approval.reason ?? "")}</div><p>${escapeHtml(language === "zh" ? "请在飞书任务卡片中确认或拒绝。" : "Approve or reject using the task card in Feishu.")}</p></section>` : "",
     state.error ? `<section class="result error-result"><h2>${escapeHtml(labels.error)}</h2><pre>${escapeHtml(state.error)}</pre></section>` : "",
     state.finalResponse
       ? `<section class="result final-result"><h2>${escapeHtml(labels.finalAnswer)}</h2><div class="markdown">${renderText(state.finalResponse)}</div></section>`
@@ -355,6 +362,9 @@ function renderActivity(
 ): string {
   switch (activity.kind) {
     case "assistant":
+      if (activity.id.startsWith("commentary:runtime-error:")) {
+        return `<article class="activity message runtime-error" data-activity="${escapeAttribute(activity.id)}"><pre>${escapeHtml(activity.text)}</pre></article>`;
+      }
       return renderMessageActivity(activity.id, activity.text, "commentary", renderText);
     case "user":
       return renderMessageActivity(activity.id, activity.text, "user", renderText);
@@ -619,7 +629,11 @@ function renderMetadata(state: TurnViewState, language: TurnPreviewLanguage): st
   return [
     elapsed,
     state.model?.trim() ? `<span title="${escapeAttribute(labels.model)}">${escapeHtml(state.model.trim())}</span>` : "",
-    state.totalTokens === undefined ? "" : `<span title="${escapeAttribute(labels.turnTokens)}">${formatTokenCount(state.totalTokens)} tokens</span>`,
+    state.totalTokens === undefined ? "" : state.cachedInputTokens === undefined
+      ? `<span title="${escapeAttribute(labels.turnTokens)}">${formatTokenCount(state.totalTokens)} tokens</span>`
+      : `<span title="${escapeAttribute(labels.nonCachedTokens)}: ${formatNumber(state.totalTokens)} tokens">${escapeHtml(labels.nonCachedTokens)} ${formatTokenCount(state.totalTokens)} tokens</span>`,
+    state.totalTokensIncludingCache === undefined ? "" : `<span title="${escapeAttribute(labels.totalTokens)}: ${formatNumber(state.totalTokensIncludingCache)} tokens">${escapeHtml(labels.totalTokens)} ${formatTokenCount(state.totalTokensIncludingCache)} tokens</span>`,
+    state.cachedInputTokens === undefined ? "" : `<span title="${escapeAttribute(labels.cachedTokens)}: ${formatNumber(state.cachedInputTokens)} tokens">${escapeHtml(labels.cachedTokens)} ${formatTokenCount(state.cachedInputTokens)} tokens</span>`,
     state.contextCompactionAfterTokens === undefined ? "" : state.contextCompactionBeforeTokens === undefined
       ? `<span title="${escapeAttribute(labels.compactionAfterTokens)}">${formatTokenCount(state.contextCompactionAfterTokens)} tokens</span>`
       : `<span title="${escapeAttribute(labels.compactionTokens)}">${formatTokenCount(state.contextCompactionBeforeTokens)} → ${formatTokenCount(state.contextCompactionAfterTokens)} tokens</span>`,
@@ -802,6 +816,7 @@ summary:focus-visible { outline: 2px solid var(--accent); outline-offset: -2px;
 .tool-meta span { white-space: nowrap; }
 .tool-header-timing { min-width: 0; overflow: hidden; text-overflow: ellipsis; }
 .tool-header-timing:empty, .tool-footer-timing:empty { display: none; }
+.runtime-error pre { white-space: pre-wrap; overflow-wrap: anywhere; border-left: 2px solid var(--danger); }
 .error-output, .error-result h2 { color: var(--danger); }
 .muted, .empty { color: var(--muted); }
 .notice, .empty { padding: 10px 0; }

package/src/presentation/TurnStateReducer.ts

@@ -53,7 +53,14 @@ export function reduceTurnEvent(state: TurnViewState, event: AgentEvent): TurnVi
     case "turn_started":
       return { ...state, status: "running", startedAt: event.startedAt };
     case "agent_text_delta":
-      return { ...state, assistantText: bound(`${state.assistantText}${event.text}`) };
+      return {
+        ...state,
+        assistantText: bound(`${state.assistantText}${event.text}`),
+        ...(event.replacesActivityId ? {
+          activities: (state.activities ?? []).filter((activity) => activity.id !== event.replacesActivityId),
+          progressText: undefined,
+        } : {}),
+      };
     case "token_usage_updated": {
       const lastTokens = normalizeTokenCount(event.lastTokens);
       const cumulativeTokens = normalizeTokenCount(event.cumulativeTokens);
@@ -61,10 +68,22 @@ export function reduceTurnEvent(state: TurnViewState, event: AgentEvent): TurnVi
       const delta = previousCumulative === undefined
         ? lastTokens
         : Math.max(0, cumulativeTokens - previousCumulative);
+      const total = accumulateReportedTokens(
+        event.lastTotalTokens, event.cumulativeTotalTokens,
+        state.totalTokensIncludingCache, state.tokenUsageTotalCumulative, previousCumulative !== undefined,
+      );
+      const cached = accumulateReportedTokens(
+        event.lastCachedTokens, event.cumulativeCachedTokens,
+        state.cachedInputTokens, state.tokenUsageCachedCumulative, previousCumulative !== undefined,
+      );
       return {
         ...state,
         totalTokens: (state.totalTokens ?? 0) + delta,
         tokenUsageCumulative: Math.max(previousCumulative ?? 0, cumulativeTokens),
+        totalTokensIncludingCache: total.value,
+        tokenUsageTotalCumulative: total.cumulative,
+        cachedInputTokens: cached.value,
+        tokenUsageCachedCumulative: cached.cumulative,
         latestContextTokens: event.contextTokens === undefined
           ? state.latestContextTokens
           : normalizeTokenCount(event.contextTokens),
@@ -155,11 +174,13 @@ export function reduceTurnEvent(state: TurnViewState, event: AgentEvent): TurnVi
       };
     }
     case "progress": {
+      const activities = state.activities ?? [];
+      const warning = event.severity === "warning";
       const activityUpdate = upsertReasoningActivity(
-        state.activities ?? [],
+        warning ? activities.filter((activity) => activity.id !== (event.activityId ?? "progress")) : activities,
         event.activityId ?? "progress",
-        event.text,
-        event.append === true,
+        warning && !event.activityId?.startsWith("commentary:runtime-error:") ? bound(event.text) : event.text,
+        !warning && event.append === true,
         event.activityId?.startsWith("commentary:") ? "assistant" : "reasoning",
       );
       return {
@@ -179,7 +200,7 @@ export function reduceTurnEvent(state: TurnViewState, event: AgentEvent): TurnVi
       return {
         ...state,
         ...tracking,
-        status: "tool_running",
+        status: state.approval ? "waiting_for_approval" : "tool_running",
         activeTool: bounded,
         activities: activityUpdate.activities,
         activitiesTruncated: state.activitiesTruncated || activityUpdate.truncated,
@@ -193,6 +214,7 @@ export function reduceTurnEvent(state: TurnViewState, event: AgentEvent): TurnVi
     case "approval_requested":
       return { ...state, status: "waiting_for_approval", approval: event.request };
     case "approval_resolved":
+      if (state.approval?.id !== event.requestId) return state;
       return { ...state, status: state.activeTool ? "tool_running" : "running", approval: undefined };
     case "turn_completed": {
       const durationMs = Math.max(0, event.durationMs ?? Date.now() - state.startedAt);
@@ -230,7 +252,7 @@ export function reduceTurnEvent(state: TurnViewState, event: AgentEvent): TurnVi
         approval: undefined,
         completedAt,
         durationMs: Math.max(0, completedAt - state.startedAt),
-        error: bound(event.message),
+        error: event.message,
       };
     }
   }
@@ -312,7 +334,7 @@ function reduceToolUpdate(state: TurnViewState, tool: ToolState, fullOutput?: st
       ...tracking,
       fullToolOutputs,
       fullToolErrors,
-      status: "tool_running",
+      status: state.approval ? "waiting_for_approval" : "tool_running",
       activeTool: bounded,
       activities: activityUpdate.activities,
       activitiesTruncated: state.activitiesTruncated || activityUpdate.truncated,
@@ -328,7 +350,7 @@ function reduceToolUpdate(state: TurnViewState, tool: ToolState, fullOutput?: st
       ...tracking,
       fullToolOutputs,
       fullToolErrors,
-      status: activeTool ? "tool_running" : "running",
+      status: state.approval ? "waiting_for_approval" : activeTool ? "tool_running" : "running",
       activeTool,
       activities: activityUpdate.activities,
       activitiesTruncated: state.activitiesTruncated || activityUpdate.truncated,
@@ -343,7 +365,7 @@ function reduceToolUpdate(state: TurnViewState, tool: ToolState, fullOutput?: st
     ...tracking,
     fullToolOutputs,
     fullToolErrors,
-    status: activeTool ? "tool_running" : "running",
+    status: state.approval ? "waiting_for_approval" : activeTool ? "tool_running" : "running",
     activeTool,
     activities: activityUpdate.activities,
     activitiesTruncated: state.activitiesTruncated || activityUpdate.truncated,
@@ -463,6 +485,24 @@ function bound(value: string): string {
   return `${value.slice(0, MAX_TEXT - 1)}…`;
 }
 
+function accumulateReportedTokens(
+  last: number | undefined,
+  cumulative: number | undefined,
+  value: number | undefined,
+  previous: number | undefined,
+  hasPriorUsage: boolean,
+): { value?: number; cumulative?: number } {
+  if (last === undefined || cumulative === undefined || !Number.isFinite(last) || !Number.isFinite(cumulative)
+    || last < 0 || cumulative < 0) return {};
+  // A saved or partial turn without a baseline cannot acquire a complete breakdown later.
+  if (hasPriorUsage && (previous === undefined || value === undefined)) return {};
+  const normalizedCumulative = normalizeTokenCount(cumulative);
+  return {
+    value: (value ?? 0) + (previous === undefined ? normalizeTokenCount(last) : Math.max(0, normalizedCumulative - previous)),
+    cumulative: Math.max(previous ?? 0, normalizedCumulative),
+  };
+}
+
 function normalizeTokenCount(value: number): number {
   return Math.max(0, Math.round(value));
 }

package/src/presentation/turnViewTypes.ts

@@ -37,6 +37,10 @@ export interface TurnViewState {
   durationMs?: number;
   totalTokens?: number;
   tokenUsageCumulative?: number;
+  totalTokensIncludingCache?: number;
+  cachedInputTokens?: number;
+  tokenUsageTotalCumulative?: number;
+  tokenUsageCachedCumulative?: number;
   contextCompactionStatus?: "running" | "completed";
   contextCompactionCount?: number;
   contextCompactionId?: string;

package/src/proxy/ProxySessionController.ts

@@ -61,6 +61,7 @@ import type {
   ApprovalDecision,
   ConversationTurn,
   ModelOption,
+  ModelListResult,
   PermissionMode,
   RemoteCompletedTurnSummary,
   RemoteSessionActivity,
@@ -234,13 +235,13 @@ const HELP_COMMAND_SECTIONS: Array<{
     commands: [
       {
         command: "/new",
-        usage: "[title] [--dir &#60;cwd&#62; | --nodir]",
-        description: "使用默认 Agent 创建任务；--nodir 创建 Projectless 任务",
+        usage: "[title] [--agent &#60;name&#62;] [--dir &#60;cwd&#62; | --nodir]",
+        description: "使用默认或指定 Agent 创建任务；--nodir 创建 Projectless 任务",
       },
       {
         command: "/newgroup",
-        usage: "[title] [--dir &#60;cwd&#62; | --nodir]",
-        description: "创建飞书群和新任务",
+        usage: "[title] [--agent &#60;name&#62;] [--dir &#60;cwd&#62; | --nodir]",
+        description: "使用默认或指定 Agent 创建飞书群和新任务",
       },
       {
         command: "/dir",
@@ -500,6 +501,7 @@ export interface ProxyLifecycle {
   supervised?: boolean;
   restart(contextKey: string, force: boolean, replyTarget?: MessageReplyTarget): Promise<void>;
   cancelSafeRestart?(scheduleId: number): Promise<boolean>;
+  forceSafeRestart?(scheduleId: number): Promise<boolean>;
   cancelAutomaticUpdate?(action: CardAction): Promise<void>;
   rememberFeishuUserOpenId?(userOpenId: string): Promise<void> | void;
   persistAgentExecutionDefaults?(
@@ -1049,6 +1051,18 @@ export class ProxySessionController {
           });
         } else if (kind === "queued_prompt_cancel") {
           await this.cancelQueuedPrompt(scopedAction);
+        } else if (kind === "safe_restart_force") {
+          const scheduleId = Number(scopedAction.value.scheduleId);
+          if (!Number.isSafeInteger(scheduleId) || scheduleId <= 0) {
+            throw new Error("安全重启卡片无效，请使用最新的状态卡片。");
+          }
+          if (!this.lifecycle?.forceSafeRestart) {
+            throw new Error("当前运行方式不支持立即重启。");
+          }
+          const restarted = await this.lifecycle.forceSafeRestart(scheduleId);
+          if (!restarted) {
+            await this.outbound.sendText(contextKey, "该安全重启计划已失效，请查看最新状态卡片。");
+          }
         } else if (kind === "safe_restart_cancel") {
           const scheduleId = Number(scopedAction.value.scheduleId);
           if (!Number.isSafeInteger(scheduleId) || scheduleId <= 0) {
@@ -1164,7 +1178,9 @@ export class ProxySessionController {
           await this.outbound.sendText(contextKey, STOP_TASK_STARTED_MESSAGE);
           await this.stopSessionReference(contextKey, sessionId);
           if (scopedAction.value.cardView === "status") await this.refreshStatusCardFromAction(scopedAction, sessionId);
-          else await this.refreshSessionsCardFromAction(scopedAction, { forceSwitchTaskId: sessionId });
+          else if (scopedAction.value.cardView !== "safe_restart") {
+            await this.refreshSessionsCardFromAction(scopedAction, { forceSwitchTaskId: sessionId });
+          }
         } else if (kind === "session_status") {
           await this.outbound.sendText(contextKey, STATUS_STARTED_MESSAGE);
           await this.status(contextKey, String(scopedAction.value.sessionId ?? ""));
@@ -2006,14 +2022,16 @@ export class ProxySessionController {
       case "file":
         await this.sendCurrentTaskFile(contextKey, command.filePath);
         return;
-      case "new":
-        if (command.projectless && this.ensureAgent(context.defaultAgent).kind !== "app-server") {
+      case "new": {
+        const agentName = command.agentName ?? context.defaultAgent;
+        const agent = this.ensureAgent(agentName);
+        if (command.projectless && agent.kind !== "app-server") {
           throw new Error("/new --nodir 仅支持 App Server Agent。");
         }
         await this.outbound.sendText(contextKey, CREATE_TASK_STARTED_MESSAGE);
         await this.createSession(
           contextKey,
-          context.defaultAgent,
+          agentName,
           command.projectless
             ? undefined
             : command.cwd === undefined
@@ -2024,11 +2042,14 @@ export class ProxySessionController {
           undefined,
           undefined,
           command.title,
-          this.inheritedExecutionSettings(contextKey, context.defaultAgent),
+          this.inheritedExecutionSettings(contextKey, agentName),
         );
         return;
-      case "newgroup":
-        if (command.projectless && this.ensureAgent(context.defaultAgent).kind !== "app-server") {
+      }
+      case "newgroup": {
+        const agentName = command.agentName ?? context.defaultAgent;
+        const agent = this.ensureAgent(agentName);
+        if (command.projectless && agent.kind !== "app-server") {
           throw new Error("/newgroup --nodir 仅支持 App Server Agent。");
         }
         if (!userId?.startsWith("ou_")) {
@@ -2037,13 +2058,14 @@ export class ProxySessionController {
         await this.outbound.sendText(contextKey, CREATE_GROUP_STARTED_MESSAGE);
         await this.createFeishuGroup(
           contextKey,
-          context.defaultAgent,
+          agentName,
           command.title,
           userId,
           command.cwd === undefined ? undefined : resolveUserPath(command.cwd),
           command.projectless === true,
         );
         return;
+      }
       case "clone":
       case "clonegroup": {
         let source = this.currentSession(contextKey);
@@ -2136,7 +2158,7 @@ export class ProxySessionController {
         await this.openExecutionSettings(contextKey, "model");
         return;
       case "provider":
-        await this.openProviderSettings(contextKey);
+        await this.openExecutionSettings(contextKey, "provider");
         return;
       case "thinking":
         await this.openExecutionSettings(contextKey, "thinking");
@@ -5110,7 +5132,7 @@ export class ProxySessionController {
       const providerSupported = loaded.runtime.kind === "codex" && Boolean(loaded.runtime.listModelProviders);
       const providers = providerSupported ? await this.modelProviderOptions(loaded) : [];
       const currentProvider = loaded.session.modelProvider ?? providers.find((provider) => provider.isDefault)?.id;
-      const models = await loaded.runtime.listModels(currentProvider, loaded.session.model);
+      const { models, warning } = await this.modelOptions(loaded.runtime, currentProvider, loaded.session.model);
       const currentModel = models.find((model) => model.id === loaded.session.model)
         ?? models.find((model) => model.isDefault)
         ?? models[0];
@@ -5127,6 +5149,7 @@ export class ProxySessionController {
         providers,
         providerSupported,
         models,
+        warning,
         reasoningOptions: currentModel?.supportedReasoningEfforts ?? [],
       };
     }
@@ -5156,21 +5179,6 @@ export class ProxySessionController {
     await this.openExecutionSettings(contextKey, "agent");
   }
 
-  private async openProviderSettings(contextKey: string): Promise<void> {
-    const loaded = await this.loadSession(this.requireCurrentSession(contextKey));
-    const providers = loaded.runtime.kind === "codex" && loaded.runtime.listModelProviders
-      ? await this.modelProviderOptions(loaded)
-      : [];
-    const current = loaded.session.modelProvider?.trim()
-      || providers.find((provider) => provider.isDefault)?.id
-      || "运行时默认";
-    if (providers.length <= 1) {
-      await this.outbound.sendText(contextKey, `当前 Provider：${current}\n当前没有其他 Provider 可以切换。`);
-      return;
-    }
-    await this.openExecutionSettings(contextKey, "provider", { sessionId: loaded.record.localSessionId });
-  }
-
   private async selectProvider(
     contextKey: string,
     modelProvider: string,
@@ -5210,13 +5218,14 @@ export class ProxySessionController {
   ): Promise<void> {
     const loaded = await this.loadSession(this.requireSession(contextKey, sessionId));
     await this.assertModelProvider(loaded, modelProvider);
-    const models = await loaded.runtime.listModels(modelProvider, loaded.session.model);
+    const { models, warning } = await this.modelOptions(loaded.runtime, modelProvider, loaded.session.model);
     const card = this.cardRenderer.renderModelSelector({
       sessionId,
       contextKey,
       currentModel: selectProviderModel(models, loaded.session.model)?.id,
       reasoningEffort: loaded.session.reasoningEffort,
       models,
+      warning,
       modelProvider,
       permissionMode,
       unifiedSettings: true,
@@ -5234,7 +5243,7 @@ export class ProxySessionController {
   ): Promise<void> {
     const loaded = await this.loadSession(this.requireSession(contextKey, sessionId));
     await this.assertModelProvider(loaded, modelProvider);
-    const models = await loaded.runtime.listModels(modelProvider, model);
+    const { models, warning } = await this.modelOptions(loaded.runtime, modelProvider, model);
     const selected = models.find((candidate) => candidate.id === model);
     if (!selected) throw new Error(`未知模型：${model}`);
     const options = selected.supportedReasoningEfforts.length > 0
@@ -5252,6 +5261,7 @@ export class ProxySessionController {
       model,
       currentEffort,
       options,
+      warning,
       permissionMode,
       unifiedSettings: true,
     });
@@ -5296,7 +5306,7 @@ export class ProxySessionController {
       await this.outbound.sendText(contextKey, `正在切换到 Provider ${settings.provider}，请稍后。`);
     }
     const loaded = await this.loadSession(record);
-    await this.assertProviderModelSettings(loaded, settings.provider, settings.model, settings.effort);
+    const warning = await this.assertProviderModelSettings(loaded, settings.provider, settings.model, settings.effort);
     const session = await this.changeProviderSettings(loaded, {
       modelProvider: settings.provider,
       model: settings.model,
@@ -5317,7 +5327,7 @@ export class ProxySessionController {
         notice,
       });
     } else {
-      await this.outbound.sendText(contextKey, notice.replaceAll("`", ""));
+      await this.outbound.sendText(contextKey, [notice.replaceAll("`", ""), warning].filter(Boolean).join("\n"));
     }
   }
 
@@ -5352,15 +5362,23 @@ export class ProxySessionController {
     modelProvider: string,
     model: string,
     effort: string,
-  ): Promise<void> {
+  ): Promise<string | undefined> {
     await this.assertModelProvider(loaded, modelProvider);
-    const selected = (await loaded.runtime.listModels(modelProvider, model)).find((candidate) => candidate.id === model);
+    const { models, warning } = await this.modelOptions(loaded.runtime, modelProvider, model);
+    const selected = models.find((candidate) => candidate.id === model);
     if (!selected) throw new Error(`未知模型：${model}`);
     if (selected.supportedReasoningEfforts.length > 0
       && !selected.supportedReasoningEfforts.some((option) => option.value === effort)) {
       const supported = selected.supportedReasoningEfforts.map((option) => option.value).join("、") || "无";
       throw new Error(`模型 ${model} 不支持思考强度 ${effort}。支持的强度：${supported}`);
     }
+    return warning;
+  }
+
+  private async modelOptions(runtime: AgentRuntime, provider?: string, fallbackModel?: string): Promise<ModelListResult> {
+    return runtime.listModelsWithStatus
+      ? runtime.listModelsWithStatus(provider, fallbackModel)
+      : { models: await runtime.listModels(provider, fallbackModel) };
   }
 
   private async assertModelProvider(loaded: LoadedSession, modelProvider: string): Promise<void> {
@@ -7027,10 +7045,12 @@ export class ProxySessionController {
       activeTurnId = remoteActive ? remote?.lastTurnId ?? activeTurnId : activeTurnId;
       queued = this.store.countQueuedPrompts(current.localSessionId);
       snapshot = turnViewSnapshot(current.lastTurnId ? this.store.getTurnSnapshot(current.lastTurnId) : undefined);
-      const statusLabel = remoteActive && remote && localCurrent && !isBotOwnedActiveTurn(localCurrent, remote)
-        ? "外部执行中"
-        : sessionStatusLabel(current.status, activeTurnId);
-      const resultLabel = remoteActive
+      const waitingForApproval = snapshot?.turnId === current.lastTurnId && snapshot?.status === "waiting_for_approval";
+      const statusLabel = waitingForApproval ? "等待确认"
+        : remoteActive && remote && localCurrent && !isBotOwnedActiveTurn(localCurrent, remote)
+          ? "外部执行中"
+          : sessionStatusLabel(current.status, activeTurnId);
+      const resultLabel = waitingForApproval ? "等待确认" : remoteActive
         ? "执行中"
         : remoteTurnStatusLabel(remote?.lastTurnStatus ?? current.lastTurnStatus);
       taskLines.push(
@@ -8259,7 +8279,8 @@ function executionDetailLines(
 
 function finalResultLines(snapshot?: TurnViewState, remote?: RemoteSessionSummary): string[] {
   const relevantSnapshot = !remote?.lastTurnId || snapshot?.turnId === remote.lastTurnId ? snapshot : undefined;
-  if (relevantSnapshot?.status === "running" || relevantSnapshot?.status === "tool_running" || relevantSnapshot?.status === "waiting_for_approval"
+  if (relevantSnapshot?.status === "waiting_for_approval") return ["任务正在等待确认，尚无最终结果。"];
+  if (relevantSnapshot?.status === "running" || relevantSnapshot?.status === "tool_running"
     || isRemoteSessionActive(remote)) {
     return ["任务仍在执行，尚无最终结果。"];
   }

package/src/runtime/types.ts

@@ -58,6 +58,7 @@ export interface ToolState {
 
 export interface ApprovalRequest {
   id: string;
+  kind?: "mode_change";
   title: string;
   command?: string;
   reason?: string;
@@ -66,13 +67,17 @@ export interface ApprovalRequest {
 
 export type AgentEvent =
   | { type: "turn_started"; sessionId: string; turnId: string; startedAt: number }
-  | { type: "agent_text_delta"; sessionId: string; turnId: string; text: string }
+  | { type: "agent_text_delta"; sessionId: string; turnId: string; text: string; replacesActivityId?: string }
   | {
       type: "token_usage_updated";
       sessionId: string;
       turnId: string;
       lastTokens: number;
       cumulativeTokens: number;
+      lastTotalTokens?: number;
+      cumulativeTotalTokens?: number;
+      lastCachedTokens?: number;
+      cumulativeCachedTokens?: number;
       contextTokens?: number;
     }
   | {
@@ -92,6 +97,7 @@ export type AgentEvent =
       text: string;
       activityId?: string;
       append?: boolean;
+      severity?: "warning";
     }
   | { type: "plan_updated"; sessionId: string; turnId: string; steps: PlanStep[] }
   | { type: "tool_started"; sessionId: string; turnId: string; tool: ToolState }
@@ -224,6 +230,11 @@ export interface ModelOption {
   defaultReasoningEffort?: string;
 }
 
+export interface ModelListResult {
+  models: ModelOption[];
+  warning?: string;
+}
+
 export interface ModelProviderOption {
   id: string;
   displayName?: string;
@@ -285,6 +296,7 @@ export interface AgentRuntime {
   ): Promise<RuntimeSession>;
   respondToApproval(sessionId: string, requestId: string, decision: ApprovalDecision): Promise<void>;
   listModels(modelProvider?: string, fallbackModel?: string): Promise<ModelOption[]>;
+  listModelsWithStatus?(modelProvider?: string, fallbackModel?: string): Promise<ModelListResult>;
   listModelProviders?(): Promise<ModelProviderOption[]>;
   release?(options?: { force?: boolean }): Promise<RuntimeReleaseResult>;
   onEvent(listener: (event: RuntimeEvent) => void): () => void;

package/src/supervision/SafeRestartNotifier.ts

@@ -121,6 +121,8 @@ export class SafeRestartNotifier {
         .filter((session) => session.status === "running" || this.store.countQueuedPrompts(session.localSessionId) > 0)
         .map((session) => ({
           id: session.remoteSessionId ?? session.localSessionId,
+          localSessionId: session.localSessionId,
+          isRunning: session.status === "running",
           title: session.title,
         }));
     await Promise.all(targets.map(async ({ contextKey, replyMessageId, reason }) => {

package/src/supervision/SafeRestartScheduler.ts

@@ -93,6 +93,13 @@ export class SafeRestartScheduler {
     return this.cancelScheduled(this.scheduleId);
   }
 
+  async forceScheduled(expectedScheduleId: number): Promise<boolean> {
+    const reason = this.reason;
+    if (!reason || this.scheduleId !== expectedScheduleId) return false;
+    await this.restart(reason, expectedScheduleId, this.options.readActivity());
+    return true;
+  }
+
   async cancelScheduled(expectedScheduleId: number): Promise<boolean> {
     const reason = this.reason;
     if (!reason || this.scheduleId !== expectedScheduleId) return false;