@tencent-ai/agent-harness 0.2.0-beta.10 → 0.2.0-beta.11

package/cli/dist-server/types/workspace/cbc-core/lib/node/hooks/hook-protocol.d.ts

@@ -1,5 +1,120 @@
-import type { BackgroundTaskInfo, CronTaskInfo, FinalStopReason, HookEvent, HookExecutionOptions, HookExecutionResult, HookPermissionMode, NotificationType, SessionEndReason, SessionStartSource } from '../../../../cbc-shared/lib/node/index.js';
-import type { Session } from '../session/session-protocol.js';
+import type { AgentInputItem, BackgroundTaskInfo, CronTaskInfo, FinalStopReason, HookEvent, HookExecutionOptions, HookExecutionResult, HookPermissionMode, NotificationType, SessionEndReason, SessionStartSource } from '../../../../cbc-shared/lib/node/index.js';
+import type { InterceptorGate, Session } from '../session/session-protocol.js';
+/**
+ * Internal Hook Provider interface
+ *
+ * Use @Component(Hook) to register internal hooks that execute
+ * alongside external shell hooks in HookManager.executeHooks().
+ *
+ * @example
+ * ```typescript
+ * @Component(Hook)
+ * export class MyStopHook implements Hook {
+ *     readonly event = HookEvent.STOP;
+ *     readonly priority = HookPriority.Normal;
+ *
+ *     async execute(input: HookInput): Promise<HookExecutionResult | undefined> {
+ *         // Return undefined to skip, or HookExecutionResult to participate
+ *         return undefined;
+ *     }
+ * }
+ * ```
+ */
+export declare const Hook: unique symbol;
+/**
+ * Data available only to in-process hooks.
+ *
+ * This context is never forwarded to command, HTTP, prompt, agent, or SDK hooks.
+ * It can therefore carry process-local data that must not become part of the
+ * serializable hook input contract.
+ */
+export interface InternalHookContext {
+    /** Structured input items for the current user prompt. */
+    inputItems?: readonly AgentInputItem[];
+    /** Files declared by the tool invocation of a PostToolUse hook (`ToolResult.producedArtifacts`). */
+    producedArtifacts?: ReadonlyArray<{
+        /** Artifact URI or process-local path. */
+        uri: string;
+    }>;
+    /**
+     * Set by the hook executor: resolves with the aggregated `allowed` verdict of
+     * every hook in this dispatch, internal ones included. A hook must not await
+     * it inside `execute` (that would wait on itself); chain work onto it instead.
+     */
+    decision?: Promise<boolean>;
+    /**
+     * FinalStop only: the interceptor gate stamped on the run result that reached
+     * FinalStop. Unlike `session.interceptorGate`, a later result cannot replace it.
+     */
+    interceptorGate?: InterceptorGate;
+}
+/** Associate local attachment paths with an input item without mutating serializable message data. */
+export declare function setInternalInputAttachmentPaths(item: AgentInputItem, paths: readonly string[]): void;
+/** Read process-local attachment paths associated with an input item. */
+export declare function getInternalInputAttachmentPaths(item: unknown): readonly string[];
+/** Carry attachment paths onto a clone or merge of input items; WeakMap entries do not survive copying. */
+export declare function copyInternalInputAttachmentPaths(from: readonly unknown[], to: AgentInputItem): void;
+/**
+ * Optional in-process service that keeps a private copy of a local input
+ * attachment the host deletes right after submission (TUI paste cleanup).
+ * `data` is the file content the host already read, so the copy needs no second read.
+ * Returns the copy's path, or undefined to keep the original path.
+ */
+export declare const InputAttachmentRetainer: unique symbol;
+export interface InputAttachmentRetainer {
+    retain(filePath: string, data?: Uint8Array): Promise<string | undefined>;
+}
+export interface InputAttachmentSource {
+    path: string;
+    /** Content the host already read from `path`, if any. */
+    data?: Uint8Array;
+}
+/** Like {@link setInternalInputAttachmentPaths}, but lets a registered retainer copy the files first. */
+export declare function retainInternalInputAttachmentPaths(item: AgentInputItem, attachments: readonly InputAttachmentSource[]): Promise<void>;
+export interface Hook {
+    /**
+     * Hook event type this hook responds to
+     */
+    readonly event: HookEvent;
+    /**
+     * Priority for execution order (lower = earlier)
+     */
+    readonly priority: number;
+    /**
+     * Optional matcher pattern (regex) for filtering
+     * - PreToolUse/PostToolUse: matches tool_name
+     * - SessionStart: matches source
+     * - SessionEnd: matches reason
+     * - Other events: not used
+     */
+    readonly matcher?: string;
+    /**
+     * Execute the hook logic
+     *
+     * @param input - Serializable hook input data
+     * @param context - Optional process-local data available only to internal hooks
+     * @returns HookExecutionResult or undefined to skip
+     */
+    execute(input: HookInput, context?: InternalHookContext): Promise<HookExecutionResult | undefined>;
+}
+/**
+ * Priority levels for internal hooks
+ * Lower values execute first
+ */
+export declare enum HookPriority {
+    /** Highest priority - runs first */
+    Highest = 0,
+    /** High priority */
+    High = 100,
+    /** Structured output processing */
+    StructuredOutput = 200,
+    /** Normal priority - default */
+    Normal = 500,
+    /** Low priority */
+    Low = 800,
+    /** Lowest priority - runs last */
+    Lowest = 1000
+}
 export interface HookInput {
     /**
      * Session identifier
@@ -312,6 +427,6 @@ export interface HookInput {
 }
 export declare const CoreHookExecutor: unique symbol;
 export interface CoreHookExecutor {
-    executeHooks(event: HookEvent, input: HookInput, options?: HookExecutionOptions): Promise<HookExecutionResult>;
+    executeHooks(event: HookEvent, input: HookInput, options?: HookExecutionOptions, internalContext?: InternalHookContext): Promise<HookExecutionResult>;
     hasHooks(event: HookEvent, toolName?: string): Promise<boolean>;
 }

package/cli/dist-server/types/workspace/cbc-core/lib/node/message-queue/index.d.ts

@@ -7,6 +7,7 @@ export * from './prompt-mid-turn-buffer.js';
 export * from './rich-queue-manager-protocol.js';
 export * from './rich-queue-manager.js';
 export * from './steer-input-buffer-protocol.js';
+export * from './steer-model-input-preparer-protocol.js';
 export * from './steer-input-buffer.js';
 export * from './followup-queue-protocol.js';
 export * from './followup-queue.js';

package/cli/dist-server/types/workspace/cbc-core/lib/node/message-queue/injectable-content.d.ts

@@ -4,13 +4,11 @@ import type { SteerDrainedGroup } from './steer-input-buffer-protocol.js';
 /**
  * 待插入内容的文本抽取与可注入性判定（#85193）。
  *
- * agent-cli 内两处共用同一份，避免过滤规则漂移：
- * - `acp-agent.ts` 的 `session/steer` handler：纵深防御，不可注入内容直接拒收；
- * - `runner-factory.ts` 的 `buildSteerInjectionInput`：注入前过滤 + 拼装。
+ * - `isInjectableContent`：只承载文本的 mid-turn 注入（acp-view 后台 drain 轮）。
+ * - `isSteerableContent`：steer 入口（ACP `session/steer` / `send_followup_now`）。steer 与普通 prompt
+ *   使用同一套用户输入转换，图片随消息进入模型（#140576），因此有文本**或有图片**即可。
  *
- * 旧文本入口与 `RichMessageQueueManager.isInjectable` 对齐：斜杠命令和空文本不可注入。
- * Server 的完整 user message 入口单独完成入队校验，保留图片与文件内容。
- * 兼容 `<channel>` 包裹（channel 消息里的斜杠命令同样识别）。
+ * 两者都拒绝斜杠命令，兼容 `<channel>` 包裹（channel 消息里的斜杠命令同样识别）。
  */
 /** 把一组 contentBlock 里的文本抽出并用换行拼接（string 块与 {type:'text'} 块都算，非文本块忽略）。 */
 export declare function contentBlocksToText(contentBlocks: unknown[]): string;
@@ -18,20 +16,19 @@ export declare function contentBlocksToText(contentBlocks: unknown[]): string;
 export declare function isSlashCommandText(text: string): boolean;
 /** 一组 contentBlocks 是否可作为普通文本注入（有文本且非斜杠命令）。 */
 export declare function isInjectableContent(contentBlocks: unknown[]): boolean;
+/** 一组 ACP contentBlocks 是否可 steer 进当前一轮：非斜杠命令，且有文本或有图片。 */
+export declare function isSteerableContent(contentBlocks: unknown[]): boolean;
 /**
- * 把若干组待插入的消息拼成一条可注入的模型输入（`<system-reminder>` 包装）。
- * 可注入的组合并进同一个 reminder（多条按顺序保留、`\n\n` 分隔）。全部不可注入返回 undefined。
+ * 把若干组已准入的 steer 消息拼成模型输入 + 历史项 + 实时回执（#87145 / #95921 / #140576）。
  *
- * 落盘 vs 注入（对齐 {@link buildPromptMidTurnInput} 的模式）：
- * - **注入项 `item`**（喂模型）：把全部可注入文本合并进一个 `<system-reminder data-role=
- *   "message-queue">` 包装，与 `clientMeta` 无关（模型不需要看到业务 metadata）。
- * - **历史项 `historyItems`**（落盘）：每组一条、只存用户原文；若该组带 `clientMeta`，把它
- *   **原样**挂进 `providerData.clientMeta`（不解构、不加 isMeta、零行为副作用）。agent-cli 不
- *   解读该 metadata，业务侧（如 WorkBuddy）读它在重放/重开时区分 steer 消息。无 clientMeta
- *   时退化为裸 user 记录（旧行为）。若带 `clientUserMessageId`，同时将其落为历史 item.id，
- *   保证 CLI 回放的 `user_message_chunk.messageId` 与实时回执一致。
- * - **实时事件 `emitInfos`**（#95921 Phase 2）：仅带 `clientUserMessageId` 的组产出一条；
- *   该 id 控制注入完成后的 pending 对账，`clientMeta` 只作为独立的不透明 metadata 随事件携带。
+ * 每组的 `messages` 与普通 prompt 一样是完整 user message（可含 `input_image`），本函数只做
+ * steer 独有的三件事，不再改写内容：
+ * - **注入项 `items`**（喂模型）：每条消息原样放进 `<system-reminder data-role="message-queue">`
+ *   包装（包装文本在内容前后各一个 input_text），图片随之进入模型。
+ * - **历史项 `historyItems`**（落盘）：消息对象本身（按引用，保留准入标记）。带 `clientUserMessageId`
+ *   的单消息组把它落为 item.id，保证 CLI 回放的 `user_message_chunk.messageId` 与实时回执一致；
+ *   带 `clientMeta` 时原样挂进 `providerData.clientMeta`（CLI 不解读，WorkBuddy 据此识别 steer）。
+ * - **实时回执 `emitInfos`**：仅带 `clientUserMessageId` 的组产出一条，`clientMeta` 随事件携带。
  */
 export declare function buildSteerInjectionInput(groups: readonly SteerDrainedGroup[]): {
     items: AgentInputItem[];

package/cli/dist-server/types/workspace/cbc-core/lib/node/message-queue/steer-input-buffer-protocol.d.ts

@@ -32,9 +32,11 @@ export type SteerInputDisposition = 'consumed' | 'cancelled' | 'discarded';
 export interface SteerDrainedGroup {
     /** Set only after the host validates a one-time mod prompt receipt. */
     readonly modsPromptSubmitted?: true;
-    readonly blocks: unknown[];
-    /** Native, already reviewed messages. Kept by reference for in-memory admission markers. */
-    readonly messages?: readonly UserMessageItem[];
+    /**
+     * 待插入的用户消息，与普通 prompt 同构（可含 `input_image`，#140576）。
+     * 按引用保留，内存中的准入标记（WeakMap）随对象传递。
+     */
+    readonly messages: readonly UserMessageItem[];
     /**
      * 客户端为本条用户消息提供的不透明对账 id。存在时，CLI 在真正注入后原样回贴；
      * 同时落为历史 user item.id，保证回放身份一致；不存在时不产生实时回执。
@@ -50,7 +52,7 @@ export interface SteerDrainedGroup {
     readonly clientMeta?: unknown;
 }
 /**
- * push 的归属 + 客户端不透明 metadata 入参（合并为一个对象，避免 push 参数过多）。
+ * pushMessages 的归属 + 客户端不透明 metadata 入参（合并为一个对象，避免参数过多）。
  */
 export interface SteerPushInput {
     /** Server-only provenance, independent of untrusted clientMeta. */
@@ -72,16 +74,13 @@ export interface SteerPushInput {
 }
 export interface SteerInputBuffer {
     /**
-     * 暂存一组待插入的消息（一次 `session/steer` 一组）。
-     * 同一次请求执行里可被调用多次（用户连发多条），取出时一次性全部合并。
-     */
-    push(sessionId: string, contentBlocks: unknown[], input: SteerPushInput): void;
-    /**
-     * Transfer reviewed native messages. Aborting withdraws only this submission while buffered.
-     * Drain and cancellation are synchronous, so exactly one wins. Once consumed, cancellation
-     * cannot retract the input. Clear or a stale owner discards it. The promise never rejects.
+     * 暂存一组待插入的用户消息（一次 steer 一组）。同一次请求执行里可被调用多次（用户连发多条）。
+     * 转移所有权：调用方必须先 clone / 审查，交出后不得再修改。
+     * Aborting withdraws only this submission while buffered. Drain and cancellation are
+     * synchronous, so exactly one wins. Once consumed, cancellation cannot retract the input.
+     * Clear or a stale owner discards it. The consumption promise never rejects.
      */
-    pushMessages(sessionId: string, messages: readonly UserMessageItem[], ownerRequestId: string, signal?: AbortSignal): Promise<SteerInputDisposition>;
+    pushMessages(sessionId: string, messages: readonly UserMessageItem[], input: SteerPushInput, signal?: AbortSignal): Promise<SteerInputDisposition>;
     /**
      * 取出并清空当前会话的全部待插入消息（取出即视为已消费）。
      * 只返回归属 `currentRequestId` 的消息；归属其它请求的陈旧残留一并丢弃、不注入。

package/cli/dist-server/types/workspace/cbc-core/lib/node/message-queue/steer-input-buffer.d.ts

@@ -9,9 +9,8 @@ import { type SteerDrainedGroup, type SteerInputBuffer, type SteerInputDispositi
  */
 export declare class SteerInputBufferImpl implements SteerInputBuffer {
     private readonly store;
-    push(sessionId: string, contentBlocks: unknown[], input: SteerPushInput): void;
+    pushMessages(sessionId: string, messages: readonly UserMessageItem[], input: SteerPushInput, signal?: AbortSignal): Promise<SteerInputDisposition>;
     drain(sessionId: string, currentRequestId: string | undefined): SteerDrainedGroup[];
-    pushMessages(sessionId: string, messages: readonly UserMessageItem[], ownerRequestId: string, signal?: AbortSignal): Promise<SteerInputDisposition>;
     has(sessionId: string, currentRequestId: string | undefined): boolean;
     clear(sessionId: string): void;
 }

package/cli/dist-server/types/workspace/cbc-core/lib/node/message-queue/steer-model-input-preparer-protocol.d.ts

@@ -0,0 +1,13 @@
+import type { AgentInputItem } from '../../../../cbc-shared/lib/node/index.js';
+import type { Session } from '../session/session-protocol.js';
+/**
+ * steer 插入点对**模型输入副本**的加工（#140576），由宿主（agent-cli）实现。
+ *
+ * 普通 prompt 在 run 起点由图片压缩 / 模型能力过滤拦截器处理，且只改发给模型的副本、历史保留原图；
+ * steer 在 run 中途进入 RunState，不经过这些拦截器，因此在插入点用同一份实现处理，语义保持一致。
+ */
+export declare const SteerModelInputPreparer: unique symbol;
+export interface SteerModelInputPreparer {
+    /** 就地加工模型输入副本：按当前模型能力过滤图片、压缩超限图片。不得修改历史项。 */
+    prepare(session: Session, items: AgentInputItem[]): Promise<void>;
+}

package/cli/dist-server/types/workspace/cbc-core/lib/node/session/interruption-service.d.ts

@@ -448,6 +448,17 @@ export declare class InterruptionServiceImpl implements InterruptionService {
      * 此时不退回额度——新请求边界已经清零，再减一次会扣掉新链的额度。
      */
     private prepareRecoveryAttempt;
+    /**
+     * reasoning-only 空流的续写前置：把模型层随错误交出的思考落史，续写请求才带得上它，
+     * 模型可以接着已有思考往下写，而不是从头审题。
+     *
+     * 只在重试已经确定发起时调用：不重试（预算耗尽、跑满上游时限、退避期间取消）时历史保持原样。
+     * 返回 `false` 时调用方退回原样重发——没有思考可接，就不能让提示说「从中断处继续」。
+     *
+     * 落史形状与 AbortedStreamDraftStore 的中途取消半成品一致（status=incomplete +
+     * isPartialAborted）；发请求时由 attachOrphanedReasoningCarriers 补承载项回传给模型。
+     */
+    private persistEmptyStreamReasoning;
     /**
      * CLI TUI 手打 `/compact` 裸跑成功后补发 SessionStart('compact')。
      *

package/cli/dist-server/types/workspace/cbc-core/lib/node/session/session-fork-guard.d.ts

@@ -1,3 +1,4 @@
 export declare class SessionForkGraphError extends Error {
-    constructor(message: string);
+    readonly reason: 'invalid_history' | 'budget_exceeded';
+    constructor(message: string, reason?: 'invalid_history' | 'budget_exceeded');
 }

package/cli/dist-server/types/workspace/cbc-core/lib/node/session/session-hook-manager.d.ts

@@ -1,6 +1,6 @@
 import { type AgentInputItem, FinalStopReason, NotificationType, RunResult, SessionEndReason, SessionStartSource, StreamedRunResult } from '../../../../cbc-shared/lib/node/index.js';
 import { Logger } from '../../../../telemetry/lib/common/index.js';
-import { CoreHookExecutor as HookManager } from '../hooks/hook-protocol.js';
+import { CoreHookExecutor as HookManager, type InternalHookContext } from '../hooks/hook-protocol.js';
 import { SessionHookHost } from './session-hook-host-protocol.js';
 import { Session, SessionHookManager, SessionStore } from './session-protocol.js';
 /**
@@ -207,7 +207,7 @@ export declare class SessionHookManagerImpl implements SessionHookManager {
      * final terminal state and will not continue via the current Stop hook.
      * Does NOT support continueRequest.
      */
-    executeFinalStopHooks(session: Session, reason?: FinalStopReason): Promise<void>;
+    executeFinalStopHooks(session: Session, reason?: FinalStopReason, internalContext?: Pick<InternalHookContext, 'interceptorGate'>): Promise<void>;
     /**
      * UserPromptExpansion — Claude Code 官方事件：任何用户输入的命令/skill 展开成
      * prompt、送进模型之前统一从这里触发，可阻断展开。`command_args` / `prompt` 按

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

@@ -176,6 +176,15 @@ export declare class SessionManagerImpl implements SessionManager, ApplicationLi
     initRunResultHandler(session: Session): void;
     protected handleRunResult(session: Session): Promise<void>;
     protected handleStreamRunResult(session: Session, result: StreamedRunResult<any, any>, modelResponseMetadata: ModelResponseMetadata): Promise<void>;
+    /**
+     * Issue #65246：把 API 实际响应的物理模型 id 存到 session.meta，
+     * 供 ACP injectMeta 透传给前端，用于 auto 模式展示「推荐模型（xxx）」。
+     */
+    private recordResponseModel;
+    /**
+     * 记录一次模型响应的 finish_reason（Chat Completions 的 choice 与 Responses API 终态事件共用）。
+     */
+    private recordModelFinishReason;
     /**
      * content_filter 安全审查终止处理。
      *

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

@@ -3,6 +3,7 @@ import { type AgentInputItem, ApprovalOptions, type Checkpoint, FinalStopReason,
 import { Command } from '../../../../product/lib/common/index.js';
 import { BehaviorSubject, Subject } from 'rxjs';
 import type { CompactionLineage } from '../context/compaction-lineage.js';
+import type { InternalHookContext } from '../hooks/hook-protocol.js';
 import { BackgroundTask } from './background-task-protocol.js';
 import type { SessionRunStateSnapshot } from './session-run-state-machine-protocol.js';
 import type { Lane, LanePointer, SessionKey, SessionStoreEntry } from './session-store-contract.js';
@@ -516,6 +517,11 @@ export interface Session {
     telemetryClientInfo?: TelemetryClientInfo;
     /** Root span for current conversation request, used to extract B3 trace headers */
     conversationRequestRootSpan?: import('../../../../telemetry/lib/common/index.js').Span;
+    /**
+     * 释放 tracing 重初始化闸门（见 trace/trace-reinit-gate.ts）。TraceStartHook 建
+     * root span 时置入，TraceStopHook / 强制收尾旧 root 时调用一次（幂等）。genie#113158。
+     */
+    _traceTurnRelease?: () => void;
     messageId?: string;
     /**
      * @deprecated Hooks 的 `generation_id` 现直接取 `conversationRequestId`（Request ID），
@@ -1239,7 +1245,8 @@ export interface SessionManager {
      * 拦截器/ModelUtils 的权威优先级是 requestOptions.model > options.model > agent 默认；
      * --model 启动参数固化在 options.model，仅写 settings/cli 无法覆盖它。override map
      * 供 applyOverrideModel 每轮重建 requestOptions（Issue #82146）。/model 命令与模型面板
-     * 共用此入口；ACP set_model（applyRuntimeSessionModel）仍为独立实现，待统一收敛。
+     * 共用此入口；ACP set_model 经 applyRuntimeSessionModel 调用。
+     * 切换前模型不在这里记录，压缩路径从会话历史里最近一次用量推导。
      */
     setRuntimeModel(session: Session | undefined, modelId: string, source?: OverrideModelSource): void;
     /**
@@ -1476,7 +1483,7 @@ export interface SessionHookManager {
      * final terminal state and will not continue via the current Stop hook.
      * Does NOT support continueRequest.
      */
-    executeFinalStopHooks(session: Session, reason?: FinalStopReason): Promise<void>;
+    executeFinalStopHooks(session: Session, reason?: FinalStopReason, internalContext?: Pick<InternalHookContext, 'interceptorGate'>): Promise<void>;
     /**
      * UserPromptExpansion — Claude Code 官方事件（非 cbc 专属扩展）：任何用户输入的
      * 命令/skill 在展开成 prompt、送进模型之前统一从这里触发，可阻断展开。适用于

package/cli/dist-server/types/workspace/cbc-core/lib/node/session/session-store.d.ts

@@ -61,12 +61,13 @@ export declare const SESSION_TITLE_META_KEY = "codebuddy.ai/sessionTitle";
  * never lands on disk. Literals kept in sync with MAIN_AGENT_META_KEY /
  * MAIN_AGENT_HOST_KIND_KEY (agent/main-agent-session.ts, #97166) and
  * MULTITASK_MODE_META_KEY (multitask overlay) and A2A_CONTEXTS_META_KEY
- * (a2a/a2a-context-store.ts), plus SESSION_TITLE_META_KEY above (#138181).
+ * (a2a/a2a-context-store.ts), plus SESSION_TITLE_META_KEY above (#138181) and
+ * PRIVATE_DATA_STICKY_META_KEY above (#127752).
  * The spec asserts the sync. Growing this list is a review decision, not a
  * side effect of putting a key on session.meta.
  * Role / locks / parentSessionId stay runtime-only.
  */
-export declare const PERSISTED_SESSION_META_KEYS: readonly ['codebuddy.ai/mainAgent', 'codebuddy.ai/hostKind', 'multitaskMode', 'codebuddy.ai/a2aContexts', "codebuddy.ai/sessionTitle"];
+export declare const PERSISTED_SESSION_META_KEYS: readonly ['codebuddy.ai/mainAgent', 'codebuddy.ai/hostKind', 'multitaskMode', 'codebuddy.ai/a2aContexts', "codebuddy.ai/sessionTitle", "codebuddy.ai/privateDataSticky"];
 /**
  * Meta a fork inherits from its source: the persisted whitelist minus title
  * facts, which describe the source conversation and must not label the child
@@ -481,7 +482,6 @@ export declare class SessionStoreImpl implements SessionStore {
      */
     private deserializeForkSubagentSession;
     private assertForkGraphAcyclic;
-    private assertForkChildSupported;
     private resolveForkChildPrefixEnd;
     private readForkRuntimeSessionId;
     private assertForkChildMetaLineage;

package/cli/dist-server/types/workspace/cbc-core/lib/node/trace/trace-turn-gate.d.ts

@@ -0,0 +1,13 @@
+import type { Session } from '../session/session-protocol.js';
+/**
+ * 归还本轮 turn 持有的 tracing 重初始化闸门（genie#113158）。
+ *
+ * 闸门计数只能由持有 release 的那一轮归还，且 session 上只存一个 release 槽位。
+ * 因此**每一个结束本轮 root span 的出口**都必须调用本函数：正常 Stop、PTL 无
+ * 续跑的兜底清理、下一轮开始时对残留 root span 的强制收尾。任一出口漏掉，
+ * 下一轮的 markTraceTurnOpen 就会覆盖掉未归还的 release，计数从此单调递增、
+ * 永不归零——后续 re-init 被无限推迟，auth/product 配置变更再也不生效。
+ *
+ * release 自身幂等，重复调用安全。
+ */
+export declare function releaseTraceTurnGate(session: Session): void;

package/cli/dist-server/types/workspace/cbc-core/lib/node/utils/error-utils.d.ts

@@ -2,6 +2,8 @@ export interface ErrorInfo {
     status?: number;
     code?: number;
     message?: string;
+    /** 会话层是否会自动重试本次错误；未知时按会重试处理，沿用流超时文案的既有口径。 */
+    isRetryable?: boolean;
 }
 /**
  * 后端业务错误码枚举
@@ -157,6 +159,11 @@ export declare namespace ErrorUtils {
      * 避免 acp-agent 分类时静默退化为通用 "Network error" 文案。对齐 isStreamTimeoutError 风格。
      */
     function isEmptyStreamError(error: unknown): boolean;
+    /**
+     * 空流里已经流出过思考、但没有正文或工具调用就 `finish_reason=error`。
+     * 只认 instanceof：与 `isRetryableEmptyStreamError` 同口径，丢了 prototype 的空流本就不会被重试。
+     */
+    function isReasoningOnlyEmptyStreamError(error: unknown): boolean;
     /**
      * 将错误信息序列化为 JSON 字符串，用于 ACP 协议传输
      * ACP SDK 会尝试解析这个 JSON 字符串并将其放到 error.data 中

package/cli/dist-server/types/workspace/cbc-core/lib/node/utils/index.d.ts

@@ -3,6 +3,7 @@ export * from '../session-title/session-title-utils.js';
 export * from './command-message-utils.js';
 export * from './content-block-sanitizer.js';
 export * from './conversation-request-id.js';
+export * from './markdown-code-utils.js';
 export * from './error-message-host-protocol.js';
 export * from './error-utils.js';
 export * from './failure-classifier.js';
@@ -20,6 +21,7 @@ export * from './message-utils.js';
 export * from './model-utils.js';
 export * from './number-utils.js';
 export * from './queue-dispatch-utils.js';
+export * from './responses-api-utils.js';
 export * from './run-result-utils.js';
 export * from './session-utils.js';
 export * from './summary-utils.js';

package/cli/dist-server/types/workspace/cbc-core/lib/node/utils/markdown-code-utils.d.ts

@@ -0,0 +1,15 @@
+/**
+ * Markdown code-span detection shared by `@path` reference scanners
+ * (agent-cli `ImportUtils` and resource reporting), so both agree on which
+ * mentions are real references.
+ *
+ * Rule: a position is inside code when an odd number of ``` fences, or of lone
+ * ` ticks (not part of a ``` run), precedes it.
+ */
+export declare function isInMarkdownCode(text: string, position: number): boolean;
+/**
+ * Same rule as {@link isInMarkdownCode}, with the counts accumulated in one
+ * forward pass. Query positions in ascending order; a text with many mentions
+ * is then scanned once instead of once per mention.
+ */
+export declare function markdownCodeTester(text: string): (position: number) => boolean;

package/cli/dist-server/types/workspace/cbc-core/lib/node/utils/message-content-utils.d.ts

@@ -1,5 +1,7 @@
 import { type AgentInputItem, type UserMessageItem } from '../../../../cbc-shared/lib/node/index.js';
 export declare abstract class MessageContentUtils {
+    /** 用户消息是否携带图片/文件附件块（无文本的纯附件提问也算用户输入）。 */
+    static hasAttachmentContent(item: UserMessageItem): boolean;
     /**
      * 检查用户消息是否有可见的内容
      */
@@ -18,7 +20,7 @@ export declare abstract class MessageContentUtils {
     /** 移除文本中的 system-reminder 标签及其内容 */
     private static stripSystemReminder;
     /** 检测 input_text 块是否为 image_local_path 标记 */
-    private static isImageLocalPathBlock;
+    static isImageLocalPathBlock(text: string | undefined): boolean;
     /**
      * 将 <teammate-message> 标签替换为友好的摘要文本
      * 优先使用 summary 属性，否则提取标签内容

package/cli/dist-server/types/workspace/cbc-core/lib/node/utils/responses-api-utils.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Chat-completions-style finish reason of a terminal OpenAI Responses API stream event
+ * (`response.completed` / `response.incomplete` / `response.failed` / `error`);
+ * `undefined` for every other event.
+ */
+export declare function responsesFinishReason(event: unknown): string | undefined;
+/**
+ * The terminal Responses event behind an SDK `response_done` event: the SDK keeps the event
+ * type in `providerData` and the rest of the response (status, model, incomplete_details) in
+ * `response.providerData`. `undefined` for chat-completions responses.
+ */
+export declare function responsesTerminalEventOf(done: {
+    providerData?: Record<string, any>;
+    response?: {
+        output?: unknown;
+        providerData?: Record<string, any>;
+    };
+}): {
+    type: string;
+    response: Record<string, any>;
+} | undefined;

package/cli/dist-server/types/workspace/cbc-core/lib/node/utils/session-utils.d.ts

@@ -1,6 +1,11 @@
 import type { AgentInputItem } from '../../../../cbc-shared/lib/node/index.js';
 import type { Session } from '../session/session-protocol.js';
 export declare const ENV_KEY_CODEBUDDY_TASK_LIST_ID = "CODEBUDDY_TASK_LIST_ID";
+/**
+ * Runtime meta on a session that runs on behalf of another one (one-off helper runs, `/btw`,
+ * subagents): the owner's {@link SessionUtils.resolveRootSessionId}.
+ */
+export declare const ROOT_SESSION_META_KEY = "codebuddy.ai/rootSessionId";
 export declare abstract class SessionUtils {
     static is(session?: any): session is Session;
     /**
@@ -60,6 +65,21 @@ export declare abstract class SessionUtils {
         };
         id?: string;
     } | undefined, teamName?: string): string | undefined;
+    /**
+     * Root of a session's lineage: the id behind `${CODEBUDDY_SESSION_ID}` in model credentials,
+     * which aihub uses as `cache_task_id` to pin every call of a task to one upstream account.
+     * A history replaying Responses items keeps the root they were produced under
+     * (`providerData.upstream.rootSessionId`), so forks stay on the account that can decrypt
+     * the replayed reasoning. Unlike {@link resolveTaskSessionId}, which picks task-list storage.
+     */
+    static resolveRootSessionId(session: {
+        id: string;
+        history?: readonly unknown[];
+        meta?: Record<string, unknown>;
+    }): string;
+    /** Marks `session` as running on behalf of `owner`, sharing its lineage root. */
+    static adoptRootSession(session: Session, owner: Session | undefined): void;
+    private static replayedRootSessionId;
     static resolveTaskSessionId(session?: {
         meta?: {
             parentSessionId?: string;

package/cli/dist-server/types/workspace/cbc-core/lib/node/utils/usage-utils.d.ts

@@ -7,6 +7,11 @@ export interface LatestUsageSnapshot {
     rawUsage: unknown;
     /** Completion time of the history item carrying this usage. */
     timestamp?: number;
+    /**
+     * 这条用量对应的执行模型。优先 requestModelId（用户选中的模型），
+     * 没有时回退到响应里的 model。Auto 路由下两者可能不同。
+     */
+    model?: string;
 }
 export declare abstract class UsageUtils {
     /** Normalize persisted records and per-response stream usage for SDK aggregation. */
@@ -22,6 +27,19 @@ export declare abstract class UsageUtils {
      * cache fields and response timestamp.
      */
     static getLatestUsageSnapshot(session: Session): LatestUsageSnapshot | undefined;
+    /**
+     * 最近一个压缩边界之后，最后一条带 usage 的消息上的执行模型。
+     * 和 currentModelId 相同、或边界之后没有用量时返回 undefined。
+     *
+     * 压缩边界之前的用量不算：压缩完成后旧模型自动失效，不必再清一份内存记录。
+     * A→B→C 且 B 没跑过时，最后一条用量仍是 A。
+     */
+    static resolvePreSwitchModelId(session: {
+        history?: AgentInputItem[];
+    }, currentModelId: string | undefined): string | undefined;
+    private static findLatestUsageSnapshot;
+    /** 用户选中的模型优先于响应里的实际路由模型。 */
+    private static readExecutedModelId;
     static getTotalUsage(items: AgentInputItem[]): Usage;
     /**
      * 从单个 item 的 rawUsage/usage 提取 cache_read_input_tokens（命中缓存的输入 token）。

package/cli/dist-server/types/workspace/cbc-daemon/lib/node/daemon/daemon-auto-restart.d.ts

@@ -7,7 +7,7 @@
  */
 import { ServerAware } from '@celljs/web/lib/node';
 import type { Server } from 'http';
-import { type DaemonConfig, type IDaemonAutoRestart } from './daemon-protocol.js';
+import { type DaemonConfig, type DaemonRestartNowResult, type IDaemonAutoRestart } from './daemon-protocol.js';
 export declare class DaemonAutoRestartImpl implements IDaemonAutoRestart, ServerAware {
     private readonly logger;
     private readonly registry;
@@ -34,7 +34,7 @@ export declare class DaemonAutoRestartImpl implements IDaemonAutoRestart, Server
      * 入口（覆盖 auto-update idle 路径与本路径的交叉竞态）；这里的检查只是
      * 提前挡掉明显重复的调用。
      */
-    restartNow(config?: Partial<DaemonConfig>): void;
+    restartNow(config?: Partial<DaemonConfig>): DaemonRestartNowResult;
     private startIdleCheck;
     private clearIdleCheck;
     /**

package/cli/dist-server/types/workspace/cbc-daemon/lib/node/daemon/daemon-protocol.d.ts

@@ -289,8 +289,24 @@ export interface IDaemonAutoRestart {
      * issue #72979）：本进程不能 stop() 自己（sendSignal 的自身 PID 守卫，#73790），
      * 必须先让当前 HTTP 响应发出，再在后台完成换进程。
      * config 为显式覆盖项（port/host/startupArgs），未提供的字段从 PID 文件快照恢复。
+     * 返回是否已受理：被安全拒绝（如旧式 systemd unit）时 started=false 并带原因。
      */
-    restartNow(config?: Partial<DaemonConfig>): void;
+    restartNow(config?: Partial<DaemonConfig>): DaemonRestartNowResult;
+}
+/** restartNow 受理结果；in-flight 的重复调用视为已受理（重启已在进行）。 */
+export type DaemonRestartNowResult = {
+    started: true;
+} | {
+    started: false;
+    reason: DaemonRestartRefusedReason;
+    message: string;
+};
+export type DaemonRestartRefusedReason = 'legacy-systemd-unit';
+/** daemon 自重启被安全拒绝；调用方可按 code 识别并映射为 409。 */
+export declare class DaemonRestartRefusedError extends Error {
+    readonly reason: DaemonRestartRefusedReason;
+    readonly code = "DAEMON_RESTART_REFUSED";
+    constructor(reason: DaemonRestartRefusedReason, message: string);
 }
 /** Channel 自动连接与恢复 */
 export interface IDaemonChannelAutoConnect {