minimal-agent 0.18.6 → 0.18.8

package/src/tools/bash/semantics.ts

@@ -21,35 +21,72 @@ export type CommandSemanticFn = (
   stderr: string,
 ) => CommandSemanticResult;
 
+/** Small conservative lexer, not a shell evaluator. Quoted regex operators are
+ * data. Expansions, redirects and unsupported syntax remain non-read-only. */
+function inspectionCommands(command: string): string[][] | null {
+  const commands: string[][] = [];
+  let words: string[] = [];
+  let word = '';
+  let started = false;
+  let quote = '';
+  const flushWord = () => { if (started) words.push(word); word = ''; started = false; };
+  const flushCommand = () => { flushWord(); if (words.length) commands.push(words); words = []; };
+  for (let i = 0; i < command.length; i++) {
+    const c = command[i]!;
+    if (quote === "'") {
+      if (c === "'") quote = ''; else word += c;
+      continue;
+    }
+    if (c === '\\') {
+      const next = command[++i];
+      if (next === undefined) return null;
+      if (quote === '"' && !['$', '`', '"', '\\', '\n'].includes(next)) word += '\\';
+      if (next !== '\n') { word += next; started = true; }
+      continue;
+    }
+    if (c === '`' || (c === '$' && /[({\w?'"*#@!$-]/.test(command[i + 1] ?? ''))) return null;
+    if (quote === '"') {
+      if (c === '"') quote = ''; else word += c;
+      continue;
+    }
+    if (c === "'" || c === '"') { quote = c; started = true; continue; }
+    if (/[<>(){}]/.test(c)) return null;
+    if (c === '#' && !started) {
+      while (i + 1 < command.length && command[i + 1] !== '\n') i++;
+      continue;
+    }
+    if (c === '&' && command[i + 1] !== '&') return null;
+    if (c === '&' || c === '|' || c === ';' || c === '\n') {
+      flushCommand();
+      if ((c === '&' || c === '|') && command[i + 1] === c) i++;
+      continue;
+    }
+    if (/\s/.test(c)) { flushWord(); continue; }
+    word += c; started = true;
+  }
+  if (quote) return null;
+  flushCommand();
+  return commands;
+}
+
 /** Conservative shell side-effect classification used by Advisor gates. */
 export function isReadOnlyShellCommand(command: string): boolean {
   if (!command.trim()) return true;
-  // Classification only, never an execution restriction. Unknown shell syntax
-  // retains the normal execution semantics rather than hiding side effects.
-  if (/[><`]|\$\(|\$\{|\btee\b|(?<!&)&(?!&)/i.test(command)) return false;
-  const body = command.replace(
-    /^(?:bash|sh|zsh|dash)\s+-c\s+(['"])([\s\S]*)\1\s*$/,
-    '$2',
-  );
-  const segments = body
-    .split(/&&|\|\||[;|\n]/)
-    .map((part) => part.trim())
-    .filter(Boolean);
-  for (const segment of segments) {
-    const tokens = segment.split(/\s+/).filter(Boolean);
+  // A conservative scheduling hint, not an OS sandbox. Strict read-only
+  // consumers must reject shell execution rather than trust this heuristic.
+  // Do not strip nested shell quoting: expansion may happen in the outer shell.
+  const segments = inspectionCommands(command);
+  if (!segments) return false;
+  for (const tokens of segments) {
     let index = 0;
     if (
       tokens[index] === 'command' &&
       /^(?:-v|--verbose|-V)$/.test(tokens[index + 1] ?? '')
     )
       continue;
-    while (index < tokens.length && tokens[index] === 'sudo') index++;
-    while (
-      index < tokens.length &&
-      /^[A-Za-z_][A-Za-z0-9_]*=/.test(tokens[index]!)
-    )
-      index++;
-    const name = tokens[index]?.replace(/^.*\//, '').toLowerCase();
+    if (tokens[index] === 'sudo' || /^[A-Za-z_][A-Za-z0-9_]*=/.test(tokens[index] ?? '')) return false;
+    if (/[\\/]/.test(tokens[index] ?? '')) return false;
+    const name = tokens[index]?.toLowerCase();
     if (
       !name ||
       name === 'cd' ||
@@ -158,7 +195,7 @@ export function isReadOnlyShellCommand(command: string): boolean {
     if ((name === 'env' || name === 'date') && tokens.length === index + 1)
       continue;
     if (
-      /^(?:node|bun|npm|npx|tsc|python|python3)$/.test(name) &&
+      /^(?:node|bun|python|python3)$/.test(name) &&
       tokens.length === index + 2 &&
       /^(?:--version|-v|--help|-h)$/.test(tokens[index + 1]!)
     )
@@ -184,19 +221,12 @@ export function isReadOnlyShellCommand(command: string): boolean {
  */
 export function isVerificationShellCommand(command: string): boolean {
   if (!command.trim()) return true;
-  if (/[><`]|\$\(|\$\{|\btee\b|(?<!&)&(?!&)/i.test(command)) return false;
-  const body = command.replace(
-    /^(?:bash|sh|zsh|dash)\s+-c\s+(['"])([\s\S]*)\1\s*$/,
-    '$2',
-  );
-  const segments = body
-    .split(/&&|\|\||[;|\n]/)
-    .map((part) => part.trim())
-    .filter(Boolean);
+  const segments = inspectionCommands(command);
+  if (!segments) return false;
   if (!segments.length) return false;
-  for (const segment of segments) {
-    if (isReadOnlyShellCommand(segment)) continue;
-    const tokens = segment.split(/\s+/).filter(Boolean);
+  for (const tokens of segments) {
+    // Re-quote tokens for the shared classifier without reinterpreting data.
+    if (isReadOnlyShellCommand(tokens.map(token => `'${token.replace(/'/g, `'\\''`)}'`).join(' '))) continue;
     let index = 0;
     while (index < tokens.length && tokens[index] === 'sudo') index++;
     while (

package/src/tools/index.js

@@ -204,7 +204,10 @@ export async function executeTool(name, rawArguments, signal, ctx) {
         const issues = checked.error.issues
             .map((i) => {
             const where = i.path.join('.') || '<root>';
-            return `  - ${where}：${i.message}\n    收到的值：${seen(i.path)}`;
+            const arrayHint = i.code === 'invalid_type' && i.expected === 'string' && i.received === 'array'
+                ? '\n    此处必须是字符串；列表用一层字符串数组，例如 ["第一条", "第二条"]，不要 [["第一条"]] 或 XML item 标签。'
+                : '';
+            return `  - ${where}：${i.message}\n    收到的值：${seen(i.path)}${arrayHint}`;
         })
             .join('\n');
         return {

package/src/tools/index.ts

@@ -249,7 +249,10 @@ export async function executeTool(
     const issues = checked.error.issues
       .map((i) => {
         const where = i.path.join('.') || '<root>';
-        return `  - ${where}：${i.message}\n    收到的值：${seen(i.path)}`;
+        const arrayHint = i.code === 'invalid_type' && i.expected === 'string' && i.received === 'array'
+          ? '\n    此处必须是字符串；列表用一层字符串数组，例如 ["第一条", "第二条"]，不要 [["第一条"]] 或 XML item 标签。'
+          : '';
+        return `  - ${where}：${i.message}\n    收到的值：${seen(i.path)}${arrayHint}`;
       })
       .join('\n');
     return {

package/src/tools/skill/searchSkills.js

@@ -24,7 +24,7 @@ export const searchSkillsTool = {
     }),
     callWithContext: async (input, signal, ctx) => {
         signal?.throwIfAborted();
-        const skills = visibleSkills(await discoverSkills(ctx.cwd, ctx));
+        const skills = visibleSkills(await discoverSkills(ctx.cwd, ctx), ctx.availableToolNames?.());
         signal?.throwIfAborted();
         const terms = (input.query ?? '')
             .toLocaleLowerCase()
@@ -48,7 +48,7 @@ export const searchSkillsTool = {
                 total: ranked.length,
                 nextOffset: offset + page.length < ranked.length ? offset + page.length : null,
                 skills: page.map(({ skill }) => skill),
-                note: '这是已安装目录，不表示依赖工具已启用。同名项用 sourceId 精确加载；未找到可换关键词，仅加载当前阶段相关技能。',
+                note: '宿主提供有效工具集合时已按依赖筛选；目录不授予执行权限。同名项用 sourceId 精确加载，仅加载当前阶段相关技能。',
             }),
         };
     },

package/src/tools/skill/searchSkills.ts

@@ -28,7 +28,7 @@ export const searchSkillsTool: Tool<z.infer<typeof schema>> = {
   }),
   callWithContext: async (input, signal, ctx) => {
     signal?.throwIfAborted();
-    const skills = visibleSkills(await discoverSkills(ctx.cwd, ctx));
+    const skills = visibleSkills(await discoverSkills(ctx.cwd, ctx), ctx.availableToolNames?.());
     signal?.throwIfAborted();
     const terms = (input.query ?? '')
       .toLocaleLowerCase()
@@ -58,7 +58,7 @@ export const searchSkillsTool: Tool<z.infer<typeof schema>> = {
         nextOffset:
           offset + page.length < ranked.length ? offset + page.length : null,
         skills: page.map(({ skill }) => skill),
-        note: '这是已安装目录，不表示依赖工具已启用。同名项用 sourceId 精确加载；未找到可换关键词，仅加载当前阶段相关技能。',
+        note: '宿主提供有效工具集合时已按依赖筛选；目录不授予执行权限。同名项用 sourceId 精确加载，仅加载当前阶段相关技能。',
       }),
     };
   },

package/src/tools/skill/skill.js

@@ -27,6 +27,10 @@ async function call(input, context) {
             ok: false,
             error: `Skill 名称有歧义：${input.name}。请选择 sourceId 后重试。\n${JSON.stringify(found.map(({ sourceId, sourceDir }) => ({ sourceId, sourceDir })))}`,
         };
+    const available = context.availableToolNames?.();
+    const missing = available && found[0].requiresTools?.filter(name => !available.has(name));
+    if (missing?.length)
+        return { ok: false, error: `Skill ${input.name} 当前缺少工具：${missing.join(', ')}。不能通过技能扩大执行权限。` };
     // Search roots are ordered: project skill intentionally overrides the bundled skill.
     const path = join(found[0].sourceDir, 'SKILL.md');
     const content = await readFile(path);

package/src/tools/skill/skill.ts

@@ -42,6 +42,9 @@ async function call(
       ok: false,
       error: `Skill 名称有歧义：${input.name}。请选择 sourceId 后重试。\n${JSON.stringify(found.map(({ sourceId, sourceDir }) => ({ sourceId, sourceDir })))}`,
     };
+  const available = context.availableToolNames?.();
+  const missing = available && found[0]!.requiresTools?.filter(name => !available.has(name));
+  if (missing?.length) return { ok: false, error: `Skill ${input.name} 当前缺少工具：${missing.join(', ')}。不能通过技能扩大执行权限。` };
   // Search roots are ordered: project skill intentionally overrides the bundled skill.
   const path = join(found[0]!.sourceDir, 'SKILL.md');
   const content = await readFile(path);

package/src/types.ts

@@ -163,6 +163,8 @@ export type Message = (
       _ephemeral?: true;
       /** Display-only milestone, persisted locally but excluded from model requests. */
       _uiProgress?: true;
+      /** Local reading history only; never a model instruction or final answer. */
+      draftPresentation?: { reason: string; label: string };
       workflowPresentation?: import('./runtime/workflowPresentation.js').WorkflowPresentation;
     }
   | {
@@ -174,6 +176,8 @@ 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. */
       advisorTaskVersion?: number;
       /** 当 tool_calls 非空时 content 通常为 null（OpenAI 协议） */
@@ -566,6 +570,10 @@ export type ToolResult = { problem?: ToolProblemOutcome; observation?: ReadObser
  * 避免按工具名写特判分支。
  */
 export interface ToolCallContext {
+  /** Host presentation only; cannot grant tools to a delegated agent. */
+  output?: import('./runtime/outputContract.js').OutputContract;
+  /** Live effective catalog, including per-turn restrictions. */
+  availableToolNames?: () => ReadonlySet<string>;
   messageProvenance?: ConversationProvenance;
   agentHandoff?: {
     questionIds?: readonly string[];
@@ -593,6 +601,8 @@ export interface ToolCallContext {
   advisorInvocation?: 'agent' | 'manual';
   /** Advisor 协调器运行时桥；只存在于主循环，不暴露给模型或持久化。 */
   advisorRuntime?: AdvisorRuntimeBridge;
+  /** Live host context used by the main request, not tool-provided instructions. */
+  advisorReviewContext?: () => import('./advisor/reviewContext.js').AdvisorReviewContext;
   /**
    * 主循环使用的 provider —— Agent 等「工具内部再起子查询」的派生工具用它
    * 跑嵌套 runQuery（子 agent 与主 agent 同一模型，不另配凭据）。
@@ -1122,8 +1132,8 @@ export type LlmStreamEvent =
  * 工作过程显示阶段标签（UI 的 LiveArea 据此选择文字 / 决定是否隐藏整面板）。
  *
  *   idle           —— 当前没有任何工作（隐藏 LiveArea）
- *   thinking       —— 已发请求，等首个 token（reasoning 或 text 或 tool_call）
- *   streaming      —— 模型在流式输出最终回答文本
+ *   thinking       —— 正在准备候选答案或等待工具调用，候选正文不公开
+ *   streaming      —— 内部检查结束后，最终表达请求的真实正文流
  *   tool_executing —— 至少一个工具在跑（并行时栈式显示多个）
  *   compacting     —— 正在跑自动 / reactive / 手动压缩
  */
@@ -1221,8 +1231,9 @@ export type LoopEvent =
       message: Extract<Message, { role: 'assistant' }>;
     }
   /**
-   * 模型已经流出了一份正文/思考草稿，但宿主确定它还不能成为本轮回答。
-   * 消费方应清掉 live 草稿；该草稿不会写入会话 history。
+   * 内部候选正文尚不能交付，需要进入检查或补全阶段。
+   * 新内核候选正文不广播；textLength=0，仅表示准备/复核阶段变化。
+   * textLength>0 仅供旧事件兼容，不应作为正常展示路径。
    */
   | {
       type: 'assistant_draft_discarded';
@@ -1315,7 +1326,8 @@ export type LoopEvent =
         | 'completed'
         | 'delivery_incomplete'
         | 'delivery_unverified'
-        | 'claims_unverified';
+        | 'claims_unverified'
+        | 'no_answer';
       warning?: string;
       /** 本回合的资源账本。见 TurnResourceUsage —— 消费方务必先看 `trustworthy`。 */
       usage?: TurnResourceUsage;
@@ -1336,7 +1348,7 @@ export type LoopEvent =
    * - reason: 'manual' 用户按ESC/Ctrl+C手动中断
    * - reason: 'queued_input' 有新的排队输入需要在安全点处理
    */
-  | { type: 'interrupted'; reason?: 'manual' | 'queued_input' }
+  | { type: 'interrupted'; reason?: 'manual' | 'queued_input'; usage?: TurnResourceUsage }
   /**
    * 出错（API 报错 / 网络异常等）。
    *
@@ -1357,6 +1369,7 @@ export type LoopEvent =
   | {
       type: 'error';
       error: string;
+      usage?: TurnResourceUsage;
       code?:
         | 'llm_error'
         | 'max_turns'

package/src/ui/LiveArea.js

@@ -37,7 +37,7 @@ import { figures } from './figures.js';
 import { humanizeToolProgress } from './toolProgress.js';
 const STAGE_LABELS = {
     thinking: '思考中',
-    streaming: '输出中（尚未定稿）',
+    streaming: '正在输出最终答案',
     tool_executing: '工作中',
     compacting: '压缩历史',
 };
@@ -179,6 +179,7 @@ export function buildLiveView(props) {
         contentDim = true;
     }
     else if (stage === 'streaming' && streamingText.length > 0) {
+        // Compatibility for older event producers; new loops publish only approved answers.
         contentLines = lastN(wrapToDisplayLines(streamingText, maxWidth), maxLines);
         contentDim = false; // 答案 = 主角，默认亮色
     }

package/src/ui/LiveArea.tsx

@@ -66,7 +66,7 @@ export interface LiveAreaProps {
 
 const STAGE_LABELS: Record<Exclude<ProgressStage, 'idle'>, string> = {
   thinking: '思考中',
-  streaming: '输出中（尚未定稿）',
+  streaming: '正在输出最终答案',
   tool_executing: '工作中',
   compacting: '压缩历史',
 };
@@ -262,6 +262,7 @@ export function buildLiveView(
     );
     contentDim = true;
   } else if (stage === 'streaming' && streamingText.length > 0) {
+    // Compatibility for older event producers; new loops publish only approved answers.
     contentLines = lastN(wrapToDisplayLines(streamingText, maxWidth), maxLines);
     contentDim = false; // 答案 = 主角，默认亮色
   } else if (stage === 'tool_executing' && runningTools.length > 0) {

package/src/ui/MessageList.js

@@ -35,6 +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 { contentToDisplayText, contentToPlainText } from '../multimodal.js';
 import { splitThinkBlocks } from '../utils/stripThink.js';
 import { figures } from './figures.js';
@@ -285,9 +286,11 @@ function MessageRow({ message, turnMeta, toolMeta, advisorDecision, foldReasonin
             const ephemeral = message._ephemeral === true;
             if (!ephemeral)
                 return null;
-            const lines = terminalText(message.content).split('\n');
+            const lines = message.draftPresentation
+                ? renderMarkdownLines(terminalText(message.content)).map(line => line.text)
+                : terminalText(message.content).split('\n');
             const milestone = message._uiProgress === true;
-            return (_jsx(Box, { marginBottom: 1, paddingLeft: 2, children: _jsx(Box, { flexDirection: "column", children: lines.map((line, i) => (_jsx(Text, { color: milestone ? theme.answer : theme.subtle, dimColor: !milestone, wrap: "end", children: line }, `eph-${i}`))) }) }));
+            return (_jsx(Box, { marginBottom: 1, paddingLeft: 2, children: _jsxs(Box, { flexDirection: "column", children: [message.draftPresentation && _jsx(Text, { color: theme.subtle, children: message.draftPresentation.label }), lines.map((line, i) => (_jsx(Text, { color: milestone ? theme.answer : theme.subtle, dimColor: !milestone, wrap: "end", children: line }, `eph-${i}`)))] }) }));
         }
         case 'user': {
             const rule = figures.hr.repeat(6);
@@ -326,7 +329,7 @@ function MessageRow({ message, turnMeta, toolMeta, advisorDecision, foldReasonin
             const hiddenReasoningCount = toolOnly
                 ? 0
                 : reasoningLines.length - visibleReasoningLines.length;
-            return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [visibleReasoningLines.length > 0 && (_jsxs(Box, { flexDirection: "column", children: [visibleReasoningLines.map((line, i) => (_jsx(Text, { color: theme.subtle, dimColor: true, wrap: "end", children: i === 0 ? `${figures.thought} ${line}` : `   ${line}` }, `r-${i}`))), hiddenReasoningCount > 0 && (_jsx(Text, { color: theme.subtle, dimColor: true, children: `   ${figures.fold} ${hiddenReasoningCount} 行 reasoning 折叠（终端高度 < ${NARROW_TERMINAL_ROWS}）` })), truncatedCharsHint.length > 0 && (_jsx(Text, { color: theme.subtle, dimColor: true, children: `   ${truncatedCharsHint}` }))] })), buildAssistantDisplayLines(answer).map((line, i) => {
+            return (_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [visibleReasoningLines.length > 0 && (_jsxs(Box, { flexDirection: "column", children: [visibleReasoningLines.map((line, i) => (_jsx(Text, { color: theme.subtle, dimColor: true, wrap: "end", children: i === 0 ? `${figures.thought} ${line}` : `   ${line}` }, `r-${i}`))), hiddenReasoningCount > 0 && (_jsx(Text, { color: theme.subtle, dimColor: true, children: `   ${figures.fold} ${hiddenReasoningCount} 行 reasoning 折叠（终端高度 < ${NARROW_TERMINAL_ROWS}）` })), truncatedCharsHint.length > 0 && (_jsx(Text, { color: theme.subtle, dimColor: true, children: `   ${truncatedCharsHint}` }))] })), answer.trim() && (message.presentation || tcCount > 0) && (_jsx(Text, { color: theme.subtle, dimColor: true, children: message.presentation === 'final' ? '最终回答' : '工作进展 · 执行中说明' })), buildAssistantDisplayLines(answer).map((line, i) => {
                         if (line.kind === 'fence') {
                             return (_jsx(Text, { color: theme.subtle, dimColor: true, wrap: line.wrap, children: line.content }, `a-${i}`));
                         }
@@ -355,11 +358,16 @@ function MessageRow({ message, turnMeta, toolMeta, advisorDecision, foldReasonin
                 ?? (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 _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,12 +385,17 @@ function MessageRow({ message, turnMeta, toolMeta, advisorDecision, foldReasonin
                         : `[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.consultationId} · 版本 ${advisorMeta.taskVersion}/${advisorMeta.workVersion}/${advisorMeta.evidenceVersion}`
-                                        : `咨询 ${advisorMeta.consultationId} 未完成，检查点已降级放行`) }), 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} 查看）` }))] }) }));
+                                        ? '顾问意见已返回，尚不代表事实核验通过'
+                                        : '顾问咨询未完成，已降级继续') }), 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} 查看）` }))] }) }));
         }
     }
 }

package/src/ui/MessageList.tsx

@@ -36,6 +36,7 @@ import React from 'react';
 import { Box, Static, Text } from 'ink';
 
 import { conciseToolDescription } from './toolProgress.js';
+import { advisorOpinionText, advisorDecisionLabel, advisorEvidenceLabel } from '../advisor/presentation.js';
 import { contentToDisplayText, contentToPlainText } from '../multimodal.js';
 import type { AdvisorDecisionMetadata, Message } from '../types.js';
 import { splitThinkBlocks } from '../utils/stripThink.js';
@@ -406,11 +407,14 @@ function MessageRow({
       const ephemeral =
         (message as { _ephemeral?: true })._ephemeral === true;
       if (!ephemeral) return null;
-      const lines = terminalText(message.content).split('\n');
+      const lines = message.draftPresentation
+        ? renderMarkdownLines(terminalText(message.content)).map(line => line.text)
+        : terminalText(message.content).split('\n');
       const milestone = message._uiProgress === true;
       return (
         <Box marginBottom={1} paddingLeft={2}>
           <Box flexDirection="column">
+            {message.draftPresentation && <Text color={theme.subtle}>{message.draftPresentation.label}</Text>}
             {lines.map((line, i) => (
               <Text key={`eph-${i}`} color={milestone ? theme.answer : theme.subtle} dimColor={!milestone} wrap="end">
                 {line}
@@ -500,6 +504,11 @@ function MessageRow({
               第一条非空 prose 行 + 默认亮色正文（答案是主角）。代码块「零装饰」：
               fence 行 dim、code 行顶格无前缀无染色逐字节原文 —— 复制粘贴即原文。
               纯 <Static> 渲染（write-once），零刷屏风险，不碰 LiveArea 的 INV-1/INV-2。 */}
+          {answer.trim() && (message.presentation || tcCount > 0) && (
+            <Text color={theme.subtle} dimColor>
+              {message.presentation === 'final' ? '最终回答' : '工作进展 · 执行中说明'}
+            </Text>
+          )}
           {buildAssistantDisplayLines(answer).map((line, i) => {
             if (line.kind === 'fence') {
               return (
@@ -557,11 +566,17 @@ function MessageRow({
         ?? (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 =
@@ -579,6 +594,13 @@ function MessageRow({
           ? 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}>
@@ -598,8 +620,8 @@ function MessageRow({
               <Box flexDirection="column">
                 <Text color={theme.subtle} wrap="end">
                   {terminalText(advisorMeta.status === 'completed'
-                    ? `咨询 ${advisorMeta.consultationId} · 版本 ${advisorMeta.taskVersion}/${advisorMeta.workVersion}/${advisorMeta.evidenceVersion}`
-                    : `咨询 ${advisorMeta.consultationId} 未完成，检查点已降级放行`)}
+                    ? '顾问意见已返回，尚不代表事实核验通过'
+                    : '顾问咨询未完成，已降级继续')}
                 </Text>
                 {advisorMeta.status === 'completed' && !advisorDecision && (
                   <Text color={theme.subtle} wrap="end">顾问意见已返回；主 Agent 的核验与采纳结论见后续记录。</Text>

package/src/ui/draftNotice.js

@@ -1,8 +1 @@
-export function draftNotice(reason) {
-    switch (reason) {
-        case 'advisor_checkpoint': return '交付前复核：草稿尚未交付，接下来咨询顾问，再由主 Agent 核验并定稿。';
-        case 'formal_delivery': return '整理交付：草稿尚未交付，接下来核对委派结果或补齐正式成果提交。';
-        case 'interactive_question': return '等待关键决策：刚才的提问草稿将改为交互问题，请在输入区作答。';
-        case 'empty_response': return '本轮未产生可显示的正文，未生成新的最终答复。';
-    }
-}
+export { answerPreparationNotice as draftNotice } from '../runtime/answerPreparation.js';

package/src/ui/draftNotice.ts

@@ -1,10 +1 @@
-import type { LoopEvent } from '../types.js';
-
-export function draftNotice(reason: Extract<LoopEvent, { type: 'assistant_draft_discarded' }>['reason']): string {
-  switch (reason) {
-    case 'advisor_checkpoint': return '交付前复核：草稿尚未交付，接下来咨询顾问，再由主 Agent 核验并定稿。';
-    case 'formal_delivery': return '整理交付：草稿尚未交付，接下来核对委派结果或补齐正式成果提交。';
-    case 'interactive_question': return '等待关键决策：刚才的提问草稿将改为交互问题，请在输入区作答。';
-    case 'empty_response': return '本轮未产生可显示的正文，未生成新的最终答复。';
-  }
-}
+export { answerPreparationNotice as draftNotice } from '../runtime/answerPreparation.js';

package/src/ui/hooks/useChat.js

@@ -1055,6 +1055,13 @@ export function handleEvent(ev, setters) {
     // V2 工作流发结构化 `workflow_progress`；旧插件仍可发 `plugin_progress`。
     // 收口到 LoopEvent：未识别的 PluginEvent type 走 default no-op
     const e = ev;
+    if (e.type === 'turn_done' || e.type === 'interrupted' || (e.type === 'error' && !isRecoverableLoopError(e))) {
+        setters.cancelStreamingFlush();
+        setters.setStreamingText(() => '');
+        setters.cancelReasoningFlush();
+        setters.setReasoningPreview(() => '');
+        setters.setProgressStage('idle');
+    }
     if (['assistant_message', 'tool_start', 'turn_done', 'interrupted', 'error'].includes(e.type))
         setters.setProgressNotice?.(null);
     switch (e.type) {
@@ -1067,6 +1074,8 @@ export function handleEvent(ev, setters) {
             setters.appendStreamingDelta(e.delta);
             break;
         case 'assistant_message':
+            if (e.message.presentation === 'final')
+                setters.setPluginProgress(null);
             // history 已被 runQuery 直接 push。先 flush 残留 streaming buffer
             // 把末段 text 落到 streamingText state（avoid 视觉跳跃），再清空
             // streamingText —— Static 已 commit 完整 assistant message 接管显示。
@@ -1085,13 +1094,26 @@ export function handleEvent(ev, setters) {
             setters.setTransientError?.(null);
             setters.bump();
             break;
+        case 'injected_message':
+            // Milestones preserve live previews; legacy drafts transfer them to history.
+            if (e.message.role === 'system' && e.message._uiProgress) {
+                if (e.message.draftPresentation) {
+                    setters.flushStreamingBuffer();
+                    setters.setStreamingText(() => '');
+                    setters.cancelReasoningFlush();
+                    setters.setReasoningPreview(() => '');
+                }
+                setters.bump();
+            }
+            break;
         case 'assistant_draft_discarded':
             setters.flushStreamingBuffer();
             setters.setStreamingText(() => '');
             setters.cancelReasoningFlush();
             setters.setReasoningPreview(() => '');
             setters.setProgressStage('thinking');
-            setters.emitProgressLine?.(draftNotice(e.reason));
+            if (e.textLength > 0)
+                setters.emitProgressLine?.(draftNotice(e.reason));
             setters.setProgressNotice?.(draftNotice(e.reason));
             break;
         case 'tool_start':
@@ -1177,6 +1199,8 @@ export function handleEvent(ev, setters) {
             // Diagnostics are intentionally local-safe and currently consumed by CLI/stream hosts.
             break;
         case 'turn_done':
+            if (e.completionStatus === 'no_answer')
+                setters.setError(e.warning ?? '本轮未生成最终答复，可以重试。');
             setters.setProgressStage('idle');
             setters.setTransientError?.(null);
             setters.bump();

package/src/ui/hooks/useChat.ts

@@ -1466,6 +1466,13 @@ export function handleEvent(
 
   // 收口到 LoopEvent：未识别的 PluginEvent type 走 default no-op
   const e = ev as LoopEvent;
+  if (e.type === 'turn_done' || e.type === 'interrupted' || (e.type === 'error' && !isRecoverableLoopError(e))) {
+    setters.cancelStreamingFlush();
+    setters.setStreamingText(() => '');
+    setters.cancelReasoningFlush();
+    setters.setReasoningPreview(() => '');
+    setters.setProgressStage('idle');
+  }
   if (['assistant_message', 'tool_start', 'turn_done', 'interrupted', 'error'].includes(e.type)) setters.setProgressNotice?.(null);
   switch (e.type) {
     case 'user_message_committed':
@@ -1477,6 +1484,7 @@ export function handleEvent(
       setters.appendStreamingDelta(e.delta);
       break;
     case 'assistant_message':
+      if (e.message.presentation === 'final') setters.setPluginProgress(null);
       // history 已被 runQuery 直接 push。先 flush 残留 streaming buffer
       // 把末段 text 落到 streamingText state（avoid 视觉跳跃），再清空
       // streamingText —— Static 已 commit 完整 assistant message 接管显示。
@@ -1495,13 +1503,25 @@ export function handleEvent(
       setters.setTransientError?.(null);
       setters.bump();
       break;
+    case 'injected_message':
+      // Milestones preserve live previews; legacy drafts transfer them to history.
+      if (e.message.role === 'system' && e.message._uiProgress) {
+        if (e.message.draftPresentation) {
+          setters.flushStreamingBuffer();
+          setters.setStreamingText(() => '');
+          setters.cancelReasoningFlush();
+          setters.setReasoningPreview(() => '');
+        }
+        setters.bump();
+      }
+      break;
     case 'assistant_draft_discarded':
       setters.flushStreamingBuffer();
       setters.setStreamingText(() => '');
       setters.cancelReasoningFlush();
       setters.setReasoningPreview(() => '');
       setters.setProgressStage('thinking');
-      setters.emitProgressLine?.(draftNotice(e.reason));
+      if (e.textLength > 0) setters.emitProgressLine?.(draftNotice(e.reason));
       setters.setProgressNotice?.(draftNotice(e.reason));
       break;
     case 'tool_start':
@@ -1585,6 +1605,7 @@ export function handleEvent(
       // Diagnostics are intentionally local-safe and currently consumed by CLI/stream hosts.
       break;
     case 'turn_done':
+      if (e.completionStatus === 'no_answer') setters.setError(e.warning ?? '本轮未生成最终答复，可以重试。');
       setters.setProgressStage('idle');
       setters.setTransientError?.(null);
       setters.bump();