minimal-agent 0.18.13 → 0.18.14

package/src/types.ts

@@ -178,7 +178,7 @@ export type Message = (
       role: 'assistant';
       /** Persisted UI semantics; not a provider instruction or a success claim. */
       presentation?: 'progress' | 'final';
-      /** Host-only review boundary for a delivered text answer; never model authority. */
+      /** @deprecated Legacy sessions only (the retired review cycle); no longer written. Stripped before any provider request. */
       advisorTaskVersion?: number;
       /** 当 tool_calls 非空时 content 通常为 null（OpenAI 协议） */
       content: string | null;
@@ -214,13 +214,13 @@ export type Message = (
       display_metadata?: ToolResultMetadata;
       /** 本地压缩策略；发送 Provider 前会剥离。 */
       tool_result_policy?: ToolResultPolicy;
-      /** Host-only effect needed to restore the current review cycle. */
+      /** @deprecated Legacy sessions only; no longer written. Stripped before any provider request. */
       advisorMutatesWorkspace?: boolean;
       timestamp?: number;
     }
 ) & {
-  /** Host-only bounded review transitions, including graceful degradation. */
-  advisorCheckpoints?: AdvisorCheckpointMetadata[];
+  /** @deprecated Legacy sessions only (the retired review checkpoints); no longer written. Stripped before any provider request. */
+  advisorCheckpoints?: unknown[];
   /** Host-only cold history. Persist with Session; strip before any provider request. */
   advisorHistory?: { version: 1; messages: Message[] };
   /** Host-only: a deferred call never produced an execution observation. */
@@ -376,51 +376,6 @@ export interface ProcessExecutionMetadata {
   exitCode?: number | null;
 }
 
-export type AdvisorCheckpoint =
-  | 'pre-execution'
-  | 'stalled'
-  | 'high-risk'
-  | 'pre-delivery';
-
-export interface AdvisorVersions {
-  taskVersion: number;
-  workVersion: number;
-  evidenceVersion: number;
-}
-
-export interface AdvisorCheckpointMetadata extends AdvisorVersions {
-  kind: 'advisor_checkpoint';
-  checkpoint: AdvisorCheckpoint;
-  checkpointKey: string;
-  status: 'required' | 'attempted-unavailable';
-}
-
-export interface AdvisorConsultationMetadata extends AdvisorVersions {
-  kind: 'advisor_consultation';
-  /** Host-recorded trigger, distinct from who emitted the tool call. Absent in old history. */
-  triggerSource?: 'checkpoint' | 'model';
-  triggerReason?: string;
-  consultationId: string;
-  checkpoint: AdvisorCheckpoint;
-  checkpointKey: string;
-  status: 'completed' | 'failed';
-}
-
-export interface AdvisorDecisionMetadata extends AdvisorVersions {
-  kind: 'advisor_decision';
-  consultationId: string;
-  checkpoint: AdvisorCheckpoint;
-  checkpointKey: string;
-  decision: 'accept' | 'partial' | 'reject';
-  rationale: string;
-  acceptedPoints: string[];
-  rejectedPoints: string[];
-  verificationPlan: string[];
-  evidenceRefs?: string[];
-  /** Referenced evidence is not proof of correctness; pending never means approved. */
-  verificationStatus?: 'evidence_linked' | 'pending';
-}
-
 /** Agent 子任务的结构化阶段进度；仅供宿主展示，不写入会话历史或发送给 LLM。 */
 export interface SubagentProgress {
   kind: 'subagent';
@@ -468,9 +423,6 @@ export type ToolResultMetadata =
   | FileDiscoveryMetadata
   | ResultManifestMetadata
   | ProcessExecutionMetadata
-  | AdvisorCheckpointMetadata
-  | AdvisorConsultationMetadata
-  | AdvisorDecisionMetadata
   | BrowserDownloadMetadata;
 
 /**
@@ -576,8 +528,6 @@ export type ToolResult = { problem?: ToolProblemOutcome; observation?: ReadObser
  * 避免按工具名写特判分支。
  */
 export interface ToolCallContext {
-  /** Run-local host initialization shared with Advisor; never a model argument. */
-  advisorConsultation?: AdvisorConsultationMetadata;
   /** Shared per-model-response read allowance; reservations happen before IO. */
   reserveReadChars?: (requested?: number) => number;
   /** Host presentation only; cannot grant tools to a delegated agent. */
@@ -609,10 +559,11 @@ export interface ToolCallContext {
   advisorCalls?: { used: number };
   /** 区分主模型自动咨询与用户显式 /advisor ask。 */
   advisorInvocation?: 'agent' | 'manual';
-  /** Advisor 协调器运行时桥；只存在于主循环，不暴露给模型或持久化。 */
-  advisorRuntime?: AdvisorRuntimeBridge;
-  /** Live host context used by the main request, not tool-provided instructions. */
-  advisorReviewContext?: () => import('./advisor/reviewContext.js').AdvisorReviewContext;
+  /**
+   * 项目约束与记忆（它们不在对话历史里），作为"背景"附给顾问；宿主在主循环里提供，
+   * 不是工具参数，也不是给顾问的指令。
+   */
+  advisorBackground?: () => string;
   /**
    * 主循环使用的 provider —— Agent 等「工具内部再起子查询」的派生工具用它
    * 跑嵌套 runQuery（子 agent 与主 agent 同一模型，不另配凭据）。
@@ -696,45 +647,6 @@ export interface ToolCallContext {
   };
 }
 
-export interface AdvisorContextPacket {
-  failureAttempts?: string[];
-  deliveryDraft?: string;
-  decisionVerification?: Pick<AdvisorDecisionMetadata, 'consultationId' | 'verificationStatus' | 'evidenceRefs' | 'verificationPlan' | 'decision' | 'rationale' | 'acceptedPoints' | 'rejectedPoints'>;
-  objective: string;
-  currentRequest: string;
-  checkpoint: AdvisorCheckpoint;
-  versions: AdvisorVersions;
-  changedFiles: string[];
-  evidence: string[];
-  /** Packet excerpts are a selection, not proof the reviewer saw every stored result. */
-  evidenceCoverage?: { available: number; included: number; omitted: number; excerpts: true };
-  previousAdvice?: string;
-  actionsAfterPreviousAdvice: string[];
-  openQuestions: string[];
-}
-
-export type AdvisorReason = 'uncertainty' | 'plan_review' | 'delivery_review' | 'stalled' | 'user_dissatisfaction' | 'evidence_conflict';
-
-export interface AdvisorRuntimeBridge {
-  /** Latest advice available for the main Agent's optional decision record. */
-  readonly pendingConsultationId: string | undefined;
-  beginConsultation(reason?: AdvisorReason): AdvisorConsultationMetadata;
-  finishConsultation(
-    metadata: AdvisorConsultationMetadata,
-    ok: boolean,
-  ): AdvisorConsultationMetadata;
-  recordDecision(input: {
-    consultationId: string;
-    decision: 'accept' | 'partial' | 'reject';
-    rationale: string;
-    acceptedPoints?: string[];
-    rejectedPoints?: string[];
-    verificationPlan?: string[];
-    evidenceRefs?: string[];
-  }): ToolResult;
-  contextPacket(note?: string): AdvisorContextPacket;
-}
-
 export type ToolCategory =
   | 'files'
   | 'shell'
@@ -901,10 +813,11 @@ interface ProviderCommon {
   maxTokens?: number;
 
   /**
-   * 请求协议格式：'openai'（Chat Completions，默认）| 'anthropic'（Messages API）。
+   * 请求协议格式：'openai'（Chat Completions，默认）| 'openai-responses'（OpenAI Responses API）
+   * | 'anthropic'（Messages API）。
    * 缺省当 'openai'——兼容旧版只产出 OpenAI 格式对象的 env 自举路径。见 client.ts。
    */
-  apiFormat?: 'openai' | 'anthropic';
+  apiFormat?: 'openai' | 'openai-responses' | 'anthropic';
 
   /**
    * 该模型是否支持识图（多模态视觉）。resolveProvider 从所选 ModelConfig 归一成真布尔
@@ -917,6 +830,12 @@ interface ProviderCommon {
   supportsJsonSchema?: boolean;
   /** Explicitly request provider reasoning when the endpoint supports it. */
   reasoning?: boolean;
+  /**
+   * 推理强度。openai-responses 发 `reasoning.effort`，openai(Chat Completions) 发
+   * `reasoning_effort`（OpenRouter 发 `reasoning.effort`）。缺省不发送，沿用服务端默认。
+   * 模型不认该档位时 client.ts 去掉参数重发一次，不让对话 400。
+   */
+  reasoningEffort?: 'none' | 'minimal' | 'low' | 'medium' | 'high' | 'xhigh';
   promptCache?: PromptCacheConfig;
 
   /**
@@ -1142,8 +1061,9 @@ export type LlmStreamEvent =
  * 工作过程显示阶段标签（UI 的 LiveArea 据此选择文字 / 决定是否隐藏整面板）。
  *
  *   idle           —— 当前没有任何工作（隐藏 LiveArea）
- *   thinking       —— 正在准备候选答案或等待工具调用，候选正文不公开
- *   streaming      —— 内部检查结束后，最终表达请求的真实正文流
+ *   thinking       —— 等待首个 token、工具调用或仍可能被检查退回的私有候选
+ *   streaming      —— 最终回答正在显示：没有检查能再拦下时边生成边实时输出；
+ *                     否则通过全部检查后原样一次发布
  *   tool_executing —— 至少一个工具在跑（并行时栈式显示多个）
  *   compacting     —— 正在跑自动 / reactive / 手动压缩
  */
@@ -1220,7 +1140,10 @@ export interface TurnResourceUsage {
 }
 
 export type LoopEvent =
-  /** 文本流（同 LlmStreamEvent.text_delta） */
+  /**
+   * 对用户可见的回答正文。没有任何检查能再拦下本次回答时逐段实时发出（含工具轮的
+   * 过程说明）；否则候选保持私有，通过全部检查后原样一次发出。已发出的正文不会被撤回。
+   */
   | { type: 'text'; delta: string }
   /**
    * 用户消息刚 push 进 history（loop 入口）。
@@ -1242,16 +1165,16 @@ export type LoopEvent =
     }
   /**
    * 内部候选正文尚不能交付，需要进入检查或补全阶段。
-   * 新内核候选正文不广播；textLength=0，仅表示准备/复核阶段变化。
+   * 只退回从未广播的私有候选，已实时显示的正文不会被退回；textLength=0，仅表示准备/复核阶段变化。
    * textLength>0 仅供旧事件兼容，不应作为正常展示路径。
    */
   | {
       type: 'assistant_draft_discarded';
       reason:
         | 'formal_delivery'
-        | 'advisor_checkpoint'
         | 'empty_response'
-        | 'interactive_question';
+        | 'interactive_question'
+        | 'diagram_preparation';
       textLength: number;
     }
   /**

package/src/ui/App.js

@@ -58,6 +58,8 @@ const CLEAR_SCREEN = '\x1b[2J\x1b[H';
 function formatProviderName(apiFormat) {
     if (apiFormat === 'anthropic')
         return 'Anthropic';
+    if (apiFormat === 'openai-responses')
+        return 'OpenAI Responses';
     if (apiFormat === 'openai')
         return 'OpenAI兼容';
     return apiFormat;

package/src/ui/App.tsx

@@ -87,6 +87,7 @@ const CLEAR_SCREEN = '\x1b[2J\x1b[H';
 
 function formatProviderName(apiFormat: string): string {
   if (apiFormat === 'anthropic') return 'Anthropic';
+  if (apiFormat === 'openai-responses') return 'OpenAI Responses';
   if (apiFormat === 'openai') return 'OpenAI兼容';
   return apiFormat;
 }

package/src/ui/MessageList.js

@@ -35,7 +35,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { Box, Static, Text } from 'ink';
 import { conciseToolDescription } from './toolProgress.js';
-import { advisorOpinionText, advisorDecisionLabel, advisorEvidenceLabel } from '../advisor/presentation.js';
+import { advisorOpinionText } from '../advisor/presentation.js';
 import { contentToDisplayText, contentToPlainText } from '../multimodal.js';
 import { splitThinkBlocks } from '../utils/stripThink.js';
 import { figures } from './figures.js';
@@ -104,16 +104,6 @@ export function buildToolCallIndex(history) {
     }
     return map;
 }
-/** 按 consultationId 关联持久化决定，供历史重载时在顾问卡片下恢复展示。 */
-export function buildAdvisorDecisionIndex(history) {
-    const decisions = new Map();
-    for (const message of history) {
-        if (message.role !== 'tool' || message.display_metadata?.kind !== 'advisor_decision')
-            continue;
-        decisions.set(message.display_metadata.consultationId, message.display_metadata);
-    }
-    return decisions;
-}
 /**
  * 从 Agent 子任务报告的统计尾巴（agent.ts 固定格式
  * 「（子任务「x」[type]：N 轮 · M 次工具调用，K 次失败）」）解析统计数。
@@ -218,7 +208,6 @@ export const MessageList = React.memo(function MessageList({ history, compactGen
     const items = React.useMemo(() => {
         const turnMetas = summarizeTurn(history);
         const toolIndex = buildToolCallIndex(history);
-        const advisorDecisions = buildAdvisorDecisionIndex(history);
         return [
             ...(bannerText
                 ? [
@@ -234,10 +223,6 @@ export const MessageList = React.memo(function MessageList({ history, compactGen
                 msg: m,
                 turnMeta: turnMetas[idx],
                 toolMeta: m.role === 'tool' ? (toolIndex.get(m.tool_call_id) ?? null) : null,
-                advisorDecision: m.role === 'tool'
-                    && m.display_metadata?.kind === 'advisor_consultation'
-                    ? (advisorDecisions.get(m.display_metadata.consultationId) ?? null)
-                    : null,
                 // 纯派生 key：有 id 用 id，没有就用 idx 兜底。绝不在 render 期 mutate 消息对象
                 // （<Static> 已 commit 的行永不重绘，key 仅在 append 对账时用，idx 已足够稳定）。
                 key: m.id ?? `message-${idx}`,
@@ -250,7 +235,7 @@ export const MessageList = React.memo(function MessageList({ history, compactGen
             if (item.kind === 'banner') {
                 return _jsx(BannerRow, { text: item.text }, item.key);
             }
-            return (_jsx(MessageRow, { message: item.msg, turnMeta: item.turnMeta, toolMeta: item.toolMeta, advisorDecision: item.advisorDecision, foldReasoning: foldReasoning }, item.key));
+            return (_jsx(MessageRow, { message: item.msg, turnMeta: item.turnMeta, toolMeta: item.toolMeta, foldReasoning: foldReasoning }, item.key));
         } }, compactGeneration));
 });
 function BannerRow({ text }) {
@@ -278,7 +263,7 @@ function formatToolHead(meta, shortId, statsTail) {
         .trim();
     return `[文件 · ${action}${target ? ` ${target}` : ''} · #${shortId}]${statsTail}`;
 }
-function MessageRow({ message, turnMeta, toolMeta, advisorDecision, foldReasoning, }) {
+function MessageRow({ message, turnMeta, toolMeta, foldReasoning, }) {
     switch (message.role) {
         case 'system': {
             // v2.x：ephemeral system message 是 UI 临时提示（slash 命令输出等），
@@ -345,19 +330,10 @@ function MessageRow({ message, turnMeta, toolMeta, advisorDecision, foldReasonin
             const lines = terminalText(message.content).split('\n');
             // 顾问意见给更高的预览上限，并用默认亮色而非 dim 灰 —— 它是另一个模型说的话，
             // 不该和 grep 输出一样被视觉降级（见 MAX_ADVISOR_PREVIEW_LINES）。
-            const advisorMeta = message.display_metadata?.kind === 'advisor_consultation'
-                ? message.display_metadata
-                : null;
-            const decisionMeta = message.display_metadata?.kind === 'advisor_decision'
-                ? message.display_metadata
-                : null;
             const inferredToolName = toolMeta?.toolName
-                ?? (advisorMeta ? 'Advisor' : null)
-                ?? (decisionMeta ? 'AdvisorDecision' : null)
                 ?? (message.display_metadata?.kind === 'result_manifest' ? 'PresentResult' : null)
                 ?? (message.display_metadata?.kind === 'agent' ? 'Agent' : undefined);
             const isAdvisor = inferredToolName === 'Advisor';
-            const isAdvisorDecision = inferredToolName === 'AdvisorDecision';
             if (isAdvisor)
                 lines.splice(0, lines.length, ...terminalText(advisorOpinionText(message.content)).split('\n'));
             const visibility = toolHistoryVisibility(inferredToolName, message.content);
@@ -365,9 +341,6 @@ function MessageRow({ message, turnMeta, toolMeta, advisorDecision, foldReasonin
             const previewLines = lines.slice(0, previewCap);
             const hidden = Math.max(0, lines.length - previewCap);
             const shortId = message.tool_call_id.slice(-8);
-            if (message.display_metadata?.kind === 'advisor_checkpoint') {
-                return _jsx(Box, { marginBottom: 1, paddingLeft: 2, children: _jsx(Text, { color: theme.subtle, wrap: "end", children: `已暂缓 · 顾问检查点 · 操作尚未执行（/show ${shortId} 查看详情，复核进展见后续记录）` }) });
-            }
             // 头行升级：有 toolMeta（发起方反查命中）显示人话描述；Agent 子任务
             // 再解析统计尾巴显示 ✓ N 轮 · M 次工具。无 meta（历史重载等）兜底旧格式。
             const stats = inferredToolName === 'Agent' ? agentResultStats(message.content) : null;
@@ -377,25 +350,16 @@ function MessageRow({ message, turnMeta, toolMeta, advisorDecision, foldReasonin
             // 顾问头行单独成文并去掉 dim：friendlyToolDescription 没有 Advisor 分支，
             // 走兜底会显示成一串参数预览，看不出这是「第二个模型的独立意见」。
             const headText = isAdvisor
-                ? `[顾问意见 · ${advisorMeta?.checkpoint ?? 'manual'} · #${shortId}]`
-                : isAdvisorDecision
-                    ? `[顾问意见处理 · ${decisionMeta?.decision ?? 'unknown'} · #${shortId}]`
-                    : toolMeta
-                        ? formatToolHead(toolMeta, shortId, statsTail)
-                        : `[tool result · #${shortId}]`;
+                ? `[顾问意见 · #${shortId}]`
+                : toolMeta
+                    ? formatToolHead(toolMeta, shortId, statsTail)
+                    : `[tool result · #${shortId}]`;
             if (visibility === 'hidden')
                 return null;
-            if (isAdvisorDecision) {
-                return _jsx(Box, { marginBottom: 1, paddingLeft: 2, children: _jsxs(Text, { color: theme.subtle, wrap: "end", children: [decisionMeta
-                                ? `顾问意见已处理 · ${advisorDecisionLabel(decisionMeta.decision)} · ${advisorEvidenceLabel(decisionMeta.verificationStatus)}`
-                                : '顾问意见登记未完成 · 可重试', `（/show ${shortId} 查看详情）`] }) });
-            }
             if (visibility === 'compact') {
                 return (_jsx(Box, { marginBottom: 1, paddingLeft: 2, children: _jsx(Text, { color: theme.subtle, dimColor: true, wrap: "end", children: terminalText(headText) }) }));
             }
-            return (_jsx(Box, { marginBottom: 1, paddingLeft: 2, children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: theme.subtle, ...(isAdvisor ? {} : { dimColor: true }), wrap: "end", children: terminalText(headText) }), advisorMeta && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: theme.subtle, wrap: "end", children: terminalText(advisorMeta.status === 'completed'
-                                        ? '顾问意见已返回，尚不代表事实核验通过'
-                                        : '顾问咨询未完成，已降级继续') }), advisorMeta.status === 'completed' && !advisorDecision && (_jsx(Text, { color: theme.subtle, wrap: "end", children: "\u987E\u95EE\u610F\u89C1\u5DF2\u8FD4\u56DE\uFF1B\u4E3B Agent \u7684\u6838\u9A8C\u4E0E\u91C7\u7EB3\u7ED3\u8BBA\u89C1\u540E\u7EED\u8BB0\u5F55\u3002" })), advisorDecision && (_jsx(Text, { color: theme.subtle, wrap: "end", children: terminalText(`${advisorDecision.decision} · ${advisorDecision.rationale}`) })), advisorDecision?.verificationPlan.map((item) => (_jsx(Text, { color: theme.subtle, wrap: "end", children: terminalText(`验证：${item}`) }, `advisor-card-verify-${item}`)))] })), decisionMeta && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: theme.subtle, wrap: "end", children: terminalText(`关联咨询 ${decisionMeta.consultationId} · ${decisionMeta.rationale}`) }), decisionMeta.verificationPlan.map((item) => (_jsx(Text, { color: theme.subtle, wrap: "end", children: terminalText(`验证：${item}`) }, `advisor-verify-${item}`)))] })), previewLines.map((line, i) => (_jsx(Text, { ...(isAdvisor ? {} : { color: theme.subtle }), wrap: "end", children: line.length > 0 ? line : ' ' }, `p-${i}`))), hidden > 0 && (_jsx(Text, { color: theme.subtle, dimColor: true, children: `... ${figures.fold} 完整 ${lines.length} 行（输入 /show ${shortId} 查看）` }))] }) }));
+            return (_jsx(Box, { marginBottom: 1, paddingLeft: 2, children: _jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: theme.subtle, ...(isAdvisor ? {} : { dimColor: true }), wrap: "end", children: terminalText(headText) }), previewLines.map((line, i) => (_jsx(Text, { ...(isAdvisor ? {} : { color: theme.subtle }), wrap: "end", children: line.length > 0 ? line : ' ' }, `p-${i}`))), hidden > 0 && (_jsx(Text, { color: theme.subtle, dimColor: true, children: `... ${figures.fold} 完整 ${lines.length} 行（输入 /show ${shortId} 查看）` }))] }) }));
         }
     }
 }

package/src/ui/MessageList.tsx

@@ -36,9 +36,9 @@ import React from 'react';
 import { Box, Static, Text } from 'ink';
 
 import { conciseToolDescription } from './toolProgress.js';
-import { advisorOpinionText, advisorDecisionLabel, advisorEvidenceLabel } from '../advisor/presentation.js';
+import { advisorOpinionText } from '../advisor/presentation.js';
 import { contentToDisplayText, contentToPlainText } from '../multimodal.js';
-import type { AdvisorDecisionMetadata, Message } from '../types.js';
+import type { Message } from '../types.js';
 import { splitThinkBlocks } from '../utils/stripThink.js';
 import { figures } from './figures.js';
 import { terminalText } from './terminalText.js';
@@ -72,7 +72,6 @@ type StaticItem =
       turnMeta: TurnMeta | null;
       /** tool 消息的发起方人话描述（buildToolCallIndex 反查）；其余消息 null */
       toolMeta: ToolCallMeta | null;
-      advisorDecision: AdvisorDecisionMetadata | null;
       key: string;
     };
 
@@ -167,18 +166,6 @@ export function buildToolCallIndex(history: Message[]): Map<string, ToolCallMeta
   return map;
 }
 
-/** 按 consultationId 关联持久化决定，供历史重载时在顾问卡片下恢复展示。 */
-export function buildAdvisorDecisionIndex(
-  history: Message[],
-): Map<string, AdvisorDecisionMetadata> {
-  const decisions = new Map<string, AdvisorDecisionMetadata>();
-  for (const message of history) {
-    if (message.role !== 'tool' || message.display_metadata?.kind !== 'advisor_decision') continue;
-    decisions.set(message.display_metadata.consultationId, message.display_metadata);
-  }
-  return decisions;
-}
-
 /**
  * 从 Agent 子任务报告的统计尾巴（agent.ts 固定格式
  * 「（子任务「x」[type]：N 轮 · M 次工具调用，K 次失败）」）解析统计数。
@@ -302,7 +289,6 @@ export const MessageList = React.memo(function MessageList({
   const items: StaticItem[] = React.useMemo(() => {
     const turnMetas = summarizeTurn(history);
     const toolIndex = buildToolCallIndex(history);
-    const advisorDecisions = buildAdvisorDecisionIndex(history);
     return [
       ...(bannerText
         ? [
@@ -318,10 +304,6 @@ export const MessageList = React.memo(function MessageList({
         msg: m,
         turnMeta: turnMetas[idx],
         toolMeta: m.role === 'tool' ? (toolIndex.get(m.tool_call_id) ?? null) : null,
-        advisorDecision: m.role === 'tool'
-          && m.display_metadata?.kind === 'advisor_consultation'
-          ? (advisorDecisions.get(m.display_metadata.consultationId) ?? null)
-          : null,
         // 纯派生 key：有 id 用 id，没有就用 idx 兜底。绝不在 render 期 mutate 消息对象
         // （<Static> 已 commit 的行永不重绘，key 仅在 append 对账时用，idx 已足够稳定）。
         key: m.id ?? `message-${idx}`,
@@ -345,7 +327,6 @@ export const MessageList = React.memo(function MessageList({
             message={item.msg}
             turnMeta={item.turnMeta}
             toolMeta={item.toolMeta}
-            advisorDecision={item.advisorDecision}
             foldReasoning={foldReasoning}
           />
         );
@@ -391,13 +372,11 @@ function MessageRow({
   message,
   turnMeta,
   toolMeta,
-  advisorDecision,
   foldReasoning,
 }: {
   message: Message;
   turnMeta: TurnMeta | null;
   toolMeta?: ToolCallMeta | null;
-  advisorDecision?: AdvisorDecisionMetadata | null;
   foldReasoning: boolean;
 }): JSX.Element | null {
   switch (message.role) {
@@ -553,30 +532,16 @@ function MessageRow({
       const lines = terminalText(message.content).split('\n');
       // 顾问意见给更高的预览上限，并用默认亮色而非 dim 灰 —— 它是另一个模型说的话，
       // 不该和 grep 输出一样被视觉降级（见 MAX_ADVISOR_PREVIEW_LINES）。
-      const advisorMeta = message.display_metadata?.kind === 'advisor_consultation'
-        ? message.display_metadata
-        : null;
-      const decisionMeta = message.display_metadata?.kind === 'advisor_decision'
-        ? message.display_metadata
-        : null;
       const inferredToolName = toolMeta?.toolName
-        ?? (advisorMeta ? 'Advisor' : null)
-        ?? (decisionMeta ? 'AdvisorDecision' : null)
         ?? (message.display_metadata?.kind === 'result_manifest' ? 'PresentResult' : null)
         ?? (message.display_metadata?.kind === 'agent' ? 'Agent' : undefined);
       const isAdvisor = inferredToolName === 'Advisor';
-      const isAdvisorDecision = inferredToolName === 'AdvisorDecision';
       if (isAdvisor) lines.splice(0, lines.length, ...terminalText(advisorOpinionText(message.content)).split('\n'));
       const visibility = toolHistoryVisibility(inferredToolName, message.content);
       const previewCap = toolPreviewCap(inferredToolName);
       const previewLines = lines.slice(0, previewCap);
       const hidden = Math.max(0, lines.length - previewCap);
       const shortId = message.tool_call_id.slice(-8);
-      if (message.display_metadata?.kind === 'advisor_checkpoint') {
-        return <Box marginBottom={1} paddingLeft={2}><Text color={theme.subtle} wrap="end">
-          {`已暂缓 · 顾问检查点 · 操作尚未执行（/show ${shortId} 查看详情，复核进展见后续记录）`}
-        </Text></Box>;
-      }
       // 头行升级：有 toolMeta（发起方反查命中）显示人话描述；Agent 子任务
       // 再解析统计尾巴显示 ✓ N 轮 · M 次工具。无 meta（历史重载等）兜底旧格式。
       const stats =
@@ -587,20 +552,11 @@ function MessageRow({
       // 顾问头行单独成文并去掉 dim：friendlyToolDescription 没有 Advisor 分支，
       // 走兜底会显示成一串参数预览，看不出这是「第二个模型的独立意见」。
       const headText = isAdvisor
-        ? `[顾问意见 · ${advisorMeta?.checkpoint ?? 'manual'} · #${shortId}]`
-        : isAdvisorDecision
-          ? `[顾问意见处理 · ${decisionMeta?.decision ?? 'unknown'} · #${shortId}]`
+        ? `[顾问意见 · #${shortId}]`
         : toolMeta
           ? formatToolHead(toolMeta, shortId, statsTail)
           : `[tool result · #${shortId}]`;
       if (visibility === 'hidden') return null;
-      if (isAdvisorDecision) {
-        return <Box marginBottom={1} paddingLeft={2}><Text color={theme.subtle} wrap="end">
-          {decisionMeta
-            ? `顾问意见已处理 · ${advisorDecisionLabel(decisionMeta.decision)} · ${advisorEvidenceLabel(decisionMeta.verificationStatus)}`
-            : '顾问意见登记未完成 · 可重试'}{`（/show ${shortId} 查看详情）`}
-        </Text></Box>;
-      }
       if (visibility === 'compact') {
         return (
           <Box marginBottom={1} paddingLeft={2}>
@@ -616,40 +572,6 @@ function MessageRow({
             <Text color={theme.subtle} {...(isAdvisor ? {} : { dimColor: true })} wrap="end">
               {terminalText(headText)}
             </Text>
-            {advisorMeta && (
-              <Box flexDirection="column">
-                <Text color={theme.subtle} wrap="end">
-                  {terminalText(advisorMeta.status === 'completed'
-                    ? '顾问意见已返回，尚不代表事实核验通过'
-                    : '顾问咨询未完成，已降级继续')}
-                </Text>
-                {advisorMeta.status === 'completed' && !advisorDecision && (
-                  <Text color={theme.subtle} wrap="end">顾问意见已返回；主 Agent 的核验与采纳结论见后续记录。</Text>
-                )}
-                {advisorDecision && (
-                  <Text color={theme.subtle} wrap="end">
-                    {terminalText(`${advisorDecision.decision} · ${advisorDecision.rationale}`)}
-                  </Text>
-                )}
-                {advisorDecision?.verificationPlan.map((item) => (
-                  <Text key={`advisor-card-verify-${item}`} color={theme.subtle} wrap="end">
-                    {terminalText(`验证：${item}`)}
-                  </Text>
-                ))}
-              </Box>
-            )}
-            {decisionMeta && (
-              <Box flexDirection="column">
-                <Text color={theme.subtle} wrap="end">
-                  {terminalText(`关联咨询 ${decisionMeta.consultationId} · ${decisionMeta.rationale}`)}
-                </Text>
-                {decisionMeta.verificationPlan.map((item) => (
-                  <Text key={`advisor-verify-${item}`} color={theme.subtle} wrap="end">
-                    {terminalText(`验证：${item}`)}
-                  </Text>
-                ))}
-              </Box>
-            )}
             {/* 逐行 wrap='end'：整段默认 wrap 会注入真实换行，从预览复制会被硬断行 */}
             {previewLines.map((line, i) => (
               <Text key={`p-${i}`} {...(isAdvisor ? {} : { color: theme.subtle })} wrap="end">

package/src/ui/hooks/useChat.js

@@ -14,6 +14,7 @@
  *    用 version 计数器驱动 setState 触发 re-render 是更顺手的写法。
  * ============================================================
  */
+import { previousUserRequest } from '../../memory/recallQuery.js';
 import { stat } from 'node:fs/promises';
 import { createTurnSummary } from '../turnSummary.js';
 import { isRecoverableLoopError } from '../../runtime/eventSemantics.js';
@@ -529,6 +530,7 @@ export function useChat(args) {
                     surface: 'tui',
                     cwd: effectiveCwd,
                     currentUserInput: trimmed,
+                    previousUserInput: previousUserRequest(historyRef.current),
                     workspaceId: workspace?.id,
                     sessionId: activeSessionIdRef.current,
                     interactiveAsk: true,

package/src/ui/hooks/useChat.ts

@@ -15,6 +15,7 @@
  * ============================================================
  */
 
+import { previousUserRequest } from '../../memory/recallQuery.js';
 import { stat } from 'node:fs/promises';
 import { createTurnSummary } from '../turnSummary.js';
 import { isRecoverableLoopError } from '../../runtime/eventSemantics.js';
@@ -829,6 +830,7 @@ export function useChat(args: {
             surface: 'tui',
             cwd: effectiveCwd,
             currentUserInput: trimmed,
+            previousUserInput: previousUserRequest(historyRef.current),
             workspaceId: workspace?.id,
             sessionId: activeSessionIdRef.current,
             interactiveAsk: true,

package/src/ui/toolProgress.js

@@ -38,7 +38,7 @@ export function toolBatchSummary(calls, maxItems = 2) {
 }
 /** 成功的普通工具结果不写 scrollback；失败和高价值结果仍保留。 */
 export function toolHistoryVisibility(toolName, content) {
-    if (toolName === 'Advisor' || toolName === 'AdvisorDecision' || toolName === 'PresentResult'
+    if (toolName === 'Advisor' || toolName === 'PresentResult'
         || toolName === 'RememberMemory' || toolName === 'UpdateMemory' || toolName === 'ForgetMemory'
         || toolName === 'ConfirmMemory' || toolName === 'SetPersona' || toolName === 'ClearPersona')
         return 'full';

package/src/ui/toolProgress.ts

@@ -43,7 +43,7 @@ export type ToolHistoryVisibility = 'hidden' | 'compact' | 'full';
 
 /** 成功的普通工具结果不写 scrollback；失败和高价值结果仍保留。 */
 export function toolHistoryVisibility(toolName: string | undefined, content: string): ToolHistoryVisibility {
-  if (toolName === 'Advisor' || toolName === 'AdvisorDecision' || toolName === 'PresentResult'
+  if (toolName === 'Advisor' || toolName === 'PresentResult'
     || toolName === 'RememberMemory' || toolName === 'UpdateMemory' || toolName === 'ForgetMemory'
     || toolName === 'ConfirmMemory' || toolName === 'SetPersona' || toolName === 'ClearPersona') return 'full';
   if (toolName === 'Agent') return 'compact';

package/src/web/protocol.ts

@@ -295,7 +295,10 @@ export interface SkillInfo {
   unavailableReason?: string;
 }
 
-export type ApiFormat = 'openai' | 'anthropic';
+export type ApiFormat = 'openai' | 'openai-responses' | 'anthropic';
+
+/** 推理强度；缺省 = 不发送，沿用服务端对该模型的默认强度。 */
+export type ReasoningEffort = 'none' | 'minimal' | 'low' | 'medium' | 'high' | 'xhigh';
 
 /** 模型列表的一个条目（脱敏视图——apiKey 只给 configured 布尔位，不下发原文）。 */
 export interface ModelView {
@@ -317,6 +320,7 @@ export interface ModelView {
   contextWindow: number;
   maxTokens?: number;
   supportsVision?: boolean;
+  reasoningEffort?: ReasoningEffort;
   promptCache?: { mode: 'auto' | 'session-key' | 'disabled' };
   enabled: boolean;
   updatedAt: number;
@@ -347,10 +351,11 @@ export interface WebchatConfig {
     configured: boolean;
     enabled: boolean;
     mode: 'auto' | 'manual';
+    /** remind = 只提醒；followup = 实质回答未复核时再请求一次，让模型自己补问顾问。 */
+    enforcement: 'remind' | 'followup';
     /** 引用 models[].id；null = 未选。顾问不再自带一整套独立凭据。 */
     modelId: string | null;
     contextPolicy: 'full-relevant';
-    shareSensitive: boolean;
     inputTokenBudget: number;
     timeoutMs: number;
   };
@@ -413,6 +418,8 @@ export interface ModelPatchFields {
   contextWindow?: number;
   maxTokens?: number;
   supportsVision?: boolean;
+  /** update 时 null = 清除，回到服务端对该模型的默认强度。 */
+  reasoningEffort?: ReasoningEffort | null;
   promptCache?: { mode: 'auto' | 'session-key' | 'disabled' };
   enabled?: boolean;
 }
@@ -431,8 +438,8 @@ export interface WebchatConfigPatch {
     clear?: boolean;
     enabled?: boolean;
     mode?: 'auto' | 'manual';
+    enforcement?: 'remind' | 'followup';
     modelId?: string | null;
-    shareSensitive?: boolean;
     inputTokenBudget?: number;
     timeoutMs?: number;
   };