pi-background-tasks 0.7.3 → 0.7.6

package/src/core/fusion/config.ts

@@ -1,10 +1,10 @@
-import { createHash, randomBytes } from 'node:crypto';
-import { closeSync, fsyncSync, openSync, renameSync } from 'node:fs';
-import { chmod, mkdir, open, readFile, rm, writeFile } from 'node:fs/promises';
+import { createHash } from 'node:crypto';
+import { chmod, mkdir, open, readFile, rm } from 'node:fs/promises';
 import { basename, dirname, join } from 'node:path';
 import { getAgentDir } from '@earendil-works/pi-coding-agent';
 import type { Api, Model } from '@earendil-works/pi-ai';
 import { isJsonObject, parseJsonText, type JsonObject } from '../common.js';
+import { replaceFileDurable } from '../durable-fs.js';
 import {
   FUSION_MODEL_CONFIG_SCHEMA_VERSION,
   FusionError,
@@ -260,25 +260,6 @@ export function resolveFusionModels(input: ResolveFusionModelsInput): ResolvedFu
   };
 }
 
-async function fsyncFile(path: string): Promise<void> {
-  const handle = await open(path, 'r');
-  try {
-    await handle.sync();
-  } finally {
-    await handle.close();
-  }
-}
-
-async function fsyncDirectory(path: string): Promise<void> {
-  if (process.platform === 'win32') return;
-  const fd = openSync(path, 'r');
-  try {
-    fsyncSync(fd);
-  } finally {
-    closeSync(fd);
-  }
-}
-
 async function delay(ms: number): Promise<void> {
   await new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -348,20 +329,7 @@ export async function saveFusionModelConfig(
         childCreated: false,
       });
     }
-    const tmp = join(
-      dir,
-      `.${basename(path)}.${String(process.pid)}.${randomBytes(6).toString('hex')}.tmp`,
-    );
-    const text = prettyConfig(config);
-    try {
-      await writeFile(tmp, text, { encoding: 'utf8', mode: 0o600 });
-      await fsyncFile(tmp);
-      renameSync(tmp, path);
-      await fsyncDirectory(dir);
-    } catch (error) {
-      await rm(tmp, { force: true });
-      throw error;
-    }
+    await replaceFileDurable(path, prettyConfig(config));
     return revisionForPath(path);
   });
 }

package/src/core/fusion/context.ts

@@ -1,3 +1,4 @@
+import { createHash } from 'node:crypto';
 import {
   buildSessionContext,
   convertToLlm,
@@ -7,10 +8,31 @@ import type { Message } from '@earendil-works/pi-ai';
 import { canonicalJson } from '../attested-pi-run.js';
 import { isJsonObject, type JsonObject } from '../common.js';
 import {
+  FUSION_BRANCH_FILTER_ID,
+  FUSION_COMMAND_CONTEXT_POLICY_ID,
+  FUSION_CONTEXT_LEDGER_SCHEMA_VERSION,
+  FUSION_CONTEXT_TRANSFORM_ID,
+  FUSION_IMAGE_OMISSION_PREFIX,
   FUSION_INPUT_SCHEMA_VERSION,
+  FUSION_TOOL_CONTEXT_POLICY_ID,
   FusionError,
-  type FusionCanonicalInputV1,
+  type FusionBranchFilterDescriptor,
+  type FusionCanonicalInputV3,
+  type FusionCanonicalRequestV3,
+  type FusionContextOmissionLedgerV2,
+  type FusionContextPolicyDescriptor,
+  type FusionContextProjectionMapEntry,
+  type FusionConversationProjectionV3,
+  type FusionOmittedEventKind,
+  type FusionOmittedEventRecord,
+  type FusionOmittedRunCounts,
+  type FusionProjectionAccounting,
+  type FusionProjectionEntry,
+  type FusionProjectionOmissionEntry,
+  type FusionProjectionTextEntry,
+  type FusionRequestAuthority,
   type FusionSource,
+  type FusionToolCallNameCount,
 } from './types.js';
 
 export const FUSION_BRAINSTORM_TOOL_NAME = 'fusion_brainstorm';
@@ -35,8 +57,9 @@ export interface BuildFusionCanonicalInputOptions {
 }
 
 export interface BuiltFusionCanonicalInput {
-  input: FusionCanonicalInputV1;
+  input: FusionCanonicalInputV3;
   serialized: string;
+  ledger: FusionContextOmissionLedgerV2;
   transcriptLeafId: string | null;
 }
 
@@ -90,25 +113,32 @@ function messageContainsToolCall(
   return false;
 }
 
+interface EffectiveLeaf {
+  leafId: string | null;
+  activeToolCallLeafExcluded: boolean;
+}
+
 function effectiveLeafForTool(
   sessionManager: FusionReadonlySessionManager,
   toolCallId: string | undefined,
   toolName: string,
-): string | null {
+): EffectiveLeaf {
   const leaf = sessionManager.getLeafEntry();
-  if (leaf === undefined) return sessionManager.getLeafId();
+  if (leaf === undefined)
+    return { leafId: sessionManager.getLeafId(), activeToolCallLeafExcluded: false };
   const message = entryMessage(leaf);
   if (message !== undefined && messageContainsToolCall(message, toolCallId, toolName)) {
-    return leaf.parentId;
+    return { leafId: leaf.parentId, activeToolCallLeafExcluded: true };
   }
-  return sessionManager.getLeafId();
+  return { leafId: sessionManager.getLeafId(), activeToolCallLeafExcluded: false };
 }
 
-function effectiveLeafId(
+function effectiveLeaf(
   sessionManager: FusionReadonlySessionManager,
   options: BuildFusionCanonicalInputOptions,
-): string | null {
-  if (options.source !== 'tool') return sessionManager.getLeafId();
+): EffectiveLeaf {
+  if (options.source !== 'tool')
+    return { leafId: sessionManager.getLeafId(), activeToolCallLeafExcluded: false };
   return effectiveLeafForTool(
     sessionManager,
     options.toolCallId,
@@ -116,42 +146,453 @@ function effectiveLeafId(
   );
 }
 
-function textContentForTranscript(content: Message['content']): string {
-  if (typeof content === 'string') return content;
-  const parts: string[] = [];
-  for (const block of content) {
-    if (block.type === 'text') parts.push(block.text);
-    else if (block.type === 'image')
-      parts.push(`[Image omitted from fusion text transcript: ${block.mimeType}]`);
+function utf8Bytes(value: string): number {
+  return Buffer.byteLength(value, 'utf8');
+}
+
+function sha256Hex(bytes: Buffer): string {
+  return createHash('sha256').update(bytes).digest('hex');
+}
+
+function sha256Text(value: string): string {
+  return sha256Hex(Buffer.from(value, 'utf8'));
+}
+
+function uint64be(value: number): Buffer {
+  const out = Buffer.alloc(8);
+  out.writeBigUInt64BE(BigInt(value));
+  return out;
+}
+
+/** Length-prefixed framing so concatenated fields cannot collide across boundaries. */
+function lengthPrefixed(bytes: Buffer): Buffer {
+  return Buffer.concat([uint64be(bytes.length), bytes]);
+}
+
+function ledgerLeafHash(index: number, record: FusionOmittedEventRecord): Buffer {
+  return createHash('sha256')
+    .update(Buffer.from('pi-fusion-ledger-leaf-v1\0', 'utf8'))
+    .update(uint64be(index))
+    .update(lengthPrefixed(Buffer.from(canonicalJson(record), 'utf8')))
+    .digest();
+}
+
+function ledgerRootHash(leaves: readonly Buffer[]): string {
+  const hash = createHash('sha256')
+    .update(Buffer.from('pi-fusion-ledger-root-v1\0', 'utf8'))
+    .update(uint64be(leaves.length));
+  for (const leaf of leaves) hash.update(leaf);
+  return hash.digest('hex');
+}
+
+function unsupportedBlock(label: string): FusionError {
+  return new FusionError(
+    `fusion context projection encountered an unsupported conversation block: ${label}`,
+    { code: 'context_policy_unsupported_block', childCreated: false },
+  );
+}
+
+function contextPolicyId(source: FusionSource): string {
+  return source === 'tool' ? FUSION_TOOL_CONTEXT_POLICY_ID : FUSION_COMMAND_CONTEXT_POLICY_ID;
+}
+
+function requestAuthority(source: FusionSource): FusionRequestAuthority {
+  return source === 'tool' ? 'explicit_text' : 'directive_over_projected_conversation';
+}
+
+function policyDescriptor(source: FusionSource): FusionContextPolicyDescriptor {
+  return {
+    id: contextPolicyId(source),
+    transform: FUSION_CONTEXT_TRANSFORM_ID,
+    version: 2,
+    receipt_format: 'omitted_activity.v2',
+    user_text: 'verbatim',
+    assistant_text: 'verbatim',
+    assistant_thinking: 'ledger_only',
+    tool_call_arguments: 'ledger_only',
+    tool_results: 'ledger_only',
+    tool_payload_preview_bytes: 0,
+    images: 'marker_or_ledger_only',
+    unknown_block_behavior: 'error',
+  };
+}
+
+/**
+ * Accumulates omitted-event ledger rows and turns maximal contiguous non-image
+ * omission runs into compact, source-ordered receipts inside the canonical input.
+ */
+class ProjectionBuilder {
+  private readonly entries: FusionProjectionEntry[] = [];
+  private readonly ledger: FusionOmittedEventRecord[] = [];
+  private readonly leaves: Buffer[] = [];
+  private readonly projectionMap: FusionContextProjectionMapEntry[] = [];
+  private readonly toolCallNames = new Map<string, number>();
+  private pendingCounts: Required<FusionOmittedRunCounts> | undefined;
+  private pendingBytes = 0;
+  private pendingLedgerFirst = 0;
+  private pendingLedgerLast = 0;
+  private pendingSourceFirst = 0;
+  private pendingSourceLast = 0;
+
+  includedUserTextBytes = 0;
+  includedAssistantTextBytes = 0;
+  includedImageMarkers = 0;
+  emptyTextBlocks = 0;
+
+  addText(entry: FusionProjectionTextEntry): void {
+    this.flush();
+    this.entries.push(entry);
+    if (entry.role === 'user') this.includedUserTextBytes += utf8Bytes(entry.text);
+    else this.includedAssistantTextBytes += utf8Bytes(entry.text);
+  }
+
+  addOmission(
+    sourceOrdinal: number,
+    blockOrdinal: number,
+    kind: FusionOmittedEventKind,
+    payload: Buffer,
+    extra: { toolName?: string; toolCallId?: string; mimeType?: string } = {},
+  ): void {
+    const index = this.ledger.length;
+    const record: FusionOmittedEventRecord = {
+      index,
+      source_ordinal: sourceOrdinal,
+      block_ordinal: blockOrdinal,
+      kind,
+      payload_bytes: payload.length,
+      payload_sha256: sha256Hex(payload),
+    };
+    if (extra.toolName !== undefined) record.tool_name = extra.toolName;
+    if (extra.toolCallId !== undefined) record.tool_call_id = extra.toolCallId;
+    if (extra.mimeType !== undefined) record.mime_type = extra.mimeType;
+    this.ledger.push(record);
+    this.leaves.push(ledgerLeafHash(index, record));
+
+    if (extra.toolName !== undefined && kind === 'tool_call') {
+      this.toolCallNames.set(extra.toolName, (this.toolCallNames.get(extra.toolName) ?? 0) + 1);
+    }
+
+    if (kind === 'tool_result_image') {
+      this.flush();
+      this.addLedgerOnlyImageMap(index);
+      return;
+    }
+
+    if (this.pendingCounts === undefined) {
+      this.pendingCounts = {
+        assistant_thinking: 0,
+        tool_calls: 0,
+        tool_result_texts: 0,
+      };
+      this.pendingBytes = 0;
+      this.pendingLedgerFirst = index;
+      this.pendingSourceFirst = sourceOrdinal;
+    }
+    this.pendingLedgerLast = index;
+    this.pendingSourceLast = sourceOrdinal;
+    this.pendingBytes += payload.length;
+    if (kind === 'assistant_thinking') this.pendingCounts.assistant_thinking += 1;
+    else if (kind === 'tool_call') this.pendingCounts.tool_calls += 1;
+    else this.pendingCounts.tool_result_texts += 1;
+  }
+
+  private addLedgerOnlyImageMap(index: number): void {
+    const previous = this.projectionMap[this.projectionMap.length - 1];
+    if (
+      previous !== undefined &&
+      previous.entry_kind === 'ledger_only_tool_result_image' &&
+      previous.ledger_index_last + 1 === index
+    ) {
+      previous.ledger_index_last = index;
+      return;
+    }
+    this.projectionMap.push({
+      entry_kind: 'ledger_only_tool_result_image',
+      ledger_index_first: index,
+      ledger_index_last: index,
+    });
+  }
+
+  private flush(): void {
+    const counts = this.pendingCounts;
+    if (counts === undefined) return;
+    const canonicalEntryIndex = this.entries.length;
+    const entry: FusionProjectionOmissionEntry = {
+      at: [this.pendingSourceFirst, this.pendingSourceLast],
+      bytes: this.pendingBytes,
+      counts: compactCounts(counts),
+      kind: 'omitted_activity',
+    };
+    this.entries.push(entry);
+    this.projectionMap.push({
+      canonical_entry_index: canonicalEntryIndex,
+      entry_kind: 'omitted_activity',
+      ledger_index_first: this.pendingLedgerFirst,
+      ledger_index_last: this.pendingLedgerLast,
+    });
+    this.pendingCounts = undefined;
+    this.pendingBytes = 0;
+  }
+
+  finish(
+    source: FusionSource,
+    branchFilter: FusionBranchFilterDescriptor,
+    messageCount: number,
+  ): { projection: FusionConversationProjectionV3; ledger: FusionContextOmissionLedgerV2 } {
+    this.flush();
+    const rootSha256 = ledgerRootHash(this.leaves);
+    let omittedRunCount = 0;
+    let includedTextEntries = 0;
+    let receiptBytes = 0;
+    for (const entry of this.entries) {
+      if (entry.kind === 'text') includedTextEntries += 1;
+      else {
+        omittedRunCount += 1;
+        receiptBytes += utf8Bytes(canonicalJson(entry));
+      }
+    }
+    let thinkingBytes = 0;
+    let toolCallCount = 0;
+    let toolArgumentBytes = 0;
+    let toolResultTextCount = 0;
+    let toolResultTextBytes = 0;
+    let toolResultImageCount = 0;
+    let toolResultImageBytes = 0;
+    for (const row of this.ledger) {
+      if (row.kind === 'assistant_thinking') thinkingBytes += row.payload_bytes;
+      else if (row.kind === 'tool_call') {
+        toolCallCount += 1;
+        toolArgumentBytes += row.payload_bytes;
+      } else if (row.kind === 'tool_result_text') {
+        toolResultTextCount += 1;
+        toolResultTextBytes += row.payload_bytes;
+      } else {
+        toolResultImageCount += 1;
+        toolResultImageBytes += row.payload_bytes;
+      }
+    }
+    const toolCallNames: FusionToolCallNameCount[] = [...this.toolCallNames.entries()]
+      .map(([name, calls]) => ({ name, calls }))
+      .sort((left, right) => (left.name < right.name ? -1 : left.name > right.name ? 1 : 0));
+    const accounting: FusionProjectionAccounting = {
+      message_count: messageCount,
+      included_text_entry_count: includedTextEntries,
+      included_user_text_bytes: this.includedUserTextBytes,
+      included_assistant_text_bytes: this.includedAssistantTextBytes,
+      included_image_marker_count: this.includedImageMarkers,
+      empty_text_block_count: this.emptyTextBlocks,
+      omitted_run_count: omittedRunCount,
+      omitted_event_count: this.ledger.length,
+      omitted_thinking_bytes: thinkingBytes,
+      omitted_tool_call_count: toolCallCount,
+      omitted_tool_call_argument_bytes: toolArgumentBytes,
+      omitted_tool_result_text_count: toolResultTextCount,
+      omitted_tool_result_text_bytes: toolResultTextBytes,
+      omitted_tool_result_image_count: toolResultImageCount,
+      omitted_tool_result_image_bytes: toolResultImageBytes,
+      tool_call_names: toolCallNames,
+      ledger_entry_count: this.ledger.length,
+      ledger_root_sha256: rootSha256,
+      omission_receipt_utf8_bytes: receiptBytes,
+    };
+    return {
+      projection: {
+        policy: policyDescriptor(source),
+        branch_filter: branchFilter,
+        entries: this.entries,
+        accounting,
+      },
+      ledger: {
+        schema_version: FUSION_CONTEXT_LEDGER_SCHEMA_VERSION,
+        policy_id: contextPolicyId(source),
+        transform: FUSION_CONTEXT_TRANSFORM_ID,
+        entries: this.ledger,
+        projection_map: this.projectionMap,
+        root_sha256: rootSha256,
+      },
+    };
+  }
+}
+
+function imageMarker(mimeType: string): string {
+  return `${FUSION_IMAGE_OMISSION_PREFIX}${mimeType}]`;
+}
+
+/**
+ * Fixed policy rule: a zero-valued kind is absent from the receipt rather than
+ * serialized as `0`. This keeps receipts compact without losing information —
+ * absent is defined by the policy version to mean exactly zero — and it is
+ * applied unconditionally, never adaptively because an input happens to be large.
+ */
+function compactCounts(counts: Required<FusionOmittedRunCounts>): FusionOmittedRunCounts {
+  const out: FusionOmittedRunCounts = {};
+  if (counts.assistant_thinking > 0) out.assistant_thinking = counts.assistant_thinking;
+  if (counts.tool_calls > 0) out.tool_calls = counts.tool_calls;
+  if (counts.tool_result_texts > 0) out.tool_result_texts = counts.tool_result_texts;
+  return out;
+}
+
+/**
+ * Projects one user-role message. User text is retained verbatim; images stay
+ * marker-only so the child never receives raw bytes.
+ */
+function projectUserMessage(
+  builder: ProjectionBuilder,
+  content: Message['content'],
+  sourceOrdinal: number,
+): void {
+  if (typeof content === 'string') {
+    if (content.length === 0) {
+      builder.emptyTextBlocks += 1;
+      return;
+    }
+    builder.addText({
+      kind: 'text',
+      source_ordinal: sourceOrdinal,
+      block_ordinal: 0,
+      role: 'user',
+      text: content,
+    });
+    return;
   }
-  return parts.join('');
-}
-
-function serializeFusionConversation(messages: readonly Message[]): string {
-  const parts: string[] = [];
-  for (const message of messages) {
-    if (message.role === 'user') {
-      const content = textContentForTranscript(message.content);
-      if (content.length > 0) parts.push(`[User]: ${content}`);
-    } else if (message.role === 'assistant') {
-      const thinkingParts: string[] = [];
-      const textParts: string[] = [];
-      const toolCalls: string[] = [];
-      for (const block of message.content) {
-        if (block.type === 'thinking') thinkingParts.push(block.thinking);
-        else if (block.type === 'text') textParts.push(block.text);
-        else if (block.type === 'toolCall')
-          toolCalls.push(`${block.name}(${canonicalJson(block.arguments)})`);
+  for (const [blockOrdinal, block] of content.entries()) {
+    if (block.type === 'text') {
+      if (block.text.length === 0) {
+        builder.emptyTextBlocks += 1;
+        continue;
       }
-      if (thinkingParts.length > 0) parts.push(`[Assistant thinking]: ${thinkingParts.join('\n')}`);
-      if (textParts.length > 0) parts.push(`[Assistant]: ${textParts.join('\n')}`);
-      if (toolCalls.length > 0) parts.push(`[Assistant tool calls]: ${toolCalls.join('; ')}`);
-    } else {
-      const content = textContentForTranscript(message.content);
-      if (content.length > 0) parts.push(`[Tool result]: ${content}`);
+      builder.addText({
+        kind: 'text',
+        source_ordinal: sourceOrdinal,
+        block_ordinal: blockOrdinal,
+        role: 'user',
+        text: block.text,
+      });
+      continue;
+    }
+    if (block.type === 'image') {
+      builder.includedImageMarkers += 1;
+      builder.addText({
+        kind: 'text',
+        source_ordinal: sourceOrdinal,
+        block_ordinal: blockOrdinal,
+        role: 'user',
+        text: imageMarker(block.mimeType),
+      });
+      continue;
     }
+    throw unsupportedBlock(`user block ${String(Reflect.get(block, 'type'))}`);
   }
-  return parts.join('\n\n');
+}
+
+function projectAssistantMessage(
+  builder: ProjectionBuilder,
+  content: Extract<Message, { role: 'assistant' }>['content'],
+  sourceOrdinal: number,
+): void {
+  for (const [blockOrdinal, block] of content.entries()) {
+    if (block.type === 'text') {
+      if (block.text.length === 0) {
+        builder.emptyTextBlocks += 1;
+        continue;
+      }
+      builder.addText({
+        kind: 'text',
+        source_ordinal: sourceOrdinal,
+        block_ordinal: blockOrdinal,
+        role: 'assistant',
+        text: block.text,
+      });
+      continue;
+    }
+    if (block.type === 'thinking') {
+      builder.addOmission(
+        sourceOrdinal,
+        blockOrdinal,
+        'assistant_thinking',
+        Buffer.from(block.thinking, 'utf8'),
+      );
+      continue;
+    }
+    if (block.type === 'toolCall') {
+      builder.addOmission(
+        sourceOrdinal,
+        blockOrdinal,
+        'tool_call',
+        Buffer.from(canonicalJson(block.arguments), 'utf8'),
+        { toolName: block.name, toolCallId: block.id },
+      );
+      continue;
+    }
+    throw unsupportedBlock(`assistant block ${String(Reflect.get(block, 'type'))}`);
+  }
+}
+
+function projectToolResultMessage(
+  builder: ProjectionBuilder,
+  message: Extract<Message, { role: 'toolResult' }>,
+  sourceOrdinal: number,
+): void {
+  const content = message.content;
+  if (typeof content === 'string') {
+    builder.addOmission(
+      sourceOrdinal,
+      0,
+      'tool_result_text',
+      Buffer.from(content, 'utf8'),
+      { toolName: message.toolName, toolCallId: message.toolCallId },
+    );
+    return;
+  }
+  for (const [blockOrdinal, block] of content.entries()) {
+    if (block.type === 'text') {
+      builder.addOmission(
+        sourceOrdinal,
+        blockOrdinal,
+        'tool_result_text',
+        Buffer.from(block.text, 'utf8'),
+        { toolName: message.toolName, toolCallId: message.toolCallId },
+      );
+      continue;
+    }
+    if (block.type === 'image') {
+      builder.addOmission(
+        sourceOrdinal,
+        blockOrdinal,
+        'tool_result_image',
+        Buffer.from(block.data, 'utf8'),
+        {
+          toolName: message.toolName,
+          toolCallId: message.toolCallId,
+          mimeType: block.mimeType,
+        },
+      );
+      continue;
+    }
+    throw unsupportedBlock(`tool result block ${String(Reflect.get(block, 'type'))}`);
+  }
+}
+
+/**
+ * Deterministic conversation projection. Every retained source block receives
+ * exactly one disposition: included verbatim, or represented as an omission
+ * ledger row. Unknown block types fail loudly instead of disappearing.
+ */
+export function projectFusionConversation(
+  messages: readonly Message[],
+  source: FusionSource,
+  branchFilter: FusionBranchFilterDescriptor,
+): { projection: FusionConversationProjectionV3; ledger: FusionContextOmissionLedgerV2 } {
+  const builder = new ProjectionBuilder();
+  for (const [sourceOrdinal, message] of messages.entries()) {
+    if (message.role === 'user') projectUserMessage(builder, message.content, sourceOrdinal);
+    else if (message.role === 'assistant')
+      projectAssistantMessage(builder, message.content, sourceOrdinal);
+    else if (message.role === 'toolResult')
+      projectToolResultMessage(builder, message, sourceOrdinal);
+    else throw unsupportedBlock(`message role ${String(Reflect.get(message, 'role'))}`);
+  }
+  return builder.finish(source, branchFilter, messages.length);
 }
 
 export function buildFusionCanonicalInput(
@@ -165,15 +606,34 @@ export function buildFusionCanonicalInput(
     });
   }
   const entries = ctx.sessionManager.getEntries();
-  const leafId = effectiveLeafId(ctx.sessionManager, options);
-  const sessionContext = buildSessionContext(entries, leafId, entriesById(entries));
+  const leaf = effectiveLeaf(ctx.sessionManager, options);
+  const sessionContext = buildSessionContext(entries, leaf.leafId, entriesById(entries));
   const llmMessages = convertToLlm(sessionContext.messages);
-  const input: FusionCanonicalInputV1 = {
+  const toolName = options.toolName ?? FUSION_BRAINSTORM_TOOL_NAME;
+  const branchFilter: FusionBranchFilterDescriptor = {
+    id: FUSION_BRANCH_FILTER_ID,
+    tool_name: toolName,
+    tool_call_id: options.source === 'tool' ? (options.toolCallId ?? null) : null,
+    active_tool_call_leaf_excluded: leaf.activeToolCallLeafExcluded,
+  };
+  const projected = projectFusionConversation(llmMessages, options.source, branchFilter);
+  const request: FusionCanonicalRequestV3 = {
+    source: options.source,
+    authority: requestAuthority(options.source),
+    text: options.request,
+    sha256: sha256Text(options.request),
+  };
+  const input: FusionCanonicalInputV3 = {
     schema_version: FUSION_INPUT_SCHEMA_VERSION,
     cwd: ctx.cwd,
     system_prompt: ctx.getSystemPrompt(),
-    conversation_transcript: serializeFusionConversation(llmMessages),
-    request: options.request,
+    request,
+    conversation_projection: projected.projection,
+  };
+  return {
+    input,
+    serialized: canonicalJson(input),
+    ledger: projected.ledger,
+    transcriptLeafId: leaf.leafId,
   };
-  return { input, serialized: canonicalJson(input), transcriptLeafId: leafId };
 }