@agent-native/core 0.12.22 → 0.12.24

package/dist/server/agent-chat-plugin.js

@@ -9,7 +9,7 @@ import { attachToolSearch } from "../agent/tool-search.js";
 import { McpClientManager, loadMcpConfig, autoDetectMcpConfig, mcpToolsToActionEntries, syncMcpActionEntries, mountMcpServersRoutes, mountMcpHubRoutes, buildMergedConfig, getHubStatus, isHubServeEnabled, } from "../mcp-client/index.js";
 import { discoverAgents } from "./agent-discovery.js";
 import { loadSchemaPromptBlock } from "./schema-prompt.js";
-import { buildAssistantMessage, extractThreadMeta, upsertAssistantMessage, } from "../agent/thread-data-builder.js";
+import { buildAssistantMessage, extractThreadMeta, mergeThreadDataForClientSave, upsertAssistantMessage, } from "../agent/thread-data-builder.js";
 import { defineEventHandler, setResponseStatus, setResponseHeader, getMethod, getQuery, getHeader, } from "h3";
 import { getSession } from "./auth.js";
 import { getOrigin } from "./google-oauth.js";
@@ -2570,7 +2570,11 @@ export function createAgentChatPlugin(options) {
                 }
                 const session = await getSession(event);
                 if (session?.email) {
-                    const resolved = { owner: session.email, anonymous: false };
+                    const resolved = {
+                        owner: session.email,
+                        anonymous: false,
+                        name: session.name,
+                    };
                     if (eventContext)
                         eventContext[OWNER_CONTEXT_KEY] = resolved;
                     return resolved;
@@ -2591,6 +2595,9 @@ export function createAgentChatPlugin(options) {
             const getOwnerFromEvent = async (event) => {
                 return (await resolveOwnerContext(event)).owner;
             };
+            const getUserNameFromEvent = async (event) => {
+                return (await resolveOwnerContext(event)).name;
+            };
             // Auto-mount template actions as HTTP endpoints under /_agent-native/actions/
             // Include engine management script so the UI can call manage-agent-engine.
             const httpActions = {
@@ -2615,6 +2622,7 @@ export function createAgentChatPlugin(options) {
                 const { mountActionRoutes } = await import("./action-routes.js");
                 mountActionRoutes(nitroApp, httpActions, {
                     getOwnerFromEvent,
+                    getUserNameFromEvent,
                     resolveOrgId: options?.resolveOrgId,
                 });
             }
@@ -3819,27 +3827,26 @@ export function createAgentChatPlugin(options) {
                             }
                             const body = await readBody(event);
                             let newThreadData = body.threadData || thread.threadData;
-                            // Preserve queuedMessages from the existing thread_data when the
-                            // incoming blob doesn't include it. Periodic full-thread saves
-                            // (exported via threadRuntime.export) don't carry the queue, and
-                            // we don't want them to clobber queued-message state persisted
-                            // via POST /threads/:id/queued.
+                            let newMessageCount = body.messageCount ?? thread.messageCount;
+                            // Merge the incoming full-thread blob over the current SQL
+                            // copy. Periodic saves can be stale relative to server-side
+                            // run completion, and threadRuntime.export() does not carry
+                            // queuedMessages.
                             if (body.threadData) {
                                 try {
                                     const existing = JSON.parse(thread.threadData);
-                                    if (existing.queuedMessages !== undefined) {
-                                        const incoming = JSON.parse(newThreadData);
-                                        if (incoming.queuedMessages === undefined) {
-                                            incoming.queuedMessages = existing.queuedMessages;
-                                            newThreadData = JSON.stringify(incoming);
-                                        }
+                                    const incoming = JSON.parse(newThreadData);
+                                    const merged = mergeThreadDataForClientSave(existing, incoming);
+                                    newThreadData = JSON.stringify(merged);
+                                    if (Array.isArray(merged.messages)) {
+                                        newMessageCount = merged.messages.length;
                                     }
                                 }
                                 catch {
                                     // Invalid JSON in either side — fall back to raw body blob.
                                 }
                             }
-                            await updateThreadData(threadId, newThreadData, body.title ?? thread.title, body.preview ?? thread.preview, body.messageCount || thread.messageCount);
+                            await updateThreadData(threadId, newThreadData, body.title ?? thread.title, body.preview ?? thread.preview, newMessageCount);
                             return { ok: true };
                         });
                     }
@@ -3949,7 +3956,12 @@ export function createAgentChatPlugin(options) {
                     tzRaw.trim().length < 64
                     ? tzRaw.trim()
                     : undefined;
-                return runWithRequestContext({ userEmail: owner, orgId: resolvedOrgId, timezone }, () => {
+                return runWithRequestContext({
+                    userEmail: owner,
+                    userName: ownerContext.name,
+                    orgId: resolvedOrgId,
+                    timezone,
+                }, () => {
                     const handler = ownerContext.anonymous && anonymousHandler
                         ? anonymousHandler
                         : currentDevMode && devHandler