agent-afk 5.265.2 → 5.266.0

package/dist/agent/tools/nesting.d.ts

@@ -3,6 +3,7 @@ import type { ModelProvider } from '../provider.js';
 import type { AgentModelInput } from '../types.js';
 import type { Surface } from '../awareness/types.js';
 import type { ReadScopeInputs } from '../subagent-read-scope.js';
+import type { JournalParent } from '../subagent/fork-types.js';
 import type { WorkspaceStore } from '../workspace/workspace-store.js';
 import { SkillExecutor } from './skill-executor.js';
 import type { SubagentExecutor } from './subagent-executor.js';
@@ -33,7 +34,7 @@ export interface CreateChildProviderFactoryOptions {
 export declare function createChildProviderFactory(opts?: CreateChildProviderFactoryOptions): (args: ChildProviderFactoryArgs) => ModelProvider;
 export declare function buildReadOnlyReconProvider(model: AgentModelInput | undefined, openaiBaseUrl?: string, allowedTools?: readonly string[]): ModelProvider;
 export declare function buildComposeNodeProvider(model: AgentModelInput | undefined, workspaceStore: WorkspaceStore, openaiBaseUrl?: string, readOnlyBash?: boolean): ModelProvider;
-export declare function createChildSkillExecutorFactory(defaultModel: AgentModelInput, apiKey: string | undefined, childProviderFactory: (args: ChildProviderFactoryArgs) => ModelProvider, baseUrl?: string, traceWriter?: TraceSink, backgroundRegistry?: BackgroundAgentRegistry, cwd?: string, resolveApiKeyForModel?: (model: string) => string | undefined, surface?: Surface, defaultSubagentModel?: AgentModelInput, agentRegistry?: AgentRegistry, openaiBaseUrl?: string, xaiBaseUrl?: string, workspaceStore?: WorkspaceStore, delegationBudget?: import('./delegation-budget.js').DelegationBudget): (depth: number, maxDepth: number, signal: AbortSignal, inheritedCwd?: string, inheritedReadScope?: ReadScopeInputs, skillDispatchName?: string) => SkillExecutor;
+export declare function createChildSkillExecutorFactory(defaultModel: AgentModelInput, apiKey: string | undefined, childProviderFactory: (args: ChildProviderFactoryArgs) => ModelProvider, baseUrl?: string, traceWriter?: TraceSink, backgroundRegistry?: BackgroundAgentRegistry, cwd?: string, resolveApiKeyForModel?: (model: string) => string | undefined, surface?: Surface, defaultSubagentModel?: AgentModelInput, agentRegistry?: AgentRegistry, openaiBaseUrl?: string, xaiBaseUrl?: string, workspaceStore?: WorkspaceStore, delegationBudget?: import('./delegation-budget.js').DelegationBudget): (depth: number, maxDepth: number, signal: AbortSignal, inheritedCwd?: string, inheritedReadScope?: ReadScopeInputs, skillDispatchName?: string, journalParent?: JournalParent) => SkillExecutor;
 export type PhaseRole = 'read-only' | 'read-write';
 export declare function buildSkillRestrictedProvider(allowedTools: string[], model: AgentModelInput | undefined, readOnlyBash?: boolean, openaiBaseUrl?: string, workspaceStore?: WorkspaceStore): ModelProvider;
 export declare function buildPhaseRestrictedProvider(_role: 'read-only', model: AgentModelInput | undefined): ModelProvider;

package/dist/agent/tools/skill-executor/fork-child-config.d.ts

@@ -1,7 +1,11 @@
 import { SubagentManager } from '../../subagent.js';
 import type { AgentConfig } from '../../types/config-types.js';
 import type { SkillExecutorInternals } from './types.js';
-export declare function buildForkedChildConfig(internals: SkillExecutorInternals, baseConfig: AgentConfig, signal: AbortSignal, readOnly?: boolean, allowedTools?: string[]): {
+import type { MessageJournal } from '../../journal/types.js';
+export interface JournalParentHolder {
+    messageJournal?: MessageJournal;
+}
+export declare function buildForkedChildConfig(internals: SkillExecutorInternals, baseConfig: AgentConfig, signal: AbortSignal, readOnly?: boolean, allowedTools?: string[], journalView?: JournalParentHolder): {
     childConfig: AgentConfig;
     childManager: SubagentManager | undefined;
 };

package/dist/agent/tools/skill-executor/fork-dispatch.d.ts

@@ -1,6 +1,7 @@
 import { SubagentManager } from '../../subagent.js';
 import type { ToolCall, ToolResult } from '../types.js';
 import type { AgentConfig } from '../../types/config-types.js';
+import { type JournalParentHolder } from './fork-child-config.js';
 import type { SkillExecutorInternals } from './types.js';
 export declare function executeForkedRegistrySkill(internals: SkillExecutorInternals, skill: {
     name: string;
@@ -13,6 +14,7 @@ export declare function runForkedSkillToResult(internals: SkillExecutorInternals
     manager: SubagentManager;
     childManager: SubagentManager | undefined;
     childConfig: AgentConfig;
+    journalView?: JournalParentHolder;
     label: string;
     idPrefix: string;
     parentId: string;

package/dist/agent/tools/skill-executor/types.d.ts

@@ -7,8 +7,9 @@ import type { ChildProviderFactoryArgs } from '../nesting.js';
 import type { Surface } from '../../awareness/types.js';
 import type { ReadScopeInputs } from '../../subagent-read-scope.js';
 import type { SkillExecutor } from '../skill-executor.js';
+import type { JournalParent } from '../../subagent/fork-types.js';
 export interface SkillExecutorContext {
-    parentSession: Pick<IAgentSession, 'sessionId' | 'getInputStreamRef' | 'abortSignal'> & Partial<Pick<IAgentSession, 'hookRegistry'>>;
+    parentSession: Pick<IAgentSession, 'sessionId' | 'getInputStreamRef' | 'abortSignal'> & Partial<Pick<IAgentSession, 'hookRegistry'>> & JournalParent;
     defaultModel?: string;
     surface?: Surface;
     defaultSubagentModel: AgentModelInput;
@@ -21,7 +22,7 @@ export interface SkillExecutorContext {
     depth?: number;
     maxDepth?: number;
     childProviderFactory?: (args: ChildProviderFactoryArgs) => ModelProvider;
-    childSkillExecutorFactory?: (depth: number, maxDepth: number, signal: AbortSignal, inheritedCwd?: string, inheritedReadScope?: ReadScopeInputs, skillDispatchName?: string) => SkillExecutor;
+    childSkillExecutorFactory?: (depth: number, maxDepth: number, signal: AbortSignal, inheritedCwd?: string, inheritedReadScope?: ReadScopeInputs, skillDispatchName?: string, journalParent?: JournalParent) => SkillExecutor;
     traceWriter?: TraceSink;
     backgroundRegistry?: BackgroundAgentRegistry;
     cwd?: string;

package/dist/agent/tools/subagent/child-config.d.ts

@@ -3,6 +3,8 @@ import type { ReadScopeInputs } from '../../subagent-read-scope.js';
 import type { ModelProvider } from '../../provider.js';
 import type { AgentModelInput } from '../../types.js';
 import type { AgentConfig } from '../../types/config-types.js';
+import type { MessageJournal } from '../../journal/types.js';
+import type { JournalParent } from '../../subagent/fork-types.js';
 import { createStubParentSession, type ChildProviderFactoryArgs } from '../nesting.js';
 import type { RegisteredAgent } from '../../agents/index.js';
 import type { AgentRegistry } from '../../agents/index.js';
@@ -13,6 +15,7 @@ import type { SubagentExecutor, SubagentExecutorContext } from '../subagent-exec
 import type { AgentInput } from './input-parse.js';
 export type ChildParentSession = ReturnType<typeof createStubParentSession> & {
     sessionId: string | undefined;
+    messageJournal?: MessageJournal;
 };
 export interface BuildChildConfigArgs {
     parsed: AgentInput;
@@ -26,7 +29,7 @@ export interface BuildChildConfigArgs {
     resolveApiKeyForModel?: (model: string) => string | undefined;
     defaultSubagentModel: AgentModelInput;
     childProviderFactory?: (args: ChildProviderFactoryArgs) => ModelProvider;
-    childSkillExecutorFactory?: (depth: number, maxDepth: number, signal: AbortSignal, inheritedCwd?: string, inheritedReadScope?: ReadScopeInputs, skillDispatchName?: string) => SkillExecutor;
+    childSkillExecutorFactory?: (depth: number, maxDepth: number, signal: AbortSignal, inheritedCwd?: string, inheritedReadScope?: ReadScopeInputs, skillDispatchName?: string, journalParent?: JournalParent) => SkillExecutor;
     surface?: Surface;
     allowedTools?: string[];
     readOnlyBash?: boolean;

package/dist/agent/tools/subagent-executor/types.d.ts

@@ -1,4 +1,5 @@
 import type { SubagentManager } from '../../subagent.js';
+import type { JournalParent } from '../../subagent/fork-types.js';
 import type { ReadScopeInputs } from '../../subagent-read-scope.js';
 import type { BackgroundAgentRegistry } from '../../background-registry.js';
 import type { ModelProvider } from '../../provider.js';
@@ -16,13 +17,13 @@ import type { PromotedSubagentInfo } from '../subagent/foreground-promotion.js';
 export type { PromotedSubagentInfo, QueuedNoteClaim };
 export interface SubagentExecutorContext {
     subagentManager: SubagentManager;
-    parentSession: Pick<IAgentSession, 'sessionId' | 'getInputStreamRef' | 'abortSignal'> & Partial<Pick<IAgentSession, 'hookRegistry'>>;
+    parentSession: Pick<IAgentSession, 'sessionId' | 'getInputStreamRef' | 'abortSignal'> & Partial<Pick<IAgentSession, 'hookRegistry'>> & JournalParent;
     defaultConfig: Pick<AgentConfig, 'apiKey' | 'systemPrompt' | 'baseUrl' | 'openaiBaseUrl' | 'xaiBaseUrl' | 'skillDispatchName'>;
     surface?: Surface;
     resolveApiKeyForModel?: (model: string) => string | undefined;
     defaultSubagentModel: AgentModelInput;
     childProviderFactory?: (args: ChildProviderFactoryArgs) => ModelProvider;
-    childSkillExecutorFactory?: (depth: number, maxDepth: number, signal: AbortSignal, inheritedCwd?: string, inheritedReadScope?: ReadScopeInputs, skillDispatchName?: string) => SkillExecutor;
+    childSkillExecutorFactory?: (depth: number, maxDepth: number, signal: AbortSignal, inheritedCwd?: string, inheritedReadScope?: ReadScopeInputs, skillDispatchName?: string, journalParent?: JournalParent) => SkillExecutor;
     depth: number;
     maxDepth?: number;
     backgroundRegistry?: BackgroundAgentRegistry;

package/dist/agent/types/config-types.d.ts

@@ -2,6 +2,7 @@ import type { AgentDefinition, EffortLevel, HookCallbackMatcher, HookEvent, OnEl
 import type { HookRegistry } from '../hooks.js';
 import type { ModelProvider } from '../provider.js';
 import type { TraceSink } from '../trace/index.js';
+import type { JournalMessage, MessageJournal } from '../journal/types.js';
 import type { AgentModelInput } from './model-types.js';
 import type { ModelSlots } from '../session/model-slots.js';
 import type { CanUseTool, PermissionBubbler } from './permission-types.js';
@@ -69,6 +70,8 @@ export interface AgentConfig {
     continue?: boolean;
     resume?: string;
     resumeHistory?: ResumeHistoryTurn[];
+    resumeMessages?: JournalMessage[];
+    messageJournal?: MessageJournal;
     sessionId?: string;
     resumeSessionAt?: string;
     forkSession?: boolean;

package/dist/agent/types/session-types.d.ts

@@ -5,6 +5,7 @@ import type { InputStreamRef } from './permission-types.js';
 import type { Message, MessageChunk, ResponseMetadata, SendMessageOptions, StructuredMessageOptions } from './message-types.js';
 import type { ProviderCommandInfo, ProviderCompactResult, ProviderContextUsage, ProviderMcpServerStatus, ProviderQuery, ProviderRewindConversationResult, RewindTarget } from '../provider.js';
 import type { HookRegistry } from '../hooks.js';
+import type { MessageJournal } from '../journal/types.js';
 import type { ZodType } from 'zod';
 export type SessionState = 'idle' | 'processing' | 'streaming' | 'compacting' | 'closed';
 export interface SessionIdentity {
@@ -138,6 +139,7 @@ export interface IAgentSession {
     readonly sessionId?: string;
     readonly cwd?: string;
     readonly hookRegistry?: HookRegistry;
+    readonly messageJournal?: MessageJournal;
     sendMessage(content: string, options?: SendMessageOptions): Promise<Message>;
     sendMessageStream(content: string | ContentBlockParam[]): AsyncIterable<OutputEvent>;
     sendMessageStructured?<T>(content: string, schema: ZodType<T>, options?: StructuredMessageOptions): Promise<T>;

package/dist/cli/commands/interactive/turn-handler.completion.d.ts

@@ -1,19 +1,14 @@
 import type { SessionStats, ToolEvent } from '../../slash/types.js';
-import type { ContentBlockParam } from '@anthropic-ai/sdk/resources';
 import type { CompletionWriter, TurnHandles } from './shared.js';
 import type { StreamEventState } from './turn-handler.stream-events.js';
 import type { TerminalCompositor } from '../../terminal-compositor.js';
 import type { StreamRenderer } from '../../_lib/stream-renderer.js';
-export declare function buildAssistantContentBlocks(responseText: string, toolEvents: ToolEvent[]): ContentBlockParam[] | undefined;
-export declare function buildUserContentBlocks(userText: string, toolEvents: ToolEvent[]): ContentBlockParam[] | undefined;
 export interface TurnCompletionContext {
     state: StreamEventState;
     stats: SessionStats;
     h: TurnHandles;
     toolEvents: ToolEvent[];
     historyText: string;
-    assistantBlocks: ContentBlockParam[] | undefined;
-    userBlocks: ContentBlockParam[] | undefined;
     completionWriter: CompletionWriter | undefined;
     borrowedCompositor: TerminalCompositor | null;
     renderer: StreamRenderer;

package/dist/cli/commands/interactive/turn-handler.d.ts

@@ -4,7 +4,6 @@ import { type ImageAttachment } from '../../input/attachments.js';
 import type { InputSurfaceRefs } from '../../input/input-surface.js';
 import { type CompletionWriter, type ThinkingUiMode, type TurnHandles } from './shared.js';
 export { formatToolLine, formatToolResultLine, ToolLane } from './tool-lane.js';
-export { buildAssistantContentBlocks, buildUserContentBlocks } from './turn-handler.completion.js';
 export type { InputSurfaceRefs } from '../../input/input-surface.js';
 export declare function runTurn(input: {
     text: string;

package/dist/cli/commands/trace-format.d.ts

@@ -0,0 +1,6 @@
+export declare function fmtDuration(ms: number): string;
+export declare function fmtBytes(n: number): string;
+export declare function fmtUsd(n: number): string;
+export declare function fmtTime(ts: string): string;
+export declare function truncate(s: string, n: number): string;
+export declare function label(s: string): string;

package/dist/cli/commands/trace-results.d.ts

@@ -0,0 +1,13 @@
+import type { TraceEvent } from '../../agent/trace/index.js';
+export declare const DEFAULT_RESULT_LINES = 40;
+export interface TraceResultsContext {
+    resultFor: (toolUseId: string) => string | null;
+    note: string;
+}
+export declare function journalSessionCandidates(traceSessionId: string, events: readonly TraceEvent[]): string[];
+export declare function renderResultBlock(text: string, maxLines: number, opts?: {
+    isError?: boolean;
+    subagentId?: string;
+}): string;
+export declare function buildTraceResults(traceSessionId: string, events: readonly TraceEvent[], maxLines?: number): TraceResultsContext;
+export declare function withToolResult(line: string, event: TraceEvent, resultFor: ((toolUseId: string) => string | null) | undefined): string;

package/dist/cli/commands/trace.d.ts

@@ -15,6 +15,8 @@ export declare function loadTrace(session: string): Promise<{
 export interface FormatTraceOptions {
     showAll?: boolean;
     limit?: number;
+    resultFor?: (toolUseId: string) => string | null;
+    resultsNote?: string;
 }
 export declare function formatTrace(sessionId: string, tracePath: string, parsed: ParsedTrace, options?: FormatTraceOptions): string;
 export declare function registerTraceCommand(program: Command): void;

package/dist/cli/commit-mode.d.ts

@@ -13,7 +13,6 @@ export interface CommitModeInput {
     geometryStale: boolean;
     roomTop?: number;
     hugSlack?: number;
-    frameErased?: boolean;
 }
 export interface CommitMode {
     fitsAboveFrame: boolean;

package/dist/cli/slash/session-stats.d.ts

@@ -1,7 +1,6 @@
 import type { ResponseMetadata } from '../../agent/types/message-types.js';
 import type { AgentModelInput } from '../../agent/types.js';
-import type { ContentBlockParam } from '@anthropic-ai/sdk/resources';
 import type { SessionStats, ToolEvent, TurnRecord } from './types.js';
 export declare function createSessionStats(model: AgentModelInput): SessionStats;
 export declare function resetStats(stats: SessionStats): void;
-export declare function recordTurn(stats: SessionStats, userInput: string, assistantText: string, metadata: ResponseMetadata | undefined, toolEvents?: ToolEvent[], userContentBlocks?: ContentBlockParam[], assistantContentBlocks?: ContentBlockParam[]): TurnRecord;
+export declare function recordTurn(stats: SessionStats, userInput: string, assistantText: string, metadata: ResponseMetadata | undefined, toolEvents?: ToolEvent[]): TurnRecord;

package/dist/cli/terminal-compositor.commit-geometry.d.ts

@@ -10,6 +10,5 @@ export interface CommitGeometry {
     phase1EffectiveFrameTop: number;
     hugSlack: number;
     roomTop: number;
-    frameErased: boolean;
 }
 export declare function snapshotCommitGeometry(self: CommittedBandHost, contentLineCount: number, rows: number, cols: number): CommitGeometry;

package/dist/cli/terminal-compositor.commit-phase1.d.ts

@@ -1,5 +1,4 @@
 import type { CommittedBandHost } from './terminal-compositor.committed-band-commit.js';
 import type { CommitGeometry } from './terminal-compositor.commit-geometry.js';
 import type { CommitRoute } from './terminal-compositor.commit-route.js';
-export declare function erasedFramePriorBandErase(self: CommittedBandHost, geo: CommitGeometry): string;
 export declare function commitPhase1Teardown(self: CommittedBandHost, geo: CommitGeometry, route: CommitRoute): number;

package/dist/cli/terminal-compositor.commit-route.d.ts

@@ -12,5 +12,6 @@ export interface CommitRoute {
     archiveCount: number;
     rawGenuineOverflow: number;
     maxBandModel: number;
+    overflowPriorContiguous: boolean;
 }
 export declare function routeCommit(self: CommittedBandHost, t: CommitText, geo: CommitGeometry): CommitRoute;

package/dist/cli/terminal-compositor.committed-band-commit.d.ts

@@ -26,10 +26,12 @@ export interface CommittedBandHost {
     anchorRow: number | undefined;
     armed: boolean;
     readonly suspended: boolean;
+    suspendCommitQueue: string[];
     logUpdate: LogUpdateFn | null;
     readonly scrollRegion?: CompositorScrollRegionGuard;
     readonly stdout: NodeJS.WriteStream;
 }
 export declare function commitAbove(self: CommittedBandHost, text: string): void;
 export declare function clearCommittedBand(self: CommittedBandHost): void;
+export declare function forgetCommittedBand(self: CommittedBandHost): void;
 export declare function resetCommittedBand(self: CommittedBandHost): void;

package/dist/cli/terminal-compositor.d.ts

@@ -45,6 +45,8 @@ export declare class TerminalCompositor {
     pickerSavedMode: CompositorInputMode;
     armed: boolean;
     suspended: boolean;
+    suspendObserver: import('./terminal-compositor.lifecycle.suspend-observer.js').SuspendObserverHandle | null;
+    suspendCommitQueue: string[];
     canceled: boolean;
     backgrounded: boolean;
     paused: boolean;
@@ -124,6 +126,7 @@ export declare class TerminalCompositor {
     setActiveToolName(toolName: string | undefined): void;
     commitAbove(text: string): void;
     clearCommittedBand(): void;
+    forgetCommittedBand(): void;
     flushResizeGhostErase(): void;
     resetCommittedBand(): void;
     repositionCommittedBand(desiredTopRow: number, preRenderFrameTop: number, targetBottomRow: number): void;

package/dist/cli/terminal-compositor.lifecycle.d.ts

@@ -4,15 +4,18 @@ import type { CaretBlinkController } from './input/caret-blink.js';
 import type { SuggestEngine } from './terminal-compositor.types.js';
 import type { BandRowMeta, CompositorScrollRegionGuard, KeyInfo, LogUpdateFn } from './terminal-compositor.types.js';
 import type { KeyDispatchHost } from './terminal-compositor.input-dispatch.js';
+import { type SuspendObserverHandle } from './terminal-compositor.lifecycle.suspend-observer.js';
 export { endTurnFlush } from './terminal-compositor.lifecycle.teardown.js';
 export interface LifecycleHost {
     repaint(): void;
     resetState(): void;
+    commitAbove(text: string): void;
     readonly repaintCount: number;
     readonly stdout: NodeJS.WriteStream;
     readonly stdin: NodeJS.ReadStream;
     armed: boolean;
     suspended: boolean;
+    suspendCommitQueue: string[];
     wasRaw: boolean;
     stdinClaim: StdinClaimHandle | null;
     handleKeypress: ((char: string | undefined, key: KeyInfo) => void) | null;
@@ -42,6 +45,8 @@ export interface LifecycleHost {
     lastMeasuredFrameBottom: number;
     lifecycleStateDirty: boolean;
     clearCommittedBand(): void;
+    forgetCommittedBand(): void;
+    suspendObserver: SuspendObserverHandle | null;
 }
 export declare function suspendInput(self: LifecycleHost): void;
 export declare function resumeInput(self: LifecycleHost): void;

package/dist/cli/terminal-compositor.lifecycle.suspend-observer.d.ts

@@ -0,0 +1,8 @@
+export interface SuspendObserverState {
+    readonly cursorRow: number;
+    readonly scrollCount: number;
+}
+export interface SuspendObserverHandle {
+    remove(): SuspendObserverState;
+}
+export declare function installObserver(stream: NodeJS.WriteStream, startRow: number, terminalRows: number, terminalCols: number): SuspendObserverHandle;

package/dist/cli/terminal-compositor.lifecycle.suspend-observer.process.d.ts

@@ -0,0 +1,20 @@
+export declare const CSI_BUF_MAX = 64;
+export interface ObserverState {
+    row: number;
+    col: number;
+    scrolls: number;
+    savedRow: number;
+    savedCol: number;
+    state: ObserverEscState;
+    csiBuf: string;
+}
+export declare const enum ObserverEscState {
+    Normal = 0,
+    Esc = 1,
+    Csi = 2,
+    AltScreen = 3
+}
+export declare function parseParam(buf: string, start: number, def: number): [number, number];
+export declare function advanceRow(st: ObserverState, getRows: () => number): void;
+export declare function handleCsi(st: ObserverState, final: string, getRows: () => number, getCols: () => number): boolean;
+export declare function processChunk(chunk: unknown, st: ObserverState, getRows: () => number, getCols: () => number): void;

package/dist/cli/terminal-compositor.lifecycle.teardown.d.ts

@@ -1,3 +1,4 @@
 import type { LifecycleHost } from './terminal-compositor.lifecycle.js';
 export declare function endTurnFlush(self: LifecycleHost): void;
 export declare function flushPendingCommittedBand(self: LifecycleHost): void;
+export declare function appendLinesAtCursor(lines: readonly string[], cursorRow: number, self: LifecycleHost): void;

package/dist/cli/terminal-compositor.reset.d.ts

@@ -2,6 +2,7 @@ import { type InputCoreState } from './input-core.js';
 import type { AutocompleteState } from './input/autocomplete-state.js';
 import type { ImageAttachment } from './input/attachments.js';
 import type { CompositorInputMode, FramePlacementMode, PickerController, SubmissionPayload } from './terminal-compositor.types.js';
+import type { SuspendObserverHandle } from './terminal-compositor.lifecycle.suspend-observer.js';
 export interface ResetStateHost {
     clearCommittedBand(): void;
     overlay: string;
@@ -41,5 +42,7 @@ export interface ResetStateHost {
     resizeUnsub: (() => void) | null;
     resizeImmediateUnsub: (() => void) | null;
     disarmRows: number;
+    suspendCommitQueue: string[];
+    suspendObserver: SuspendObserverHandle | null;
 }
 export declare function resetState(self: ResetStateHost): void;