@sqlrooms/ai-core 0.27.0-rc.0 → 0.27.0-rc.2

package/README.md

@@ -43,7 +43,7 @@ const {roomStore, useRoomStore} = createRoomStore({
     getInstructions: () => {
       return `You are an AI assistant that can answer questions and help with tasks.`;
     },
-    initialAnalysisPrompt: 'What insights can you provide from my data?',
+    initialPrompt: 'What insights can you provide from my data?',
     tools: {
       // Your tools
     },
@@ -464,7 +464,7 @@ createAiSlice({
 The `processAgentStream` function handles the complexity of integrating agent execution into the main conversation:
 
 ```typescript
-await processAgentStream(agentResult, store, parentToolCallId)
+await processAgentStream(agentResult, store, parentToolCallId, abortSignal)
 ```
 
 **What it handles:**

package/dist/AiSlice.d.ts

@@ -1,42 +1,33 @@
 import { AiSliceConfig, AnalysisResultSchema, AnalysisSessionSchema } from '@sqlrooms/ai-config';
 import { type StateCreator } from '@sqlrooms/room-store';
-import { UIMessage, DefaultChatTransport, LanguageModel, UITools, ChatOnDataCallback, UIDataTypes } from 'ai';
+import { UIMessage, DefaultChatTransport, LanguageModel, ChatOnDataCallback } from 'ai';
 import { ToolCall } from './chatTransport';
 import { OpenAssistantToolSet } from '@openassistant/utils';
-import { AddToolResult } from './types';
-type ExtendedChatOnToolCallCallback = (args: {
-    toolCall: ToolCall;
-    addToolResult?: AddToolResult;
-}) => Promise<void> | void;
+import type { AddToolResult, AiChatSendMessage, GetProviderOptions } from './types';
 export type AiSliceState = {
     ai: {
         config: AiSliceConfig;
-        analysisPrompt: string;
-        isRunningAnalysis: boolean;
         promptSuggestionsVisible: boolean;
         tools: OpenAssistantToolSet;
-        analysisAbortController?: AbortController;
+        getProviderOptions?: GetProviderOptions;
         setConfig: (config: AiSliceConfig) => void;
         setPromptSuggestionsVisible: (visible: boolean) => void;
-        /** Latest stop function from useChat to immediately halt local streaming */
-        chatStop?: () => void;
-        /** Register/replace the current chat stop function */
-        setChatStop: (stop: (() => void) | undefined) => void;
-        /** Latest sendMessage function from useChat to send messages */
-        chatSendMessage?: (message: {
-            text: string;
-        }) => void;
-        /** Register/replace the current chat sendMessage function */
-        setChatSendMessage: (sendMessage: ((message: {
-            text: string;
-        }) => void) | undefined) => void;
-        /** Latest addToolResult function from useChat to add tool results */
-        addToolResult?: AddToolResult;
-        /** Register/replace the current addToolResult function */
-        setAddToolResult: (addToolResult: AddToolResult | undefined) => void;
-        /** Wait for a tool result to be added by UI component */
-        waitForToolResult: (toolCallId: string, abortSignal?: AbortSignal) => Promise<void>;
-        setAnalysisPrompt: (prompt: string) => void;
+        getAbortController: (sessionId: string) => AbortController | undefined;
+        setAbortController: (sessionId: string, controller: AbortController | undefined) => void;
+        setChatStop: (sessionId: string, stop: (() => void) | undefined) => void;
+        getChatStop: (sessionId: string) => (() => void) | undefined;
+        setChatSendMessage: (sessionId: string, sendMessage: AiChatSendMessage | undefined) => void;
+        getChatSendMessage: (sessionId: string) => AiChatSendMessage | undefined;
+        setAddToolResult: (sessionId: string, addToolResult: AddToolResult | undefined) => void;
+        getAddToolResult: (sessionId: string) => AddToolResult | undefined;
+        waitForToolResult: (sessionId: string, toolCallId: string, abortSignal?: AbortSignal) => Promise<void>;
+        /** Map toolCallId -> sessionId for long-running tool streams (e.g. agent tools) */
+        setToolCallSession: (toolCallId: string, sessionId: string | undefined) => void;
+        getToolCallSession: (toolCallId: string) => string | undefined;
+        setPrompt: (sessionId: string, prompt: string) => void;
+        getPrompt: (sessionId: string) => string;
+        setIsRunning: (sessionId: string, isRunning: boolean) => void;
+        getIsRunning: (sessionId: string) => boolean;
         addAnalysisResult: (message: UIMessage) => void;
         sendPrompt: (prompt: string, options?: {
             systemInstructions?: string;
@@ -46,10 +37,8 @@ export type AiSliceState = {
             abortSignal?: AbortSignal;
             useTools?: boolean;
         }) => Promise<string>;
-        startAnalysis: (sendMessage: (message: {
-            text: string;
-        }) => void) => Promise<void>;
-        cancelAnalysis: () => void;
+        startAnalysis: (sessionId: string) => Promise<void>;
+        cancelAnalysis: (sessionId: string) => void;
         setAiModel: (modelProvider: string, model: string) => void;
         createSession: (name?: string, modelProvider?: string, model?: string) => void;
         switchSession: (sessionId: string) => void;
@@ -66,19 +55,23 @@ export type AiSliceState = {
         getBaseUrlFromSettings: () => string | undefined;
         getMaxStepsFromSettings: () => number;
         getFullInstructions: () => string;
-        getLocalChatTransport: () => DefaultChatTransport<UIMessage>;
+        getLocalChatTransport: (sessionId: string) => 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: ChatOnDataCallback<UIMessage<unknown, UIDataTypes, UITools>>;
+        getRemoteChatTransport: (sessionId: string, endpoint: string, headers?: Record<string, string>) => DefaultChatTransport<UIMessage>;
         onChatFinish: (args: {
-            message: UIMessage;
+            sessionId: string;
             messages: UIMessage[];
             isError?: boolean;
         }) => void;
-        onChatError: (error: unknown) => void;
+        onChatToolCall: (args: {
+            sessionId: string;
+            toolCall: ToolCall;
+            addToolResult?: AddToolResult;
+        }) => Promise<void> | void;
+        onChatData: (sessionId: string, dataPart: Parameters<ChatOnDataCallback<UIMessage>>[0]) => void;
+        onChatError: (sessionId: string, error: unknown) => void;
     };
 };
 /**
@@ -86,19 +79,14 @@ export type AiSliceState = {
  */
 export interface AiSliceOptions {
     config?: Partial<AiSliceConfig>;
-    /** Initial prompt to display in the analysis input */
-    initialAnalysisPrompt?: string;
-    /** Tools to add to the AI assistant */
+    initialPrompt?: string;
     tools: OpenAssistantToolSet;
-    /**
-     * Function to get custom instructions for the AI assistant
-     * @returns The instructions string to use
-     */
     getInstructions: () => string;
     defaultProvider?: string;
     defaultModel?: string;
     /** Provide a pre-configured model client for a provider (e.g., Azure). */
     getCustomModel?: () => LanguageModel | undefined;
+    getProviderOptions?: GetProviderOptions;
     maxSteps?: number;
     getApiKey?: (modelProvider: string) => string;
     getBaseUrl?: () => string;
@@ -109,5 +97,4 @@ export interface AiSliceOptions {
 }
 export declare function createAiSlice(params: AiSliceOptions): StateCreator<AiSliceState>;
 export declare function useStoreWithAi<T>(selector: (state: AiSliceState) => 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":"AACA,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,qBAAqB,EAEtB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAGL,KAAK,YAAY,EAClB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACL,SAAS,EACT,oBAAoB,EACpB,aAAa,EACb,OAAO,EACP,kBAAkB,EAClB,WAAW,EAEZ,MAAM,IAAI,CAAC;AACZ,OAAO,EAIL,QAAQ,EAGT,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAC,oBAAoB,EAAC,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AAKtC,KAAK,8BAA8B,GAAG,CAAC,IAAI,EAAE;IAC3C,QAAQ,EAAE,QAAQ,CAAC;IACnB,aAAa,CAAC,EAAE,aAAa,CAAC;CAC/B,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;AAE3B,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,EAAE;QACF,MAAM,EAAE,aAAa,CAAC;QACtB,cAAc,EAAE,MAAM,CAAC;QACvB,iBAAiB,EAAE,OAAO,CAAC;QAC3B,wBAAwB,EAAE,OAAO,CAAC;QAClC,KAAK,EAAE,oBAAoB,CAAC;QAC5B,uBAAuB,CAAC,EAAE,eAAe,CAAC;QAC1C,SAAS,EAAE,CAAC,MAAM,EAAE,aAAa,KAAK,IAAI,CAAC;QAC3C,2BAA2B,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;QACxD,4EAA4E;QAC5E,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC;QACtB,sDAAsD;QACtD,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,KAAK,IAAI,CAAC;QACtD,gEAAgE;QAChE,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE;YAAC,IAAI,EAAE,MAAM,CAAA;SAAC,KAAK,IAAI,CAAC;QACpD,6DAA6D;QAC7D,kBAAkB,EAAE,CAClB,WAAW,EAAE,CAAC,CAAC,OAAO,EAAE;YAAC,IAAI,EAAE,MAAM,CAAA;SAAC,KAAK,IAAI,CAAC,GAAG,SAAS,KACzD,IAAI,CAAC;QACV,qEAAqE;QACrE,aAAa,CAAC,EAAE,aAAa,CAAC;QAC9B,0DAA0D;QAC1D,gBAAgB,EAAE,CAAC,aAAa,EAAE,aAAa,GAAG,SAAS,KAAK,IAAI,CAAC;QACrE,yDAAyD;QACzD,iBAAiB,EAAE,CACjB,UAAU,EAAE,MAAM,EAClB,WAAW,CAAC,EAAE,WAAW,KACtB,OAAO,CAAC,IAAI,CAAC,CAAC;QACnB,iBAAiB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;QAC5C,iBAAiB,EAAE,CAAC,OAAO,EAAE,SAAS,KAAK,IAAI,CAAC;QAChD,UAAU,EAAE,CACV,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE;YACR,kBAAkB,CAAC,EAAE,MAAM,CAAC;YAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;YACvB,SAAS,CAAC,EAAE,MAAM,CAAC;YACnB,OAAO,CAAC,EAAE,MAAM,CAAC;YACjB,WAAW,CAAC,EAAE,WAAW,CAAC;YAC1B,QAAQ,CAAC,EAAE,OAAO,CAAC;SACpB,KACE,OAAO,CAAC,MAAM,CAAC,CAAC;QACrB,aAAa,EAAE,CACb,WAAW,EAAE,CAAC,OAAO,EAAE;YAAC,IAAI,EAAE,MAAM,CAAA;SAAC,KAAK,IAAI,KAC3C,OAAO,CAAC,IAAI,CAAC,CAAC;QACnB,cAAc,EAAE,MAAM,IAAI,CAAC;QAC3B,UAAU,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;QAC3D,aAAa,EAAE,CACb,IAAI,CAAC,EAAE,MAAM,EACb,aAAa,CAAC,EAAE,MAAM,EACtB,KAAK,CAAC,EAAE,MAAM,KACX,IAAI,CAAC;QACV,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;QAC3C,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QACzD,aAAa,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,IAAI,CAAC;QAC3C,iBAAiB,EAAE,MAAM,qBAAqB,GAAG,SAAS,CAAC;QAC3D,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,IAAI,CAAC;QAC3E,4BAA4B,EAAE,CAC5B,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,OAAO,KACpB,IAAI,CAAC;QACV,kBAAkB,EAAE,MAAM,oBAAoB,EAAE,GAAG,SAAS,CAAC;QAC7D,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC;QACpE,wBAAwB,EAAE,CAAC,gBAAgB,EAAE,MAAM,KAAK,SAAS,CAAC,OAAO,CAAC,CAAC;QAC3E,iBAAiB,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,KAAK,CAAC,aAAa,GAAG,SAAS,CAAC;QACzE,qBAAqB,EAAE,MAAM,MAAM,CAAC;QACpC,sBAAsB,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;QACjD,uBAAuB,EAAE,MAAM,MAAM,CAAC;QACtC,mBAAmB,EAAE,MAAM,MAAM,CAAC;QAElC,qBAAqB,EAAE,MAAM,oBAAoB,CAAC,SAAS,CAAC,CAAC;QAC7D,kFAAkF;QAClF,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACpC,sBAAsB,EAAE,CACtB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,KAC7B,oBAAoB,CAAC,SAAS,CAAC,CAAC;QACrC,cAAc,EAAE,8BAA8B,CAAC;QAC/C,UAAU,EAAE,kBAAkB,CAAC,SAAS,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;QACzE,YAAY,EAAE,CAAC,IAAI,EAAE;YACnB,OAAO,EAAE,SAAS,CAAC;YACnB,QAAQ,EAAE,SAAS,EAAE,CAAC;YACtB,OAAO,CAAC,EAAE,OAAO,CAAC;SACnB,KAAK,IAAI,CAAC;QACX,WAAW,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;KACvC,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IAChC,sDAAsD;IACtD,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,uCAAuC;IACvC,KAAK,EAAE,oBAAoB,CAAC;IAE5B;;;OAGG;IACH,eAAe,EAAE,MAAM,MAAM,CAAC;IAC9B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,0EAA0E;IAC1E,cAAc,CAAC,EAAE,MAAM,aAAa,GAAG,SAAS,CAAC;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,CAAC,aAAa,EAAE,MAAM,KAAK,MAAM,CAAC;IAC9C,UAAU,CAAC,EAAE,MAAM,MAAM,CAAC;IAC1B,kFAAkF;IAClF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oDAAoD;IACpD,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACtC;AAED,wBAAgB,aAAa,CAC3B,MAAM,EAAE,cAAc,GACrB,YAAY,CAAC,YAAY,CAAC,CA2uB5B;AAYD,wBAAgB,cAAc,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,CAAC,GAAG,CAAC,CAEzE"}
+{"version":3,"file":"AiSlice.d.ts","sourceRoot":"","sources":["../src/AiSlice.ts"],"names":[],"mappings":"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"}

package/dist/AiSlice.js

@@ -3,13 +3,13 @@ import { createDefaultAiConfig, } from '@sqlrooms/ai-config';
 import { createSlice, useBaseRoomStore, } from '@sqlrooms/room-store';
 import { produce } from 'immer';
 import { generateText, } from 'ai';
-import { createChatHandlers, createLocalChatTransportFactory, createRemoteChatTransportFactory, convertToAiSDKTools, completeIncompleteToolCalls, } from './chatTransport';
-import { AI_DEFAULT_TEMPERATURE } from './constants';
+import { createChatHandlers, createLocalChatTransportFactory, createRemoteChatTransportFactory, convertToAiSDKTools, } from './chatTransport';
+import { ABORT_EVENT, AI_DEFAULT_TEMPERATURE, ANALYSIS_CANCELLED, ANALYSIS_PENDING_ID, SESSION_DELETED, TOOL_CALL_CANCELLED, } from './constants';
 import { hasAiSettingsConfig } from './hasAiSettingsConfig';
-import { cleanupPendingAnalysisResults } from './utils';
+import { cleanupPendingAnalysisResults, ToolAbortError, fixIncompleteToolCalls, } from './utils';
 import { createOpenAICompatible } from '@ai-sdk/openai-compatible';
 export function createAiSlice(params) {
-    const { initialAnalysisPrompt = '', tools, getApiKey, getBaseUrl, maxSteps = 50, getInstructions, defaultProvider = 'openai', defaultModel = 'gpt-4.1', getCustomModel, chatEndPoint = '', chatHeaders = {}, } = params;
+    const { initialPrompt = '', tools, getApiKey, getBaseUrl, maxSteps = 50, getInstructions, defaultProvider = 'openai', defaultModel = 'gpt-4.1', getCustomModel, getProviderOptions, chatEndPoint = '', chatHeaders = {}, } = params;
     return createSlice((set, get, store) => {
         // Clean up pending analysis results from persisted config
         const cleanedConfig = params.config?.sessions
@@ -18,7 +18,7 @@ export function createAiSlice(params) {
                 sessions: params.config.sessions.map((session) => {
                     const cleaned = cleanupPendingAnalysisResults(session);
                     const completedUiMessages = Array.isArray(cleaned.uiMessages)
-                        ? completeIncompleteToolCalls(cleaned.uiMessages || [])
+                        ? fixIncompleteToolCalls(cleaned.uiMessages || [])
                         : [];
                     return {
                         ...cleaned,
@@ -27,8 +27,13 @@ export function createAiSlice(params) {
                 }),
             }
             : params.config;
-        // Create a persistent Map for pending tool call resolvers (outside of immer draft)
+        // Create persistent Maps (outside of immer draft)
         const pendingToolCallResolvers = new Map();
+        const toolCallToSessionId = new Map();
+        const sessionAbortControllers = new Map();
+        const sessionChatStops = new Map();
+        const sessionChatSendMessages = new Map();
+        const sessionAddToolResults = new Map();
         // Initialize base config and ensure the initial session respects default provider/model
         const baseConfig = createDefaultAiConfig(cleanedConfig);
         if (!cleanedConfig?.sessions || cleanedConfig.sessions.length === 0) {
@@ -36,55 +41,124 @@ export function createAiSlice(params) {
             if (firstSession) {
                 firstSession.modelProvider = defaultProvider;
                 firstSession.model = defaultModel;
+                firstSession.prompt = initialPrompt;
+                firstSession.isRunning = false;
             }
         }
         return {
             ai: {
                 config: baseConfig,
-                analysisPrompt: initialAnalysisPrompt,
-                isRunningAnalysis: false,
                 promptSuggestionsVisible: true,
                 tools,
-                waitForToolResult: (toolCallId, abortSignal) => {
+                getProviderOptions,
+                waitForToolResult: (sessionId, toolCallId, abortSignal) => {
+                    const key = `${sessionId}:${toolCallId}`;
                     return new Promise((resolve, reject) => {
                         // Set up abort handler
                         const abortHandler = () => {
-                            const resolver = pendingToolCallResolvers.get(toolCallId);
+                            const resolver = pendingToolCallResolvers.get(key);
                             if (resolver) {
-                                pendingToolCallResolvers.delete(toolCallId);
-                                resolver.reject(new Error('Tool call cancelled by user'));
+                                pendingToolCallResolvers.delete(key);
+                                resolver.reject(new Error(TOOL_CALL_CANCELLED));
                             }
                         };
                         if (abortSignal) {
                             if (abortSignal.aborted) {
-                                reject(new Error('Tool call cancelled by user'));
+                                reject(new Error(TOOL_CALL_CANCELLED));
                                 return;
                             }
-                            abortSignal.addEventListener('abort', abortHandler, { once: true });
+                            abortSignal.addEventListener(ABORT_EVENT, abortHandler, {
+                                once: true,
+                            });
                         }
                         // Store resolver (overwrites any existing one, which is fine for our use case)
-                        pendingToolCallResolvers.set(toolCallId, {
+                        pendingToolCallResolvers.set(key, {
                             resolve: () => {
                                 if (abortSignal) {
-                                    abortSignal.removeEventListener('abort', abortHandler);
+                                    abortSignal.removeEventListener(ABORT_EVENT, abortHandler);
                                 }
-                                pendingToolCallResolvers.delete(toolCallId);
+                                pendingToolCallResolvers.delete(key);
                                 resolve();
                             },
                             reject: (error) => {
                                 if (abortSignal) {
-                                    abortSignal.removeEventListener('abort', abortHandler);
+                                    abortSignal.removeEventListener(ABORT_EVENT, abortHandler);
                                 }
-                                pendingToolCallResolvers.delete(toolCallId);
+                                pendingToolCallResolvers.delete(key);
                                 reject(error);
                             },
                         });
                     });
                 },
-                setChatStop: (stopFn) => {
-                    set((state) => produce(state, (draft) => {
-                        draft.ai.chatStop = stopFn;
-                    }));
+                setToolCallSession: (toolCallId, sessionId) => {
+                    if (!toolCallId)
+                        return;
+                    if (sessionId) {
+                        toolCallToSessionId.set(toolCallId, sessionId);
+                    }
+                    else {
+                        toolCallToSessionId.delete(toolCallId);
+                    }
+                },
+                getToolCallSession: (toolCallId) => {
+                    if (!toolCallId)
+                        return undefined;
+                    return toolCallToSessionId.get(toolCallId);
+                },
+                getAbortController: (sessionId) => {
+                    return sessionAbortControllers.get(sessionId);
+                },
+                setAbortController: (sessionId, controller) => {
+                    if (controller) {
+                        sessionAbortControllers.set(sessionId, controller);
+                    }
+                    else {
+                        sessionAbortControllers.delete(sessionId);
+                    }
+                },
+                setChatStop: (sessionId, stopFn) => {
+                    if (stopFn) {
+                        sessionChatStops.set(sessionId, stopFn);
+                    }
+                    else {
+                        sessionChatStops.delete(sessionId);
+                    }
+                },
+                getChatStop: (sessionId) => {
+                    return sessionChatStops.get(sessionId);
+                },
+                setChatSendMessage: (sessionId, sendMessageFn) => {
+                    if (sendMessageFn) {
+                        sessionChatSendMessages.set(sessionId, sendMessageFn);
+                    }
+                    else {
+                        sessionChatSendMessages.delete(sessionId);
+                    }
+                },
+                getChatSendMessage: (sessionId) => {
+                    return sessionChatSendMessages.get(sessionId);
+                },
+                setAddToolResult: (sessionId, addToolResultFn) => {
+                    if (addToolResultFn) {
+                        // Wrap addToolResult to intercept calls and resolve pending promises
+                        const wrappedAddToolResult = (options) => {
+                            addToolResultFn(options);
+                            const key = `${sessionId}:${options.toolCallId}`;
+                            const resolver = pendingToolCallResolvers.get(key);
+                            if (resolver) {
+                                resolver.resolve();
+                            }
+                            // Tool is complete (success or error), we can drop toolCall->session mapping.
+                            toolCallToSessionId.delete(options.toolCallId);
+                        };
+                        sessionAddToolResults.set(sessionId, wrappedAddToolResult);
+                    }
+                    else {
+                        sessionAddToolResults.delete(sessionId);
+                    }
+                },
+                getAddToolResult: (sessionId) => {
+                    return sessionAddToolResults.get(sessionId);
                 },
                 setConfig: (config) => {
                     set((state) => produce(state, (draft) => {
@@ -96,33 +170,32 @@ export function createAiSlice(params) {
                         draft.ai.promptSuggestionsVisible = visible;
                     }));
                 },
-                setChatSendMessage: (sendMessageFn) => {
+                setPrompt: (sessionId, prompt) => {
                     set((state) => produce(state, (draft) => {
-                        draft.ai.chatSendMessage = sendMessageFn;
-                    }));
-                },
-                setAddToolResult: (addToolResultFn) => {
-                    // Wrap addToolResult to intercept calls and resolve pending promises
-                    const wrappedAddToolResult = addToolResultFn
-                        ? (options) => {
-                            // Call the original addToolResult
-                            addToolResultFn(options);
-                            // Resolve the promise if there's a pending waiter for this toolCallId
-                            const resolver = pendingToolCallResolvers.get(options.toolCallId);
-                            if (resolver) {
-                                resolver.resolve();
-                            }
+                        const session = draft.ai.config.sessions.find((s) => s.id === sessionId);
+                        if (session) {
+                            session.prompt = prompt;
                         }
-                        : undefined;
-                    set((state) => produce(state, (draft) => {
-                        draft.ai.addToolResult = wrappedAddToolResult;
                     }));
                 },
-                setAnalysisPrompt: (prompt) => {
+                getPrompt: (sessionId) => {
+                    const state = get();
+                    const session = state.ai.config.sessions.find((s) => s.id === sessionId);
+                    return session?.prompt || '';
+                },
+                setIsRunning: (sessionId, isRunning) => {
                     set((state) => produce(state, (draft) => {
-                        draft.ai.analysisPrompt = prompt;
+                        const session = draft.ai.config.sessions.find((s) => s.id === sessionId);
+                        if (session) {
+                            session.isRunning = isRunning;
+                        }
                     }));
                 },
+                getIsRunning: (sessionId) => {
+                    const state = get();
+                    const session = state.ai.config.sessions.find((s) => s.id === sessionId);
+                    return session?.isRunning || false;
+                },
                 /**
                  * Set the AI model for the current session
                  * @param model - The model to set
@@ -168,7 +241,7 @@ export function createAiSlice(params) {
                         sessionName = `Session ${formattedDate} at ${formattedTime}`;
                     }
                     set((state) => produce(state, (draft) => {
-                        // Add to AI sessions
+                        // Add to AI sessions with per-session state
                         draft.ai.config.sessions.unshift({
                             id: newSessionId,
                             name: sessionName,
@@ -181,6 +254,8 @@ export function createAiSlice(params) {
                             uiMessages: [],
                             toolAdditionalData: {},
                             messagesRevision: 0,
+                            prompt: '',
+                            isRunning: false,
                         });
                         draft.ai.config.currentSessionId = newSessionId;
                     }));
@@ -205,9 +280,18 @@ export function createAiSlice(params) {
                     }));
                 },
                 /**
-                 * Delete a session
+                 * Delete a session and clean up its resources
                  */
                 deleteSession: (sessionId) => {
+                    // Clean up per-session state
+                    const abortController = sessionAbortControllers.get(sessionId);
+                    if (abortController) {
+                        abortController.abort(SESSION_DELETED);
+                    }
+                    sessionAbortControllers.delete(sessionId);
+                    sessionChatStops.delete(sessionId);
+                    sessionChatSendMessages.delete(sessionId);
+                    sessionAddToolResults.delete(sessionId);
                     set((state) => produce(state, (draft) => {
                         const sessionIndex = draft.ai.config.sessions.findIndex((s) => s.id === sessionId);
                         if (sessionIndex !== -1) {
@@ -333,15 +417,15 @@ export function createAiSlice(params) {
                 sendPrompt: async (prompt, options = {}) => {
                     // One-shot generateText path with explicit abort lifecycle management
                     const state = get();
-                    const currentSession = state.ai.getCurrentSession();
+                    const currentSession = state.ai.getCurrentSession(); // only used when no model provider is provided
                     const { systemInstructions, modelProvider, modelName, baseUrl, abortSignal, useTools = false, } = options;
+                    if (abortSignal?.aborted) {
+                        throw new ToolAbortError(TOOL_CALL_CANCELLED);
+                    }
                     const provider = modelProvider || currentSession?.modelProvider || defaultProvider;
                     const modelId = modelName || currentSession?.model || defaultModel;
-                    const baseURL = baseUrl ||
-                        state.ai.getBaseUrlFromSettings() ||
-                        'https://api.openai.com/v1';
+                    const baseURL = baseUrl ?? state.ai.getBaseUrlFromSettings() ?? '';
                     const tools = state.ai.tools;
-                    // remove execute from tools
                     const toolsWithoutExecute = Object.fromEntries(Object.entries(tools).filter(([, tool]) => !tool.execute));
                     const model = createOpenAICompatible({
                         apiKey: state.ai.getApiKeyFromSettings(),
@@ -362,63 +446,69 @@ export function createAiSlice(params) {
                         return response.text;
                     }
                     catch (error) {
+                        const errorName = typeof error === 'object' && error && 'name' in error
+                            ? String(error.name)
+                            : '';
+                        if (abortSignal?.aborted || errorName === 'AbortError') {
+                            throw new ToolAbortError(TOOL_CALL_CANCELLED);
+                        }
                         console.error('Error generating text:', error);
                         return 'error: can not generate response';
                     }
                 },
                 /**
-                 * Start the analysis
+                 * Start the analysis for a specific session
                  */
-                startAnalysis: async (sendMessage) => {
-                    const abortController = new AbortController();
-                    const currentSession = get().ai.getCurrentSession();
-                    if (!currentSession) {
-                        console.error('No current session found');
+                startAnalysis: async (sessionId) => {
+                    const state = get();
+                    const session = state.ai.config.sessions.find((s) => s.id === sessionId);
+                    if (!session) {
+                        console.error('Session not found:', sessionId);
                         return;
                     }
-                    const promptText = get().ai.analysisPrompt;
-                    set((state) => produce(state, (draft) => {
-                        draft.ai.analysisAbortController = abortController;
-                        draft.ai.isRunningAnalysis = true;
-                        draft.ai.analysisPrompt = '';
-                        draft.ai.promptSuggestionsVisible = false;
-                        // 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) {
-                            // Remove any existing pending results (safety check for page refresh scenarios)
-                            session.analysisResults = session.analysisResults.filter((result) => result.id !== '__pending__');
+                    const sendMessage = state.ai.getChatSendMessage(sessionId);
+                    if (!sendMessage) {
+                        console.error('No sendMessage function found for session:', sessionId);
+                        return;
+                    }
+                    const abortController = new AbortController();
+                    const promptText = session.prompt || '';
+                    // Store abort controller for this session
+                    state.ai.setAbortController(sessionId, abortController);
+                    set((stateToUpdate) => produce(stateToUpdate, (draft) => {
+                        const draftSession = draft.ai.config.sessions.find((s) => s.id === sessionId);
+                        if (draftSession) {
+                            draftSession.isRunning = true;
+                            draftSession.prompt = '';
+                            draft.ai.promptSuggestionsVisible = false;
+                            // Remove any existing pending results
+                            draftSession.analysisResults =
+                                draftSession.analysisResults.filter((result) => result.id !== ANALYSIS_PENDING_ID);
                             // 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__',
+                            draftSession.analysisResults.push({
+                                id: ANALYSIS_PENDING_ID,
                                 prompt: promptText,
                                 isCompleted: false,
                             });
                         }
                     }));
-                    // The pending analysis result will be updated in onChatFinish with the correct message ID
+                    // Send the message through the session's chat instance
                     sendMessage({ text: promptText });
                 },
-                cancelAnalysis: () => {
-                    const abortController = get().ai.analysisAbortController;
+                cancelAnalysis: (sessionId) => {
+                    const state = get();
+                    const abortController = state.ai.getAbortController(sessionId);
+                    const stopFn = state.ai.getChatStop(sessionId);
                     // Stop local chat streaming immediately if available
-                    try {
-                        get().ai.chatStop?.();
-                    }
-                    catch {
-                        // no-op
-                    }
-                    // Call abort to signal cancellation
-                    // Keep the abort controller in state so that async handlers (onChatToolCall, onChatFinish)
-                    // can check if it was aborted. The onChatFinish handler will clean it up.
-                    abortController?.abort('Analysis cancelled');
-                    set((state) => produce(state, (draft) => {
-                        // Set isRunningAnalysis to false to update UI
-                        draft.ai.isRunningAnalysis = false;
-                        // Keep analysisAbortController so handlers can check signal.aborted
+                    stopFn?.();
+                    abortController?.abort(ANALYSIS_CANCELLED);
+                    set((stateToUpdate) => produce(stateToUpdate, (draft) => {
+                        const session = draft.ai.config.sessions.find((s) => s.id === sessionId);
+                        if (session) {
+                            session.isRunning = false;
+                        }
+                        // Keep abort controller so handlers can check signal.aborted
                         // It will be cleared by onChatFinish
-                        // Intentionally preserve any pending analysis result so the
-                        // conversation row remains visible until onChatFinish runs.
                     }));
                 },
                 /**
@@ -539,7 +629,7 @@ export function createAiSlice(params) {
                 // Chat transport configuration
                 chatEndPoint,
                 chatHeaders,
-                getLocalChatTransport: () => {
+                getLocalChatTransport: (sessionId) => {
                     const state = get();
                     return createLocalChatTransportFactory({
                         store,
@@ -549,12 +639,14 @@ export function createAiSlice(params) {
                         baseUrl: state.ai.getBaseUrlFromSettings(),
                         getInstructions: () => store.getState().ai.getFullInstructions(),
                         getCustomModel,
+                        sessionId,
                     })();
                 },
-                getRemoteChatTransport: (endpoint, headers) => createRemoteChatTransportFactory({
+                getRemoteChatTransport: (sessionId, endpoint, headers) => createRemoteChatTransportFactory({
                     store,
                     defaultProvider,
                     defaultModel,
+                    sessionId,
                 })(endpoint, headers),
                 ...createChatHandlers({ store }),
             },