@zhin.js/agent 1.1.38 → 1.1.40

package/lib/context/turn-envelope.js.map

@@ -1 +1 @@
-{"version":3,"file":"turn-envelope.js","sourceRoot":"","sources":["../../src/context/turn-envelope.ts"],"names":[],"mappings":"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","sourcesContent":["import { getFileMemoryContext, formatMemoryPathsHint } from '../memory-layers.js';\nimport type { TurnRequest } from '../turn/turn-ingress.js';\n\nexport const TURN_CONTEXT_BEGIN = '[Turn context]';\nexport const TURN_CONTEXT_END = '[/Turn context]';\n\nexport type TurnContextView = Pick<TurnRequest, 'origin' | 'principal' | 'session'>\n  & Partial<Pick<TurnRequest, 'policy'>>;\n\nexport interface TurnContextEnvelopeInput {\n  turn?: TurnContextView;\n  profileSummary?: string;\n  toneHint?: string;\n  deferredStats?: string;\n  activeSkillsContext?: string;\n  quoteSystemHint?: string;\n  modelLine?: string;\n  sdk?: string;\n  agentsContext?: string;\n  /** Rendered \"already told the user\" ledger (#730). */\n  toldLedger?: string;\n  /** BM25-recalled semantic memory for this message (#734). */\n  relevantMemory?: string;\n}\n\nexport function formatSessionContextLine(turn: TurnContextView): string {\n  const origin = turn.origin;\n  if (origin.kind === 'im') {\n    return `Session: platform:${origin.platform} | endpoint:${origin.endpoint} | ${origin.scope}_id:${origin.sceneId}`;\n  }\n  if (origin.kind === 'http') return `Session: origin:http | session_id:${origin.sessionId}`;\n  if (origin.kind === 'a2a') return `Session: origin:a2a | task_id:${origin.taskId}`;\n  if (origin.kind === 'schedule') return `Session: origin:schedule | job_id:${origin.jobId}`;\n  return `Session: origin:internal | source:${origin.source}`;\n}\n\nexport function formatSenderContextLine(turn: TurnContextView): string {\n  const { principal } = turn;\n  const roles = principal.roles.length > 0 ? principal.roles.join(',') : 'user';\n  return principal.displayName?.trim()\n    ? `Sender: id=${principal.subjectId} name=${principal.displayName.trim()} roles=${roles}`\n    : `Sender: id=${principal.subjectId} roles=${roles}`;\n}\n\nexport function buildTurnContextEnvelope(input: TurnContextEnvelopeInput): string | null {\n  const lines: string[] = [];\n  const now = new Date();\n  const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;\n  const timeStr = now.toLocaleString('zh-CN', { timeZone: tz });\n  lines.push(`Time: ${timeStr} (${tz})`);\n\n  if (input.modelLine?.trim()) lines.push(`Model: ${input.modelLine.trim()}`);\n  if (input.sdk?.trim()) lines.push(`Sdk: ${input.sdk.trim()}`);\n\n  if (input.turn) {\n    lines.push(formatSessionContextLine(input.turn));\n    lines.push(formatSenderContextLine(input.turn));\n    if (input.turn.policy?.filesystem) {\n      const filesystem = input.turn.policy.filesystem;\n      lines.push(`Workspace: ${filesystem.workingDirectory ?? filesystem.workspaceRoot} | access:${filesystem.access ?? 'workspace-write'}`);\n    }\n    if (input.turn.origin.kind === 'im') {\n      const platform = input.turn.origin.platform;\n      const sessionKey = input.turn.session.key;\n      const memoryPaths = formatMemoryPathsHint(platform, sessionKey);\n      if (memoryPaths) lines.push(`Memory paths: ${memoryPaths}`);\n      const fileMemory = getFileMemoryContext(undefined, platform, sessionKey);\n      if (fileMemory?.trim()) {\n        lines.push('Memory snapshot:');\n        lines.push(fileMemory.trim());\n      }\n    }\n  }\n\n  if (input.deferredStats?.trim()) lines.push(`Deferred catalog: ${input.deferredStats.trim()}`);\n  if (input.profileSummary?.trim()) lines.push(input.profileSummary.trim());\n  if (input.toneHint?.trim()) lines.push(`[Tone hint] ${input.toneHint.trim()}`);\n  if (input.activeSkillsContext?.trim()) lines.push(input.activeSkillsContext.trim());\n  if (input.quoteSystemHint?.trim()) lines.push(input.quoteSystemHint.trim());\n  if (input.agentsContext?.trim()) lines.push(input.agentsContext.trim());\n  if (input.toldLedger?.trim()) lines.push(input.toldLedger.trim());\n  if (input.relevantMemory?.trim()) lines.push(input.relevantMemory.trim());\n\n  return lines.length === 0\n    ? null\n    : `${TURN_CONTEXT_BEGIN}\\n${lines.join('\\n')}\\n${TURN_CONTEXT_END}`;\n}\n\nexport function prependTurnContextEnvelope(content: string, envelope: string | null | undefined): string {\n  if (!envelope?.trim()) return content;\n  return `${envelope.trim()}\\n\\n${content}`;\n}\n"]}
+{"version":3,"file":"turn-envelope.js","sourceRoot":"","sources":["../../src/context/turn-envelope.ts"],"names":[],"mappings":"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","sourcesContent":["import { createPromptContextBlock, type TextContentBlock } from '@zhin.js/ai';\nimport { getFileMemoryContext, formatMemoryPathsHint } from '../memory-layers.js';\nimport type { TurnRequest } from '../turn/turn-ingress.js';\n\nexport const TURN_CONTEXT_BEGIN = '[Turn context]';\nexport const TURN_CONTEXT_END = '[/Turn context]';\n\nexport type TurnContextView = Pick<TurnRequest, 'origin' | 'principal' | 'session'>\n  & Partial<Pick<TurnRequest, 'policy' | 'input'>>;\n\n/** Trusted turn metadata key the IM ingress sets for a turn nobody addressed. */\nexport const AMBIENT_ENGAGEMENT_METADATA_KEY = 'zhinEngagement';\n\nconst AMBIENT_ENGAGEMENT_LINE = 'Engagement: ambient. Nobody called you; you are reading the group chat and chose to look. '\n  + 'Reply only if a group member like you would naturally chime in here; otherwise return {\"messages\":[]} and stay quiet.';\n\nexport interface TurnContextEnvelopeInput {\n  turn?: TurnContextView;\n  profileSummary?: string;\n  toneHint?: string;\n  deferredStats?: string;\n  activeSkillsContext?: string;\n  activeSkillBlocks?: readonly TextContentBlock[];\n  quoteSystemHint?: string;\n  modelLine?: string;\n  sdk?: string;\n  gitStatus?: string | null;\n  agentsContext?: string;\n  /** Rendered \"already told the user\" ledger (#730). */\n  toldLedger?: string;\n  /** BM25-recalled semantic memory for this message (#734). */\n  relevantMemory?: string;\n}\n\nexport function formatSessionContextLine(turn: TurnContextView): string {\n  const origin = turn.origin;\n  if (origin.kind === 'im') {\n    return `Session: platform:${origin.platform} | endpoint:${origin.endpoint} | ${origin.scope}_id:${origin.sceneId}`;\n  }\n  if (origin.kind === 'http') return `Session: origin:http | session_id:${origin.sessionId}`;\n  if (origin.kind === 'a2a') return `Session: origin:a2a | task_id:${origin.taskId}`;\n  if (origin.kind === 'schedule') return `Session: origin:schedule | job_id:${origin.jobId}`;\n  return `Session: origin:internal | source:${origin.source}`;\n}\n\nexport function formatSenderContextLine(turn: TurnContextView): string {\n  const { principal } = turn;\n  const roles = principal.roles.length > 0 ? principal.roles.join(',') : 'user';\n  return principal.displayName?.trim()\n    ? `Sender: id=${principal.subjectId} name=${principal.displayName.trim()} roles=${roles}`\n    : `Sender: id=${principal.subjectId} roles=${roles}`;\n}\n\nexport function buildTurnContextEnvelope(input: TurnContextEnvelopeInput): string | null {\n  return buildTurnContextBlocks(input).map(block => block.text).join('\\n');\n}\n\nexport function buildTurnContextBlocks(input: TurnContextEnvelopeInput): TextContentBlock[] {\n  const blocks: TextContentBlock[] = [];\n  const lines: string[] = [TURN_CONTEXT_BEGIN];\n  const flush = () => {\n    if (lines.length) blocks.push({ type: 'text', text: lines.splice(0).join('\\n') });\n  };\n  const now = new Date();\n  const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;\n  const timeStr = now.toLocaleString('zh-CN', { timeZone: tz });\n  lines.push(`Time: ${timeStr} (${tz})`);\n\n  if (input.modelLine?.trim()) lines.push(`Model: ${input.modelLine.trim()}`);\n  if (input.sdk?.trim()) lines.push(`Sdk: ${input.sdk.trim()}`);\n  if (input.gitStatus?.trim()) lines.push(input.gitStatus.trim());\n\n  if (input.turn) {\n    lines.push(formatSessionContextLine(input.turn));\n    lines.push(formatSenderContextLine(input.turn));\n    if (input.turn.input?.metadata?.[AMBIENT_ENGAGEMENT_METADATA_KEY] === 'ambient') lines.push(AMBIENT_ENGAGEMENT_LINE);\n    if (input.turn.policy?.filesystem) {\n      const filesystem = input.turn.policy.filesystem;\n      lines.push(`Workspace: ${filesystem.workingDirectory ?? filesystem.workspaceRoot} | access:${filesystem.access ?? 'workspace-write'}`);\n    }\n    if (input.turn.origin.kind === 'im') {\n      const platform = input.turn.origin.platform;\n      const sessionKey = input.turn.session.key;\n      const memoryPaths = formatMemoryPathsHint(platform, sessionKey);\n      if (memoryPaths) lines.push(`Memory paths: ${memoryPaths}`);\n      const fileMemory = getFileMemoryContext(undefined, platform, sessionKey);\n      if (fileMemory?.trim()) {\n        lines.push('Memory snapshot:');\n        lines.push(fileMemory.trim());\n      }\n    }\n  }\n\n  if (input.deferredStats?.trim()) lines.push(`Deferred catalog: ${input.deferredStats.trim()}`);\n  if (input.profileSummary?.trim()) lines.push(input.profileSummary.trim());\n  if (input.toneHint?.trim()) lines.push(`[Tone hint] ${input.toneHint.trim()}`);\n  if (input.activeSkillBlocks?.length) {\n    flush();\n    blocks.push(...input.activeSkillBlocks);\n  } else if (input.activeSkillsContext?.trim()) lines.push(input.activeSkillsContext.trim());\n  if (input.quoteSystemHint?.trim()) lines.push(input.quoteSystemHint.trim());\n  if (input.agentsContext?.trim()) {\n    flush();\n    blocks.push(createPromptContextBlock('workspace-rules', input.agentsContext.trim()));\n  }\n  if (input.toldLedger?.trim()) lines.push(input.toldLedger.trim());\n  if (input.relevantMemory?.trim()) lines.push(input.relevantMemory.trim());\n\n  lines.push(TURN_CONTEXT_END);\n  flush();\n  return blocks;\n}\n\nexport function prependTurnContextEnvelope(content: string, envelope: string | null | undefined): string {\n  if (!envelope?.trim()) return content;\n  return `${envelope.trim()}\\n\\n${content}`;\n}\n"]}

package/lib/context/turn-user-message.d.ts

@@ -1,4 +1,4 @@
-import { type AgentMessageExtra, type AgentMessage, type UserMessage } from '@zhin.js/ai';
+import { type AgentMessageExtra, type AgentMessage, type UserMessage, type TextContentBlock } from '@zhin.js/ai';
 import type { Message } from '@zhin.js/core';
 export declare function buildTurnUserMessages(commMessage: Message, rawContent: string): {
     rawContent: string;
@@ -7,3 +7,5 @@ export declare function buildTurnUserMessages(commMessage: Message, rawContent:
 };
 export declare function applyTurnContextToUserMessages(messages: UserMessage[], envelope: string | null | undefined): UserMessage[];
 export declare function prependEnvelopeToFirstUserText(messages: AgentMessage[], envelope: string | null | undefined): AgentMessage[];
+/** Keep provenance-bearing guidance separate from the actual participant text. */
+export declare function prependTurnContextBlocks(messages: AgentMessage[], blocks: readonly TextContentBlock[], extra?: AgentMessageExtra): AgentMessage[];

package/lib/context/turn-user-message.js

@@ -1,4 +1,4 @@
-import { createUserMessage, userMessagePlainText } from '@zhin.js/ai';
+import { createUserMessage, userMessagePlainText, userMessageBody, renderUserMessageForLlm } from '@zhin.js/ai';
 import { resolveTurnUserMessage } from '../session/session-io.js';
 import { prependTurnContextEnvelope } from './turn-envelope.js';
 export function buildTurnUserMessages(commMessage, rawContent) {
@@ -44,4 +44,17 @@ export function prependEnvelopeToFirstUserText(messages, envelope) {
     nextContent[textIdx] = { type: 'text', text: nextText };
     return [{ ...first, content: nextContent }, ...messages.slice(1)];
 }
+/** Keep provenance-bearing guidance separate from the actual participant text. */
+export function prependTurnContextBlocks(messages, blocks, extra) {
+    const first = messages[0];
+    if (first?.role !== 'user' || !Array.isArray(first.content) || !blocks.length)
+        return messages;
+    const user = first;
+    // Only the first text block carries the ingress presentation. Preserve the
+    // other blocks (including provenance) and current media without flattening.
+    const content = user.content.map((block, index) => index === 0 && !block.contextRef
+        ? { ...block, text: userMessageBody({ ...user, content: [block] }, extra) }
+        : block);
+    return [renderUserMessageForLlm({ ...user, content: [...blocks, ...content] }, extra), ...messages.slice(1)];
+}
 //# sourceMappingURL=turn-user-message.js.map

package/lib/context/turn-user-message.js.map

@@ -1 +1 @@
-{"version":3,"file":"turn-user-message.js","sourceRoot":"","sources":["../../src/context/turn-user-message.ts"],"names":[],"mappings":"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","sourcesContent":["import { type AgentMessageExtra, type AgentMessage, type UserMessage, createUserMessage, userMessagePlainText } from '@zhin.js/ai';\nimport type { Message } from '@zhin.js/core';\nimport { resolveTurnUserMessage } from '../session/session-io.js';\nimport { prependTurnContextEnvelope } from './turn-envelope.js';\nexport function buildTurnUserMessages(\n  commMessage: Message,\n  rawContent: string,\n): {\n  rawContent: string;\n  userMessageExtra?: AgentMessageExtra;\n  promptMessages: UserMessage[];\n} {\n  const { content, llmMessage } = resolveTurnUserMessage(\n    commMessage as import('@zhin.js/core').AgentTurnMessage,\n    rawContent,\n  );\n  return {\n    rawContent: content,\n    promptMessages: [llmMessage],\n  };\n}\n\nexport function applyTurnContextToUserMessages(\n  messages: UserMessage[],\n  envelope: string | null | undefined,\n): UserMessage[] {\n  if (!envelope?.trim() || messages.length === 0) return messages;\n  return messages.map((msg, i) => {\n    if (i !== 0 || msg.role !== 'user') return msg;\n    const text = userMessagePlainText(msg);\n    return createUserMessage(\n      prependTurnContextEnvelope(text, envelope),\n      msg.media,\n      msg.timestamp,\n      msg.actor,\n      msg.cause,\n    );\n  });\n}\n\nexport function prependEnvelopeToFirstUserText(\n  messages: AgentMessage[],\n  envelope: string | null | undefined,\n): AgentMessage[] {\n  if (!envelope?.trim() || messages.length === 0) return messages;\n  const first = messages[0];\n  if (!first || first.role !== 'user') return messages;\n\n  const content = first.content;\n  if (!Array.isArray(content)) return messages;\n\n  const textIdx = content.findIndex((b) => b?.type === 'text');\n  if (textIdx < 0) {\n    return [\n      { ...first, content: [{ type: 'text', text: envelope.trim() }, ...content] },\n      ...messages.slice(1),\n    ];\n  }\n\n  const block = content[textIdx];\n  if (block.type !== 'text') return messages;\n  const nextText = prependTurnContextEnvelope(block.text, envelope);\n  if (nextText === block.text) return messages;\n\n  const nextContent = [...content];\n  nextContent[textIdx] = { type: 'text', text: nextText };\n  return [{ ...first, content: nextContent }, ...messages.slice(1)];\n}\n"]}
+{"version":3,"file":"turn-user-message.js","sourceRoot":"","sources":["../../src/context/turn-user-message.ts"],"names":[],"mappings":"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","sourcesContent":["import { type AgentMessageExtra, type AgentMessage, type UserMessage, type TextContentBlock, createUserMessage, userMessagePlainText, userMessageBody, renderUserMessageForLlm } from '@zhin.js/ai';\nimport type { Message } from '@zhin.js/core';\nimport { resolveTurnUserMessage } from '../session/session-io.js';\nimport { prependTurnContextEnvelope } from './turn-envelope.js';\nexport function buildTurnUserMessages(\n  commMessage: Message,\n  rawContent: string,\n): {\n  rawContent: string;\n  userMessageExtra?: AgentMessageExtra;\n  promptMessages: UserMessage[];\n} {\n  const { content, llmMessage } = resolveTurnUserMessage(\n    commMessage as import('@zhin.js/core').AgentTurnMessage,\n    rawContent,\n  );\n  return {\n    rawContent: content,\n    promptMessages: [llmMessage],\n  };\n}\n\nexport function applyTurnContextToUserMessages(\n  messages: UserMessage[],\n  envelope: string | null | undefined,\n): UserMessage[] {\n  if (!envelope?.trim() || messages.length === 0) return messages;\n  return messages.map((msg, i) => {\n    if (i !== 0 || msg.role !== 'user') return msg;\n    const text = userMessagePlainText(msg);\n    return createUserMessage(\n      prependTurnContextEnvelope(text, envelope),\n      msg.media,\n      msg.timestamp,\n      msg.actor,\n      msg.cause,\n    );\n  });\n}\n\nexport function prependEnvelopeToFirstUserText(\n  messages: AgentMessage[],\n  envelope: string | null | undefined,\n): AgentMessage[] {\n  if (!envelope?.trim() || messages.length === 0) return messages;\n  const first = messages[0];\n  if (!first || first.role !== 'user') return messages;\n\n  const content = first.content;\n  if (!Array.isArray(content)) return messages;\n\n  const textIdx = content.findIndex((b) => b?.type === 'text');\n  if (textIdx < 0) {\n    return [\n      { ...first, content: [{ type: 'text', text: envelope.trim() }, ...content] },\n      ...messages.slice(1),\n    ];\n  }\n\n  const block = content[textIdx];\n  if (block.type !== 'text') return messages;\n  const nextText = prependTurnContextEnvelope(block.text, envelope);\n  if (nextText === block.text) return messages;\n\n  const nextContent = [...content];\n  nextContent[textIdx] = { type: 'text', text: nextText };\n  return [{ ...first, content: nextContent }, ...messages.slice(1)];\n}\n\n/** Keep provenance-bearing guidance separate from the actual participant text. */\nexport function prependTurnContextBlocks(messages: AgentMessage[], blocks: readonly TextContentBlock[], extra?: AgentMessageExtra): AgentMessage[] {\n  const first = messages[0];\n  if (first?.role !== 'user' || !Array.isArray(first.content) || !blocks.length) return messages;\n  const user = first as UserMessage;\n  // Only the first text block carries the ingress presentation. Preserve the\n  // other blocks (including provenance) and current media without flattening.\n  const content = user.content.map((block, index) => index === 0 && !block.contextRef\n    ? { ...block, text: userMessageBody({ ...user, content: [block] }, extra) }\n    : block);\n  return [renderUserMessageForLlm({ ...user, content: [...blocks, ...content] }, extra), ...messages.slice(1)];\n}\n"]}

package/lib/core/agent-core-run.d.ts

@@ -52,6 +52,7 @@ export interface AgentLoopTurnInput {
     /** Turn-owned deferred selection authority. Required for deferred loading. */
     deferredController?: Readonly<{
         loadedToolNames(): string[];
+        modelOutputBlocks?(name: string, args: unknown, text: string): import('@zhin.js/ai').TextContentBlock[] | undefined;
         /** Optional: lets the loop auto-load a deferred tool the model called directly. */
         load?(name: string): Promise<boolean>;
     }>;

package/lib/core/agent-core-run.js

@@ -5,7 +5,7 @@ import { decodeStructuredReply, structuredReplyInstruction, structuredReplySchem
 import { renderAgentOutput } from '../outbound/agent-output.js';
 import { mergeToolOutboundElements } from '../media/media-tool-bridge.js';
 import { formatCompact, truncatePreview, getLogger } from '@zhin.js/logger';
-import { parseOutput, agentLoop, agentContextFrom, assistantText, createUserMessage, agentToolsToLlmTools, createResilientCompletionPort, isProviderFailureMessage, resolveProviderConfigResilience, resolveProviderResilienceConfig } from '@zhin.js/ai';
+import { createPromptContextBlock, projectPromptContext, estimateContextFixedTokens, parseOutput, agentLoop, agentContextFrom, assistantText, createUserMessage, agentToolsToLlmTools, createResilientCompletionPort, isProviderFailureMessage, resolveProviderConfigResilience, resolveProviderResilienceConfig } from '@zhin.js/ai';
 import { tokenUsageToLegacy } from './agent-run-shared.js';
 import { applyExecPolicyToTools } from '../security/exec-policy.js';
 import { resolveModelHarness } from '../config/model-harness-runtime.js';
@@ -15,7 +15,8 @@ import { planToolRun } from '../tool/runtime.js';
 import { sanitizeAssistantReply, unwrapJsonStringLayers } from './text-sanitize.js';
 import { formatToolCallsForUser } from './tool-calls-user-format.js';
 import { summarizeExhaustedTurn } from './exhausted-turn-reply.js';
-import { recoverStructuredReply, STRUCTURED_REPLY_FAILURE } from './structured-reply-recovery.js';
+import { decodeLenientStructuredReply, recoverStructuredReply } from './structured-reply-recovery.js';
+import { chatFailureKindOf, chatFailureLine } from '../outbound/chat-failure.js';
 import { trackTurnCompletionUsage } from './turn-completion-usage.js';
 import { shouldSuppressReplyForSpawnDelegation } from './spawn-delegation.js';
 import { logPhase, tokenUsageLogFields, logAgentLoopIterationEnd } from '../internal/phase-trace.js';
@@ -24,7 +25,7 @@ import { buildLlmToolsForProvider } from '../tool/deferred-resolution.js';
 import { applyToolToModelOutput } from '../tool/tool-model-output.js';
 import { resolveAlwaysLoadedSet } from '../tool-catalog/resolve-config.js';
 import { resolveDeferredApiTools, residentToolNames } from '../tool-catalog/tool-catalog.js';
-import { createTurnEventMapperState, mapAgentEventToTurnEvents, turnUsageEvent, } from './turn-event-mapper.js';
+import { createTurnEventMapperState, mapAgentEventToTurnEvents, } from './turn-event-mapper.js';
 import { TurnJournalCommitError } from '../turn/journal-integrity.js';
 import { ExecutableToolRegistry } from '../tool/executable-tool-registry.js';
 import { withoutForbiddenShell } from '../plugin-runtime/native-bash-tool.js';
@@ -33,7 +34,6 @@ import { createMissingToolResolver } from './missing-tool-resolver.js';
 import { DEFAULT_EXPLORATION_BUDGET, EXPLORATION_GUIDANCE, ExplorationBudget, } from './exploration-budget.js';
 import { TurnProgressTracker, autoContinueAllowed, buildContinuationInstruction, isProgress, resolveToolBudget, } from './turn-progress.js';
 import { TurnProgressReporter, summarizeProgress } from './progress-reporter.js';
-import { estimatePromptTokens } from '../prompt/estimate-tokens.js';
 import { noteTurnTrace } from '../trace/turn-trace-registry.js';
 import { buildContextBudgetReport } from '../trace/context-budget.js';
 import { renderDeferredToolIndex } from '../skill/capability-catalog.js';
@@ -46,11 +46,14 @@ function normalizeAssistantMessageText(assistant) {
         }
     }
 }
-function resolveAssistantReplyText(assistant) {
+function resolveAssistantReplyText(assistant, chat) {
     normalizeAssistantMessageText(assistant);
     const text = assistantText(assistant);
     if (text.trim())
         return text;
+    // In a chat the failure is said like a member would say it; operators read the logs.
+    if (assistant.errorMessage && chat)
+        return chatFailureLine(chatFailureKindOf(assistant.errorMessage), chat);
     if (assistant.errorMessage && isProviderFailureMessage(assistant.errorMessage)) {
         return `${assistant.errorMessage}。`;
     }
@@ -184,7 +187,7 @@ async function* runAgentLoopVisionTurnOnceRun(input) {
             modelId,
             label: 'vision',
         }),
-        convertToLlm: (messages) => messages,
+        convertToLlm: projectPromptContext,
         getSteeringMessages: promptHooks?.getSteeringMessages,
         getFollowUpMessages: promptHooks?.getFollowUpMessages,
     };
@@ -320,7 +323,7 @@ export async function* runAgentLoopTextTurnRun(input) {
     const loaded = persistentConversation
         ? await repo.loadContext(sessionId)
         : { messages: [] };
-    const promptMessages = input.initialMessages?.length
+    let promptMessages = input.initialMessages?.length
         ? input.initialMessages
         : [createUserMessage(input.rawContent)];
     const directTools = input.toolLoading === 'direct';
@@ -336,6 +339,9 @@ export async function* runAgentLoopTextTurnRun(input) {
     const messagePreset = configuredSchema === true || configuredSchema === 'segments';
     const imReply = messagePreset && input.turnContext.origin.kind === 'im'
         && input.conversationPersistence !== 'none';
+    const chatFailure = input.turnContext.origin.kind === 'im'
+        ? { master: input.turnContext.principal.roles.includes('master') }
+        : undefined;
     const outputSchema = imReply ? structuredReplySchema(input.replySegments)
         : messagePreset || !configuredSchema ? undefined : configuredSchema;
     const turnShellPolicy = input.turnContext.policy?.shell;
@@ -433,8 +439,15 @@ export async function* runAgentLoopTextTurnRun(input) {
     if (hasTools && !directTools) {
         const toolIndex = renderDeferredToolIndex(deferredCatalogTools(catalog, agentTools)
             .map((item) => ({ name: item.name, description: item.brief })));
-        if (toolIndex)
-            systemPrompt = `${systemPrompt}\n\n${toolIndex}`;
+        if (toolIndex) {
+            const block = createPromptContextBlock('deferred-tools', toolIndex);
+            const userIndex = promptMessages.map(message => message.role === 'user' && Array.isArray(message.content)).lastIndexOf(true);
+            promptMessages = userIndex < 0
+                ? [...promptMessages, { ...createUserMessage(''), content: [block] }]
+                : promptMessages.map((message, index) => index === userIndex && Array.isArray(message.content)
+                    ? { ...message, content: [...message.content, block] }
+                    : message);
+        }
     }
     if (networkWithheld)
         systemPrompt = `${systemPrompt}\n\n${NETWORK_DISABLED_PROMPT_NOTE}`;
@@ -447,6 +460,7 @@ export async function* runAgentLoopTextTurnRun(input) {
             kind: 'context_budget',
             report: buildContextBudgetReport({
                 systemPrompt,
+                outputSchema,
                 sections: promptSections,
                 bootstrapContext: input.promptRuntime?.bootstrapContext,
                 activeSkillsContext: input.promptRuntime?.activeSkillsContext,
@@ -490,8 +504,16 @@ export async function* runAgentLoopTextTurnRun(input) {
     const contextWindow = llmModel.contextWindow ?? host.config.contextTokens;
     // System prompt and tool schemas count against the window too, so the
     // compaction threshold is measured on what is left for messages (#730).
-    const fixedPromptTokens = () => estimatePromptTokens(systemPrompt)
-        + llmTools.reduce((sum, tool) => sum + estimatePromptTokens(`${tool.name} ${tool.description}`), 0);
+    let budgetTools;
+    let fixedBudget;
+    const fixedPromptTokens = () => {
+        // 本回合系统提示不变；工具渐进披露替换数组后重新计算完整 Schema。
+        if (!fixedBudget || budgetTools !== llmTools) {
+            budgetTools = llmTools;
+            fixedBudget = estimateContextFixedTokens({ systemPrompt, tools: llmTools, model: llmModel, outputSchema });
+        }
+        return fixedBudget;
+    };
     const loopHooks = input.loopHooks;
     const completionPort = createTurnCompletionPort({
         host,
@@ -544,7 +566,7 @@ export async function* runAgentLoopTextTurnRun(input) {
             }),
             ...(outputSchema ? { outputSchema } : {}),
         },
-        convertToLlm: (messages) => messages,
+        convertToLlm: projectPromptContext,
         transformContext: async (messages, ctxSignal) => persistentConversation ? host.compactionRuntime.transformContext(messages, ctxSignal, {
             host,
             sessionId,
@@ -552,7 +574,7 @@ export async function* runAgentLoopTextTurnRun(input) {
             model: llmModel,
             compactionConfig: host.config.compaction,
             contextWindow,
-            reservedTokens: fixedPromptTokens(),
+            reservedTokens: await fixedPromptTokens(),
             toldLedger: host.toldLedger?.render(sessionId),
             mode: 'text',
             loopHooks,
@@ -564,7 +586,7 @@ export async function* runAgentLoopTextTurnRun(input) {
             model: llmModel,
             compactionConfig: host.config.compaction,
             contextWindow,
-            reservedTokens: fixedPromptTokens(),
+            reservedTokens: await fixedPromptTokens(),
             toldLedger: host.toldLedger?.render(sessionId),
             mode: 'text',
             force: true,
@@ -644,7 +666,9 @@ export async function* runAgentLoopTextTurnRun(input) {
                 const budgetNote = explorationBudget?.record(resolvedName, isProgress(progressKind));
                 const finalText = budgetNote ? `${resultText}\n\n${budgetNote}` : resultText;
                 toolCalls.push({ tool: resolvedName, args: effectiveArgs, result: finalText });
-                return toolResultToAgentMessage(toolCall, finalText, false);
+                const result = toolResultToAgentMessage(toolCall, finalText, false);
+                const blocks = deferredController?.modelOutputBlocks?.(resolvedName, effectiveArgs, finalText);
+                return blocks ? { ...result, content: blocks } : result;
             }
             catch (err) {
                 if (err instanceof TurnJournalCommitError)
@@ -719,8 +743,7 @@ export async function* runAgentLoopTextTurnRun(input) {
     // Messages of the running segment, for progress summaries before agent_end.
     let segmentMessages = [];
     function* drainCompletionUsage() {
-        for (const usage of completionUsage.drainUsage()) {
-            const event = turnUsageEvent(usage);
+        for (const event of completionUsage.drainEvents()) {
             emitTurnEvent(event);
             yield event;
         }
@@ -773,7 +796,7 @@ export async function* runAgentLoopTextTurnRun(input) {
                 lastAssistantNeedsHostReply = Boolean(assistant.errorMessage)
                     || (!lastAssistantHadToolCalls && !answerText.trim());
                 lastAssistantText = imReply && !lastAssistantNeedsHostReply ? answerText
-                    : resolveAssistantReplyText(imReply ? { ...assistant, content: [] } : assistant);
+                    : resolveAssistantReplyText(imReply ? { ...assistant, content: [] } : assistant, chatFailure);
                 logAssistantIterationFailure(assistant, modelId, sessionId);
                 const toolNames = assistant.content
                     .filter((b) => b.type === 'toolCall')
@@ -900,10 +923,14 @@ export async function* runAgentLoopTextTurnRun(input) {
         hostReply = !summary.assistant;
     }
     const structuredReply = imReply && !hostReply;
-    const continuationPrefix = continuations > 0
+    // A chat member does not announce how many steps a task took; only non-IM callers get the notice.
+    const continuationPrefix = continuations > 0 && input.turnContext.origin.kind !== 'im'
         ? `（任务步骤较多，已自动续跑 ${continuations} 次）\n\n` : '';
     const proseReply = structuredReply ? ''
-        : sanitizeAssistantReply(rawReply, { toolSummary: formatToolCallsForUser(toolCalls) });
+        : sanitizeAssistantReply(rawReply, {
+            toolSummary: formatToolCallsForUser(toolCalls),
+            ...(chatFailure ? { emptyMessage: chatFailureLine('malformed_tool_call', chatFailure) } : {}),
+        });
     const textReply = delegatedOnly ? '' : proseReply.trim() ? continuationPrefix + proseReply : proseReply;
     let output = delegatedOnly || structuredReply ? [] : parseOutput(textReply);
     if (!delegatedOnly && structuredReply) {
@@ -911,26 +938,33 @@ export async function* runAgentLoopTextTurnRun(input) {
             output = decodeStructuredReply(rawReply, input.replySegments);
         }
         catch (error) {
-            const recovery = await recoverStructuredReply({
-                transport: completionUsage.transport, model: llmModel, raw: rawReply,
-                error: error instanceof Error ? error : new Error('Invalid structured reply'), signal,
-                segments: input.replySegments,
-            });
-            output = recovery.output;
-            // History must match what the user saw: the corrected reply, or the failure text. Never the
-            // correction prompt (it embeds the rejected raw text) and never the rejected raw reply.
             const messages = conversationBatches.at(-1)?.messages;
             const rejected = messages?.at(-1);
-            if (messages && rejected?.role === 'assistant') {
-                messages[messages.length - 1] = recovery.assistant
-                    ?? { ...rejected, content: [{ type: 'text', text: STRUCTURED_REPLY_FAILURE }] };
+            const lenient = decodeLenientStructuredReply(rawReply, input.replySegments);
+            if (lenient) {
+                output = lenient.output;
+                if (messages && rejected?.role === 'assistant') {
+                    messages[messages.length - 1] = { ...rejected, content: [{ type: 'text', text: lenient.text }] };
+                }
+            }
+            else {
+                const recovery = await recoverStructuredReply({
+                    transport: completionUsage.transport, model: llmModel, raw: rawReply,
+                    error: error instanceof Error ? error : new Error('Invalid structured reply'), signal,
+                    segments: input.replySegments,
+                    failureText: chatFailureLine('format', { ...chatFailure, random: 0 }),
+                });
+                output = recovery.output;
+                // History must match what the user saw: the corrected reply, or the failure text. Never the
+                // correction prompt (it embeds the rejected raw text) and never the rejected raw reply.
+                if (messages && rejected?.role === 'assistant') {
+                    messages[messages.length - 1] = recovery.assistant
+                        ?? { ...rejected, content: [{ type: 'text', text: renderAgentOutput(recovery.output) }] };
+                }
             }
         }
     }
     if (!delegatedOnly) {
-        if (structuredReply && continuationPrefix && output[0]?.type === 'message') {
-            output[0].segments.unshift({ type: 'text', data: { text: continuationPrefix } });
-        }
         output = mergeToolOutboundElements(output, toolCalls);
     }
     const finalReply = imReply ? renderAgentOutput(output) : textReply;