praxis-agent 0.55.1 → 0.55.3

package/dist/application/session-service.js

@@ -8,13 +8,12 @@ import { formatClaudeCompactSummary } from '../native/compaction.js';
 import { isClaudeAgentId } from '../native/sidechain.js';
 import { assertNativeDataPlane, resolveDataPlanePaths, resolveScheduledTaskFile, } from '../persistence/data-plane.js';
 import { downloadClaudeFileResources, } from '../native/file-resources.js';
-import { selectClaudeActiveTranscript } from '../native/history.js';
 import { ClaudeFileHistory } from '../native/file-history.js';
 import { getClaudeAgentSetting, projectClaudeModelMessages, } from '../native/projection.js';
 import { projectNativeSessionEntries } from './native-session-projection.js';
 import { classifyClaudeInterruption, } from '../native/interruption.js';
 import { findUnresolvedClaudeToolCalls, getClaudeContentBlocks, } from '../native/tool-links.js';
-import { createClaudeAgentSettingEntry, createClaudeHookAttachmentEntries, createClaudeLastPromptEntry, createClaudeRuleAttachmentEntry, translateProviderEvents, } from '../native/translation.js';
+import { createClaudeAgentSettingEntry, createClaudeHookAttachmentEntries, createClaudeRuleAttachmentEntry, translateProviderEvents, } from '../native/translation.js';
 import { AgentRunCancelledError, AgentRuntime, MALFORMED_TOOL_INPUT_MESSAGE, ModelProviderError, } from '../core/runtime.js';
 import { resolveToolSchedulingPolicy } from '../core/tool-scheduling-policy.js';
 import { BackgroundTaskRuntime, } from './background-task-runtime.js';
@@ -34,6 +33,8 @@ import { lastUserPrompt, projectTranscriptDisplay, unresolvedActiveToolCallIds,
 import { InMemoryTranscriptStore } from '../persistence/in-memory-transcript-store.js';
 import { NativeTranscriptStore, } from '../persistence/native-transcript-store.js';
 import { NativeSessionTranscript, } from './native-session-transcript.js';
+import { TurnPersistence } from './turn-persistence.js';
+import { TurnAccounting } from './turn-accounting.js';
 import { SubagentLifecycleStore } from '../persistence/subagent-lifecycle-store.js';
 import { ModelCompactor } from './model-compactor.js';
 import { agentMemoryPrompt, ClaudeSubagentExecutor, StructuredOutputRegistry, } from './subagent-service.js';
@@ -249,18 +250,6 @@ function requireCompactionDurations(result) {
     }
     return { durationMs, durationWithoutRetriesMs };
 }
-function addToolDuration(value, total) {
-    if (value === undefined)
-        return total;
-    if (typeof value !== 'number' || !Number.isFinite(value) || value < 0) {
-        throw new TypeError('durationToolMs must be a finite nonnegative number');
-    }
-    const next = total + value;
-    if (!Number.isFinite(next) || next < 0) {
-        throw new TypeError('durationToolMs total overflow');
-    }
-    return next;
-}
 function addApiDuration(value, total, field) {
     if (value === undefined)
         return total;
@@ -273,36 +262,6 @@ function addApiDuration(value, total, field) {
     }
     return next;
 }
-function createLineCountAccumulator() {
-    let linesAdded = 0;
-    let linesRemoved = 0;
-    const addCounter = (current, value, field) => {
-        if (value === undefined)
-            return current;
-        if (!Number.isSafeInteger(value) || value < 0) {
-            throw new TypeError(`${field} must be a nonnegative safe integer`);
-        }
-        const next = current + value;
-        if (!Number.isSafeInteger(next) || next < 0) {
-            throw new TypeError(`${field} total must be a nonnegative safe integer`);
-        }
-        return next;
-    };
-    return {
-        get linesAdded() {
-            return linesAdded;
-        },
-        get linesRemoved() {
-            return linesRemoved;
-        },
-        add(input) {
-            if (input.isError)
-                return;
-            linesAdded = addCounter(linesAdded, input.linesAdded, 'linesAdded');
-            linesRemoved = addCounter(linesRemoved, input.linesRemoved, 'linesRemoved');
-        },
-    };
-}
 export function workflowTokenTarget(prompt) {
     const match = /(?:^|\s)\+(\d+(?:\.\d+)?)([km])\b/iu.exec(prompt);
     if (!match)
@@ -495,22 +454,6 @@ function validSessionName(value) {
         ? name.toLocaleLowerCase()
         : null;
 }
-function projectMemoryMessages(entries) {
-    return selectClaudeActiveTranscript(entries).flatMap((entry) => {
-        if (typeof entry.uuid !== 'string')
-            return [];
-        return projectClaudeModelMessages([entry]).flatMap((message) => (message.role === 'user' || message.role === 'assistant') &&
-            message.content.trim().length > 0
-            ? [
-                {
-                    id: entry.uuid,
-                    role: message.role,
-                    content: message.content,
-                },
-            ]
-            : []);
-    });
-}
 function successfulHookOutput(outcome) {
     return (outcome?.executions ?? []).flatMap((execution) => {
         const output = execution.stdout.trim();
@@ -2529,39 +2472,47 @@ export class ClaudeSessionService {
             }
             const sessionPaths = this.paths(sessionId);
             const toolResultDirectory = join(sessionPaths.projectRoot, sessionId, 'tool-results');
-            const runUnderLease = async (lease, nativeLease) => {
-                const loadedSnapshot = await lease.load();
-                let snapshot = {
-                    entries: projectNativeSessionEntries(nativeLease.activeEvents()),
-                    tail: loadedSnapshot.tail,
+            const runUnderLease = async (persistence) => {
+                const activeTracker = this.sessionCostTrackers.get(sessionId);
+                if (!activeTracker) {
+                    throw new Error(`Session cost tracker is not active for session ${sessionId}`);
+                }
+                const turnAccounting = new TurnAccounting({
+                    tracker: activeTracker,
+                    ...(this.options.pricing ? { pricing: this.options.pricing } : {}),
+                });
+                const projectionSnapshot = () => {
+                    const view = persistence.view();
+                    return {
+                        entries: [...view.projectionEntries],
+                        tail: view.projectionTail,
+                    };
+                };
+                const commitProjection = async (entries) => {
+                    await persistence.commit({ kind: 'projection', entries });
                 };
                 const activeTurnMessages = () => {
                     // Native events remain authoritative; refresh the derived projection
                     // after each append so memory/compaction sees the live branch.
-                    snapshot = {
-                        ...snapshot,
-                        entries: projectNativeSessionEntries(nativeLease.activeEvents()),
-                    };
-                    return nativeLease.activeMessages();
+                    const view = persistence.refresh();
+                    return [...view.activeMessages];
                 };
-                if (nativeLease &&
-                    name !== undefined &&
-                    this.options.sessionPersistence !== false) {
+                if (name !== undefined && this.options.sessionPersistence !== false) {
                     const marker = `<praxis-session-name>${name}</praxis-session-name>`;
-                    if (!nativeLease
-                        .activeEvents()
-                        .some((event) => event.kind === 'messages' &&
+                    if (!persistence
+                        .view()
+                        .activeEvents.some((event) => event.kind === 'messages' &&
                         event.messages.some((message) => message.role === 'user' && message.content === marker))) {
-                        await nativeLease.appendMessages({
-                            messages: [{ role: 'user', content: marker }],
+                        await persistence.commit({
+                            kind: 'messages',
+                            input: { messages: [{ role: 'user', content: marker }] },
                         });
                     }
                 }
-                const nativeInterruption = nativeLease?.interruption();
+                const nativeInterruption = persistence.view().interruption;
                 if (nativeInterruption?.kind === 'indeterminate-tools')
                     throw new Error(`Native tool execution is indeterminate: ${nativeInterruption.callIds.join(', ')}`);
-                const nativeResumeInterrupted = nativeLease !== undefined &&
-                    this.options.resumeInterruptedTurn === true &&
+                const nativeResumeInterrupted = this.options.resumeInterruptedTurn === true &&
                     (nativeInterruption?.kind === 'interrupted-prompt' ||
                         nativeInterruption?.kind === 'interrupted-turn');
                 const shouldSkipUserPrompt = () => skipUserPrompt || nativeResumeInterrupted;
@@ -2572,48 +2523,35 @@ export class ClaudeSessionService {
                     shellCommand === undefined &&
                     !shouldSkipUserPrompt() &&
                     !(this.options.approveRecovery !== undefined &&
-                        findUnresolvedClaudeToolCalls(snapshot.entries).length > 0)) {
-                    const interruption = classifyClaudeInterruption(snapshot.entries);
+                        findUnresolvedClaudeToolCalls(projectionSnapshot().entries).length >
+                            0)) {
+                    const interruption = classifyClaudeInterruption(projectionSnapshot().entries);
                     if ((interruption.kind === 'interrupted-prompt' ||
                         interruption.kind === 'interrupted-turn') &&
                         interruption.prompt !== undefined &&
                         interruption.replayEntries !== undefined) {
                         automaticReplayPrompt = interruption.prompt;
-                        snapshot = {
-                            entries: interruption.replayEntries,
-                            tail: {
-                                ...snapshot.tail,
-                                branchParentId: interruption.replayParentUuid ?? null,
-                            },
-                        };
                     }
                 }
                 const initialTransition = this.worktreeManager?.consumeTransition('__initial__');
-                if (initialTransition && snapshot.entries.length === 0) {
+                if (initialTransition && projectionSnapshot().entries.length === 0) {
                     const stateEntry = {
                         type: 'worktree-state',
                         worktreeSession: initialTransition.state,
                         sessionId,
                     };
-                    const stateTail = await this.append(lease, snapshot.tail, stateEntry);
-                    snapshot = {
-                        entries: [...snapshot.entries, stateEntry],
-                        tail: stateTail,
-                    };
+                    await commitProjection([stateEntry]);
                 }
-                this.restoreWorktree(snapshot.entries);
-                this.options.interactiveTools?.restore(sessionId, snapshot.entries);
+                this.restoreWorktree(projectionSnapshot().entries);
+                this.options.interactiveTools?.restore(sessionId, projectionSnapshot().entries);
                 if (requireExisting &&
                     name !== undefined &&
-                    !this.hasSessionName(snapshot.entries, name)) {
+                    !this.hasSessionName(projectionSnapshot().entries, name)) {
                     const entries = this.sessionNameEntries(sessionId, name);
-                    const appendResult = await this.appendProjectionMany(snapshot.tail, entries);
-                    snapshot = {
-                        entries: [...snapshot.entries, ...entries],
-                        tail: appendResult.tail,
-                    };
+                    await commitProjection(entries);
                 }
-                const agentName = this.options.agent ?? getClaudeAgentSetting(snapshot.entries);
+                const agentName = this.options.agent ??
+                    getClaudeAgentSetting(projectionSnapshot().entries);
                 const agent = this.resolveAgent(agentName);
                 const provider = this.providerForAgent(agent);
                 this.activeProvider = provider;
@@ -2660,11 +2598,9 @@ export class ClaudeSessionService {
                         ...(this.options.fileRewindRoots ?? []),
                     ])
                     : null;
-                const unresolvedToolCalls = nativeLease
-                    ? nativeInterruption?.kind === 'recoverable-tools'
-                        ? [...nativeInterruption.calls]
-                        : []
-                    : findUnresolvedClaudeToolCalls(snapshot.entries);
+                const unresolvedToolCalls = nativeInterruption?.kind === 'recoverable-tools'
+                    ? [...nativeInterruption.calls]
+                    : [];
                 const pendingRecoveryToolCallIds = new Set(unresolvedToolCalls.map((call) => call.id));
                 const pendingRecoveryHookOutcomes = [];
                 let refreshRuntimeContext;
@@ -2678,26 +2614,25 @@ export class ClaudeSessionService {
                     permission_mode: 'default',
                 };
                 const appendHookOutcome = async (outcome) => {
-                    for (const entry of createClaudeHookAttachmentEntries(outcome, this.translationContext(sessionId, snapshot))) {
-                        const tail = await this.append(lease, snapshot.tail, entry);
-                        snapshot = { entries: [...snapshot.entries, entry], tail };
-                        if (nativeLease) {
-                            const attachment = entry.attachment;
-                            const raw = attachment?.content;
-                            const content = typeof raw === 'string'
-                                ? raw
-                                : Array.isArray(raw)
-                                    ? raw
-                                        .filter((value) => typeof value === 'string')
-                                        .join('\n')
-                                    : raw && typeof raw === 'object' && 'content' in raw
-                                        ? String(raw.content)
-                                        : '';
-                            if (content) {
-                                await nativeLease.appendMessages({
-                                    messages: [{ role: 'user', content }],
-                                });
-                            }
+                    for (const entry of createClaudeHookAttachmentEntries(outcome, this.translationContext(sessionId, projectionSnapshot()))) {
+                        const attachment = entry.attachment;
+                        const raw = attachment?.content;
+                        const content = typeof raw === 'string'
+                            ? raw
+                            : Array.isArray(raw)
+                                ? raw.filter((value) => typeof value === 'string').join('\n')
+                                : raw && typeof raw === 'object' && 'content' in raw
+                                    ? String(raw.content)
+                                    : '';
+                        if (content) {
+                            await persistence.commit({
+                                kind: 'messages',
+                                input: { messages: [{ role: 'user', content }] },
+                                projectionEntries: [entry],
+                            });
+                        }
+                        else {
+                            await commitProjection([entry]);
                         }
                     }
                 };
@@ -2710,11 +2645,11 @@ export class ClaudeSessionService {
                 };
                 const flushRecoveryHookOutcomes = async () => {
                     const entries = [];
-                    let history = snapshot.entries;
-                    let parentUuid = this.logicalTailUuid(snapshot.tail);
+                    let history = projectionSnapshot().entries;
+                    let parentUuid = this.logicalTailUuid(projectionSnapshot().tail);
                     for (const outcome of pendingRecoveryHookOutcomes) {
                         const outcomeEntries = createClaudeHookAttachmentEntries(outcome, {
-                            ...this.translationContext(sessionId, snapshot),
+                            ...this.translationContext(sessionId, projectionSnapshot()),
                             parentUuid,
                             history,
                         });
@@ -2728,8 +2663,7 @@ export class ClaudeSessionService {
                         pendingRecoveryHookOutcomes.length = 0;
                         return;
                     }
-                    const appendResult = await this.appendProjectionMany(snapshot.tail, entries);
-                    snapshot = { entries: history, tail: appendResult.tail };
+                    await commitProjection(entries);
                     pendingRecoveryHookOutcomes.length = 0;
                 };
                 const capabilities = this.toolCapabilities();
@@ -2870,7 +2804,7 @@ export class ClaudeSessionService {
                                 backgroundTaskNotifications: (waitForRunning) => taskTools.notifications(waitForRunning),
                             }
                             : {}),
-                        notificationDelivered: (notification) => transcriptContainsBackgroundAgentNotification(snapshot.entries, notification),
+                        notificationDelivered: (notification) => transcriptContainsBackgroundAgentNotification(projectionSnapshot().entries, notification),
                         stopOwnedBackgroundAgent: (ownerSessionId, agentId) => this.backgroundTasks.stopAgent(ownerSessionId, agentId),
                         outputOwnedBackgroundAgent: (ownerSessionId, agentId, options) => this.backgroundTasks.outputAgent(ownerSessionId, agentId, options),
                         sendOwnedBackgroundAgent: (ownerSessionId, agentId, message, summary, toolUseId) => this.sendOwnedBackgroundAgent(ownerSessionId, agentId, message, summary, toolUseId),
@@ -2883,7 +2817,7 @@ export class ClaudeSessionService {
                 }
                 const agentTools = subagentExecutor
                     ? subagentExecutor.registry(sessionId, 0, (callId) => currentPromptId ??
-                        this.promptIdForToolCall(snapshot.entries, callId))
+                        this.promptIdForToolCall(projectionSnapshot().entries, callId))
                     : baseTools;
                 const turnTools = this.workflowManager && subagentExecutor && agentTools
                     ? new ClaudeWorkflowToolRegistry({
@@ -2895,7 +2829,7 @@ export class ClaudeSessionService {
                         configRoot: this.options.configRoot,
                         sessionId,
                         promptIdForCall: (callId) => currentPromptId ??
-                            this.promptIdForToolCall(snapshot.entries, callId),
+                            this.promptIdForToolCall(projectionSnapshot().entries, callId),
                         defaultModel: provider.model ?? 'praxis/provider',
                         tokenBudget: workflowTokenTarget(effectivePrompt),
                         enabled: capabilities.has('Workflow'),
@@ -2948,13 +2882,13 @@ export class ClaudeSessionService {
                                 return interactiveMessageTools.execute(call, context);
                             }
                             const snapshotMessageId = currentPromptId ??
-                                this.promptIdForToolCall(snapshot.entries, call.id);
+                                this.promptIdForToolCall(projectionSnapshot().entries, call.id);
                             const assistantMessageId = lastAssistantUuid ??
-                                this.assistantIdForToolCall(snapshot.entries, call.id);
+                                this.assistantIdForToolCall(projectionSnapshot().entries, call.id);
                             if (!snapshotMessageId || !assistantMessageId) {
                                 throw new Error('Claude file history could not link tool call');
                             }
-                            const prepared = await fileHistory.prepareMutation(snapshot.entries, snapshotMessageId, path);
+                            const prepared = await fileHistory.prepareMutation(projectionSnapshot().entries, snapshotMessageId, path);
                             let result;
                             try {
                                 result = await interactiveMessageTools.execute(call, context);
@@ -2969,18 +2903,18 @@ export class ClaudeSessionService {
                             }
                             const entry = prepared.commit(assistantMessageId);
                             if (entry) {
-                                const tail = await this.append(lease, snapshot.tail, entry);
-                                snapshot = { entries: [...snapshot.entries, entry], tail };
-                                if (nativeLease) {
-                                    await nativeLease.appendMessages({
+                                await persistence.commit({
+                                    kind: 'messages',
+                                    input: {
                                         messages: [
                                             {
                                                 role: 'user',
                                                 content: `<praxis-file-history>${JSON.stringify(entry)}</praxis-file-history>`,
                                             },
                                         ],
-                                    });
-                                }
+                                    },
+                                    projectionEntries: [entry],
+                                });
                             }
                             return result;
                         },
@@ -3058,14 +2992,13 @@ export class ClaudeSessionService {
                 const durableFollowUps = new DurableFollowUpTracker();
                 const claimedToolCallIds = new Set();
                 const observer = {
-                    ...(nativeLease
-                        ? {
-                            toolExecutionStarted: async (call) => {
-                                await nativeLease.beginToolExecution(call.id);
-                                claimedToolCallIds.add(call.id);
-                            },
-                        }
-                        : {}),
+                    toolExecutionStarted: async (call) => {
+                        await persistence.commit({
+                            kind: 'tool-execution-started',
+                            callId: call.id,
+                        });
+                        claimedToolCallIds.add(call.id);
+                    },
                     modelRequestCompleted: async (input) => {
                         observeModelRequestUsage(input);
                     },
@@ -3081,13 +3014,12 @@ export class ClaudeSessionService {
                                 providerMessageId: `msg_${randomUUID().replaceAll('-', '')}`,
                                 model: provider.model ?? 'praxis/provider',
                             },
-                        ], this.translationContext(sessionId, snapshot));
+                        ], this.translationContext(sessionId, projectionSnapshot()));
                         if (!entry)
                             throw new Error('Could not translate assistant response');
-                        const tail = await this.append(lease, snapshot.tail, entry);
-                        snapshot = { entries: [...snapshot.entries, entry], tail };
-                        lastAssistantUuid = nativeLease
-                            ? await nativeLease.appendMessages({
+                        const nativeReceipt = await persistence.commit({
+                            kind: 'messages',
+                            input: {
                                 messages: [
                                     {
                                         role: 'assistant',
@@ -3101,29 +3033,26 @@ export class ClaudeSessionService {
                                     },
                                 ],
                                 model: provider.model ?? 'praxis/provider',
-                            })
-                            : typeof entry.uuid === 'string'
-                                ? entry.uuid
-                                : lastAssistantUuid;
+                            },
+                            projectionEntries: [entry],
+                        });
+                        if (nativeReceipt.kind !== 'messages')
+                            throw new Error('Turn persistence returned an invalid message receipt');
+                        lastAssistantUuid = nativeReceipt.eventId;
                     },
                     toolCompleted: async (call, toolResult) => {
-                        currentTurnToolCalls += 1;
                         const transition = this.worktreeManager?.consumeTransition(call.id);
                         if (transition) {
-                            this.options.contextAssembler?.invalidate?.({
-                                lifecycleId: sessionId,
-                                reason: 'worktree',
-                            });
                             const stateEntry = {
                                 type: 'worktree-state',
                                 worktreeSession: transition.state,
                                 sessionId,
                             };
-                            const stateTail = await this.append(lease, snapshot.tail, stateEntry);
-                            snapshot = {
-                                entries: [...snapshot.entries, stateEntry],
-                                tail: stateTail,
-                            };
+                            await commitProjection([stateEntry]);
+                            this.options.contextAssembler?.invalidate?.({
+                                lifecycleId: sessionId,
+                                reason: 'worktree',
+                            });
                         }
                         const permissionMode = this.options.interactiveTools?.consumeTransition(call.id);
                         if (permissionMode) {
@@ -3132,21 +3061,18 @@ export class ClaudeSessionService {
                                 permissionMode,
                                 sessionId,
                             };
-                            const modeTail = await this.append(lease, snapshot.tail, modeEntry);
-                            snapshot = {
-                                entries: [...snapshot.entries, modeEntry],
-                                tail: modeTail,
-                            };
-                            if (nativeLease) {
-                                await nativeLease.appendMessages({
+                            await persistence.commit({
+                                kind: 'messages',
+                                input: {
                                     messages: [
                                         {
                                             role: 'user',
                                             content: `/permission-mode ${permissionMode}`,
                                         },
                                     ],
-                                });
-                            }
+                                },
+                                projectionEntries: [modeEntry],
+                            });
                             // Interactive mode transitions change the runtime system
                             // context for the very next provider request. Refresh here so
                             // an EnterPlanMode/ExitPlanMode tool call is immediately
@@ -3154,43 +3080,21 @@ export class ClaudeSessionService {
                             if (typeof refreshRuntimeContext === 'function')
                                 await refreshRuntimeContext();
                         }
-                        if (nativeLease) {
-                            if (!claimedToolCallIds.has(call.id) && !signal?.aborted) {
-                                await nativeLease.beginToolExecution(call.id);
-                                claimedToolCallIds.add(call.id);
-                            }
-                            await nativeLease.appendToolCompletion({
+                        if (!claimedToolCallIds.has(call.id) && !signal?.aborted) {
+                            await persistence.commit({
+                                kind: 'tool-execution-started',
                                 callId: call.id,
-                                result: toolResult,
                             });
+                            claimedToolCallIds.add(call.id);
                         }
-                        else {
-                            const [entry] = translateProviderEvents([
-                                {
-                                    type: 'tool-result',
-                                    toolCallId: call.id,
-                                    content: toolResult.content,
-                                    ...(toolResult.contentBlocks
-                                        ? { contentBlocks: toolResult.contentBlocks }
-                                        : {}),
-                                    ...(toolResult.images ? { images: toolResult.images } : {}),
-                                    ...(toolResult.documents
-                                        ? { documents: toolResult.documents }
-                                        : {}),
-                                    isError: toolResult.isError,
-                                    ...(toolResult.nativeToolUseResult
-                                        ? { nativeToolUseResult: toolResult.nativeToolUseResult }
-                                        : {}),
-                                    ...(toolResult.nativeMcpMeta
-                                        ? { nativeMcpMeta: toolResult.nativeMcpMeta }
-                                        : {}),
-                                },
-                            ], this.translationContext(sessionId, snapshot));
-                            if (!entry)
-                                throw new Error('Could not translate tool result');
-                            const tail = await this.append(lease, snapshot.tail, entry);
-                            snapshot = { entries: [...snapshot.entries, entry], tail };
-                        }
+                        await persistence.commit({
+                            kind: 'tool-completion',
+                            input: {
+                                callId: call.id,
+                                result: toolResult,
+                            },
+                        });
+                        currentTurnToolCalls += 1;
                         if (!toolResult.isError && this.options.projectMemoryDirectory) {
                             const pathValue = call.input.file_path;
                             const path = typeof pathValue === 'string'
@@ -3220,23 +3124,23 @@ export class ClaudeSessionService {
                             !toolResult.accessedPaths) {
                             return;
                         }
-                        const attachedRulePaths = this.attachedRulePaths(snapshot.entries);
+                        const attachedRulePaths = this.attachedRulePaths(projectionSnapshot().entries);
                         for (const filePath of toolResult.accessedPaths) {
                             const rules = await this.options.conditionalRuleResolver.resolve(filePath, [...attachedRulePaths]);
                             for (const rule of rules) {
-                                const attachment = createClaudeRuleAttachmentEntry(rule, this.displayRulePath(rule.path), this.translationContext(sessionId, snapshot));
-                                const attachmentTail = await this.append(lease, snapshot.tail, attachment);
-                                snapshot = {
-                                    entries: [...snapshot.entries, attachment],
-                                    tail: attachmentTail,
-                                };
-                                if (nativeLease) {
-                                    const ruleContent = rule.content.trim();
-                                    if (ruleContent.length > 0) {
-                                        await nativeLease.appendMessages({
+                                const attachment = createClaudeRuleAttachmentEntry(rule, this.displayRulePath(rule.path), this.translationContext(sessionId, projectionSnapshot()));
+                                const ruleContent = rule.content.trim();
+                                if (ruleContent.length > 0) {
+                                    await persistence.commit({
+                                        kind: 'messages',
+                                        input: {
                                             messages: [{ role: 'user', content: ruleContent }],
-                                        });
-                                    }
+                                        },
+                                        projectionEntries: [attachment],
+                                    });
+                                }
+                                else {
+                                    await commitProjection([attachment]);
                                 }
                                 attachedRulePaths.add(rule.path);
                                 await this.instructionLoaded(sessionId, {
@@ -3257,44 +3161,20 @@ export class ClaudeSessionService {
                     },
                     followUpUserMessagesCompleted: async (messages) => {
                         for (const content of messages) {
-                            if (nativeLease) {
-                                await nativeLease.appendMessages({
-                                    messages: [{ role: 'user', content }],
-                                });
-                                currentTurnUserMessages?.push(content);
-                                await Promise.all(this.sessionSubagentExecutors(sessionId, true).map((executor) => executor.acknowledgeNotifications([content])));
-                                continue;
-                            }
-                            const [followUpEntry] = translateProviderEvents([{ type: 'user-text-block', text: content }], this.translationContext(sessionId, snapshot));
-                            if (!followUpEntry) {
-                                throw new Error('Could not translate tool follow-up message');
-                            }
-                            const followUpTail = await this.append(lease, snapshot.tail, followUpEntry);
-                            snapshot = {
-                                entries: [...snapshot.entries, followUpEntry],
-                                tail: followUpTail,
-                            };
+                            await persistence.commit({
+                                kind: 'messages',
+                                input: { messages: [{ role: 'user', content }] },
+                            });
                             currentTurnUserMessages?.push(content);
                             await Promise.all(this.sessionSubagentExecutors(sessionId, true).map((executor) => executor.acknowledgeNotifications([content])));
                         }
                         await durableFollowUps.followUpUserMessagesCompleted(messages);
                     },
                     userInputDelivered: async (item) => {
-                        if (nativeLease) {
-                            await nativeLease.appendMessages({
-                                messages: [{ role: 'user', content: item.content }],
-                            });
-                            currentTurnUserMessages?.push(item.content);
-                            return;
-                        }
-                        const [steeringEntry] = translateProviderEvents([{ type: 'user-text-block', text: item.content }], this.translationContext(sessionId, snapshot));
-                        if (!steeringEntry)
-                            throw new Error('Could not translate steering message');
-                        const steeringTail = await this.append(lease, snapshot.tail, steeringEntry);
-                        snapshot = {
-                            entries: [...snapshot.entries, steeringEntry],
-                            tail: steeringTail,
-                        };
+                        await persistence.commit({
+                            kind: 'messages',
+                            input: { messages: [{ role: 'user', content: item.content }] },
+                        });
                         currentTurnUserMessages?.push(item.content);
                     },
                 };
@@ -3338,31 +3218,23 @@ export class ClaudeSessionService {
                         throw new Error(`Claude session tool call ${unresolvedToolCall.id} requires explicit recovery approval`);
                     }
                     const recoveryResults = await runtime.recoverToolCalls(unresolvedToolCalls, recoveryRequest);
-                    const recoveryUsage = recoveryResults.reduce((usage, result) => result.usage ? mergeUsage(usage, result.usage) : usage, { inputTokens: 0, outputTokens: 0 });
-                    const recoveryModelUsage = mergeSessionRawModelUsage(...recoveryResults.map((result) => result.isError ? undefined : result.modelUsage));
-                    const foregroundLineChanges = createLineCountAccumulator();
-                    for (const result of recoveryResults) {
-                        foregroundLineChanges.add(result);
-                    }
                     if (this.options.agent &&
                         agent &&
-                        getClaudeAgentSetting(snapshot.entries) !== this.options.agent) {
+                        getClaudeAgentSetting(projectionSnapshot().entries) !==
+                            this.options.agent) {
                         const agentSetting = createClaudeAgentSettingEntry(sessionId, this.options.agent);
-                        const settingTail = await this.append(lease, snapshot.tail, agentSetting);
-                        snapshot = {
-                            entries: [...snapshot.entries, agentSetting],
-                            tail: settingTail,
-                        };
-                        if (nativeLease) {
-                            await nativeLease.appendMessages({
+                        await persistence.commit({
+                            kind: 'messages',
+                            input: {
                                 messages: [
                                     {
                                         role: 'user',
                                         content: `<praxis-agent-setting>${this.options.agent}</praxis-agent-setting>`,
                                     },
                                 ],
-                            });
-                        }
+                            },
+                            projectionEntries: [agentSetting],
+                        });
                     }
                     let agentSystem = null;
                     let planModeMessage;
@@ -3429,13 +3301,6 @@ export class ClaudeSessionService {
                         type: 'state',
                         state: 'assembling-context',
                     });
-                    let compactionUsage = {
-                        inputTokens: 0,
-                        outputTokens: 0,
-                    };
-                    let compactionDurationMs;
-                    let compactionDurationWithoutRetriesMs;
-                    let compactionModelUsage;
                     const budget = this.contextBudget(provider);
                     const contextEngine = new ContextEngine({
                         ...(budget ? { budget } : {}),
@@ -3471,7 +3336,7 @@ export class ClaudeSessionService {
                         shellCommand === undefined && !shouldSkipUserPrompt()
                             ? (this.options.extensions?.agentMentionMessages(effectivePrompt) ?? [])
                             : [];
-                    let compactionAnchorUuid = this.lastMessageUuid(snapshot.entries);
+                    let compactionAnchorUuid = this.lastMessageUuid(projectionSnapshot().entries);
                     const contextTransitionPort = (pendingMessages = [], preservedUserMessages = []) => ({
                         current: () => {
                             const projection = contextPreparation.project({
@@ -3491,7 +3356,6 @@ export class ClaudeSessionService {
                             ],
                         }).envelope,
                         propose: async () => {
-                            const activeNativeLease = nativeLease;
                             if (!budget)
                                 throw new Error('Context budget is unavailable');
                             const definitions = contextPreparation.project().envelope.tools;
@@ -3547,15 +3411,15 @@ export class ClaudeSessionService {
                                         !promptContents.has(message.content)),
                                 ];
                                 if (earliest === 0 && preservedUserMessages[0] !== undefined) {
-                                    compactionLogicalParentId = activeNativeLease
-                                        .activeEvents()
-                                        .find((event) => event.kind === 'messages' &&
+                                    compactionLogicalParentId = persistence
+                                        .view()
+                                        .activeEvents.find((event) => event.kind === 'messages' &&
                                         event.messages.some((message) => message.role === 'user' &&
                                             message.content === preservedUserMessages[0]))?.id;
                                 }
                             }
                             const memorySelection = sessionMemory
-                                ? await this.selectMemoryPreservedCompact(sessionId, projectNativeSessionEntries(activeNativeLease.activeEvents()))
+                                ? await this.selectMemoryPreservedCompact(sessionId, persistence.view().projectionEntries)
                                 : null;
                             if (memorySelection) {
                                 compactableMessages = [
@@ -3576,9 +3440,9 @@ export class ClaudeSessionService {
                                 preservedMessages = historyMessages.filter((message) => message.role === 'user');
                                 const anchor = preservedMessages[0];
                                 if (anchor !== undefined) {
-                                    compactionLogicalParentId = nativeLease
-                                        .activeEvents()
-                                        .find((event) => event.kind === 'messages' &&
+                                    compactionLogicalParentId = persistence
+                                        .view()
+                                        .activeEvents.find((event) => event.kind === 'messages' &&
                                         event.messages.some((message) => message.role === 'user' &&
                                             message.content === anchor.content))?.id;
                                 }
@@ -3612,15 +3476,6 @@ export class ClaudeSessionService {
                             const { durationMs, durationWithoutRetriesMs } = requireCompactionDurations(compacted);
                             if (signal?.aborted)
                                 throw new AgentRunCancelledError();
-                            const proposedCompactionDurationMs = (compactionDurationMs ?? 0) + durationMs;
-                            if (!Number.isFinite(proposedCompactionDurationMs)) {
-                                throw new TypeError('compaction durationMs total overflow');
-                            }
-                            const proposedCompactionDurationWithoutRetriesMs = (compactionDurationWithoutRetriesMs ?? 0) +
-                                durationWithoutRetriesMs;
-                            if (!Number.isFinite(proposedCompactionDurationWithoutRetriesMs)) {
-                                throw new TypeError('compaction durationWithoutRetriesMs total overflow');
-                            }
                             const postTokens = estimateModelRequestTokens([
                                 { role: 'user', content: compacted.summary },
                                 ...preservedMessages,
@@ -3628,49 +3483,12 @@ export class ClaudeSessionService {
                             const compactModel = compacted.model !== undefined && compacted.model.trim() !== ''
                                 ? compacted.model
                                 : provider.model;
-                            const meaningfulUsage = hasNonZeroUsage(compacted.usage);
-                            if (meaningfulUsage &&
-                                (compactModel === undefined || compactModel.trim() === ''))
-                                throw new Error('Auto compact usage requires a nonblank model identity');
-                            const tracker = this.sessionCostTrackers.get(sessionId);
-                            if (!tracker)
-                                throw new Error(`Session cost tracker is not active for session ${sessionId}`);
-                            let meteringTurnInput;
-                            if (meaningfulUsage &&
-                                compactModel !== undefined &&
-                                compactModel.trim() !== '') {
-                                const pricing = this.options.pricing?.resolve(compactModel);
-                                const costUsd = pricing
-                                    ? usageCostUsd(compacted.usage, pricing)
-                                    : undefined;
-                                meteringTurnInput = {
-                                    model: compactModel,
-                                    usage: compacted.usage,
-                                    ...(costUsd === undefined ? {} : { costUsd }),
-                                    ...(compacted.usage.webSearchRequests === undefined
-                                        ? {}
-                                        : {
-                                            webSearchRequests: compacted.usage.webSearchRequests,
-                                        }),
-                                };
-                            }
-                            let meteringDurationsInput;
-                            if (durationMs > 0 || durationWithoutRetriesMs > 0)
-                                meteringDurationsInput = {
-                                    ...(durationMs === 0 ? {} : { apiDurationMs: durationMs }),
-                                    apiDurationWithoutRetriesMs: durationWithoutRetriesMs,
-                                };
-                            if (meteringTurnInput !== undefined ||
-                                meteringDurationsInput !== undefined) {
-                                const preflight = new ClaudeSessionCostTracker({
-                                    sessionId,
-                                    restored: tracker.snapshot(),
-                                });
-                                if (meteringTurnInput !== undefined)
-                                    preflight.recordTurn(meteringTurnInput);
-                                if (meteringDurationsInput !== undefined)
-                                    preflight.recordDurations(meteringDurationsInput);
-                            }
+                            const preparedCompaction = turnAccounting.prepareCompaction({
+                                usage: compacted.usage,
+                                ...(compactModel === undefined ? {} : { model: compactModel }),
+                                durationApiMs: durationMs,
+                                durationApiWithoutRetriesMs: durationWithoutRetriesMs,
+                            });
                             const summaryMessage = {
                                 role: 'user',
                                 content: compacted.summary,
@@ -3705,25 +3523,30 @@ export class ClaudeSessionService {
                                 commit: async () => {
                                     if (signal?.aborted)
                                         throw new AgentRunCancelledError();
-                                    const committed = await replacement.commit(() => nativeLease.appendCompaction({
-                                        summary: compacted.summary,
-                                        trigger: 'auto',
-                                        preTokens,
-                                        postTokens,
-                                        durationMs,
-                                        preservedMessages: replayMessages,
-                                        ...(compactionLogicalParentId === undefined
-                                            ? {}
-                                            : { logicalParentId: compactionLogicalParentId }),
-                                        ...(memorySelection
-                                            ? {
-                                                direction: 'from',
-                                                messagesSummarized: compactableMessages.length,
-                                                preservePrefix: false,
-                                            }
-                                            : {}),
+                                    const committed = await replacement.commit(() => persistence.commit({
+                                        kind: 'compaction',
+                                        input: {
+                                            summary: compacted.summary,
+                                            trigger: 'auto',
+                                            preTokens,
+                                            postTokens,
+                                            durationMs,
+                                            preservedMessages: replayMessages,
+                                            ...(compactionLogicalParentId === undefined
+                                                ? {}
+                                                : { logicalParentId: compactionLogicalParentId }),
+                                            ...(memorySelection
+                                                ? {
+                                                    direction: 'from',
+                                                    messagesSummarized: compactableMessages.length,
+                                                    preservePrefix: false,
+                                                }
+                                                : {}),
+                                        },
                                     }));
                                     const ids = committed.value;
+                                    if (ids.kind !== 'compaction')
+                                        throw new Error('Turn persistence returned an invalid compaction receipt');
                                     await this.runAdvisoryHook(sessionId, 'PostCompact', { trigger: 'auto', compact_summary: compacted.summary }, 'auto', signal);
                                     if (this.options.hooks) {
                                         const outcome = await this.hookLifecycle.refresh(sessionId, hookSession, signal);
@@ -3741,21 +3564,7 @@ export class ClaudeSessionService {
                                         preTokens,
                                         uuid: ids.boundaryId,
                                     });
-                                    compactionUsage = mergeUsage(compactionUsage, compacted.usage);
-                                    compactionDurationMs =
-                                        (compactionDurationMs ?? 0) + durationMs;
-                                    compactionDurationWithoutRetriesMs =
-                                        (compactionDurationWithoutRetriesMs ?? 0) +
-                                            durationWithoutRetriesMs;
-                                    if (meteringTurnInput !== undefined) {
-                                        tracker.recordTurn(meteringTurnInput);
-                                    }
-                                    if (compactModel !== undefined &&
-                                        compactModel.trim() !== '') {
-                                        compactionModelUsage = mergeSessionRawModelUsage(compactionModelUsage, { [compactModel]: compacted.usage });
-                                    }
-                                    if (meteringDurationsInput !== undefined)
-                                        tracker.recordDurations(meteringDurationsInput);
+                                    preparedCompaction.commit();
                                 },
                             };
                         },
@@ -3783,7 +3592,7 @@ export class ClaudeSessionService {
                             : index === 0
                                 ? { type: 'user-text', text: message.text }
                                 : { type: 'user-text-block', text: message.text };
-                        const [userEntry] = translateProviderEvents([persistenceEvent], this.translationContext(sessionId, snapshot));
+                        const [userEntry] = translateProviderEvents([persistenceEvent], this.translationContext(sessionId, projectionSnapshot()));
                         if (!userEntry)
                             throw new Error('Could not translate user prompt');
                         if (currentPromptId === null &&
@@ -3791,13 +3600,9 @@ export class ClaudeSessionService {
                             currentPromptId = userEntry.uuid;
                             compactionAnchorUuid ??= userEntry.uuid;
                         }
-                        const userTail = await this.append(lease, snapshot.tail, userEntry);
-                        snapshot = {
-                            entries: [...snapshot.entries, userEntry],
-                            tail: userTail,
-                        };
-                        if (nativeLease) {
-                            const nativePromptId = await nativeLease.appendMessages({
+                        const nativePrompt = await persistence.commit({
+                            kind: 'messages',
+                            input: {
                                 messages: [
                                     {
                                         role: 'user',
@@ -3808,29 +3613,29 @@ export class ClaudeSessionService {
                                             : {}),
                                     },
                                 ],
-                            });
-                            // File-history snapshots key their metadata to the durable
-                            // native event id, not the scratch compatibility projection id.
-                            currentPromptId = nativePromptId;
-                        }
+                            },
+                            projectionEntries: [userEntry],
+                        });
+                        // File-history snapshots key their metadata to the durable native
+                        // event id, not the compatibility projection id.
+                        if (nativePrompt.kind !== 'messages')
+                            throw new Error('Turn persistence returned an invalid message receipt');
+                        currentPromptId = nativePrompt.eventId;
                     }
                     if (fileHistory && currentPromptId) {
-                        const historySnapshot = await fileHistory.snapshot(snapshot.entries, currentPromptId);
-                        const historyTail = await this.append(lease, snapshot.tail, historySnapshot);
-                        snapshot = {
-                            entries: [...snapshot.entries, historySnapshot],
-                            tail: historyTail,
-                        };
-                        if (nativeLease) {
-                            await nativeLease.appendMessages({
+                        const historySnapshot = await fileHistory.snapshot(projectionSnapshot().entries, currentPromptId);
+                        await persistence.commit({
+                            kind: 'messages',
+                            input: {
                                 messages: [
                                     {
                                         role: 'user',
                                         content: `<praxis-file-history>${JSON.stringify(historySnapshot)}</praxis-file-history>`,
                                     },
                                 ],
-                            });
-                        }
+                            },
+                            projectionEntries: [historySnapshot],
+                        });
                     }
                     if (this.options.hooks && !shouldSkipUserPrompt()) {
                         const outcome = await this.options.hooks.run({
@@ -3844,11 +3649,7 @@ export class ClaudeSessionService {
                             throw new Error(`UserPromptSubmit hook error: ${outcome.blockedReason}`);
                         }
                     }
-                    let shellUsage = { inputTokens: 0, outputTokens: 0 };
-                    let shellModelUsage;
-                    let shellDurationApiMs;
-                    let shellDurationApiWithoutRetriesMs;
-                    let shellToolDurationMs;
+                    let shellResult;
                     if (shellCommand !== undefined) {
                         const call = {
                             id: `shell_${randomUUID().replaceAll('-', '')}`,
@@ -3860,7 +3661,6 @@ export class ClaudeSessionService {
                             callId: call.id,
                             command: shellCommand,
                         });
-                        let shellResult;
                         try {
                             shellResult = await runtime.executeDirectToolCall(call, {
                                 cwd: this.activeCwd(),
@@ -3887,15 +3687,6 @@ export class ClaudeSessionService {
                             });
                             throw error;
                         }
-                        shellUsage = shellResult.usage ?? shellUsage;
-                        shellDurationApiMs = shellResult.durationApiMs;
-                        shellDurationApiWithoutRetriesMs =
-                            shellResult.durationApiWithoutRetriesMs;
-                        shellToolDurationMs = shellResult.durationToolMs;
-                        if (!shellResult.isError) {
-                            shellModelUsage = shellResult.modelUsage;
-                            foregroundLineChanges.add(shellResult);
-                        }
                         const stdout = shellResult.processOutput?.stdout ??
                             (shellResult.isError ? '' : shellResult.content);
                         const stderr = shellResult.processOutput?.stderr ??
@@ -3905,22 +3696,15 @@ export class ClaudeSessionService {
                             { type: 'bash-input', command: shellCommand },
                             { type: 'bash-output', stdout, stderr },
                         ], {
-                            ...this.translationContext(sessionId, snapshot),
+                            ...this.translationContext(sessionId, projectionSnapshot()),
                             createUuid: () => shellUuids.shift() ?? randomUUID(),
                         });
                         if (!inputEntry || !outputEntry) {
                             throw new Error('Could not translate shell command result');
                         }
-                        const shellAppend = await this.appendProjectionMany(snapshot.tail, [
-                            inputEntry,
-                            outputEntry,
-                        ]);
-                        snapshot = {
-                            entries: [...snapshot.entries, inputEntry, outputEntry],
-                            tail: shellAppend.tail,
-                        };
-                        if (nativeLease) {
-                            await nativeLease.appendMessages({
+                        await persistence.commit({
+                            kind: 'messages',
+                            input: {
                                 messages: [
                                     {
                                         role: 'user',
@@ -3931,8 +3715,9 @@ export class ClaudeSessionService {
                                         content: `<bash-stdout>${stdout}</bash-stdout><bash-stderr>${stderr}</bash-stderr>`,
                                     },
                                 ],
-                            });
-                        }
+                            },
+                            projectionEntries: [inputEntry, outputEntry],
+                        });
                         currentTurnUserMessages.push(`<bash-stdout>${stdout}</bash-stdout><bash-stderr>${stderr}</bash-stderr>`);
                         this.options.eventSink?.({
                             type: 'shell-result',
@@ -3943,70 +3728,27 @@ export class ClaudeSessionService {
                         });
                     }
                     if (shellCommand !== undefined) {
-                        const tracker = this.sessionCostTrackers.get(sessionId);
-                        if (!tracker) {
-                            throw new Error(`Session cost tracker is not active for session ${sessionId}`);
-                        }
-                        const totalUsage = mergeUsage(recoveryUsage, shellUsage);
-                        const turnModelUsage = mergeSessionRawModelUsage(recoveryModelUsage, shellModelUsage);
-                        let rawCostUsd;
-                        if (turnModelUsage) {
-                            for (const [model, usage] of Object.entries(turnModelUsage)) {
-                                const pricing = this.options.pricing?.resolve(model);
-                                const costUsd = pricing
-                                    ? usageCostUsd(usage, pricing)
-                                    : undefined;
-                                if (costUsd !== undefined)
-                                    rawCostUsd = (rawCostUsd ?? 0) + costUsd;
-                                tracker.recordTurn({
-                                    model,
-                                    usage,
-                                    ...(costUsd === undefined ? {} : { costUsd }),
-                                    ...(usage.webSearchRequests === undefined
-                                        ? {}
-                                        : { webSearchRequests: usage.webSearchRequests }),
-                                });
-                            }
-                        }
-                        let combinedToolDurationMs = 0;
-                        for (const recoveryResult of recoveryResults) {
-                            combinedToolDurationMs = addToolDuration(recoveryResult.durationToolMs, combinedToolDurationMs);
-                        }
-                        combinedToolDurationMs = addToolDuration(shellToolDurationMs, combinedToolDurationMs);
-                        tracker.recordDurations({
-                            ...(shellDurationApiMs === undefined
-                                ? {}
-                                : { apiDurationMs: shellDurationApiMs }),
-                            ...(shellDurationApiWithoutRetriesMs === undefined
-                                ? {}
-                                : {
-                                    apiDurationWithoutRetriesMs: shellDurationApiWithoutRetriesMs,
-                                }),
-                            ...(combinedToolDurationMs === 0
-                                ? {}
-                                : { toolDurationMs: combinedToolDurationMs }),
+                        if (!shellResult)
+                            throw new Error('Shell command produced no result');
+                        const accounting = turnAccounting.complete({
+                            kind: 'shell',
+                            recovery: recoveryResults,
+                            result: shellResult,
                         });
-                        if (foregroundLineChanges.linesAdded !== 0 ||
-                            foregroundLineChanges.linesRemoved !== 0) {
-                            tracker.recordLineChanges({
-                                ...(foregroundLineChanges.linesAdded === 0
-                                    ? {}
-                                    : { linesAdded: foregroundLineChanges.linesAdded }),
-                                ...(foregroundLineChanges.linesRemoved === 0
-                                    ? {}
-                                    : { linesRemoved: foregroundLineChanges.linesRemoved }),
-                            });
-                        }
                         turnCompleted = true;
                         return {
                             sessionId,
                             text: '',
-                            usage: totalUsage,
-                            ...(rawCostUsd === undefined ? {} : { costUsd: rawCostUsd }),
-                            ...(turnModelUsage ? { modelUsage: { ...turnModelUsage } } : {}),
-                            ...(shellDurationApiMs === undefined
+                            usage: accounting.usage,
+                            ...(accounting.costUsd === undefined
+                                ? {}
+                                : { costUsd: accounting.costUsd }),
+                            ...(accounting.modelUsage === undefined
                                 ? {}
-                                : { durationApiMs: shellDurationApiMs }),
+                                : { modelUsage: accounting.modelUsage }),
+                            ...(accounting.durationApiMs === undefined
+                                ? {}
+                                : { durationApiMs: accounting.durationApiMs }),
                         };
                     }
                     if (shellCommand === undefined && budget) {
@@ -4086,9 +3828,7 @@ export class ClaudeSessionService {
                                     }
                                     const claimedAgentIds = new Set(this.sessionSubagentExecutors(sessionId, true).flatMap((executor) => executor.notificationClaimAgentIds()));
                                     await Promise.all(this.sessionSubagentExecutors(sessionId, true).map((executor) => {
-                                        const delivered = (notification) => transcriptContainsBackgroundAgentNotification(nativeLease
-                                            ? nativeLease.activeMessages()
-                                            : snapshot.entries, notification);
+                                        const delivered = (notification) => transcriptContainsBackgroundAgentNotification(persistence.view().activeMessages, notification);
                                         return this.hostedSubagents.has(executor)
                                             ? executor.reconcileDetachedNotifications(delivered)
                                             : executor.reconcileDeliveredNotifications(delivered);
@@ -4096,11 +3836,8 @@ export class ClaudeSessionService {
                                     await subagentExecutor?.hydratePersistedTasks(sessionId, this.activeCwd(), claimedAgentIds);
                                     const background = await this.collectSubagentNotifications(sessionId, subagentExecutor ?? undefined);
                                     if (background) {
-                                        if (nativeLease) {
-                                            for (const message of background.messages) {
-                                                await this.appendBackgroundNotification(sessionId, message, nativeLease);
-                                            }
-                                        }
+                                        for (const message of background.messages)
+                                            await this.appendBackgroundNotification(sessionId, message, persistence);
                                         messages.push(...background.messages);
                                     }
                                     const workflow = await this.workflowManager?.notifications(true);
@@ -4226,103 +3963,15 @@ export class ClaudeSessionService {
                     if (!finalLeafUuid) {
                         throw new Error('Could not locate final assistant response');
                     }
-                    if (!nativeLease && !skipUserPrompt) {
-                        const lastPrompt = createClaudeLastPromptEntry({
-                            sessionId,
-                            lastPrompt: effectivePrompt,
-                            leafUuid: finalLeafUuid,
-                        });
-                        const tail = await this.append(lease, snapshot.tail, lastPrompt);
-                        snapshot = {
-                            entries: [...snapshot.entries, lastPrompt],
-                            tail,
-                        };
-                    }
-                    const totalUsage = mergeUsage(mergeUsage(mergeUsage(recoveryUsage, compactionUsage), shellUsage), result.usage);
-                    const tracker = this.sessionCostTrackers.get(sessionId);
-                    if (!tracker) {
-                        throw new Error(`Session cost tracker is not active for session ${sessionId}`);
-                    }
-                    const turnModelUsage = mergeSessionRawModelUsage(recoveryModelUsage, compactionModelUsage, shellModelUsage, result.modelUsage);
-                    const combinedDurationMs = compactionDurationMs === undefined &&
-                        result.durationApiMs === undefined
-                        ? undefined
-                        : (compactionDurationMs ?? 0) + (result.durationApiMs ?? 0);
-                    let rawCostUsd;
-                    if (turnModelUsage) {
-                        for (const [model, usage] of Object.entries(turnModelUsage)) {
-                            const pricing = this.options.pricing?.resolve(model);
-                            const costUsd = pricing ? usageCostUsd(usage, pricing) : undefined;
-                            if (costUsd !== undefined)
-                                rawCostUsd = (rawCostUsd ?? 0) + costUsd;
-                        }
-                    }
-                    // Auto-compaction metering was already recorded atomically with each
-                    // committed boundary, and externally metered tool-summary metrics were
-                    // committed through the summary callback, so the live tracker receives
-                    // only the unrecorded subset here. The inclusive public aggregates
-                    // above still contain every row and duration.
-                    const trackedModelUsage = mergeSessionRawModelUsage(recoveryModelUsage, shellModelUsage, result.unrecordedModelUsage ?? result.modelUsage);
-                    if (trackedModelUsage) {
-                        for (const [model, usage] of Object.entries(trackedModelUsage)) {
-                            const pricing = this.options.pricing?.resolve(model);
-                            const costUsd = pricing ? usageCostUsd(usage, pricing) : undefined;
-                            tracker.recordTurn({
-                                model,
-                                usage,
-                                ...(costUsd === undefined ? {} : { costUsd }),
-                                ...(usage.webSearchRequests === undefined
-                                    ? {}
-                                    : { webSearchRequests: usage.webSearchRequests }),
-                            });
-                        }
-                    }
-                    let combinedToolDurationMs = 0;
-                    for (const recoveryResult of recoveryResults) {
-                        combinedToolDurationMs = addToolDuration(recoveryResult.durationToolMs, combinedToolDurationMs);
-                    }
-                    combinedToolDurationMs = addToolDuration(result.durationToolMs, combinedToolDurationMs);
-                    const trackedDurationApiMs = result.unrecordedDurationApiMs ?? result.durationApiMs;
-                    const trackedDurationApiWithoutRetriesMs = result.unrecordedDurationApiWithoutRetriesMs ??
-                        result.durationApiWithoutRetriesMs;
-                    tracker.recordDurations({
-                        ...(trackedDurationApiMs === undefined
-                            ? {}
-                            : { apiDurationMs: trackedDurationApiMs }),
-                        ...(trackedDurationApiWithoutRetriesMs === undefined
-                            ? {}
-                            : {
-                                apiDurationWithoutRetriesMs: trackedDurationApiWithoutRetriesMs,
-                            }),
-                        ...(combinedToolDurationMs === 0
-                            ? {}
-                            : { toolDurationMs: combinedToolDurationMs }),
-                    });
-                    foregroundLineChanges.add({
-                        isError: false,
-                        ...(result.linesAdded === undefined
-                            ? {}
-                            : { linesAdded: result.linesAdded }),
-                        ...(result.linesRemoved === undefined
-                            ? {}
-                            : { linesRemoved: result.linesRemoved }),
+                    const accounting = turnAccounting.complete({
+                        kind: 'runtime',
+                        recovery: recoveryResults,
+                        result,
                     });
-                    if (foregroundLineChanges.linesAdded !== 0 ||
-                        foregroundLineChanges.linesRemoved !== 0) {
-                        tracker.recordLineChanges({
-                            ...(foregroundLineChanges.linesAdded === 0
-                                ? {}
-                                : { linesAdded: foregroundLineChanges.linesAdded }),
-                            ...(foregroundLineChanges.linesRemoved === 0
-                                ? {}
-                                : { linesRemoved: foregroundLineChanges.linesRemoved }),
-                        });
-                    }
                     const memorySnapshot = activeTurnMessages();
-                    const nativeMemoryMessageId = nativeLease
-                        ? projectNativeSessionEntries(nativeLease.activeEvents()).at(-1)
-                            ?.uuid
-                        : undefined;
+                    const nativeMemoryMessageId = persistence
+                        .view()
+                        .projectionEntries.at(-1)?.uuid;
                     const providerProjection = contextPreparation.project({
                         includeMemory: false,
                     });
@@ -4344,18 +3993,16 @@ export class ClaudeSessionService {
                         occupancyTokens: currentContextTokens,
                         toolCalls: currentTurnToolCalls,
                         messages: memorySnapshot,
-                        projectMessages: nativeLease
-                            ? memorySnapshot.flatMap((message, index) => (message.role === 'user' || message.role === 'assistant') &&
-                                message.content.trim().length > 0
-                                ? [
-                                    {
-                                        id: `${finalLeafUuid ?? sessionId}:${index}`,
-                                        role: message.role,
-                                        content: message.content,
-                                    },
-                                ]
-                                : [])
-                            : projectMemoryMessages(snapshot.entries),
+                        projectMessages: memorySnapshot.flatMap((message, index) => (message.role === 'user' || message.role === 'assistant') &&
+                            message.content.trim().length > 0
+                            ? [
+                                {
+                                    id: `${finalLeafUuid ?? sessionId}:${index}`,
+                                    role: message.role,
+                                    content: message.content,
+                                },
+                            ]
+                            : []),
                         directMaintenance: projectMemoryMaintained,
                     });
                     turnCompleted = true;
@@ -4364,12 +4011,16 @@ export class ClaudeSessionService {
                         text: structuredCapture && structuredCapture.calls === 1
                             ? JSON.stringify(structuredCapture.value)
                             : result.text,
-                        usage: totalUsage,
-                        ...(combinedDurationMs === undefined
+                        usage: accounting.usage,
+                        ...(accounting.durationApiMs === undefined
+                            ? {}
+                            : { durationApiMs: accounting.durationApiMs }),
+                        ...(accounting.costUsd === undefined
                             ? {}
-                            : { durationApiMs: combinedDurationMs }),
-                        ...(rawCostUsd === undefined ? {} : { costUsd: rawCostUsd }),
-                        ...(turnModelUsage ? { modelUsage: { ...turnModelUsage } } : {}),
+                            : { costUsd: accounting.costUsd }),
+                        ...(accounting.modelUsage === undefined
+                            ? {}
+                            : { modelUsage: accounting.modelUsage }),
                         ...(structuredCapture && structuredCapture.calls === 1
                             ? { structuredOutput: structuredCapture.value }
                             : {}),
@@ -4405,12 +4056,8 @@ export class ClaudeSessionService {
                         : { kind: 'resume', atEventId: resumeSessionAt }
                     : { kind: 'start' };
                 result = await nativeTranscript.withLease(activationKind, async (nativeLease) => {
-                    const scratch = new InMemoryTranscriptStore();
-                    const scratchResult = await scratch.withLease((scratchLease) => runUnderLease(scratchLease, nativeLease));
-                    if (scratchResult.status === 'conflict') {
-                        throw new Error(`native scratch transcript conflict: ${scratchResult.reason}`);
-                    }
-                    return scratchResult.value;
+                    const persistence = new TurnPersistence({ native: nativeLease });
+                    return runUnderLease(persistence);
                 });
             }
             return result;
@@ -4788,6 +4435,16 @@ export class ClaudeSessionService {
         });
     }
     async appendBackgroundNotification(sessionId, content, nativeLease) {
+        if (nativeLease instanceof TurnPersistence) {
+            if (nativeLease.view().activeMessages.length === 0) {
+                throw new Error(`Native session not found: ${sessionId}`);
+            }
+            await nativeLease.commit({
+                kind: 'messages',
+                input: { messages: [{ role: 'user', content }] },
+            });
+            return true;
+        }
         if (nativeLease) {
             if (nativeLease.activeMessages().length === 0) {
                 throw new Error(`Native session not found: ${sessionId}`);
@@ -5177,32 +4834,6 @@ export class ClaudeSessionService {
         }
         return factory(base, operations, sessionId, enabledTools);
     }
-    async append(lease, tail, entry) {
-        void lease;
-        return this.appendProjectionMany(tail, [entry]).then((result) => result.tail);
-    }
-    /**
-     * Update the in-memory compatibility projection used by the turn pipeline.
-     * Authoritative native persistence is performed by NativeSessionTranscript;
-     * these entries are never written to the native event store.
-     */
-    async appendProjectionMany(tail, entries) {
-        if (entries.length === 0)
-            throw new Error('Cannot append an empty projection');
-        const lastUuid = [...entries]
-            .reverse()
-            .find((entry) => typeof entry.uuid === 'string')?.uuid;
-        return {
-            status: 'appended',
-            tail: {
-                ...tail,
-                byteLength: tail.byteLength + entries.length,
-                lastLineHash: `projection:${tail.byteLength + entries.length}`,
-                lastEventId: typeof lastUuid === 'string' ? lastUuid : tail.lastEventId,
-                ...(tail.branchParentId === undefined ? {} : { branchParentId: null }),
-            },
-        };
-    }
     logicalTailUuid(tail) {
         return tail.branchParentId ?? tail.lastEventId;
     }