chore: snapshot main sync

apps/server/src/services/inference/tool-phase.ts

@@ -1,8 +1,7 @@
 import type { Agent, Session, ToolCall } from '../../types/api.js';
 import * as modelContext from '../model-context.js';
 import { PathScopeError } from '../path_guard.js';
-import { TOOLS_BY_NAME } from '../tools.js';
-import type { ToolExecCtx } from '../tools.js';
+import { TOOLS_BY_NAME, type ToolExecCtx } from "../tools.js";
 import { matchToolGlob } from '../agents.js';
 import { maybeFlagForCompaction } from './payload.js';
 import { insertParts, partsFromAssistantMessage, partsFromToolMessage } from './parts.js';
@@ -214,6 +213,7 @@ export async function executeToolPhase(
       content,
       tool_calls: toolCalls,
       reasoning: result.reasoning,
+      reasoningBlocks: result.reasoningBlocks,
     }).map((p) => ({
       ...p,
       message_id: assistantMessageId,
@@ -404,7 +404,7 @@ export async function executeToolPhase(
       });
       const tres = await executeToolCall(
         projectRoot, tc, session.allowed_read_paths,
-        { sql: ctx.sql, sessionId },
+        { sql: ctx.sql, sessionId, toolCallId: tc.id },
         ctx.hooks, sessionId,
       );
       // tool_trace instrumentation - finish