@agent-native/core 0.196.0 → 0.196.1-nightly-20260928204657

package/dist/chat-threads/store.js

@@ -256,28 +256,253 @@ function normalizeForkSourceSnapshot(source) {
     catch {
         return null;
     }
-    const repoMessageCount = Array.isArray(parsed.messages)
-        ? parsed.messages.length
-        : 0;
-    if (repoMessageCount <= 0)
+    const messageCount = countThreadMessages(parsed, 0);
+    if (messageCount <= 0)
         return null;
     return {
         threadData: JSON.stringify(parsed),
         title: typeof source.title === "string" ? source.title : "",
         preview: typeof source.preview === "string" ? source.preview : "",
-        messageCount: repoMessageCount,
+        messageCount,
+        ...(typeof source.fromMessageId === "string"
+            ? { fromMessageId: source.fromMessageId }
+            : {}),
         ...(Object.prototype.hasOwnProperty.call(source, "scope")
             ? { scope: source.scope ?? null }
             : {}),
     };
 }
+function countThreadMessages(value, fallback) {
+    const repo = normalizeThreadRepository(value);
+    if (!repo || typeof repo !== "object")
+        return fallback;
+    const repoMessageCount = Array.isArray(repo.messages)
+        ? repo.messages.length
+        : undefined;
+    const agentKitMessageCount = Array.isArray(repo.agentKit?.messages)
+        ? repo.agentKit.messages.length
+        : undefined;
+    if (repoMessageCount === undefined && agentKitMessageCount === undefined) {
+        return fallback;
+    }
+    return Math.max(repoMessageCount ?? 0, agentKitMessageCount ?? 0);
+}
+function forkThreadData(threadData, forkId, fromMessageId) {
+    const parsed = normalizeThreadRepository(JSON.parse(threadData));
+    const repository = parsed && typeof parsed === "object" && !Array.isArray(parsed)
+        ? parsed
+        : undefined;
+    const agentKit = repository?.agentKit;
+    if (!agentKit || typeof agentKit !== "object" || Array.isArray(agentKit)) {
+        return threadData;
+    }
+    const agentKitRecord = agentKit;
+    const asRecord = (value) => value && typeof value === "object" && !Array.isArray(value)
+        ? value
+        : undefined;
+    const repositoryMessages = Array.isArray(repository.messages)
+        ? repository.messages
+        : [];
+    const protocolMessages = Array.isArray(agentKitRecord.messages)
+        ? agentKitRecord.messages
+        : [];
+    const messageId = (value) => {
+        const outer = asRecord(value);
+        const message = asRecord(outer?.message) ?? outer;
+        return typeof message?.id === "string" ? message.id : undefined;
+    };
+    const messageIds = new Set();
+    if (fromMessageId) {
+        for (const messages of [repositoryMessages, protocolMessages]) {
+            const throughIndex = messages.findIndex((message) => messageId(message) === fromMessageId);
+            if (throughIndex >= 0) {
+                for (const message of messages.slice(0, throughIndex + 1)) {
+                    const id = messageId(message);
+                    if (id)
+                        messageIds.add(id);
+                }
+            }
+        }
+        if (!messageIds.has(fromMessageId)) {
+            throw new Error(`Unknown message for fork: ${fromMessageId}`);
+        }
+    }
+    else {
+        for (const message of [...repositoryMessages, ...protocolMessages]) {
+            const id = messageId(message);
+            if (id)
+                messageIds.add(id);
+        }
+    }
+    const events = Array.isArray(agentKitRecord.events)
+        ? agentKitRecord.events
+        : [];
+    const runs = Array.isArray(agentKitRecord.runs) ? agentKitRecord.runs : [];
+    const eventBoundaries = new Map();
+    for (const rawEvent of events) {
+        const event = asRecord(rawEvent);
+        const message = asRecord(event?.message);
+        const messageId = typeof event?.messageId === "string"
+            ? event.messageId
+            : typeof message?.id === "string"
+                ? message.id
+                : undefined;
+        if (event?.type === "message.completed" &&
+            typeof event?.runId === "string" &&
+            typeof event.sequence === "number" &&
+            messageId &&
+            messageIds.has(messageId)) {
+            eventBoundaries.set(event.runId, Math.max(eventBoundaries.get(event.runId) ?? 0, event.sequence));
+        }
+    }
+    for (const rawRun of runs) {
+        const run = asRecord(rawRun);
+        if (typeof run?.id === "string" &&
+            typeof run.activeMessageId === "string" &&
+            messageIds.has(run.activeMessageId) &&
+            typeof run.lastSequence === "number") {
+            eventBoundaries.set(run.id, Math.max(eventBoundaries.get(run.id) ?? 0, run.lastSequence));
+        }
+    }
+    const retainedRunIds = new Set(eventBoundaries.keys());
+    const nonterminalRunIds = new Set(runs.flatMap((rawRun) => {
+        const run = asRecord(rawRun);
+        return typeof run?.id === "string" &&
+            (run.status === "queued" ||
+                run.status === "running" ||
+                run.status === "awaiting_approval" ||
+                run.status === "awaiting_input")
+            ? [run.id]
+            : [];
+    }));
+    const activeMessageIds = new Set(runs.flatMap((rawRun) => {
+        const run = asRecord(rawRun);
+        return typeof run?.id === "string" &&
+            nonterminalRunIds.has(run.id) &&
+            typeof run.activeMessageId === "string"
+            ? [run.activeMessageId]
+            : [];
+    }));
+    const retainedMessageId = (value) => {
+        const id = messageId(value);
+        return Boolean(id && messageIds.has(id));
+    };
+    const remapThreadId = (value) => value && typeof value === "object" && !Array.isArray(value)
+        ? { ...value, threadId: forkId }
+        : value;
+    return JSON.stringify({
+        ...repository,
+        ...(Array.isArray(repository.messages)
+            ? { messages: repositoryMessages.filter(retainedMessageId) }
+            : {}),
+        agentKit: {
+            ...agentKitRecord,
+            ...(Array.isArray(agentKitRecord.messages)
+                ? {
+                    messages: agentKitRecord.messages
+                        .filter(retainedMessageId)
+                        .map((message) => {
+                        const record = asRecord(message);
+                        return typeof record.id === "string" &&
+                            activeMessageIds.has(record.id) &&
+                            record.status === "streaming"
+                            ? { ...record, status: "complete" }
+                            : record;
+                    }),
+                }
+                : {}),
+            ...(Array.isArray(agentKitRecord.events)
+                ? {
+                    events: events.flatMap((rawEvent) => {
+                        const event = asRecord(rawEvent);
+                        const runId = event?.runId;
+                        const boundary = typeof runId === "string"
+                            ? eventBoundaries.get(runId)
+                            : undefined;
+                        if (typeof runId !== "string" ||
+                            boundary === undefined ||
+                            typeof event?.sequence !== "number" ||
+                            event.sequence > boundary) {
+                            return [];
+                        }
+                        if (nonterminalRunIds.has(runId) &&
+                            (event.type === "activity.started" ||
+                                event.type === "activity.updated")) {
+                            const activity = asRecord(event.activity);
+                            if (activity?.status === "running") {
+                                return [
+                                    {
+                                        ...event,
+                                        type: "activity.completed",
+                                        activity: { ...activity, status: "cancelled" },
+                                        threadId: forkId,
+                                    },
+                                ];
+                            }
+                        }
+                        return [remapThreadId(rawEvent)];
+                    }),
+                }
+                : {}),
+            ...(Array.isArray(agentKitRecord.runs)
+                ? {
+                    runs: runs.flatMap((rawRun) => {
+                        const run = asRecord(rawRun);
+                        if (typeof run?.id !== "string" || !retainedRunIds.has(run.id)) {
+                            return [];
+                        }
+                        const copied = {
+                            ...run,
+                            threadId: forkId,
+                        };
+                        if (nonterminalRunIds.has(run.id)) {
+                            copied.status = "cancelled";
+                            delete copied.activeMessageId;
+                        }
+                        return [copied];
+                    }),
+                }
+                : {}),
+            ...(fromMessageId && Array.isArray(agentKitRecord.toolCalls)
+                ? {
+                    toolCalls: agentKitRecord.toolCalls.filter((rawToolCall) => {
+                        const toolCall = asRecord(rawToolCall);
+                        if (typeof toolCall?.messageId === "string") {
+                            return messageIds.has(toolCall.messageId);
+                        }
+                        return (typeof toolCall?.runId === "string" &&
+                            retainedRunIds.has(toolCall.runId));
+                    }),
+                }
+                : {}),
+            ...(Array.isArray(agentKitRecord.widgets)
+                ? {
+                    widgets: agentKitRecord.widgets.filter((widget) => {
+                        const record = asRecord(widget);
+                        return (typeof record?.messageId === "string" &&
+                            messageIds.has(record.messageId));
+                    }),
+                }
+                : {}),
+            ...(Array.isArray(agentKitRecord.annotations)
+                ? {
+                    annotations: agentKitRecord.annotations.filter((annotation) => {
+                        const record = asRecord(annotation);
+                        return (typeof record?.messageId === "string" &&
+                            messageIds.has(record.messageId));
+                    }),
+                }
+                : {}),
+            ...(fromMessageId ? { suggestions: [] } : {}),
+            activeRunIds: [],
+        },
+    });
+}
 function deriveMessageCount(threadData, fallback) {
     if (typeof threadData !== "string" || !threadData.trim())
         return fallback;
     try {
-        const repo = normalizeThreadRepository(JSON.parse(threadData));
-        if (Array.isArray(repo.messages))
-            return repo.messages.length;
+        return countThreadMessages(JSON.parse(threadData), fallback);
     }
     catch {
         // Keep the stored count if the JSON blob is malformed.
@@ -485,18 +710,17 @@ export async function forkThread(sourceId, ownerEmail, opts) {
     }
     else if (snapshot &&
         source.ownerEmail === ownerEmail &&
-        snapshot.messageCount > source.messageCount) {
-        // The source row exists but the in-memory snapshot is fresher — the agent
-        // run flushed an older state to SQL, but the tab has additional unflushed
-        // messages. Overlay the snapshot before cloning so the fork captures the
-        // latest user-visible content. Guard with messageCount > stored to avoid
-        // clobbering a fresher persisted row with a stale snapshot from another
-        // tab.
+        (snapshot.fromMessageId || snapshot.messageCount > source.messageCount)) {
+        // Message-scoped forks intentionally carry a truncated snapshot even when
+        // the persisted source has later messages; full forks only overlay fresher
+        // client snapshots.
         source = {
             ...source,
             threadData: snapshot.threadData,
             title: snapshot.title || source.title,
-            preview: snapshot.preview || source.preview,
+            preview: snapshot.fromMessageId
+                ? snapshot.preview
+                : snapshot.preview || source.preview,
             messageCount: snapshot.messageCount,
         };
     }
@@ -505,6 +729,7 @@ export async function forkThread(sourceId, ownerEmail, opts) {
         return null;
     }
     const id = opts?.id ?? generateId();
+    const threadData = forkThreadData(source.threadData, id, snapshot?.fromMessageId);
     const now = Date.now();
     const title = source.title ? `${source.title} (fork)` : "";
     const client = getDbExec();
@@ -516,7 +741,7 @@ export async function forkThread(sourceId, ownerEmail, opts) {
             ownerEmail,
             title,
             source.preview,
-            source.threadData,
+            threadData,
             source.messageCount,
             now,
             now,
@@ -534,7 +759,7 @@ export async function forkThread(sourceId, ownerEmail, opts) {
         ownerEmail,
         title,
         preview: source.preview,
-        threadData: source.threadData,
+        threadData,
         messageCount: source.messageCount,
         createdAt: now,
         updatedAt: now,
@@ -787,9 +1012,7 @@ export async function updateThreadData(id, threadData, title, preview, messageCo
                     preserveExistingTopLevelKeys: options.preserveExistingTopLevelKeys ?? true,
                 });
                 nextThreadData = JSON.stringify(merged);
-                if (Array.isArray(merged.messages)) {
-                    nextMessageCount = merged.messages.length;
-                }
+                nextMessageCount = countThreadMessages(merged, messageCount);
             }
             catch {
                 // Keep the caller's serialized value if either JSON blob is malformed.

package/dist/client/AgentKitAssistantChat.js

@@ -1,4 +1,5 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { hasActiveAgentRuns, } from "@agent-native/agentkit";
 import { AgentKitChat, AgentKitComposer, AgentApprovalPrompt, AgentMessageView, useAgentKit, useAgentKitControl, useAgentThread, } from "@agent-native/agentkit/react";
 import { AgentKitRoot } from "@agent-native/agentkit/react/root";
 import { AgentSuggestionBar, agentSuggestionPrompt, } from "@agent-native/toolkit/composer";
@@ -577,7 +578,7 @@ export const AgentKitAssistantChat = forwardRef(function AgentKitAssistantChat(p
                 }, children: history ? (_jsx(AgentKitHistoryProvider, { history: history, children: _jsx(AgentKitDevCheckpointProvider, { apiUrl: props.apiUrl ?? agentNativePath("/_agent-native/agent-chat"), children: _jsx(AgentKitAssistantChatBody, { ...props, threadId: threadId, handoffSnapshot: handoffSnapshot, getThreadSnapshot: getThreadSnapshot, threadRestore: threadRestore, retryThreadRestore: retryThreadRestore, onThreadRestoreLoaded: onThreadRestoreLoaded, ref: ref }) }) })) : (_jsx(AgentKitDevCheckpointProvider, { apiUrl: props.apiUrl ?? agentNativePath("/_agent-native/agent-chat"), children: _jsx(AgentKitAssistantChatBody, { ...props, threadId: threadId, handoffSnapshot: handoffSnapshot, getThreadSnapshot: getThreadSnapshot, threadRestore: threadRestore, retryThreadRestore: retryThreadRestore, onThreadRestoreLoaded: onThreadRestoreLoaded, ref: ref }) })) }) }) }));
 });
 const AgentKitAssistantChatBody = forwardRef(function AgentKitAssistantChatBody(props, ref) {
-    const { threadId, requestComposerFocus } = useAgentKit();
+    const { controller, threadId, requestComposerFocus } = useAgentKit();
     const control = useAgentKitControl(threadId);
     const thread = useAgentThread(threadId);
     const history = useOptionalAgentKitHistory();
@@ -701,7 +702,8 @@ const AgentKitAssistantChatBody = forwardRef(function AgentKitAssistantChatBody(
     const latestAssistant = useMemo(() => [...thread.messages]
         .reverse()
         .find((message) => message.role === "assistant"), [thread.messages]);
-    const isRunning = thread.activeRunIds.length > 0;
+    const isRunning = hasActiveAgentRuns(thread);
+    const isThreadRunning = useCallback(() => hasActiveAgentRuns(controller.getThread(threadId)), [controller, threadId]);
     useEffect(() => {
         if (previousPrefillRevisionRef.current === prefillRevision)
             return;
@@ -1541,7 +1543,7 @@ const AgentKitAssistantChatBody = forwardRef(function AgentKitAssistantChatBody(
         thread.queuedMessages,
         threadId,
     ]);
-    const send = useCallback(async (text, images, options) => submit(text, [], [], { intent: isRunning ? "queued" : "immediate" }, {
+    const send = useCallback(async (text, images, options) => submit(text, [], [], { intent: isThreadRunning() ? "queued" : "immediate" }, {
         ...options,
         attachments: [
             ...(options?.attachments ?? []),
@@ -1551,9 +1553,9 @@ const AgentKitAssistantChatBody = forwardRef(function AgentKitAssistantChatBody(
                 url,
             })),
         ],
-    }), [isRunning, submit]);
+    }), [isThreadRunning, submit]);
     const sendRecoveryMessage = useCallback(async (text, recoveryAction, images, attachments, references, recoveryOptions) => {
-        return submit(text, [], [], { intent: isRunning ? "queued" : "immediate" }, {
+        return submit(text, [], [], { intent: isThreadRunning() ? "queued" : "immediate" }, {
             hideUserMessage: true,
             recoveryAction,
             recoveryReferences: references,
@@ -1567,7 +1569,7 @@ const AgentKitAssistantChatBody = forwardRef(function AgentKitAssistantChatBody(
                 })),
             ],
         });
-    }, [isRunning, submit]);
+    }, [isThreadRunning, submit]);
     const resumeIntegrationPrompt = useCallback((message) => {
         if (props.isActiveComposer === false)
             return;
@@ -1576,10 +1578,10 @@ const AgentKitAssistantChatBody = forwardRef(function AgentKitAssistantChatBody(
         });
     }, [props.isActiveComposer, props.tabId, send, threadId]);
     const submitSuggestion = useCallback((prompt) => void submit(prompt, [], [], {
-        intent: isRunning ? "queued" : "immediate",
+        intent: isThreadRunning() ? "queued" : "immediate",
     }).catch((error) => {
         dispatchSetupRequiredEvent(error, props.tabId, threadId);
-    }), [isRunning, props.tabId, submit, threadId]);
+    }), [isThreadRunning, props.tabId, submit, threadId]);
     const retryDeferredSubmission = useCallback(async () => {
         if (!deferredProviderSubmissionFailureId)
             return;
@@ -1659,7 +1661,7 @@ const AgentKitAssistantChatBody = forwardRef(function AgentKitAssistantChatBody(
                 url,
             })),
         }),
-        isRunning: () => thread.activeRunIds.length > 0,
+        isRunning: isThreadRunning,
         hasInFlightWork: () => Object.values(thread.tools).some((tool) => tool.status === "running") ||
             Object.values(thread.activities).some((activity) => activity.status === "running"),
         focusComposer: () => requestComposerFocus(threadId),
@@ -1787,6 +1789,7 @@ function AgentKitSelectionPill({ length, onClear, }) {
                     }) }), _jsx("button", { type: "button", "aria-label": t("agentChat.selection.clear"), onClick: onClear, className: "flex h-4 w-4 items-center justify-center rounded text-muted-foreground hover:bg-accent/60 hover:text-foreground", children: _jsx(IconX, { size: 11, "aria-hidden": "true" }) })] }) }));
 }
 function AgentKitTranscript({ children, threadId }) {
+    const { controller } = useAgentKit();
     const surface = useAgentKitSurface();
     const t = useT();
     const thread = useAgentThread(threadId);
@@ -1800,11 +1803,19 @@ function AgentKitTranscript({ children, threadId }) {
         browserTabId: surface.props.browserTabId,
         threadId,
         onSubmitMessage: async ({ message, context }) => {
-            await surface.onSubmit(appendAgentChatContextToMessage(message, context), [], [], { intent: surface.isRunning ? "queued" : "immediate" });
+            await surface.onSubmit(appendAgentChatContextToMessage(message, context), [], [], {
+                intent: hasActiveAgentRuns(controller.getThread(threadId))
+                    ? "queued"
+                    : "immediate",
+            });
             return { delivered: true };
         },
         onSkipMessage: async ({ message, context }) => {
-            await surface.onSubmit(appendAgentChatContextToMessage(message, context), [], [], { intent: surface.isRunning ? "queued" : "immediate" });
+            await surface.onSubmit(appendAgentChatContextToMessage(message, context), [], [], {
+                intent: hasActiveAgentRuns(controller.getThread(threadId))
+                    ? "queued"
+                    : "immediate",
+            });
             return { delivered: true };
         },
     });
@@ -2035,7 +2046,7 @@ function AgentKitMessageSupplement(props) {
         .join("\n");
     const integration = value.role === "assistant" &&
         value.status === "complete" &&
-        thread.activeRunIds.length === 0
+        !hasActiveAgentRuns(thread)
         ? findMcpConnectionSuggestionIntegration({
             text,
             contextText,