@sqlrooms/ai-core 0.26.0-rc.2 → 0.26.0-rc.4

package/dist/AiSlice.d.ts

@@ -1,17 +1,23 @@
-import { ExtendedTool } from '@openassistant/utils';
-import { AiSliceConfig, AnalysisSessionSchema } from '@sqlrooms/ai-config';
+import { AiSliceConfig, AnalysisResultSchema, AnalysisSessionSchema } from '@sqlrooms/ai-config';
 import { BaseRoomConfig, RoomState, type StateCreator } from '@sqlrooms/room-store';
-import { z } from 'zod';
-export type AiSliceTool = ExtendedTool<z.ZodTypeAny, unknown, unknown, unknown>;
+import { UIMessage, DefaultChatTransport, LanguageModel } from 'ai';
+import { OpenAssistantToolSet } from '@openassistant/utils';
+type ExtendedChatOnToolCallCallback = (args: {
+    toolCall: any;
+    addToolResult?: any;
+}) => Promise<any> | any;
 export type AiSliceState = {
     ai: {
         config: AiSliceConfig;
         analysisPrompt: string;
         isRunningAnalysis: boolean;
-        tools: Record<string, AiSliceTool>;
+        tools: OpenAssistantToolSet;
         analysisAbortController?: AbortController;
         setAnalysisPrompt: (prompt: string) => void;
-        startAnalysis: () => Promise<void>;
+        addAnalysisResult: (message: UIMessage) => void;
+        startAnalysis: (sendMessage: (message: {
+            text: string;
+        }) => void) => Promise<void>;
         cancelAnalysis: () => void;
         setAiModel: (modelProvider: string, model: string) => void;
         createSession: (name?: string, modelProvider?: string, model?: string) => void;
@@ -19,12 +25,29 @@ export type AiSliceState = {
         renameSession: (sessionId: string, name: string) => void;
         deleteSession: (sessionId: string) => void;
         getCurrentSession: () => AnalysisSessionSchema | undefined;
+        setSessionUiMessages: (sessionId: string, uiMessages: UIMessage[]) => void;
+        setSessionToolAdditionalData: (sessionId: string, toolCallId: string, additionalData: unknown) => void;
+        getAnalysisResults: () => AnalysisResultSchema[];
         deleteAnalysisResult: (sessionId: string, resultId: string) => void;
+        getAssistantMessageParts: (analysisResultId: string) => UIMessage['parts'];
         findToolComponent: (toolName: string) => React.ComponentType | undefined;
         getApiKeyFromSettings: () => string;
         getBaseUrlFromSettings: () => string | undefined;
         getMaxStepsFromSettings: () => number;
         getFullInstructions: () => string;
+        getLocalChatTransport: () => DefaultChatTransport<UIMessage>;
+        /** Optional remote endpoint to use for chat; if empty, local transport is used */
+        chatEndPoint: string;
+        chatHeaders: Record<string, string>;
+        getRemoteChatTransport: (endpoint: string, headers?: Record<string, string>) => DefaultChatTransport<UIMessage>;
+        onChatToolCall: ExtendedChatOnToolCallCallback;
+        onChatData: (dataPart: any) => void;
+        onChatFinish: (args: {
+            message: UIMessage;
+            messages: UIMessage[];
+            isError?: boolean;
+        }) => void;
+        onChatError: (error: unknown) => void;
     };
 };
 /**
@@ -35,7 +58,7 @@ export interface AiSliceOptions {
     /** Initial prompt to display in the analysis input */
     initialAnalysisPrompt?: string;
     /** Tools to add to the AI assistant */
-    tools: Record<string, AiSliceTool>;
+    tools: OpenAssistantToolSet;
     /**
      * Function to get custom instructions for the AI assistant
      * @returns The instructions string to use
@@ -43,10 +66,17 @@ export interface AiSliceOptions {
     getInstructions: () => string;
     defaultProvider?: string;
     defaultModel?: string;
+    /** Provide a pre-configured model client for a provider (e.g., Azure). */
+    getCustomModel?: () => LanguageModel | undefined;
     maxSteps?: number;
     getApiKey?: (modelProvider: string) => string;
     getBaseUrl?: () => string;
+    /** Optional remote endpoint to use for chat; if empty, local transport is used */
+    chatEndPoint?: string;
+    /** Optional headers to send with remote endpoint */
+    chatHeaders?: Record<string, string>;
 }
 export declare function createAiSlice<PC extends BaseRoomConfig>(params: AiSliceOptions): StateCreator<AiSliceState>;
 export declare function useStoreWithAi<T, PC extends BaseRoomConfig, S extends RoomState<PC> & AiSliceState>(selector: (state: S) => T): T;
+export {};
 //# sourceMappingURL=AiSlice.d.ts.map

package/dist/AiSlice.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AiSlice.d.ts","sourceRoot":"","sources":["../src/AiSlice.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AiSlice.d.ts","sourceRoot":"","sources":["../src/AiSlice.ts"],"names":[],"mappings":"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"}

package/dist/AiSlice.js

@@ -2,10 +2,10 @@ import { createId } from '@paralleldrive/cuid2';
 import { createDefaultAiConfig, } from '@sqlrooms/ai-config';
 import { createBaseSlice, useBaseRoomStore, } from '@sqlrooms/room-store';
 import { produce } from 'immer';
-import { runAnalysis } from './analysis';
+import { createLocalChatTransportFactory, createRemoteChatTransportFactory, createChatHandlers, } from './chatTransport';
 import { hasAiSettingsConfig } from './hasAiSettingsConfig';
 export function createAiSlice(params) {
-    const { defaultProvider = 'openai', defaultModel = 'gpt-4.1', initialAnalysisPrompt = '', tools, getApiKey, getBaseUrl, maxSteps, getInstructions, } = params;
+    const { initialAnalysisPrompt = '', tools, getApiKey, getBaseUrl, maxSteps = 50, getInstructions, defaultProvider = 'openai', defaultModel = 'gpt-4.1', getCustomModel, chatEndPoint = '', chatHeaders = {}, } = params;
     return createBaseSlice((set, get, store) => {
         return {
             ai: {
@@ -71,6 +71,9 @@ export function createAiSlice(params) {
                             model: model || currentSession?.model || 'gpt-4.1',
                             analysisResults: [],
                             createdAt: new Date(),
+                            uiMessages: [],
+                            toolAdditionalData: {},
+                            messagesRevision: 0,
                         });
                         draft.ai.config.currentSessionId = newSessionId;
                     }));
@@ -119,93 +122,34 @@ export function createAiSlice(params) {
                     }));
                 },
                 /**
-                 * Start the analysis
-                 * TODO: how to pass the history analysisResults?
+                 * Save the Ai SDK UI messages for a session
                  */
-                startAnalysis: async () => {
-                    const resultId = createId();
-                    const abortController = new AbortController();
-                    const currentSession = get().ai.getCurrentSession();
-                    if (!currentSession) {
-                        console.error('No current session found');
-                        return;
-                    }
+                setSessionUiMessages: (sessionId, uiMessages) => {
                     set((state) => produce(state, (draft) => {
-                        draft.ai.analysisAbortController = abortController;
-                        draft.ai.isRunningAnalysis = true;
-                        const session = draft.ai.config.sessions.find((s) => s.id === draft.ai.config.currentSessionId);
+                        const session = draft.ai.config.sessions.find((s) => s.id === sessionId);
                         if (session) {
-                            session.analysisResults.push({
-                                id: resultId,
-                                prompt: get().ai.analysisPrompt,
-                                streamMessage: {
-                                    parts: [
-                                        {
-                                            type: 'text',
-                                            text: '',
-                                        },
-                                    ],
-                                },
-                                isCompleted: false,
-                            });
+                            // store the latest UI messages from the chat hook
+                            // Create a deep copy to avoid read-only property issues
+                            session.uiMessages = JSON.parse(JSON.stringify(uiMessages));
                         }
                     }));
-                    try {
-                        await runAnalysis({
-                            modelProvider: currentSession.modelProvider || defaultProvider,
-                            model: currentSession.model || defaultModel,
-                            apiKey: get().ai.getApiKeyFromSettings(),
-                            baseUrl: get().ai.getBaseUrlFromSettings(),
-                            prompt: get().ai.analysisPrompt,
-                            abortController,
-                            tools: get().ai.tools,
-                            maxSteps: get().ai.getMaxStepsFromSettings(),
-                            getInstructions: get().ai.getFullInstructions,
-                            historyAnalysis: currentSession.analysisResults,
-                            onStreamResult: (isCompleted, streamMessage) => {
-                                set(makeResultsAppender({
-                                    resultId,
-                                    streamMessage,
-                                    isCompleted,
-                                }));
-                            },
-                        });
-                    }
-                    catch (err) {
-                        set(makeResultsAppender({
-                            resultId,
-                            isCompleted: true,
-                            errorMessage: {
-                                error: err instanceof Error ? err.message : String(err),
-                            },
-                        }));
-                    }
-                    finally {
-                        set((state) => produce(state, (draft) => {
-                            draft.ai.isRunningAnalysis = false;
-                            draft.ai.analysisPrompt = '';
-                        }));
-                    }
-                },
-                cancelAnalysis: () => {
-                    set((state) => produce(state, (draft) => {
-                        draft.ai.isRunningAnalysis = false;
-                    }));
-                    get().ai.analysisAbortController?.abort('Analysis cancelled');
                 },
                 /**
-                 * Delete an analysis result from a session
+                 * Save additional data for a session
                  */
-                deleteAnalysisResult: (sessionId, resultId) => {
+                setSessionToolAdditionalData: (sessionId, toolCallId, additionalData) => {
                     set((state) => produce(state, (draft) => {
                         const session = draft.ai.config.sessions.find((s) => s.id === sessionId);
                         if (session) {
-                            session.analysisResults = session.analysisResults.filter((r) => r.id !== resultId);
+                            if (!session.toolAdditionalData) {
+                                session.toolAdditionalData = {};
+                            }
+                            session.toolAdditionalData[toolCallId] = additionalData;
                         }
                     }));
                 },
                 findToolComponent: (toolName) => {
-                    return Object.entries(get().ai.tools).find(([name]) => name === toolName)?.[1]?.component;
+                    return get().ai.tools[toolName]?.component;
                 },
                 getBaseUrlFromSettings: () => {
                     // First try the getBaseUrl function if provided
@@ -233,7 +177,7 @@ export function createAiSlice(params) {
                     const currentSession = getCurrentSessionFromState(store);
                     if (currentSession) {
                         // First try the getApiKey function if provided
-                        const apiKeyFromFunction = getApiKey?.(currentSession.modelProvider || defaultProvider);
+                        const apiKeyFromFunction = getApiKey?.(currentSession.modelProvider || 'openai');
                         if (apiKeyFromFunction) {
                             return apiKeyFromFunction;
                         }
@@ -264,7 +208,7 @@ export function createAiSlice(params) {
                             return settingsMaxSteps;
                         }
                     }
-                    return 5;
+                    return 50;
                 },
                 getFullInstructions: () => {
                     const store = get();
@@ -279,6 +223,189 @@ export function createAiSlice(params) {
                     }
                     return instructions;
                 },
+                /**
+                 * Start the analysis
+                 * TODO: how to pass the history analysisResults?
+                 */
+                startAnalysis: async (sendMessage) => {
+                    const abortController = new AbortController();
+                    const currentSession = get().ai.getCurrentSession();
+                    if (!currentSession) {
+                        console.error('No current session found');
+                        return;
+                    }
+                    const promptText = get().ai.analysisPrompt;
+                    set((state) => produce(state, (draft) => {
+                        draft.ai.analysisAbortController = abortController;
+                        draft.ai.isRunningAnalysis = true;
+                        // Add incomplete analysis result to session immediately for instant UI rendering
+                        const session = draft.ai.config.sessions.find((s) => s.id === currentSession.id);
+                        if (session) {
+                            // Add incomplete analysis result with a temporary ID
+                            // This will be updated in onChatFinish with the actual user message ID
+                            session.analysisResults.push({
+                                id: '__pending__',
+                                prompt: promptText,
+                                isCompleted: false,
+                            });
+                        }
+                    }));
+                    // The pending analysis result will be updated in onChatFinish with the correct message ID
+                    sendMessage({ text: promptText });
+                },
+                cancelAnalysis: () => {
+                    const currentSession = get().ai.getCurrentSession();
+                    set((state) => produce(state, (draft) => {
+                        draft.ai.isRunningAnalysis = false;
+                        // Remove pending analysis result if it exists
+                        if (currentSession) {
+                            const session = draft.ai.config.sessions.find((s) => s.id === currentSession.id);
+                            if (session) {
+                                const pendingIndex = session.analysisResults.findIndex((result) => result.id === '__pending__');
+                                if (pendingIndex !== -1) {
+                                    session.analysisResults.splice(pendingIndex, 1);
+                                }
+                            }
+                        }
+                    }));
+                    get().ai.analysisAbortController?.abort('Analysis cancelled');
+                },
+                /**
+                 * Get the assistant message parts for a given analysis result ID
+                 * @param analysisResultId - The ID of the analysis result (user message ID)
+                 * @returns Array of message parts from the assistant's response
+                 */
+                getAssistantMessageParts: (analysisResultId) => {
+                    const currentSession = get().ai.getCurrentSession();
+                    if (!currentSession)
+                        return [];
+                    const uiMessages = currentSession.uiMessages;
+                    // Find the user message with analysisResultId
+                    const userMessageIndex = uiMessages.findIndex((msg) => msg.id === analysisResultId && msg.role === 'user');
+                    if (userMessageIndex === -1)
+                        return [];
+                    // Find the next assistant message after this user message
+                    for (let i = userMessageIndex + 1; i < uiMessages.length; i++) {
+                        const msg = uiMessages[i];
+                        if (msg?.role === 'assistant') {
+                            return msg.parts;
+                        }
+                        if (msg?.role === 'user') {
+                            // Hit next user message without finding assistant response
+                            break;
+                        }
+                    }
+                    return [];
+                },
+                /**
+                 * Delete an analysis result from a session
+                 * - remove the corresponding prompt-response pair from uiMessages
+                 * - remove the associated toolAdditionalData
+                 */
+                deleteAnalysisResult: (sessionId, resultId) => {
+                    set((state) => produce(state, (draft) => {
+                        const session = draft.ai.config.sessions.find((s) => s.id === sessionId);
+                        if (session) {
+                            session.analysisResults = session.analysisResults.filter((r) => r.id !== resultId);
+                            // Remove corresponding prompt-response pair from uiMessages
+                            const uiMessages = session.uiMessages;
+                            const userMessageIndex = uiMessages.findIndex((msg) => msg.id === resultId && msg.role === 'user');
+                            if (userMessageIndex !== -1) {
+                                // Find the next user message (or end of array) to determine response boundary
+                                let nextUserIndex = userMessageIndex + 1;
+                                const toolCallIdsToDelete = new Set();
+                                while (nextUserIndex < uiMessages.length &&
+                                    uiMessages[nextUserIndex]?.role !== 'user') {
+                                    const msg = uiMessages[nextUserIndex];
+                                    // Extract toolCallId from message parts
+                                    if (msg?.parts) {
+                                        for (const part of msg.parts) {
+                                            // Check for tool-* or dynamic-tool parts that have toolCallId
+                                            if ('toolCallId' in part &&
+                                                typeof part.toolCallId === 'string') {
+                                                toolCallIdsToDelete.add(part.toolCallId);
+                                            }
+                                        }
+                                    }
+                                    nextUserIndex++;
+                                }
+                                // Remove the user message and all assistant messages until the next user message
+                                session.uiMessages.splice(userMessageIndex, nextUserIndex - userMessageIndex);
+                                // Increment messagesRevision to force useChat reset
+                                session.messagesRevision =
+                                    (session.messagesRevision || 0) + 1;
+                                // Clean up toolAdditionalData for deleted messages
+                                if (session.toolAdditionalData) {
+                                    // Remove data keyed by the toolCallId from the deleted messages
+                                    toolCallIdsToDelete.forEach((toolCallId) => {
+                                        if (session.toolAdditionalData[toolCallId]) {
+                                            delete session.toolAdditionalData[toolCallId];
+                                        }
+                                    });
+                                }
+                            }
+                        }
+                    }));
+                },
+                /**
+                 * Get analysis results for the current session by transforming UI messages
+                 * into structured analysis results (user prompt → AI response pairs).
+                 *
+                 * @returns Array of analysis results for the current session
+                 */
+                getAnalysisResults: () => {
+                    const currentSession = get().ai.getCurrentSession();
+                    if (!currentSession)
+                        return [];
+                    return currentSession.analysisResults;
+                },
+                /**
+                 * Add an analysis result to the current session
+                 * - add the message to the uiMessages
+                 * - add the analysis result to the analysisResults
+                 */
+                addAnalysisResult: (message) => {
+                    const currentSession = get().ai.getCurrentSession();
+                    if (!currentSession) {
+                        console.error('No current session found');
+                        return;
+                    }
+                    set((state) => produce(state, (draft) => {
+                        // Extract text content from message parts
+                        const textContent = message.parts
+                            ?.filter((part) => part.type === 'text')
+                            ?.map((part) => part.text)
+                            ?.join('') || '';
+                        draft.ai.config.sessions
+                            .find((s) => s.id === currentSession?.id)
+                            ?.analysisResults.push({
+                            id: message.id,
+                            prompt: textContent,
+                            isCompleted: true,
+                        });
+                    }));
+                },
+                // Chat transport configuration
+                chatEndPoint,
+                chatHeaders,
+                getLocalChatTransport: () => {
+                    const state = get();
+                    return createLocalChatTransportFactory({
+                        store,
+                        defaultProvider: defaultProvider,
+                        defaultModel: defaultModel,
+                        apiKey: state.ai.getApiKeyFromSettings(),
+                        baseUrl: state.ai.getBaseUrlFromSettings(),
+                        getInstructions: () => store.getState().ai.getFullInstructions(),
+                        getCustomModel,
+                    })();
+                },
+                getRemoteChatTransport: (endpoint, headers) => createRemoteChatTransportFactory({
+                    store,
+                    defaultProvider,
+                    defaultModel,
+                })(endpoint, headers),
+                ...createChatHandlers({ store }),
             },
         };
     });
@@ -290,77 +417,6 @@ function getCurrentSessionFromState(state) {
     const { currentSessionId, sessions } = state.ai.config;
     return sessions.find((session) => session.id === currentSessionId);
 }
-function findResultById(analysisResults, id) {
-    return analysisResults.find((result) => result.id === id);
-}
-/**
- * Appends the tool results, tool calls, and analysis to the state
- *
- * @param resultId - The id of the result to append to
- * @param message - The message to append to the state. The structure of the message is defined as:
- * - reasoning: string The reasoning of the assistant
- * - toolCallMessages: ToolCallMessage[] The tool call messages
- * - text: string The final text message
- * @param isCompleted - Whether the analysis is completed
- * @returns The new state
- */
-function makeResultsAppender({ resultId, streamMessage, errorMessage, isCompleted, }) {
-    return (state) => produce(state, (draft) => {
-        const currentSession = getCurrentSessionFromState(draft);
-        if (!currentSession) {
-            console.error('No current session found');
-            return;
-        }
-        const result = findResultById(currentSession.analysisResults, resultId);
-        if (result) {
-            if (streamMessage && streamMessage.parts) {
-                // copy all properties from streamMessage
-                const newStreamMessage = {
-                    parts: streamMessage.parts.map((part) => {
-                        if (part.type === 'text') {
-                            return {
-                                type: 'text',
-                                text: part.text,
-                                additionalData: part.additionalData,
-                                isCompleted: part.isCompleted,
-                            };
-                        }
-                        else if (part.type === 'tool-invocation') {
-                            return {
-                                type: 'tool-invocation',
-                                toolInvocation: {
-                                    toolCallId: part.toolInvocation.toolCallId,
-                                    toolName: part.toolInvocation.toolName,
-                                    args: part.toolInvocation.args,
-                                    state: part.toolInvocation.state,
-                                    result: part.toolInvocation.state === 'result'
-                                        ? part.toolInvocation.result
-                                        : undefined,
-                                },
-                                additionalData: part.additionalData,
-                                isCompleted: part.isCompleted,
-                            };
-                        }
-                        else {
-                            // TODO: handle other part types later
-                            return part;
-                        }
-                    }),
-                };
-                result.streamMessage = newStreamMessage;
-            }
-            if (errorMessage) {
-                result.errorMessage = errorMessage;
-            }
-            if (isCompleted) {
-                result.isCompleted = isCompleted;
-            }
-        }
-        else {
-            console.error('Result not found', resultId);
-        }
-    });
-}
 export function useStoreWithAi(selector) {
     return useBaseRoomStore((state) => selector(state));
 }