@qduc/term2 0.32.1 → 0.33.0

package/dist/services/session/live-run.d.ts

@@ -1,3 +1,4 @@
+import type { ConversationTerminal } from '../../contracts/conversation.js';
 import type { PostExecutePendingRegistry } from './post-execute-pending-registry.js';
 export type LiveRunState<Event, Result> = {
     kind: 'event';
@@ -5,6 +6,9 @@ export type LiveRunState<Event, Result> = {
 } | {
     kind: 'post_execute_approval_required';
     entries: readonly import('./post-execute-pending-registry.js').PostExecutePendingEntry[];
+} | {
+    kind: 'approval_required';
+    terminal: ConversationTerminal;
 } | {
     kind: 'completed';
     result: Result;
@@ -12,9 +16,9 @@ export type LiveRunState<Event, Result> = {
     kind: 'cancelled';
 };
 /**
- * One foreground stream's ownership boundary. The consumer is started exactly
- * once and remains alive while an application post-execute gate holds a tool
- * promise. Callers only observe buffered events, gates, or its terminal result.
+ * The observation mailbox for one foreground turn. Its consumer starts once
+ * and stays alive through approval and post-execute waits. Callers observe
+ * buffered events, pending decisions, or the runtime's terminal result.
  */
 export declare class LiveRun<Event, Result> {
     #private;
@@ -23,6 +27,8 @@ export declare class LiveRun<Event, Result> {
     constructor(runId: string, pending: PostExecutePendingRegistry, consume: (emit: (event: Event) => void) => Promise<Result>);
     get completion(): Promise<Result>;
     next(): Promise<LiveRunState<Event, Result>>;
+    pause(terminal: ConversationTerminal): void;
+    resume(): void;
     /** Stop projecting this run and fail-close every gate it owns. */
     cancel(): void;
 }

package/dist/services/session/live-run.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"live-run.d.ts","sourceRoot":"","sources":["../../../source/services/session/live-run.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAErF,MAAM,MAAM,YAAY,CAAC,KAAK,EAAE,MAAM,IAClC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,GAC/B;IACE,IAAI,EAAE,gCAAgC,CAAC;IACvC,OAAO,EAAE,SAAS,OAAO,oCAAoC,EAAE,uBAAuB,EAAE,CAAC;CAC1F,GACD;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACrC;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC;AAE1B;;;;GAIG;AACH,qBAAa,OAAO,CAAC,KAAK,EAAE,MAAM;;IAU9B,QAAQ,CAAC,KAAK,EAAE,MAAM;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAF1B,YACW,KAAK,EAAE,MAAM,EACL,OAAO,EAAE,0BAA0B,EACpD,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,EAyB3D;IAED,IAAI,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAEhC;IAEK,IAAI,IAAI,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAsBjD;IA+BD,kEAAkE;IAClE,MAAM,IAAI,IAAI,CAKb;CACF"}
+{"version":3,"file":"live-run.d.ts","sourceRoot":"","sources":["../../../source/services/session/live-run.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAC5E,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAErF,MAAM,MAAM,YAAY,CAAC,KAAK,EAAE,MAAM,IAClC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,KAAK,CAAA;CAAE,GAC/B;IACE,IAAI,EAAE,gCAAgC,CAAC;IACvC,OAAO,EAAE,SAAS,OAAO,oCAAoC,EAAE,uBAAuB,EAAE,CAAC;CAC1F,GACD;IAAE,IAAI,EAAE,mBAAmB,CAAC;IAAC,QAAQ,EAAE,oBAAoB,CAAA;CAAE,GAC7D;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GACrC;IAAE,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC;AAE1B;;;;GAIG;AACH,qBAAa,OAAO,CAAC,KAAK,EAAE,MAAM;;IAW9B,QAAQ,CAAC,KAAK,EAAE,MAAM;IACtB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAF1B,YACW,KAAK,EAAE,MAAM,EACL,OAAO,EAAE,0BAA0B,EACpD,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,KAAK,OAAO,CAAC,MAAM,CAAC,EA4B3D;IAED,IAAI,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAEhC;IAEK,IAAI,IAAI,OAAO,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAuBjD;IAED,KAAK,CAAC,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAG1C;IAED,MAAM,IAAI,IAAI,CAGb;IA+BD,kEAAkE;IAClE,MAAM,IAAI,IAAI,CAKb;CACF"}

package/dist/services/session/live-run.js

@@ -1,7 +1,7 @@
 /**
- * One foreground stream's ownership boundary. The consumer is started exactly
- * once and remains alive while an application post-execute gate holds a tool
- * promise. Callers only observe buffered events, gates, or its terminal result.
+ * The observation mailbox for one foreground turn. Its consumer starts once
+ * and stays alive through approval and post-execute waits. Callers observe
+ * buffered events, pending decisions, or the runtime's terminal result.
  */
 export class LiveRun {
     runId;
@@ -13,11 +13,16 @@ export class LiveRun {
     #error;
     #finished = false;
     #cancelled = false;
+    #approval;
     constructor(runId, pending, consume) {
         this.runId = runId;
         this.pending = pending;
         this.#completion = Promise.resolve()
-            .then(() => consume((event) => this.#emit(event)))
+            .then(() => {
+            if (this.#cancelled)
+                throw Object.assign(new Error('Operation aborted'), { name: 'AbortError' });
+            return consume((event) => this.#emit(event));
+        })
             .then((result) => {
             if (this.#cancelled)
                 return result;
@@ -53,6 +58,8 @@ export class LiveRun {
                 throw this.#error;
             if (this.#finished)
                 return { kind: 'completed', result: this.#result };
+            if (this.#approval)
+                return { kind: 'approval_required', terminal: this.#approval };
             const entries = this.pending.entriesForRun(this.runId);
             if (entries.length > 0)
                 return { kind: 'post_execute_approval_required', entries };
@@ -70,6 +77,14 @@ export class LiveRun {
             }
         }
     }
+    pause(terminal) {
+        this.#approval = terminal;
+        this.#changed();
+    }
+    resume() {
+        this.#approval = undefined;
+        this.#changed();
+    }
     #emit(event) {
         if (this.#cancelled)
             return;

package/dist/services/session/live-run.js.map

@@ -1 +1 @@
-{"version":3,"file":"live-run.js","sourceRoot":"","sources":["../../../source/services/session/live-run.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"live-run.js","sourceRoot":"","sources":["../../../source/services/session/live-run.ts"],"names":[],"mappings":"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"}

package/dist/services/session/session-composition.d.ts

@@ -3,7 +3,7 @@ import type { ProviderInputItem } from '../../contracts/provider-input.js';
 import { type LocalCompactionOutcome } from '../agent-runtime/context-compaction/local-context-compactor.js';
 import { type ContextEstimate } from '../agent-runtime/context-compaction/index.js';
 import type { SteerOutcome } from '../agent-runtime/application-run-loop.js';
-import { ConversationStore } from '../conversation/conversation-store.js';
+import { ConversationRecord } from '../conversation/conversation-record.js';
 import { ApprovalState, type PendingApprovalContext } from '../approval/approval-state.js';
 import { TurnItemAccumulator } from './turn-item-accumulator.js';
 import { ShellAutoApprovalResolver } from '../approval/shell-auto-approval-resolver.js';
@@ -15,12 +15,11 @@ import type { AskUserAnswerSink, ConversationAgentClient, SubagentEventSinkHost
 import type { UserTurn } from '../../types/user-turn.js';
 import type { ConversationEvent } from '../conversation/conversation-events.js';
 import { SessionInputPlanner } from './session-input-planner.js';
-import { SessionLifecycle } from './session-lifecycle.js';
+import { SessionLifecycle, type SessionState } from './session-lifecycle.js';
 import { ProviderContinuity } from '../provider-continuity.js';
 import type { OpenAIRootCheckpointLifecycleObserver } from '../openai-root-checkpoint-lifecycle-observer.js';
 import { TurnCoordinator, type TurnStartOptions } from './turn-coordinator.js';
 import { SessionStreamProcessor } from './session-stream-processor.js';
-import { SessionManager } from './session-manager.js';
 import { SessionRuntimeController } from './session-runtime-controller.js';
 import { DefaultConversationRecoveryPolicy } from '../retry/recovery-policy.js';
 import { DefaultRecoveryExecutor } from '../retry/recovery-executor.js';
@@ -28,9 +27,8 @@ import type { ClassifiedFailure } from '../retry/retry-contracts.js';
 import { GenerationGuard } from '../generation-guard.js';
 import { DefaultRetryClassifier } from '../retry/retry-classifier.js';
 import { RetryEventPresenter } from '../retry/retry-event-presenter.js';
-import { TurnWorkflow } from './turn-workflow.js';
+import { SessionTurnAdapter } from './session-turn-adapter.js';
 import { TurnStatusMachine } from './turn-status-machine.js';
-import { AssistantTurnJournal } from '../logging/assistant-turn-journal.js';
 import { SessionIdentity } from './session-identity.js';
 import { type BackgroundSubagentNotificationPort, type BackgroundSubagentTaskPort } from '../subagents/subagent-notification-store.js';
 import { type BackgroundTaskControlDetails, type BackgroundTaskControlPort } from './background-task-control.js';
@@ -72,7 +70,7 @@ export type SessionRuntimeInternals = {
     identity: SessionIdentity;
     sessionStartedAt: string;
     logger: ILoggingService;
-    conversationStore: ConversationStore;
+    record: ConversationRecord;
     approvalState: ApprovalState;
     toolTracker: SessionToolTracker;
     getUnsettledToolExecutions: () => {
@@ -92,7 +90,7 @@ export type SessionRuntimeInternals = {
     };
     turnCoordinator: TurnCoordinator;
     /** Facade for state/persistence/undo/snapshot operations. */
-    stateFacade: SessionManager;
+    stateFacade: SessionState;
     /** Controller for runtime model/provider/retry settings. */
     runtimeController: SessionRuntimeController;
     /**
@@ -122,10 +120,8 @@ export type SessionRuntimeInternals = {
     retryClassifier: DefaultRetryClassifier;
     retryEventPresenter: RetryEventPresenter;
     turnAccumulator: TurnItemAccumulator;
-    turnWorkflow: TurnWorkflow;
+    turnAdapter: SessionTurnAdapter;
     freshStartRetriesAllowed: boolean;
-    /** Stable assistant-output journal created during composition. */
-    journal: AssistantTurnJournal;
     /** @internal Resolved ask-user-answer sink (derived from option or agent client). */
     resolvedAskUserAnswerSink: AskUserAnswerSink | null;
     /** @internal Session-owned sink facade; background registration observes lifecycle events. */
@@ -183,7 +179,7 @@ export type CreateSessionRuntimeInternalsOptions = {
     enableNestedApproval?: boolean;
 };
 export type CreateConversationSessionOptions = Omit<CreateSessionRuntimeInternalsOptions, 'turnAccumulator'>;
-export type ConversationSessionBundle = Pick<SessionRuntimeInternals, 'sessionId' | 'sessionStartedAt' | 'turnCoordinator' | 'stateFacade' | 'runtimeController' | 'conversationLogger' | 'approvalState' | 'shellAutoApproval' | 'toolTracker' | 'inputPlanner' | 'dispose' | 'journal'>;
+export type ConversationSessionBundle = Pick<SessionRuntimeInternals, 'sessionId' | 'sessionStartedAt' | 'turnCoordinator' | 'stateFacade' | 'runtimeController' | 'conversationLogger' | 'approvalState' | 'shellAutoApproval' | 'toolTracker' | 'inputPlanner' | 'dispose' | 'record'>;
 export type SessionApprovalQuery = {
     getPending(): PendingApprovalContext | null;
     getPendingInterruption(): unknown;
@@ -254,7 +250,7 @@ export type SessionRuntime = {
         editSteer: (id: string, items: readonly ProviderInputItem[]) => boolean;
     };
     /** Facade for state/persistence/undo/snapshot operations. */
-    state: SessionManager;
+    state: SessionState;
     /** Controller for runtime model/provider/retry settings. */
     settings: SessionRuntimeController;
     compactContext: (options?: {

package/dist/services/session/session-composition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-composition.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-composition.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-composition.d.ts","sourceRoot":"","sources":["../../../source/services/session/session-composition.ts"],"names":[],"mappings":"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"}

package/dist/services/session/session-composition.js

@@ -4,8 +4,7 @@ import { CONTEXT_COMPACTION_INSTRUCTIONS } from '../../prompts/context-compactio
 import { projectConversationMessage } from '../conversation/conversation-message-projection.js';
 import { LocalContextCompactor, } from '../agent-runtime/context-compaction/local-context-compactor.js';
 import { estimateContext } from '../agent-runtime/context-compaction/index.js';
-import { ConversationStore } from '../conversation/conversation-store.js';
-import { replayEvents } from '../conversation/conversation-replay.js';
+import { ConversationRecord } from '../conversation/conversation-record.js';
 import { createCheckpointSourceDigest, resolveCheckpointSourceRefs, } from '../conversation/conversation-checkpoint-provenance.js';
 import { readConversationLogEnvelopes, generateId } from '../conversation/conversation-persistence.js';
 import { ApprovalState } from '../approval/approval-state.js';
@@ -21,7 +20,6 @@ import { ProviderContinuity } from '../provider-continuity.js';
 import { TurnCoordinator } from './turn-coordinator.js';
 import { BackgroundCheckInScheduler } from './background-check-in-scheduler.js';
 import { SessionStreamProcessor } from './session-stream-processor.js';
-import { SessionManager } from './session-manager.js';
 import { SessionRuntimeController } from './session-runtime-controller.js';
 import { ContinuationPlanApplier } from './continuation-plan-applier.js';
 import { ContinuationRecoveryHandler } from './continuation-recovery-handler.js';
@@ -30,12 +28,11 @@ import { DefaultRecoveryExecutor } from '../retry/recovery-executor.js';
 import { GenerationGuard } from '../generation-guard.js';
 import { DefaultRetryClassifier } from '../retry/retry-classifier.js';
 import { RetryEventPresenter } from '../retry/retry-event-presenter.js';
-import { TurnWorkflow } from './turn-workflow.js';
+import { SessionTurnAdapter } from './session-turn-adapter.js';
 import { TurnStatusMachine } from './turn-status-machine.js';
 import { TurnAttemptFactory } from './turn-attempt-factory.js';
 import { InitialInputPreparer } from './initial-input-preparer.js';
 import { InitialTurnRecoveryHandler } from './initial-turn-recovery-handler.js';
-import { AssistantTurnJournal } from '../logging/assistant-turn-journal.js';
 import { SessionContinuityReset } from './session-continuity-reset.js';
 import { SessionIdentity } from './session-identity.js';
 import { SubagentNotificationStore, } from '../subagents/subagent-notification-store.js';
@@ -187,18 +184,20 @@ export function createSessionRuntimeInternals(options) {
     // Factory-owned handles supply this same registry to the root tool policy.
     // Compatibility callers receive a fresh explicit token, never a wall-clock epoch.
     const postExecutePending = suppliedPostExecutePending ?? new PostExecutePendingRegistry({ sessionId: identity, epoch: crypto.randomUUID() });
-    const conversationStore = new ConversationStore();
+    const providerContinuity = suppliedProviderContinuity ?? new ProviderContinuity();
+    const record = new ConversationRecord({
+        logger,
+        providerContext: providerContinuity,
+        checkpointObserver: openAIRootCheckpointLifecycleObserver,
+    });
     const approvalState = new ApprovalState();
     const pendingInteraction = new PendingInteractionState();
     const nestedApprovalOwner = new NestedApprovalOwner(identity);
     if (enableNestedApproval)
         agentClient?.setNestedApprovalOwner?.(nestedApprovalOwner);
-    const toolTracker = new SessionToolTracker(conversationStore);
-    // Mark ledger dispatch when the run loop enters a tool body so stream recovery
-    // can distinguish never-dispatched (aborted) from unobserved outcome (unknown).
-    getMethod(agentClient, 'setOnToolDispatch')?.call(agentClient, (callId) => toolTracker.markDispatched(callId));
+    const toolTracker = new SessionToolTracker();
     const shellAutoApproval = new DelegatingShellAutoApprovalResolver({
-        conversationStore,
+        record,
         agentClient,
         logger,
         settingsService,
@@ -207,18 +206,14 @@ export function createSessionRuntimeInternals(options) {
     });
     const appState = { statusMachine: new TurnStatusMachine() };
     const hookEvents = suppliedHookEvents ?? (hookLifecycle ? new HookEventFactory({ sessionId: identity }) : undefined);
-    const providerContinuity = suppliedProviderContinuity ?? new ProviderContinuity();
     const inputPlanner = new SessionInputPlanner({
+        record,
         settingsService,
         agentClient,
-        toolTracker,
         providerContinuity,
         providerRegistry,
-        getProviderHistorySnapshot: () => conversationStore.getProviderHistorySnapshot(),
-        getHistoryIdentity: () => conversationStore.getProviderHistoryIdentity().identity,
-    });
-    const journal = new AssistantTurnJournal({
-        getCurrentTurnId: () => toolTracker.getCurrentTurnId(),
+        getProviderHistorySnapshot: () => record.getProviderHistorySnapshot(),
+        getHistoryIdentity: () => record.getProviderHistoryIdentity().identity,
     });
     const conversationLogger = new ConversationLogger({
         turnAccumulator: resolvedTurnAccumulator,
@@ -233,12 +228,8 @@ export function createSessionRuntimeInternals(options) {
                 ...(provider ? { provider } : {}),
             };
         },
-        getCurrentTurnId: () => toolTracker.getCurrentTurnId(),
-        getToolLedger: () => toolTracker.export(),
-        journal,
-        onProviderHistoryReplay: (envelopes) => {
-            conversationStore.replaceHistory(replayEvents(envelopes).history);
-        },
+        getCurrentTurnId: () => record.getCurrentTurnId(),
+        getToolLedger: () => record.exportToolEvidence(),
     });
     const appendLocalCheckpoint = (input) => {
         const envelopes = readConversationLogEnvelopes(identity.current);
@@ -353,11 +344,11 @@ export function createSessionRuntimeInternals(options) {
     });
     getMethod(agentClient, 'setBackgroundCheckInScheduler')?.call(agentClient, backgroundCheckInScheduler);
     const approvalFlow = new ApprovalFlowCoordinator({
+        record,
         agentClient,
         approvalState,
         logger,
         sessionId: identity,
-        toolTracker,
         generationGuard,
         toolOwnership,
         sessionAccess,
@@ -377,9 +368,11 @@ export function createSessionRuntimeInternals(options) {
     // eslint-disable-next-line prefer-const
     let terminateActiveTurn;
     const state = new SessionLifecycle({
+        conversationLogger,
+        agentClient,
+        settingsService,
         inputPlanner,
-        toolTracker,
-        conversationStore,
+        record,
         logger,
         sessionId: identity,
         appState,
@@ -387,7 +380,6 @@ export function createSessionRuntimeInternals(options) {
         generationGuard,
         continuityReset,
         sessionAccess,
-        journal,
         pendingInteraction,
         terminateActiveTurn: () => terminateActiveTurn?.(),
     });
@@ -435,12 +427,7 @@ export function createSessionRuntimeInternals(options) {
         logger,
         sessionId: identity,
         toolTracker,
-        conversationStore,
-        conversationLogger,
-        providerContinuity,
-        openAIRootCheckpointLifecycleObserver,
         generationGuard,
-        journal,
         abortStream: () => agentClient.abort(),
         toolCallMarkers,
     });
@@ -458,8 +445,7 @@ export function createSessionRuntimeInternals(options) {
     };
     const recoveryPolicy = new DefaultConversationRecoveryPolicy();
     const recoveryExecutor = new DefaultRecoveryExecutor({
-        toolTracker,
-        conversationStore,
+        record,
         providerContinuity,
     });
     const retryClassifier = new DefaultRetryClassifier(agentClient);
@@ -473,15 +459,13 @@ export function createSessionRuntimeInternals(options) {
     };
     const attemptFactory = new TurnAttemptFactory({
         agentClient,
-        conversationStore,
+        record,
         generationGuard,
-        toolTracker,
         state,
         resolveRetryLimit,
-        journal,
     });
     const inputPreparer = new InitialInputPreparer({
-        conversationStore,
+        record,
         generationGuard,
         inputPlanner,
         logger,
@@ -490,7 +474,7 @@ export function createSessionRuntimeInternals(options) {
     });
     const recoveryHandler = new InitialTurnRecoveryHandler({
         breakChaining,
-        conversationStore,
+        record,
         freshStartRetriesAllowed: retryOptions?.allowFreshStartRetries ?? true,
         generationGuard,
         inputPlanner,
@@ -501,16 +485,14 @@ export function createSessionRuntimeInternals(options) {
         retryEventPresenter,
         sessionId: identity,
         provider: agentClient?.getProvider?.(),
-        toolTracker,
     });
     const planApplier = new ContinuationPlanApplier({
+        record,
         approvalFlow,
         toolTracker,
-        logger,
-        sessionId: identity,
-        journal,
     });
     const continuationRecoveryHandler = new ContinuationRecoveryHandler({
+        record,
         breakChaining,
         logger,
         sessionId: identity,
@@ -520,10 +502,9 @@ export function createSessionRuntimeInternals(options) {
         recoveryExecutor,
         retryEventPresenter,
         resolveRetryLimit,
-        toolTracker,
         provider: agentClient?.getProvider?.(),
     });
-    const turnWorkflow = new TurnWorkflow({
+    const turnAdapter = new SessionTurnAdapter({
         agentClient,
         logger,
         sessionId: identity,
@@ -535,9 +516,8 @@ export function createSessionRuntimeInternals(options) {
         inputPreparer,
         streamProcessor,
         recoveryHandler,
-        journal,
         inputPlanner,
-        conversationStore,
+        record,
         approvalFlow,
         planApplier,
         continuationRecoveryHandler,
@@ -552,7 +532,7 @@ export function createSessionRuntimeInternals(options) {
     });
     const turnCoordinator = new TurnCoordinator({
         statusMachine: appState.statusMachine,
-        turnWorkflow,
+        turnAdapter,
         approvalFlow,
         providerContinuity,
         shellAutoApproval,
@@ -565,15 +545,7 @@ export function createSessionRuntimeInternals(options) {
         hookEvents,
     });
     terminateActiveTurn = () => turnCoordinator.terminate();
-    const stateFacade = new SessionManager({
-        conversationStore,
-        toolTracker,
-        state,
-        conversationLogger,
-        agentClient,
-        settingsService,
-        inputPlanner,
-    });
+    const stateFacade = state;
     const runtimeController = new SessionRuntimeController({
         agentClient,
         state,
@@ -617,7 +589,7 @@ export function createSessionRuntimeInternals(options) {
         disposed = true;
         backgroundCheckInScheduler.dispose();
         getMethod(agentClient, 'setBackgroundCheckInScheduler')?.call(agentClient, undefined);
-        turnWorkflow.abortLiveRun();
+        turnAdapter.abortLiveRun();
         postExecutePending.close();
         generationGuard.invalidate();
         // Abort any active SDK work only if a turn is currently running.
@@ -681,7 +653,7 @@ export function createSessionRuntimeInternals(options) {
     const compactContext = async (options) => {
         if (!appState.statusMachine.is('idle'))
             return { kind: 'busy' };
-        const snapshot = conversationStore.getProviderHistorySnapshot();
+        const snapshot = record.getProviderHistorySnapshot();
         const provider = getMethod(agentClient, 'getProvider')?.call(agentClient) ??
             settingsService?.get('agent.modelSelection').provider ??
             'openai';
@@ -716,7 +688,7 @@ export function createSessionRuntimeInternals(options) {
                         { kind: 'failed', reason: 'native_failed', estimate: before, provider: remote.provider }
                     : { kind: 'not_needed', estimate: before };
             }
-            if (!conversationStore.replaceHistoryAtRevision(snapshot.revision, remote.history)) {
+            if (!record.replaceHistoryAtRevision(snapshot.revision, remote.history)) {
                 return { kind: 'stale' };
             }
             providerContinuity.clear();
@@ -808,11 +780,7 @@ export function createSessionRuntimeInternals(options) {
             return message?.role === 'user' && !message.isSynthetic;
         }).length;
         const preservedUsers = hotUsers === 0 ? genuineUsers : genuineUsers.slice(0, -hotUsers);
-        if (!conversationStore.replaceHistoryAtRevision(snapshot.revision, [
-            ...preservedUsers,
-            outcome.checkpoint,
-            ...outcome.hotTail,
-        ])) {
+        if (!record.replaceHistoryAtRevision(snapshot.revision, [...preservedUsers, outcome.checkpoint, ...outcome.hotTail])) {
             return { kind: 'stale' };
         }
         appendLocalCheckpoint({ history: snapshot.history, hotTail: outcome.hotTail, checkpoint: outcome.checkpoint });
@@ -826,14 +794,14 @@ export function createSessionRuntimeInternals(options) {
             return identity.startedAt;
         },
         getUnsettledToolExecutions: () => {
-            const unsettled = new Set(toolTracker.unsettledToolCallIdsForCurrentTurn());
-            return toolTracker
-                .export()
+            const unsettled = new Set(record.unsettledToolCallIdsForCurrentTurn());
+            return record
+                .exportToolEvidence()
                 .filter((entry) => unsettled.has(entry.callId))
                 .map(({ callId, toolName, status }) => ({ callId, toolName, status }));
         },
         logger,
-        conversationStore,
+        record,
         approvalState,
         toolTracker,
         toolCallMarkers,
@@ -861,9 +829,8 @@ export function createSessionRuntimeInternals(options) {
         retryClassifier,
         retryEventPresenter,
         turnAccumulator: resolvedTurnAccumulator,
-        turnWorkflow,
+        turnAdapter,
         freshStartRetriesAllowed: retryOptions?.allowFreshStartRetries ?? true,
-        journal,
         resolvedAskUserAnswerSink,
         resolvedSubagentEventSinkHost: resolvedSubagentEventSinkHost
             ? {
@@ -893,7 +860,7 @@ export const createConversationSession = createSessionRuntimeInternals;
 // ── Session Runtime Factory ───────────────────────────────────────
 /** @internal Wraps a shared internals instance into the closed runtime. */
 export function buildSessionRuntime(internals) {
-    const { turnCoordinator, stateFacade, runtimeController, conversationLogger, journal, dispose, approvalFlow, resolvedAskUserAnswerSink, resolvedSubagentEventSinkHost, backgroundSubagentNotifications, backgroundSubagentTasks, backgroundSubagentApprovals, backgroundTaskControl, postExecutePending, pendingInteraction, nestedApprovalOwner, } = internals;
+    const { turnCoordinator, stateFacade, runtimeController, conversationLogger, record, dispose, approvalFlow, resolvedAskUserAnswerSink, resolvedSubagentEventSinkHost, backgroundSubagentNotifications, backgroundSubagentTasks, backgroundSubagentApprovals, backgroundTaskControl, postExecutePending, pendingInteraction, nestedApprovalOwner, } = internals;
     return {
         get sessionId() {
             return internals.identity.current;
@@ -917,20 +884,7 @@ export function buildSessionRuntime(internals) {
         logs: {
             setLogSink: (sink) => {
                 conversationLogger.setLogSink(sink);
-                journal.setSink(sink
-                    ? (event) => {
-                        try {
-                            sink(event);
-                        }
-                        catch (err) {
-                            internals.logger.warn('Journal sink threw', {
-                                eventType: 'conversation_log.sink_failed',
-                                category: 'persistence',
-                                errorMessage: err instanceof Error ? err.message : String(err),
-                            });
-                        }
-                    }
-                    : null);
+                record.setJournalSink(sink);
             },
             dispatchEventToLog: conversationLogger.dispatchEventToLog.bind(conversationLogger),
             log: conversationLogger.log.bind(conversationLogger),