@jait/gateway 0.1.461 → 0.1.463

package/dist/routes/chat.js

@@ -3,7 +3,7 @@ import {} from "../config.js";
 import { FileSystemSurface } from "../surfaces/filesystem.js";
 import { extractTodoResultItems } from "../providers/todo-result.js";
 import { RemoteCliProvider } from "../providers/remote-cli-provider.js";
-import { resolveWorkspaceRoot } from "../tools/core/get-fs.js";
+import { resolveProjectRoot } from "../tools/core/get-fs.js";
 import { existsSync } from "node:fs";
 import { messages as messagesTable } from "../db/schema.js";
 import { eq } from "drizzle-orm";
@@ -40,7 +40,7 @@ function buildCliProviderSystemPrompt(provider, model, mode, promptCtx) {
         backend: provider,
     });
 }
-function buildExternalProviderContextFlow(requestProvider, model, setupMessage, systemPrompt, userContent, sentAt, note) {
+function buildExternalProviderContextFlow(requestProvider, model, setupMessage, systemPrompt, userContent, sentAt, note, memory) {
     const messages = [
         { role: "system", content: setupMessage },
     ];
@@ -52,6 +52,7 @@ function buildExternalProviderContextFlow(requestProvider, model, setupMessage,
         provider: requestProvider,
         ...(model ? { model } : {}),
         note,
+        ...(memory ? { memory } : {}),
         rounds: [{
                 round: 1,
                 createdAt: sentAt,
@@ -60,6 +61,79 @@ function buildExternalProviderContextFlow(requestProvider, model, setupMessage,
             }],
     };
 }
+function truncateForMemoryBlock(value, max = 220) {
+    const compact = value.replace(/\s+/g, " ").trim();
+    if (compact.length <= max)
+        return compact;
+    return `${compact.slice(0, max - 1)}…`;
+}
+function shouldIncludeContactMemories(content) {
+    return /\b(based on what you know|remember|preference|preferences|prefer|my usual|about me|what do you know)\b/i.test(content);
+}
+function memorySourceLabel(entry) {
+    return `${entry.source.type}:${entry.source.id}@${entry.source.surface}`;
+}
+function toContextFlowMemoryEntry(entry) {
+    return {
+        id: entry.id,
+        scope: entry.scope,
+        source: memorySourceLabel(entry),
+        sourceType: entry.source.type,
+        sourceId: entry.source.id,
+        sourceSurface: entry.source.surface,
+        updatedAt: entry.updatedAt,
+        content: truncateForMemoryBlock(entry.content),
+    };
+}
+function buildRelevantMemoryPromptBlock(entries) {
+    const lines = entries.slice(0, 5).map((entry) => {
+        const content = truncateForMemoryBlock(entry.content);
+        return `- [id=${entry.id} scope=${entry.scope} source=${memorySourceLabel(entry)} updated=${entry.updatedAt}] ${content}`;
+    });
+    return [
+        "<relevant_memory>",
+        "Use these memories only when they are directly relevant. Do not mention memory IDs unless the user asks for provenance.",
+        ...lines,
+        "</relevant_memory>",
+    ].join("\n");
+}
+async function retrieveRelevantMemoryContext(memoryService, content) {
+    const query = content.trim();
+    if (!memoryService || !query)
+        return null;
+    const projectMemories = await memoryService.search(query, 5, "project");
+    const byId = new Map();
+    for (const entry of projectMemories)
+        byId.set(entry.id, entry);
+    if (shouldIncludeContactMemories(query)) {
+        const contactMemories = await memoryService.search(query, Math.max(0, 5 - byId.size), "contact");
+        for (const entry of contactMemories)
+            byId.set(entry.id, entry);
+    }
+    const entries = [...byId.values()].slice(0, 5);
+    if (entries.length === 0) {
+        return {
+            block: "",
+            flow: {
+                query,
+                retrieved: [],
+                injectedIds: [],
+                ignoredIds: [],
+                savedIds: [],
+            },
+        };
+    }
+    return {
+        block: buildRelevantMemoryPromptBlock(entries),
+        flow: {
+            query,
+            retrieved: entries.map(toContextFlowMemoryEntry),
+            injectedIds: entries.map((entry) => entry.id),
+            ignoredIds: [],
+            savedIds: [],
+        },
+    };
+}
 function buildSyntheticSkillToolCall(skills) {
     if (skills.length === 0)
         return null;
@@ -129,9 +203,9 @@ function parseUserDisplaySegments(raw) {
             });
             continue;
         }
-        if (record.type === "workspace" && typeof record.path === "string") {
+        if (record.type === "project" && typeof record.path === "string") {
             segments.push({
-                type: "workspace",
+                type: "project",
                 path: record.path,
                 name: typeof record.name === "string" ? record.name : record.path.split("/").pop() ?? record.path,
             });
@@ -142,7 +216,7 @@ function parseUserDisplaySegments(raw) {
                 type: "terminal",
                 terminalId: record.terminalId,
                 name: typeof record.name === "string" ? record.name : record.terminalId,
-                ...(typeof record.workspaceRoot === "string" ? { workspaceRoot: record.workspaceRoot } : {}),
+                ...(typeof record.projectRoot === "string" ? { projectRoot: record.projectRoot } : {}),
                 ...(parseDisplayLineRange(record) ? { lineRange: parseDisplayLineRange(record) } : {}),
                 ...(typeof record.selectedText === "string" ? { selectedText: record.selectedText } : {}),
             });
@@ -618,7 +692,7 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
     let memoryService;
     let ws;
     let sessionStateService;
-    let workspaceService;
+    let projectService;
     let providerRegistry;
     let skillRegistry;
     if (depsOrDb && typeof depsOrDb === "object" && "sessionService" in depsOrDb) {
@@ -633,7 +707,7 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
         memoryService = deps.memoryService;
         ws = deps.ws;
         sessionStateService = deps.sessionState;
-        workspaceService = deps.workspaceService;
+        projectService = deps.projectService;
         providerRegistry = deps.providerRegistry;
         skillRegistry = deps.skillRegistry;
     }
@@ -835,6 +909,28 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
             app.log.error(err, "Failed to persist message");
         }
     }
+    function updateLatestAssistantContextFlow(sessionId, contextFlow) {
+        if (!db)
+            return;
+        try {
+            const rows = db
+                .select()
+                .from(messagesTable)
+                .where(eq(messagesTable.sessionId, sessionId))
+                .orderBy(messagesTable.createdAt)
+                .all();
+            const lastAssistant = [...rows].reverse().find((row) => row.role === "assistant");
+            if (!lastAssistant)
+                return;
+            db.update(messagesTable)
+                .set({ contextFlow })
+                .where(eq(messagesTable.id, lastAssistant.id))
+                .run();
+        }
+        catch (err) {
+            app.log.error(err, "Failed to update assistant context flow");
+        }
+    }
     // ── Tool execution helper ──────────────────────────────────────────
     async function executeTool(toolName, args, sessionId, auth, onOutputChunk, signal) {
         if (!toolRegistry) {
@@ -844,15 +940,15 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
             return { ok: false, message: "Cancelled" };
         }
         const sessionRecord = sessionService?.getById(sessionId);
-        const workspaceRecord = sessionRecord?.workspaceId
-            ? workspaceService?.getById(sessionRecord.workspaceId, auth?.userId)
+        const projectRecord = sessionRecord?.projectId
+            ? projectService?.getById(sessionRecord.projectId, auth?.userId)
             : null;
-        const wsPath = workspaceRecord?.rootPath ?? sessionRecord?.workspacePath;
+        const wsPath = projectRecord?.rootPath ?? sessionRecord?.projectPath;
         const context = {
             sessionId,
             actionId: uuidv7(),
-            workspaceRoot: surfaceRegistry
-                ? resolveWorkspaceRoot(surfaceRegistry, sessionId, wsPath)
+            projectRoot: surfaceRegistry
+                ? resolveProjectRoot(surfaceRegistry, sessionId, wsPath)
                 : (wsPath?.trim() || process.cwd()),
             requestedBy: "agent",
             userId: auth?.userId,
@@ -989,16 +1085,16 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
         };
         // Build conversation history (hydrate from DB if needed)
         hydrateSession(sessionId);
-        // Resolve workspace root so the system prompt includes it
+        // Resolve project root so the system prompt includes it
         const sessionRecord = sessionService?.getById(sessionId);
-        const workspaceRecord = sessionRecord?.workspaceId
-            ? workspaceService?.getById(sessionRecord.workspaceId, authUser.id)
+        const projectRecord = sessionRecord?.projectId
+            ? projectService?.getById(sessionRecord.projectId, authUser.id)
             : null;
         const wsRoot = surfaceRegistry
-            ? resolveWorkspaceRoot(surfaceRegistry, sessionId, workspaceRecord?.rootPath ?? sessionRecord?.workspacePath)
-            : ((workspaceRecord?.rootPath ?? sessionRecord?.workspacePath)?.trim() || process.cwd());
+            ? resolveProjectRoot(surfaceRegistry, sessionId, projectRecord?.rootPath ?? sessionRecord?.projectPath)
+            : ((projectRecord?.rootPath ?? sessionRecord?.projectPath)?.trim() || process.cwd());
         const promptCtx = {
-            workspaceRoot: wsRoot,
+            projectRoot: wsRoot,
             skills: skillRegistry?.listEnabled(),
             responseStyle,
             backend: llmRuntime.backend,
@@ -1009,7 +1105,7 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
             ]);
         }
         else {
-            // Update system prompt if mode/model/workspace changed mid-session
+            // Update system prompt if mode/model/project changed mid-session
             const h = sessionHistory.get(sessionId);
             const modePrompt = buildSystemPrompt(chatMode, modelEndpoint, promptCtx);
             if (h[0]?.role === "system" && h[0].content !== modePrompt) {
@@ -1045,8 +1141,8 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
         }
         try {
             sessionService?.touch(sessionId);
-            if (sessionRecord?.workspaceId) {
-                workspaceService?.touch(sessionRecord.workspaceId);
+            if (sessionRecord?.projectId) {
+                projectService?.touch(sessionRecord.projectId);
             }
         }
         catch { /* session may not exist */ }
@@ -1077,6 +1173,9 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
         const matchedSkills = (promptCtx.skills ?? []).filter((skill) => matchedSkillIds.has(skill.id));
         const turnSkillToolCall = buildSyntheticSkillToolCall(matchedSkills);
         emitSyntheticSkillToolCall(sessionId, turnSkillToolCall, safeWrite, emitToSubscribers);
+        const relevantMemory = await retrieveRelevantMemoryContext(memoryService, content);
+        const memoryFlow = relevantMemory?.flow;
+        const memoryBlock = relevantMemory?.block;
         const providerLabel = requestProvider === "codex"
             ? "Codex"
             : requestProvider === "claude-code"
@@ -1099,9 +1198,9 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
             // ══ CLI Provider path (codex / claude-code via MCP) ══════════
             if (requestProvider && requestProvider !== "jait" && providerRegistry) {
                 const cliWsRoot = surfaceRegistry
-                    ? resolveWorkspaceRoot(surfaceRegistry, sessionId, workspaceRecord?.rootPath ?? sessionRecord?.workspacePath)
-                    : ((workspaceRecord?.rootPath ?? sessionRecord?.workspacePath)?.trim() || process.cwd());
-                // Detect if the workspace lives on a remote node (e.g. Windows
+                    ? resolveProjectRoot(surfaceRegistry, sessionId, projectRecord?.rootPath ?? sessionRecord?.projectPath)
+                    : ((projectRecord?.rootPath ?? sessionRecord?.projectPath)?.trim() || process.cwd());
+                // Detect if the project lives on a remote node (e.g. Windows
                 // desktop) and route the CLI provider session there instead of
                 // trying to spawn codex/claude-code locally on the gateway.
                 const pathExistsLocally = existsSync(cliWsRoot);
@@ -1143,11 +1242,11 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                     safeWrite(`data: ${JSON.stringify({ type: "provider_fallback", from: requestProvider, to: "jait", reason })}\n\n`);
                 }
                 else {
-                    console.log(`[chat/cli] session=${sessionId} wsRoot="${cliWsRoot}" session.workspacePath="${sessionRecord?.workspacePath}" surfaces=${surfaceRegistry?.getBySession(sessionId)?.length ?? 0}`);
+                    console.log(`[chat/cli] session=${sessionId} wsRoot="${cliWsRoot}" session.projectPath="${sessionRecord?.projectPath}" surfaces=${surfaceRegistry?.getBySession(sessionId)?.length ?? 0}`);
                     // Ensure a FileSystemSurface exists for this session so we can
                     // back up files before CLI providers (Codex/Claude) write them,
                     // enabling the keep/discard (undo) flow.
-                    // Use _skipBroadcast so the UI doesn't open the workspace panel.
+                    // Use _skipBroadcast so the UI doesn't open the project panel.
                     let cliFsSurface = null;
                     if (surfaceRegistry) {
                         const fsId = `fs-${sessionId}`;
@@ -1161,7 +1260,7 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                                 surfaceRegistry.onSurfaceStarted = null;
                                 const started = await surfaceRegistry.startSurface("filesystem", fsId, {
                                     sessionId,
-                                    workspaceRoot: cliWsRoot,
+                                    projectRoot: cliWsRoot,
                                 });
                                 surfaceRegistry.onSurfaceStarted = prevHandler;
                                 cliFsSurface = started;
@@ -1171,7 +1270,7 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                     }
                     const mcpServers = [providerRegistry.buildJaitMcpServerRef(config, getRequestBaseUrl(request), {
                             sessionId,
-                            workspaceRoot: cliWsRoot,
+                            projectRoot: cliWsRoot,
                         })];
                     // ── Reuse an existing CLI session if one is alive for this Jait session ──
                     const cachedCliSession = activeCliSessions.get(sessionId);
@@ -1204,11 +1303,11 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                         activeCliSessions.set(sessionId, { providerId: requestProvider, runtimeMode, providerSessionId, provider: cliProvider });
                         console.log(`[chat/cli] Started new ${requestProvider}/${runtimeMode}${isRemote ? " (remote)" : ""} session ${providerSessionId} for ${sessionId}`);
                     }
-                    // Tell the frontend about the execution context (node, workspace)
+                    // Tell the frontend about the execution context (node, project)
                     safeWrite(`data: ${JSON.stringify({
                         type: "session_info",
                         provider: requestProvider,
-                        workspacePath: cliWsRoot,
+                        projectPath: cliWsRoot,
                         isRemote,
                         ...(remoteNodeInfo ? { remoteNode: remoteNodeInfo } : {}),
                     })}\n\n`);
@@ -1394,9 +1493,10 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                     });
                     const responseStyleBlock = getResponseStyleInstructions(responseStyle);
                     const cliSystemPrompt = buildCliProviderSystemPrompt(requestProvider, typeof body["model"] === "string" ? body["model"] : undefined, chatMode, promptCtx);
-                    let cliContent = content;
+                    const cliUserContent = memoryBlock ? `${memoryBlock}\n\n${content}` : content;
+                    let cliContent = cliUserContent;
                     if (isNewCliSession) {
-                        cliContent = formatExternalProviderFirstTurn(cliSystemPrompt, content);
+                        cliContent = formatExternalProviderFirstTurn(cliSystemPrompt, cliUserContent);
                     }
                     else if (responseStyleBlock) {
                         cliContent = `<responseStyle>\n${responseStyleBlock}\n</responseStyle>\n\n${cliContent}`;
@@ -1437,7 +1537,7 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                                 : "Jait did not paste its internal system prompt into this provider turn.",
                             "Provider-native hidden system prompts may still exist inside the CLI provider and are not visible to Jait.",
                         ].join("\n");
-                        const cliContextFlow = buildExternalProviderContextFlow(requestProvider, typeof body["model"] === "string" ? body["model"] : undefined, setupContent, cliSystemPrompt, content, sentAt, "CLI providers keep their own session context. This captures the Jait setup metadata, the external-provider system prompt, and the user turn content. On reused CLI sessions, the system prompt is shown for inspection even though it was only sent when Jait initialized or recovered the provider session.");
+                        const cliContextFlow = buildExternalProviderContextFlow(requestProvider, typeof body["model"] === "string" ? body["model"] : undefined, setupContent, cliSystemPrompt, cliUserContent, sentAt, "CLI providers keep their own session context. This captures the Jait setup metadata, the external-provider system prompt, and the user turn content. On reused CLI sessions, the system prompt is shown for inspection even though it was only sent when Jait initialized or recovered the provider session.", memoryFlow);
                         contextFlowJson = JSON.stringify(cliContextFlow);
                         safeWrite(`data: ${JSON.stringify({ type: "context_flow", ...cliContextFlow })}\n\n`);
                         emitToSubscribers(sessionId, { type: "context_flow", ...cliContextFlow });
@@ -1473,7 +1573,7 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                         });
                         const refreshedSystemPrompt = buildCliProviderSystemPrompt(requestProvider, typeof body["model"] === "string" ? body["model"] : undefined, chatMode, promptCtx);
                         let recoveryContent = content;
-                        recoveryContent = formatExternalProviderFirstTurn(refreshedSystemPrompt, content);
+                        recoveryContent = formatExternalProviderFirstTurn(refreshedSystemPrompt, cliUserContent);
                         const sentAt = new Date().toISOString();
                         const setupContent = [
                             "CLI provider recovery session setup captured by Jait.",
@@ -1486,7 +1586,7 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                             "Jait pasted its external-provider system prompt into this recovery provider session turn.",
                             "Provider-native hidden system prompts may still exist inside the CLI provider and are not visible to Jait.",
                         ].join("\n");
-                        const cliContextFlow = buildExternalProviderContextFlow(requestProvider, typeof body["model"] === "string" ? body["model"] : undefined, setupContent, refreshedSystemPrompt, content, sentAt, "CLI providers keep their own session context. This captures the Jait recovery setup metadata, the current Jait session system prompt, and the user turn content.");
+                        const cliContextFlow = buildExternalProviderContextFlow(requestProvider, typeof body["model"] === "string" ? body["model"] : undefined, setupContent, refreshedSystemPrompt, cliUserContent, sentAt, "CLI providers keep their own session context. This captures the Jait recovery setup metadata, the current Jait session system prompt, and the user turn content.", memoryFlow);
                         contextFlowJson = JSON.stringify(cliContextFlow);
                         safeWrite(`data: ${JSON.stringify({ type: "context_flow", ...cliContextFlow })}\n\n`);
                         emitToSubscribers(sessionId, { type: "context_flow", ...cliContextFlow });
@@ -1627,47 +1727,64 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                     }
                 };
                 const contextRounds = [];
-                const result = await runAgentLoop({
-                    llm: llmRuntime,
-                    history,
-                    toolSchemas,
-                    hasTools,
-                    sessionId,
-                    auth: {
-                        userId: authUser.id,
-                        apiKeys: userApiKeys,
-                        providerId: swarmWorkerProvider ?? requestProvider,
-                        model: requestBodyModel || undefined,
-                        jaitBackend,
-                        runtimeMode: requestRuntimeMode ?? undefined,
-                    },
-                    abort: streamAbort,
-                    maxRounds: MAX_TOOL_ROUNDS,
-                    parallel: true,
-                    toolRegistry,
-                    disabledTools,
-                    mode: chatMode,
-                    onEvent,
-                    onContext: (round) => {
-                        contextRounds.push(round);
-                        contextFlowJson = JSON.stringify({
-                            provider: "jait",
-                            model: llmRuntime.openaiModel,
-                            rounds: contextRounds,
-                        });
-                        const event = {
-                            type: "context_flow",
-                            provider: "jait",
-                            model: llmRuntime.openaiModel,
-                            rounds: contextRounds,
-                        };
-                        emitToSubscribers(sessionId, event);
-                        safeWrite(`data: ${JSON.stringify(event)}\n\n`);
-                    },
-                    onPersist: (sid, role, content, tc, seg, thinking) => persistMessage(sid, role, content, tc, seg, contextFlowJson, thinking),
-                    priorFingerprints: sessionFingerprints.get(sessionId),
-                    log: app.log,
-                }, executeTool, steering);
+                const injectedMemoryMessage = memoryBlock
+                    ? { role: "system", content: memoryBlock }
+                    : null;
+                if (injectedMemoryMessage)
+                    history.push(injectedMemoryMessage);
+                let result;
+                try {
+                    result = await runAgentLoop({
+                        llm: llmRuntime,
+                        history,
+                        toolSchemas,
+                        hasTools,
+                        sessionId,
+                        auth: {
+                            userId: authUser.id,
+                            apiKeys: userApiKeys,
+                            providerId: swarmWorkerProvider ?? requestProvider,
+                            model: requestBodyModel || undefined,
+                            jaitBackend,
+                            runtimeMode: requestRuntimeMode ?? undefined,
+                        },
+                        abort: streamAbort,
+                        maxRounds: MAX_TOOL_ROUNDS,
+                        parallel: true,
+                        toolRegistry,
+                        disabledTools,
+                        mode: chatMode,
+                        onEvent,
+                        onContext: (round) => {
+                            contextRounds.push(round);
+                            contextFlowJson = JSON.stringify({
+                                provider: "jait",
+                                model: llmRuntime.openaiModel,
+                                rounds: contextRounds,
+                                ...(memoryFlow ? { memory: memoryFlow } : {}),
+                            });
+                            const event = {
+                                type: "context_flow",
+                                provider: "jait",
+                                model: llmRuntime.openaiModel,
+                                rounds: contextRounds,
+                                ...(memoryFlow ? { memory: memoryFlow } : {}),
+                            };
+                            emitToSubscribers(sessionId, event);
+                            safeWrite(`data: ${JSON.stringify(event)}\n\n`);
+                        },
+                        onPersist: (sid, role, content, tc, seg, thinking) => persistMessage(sid, role, content, tc, seg, contextFlowJson, thinking),
+                        priorFingerprints: sessionFingerprints.get(sessionId),
+                        log: app.log,
+                    }, executeTool, steering);
+                }
+                finally {
+                    if (injectedMemoryMessage) {
+                        const index = history.indexOf(injectedMemoryMessage);
+                        if (index >= 0)
+                            history.splice(index, 1);
+                    }
+                }
                 fullContent = result.content;
                 partialToolCalls = result.executedToolCalls;
                 if (turnSkillToolCall) {
@@ -1687,21 +1804,24 @@ export function registerChatRoutes(app, config, depsOrDb, sessionServiceArg) {
                         provider: "jait",
                         model: llmRuntime.openaiModel,
                         rounds: contextRounds,
+                        ...(memoryFlow ? { memory: memoryFlow } : {}),
                     });
                     const finalEvent = {
                         type: "context_flow",
                         provider: "jait",
                         model: llmRuntime.openaiModel,
                         rounds: contextRounds,
+                        ...(memoryFlow ? { memory: memoryFlow } : {}),
                     };
                     emitToSubscribers(sessionId, finalEvent);
                     safeWrite(`data: ${JSON.stringify(finalEvent)}\n\n`);
                 }
                 if (contextFlowJson) {
-                    const lastAssistant = [...history].reverse().find((msg) => msg.role === "assistant" && !msg.contextFlow);
+                    const lastAssistant = [...history].reverse().find((msg) => msg.role === "assistant");
                     if (lastAssistant) {
                         lastAssistant.contextFlow = JSON.parse(contextFlowJson);
                     }
+                    updateLatestAssistantContextFlow(sessionId, contextFlowJson);
                 }
                 // Track executed tool calls for retry API
                 sessionExecutedToolCalls.set(sessionId, result.executedToolCalls);