@byfriends/agent-core 0.1.0 → 0.2.0

package/dist/{index-BUBoyyCX.d.mts → index-CSFujlN1.d.mts}

@@ -1,16 +1,15 @@
-import { ChatProvider, ContentPart, FinishReason, Message, ModelCapability, ProviderConfig, ProviderRequestAuth, TextPart, ThinkPart, ThinkingEffort, TokenUsage, Tool, ToolCall, ToolCall as ToolCall$1, generate } from "@byfriends/kosong";
+import { CacheHitRate, ChatProvider, ContentPart, FinishReason, Message, ModelCapability, PromptPlan, ProviderCacheCapability, ProviderConfig, ProviderRequestAuth, TextPart, ThinkPart, ThinkingEffort, TokenUsage, Tool, ToolCall, ToolCall as ToolCall$1, generate } from "@byfriends/kosong";
 import { z } from "zod";
 import { OAuthClientProvider, OAuthDiscoveryState } from "@modelcontextprotocol/sdk/client/auth.js";
 import { Kaos, KaosProcess } from "@byfriends/kaos";
 import { ActivateSkillPayload, AgentAPI, AgentEvent, SDKAgentRPC, SDKSessionRPC, UsageStatus } from "#/rpc";
 import { OAuthClientInformationMixed, OAuthClientMetadata, OAuthTokens } from "@modelcontextprotocol/sdk/shared/auth.js";
 import { ByfConfig, ByfConfigPatch, OAuthRef } from "#/config";
-import { AgentType } from "#/agent";
 import { AgentConfigData, AgentConfigUpdateData } from "#/agent/config";
 import { AgentContextData, ContextMessage } from "#/agent/context";
 import { PermissionApprovalResultRecord, PermissionData, PermissionMode } from "#/agent/permission";
-import { PlanData } from "#/agent/plan";
 import { ToolInfo } from "#/agent/tool";
+import { AgentType } from "#/agent";
 import { SessionMeta } from "#/session";
 import { BackgroundTaskInfo } from "#/tools/builtin";
 
@@ -93,8 +92,7 @@ interface RootLogger {
 //#region src/config/schema.d.ts
 declare const ProviderTypeSchema: z.ZodEnum<{
   anthropic: "anthropic";
-  openai: "openai";
-  "openai-compat": "openai-compat";
+  "openai-completions": "openai-completions";
   "google-genai": "google-genai";
   openai_responses: "openai_responses";
   vertexai: "vertexai";
@@ -111,8 +109,7 @@ type OAuthRef$1 = z.infer<typeof OAuthRefSchema>;
 declare const ProviderConfigSchema: z.ZodObject<{
   type: z.ZodEnum<{
     anthropic: "anthropic";
-    openai: "openai";
-    "openai-compat": "openai-compat";
+    "openai-completions": "openai-completions";
     "google-genai": "google-genai";
     openai_responses: "openai_responses";
     vertexai: "vertexai";
@@ -148,7 +145,13 @@ declare const ThinkingConfigSchema: z.ZodObject<{
     auto: "auto";
     on: "on";
   }>>;
-  effort: z.ZodOptional<z.ZodString>;
+  effort: z.ZodOptional<z.ZodEnum<{
+    low: "low";
+    medium: "medium";
+    high: "high";
+    xhigh: "xhigh";
+    max: "max";
+  }>>;
 }, z.core.$strip>;
 type ThinkingConfig = z.infer<typeof ThinkingConfigSchema>;
 declare const PermissionModeSchema: z.ZodEnum<{
@@ -337,8 +340,7 @@ declare const ByfConfigSchema: z.ZodObject<{
   providers: z.ZodDefault<z.ZodRecord<z.ZodString, z.ZodObject<{
     type: z.ZodEnum<{
       anthropic: "anthropic";
-      openai: "openai";
-      "openai-compat": "openai-compat";
+      "openai-completions": "openai-completions";
       "google-genai": "google-genai";
       openai_responses: "openai_responses";
       vertexai: "vertexai";
@@ -374,9 +376,14 @@ declare const ByfConfigSchema: z.ZodObject<{
       auto: "auto";
       on: "on";
     }>>;
-    effort: z.ZodOptional<z.ZodString>;
+    effort: z.ZodOptional<z.ZodEnum<{
+      low: "low";
+      medium: "medium";
+      high: "high";
+      xhigh: "xhigh";
+      max: "max";
+    }>>;
   }, z.core.$strip>>;
-  planMode: z.ZodOptional<z.ZodBoolean>;
   yolo: z.ZodOptional<z.ZodBoolean>;
   defaultThinking: z.ZodOptional<z.ZodBoolean>;
   defaultPermissionMode: z.ZodOptional<z.ZodEnum<{
@@ -384,7 +391,6 @@ declare const ByfConfigSchema: z.ZodObject<{
     yolo: "yolo";
     manual: "manual";
   }>>;
-  defaultPlanMode: z.ZodOptional<z.ZodBoolean>;
   permission: z.ZodOptional<z.ZodObject<{
     rules: z.ZodOptional<z.ZodArray<z.ZodObject<{
       decision: z.ZodEnum<{
@@ -464,7 +470,6 @@ declare const ByfConfigSchema: z.ZodObject<{
     agentTaskTimeoutS: z.ZodOptional<z.ZodNumber>;
     printWaitCeilingS: z.ZodOptional<z.ZodNumber>;
   }, z.core.$strip>>;
-  telemetry: z.ZodOptional<z.ZodBoolean>;
   raw: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
 }, z.core.$strip>;
 type ByfConfig$1 = z.infer<typeof ByfConfigSchema>;
@@ -472,8 +477,7 @@ declare const ByfConfigPatchSchema: z.ZodObject<{
   providers: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
     type: z.ZodOptional<z.ZodEnum<{
       anthropic: "anthropic";
-      openai: "openai";
-      "openai-compat": "openai-compat";
+      "openai-completions": "openai-completions";
       "google-genai": "google-genai";
       openai_responses: "openai_responses";
       vertexai: "vertexai";
@@ -509,9 +513,14 @@ declare const ByfConfigPatchSchema: z.ZodObject<{
       auto: "auto";
       on: "on";
     }>>>;
-    effort: z.ZodOptional<z.ZodOptional<z.ZodString>>;
+    effort: z.ZodOptional<z.ZodOptional<z.ZodEnum<{
+      low: "low";
+      medium: "medium";
+      high: "high";
+      xhigh: "xhigh";
+      max: "max";
+    }>>>;
   }, z.core.$strip>>;
-  planMode: z.ZodOptional<z.ZodBoolean>;
   yolo: z.ZodOptional<z.ZodBoolean>;
   defaultThinking: z.ZodOptional<z.ZodBoolean>;
   defaultPermissionMode: z.ZodOptional<z.ZodEnum<{
@@ -519,7 +528,6 @@ declare const ByfConfigPatchSchema: z.ZodObject<{
     yolo: "yolo";
     manual: "manual";
   }>>;
-  defaultPlanMode: z.ZodOptional<z.ZodBoolean>;
   permission: z.ZodOptional<z.ZodObject<{
     rules: z.ZodOptional<z.ZodOptional<z.ZodArray<z.ZodObject<{
       decision: z.ZodEnum<{
@@ -599,7 +607,6 @@ declare const ByfConfigPatchSchema: z.ZodObject<{
     agentTaskTimeoutS: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
     printWaitCeilingS: z.ZodOptional<z.ZodOptional<z.ZodNumber>>;
   }, z.core.$strip>>;
-  telemetry: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strict>;
 type ByfConfigPatch$1 = z.infer<typeof ByfConfigPatchSchema>;
 declare function getDefaultConfig(): ByfConfig$1;
@@ -1011,8 +1018,6 @@ interface Environment {
 interface SystemPromptContext {
   readonly osEnv: Environment;
   readonly cwd: string;
-  readonly now?: string | Date;
-  readonly cwdListing?: string;
   readonly agentsMd?: string;
   readonly skills?: SkillRegistry | string;
   readonly additionalDirsInfo?: string;
@@ -1029,7 +1034,7 @@ interface ResolvedAgentProfile {
 }
 //#endregion
 //#region src/profile/context.d.ts
-type PreparedSystemPromptContext = Pick<SystemPromptContext, 'cwd' | 'cwdListing' | 'agentsMd'>;
+type PreparedSystemPromptContext = Pick<SystemPromptContext, 'cwd' | 'agentsMd'>;
 //#endregion
 //#region src/config/merge.d.ts
 declare function mergeConfigPatch(config: ByfConfig$1, patch: ByfConfigPatch$1): ByfConfig$1;
@@ -1584,6 +1589,8 @@ interface LLMChatResponse {
   providerFinishReason?: FinishReason | undefined;
   rawFinishReason?: string | undefined;
   usage: TokenUsage;
+  llmFirstTokenLatencyMs?: number | undefined;
+  llmStreamDurationMs?: number | undefined;
 }
 interface LLM {
   readonly systemPrompt: string;
@@ -1636,6 +1643,12 @@ interface ExecutableToolErrorResult {
    * allowed after this tool batch.
    */
   readonly stopTurn?: boolean | undefined;
+  /**
+   * Set when the tool was not executed because the approval request was
+   * rejected or cancelled by the user. Distinguishes "blocked by user" from
+   * "tool ran but failed".
+   */
+  readonly blockedReason?: 'rejected' | 'cancelled' | undefined;
 }
 type ExecutableToolResult = ExecutableToolSuccessResult | ExecutableToolErrorResult;
 interface ToolUpdate$1 {
@@ -1689,6 +1702,7 @@ interface PrepareToolExecutionResult {
   readonly updatedArgs?: unknown;
   readonly syntheticResult?: ExecutableToolResult | undefined;
   readonly executionMetadata?: unknown;
+  readonly blockedReason?: 'rejected' | 'cancelled' | undefined;
 }
 //#endregion
 //#region src/loop/events.d.ts
@@ -1711,6 +1725,8 @@ interface LoopStepEndEvent {
    */
   readonly providerFinishReason?: FinishReason | undefined;
   readonly rawFinishReason?: string | undefined;
+  readonly llmFirstTokenLatencyMs?: number | undefined;
+  readonly llmStreamDurationMs?: number | undefined;
 }
 interface LoopContentPartEvent {
   readonly type: 'content.part';
@@ -1752,97 +1768,195 @@ interface ToolStoreUpdate<K extends ToolStoreKey = ToolStoreKey> {
   readonly value: ToolStoreData[K];
 }
 //#endregion
-//#region src/agent/tool/types.d.ts
-type ToolSource = 'builtin' | 'user' | 'mcp';
-type BuiltinTool<Input = unknown> = ExecutableTool<Input>;
-interface UserToolRegistration {
-  readonly name: string;
-  readonly description: string;
-  readonly parameters: Record<string, unknown>;
+//#region src/agent/context/types.d.ts
+interface UserPromptOrigin {
+  readonly kind: 'user';
+  readonly blockedByHook?: string | undefined;
 }
-interface ToolInfo$1 {
+declare const USER_PROMPT_ORIGIN: UserPromptOrigin;
+interface SkillActivationOrigin {
+  readonly kind: 'skill_activation';
+  readonly activationId: string;
+  readonly skillName: string;
+  readonly skillArgs?: string | undefined;
+  readonly trigger: 'user-slash' | 'model-tool' | 'nested-skill';
+  readonly skillType?: string | undefined;
+  readonly skillPath?: string | undefined;
+  readonly skillSource?: SkillSource | undefined;
+}
+interface InjectionOrigin {
+  readonly kind: 'injection';
+  readonly variant: string;
+}
+interface CompactionSummaryOrigin {
+  readonly kind: 'compaction_summary';
+}
+interface SystemTriggerOrigin {
+  readonly kind: 'system_trigger';
   readonly name: string;
-  readonly description: string;
-  readonly active: boolean;
-  readonly source: ToolSource;
 }
-interface McpToolCollision {
-  readonly qualified: string;
-  readonly toolName: string;
-  readonly collidesWith: {
-    readonly kind: 'same_server';
-    readonly toolName: string;
-  } | {
-    readonly kind: 'other_server';
-    readonly serverName: string;
-  };
+interface BackgroundTaskOrigin {
+  readonly kind: 'background_task';
+  readonly taskId: string;
+  readonly status: BackgroundTaskStatus;
+  readonly notificationId: string;
 }
-interface McpServerRegistrationResult {
-  readonly registered: readonly string[];
-  readonly collisions: readonly McpToolCollision[];
+interface HookResultOrigin {
+  readonly kind: 'hook_result';
+  readonly event: string;
+  readonly blocked?: boolean;
 }
-//#endregion
-//#region src/agent/tool/index.d.ts
-interface McpToolEntry {
-  readonly tool: ExecutableTool;
-  readonly serverName: string;
+type PromptOrigin = UserPromptOrigin | SkillActivationOrigin | InjectionOrigin | CompactionSummaryOrigin | SystemTriggerOrigin | BackgroundTaskOrigin | HookResultOrigin;
+type ContextMessage$1 = Message & {
+  readonly origin?: PromptOrigin | undefined;
+  readonly isError?: boolean;
+};
+interface AgentContextData$1 {
+  history: readonly ContextMessage$1[];
+  tokenCount: number;
 }
-declare class ToolManager {
-  protected readonly agent: Agent;
-  protected builtinTools: Map<string, BuiltinTool>;
-  protected readonly userTools: Map<string, ExecutableTool>;
-  protected readonly mcpTools: Map<string, McpToolEntry>;
-  /** server name → list of qualified tool names registered for that server. */
-  protected readonly mcpToolsByServer: Map<string, string[]>;
-  protected enabledTools: Set<string>;
-  /** Glob patterns (e.g. `mcp__*`, `mcp__github__*`) gating which MCP tools the profile exposes. */
-  private mcpAccessPatterns;
-  protected readonly store: Partial<ToolStoreData>;
-  private mcpToolStatusUnsubscribe;
-  constructor(agent: Agent);
-  protected get toolStore(): ToolStore;
-  attachMcpTools(): void;
-  updateStore<K extends ToolStoreKey>(key: K, value: ToolStoreData[K]): void;
-  registerUserTool(input: UserToolRegistration): void;
-  unregisterUserTool(name: string): void;
-  registerMcpServer(serverName: string, client: MCPClient, tools: readonly Tool[], enabledTools?: ReadonlySet<string>): McpServerRegistrationResult;
-  unregisterMcpServer(serverName: string): boolean;
-  private handleMcpServerStatusChange;
-  private registerNeedsAuthMcpServer;
-  private registerConnectedMcpServer;
-  private emitMcpToolCollisions;
-  setActiveTools(names: readonly string[]): void;
-  private isMcpToolEnabled;
-  toolInfos(): Iterable<ToolInfo$1>;
-  data(): readonly ToolInfo$1[];
-  storeData(): Readonly<Record<string, unknown>>;
-  initializeBuiltinTools(): void;
-  private createVideoUploader;
-  get loopTools(): readonly ExecutableTool[];
+//#endregion
+//#region src/agent/context/observation-masking.d.ts
+interface MaskingConfig {
+  /** Effective capacity ratio (default 0.6 = 60% of advertised capacity) */
+  effectiveCapacityRatio: number;
+  /** Low priority masking threshold (default 0.60) */
+  lowPriorityThreshold: number;
+  /** Medium priority masking threshold (default 0.80) */
+  mediumPriorityThreshold: number;
+  /** High priority threshold — unmaskable, goes straight to compaction */
+  highPriorityThreshold: number;
+}
+interface MaskingResult {
+  masked: boolean;
+  maskedCount: number;
+  tokensBefore: number;
+  tokensAfter: number;
 }
 //#endregion
-//#region src/logging/logger.d.ts
-declare function getRootLogger(): RootLogger;
-declare function flushDiagnosticLogs(): Promise<boolean>;
+//#region src/agent/restore-handler.d.ts
 /**
- * Root logger. Import and use directly for events that don't belong to any
- * session (CLI startup, harness construction, etc.):
+ * 记录恢复处理器接口。
  *
- *   import { log } from 'byf-sdk';
- *   log.info('byf starting', { version });
+ * 实现此接口的子系统负责恢复特定类型的 AgentRecord。
  *
- * For events scoped to a session or agent, use the parent's `log` field:
+ * ## 契约
  *
- *   session.log.error('mcp initial load failed', error);
- *   agent.log.error('turn failed', { turnId, error });
+ * 恢复操作必须遵循以下契约：
  *
- * Late-binding: methods look up the current `RootLogger` on every call, so
- * importing `log` at module load (before `ByfHarness` configures the root)
- * is safe — calls during the pre-configure window are silent noops.
+ * - **同步操作**：恢复必须是同步的，不返回 Promise。
+ *   恢复是重建内存状态的过程，不应涉及 I/O、网络或其他异步操作。
+ *
+ * - **无副作用**：恢复时不产生任何外部副作用：
+ *   - 不调用 `records.logRecord()`
+ *   - 不调用 `agent.emitEvent()`
+ *   - 不调用 LLM
+ *   - 不执行工具
+ *   - 不写入文件系统（除了恢复所需的内存操作）
+ *
+ * - **非幂等性**：恢复操作不需要保证幂等性。
+ *   实现时假设每条记录只会被恢复一次。
+ *
+ * - **状态恢复**：恢复操作的目的是将子系统的内存状态
+ *   恢复到记录日志时的状态。
+ *
+ * ## 使用
+ *
+ * 子系统实现此接口后，通过 `AgentRecords.registerHandlers()`
+ * 注册，然后在恢复时被调用。
  */
-declare const log: Logger;
-declare function redact<T>(value: T): T;
-declare function resolveGlobalLogPath(homeDir: string): string;
+interface RecordRestoreHandler {
+  /**
+   * 恢复一条记录到子系统状态。
+   *
+   * @param record - 要恢复的记录（已通过迁移处理）
+   *
+   * @remarks
+   *
+   * 此方法在 `AgentRecords.replay()` 过程中被调用。
+   * 实现时应根据 `record.type` 分发到相应的恢复逻辑。
+   *
+   * 示例：
+   *
+   * ```typescript
+   * class ContextMemory implements RecordRestoreHandler {
+   *   restoreRecord(record: AgentRecord): void {
+   *     switch (record.type) {
+   *       case 'context.append_message':
+   *         this.appendMessage(record.message);
+   *         break;
+   *       // ...
+   *     }
+   *   }
+   * }
+   * ```
+   */
+  restoreRecord(record: AgentRecord): void;
+}
+//#endregion
+//#region src/agent/context/scratch-manager.d.ts
+interface ScratchManagerConfig {
+  /** 每个 session 的最大 scratch 大小 (bytes)，默认 50MB */
+  maxSessionSize: number;
+  /** 每个 session 的最大文件数，默认 100 */
+  maxFileCount: number;
+  /** scratch 目录 */
+  scratchDir: string;
+}
+declare class ScratchManager {
+  private readonly kaos;
+  private readonly config;
+  private currentSize;
+  private files;
+  constructor(kaos: Kaos, config: ScratchManagerConfig);
+  writeOutput(toolCallId: string, output: string): Promise<string>;
+  readOutput(filePath: string): Promise<string>;
+  private evictIfNeeded;
+  cleanup(): Promise<void>;
+}
+//#endregion
+//#region src/agent/context/index.d.ts
+declare class ContextMemory implements RecordRestoreHandler {
+  protected readonly agent: Agent;
+  private _history;
+  private _tokenCount;
+  private tokenCountCoveredMessageCount;
+  private openSteps;
+  private pendingToolResultIds;
+  private deferredMessages;
+  private toolCallInfo;
+  readonly scratchManager: ScratchManager | undefined;
+  constructor(agent: Agent, sessionId?: string);
+  appendUserMessage(content: readonly ContentPart[], origin?: PromptOrigin): void;
+  appendSystemReminder(content: string, origin: PromptOrigin): void;
+  markLastUserPromptBlocked(hookEvent: string): void;
+  clear(): void;
+  applyCompaction(summary: CompactionResult$1): void;
+  data(): AgentContextData$1;
+  get tokenCount(): number;
+  get tokenCountWithPending(): number;
+  get history(): readonly ContextMessage$1[];
+  get messages(): Message[];
+  applyObservationMasking(config?: MaskingConfig): MaskingResult;
+  applyPruning(config?: {
+    effectiveCapacityRatio?: number;
+    pruningThreshold?: number;
+  }): {
+    pruned: boolean;
+    prunedCount: number;
+  };
+  appendLoopEvent(event: LoopRecordedEvent): Promise<void>;
+  appendMessage(message: ContextMessage$1): void;
+  private flushDeferredMessagesIfToolExchangeClosed;
+  private hasOpenToolExchange;
+  private pushHistory;
+  restoreRecord(record: AgentRecord): void;
+  private restoreClear;
+  private restoreApplyCompaction;
+  private restoreMarkLastUserPromptBlocked;
+  private restoreAppendLoopEvent;
+  private restoreObservationMasking;
+}
 //#endregion
 //#region src/agent/compaction/types.d.ts
 interface CompactionResult$1 {
@@ -1863,12 +1977,13 @@ interface CompactionStrategy {
   computeCompactCount(messages: readonly Message[], maxSize: number): number;
   readonly checkAfterStep: boolean;
   readonly maxCompactionPerTurn: number;
+  readonly maskingConfig?: MaskingConfig | undefined;
 }
 interface CompactedHistory {
   text: string;
 }
 type CompactionTelemetryTrigger = CompactionBeginData['source'] | 'manual-with-prompt' | 'unknown';
-declare class FullCompaction {
+declare class FullCompaction implements RecordRestoreHandler {
   protected readonly agent: Agent;
   protected compactionCountInTurn: number;
   protected compacting: {
@@ -1903,135 +2018,52 @@ declare class FullCompaction {
   private triggerPreCompactHook;
   private triggerPostCompactHook;
   private computeCompactableCount;
+  restoreRecord(record: AgentRecord): void;
 }
 //#endregion
-//#region src/agent/context/types.d.ts
-interface UserPromptOrigin {
-  readonly kind: 'user';
-  readonly blockedByHook?: string | undefined;
-}
-declare const USER_PROMPT_ORIGIN: UserPromptOrigin;
-interface SkillActivationOrigin {
-  readonly kind: 'skill_activation';
-  readonly activationId: string;
-  readonly skillName: string;
-  readonly skillArgs?: string | undefined;
-  readonly trigger: 'user-slash' | 'model-tool' | 'nested-skill';
-  readonly skillType?: string | undefined;
-  readonly skillPath?: string | undefined;
-  readonly skillSource?: SkillSource | undefined;
-}
-interface InjectionOrigin {
-  readonly kind: 'injection';
-  readonly variant: string;
-}
-interface CompactionSummaryOrigin {
-  readonly kind: 'compaction_summary';
-}
-interface SystemTriggerOrigin {
-  readonly kind: 'system_trigger';
-  readonly name: string;
-}
-interface BackgroundTaskOrigin {
-  readonly kind: 'background_task';
-  readonly taskId: string;
-  readonly status: BackgroundTaskStatus;
-  readonly notificationId: string;
-}
-interface HookResultOrigin {
-  readonly kind: 'hook_result';
-  readonly event: string;
-  readonly blocked?: boolean;
-}
-type PromptOrigin = UserPromptOrigin | SkillActivationOrigin | InjectionOrigin | CompactionSummaryOrigin | SystemTriggerOrigin | BackgroundTaskOrigin | HookResultOrigin;
-type ContextMessage$1 = Message & {
-  readonly origin?: PromptOrigin | undefined;
-  readonly isError?: boolean;
-};
-interface AgentContextData$1 {
-  history: readonly ContextMessage$1[];
-  tokenCount: number;
+//#region src/agent/config/types.d.ts
+interface AgentConfigData$1 {
+  cwd: string;
+  provider?: ProviderConfig;
+  modelAlias?: string;
+  modelCapabilities: ModelCapability;
+  profileName?: string;
+  thinkingLevel: string;
+  systemPrompt: string;
 }
+type AgentConfigUpdateData$1 = Partial<{
+  cwd: string;
+  modelAlias: string;
+  profileName: string;
+  thinkingLevel: string;
+  systemPrompt: string;
+}>;
 //#endregion
-//#region src/agent/context/index.d.ts
-declare class ContextMemory {
+//#region src/agent/config/index.d.ts
+declare class ConfigState implements RecordRestoreHandler {
   protected readonly agent: Agent;
-  private _history;
-  private _tokenCount;
-  private tokenCountCoveredMessageCount;
-  private openSteps;
-  private pendingToolResultIds;
-  private deferredMessages;
+  private _cwd;
+  private _modelAlias;
+  private _profileName;
+  private _thinkingLevel;
+  private _systemPrompt;
   constructor(agent: Agent);
-  appendUserMessage(content: readonly ContentPart[], origin?: PromptOrigin): void;
-  appendSystemReminder(content: string, origin: PromptOrigin): void;
-  markLastUserPromptBlocked(hookEvent: string): void;
-  clear(): void;
-  applyCompaction(summary: CompactionResult$1): void;
-  data(): AgentContextData$1;
-  get tokenCount(): number;
-  get tokenCountWithPending(): number;
-  get history(): readonly ContextMessage$1[];
-  get messages(): Message[];
-  appendLoopEvent(event: LoopRecordedEvent): void;
-  appendMessage(message: ContextMessage$1): void;
-  private flushDeferredMessagesIfToolExchangeClosed;
-  private hasOpenToolExchange;
-  private pushHistory;
-}
-//#endregion
-//#region src/agent/hooks/types.d.ts
-declare const HOOK_EVENT_TYPES: readonly ["PreToolUse", "PostToolUse", "PostToolUseFailure", "UserPromptSubmit", "Stop", "StopFailure", "SessionStart", "SessionEnd", "SubagentStart", "SubagentStop", "PreCompact", "PostCompact", "Notification"];
-type HookEventType = (typeof HOOK_EVENT_TYPES)[number];
-interface HookDef {
-  readonly event: HookEventType;
-  readonly matcher?: string;
-  readonly command: string;
-  readonly timeout?: number;
-}
-interface HookResult {
-  readonly action: 'allow' | 'block';
-  readonly message?: string;
-  readonly reason?: string;
-  readonly stdout?: string;
-  readonly stderr?: string;
-  readonly exitCode?: number;
-  readonly timedOut?: boolean;
-  readonly structuredOutput?: boolean;
-}
-interface HookBlockDecision {
-  readonly block: true;
-  readonly reason: string;
-}
-type HookMatcherValue = string | readonly ContentPart[];
-interface HookEngineTriggerArgs {
-  readonly matcherValue?: HookMatcherValue;
-  readonly inputData?: Record<string, unknown>;
-  readonly signal?: AbortSignal;
-}
-type HookTriggeredCallback = (event: string, target: string, count: number) => void;
-type HookResolvedCallback = (event: string, target: string, action: string, reason: string | undefined, durationMs: number) => void;
-interface HookEngineOptions {
-  readonly cwd?: string;
-  readonly sessionId?: string;
-  readonly onTriggered?: HookTriggeredCallback;
-  readonly onResolved?: HookResolvedCallback;
-}
-//#endregion
-//#region src/agent/hooks/engine.d.ts
-declare class HookEngine {
-  private readonly options;
-  private readonly byEvent;
-  private readonly pendingTriggers;
-  constructor(hooks?: readonly HookDef[], options?: HookEngineOptions);
-  get summary(): Record<string, number>;
-  trigger(event: string, args?: HookEngineTriggerArgs): Promise<HookResult[]>;
-  triggerBlock(event: string, args?: HookEngineTriggerArgs): Promise<HookBlockDecision | undefined>;
-  fireAndForgetTrigger(event: string, args?: HookEngineTriggerArgs): Promise<HookResult[]>;
-  private triggerInner;
-  private matchingHooks;
-  private emitTriggered;
-  private emitResolved;
+  update(input: AgentConfigUpdateData$1): void;
+  data(): AgentConfigData$1;
+  get cwd(): string;
+  get hasModel(): boolean;
+  get hasProvider(): boolean;
+  get providerConfig(): ProviderConfig;
+  get provider(): ChatProvider;
+  get model(): string;
+  get modelAlias(): string | undefined;
+  get thinkingLevel(): ThinkingEffort;
+  get profileName(): string | undefined;
+  get systemPrompt(): string;
+  get modelCapabilities(): ModelCapability;
+  private get resolvedProviderConfig();
+  private tryResolvedProviderConfig;
+  restoreRecord(record: AgentRecord): void;
 }
 //#endregion
 //#region src/agent/permission/types.d.ts
@@ -2119,7 +2151,7 @@ interface PermissionManagerOptions {
   readonly policies?: readonly PermissionPolicy[] | undefined;
   readonly parent?: PermissionManager | undefined;
 }
-declare class PermissionManager {
+declare class PermissionManager implements RecordRestoreHandler {
   protected readonly agent: Agent;
   rules: PermissionRule[];
   private modeOverride;
@@ -2148,6 +2180,259 @@ declare class PermissionManager {
   }): string;
   private pathMatchOptions;
   private trackToolApproved;
+  restoreRecord(record: AgentRecord): void;
+}
+//#endregion
+//#region src/agent/usage/index.d.ts
+type UsageRecordScope = 'session' | 'turn';
+declare class UsageRecorder implements RecordRestoreHandler {
+  protected readonly agent?: Agent | undefined;
+  private readonly byModel;
+  private currentTurn;
+  constructor(agent?: Agent | undefined);
+  beginTurn(): void;
+  endTurn(): void;
+  record(model: string, usage: TokenUsage, scope?: UsageRecordScope): void;
+  data(): UsageStatus;
+  status(): UsageStatus | undefined;
+  private byModelSnapshot;
+  restoreRecord(record: AgentRecord): void;
+}
+//#endregion
+//#region src/agent/records/types.d.ts
+interface AgentRecordEvents {
+  metadata: {
+    protocol_version: string;
+    created_at: number;
+  };
+  'turn.prompt': {
+    input: readonly ContentPart[];
+    origin: PromptOrigin;
+  };
+  'turn.steer': {
+    input: readonly ContentPart[];
+    origin: PromptOrigin;
+  };
+  'turn.cancel': {
+    turnId?: number;
+  };
+  'config.update': AgentConfigUpdateData$1;
+  'permission.set_mode': {
+    mode: PermissionMode$1;
+  };
+  'permission.record_approval_result': PermissionApprovalResultRecord$1;
+  'full_compaction.begin': CompactionBeginData;
+  'plan_mode.enter': {
+    id: string;
+  };
+  'plan_mode.cancel': {
+    id?: string;
+  };
+  'plan_mode.exit': {
+    id?: string;
+  };
+  'tools.register_user_tool': UserToolRegistration;
+  'tools.unregister_user_tool': {
+    name: string;
+  };
+  'tools.set_active_tools': {
+    names: readonly string[];
+  };
+  'background.stop': {
+    taskId: string;
+  };
+  'usage.record': {
+    model: string;
+    usage: TokenUsage;
+    usageScope?: UsageRecordScope | undefined;
+  };
+  'full_compaction.cancel': {};
+  'full_compaction.complete': CompactionResult$1;
+  'context.append_message': {
+    message: ContextMessage$1;
+  };
+  'context.mark_last_user_prompt_blocked': {
+    hookEvent: string;
+  };
+  'context.append_loop_event': {
+    event: LoopRecordedEvent;
+  };
+  'context.clear': {};
+  'context.apply_compaction': CompactionResult$1;
+  'context.observation_masking': {
+    maskedCount: number;
+    tokensBefore: number;
+    tokensAfter: number;
+  };
+  'context.output_offloaded': {
+    toolCallId: string;
+    filePath?: string | undefined;
+  };
+  'context.pruning': {
+    prunedCount: number;
+  };
+  'tools.update_store': ToolStoreUpdate;
+}
+type AgentRecord = { [K in keyof AgentRecordEvents]: Readonly<AgentRecordEvents[K]> & {
+  readonly type: K;
+  readonly time?: number;
+} }[keyof AgentRecordEvents];
+type AgentRecordOf<K extends keyof AgentRecordEvents> = Extract<AgentRecord, {
+  readonly type: K;
+}>;
+interface AgentRecordPersistence {
+  read(): AsyncIterable<AgentRecord>;
+  append(input: AgentRecord): void;
+  rewrite(records: readonly AgentRecord[]): void;
+  flush(): Promise<void>;
+  close(): Promise<void>;
+}
+//#endregion
+//#region src/agent/tool/types.d.ts
+type ToolSource = 'builtin' | 'user' | 'mcp';
+type BuiltinTool<Input = unknown> = ExecutableTool<Input>;
+interface UserToolRegistration {
+  readonly name: string;
+  readonly description: string;
+  readonly parameters: Record<string, unknown>;
+}
+interface ToolInfo$1 {
+  readonly name: string;
+  readonly description: string;
+  readonly active: boolean;
+  readonly source: ToolSource;
+}
+interface McpToolCollision {
+  readonly qualified: string;
+  readonly toolName: string;
+  readonly collidesWith: {
+    readonly kind: 'same_server';
+    readonly toolName: string;
+  } | {
+    readonly kind: 'other_server';
+    readonly serverName: string;
+  };
+}
+interface McpServerRegistrationResult {
+  readonly registered: readonly string[];
+  readonly collisions: readonly McpToolCollision[];
+}
+//#endregion
+//#region src/agent/tool/index.d.ts
+interface McpToolEntry {
+  readonly tool: ExecutableTool;
+  readonly serverName: string;
+}
+declare class ToolManager implements RecordRestoreHandler {
+  protected readonly agent: Agent;
+  protected builtinTools: Map<string, BuiltinTool>;
+  protected readonly userTools: Map<string, ExecutableTool>;
+  protected readonly mcpTools: Map<string, McpToolEntry>;
+  /** server name → list of qualified tool names registered for that server. */
+  protected readonly mcpToolsByServer: Map<string, string[]>;
+  protected enabledTools: Set<string>;
+  /** Glob patterns (e.g. `mcp__*`, `mcp__github__*`) gating which MCP tools the profile exposes. */
+  private mcpAccessPatterns;
+  protected readonly store: Partial<ToolStoreData>;
+  private mcpToolStatusUnsubscribe;
+  constructor(agent: Agent);
+  protected get toolStore(): ToolStore;
+  attachMcpTools(): void;
+  updateStore<K extends ToolStoreKey>(key: K, value: ToolStoreData[K]): void;
+  registerUserTool(input: UserToolRegistration): void;
+  unregisterUserTool(name: string): void;
+  registerMcpServer(serverName: string, client: MCPClient, tools: readonly Tool[], enabledTools?: ReadonlySet<string>): McpServerRegistrationResult;
+  unregisterMcpServer(serverName: string): boolean;
+  private handleMcpServerStatusChange;
+  private registerNeedsAuthMcpServer;
+  private registerConnectedMcpServer;
+  private emitMcpToolCollisions;
+  setActiveTools(names: readonly string[]): void;
+  private isMcpToolEnabled;
+  toolInfos(): Iterable<ToolInfo$1>;
+  data(): readonly ToolInfo$1[];
+  storeData(): Readonly<Record<string, unknown>>;
+  initializeBuiltinTools(): void;
+  private createVideoUploader;
+  get loopTools(): readonly ExecutableTool[];
+  restoreRecord(record: AgentRecord): void;
+}
+//#endregion
+//#region src/logging/logger.d.ts
+declare function getRootLogger(): RootLogger;
+declare function flushDiagnosticLogs(): Promise<boolean>;
+/**
+ * Root logger. Import and use directly for events that don't belong to any
+ * session (CLI startup, harness construction, etc.):
+ *
+ *   import { log } from 'byf-sdk';
+ *   log.info('byf starting', { version });
+ *
+ * For events scoped to a session or agent, use the parent's `log` field:
+ *
+ *   session.log.error('mcp initial load failed', error);
+ *   agent.log.error('turn failed', { turnId, error });
+ *
+ * Late-binding: methods look up the current `RootLogger` on every call, so
+ * importing `log` at module load (before `ByfHarness` configures the root)
+ * is safe — calls during the pre-configure window are silent noops.
+ */
+declare const log: Logger;
+declare function redact<T>(value: T): T;
+declare function resolveGlobalLogPath(homeDir: string): string;
+//#endregion
+//#region src/agent/hooks/types.d.ts
+declare const HOOK_EVENT_TYPES: readonly ["PreToolUse", "PostToolUse", "PostToolUseFailure", "UserPromptSubmit", "Stop", "StopFailure", "SessionStart", "SessionEnd", "SubagentStart", "SubagentStop", "PreCompact", "PostCompact", "Notification"];
+type HookEventType = (typeof HOOK_EVENT_TYPES)[number];
+interface HookDef {
+  readonly event: HookEventType;
+  readonly matcher?: string;
+  readonly command: string;
+  readonly timeout?: number;
+}
+interface HookResult {
+  readonly action: 'allow' | 'block';
+  readonly message?: string;
+  readonly reason?: string;
+  readonly stdout?: string;
+  readonly stderr?: string;
+  readonly exitCode?: number;
+  readonly timedOut?: boolean;
+  readonly structuredOutput?: boolean;
+}
+interface HookBlockDecision {
+  readonly block: true;
+  readonly reason: string;
+}
+type HookMatcherValue = string | readonly ContentPart[];
+interface HookEngineTriggerArgs {
+  readonly matcherValue?: HookMatcherValue;
+  readonly inputData?: Record<string, unknown>;
+  readonly signal?: AbortSignal;
+}
+type HookTriggeredCallback = (event: string, target: string, count: number) => void;
+type HookResolvedCallback = (event: string, target: string, action: string, reason: string | undefined, durationMs: number) => void;
+interface HookEngineOptions {
+  readonly cwd?: string;
+  readonly sessionId?: string;
+  readonly onTriggered?: HookTriggeredCallback;
+  readonly onResolved?: HookResolvedCallback;
+}
+//#endregion
+//#region src/agent/hooks/engine.d.ts
+declare class HookEngine {
+  private readonly options;
+  private readonly byEvent;
+  private readonly pendingTriggers;
+  constructor(hooks?: readonly HookDef[], options?: HookEngineOptions);
+  get summary(): Record<string, number>;
+  trigger(event: string, args?: HookEngineTriggerArgs): Promise<HookResult[]>;
+  triggerBlock(event: string, args?: HookEngineTriggerArgs): Promise<HookBlockDecision | undefined>;
+  fireAndForgetTrigger(event: string, args?: HookEngineTriggerArgs): Promise<HookResult[]>;
+  private triggerInner;
+  private matchingHooks;
+  private emitTriggered;
+  private emitResolved;
 }
 //#endregion
 //#region src/telemetry.d.ts
@@ -2161,8 +2446,6 @@ interface TelemetryClient {
   withContext?(patch: TelemetryContextPatch): TelemetryClient;
   setContext?(patch: TelemetryContextPatch): void;
 }
-declare const noopTelemetryClient: TelemetryClient;
-declare function withTelemetryContext(telemetry: TelemetryClient, patch: TelemetryContextPatch): TelemetryClient;
 //#endregion
 //#region src/session/index.d.ts
 interface SessionConfig {
@@ -2375,50 +2658,6 @@ declare class BackgroundManager extends BackgroundProcessManager {
   _reset(): void;
 }
 //#endregion
-//#region src/agent/config/types.d.ts
-interface AgentConfigData$1 {
-  cwd: string;
-  provider?: ProviderConfig;
-  modelAlias?: string;
-  modelCapabilities: ModelCapability;
-  profileName?: string;
-  thinkingLevel: string;
-  systemPrompt: string;
-}
-type AgentConfigUpdateData$1 = Partial<{
-  cwd: string;
-  modelAlias: string;
-  profileName: string;
-  thinkingLevel: string;
-  systemPrompt: string;
-}>;
-//#endregion
-//#region src/agent/config/index.d.ts
-declare class ConfigState {
-  protected readonly agent: Agent;
-  private _cwd;
-  private _modelAlias;
-  private _profileName;
-  private _thinkingLevel;
-  private _systemPrompt;
-  constructor(agent: Agent);
-  update(input: AgentConfigUpdateData$1): void;
-  data(): AgentConfigData$1;
-  get cwd(): string;
-  get hasModel(): boolean;
-  get hasProvider(): boolean;
-  get providerConfig(): ProviderConfig;
-  get provider(): ChatProvider;
-  get model(): string;
-  get modelAlias(): string | undefined;
-  get thinkingLevel(): ThinkingEffort;
-  get profileName(): string | undefined;
-  get systemPrompt(): string;
-  get modelCapabilities(): ModelCapability;
-  private get resolvedProviderConfig();
-  private tryResolvedProviderConfig;
-}
-//#endregion
 //#region src/agent/injection/manager.d.ts
 declare class InjectionManager {
   protected readonly agent: Agent;
@@ -2429,143 +2668,20 @@ declare class InjectionManager {
   onContextCompacted(compactedCount: number): void;
 }
 //#endregion
-//#region src/agent/plan/index.d.ts
-type PlanData$1 = null | {
-  id: string;
-  exists: boolean;
-  content: string;
-  path: string;
-};
-type PlanFilePath = string | null;
-declare class PlanMode {
-  protected readonly agent: Agent;
-  protected _isActive: boolean;
-  protected _planId: null | string;
-  protected _planFilePath: PlanFilePath;
-  constructor(agent: Agent);
-  createPlanId(): string;
-  enter(id?: string, createFile?: boolean, emitStatus?: boolean): Promise<void>;
-  restoreEnter({
-    id
-  }: {
-    readonly id: string;
-  }): void;
-  cancel(id?: string): void;
-  clear(): Promise<void>;
-  exit(id?: string): void;
-  get isActive(): boolean;
-  get planFilePath(): PlanFilePath;
-  data(): Promise<PlanData$1>;
-  materializeCurrentPlanFile(): Promise<void>;
-  private materializePlanFile;
-  private ensurePlanDirectory;
-  private planFilePathFor;
-  private planFileExists;
-  private trackPlanLifecycle;
-}
-//#endregion
-//#region src/agent/usage/index.d.ts
-type UsageRecordScope = 'session' | 'turn';
-declare class UsageRecorder {
-  protected readonly agent?: Agent | undefined;
-  private readonly byModel;
-  private currentTurn;
-  constructor(agent?: Agent | undefined);
-  beginTurn(): void;
-  endTurn(): void;
-  record(model: string, usage: TokenUsage, scope?: UsageRecordScope): void;
-  data(): UsageStatus;
-  status(): UsageStatus | undefined;
-  private byModelSnapshot;
-}
-//#endregion
-//#region src/agent/records/types.d.ts
-interface AgentRecordEvents {
-  metadata: {
-    protocol_version: string;
-    created_at: number;
-  };
-  'turn.prompt': {
-    input: readonly ContentPart[];
-    origin: PromptOrigin;
-  };
-  'turn.steer': {
-    input: readonly ContentPart[];
-    origin: PromptOrigin;
-  };
-  'turn.cancel': {
-    turnId?: number;
-  };
-  'config.update': AgentConfigUpdateData$1;
-  'permission.set_mode': {
-    mode: PermissionMode$1;
-  };
-  'permission.record_approval_result': PermissionApprovalResultRecord$1;
-  'full_compaction.begin': CompactionBeginData;
-  'plan_mode.enter': {
-    id: string;
-  };
-  'plan_mode.cancel': {
-    id?: string;
-  };
-  'plan_mode.exit': {
-    id?: string;
-  };
-  'tools.register_user_tool': UserToolRegistration;
-  'tools.unregister_user_tool': {
-    name: string;
-  };
-  'tools.set_active_tools': {
-    names: readonly string[];
-  };
-  'background.stop': {
-    taskId: string;
-  };
-  'usage.record': {
-    model: string;
-    usage: TokenUsage;
-    usageScope?: UsageRecordScope | undefined;
-  };
-  'full_compaction.cancel': {};
-  'full_compaction.complete': CompactionResult$1;
-  'context.append_message': {
-    message: ContextMessage$1;
-  };
-  'context.mark_last_user_prompt_blocked': {
-    hookEvent: string;
-  };
-  'context.append_loop_event': {
-    event: LoopRecordedEvent;
-  };
-  'context.clear': {};
-  'context.apply_compaction': CompactionResult$1;
-  'tools.update_store': ToolStoreUpdate;
-}
-type AgentRecord = { [K in keyof AgentRecordEvents]: Readonly<AgentRecordEvents[K]> & {
-  readonly type: K;
-  readonly time?: number;
-} }[keyof AgentRecordEvents];
-type AgentRecordOf<K extends keyof AgentRecordEvents> = Extract<AgentRecord, {
-  readonly type: K;
-}>;
-interface AgentRecordPersistence {
-  read(): AsyncIterable<AgentRecord>;
-  append(input: AgentRecord): void;
-  rewrite(records: readonly AgentRecord[]): void;
-  flush(): Promise<void>;
-  close(): Promise<void>;
-}
-//#endregion
 //#region src/agent/records/index.d.ts
 declare class AgentRecords {
   private readonly agent;
   private readonly persistence?;
   private _restoring;
   private metadataInitialized;
+  private handlers;
   constructor(agent: Agent, persistence?: AgentRecordPersistence | undefined);
   get restoring(): boolean;
+  registerHandlers(handlers: Record<string, RecordRestoreHandler>): void;
   logRecord(record: AgentRecord): void;
   restore(record: AgentRecord): void;
+  private routeToHandler;
+  private getHandlerKey;
   replay(): Promise<{
     warning?: string;
   }>;
@@ -2618,7 +2734,6 @@ declare const ErrorCodes: {
   readonly SESSION_PERMISSION_MODE_INVALID: "session.permission_mode_invalid";
   readonly SESSION_THINKING_EMPTY: "session.thinking_empty";
   readonly SESSION_MODEL_EMPTY: "session.model_empty";
-  readonly SESSION_PLAN_MODE_INVALID: "session.plan_mode_invalid";
   readonly SESSION_APPROVAL_HANDLER_ERROR: "session.approval_handler_error";
   readonly SESSION_QUESTION_HANDLER_ERROR: "session.question_handler_error";
   readonly SESSION_INIT_FAILED: "session.init_failed";
@@ -2758,12 +2873,6 @@ declare const BYF_ERROR_INFO: {
     readonly public: true;
     readonly action: "Provide a non-empty model identifier.";
   };
-  readonly 'session.plan_mode_invalid': {
-    readonly title: "Invalid plan mode";
-    readonly retryable: false;
-    readonly public: true;
-    readonly action: "Provide a boolean plan mode.";
-  };
   readonly 'session.approval_handler_error': {
     readonly title: "Approval handler threw";
     readonly retryable: false;
@@ -3022,6 +3131,8 @@ interface UsageStatus$1 {
   readonly byModel?: Record<string, TokenUsage> | undefined;
   readonly currentTurn?: TokenUsage | undefined;
   readonly total?: TokenUsage | undefined;
+  /** Cache hit rate across all recorded usage (0–1), undefined when no data. */
+  readonly cacheHitRate?: CacheHitRate | undefined;
 }
 interface ToolUpdate {
   readonly kind: 'stdout' | 'stderr' | 'progress' | 'status' | 'custom';
@@ -3048,7 +3159,6 @@ interface AgentStatusUpdatedEvent {
   readonly contextTokens?: number | undefined;
   readonly maxContextTokens?: number | undefined;
   readonly contextUsage?: number | undefined;
-  readonly planMode?: boolean | undefined;
   readonly permission?: PermissionMode$1 | undefined;
   readonly usage?: UsageStatus$1 | undefined;
 }
@@ -3100,6 +3210,8 @@ interface TurnStepCompletedEvent {
   readonly finishReason?: string | undefined;
   readonly providerFinishReason?: FinishReason | undefined;
   readonly rawFinishReason?: string | undefined;
+  readonly llmFirstTokenLatencyMs?: number | undefined;
+  readonly llmStreamDurationMs?: number | undefined;
 }
 interface TurnStepRetryingEvent {
   readonly type: 'turn.step.retrying';
@@ -3168,6 +3280,7 @@ interface ToolResultEvent {
   readonly output: unknown;
   readonly isError?: boolean | undefined;
   readonly synthetic?: boolean | undefined;
+  readonly blockedReason?: 'rejected' | 'cancelled' | undefined;
 }
 interface SubagentSpawnedEvent {
   readonly type: 'subagent.spawned';
@@ -3208,6 +3321,16 @@ interface CompactionCompletedEvent {
   readonly type: 'compaction.completed';
   readonly result: CompactionResult;
 }
+interface ObservationMaskingAppliedEvent {
+  readonly type: 'observation_masking.applied';
+  readonly maskedCount: number;
+  readonly tokensBefore: number;
+  readonly tokensAfter: number;
+}
+interface PruningAppliedEvent {
+  readonly type: 'pruning.applied';
+  readonly prunedCount: number;
+}
 interface BackgroundTaskStartedEvent {
   readonly type: 'background.task.started';
   readonly info: BackgroundTaskInfo$1;
@@ -3237,7 +3360,7 @@ interface McpServerStatusPayload {
   readonly toolCount: number;
   readonly error?: string | undefined;
 }
-type AgentEvent$1 = ErrorEvent | WarningEvent | AgentStatusUpdatedEvent | SessionMetaUpdatedEvent | SkillActivatedEvent | TurnStartedEvent | TurnEndedEvent | TurnStepStartedEvent | TurnStepCompletedEvent | TurnStepRetryingEvent | TurnStepInterruptedEvent | AssistantDeltaEvent | HookResultEvent | ThinkingDeltaEvent | ToolCallDeltaEvent | ToolCallStartedEvent | ToolProgressEvent | ToolResultEvent | ToolListUpdatedEvent | McpServerStatusEvent | SubagentSpawnedEvent | SubagentCompletedEvent | SubagentFailedEvent | CompactionStartedEvent | CompactionBlockedEvent | CompactionCancelledEvent | CompactionCompletedEvent | BackgroundTaskStartedEvent | BackgroundTaskUpdatedEvent | BackgroundTaskTerminatedEvent;
+type AgentEvent$1 = ErrorEvent | WarningEvent | AgentStatusUpdatedEvent | SessionMetaUpdatedEvent | SkillActivatedEvent | TurnStartedEvent | TurnEndedEvent | TurnStepStartedEvent | TurnStepCompletedEvent | TurnStepRetryingEvent | TurnStepInterruptedEvent | AssistantDeltaEvent | HookResultEvent | ThinkingDeltaEvent | ToolCallDeltaEvent | ToolCallStartedEvent | ToolProgressEvent | ToolResultEvent | ToolListUpdatedEvent | McpServerStatusEvent | SubagentSpawnedEvent | SubagentCompletedEvent | SubagentFailedEvent | CompactionStartedEvent | CompactionBlockedEvent | CompactionCancelledEvent | CompactionCompletedEvent | ObservationMaskingAppliedEvent | PruningAppliedEvent | BackgroundTaskStartedEvent | BackgroundTaskUpdatedEvent | BackgroundTaskTerminatedEvent;
 type Event = AgentEvent$1 & {
   agentId: string;
   sessionId: string;
@@ -3290,6 +3413,7 @@ type WithSessionId<T> = WithExtraPayload<T, {
 declare function proxyWithExtraPayload<T, U>(methods: RPCMethods<WithExtraPayload<T, U>>, extraPayload: U): RPCMethods<T>;
 //#endregion
 //#region src/rpc/core-api.d.ts
+type PlanData = null;
 type JsonPrimitive = string | number | boolean | null;
 type JsonValue = JsonPrimitive | JsonValue[] | {
   readonly [key: string]: JsonValue;
@@ -3631,7 +3755,6 @@ interface ByfCoreOptions {
   readonly byfRequestHeaders?: Record<string, string> | undefined;
   readonly resolveOAuthTokenProvider?: OAuthTokenProviderResolver | undefined;
   readonly skillDirs?: readonly string[];
-  readonly telemetry?: TelemetryClient | undefined;
 }
 declare class ByfCore implements PromisableMethods<CoreAPI> {
   protected readonly rpcClient: CoreRPCClient;
@@ -3759,7 +3882,7 @@ declare class ByfCore implements PromisableMethods<CoreAPI> {
   getPlan({
     sessionId,
     ...payload
-  }: SessionAgentPayload<EmptyPayload>): PlanData$1 | Promise<PlanData$1>;
+  }: SessionAgentPayload<EmptyPayload>): Promise<null> | null;
   getUsage({
     sessionId,
     ...payload
@@ -3816,10 +3939,11 @@ interface TurnEndResult {
   readonly event: TurnEndedEvent;
   readonly stopReason?: LoopTurnStopReason;
 }
-declare class TurnFlow {
+declare class TurnFlow implements RecordRestoreHandler {
   protected readonly agent: Agent;
   private steerBuffer;
   private turnId;
+  private _previousTurnMessageCount;
   private activeTurn;
   private readonly toolCallStartedAt;
   private readonly toolCallDupType;
@@ -3854,6 +3978,7 @@ declare class TurnFlow {
   private trackTurnInterrupted;
   private telemetryMode;
   private shouldTrackApiError;
+  restoreRecord(record: AgentRecord): void;
 }
 //#endregion
 //#region src/agent/index.d.ts
@@ -3898,7 +4023,6 @@ declare class Agent {
   readonly turn: TurnFlow;
   readonly injection: InjectionManager;
   readonly permission: PermissionManager;
-  readonly planMode: PlanMode;
   readonly usage: UsageRecorder;
   readonly tools: ToolManager;
   readonly background: BackgroundManager;
@@ -3912,6 +4036,7 @@ declare class Agent {
   useProfile(profile: ResolvedAgentProfile, context?: PreparedSystemPromptContext): void;
   resume(): Promise<{
     warning?: string;
+    error?: Error;
   }>;
   get rpcMethods(): PromisableMethods<AgentAPI>;
   emitEvent(event: AgentEvent): void;
@@ -3984,4 +4109,7 @@ interface ResolveLoggingInput {
  */
 declare function resolveLoggingConfig(input: ResolveLoggingInput): LoggingConfig;
 //#endregion
-export { CreateSessionPayload as $, SessionConfig as $n, resolveByfHome as $r, CompactionCancelledEvent as $t, QuestionItem as A, ProviderType as Ai, WarningEvent as An, LoopStepEndEvent as Ar, SetThinkingPayload as At, SDKSessionRPC$1 as B, LogEntry as Bi, ByfErrorInfo as Bn, BackgroundTaskStatus as Br, WithAgentId as Bt, createRPC as C, PermissionConfigSchema as Ci, TurnEndedEvent as Cn, ToolInfo$1 as Cr, SessionMetadataPatch as Ct, ApprovalScope as D, PermissionRuleScopeSchema as Di, TurnStepRetryingEvent as Dn, LoopContentPartEvent as Dr, SetModelPayload as Dt, ApprovalResponse as E, PermissionRuleSchema as Ei, TurnStepInterruptedEvent as En, ToolStoreUpdate as Er, SetByfConfigPayload as Et, SDKAPI as F, ThinkingConfigSchema as Fi, toByfErrorPayload as Fn, ExecutableToolSuccessResult as Fr, StopBackgroundPayload as Ft, BeginCompactionPayload as G, RootLogger as Gi, AgentRecordPersistence as Gn, parseConfigString as Gr, ResumedAgentState as Gt, ToolCallResponse as H, LogPayload as Hi, AgentRecord as Hn, OAuthTokenProviderResolver as Hr, proxyWithExtraPayload as Ht, SDKAgentAPI as I, formatConfigValidationError as Ii, ByfError as In, ToolInputDisplay as Ir, TextPromptPart as It, CancelPayload as J, RuntimeConfig as Jn, writeConfigFile as Jr, AssistantDeltaEvent as Jt, ByfConfig as K, SessionAttachInput as Ki, UsageRecordScope as Kn, readConfigFile as Kr, AgentEvent$1 as Kt, SDKAgentRPC$1 as L, getDefaultConfig as Li, ByfErrorOptions as Ln, BackgroundLifecycleEvent as Lr, UnregisterToolPayload as Lt, QuestionRequest as M, ServicesConfig as Mi, fromByfErrorPayload as Mn, LoopToolResultEvent as Mr, ShellExecResult as Mt, QuestionResponse as N, ServicesConfigSchema as Ni, isByfError as Nn, ExecutableToolErrorResult as Nr, SkillSummary as Nt, QuestionAnswerMethod as O, ProviderConfig$1 as Oi, TurnStepStartedEvent as On, LoopRecordedEvent as Or, SetModelResult as Ot, QuestionResult as P, ThinkingConfig as Pi, makeErrorPayload as Pn, ExecutableToolResult as Pr, SteerPayload as Pt, CoreInfo as Q, Session as Qn, ensureByfHome as Qr, CompactionBlockedEvent as Qt, SDKRPC as R, validateConfig as Ri, BYF_ERROR_INFO as Rn, BackgroundTaskInfo$1 as Rr, Unsubscribe as Rt, SDKRPCClient as S, PermissionConfig as Si, TurnEndReason as Sn, BuiltinTool as Sr, SessionAPI as St, ApprovalRequest as T, PermissionRuleDecisionSchema as Ti, TurnStepCompletedEvent as Tn, UserToolRegistration as Tr, SetActiveToolsPayload as Tt, ActivateSkillPayload$1 as U, Logger as Ui, AgentRecordEvents as Un, configToTomlData as Ur, AgentReplayRecord as Ut, ToolCallRequest as V, LogLevel as Vi, ErrorCodes as Vn, BearerTokenProvider as Vr, WithSessionId as Vt, AgentAPI$1 as W, LoggingConfig as Wi, AgentRecordOf as Wn, ensureConfigFile as Wr, ResumeSessionResult as Wt, CloseSessionPayload as X, SubagentHandle as Xn, parseBooleanEnv as Xr, BackgroundTaskTerminatedEvent as Xt, CancelPlanPayload as Y, SessionSubagentHost as Yn, ResolveConfigValueInput as Yr, BackgroundTaskStartedEvent as Yt, CoreAPI as Z, AgentMeta as Zn, resolveConfigValue as Zr, BackgroundTaskUpdatedEvent as Zt, CoreRPC as _, McpServerStdioConfigSchema as _i, ToolListUpdatedEvent as _n, flushDiagnosticLogs as _r, ReconnectMcpServerPayload as _t, writeExportZip as a, ByfConfigSchema as ai, MCP_OAUTH_AUTHORIZATION_URL_TOOL_UPDATE as an, TelemetryPropertyValue as ar, GetBackgroundOutputPathPayload as at, RPCClient as b, OAuthRef$1 as bi, ToolResultEvent as bn, redact as br, RenameSessionPayload as bt, buildExportManifest as c, HookDefConfig as ci, McpServerStatusPayload as cn, PermissionApprovalResultRecord$1 as cr, JsonObject as ct, scanSessionWire as d, LoopControlSchema as di, SubagentCompletedEvent as dn, ContextMessage$1 as dr, ListSessionsPayload as dt, resolveConfigPath as ei, CompactionCompletedEvent as en, SessionMeta$1 as er, EmptyPayload as et, Agent as f, McpServerConfig as fi, SubagentFailedEvent as fn, PromptOrigin as fr, McpServerInfo as ft, ByfCoreOptions as g, McpServerStdioConfig as gi, ToolCallStartedEvent as gn, CompactionResult$1 as gr, PromptPayload as gt, ByfCore as h, McpServerHttpConfigSchema as hi, ToolCallDeltaEvent as hn, CompactionBeginData as hr, PromptPart as ht, collectFilesRecursive as i, ByfConfigPatchSchema as ii, HookResultEvent as in, TelemetryProperties as ir, ForkSessionPayload as it, QuestionOption as j, ProviderTypeSchema as ji, ByfErrorPayload as jn, LoopToolCallEvent as jr, ShellExecPayload as jt, QuestionAnswers as k, ProviderConfigSchema as ki, UsageStatus$1 as kn, LoopStepBeginEvent as kr, SetPermissionPayload as kt, SessionWireScan as l, HookDefSchema as li, SessionMetaUpdatedEvent as ln, PermissionMode$1 as lr, JsonPrimitive as lt, AgentType$1 as m, McpServerHttpConfig as mi, ThinkingDeltaEvent as mn, UserPromptOrigin as mr, PromptInput as mt, resolveLoggingConfig as n, BackgroundConfig as ni, ErrorEvent as nn, TelemetryClient as nr, ExportSessionPayload as nt, exportSessionDirectory as o, ByfServiceConfig as oi, McpOAuthAuthorizationUrlUpdateData as on, noopTelemetryClient as or, GetBackgroundOutputPayload as ot, AgentConfig as p, McpServerConfigSchema as pi, SubagentSpawnedEvent as pn, USER_PROMPT_ORIGIN as pr, McpStartupMetrics as pt, ByfConfigPatch as q, SessionLogHandle as qi, AgentConfigUpdateData$1 as qn, transformTomlData as qr, AgentStatusUpdatedEvent as qt, ExtraZipEntry as r, BackgroundConfigSchema as ri, Event as rn, TelemetryContextPatch as rr, ExportSessionResult as rt, WIRE_PROTOCOL_VERSION as s, ByfServiceConfigSchema as si, McpServerStatusEvent as sn, withTelemetryContext as sr, GetBackgroundPayload as st, ResolveLoggingInput as t, mergeConfigPatch as ti, CompactionStartedEvent as tn, SessionSkillConfig as tr, ExportSessionManifest as tt, normalizeTimestampMs as u, LoopControl as ui, SkillActivatedEvent as un, AgentContextData$1 as ur, JsonValue as ut, CoreRPCClient as v, ModelAlias as vi, ToolListUpdatedReason as vn, getRootLogger as vr, RegisterToolPayload as vt, ApprovalDecision as w, PermissionModeSchema as wi, TurnStartedEvent as wn, ToolSource as wr, SessionSummary as wt, RPCMethods as x, OAuthRefSchema as xi, ToolUpdate as xn, resolveGlobalLogPath as xr, ResumeSessionPayload as xt, RPCCallOptions as y, ModelAliasSchema as yi, ToolProgressEvent as yn, log as yr, RemoveByfProviderPayload as yt, SDKSessionAPI as z, LogContext as zi, ByfErrorCode as zn, BackgroundTaskKind as zr, UpdateSessionMetadataPayload as zt };
+//#region src/prompt-plan/builder.d.ts
+declare function buildPromptPlan(renderedSystemPrompt: string, providerCacheCapability: ProviderCacheCapability): PromptPlan;
+//#endregion
+export { CoreInfo as $, SessionSkillConfig as $n, resolveByfHome as $r, BackgroundTaskUpdatedEvent as $t, QuestionAnswers as A, ProviderType as Ai, TurnStepInterruptedEvent as An, LoopStepEndEvent as Ar, SetModelResult as At, SDKSessionAPI as B, LogEntry as Bi, ByfError as Bn, BackgroundTaskStatus as Br, Unsubscribe as Bt, SDKRPCClient as C, PermissionConfigSchema as Ci, ToolProgressEvent as Cn, PromptOrigin as Cr, ResumeSessionPayload as Ct, ApprovalResponse as D, PermissionRuleScopeSchema as Di, TurnEndedEvent as Dn, LoopContentPartEvent as Dr, SetActiveToolsPayload as Dt, ApprovalRequest as E, PermissionRuleSchema as Ei, TurnEndReason as En, ToolStoreUpdate as Er, SessionSummary as Et, QuestionResult as F, ThinkingConfigSchema as Fi, ByfErrorPayload as Fn, ExecutableToolSuccessResult as Fr, SkillSummary as Ft, AgentAPI$1 as G, RootLogger as Gi, ErrorCodes as Gn, parseConfigString as Gr, AgentReplayRecord as Gt, ToolCallRequest as H, LogPayload as Hi, BYF_ERROR_INFO as Hn, OAuthTokenProviderResolver as Hr, WithAgentId as Ht, SDKAPI as I, formatConfigValidationError as Ii, fromByfErrorPayload as In, ToolInputDisplay as Ir, SteerPayload as It, ByfConfigPatch as J, SubagentHandle as Jn, writeConfigFile as Jr, AgentEvent$1 as Jt, BeginCompactionPayload as K, SessionAttachInput as Ki, RuntimeConfig as Kn, readConfigFile as Kr, ResumeSessionResult as Kt, SDKAgentAPI as L, getDefaultConfig as Li, isByfError as Ln, BackgroundLifecycleEvent as Lr, StopBackgroundPayload as Lt, QuestionOption as M, ServicesConfig as Mi, TurnStepStartedEvent as Mn, LoopToolResultEvent as Mr, SetThinkingPayload as Mt, QuestionRequest as N, ServicesConfigSchema as Ni, UsageStatus$1 as Nn, ExecutableToolErrorResult as Nr, ShellExecPayload as Nt, ApprovalScope as O, ProviderConfig$1 as Oi, TurnStartedEvent as On, LoopRecordedEvent as Or, SetByfConfigPayload as Ot, QuestionResponse as P, ThinkingConfig as Pi, WarningEvent as Pn, ExecutableToolResult as Pr, ShellExecResult as Pt, CoreAPI as Q, SessionMeta$1 as Qn, ensureByfHome as Qr, BackgroundTaskTerminatedEvent as Qt, SDKAgentRPC$1 as R, validateConfig as Ri, makeErrorPayload as Rn, BackgroundTaskInfo$1 as Rr, TextPromptPart as Rt, RPCMethods as S, PermissionConfig as Si, ToolListUpdatedReason as Sn, ContextMessage$1 as Sr, RenameSessionPayload as St, ApprovalDecision as T, PermissionRuleDecisionSchema as Ti, ToolUpdate as Tn, UserPromptOrigin as Tr, SessionMetadataPatch as Tt, ToolCallResponse as U, Logger as Ui, ByfErrorCode as Un, configToTomlData as Ur, WithSessionId as Ut, SDKSessionRPC$1 as V, LogLevel as Vi, ByfErrorOptions as Vn, BearerTokenProvider as Vr, UpdateSessionMetadataPayload as Vt, ActivateSkillPayload$1 as W, LoggingConfig as Wi, ByfErrorInfo as Wn, ensureConfigFile as Wr, proxyWithExtraPayload as Wt, CancelPlanPayload as X, Session as Xn, parseBooleanEnv as Xr, AssistantDeltaEvent as Xt, CancelPayload as Y, AgentMeta as Yn, ResolveConfigValueInput as Yr, AgentStatusUpdatedEvent as Yt, CloseSessionPayload as Z, SessionConfig as Zn, resolveConfigValue as Zr, BackgroundTaskStartedEvent as Zt, ByfCoreOptions as _, McpServerStdioConfigSchema as _i, SubagentSpawnedEvent as _n, PermissionMode$1 as _r, PromptPart as _t, collectFilesRecursive as a, ByfConfigSchema as ai, Event as an, redact as ar, ForkSessionPayload as at, RPCCallOptions as b, OAuthRef$1 as bi, ToolCallStartedEvent as bn, CompactionResult$1 as br, RegisterToolPayload as bt, WIRE_PROTOCOL_VERSION as c, HookDefConfig as ci, McpOAuthAuthorizationUrlUpdateData as cn, ToolInfo$1 as cr, GetBackgroundPayload as ct, normalizeTimestampMs as d, LoopControlSchema as di, ObservationMaskingAppliedEvent as dn, AgentRecord as dr, JsonValue as dt, resolveConfigPath as ei, CompactionBlockedEvent as en, TelemetryClient as er, CreateSessionPayload as et, scanSessionWire as f, McpServerConfig as fi, PruningAppliedEvent as fn, AgentRecordEvents as fr, ListSessionsPayload as ft, ByfCore as g, McpServerStdioConfig as gi, SubagentFailedEvent as gn, PermissionApprovalResultRecord$1 as gr, PromptInput as gt, AgentType$1 as h, McpServerHttpConfigSchema as hi, SubagentCompletedEvent as hn, UsageRecordScope as hr, PlanData as ht, ExtraZipEntry as i, ByfConfigPatchSchema as ii, ErrorEvent as in, log as ir, ExportSessionResult as it, QuestionItem as j, ProviderTypeSchema as ji, TurnStepRetryingEvent as jn, LoopToolCallEvent as jr, SetPermissionPayload as jt, QuestionAnswerMethod as k, ProviderConfigSchema as ki, TurnStepCompletedEvent as kn, LoopStepBeginEvent as kr, SetModelPayload as kt, buildExportManifest as l, HookDefSchema as li, McpServerStatusEvent as ln, ToolSource as lr, JsonObject as lt, AgentConfig as m, McpServerHttpConfig as mi, SkillActivatedEvent as mn, AgentRecordPersistence as mr, McpStartupMetrics as mt, ResolveLoggingInput as n, BackgroundConfig as ni, CompactionCompletedEvent as nn, flushDiagnosticLogs as nr, ExportSessionManifest as nt, writeExportZip as o, ByfServiceConfig as oi, HookResultEvent as on, resolveGlobalLogPath as or, GetBackgroundOutputPathPayload as ot, Agent as p, McpServerConfigSchema as pi, SessionMetaUpdatedEvent as pn, AgentRecordOf as pr, McpServerInfo as pt, ByfConfig as q, SessionLogHandle as qi, SessionSubagentHost as qn, transformTomlData as qr, ResumedAgentState as qt, resolveLoggingConfig as r, BackgroundConfigSchema as ri, CompactionStartedEvent as rn, getRootLogger as rr, ExportSessionPayload as rt, exportSessionDirectory as s, ByfServiceConfigSchema as si, MCP_OAUTH_AUTHORIZATION_URL_TOOL_UPDATE as sn, BuiltinTool as sr, GetBackgroundOutputPayload as st, buildPromptPlan as t, mergeConfigPatch as ti, CompactionCancelledEvent as tn, TelemetryProperties as tr, EmptyPayload as tt, SessionWireScan as u, LoopControl as ui, McpServerStatusPayload as un, UserToolRegistration as ur, JsonPrimitive as ut, CoreRPC as v, ModelAlias as vi, ThinkingDeltaEvent as vn, AgentConfigUpdateData$1 as vr, PromptPayload as vt, createRPC as w, PermissionModeSchema as wi, ToolResultEvent as wn, USER_PROMPT_ORIGIN as wr, SessionAPI as wt, RPCClient as x, OAuthRefSchema as xi, ToolListUpdatedEvent as xn, AgentContextData$1 as xr, RemoveByfProviderPayload as xt, CoreRPCClient as y, ModelAliasSchema as yi, ToolCallDeltaEvent as yn, CompactionBeginData as yr, ReconnectMcpServerPayload as yt, SDKRPC as z, LogContext as zi, toByfErrorPayload as zn, BackgroundTaskKind as zr, UnregisterToolPayload as zt };