@tencent-ai/agent-harness 0.2.0-beta.2 → 0.2.0-beta.4

package/cli/dist-server/types/vendor/cbc-core/node/session/session-manager-host-protocol.d.ts

@@ -1,5 +1,5 @@
 import type { AgentInputItem } from '../../../cbc-shared/node/index.js';
-import type { ModelResponseMetadata, Session } from './session-protocol';
+import type { ModelCallGeneration, ModelResponseMetadata, Session } from './session-protocol';
 export declare const SessionCheckpointHost: unique symbol;
 export interface SessionCheckpointHost {
     createCheckpoint(session: Session): Promise<void>;
@@ -57,7 +57,8 @@ export declare const SessionResponseTelemetryHost: unique symbol;
 export interface SessionResponseTelemetryHost {
     reportChatRequestResponseTelemetry(session: Session, result: NonNullable<Session['resultSubject']['value']>, isSuccessful: boolean, error: unknown, metadata: ModelResponseMetadata): Promise<void>;
     reportMessageResponseTelemetryStream(session: Session, usage: SessionResponseUsage | undefined, metadata: ModelResponseMetadata, error: unknown): Promise<void>;
-    reportChatMessageStatus(session: Session, errorCode: string, error?: unknown): Promise<void>;
+    /** Status of one model call (`generation`); run failures no model call owns are not reported. */
+    reportChatMessageStatus(session: Session, errorCode: string, generation: ModelCallGeneration, error?: unknown): Promise<void>;
 }
 export type SessionResponseTelemetrySnapshot = Pick<NonNullable<Session['telemetry']>, 'modelId' | 'modelName' | 'currentTurn' | 'traceId'>;
 export declare const SessionResponseObserver: unique symbol;

package/cli/dist-server/types/vendor/cbc-core/node/session/session-manager.d.ts

@@ -4,7 +4,7 @@ import { Logger } from '../../../../workspace/telemetry/lib/common/index.js';
 import { BehaviorSubject } from 'rxjs';
 import { SessionRequestContextHost, SessionSettingsHost as SettingsManager, SessionUsageHost as UserStateManager } from './session-host-protocol';
 import { SessionBackgroundTaskHost as ToolManager, SessionCheckpointHost as CheckpointService, SessionProgressHost as ProgressSyncService, SessionResponseObserver as GalileoSessionBridge, SessionResponseTelemetryHost as TelemetryService, SessionSchedulerHost as CronSchedulerService, SessionSensitiveProjectionHost, SessionTaskLifecycleHost as AgentTaskManager } from './session-manager-host-protocol';
-import { AgentInputItemProcessor, InterruptionService, ModelResponseInterceptor, ModelResponseMetadata, Session, SessionFactory, SessionGetOptions, SessionHookManager, SessionManager, SessionStore } from './session-protocol';
+import { AgentInputItemProcessor, InterruptionService, ModelResponseInterceptor, ModelResponseMetadata, OverrideModelSource, Session, SessionFactory, SessionGetOptions, SessionHookManager, SessionManager, SessionStore } from './session-protocol';
 import { SessionRunStateMachine } from './session-run-state-machine-protocol';
 export declare class SessionManagerImpl implements SessionManager, ApplicationLifecycle<Application> {
     protected readonly sessionFactory: SessionFactory;
@@ -32,6 +32,7 @@ export declare class SessionManagerImpl implements SessionManager, ApplicationLi
     private skipHistoryContext;
     private sessionStartTimes;
     private addHistoryLocks;
+    private promptAdmissions;
     private resultSubscriptions;
     private readonly resultSubscriptionOwners;
     /**
@@ -44,6 +45,8 @@ export declare class SessionManagerImpl implements SessionManager, ApplicationLi
     private readonly liveSessionsById;
     private overridePermissionModes;
     private overrideModels;
+    /** 与 overrideModels 同生命周期的意图来源（user / declared / materialized）。 */
+    private overrideModelSources;
     /**
      * Issue #12554：会话级 thinking override（按 sessionId 隔离）。
      * 由 ACP setSessionConfigOption('thought_level') 或 prompt _meta 写入。
@@ -106,6 +109,7 @@ export declare class SessionManagerImpl implements SessionManager, ApplicationLi
     private readonly loadedSessionIds;
     private resetIdleTimer;
     addHistory(session: Session, input: string | AgentInputItem[]): Promise<void>;
+    private writeHistory;
     /**
      * Record a UserPromptSubmit hook block as an in-band assistant message
      * (issue #71907, cc-aligned: cc surfaces a warning system message and ends the
@@ -123,6 +127,34 @@ export declare class SessionManagerImpl implements SessionManager, ApplicationLi
      * (use-message-sender). chalk=false because ACP does not strip ANSI codes.
      */
     private recordHookBlockedMessage;
+    /**
+     * 把一条 mod 打出来的 `$.ui.log` 落到当前 session 的可见消息流里。
+     *
+     * ## 与 `recordHookBlockedMessage` 的关系
+     *
+     * 二者走**同一条落地路径**（history + inputSubject + combineSubject +
+     * sessionStore.appendHistory），因此 TUI / ACP / persisted transcript 都用
+     * 既有渲染，不必新增 sessionUpdate 类型（对齐根 CODEBUDDY.md 的 ACP 约束）。
+     *
+     * ## 与 hook 阻断消息刻意不同的三点
+     *
+     * 1. **不动 `session.lastMessageId`**：hook-block 是回合终点，需要挂上 replay
+     *    分支；mod-log 是**装饰性**通知，如果推进 lastMessageId 会让 `/rewind`
+     *    退到"一条 log 中间"，语义混乱。
+     * 2. **不挂 `parentId`**：同样出于 replay 分支洁净。
+     * 3. **`chalk: false`**：ACP 侧不剥 ANSI，chalk 转义码会露出到 Web UI；此外
+     *    宿主已在 `<plugin>: <text>` 里给足了归属信号，terminal 也不再需要额外
+     *    颜色包装（TUI 侧后续可按 `hookStatus === 'mod-log'` 做专属渲染）。
+     *
+     * ## 失败语义
+     *
+     * 与 hook-block 同款：写盘失败只记日志，不向外抛 —— mod 打日志不该把 CLI 弄挂。
+     *
+     * @param session 目标 session（宿主取当前 session 后传入）
+     * @param text 已由宿主前缀成 `<plugin>: <text>` 的完整行文
+     * @param plugin 发起本次调用的 mod 名（`origin.plugin`），用于前端识别
+     */
+    recordModLogMessage(session: Session, text: string, plugin: string): Promise<void>;
     private readonly inflightSessionStarts;
     emitSessionStart(session: Session, source: SessionStartSource): Promise<void>;
     create(options?: Partial<Session>, needHandleRunResult?: boolean, parentSession?: Session): Promise<Session>;
@@ -190,9 +222,11 @@ export declare class SessionManagerImpl implements SessionManager, ApplicationLi
     rename(session: Session, name: string): Promise<void>;
     setOverridePermissionMode(sessionId: string, mode: PermissionMode): void;
     getOverridePermissionMode(sessionId: string): PermissionMode | undefined;
-    setOverrideModel(sessionId: string, model: string): void;
+    setOverrideModel(sessionId: string, model: string, source?: OverrideModelSource): void;
     getOverrideModel(sessionId: string): string | undefined;
-    setRuntimeModel(session: Session | undefined, modelId: string): void;
+    getOverrideModelSource(sessionId: string): OverrideModelSource | undefined;
+    clearOverrideModel(sessionId: string): void;
+    setRuntimeModel(session: Session | undefined, modelId: string, source?: OverrideModelSource): void;
     setRuntimeOutputStyle(session: Session | undefined, style: string): void;
     /**
      * Issue #83229：把 settings.json 中的 model / outputStyle 读一次"钉"进 session.options，

package/cli/dist-server/types/vendor/cbc-core/node/session/session-protocol.d.ts

@@ -2,6 +2,7 @@ import { Deferred } from '@celljs/core';
 import { type AgentInputItem, ApprovalOptions, type Checkpoint, FinalStopReason, NotificationType, PermissionMode, ReasoningEffortLevel, type ResponseStreamEvent, type RunItem, type RunResult, type RunState, type RunToolApprovalItem, type SdkCapabilities, SessionEndReason, SessionStartSource, type StreamedRunResult, type TerminalEvent, type ToolDeferOverlaySnapshot, ToolPermissionContext, type Usage } from '../../../cbc-shared/node/index.js';
 import { Command } from '../../../../workspace/product/lib/common/index.js';
 import { BehaviorSubject, Subject } from 'rxjs';
+import type { CompactionLineage } from '../context/compaction-lineage';
 import { BackgroundTask } from './background-task-protocol';
 import type { SessionRunStateSnapshot } from './session-run-state-machine-protocol';
 import type { Lane, LanePointer, SessionKey, SessionStoreEntry } from './session-store-contract';
@@ -86,6 +87,7 @@ export type AgentState = 'agent_pending' | 'agent_start' | 'agent_tool_start' |
  *                              则 emit，触发 UI 显示"正在同步文件"提示)
  */
 export type AgentPhase = 'preparing' | 'model_requesting' | 'model_streaming' | 'model_done' | 'tool_executing' | 'waiting_for_permission' | 'waiting_for_user' | 'retrying' | 'finalization_file_projection_sync' | 'finalization_file_projection_sync_notify' | 'idle';
+export type AgentRetryReason = 'network';
 export interface AgentPhaseInfo {
     phase: AgentPhase;
     toolName?: string;
@@ -102,6 +104,13 @@ export interface AgentPhaseInfo {
         current: number;
         total: number;
     };
+    /**
+     * 仅 retrying phase 使用，经 ACP `_meta['codebuddy.ai/agentPhase']` 透传给上层。
+     * 缺省表示原因未分类（如流超时），不代表网络正常。
+     */
+    retry?: {
+        reason: AgentRetryReason;
+    };
 }
 export declare const AgentPhaseUtils: {
     /** Create an AgentPhaseInfo with the current timestamp. */
@@ -353,6 +362,14 @@ export interface Session {
      * field and pass it through as `options.maxTurns` explicitly.
      */
     lastRunMaxTurns?: number;
+    /**
+     * Latest agent-loop model call number (`providerData.stepSeq`). Unlike the
+     * SDK turn counter it survives runs, compaction and resume; see
+     * `allocateModelStepSeq`.
+     */
+    modelStepSeq?: number;
+    /** Compactions of this Session's context; see `getCompactionLineage`. */
+    compactionLineage?: CompactionLineage;
     queue: AgentInputItem[];
     queueSubject: BehaviorSubject<AgentInputItem[]>;
     /**
@@ -860,7 +877,7 @@ export interface SubagentInvocationRecord {
     lifecycle: SubagentLifecycleSnapshot;
 }
 export type SubagentLifecycleDescriptor = Omit<SubagentLifecycleSnapshot, 'status' | 'updatedAt' | 'usage'>;
-export type CombineEvent = (AgentInputItemEvent | ModelRawResponseEvent | ResultEndEvent | InterruptResultEvent | NoticeEvent | SubagentStatusEvent | CompactionLifecycleEvent | TerminalEvent) & CombineEventMeta;
+export type CombineEvent = (AgentInputItemEvent | AgentSdkStreamEvent | ModelRawResponseEvent | ResultEndEvent | InterruptResultEvent | NoticeEvent | SubagentStatusEvent | CompactionLifecycleEvent | TerminalEvent) & CombineEventMeta;
 export interface CompactionLifecycleEvent {
     type: 'compaction';
     data: {
@@ -875,6 +892,11 @@ export interface SubagentStatusEvent {
     type: 'subagent_status';
     data: SubagentLifecycleSnapshot;
 }
+/** Original SDK stream payload, observed by the existing single stream consumer. */
+export interface AgentSdkStreamEvent {
+    type: 'sdk';
+    data: import('../../../cbc-shared/node/index.js').RunStreamEvent;
+}
 export interface AgentInputItemEvent {
     type: 'input';
     data: AgentInputItem;
@@ -1063,6 +1085,13 @@ export interface SessionRewindMutationOptions {
     cwd: string;
     headMessageId: string | undefined;
 }
+/**
+ * model override 的意图来源：决定该值是否等价于「用户显式选择」。
+ * - 'user'：/model 命令、ACP set_model、SDK 控制信号等用户动作；
+ * - 'declared'：主 Agent 声明模型（declaredModel）联动写入；
+ * - 'materialized'：Web UI 会话装配期钉住的兜底解析值（非用户意图）。
+ */
+export type OverrideModelSource = 'user' | 'declared' | 'materialized';
 export interface SessionManager {
     getCurrent(): Session;
     setCurrent(session: Session): void;
@@ -1088,6 +1117,18 @@ export interface SessionManager {
      * before injecting `additionalContext`.
      */
     emitSessionStart(session: Session, source: SessionStartSource): Promise<void>;
+    /**
+     * Record a mod-plugin `$.ui.log` line as a user-visible message on the
+     * session transcript (mirrors `recordHookBlockedMessage` — same
+     * inputSubject / combineSubject / sessionStore path — but leaves
+     * `lastMessageId` and `parentId` untouched because mod logs are
+     * decorative and must not become anchors on the replay branch).
+     *
+     * @param session target session (host resolves current session and passes it in)
+     * @param text already prefixed as `<plugin>: <text>` by the host bridge
+     * @param plugin the calling mod's name (`origin.plugin`), for provider metadata
+     */
+    recordModLogMessage(session: Session, text: string, plugin: string): Promise<void>;
     addHistory(session: Session, input: string | AgentInputItem[]): Promise<void>;
     save(session: Session): Promise<void>;
     /** Initialize an immutable full snapshot for a new fork; target must be absent or empty. */
@@ -1165,11 +1206,15 @@ export interface SessionManager {
     setOverridePermissionMode(sessionId: string, mode: PermissionMode): void;
     getOverridePermissionMode(sessionId: string): PermissionMode | undefined;
     /**
-     * 设置 session 的 model 覆盖值（来自 SDK control signal）
-     * 这些值会覆盖 CLI 参数和配置文件的设置
+     * 设置 session 的 model 覆盖值。source 记录意图来源，供「是否用户显式选择」判定：
+     * - 'user'（默认）：/model 命令、ACP set_model、SDK 控制信号等用户动作；
+     * - 'declared'：主 Agent 声明模型（declaredModel）联动写入；
+     * - 'materialized'：Web UI 会话装配期钉住的兜底解析值（非用户意图）。
      */
-    setOverrideModel(sessionId: string, model: string): void;
+    setOverrideModel(sessionId: string, model: string, source?: OverrideModelSource): void;
     getOverrideModel(sessionId: string): string | undefined;
+    getOverrideModelSource(sessionId: string): OverrideModelSource | undefined;
+    clearOverrideModel(sessionId: string): void;
     /**
      * 设置会话运行时模型：同步写 session.options.model + requestOptions.model + override map。
      *
@@ -1178,7 +1223,7 @@ export interface SessionManager {
      * 供 applyOverrideModel 每轮重建 requestOptions（Issue #82146）。/model 命令与模型面板
      * 共用此入口；ACP set_model（applyRuntimeSessionModel）仍为独立实现，待统一收敛。
      */
-    setRuntimeModel(session: Session | undefined, modelId: string): void;
+    setRuntimeModel(session: Session | undefined, modelId: string, source?: OverrideModelSource): void;
     /**
      * 设置会话运行时 outputStyle：同步写 session.options.outputStyle。
      *
@@ -1502,6 +1547,7 @@ export interface InterruptionService {
     approve(item: RunToolApprovalItem, options?: ApprovalOptions): void;
     reject(item: RunToolApprovalItem, options?: {
         decision?: 'deny' | 'rejectAndExitPlan';
+        cancelTurn?: boolean;
     }): void;
     waitFor(session: Session): Promise<void>;
     /** Resolve the main/leader session for a given session (returns self if already main). */
@@ -1712,6 +1758,12 @@ export interface TurnMetricsReporter {
      */
     unregister(sessionId: string): void;
 }
+/** Ids of one model call, as stamped by the model wrapper. */
+export interface ModelCallGeneration {
+    messageId: string;
+    conversationRequestId?: string;
+    stepSeq?: number;
+}
 export interface ModelResponseMetadata {
     /** 响应中的模型 ID */
     model?: string;
@@ -1725,6 +1777,8 @@ export interface ModelResponseMetadata {
      * 都带 providerData.messageId === 此值，handleContentFilteredResponse 据此剔除并替换为安全提示。
      */
     contentFilterMessageId?: string;
+    /** Correlation of the generation that just completed, as stamped by the model wrapper. */
+    generation?: ModelCallGeneration;
     usage?: {
         prompt_tokens: number;
         completion_tokens: number;

package/cli/dist-server/types/vendor/cbc-core/node/session/session-run-state-machine-protocol.d.ts

@@ -1,5 +1,5 @@
 import type { Observable } from 'rxjs';
-import type { Session } from './session-protocol';
+import type { AgentRetryReason, Session } from './session-protocol';
 export declare const SessionRunStateMachine: unique symbol;
 export declare const SessionRunStateProjectionService: unique symbol;
 export declare const SESSION_RUN_STATE_PROJECTION_SCHEMA: 'session-run-state.v1';
@@ -144,6 +144,7 @@ export type SessionRunEvent = {
 } | {
     type: SessionRunEventType.RETRYING;
     reason?: string;
+    retryReason?: AgentRetryReason;
 } | {
     type: SessionRunEventType.COMPACT_STARTED;
     reason?: string;
@@ -189,6 +190,18 @@ export interface SessionRunStateMachine {
      */
     getChange$(session: Session, skipFirst?: boolean): Observable<void>;
 }
+export declare const ModelRequestRetryPhase: unique symbol;
+/**
+ * 模型请求层（宿主 provider）在同一次请求内部退避重发时，借此把会话投影为 retrying。
+ * 状态写入与守卫收口在 core，宿主只包住退避等待，不直接驱动状态机。
+ */
+export interface ModelRequestRetryPhase {
+    /**
+     * `wait` 期间会话显示 retrying 并携带 `reason`；结束（含抛错 / 取消）后恢复 model_requesting。
+     * 非本轮主请求（无 session、辅助型 purpose、状态不在 model_requesting）时只执行 `wait`。
+     */
+    during<T>(session: Session | undefined, reason: AgentRetryReason, wait: () => Promise<T>): Promise<T>;
+}
 /**
  * Pure derivations from a `SessionRunStatus`. The state machine implementation
  * MUST keep its instance methods (`getLifecycle`, `isBusy`, etc.) consistent

package/cli/dist-server/types/vendor/cbc-core/node/session/stream-timeout-retry-budget.d.ts

@@ -9,11 +9,18 @@ export declare function hasExhaustedStreamTimeoutRetryBudget(session: Session, i
 /**
  * `finish_reason=error` 且没有可用输出的两种空流：reasoning-only 与 no-token。
  * placeholder（空 200 / 心跳帧）仍是会话层终态，由拦截器切一次备站。
+ *
+ * 额外的时长闸门（#132616）：这两种 kind 之所以可重试，前提是「上游瞬时失败」——秒级
+ * 空响应重跑一次大概率就好了。但当这条流已经跑满上游的硬时限才收到 error 时，前提不成立：
+ * 同一段 prompt 重跑必然再次跑满同一个时限。实测 7 个会话全部重试、全部再次撞墙、0 次恢复，
+ * 而 `#130098` 把预算从 1 提到 3 之后，同样的输入会从 2×900s 变成 4×900s ≈ 60 分钟静默。
+ * 重试的期望收益不随 elapsed 增长，成本却线性增长，所以按 elapsed 收口。
  */
 export declare function isRetryableEmptyStreamError(error: unknown): boolean;
 /**
  * Empty 200 / placeholder-only：拦截器最多切一次备站，会话层终态（#115866）。
- * reasoning-only / no-token + finish_reason=error：上游瞬时失败，按 error 预算重试。
+ * reasoning-only / no-token + finish_reason=error：上游瞬时失败，按 error 预算重试；
+ * 已烧满上游硬时限的那些除外，见 {@link isRetryableEmptyStreamError} 的时长闸门（#132616）。
  * 流空闲超时 / 首 token 超时：按各自的超时预算重试。
  */
 export declare function shouldAutoRetryStreamTimeout(session: Session, error: unknown): boolean;

package/cli/dist-server/types/vendor/cbc-core/node/trace/turn-context.d.ts

@@ -34,6 +34,33 @@ export interface TurnContext {
     /** Canonical id assigned when the external user input is admitted. */
     conversationRequestId?: string;
 }
+export interface RequestOwner {
+    readonly session: Session;
+    readonly requestId: string;
+    readonly turn: TurnContext;
+    latestExecution?: object;
+}
+export type RequestTerminalOutcome = 'written' | 'failed' | 'unconfirmed';
+export interface RequestTerminal {
+    readonly attempt: object;
+    outcome?: RequestTerminalOutcome;
+    readonly completed: Promise<RequestTerminalOutcome>;
+}
+export declare function getRequestOwner(ref: object): RequestOwner | undefined;
+export declare function getRequestExecution(ref: object): object | undefined;
+export declare function associateRequestOwner(ref: object, owner: RequestOwner, execution?: object): void;
+/** Carry physical execution through admission without inventing a request owner. */
+export declare function associateRequestExecution(ref: object, execution: object): void;
+/** Reserve completion ownership at admission, retaining the prior result if startup fails. */
+export declare function beginRequestExecution(owner: RequestOwner, execution: object): void;
+/** A failed startup never owns a result; restore only the execution it actually replaced. */
+export declare function abandonRequestExecution(execution: object): Session['resultSubject']['value'];
+export declare function getRequestTerminal(owner: RequestOwner, destination: string): RequestTerminal | undefined;
+export declare function claimRequestTerminal(owner: RequestOwner, destination: string, attempt: object): boolean;
+export declare function settleRequestTerminal(owner: RequestOwner, destination: string, attempt: object, outcome: RequestTerminalOutcome): void;
+/** The admission boundary, not trace binding, creates a new logical request. */
+export declare function admitRequestOwner(session: Session, requestId: string): RequestOwner;
+export declare function runInRequestOwner<T>(owner: RequestOwner, callback: () => T): T;
 /** Transient provider-data key; stripped before history/model persistence. */
 export declare const TURN_CARRIER_CANDIDATE_KEY = "codebuddy.ai/turnCarrierCandidate";
 export declare const BAGGAGE_KEY_SESSION_ID = "codebuddy.session_id";
@@ -83,7 +110,7 @@ export declare function bindCurrentTurnContext(session: Session, conversationReq
 /** Carrier for one exact admitted request; never returns the latest other turn. */
 export declare function turnCarrierForRequest(session: Session, conversationRequestId: string | undefined): W3CTraceContextMeta;
 /** Release an exact request binding. */
-export declare function releaseTurnContext(session: Session, conversationRequestId: string | undefined): void;
+export declare function releaseTurnContext(session: Session, conversationRequestId: string | undefined, owner?: RequestOwner): void;
 /** The current turn as an injectable three-key carrier; `{}` outside a turn. */
 export declare function currentTurnCarrier(): W3CTraceContextMeta;
 /**

package/cli/dist-server/types/vendor/cbc-core/node/utils/command-message-utils.d.ts

@@ -58,6 +58,26 @@ export declare abstract class CommandMessageUtils {
      * 解析XML格式的命令输出
      */
     static parseOutput(xmlText: string): ParseCommandMessage | undefined;
+    /**
+     * 是否为本地命令在会话历史里留下的记账项：caveat、命令回显（`<command-name>`）、
+     * 命令输出（`<local-command-stdout>`）、本地 bash 的输入输出、plan 输出。
+     *
+     * 这些 item 的 role 是 user、也不带 skipRun，因此按「真实用户消息」判定会命中；
+     * 但它们只是本地命令的痕迹，**不代表用户开启了新一轮对话**。调用方（如 TUI 的
+     * loading 计时器）需要区分「新一轮」和「本地命令留痕」时用这个判据。
+     *
+     * 识别口径复用 parseInput / parseOutput / parsePlanOutput，避免调用方各自
+     * 维护一份 XML 标签清单而漂移。
+     */
+    static isLocalCommandRecord(text: string): boolean;
+    /**
+     * {@link isLocalCommandRecord} 的 item 版本。
+     *
+     * 必须读 **原始** content：`MessageContentUtils.extractTextContent` 已经把命令 XML
+     * 拆开（`<command-name>/doctor</command-name>` → `/doctor`），拿它的结果再判就永远
+     * 判不出来。
+     */
+    static isLocalCommandRecordItem(item: UserMessageItem): boolean;
     /**
      * 解析计划输出
      */

package/cli/dist-server/types/vendor/cbc-core/node/utils/history-utils.d.ts

@@ -226,10 +226,10 @@ export declare abstract class HistoryUtils {
      * <conversation_history_summary>…</conversation_history_summary> 包裹的正文)。
      *
      * 规则(与 replaceCompactWithSummary / getCompactHistory 对齐):
-     *   1. 仅查看 `providerData.agent === AgentNames.COMPACT` 且为 assistant 的 message
-     *   2. 从后向前扫描,命中第一条满足格式的 compact assistant 即返回
-     *   3. "满足格式"由 `SummaryUtils.extractCompactSummaryFromText` 统一判定
-     *      (内含结构校验 + 非空正文双闸)
+     *   1. 查看 compact-agent assistant，或 PreMessage/MaxToken 写入的显式 compact boundary
+     *   2. 从后向前扫描,命中第一条可用摘要即返回
+     *   3. compact assistant 继续要求结构化 summary envelope；显式 boundary 同时支持
+     *      工程压缩的 `<cb_summary>` 与 LLM summary envelope
      *   4. 全程扫描都拿不到 → 返回 `undefined`(history 中**从未**出现过合法摘要)
      *
      * ⚠️ 不适合用于"判断本次 compact run 是否成功"!

package/cli/dist-server/types/vendor/cbc-core/node/utils/input-item-utils.d.ts

@@ -1,6 +1,6 @@
 import { type AcpTerminalStateItem, type AgentInputItem, type AssistantMessageItem, type CustomTitleItem, type FileHistorySnapshotItem, type FunctionCallItem, type FunctionCallResultItem, type HookBlockingDetail, HookEvent, type ResendForkNoticeItem, type UserMessageItem } from '../../../cbc-shared/node/index.js';
 type ItemStatus = 'in_progress' | 'completed' | 'incomplete';
-export type HookStatus = 'success' | 'blocked' | 'warning' | 'error';
+export type HookStatus = 'success' | 'blocked' | 'warning' | 'error' | 'mod-log';
 interface ItemOptions {
     readonly skipRun?: boolean;
     readonly status?: ItemStatus;
@@ -256,6 +256,14 @@ export declare abstract class InputItemUtils {
     static isUserInterrupted(item: AgentInputItem): boolean;
     static isSuccessfulFunctionCallResultItem(item: AgentInputItem): item is FunctionCallResultItem;
     static isCompactBoundaryMessage(item: AgentInputItem): boolean;
+    /**
+     * 仅凭 providerData 结构化标记判定 compact boundary，不使用内容正则兜底。
+     *
+     * 会删除或改写消息的路径（如 replaceCompactWithSummary）必须用这个版本：
+     * 内容兜底会把用户粘贴的 `<cb_summary>` / `<conversation_history_summary>` 文本
+     * 误判为 boundary，导致真实用户输入被移除。
+     */
+    static isStructuredCompactBoundaryMessage(item: AgentInputItem): boolean;
     static isReplayRecoverableCompactMessage(item: AgentInputItem): item is UserMessageItem;
     static isCompactUserMessage(item: AgentInputItem): item is UserMessageItem;
     private static hasCompactBoundaryContent;

package/cli/dist-server/types/vendor/cbc-core/node/utils/token-utils.d.ts

@@ -64,7 +64,9 @@ export declare class TokenUtils {
      * tool call 执行后产生的 function_call_result（这些结果在 API 返回后才追加到 history）。
      * 为了更准确地判断是否需要触发压缩，需要把这部分 token 补上。
      *
-     * 从 history 末尾往前扫描，收集连续的 function_call_result 条目直到遇到其他类型为止。
+     * 从 history 末尾往前扫描，只收集紧挨在末尾的连续 function_call_result。
+     * 一遇到非 function_call_result（含 function_call）即停止：function_call 属于上一轮
+     * 已经进过请求的内容，穿过它会把更早轮次的 result 重复计入 inputTokens（#133055）。
      * 注意：估算前会移除图片内容，避免 base64 图片数据导致 token 严重偏高。
      */
     static estimateTrailingToolResultTokens(history: any[]): number;

package/cli/dist-server/types/vendor/cbc-shared/node/agent/openai-agents-types.d.ts

@@ -31,6 +31,7 @@ import type { AgentOutputType, getAllMcpTools as getAllMcpToolsFn, MaxTurnsExcee
 import type { TextOutput, UnknownContext, UserContent } from '@openai/agents-core/types';
 import type { AcpTerminalStateItem, FileHistorySnapshotItem, ModelUsageItem, ResendForkNoticeItem } from './custom-input-item-types';
 export * from './custom-input-item-types';
+export type { RunStreamEvent } from '@openai/agents-core';
 export type Agent<TContext = UnknownContext, TOutput extends AgentOutputType = TextOutput> = AgentTypeCtor<TContext, TOutput>;
 export type RunContext<TContext = UnknownContext> = RunContextTypeCtor<TContext>;
 export type Runner = RunnerTypeCtor;

package/cli/dist-server/types/vendor/cbc-shared/node/checkpoint/checkpoint-types.d.ts

@@ -64,4 +64,10 @@ export interface CheckpointFileChangeStats {
     additions: number;
     /** 删除行数 */
     deletions: number;
+    /**
+     * 行数为近似值（PTC/Code Mode 兜底：files 来自本轮 trackFile 快照，additions/deletions
+     * 暂记 0）。需要精确行数的调用方（如 TUI rewind 面板）据此异步调用
+     * compareWithCurrentFiles 补齐后清除本标记。仅内存态，不持久化。
+     */
+    approximate?: boolean;
 }

package/cli/dist-server/types/vendor/cbc-shared/node/model/model-errors.d.ts

@@ -20,11 +20,23 @@ export declare class StreamTimeoutError extends CustomError {
  * reasoning-only：已流出思考、finish_reason=error 且无可用输出（#63761 / #122115）。
  * no-token：finish_reason=error 到达时一个模型 token 都没有（连 reasoning 也没有）。
  *
- * reasoning-only 与 no-token 都是上游瞬时失败，会话层按 error 恢复预算重试；
+ * reasoning-only 与 no-token 按「上游瞬时失败」处理，会话层按 error 恢复预算重试——
+ * 但仅限流没跑太久的那些：已经烧满上游硬时限的同样形态重跑必然再次跑满，由
+ * `isRetryableEmptyStreamError` 按 {@link EmptyStreamError.elapsedMs} 收口（#132616）。
  * placeholder 必须与 no-token 分开——两者共用一个值时，放开 no-token 会连带
  * 推翻空 200 的终态判定。
  */
 export type EmptyStreamKind = 'placeholder' | 'reasoning-only' | 'no-token';
+/**
+ * 空流错误的结构化 category，两条上报通道共用一个值。
+ *
+ * ACP 侧 `classifyErrorAsRequestError` 早就用它（前端按此映射业务码 3008「模型服务未返回消息」）；
+ * stream-json 侧此前没有任何结构化维度，`errors_info` 整体缺席，sandbox-proxy 的
+ * `BuildErrorMessageFromCLIErrors` 只能兜底成 `category=internal`，再由
+ * `ClassifyInBandPromptError` 推出 `error_origin=cli`——把上游故障记成 CLI 内部错误。
+ * 挂到错误对象的 `data` 上让两条通道读到同一个值，不再各说各话。
+ */
+export declare const EMPTY_STREAM_ERROR_CATEGORY = "empty_model_response";
 /**
  * 空流错误
  * 语义上仍然是"上游没有提供模型输出"，所以继承 StreamTimeoutError
@@ -33,10 +45,26 @@ export type EmptyStreamKind = 'placeholder' | 'reasoning-only' | 'no-token';
  * 典型触发：某些 OpenAI 兼容网关在后端异常时没有透传错误码，而是发一帧全空
  * `{"delta":{"role":"assistant","content":"","tool_calls":[],"refusal":""},"finish_reason":""}`
  * 然后直接关闭连接——用户看到的现象是 cbc 当前轮"空响应"并被 ACP 分类为 refusal。
+ *
+ * message **必须**按 kind 分开写：三种 kind 共用一句「only placeholder chunks」会谎报失败形态。
+ * 0924 沙箱实测的 reasoning-only 样本里上游发了 20397 帧 / 9.5 MB 真实 reasoning，
+ * 与「只有占位帧」正相反；而下游报表、看板、排障全靠这个字符串归因，于是把上游
+ * ~900s 时限问题记成了 CLI 内部错误（#132616）。
  */
 export declare class EmptyStreamError extends StreamTimeoutError {
     readonly emptyStreamKind: EmptyStreamKind;
-    constructor(chunkCount: number, totalBytes: number, kind?: EmptyStreamKind);
+    /**
+     * 流从打开到判定空流的时长。
+     *
+     * 用来区分「上游瞬时抖动（秒级空响应）」和「跑满上游硬时限（0924 实测 ~900s）」——
+     * 后者重跑同一段 prompt 必然再次跑满，重试只是把静默时长翻倍，见
+     * `isRetryableEmptyStreamError` 的时长闸门。
+     */
+    readonly elapsedMs: number;
+    readonly data: Readonly<{
+        category: "empty_model_response";
+    }>;
+    constructor(chunkCount: number, totalBytes: number, kind?: EmptyStreamKind, elapsedMs?: number);
 }
 /**
  * 认证缺失错误

package/cli/dist-server/types/workspace/agent-client-protocol/lib/common/index.d.ts

@@ -3,6 +3,7 @@ export * from './prompt-codec.js';
 export * from './prompt-context-xml.js';
 export * from './to-resolve-blocks.js';
 export * from './interactive-question-tools.js';
+export * from './sandbox-rule-context.js';
 export * from './sdk.js';
 export * from './transport/streamable-http.js';
 export * from './client/index.js';

package/cli/dist-server/types/workspace/agent-client-protocol/lib/common/prompt-codec.d.ts

@@ -24,6 +24,8 @@ export interface AcpResourceLinkProviderData {
     [extra: string]: unknown;
 }
 export interface DecodeInputTextToAcpContentBlocksOptions {
+    /** Defaults to legacy badge parsing. False restores only explicit resource metadata. */
+    parseInlineReferences?: boolean;
     resolveImageOrdinal?: (ordinal: number, label: string) => ContentBlock | undefined;
     /** 标题/摘要等纯展示场景允许缺少 providerData 的 badge 降级为不可交互的可读块。 */
     allowDisplayOnlyFallback?: boolean;
@@ -36,6 +38,8 @@ export interface DecodeInputTextToAcpContentBlocksOptions {
     allowUnicodeSlashTokens?: boolean;
 }
 export interface DecodePersistedUserContentToAcpContentBlocksOptions {
+    /** Keep ordinary text literal while restoring explicitly encoded attachments. */
+    parseInlineReferences?: boolean;
     convertPersistedImageBlock?: (block: Record<string, any>) => ContentBlock | undefined;
 }
 export declare function getAcpResourceLinkDisplayName(uri: string, name?: string): string;

package/cli/dist-server/types/workspace/agent-client-protocol/lib/common/sandbox-rule-context.d.ts

@@ -0,0 +1,38 @@
+export type SandboxRuleDomain = 'file' | 'command' | 'network';
+export type SandboxRuleSource = 'enterprise' | 'preset' | 'user';
+export type SandboxRuleCause = {
+    kind: 'ordered-rule';
+    domain: SandboxRuleDomain;
+    ruleRef: string;
+} | {
+    kind: 'sensitive-rule';
+    ruleId: string;
+    source?: SandboxRuleSource;
+} | {
+    kind: 'policy';
+    code: string;
+};
+export interface SandboxRuleContext {
+    causes: SandboxRuleCause[];
+}
+export interface FileApprovalScope {
+    directory: string;
+    operation: 'read' | 'write' | 'delete';
+    recursive: boolean;
+    lifetime: 'session';
+}
+export declare const SANDBOX_RULE_CONTEXT_META_KEY = "codebuddy.ai/sandboxRuleContext";
+export declare const FILE_APPROVAL_SCOPE_META_KEY = "codebuddy.ai/fileApprovalScope";
+/** 仅复制显示所需字段，不能将归因标识作为授权凭证。 */
+export declare function parseSandboxRuleContext(value: unknown): SandboxRuleContext | undefined;
+export declare function parseFileApprovalScope(value: unknown): FileApprovalScope | undefined;
+/**
+ * 目录授权的专用应答 optionId，不出现在 requestPermission 的选项列表中。
+ * 只有展示了 fileApprovalScope 的卡片会回传它；按选项 kind 自动应答的 IM、
+ * 自动化或旧 UI 选不到它，因而无法替用户登记目录授权。
+ */
+export declare const FILE_DIRECTORY_APPROVAL_OPTION_ID = "allow_directory";
+export declare function parseSandboxPermissionMetadata(meta: unknown): {
+    ruleContext?: SandboxRuleContext;
+    fileApprovalScope?: FileApprovalScope;
+};

package/cli/dist-server/types/workspace/agent-client-protocol/lib/common/types.d.ts

@@ -41,12 +41,26 @@ export declare const ExtensionMethod: {
     readonly DELEGATE_TOOLS_CHANGED: '_codebuddy.ai/delegateToolsChanged';
     /** UI control for operating Web UI elements */
     readonly UI_CONTROL: '_codebuddy.ai/uiControl';
+    /**
+     * A `--plugin-dir` mod's `ui.render` output — one serialized tree per
+     * paint. Payload: `{ sessionId, plugin, tree }`. The webui / desktop
+     * surface re-hydrates the tree into React nodes; a `<Button>` in the
+     * tree renders as a real HTML button whose click sends MOD_PRESS.
+     */
+    readonly MOD_RENDER: '_codebuddy.ai/modRender';
+    /**
+     * Interaction back-channel for MOD_RENDER trees. Payload:
+     * `{ sessionId, plugin, element, surface }`. The agent dispatches
+     * `ui.press` and runs the closure the mod registered under that
+     * element key.
+     */
+    readonly MOD_PRESS: '_codebuddy.ai/modPress';
 };
 export type ExtensionMethodName = (typeof ExtensionMethod)[keyof typeof ExtensionMethod];
 /**
  * All known extension methods
  */
-export declare const KNOWN_EXTENSIONS: readonly ["_codebuddy.ai/artifact", "_codebuddy.ai/artifactBatch", "_codebuddy.ai/question", "_codebuddy.ai/checkpoint", "_codebuddy.ai/command", "_codebuddy.ai/authUrl", "_codebuddy.ai/file_history_snapshot", "_codebuddy.ai/delegateTool", "_codebuddy.ai/delegateToolsChanged"];
+export declare const KNOWN_EXTENSIONS: readonly ["_codebuddy.ai/artifact", "_codebuddy.ai/artifactBatch", "_codebuddy.ai/question", "_codebuddy.ai/checkpoint", "_codebuddy.ai/command", "_codebuddy.ai/authUrl", "_codebuddy.ai/file_history_snapshot", "_codebuddy.ai/delegateTool", "_codebuddy.ai/delegateToolsChanged", "_codebuddy.ai/modRender", "_codebuddy.ai/modPress"];
 /**
  * 恶意网站拦截的错误码标记，随工具调用结果经 ACP 传给客户端。
  *

package/cli/dist-server/types/workspace/authentication/lib/common/account-scoped-external-link-authentication-provider.d.ts

@@ -1,7 +1,7 @@
 import { RestOperations } from '@celljs/http';
 import { AuthenticationType, ClientInfoProvider, ProductConfiguration, ProductManager } from '../../../product/lib/common/index.js';
 import { ExternalUriOpener } from '../../../runtime/lib/common/index.js';
-import { Logger } from '../../../telemetry/lib/common/index.js';
+import { Logger, type Span } from '../../../telemetry/lib/common/index.js';
 import { Account, APIResult, AuthenticationProvider, AuthSession, AuthState, AuthToken, LoginContext, LogoutOptions, ProductEnvService, SignContext } from './authentication-protocol.js';
 /**
  * External-link auth variant whose current account is scoped by the token.
@@ -29,11 +29,11 @@ export declare class AccountScopedExternalLinkAuthenticationProvider implements
     removeSession(_session?: AuthSession, _options?: LogoutOptions): Promise<void>;
     switchAccount(account: Account, authSession: AuthSession, ctx: SignContext): Promise<AuthSession>;
     private toSessionAccountLists;
-    protected openAuthUrl(authState: AuthState): Promise<void>;
+    protected openAuthUrl(authState: AuthState, handoffSpan?: Span): Promise<void>;
     private fetchAuthState;
     private loopGetToken;
     private loopGetCurrentAccount;
-    protected fetchCurrentAccount(auth: AuthToken, ctx: SignContext): Promise<Account>;
+    protected fetchCurrentAccount(auth: AuthToken, ctx: SignContext, requestSpan?: Span): Promise<Account>;
     protected enterpriseHeaders(auth?: AuthToken): Record<string, string>;
     protected calculateExpiresAt(authToken: AuthToken): void;
     private isAuthenticationInvalidError;