LLM inference in C/C++
C++ ggml
ui: Stores split refactor (#27240)
Aleksander Grygier521a64cd0197
diff --git a/tools/ui/README.md b/tools/ui/README.mdindex 53b5925e2c..99abfaa41f 100644--- a/tools/ui/README.md+++ b/tools/ui/README.md@@ -239,31 +239,44 @@ Routes → Components → Hooks → Stores → Services → Storage/API### High-Level Architecture-See: [`docs/architecture/high-level-architecture-simplified.md`](docs/architecture/high-level-architecture-simplified.md)-```mermaidflowchart TBsubgraph Routes["📍 Routes"]R1["/ (Welcome)"]R2["/chat/[id]"]+ R3["/mcp-servers"]+ R4["/search"]+ R5["/settings"]RL["+layout.svelte"]endsubgraph Components["🧩 Components"]- C_Sidebar["ChatSidebar"]C_Screen["ChatScreen"]C_Form["ChatForm"]C_Messages["ChatMessages"]- C_ModelsSelector["ModelsSelector"]+ C_Sidebar["ChatSidebar"]+ C_Models["ModelsSelector"]C_Settings["ChatSettings"]+ C_Mcp["McpServers"]+ end++ subgraph Hooks["🔌 Hooks"]+ H1["use-chat-screen-active-model"]+ H2["use-processing-state"]+ H3["use-context-gauge"]+ H4["use-models-selector"]+ H5["use-tools-panel"]endsubgraph Stores["🗄️ Stores"]S1["chatStore"]S2["conversationsStore"]S3["modelsStore"]- S4["serverStore"]- S5["settingsStore"]+ S4["mcpStore"]+ S5["agenticStore"]+ S6["serverStore"]+ S7["settingsStore"]+ S8["toolsStore"]endsubgraph Services["⚙️ Services"]@@ -271,6 +284,9 @@ flowchart TBSV2["ModelsService"]SV3["PropsService"]SV4["DatabaseService"]+ SV5["MCPService"]+ SV6["ToolsService"]+ SV7["SandboxService"]endsubgraph Storage["💾 Storage"]@@ -282,19 +298,28 @@ flowchart TBAPI1["/v1/chat/completions"]API2["/props"]API3["/models/*"]+ API4["/tools"]endR1 & R2 --> C_ScreenRL --> C_SidebarC_Screen --> C_Form & C_Messages & C_Settings- C_Screen --> S1 & S2- C_ModelsSelector --> S3 & S4+ C_Screen --> H1 & H2 & H3+ C_Models --> H4+ C_Mcp --> S4+ C_Screen --> S1 & S2 & S3+ C_Models --> S3+ H1 --> S3S1 --> SV1 & SV4+ S2 --> SV4S3 --> SV2 & SV3+ S4 --> SV5+ S5 --> SV1 & SV5 & SV6 & SV7SV4 --> ST1SV1 --> API1SV2 --> API3SV3 --> API2+ SV6 --> API4```### Layer Breakdown@@ -303,6 +328,9 @@ flowchart TB- **`/`** - Welcome screen, creates new conversation- **`/chat/[id]`** - Active chat interface+- **`/mcp-servers`** - MCP server management+- **`/search`** - Conversation search+- **`/settings`** - Settings (optional `[[section]]`)- **`+layout.svelte`** - Sidebar, navigation, global initialization#### Components (`src/lib/components/`)@@ -348,28 +376,68 @@ Components are organized in `app/` (application-specific) and `ui/` (shadcn-svel#### Hooks (`src/lib/hooks/`)-- **`useModelChangeValidation`** - Validates model switch against conversation modalities-- **`useProcessingState`** - Tracks streaming progress and token generation+Hooks are the thin view-layer between components and stores: they own UI concerns (scroll, drag-and-drop, keyboard shortcuts, pickers, selection) and translate store state into view state.++| Hook | Responsibility |+| ------------------------------- | -------------------------------------------------------------- |+| `use-chat-screen-active-model` | Active model resolution + modality capability detection |+| `use-processing-state` | View over `chatStore.processing` for streaming progress/tokens |+| `use-context-gauge` | View over `contextStatsStore` for the context usage gauge |+| `use-models-selector` | Model selector dropdown state (loaded/available groups) |+| `use-tools-panel` | Tools panel state |+| `use-reasoning-menu` | Reasoning-effort menu state |+| `use-attachment-menu` | Attachment menu + modality flags |+| `use-draft-messages` | Per-chat draft message/files persistence |+| `use-chat-form-pickers` | Chat form pickers (commands, mentions) |+| `use-debounced-search` | Shared debounced async search for pickers |+| `use-picker-navigation` | Picker keyboard navigation |+| `use-chat-message-edit-context` | Message edit context (content + extras) |+| `use-chat-screen-drag-and-drop` | Drag-and-drop state machine |+| `use-chat-screen-file-upload` | File upload queue + capability validation |+| `use-chat-screen-scroll` | Scroll container binding + navigation guard |+| `use-auto-scroll` | Auto-scroll controller for streaming |+| `use-marquee-selection` | Shift+click / marquee range selection |+| `use-keyboard-shortcuts` | Global keyboard shortcuts |+| `use-settings-navigation` | Settings section navigation |+| `use-pwa` | PWA install/update + version mismatch detection |#### Stores (`src/lib/stores/`)-| Store | Responsibility |-| -------------------- | --------------------------------------------------------- |-| `chatStore` | Message sending, streaming, abort control, error handling |-| `conversationsStore` | CRUD for conversations, message branching, navigation |-| `modelsStore` | Model list, selection, loading/unloading (ROUTER) |-| `serverStore` | Server properties, role detection, modalities |-| `settingsStore` | User preferences, parameter sync with server defaults |+Stores own reactive application state as Svelte 5 runes. Larger stores are split into directories and compose focused sub-stores behind a narrow host interface (see Architectural Patterns).++| Store | Responsibility |+| -------------------- | --------------------------------------------------------------------------------------------------------------- |+| `chatStore` | Chat lifecycle, streaming, abort control, error handling; composes `processing`, `activity`, `streams`, `flows` |+| `conversationsStore` | Conversation CRUD, message branching, navigation, import/export; composes `preferences` |+| `modelsStore` | Model list, selection, loading/unloading (ROUTER); composes `props`, `status` |+| `mcpStore` | MCP host role: multi-server lifecycle, tool routing; composes `health`, `resources` |+| `agenticStore` | Multi-turn agentic loop orchestration, tool execution; composes `gates` |+| `serverStore` | Server connection state, `/props`, role detection, modalities |+| `settingsStore` | User preferences, theme, parameter sync with server defaults |+| `toolsStore` | Tool registry: server + MCP tools, enabled set for the LLM |+| `permissionsStore` | Persisted tool permission grants |+| `contextStatsStore` | Context window usage for the active conversation |+| `draftMessagesStore` | Per-chat draft message/files |+| `deviceStore` | Browser environment signals (mobile, OS, theme) |+| `versionStore` | Build version information |#### Services (`src/lib/services/`)-| Service | Responsibility |-| ---------------------- | ----------------------------------------------- |-| `ChatService` | API calls to`/v1/chat/completions`, SSE parsing |-| `ModelsService` | `/models`, `/models/load`, `/models/unload` |-| `PropsService` | `/props`, `/props?model=` |-| `DatabaseService` | IndexedDB operations via Dexie |-| `ParameterSyncService` | Syncs settings with server defaults |+Services are a stateless protocol layer: static methods, pure I/O, no reactive state. Stores consume them for all API and storage access.++| Service | Responsibility |+| ----------------------------- | ------------------------------------------------------------------------- |+| `ChatService` | `/v1/chat/completions` streaming + SSE parsing, message format conversion |+| `ModelsService` | `/models`, `/models/load`, `/models/unload` |+| `PropsService` | `/props`, `/props?model=` |+| `DatabaseService` | IndexedDB operations via Dexie |+| `MCPService` | MCP protocol: transports, connect, list/execute tools, prompts, resources |+| `ToolsService` | Server tool list/execute/stream (`/tools`) |+| `SandboxService` | Browser JS execution in a sandboxed worker |+| `ParameterSyncService` | Syncs settings with server defaults |+| `ConversationTransferService` | Conversation import/export JSONL + ZIP format |+| `MigrationService` | Non-destructive localStorage/IndexedDB migrations |+| `RouterService` | Dynamic route URL construction |---@@ -377,8 +445,6 @@ Components are organized in `app/` (application-specific) and `ui/` (shadcn-svel### MODEL Mode (Single Model)-See: [`docs/flows/data-flow-simplified-model-mode.md`](docs/flows/data-flow-simplified-model-mode.md)-```mermaidsequenceDiagramparticipant User@@ -388,8 +454,9 @@ sequenceDiagramparticipant API as llama-serverNote over User,API: Initialization- UI->>Stores: initialize()- Stores->>DB: load conversations+ UI->>Stores: initStores() (awaited by route loads)+ Stores->>Stores: run migrations+ Stores->>DB: load conversations (background)Stores->>API: GET /propsAPI-->>Stores: server configStores->>API: GET /v1/models@@ -408,8 +475,6 @@ sequenceDiagram### ROUTER Mode (Multi-Model)-See: [`docs/flows/data-flow-simplified-router-mode.md`](docs/flows/data-flow-simplified-router-mode.md)-```mermaidsequenceDiagramparticipant User@@ -441,17 +506,6 @@ sequenceDiagramend```-### Detailed Flow Diagrams--| Flow | Description | File |-| ------------- | ------------------------------------------ | ----------------------------------------------------------- |-| Chat | Message lifecycle, streaming, regeneration | [`chat-flow.md`](docs/flows/chat-flow.md) |-| Models | Loading, unloading, modality caching | [`models-flow.md`](docs/flows/models-flow.md) |-| Server | Props fetching, role detection | [`server-flow.md`](docs/flows/server-flow.md) |-| Conversations | CRUD, branching, import/export | [`conversations-flow.md`](docs/flows/conversations-flow.md) |-| Database | IndexedDB schema, operations | [`database-flow.md`](docs/flows/database-flow.md) |-| Settings | Parameter sync, user overrides | [`settings-flow.md`](docs/flows/settings-flow.md) |----## Architectural Patterns@@ -505,13 +559,14 @@ Components dispatch actions to stores, stores coordinate with services for I/O,### 3. Per-Conversation State-Enables concurrent streaming across multiple conversations:+Enables concurrent streaming across multiple conversations. Loading is tracked+per conversation by the activity ledger (`chatStore.activity`), while streaming+state and abort controllers live in per-conversation maps:```typescriptclass ChatStore {- chatLoadingStates = new Map<string, boolean>();- chatStreamingStates = new Map<string, { response: string; messageId: string }>();- abortControllers = new Map<string, AbortController>();+ chatStreamingStates = new SvelteMap<string, { response: string; messageId: string }>();+ abortControllers = new SvelteMap<string, AbortController>();}```@@ -567,20 +622,14 @@ get isRouterMode() {### 7. Modality Validation-Prevents sending attachments to incompatible models:+Prevents sending attachments to incompatible models. The+`use-chat-screen-active-model` hook derives the active model's capabilities+from `modelsStore.props`:```typescript-// useModelChangeValidation hook-const validate = (modelId: string) => {- const modelModalities = modelsStore.getModelModalities(modelId);- const conversationModalities = conversationsStore.usedModalities;-- // Check if model supports all used modalities- if (conversationModalities.hasImages && !modelModalities.vision) {- return { valid: false, reason: 'Model does not support images' };- }- // ...-};+// use-chat-screen-active-model hook+const hasVisionModality = $derived.by(() => modelsStore.props.modelSupportsVision(activeModelId));+const hasAudioModality = $derived.by(() => modelsStore.props.modelSupportsAudio(activeModelId));```### 8. Persistent Storage Strategy@@ -673,9 +722,6 @@ tools/ui/│ └── styles/ # Global styles├── static/ # Static assets├── tests/ # Test files-├── docs/ # Architecture diagrams-│ ├── architecture/ # High-level architecture-│ └── flows/ # Feature-specific flows└── .storybook/ # Storybook configuration```diff --git a/tools/ui/docs/architecture/high-level-architecture-simplified.md b/tools/ui/docs/architecture/high-level-architecture-simplified.mddeleted file mode 100644index 500f477c9a..0000000000--- a/tools/ui/docs/architecture/high-level-architecture-simplified.md+++ /dev/null@@ -1,145 +0,0 @@-```mermaid-flowchart TB- subgraph Routes["📍 Routes"]- R1["/ (Welcome)"]- R2["/chat/[id]"]- RL["+layout.svelte"]- end-- subgraph Components["🧩 Components"]- C_Sidebar["ChatSidebar"]- C_Screen["ChatScreen"]- C_Form["ChatForm"]- C_Messages["ChatMessages"]- C_Message["ChatMessage"]- C_ChatMessageAgenticContent["ChatMessageAgenticContent"]- C_MessageEditForm["ChatMessageEditForm"]- C_ModelsSelector["ModelsSelector"]- C_Settings["ChatSettings"]- C_McpSettings["McpServersSettings"]- C_McpResourceBrowser["McpResourceBrowser"]- C_McpServersSelector["McpServersSelector"]- end-- subgraph Hooks["🪝 Hooks"]- H1["useModelChangeValidation"]- H2["useProcessingState"]- end-- subgraph Stores["🗄️ Stores"]- S1["chatStore<br/><i>Chat interactions & streaming</i>"]- SA["agenticStore<br/><i>Multi-turn agentic loop orchestration</i>"]- S2["conversationsStore<br/><i>Conversation data, messages & MCP overrides</i>"]- S3["modelsStore<br/><i>Model selection & loading</i>"]- S4["serverStore<br/><i>Server props & role detection</i>"]- S5["settingsStore<br/><i>User configuration incl. MCP</i>"]- S6["mcpStore<br/><i>MCP servers, tools, prompts</i>"]- S7["mcpResourceStore<br/><i>MCP resources & attachments</i>"]- end-- subgraph Services["⚙️ Services"]- SV1["ChatService"]- SV2["ModelsService"]- SV3["PropsService"]- SV4["DatabaseService"]- SV5["ParameterSyncService"]- SV6["MCPService<br/><i>protocol operations</i>"]- end-- subgraph Storage["💾 Storage"]- ST1["IndexedDB<br/><i>conversations, messages</i>"]- ST2["LocalStorage<br/><i>config, userOverrides, mcpServers</i>"]- end-- subgraph APIs["🌐 llama-server API"]- API1["/v1/chat/completions"]- API2["/props"]- API3["/models/*"]- API4["/v1/models"]- end-- subgraph ExternalMCP["🔌 External MCP Servers"]- EXT1["MCP Server 1<br/><i>WebSocket/HTTP/SSE</i>"]- EXT2["MCP Server N"]- end-- %% Routes → Components- R1 & R2 --> C_Screen- RL --> C_Sidebar-- %% Layout runs MCP health checks- RL --> S6-- %% Component hierarchy- C_Screen --> C_Form & C_Messages & C_Settings- C_Messages --> C_Message- C_Message --> C_ChatMessageAgenticContent- C_Message --> C_MessageEditForm- C_Form & C_MessageEditForm --> C_ModelsSelector- C_Form --> C_McpServersSelector- C_Settings --> C_McpSettings- C_McpSettings --> C_McpResourceBrowser-- %% Components → Hooks → Stores- C_Form & C_Messages --> H1 & H2- H1 --> S3 & S4- H2 --> S1 & S5-- %% Components → Stores- C_Screen --> S1 & S2- C_Sidebar --> S2- C_ModelsSelector --> S3 & S4- C_Settings --> S5- C_McpSettings --> S6- C_McpResourceBrowser --> S6 & S7- C_McpServersSelector --> S6- C_Form --> S6-- %% chatStore → agenticStore → mcpStore (agentic loop)- S1 --> SA- SA --> SV1- SA --> S6-- %% Stores → Services- S1 --> SV1 & SV4- S2 --> SV4- S3 --> SV2 & SV3- S4 --> SV3- S5 --> SV5- S6 --> SV6- S7 --> SV6-- %% Services → Storage- SV4 --> ST1- SV5 --> ST2-- %% Services → APIs- SV1 --> API1- SV2 --> API3 & API4- SV3 --> API2-- %% MCP → External Servers- SV6 --> EXT1 & EXT2-- %% Styling- classDef routeStyle fill:#e1f5fe,stroke:#01579b,stroke-width:2px- classDef componentStyle fill:#f3e5f5,stroke:#7b1fa2,stroke-width:2px- classDef hookStyle fill:#fff8e1,stroke:#ff8f00,stroke-width:2px- classDef storeStyle fill:#fff3e0,stroke:#e65100,stroke-width:2px- classDef serviceStyle fill:#e8f5e9,stroke:#2e7d32,stroke-width:2px- classDef storageStyle fill:#fce4ec,stroke:#c2185b,stroke-width:2px- classDef apiStyle fill:#e3f2fd,stroke:#1565c0,stroke-width:2px- classDef mcpStyle fill:#e0f2f1,stroke:#00695c,stroke-width:2px- classDef agenticStyle fill:#e8eaf6,stroke:#283593,stroke-width:2px- classDef externalStyle fill:#f3e5f5,stroke:#6a1b9a,stroke-width:2px,stroke-dasharray: 5 5-- class R1,R2,RL routeStyle- class C_Sidebar,C_Screen,C_Form,C_Messages,C_Message,C_ChatMessageAgenticContent,C_MessageEditForm,C_ModelsSelector,C_Settings componentStyle- class C_McpSettings,C_McpResourceBrowser,C_McpServersSelector componentStyle- class H1,H2 hookStyle- class S1,S2,S3,S4,S5,SA,S6,S7 storeStyle- class SV1,SV2,SV3,SV4,SV5,SV6 serviceStyle- class ST1,ST2 storageStyle- class API1,API2,API3,API4 apiStyle- class EXT1,EXT2 externalStyle-```diff --git a/tools/ui/docs/architecture/high-level-architecture.md b/tools/ui/docs/architecture/high-level-architecture.mddeleted file mode 100644index 42ddb3f4f5..0000000000--- a/tools/ui/docs/architecture/high-level-architecture.md+++ /dev/null@@ -1,373 +0,0 @@-```mermaid-flowchart TB-subgraph Routes["📍 Routes"]-R1["/ (+page.svelte)"]-R2["/chat/[id]"]-RL["+layout.svelte"]-end-- subgraph Components["🧩 Components"]- direction TB- subgraph LayoutComponents["Layout"]- C_Sidebar["ChatSidebar"]- C_Screen["ChatScreen"]- end- subgraph ChatUIComponents["Chat UI"]- C_Form["ChatForm"]- C_Messages["ChatMessages"]- C_Message["ChatMessage"]- C_MessageUser["ChatMessageUser"]- C_MessageEditForm["ChatMessageEditForm"]- C_Attach["ChatAttachments"]- C_ModelsSelector["ModelsSelector"]- C_Settings["ChatSettings"]- end- subgraph MCPComponents["MCP UI"]- C_McpSettings["McpServersSettings"]- C_McpServerCard["McpServerCard"]- C_McpResourceBrowser["McpResourceBrowser"]- C_McpResourcePreview["McpResourcePreview"]- C_McpServersSelector["McpServersSelector"]- end- end-- subgraph Hooks["🪝 Hooks"]- H1["useModelChangeValidation"]- H2["useProcessingState"]- H3["isMobile"]- end-- subgraph Stores["🗄️ Stores"]- direction TB- subgraph S1["chatStore"]- S1State["<b>State:</b><br/>isLoading, currentResponse<br/>errorDialogState<br/>activeProcessingState<br/>chatLoadingStates<br/>chatStreamingStates<br/>abortControllers<br/>processingStates<br/>activeConversationId<br/>isStreamingActive"]- S1LoadState["<b>Loading State:</b><br/>setChatLoading()<br/>isChatLoading()<br/>syncLoadingStateForChat()<br/>clearUIState()<br/>isChatLoadingPublic()<br/>getAllLoadingChats()<br/>getAllStreamingChats()"]- S1ProcState["<b>Processing State:</b><br/>setActiveProcessingConversation()<br/>getProcessingState()<br/>clearProcessingState()<br/>getActiveProcessingState()<br/>updateProcessingStateFromTimings()<br/>getCurrentProcessingStateSync()<br/>restoreProcessingStateFromMessages()"]- S1Stream["<b>Streaming:</b><br/>streamChatCompletion()<br/>startStreaming()<br/>stopStreaming()<br/>stopGeneration()<br/>isStreaming()"]- S1Error["<b>Error Handling:</b><br/>showErrorDialog()<br/>dismissErrorDialog()<br/>isAbortError()"]- S1Msg["<b>Message Operations:</b><br/>addMessage()<br/>sendMessage()<br/>updateMessage()<br/>deleteMessage()<br/>getDeletionInfo()"]- S1Regen["<b>Regeneration:</b><br/>regenerateMessage()<br/>regenerateMessageWithBranching()<br/>continueAssistantMessage()"]- S1Edit["<b>Editing:</b><br/>editAssistantMessage()<br/>editUserMessagePreserveResponses()<br/>editMessageWithBranching()<br/>clearEditMode()<br/>isEditModeActive()<br/>getAddFilesHandler()<br/>setEditModeActive()"]- S1Utils["<b>Utilities:</b><br/>getApiOptions()<br/>parseTimingData()<br/>getOrCreateAbortController()<br/>getConversationModel()"]- end- subgraph SA["agenticStore"]- SAState["<b>State:</b><br/>sessions (Map)<br/>isAnyRunning"]- SASession["<b>Session Management:</b><br/>getSession()<br/>updateSession()<br/>clearSession()<br/>getActiveSessions()<br/>isRunning()<br/>currentTurn()<br/>totalToolCalls()<br/>lastError()<br/>streamingToolCall()"]- SAConfig["<b>Configuration:</b><br/>getConfig()<br/>maxTurns, maxToolPreviewLines"]- SAFlow["<b>Agentic Loop:</b><br/>runAgenticFlow()<br/>executeAgenticLoop()<br/>normalizeToolCalls()<br/>emitToolCallResult()<br/>extractBase64Attachments()"]- end- subgraph S2["conversationsStore"]- S2State["<b>State:</b><br/>conversations<br/>activeConversation<br/>activeMessages<br/>isInitialized<br/>pendingMcpServerOverrides<br/>titleUpdateConfirmationCallback"]- S2Lifecycle["<b>Lifecycle:</b><br/>initialize()<br/>loadConversations()<br/>clearActiveConversation()"]- S2ConvCRUD["<b>Conversation CRUD:</b><br/>createConversation()<br/>loadConversation()<br/>deleteConversation()<br/>deleteAll()<br/>updateConversationName()<br/>updateConversationTitleWithConfirmation()"]- S2MsgMgmt["<b>Message Management:</b><br/>refreshActiveMessages()<br/>addMessageToActive()<br/>updateMessageAtIndex()<br/>findMessageIndex()<br/>sliceActiveMessages()<br/>removeMessageAtIndex()<br/>getConversationMessages()"]- S2Nav["<b>Navigation:</b><br/>navigateToSibling()<br/>updateCurrentNode()<br/>updateConversationTimestamp()"]- S2McpOverrides["<b>MCP Per-Chat Overrides:</b><br/>getMcpServerOverride()<br/>getAllMcpServerOverrides()<br/>setMcpServerOverride()<br/>toggleMcpServerForChat()<br/>removeMcpServerOverride()<br/>isMcpServerEnabledForChat()<br/>clearPendingMcpServerOverrides()"]- S2Export["<b>Import/Export:</b><br/>downloadConversation()<br/>exportAllConversations()<br/>importConversations()<br/>importConversationsData()<br/>triggerDownload()"]- S2Utils["<b>Utilities:</b><br/>setTitleUpdateConfirmationCallback()"]- end- subgraph S3["modelsStore"]- S3State["<b>State:</b><br/>models, routerModels<br/>selectedModelId<br/>selectedModelName<br/>loading, updating, error<br/>modelLoadingStates<br/>modelPropsCache<br/>modelPropsFetching<br/>propsCacheVersion"]- S3Getters["<b>Computed Getters:</b><br/>selectedModel<br/>loadedModelIds<br/>loadingModelIds<br/>singleModelName"]- S3Modal["<b>Modalities:</b><br/>getModelModalities()<br/>modelSupportsVision()<br/>modelSupportsAudio()<br/>getModelModalitiesArray()<br/>getModelProps()<br/>updateModelModalities()"]- S3Status["<b>Status Queries:</b><br/>isModelLoaded()<br/>isModelOperationInProgress()<br/>getModelStatus()<br/>isModelPropsFetching()"]- S3Fetch["<b>Data Fetching:</b><br/>fetch()<br/>fetchRouterModels()<br/>fetchModelProps()<br/>fetchModalitiesForLoadedModels()"]- S3Select["<b>Model Selection:</b><br/>selectModelById()<br/>selectModelByName()<br/>clearSelection()<br/>findModelByName()<br/>findModelById()<br/>hasModel()"]- S3LoadUnload["<b>Loading/Unloading Models:</b><br/>loadModel()<br/>unloadModel()<br/>ensureModelLoaded()<br/>waitForModelStatus()<br/>pollForModelStatus()"]- S3Utils["<b>Utilities:</b><br/>toDisplayName()<br/>clear()"]- end- subgraph S4["serverStore"]- S4State["<b>State:</b><br/>props<br/>loading, error<br/>role<br/>fetchPromise"]- S4Getters["<b>Getters:</b><br/>defaultParams<br/>contextSize<br/>isRouterMode<br/>isModelMode"]- S4Data["<b>Data Handling:</b><br/>fetch()<br/>getErrorMessage()<br/>clear()"]- S4Utils["<b>Utilities:</b><br/>detectRole()"]- end- subgraph S5["settingsStore"]- S5State["<b>State:</b><br/>config<br/>theme<br/>isInitialized<br/>userOverrides"]- S5Lifecycle["<b>Lifecycle:</b><br/>initialize()<br/>loadConfig()<br/>saveConfig()<br/>loadTheme()<br/>saveTheme()"]- S5Update["<b>Config Updates:</b><br/>updateConfig()<br/>updateMultipleConfig()<br/>updateTheme()"]- S5Reset["<b>Reset:</b><br/>resetConfig()<br/>resetTheme()<br/>resetAll()<br/>resetParameterToServerDefault()"]- S5Sync["<b>Server Sync:</b><br/>syncWithServerDefaults()<br/>forceSyncWithServerDefaults()"]- S5Utils["<b>Utilities:</b><br/>getConfig()<br/>getAllConfig()<br/>getParameterInfo()<br/>getParameterDiff()<br/>getServerDefaults()<br/>clearAllUserOverrides()"]- end- subgraph S6["mcpStore"]- S6State["<b>State:</b><br/>isInitializing, error<br/>toolCount, connectedServers<br/>healthChecks (Map)<br/>connections (Map)<br/>toolsIndex (Map)"]- S6Lifecycle["<b>Lifecycle:</b><br/>ensureInitialized()<br/>initialize()<br/>shutdown()<br/>acquireConnection()<br/>releaseConnection()"]- S6Health["<b>Health Checks:</b><br/>runHealthCheck()<br/>runHealthChecksForServers()<br/>updateHealthCheck()<br/>getHealthCheckState()<br/>clearHealthCheck()"]- S6Servers["<b>Server Management:</b><br/>getServers()<br/>addServer()<br/>updateServer()<br/>removeServer()<br/>getServerById()<br/>getServerDisplayName()"]- S6Tools["<b>Tool Operations:</b><br/>getToolDefinitionsForLLM()<br/>getToolNames()<br/>hasTool()<br/>getToolServer()<br/>executeTool()<br/>executeToolByName()"]- S6Prompts["<b>Prompt Operations:</b><br/>getAllPrompts()<br/>getPrompt()<br/>hasPromptsCapability()<br/>getPromptCompletions()"]- end- subgraph S7["mcpResourceStore"]- S7State["<b>State:</b><br/>serverResources (Map)<br/>cachedResources (Map)<br/>subscriptions (Map)<br/>attachments[]<br/>isLoading"]- S7Resources["<b>Resource Discovery:</b><br/>setServerResources()<br/>getServerResources()<br/>getAllResourceInfos()<br/>getAllTemplateInfos()<br/>clearServerResources()"]- S7Cache["<b>Caching:</b><br/>cacheResourceContent()<br/>getCachedContent()<br/>invalidateCache()<br/>clearCache()"]- S7Subs["<b>Subscriptions:</b><br/>addSubscription()<br/>removeSubscription()<br/>isSubscribed()<br/>handleResourceUpdate()"]- S7Attach["<b>Attachments:</b><br/>addAttachment()<br/>updateAttachmentContent()<br/>removeAttachment()<br/>clearAttachments()<br/>toMessageExtras()"]- end-- subgraph ReactiveExports["⚡ Reactive Exports"]- direction LR- subgraph ChatExports["chatStore"]- RE1["isLoading()"]- RE2["currentResponse()"]- RE3["errorDialog()"]- RE4["activeProcessingState()"]- RE5["isChatStreaming()"]- RE6["isChatLoading()"]- RE7["getChatStreaming()"]- RE8["getAllLoadingChats()"]- RE9["getAllStreamingChats()"]- RE9a["isEditModeActive()"]- RE9b["getAddFilesHandler()"]- RE9c["setEditModeActive()"]- RE9d["clearEditMode()"]- end- subgraph AgenticExports["agenticStore"]- REA1["agenticIsRunning()"]- REA2["agenticCurrentTurn()"]- REA3["agenticTotalToolCalls()"]- REA4["agenticLastError()"]- REA5["agenticStreamingToolCall()"]- REA6["agenticIsAnyRunning()"]- end- subgraph ConvExports["conversationsStore"]- RE10["conversations()"]- RE11["activeConversation()"]- RE12["activeMessages()"]- RE13["isConversationsInitialized()"]- end- subgraph ModelsExports["modelsStore"]- RE15["modelOptions()"]- RE16["routerModels()"]- RE17["modelsLoading()"]- RE18["modelsUpdating()"]- RE19["modelsError()"]- RE20["selectedModelId()"]- RE21["selectedModelName()"]- RE22["selectedModelOption()"]- RE23["loadedModelIds()"]- RE24["loadingModelIds()"]- RE25["propsCacheVersion()"]- RE26["singleModelName()"]- end- subgraph ServerExports["serverStore"]- RE27["serverProps()"]- RE28["serverLoading()"]- RE29["serverError()"]- RE30["serverRole()"]- RE31["defaultParams()"]- RE32["contextSize()"]- RE33["isRouterMode()"]- RE34["isModelMode()"]- end- subgraph SettingsExports["settingsStore"]- RE35["config()"]- RE36["theme()"]- RE37["isInitialized()"]- end- subgraph MCPExports["mcpStore / mcpResourceStore"]- RE38["mcpResources()"]- RE39["mcpResourceAttachments()"]- RE40["mcpHasResourceAttachments()"]- RE41["mcpTotalResourceCount()"]- RE42["mcpResourcesLoading()"]- end- end- end-- subgraph Services["⚙️ Services"]- direction TB- subgraph SV1["ChatService"]- SV1Msg["<b>Messaging:</b><br/>sendMessage()"]- SV1Stream["<b>Streaming:</b><br/>handleStreamResponse()<br/>handleNonStreamResponse()"]- SV1Convert["<b>Conversion:</b><br/>convertDbMessageToApiChatMessageData()<br/>mergeToolCallDeltas()"]- SV1Utils["<b>Utilities:</b><br/>stripReasoningContent()<br/>extractModelName()<br/>parseErrorResponse()"]- end- subgraph SV2["ModelsService"]- SV2List["<b>Listing:</b><br/>list()<br/>listRouter()"]- SV2LoadUnload["<b>Load/Unload:</b><br/>load()<br/>unload()"]- SV2Status["<b>Status:</b><br/>isModelLoaded()<br/>isModelLoading()"]- end- subgraph SV3["PropsService"]- SV3Fetch["<b>Fetching:</b><br/>fetch()<br/>fetchForModel()"]- end- subgraph SV4["DatabaseService"]- SV4Conv["<b>Conversations:</b><br/>createConversation()<br/>getConversation()<br/>getAllConversations()<br/>updateConversation()<br/>deleteConversation()"]- SV4Msg["<b>Messages:</b><br/>createMessageBranch()<br/>createRootMessage()<br/>createSystemMessage()<br/>getConversationMessages()<br/>updateMessage()<br/>deleteMessage()<br/>deleteMessageCascading()"]- SV4Node["<b>Navigation:</b><br/>updateCurrentNode()"]- SV4Import["<b>Import:</b><br/>importConversations()"]- end- subgraph SV5["ParameterSyncService"]- SV5Extract["<b>Extraction:</b><br/>extractServerDefaults()"]- SV5Merge["<b>Merging:</b><br/>mergeWithServerDefaults()"]- SV5Info["<b>Info:</b><br/>getParameterInfo()<br/>canSyncParameter()<br/>getSyncableParameterKeys()<br/>validateServerParameter()"]- SV5Diff["<b>Diff:</b><br/>createParameterDiff()"]- end- subgraph SV6["MCPService"]- SV6Transport["<b>Transport:</b><br/>createTransport()<br/>WebSocket / StreamableHTTP / SSE"]- SV6Conn["<b>Connection:</b><br/>connect()<br/>disconnect()"]- SV6Tools["<b>Tools:</b><br/>listTools()<br/>callTool()"]- SV6Prompts["<b>Prompts:</b><br/>listPrompts()<br/>getPrompt()"]- SV6Resources["<b>Resources:</b><br/>listResources()<br/>listResourceTemplates()<br/>readResource()<br/>subscribeResource()<br/>unsubscribeResource()"]- SV6Complete["<b>Completions:</b><br/>complete()"]- end- end-- subgraph ExternalMCP["🔌 External MCP Servers"]- EXT1["MCP Server 1<br/>(WebSocket/StreamableHTTP/SSE)"]- EXT2["MCP Server N"]- end-- subgraph Storage["💾 Storage"]- ST1["IndexedDB"]- ST2["conversations"]- ST3["messages"]- ST5["LocalStorage"]- ST6["config"]- ST7["userOverrides"]- ST8["mcpServers"]- end-- subgraph APIs["🌐 llama-server API"]- API1["/v1/chat/completions"]- API2["/props<br/>/props?model="]- API3["/models<br/>/models/load<br/>/models/unload"]- API4["/v1/models"]- end-- %% Routes render Components- R1 --> C_Screen- R2 --> C_Screen- RL --> C_Sidebar-- %% Layout runs MCP health checks on startup- RL --> S6-- %% Component hierarchy- C_Screen --> C_Form & C_Messages & C_Settings- C_Messages --> C_Message- C_Message --> C_MessageUser- C_MessageUser --> C_MessageEditForm- C_MessageEditForm --> C_ModelsSelector- C_MessageEditForm --> C_Attach- C_Form --> C_ModelsSelector- C_Form --> C_Attach- C_Form --> C_McpServersSelector- C_Message --> C_Attach-- %% MCP Components hierarchy- C_Settings --> C_McpSettings- C_McpSettings --> C_McpServerCard- C_McpServerCard --> C_McpResourceBrowser- C_McpResourceBrowser --> C_McpResourcePreview-- %% Components use Hooks- C_Form --> H1- C_Message --> H1 & H2- C_MessageEditForm --> H1- C_Screen --> H2-- %% Hooks use Stores- H1 --> S3 & S4- H2 --> S1 & S5-- %% Components use Stores- C_Screen --> S1 & S2- C_Messages --> S2- C_Message --> S1 & S2 & S3- C_Form --> S1 & S3 & S6- C_Sidebar --> S2- C_ModelsSelector --> S3 & S4- C_Settings --> S5- C_McpSettings --> S6- C_McpServerCard --> S6- C_McpResourceBrowser --> S6 & S7- C_McpServersSelector --> S6-- %% Stores export Reactive State- S1 -. exports .-> ChatExports- SA -. exports .-> AgenticExports- S2 -. exports .-> ConvExports- S3 -. exports .-> ModelsExports- S4 -. exports .-> ServerExports- S5 -. exports .-> SettingsExports- S6 -. exports .-> MCPExports- S7 -. exports .-> MCPExports-- %% chatStore → agenticStore (agentic loop orchestration)- S1 --> SA- SA --> SV1- SA --> S6-- %% Stores use Services- S1 --> SV1 & SV4- S2 --> SV4- S3 --> SV2 & SV3- S4 --> SV3- S5 --> SV5- S6 --> SV6- S7 --> SV6-- %% Services to Storage- SV4 --> ST1- ST1 --> ST2 & ST3- SV5 --> ST5- ST5 --> ST6 & ST7 & ST8-- %% Services to APIs- SV1 --> API1- SV2 --> API3 & API4- SV3 --> API2-- %% MCP → External Servers- SV6 --> EXT1 & EXT2-- %% Styling- classDef routeStyle fill:#e1f5fe,stroke:#01579b,stroke-width:2px- classDef componentStyle fill:#f3e5f5,stroke:#7b1fa2,stroke-width:2px- classDef componentGroupStyle fill:#e1bee7,stroke:#7b1fa2,stroke-width:1px- classDef hookStyle fill:#fff8e1,stroke:#ff8f00,stroke-width:2px- classDef storeStyle fill:#fff3e0,stroke:#e65100,stroke-width:2px- classDef stateStyle fill:#ffe0b2,stroke:#e65100,stroke-width:1px- classDef methodStyle fill:#ffecb3,stroke:#e65100,stroke-width:1px- classDef reactiveStyle fill:#fffde7,stroke:#f9a825,stroke-width:1px- classDef serviceStyle fill:#e8f5e9,stroke:#2e7d32,stroke-width:2px- classDef serviceMStyle fill:#c8e6c9,stroke:#2e7d32,stroke-width:1px- classDef externalStyle fill:#f3e5f5,stroke:#6a1b9a,stroke-width:2px,stroke-dasharray: 5 5- classDef storageStyle fill:#fce4ec,stroke:#c2185b,stroke-width:2px- classDef apiStyle fill:#e3f2fd,stroke:#1565c0,stroke-width:2px-- class R1,R2,RL routeStyle- class C_Sidebar,C_Screen,C_Form,C_Messages,C_Message,C_MessageUser,C_MessageEditForm componentStyle- class C_ModelsSelector,C_Settings componentStyle- class C_Attach componentStyle- class C_McpSettings,C_McpServerCard,C_McpResourceBrowser,C_McpResourcePreview,C_McpServersSelector componentStyle- class H1,H2,H3 hookStyle- class LayoutComponents,ChatUIComponents,MCPComponents componentGroupStyle- class Hooks hookStyle- classDef agenticStyle fill:#e8eaf6,stroke:#283593,stroke-width:2px- classDef agenticMethodStyle fill:#c5cae9,stroke:#283593,stroke-width:1px-- class S1,S2,S3,S4,S5,SA,S6,S7 storeStyle- class S1State,S2State,S3State,S4State,S5State,SAState,S6State,S7State stateStyle- class S1Msg,S1Regen,S1Edit,S1Stream,S1LoadState,S1ProcState,S1Error,S1Utils methodStyle- class SASession,SAConfig,SAFlow methodStyle- class S2Lifecycle,S2ConvCRUD,S2MsgMgmt,S2Nav,S2McpOverrides,S2Export,S2Utils methodStyle- class S3Getters,S3Modal,S3Status,S3Fetch,S3Select,S3LoadUnload,S3Utils methodStyle- class S4Getters,S4Data,S4Utils methodStyle- class S5Lifecycle,S5Update,S5Reset,S5Sync,S5Utils methodStyle- class S6Lifecycle,S6Health,S6Servers,S6Tools,S6Prompts methodStyle- class S7Resources,S7Cache,S7Subs,S7Attach methodStyle- class ChatExports,AgenticExports,ConvExports,ModelsExports,ServerExports,SettingsExports,MCPExports reactiveStyle- class SV1,SV2,SV3,SV4,SV5,SV6 serviceStyle- class SV6Transport,SV6Conn,SV6Tools,SV6Prompts,SV6Resources,SV6Complete serviceMStyle- class EXT1,EXT2 externalStyle- class SV1Msg,SV1Stream,SV1Convert,SV1Utils serviceMStyle- class SV2List,SV2LoadUnload,SV2Status serviceMStyle- class SV3Fetch serviceMStyle- class SV4Conv,SV4Msg,SV4Node,SV4Import serviceMStyle- class SV5Extract,SV5Merge,SV5Info,SV5Diff serviceMStyle- class ST1,ST2,ST3,ST5,ST6,ST7,ST8 storageStyle- class API1,API2,API3,API4 apiStyle-```diff --git a/tools/ui/docs/flows/chat-flow.md b/tools/ui/docs/flows/chat-flow.mddeleted file mode 100644index 296693c6a5..0000000000--- a/tools/ui/docs/flows/chat-flow.md+++ /dev/null@@ -1,228 +0,0 @@-```mermaid-sequenceDiagram- participant UI as 🧩 ChatForm / ChatMessage- participant chatStore as 🗄️ chatStore- participant agenticStore as 🗄️ agenticStore- participant convStore as 🗄️ conversationsStore- participant settingsStore as 🗄️ settingsStore- participant mcpStore as 🗄️ mcpStore- participant ChatSvc as ⚙️ ChatService- participant DbSvc as ⚙️ DatabaseService- participant API as 🌐 /v1/chat/completions-- Note over chatStore: State:<br/>isLoading, currentResponse<br/>errorDialogState, activeProcessingState<br/>chatLoadingStates (Map)<br/>chatStreamingStates (Map)<br/>abortControllers (Map)<br/>processingStates (Map)-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,API: 💬 SEND MESSAGE- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>chatStore: sendMessage(content, extras)- activate chatStore-- chatStore->>chatStore: setChatLoading(convId, true)- chatStore->>chatStore: clearChatStreaming(convId)-- alt no active conversation- chatStore->>convStore: createConversation()- Note over convStore: → see conversations-flow.mmd- end-- chatStore->>mcpStore: consumeResourceAttachmentsAsExtras()- Note right of mcpStore: Converts pending MCP resource<br/>attachments into message extras-- chatStore->>chatStore: addMessage("user", content, extras)- chatStore->>DbSvc: createMessageBranch(userMsg, parentId)- chatStore->>convStore: addMessageToActive(userMsg)- chatStore->>convStore: updateCurrentNode(userMsg.id)-- chatStore->>chatStore: createAssistantMessage(userMsg.id)- chatStore->>DbSvc: createMessageBranch(assistantMsg, userMsg.id)- chatStore->>convStore: addMessageToActive(assistantMsg)-- chatStore->>chatStore: streamChatCompletion(messages, assistantMsg)- deactivate chatStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,API: 🌊 STREAMING (with agentic flow detection)- %% ═══════════════════════════════════════════════════════════════════════════-- activate chatStore- chatStore->>chatStore: startStreaming()- Note right of chatStore: isStreamingActive = true-- chatStore->>chatStore: setActiveProcessingConversation(convId)- chatStore->>chatStore: getOrCreateAbortController(convId)- Note right of chatStore: abortControllers.set(convId, new AbortController())-- chatStore->>chatStore: getApiOptions()- Note right of chatStore: Merge from settingsStore.config:<br/>temperature, max_tokens, top_p, etc.-- alt agenticConfig.enabled && mcpStore has connected servers- chatStore->>agenticStore: runAgenticFlow(convId, messages, assistantMsg, options, signal)- Note over agenticStore: Multi-turn agentic loop:<br/>1. Call ChatService.sendMessage()<br/>2. If response has tool_calls → execute via mcpStore<br/>3. Append tool results as messages<br/>4. Loop until no more tool_calls or maxTurns<br/>→ see agentic flow details below- agenticStore-->>chatStore: final response with timings- else standard (non-agentic) flow- chatStore->>ChatSvc: sendMessage(messages, options, signal)- end-- activate ChatSvc-- ChatSvc->>ChatSvc: convertDbMessageToApiChatMessageData(messages)- Note right of ChatSvc: DatabaseMessage[] → ApiChatMessageData[]<br/>Process attachments (images, PDFs, audio)-- ChatSvc->>API: POST /v1/chat/completions- Note right of API: {messages, model?, stream: true, ...params}-- loop SSE chunks- API-->>ChatSvc: data: {"choices":[{"delta":{...}}]}- ChatSvc->>ChatSvc: handleStreamResponse(response)-- alt content chunk- ChatSvc-->>chatStore: onChunk(content)- chatStore->>chatStore: setChatStreaming(convId, response, msgId)- Note right of chatStore: currentResponse = $state(accumulated)- chatStore->>convStore: updateMessageAtIndex(idx, {content})- end-- alt reasoning chunk- ChatSvc-->>chatStore: onReasoningChunk(reasoning)- chatStore->>convStore: updateMessageAtIndex(idx, {thinking})- end-- alt tool_calls chunk- ChatSvc-->>chatStore: onToolCallChunk(toolCalls)- chatStore->>convStore: updateMessageAtIndex(idx, {toolCalls})- end-- alt model info- ChatSvc-->>chatStore: onModel(modelName)- chatStore->>chatStore: recordModel(modelName)- chatStore->>DbSvc: updateMessage(msgId, {model})- end-- alt timings (during stream)- ChatSvc-->>chatStore: onTimings(timings, promptProgress)- chatStore->>chatStore: updateProcessingStateFromTimings()- end-- chatStore-->>UI: reactive $state update- end-- API-->>ChatSvc: data: [DONE]- ChatSvc-->>chatStore: onComplete(content, reasoning, timings, toolCalls)- deactivate ChatSvc-- chatStore->>chatStore: stopStreaming()- chatStore->>DbSvc: updateMessage(msgId, {content, timings, model})- chatStore->>convStore: updateCurrentNode(msgId)- chatStore->>chatStore: setChatLoading(convId, false)- chatStore->>chatStore: clearChatStreaming(convId)- chatStore->>chatStore: clearProcessingState(convId)- deactivate chatStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,API: ⏹️ STOP GENERATION- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>chatStore: stopGeneration()- activate chatStore- chatStore->>chatStore: savePartialResponseIfNeeded(convId)- Note right of chatStore: Save currentResponse to DB if non-empty- chatStore->>chatStore: abortControllers.get(convId).abort()- Note right of chatStore: fetch throws AbortError → caught by isAbortError()- chatStore->>chatStore: stopStreaming()- chatStore->>chatStore: setChatLoading(convId, false)- chatStore->>chatStore: clearChatStreaming(convId)- chatStore->>chatStore: clearProcessingState(convId)- deactivate chatStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,API: 🔁 REGENERATE- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>chatStore: regenerateMessageWithBranching(msgId, model?)- activate chatStore- chatStore->>convStore: findMessageIndex(msgId)- chatStore->>chatStore: Get parent of target message- chatStore->>chatStore: createAssistantMessage(parentId)- chatStore->>DbSvc: createMessageBranch(newAssistantMsg, parentId)- chatStore->>convStore: refreshActiveMessages()- Note right of chatStore: Same streaming flow- chatStore->>chatStore: streamChatCompletion(...)- deactivate chatStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,API: ➡️ CONTINUE- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>chatStore: continueAssistantMessage(msgId)- activate chatStore- chatStore->>chatStore: Get existing content from message- chatStore->>chatStore: streamChatCompletion(..., existingContent)- Note right of chatStore: Appends to existing message content- deactivate chatStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,API: ✏️ EDIT USER MESSAGE- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>chatStore: editMessageWithBranching(msgId, newContent, extras)- activate chatStore- chatStore->>chatStore: Get parent of target message- chatStore->>DbSvc: createMessageBranch(editedMsg, parentId)- chatStore->>convStore: refreshActiveMessages()- Note right of chatStore: Creates new branch, original preserved- chatStore->>chatStore: createAssistantMessage(editedMsg.id)- chatStore->>chatStore: streamChatCompletion(...)- Note right of chatStore: Automatically regenerates response- deactivate chatStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,API: ❌ ERROR HANDLING- %% ═══════════════════════════════════════════════════════════════════════════-- Note over chatStore: On stream error (non-abort):- chatStore->>chatStore: showErrorDialog(type, message)- Note right of chatStore: errorDialogState = {type: 'timeout'|'server', message}- chatStore->>convStore: removeMessageAtIndex(failedMsgIdx)- chatStore->>DbSvc: deleteMessage(failedMsgId)-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,API: 🤖 AGENTIC LOOP (when agenticConfig.enabled)- %% ═══════════════════════════════════════════════════════════════════════════-- Note over agenticStore: agenticStore.runAgenticFlow(convId, messages, assistantMsg, options, signal)- activate agenticStore- agenticStore->>agenticStore: getSession(convId) or create new- agenticStore->>agenticStore: updateSession(turn: 0, running: true)-- loop executeAgenticLoop (until no tool_calls or maxTurns)- agenticStore->>agenticStore: turn++- agenticStore->>ChatSvc: sendMessage(messages, options, signal)- ChatSvc->>API: POST /v1/chat/completions- API-->>ChatSvc: response with potential tool_calls- ChatSvc-->>agenticStore: onComplete(content, reasoning, timings, toolCalls)-- alt response has tool_calls- agenticStore->>agenticStore: normalizeToolCalls(toolCalls)- loop for each tool_call- agenticStore->>agenticStore: updateSession(streamingToolCall)- agenticStore->>mcpStore: executeTool(mcpCall, signal)- mcpStore-->>agenticStore: tool result- agenticStore->>agenticStore: extractBase64Attachments(result)- agenticStore->>agenticStore: emitToolCallResult(convId, ...)- agenticStore->>convStore: addMessageToActive(toolResultMsg)- agenticStore->>DbSvc: createMessageBranch(toolResultMsg)- end- agenticStore->>agenticStore: Create new assistantMsg for next turn- Note right of agenticStore: Continue loop with updated messages- else no tool_calls (final response)- agenticStore->>agenticStore: buildFinalTimings(allTurns)- Note right of agenticStore: Break loop, return final response- end- end-- agenticStore->>agenticStore: updateSession(running: false)- agenticStore-->>chatStore: final content, timings, model- deactivate agenticStore-```diff --git a/tools/ui/docs/flows/conversations-flow.md b/tools/ui/docs/flows/conversations-flow.mddeleted file mode 100644index bd2309bc03..0000000000--- a/tools/ui/docs/flows/conversations-flow.md+++ /dev/null@@ -1,183 +0,0 @@-```mermaid-sequenceDiagram- participant UI as 🧩 ChatSidebar / ChatScreen- participant convStore as 🗄️ conversationsStore- participant chatStore as 🗄️ chatStore- participant DbSvc as ⚙️ DatabaseService- participant IDB as 💾 IndexedDB-- Note over convStore: State:<br/>conversations: DatabaseConversation[]<br/>activeConversation: DatabaseConversation | null<br/>activeMessages: DatabaseMessage[]<br/>isInitialized: boolean<br/>pendingMcpServerOverrides: Map<string, McpServerOverride>-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,IDB: 🚀 INITIALIZATION- %% ═══════════════════════════════════════════════════════════════════════════-- Note over convStore: Auto-initialized in constructor (browser only)- convStore->>convStore: initialize()- activate convStore- convStore->>convStore: loadConversations()- convStore->>DbSvc: getAllConversations()- DbSvc->>IDB: SELECT * FROM conversations ORDER BY lastModified DESC- IDB-->>DbSvc: Conversation[]- DbSvc-->>convStore: conversations- convStore->>convStore: conversations = $state(data)- convStore->>convStore: isInitialized = true- deactivate convStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,IDB: ➕ CREATE CONVERSATION- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>convStore: createConversation(name?)- activate convStore- convStore->>DbSvc: createConversation(name || "New Chat")- DbSvc->>IDB: INSERT INTO conversations- IDB-->>DbSvc: conversation {id, name, lastModified, currNode: ""}- DbSvc-->>convStore: conversation- convStore->>convStore: conversations.unshift(conversation)- convStore->>convStore: activeConversation = $state(conversation)- convStore->>convStore: activeMessages = $state([])-- alt pendingMcpServerOverrides has entries- loop each pending override- convStore->>DbSvc: Store MCP server override for new conversation- end- convStore->>convStore: clearPendingMcpServerOverrides()- end- deactivate convStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,IDB: 📂 LOAD CONVERSATION- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>convStore: loadConversation(convId)- activate convStore- convStore->>DbSvc: getConversation(convId)- DbSvc->>IDB: SELECT * FROM conversations WHERE id = ?- IDB-->>DbSvc: conversation- convStore->>convStore: activeConversation = $state(conversation)-- convStore->>convStore: refreshActiveMessages()- convStore->>DbSvc: getConversationMessages(convId)- DbSvc->>IDB: SELECT * FROM messages WHERE convId = ?- IDB-->>DbSvc: allMessages[]- convStore->>convStore: filterByLeafNodeId(allMessages, currNode)- Note right of convStore: Filter to show only current branch path- convStore->>convStore: activeMessages = $state(filtered)-- Note right of convStore: Route (+page.svelte) then calls:<br/>chatStore.syncLoadingStateForChat(convId)- deactivate convStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,IDB: 🌳 MESSAGE BRANCHING MODEL- %% ═══════════════════════════════════════════════════════════════════════════-- Note over IDB: Message Tree Structure:<br/>- Each message has parent (null for root)<br/>- Each message has children[] array<br/>- Conversation.currNode points to active leaf<br/>- filterByLeafNodeId() traverses from root to currNode-- rect rgb(240, 240, 255)- Note over convStore: Example Branch Structure:- Note over convStore: root → user1 → assistant1 → user2 → assistant2a (currNode)<br/> ↘ assistant2b (alt branch)- end-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,IDB: ↔️ BRANCH NAVIGATION- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>convStore: navigateToSibling(msgId, direction)- activate convStore- convStore->>convStore: Find message in activeMessages- convStore->>convStore: Get parent message- convStore->>convStore: Find sibling in parent.children[]- convStore->>convStore: findLeafNode(siblingId, allMessages)- Note right of convStore: Navigate to leaf of sibling branch- convStore->>convStore: updateCurrentNode(leafId)- convStore->>DbSvc: updateCurrentNode(convId, leafId)- DbSvc->>IDB: UPDATE conversations SET currNode = ?- convStore->>convStore: refreshActiveMessages()- deactivate convStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,IDB: 📝 UPDATE CONVERSATION- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>convStore: updateConversationName(convId, newName)- activate convStore- convStore->>DbSvc: updateConversation(convId, {name: newName})- DbSvc->>IDB: UPDATE conversations SET name = ?- convStore->>convStore: Update in conversations array- deactivate convStore-- Note over convStore: Auto-title update (after first response):- convStore->>convStore: updateConversationTitleWithConfirmation()- convStore->>convStore: titleUpdateConfirmationCallback?()- Note right of convStore: Shows dialog if title would change-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,IDB: 🗑️ DELETE CONVERSATION- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>convStore: deleteConversation(convId)- activate convStore- convStore->>DbSvc: deleteConversation(convId)- DbSvc->>IDB: DELETE FROM conversations WHERE id = ?- DbSvc->>IDB: DELETE FROM messages WHERE convId = ?- convStore->>convStore: conversations.filter(c => c.id !== convId)- alt deleted active conversation- convStore->>convStore: clearActiveConversation()- end- deactivate convStore-- UI->>convStore: deleteAll()- activate convStore- convStore->>DbSvc: Delete all conversations and messages- convStore->>convStore: conversations = []- convStore->>convStore: clearActiveConversation()- deactivate convStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,IDB: � MCP SERVER PER-CHAT OVERRIDES- %% ═══════════════════════════════════════════════════════════════════════════-- Note over convStore: Conversations can override which MCP servers are enabled.- Note over convStore: Uses pendingMcpServerOverrides before conversation<br/>is created, then persists to conversation metadata.-- UI->>convStore: setMcpServerOverride(convId, serverName, override)- Note right of convStore: override = {enabled: boolean}-- UI->>convStore: toggleMcpServerForChat(convId, serverName, enabled)- activate convStore- convStore->>convStore: setMcpServerOverride(convId, serverName, {enabled})- deactivate convStore-- UI->>convStore: isMcpServerEnabledForChat(convId, serverName)- Note right of convStore: Check override → fall back to global MCP config-- UI->>convStore: getAllMcpServerOverrides(convId)- Note right of convStore: Returns all overrides for a conversation-- UI->>convStore: removeMcpServerOverride(convId, serverName)- UI->>convStore: getMcpServerOverride(convId, serverName)-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,IDB: 📤 EXPORT / 📥 IMPORT- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>convStore: exportAllConversations()- activate convStore- convStore->>DbSvc: getAllConversations()- loop each conversation- convStore->>DbSvc: getConversationMessages(convId)- end- convStore->>convStore: triggerDownload(JSON blob)- deactivate convStore-- UI->>convStore: importConversations(file)- activate convStore- convStore->>convStore: Parse JSON file- convStore->>convStore: importConversationsData(parsed)- convStore->>DbSvc: importConversations(parsed)- Note right of DbSvc: Skips duplicate conversations<br/>(checks existing by ID)- DbSvc->>IDB: INSERT conversations + messages (skip existing)- convStore->>convStore: loadConversations()- deactivate convStore-```diff --git a/tools/ui/docs/flows/data-flow-simplified-model-mode.md b/tools/ui/docs/flows/data-flow-simplified-model-mode.mddeleted file mode 100644index 07b362147f..0000000000--- a/tools/ui/docs/flows/data-flow-simplified-model-mode.md+++ /dev/null@@ -1,45 +0,0 @@-```mermaid-%% MODEL Mode Data Flow (single model)-%% Detailed flows: ./flows/server-flow.mmd, ./flows/models-flow.mmd, ./flows/chat-flow.mmd--sequenceDiagram- participant User as 👤 User- participant UI as 🧩 UI- participant Stores as 🗄️ Stores- participant DB as 💾 IndexedDB- participant API as 🌐 llama-server-- Note over User,API: 🚀 Initialization (see: server-flow.mmd, models-flow.mmd)-- UI->>Stores: initialize()- Stores->>DB: load conversations- Stores->>API: GET /props- API-->>Stores: server config + modalities- Stores->>API: GET /v1/models- API-->>Stores: single model (auto-selected)-- Note over User,API: 💬 Chat Flow (see: chat-flow.mmd)-- User->>UI: send message- UI->>Stores: sendMessage()- Stores->>DB: save user message- Stores->>API: POST /v1/chat/completions (stream)- loop streaming- API-->>Stores: SSE chunks- Stores-->>UI: reactive update- end- API-->>Stores: done + timings- Stores->>DB: save assistant message-- Note over User,API: 🔁 Regenerate-- User->>UI: regenerate- Stores->>DB: create message branch- Note right of Stores: same streaming flow-- Note over User,API: ⏹️ Stop-- User->>UI: stop- Stores->>Stores: abort stream- Stores->>DB: save partial response-```diff --git a/tools/ui/docs/flows/data-flow-simplified-router-mode.md b/tools/ui/docs/flows/data-flow-simplified-router-mode.mddeleted file mode 100644index bccacf5684..0000000000--- a/tools/ui/docs/flows/data-flow-simplified-router-mode.md+++ /dev/null@@ -1,77 +0,0 @@-```mermaid-%% ROUTER Mode Data Flow (multi-model)-%% Detailed flows: ./flows/server-flow.mmd, ./flows/models-flow.mmd, ./flows/chat-flow.mmd--sequenceDiagram- participant User as 👤 User- participant UI as 🧩 UI- participant Stores as 🗄️ Stores- participant DB as 💾 IndexedDB- participant API as 🌐 llama-server-- Note over User,API: 🚀 Initialization (see: server-flow.mmd, models-flow.mmd)-- UI->>Stores: initialize()- Stores->>DB: load conversations- Stores->>API: GET /props- API-->>Stores: {role: "router"}- Stores->>API: GET /v1/models- API-->>Stores: models[] with status (loaded/available)- loop each loaded model- Stores->>API: GET /props?model=X- API-->>Stores: modalities (vision/audio)- end-- Note over User,API: 🔄 Model Selection (see: models-flow.mmd)-- User->>UI: select model- alt model not loaded- Stores->>API: POST /models/load- loop poll status- Stores->>API: GET /v1/models- API-->>Stores: check if loaded- end- Stores->>API: GET /props?model=X- API-->>Stores: cache modalities- end- Stores->>Stores: validate modalities vs conversation- alt valid- Stores->>Stores: select model- else invalid- Stores->>API: POST /models/unload- UI->>User: show error toast- end-- Note over User,API: 💬 Chat Flow (see: chat-flow.mmd)-- User->>UI: send message- UI->>Stores: sendMessage()- Stores->>DB: save user message- Stores->>API: POST /v1/chat/completions {model: X}- Note right of API: router forwards to model- loop streaming- API-->>Stores: SSE chunks + model info- Stores-->>UI: reactive update- end- API-->>Stores: done + timings- Stores->>DB: save assistant message + model used-- Note over User,API: 🔁 Regenerate (optional: different model)-- User->>UI: regenerate- Stores->>Stores: validate modalities up to this message- Stores->>DB: create message branch- Note right of Stores: same streaming flow-- Note over User,API: ⏹️ Stop-- User->>UI: stop- Stores->>Stores: abort stream- Stores->>DB: save partial response-- Note over User,API: 🗑️ LRU Unloading-- Note right of API: Server auto-unloads LRU models<br/>when cache full- User->>UI: select unloaded model- Note right of Stores: triggers load flow again-```diff --git a/tools/ui/docs/flows/database-flow.md b/tools/ui/docs/flows/database-flow.mddeleted file mode 100644index 38cd6941cf..0000000000--- a/tools/ui/docs/flows/database-flow.md+++ /dev/null@@ -1,174 +0,0 @@-```mermaid-sequenceDiagram- participant Store as 🗄️ Stores- participant DbSvc as ⚙️ DatabaseService- participant Dexie as 📦 Dexie ORM- participant IDB as 💾 IndexedDB-- Note over DbSvc: Stateless service - all methods static<br/>Database: "LlamacppWebui"-- %% ═══════════════════════════════════════════════════════════════════════════- Note over Store,IDB: 📊 SCHEMA- %% ═══════════════════════════════════════════════════════════════════════════-- rect rgb(240, 248, 255)- Note over IDB: conversations table:<br/>id (PK), lastModified, currNode, name- end-- rect rgb(255, 248, 240)- Note over IDB: messages table:<br/>id (PK), convId (FK), type, role, timestamp,<br/>parent, children[], content, thinking,<br/>toolCalls, extra[], model, timings- end-- %% ═══════════════════════════════════════════════════════════════════════════- Note over Store,IDB: 💬 CONVERSATIONS CRUD- %% ═══════════════════════════════════════════════════════════════════════════-- Store->>DbSvc: createConversation(name)- activate DbSvc- DbSvc->>DbSvc: Generate UUID- DbSvc->>Dexie: db.conversations.add({id, name, lastModified, currNode: ""})- Dexie->>IDB: INSERT- IDB-->>Dexie: success- DbSvc-->>Store: DatabaseConversation- deactivate DbSvc-- Store->>DbSvc: getConversation(convId)- DbSvc->>Dexie: db.conversations.get(convId)- Dexie->>IDB: SELECT WHERE id = ?- IDB-->>DbSvc: DatabaseConversation-- Store->>DbSvc: getAllConversations()- DbSvc->>Dexie: db.conversations.orderBy('lastModified').reverse().toArray()- Dexie->>IDB: SELECT ORDER BY lastModified DESC- IDB-->>DbSvc: DatabaseConversation[]-- Store->>DbSvc: updateConversation(convId, updates)- DbSvc->>Dexie: db.conversations.update(convId, {...updates, lastModified})- Dexie->>IDB: UPDATE-- Store->>DbSvc: deleteConversation(convId)- activate DbSvc- DbSvc->>Dexie: db.conversations.delete(convId)- Dexie->>IDB: DELETE FROM conversations- DbSvc->>Dexie: db.messages.where('convId').equals(convId).delete()- Dexie->>IDB: DELETE FROM messages WHERE convId = ?- deactivate DbSvc-- %% ═══════════════════════════════════════════════════════════════════════════- Note over Store,IDB: 📝 MESSAGES CRUD- %% ═══════════════════════════════════════════════════════════════════════════-- Store->>DbSvc: createRootMessage(convId)- activate DbSvc- DbSvc->>DbSvc: Create root message {type: "root", parent: null}- DbSvc->>Dexie: db.messages.add(rootMsg)- Dexie->>IDB: INSERT- DbSvc-->>Store: rootMessageId- deactivate DbSvc-- Store->>DbSvc: createSystemMessage(convId, content, parentId)- activate DbSvc- DbSvc->>DbSvc: Create message {role: "system", parent: parentId}- DbSvc->>Dexie: db.messages.add(systemMsg)- Dexie->>IDB: INSERT- DbSvc-->>Store: DatabaseMessage- deactivate DbSvc-- Store->>DbSvc: createMessageBranch(message, parentId)- activate DbSvc- DbSvc->>DbSvc: Generate UUID for new message- DbSvc->>Dexie: db.messages.add({...message, id, parent: parentId})- Dexie->>IDB: INSERT message-- alt parentId exists- DbSvc->>Dexie: db.messages.get(parentId)- Dexie->>IDB: SELECT parent- DbSvc->>DbSvc: parent.children.push(newId)- DbSvc->>Dexie: db.messages.update(parentId, {children})- Dexie->>IDB: UPDATE parent.children- end-- DbSvc->>Dexie: db.conversations.update(convId, {currNode: newId})- Dexie->>IDB: UPDATE conversation.currNode- DbSvc-->>Store: DatabaseMessage- deactivate DbSvc-- Store->>DbSvc: getConversationMessages(convId)- DbSvc->>Dexie: db.messages.where('convId').equals(convId).toArray()- Dexie->>IDB: SELECT WHERE convId = ?- IDB-->>DbSvc: DatabaseMessage[]-- Store->>DbSvc: updateMessage(msgId, updates)- DbSvc->>Dexie: db.messages.update(msgId, updates)- Dexie->>IDB: UPDATE-- Store->>DbSvc: deleteMessage(msgId)- DbSvc->>Dexie: db.messages.delete(msgId)- Dexie->>IDB: DELETE-- %% ═══════════════════════════════════════════════════════════════════════════- Note over Store,IDB: 🌳 BRANCHING OPERATIONS- %% ═══════════════════════════════════════════════════════════════════════════-- Store->>DbSvc: updateCurrentNode(convId, nodeId)- DbSvc->>Dexie: db.conversations.update(convId, {currNode: nodeId, lastModified})- Dexie->>IDB: UPDATE-- Store->>DbSvc: deleteMessageCascading(msgId)- activate DbSvc- DbSvc->>DbSvc: findDescendantMessages(msgId, allMessages)- Note right of DbSvc: Recursively find all children- loop each descendant- DbSvc->>Dexie: db.messages.delete(descendantId)- Dexie->>IDB: DELETE- end- DbSvc->>Dexie: db.messages.delete(msgId)- Dexie->>IDB: DELETE target message-- alt target message has a parent- DbSvc->>Dexie: db.messages.get(parentId)- DbSvc->>DbSvc: parent.children.filter(id !== msgId)- DbSvc->>Dexie: db.messages.update(parentId, {children})- Note right of DbSvc: Remove deleted message from parent's children[]- end- deactivate DbSvc-- %% ═══════════════════════════════════════════════════════════════════════════- Note over Store,IDB: 📥 IMPORT- %% ═══════════════════════════════════════════════════════════════════════════-- Store->>DbSvc: importConversations(data)- activate DbSvc- loop each conversation in data- DbSvc->>Dexie: db.conversations.get(conv.id)- alt conversation already exists- Note right of DbSvc: Skip duplicate (keep existing)- else conversation is new- DbSvc->>Dexie: db.conversations.add(conversation)- Dexie->>IDB: INSERT conversation- loop each message- DbSvc->>Dexie: db.messages.add(message)- Dexie->>IDB: INSERT message- end- end- end- deactivate DbSvc-- %% ═══════════════════════════════════════════════════════════════════════════- Note over Store,IDB: 🔗 MESSAGE TREE UTILITIES- %% ═══════════════════════════════════════════════════════════════════════════-- Note over DbSvc: Used by stores (imported from utils):-- rect rgb(240, 255, 240)- Note over DbSvc: filterByLeafNodeId(messages, leafId)<br/>→ Returns path from root to leaf<br/>→ Used to display current branch- end-- rect rgb(240, 255, 240)- Note over DbSvc: findLeafNode(startId, messages)<br/>→ Traverse to deepest child<br/>→ Used for branch navigation- end-- rect rgb(240, 255, 240)- Note over DbSvc: findDescendantMessages(msgId, messages)<br/>→ Find all children recursively<br/>→ Used for cascading deletes- end-```diff --git a/tools/ui/docs/flows/mcp-flow.md b/tools/ui/docs/flows/mcp-flow.mddeleted file mode 100644index c8aa666599..0000000000--- a/tools/ui/docs/flows/mcp-flow.md+++ /dev/null@@ -1,226 +0,0 @@-```mermaid-sequenceDiagram- participant UI as 🧩 McpServersSettings / ChatForm- participant chatStore as 🗄️ chatStore- participant mcpStore as 🗄️ mcpStore- participant mcpResStore as 🗄️ mcpResourceStore- participant convStore as 🗄️ conversationsStore- participant MCPSvc as ⚙️ MCPService- participant LS as 💾 LocalStorage- participant ExtMCP as 🔌 External MCP Server-- Note over mcpStore: State:<br/>isInitializing, error<br/>toolCount, connectedServers<br/>healthChecks (Map)<br/>connections (Map)<br/>toolsIndex (Map)<br/>serverConfigs (Map)-- Note over mcpResStore: State:<br/>serverResources (Map)<br/>cachedResources (Map)<br/>subscriptions (Map)<br/>attachments[]-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,ExtMCP: 🚀 INITIALIZATION (App Startup)- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>mcpStore: ensureInitialized()- activate mcpStore-- mcpStore->>LS: get(MCP_SERVERS_LOCALSTORAGE_KEY)- LS-->>mcpStore: MCPServerSettingsEntry[]-- mcpStore->>mcpStore: parseServerSettings(servers)- Note right of mcpStore: Filter enabled servers<br/>Build MCPServerConfig objects<br/>Per-chat overrides checked via convStore-- loop For each enabled server- mcpStore->>mcpStore: runHealthCheck(serverId)- mcpStore->>mcpStore: updateHealthCheck(id, CONNECTING)-- mcpStore->>MCPSvc: connect(serverName, config, clientInfo, capabilities, onPhase)- activate MCPSvc-- MCPSvc->>MCPSvc: createTransport(config)- Note right of MCPSvc: WebSocket / StreamableHTTP / SSE<br/>with optional CORS proxy-- MCPSvc->>ExtMCP: Transport handshake- ExtMCP-->>MCPSvc: Connection established-- MCPSvc->>ExtMCP: Initialize request- Note right of ExtMCP: Exchange capabilities<br/>Server info, protocol version-- ExtMCP-->>MCPSvc: InitializeResult (serverInfo, capabilities)-- MCPSvc->>ExtMCP: listTools()- ExtMCP-->>MCPSvc: Tool[]-- MCPSvc-->>mcpStore: MCPConnection- deactivate MCPSvc-- mcpStore->>mcpStore: connections.set(serverName, connection)- mcpStore->>mcpStore: indexTools(connection.tools, serverName)- Note right of mcpStore: toolsIndex.set(toolName, serverName)<br/>Handle name conflicts with prefixes-- mcpStore->>mcpStore: updateHealthCheck(id, SUCCESS)- mcpStore->>mcpStore: _connectedServers.push(serverName)-- alt Server supports resources- mcpStore->>MCPSvc: listAllResources(connection)- MCPSvc->>ExtMCP: listResources()- ExtMCP-->>MCPSvc: MCPResource[]- MCPSvc-->>mcpStore: resources-- mcpStore->>MCPSvc: listAllResourceTemplates(connection)- MCPSvc->>ExtMCP: listResourceTemplates()- ExtMCP-->>MCPSvc: MCPResourceTemplate[]- MCPSvc-->>mcpStore: templates-- mcpStore->>mcpResStore: setServerResources(serverName, resources, templates)- end- end-- mcpStore->>mcpStore: _isInitializing = false- deactivate mcpStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,ExtMCP: 🔧 TOOL EXECUTION (Chat with Tools)- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>mcpStore: executeTool(mcpCall: MCPToolCall, signal?)- activate mcpStore-- mcpStore->>mcpStore: toolsIndex.get(mcpCall.function.name)- Note right of mcpStore: Resolve serverName from toolsIndex<br/>MCPToolCall = {id, type, function: {name, arguments}}-- mcpStore->>mcpStore: acquireConnection()- Note right of mcpStore: activeFlowCount++<br/>Prevent shutdown during execution-- mcpStore->>mcpStore: connection = connections.get(serverName)-- mcpStore->>MCPSvc: callTool(connection, {name, arguments}, signal)- activate MCPSvc-- MCPSvc->>MCPSvc: throwIfAborted(signal)- MCPSvc->>ExtMCP: callTool(name, arguments)-- alt Tool execution success- ExtMCP-->>MCPSvc: ToolCallResult (content, isError)- MCPSvc->>MCPSvc: formatToolResult(result)- Note right of MCPSvc: Handle text, image (base64),<br/>embedded resource content- MCPSvc-->>mcpStore: ToolExecutionResult- else Tool execution error- ExtMCP-->>MCPSvc: Error- MCPSvc-->>mcpStore: throw Error- else Aborted- MCPSvc-->>mcpStore: throw AbortError- end-- deactivate MCPSvc-- mcpStore->>mcpStore: releaseConnection()- Note right of mcpStore: activeFlowCount---- mcpStore-->>UI: ToolExecutionResult- deactivate mcpStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,ExtMCP: � RESOURCE ATTACHMENT CONSUMPTION- %% ═══════════════════════════════════════════════════════════════════════════-- chatStore->>mcpStore: consumeResourceAttachmentsAsExtras()- activate mcpStore- mcpStore->>mcpResStore: getAttachments()- mcpResStore-->>mcpStore: MCPResourceAttachment[]- mcpStore->>mcpStore: Convert attachments to message extras- mcpStore->>mcpResStore: clearAttachments()- mcpStore-->>chatStore: MessageExtra[] (for user message)- deactivate mcpStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,ExtMCP: �📝 PROMPT OPERATIONS- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>mcpStore: getAllPrompts()- activate mcpStore-- loop For each connected server with prompts capability- mcpStore->>MCPSvc: listPrompts(connection)- MCPSvc->>ExtMCP: listPrompts()- ExtMCP-->>MCPSvc: Prompt[]- MCPSvc-->>mcpStore: prompts- end-- mcpStore-->>UI: MCPPromptInfo[] (with serverName)- deactivate mcpStore-- UI->>mcpStore: getPrompt(serverName, promptName, args?)- activate mcpStore-- mcpStore->>MCPSvc: getPrompt(connection, name, args)- MCPSvc->>ExtMCP: getPrompt({name, arguments})- ExtMCP-->>MCPSvc: GetPromptResult (messages)- MCPSvc-->>mcpStore: GetPromptResult-- mcpStore-->>UI: GetPromptResult- deactivate mcpStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,ExtMCP: 📁 RESOURCE OPERATIONS- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>mcpResStore: addAttachment(resourceInfo)- activate mcpResStore- mcpResStore->>mcpResStore: Create MCPResourceAttachment (loading: true)- mcpResStore-->>UI: attachment-- UI->>mcpStore: readResource(serverName, uri)- activate mcpStore-- mcpStore->>MCPSvc: readResource(connection, uri)- MCPSvc->>ExtMCP: readResource({uri})- ExtMCP-->>MCPSvc: MCPReadResourceResult (contents)- MCPSvc-->>mcpStore: contents-- mcpStore-->>UI: MCPResourceContent[]- deactivate mcpStore-- UI->>mcpResStore: updateAttachmentContent(attachmentId, content)- mcpResStore->>mcpResStore: cacheResourceContent(resource, content)- deactivate mcpResStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,ExtMCP: 🔄 AUTO-RECONNECTION- %% ═══════════════════════════════════════════════════════════════════════════-- Note over mcpStore: On WebSocket close or connection error:- mcpStore->>mcpStore: autoReconnect(serverName, attempt)- activate mcpStore-- mcpStore->>mcpStore: Calculate backoff delay- Note right of mcpStore: delay = min(30s, 1s * 2^attempt)-- mcpStore->>mcpStore: Wait for delay- mcpStore->>mcpStore: reconnectServer(serverName)-- alt Reconnection success- mcpStore->>mcpStore: updateHealthCheck(id, SUCCESS)- else Max attempts reached- mcpStore->>mcpStore: updateHealthCheck(id, ERROR)- end- deactivate mcpStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,ExtMCP: 🛑 SHUTDOWN- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>mcpStore: shutdown()- activate mcpStore-- mcpStore->>mcpStore: Wait for activeFlowCount == 0-- loop For each connection- mcpStore->>MCPSvc: disconnect(connection)- MCPSvc->>MCPSvc: transport.onclose = undefined- MCPSvc->>ExtMCP: close()- end-- mcpStore->>mcpStore: connections.clear()- mcpStore->>mcpStore: toolsIndex.clear()- mcpStore->>mcpStore: _connectedServers = []-- mcpStore->>mcpResStore: clear()- deactivate mcpStore-```diff --git a/tools/ui/docs/flows/models-flow.md b/tools/ui/docs/flows/models-flow.mddeleted file mode 100644index c3031b7292..0000000000--- a/tools/ui/docs/flows/models-flow.md+++ /dev/null@@ -1,181 +0,0 @@-```mermaid-sequenceDiagram- participant UI as 🧩 ModelsSelector- participant Hooks as 🪝 useModelChangeValidation- participant modelsStore as 🗄️ modelsStore- participant serverStore as 🗄️ serverStore- participant convStore as 🗄️ conversationsStore- participant ModelsSvc as ⚙️ ModelsService- participant PropsSvc as ⚙️ PropsService- participant API as 🌐 llama-server-- Note over modelsStore: State:<br/>models: ModelOption[]<br/>routerModels: ApiModelDataEntry[]<br/>selectedModelId, selectedModelName<br/>loading, updating, error<br/>modelLoadingStates (Map)<br/>modelPropsCache (Map)<br/>propsCacheVersion-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,API: 🚀 INITIALIZATION (MODEL mode)- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>modelsStore: fetch()- activate modelsStore- modelsStore->>modelsStore: loading = true-- alt serverStore.props not loaded- modelsStore->>serverStore: fetch()- Note over serverStore: → see server-flow.mmd- end-- modelsStore->>ModelsSvc: list()- ModelsSvc->>API: GET /v1/models- API-->>ModelsSvc: ApiModelListResponse {data: [model]}-- modelsStore->>modelsStore: models = $state(mapped)- Note right of modelsStore: Map to ModelOption[]:<br/>{id, name, model, description, capabilities}-- Note over modelsStore: MODEL mode: Get modalities from serverStore.props- modelsStore->>modelsStore: modelPropsCache.set(model.id, serverStore.props)- modelsStore->>modelsStore: models[0].modalities = props.modalities-- modelsStore->>modelsStore: Auto-select single model- Note right of modelsStore: selectedModelId = models[0].id- modelsStore->>modelsStore: loading = false- deactivate modelsStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,API: 🚀 INITIALIZATION (ROUTER mode)- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>modelsStore: fetch()- activate modelsStore- modelsStore->>ModelsSvc: list()- ModelsSvc->>API: GET /v1/models- API-->>ModelsSvc: ApiModelListResponse- modelsStore->>modelsStore: models = $state(mapped)- deactivate modelsStore-- Note over UI: After models loaded, layout triggers:- UI->>modelsStore: fetchRouterModels()- activate modelsStore- modelsStore->>ModelsSvc: listRouter()- ModelsSvc->>API: GET /v1/models- API-->>ModelsSvc: ApiRouterModelsListResponse- Note right of API: {data: [{id, status, path, in_cache}]}- modelsStore->>modelsStore: routerModels = $state(data)-- modelsStore->>modelsStore: fetchModalitiesForLoadedModels()- loop each model where status === "loaded"- modelsStore->>PropsSvc: fetchForModel(modelId)- PropsSvc->>API: GET /props?model={modelId}- API-->>PropsSvc: ApiLlamaCppServerProps- modelsStore->>modelsStore: modelPropsCache.set(modelId, props)- end- modelsStore->>modelsStore: propsCacheVersion++- deactivate modelsStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,API: 🔄 MODEL SELECTION (ROUTER mode)- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>Hooks: useModelChangeValidation({getRequiredModalities, onSuccess?, onValidationFailure?})- Note over Hooks: Hook configured per-component:<br/>ChatForm: getRequiredModalities = usedModalities<br/>ChatMessage: getRequiredModalities = getModalitiesUpToMessage(msgId)-- UI->>Hooks: handleModelChange(modelId, modelName)- activate Hooks- Hooks->>Hooks: previousSelectedModelId = modelsStore.selectedModelId- Hooks->>modelsStore: isModelLoaded(modelName)?-- alt model NOT loaded- Hooks->>modelsStore: loadModel(modelName)- Note over modelsStore: → see LOAD MODEL section below- end-- Note over Hooks: Always fetch props (from cache or API)- Hooks->>modelsStore: fetchModelProps(modelName)- modelsStore-->>Hooks: props-- Hooks->>convStore: getRequiredModalities()- convStore-->>Hooks: {vision, audio}-- Hooks->>Hooks: Validate: model.modalities ⊇ required?-- alt validation PASSED- Hooks->>modelsStore: selectModelById(modelId)- Hooks-->>UI: return true- else validation FAILED- Hooks->>UI: toast.error("Model doesn't support required modalities")- alt model was just loaded- Hooks->>modelsStore: unloadModel(modelName)- end- alt onValidationFailure provided- Hooks->>modelsStore: selectModelById(previousSelectedModelId)- end- Hooks-->>UI: return false- end- deactivate Hooks-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,API: ⬆️ LOAD MODEL (ROUTER mode)- %% ═══════════════════════════════════════════════════════════════════════════-- modelsStore->>modelsStore: loadModel(modelId)- activate modelsStore-- alt already loaded- modelsStore-->>modelsStore: return (no-op)- end-- modelsStore->>modelsStore: modelLoadingStates.set(modelId, true)- modelsStore->>ModelsSvc: load(modelId)- ModelsSvc->>API: POST /models/load {model: modelId}- API-->>ModelsSvc: {status: "loading"}-- modelsStore->>modelsStore: pollForModelStatus(modelId, LOADED)- loop poll every 500ms (max 60 attempts)- modelsStore->>modelsStore: fetchRouterModels()- modelsStore->>ModelsSvc: listRouter()- ModelsSvc->>API: GET /v1/models- API-->>ModelsSvc: models[]- modelsStore->>modelsStore: getModelStatus(modelId)- alt status === LOADED- Note right of modelsStore: break loop- else status === LOADING- Note right of modelsStore: wait 500ms, continue- end- end-- modelsStore->>modelsStore: updateModelModalities(modelId)- modelsStore->>PropsSvc: fetchForModel(modelId)- PropsSvc->>API: GET /props?model={modelId}- API-->>PropsSvc: props with modalities- modelsStore->>modelsStore: modelPropsCache.set(modelId, props)- modelsStore->>modelsStore: propsCacheVersion++-- modelsStore->>modelsStore: modelLoadingStates.set(modelId, false)- deactivate modelsStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,API: ⬇️ UNLOAD MODEL (ROUTER mode)- %% ═══════════════════════════════════════════════════════════════════════════-- modelsStore->>modelsStore: unloadModel(modelId)- activate modelsStore- modelsStore->>modelsStore: modelLoadingStates.set(modelId, true)- modelsStore->>ModelsSvc: unload(modelId)- ModelsSvc->>API: POST /models/unload {model: modelId}-- modelsStore->>modelsStore: pollForModelStatus(modelId, UNLOADED)- loop poll until unloaded- modelsStore->>ModelsSvc: listRouter()- ModelsSvc->>API: GET /v1/models- end-- modelsStore->>modelsStore: modelLoadingStates.set(modelId, false)- deactivate modelsStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,API: 📊 COMPUTED GETTERS- %% ═══════════════════════════════════════════════════════════════════════════-- Note over modelsStore: Getters:<br/>- selectedModel: ModelOption | null<br/>- loadedModelIds: string[] (from routerModels)<br/>- loadingModelIds: string[] (from modelLoadingStates)<br/>- singleModelName: string | null (MODEL mode only)-- Note over modelsStore: Modality helpers:<br/>- getModelModalities(modelId): {vision, audio}<br/>- modelSupportsVision(modelId): boolean<br/>- modelSupportsAudio(modelId): boolean-```diff --git a/tools/ui/docs/flows/server-flow.md b/tools/ui/docs/flows/server-flow.mddeleted file mode 100644index d6a1611f6f..0000000000--- a/tools/ui/docs/flows/server-flow.md+++ /dev/null@@ -1,76 +0,0 @@-```mermaid-sequenceDiagram- participant UI as 🧩 +layout.svelte- participant serverStore as 🗄️ serverStore- participant PropsSvc as ⚙️ PropsService- participant API as 🌐 llama-server-- Note over serverStore: State:<br/>props: ApiLlamaCppServerProps | null<br/>loading, error<br/>role: ServerRole | null (MODEL | ROUTER)<br/>fetchPromise (deduplication)-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,API: 🚀 INITIALIZATION- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>serverStore: fetch()- activate serverStore-- alt fetchPromise exists (already fetching)- serverStore-->>UI: return fetchPromise- Note right of serverStore: Deduplicate concurrent calls- end-- serverStore->>serverStore: loading = true- serverStore->>serverStore: fetchPromise = new Promise()-- serverStore->>PropsSvc: fetch()- PropsSvc->>API: GET /props- API-->>PropsSvc: ApiLlamaCppServerProps- Note right of API: {role, model_path, model_alias,<br/>modalities, default_generation_settings, ...}-- PropsSvc-->>serverStore: props- serverStore->>serverStore: props = $state(data)-- serverStore->>serverStore: detectRole(props)- Note right of serverStore: role = props.role === "router"<br/> ? ServerRole.ROUTER<br/> : ServerRole.MODEL-- serverStore->>serverStore: loading = false- serverStore->>serverStore: fetchPromise = null- deactivate serverStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,API: 📊 COMPUTED GETTERS- %% ═══════════════════════════════════════════════════════════════════════════-- Note over serverStore: Getters from props:-- rect rgb(240, 255, 240)- Note over serverStore: defaultParams<br/>→ props.default_generation_settings.params<br/>(temperature, top_p, top_k, etc.)- end-- rect rgb(240, 255, 240)- Note over serverStore: contextSize<br/>→ props.default_generation_settings.n_ctx- end-- rect rgb(255, 240, 240)- Note over serverStore: isRouterMode<br/>→ role === ServerRole.ROUTER- end-- rect rgb(255, 240, 240)- Note over serverStore: isModelMode<br/>→ role === ServerRole.MODEL- end-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,API: 🔗 RELATIONSHIPS- %% ═══════════════════════════════════════════════════════════════════════════-- Note over serverStore: Used by:- Note right of serverStore: - modelsStore: role detection, MODEL mode modalities<br/>- settingsStore: syncWithServerDefaults (defaultParams)<br/>- chatStore: contextSize for processing state<br/>- UI components: isRouterMode for conditional rendering-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,API: ❌ ERROR HANDLING- %% ═══════════════════════════════════════════════════════════════════════════-- Note over serverStore: getErrorMessage(): string | null<br/>Returns formatted error for UI display-- Note over serverStore: clear(): void<br/>Resets all state (props, error, loading, role)-```diff --git a/tools/ui/docs/flows/settings-flow.md b/tools/ui/docs/flows/settings-flow.mddeleted file mode 100644index 260713a17b..0000000000--- a/tools/ui/docs/flows/settings-flow.md+++ /dev/null@@ -1,156 +0,0 @@-```mermaid-sequenceDiagram- participant UI as 🧩 ChatSettings- participant settingsStore as 🗄️ settingsStore- participant serverStore as 🗄️ serverStore- participant ParamSvc as ⚙️ ParameterSyncService- participant LS as 💾 LocalStorage-- Note over settingsStore: State:<br/>config: SettingsConfigType<br/>theme: string ("auto" | "light" | "dark")<br/>isInitialized: boolean<br/>userOverrides: Set<string>-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,LS: 🚀 INITIALIZATION- %% ═══════════════════════════════════════════════════════════════════════════-- Note over settingsStore: Auto-initialized in constructor (browser only)- settingsStore->>settingsStore: initialize()- activate settingsStore-- settingsStore->>settingsStore: loadConfig()- settingsStore->>LS: get("llama-config")- LS-->>settingsStore: StoredConfig | null-- alt config exists- settingsStore->>settingsStore: Merge with SETTING_CONFIG_DEFAULT- Note right of settingsStore: Fill missing keys with defaults- else no config- settingsStore->>settingsStore: config = SETTING_CONFIG_DEFAULT- end-- settingsStore->>LS: get("llama-userOverrides")- LS-->>settingsStore: string[] | null- settingsStore->>settingsStore: userOverrides = new Set(data)-- settingsStore->>settingsStore: loadTheme()- settingsStore->>LS: get("llama-theme")- LS-->>settingsStore: theme | "auto"-- settingsStore->>settingsStore: isInitialized = true- deactivate settingsStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,LS: 🔄 SYNC WITH SERVER DEFAULTS- %% ═══════════════════════════════════════════════════════════════════════════-- Note over UI: Triggered from +layout.svelte when serverStore.props loaded- UI->>settingsStore: syncWithServerDefaults()- activate settingsStore-- settingsStore->>serverStore: defaultParams- serverStore-->>settingsStore: {temperature, top_p, top_k, ...}-- loop each SYNCABLE_PARAMETER- alt key NOT in userOverrides- settingsStore->>settingsStore: config[key] = serverDefault[key]- Note right of settingsStore: Non-overridden params adopt server default- else key in userOverrides- Note right of settingsStore: Keep user value, skip server default- end- end-- alt serverStore.props has uiSettings- settingsStore->>settingsStore: Apply uiSettings from server- Note right of settingsStore: Server-provided UI settings<br/>(e.g. showRawOutputSwitch)- end-- settingsStore->>settingsStore: saveConfig()- deactivate settingsStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,LS: ⚙️ UPDATE CONFIG- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>settingsStore: updateConfig(key, value)- activate settingsStore- settingsStore->>settingsStore: config[key] = value-- alt value matches server default for key- settingsStore->>settingsStore: userOverrides.delete(key)- Note right of settingsStore: Matches server default, remove override- else value differs from server default- settingsStore->>settingsStore: userOverrides.add(key)- Note right of settingsStore: Mark as user-modified (won't be overwritten)- end-- settingsStore->>settingsStore: saveConfig()- settingsStore->>LS: set(CONFIG_LOCALSTORAGE_KEY, config)- settingsStore->>LS: set(USER_OVERRIDES_LOCALSTORAGE_KEY, [...userOverrides])- deactivate settingsStore-- UI->>settingsStore: updateMultipleConfig({key1: val1, key2: val2})- activate settingsStore- Note right of settingsStore: Batch update, single save- settingsStore->>settingsStore: For each key: config[key] = value- settingsStore->>settingsStore: For each key: userOverrides.add(key)- settingsStore->>settingsStore: saveConfig()- deactivate settingsStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,LS: 🔄 RESET- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>settingsStore: resetConfig()- activate settingsStore- settingsStore->>settingsStore: config = {...SETTING_CONFIG_DEFAULT}- settingsStore->>settingsStore: userOverrides.clear()- Note right of settingsStore: All params reset to defaults<br/>Next syncWithServerDefaults will adopt server values- settingsStore->>settingsStore: saveConfig()- deactivate settingsStore-- UI->>settingsStore: resetParameterToServerDefault(key)- activate settingsStore- settingsStore->>settingsStore: userOverrides.delete(key)- settingsStore->>serverStore: defaultParams[key]- settingsStore->>settingsStore: config[key] = serverDefault- settingsStore->>settingsStore: saveConfig()- deactivate settingsStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,LS: 🎨 THEME- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>settingsStore: updateTheme(newTheme)- activate settingsStore- settingsStore->>settingsStore: theme = newTheme- settingsStore->>settingsStore: saveTheme()- settingsStore->>LS: set("llama-theme", theme)- deactivate settingsStore-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,LS: 📊 PARAMETER INFO- %% ═══════════════════════════════════════════════════════════════════════════-- UI->>settingsStore: getParameterInfo(key)- settingsStore->>ParamSvc: getParameterInfo(key, config, serverDefaults, userOverrides)- ParamSvc-->>settingsStore: ParameterInfo- Note right of ParamSvc: {<br/> currentValue,<br/> serverDefault,<br/> isUserOverride: boolean,<br/> canSync: boolean,<br/> isDifferentFromServer: boolean<br/>}-- UI->>settingsStore: getParameterDiff()- settingsStore->>ParamSvc: createParameterDiff(config, serverDefaults, userOverrides)- ParamSvc-->>settingsStore: ParameterDiff[]- Note right of ParamSvc: Array of parameters where user != server-- %% ═══════════════════════════════════════════════════════════════════════════- Note over UI,LS: 📋 CONFIG CATEGORIES- %% ═══════════════════════════════════════════════════════════════════════════-- Note over settingsStore: Syncable with server (from /props):- rect rgb(240, 255, 240)- Note over settingsStore: temperature, top_p, top_k, min_p<br/>repeat_penalty, presence_penalty, frequency_penalty<br/>dynatemp_range, dynatemp_exponent<br/>typ_p, xtc_probability, xtc_threshold<br/>dry_multiplier, dry_base, dry_allowed_length, dry_penalty_last_n- end-- Note over settingsStore: UI-only (not synced):- rect rgb(255, 240, 240)- Note over settingsStore: systemMessage, custom (JSON)<br/>showStatistics, enableContinueGeneration<br/>autoMicOnEmpty, disableAutoScroll<br/>apiKey, pdfAsImage, disableReasoningParsing, showRawOutputSwitch- end-```diff --git a/tools/ui/eslint.config.js b/tools/ui/eslint.config.jsindex b8bdb216e2..6ad065f5a0 100644--- a/tools/ui/eslint.config.js+++ b/tools/ui/eslint.config.js@@ -12,6 +12,49 @@ import { fileURLToPath } from 'node:url';import ts from 'typescript-eslint';const gitignorePath = fileURLToPath(new URL('./.gitignore', import.meta.url));+// Require a blank line between consecutive class accessors (get/set). The core+// `padding-line-between-statements` rule only handles statements, not class+// members, so this is enforced with a small custom rule.+const blankLineBetweenAccessors = {+ create(context) {+ return {+ MethodDefinition(node) {+ if (node.kind !== 'get' && node.kind !== 'set') return;++ const body = node.parent;++ if (!body || body.type !== 'ClassBody') return;++ const index = body.body.indexOf(node);++ if (index <= 0) return;++ const prev = body.body[index - 1];++ if (prev.type !== 'MethodDefinition' || (prev.kind !== 'get' && prev.kind !== 'set'))+ return;++ if (node.loc.start.line - prev.loc.end.line <= 1) {+ context.report({+ fix(fixer) {+ // Insert after the previous accessor's closing brace so the blank+ // line keeps the current accessor's indentation.+ return fixer.insertTextAfter(prev, '\n');+ },+ message: 'Expected a blank line between class accessors (get/set).',+ node+ });+ }+ }+ };+ },+ meta: {+ docs: { description: 'Require a blank line between consecutive class accessors (get/set).' },+ fixable: 'whitespace',+ schema: [],+ type: 'layout'+ }+};export default ts.config(includeIgnoreFile(gitignorePath),@@ -22,7 +65,11 @@ export default ts.config(...svelte.configs.prettier,{languageOptions: { globals: { ...globals.browser, ...globals.node } },- plugins: { perfectionist, 'simple-import-sort': simpleImportSort },+ plugins: {+ local: { rules: { 'blank-line-between-accessors': blankLineBetweenAccessors } },+ perfectionist,+ 'simple-import-sort': simpleImportSort+ },rules: {// Snippet bodies often ignore one or more of the parent's params// (e.g. `{#snippet children(_meta, ctx)}` when only ctx is read).@@ -30,8 +77,11 @@ export default ts.config('error',{ argsIgnorePattern: '^_', varsIgnorePattern: '^_' }],+// Enforce empty line at end of file'eol-last': 'error',+ // Enforce a blank line between consecutive get/set accessors+ 'local/blank-line-between-accessors': 'error',// typescript-eslint strongly recommend that you do not use the no-undef lint rule on TypeScript projects.// see: https://typescript-eslint.io/troubleshooting/faqs/eslint/#i-get-errors-from-the-no-undef-rule-about-global-variables-not-being-defined-even-though-there-are-no-typescript-errors'no-undef': 'off',@@ -61,6 +111,38 @@ export default ts.config({ blankLine: 'always', next: ['return', 'throw', 'break', 'continue'], prev: '*' }],+ // Class member order: public fields -> private fields -> constructor -> getters+ // -> setters -> public methods -> private methods, alphabetical within each.+ // Svelte $derived fields must stay in dependency order (forward references are+ // rejected), so the two stores that rely on that are exempted below.+ 'perfectionist/sort-classes': [+ 'error',+ {+ customGroups: [+ { groupName: 'public-field', modifiers: ['public'], selector: 'property' },+ { groupName: 'private-field', modifiers: ['private'], selector: 'property' },+ { groupName: 'get-method', selector: 'get-method' },+ { groupName: 'set-method', selector: 'set-method' },+ { groupName: 'public-method', modifiers: ['public'], selector: 'method' },+ { groupName: 'private-method', modifiers: ['private'], selector: 'method' }+ ],+ groups: [+ 'public-field',+ 'private-field',+ 'constructor',+ 'get-method',+ 'set-method',+ 'public-method',+ 'private-method',+ 'unknown'+ ],+ type: 'natural',+ // Keep members in dependency order (Svelte rejects forward references in+ // $derived fields), while still sorting the rest alphabetically.+ useExperimentalDependencyDetection: true+ }+ ],+// Alphabetical order for enum members'perfectionist/sort-enums': ['error', { type: 'natural' }],diff --git a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreview.svelte b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreview.svelteindex 8e89491723..304e5a6009 100644--- a/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreview.svelte+++ b/tools/ui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsPreview/ChatAttachmentsPreview.svelte@@ -139,7 +139,7 @@let fileSize = $derived(currentItem?.size ? formatFileSize(currentItem.size) : '');let hasVisionModality = $derived(- currentItem && activeModelId ? modelsStore.modelSupportsVision(activeModelId) : false+ currentItem && activeModelId ? modelsStore.props.modelSupportsVision(activeModelId) : false);let audioSrc = $derived(diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatForm.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatForm.svelteindex e937d27306..18061728a2 100644--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatForm.svelte+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatForm.svelte@@ -28,7 +28,6 @@import {chatStore,conversationsStore,- mcpResourceStore,mcpStore,modelsStore,serverStore,@@ -140,7 +139,9 @@// float above the box.let mentionAnchor: HTMLDivElement | null = $state(null);- let cwd = $derived(conversationsStore.activeConversation?.cwd ?? conversationsStore.pendingCwd);+ let cwd = $derived(+ conversationsStore.activeConversation?.cwd ?? conversationsStore.preferences.pendingCwd+ );const pickers = useChatFormPickers({focusInput: refocusInput,@@ -151,7 +152,8 @@getShowModelSelector: () => showModelSelector,getValue: () => value,hasCwdTools: () => toolsStore.hasEnabledCwdTools,- hasPrompts: () => mcpStore.hasPromptsCapability(conversationsStore.getAllMcpServerOverrides()),+ hasPrompts: () =>+ mcpStore.hasPromptsCapability(conversationsStore.preferences.getAllMcpServerOverrides()),openModelSelector: () => chatFormActionsRef?.openModelSelector(),setCaretOffset: (offset) => inputRef?.setCaretOffset(offset),setValue: (v) => {@@ -170,7 +172,7 @@onValueChange?.('');}- await conversationsStore.setCwd(newDir);+ await conversationsStore.preferences.setCwd(newDir);if (conversationsStore.activeConversation) {await chatStore.recordCwdChange(newDir?.trim() || null);@@ -595,7 +597,7 @@{useRichInput}/>- {#if mcpResourceStore.hasAttachments}+ {#if mcpStore.resources.hasAttachments}<ChatFormMcpResourcesListclass="mb-3"onResourceClick={(uri) => {diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddMcpServersSubmenu.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddMcpServersSubmenu.svelteindex 3d04d14cb1..92f5b93490 100644--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddMcpServersSubmenu.svelte+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddMcpServersSubmenu.svelte@@ -38,11 +38,11 @@}function isServerEnabledForChat(serverId: string): boolean {- return conversationsStore.isMcpServerEnabledForChat(serverId);+ return conversationsStore.preferences.isMcpServerEnabledForChat(serverId);}async function toggleServerForChat(serverId: string) {- await conversationsStore.toggleMcpServerForChat(serverId);+ await conversationsStore.preferences.toggleMcpServerForChat(serverId);}function handleMcpSubMenuOpen(open: boolean) {diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddSheet.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddSheet.svelteindex 63a8c267d8..2e61bb07dd 100644--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddSheet.svelte+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionAdd/ChatFormActionAddSheet.svelte@@ -218,12 +218,15 @@{@const hasError = healthState.status === HealthCheckStatus.ERROR}{@const displayName = mcpStore.getServerLabel(server)}{@const faviconUrl = mcpStore.getServerFavicon(server.id)}- {@const isEnabled = conversationsStore.isMcpServerEnabledForChat(server.id)}+ {@const isEnabled = conversationsStore.preferences.isMcpServerEnabledForChat(+ server.id+ )}<buttontype="button"class={sheetItemRowClass}- onclick={() => !hasError && conversationsStore.toggleMcpServerForChat(server.id)}+ onclick={() =>+ !hasError && conversationsStore.preferences.toggleMcpServerForChat(server.id)}disabled={hasError}><div class="flex min-w-0 flex-1 items-center gap-2">@@ -250,7 +253,8 @@{:else}<Switchchecked={isEnabled}- onCheckedChange={() => conversationsStore.toggleMcpServerForChat(server.id)}+ onCheckedChange={() =>+ conversationsStore.preferences.toggleMcpServerForChat(server.id)}/>{/if}</button>diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionModels.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionModels.svelteindex 518dee5d95..f76333a1cb 100644--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionModels.svelte+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActionModels.svelte@@ -81,10 +81,10 @@$effect(() => {if (activeModelId) {- const cached = modelsStore.getModelProps(activeModelId);+ const cached = modelsStore.props.getModelProps(activeModelId);if (!cached) {- modelsStore.fetchModelProps(activeModelId).then(() => {+ modelsStore.props.fetchModelProps(activeModelId).then(() => {modelPropsVersion++;});}@@ -94,19 +94,21 @@$effect(() => {void modelPropsVersion;- hasAudioModality = activeModelId ? modelsStore.modelSupportsAudio(activeModelId) : false;+ hasAudioModality = activeModelId ? modelsStore.props.modelSupportsAudio(activeModelId) : false;});$effect(() => {void modelPropsVersion;- hasVideoModality = activeModelId ? modelsStore.modelSupportsVideo(activeModelId) : false;+ hasVideoModality = activeModelId ? modelsStore.props.modelSupportsVideo(activeModelId) : false;});$effect(() => {void modelPropsVersion;- hasVisionModality = activeModelId ? modelsStore.modelSupportsVision(activeModelId) : false;+ hasVisionModality = activeModelId+ ? modelsStore.props.modelSupportsVision(activeModelId)+ : false;});$effect(() => {diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActions.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActions.svelteindex d8fad772dd..118e54a0a2 100644--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActions.svelte+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormActions/ChatFormActions.svelte@@ -58,13 +58,13 @@let currentConfig = $derived(settingsStore.config);let hasMcpPromptsSupport = $derived.by(() => {- const perChatOverrides = conversationsStore.getAllMcpServerOverrides();+ const perChatOverrides = conversationsStore.preferences.getAllMcpServerOverrides();return mcpStore.hasPromptsCapability(perChatOverrides);});let hasMcpResourcesSupport = $derived.by(() => {- const perChatOverrides = conversationsStore.getAllMcpServerOverrides();+ const perChatOverrides = conversationsStore.preferences.getAllMcpServerOverrides();return mcpStore.hasResourcesCapability(perChatOverrides);});@@ -121,7 +121,7 @@if (!chatStore.isLoading && !chatStore.isStreaming()) return false;- const processingState = chatStore.activeProcessingState;+ const processingState = chatStore.processing.activeState;if (!processingState) return false;diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ChatFormContextGauge.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ChatFormContextGauge.svelteindex 7b071d99e0..d6bad98dc9 100644--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ChatFormContextGauge.svelte+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormContextGauge/ChatFormContextGauge.svelte@@ -16,7 +16,7 @@$effect(() => {const conv = conversationsStore.activeConversation;- untrack(() => chatStore.setActiveProcessingConversation(conv?.id ?? null));+ untrack(() => chatStore.processing.setActiveConversation(conv?.id ?? null));});$effect(() => {@@ -28,12 +28,12 @@if (chatStore.isLoading || chatStore.isStreaming()) return;if (messages.length === 0) {- untrack(() => chatStore.clearProcessingState(conv.id));+ untrack(() => chatStore.processing.setState(conv.id, null));return;}- untrack(() => chatStore.restoreProcessingStateFromMessages(messages, conv.id));+ untrack(() => chatStore.processing.restoreFromMessages(messages, conv.id));});$effect(() => {diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormMcpResourcesList.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormMcpResourcesList.svelteindex 3f178da188..452fd7a68a 100644--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormMcpResourcesList.svelte+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormMcpResourcesList.svelte@@ -3,7 +3,7 @@ChatAttachmentsListItemMcpResource,HorizontalScrollCarousel} from '$lib/components/app';- import { mcpResourceStore, mcpStore } from '$lib/stores';+ import { mcpStore } from '$lib/stores';interface Props {class?: string;@@ -12,8 +12,8 @@let { class: className, onResourceClick }: Props = $props();- const attachments = $derived(mcpResourceStore.attachments);- const hasAttachments = $derived(mcpResourceStore.hasAttachments);+ const attachments = $derived(mcpStore.resources.attachments);+ const hasAttachments = $derived(mcpStore.resources.hasAttachments);function handleRemove(attachmentId: string) {mcpStore.removeResourceAttachment(attachmentId);diff --git a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMcpPrompts/ChatFormPickerMcpPrompts.svelte b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMcpPrompts/ChatFormPickerMcpPrompts.svelteindex 9b5a57b9b9..9a5c3e7470 100644--- a/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMcpPrompts/ChatFormPickerMcpPrompts.svelte+++ b/tools/ui/src/lib/components/app/chat/ChatForm/ChatFormPickers/ChatFormPickerMcpPrompts/ChatFormPickerMcpPrompts.svelte@@ -87,7 +87,7 @@isLoading = true;try {- const perChatOverrides = conversationsStore.getAllMcpServerOverrides();+ const perChatOverrides = conversationsStore.preferences.getAllMcpServerOverrides();const initialized = await mcpStore.ensureInitialized(perChatOverrides);if (!initialized) {diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistant.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistant.svelteindex b92be9fbd6..c92af719a5 100644--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistant.svelte+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistant.svelte@@ -59,7 +59,7 @@message.model ?? chatStore.getResumeModel(message.convId) ?? modelsStore.selectedModelName);let modelLoadProgress = $derived(- isRouter && loadTargetModel ? modelsStore.getLoadProgress(loadTargetModel) : null+ isRouter && loadTargetModel ? modelsStore.status.getLoadProgress(loadTargetModel) : null);let modelLoadingText = $derived(modelLoadProgressText(modelLoadProgress));diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistantModel.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistantModel.svelteindex d3fb33a008..c5b80f1569 100644--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistantModel.svelte+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessage/ChatMessageAssistant/ChatMessageAssistantModel.svelte@@ -31,7 +31,7 @@pendingModel = modelId;try {- await modelsStore.loadModel(modelId);+ await modelsStore.status.load(modelId);} finally {pendingModel = null;}diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageAgenticContent.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageAgenticContent.svelteindex 5849799794..7a21c67666 100644--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageAgenticContent.svelte+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessageAgenticContent.svelte@@ -43,14 +43,14 @@);const hasReasoningError = $derived(- isLastAssistantMessage ? !!agenticStore.lastError(message.convId) : false+ isLastAssistantMessage ? !!agenticStore.getLastError(message.convId) : false);let permissionDismissed = $state(false);const pendingPermission = $derived(isStreaming && isLastAssistantMessage- ? agenticStore.pendingPermissionRequest(message.convId)+ ? agenticStore.getPendingPermissionRequest(message.convId): null);@@ -74,7 +74,7 @@const pendingContinue = $derived(isStreaming && isLastAssistantMessage- ? agenticStore.pendingContinueRequest(message.convId)+ ? agenticStore.getPendingContinueRequest(message.convId): false);@@ -97,7 +97,7 @@const sections = $derived(deriveAgenticSections(message, toolMessages, [], isStreaming));const currentlyExecutingToolCallId = $derived(- isStreaming ? agenticStore.executingToolCallId(message.convId) : null+ isStreaming ? agenticStore.getExecutingToolCallId(message.convId) : null);type TurnGroup = {diff --git a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessages.svelte b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessages.svelteindex 2a8f45ba53..c32c66d911 100644--- a/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessages.svelte+++ b/tools/ui/src/lib/components/app/chat/ChatMessages/ChatMessages.svelte@@ -238,30 +238,30 @@/>{/each}- {#if conversationsStore.activeConversation && agenticStore.pendingSteeringMessageContent(conversationsStore.activeConversation!.id)}+ {#if conversationsStore.activeConversation && agenticStore.getPendingSteeringMessageContent(conversationsStore.activeConversation!.id)}{@const convId = conversationsStore.activeConversation!.id}- {@const pendingContent = agenticStore.pendingSteeringMessageContent(convId)}+ {@const pendingContent = agenticStore.getPendingSteeringMessageContent(convId)}{#if pendingContent}<ChatMessageUserPendingclass="mx-auto mt-12 w-full max-w-[48rem]"content={pendingContent}- extras={agenticStore.pendingSteeringMessageExtras(convId)}+ extras={agenticStore.getPendingSteeringMessageExtras(convId)}onSendImmediately={() => chatStore.abortCurrentFlow(convId)}onEdit={(newContent, extras) =>agenticStore.injectSteeringMessage(convId, newContent, extras)}onDelete={() => agenticStore.clearSteeringMessage(convId)}/>{/if}- {:else if conversationsStore.activeConversation && chatStore.pendingMessageContent(conversationsStore.activeConversation!.id)}+ {:else if conversationsStore.activeConversation && chatStore.getPendingMessageContent(conversationsStore.activeConversation!.id)}{@const convId = conversationsStore.activeConversation!.id}- {@const pendingContent = chatStore.pendingMessageContent(convId)}+ {@const pendingContent = chatStore.getPendingMessageContent(convId)}{#if pendingContent}<ChatMessageUserPendingclass="mx-auto mt-12 w-full max-w-[48rem]"content={pendingContent}- extras={chatStore.pendingMessageExtras(convId)}+ extras={chatStore.getPendingMessageExtras(convId)}onSendImmediately={() => chatStore.abortCurrentFlow(convId)}onEdit={(newContent, extras) => chatStore.injectPendingMessage(convId, newContent, extras)}onDelete={() => chatStore.clearPendingMessage(convId)}diff --git a/tools/ui/src/lib/components/app/dialogs/DialogMcpResourcesBrowser.svelte b/tools/ui/src/lib/components/app/dialogs/DialogMcpResourcesBrowser.svelteindex 1ddad694b6..c48dcb38c7 100644--- a/tools/ui/src/lib/components/app/dialogs/DialogMcpResourcesBrowser.svelte+++ b/tools/ui/src/lib/components/app/dialogs/DialogMcpResourcesBrowser.svelte@@ -8,7 +8,7 @@import { Button } from '$lib/components/ui/button';import * as Dialog from '$lib/components/ui/dialog';import { ICON_CLASS_DEFAULT } from '$lib/constants';- import { conversationsStore, mcpResourceStore, mcpStore } from '$lib/stores';+ import { conversationsStore, mcpStore } from '$lib/stores';import type { MCPResourceContent, MCPResourceInfo, MCPResourceTemplateInfo } from '$lib/types';import { getResourceDisplayName } from '$lib/utils';import { SvelteSet } from 'svelte/reactivity';@@ -33,7 +33,7 @@let templatePreviewLoading = $state(false);let templatePreviewError = $state<string | null>(null);- const totalCount = $derived(mcpResourceStore.totalResourceCount);+ const totalCount = $derived(mcpStore.resources.totalResourceCount);$effect(() => {if (open) {@@ -48,7 +48,7 @@});async function loadResources() {- const perChatOverrides = conversationsStore.getAllMcpServerOverrides();+ const perChatOverrides = conversationsStore.preferences.getAllMcpServerOverrides();const initialized = await mcpStore.ensureInitialized(perChatOverrides);if (initialized) {@@ -126,16 +126,16 @@isAttaching = true;try {- const knownResource = mcpResourceStore.findResourceByUri(templatePreviewUri);+ const knownResource = mcpStore.resources.findResourceByUri(templatePreviewUri);if (knownResource) {- if (!mcpResourceStore.isAttached(knownResource.uri)) {+ if (!mcpStore.resources.isAttached(knownResource.uri)) {await mcpStore.attachResource(knownResource.uri);}toast.success(`Resource attached: ${knownResource.title || knownResource.name}`);} else {- if (mcpResourceStore.isAttached(templatePreviewUri)) {+ if (mcpStore.resources.isAttached(templatePreviewUri)) {toast.info('Resource already attached');handleOpenChange(false);@@ -147,9 +147,9 @@serverName: selectedTemplate.serverName,uri: templatePreviewUri};- const attachment = mcpResourceStore.addAttachment(resourceInfo);+ const attachment = mcpStore.resources.addAttachment(resourceInfo);- mcpResourceStore.updateAttachmentContent(attachment.id, templatePreviewContent);+ mcpStore.resources.updateAttachmentContent(attachment.id, templatePreviewContent);toast.success(`Resource attached: ${resourceInfo.name}`);}@@ -199,7 +199,7 @@function getAllResourcesFlatInTreeOrder(): MCPResourceInfo[] {const allResources: MCPResourceInfo[] = [];- const resourcesMap = mcpResourceStore.serverResources;+ const resourcesMap = mcpStore.resources.serverResources;for (const [serverName, serverRes] of resourcesMap.entries()) {for (const resource of serverRes.resources) {diff --git a/tools/ui/src/lib/components/app/dialogs/DialogMcpServerAddNew.svelte b/tools/ui/src/lib/components/app/dialogs/DialogMcpServerAddNew.svelteindex 9123dcef99..a339c6a429 100644--- a/tools/ui/src/lib/components/app/dialogs/DialogMcpServerAddNew.svelte+++ b/tools/ui/src/lib/components/app/dialogs/DialogMcpServerAddNew.svelte@@ -234,7 +234,7 @@useProxy: newServerUseProxy});- conversationsStore.setMcpServerOverride(newServerId, true);+ conversationsStore.preferences.setMcpServerOverride(newServerId, true);handleOpenChange(false);}diff --git a/tools/ui/src/lib/components/app/dialogs/DialogModelInformation.svelte b/tools/ui/src/lib/components/app/dialogs/DialogModelInformation.svelteindex 61155fceba..fb74988702 100644--- a/tools/ui/src/lib/components/app/dialogs/DialogModelInformation.svelte+++ b/tools/ui/src/lib/components/app/dialogs/DialogModelInformation.svelte@@ -42,7 +42,7 @@let modalities = $derived.by(() => {if (!firstModel?.id) return [];- return modelsStore.getModelModalitiesArray(firstModel.id);+ return modelsStore.props.getModelModalitiesArray(firstModel.id);});// Ensure models are fetched when dialog opens@@ -56,7 +56,7 @@$effect(() => {if (open && isRouter && modelId) {isLoadingRouterProps = true;- modelsStore+ modelsStore.props.fetchModelProps(modelId).then((props) => {routerModelProps = props;diff --git a/tools/ui/src/lib/components/app/mcp/McpActiveServersAvatars.svelte b/tools/ui/src/lib/components/app/mcp/McpActiveServersAvatars.svelteindex 301c396991..a8772aa1c9 100644--- a/tools/ui/src/lib/components/app/mcp/McpActiveServersAvatars.svelte+++ b/tools/ui/src/lib/components/app/mcp/McpActiveServersAvatars.svelte@@ -14,7 +14,9 @@let mcpServers = $derived(mcpStore.getServers().filter((s) => s.enabled));let enabledMcpServersForChat = $derived(- mcpServers.filter((s) => conversationsStore.isMcpServerEnabledForChat(s.id) && s.url.trim())+ mcpServers.filter(+ (s) => conversationsStore.preferences.isMcpServerEnabledForChat(s.id) && s.url.trim()+ ));let healthyEnabledMcpServers = $derived(enabledMcpServersForChat.filter((s) => {diff --git a/tools/ui/src/lib/components/app/mcp/McpResourcesBrowser/McpResourcesBrowser.svelte b/tools/ui/src/lib/components/app/mcp/McpResourcesBrowser/McpResourcesBrowser.svelteindex 18e9746532..c8cf8bbbc2 100644--- a/tools/ui/src/lib/components/app/mcp/McpResourcesBrowser/McpResourcesBrowser.svelte+++ b/tools/ui/src/lib/components/app/mcp/McpResourcesBrowser/McpResourcesBrowser.svelte@@ -2,7 +2,7 @@import McpResourcesBrowserEmptyState from './McpResourcesBrowserEmptyState.svelte';import McpResourcesBrowserHeader from './McpResourcesBrowserHeader.svelte';import McpResourcesBrowserServerItem from './McpResourcesBrowserServerItem.svelte';- import { mcpResourceStore, mcpStore } from '$lib/stores';+ import { mcpStore } from '$lib/stores';import type { MCPResourceInfo, MCPResourceTemplateInfo, MCPServerResources } from '$lib/types';import { parseResourcePath } from '$lib/utils';import { SvelteMap, SvelteSet } from 'svelte/reactivity';@@ -31,8 +31,8 @@let expandedFolders = new SvelteSet<string>();let searchQuery = $state('');- const resources = $derived(mcpResourceStore.serverResources);- const isLoading = $derived(mcpResourceStore.isLoading);+ const resources = $derived(mcpStore.resources.serverResources);+ const isLoading = $derived(mcpStore.resources.isLoading);const filteredResources = $derived.by(() => {if (!searchQuery.trim()) {diff --git a/tools/ui/src/lib/components/app/models/ModelsSelectorDropdown.svelte b/tools/ui/src/lib/components/app/models/ModelsSelectorDropdown.svelteindex c23bca1aeb..1cd56c1246 100644--- a/tools/ui/src/lib/components/app/models/ModelsSelectorDropdown.svelte+++ b/tools/ui/src/lib/components/app/models/ModelsSelectorDropdown.svelte@@ -116,7 +116,7 @@if (status === ServerModelStatus.LOADING) return;- await modelsStore.unloadModel(modelId);+ await modelsStore.status.unload(modelId);}export function open() {@@ -174,9 +174,9 @@{@const triggerLoading =!!triggerModel &&(triggerStatus === ServerModelStatus.LOADING ||- modelsStore.isModelOperationInProgress(triggerModel))}+ modelsStore.status.isOperationInProgress(triggerModel))}{@const triggerLoadPercent = triggerLoading- ? Math.round(modelLoadFraction(modelsStore.getLoadProgress(triggerModel)) * 100)+ ? Math.round(modelLoadFraction(modelsStore.status.getLoadProgress(triggerModel)) * 100): 0}{#if ms.isRouter}diff --git a/tools/ui/src/lib/components/app/models/ModelsSelectorOption.svelte b/tools/ui/src/lib/components/app/models/ModelsSelectorOption.svelteindex 18c885a62c..acdb36bcad 100644--- a/tools/ui/src/lib/components/app/models/ModelsSelectorOption.svelte+++ b/tools/ui/src/lib/components/app/models/ModelsSelectorOption.svelte@@ -47,7 +47,7 @@return (model?.status?.value as ServerModelStatus) ?? null;});- let isOperationInProgress = $derived(modelsStore.isModelOperationInProgress(option.model));+ let isOperationInProgress = $derived(modelsStore.status.isOperationInProgress(option.model));let isFailed = $derived(serverStatus === ServerModelStatus.FAILED);let isSleeping = $derived(serverStatus === ServerModelStatus.SLEEPING);let isLoaded = $derived(@@ -55,7 +55,7 @@);let isLoading = $derived(serverStatus === ServerModelStatus.LOADING || isOperationInProgress);- let loadProgress = $derived(isLoading ? modelsStore.getLoadProgress(option.model) : null);+ let loadProgress = $derived(isLoading ? modelsStore.status.getLoadProgress(option.model) : null);let loadPercent = $derived(Math.round(modelLoadFraction(loadProgress) * 100));let loadTitle = $derived(modelLoadProgressText(loadProgress));</script>@@ -138,7 +138,7 @@icon={RotateCw}tooltip="Retry loading model"class="h-3 w-3 text-red-500 hover:text-foreground"- onclick={() => modelsStore.loadModel(option.model)}+ onclick={() => modelsStore.status.load(option.model)}stopPropagationOnClick/></div>@@ -157,7 +157,7 @@class="h-3 w-3 text-red-500 hover:text-red-600 [@media(pointer:coarse)]:text-amber-500 [@media(pointer:coarse)]:hover:text-amber-600"onclick={(e) => {e?.stopPropagation();- modelsStore.unloadModel(option.model);+ modelsStore.status.unload(option.model);}}/></div>@@ -174,7 +174,7 @@icon={PowerOff}tooltip="Unload model"class="h-3 w-3 text-red-500 hover:text-red-600 [@media(pointer:coarse)]:text-green-500 [@media(pointer:coarse)]:hover:text-green-600"- onclick={() => modelsStore.unloadModel(option.model)}+ onclick={() => modelsStore.status.unload(option.model)}stopPropagationOnClick/></div>@@ -191,7 +191,7 @@icon={Power}tooltip="Load model"class="h-3 w-3 [@media(pointer:coarse)]:text-muted-foreground"- onclick={() => modelsStore.loadModel(option.model)}+ onclick={() => modelsStore.status.load(option.model)}stopPropagationOnClick/></div>diff --git a/tools/ui/src/lib/components/app/models/ModelsSelectorSheet.svelte b/tools/ui/src/lib/components/app/models/ModelsSelectorSheet.svelteindex 7228a2e74a..0d10dd106c 100644--- a/tools/ui/src/lib/components/app/models/ModelsSelectorSheet.svelte+++ b/tools/ui/src/lib/components/app/models/ModelsSelectorSheet.svelte@@ -72,9 +72,9 @@{@const triggerLoading =!!triggerModel &&(triggerStatus === ServerModelStatus.LOADING ||- modelsStore.isModelOperationInProgress(triggerModel))}+ modelsStore.status.isOperationInProgress(triggerModel))}{@const triggerLoadPercent = triggerLoading- ? Math.round(modelLoadFraction(modelsStore.getLoadProgress(triggerModel)) * 100)+ ? Math.round(modelLoadFraction(modelsStore.status.getLoadProgress(triggerModel)) * 100): 0}{#if ms.isRouter}diff --git a/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChat.svelte b/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChat.svelteindex c8b2c814cd..4233039eff 100644--- a/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChat.svelte+++ b/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChat.svelte@@ -52,7 +52,7 @@void modelsStore.fetch().then(() => modelsStore.fetchRouterModels())- .then(() => modelsStore.fetchModalitiesForLoadedModels())+ .then(() => modelsStore.props.fetchModalitiesForLoadedModels()).then(() => modelsStore.ensureFirstModelSelected());}});diff --git a/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatFields.svelte b/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatFields.svelteindex 30f2b9b2a7..d5d93e11d7 100644--- a/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatFields.svelte+++ b/tools/ui/src/lib/components/app/settings/SettingsChat/SettingsChatFields.svelte@@ -23,13 +23,13 @@let { fields, localConfig, onConfigChange, onThemeChange }: Props = $props();let currentModelParams = $derived.by(() => {- void modelsStore.propsCacheVersion;+ void modelsStore.props.cacheVersion;if (serverStore.isRouterMode) {const currentModelName = modelsStore.selectedModelName;if (currentModelName) {- const currentModelProps = modelsStore.getModelProps(currentModelName);+ const currentModelProps = modelsStore.props.getModelProps(currentModelName);return (currentModelProps?.default_generation_settings?.params ?? {}) as Record<string,diff --git a/tools/ui/src/lib/components/app/settings/SettingsMcpServers.svelte b/tools/ui/src/lib/components/app/settings/SettingsMcpServers.svelteindex 4ea4285322..23736ef1c1 100644--- a/tools/ui/src/lib/components/app/settings/SettingsMcpServers.svelte+++ b/tools/ui/src/lib/components/app/settings/SettingsMcpServers.svelte@@ -121,11 +121,13 @@{:else}<McpServerCard{server}- enabled={conversationsStore.isMcpServerEnabledForChat(server.id)}+ enabled={conversationsStore.preferences.isMcpServerEnabledForChat(server.id)}onToggle={async () => {- const wasEnabled = conversationsStore.isMcpServerEnabledForChat(server.id);+ const wasEnabled = conversationsStore.preferences.isMcpServerEnabledForChat(+ server.id+ );- await conversationsStore.toggleMcpServerForChat(server.id);+ await conversationsStore.preferences.toggleMcpServerForChat(server.id);if (!wasEnabled) {// Promote the connection so tools/prompts/resources becomediff --git a/tools/ui/src/lib/constants/attachment-menu.constants.ts b/tools/ui/src/lib/constants/attachment-menu.constants.tsindex 62e03bea6e..07ca17fad1 100644--- a/tools/ui/src/lib/constants/attachment-menu.constants.ts+++ b/tools/ui/src/lib/constants/attachment-menu.constants.ts@@ -74,7 +74,7 @@ export const ATTACHMENT_PROMPT_ITEMS: AttachmentMenuItem[] = [enabledWhen: AttachmentItemEnabledWhen.ALWAYS,icon: Zap,id: AttachmentMenuItemId.MCP_PROMPT,- label: 'MCP Prompt',+ label: 'MCP Prompts',visibleWhen: AttachmentItemVisibleWhen.HAS_MCP_PROMPTS_SUPPORT}];diff --git a/tools/ui/src/lib/constants/cache.constants.ts b/tools/ui/src/lib/constants/cache.constants.tsindex b60792d995..9c6bfadf8a 100644--- a/tools/ui/src/lib/constants/cache.constants.ts+++ b/tools/ui/src/lib/constants/cache.constants.ts@@ -32,13 +32,3 @@ export const MCP_RESOURCE_CACHE = {/** TTL for MCP resource cache entries in milliseconds (5 minutes) */TTL_MS: 5 * 60 * 1000} as const;--/**- * Limits for pruning inactive conversation states held in memory.- */-export const INACTIVE_CONVERSATION = {- /** Maximum age (in ms) for inactive conversation states before cleanup (30 minutes) */- MAX_AGE_MS: 30 * 60 * 1000,- /** Maximum number of inactive conversation states to keep in memory */- MAX_STATES: 10-} as const;diff --git a/tools/ui/src/lib/constants/url.constants.ts b/tools/ui/src/lib/constants/url.constants.tsindex 214c8afbac..8df4429346 100644--- a/tools/ui/src/lib/constants/url.constants.ts+++ b/tools/ui/src/lib/constants/url.constants.ts@@ -1,3 +1,5 @@+import { UrlProtocol } from '$lib/enums';+const STD = ['com', 'net', 'org', 'gov', 'edu'] as const;const STD_MIL = [...STD, 'mil'] as const;const ccTLD_PREFIXES: Record<string, readonly string[]> = {@@ -184,3 +186,7 @@ export const WILDCARD_PUBLIC_SUFFIXES = buildSuffixSet(WILDCARD_BASES);// Matches one or more trailing "/" characters at the end of a URL/path.export const TRAILING_SLASHES_REGEX = /\/+$/;++// Protocols that apiFetch treats as absolute and passes through untouched.+// Add a protocol here when a caller needs to fetch an absolute URL with it.+export const API_ABSOLUTE_URL_PROTOCOLS = [UrlProtocol.HTTP, UrlProtocol.HTTPS] as const;diff --git a/tools/ui/src/lib/hooks/use-auto-scroll.svelte.ts b/tools/ui/src/lib/hooks/use-auto-scroll.svelte.tsindex 6ebce15dad..d55574efef 100644--- a/tools/ui/src/lib/hooks/use-auto-scroll.svelte.ts+++ b/tools/ui/src/lib/hooks/use-auto-scroll.svelte.ts@@ -14,18 +14,14 @@ export interface AutoScrollOptions {*/export class AutoScrollController {private _autoScrollEnabled = $state(true);- private _userScrolledUp = $state(false);- private _lastScrollTop = $state(0);- private _scrollInterval: ReturnType<typeof setInterval> | undefined;private _container: HTMLElement | undefined;private _disabled: boolean;+ private _lastScrollTop = $state(0);private _mutationObserver: MutationObserver | null = null;- private _rafPending = false;private _observerEnabled = false;- constructor(options: AutoScrollOptions = {}) {- this._disabled = options.disabled ?? false;- }-+ private _rafPending = false;+ private _scrollInterval: ReturnType<typeof setInterval> | undefined;+ private _userScrolledUp = $state(false);get autoScrollEnabled(): boolean {return this._autoScrollEnabled;}@@ -34,33 +30,26 @@ export class AutoScrollController {return this._userScrolledUp;}+ constructor(options: AutoScrollOptions = {}) {+ this._disabled = options.disabled ?? false;+ }+/**- * Binds the controller to a scrollable container element.+ * Cleans up resources. Call this in onDestroy or when the component unmounts.*/- setContainer(container: HTMLElement | undefined): void {+ destroy(): void {+ this.stopInterval();this._doStopObserving();- this._container = container;-- if (this._observerEnabled && container && !this._disabled) {- this._doStartObserving();- }}/**- * Updates the disabled state.+ * Enables auto-scroll (e.g., when user sends a message).*/- setDisabled(disabled: boolean): void {- if (this._disabled === disabled) return;-- this._disabled = disabled;+ enable(): void {+ if (this._disabled) return;- if (disabled) {- this._autoScrollEnabled = false;- this.stopInterval();- this._doStopObserving();- } else if (this._observerEnabled && this._container && !this._mutationObserver) {- this._doStartObserving();- }+ this._userScrolledUp = false;+ this._autoScrollEnabled = true;}/**@@ -85,6 +74,18 @@ export class AutoScrollController {this._lastScrollTop = scrollTop;}+ /**+ * Resets scroll state when switching conversations.+ */+ resetScrollState(): void {+ this._userScrolledUp = false;+ this._autoScrollEnabled = !this._disabled;++ if (this._container) {+ this._lastScrollTop = this._container.scrollTop;+ }+ }+/*** Scrolls the container to the bottom instantly.*/@@ -95,24 +96,31 @@ export class AutoScrollController {}/**- * Enables auto-scroll (e.g., when user sends a message).+ * Binds the controller to a scrollable container element.*/- enable(): void {- if (this._disabled) return;+ setContainer(container: HTMLElement | undefined): void {+ this._doStopObserving();+ this._container = container;- this._userScrolledUp = false;- this._autoScrollEnabled = true;+ if (this._observerEnabled && container && !this._disabled) {+ this._doStartObserving();+ }}/**- * Resets scroll state when switching conversations.+ * Updates the disabled state.*/- resetScrollState(): void {- this._userScrolledUp = false;- this._autoScrollEnabled = !this._disabled;+ setDisabled(disabled: boolean): void {+ if (this._disabled === disabled) return;- if (this._container) {- this._lastScrollTop = this._container.scrollTop;+ this._disabled = disabled;++ if (disabled) {+ this._autoScrollEnabled = false;+ this.stopInterval();+ this._doStopObserving();+ } else if (this._observerEnabled && this._container && !this._mutationObserver) {+ this._doStartObserving();}}@@ -127,6 +135,18 @@ export class AutoScrollController {}, AUTO_SCROLL_INTERVAL);}+ /**+ * Starts a MutationObserver on the container that auto-scrolls to bottom+ * on content changes. More responsive than interval-based polling.+ */+ startObserving(): void {+ this._observerEnabled = true;++ if (this._container && !this._disabled && !this._mutationObserver) {+ this._doStartObserving();+ }+ }+/*** Stops the auto-scroll interval.*/@@ -137,6 +157,14 @@ export class AutoScrollController {}}+ /**+ * Stops the MutationObserver.+ */+ stopObserving(): void {+ this._observerEnabled = false;+ this._doStopObserving();+ }+/*** Updates the auto-scroll interval based on streaming state.* Call this in a $effect to automatically manage the interval.@@ -157,34 +185,6 @@ export class AutoScrollController {}}- /**- * Cleans up resources. Call this in onDestroy or when the component unmounts.- */- destroy(): void {- this.stopInterval();- this._doStopObserving();- }-- /**- * Starts a MutationObserver on the container that auto-scrolls to bottom- * on content changes. More responsive than interval-based polling.- */- startObserving(): void {- this._observerEnabled = true;-- if (this._container && !this._disabled && !this._mutationObserver) {- this._doStartObserving();- }- }-- /**- * Stops the MutationObserver.- */- stopObserving(): void {- this._observerEnabled = false;- this._doStopObserving();- }-private _doStartObserving(): void {if (!this._container || this._mutationObserver) return;diff --git a/tools/ui/src/lib/hooks/use-chat-screen-active-model.svelte.ts b/tools/ui/src/lib/hooks/use-chat-screen-active-model.svelte.tsindex ceffdd8a3a..b5a5d85ce9 100644--- a/tools/ui/src/lib/hooks/use-chat-screen-active-model.svelte.ts+++ b/tools/ui/src/lib/hooks/use-chat-screen-active-model.svelte.ts@@ -22,10 +22,10 @@ export function useChatScreenActiveModel() {$effect(() => {if (activeModelId) {- const cached = modelsStore.getModelProps(activeModelId);+ const cached = modelsStore.props.getModelProps(activeModelId);if (!cached) {- modelsStore.fetchModelProps(activeModelId).then(() => {+ modelsStore.props.fetchModelProps(activeModelId).then(() => {modelPropsVersion++;});}@@ -36,7 +36,7 @@ export function useChatScreenActiveModel() {if (activeModelId) {void modelPropsVersion;- return modelsStore.modelSupportsAudio(activeModelId);+ return modelsStore.props.modelSupportsAudio(activeModelId);}return false;@@ -45,7 +45,7 @@ export function useChatScreenActiveModel() {if (activeModelId) {void modelPropsVersion;- return modelsStore.modelSupportsVideo(activeModelId);+ return modelsStore.props.modelSupportsVideo(activeModelId);}return false;@@ -54,7 +54,7 @@ export function useChatScreenActiveModel() {if (activeModelId) {void modelPropsVersion;- return modelsStore.modelSupportsVision(activeModelId);+ return modelsStore.props.modelSupportsVision(activeModelId);}return false;diff --git a/tools/ui/src/lib/hooks/use-context-gauge.svelte.ts b/tools/ui/src/lib/hooks/use-context-gauge.svelte.tsindex 07d380224d..c6d55e3935 100644--- a/tools/ui/src/lib/hooks/use-context-gauge.svelte.ts+++ b/tools/ui/src/lib/hooks/use-context-gauge.svelte.ts@@ -54,10 +54,10 @@ export function useContextGauge(): UseContextGaugeReturn {const modelId = contextStatsStore.activeModelId;if (modelId && contextStatsStore.isActiveModelLoaded) {- const cached = modelsStore.getModelProps(modelId);+ const cached = modelsStore.props.getModelProps(modelId);if (!cached) {- void modelsStore.fetchModelProps(modelId);+ void modelsStore.props.fetchModelProps(modelId);}}});@@ -80,9 +80,9 @@ export function useContextGauge(): UseContextGaugeReturn {if (!modelId || contextStatsStore.isActiveModelLoading) return;try {- await modelsStore.loadModel(modelId);+ await modelsStore.status.load(modelId);} catch {- // toast already surfaced by modelsStore.loadModel+ // toast already surfaced by modelsStore.status.load}}diff --git a/tools/ui/src/lib/hooks/use-models-selector.svelte.ts b/tools/ui/src/lib/hooks/use-models-selector.svelte.tsindex d56eeefcd3..7d2770a261 100644--- a/tools/ui/src/lib/hooks/use-models-selector.svelte.ts+++ b/tools/ui/src/lib/hooks/use-models-selector.svelte.ts@@ -47,7 +47,7 @@ export interface UseModelsSelectorReturn {export function useModelsSelector(opts: UseModelsSelectorOptions): UseModelsSelectorReturn {const options = $derived(modelsStore.models.filter((option) => {- const modelProps = modelsStore.getModelProps(option.model);+ const modelProps = modelsStore.props.getModelProps(option.model);return modelProps?.ui !== false;})@@ -103,7 +103,7 @@ export function useModelsSelector(opts: UseModelsSelectorOptions): UseModelsSeleif (open) {modelsStore.fetchRouterModels().then(() => {- modelsStore.fetchModalitiesForLoadedModels();+ modelsStore.props.fetchModalitiesForLoadedModels();});}@@ -143,8 +143,8 @@ export function useModelsSelector(opts: UseModelsSelectorOptions): UseModelsSeleif (!onModelChange && isRouter && !modelsStore.isModelLoaded(option.model)) {isLoadingModel = true;- modelsStore- .loadModel(option.model)+ modelsStore.status+ .load(option.model).catch((error) => console.error('Failed to load model:', error)).finally(() => (isLoadingModel = false));}diff --git a/tools/ui/src/lib/hooks/use-processing-state.svelte.ts b/tools/ui/src/lib/hooks/use-processing-state.svelte.tsindex 37e0748bcb..8a6f332f35 100644--- a/tools/ui/src/lib/hooks/use-processing-state.svelte.ts+++ b/tools/ui/src/lib/hooks/use-processing-state.svelte.ts@@ -43,7 +43,7 @@ export function useProcessingState(): UseProcessingStateReturn {}// Read directly from the reactive state- return chatStore.activeProcessingState;+ return chatStore.processing.activeState;});$effect(() => {diff --git a/tools/ui/src/lib/hooks/use-reasoning-menu.svelte.ts b/tools/ui/src/lib/hooks/use-reasoning-menu.svelte.tsindex 2ff67c9392..2cb9c90609 100644--- a/tools/ui/src/lib/hooks/use-reasoning-menu.svelte.ts+++ b/tools/ui/src/lib/hooks/use-reasoning-menu.svelte.ts@@ -42,19 +42,20 @@ export function useReasoningMenu(): UseReasoningMenuReturn {});const modelSupportsThinking = $derived.by(() => {void modelsStore.loadedModelIds;- void modelsStore.propsCacheVersion;+ void modelsStore.props.cacheVersion;if (serverStore.isRouterMode) {const modelId = modelsStore.selectedModelName || conversationModel;return (- modelsStore.checkModelSupportsThinking(modelId ?? '') || modelSupportsThinkingFromMessages+ modelsStore.props.checkModelSupportsThinking(modelId ?? '') ||+ modelSupportsThinkingFromMessages);}- return modelsStore.supportsThinking || modelSupportsThinkingFromMessages;+ return modelsStore.props.supportsThinking || modelSupportsThinkingFromMessages;});- const currentEffort = $derived(conversationsStore.getReasoningEffort());+ const currentEffort = $derived(conversationsStore.preferences.getReasoningEffort());const thinkingEnabled = $derived(currentEffort !== ReasoningEffort.OFF && currentEffort !== ReasoningEffort.DEFAULT);@@ -76,7 +77,7 @@ export function useReasoningMenu(): UseReasoningMenuReturn {return modelSupportsThinking;},select(level: ReasoningEffortLevel): void {- conversationsStore.setReasoningEffort(level.value as ReasoningEffort);+ conversationsStore.preferences.setReasoningEffort(level.value as ReasoningEffort);},get thinkingEnabled() {return thinkingEnabled;diff --git a/tools/ui/src/lib/hooks/use-tools-panel.svelte.ts b/tools/ui/src/lib/hooks/use-tools-panel.svelte.tsindex 80b3b85a99..e9dc0dcab6 100644--- a/tools/ui/src/lib/hooks/use-tools-panel.svelte.ts+++ b/tools/ui/src/lib/hooks/use-tools-panel.svelte.ts@@ -35,7 +35,7 @@ export function useToolsPanel(): UseToolsPanelReturn {(g) =>g.source !== ToolSource.MCP ||!g.serverId ||- conversationsStore.isMcpServerEnabledForChat(g.serverId)+ conversationsStore.preferences.isMcpServerEnabledForChat(g.serverId)));const totalToolCount = $derived(activeGroups.reduce((n, g) => n + g.tools.length, 0));@@ -73,7 +73,7 @@ export function useToolsPanel(): UseToolsPanelReturn {return (group.source === ToolSource.MCP &&!!group.serverId &&- !conversationsStore.isMcpServerEnabledForChat(group.serverId)+ !conversationsStore.preferences.isMcpServerEnabledForChat(group.serverId));}diff --git a/tools/ui/src/lib/services/chat.service.ts b/tools/ui/src/lib/services/chat.service.tsindex f609b4f4ec..b008b16db8 100644--- a/tools/ui/src/lib/services/chat.service.ts+++ b/tools/ui/src/lib/services/chat.service.ts@@ -1,4 +1,11 @@-import { settingsStore } from '../stores/settings.svelte';+/**+ * ChatService - Stateless chat completion and streaming API layer+ *+ * Wraps the /chat/completions and /stream endpoints: request building, SSE+ * parsing, streaming callbacks, resume/probe logic and pre-encode KV-cache+ * warming. No reactive state; consumed by chatStore and its managers.+ */+import { getAudioInputFormat } from '../utils/audio-format';import { capImageDataURLSize } from '../utils/cap-img-size';import {@@ -25,7 +32,8 @@ import {ReasoningFormat,StreamConnectionState} from '$lib/enums';-import { modelsStore } from '$lib/stores/models.svelte';+import { modelsStore } from '$lib/stores/models/index.svelte';+import { settingsStore } from '$lib/stores/settings/index.svelte';import type { DatabaseMessageExtraMcpPrompt, DatabaseMessageExtraMcpResource } from '$lib/types';import type {ApiChatCompletionToolCall,@@ -53,711 +61,800 @@ function streamStorageKey(conversationId: string): string {}export class ChatService {- /**- *- *- * Title Generation- *- *- */+ // Per-chunk localStorage writes are throttled to at most one per+ // conversation per interval (saveStreamStateThrottled). The resume offset+ // only needs to be roughly current: on resume the server retransmits from+ // a line boundary and the client discards its partial line. Guaranteed+ // immediate writes happen at stream start, at resume boundaries and when+ // the page goes hidden or away (pagehide/visibilitychange), so a reload+ // always finds a usable offset.+ private static readonly STREAM_STATE_SAVE_INTERVAL_MS = 500;++ private static streamStateSaveTrackers = new Map<+ string,+ { lastSavedAt: number; model: string | null; pendingBytes: number | null }+ >();/**- * Sends a streaming chat completion request for generating a chat title.- * Delegates to `sendMessage` for fetch, SSE parsing, and error handling.+ * Checks whether all server slots are currently idle (not processing any requests).+ * Queries the /slots endpoint (requires --slots flag on the server).+ * Returns true if all slots are idle, false if any is processing.+ * If the endpoint is unavailable or errors out, returns true (best-effort fallback).*- * @param message - The single message to send (a user message containing the title generation prompt)- * @param model - Optional model name to use (required in ROUTER mode)- * @param signal - Optional AbortSignal to cancel the request- * @returns {Promise<string>} The aggregated title text, or empty string if request failed- * @static+ * @param signal - Optional AbortSignal to cancel the request if needed+ * @param model - Optional model name to check slots for (required in ROUTER mode)+ * @returns {Promise<boolean>} Promise that resolves to true if all slots are idle, false if any is processing*/- static async generateTitle(- message: ApiChatMessageData,- model?: string | null,- signal?: AbortSignal- ): Promise<string> {- let titleResponse = '';-+ static async areAllSlotsIdle(model?: string | null, signal?: AbortSignal): Promise<boolean> {try {- await ChatService.sendMessage(- [message],- {- custom: { chat_template_kwargs: { enable_thinking: false } },- model: model || undefined,- onChunk: (chunk: string) => {- titleResponse += chunk;- },- stream: true- },- undefined,- signal- );+ const url = model ? `${API_SLOTS.LIST}?model=${encodeURIComponent(model)}` : API_SLOTS.LIST;+ const res = await fetch(url, { signal });++ if (!res.ok) return true;++ const slots: { is_processing: boolean }[] = await res.json();++ return slots.every((s) => !s.is_processing);} catch {- return '';+ return true;}-- return titleResponse;}/**- *- *- * Messaging- *- *- */-- /**- * Sends a chat completion request to the llama-server.- * Supports both streaming and non-streaming responses with comprehensive parameter configuration.- * Automatically converts database messages with attachments to the appropriate API format.- *- * @param messages - Array of chat messages to send to the API (supports both ApiChatMessageData and DatabaseMessage with attachments)- * @param options - Configuration options for the chat completion request. See `SettingsChatServiceOptions` type for details.- * @returns {Promise<string | void>} that resolves to the complete response string (non-streaming) or void (streaming)- * @throws {Error} if the request fails or is aborted+ * Cancels the server-side replay buffer for a conversation, freeing its slot.*/- static async sendMessage(- messages: ApiChatMessageData[] | (DatabaseMessage & { extra?: DatabaseMessageExtra[] })[],- options: SettingsChatServiceOptions = {},- conversationId?: string,- signal?: AbortSignal- ): Promise<string | void> {- const {- backend_sampling,- continueFinalMessage,- custom,- // Config options- disableReasoningParsing,- dry_allowed_length,- dry_base,- dry_multiplier,- dry_penalty_last_n,- dynatemp_exponent,- // Sampling parameters- dynatemp_range,- enableThinking,- excludeReasoningFromContext,- frequency_penalty,- max_tokens,- min_p,- onChunk,- onComplete,- onCompletionId,- onConnectionState,- onError,- onModel,- onReasoningChunk,- onTimings,- onToolCallChunk,- presence_penalty,- reasoningEffort,- // Penalty parameters- repeat_last_n,- repeat_penalty,- // Other parameters- samplers,- stream,- // Generation parameters- temperature,- timings_per_token,- // Tools for function calling- tools,- top_k,- top_p,- typ_p,- xtc_probability,- xtc_threshold- } = options;- const normalizedMessages: ApiChatMessageData[] = (- await Promise.all(- messages.map((msg) => {- if ('id' in msg && 'convId' in msg && 'timestamp' in msg) {- const dbMsg = msg as DatabaseMessage & { extra?: DatabaseMessageExtra[] };-- return ChatService.convertDbMessageToApiChatMessageData(dbMsg);- } else {- return msg as ApiChatMessageData;- }- })- )- ).filter((msg: { role: ChatRole; content: string | ApiChatMessageContentPart[] }) => {- // Filter out empty system messages- if (msg.role === MessageRole.SYSTEM) {- const content = typeof msg.content === 'string' ? msg.content : '';-- return content.trim().length > 0;- }-- return true;- });-- // Filter out image attachments if the model doesn't support vision- if (options.model && !modelsStore.modelSupportsVision(options.model)) {- normalizedMessages.forEach((msg) => {- if (Array.isArray(msg.content)) {- msg.content = msg.content.filter((part: ApiChatMessageContentPart) => {- if (part.type === ContentPartType.IMAGE_URL) {- console.info(- `[ChatService] Skipping image attachment in message history (model "${options.model}" does not support vision)`- );-- return false;- }+ static async cancelServerStream(conversationId: string, model?: string | null): Promise<void> {+ if (!conversationId) return;- return true;- });+ try {+ const id = streamIdentity(conversationId, model);- // If only text remains and it's a single part, simplify to string- if (- msg.content.length === 1 &&- msg.content[0].type === ContentPartType.TEXT &&- typeof msg.content[0].text === 'string'- ) {- msg.content = msg.content[0].text;- }- }+ await fetch(ChatService.buildStreamUrl(id), {+ headers: getAuthHeaders(),+ method: 'DELETE'});+ } catch (e) {+ console.warn('cancelServerStream failed:', e);}+ }- const requestBody: ApiChatCompletionRequest = {- messages: normalizedMessages.map((msg: ApiChatMessageData) => {- const mapped: ApiChatCompletionRequest['messages'][0] = {- content: msg.content,- role: msg.role,- tool_call_id: msg.tool_call_id,- tool_calls: msg.tool_calls- };+ static clearStreamState(conversationId: string): void {+ if (!conversationId) return;- // Include reasoning_content from the dedicated field- if (!excludeReasoningFromContext && msg.reasoning_content) {- mapped.reasoning_content = msg.reasoning_content;- }+ ChatService.streamStateSaveTrackers.delete(conversationId);- return mapped;- }),- return_progress: stream ? true : undefined,- sse_ping_interval: stream ? 1 : undefined,- stream,- tools: tools && tools.length > 0 ? tools : undefined- };+ try {+ localStorage.removeItem(streamStorageKey(conversationId));+ } catch {+ // nothing to do+ }+ }- // Include model in request if provided (required in ROUTER mode)- if (options.model) {- requestBody.model = options.model;+ /**+ * Converts a database message with attachments to API chat message format.+ * Processes various attachment types (images, text files, PDFs) and formats them+ * as content parts suitable for the chat completion API.+ */+ static async convertDbMessageToApiChatMessageData(+ message: DatabaseMessage & { extra?: DatabaseMessageExtra[] }+ ): Promise<ApiChatMessageData> {+ // Handle tool result messages (role: 'tool')+ if (message.role === MessageRole.TOOL && message.toolCallId) {+ return {+ content: message.content,+ role: MessageRole.TOOL,+ tool_call_id: message.toolCallId+ };}- requestBody.reasoning_format = disableReasoningParsing- ? ReasoningFormat.NONE- : ReasoningFormat.AUTO;+ // Parse tool calls for assistant messages+ let toolCalls: ApiChatCompletionToolCall[] | undefined;- const reasoningBudgetTokens =- enableThinking && reasoningEffort ? (REASONING_EFFORT_TOKENS[reasoningEffort] ?? -1) : -1;+ if (message.toolCalls) {+ try {+ toolCalls = JSON.parse(message.toolCalls);+ } catch {+ // Ignore parse errors for malformed tool calls+ }+ }- // an explicit user choice injects the kwarg, otherwise it is omitted so- // the server default applies (--reasoning flag or chat template)- if (enableThinking !== undefined) {- requestBody.chat_template_kwargs = {- ...(requestBody.chat_template_kwargs ?? {}),- enable_thinking: enableThinking+ if (!message.extra || message.extra.length === 0) {+ const result: ApiChatMessageData = {+ content: message.content,+ role: message.role as MessageRole};- }- if (reasoningBudgetTokens >= 0) {- requestBody.thinking_budget_tokens = reasoningBudgetTokens;- }+ if (message.reasoningContent) {+ result.reasoning_content = message.reasoningContent;+ }- // arms the budget sampler so reasoning can be ended at runtime via the control endpoint- requestBody.reasoning_control = true;+ if (toolCalls && toolCalls.length > 0) {+ result.tool_calls = toolCalls;+ }- if (continueFinalMessage) {- requestBody.continue_final_message = true;- requestBody.add_generation_prompt = false;+ return result;}- if (temperature !== undefined) requestBody.temperature = temperature;+ const contentParts: ApiChatMessageContentPart[] = [];+ const textFiles = message.extra.filter(+ (extra: DatabaseMessageExtra): extra is DatabaseMessageExtraTextFile =>+ extra.type === AttachmentType.TEXT+ );- if (max_tokens !== undefined) {- // Set max_tokens to -1 (infinite) when explicitly configured as 0 or null- requestBody.max_tokens = max_tokens !== null && max_tokens !== 0 ? max_tokens : -1;+ for (const textFile of textFiles) {+ contentParts.push({+ text: formatAttachmentText(AttachmentLabel.FILE, textFile.name, textFile.content),+ type: ContentPartType.TEXT+ });}- if (dynatemp_range !== undefined) requestBody.dynatemp_range = dynatemp_range;+ // Handle legacy 'context' type from the old UI (pasted content)+ const legacyContextFiles = message.extra.filter(+ (extra: DatabaseMessageExtra): extra is DatabaseMessageExtraLegacyContext =>+ extra.type === AttachmentType.LEGACY_CONTEXT+ );- if (dynatemp_exponent !== undefined) requestBody.dynatemp_exponent = dynatemp_exponent;+ for (const legacyContextFile of legacyContextFiles) {+ contentParts.push({+ text: formatAttachmentText(+ AttachmentLabel.FILE,+ legacyContextFile.name,+ legacyContextFile.content+ ),+ type: ContentPartType.TEXT+ });+ }- if (top_k !== undefined) requestBody.top_k = top_k;+ const imageFiles = message.extra.filter(+ (extra: DatabaseMessageExtra): extra is DatabaseMessageExtraImageFile =>+ extra.type === AttachmentType.IMAGE+ );- if (top_p !== undefined) requestBody.top_p = top_p;+ for (const image of imageFiles) {+ const maxImageResolution = settingsStore.getConfig(SETTINGS_KEYS.MAX_IMAGE_RESOLUTION);+ // Caps the resolution and bakes the jpeg exif orientation in one pass,+ // untouched images pass through as is+ const base64Url = await capImageDataURLSize(image.base64Url, maxImageResolution);- if (min_p !== undefined) requestBody.min_p = min_p;+ contentParts.push({+ image_url: { url: base64Url },+ type: ContentPartType.IMAGE_URL+ });+ }- if (xtc_probability !== undefined) requestBody.xtc_probability = xtc_probability;+ const audioFiles = message.extra.filter(+ (extra: DatabaseMessageExtra): extra is DatabaseMessageExtraAudioFile =>+ extra.type === AttachmentType.AUDIO+ );- if (xtc_threshold !== undefined) requestBody.xtc_threshold = xtc_threshold;+ for (const audio of audioFiles) {+ contentParts.push({+ input_audio: {+ data: audio.base64Data,+ format: getAudioInputFormat(audio.mimeType)+ },+ type: ContentPartType.INPUT_AUDIO+ });+ }- if (typ_p !== undefined) requestBody.typ_p = typ_p;+ if (message.content) {+ contentParts.push({+ text: message.content,+ type: ContentPartType.TEXT+ });+ }- if (repeat_last_n !== undefined) requestBody.repeat_last_n = repeat_last_n;+ const videoFiles = message.extra.filter(+ (extra: DatabaseMessageExtra): extra is DatabaseMessageExtraVideoFile =>+ extra.type === AttachmentType.VIDEO+ );- if (repeat_penalty !== undefined) requestBody.repeat_penalty = repeat_penalty;+ for (const video of videoFiles) {+ contentParts.push({+ input_video: {+ data: video.base64Data,+ format: video.mimeType.includes('mp4')+ ? 'mp4'+ : video.mimeType.includes('ogg')+ ? 'ogg'+ : 'auto'+ },+ type: ContentPartType.INPUT_VIDEO+ });+ }- if (presence_penalty !== undefined) requestBody.presence_penalty = presence_penalty;+ const pdfFiles = message.extra.filter(+ (extra: DatabaseMessageExtra): extra is DatabaseMessageExtraPdfFile =>+ extra.type === AttachmentType.PDF+ );- if (frequency_penalty !== undefined) requestBody.frequency_penalty = frequency_penalty;+ for (const pdfFile of pdfFiles) {+ if (pdfFile.processedAsImages && pdfFile.images) {+ for (let i = 0; i < pdfFile.images.length; i++) {+ contentParts.push({+ image_url: { url: pdfFile.images[i] },+ type: ContentPartType.IMAGE_URL+ });+ }+ } else {+ contentParts.push({+ text: formatAttachmentText(AttachmentLabel.PDF_FILE, pdfFile.name, pdfFile.content),+ type: ContentPartType.TEXT+ });+ }+ }- if (dry_multiplier !== undefined) requestBody.dry_multiplier = dry_multiplier;+ const mcpPrompts = message.extra.filter(+ (extra: DatabaseMessageExtra): extra is DatabaseMessageExtraMcpPrompt =>+ extra.type === AttachmentType.MCP_PROMPT+ );- if (dry_base !== undefined) requestBody.dry_base = dry_base;+ for (const mcpPrompt of mcpPrompts) {+ contentParts.push({+ text: formatAttachmentText(+ AttachmentLabel.MCP_PROMPT,+ mcpPrompt.name,+ mcpPrompt.content,+ mcpPrompt.serverName+ ),+ type: ContentPartType.TEXT+ });+ }- if (dry_allowed_length !== undefined) requestBody.dry_allowed_length = dry_allowed_length;+ const mcpResources = message.extra.filter(+ (extra: DatabaseMessageExtra): extra is DatabaseMessageExtraMcpResource =>+ extra.type === AttachmentType.MCP_RESOURCE+ );- if (dry_penalty_last_n !== undefined) requestBody.dry_penalty_last_n = dry_penalty_last_n;+ for (const mcpResource of mcpResources) {+ contentParts.push({+ text: formatAttachmentText(+ AttachmentLabel.MCP_RESOURCE,+ mcpResource.name,+ mcpResource.content,+ mcpResource.serverName+ ),+ type: ContentPartType.TEXT+ });+ }- if (samplers !== undefined) {- requestBody.samplers =- typeof samplers === 'string'- ? samplers.split(';').filter((s: string) => s.trim())- : samplers;+ const result: ApiChatMessageData = {+ content: contentParts,+ role: message.role as MessageRole+ };++ if (message.reasoningContent) {+ result.reasoning_content = message.reasoningContent;}- if (backend_sampling !== undefined) requestBody.backend_sampling = backend_sampling;+ if (toolCalls && toolCalls.length > 0) {+ result.tool_calls = toolCalls;+ }- if (timings_per_token !== undefined) requestBody.timings_per_token = timings_per_token;+ return result;+ }- if (custom) {- try {- const customParams = typeof custom === 'string' ? JSON.parse(custom) : custom;+ /**+ * Fetch the full replay of a server-side stream from byte 0. Returns the raw Response so the+ * caller can pipe it through the SSE parser like a fresh stream.+ */+ static async fetchStreamReplay(streamId: string): Promise<Response> {+ const resp = await fetch(ChatService.buildStreamUrl(streamId, 0), {+ headers: getAuthHeaders()+ });- Object.assign(requestBody, customParams);- } catch (error) {- console.warn('Failed to parse custom parameters:', error);- }+ if (!resp.ok) {+ throw new ApiError(`Stream replay failed with HTTP ${resp.status}`, resp.status);}- try {- const headers: Record<string, string> = { ...getJsonHeaders() };+ return resp;+ }- // tag streaming requests with the conversation id, this single header is the opt in for the- // server side replay buffer and powers discoverActiveStream on tab reopen. with an explicit- // model the ::model suffix keeps the per model session distinct- if (stream && conversationId) {- headers[HEADERS.X_CONVERSATION_ID_HEADER] = streamIdentity(conversationId, options.model);- // persist the pending stream before the fetch: a reload during the model load or- // the prompt processing must still find its way back to the session once it exists- ChatService.saveStreamState(conversationId, 0, options.model ?? null);- }+ // write a throttled-but-not-yet-persisted offset immediately; used at+ // resume boundaries and on pagehide/visibilitychange so the persisted+ // offset is the freshest one when it matters+ static flushStreamState(conversationId: string): void {+ const tracker = ChatService.streamStateSaveTrackers.get(conversationId);- const response = await fetch(API_CHAT.COMPLETIONS, {- body: JSON.stringify(requestBody),- headers,- method: 'POST',+ if (!tracker || tracker.pendingBytes === null) return;++ const { model, pendingBytes } = tracker;++ tracker.lastSavedAt = Date.now();+ tracker.pendingBytes = null;++ ChatService.writeStreamState(conversationId, pendingBytes, model);+ }++ /**+ * Sends a streaming chat completion request for generating a chat title.+ * Delegates to `sendMessage` for fetch, SSE parsing, and error handling.+ *+ * @param message - The single message to send (a user message containing the title generation prompt)+ * @param model - Optional model name to use (required in ROUTER mode)+ * @param signal - Optional AbortSignal to cancel the request+ * @returns {Promise<string>} The aggregated title text, or empty string if request failed+ * @static+ */+ static async generateTitle(+ message: ApiChatMessageData,+ model?: string | null,+ signal?: AbortSignal+ ): Promise<string> {+ let titleResponse = '';++ try {+ await ChatService.sendMessage(+ [message],+ {+ custom: { chat_template_kwargs: { enable_thinking: false } },+ model: model || undefined,+ onChunk: (chunk: string) => {+ titleResponse += chunk;+ },+ stream: true+ },+ undefined,signal- });+ );+ } catch {+ return '';+ }- if (!response.ok) {- // a rejected request (including one cancelled by a stop during the model load)- // leaves nothing to resume- if (conversationId) {- ChatService.clearStreamState(conversationId);- }+ return titleResponse;+ }- const error = await ChatService.parseErrorResponse(response);+ static getStreamState(conversationId: string): ResumableStreamState | null {+ if (!conversationId) return null;- if (onError) {- onError(error);- }+ try {+ const raw = localStorage.getItem(streamStorageKey(conversationId));- throw error;- }+ if (!raw) return null;- if (stream) {- await ChatService.handleStreamResponse(- response,- onChunk,- onComplete,- onError,- onReasoningChunk,- onToolCallChunk,- onModel,- onCompletionId,- onTimings,- conversationId,- signal,- onConnectionState,- options.model- );-- return;- } else {- return ChatService.handleNonStreamResponse(- response,- onComplete,- onError,- onToolCallChunk,- onModel- );- }- } catch (error) {- if (isAbortError(error)) {- console.log('Chat completion request was aborted');-- return;- }-- let userFriendlyError: Error;-- if (error instanceof Error) {- if (error.name === 'TypeError' && error.message.includes('fetch')) {- userFriendlyError = new Error(- 'Unable to connect to server - please check if the server is running'- );- userFriendlyError.name = 'NetworkError';- } else if (error.message.includes('ECONNREFUSED')) {- userFriendlyError = new Error('Connection refused - server may be offline');- userFriendlyError.name = 'NetworkError';- } else if (error.message.includes('ETIMEDOUT')) {- userFriendlyError = new Error('Request timed out - the server took too long to respond');- userFriendlyError.name = 'TimeoutError';- } else {- userFriendlyError = error;- }- } else {- userFriendlyError = new Error('Unknown error occurred while sending message');- }-- console.error('Error in sendMessage:', error);+ const parsed = JSON.parse(raw) as ResumableStreamState;- if (onError) {- onError(userFriendlyError);- }+ if (!parsed || typeof parsed.bytesReceived !== 'number') return null;- throw userFriendlyError;+ return parsed;+ } catch {+ return null;}}/**- * Checks whether all server slots are currently idle (not processing any requests).- * Queries the /slots endpoint (requires --slots flag on the server).- * Returns true if all slots are idle, false if any is processing.- * If the endpoint is unavailable or errors out, returns true (best-effort fallback).- *- * @param signal - Optional AbortSignal to cancel the request if needed- * @param model - Optional model name to check slots for (required in ROUTER mode)- * @returns {Promise<boolean>} Promise that resolves to true if all slots are idle, false if any is processing+ * Handles streaming response from the chat completion API.*/- static async areAllSlotsIdle(model?: string | null, signal?: AbortSignal): Promise<boolean> {- try {- const url = model ? `${API_SLOTS.LIST}?model=${encodeURIComponent(model)}` : API_SLOTS.LIST;- const res = await fetch(url, { signal });+ static async handleStreamResponse(+ response: Response,+ onChunk?: (chunk: string) => void,+ onComplete?: (+ response: string,+ reasoningContent?: string,+ timings?: ChatMessageTimings,+ toolCalls?: string+ ) => void,+ onError?: (error: Error) => void,+ onReasoningChunk?: (chunk: string) => void,+ onToolCallChunk?: (chunk: string) => void,+ onModel?: (model: string) => void,+ onCompletionId?: (id: string) => void,+ onTimings?: (timings?: ChatMessageTimings, promptProgress?: ChatMessagePromptProgress) => void,+ conversationId?: string,+ abortSignal?: AbortSignal,+ onConnectionState?: (state: StreamConnectionState) => void,+ streamModel?: string | null+ ): Promise<void> {+ let reader = response.body?.getReader();- if (!res.ok) return true;+ if (!reader) {+ throw new Error('No response body');+ }- const slots: { is_processing: boolean }[] = await res.json();+ // bytesParsed is the absolute server side buffer offset of the next byte to parse+ // segmentStartOffset is the absolute offset where the current reader started, reset on resume+ // segmentBytesRead is wire bytes read by the current reader+ let bytesParsed = 0;+ let segmentStartOffset = 0;+ let segmentBytesRead = 0;+ let lastByteAt = Date.now();+ // each resume must produce at least one byte to be retried again+ // if a resume returns 200 but yields nothing, we abandon+ // since the session has a bounded size, the total number of retries is bounded by construction+ let madeProgress = true;- return slots.every((s) => !s.is_processing);- } catch {- return true;+ const encoder = new TextEncoder();++ if (conversationId) {+ ChatService.saveStreamState(conversationId, 0, streamModel);}- }- /**- * Ends the current reasoning block of a running completion, targeted by its- * chat completion id (streamed back as `id`). Matching the completion rather- * than a slot index avoids a TOCTOU: a finished completion simply matches- * nothing server side. The model is carried so the router forwards to the- * right child, single model ignores it. Returns true on success.- */- static async stopReasoning(completionId: string, model?: string | null): Promise<boolean> {- if (!completionId) {- console.error(- 'stopReasoning: no completion id for the active message, cannot target the running completion'- );+ onConnectionState?.(StreamConnectionState.STREAMING);- return false;- }+ let decoder = new TextDecoder();+ let aggregatedContent = '';+ let fullReasoningContent = '';+ let aggregatedToolCalls: ApiChatCompletionToolCall[] = [];+ let lastTimings: ChatMessageTimings | undefined;+ let streamFinished = false;+ let modelEmitted = false;+ let idEmitted = false;+ let toolCallIndexOffset = 0;+ let hasOpenToolCallBatch = false;- const body: Record<string, unknown> = {- action: CONTROL_ACTION.END_REASONING,- id: completionId+ const finalizeOpenToolCallBatch = () => {+ if (!hasOpenToolCallBatch) {+ return;+ }++ toolCallIndexOffset = aggregatedToolCalls.length;+ hasOpenToolCallBatch = false;};+ const processToolCallDelta = (toolCalls?: ApiChatCompletionToolCallDelta[]) => {+ if (!toolCalls || toolCalls.length === 0) {+ return;+ }- if (model) body.model = model;+ aggregatedToolCalls = ChatService.mergeToolCallDeltas(+ aggregatedToolCalls,+ toolCalls,+ toolCallIndexOffset+ );- try {- const res = await fetch(API_CHAT.CONTROL, {- body: JSON.stringify(body),- headers: getJsonHeaders(),- method: 'POST'- });- const data = await res.json().catch(() => null);+ if (aggregatedToolCalls.length === 0) {+ return;+ }- if (!res.ok || data?.success !== true) {- console.error('stopReasoning: control request failed', {- completionId,- response: data,- status: res.status- });+ hasOpenToolCallBatch = true;- return false;- }+ const serializedToolCalls = JSON.stringify(aggregatedToolCalls);- return true;- } catch (error) {- console.error('stopReasoning: control request threw', { completionId, error });+ if (import.meta.env.DEV && import.meta.env.VITE_DEBUG) {+ console.log('[ChatService] Aggregated tool calls:', serializedToolCalls);+ }- return false;- }- }+ if (!serializedToolCalls) {+ return;+ }- /**- * Sends a fire-and-forget request to pre-encode the conversation in the server's KV cache.- * After a response completes, this re-submits the full conversation- * using n_predict=0 and stream=false so the server processes the prompt without generating tokens.- * This warms the cache for the next turn, making it faster.- *- * When excludeReasoningFromContext is true, reasoning content is stripped from the messages- * to match what sendMessage would send on the next turn (avoiding cache misses).- * When false, reasoning_content is preserved so the cached prompt matches the next request.- *- * @param messages - The full conversation including the latest assistant response- * @param model - Optional model name (required in ROUTER mode)- * @param excludeReasoning - Whether to strip reasoning content (should match excludeReasoningFromContext setting)- * @param signal - Optional AbortSignal to cancel the pre-encode request- */- static async cancelServerStream(conversationId: string, model?: string | null): Promise<void> {- if (!conversationId) return;+ if (!abortSignal?.aborted) {+ onToolCallChunk?.(serializedToolCalls);+ }+ };+ const onVisibilityChange = () => {+ if (typeof document === 'undefined') return;- try {- const id = streamIdentity(conversationId, model);+ if (document.visibilityState === 'hidden') {+ // the tab is going to the background and the OS may throttle or+ // drop the socket shortly; persist the freshest resume offset now+ if (conversationId) ChatService.flushStreamState(conversationId);- await fetch(ChatService.buildStreamUrl(id), {- headers: getAuthHeaders(),- method: 'DELETE'- });- } catch (e) {- console.warn('cancelServerStream failed:', e);- }- }+ return;+ }- /**- * Look up server-side stream sessions for the given conversation ids. Ids carry the frozen- * conv::model identity when a model was bound at POST time.- */- static async lookupStreamSessions(conversationIds: string[]): Promise<ApiStreamSession[]> {- const resp = await fetch(API_STREAM.LOOKUP, {- body: JSON.stringify({ conversation_ids: conversationIds }),- headers: getJsonHeaders(),- method: 'POST'- });+ if (streamFinished) return;- if (!resp.ok) {- throw new ApiError(`Stream lookup failed with HTTP ${resp.status}`, resp.status);- }+ if (!conversationId) return;- const body = (await resp.json()) as unknown;+ // the bytes have been quiet for too long, the OS likely killed the socket+ // kicking the reader unblocks reader.read with done=true so the outer loop can resume+ if (Date.now() - lastByteAt > STREAM_VISIBILITY_KICK_MS) {+ reader!.cancel().catch(() => {});+ }+ };+ const onPageHide = () => {+ // a reload or navigation is about to happen; make sure the resume+ // offset that getStreamState() will read is not a stale throttled one+ if (conversationId) ChatService.flushStreamState(conversationId);+ };- if (!Array.isArray(body)) {- throw new Error('Stream lookup returned a non-array response');+ if (typeof document !== 'undefined') {+ document.addEventListener('visibilitychange', onVisibilityChange);+ window.addEventListener('pagehide', onPageHide);}- return body as ApiStreamSession[];- }+ try {+ let chunk = '';- /**- * Fetch the full replay of a server-side stream from byte 0. Returns the raw Response so the- * caller can pipe it through the SSE parser like a fresh stream.- */- static async fetchStreamReplay(streamId: string): Promise<Response> {- const resp = await fetch(ChatService.buildStreamUrl(streamId, 0), {- headers: getAuthHeaders()- });+ // outer loop drives the resume cycle, swaps reader on premature end of stream+ while (true) {+ while (true) {+ if (abortSignal?.aborted) break;- if (!resp.ok) {- throw new ApiError(`Stream replay failed with HTTP ${resp.status}`, resp.status);- }+ let done: boolean;+ let value: Uint8Array | undefined;- return resp;- }+ try {+ const r = await reader.read();- /**- * Pick the running session to splice into when discoverActiveStream lists candidates for a- * conversation. Finalized sessions are not candidates: their final content was already written- * to the DB by the original onComplete handler, so attaching to them would replay a buffer that- * may not match what the DB holds. A continue session's buffer holds only the appended deltas,- * not the pre continue prefix, so replaying it as a fresh generation would erase the original.- *- * Among running sessions we tie break on the most recent started_at, which covers the case of- * multiple inferences left running on the same conversation.- */- static selectActiveStream(- sessions: ApiStreamSession[] | null | undefined- ): ApiStreamSession | null {- if (!Array.isArray(sessions) || sessions.length === 0) {- return null;- }+ done = r.done;+ value = r.value;+ } catch (readErr) {+ // reader.read() rejects with TypeError when the underlying connection drops+ // instead of just resolving with done=true. treat it like done so the outer+ // loop swaps reader via the resume path+ if (isAbortError(readErr)) {+ throw readErr;+ }- const running = sessions.filter((s) => !s.is_done);+ console.warn('reader.read() rejected, treating as premature end:', readErr);+ done = true;+ value = undefined;+ }- if (running.length === 0) {- return null;- }+ if (done) break;- return running.reduce((best, cur) => (cur.started_at > best.started_at ? cur : best));- }+ if (abortSignal?.aborted) break;- // persist the running byte count and the frozen model for a conversation, a later visit- // resumes the SSE replay at the right offset under the same conv::model identity- static saveStreamState(- conversationId: string,- bytesReceived: number,- model?: string | null- ): void {- if (!conversationId) return;+ if (value && value.byteLength > 0) {+ segmentBytesRead += value.byteLength;+ lastByteAt = Date.now();- try {- const state: ResumableStreamState = {- bytesReceived,- model: model ?? null,- updatedAt: Date.now()- };+ if (!madeProgress) {+ madeProgress = true;+ onConnectionState?.(StreamConnectionState.STREAMING);+ }+ }- localStorage.setItem(streamStorageKey(conversationId), JSON.stringify(state));- } catch {- // localStorage may be full or disabled, silently ignore- }- }+ chunk += decoder.decode(value, { stream: true });+ const lines = chunk.split(SSE_LINE_SEPARATOR);- static getStreamState(conversationId: string): ResumableStreamState | null {- if (!conversationId) return null;+ chunk = lines.pop() || '';- try {- const raw = localStorage.getItem(streamStorageKey(conversationId));+ // the persisted offset must point right after the last fully parsed line,+ // the trailing `chunk` is partial bytes still waiting for a newline+ if (conversationId) {+ const tailBytes = encoder.encode(chunk).byteLength;- if (!raw) return null;+ bytesParsed = segmentStartOffset + segmentBytesRead - tailBytes;+ ChatService.saveStreamStateThrottled(conversationId, bytesParsed, streamModel);+ }- const parsed = JSON.parse(raw) as ResumableStreamState;+ for (const line of lines) {+ if (abortSignal?.aborted) break;- if (!parsed || typeof parsed.bytesReceived !== 'number') return null;+ if (line.startsWith(SSE_DATA_PREFIX)) {+ const data = line.slice(SSE_DATA_PREFIX.length).trim();- return parsed;- } catch {- return null;- }- }+ if (data === SSE_DONE_MARKER) {+ streamFinished = true;- static clearStreamState(conversationId: string): void {- if (!conversationId) return;+ continue;+ }- try {- localStorage.removeItem(streamStorageKey(conversationId));- } catch {- // nothing to do- }- }+ try {+ const parsed: ApiChatCompletionStreamChunk = JSON.parse(data);+ const choice = parsed.choices?.[0];+ const content = choice?.delta?.content;+ const reasoningContent = choice?.delta?.reasoning_content;+ const toolCalls = choice?.delta?.tool_calls;+ const timings = parsed.timings;+ const promptProgress = parsed.prompt_progress;+ const chunkModel = ChatService.extractModelName(parsed);- /**- * Rebuild the stream identity for a resume. The model persisted at POST time wins, including a- * stored null which means the POST carried no explicit model so the identity stays the bare conv- * id. Only fall back to the caller supplied current model when nothing was persisted.- */- static resumeStreamIdentity(- conversationId: string,- state: ResumableStreamState | null,- fallbackModel: string | null- ): string {- const model = state && state.model !== undefined ? state.model : fallbackModel;+ if (chunkModel && !modelEmitted) {+ modelEmitted = true;+ onModel?.(chunkModel);+ }- return streamIdentity(conversationId, model);- }+ if (parsed.id && !idEmitted) {+ idEmitted = true;+ onCompletionId?.(parsed.id);+ }- // build the replay route url for a stream identity, from is the resume byte offset, omitted- // for the cancel route- private static buildStreamUrl(streamId: string, from?: number): string {- const query = `${STREAM_QUERY_PARAMS.CONV_ID}=${encodeURIComponent(streamId)}`;- const offset = from === undefined ? '' : `&${STREAM_QUERY_PARAMS.FROM}=${from}`;+ if (promptProgress) {+ ChatService.notifyTimings(undefined, promptProgress, onTimings);+ }- return `${API_STREAM.BASE}?${query}${offset}`;- }+ if (timings) {+ ChatService.notifyTimings(timings, promptProgress, onTimings);+ lastTimings = timings;+ }- /**- * Reconnect to an interrupted stream for this conversation. Returns the fetch Response so the- * existing SSE parser drains it like a fresh stream. The server returns 200 on success, 404 if- * no session exists for the conv_id, and 400 if the offset is below the dropped prefix.- */- // probe the resume route status without consuming the stream: the SSE route has no HEAD,- // so issue the GET and abort it right after the status line. 0 on network error- static async probeResumeStatus(streamId: string): Promise<number> {- if (!streamId) return 0;+ if (content) {+ finalizeOpenToolCallBatch();+ aggregatedContent += content;- const ac = new AbortController();+ if (!abortSignal?.aborted) {+ onChunk?.(content);+ }+ }- try {- const resp = await fetch(ChatService.buildStreamUrl(streamId, 0), {- headers: getAuthHeaders(),- signal: ac.signal- });+ if (reasoningContent) {+ finalizeOpenToolCallBatch();+ fullReasoningContent += reasoningContent;- ac.abort();+ if (!abortSignal?.aborted) {+ onReasoningChunk?.(reasoningContent);+ }+ }- return resp.status;- } catch {- return 0;- }- }+ processToolCallDelta(toolCalls);+ } catch (e) {+ console.error('Error parsing JSON chunk:', e);+ }+ }+ }- static async resumeStream(- conversationId: string,- signal?: AbortSignal,- model?: string | null- ): Promise<Response | null> {- if (!conversationId) return null;+ if (abortSignal?.aborted) break;- const state = ChatService.getStreamState(conversationId);- const from = state?.bytesReceived ?? 0;- const id = streamIdentity(conversationId, model);- const url = ChatService.buildStreamUrl(id, from);+ if (streamFinished) break;+ }- return await fetch(url, { headers: getAuthHeaders(), method: 'GET', signal });- }+ // inner reader done, decide whether to try a resume+ if (abortSignal?.aborted) break;- static async preEncode(- messages: ApiChatMessageData[] | (DatabaseMessage & { extra?: DatabaseMessageExtra[] })[],- model?: string | null,- excludeReasoning?: boolean,- signal?: AbortSignal- ): Promise<void> {- const normalizedMessages: ApiChatMessageData[] = (- await Promise.all(- messages.map((msg) => {- if ('id' in msg && 'convId' in msg && 'timestamp' in msg) {- return ChatService.convertDbMessageToApiChatMessageData(- msg as DatabaseMessage & { extra?: DatabaseMessageExtra[] }- );- }+ if (streamFinished) break;- return msg as ApiChatMessageData;- })- )- ).filter((msg: { role: ChatRole; content: string | ApiChatMessageContentPart[] }) => {- if (msg.role === MessageRole.SYSTEM) {- const content = typeof msg.content === 'string' ? msg.content : '';+ if (!conversationId) break;- return content.trim().length > 0;- }+ if (!madeProgress) {+ onConnectionState?.(StreamConnectionState.LOST);+ onError?.(new Error('Stream resume produced no new bytes, giving up'));- return true;- });- const requestBody: Record<string, unknown> = {- messages: normalizedMessages.map((msg: ApiChatMessageData) => {- const mapped: Record<string, unknown> = {- content: excludeReasoning ? ChatService.stripReasoningContent(msg.content) : msg.content,- role: msg.role,- tool_call_id: msg.tool_call_id,- tool_calls: msg.tool_calls- };+ break;+ }- if (!excludeReasoning && msg.reasoning_content) {+ onConnectionState?.(StreamConnectionState.RESUMING);+ madeProgress = false;++ // the server resends starting at bytesParsed, discard any partial line we held, it+ // will be retransmitted from a clean line boundary. reuse the frozen model, not the+ // live dropdown+ // resumeStream reads the offset from localStorage, so persist the+ // freshest bytesParsed before asking the server to replay from it+ ChatService.flushStreamState(conversationId);+ const resumeResp = await ChatService.resumeStream(+ conversationId,+ abortSignal,+ streamModel+ ).catch(() => null);++ // an abort landing during the resume request is intentional, not a lost connection+ if (abortSignal?.aborted) break;++ if (!resumeResp || resumeResp.status !== 200) {+ onConnectionState?.(StreamConnectionState.LOST);+ onError?.(new Error('Stream connection lost and could not be resumed'));++ break;+ }++ const newReader = resumeResp.body?.getReader();++ if (!newReader) break;++ try {+ reader.releaseLock();+ } catch {+ /* ignore */+ }+ reader = newReader;+ decoder = new TextDecoder();+ chunk = '';+ segmentStartOffset = bytesParsed;+ segmentBytesRead = 0;+ lastByteAt = Date.now();+ }++ if (abortSignal?.aborted) return;++ if (streamFinished) {+ finalizeOpenToolCallBatch();++ if (conversationId) {+ ChatService.clearStreamState(conversationId);+ }++ const finalToolCalls =+ aggregatedToolCalls.length > 0 ? JSON.stringify(aggregatedToolCalls) : undefined;++ onComplete?.(+ aggregatedContent,+ fullReasoningContent || undefined,+ lastTimings,+ finalToolCalls+ );+ }+ } catch (error) {+ const err = error instanceof Error ? error : new Error('Stream error');++ onError?.(err);++ throw err;+ } finally {+ if (typeof document !== 'undefined') {+ document.removeEventListener('visibilitychange', onVisibilityChange);+ window.removeEventListener('pagehide', onPageHide);+ }++ try {+ reader.releaseLock();+ } catch {+ /* ignore */+ }+ }+ }++ /**+ * Look up server-side stream sessions for the given conversation ids. Ids carry the frozen+ * conv::model identity when a model was bound at POST time.+ */+ static async lookupStreamSessions(conversationIds: string[]): Promise<ApiStreamSession[]> {+ const resp = await fetch(API_STREAM.LOOKUP, {+ body: JSON.stringify({ conversation_ids: conversationIds }),+ headers: getJsonHeaders(),+ method: 'POST'+ });++ if (!resp.ok) {+ throw new ApiError(`Stream lookup failed with HTTP ${resp.status}`, resp.status);+ }++ const body = (await resp.json()) as unknown;++ if (!Array.isArray(body)) {+ throw new Error('Stream lookup returned a non-array response');+ }++ return body as ApiStreamSession[];+ }++ /**+ * Normalizes an array of messages (database or already-API-shaped) into+ * API chat message data, converting DB messages and dropping empty system+ * messages. Shared by sendMessage, preEncode and the agentic flow.+ */+ static async normalizeMessagesForApi(+ messages: ApiChatMessageData[] | (DatabaseMessage & { extra?: DatabaseMessageExtra[] })[]+ ): Promise<ApiChatMessageData[]> {+ return (+ await Promise.all(+ messages.map((msg) => {+ if ('id' in msg && 'convId' in msg && 'timestamp' in msg) {+ return ChatService.convertDbMessageToApiChatMessageData(+ msg as DatabaseMessage & { extra?: DatabaseMessageExtra[] }+ );+ }++ return msg as ApiChatMessageData;+ })+ )+ ).filter((msg: { role: ChatRole; content: string | ApiChatMessageContentPart[] }) => {+ // Filter out empty system messages+ if (msg.role === MessageRole.SYSTEM) {+ const content = typeof msg.content === 'string' ? msg.content : '';++ return content.trim().length > 0;+ }++ return true;+ });+ }++ /**+ * Fire-and-forget request to pre-encode the conversation in the server's KV cache.+ * Re-submits the full conversation with n_predict=0 so the server processes the prompt+ * without generating tokens, warming the cache for the next turn.+ */+ static async preEncode(+ messages: ApiChatMessageData[] | (DatabaseMessage & { extra?: DatabaseMessageExtra[] })[],+ model?: string | null,+ excludeReasoning?: boolean,+ signal?: AbortSignal+ ): Promise<void> {+ const normalizedMessages: ApiChatMessageData[] =+ await ChatService.normalizeMessagesForApi(messages);+ const requestBody: Record<string, unknown> = {+ messages: normalizedMessages.map((msg: ApiChatMessageData) => {+ const mapped: Record<string, unknown> = {+ content: excludeReasoning ? ChatService.stripReasoningContent(msg.content) : msg.content,+ role: msg.role,+ tool_call_id: msg.tool_call_id,+ tool_calls: msg.tool_calls+ };++ if (!excludeReasoning && msg.reasoning_content) {mapped.reasoning_content = msg.reasoning_content;}@@ -785,780 +882,500 @@ export class ChatService {}}- /**- *- *- * Streaming- *- *- */-- /**- * Handles streaming response from the chat completion API- * @param response - The Response object from the fetch request- * @param onChunk - Optional callback invoked for each content chunk received- * @param onComplete - Optional callback invoked when the stream is complete with full response- * @param onError - Optional callback invoked if an error occurs during streaming- * @param onReasoningChunk - Optional callback invoked for each reasoning content chunk- * @param conversationId - Optional conversation ID for per-conversation state tracking- * @returns {Promise<void>} Promise that resolves when streaming is complete- * @throws {Error} if the stream cannot be read or parsed- */- static async handleStreamResponse(- response: Response,- onChunk?: (chunk: string) => void,- onComplete?: (- response: string,- reasoningContent?: string,- timings?: ChatMessageTimings,- toolCalls?: string- ) => void,- onError?: (error: Error) => void,- onReasoningChunk?: (chunk: string) => void,- onToolCallChunk?: (chunk: string) => void,- onModel?: (model: string) => void,- onCompletionId?: (id: string) => void,- onTimings?: (timings?: ChatMessageTimings, promptProgress?: ChatMessagePromptProgress) => void,- conversationId?: string,- abortSignal?: AbortSignal,- onConnectionState?: (state: StreamConnectionState) => void,- streamModel?: string | null- ): Promise<void> {- let reader = response.body?.getReader();+ // probe the resume route status without consuming the stream: the SSE route has no HEAD,+ // so issue the GET and abort it right after the status line. 0 on network error+ static async probeResumeStatus(streamId: string): Promise<number> {+ if (!streamId) return 0;- if (!reader) {- throw new Error('No response body');- }+ const ac = new AbortController();- // bytesParsed is the absolute server side buffer offset of the next byte to parse- // segmentStartOffset is the absolute offset where the current reader started, reset on resume- // segmentBytesRead is wire bytes read by the current reader- let bytesParsed = 0;- let segmentStartOffset = 0;- let segmentBytesRead = 0;- let lastByteAt = Date.now();- // each resume must produce at least one byte to be retried again- // if a resume returns 200 but yields nothing, we abandon- // since the session has a bounded size, the total number of retries is bounded by construction- let madeProgress = true;+ try {+ const resp = await fetch(ChatService.buildStreamUrl(streamId, 0), {+ headers: getAuthHeaders(),+ signal: ac.signal+ });- const encoder = new TextEncoder();+ ac.abort();- if (conversationId) {- ChatService.saveStreamState(conversationId, 0, streamModel);+ return resp.status;+ } catch {+ return 0;}+ }- onConnectionState?.(StreamConnectionState.STREAMING);+ static async resumeStream(+ conversationId: string,+ signal?: AbortSignal,+ model?: string | null+ ): Promise<Response | null> {+ if (!conversationId) return null;- let decoder = new TextDecoder();- let aggregatedContent = '';- let fullReasoningContent = '';- let aggregatedToolCalls: ApiChatCompletionToolCall[] = [];- let lastTimings: ChatMessageTimings | undefined;- let streamFinished = false;- let modelEmitted = false;- let idEmitted = false;- let toolCallIndexOffset = 0;- let hasOpenToolCallBatch = false;+ const state = ChatService.getStreamState(conversationId);+ const from = state?.bytesReceived ?? 0;+ const id = streamIdentity(conversationId, model);+ const url = ChatService.buildStreamUrl(id, from);- const finalizeOpenToolCallBatch = () => {- if (!hasOpenToolCallBatch) {- return;- }+ return await fetch(url, { headers: getAuthHeaders(), method: 'GET', signal });+ }- toolCallIndexOffset = aggregatedToolCalls.length;- hasOpenToolCallBatch = false;- };- const processToolCallDelta = (toolCalls?: ApiChatCompletionToolCallDelta[]) => {- if (!toolCalls || toolCalls.length === 0) {- return;- }+ /**+ * Rebuild the stream identity for a resume. The model persisted at POST time wins, including a+ * stored null which means the POST carried no explicit model so the identity stays the bare conv+ * id. Only fall back to the caller supplied current model when nothing was persisted.+ */+ static resumeStreamIdentity(+ conversationId: string,+ state: ResumableStreamState | null,+ fallbackModel: string | null+ ): string {+ const model = state && state.model !== undefined ? state.model : fallbackModel;- aggregatedToolCalls = ChatService.mergeToolCallDeltas(- aggregatedToolCalls,- toolCalls,- toolCallIndexOffset- );-- if (aggregatedToolCalls.length === 0) {- return;- }-- hasOpenToolCallBatch = true;+ return streamIdentity(conversationId, model);+ }- const serializedToolCalls = JSON.stringify(aggregatedToolCalls);+ // persist the running byte count and the frozen model for a conversation, a later visit+ // resumes the SSE replay at the right offset under the same conv::model+ // identity. Writes immediately; the per-chunk read loop uses the throttled+ // variant instead.+ static saveStreamState(+ conversationId: string,+ bytesReceived: number,+ model?: string | null+ ): void {+ if (!conversationId) return;- if (import.meta.env.DEV && import.meta.env.VITE_DEBUG) {- console.log('[ChatService] Aggregated tool calls:', serializedToolCalls);- }+ ChatService.writeStreamState(conversationId, bytesReceived, model);+ // record the write so a throttled save landing inside the interval+ // holds its value pending instead of re-writing+ ChatService.streamStateSaveTrackers.set(conversationId, {+ lastSavedAt: Date.now(),+ model: model ?? null,+ pendingBytes: null+ });+ }- if (!serializedToolCalls) {- return;- }+ // throttled variant for the per-chunk read loop: writes at most once per+ // conversation per STREAM_STATE_SAVE_INTERVAL_MS, holding the latest value+ // pending until the interval elapses or flushStreamState() forces it out+ static saveStreamStateThrottled(+ conversationId: string,+ bytesReceived: number,+ model?: string | null+ ): void {+ if (!conversationId) return;- if (!abortSignal?.aborted) {- onToolCallChunk?.(serializedToolCalls);- }+ const tracker = ChatService.streamStateSaveTrackers.get(conversationId) ?? {+ lastSavedAt: 0,+ model: null,+ pendingBytes: null};- const onVisibilityChange = () => {- if (typeof document === 'undefined') return;- if (document.visibilityState !== 'visible') return;-- if (streamFinished) return;+ tracker.model = model ?? null;- if (!conversationId) return;+ if (Date.now() - tracker.lastSavedAt >= ChatService.STREAM_STATE_SAVE_INTERVAL_MS) {+ tracker.lastSavedAt = Date.now();+ tracker.pendingBytes = null;+ ChatService.writeStreamState(conversationId, bytesReceived, model);+ } else {+ tracker.pendingBytes = bytesReceived;+ }- // the bytes have been quiet for too long, the OS likely killed the socket- // kicking the reader unblocks reader.read with done=true so the outer loop can resume- if (Date.now() - lastByteAt > STREAM_VISIBILITY_KICK_MS) {- reader!.cancel().catch(() => {});- }- };+ ChatService.streamStateSaveTrackers.set(conversationId, tracker);+ }- if (typeof document !== 'undefined') {- document.addEventListener('visibilitychange', onVisibilityChange);+ /**+ * Pick the running session to splice into when discoverActiveStream lists candidates for a+ * conversation. Finalized sessions are not candidates: their final content was already written+ * to the DB by the original onComplete handler, so attaching to them would replay a buffer that+ * may not match what the DB holds. A continue session's buffer holds only the appended deltas,+ * not the pre continue prefix, so replaying it as a fresh generation would erase the original.+ *+ * Among running sessions we tie break on the most recent started_at, which covers the case of+ * multiple inferences left running on the same conversation.+ */+ static selectActiveStream(+ sessions: ApiStreamSession[] | null | undefined+ ): ApiStreamSession | null {+ if (!Array.isArray(sessions) || sessions.length === 0) {+ return null;}- try {- let chunk = '';+ const running = sessions.filter((s) => !s.is_done);- // outer loop drives the resume cycle, swaps reader on premature end of stream- while (true) {- while (true) {- if (abortSignal?.aborted) break;+ if (running.length === 0) {+ return null;+ }- let done: boolean;- let value: Uint8Array | undefined;+ return running.reduce((best, cur) => (cur.started_at > best.started_at ? cur : best));+ }- try {- const r = await reader.read();+ /**+ * Sends a chat completion request to the llama-server.+ * Supports both streaming and non-streaming responses with comprehensive parameter configuration.+ * Automatically converts database messages with attachments to the appropriate API format.+ *+ * @param messages - Array of chat messages to send to the API (supports both ApiChatMessageData and DatabaseMessage with attachments)+ * @param options - Configuration options for the chat completion request. See `SettingsChatServiceOptions` type for details.+ * @returns {Promise<string | void>} that resolves to the complete response string (non-streaming) or void (streaming)+ * @throws {Error} if the request fails or is aborted+ */+ static async sendMessage(+ messages: ApiChatMessageData[] | (DatabaseMessage & { extra?: DatabaseMessageExtra[] })[],+ options: SettingsChatServiceOptions = {},+ conversationId?: string,+ signal?: AbortSignal+ ): Promise<string | void> {+ const {+ backend_sampling,+ continueFinalMessage,+ custom,+ // Config options+ disableReasoningParsing,+ dry_allowed_length,+ dry_base,+ dry_multiplier,+ dry_penalty_last_n,+ dynatemp_exponent,+ // Sampling parameters+ dynatemp_range,+ enableThinking,+ excludeReasoningFromContext,+ frequency_penalty,+ max_tokens,+ min_p,+ onChunk,+ onComplete,+ onCompletionId,+ onConnectionState,+ onError,+ onModel,+ onReasoningChunk,+ onTimings,+ onToolCallChunk,+ presence_penalty,+ reasoningEffort,+ // Penalty parameters+ repeat_last_n,+ repeat_penalty,+ // Other parameters+ samplers,+ stream,+ // Generation parameters+ temperature,+ timings_per_token,+ // Tools for function calling+ tools,+ top_k,+ top_p,+ typ_p,+ xtc_probability,+ xtc_threshold+ } = options;+ const normalizedMessages: ApiChatMessageData[] =+ await ChatService.normalizeMessagesForApi(messages);- done = r.done;- value = r.value;- } catch (readErr) {- // reader.read() rejects with TypeError when the underlying connection drops- // instead of just resolving with done=true. treat it like done so the outer- // loop swaps reader via the resume path- if (isAbortError(readErr)) {- throw readErr;+ // Filter out image attachments if the model doesn't support vision+ if (options.model && !modelsStore.props.modelSupportsVision(options.model)) {+ normalizedMessages.forEach((msg) => {+ if (Array.isArray(msg.content)) {+ msg.content = msg.content.filter((part: ApiChatMessageContentPart) => {+ if (part.type === ContentPartType.IMAGE_URL) {+ console.info(+ `[ChatService] Skipping image attachment in message history (model "${options.model}" does not support vision)`+ );++ return false;}- console.warn('reader.read() rejected, treating as premature end:', readErr);- done = true;- value = undefined;+ return true;+ });++ // If only text remains and it's a single part, simplify to string+ if (+ msg.content.length === 1 &&+ msg.content[0].type === ContentPartType.TEXT &&+ typeof msg.content[0].text === 'string'+ ) {+ msg.content = msg.content[0].text;}+ }+ });+ }- if (done) break;+ const requestBody: ApiChatCompletionRequest = {+ messages: normalizedMessages.map((msg: ApiChatMessageData) => {+ const mapped: ApiChatCompletionRequest['messages'][0] = {+ content: msg.content,+ role: msg.role,+ tool_call_id: msg.tool_call_id,+ tool_calls: msg.tool_calls+ };- if (abortSignal?.aborted) break;+ // Include reasoning_content from the dedicated field+ if (!excludeReasoningFromContext && msg.reasoning_content) {+ mapped.reasoning_content = msg.reasoning_content;+ }- if (value && value.byteLength > 0) {- segmentBytesRead += value.byteLength;- lastByteAt = Date.now();+ return mapped;+ }),+ return_progress: stream ? true : undefined,+ sse_ping_interval: stream ? 1 : undefined,+ stream,+ tools: tools && tools.length > 0 ? tools : undefined+ };- if (!madeProgress) {- madeProgress = true;- onConnectionState?.(StreamConnectionState.STREAMING);- }- }+ // Include model in request if provided (required in ROUTER mode)+ if (options.model) {+ requestBody.model = options.model;+ }- chunk += decoder.decode(value, { stream: true });- const lines = chunk.split(SSE_LINE_SEPARATOR);+ requestBody.reasoning_format = disableReasoningParsing+ ? ReasoningFormat.NONE+ : ReasoningFormat.AUTO;- chunk = lines.pop() || '';+ const reasoningBudgetTokens =+ enableThinking && reasoningEffort ? (REASONING_EFFORT_TOKENS[reasoningEffort] ?? -1) : -1;- // the persisted offset must point right after the last fully parsed line,- // the trailing `chunk` is partial bytes still waiting for a newline- if (conversationId) {- const tailBytes = encoder.encode(chunk).byteLength;+ // an explicit user choice injects the kwarg, otherwise it is omitted so+ // the server default applies (--reasoning flag or chat template)+ if (enableThinking !== undefined) {+ requestBody.chat_template_kwargs = {+ ...(requestBody.chat_template_kwargs ?? {}),+ enable_thinking: enableThinking+ };+ }- bytesParsed = segmentStartOffset + segmentBytesRead - tailBytes;- ChatService.saveStreamState(conversationId, bytesParsed, streamModel);- }+ if (reasoningBudgetTokens >= 0) {+ requestBody.thinking_budget_tokens = reasoningBudgetTokens;+ }- for (const line of lines) {- if (abortSignal?.aborted) break;+ // arms the budget sampler so reasoning can be ended at runtime via the control endpoint+ requestBody.reasoning_control = true;- if (line.startsWith(SSE_DATA_PREFIX)) {- const data = line.slice(SSE_DATA_PREFIX.length).trim();+ if (continueFinalMessage) {+ requestBody.continue_final_message = true;+ requestBody.add_generation_prompt = false;+ }- if (data === SSE_DONE_MARKER) {- streamFinished = true;+ if (temperature !== undefined) requestBody.temperature = temperature;- continue;- }+ if (max_tokens !== undefined) {+ // Set max_tokens to -1 (infinite) when explicitly configured as 0 or null+ requestBody.max_tokens = max_tokens !== null && max_tokens !== 0 ? max_tokens : -1;+ }- try {- const parsed: ApiChatCompletionStreamChunk = JSON.parse(data);- const choice = parsed.choices?.[0];- const content = choice?.delta?.content;- const reasoningContent = choice?.delta?.reasoning_content;- const toolCalls = choice?.delta?.tool_calls;- const timings = parsed.timings;- const promptProgress = parsed.prompt_progress;- const chunkModel = ChatService.extractModelName(parsed);-- if (chunkModel && !modelEmitted) {- modelEmitted = true;- onModel?.(chunkModel);- }-- if (parsed.id && !idEmitted) {- idEmitted = true;- onCompletionId?.(parsed.id);- }+ if (dynatemp_range !== undefined) requestBody.dynatemp_range = dynatemp_range;- if (promptProgress) {- ChatService.notifyTimings(undefined, promptProgress, onTimings);- }+ if (dynatemp_exponent !== undefined) requestBody.dynatemp_exponent = dynatemp_exponent;- if (timings) {- ChatService.notifyTimings(timings, promptProgress, onTimings);- lastTimings = timings;- }+ if (top_k !== undefined) requestBody.top_k = top_k;- if (content) {- finalizeOpenToolCallBatch();- aggregatedContent += content;+ if (top_p !== undefined) requestBody.top_p = top_p;- if (!abortSignal?.aborted) {- onChunk?.(content);- }- }+ if (min_p !== undefined) requestBody.min_p = min_p;- if (reasoningContent) {- finalizeOpenToolCallBatch();- fullReasoningContent += reasoningContent;+ if (xtc_probability !== undefined) requestBody.xtc_probability = xtc_probability;- if (!abortSignal?.aborted) {- onReasoningChunk?.(reasoningContent);- }- }+ if (xtc_threshold !== undefined) requestBody.xtc_threshold = xtc_threshold;- processToolCallDelta(toolCalls);- } catch (e) {- console.error('Error parsing JSON chunk:', e);- }- }- }+ if (typ_p !== undefined) requestBody.typ_p = typ_p;- if (abortSignal?.aborted) break;+ if (repeat_last_n !== undefined) requestBody.repeat_last_n = repeat_last_n;- if (streamFinished) break;- }+ if (repeat_penalty !== undefined) requestBody.repeat_penalty = repeat_penalty;- // inner reader done, decide whether to try a resume- if (abortSignal?.aborted) break;+ if (presence_penalty !== undefined) requestBody.presence_penalty = presence_penalty;- if (streamFinished) break;+ if (frequency_penalty !== undefined) requestBody.frequency_penalty = frequency_penalty;- if (!conversationId) break;+ if (dry_multiplier !== undefined) requestBody.dry_multiplier = dry_multiplier;- if (!madeProgress) {- onConnectionState?.(StreamConnectionState.LOST);- onError?.(new Error('Stream resume produced no new bytes, giving up'));+ if (dry_base !== undefined) requestBody.dry_base = dry_base;- break;- }+ if (dry_allowed_length !== undefined) requestBody.dry_allowed_length = dry_allowed_length;- onConnectionState?.(StreamConnectionState.RESUMING);- madeProgress = false;+ if (dry_penalty_last_n !== undefined) requestBody.dry_penalty_last_n = dry_penalty_last_n;- // the server resends starting at bytesParsed, discard any partial line we held, it- // will be retransmitted from a clean line boundary. reuse the frozen model, not the- // live dropdown- const resumeResp = await ChatService.resumeStream(- conversationId,- abortSignal,- streamModel- ).catch(() => null);+ if (samplers !== undefined) {+ requestBody.samplers =+ typeof samplers === 'string'+ ? samplers.split(';').filter((s: string) => s.trim())+ : samplers;+ }- // an abort landing during the resume request is intentional, not a lost connection- if (abortSignal?.aborted) break;+ if (backend_sampling !== undefined) requestBody.backend_sampling = backend_sampling;- if (!resumeResp || resumeResp.status !== 200) {- onConnectionState?.(StreamConnectionState.LOST);- onError?.(new Error('Stream connection lost and could not be resumed'));+ if (timings_per_token !== undefined) requestBody.timings_per_token = timings_per_token;- break;- }+ if (custom) {+ try {+ const customParams = typeof custom === 'string' ? JSON.parse(custom) : custom;- const newReader = resumeResp.body?.getReader();+ Object.assign(requestBody, customParams);+ } catch (error) {+ console.warn('Failed to parse custom parameters:', error);+ }+ }- if (!newReader) break;+ try {+ const headers: Record<string, string> = { ...getJsonHeaders() };- try {- reader.releaseLock();- } catch {- /* ignore */- }- reader = newReader;- decoder = new TextDecoder();- chunk = '';- segmentStartOffset = bytesParsed;- segmentBytesRead = 0;- lastByteAt = Date.now();+ // tag streaming requests with the conversation id, this single header is the opt in for the+ // server side replay buffer and powers discoverActiveStream on tab reopen. with an explicit+ // model the ::model suffix keeps the per model session distinct+ if (stream && conversationId) {+ headers[HEADERS.X_CONVERSATION_ID_HEADER] = streamIdentity(conversationId, options.model);+ // persist the pending stream before the fetch: a reload during the model load or+ // the prompt processing must still find its way back to the session once it exists+ ChatService.saveStreamState(conversationId, 0, options.model ?? null);}- if (abortSignal?.aborted) return;-- if (streamFinished) {- finalizeOpenToolCallBatch();+ const response = await fetch(API_CHAT.COMPLETIONS, {+ body: JSON.stringify(requestBody),+ headers,+ method: 'POST',+ signal+ });+ if (!response.ok) {+ // a rejected request (including one cancelled by a stop during the model load)+ // leaves nothing to resumeif (conversationId) {ChatService.clearStreamState(conversationId);}- const finalToolCalls =- aggregatedToolCalls.length > 0 ? JSON.stringify(aggregatedToolCalls) : undefined;+ const error = await ChatService.parseErrorResponse(response);- onComplete?.(- aggregatedContent,- fullReasoningContent || undefined,- lastTimings,- finalToolCalls+ if (onError) {+ onError(error);+ }++ throw error;+ }++ if (stream) {+ await ChatService.handleStreamResponse(+ response,+ onChunk,+ onComplete,+ onError,+ onReasoningChunk,+ onToolCallChunk,+ onModel,+ onCompletionId,+ onTimings,+ conversationId,+ signal,+ onConnectionState,+ options.model+ );++ return;+ } else {+ return ChatService.handleNonStreamResponse(+ response,+ onComplete,+ onError,+ onToolCallChunk,+ onModel);}} catch (error) {- const err = error instanceof Error ? error : new Error('Stream error');+ if (isAbortError(error)) {+ console.log('Chat completion request was aborted');- onError?.(err);+ return;+ }- throw err;- } finally {- if (typeof document !== 'undefined') {- document.removeEventListener('visibilitychange', onVisibilityChange);+ let userFriendlyError: Error;++ if (error instanceof Error) {+ if (error.name === 'TypeError' && error.message.includes('fetch')) {+ userFriendlyError = new Error(+ 'Unable to connect to server - please check if the server is running'+ );+ userFriendlyError.name = 'NetworkError';+ } else if (error.message.includes('ECONNREFUSED')) {+ userFriendlyError = new Error('Connection refused - server may be offline');+ userFriendlyError.name = 'NetworkError';+ } else if (error.message.includes('ETIMEDOUT')) {+ userFriendlyError = new Error('Request timed out - the server took too long to respond');+ userFriendlyError.name = 'TimeoutError';+ } else {+ userFriendlyError = error;+ }+ } else {+ userFriendlyError = new Error('Unknown error occurred while sending message');}- try {- reader.releaseLock();- } catch {- /* ignore */+ console.error('Error in sendMessage:', error);++ if (onError) {+ onError(userFriendlyError);}++ throw userFriendlyError;}}/**- * Handles non-streaming response from the chat completion API.- * Parses the JSON response and extracts the generated content.- *- * @param response - The fetch Response object containing the JSON data- * @param onComplete - Optional callback invoked when response is successfully parsed- * @param onError - Optional callback invoked if an error occurs while parsing- * @returns {Promise<string>} Promise that resolves to the generated content string- * @throws {Error} if the response cannot be parsed or is malformed+ * Ends the current reasoning block of a running completion, targeted by its+ * chat completion id (streamed back as `id`). Matching the completion rather+ * than a slot index avoids a TOCTOU: a finished completion simply matches+ * nothing server side. The model is carried so the router forwards to the+ * right child, single model ignores it. Returns true on success.*/- private static async handleNonStreamResponse(- response: Response,- onComplete?: (- response: string,- reasoningContent?: string,- timings?: ChatMessageTimings,- toolCalls?: string- ) => void,- onError?: (error: Error) => void,- onToolCallChunk?: (chunk: string) => void,- onModel?: (model: string) => void- ): Promise<string> {- try {- const responseText = await response.text();-- if (!responseText.trim()) {- const noResponseError = new Error('No response received from server. Please try again.');+ static async stopReasoning(completionId: string, model?: string | null): Promise<boolean> {+ if (!completionId) {+ console.error(+ 'stopReasoning: no completion id for the active message, cannot target the running completion'+ );- throw noResponseError;- }+ return false;+ }- const data: ApiChatCompletionResponse = JSON.parse(responseText);- const responseModel = ChatService.extractModelName(data);-- if (responseModel) {- onModel?.(responseModel);- }-- const content = data.choices[0]?.message?.content || '';- const reasoningContent = data.choices[0]?.message?.reasoning_content;- const toolCalls = data.choices[0]?.message?.tool_calls;-- let serializedToolCalls: string | undefined;-- if (toolCalls && toolCalls.length > 0) {- const mergedToolCalls = ChatService.mergeToolCallDeltas([], toolCalls);-- if (mergedToolCalls.length > 0) {- serializedToolCalls = JSON.stringify(mergedToolCalls);-- if (serializedToolCalls) {- onToolCallChunk?.(serializedToolCalls);- }- }- }-- if (!content.trim() && !serializedToolCalls) {- const noResponseError = new Error('No response received from server. Please try again.');-- throw noResponseError;- }-- onComplete?.(content, reasoningContent, undefined, serializedToolCalls);-- return content;- } catch (error) {- const err = error instanceof Error ? error : new Error('Parse error');-- onError?.(err);-- throw err;- }- }-- /**- * Merges tool call deltas into an existing array of tool calls.- * Handles both existing and new tool calls, updating existing ones and adding new ones.- *- * @param existing - The existing array of tool calls to merge into- * @param deltas - The array of tool call deltas to merge- * @param indexOffset - Optional offset to apply to the index of new tool calls- * @returns {ApiChatCompletionToolCall[]} The merged array of tool calls- */- private static mergeToolCallDeltas(- existing: ApiChatCompletionToolCall[],- deltas: ApiChatCompletionToolCallDelta[],- indexOffset = 0- ): ApiChatCompletionToolCall[] {- const result = existing.map((call) => ({- ...call,- function: call.function ? { ...call.function } : undefined- }));-- for (const delta of deltas) {- const index =- typeof delta.index === 'number' && delta.index >= 0- ? delta.index + indexOffset- : result.length;-- while (result.length <= index) {- result.push({ function: undefined });- }-- const target = result[index]!;-- if (delta.id) {- target.id = delta.id;- }-- if (delta.type) {- target.type = delta.type;- }-- if (delta.function) {- const fn = target.function ? { ...target.function } : {};-- if (delta.function.name) {- fn.name = delta.function.name;- }-- if (delta.function.arguments) {- fn.arguments = (fn.arguments ?? '') + delta.function.arguments;- }-- target.function = fn;- }- }-- return result;- }-- /**- *- *- * Conversion- *- *- */-- /**- * Converts a database message with attachments to API chat message format.- * Processes various attachment types (images, text files, PDFs) and formats them- * as content parts suitable for the chat completion API.- *- * @param message - Database message object with optional extra attachments- * @param message.content - The text content of the message- * @param message.role - The role of the message sender (user, assistant, system)- * @param message.extra - Optional array of message attachments (images, files, etc.)- * @returns {ApiChatMessageData} object formatted for the chat completion API- * @static- */- static async convertDbMessageToApiChatMessageData(- message: DatabaseMessage & { extra?: DatabaseMessageExtra[] }- ): Promise<ApiChatMessageData> {- // Handle tool result messages (role: 'tool')- if (message.role === MessageRole.TOOL && message.toolCallId) {- return {- content: message.content,- role: MessageRole.TOOL,- tool_call_id: message.toolCallId- };- }-- // Parse tool calls for assistant messages- let toolCalls: ApiChatCompletionToolCall[] | undefined;-- if (message.toolCalls) {- try {- toolCalls = JSON.parse(message.toolCalls);- } catch {- // Ignore parse errors for malformed tool calls- }- }-- if (!message.extra || message.extra.length === 0) {- const result: ApiChatMessageData = {- content: message.content,- role: message.role as MessageRole- };-- if (message.reasoningContent) {- result.reasoning_content = message.reasoningContent;- }-- if (toolCalls && toolCalls.length > 0) {- result.tool_calls = toolCalls;- }-- return result;- }-- const contentParts: ApiChatMessageContentPart[] = [];- const textFiles = message.extra.filter(- (extra: DatabaseMessageExtra): extra is DatabaseMessageExtraTextFile =>- extra.type === AttachmentType.TEXT- );-- for (const textFile of textFiles) {- contentParts.push({- text: formatAttachmentText(AttachmentLabel.FILE, textFile.name, textFile.content),- type: ContentPartType.TEXT- });- }-- // Handle legacy 'context' type from the old UI (pasted content)- const legacyContextFiles = message.extra.filter(- (extra: DatabaseMessageExtra): extra is DatabaseMessageExtraLegacyContext =>- extra.type === AttachmentType.LEGACY_CONTEXT- );-- for (const legacyContextFile of legacyContextFiles) {- contentParts.push({- text: formatAttachmentText(- AttachmentLabel.FILE,- legacyContextFile.name,- legacyContextFile.content- ),- type: ContentPartType.TEXT- });- }-- const imageFiles = message.extra.filter(- (extra: DatabaseMessageExtra): extra is DatabaseMessageExtraImageFile =>- extra.type === AttachmentType.IMAGE- );-- for (const image of imageFiles) {- const maxImageResolution = settingsStore.getConfig(SETTINGS_KEYS.MAX_IMAGE_RESOLUTION);- // Caps the resolution and bakes the jpeg exif orientation in one pass,- // untouched images pass through as is- const base64Url = await capImageDataURLSize(image.base64Url, maxImageResolution);-- contentParts.push({- image_url: { url: base64Url },- type: ContentPartType.IMAGE_URL- });- }-- const audioFiles = message.extra.filter(- (extra: DatabaseMessageExtra): extra is DatabaseMessageExtraAudioFile =>- extra.type === AttachmentType.AUDIO- );-- for (const audio of audioFiles) {- contentParts.push({- input_audio: {- data: audio.base64Data,- format: getAudioInputFormat(audio.mimeType)- },- type: ContentPartType.INPUT_AUDIO- });- }-- if (message.content) {- contentParts.push({- text: message.content,- type: ContentPartType.TEXT- });- }-- const videoFiles = message.extra.filter(- (extra: DatabaseMessageExtra): extra is DatabaseMessageExtraVideoFile =>- extra.type === AttachmentType.VIDEO- );-- for (const video of videoFiles) {- contentParts.push({- input_video: {- data: video.base64Data,- format: video.mimeType.includes('mp4')- ? 'mp4'- : video.mimeType.includes('ogg')- ? 'ogg'- : 'auto'- },- type: ContentPartType.INPUT_VIDEO- });- }-- const pdfFiles = message.extra.filter(- (extra: DatabaseMessageExtra): extra is DatabaseMessageExtraPdfFile =>- extra.type === AttachmentType.PDF- );-- for (const pdfFile of pdfFiles) {- if (pdfFile.processedAsImages && pdfFile.images) {- for (let i = 0; i < pdfFile.images.length; i++) {- contentParts.push({- image_url: { url: pdfFile.images[i] },- type: ContentPartType.IMAGE_URL- });- }- } else {- contentParts.push({- text: formatAttachmentText(AttachmentLabel.PDF_FILE, pdfFile.name, pdfFile.content),- type: ContentPartType.TEXT- });- }- }-- const mcpPrompts = message.extra.filter(- (extra: DatabaseMessageExtra): extra is DatabaseMessageExtraMcpPrompt =>- extra.type === AttachmentType.MCP_PROMPT- );-- for (const mcpPrompt of mcpPrompts) {- contentParts.push({- text: formatAttachmentText(- AttachmentLabel.MCP_PROMPT,- mcpPrompt.name,- mcpPrompt.content,- mcpPrompt.serverName- ),- type: ContentPartType.TEXT- });- }-- const mcpResources = message.extra.filter(- (extra: DatabaseMessageExtra): extra is DatabaseMessageExtraMcpResource =>- extra.type === AttachmentType.MCP_RESOURCE- );-- for (const mcpResource of mcpResources) {- contentParts.push({- text: formatAttachmentText(- AttachmentLabel.MCP_RESOURCE,- mcpResource.name,- mcpResource.content,- mcpResource.serverName- ),- type: ContentPartType.TEXT- });- }-- const result: ApiChatMessageData = {- content: contentParts,- role: message.role as MessageRole+ const body: Record<string, unknown> = {+ action: CONTROL_ACTION.END_REASONING,+ id: completionId};- if (message.reasoningContent) {- result.reasoning_content = message.reasoningContent;- }-- if (toolCalls && toolCalls.length > 0) {- result.tool_calls = toolCalls;- }-- return result;- }-- /**- *- *- * Utilities- *- *- */-- /**- * Strips legacy inline reasoning content tags from message content.- * Handles both plain string content and multipart content arrays.- */- private static stripReasoningContent(- content: string | ApiChatMessageContentPart[]- ): string | ApiChatMessageContentPart[] {- const stripFromString = (text: string): string =>- text.replace(LEGACY_AGENTIC_REGEX.REASONING_BLOCK, '').trim();-- if (typeof content === 'string') {- return stripFromString(content);- }-- return content.map((part) => {- if (part.type === ContentPartType.TEXT && part.text) {- return { ...part, text: stripFromString(part.text) };- }-- return part;- });- }-- /**- * Parses error response and creates appropriate error with context information- * @param response - HTTP response object- * @returns Promise<Error> - Parsed error with context info if available- */- private static async parseErrorResponse(- response: Response- ): Promise<Error & { contextInfo?: { n_prompt_tokens: number; n_ctx: number } }> {- try {- const errorText = await response.text();- const errorData: ApiErrorResponse = JSON.parse(errorText);- const message = errorData.error?.message || 'Unknown server error';- const error = new Error(message) as Error & {- contextInfo?: { n_prompt_tokens: number; n_ctx: number };- };-- error.name = response.status === 400 ? 'ServerError' : 'HttpError';+ if (model) body.model = model;- if (errorData.error && 'n_prompt_tokens' in errorData.error && 'n_ctx' in errorData.error) {- error.contextInfo = {- n_ctx: errorData.error.n_ctx,- n_prompt_tokens: errorData.error.n_prompt_tokens- };- }+ try {+ const res = await fetch(API_CHAT.CONTROL, {+ body: JSON.stringify(body),+ headers: getJsonHeaders(),+ method: 'POST'+ });+ const data = await res.json().catch(() => null);- return error;- } catch {- const fallback = new Error(- `Server error (${response.status}): ${response.statusText}`- ) as Error & {- contextInfo?: { n_prompt_tokens: number; n_ctx: number };- };+ if (!res.ok || data?.success !== true) {+ console.error('stopReasoning: control request failed', {+ completionId,+ response: data,+ status: res.status+ });- fallback.name = 'HttpError';+ return false;+ }- return fallback;+ return true;+ } catch (error) {+ console.error('stopReasoning: control request threw', { completionId, error });++ return false;}}+ // build the replay route url for a stream identity, from is the resume byte offset, omitted+ // for the cancel route+ private static buildStreamUrl(streamId: string, from?: number): string {+ const query = `${STREAM_QUERY_PARAMS.CONV_ID}=${encodeURIComponent(streamId)}`;+ const offset = from === undefined ? '' : `&${STREAM_QUERY_PARAMS.FROM}=${from}`;++ return `${API_STREAM.BASE}?${query}${offset}`;+ }+/*** Extracts model name from Chat Completions API response data.* Handles various response formats including streaming chunks and final responses.@@ -1614,6 +1431,137 @@ export class ChatService {return undefined;}+ /**+ * Handles non-streaming response from the chat completion API.+ * Parses the JSON response and extracts the generated content.+ *+ * @param response - The fetch Response object containing the JSON data+ * @param onComplete - Optional callback invoked when response is successfully parsed+ * @param onError - Optional callback invoked if an error occurs while parsing+ * @returns {Promise<string>} Promise that resolves to the generated content string+ * @throws {Error} if the response cannot be parsed or is malformed+ */+ private static async handleNonStreamResponse(+ response: Response,+ onComplete?: (+ response: string,+ reasoningContent?: string,+ timings?: ChatMessageTimings,+ toolCalls?: string+ ) => void,+ onError?: (error: Error) => void,+ onToolCallChunk?: (chunk: string) => void,+ onModel?: (model: string) => void+ ): Promise<string> {+ try {+ const responseText = await response.text();++ if (!responseText.trim()) {+ const noResponseError = new Error('No response received from server. Please try again.');++ throw noResponseError;+ }++ const data: ApiChatCompletionResponse = JSON.parse(responseText);+ const responseModel = ChatService.extractModelName(data);++ if (responseModel) {+ onModel?.(responseModel);+ }++ const content = data.choices[0]?.message?.content || '';+ const reasoningContent = data.choices[0]?.message?.reasoning_content;+ const toolCalls = data.choices[0]?.message?.tool_calls;++ let serializedToolCalls: string | undefined;++ if (toolCalls && toolCalls.length > 0) {+ const mergedToolCalls = ChatService.mergeToolCallDeltas([], toolCalls);++ if (mergedToolCalls.length > 0) {+ serializedToolCalls = JSON.stringify(mergedToolCalls);++ if (serializedToolCalls) {+ onToolCallChunk?.(serializedToolCalls);+ }+ }+ }++ if (!content.trim() && !serializedToolCalls) {+ const noResponseError = new Error('No response received from server. Please try again.');++ throw noResponseError;+ }++ onComplete?.(content, reasoningContent, undefined, serializedToolCalls);++ return content;+ } catch (error) {+ const err = error instanceof Error ? error : new Error('Parse error');++ onError?.(err);++ throw err;+ }+ }++ /**+ * Merges tool call deltas into an existing array of tool calls.+ * Handles both existing and new tool calls, updating existing ones and adding new ones.+ *+ * @param existing - The existing array of tool calls to merge into+ * @param deltas - The array of tool call deltas to merge+ * @param indexOffset - Optional offset to apply to the index of new tool calls+ * @returns {ApiChatCompletionToolCall[]} The merged array of tool calls+ */+ private static mergeToolCallDeltas(+ existing: ApiChatCompletionToolCall[],+ deltas: ApiChatCompletionToolCallDelta[],+ indexOffset = 0+ ): ApiChatCompletionToolCall[] {+ const result = existing.map((call) => ({+ ...call,+ function: call.function ? { ...call.function } : undefined+ }));++ for (const delta of deltas) {+ const index =+ typeof delta.index === 'number' && delta.index >= 0+ ? delta.index + indexOffset+ : result.length;++ while (result.length <= index) {+ result.push({ function: undefined });+ }++ const target = result[index]!;++ if (delta.id) {+ target.id = delta.id;+ }++ if (delta.type) {+ target.type = delta.type;+ }++ if (delta.function) {+ const fn = target.function ? { ...target.function } : {};++ if (delta.function.name) {+ fn.name = delta.function.name;+ }++ if (delta.function.arguments) {+ fn.arguments = (fn.arguments ?? '') + delta.function.arguments;+ }++ target.function = fn;+ }+ }++ return result;+ }+/*** Calls the onTimings callback with timing data from streaming response.*@@ -1633,4 +1581,85 @@ export class ChatService {onTimingsCallback(timings, promptProgress);}++ /**+ * Parses error response and creates appropriate error with context information+ * @param response - HTTP response object+ * @returns Promise<Error> - Parsed error with context info if available+ */+ private static async parseErrorResponse(+ response: Response+ ): Promise<Error & { contextInfo?: { n_prompt_tokens: number; n_ctx: number } }> {+ try {+ const errorText = await response.text();+ const errorData: ApiErrorResponse = JSON.parse(errorText);+ const message = errorData.error?.message || 'Unknown server error';+ const error = new Error(message) as Error & {+ contextInfo?: { n_prompt_tokens: number; n_ctx: number };+ };++ error.name = response.status === 400 ? 'ServerError' : 'HttpError';++ if (errorData.error && 'n_prompt_tokens' in errorData.error && 'n_ctx' in errorData.error) {+ error.contextInfo = {+ n_ctx: errorData.error.n_ctx,+ n_prompt_tokens: errorData.error.n_prompt_tokens+ };+ }++ return error;+ } catch {+ const fallback = new Error(+ `Server error (${response.status}): ${response.statusText}`+ ) as Error & {+ contextInfo?: { n_prompt_tokens: number; n_ctx: number };+ };++ fallback.name = 'HttpError';++ return fallback;+ }+ }++ /**+ * Strips legacy inline reasoning content tags from message content.+ * Handles both plain string content and multipart content arrays.+ */+ private static stripReasoningContent(+ content: string | ApiChatMessageContentPart[]+ ): string | ApiChatMessageContentPart[] {+ const stripFromString = (text: string): string =>+ text.replace(LEGACY_AGENTIC_REGEX.REASONING_BLOCK, '').trim();++ if (typeof content === 'string') {+ return stripFromString(content);+ }++ return content.map((part) => {+ if (part.type === ContentPartType.TEXT && part.text) {+ return { ...part, text: stripFromString(part.text) };+ }++ return part;+ });+ }++ // write the resume state straight to localStorage, bypassing the throttle+ private static writeStreamState(+ conversationId: string,+ bytesReceived: number,+ model?: string | null+ ): void {+ try {+ const state: ResumableStreamState = {+ bytesReceived,+ model: model ?? null,+ updatedAt: Date.now()+ };++ localStorage.setItem(streamStorageKey(conversationId), JSON.stringify(state));+ } catch {+ // localStorage may be full or disabled, silently ignore+ }+ }}diff --git a/tools/ui/src/lib/services/conversation-transfer.service.ts b/tools/ui/src/lib/services/conversation-transfer.service.tsindex acef580053..40a09477a3 100644--- a/tools/ui/src/lib/services/conversation-transfer.service.ts+++ b/tools/ui/src/lib/services/conversation-transfer.service.ts@@ -17,103 +17,96 @@ import { strFromU8, strToU8, unzipSync, zipSync } from 'fflate';export class ConversationTransferService {/**- *- *- * JSONL Session Format- *- *+ * Triggers a browser download of the provided exported conversation data+ * @param data - The exported conversation payload (a single conversation with its messages)+ * @param filename - Filename; if omitted, a deterministic name is generated*/+ static downloadConversationFile(data: ExportedConversation, filename?: string): void {+ const { conv: conversation, messages: msgs } = data;- /**- * Serializes a session (a conversation with its messages) as JSONL.- * The first line is the session header (a `SessionRecordType.SESSION` record- * carrying the conversation properties); each subsequent line is a single message.- * @param data - The exported conversation payload- * @returns The JSONL string (one record per line)- */- static serializeSessionToJsonl(data: ExportedConversation): string {- const { conv, messages } = data;- const sessionLine = JSON.stringify({- harness: EXPORT_CONV.HARNESS,- type: SessionRecordType.SESSION,- ...conv- });- const messageLines = messages.map((message: DatabaseMessage) => {- // `toolCalls` is stored as a JSON string; drop it when empty, otherwise parse it.- const { toolCalls, ...rest } = message;- const normalized = toolCalls ? { ...rest, toolCalls: JSON.parse(toolCalls) } : rest;+ if (!conversation) {+ console.error('Invalid data: missing conversation');- return JSON.stringify({ message: normalized, type: SessionRecordType.MESSAGE });- });+ return;+ }- return [sessionLine, ...messageLines].join(NEWLINE);+ const downloadFilename =+ filename ?? ConversationTransferService.generateConversationFilename(conversation, msgs);+ const jsonl = ConversationTransferService.serializeSessionToJsonl(data);+ const blob = new Blob([jsonl], { type: MimeTypeText.JSONL });++ ConversationTransferService.triggerDownload(blob, downloadFilename);}/**- * Parses the JSONL session format produced by {@link serializeSessionToJsonl}.- * A `SessionRecordType.SESSION` line starts a new session; following- * `SessionRecordType.MESSAGE` lines are appended to it. Supports multiple- * sessions in a single file.- * @param text - The JSONL file contents- * @returns The parsed conversations with their messages+ * Triggers a browser download of multiple conversations as a `.zip`, one+ * `.jsonl` file per conversation.+ * @param data - The conversations to export*/- static parseSessionsJsonl(text: string): ExportedConversation[] {- const sessions: ExportedConversation[] = [];-- let current: ExportedConversation | null = null;-- for (const line of text.split(NEWLINE)) {- const trimmed = line.trim();-- if (!trimmed) continue;-- const record = JSON.parse(trimmed);+ static downloadConversationsArchive(data: ExportedConversation[]): void {+ if (data.length === 0) {+ console.error('Invalid data: no conversations to export');- if (record.type === SessionRecordType.SESSION) {- // Drop the discriminator and harness marker; the rest is the conversation.- const conv = { ...record };+ return;+ }- delete conv.type;- delete conv.harness;- current = { conv: conv as DatabaseConversation, messages: [] };- sessions.push(current);- } else if (record.type === SessionRecordType.MESSAGE) {- if (!current) {- throw new Error('Invalid JSONL: message record before any session record');- }+ const usedNames = new Set<string>();+ const files: Record<string, Uint8Array> = {};- const message = record.message as DatabaseMessage;+ for (const session of data) {+ const baseName = ConversationTransferService.generateConversationFilename(+ session.conv,+ session.messages+ );- // `toolCalls` is parsed to an array on export; the DB stores it as a string.- if (message.toolCalls !== undefined && typeof message.toolCalls !== 'string') {- message.toolCalls = JSON.stringify(message.toolCalls);- }+ // Disambiguate any duplicate filenames within the archive.+ let entryName = baseName;+ let suffix = 1;- current.messages.push(message);+ while (usedNames.has(entryName)) {+ entryName = baseName.replace(+ new RegExp(`${FileExtensionText.JSONL}$`),+ `_${suffix++}${FileExtensionText.JSONL}`+ );}- // Ignore unknown record types for forward compatibility.+ usedNames.add(entryName);++ files[entryName] = strToU8(ConversationTransferService.serializeSessionToJsonl(session));}- return sessions;+ const archiveName = `${new Date().toISOString().split(EXPORT_CONV.ISO_DATE_TIME_SEPARATOR)[0]}_conversations${FileExtensionText.ZIP}`;+ const zipped = zipSync(files);+ const blob = new Blob([zipped], { type: MimeTypeApplication.ZIP });++ ConversationTransferService.triggerDownload(blob, archiveName);}/**- * Reports whether the text is the JSONL session format, whose first non-empty- * line is a `SessionRecordType.SESSION` record. A legacy JSON export starts- * with an array or an object that has no such discriminator.- * @param text - The file contents+ * Generates a sanitized filename for a conversation export+ * @param conversation - The conversation metadata+ * @param msgs - Optional array of messages belonging to the conversation+ * @returns The generated filename string*/- private static isSessionsJsonl(text: string): boolean {- const trimmed = text.trimStart();- const lineEnd = trimmed.indexOf(NEWLINE);- const firstLine = lineEnd === -1 ? trimmed : trimmed.slice(0, lineEnd);+ static generateConversationFilename(+ conversation: { id?: string; name?: string },+ msgs?: DatabaseMessage[]+ ): string {+ const conversationName = (conversation.name ?? '').trim().toLowerCase();+ const sanitizedName = conversationName+ .replace(EXPORT_CONV.NON_ALPHANUMERIC_REGEX, EXPORT_CONV.NONALNUM_REPLACEMENT)+ .replace(EXPORT_CONV.MULTIPLE_UNDERSCORE_REGEX, '_')+ .substring(0, EXPORT_CONV.NAME_SUFFIX_MAX_LENGTH);+ // If we have messages, use the timestamp of the newest message+ const referenceDate = msgs?.length+ ? new Date(Math.max(...msgs.map((m) => m.timestamp)))+ : new Date();+ const iso = referenceDate.toISOString().slice(0, EXPORT_CONV.ISO_TIMESTAMP_SLICE);+ const formattedDate = iso+ .replace(EXPORT_CONV.ISO_DATE_TIME_SEPARATOR, EXPORT_CONV.ISO_DATE_TIME_SEPARATOR_REPLACEMENT)+ .replaceAll(EXPORT_CONV.ISO_TIME_SEPARATOR, EXPORT_CONV.ISO_TIME_SEPARATOR_REPLACEMENT);+ const trimmedConvId = conversation.id?.slice(0, EXPORT_CONV.ID_TRIM_LENGTH) ?? '';- try {- return JSON.parse(firstLine).type === SessionRecordType.SESSION;- } catch {- // Not a standalone JSON record, so not the JSONL format.- return false;- }+ return `${formattedDate}_conv_${trimmedConvId}_${sanitizedName}${FileExtensionText.JSONL}`;}/**@@ -162,104 +155,95 @@ export class ConversationTransferService {}/**- *- *- * Downloads- *- *+ * Parses the JSONL session format produced by {@link serializeSessionToJsonl}.+ * A `SessionRecordType.SESSION` line starts a new session; following+ * `SessionRecordType.MESSAGE` lines are appended to it. Supports multiple+ * sessions in a single file.+ * @param text - The JSONL file contents+ * @returns The parsed conversations with their messages*/+ static parseSessionsJsonl(text: string): ExportedConversation[] {+ const sessions: ExportedConversation[] = [];- /**- * Generates a sanitized filename for a conversation export- * @param conversation - The conversation metadata- * @param msgs - Optional array of messages belonging to the conversation- * @returns The generated filename string- */- static generateConversationFilename(- conversation: { id?: string; name?: string },- msgs?: DatabaseMessage[]- ): string {- const conversationName = (conversation.name ?? '').trim().toLowerCase();- const sanitizedName = conversationName- .replace(EXPORT_CONV.NON_ALPHANUMERIC_REGEX, EXPORT_CONV.NONALNUM_REPLACEMENT)- .replace(EXPORT_CONV.MULTIPLE_UNDERSCORE_REGEX, '_')- .substring(0, EXPORT_CONV.NAME_SUFFIX_MAX_LENGTH);- // If we have messages, use the timestamp of the newest message- const referenceDate = msgs?.length- ? new Date(Math.max(...msgs.map((m) => m.timestamp)))- : new Date();- const iso = referenceDate.toISOString().slice(0, EXPORT_CONV.ISO_TIMESTAMP_SLICE);- const formattedDate = iso- .replace(EXPORT_CONV.ISO_DATE_TIME_SEPARATOR, EXPORT_CONV.ISO_DATE_TIME_SEPARATOR_REPLACEMENT)- .replaceAll(EXPORT_CONV.ISO_TIME_SEPARATOR, EXPORT_CONV.ISO_TIME_SEPARATOR_REPLACEMENT);- const trimmedConvId = conversation.id?.slice(0, EXPORT_CONV.ID_TRIM_LENGTH) ?? '';+ let current: ExportedConversation | null = null;- return `${formattedDate}_conv_${trimmedConvId}_${sanitizedName}${FileExtensionText.JSONL}`;- }+ for (const line of text.split(NEWLINE)) {+ const trimmed = line.trim();- /**- * Triggers a browser download of the provided exported conversation data- * @param data - The exported conversation payload (a single conversation with its messages)- * @param filename - Filename; if omitted, a deterministic name is generated- */- static downloadConversationFile(data: ExportedConversation, filename?: string): void {- const { conv: conversation, messages: msgs } = data;+ if (!trimmed) continue;- if (!conversation) {- console.error('Invalid data: missing conversation');+ const record = JSON.parse(trimmed);- return;- }+ if (record.type === SessionRecordType.SESSION) {+ // Drop the discriminator and harness marker; the rest is the conversation.+ const conv = { ...record };- const downloadFilename =- filename ?? ConversationTransferService.generateConversationFilename(conversation, msgs);- const jsonl = ConversationTransferService.serializeSessionToJsonl(data);- const blob = new Blob([jsonl], { type: MimeTypeText.JSONL });+ delete conv.type;+ delete conv.harness;+ current = { conv: conv as DatabaseConversation, messages: [] };+ sessions.push(current);+ } else if (record.type === SessionRecordType.MESSAGE) {+ if (!current) {+ throw new Error('Invalid JSONL: message record before any session record');+ }- ConversationTransferService.triggerDownload(blob, downloadFilename);- }+ const message = record.message as DatabaseMessage;- /**- * Triggers a browser download of multiple conversations as a `.zip`, one- * `.jsonl` file per conversation.- * @param data - The conversations to export- */- static downloadConversationsArchive(data: ExportedConversation[]): void {- if (data.length === 0) {- console.error('Invalid data: no conversations to export');+ // `toolCalls` is parsed to an array on export; the DB stores it as a string.+ if (message.toolCalls !== undefined && typeof message.toolCalls !== 'string') {+ message.toolCalls = JSON.stringify(message.toolCalls);+ }- return;+ current.messages.push(message);+ }+ // Ignore unknown record types for forward compatibility.}- const usedNames = new Set<string>();- const files: Record<string, Uint8Array> = {};-- for (const session of data) {- const baseName = ConversationTransferService.generateConversationFilename(- session.conv,- session.messages- );+ return sessions;+ }- // Disambiguate any duplicate filenames within the archive.- let entryName = baseName;- let suffix = 1;+ /**+ * Serializes a session (a conversation with its messages) as JSONL.+ * The first line is the session header (a `SessionRecordType.SESSION` record+ * carrying the conversation properties); each subsequent line is a single message.+ * @param data - The exported conversation payload+ * @returns The JSONL string (one record per line)+ */+ static serializeSessionToJsonl(data: ExportedConversation): string {+ const { conv, messages } = data;+ const sessionLine = JSON.stringify({+ harness: EXPORT_CONV.HARNESS,+ type: SessionRecordType.SESSION,+ ...conv+ });+ const messageLines = messages.map((message: DatabaseMessage) => {+ // `toolCalls` is stored as a JSON string; drop it when empty, otherwise parse it.+ const { toolCalls, ...rest } = message;+ const normalized = toolCalls ? { ...rest, toolCalls: JSON.parse(toolCalls) } : rest;- while (usedNames.has(entryName)) {- entryName = baseName.replace(- new RegExp(`${FileExtensionText.JSONL}$`),- `_${suffix++}${FileExtensionText.JSONL}`- );- }- usedNames.add(entryName);+ return JSON.stringify({ message: normalized, type: SessionRecordType.MESSAGE });+ });- files[entryName] = strToU8(ConversationTransferService.serializeSessionToJsonl(session));- }+ return [sessionLine, ...messageLines].join(NEWLINE);+ }- const archiveName = `${new Date().toISOString().split(EXPORT_CONV.ISO_DATE_TIME_SEPARATOR)[0]}_conversations${FileExtensionText.ZIP}`;- const zipped = zipSync(files);- const blob = new Blob([zipped], { type: MimeTypeApplication.ZIP });+ /**+ * Reports whether the text is the JSONL session format, whose first non-empty+ * line is a `SessionRecordType.SESSION` record. A legacy JSON export starts+ * with an array or an object that has no such discriminator.+ * @param text - The file contents+ */+ private static isSessionsJsonl(text: string): boolean {+ const trimmed = text.trimStart();+ const lineEnd = trimmed.indexOf(NEWLINE);+ const firstLine = lineEnd === -1 ? trimmed : trimmed.slice(0, lineEnd);- ConversationTransferService.triggerDownload(blob, archiveName);+ try {+ return JSON.parse(firstLine).type === SessionRecordType.SESSION;+ } catch {+ // Not a standalone JSON record, so not the JSONL format.+ return false;+ }}/**diff --git a/tools/ui/src/lib/services/database.service.ts b/tools/ui/src/lib/services/database.service.tsindex 89dc58b005..a466f84831 100644--- a/tools/ui/src/lib/services/database.service.ts+++ b/tools/ui/src/lib/services/database.service.ts@@ -1,3 +1,11 @@+/**+ * DatabaseService - IndexedDB persistence for conversations and messages+ *+ * Thin Dexie layer over the conversations/messages tables: CRUD, tree+ * navigation (descendants, reparenting) and cascading deletes. No reactive+ * state; consumed by conversationsStore and the chat flows.+ */+import { IDXDB_STORES, IDXDB_TABLES, STORAGE_APP_NAME } from '$lib/constants';import { MessageRole } from '$lib/enums';import type { McpServerOverride } from '$lib/types/database';@@ -20,12 +28,99 @@ const db = new LlamaUiDatabase();export class DatabaseService {/**+ * Deletes multiple conversations in a single transaction. Each deleted+ * conversation has its direct children reparented to the nearest surviving+ * ancestor (or promoted to top-level). Children also in `ids` are dropped+ * entirely rather than reparented.*+ * @param ids - Conversation IDs to delete+ */+ static async bulkDeleteConversations(ids: string[]): Promise<void> {+ const cleanIds = ids.filter((id): id is string => typeof id === 'string' && id.length > 0);++ if (cleanIds.length === 0) return;++ const idSet = new Set(cleanIds);++ await db.transaction(+ 'rw',+ [db[IDXDB_TABLES.conversations], db[IDXDB_TABLES.messages]],+ async () => {+ // Pre-load each to-delete conversation so the per-id reparent+ // walk-up doesn't ping-pong the same ancestry chain.+ const prefetched = new Map<string, DatabaseConversation>();++ let frontier = [...cleanIds];++ const requested = new Set<string>(frontier);++ while (frontier.length > 0) {+ const fetched = await db[IDXDB_TABLES.conversations].bulkGet(frontier);++ frontier = [];+ for (let i = 0; i < fetched.length; i++) {+ const conv = fetched[i];++ if (!conv || !conv.id) continue;++ prefetched.set(conv.id, conv);+ const ancestor = conv.forkedFromConversationId;++ if (ancestor && !prefetched.has(ancestor) && !requested.has(ancestor)) {+ frontier.push(ancestor);+ requested.add(ancestor);+ }+ }+ }++ for (const id of cleanIds) {+ await this.reparentDirectChildren(id, idSet, prefetched);+ }++ await db[IDXDB_TABLES.conversations].bulkDelete(cleanIds);+ await db[IDXDB_TABLES.messages].where('convId').anyOf(cleanIds).delete();+ }+ );+ }++ /**+ * Toggles the pinned status of each conversation in `ids` inside a single+ * transaction. Treats `pinned === undefined` as `false`, matching the+ * semantics of {@link toggleConversationPin} where `!undefined` evaluates+ * to `true`. Returns the resulting pinned state for every id that was+ * updated; missing ids are omitted from the map.*- * Conversations- *- *+ * @param ids - Conversation IDs to toggle+ * @returns Map of id -> new pinned state*/+ static async bulkToggleConversationPins(ids: string[]): Promise<Map<string, boolean>> {+ const cleanIds = ids.filter((id): id is string => typeof id === 'string' && id.length > 0);+ const result = new Map<string, boolean>();++ if (cleanIds.length === 0) return result;++ await db.transaction('rw', db[IDXDB_TABLES.conversations], async () => {+ const convs = await db[IDXDB_TABLES.conversations].bulkGet(cleanIds);+ const updates: DatabaseConversation[] = [];++ for (let i = 0; i < cleanIds.length; i++) {+ const conv = convs[i];++ if (!conv) continue;++ const newPinned = !conv.pinned;++ updates.push({ ...conv, pinned: newPinned });+ result.set(cleanIds[i], newPinned);+ }++ if (updates.length === 0) return;++ await db[IDXDB_TABLES.conversations].bulkPut(updates);+ });++ return result;+ }/*** Creates a new conversation.@@ -51,14 +146,6 @@ export class DatabaseService {return conversation;}- /**- *- *- * Messages- *- *- */-/*** Creates a new message branch by adding a message and updating parent/child relationships.* Also updates the conversation's currNode to point to the new message.@@ -96,13 +183,7 @@ export class DatabaseService {// Update parent's children array if parent existsif (parentId !== null) {- const parentMessage = await db[IDXDB_TABLES.messages].get(parentId);-- if (parentMessage) {- await db[IDXDB_TABLES.messages].update(parentId, {- children: [...parentMessage.children, newMessage.id]- });- }+ await this.addChildToParent(parentId, newMessage.id);}await this.updateConversation(message.convId, {@@ -178,9 +259,7 @@ export class DatabaseService {};await db[IDXDB_TABLES.messages].add(systemMessage);- await db[IDXDB_TABLES.messages].update(parentId, {- children: [...parentMessage.children, systemMessage.id]- });+ await this.addChildToParent(parentId, systemMessage.id);return systemMessage;});@@ -230,121 +309,6 @@ export class DatabaseService {);}- /**- * Reparents direct children of `parentId` to the nearest surviving- * ancestor (or promotes them to top-level when the immediate parent was- * top-level). Walking skips any ancestor listed in `excludeIds`, since- * those will be deleted in the same batch — leaving a grandchild pointing- * at an `excludeIds` entry would orphan it. Children whose own id is in- * `excludeIds` are dropped from the updates (the bulk-delete pass will- * remove them). `prefetched` may carry a pre-fetched ancestor map to- * avoid repeat reads inside a bulk transaction.- */- private static async reparentDirectChildren(- parentId: string,- excludeIds: ReadonlySet<string> = new Set(),- prefetched?: ReadonlyMap<string, DatabaseConversation>- ): Promise<void> {- const conv = prefetched?.get(parentId) ?? (await db[IDXDB_TABLES.conversations].get(parentId));-- if (!conv) return;-- let newParent = conv.forkedFromConversationId;-- const visited = new Set<string>([parentId]);-- while (newParent && excludeIds.has(newParent)) {- if (visited.has(newParent)) {- newParent = undefined;-- break;- }-- visited.add(newParent);- const next =- prefetched?.get(newParent) ?? (await db[IDXDB_TABLES.conversations].get(newParent));-- if (!next) {- newParent = undefined;-- break;- }-- newParent = next.forkedFromConversationId;- }-- const directChildren = await db[IDXDB_TABLES.conversations]- .filter((c) => c.forkedFromConversationId === parentId)- .toArray();- const updates: DatabaseConversation[] = [];-- for (const child of directChildren) {- if (excludeIds.has(child.id)) continue;-- updates.push({ ...child, forkedFromConversationId: newParent });- }-- if (updates.length === 0) return;-- await db[IDXDB_TABLES.conversations].bulkPut(updates);- }-- /**- * Deletes multiple conversations in a single transaction. Each deleted- * conversation has its direct children reparented to the nearest surviving- * ancestor (or promoted to top-level). Children also in `ids` are dropped- * entirely rather than reparented.- *- * @param ids - Conversation IDs to delete- */- static async bulkDeleteConversations(ids: string[]): Promise<void> {- const cleanIds = ids.filter((id): id is string => typeof id === 'string' && id.length > 0);-- if (cleanIds.length === 0) return;-- const idSet = new Set(cleanIds);-- await db.transaction(- 'rw',- [db[IDXDB_TABLES.conversations], db[IDXDB_TABLES.messages]],- async () => {- // Pre-load each to-delete conversation so the per-id reparent- // walk-up doesn't ping-pong the same ancestry chain.- const prefetched = new Map<string, DatabaseConversation>();-- let frontier = [...cleanIds];-- const requested = new Set<string>(frontier);-- while (frontier.length > 0) {- const fetched = await db[IDXDB_TABLES.conversations].bulkGet(frontier);-- frontier = [];- for (let i = 0; i < fetched.length; i++) {- const conv = fetched[i];-- if (!conv || !conv.id) continue;-- prefetched.set(conv.id, conv);- const ancestor = conv.forkedFromConversationId;-- if (ancestor && !prefetched.has(ancestor) && !requested.has(ancestor)) {- frontier.push(ancestor);- requested.add(ancestor);- }- }- }-- for (const id of cleanIds) {- await this.reparentDirectChildren(id, idSet, prefetched);- }-- await db[IDXDB_TABLES.conversations].bulkDelete(cleanIds);- await db[IDXDB_TABLES.messages].where('convId').anyOf(cleanIds).delete();- }- );- }-/*** Deletes a message and removes it from its parent's children array.*@@ -356,17 +320,8 @@ export class DatabaseService {if (!message) return;- // Remove this message from its parent's children array- if (message.parent) {- const parent = await db[IDXDB_TABLES.messages].get(message.parent);-- if (parent) {- parent.children = parent.children.filter((childId: string) => childId !== messageId);- await db[IDXDB_TABLES.messages].put(parent);- }- }+ await this.removeChildFromParent(messageId);- // Delete the messageawait db[IDXDB_TABLES.messages].delete(messageId);});}@@ -389,20 +344,10 @@ export class DatabaseService {.where('convId').equals(conversationId).toArray();- // Find all descendant messagesconst descendants = findDescendantMessages(allMessages, messageId);const allToDelete = [messageId, ...descendants];- // Get the message to delete for parent cleanup- const message = await db[IDXDB_TABLES.messages].get(messageId);- if (message && message.parent) {- const parent = await db[IDXDB_TABLES.messages].get(message.parent);-- if (parent) {- parent.children = parent.children.filter((childId: string) => childId !== messageId);- await db[IDXDB_TABLES.messages].put(parent);- }- }+ await this.removeChildFromParent(messageId);// Delete all messages in the branchawait db[IDXDB_TABLES.messages].bulkDelete(allToDelete);@@ -412,23 +357,108 @@ export class DatabaseService {}/**- * Gets all conversations, sorted by last modified time (newest first).- *- * @returns Array of conversations- */- static async getAllConversations(): Promise<DatabaseConversation[]> {- return await db[IDXDB_TABLES.conversations].orderBy('lastModified').reverse().toArray();- }-- /**- * Gets a conversation by ID.+ * Forks a conversation at a specific message, creating a new conversation+ * containing all messages from the root up to (and including) the target message.*- * @param id - Conversation ID- * @returns The conversation if found, otherwise undefined+ * @param sourceConvId - The source conversation ID+ * @param atMessageId - The message ID to fork at (the new conversation ends here)+ * @param options - Fork options (name and whether to include attachments)+ * @returns The newly created conversation*/- static async getConversation(id: string): Promise<DatabaseConversation | undefined> {- return await db[IDXDB_TABLES.conversations].get(id);- }+ static async forkConversation(+ sourceConvId: string,+ atMessageId: string,+ options: { name: string; includeAttachments: boolean }+ ): Promise<DatabaseConversation> {+ return await db.transaction(+ 'rw',+ [db[IDXDB_TABLES.conversations], db[IDXDB_TABLES.messages]],+ async () => {+ const sourceConv = await db[IDXDB_TABLES.conversations].get(sourceConvId);++ if (!sourceConv) {+ throw new Error(`Source conversation ${sourceConvId} not found`);+ }++ const allMessages = await db[IDXDB_TABLES.messages]+ .where('convId')+ .equals(sourceConvId)+ .toArray();+ const pathMessages = filterByLeafNodeId(+ allMessages,+ atMessageId,+ true+ ) as DatabaseMessage[];++ if (pathMessages.length === 0) {+ throw new Error(`Could not resolve message path to ${atMessageId}`);+ }++ const idMap = new Map<string, string>();++ for (const msg of pathMessages) {+ idMap.set(msg.id, uuid());+ }++ const newConvId = uuid();+ const clonedMessages: DatabaseMessage[] = pathMessages.map((msg) => {+ const newId = idMap.get(msg.id)!;+ const newParent = msg.parent ? (idMap.get(msg.parent) ?? null) : null;+ const newChildren = msg.children+ .filter((childId: string) => idMap.has(childId))+ .map((childId: string) => idMap.get(childId)!);++ return {+ ...msg,+ children: newChildren,+ convId: newConvId,+ extra: options.includeAttachments ? msg.extra : undefined,+ id: newId,+ parent: newParent+ };+ });+ const lastClonedMessage = clonedMessages[clonedMessages.length - 1];+ const newConv: DatabaseConversation = {+ currNode: lastClonedMessage.id,+ cwd: sourceConv.cwd,+ forkedFromConversationId: sourceConvId,+ id: newConvId,+ lastModified: Date.now(),+ mcpServerOverrides: sourceConv.mcpServerOverrides+ ? sourceConv.mcpServerOverrides.map((o: McpServerOverride) => ({+ enabled: o.enabled,+ serverId: o.serverId+ }))+ : undefined,+ name: options.name+ };++ await db[IDXDB_TABLES.conversations].add(newConv);+ await db[IDXDB_TABLES.messages].bulkAdd(clonedMessages);++ return newConv;+ }+ );+ }++ /**+ * Gets all conversations, sorted by last modified time (newest first).+ *+ * @returns Array of conversations+ */+ static async getAllConversations(): Promise<DatabaseConversation[]> {+ return await db[IDXDB_TABLES.conversations].orderBy('lastModified').reverse().toArray();+ }++ /**+ * Gets a conversation by ID.+ *+ * @param id - Conversation ID+ * @returns The conversation if found, otherwise undefined+ */+ static async getConversation(id: string): Promise<DatabaseConversation | undefined> {+ return await db[IDXDB_TABLES.conversations].get(id);+ }/*** Gets all messages in a conversation, sorted by timestamp (oldest first).@@ -484,27 +514,44 @@ export class DatabaseService {}/**- * Updates a conversation. `lastModified` is never stamped implicitly;- * pass it in `updates` to bump the conversation in recency ordering.+ * Imports multiple conversations and their messages.+ * Skips conversations that already exist.*- * @param id - Conversation ID- * @param updates - Partial updates to apply- * @returns Promise that resolves when the conversation is updated+ * @param data - Array of { conv, messages } objects+ * @returns The conversations written to the database and the ones skipped*/- static async updateConversation(- id: string,- updates: Partial<Omit<DatabaseConversation, 'id'>>- ): Promise<void> {- await db[IDXDB_TABLES.conversations].update(id, updates);- }+ static async importConversations(+ data: { conv: DatabaseConversation; messages: DatabaseMessage[] }[]+ ): Promise<{ imported: DatabaseConversation[]; skipped: DatabaseConversation[] }> {+ const imported: DatabaseConversation[] = [];+ const skipped: DatabaseConversation[] = [];- /**- *- *- * Navigation- *- *- */+ return await db.transaction(+ 'rw',+ [db[IDXDB_TABLES.conversations], db[IDXDB_TABLES.messages]],+ async () => {+ for (const item of data) {+ const { conv, messages } = item;+ const existing = await db[IDXDB_TABLES.conversations].get(conv.id);++ if (existing) {+ skipped.push(conv);++ continue;+ }++ await db[IDXDB_TABLES.conversations].add(conv);+ for (const msg of messages) {+ await db[IDXDB_TABLES.messages].put(msg);+ }++ imported.push(conv);+ }++ return { imported, skipped };+ }+ );+ }/*** Toggles the pinned status of a conversation.@@ -527,42 +574,18 @@ export class DatabaseService {}/**- * Toggles the pinned status of each conversation in `ids` inside a single- * transaction. Treats `pinned === undefined` as `false`, matching the- * semantics of {@link toggleConversationPin} where `!undefined` evaluates- * to `true`. Returns the resulting pinned state for every id that was- * updated; missing ids are omitted from the map.+ * Updates a conversation. `lastModified` is never stamped implicitly;+ * pass it in `updates` to bump the conversation in recency ordering.*- * @param ids - Conversation IDs to toggle- * @returns Map of id -> new pinned state+ * @param id - Conversation ID+ * @param updates - Partial updates to apply+ * @returns Promise that resolves when the conversation is updated*/- static async bulkToggleConversationPins(ids: string[]): Promise<Map<string, boolean>> {- const cleanIds = ids.filter((id): id is string => typeof id === 'string' && id.length > 0);- const result = new Map<string, boolean>();-- if (cleanIds.length === 0) return result;-- await db.transaction('rw', db[IDXDB_TABLES.conversations], async () => {- const convs = await db[IDXDB_TABLES.conversations].bulkGet(cleanIds);- const updates: DatabaseConversation[] = [];-- for (let i = 0; i < cleanIds.length; i++) {- const conv = convs[i];-- if (!conv) continue;-- const newPinned = !conv.pinned;-- updates.push({ ...conv, pinned: newPinned });- result.set(cleanIds[i], newPinned);- }-- if (updates.length === 0) return;-- await db[IDXDB_TABLES.conversations].bulkPut(updates);- });-- return result;+ static async updateConversation(+ id: string,+ updates: Partial<Omit<DatabaseConversation, 'id'>>+ ): Promise<void> {+ await db[IDXDB_TABLES.conversations].update(id, updates);}/**@@ -593,146 +616,90 @@ export class DatabaseService {}/**- *- *- * Import- *- *+ * Appends a child id to a parent message's children array.*/+ private static async addChildToParent(parentId: string, childId: string): Promise<void> {+ const parent = await db[IDXDB_TABLES.messages].get(parentId);++ if (!parent) return;++ await db[IDXDB_TABLES.messages].update(parentId, {+ children: [...parent.children, childId]+ });+ }/**- * Imports multiple conversations and their messages.- * Skips conversations that already exist.- *- * @param data - Array of { conv, messages } objects- * @returns The conversations written to the database and the ones skipped+ * Removes a child id from its parent message's children array.*/- static async importConversations(- data: { conv: DatabaseConversation; messages: DatabaseMessage[] }[]- ): Promise<{ imported: DatabaseConversation[]; skipped: DatabaseConversation[] }> {- const imported: DatabaseConversation[] = [];- const skipped: DatabaseConversation[] = [];+ private static async removeChildFromParent(messageId: string): Promise<void> {+ const message = await db[IDXDB_TABLES.messages].get(messageId);- return await db.transaction(- 'rw',- [db[IDXDB_TABLES.conversations], db[IDXDB_TABLES.messages]],- async () => {- for (const item of data) {- const { conv, messages } = item;- const existing = await db[IDXDB_TABLES.conversations].get(conv.id);+ if (!message?.parent) return;- if (existing) {- skipped.push(conv);-- continue;- }+ const parent = await db[IDXDB_TABLES.messages].get(message.parent);- await db[IDXDB_TABLES.conversations].add(conv);- for (const msg of messages) {- await db[IDXDB_TABLES.messages].put(msg);- }+ if (!parent) return;- imported.push(conv);- }-- return { imported, skipped };- }- );+ parent.children = parent.children.filter((childId: string) => childId !== messageId);+ await db[IDXDB_TABLES.messages].put(parent);}/**- *- *- * Forking- *- *+ * Reparents direct children of `parentId` to the nearest surviving+ * ancestor (or promotes them to top-level when the immediate parent was+ * top-level). Walking skips any ancestor listed in `excludeIds`, since+ * those will be deleted in the same batch — leaving a grandchild pointing+ * at an `excludeIds` entry would orphan it. Children whose own id is in+ * `excludeIds` are dropped from the updates (the bulk-delete pass will+ * remove them). `prefetched` may carry a pre-fetched ancestor map to+ * avoid repeat reads inside a bulk transaction.*/+ private static async reparentDirectChildren(+ parentId: string,+ excludeIds: ReadonlySet<string> = new Set(),+ prefetched?: ReadonlyMap<string, DatabaseConversation>+ ): Promise<void> {+ const conv = prefetched?.get(parentId) ?? (await db[IDXDB_TABLES.conversations].get(parentId));- /**- * Forks a conversation at a specific message, creating a new conversation- * containing all messages from the root up to (and including) the target message.- *- * @param sourceConvId - The source conversation ID- * @param atMessageId - The message ID to fork at (the new conversation ends here)- * @param options - Fork options (name and whether to include attachments)- * @returns The newly created conversation- */- static async forkConversation(- sourceConvId: string,- atMessageId: string,- options: { name: string; includeAttachments: boolean }- ): Promise<DatabaseConversation> {- return await db.transaction(- 'rw',- [db[IDXDB_TABLES.conversations], db[IDXDB_TABLES.messages]],- async () => {- const sourceConv = await db[IDXDB_TABLES.conversations].get(sourceConvId);+ if (!conv) return;- if (!sourceConv) {- throw new Error(`Source conversation ${sourceConvId} not found`);- }+ let newParent = conv.forkedFromConversationId;- const allMessages = await db[IDXDB_TABLES.messages]- .where('convId')- .equals(sourceConvId)- .toArray();- const pathMessages = filterByLeafNodeId(- allMessages,- atMessageId,- true- ) as DatabaseMessage[];+ const visited = new Set<string>([parentId]);- if (pathMessages.length === 0) {- throw new Error(`Could not resolve message path to ${atMessageId}`);- }+ while (newParent && excludeIds.has(newParent)) {+ if (visited.has(newParent)) {+ newParent = undefined;- const idMap = new Map<string, string>();+ break;+ }- for (const msg of pathMessages) {- idMap.set(msg.id, uuid());- }+ visited.add(newParent);+ const next =+ prefetched?.get(newParent) ?? (await db[IDXDB_TABLES.conversations].get(newParent));- const newConvId = uuid();- const clonedMessages: DatabaseMessage[] = pathMessages.map((msg) => {- const newId = idMap.get(msg.id)!;- const newParent = msg.parent ? (idMap.get(msg.parent) ?? null) : null;- const newChildren = msg.children- .filter((childId: string) => idMap.has(childId))- .map((childId: string) => idMap.get(childId)!);+ if (!next) {+ newParent = undefined;- return {- ...msg,- children: newChildren,- convId: newConvId,- extra: options.includeAttachments ? msg.extra : undefined,- id: newId,- parent: newParent- };- });- const lastClonedMessage = clonedMessages[clonedMessages.length - 1];- const newConv: DatabaseConversation = {- currNode: lastClonedMessage.id,- cwd: sourceConv.cwd,- forkedFromConversationId: sourceConvId,- id: newConvId,- lastModified: Date.now(),- mcpServerOverrides: sourceConv.mcpServerOverrides- ? sourceConv.mcpServerOverrides.map((o: McpServerOverride) => ({- enabled: o.enabled,- serverId: o.serverId- }))- : undefined,- name: options.name- };+ break;+ }- await db[IDXDB_TABLES.conversations].add(newConv);+ newParent = next.forkedFromConversationId;+ }- for (const msg of clonedMessages) {- await db[IDXDB_TABLES.messages].add(msg);- }+ const directChildren = await db[IDXDB_TABLES.conversations]+ .filter((c) => c.forkedFromConversationId === parentId)+ .toArray();+ const updates: DatabaseConversation[] = [];- return newConv;- }- );+ for (const child of directChildren) {+ if (excludeIds.has(child.id)) continue;++ updates.push({ ...child, forkedFromConversationId: newParent });+ }++ if (updates.length === 0) return;++ await db[IDXDB_TABLES.conversations].bulkPut(updates);}}diff --git a/tools/ui/src/lib/services/index.ts b/tools/ui/src/lib/services/index.tsindex fe739a3bc2..7ae9e23d48 100644--- a/tools/ui/src/lib/services/index.ts+++ b/tools/ui/src/lib/services/index.ts@@ -53,9 +53,9 @@* - Reasoning content stripping from prompt history to avoid KV cache pollution* - Error translation (network, timeout, server errors → user-friendly messages)*- * @see chatStore in stores/chat.svelte.ts — primary consumer for chat state management- * @see agenticStore in stores/agentic.svelte.ts — uses ChatService for agentic loop streaming- * @see conversationsStore in stores/conversations.svelte.ts — provides message context+ * @see chatStore in stores/chat/index.svelte.ts — primary consumer for chat state management+ * @see agenticStore in stores/agentic/index.svelte.ts — uses ChatService for agentic loop streaming+ * @see conversationsStore in stores/conversations/index.svelte.ts — provides message context*/export { ChatService } from './chat.service';@@ -98,8 +98,8 @@ export { ChatService } from './chat.service';* enabling conversation branching and alternative response paths. The conversation's* `currNode` tracks the currently active branch endpoint.*- * @see conversationsStore in stores/conversations.svelte.ts — reactive layer on top of DatabaseService- * @see chatStore in stores/chat.svelte.ts — uses DatabaseService directly for message CRUD during streaming+ * @see conversationsStore in stores/conversations/index.svelte.ts — reactive layer on top of DatabaseService+ * @see chatStore in stores/chat/index.svelte.ts — uses DatabaseService directly for message CRUD during streaming*/export { DatabaseService } from './database.service';@@ -143,7 +143,7 @@ export { ConversationTransferService } from './conversation-transfer.service';* - `POST /models/load` — Load a model (ROUTER mode only)* - `POST /models/unload` — Unload a model (ROUTER mode only)*- * @see modelsStore in stores/models.svelte.ts — primary consumer for reactive model state+ * @see modelsStore in stores/models/index.svelte.ts — primary consumer for reactive model state*/export { ModelsService } from './models.service';@@ -174,8 +174,8 @@ export { ModelsService } from './models.service';* - `&autoload=false` → Prevents model auto-loading when querying props** @see serverStore in stores/server.svelte.ts — consumes global server props- * @see modelsStore in stores/models.svelte.ts — consumes per-model props for modalities- * @see settingsStore in stores/settings.svelte.ts — syncs default generation params from props+ * @see modelsStore in stores/models/index.svelte.ts — consumes per-model props for modalities+ * @see settingsStore in stores/settings/index.svelte.ts — syncs default generation params from props*/export { PropsService } from './props.service';@@ -217,7 +217,7 @@ export { PropsService } from './props.service';* - `ParameterSyncService` class — static methods for sync logic* - `SYNCABLE_PARAMETERS` — mapping of UI setting keys to server parameter keys*- * @see settingsStore in stores/settings.svelte.ts — primary consumer for settings sync+ * @see settingsStore in stores/settings/index.svelte.ts — primary consumer for settings sync* @see SettingsChatParameterSourceIndicator — displays parameter source badges in UI*/export { ParameterSyncService } from './parameter-sync.service';@@ -241,7 +241,7 @@ export { ParameterSyncService } from './parameter-sync.service';* - Manages connection lifecycle, health checks, reconnection* - Handles tool name conflict resolution and server coordination*- * - **mcpResourceStore**: Reactive resource state+ * - **mcpResourceStore** (composed as mcpStore.resources): Reactive resource state* - Receives resource data fetched via MCPService* - Manages resource caching, subscriptions, and attachments*@@ -263,9 +263,9 @@ export { ParameterSyncService } from './parameter-sync.service';* 2. **StreamableHTTP** — modern HTTP-based, supports CORS proxy* 3. **SSE** — legacy fallback, supports CORS proxy*- * @see mcpStore in stores/mcp.svelte.ts — reactive business logic facade on top of MCPService- * @see mcpResourceStore in stores/mcp-resources.svelte.ts — reactive resource state management- * @see agenticStore in stores/agentic.svelte.ts — uses MCPService (via mcpStore) for tool execution+ * @see mcpStore in stores/mcp/index.svelte.ts — reactive business logic facade on top of MCPService+ * @see mcpStore.resources in stores/mcp/resources.svelte.ts — reactive resource state management+ * @see agenticStore in stores/agentic/index.svelte.ts — uses MCPService (via mcpStore) for tool execution* @see MCP Protocol Specification: https://modelcontextprotocol.io/specification/2025-06-18*/export { MCPService } from './mcp.service';@@ -286,7 +286,7 @@ export { MCPService } from './mcp.service';* - **agenticStore**: Dispatches ToolSource.BROWSER calls here** @see buildSandboxToolDefinition in utils/sandbox-tool - tool schema sent to the LLM- * @see agenticStore in stores/agentic.svelte.ts - tool dispatch+ * @see agenticStore in stores/agentic/index.svelte.ts - tool dispatch*/export { SandboxService } from './sandbox.service';diff --git a/tools/ui/src/lib/services/mcp.service.ts b/tools/ui/src/lib/services/mcp.service.tsindex 65e9e59d6e..7b857fd438 100644--- a/tools/ui/src/lib/services/mcp.service.ts+++ b/tools/ui/src/lib/services/mcp.service.ts@@ -1,3 +1,11 @@+/**+ * MCPService - Stateless MCP protocol layer+ *+ * Implements the client side of the MCP spec over WebSocket, StreamableHTTP+ * and SSE transports: connect, tool/prompt/resource operations and result+ * formatting. No reactive state; consumed by mcpStore and its managers.+ */+import { Client } from '@modelcontextprotocol/sdk/client';import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';import {@@ -88,563 +96,149 @@ interface DiagnosticRequestDetails {export class MCPService {/**- * Create a connection log entry for phase tracking.+ * Execute a tool call on a connection.+ * Supports abort signal for cancellable operations (e.g., when user stops generation).+ * Formats the raw tool result into a string representation.*- * @param phase - The connection phase this log belongs to- * @param message - Human-readable log message- * @param level - Log severity level (default: INFO)- * @param details - Optional structured details for debugging- * @returns Formatted connection log entry+ * @param connection - The MCP connection to execute against+ * @param params - Tool name and arguments to execute+ * @param signal - Optional AbortSignal for cancellation support+ * @returns Formatted tool execution result with content string and error flag+ * @throws {Error} If tool execution fails or is aborted*/- private static createLog(- phase: MCPConnectionPhase,- message: string,- level: MCPLogLevel = MCPLogLevel.INFO,- details?: unknown- ): MCPConnectionLog {- return {- details,- level,- message,- phase,- timestamp: new Date()- };- }+ static async callTool(+ connection: MCPConnection,+ params: ToolCallParams,+ signal?: AbortSignal+ ): Promise<ToolExecutionResult> {+ throwIfAborted(signal);- private static createDiagnosticRequestDetails(- input: RequestInfo | URL,- init: RequestInit | undefined,- baseInit: RequestInit,- requestHeaders: Headers,- extraRedactedHeaders?: Iterable<string>- ): DiagnosticRequestDetails {- const body = getRequestBody(input, init);- const details: DiagnosticRequestDetails = {- body: summarizeRequestBody(body),- credentials: init?.credentials ?? baseInit.credentials,- headers: sanitizeHeaders(requestHeaders, extraRedactedHeaders, HEADERS.PARTIAL_REDACT),- method: getRequestMethod(input, init, baseInit).toUpperCase(),- mode: init?.mode ?? baseInit.mode,- url: getRequestUrl(input)- };- const jsonRpcMethods = extractJsonRpcMethods(body);+ try {+ const result = await connection.client.callTool(+ { arguments: params.arguments, name: params.name },+ undefined,+ { signal, timeout: connection.requestTimeoutMs }+ );- if (jsonRpcMethods) {- details.jsonRpcMethods = jsonRpcMethods;- }+ return {+ content: this.formatToolResult(result as ToolCallResult),+ isError: (result as ToolCallResult).isError ?? false+ };+ } catch (error) {+ if (isAbortError(error)) {+ throw error;+ }- return details;- }+ // Let session-expired errors propagate unwrapped for reconnection handling+ if (this.isSessionExpiredError(error)) {+ throw error;+ }- private static addRequestHeaders(- requestHeaders: Headers,- headers: HeadersInit,- useProxy: boolean- ) {- for (const [key, value] of new Headers(headers).entries()) {- const proxiedKey =- useProxy && !key.toLowerCase().startsWith(CORS_PROXY.HEADER_PREFIX)- ? `${CORS_PROXY.HEADER_PREFIX}${key}`- : key;+ const message = error instanceof Error ? error.message : String(error);- requestHeaders.set(proxiedKey, value);+ throw new Error(+ `Tool "${params.name}" execution failed on server "${connection.serverName}": ${message}`,+ { cause: error instanceof Error ? error : undefined }+ );}}- private static summarizeError(error: unknown): Record<string, unknown> {- if (error instanceof Error) {- return {- cause:- error.cause instanceof Error- ? { message: error.cause.message, name: error.cause.name }- : error.cause,- message: error.message,- name: error.name,- stack: error.stack?.split('\n').slice(0, 6).join('\n')- };- }+ /**+ * Request completion suggestions from a server.+ * Used for autocompleting prompt arguments or resource URI templates.+ *+ * @param connection - The MCP connection to use+ * @param ref - Reference to the prompt or resource template+ * @param argument - The argument being completed (name and current value)+ * @returns Completion result with suggested values+ */+ static async complete(+ connection: MCPConnection,+ ref: { type: MCPRefType.PROMPT; name: string } | { type: MCPRefType.RESOURCE; uri: string },+ argument: { name: string; value: string }+ ): Promise<{ values: string[]; total?: number; hasMore?: boolean } | null> {+ try {+ const result = await connection.client.complete({+ argument,+ ref+ });- return { value: String(error) };- }+ return result.completion;+ } catch (error) {+ console.error(`[MCPService] Failed to get completions:`, error);- private static getBrowserContext(- targetUrl: URL,- useProxy: boolean- ): Record<string, unknown> | undefined {- if (typeof window === 'undefined') {- return undefined;+ return null;}-- return {- isSecureContext: window.isSecureContext,- location: window.location.href,- origin: window.location.origin,- protocol: window.location.protocol,- sameOrigin: window.location.origin === targetUrl.origin,- targetOrigin: targetUrl.origin,- targetProtocol: targetUrl.protocol,- useProxy- };}- private static getConnectionHints(- targetUrl: URL,- config: MCPServerConfig,- error: unknown- ): string[] {- const hints: string[] = [];- const message = error instanceof Error ? error.message : String(error);- const headerNames = Object.keys(config.headers ?? {});-- if (typeof window !== 'undefined') {- if (- window.location.protocol === 'https:' &&- targetUrl.protocol === 'http:' &&- !config.useProxy- ) {- hints.push(- 'The page is running over HTTPS but the MCP server is HTTP. Browsers often block this as mixed content; enable the proxy or use HTTPS/WSS for the MCP server.'- );- }+ /**+ * Connect to a single MCP server with detailed phase tracking.+ *+ * Performs the full MCP connection lifecycle:+ * 1. Transport creation (with automatic fallback)+ * 2. Client initialization and capability exchange+ * 3. Tool discovery via `listTools`+ *+ * Reports progress via `onPhase` callback at each step, enabling+ * UI progress indicators during connection.+ *+ * @param serverName - Display name for the server (used in logging)+ * @param serverConfig - Server URL, transport type, proxy, and auth configuration+ * @param clientInfo - Optional client identification (defaults to app info)+ * @param capabilities - Optional client capability declaration+ * @param onPhase - Optional callback for connection phase progress updates+ * @param listChangedHandlers - Optional handlers for server-initiated list change notifications+ * @returns Full connection object with client, transport, tools, server info, and timing+ * @throws {Error} If transport creation or connection fails+ */+ static async connect(+ serverName: string,+ serverConfig: MCPServerConfig,+ clientInfo?: Implementation,+ capabilities?: ClientCapabilities,+ onPhase?: MCPPhaseCallback,+ listChangedHandlers?: ListChangedHandlers+ ): Promise<MCPConnection> {+ const startTime = performance.now();+ const effectiveClientInfo = clientInfo ?? DEFAULT_MCP_CONFIG.clientInfo;+ const effectiveCapabilities = capabilities ?? DEFAULT_MCP_CONFIG.capabilities;- if (window.location.origin !== targetUrl.origin && !config.useProxy) {- hints.push(- 'This is a cross-origin browser request. If the server is reachable from curl or Node but not from the browser, missing CORS headers are the most likely cause.'- );- }- }+ // Phase: Creating transport+ onPhase?.(+ MCPConnectionPhase.TRANSPORT_CREATING,+ this.createLog(+ MCPConnectionPhase.TRANSPORT_CREATING,+ `Creating transport for ${serverConfig.url}`+ )+ );- if (headerNames.length > 0) {- hints.push(- `Custom request headers are configured (${headerNames.join(', ')}). That triggers a CORS preflight, so the server must allow OPTIONS and include the matching Access-Control-Allow-Headers response.`- );+ if (import.meta.env.DEV && import.meta.env.VITE_DEBUG) {+ console.log(`[MCPService][${serverName}] Creating transport...`);}- if (config.credentials && config.credentials !== 'omit') {- hints.push(- 'Credentials are enabled for this connection. Cross-origin credentialed requests need Access-Control-Allow-Credentials: true and cannot use a wildcard Access-Control-Allow-Origin.'- );- }+ const {+ stopPhaseLogging,+ transport,+ type: transportType+ } = this.createTransport(serverName, serverConfig, (log) => onPhase?.(log.phase, log));- if (message.includes('Failed to fetch')) {- hints.push(- '"Failed to fetch" is a browser-level network failure. Common causes are CORS rejection, mixed-content blocking, certificate/TLS errors, DNS failures, or nothing listening on the target port.'- );+ // Setup WebSocket reconnection handler+ if (transportType === MCPTransportType.WEBSOCKET) {+ transport.onclose = () => {+ console.log(`[MCPService][${serverName}] WebSocket closed, notifying for reconnection`);+ onPhase?.(+ MCPConnectionPhase.DISCONNECTED,+ this.createLog(MCPConnectionPhase.DISCONNECTED, 'WebSocket connection closed')+ );+ };}- return hints;- }-- private static createDiagnosticFetch(- serverName: string,- config: MCPServerConfig,- baseInit: RequestInit,- targetUrl: URL,- useProxy: boolean,- onLog?: (log: MCPConnectionLog) => void- ): {- fetch: typeof fetch;- disable: () => void;- } {- let enabled = true;-- const logIfEnabled = (log: MCPConnectionLog) => {- if (enabled) {- onLog?.(log);- }- };-- return {- disable: () => {- enabled = false;- },- fetch: async (input, init) => {- if (useProxy && typeof window !== 'undefined') {- let requestUrlStr = '';-- if (typeof input === 'string') {- requestUrlStr = input;- } else if (input instanceof URL) {- requestUrlStr = input.href;- }-- if (requestUrlStr) {- const parsedRequestUrl = new URL(requestUrlStr, window.location.origin);-- if (- parsedRequestUrl.origin === window.location.origin &&- !parsedRequestUrl.pathname.includes(CORS_PROXY_ENDPOINT)- ) {- const originalConfigUrl = new URL(config.url);- const realTargetUrl = new URL(- parsedRequestUrl.pathname + parsedRequestUrl.search,- originalConfigUrl.origin- );- const proxiedUrl = buildProxiedUrl(realTargetUrl.href);-- if (typeof input === 'string') {- input = proxiedUrl.href;- } else if (input instanceof URL) {- input = proxiedUrl;- }- }- }- }-- const startedAt = performance.now();- const requestHeaders = new Headers(baseInit.headers);-- if (typeof Request !== 'undefined' && input instanceof Request) {- this.addRequestHeaders(requestHeaders, input.headers, useProxy);- }-- if (init?.headers) {- this.addRequestHeaders(requestHeaders, init.headers, useProxy);- }-- const request = this.createDiagnosticRequestDetails(- input,- init,- baseInit,- requestHeaders,- Object.keys(config.headers ?? {})- );- const { method, url } = request;-- logIfEnabled(- this.createLog(- MCPConnectionPhase.INITIALIZING,- `HTTP ${method} ${url}`,- MCPLogLevel.INFO,- {- request,- serverName- }- )- );-- if (method === 'DELETE' && url.includes(CORS_PROXY_ENDPOINT)) {- const response = new Response(null, { status: 200, statusText: 'OK' });-- logIfEnabled(- this.createLog(- MCPConnectionPhase.INITIALIZING,- `HTTP 200 ${method} ${url} (fake response)`,- MCPLogLevel.INFO,- {- response: {- durationMs: 0,- isFake: true,- status: response.status,- statusText: response.statusText,- url- }- }- )- );-- // fake response, bypass real fetch()- return response;- }-- try {- const response = await fetch(input, {- ...baseInit,- ...init,- headers: requestHeaders- });- const durationMs = Math.round(performance.now() - startedAt);-- logIfEnabled(- this.createLog(- MCPConnectionPhase.INITIALIZING,- `HTTP ${response.status} ${method} ${url} (${durationMs}ms)`,- response.ok ? MCPLogLevel.INFO : MCPLogLevel.WARN,- {- response: {- durationMs,- headers: sanitizeHeaders(response.headers, undefined, HEADERS.PARTIAL_REDACT),- status: response.status,- statusText: response.statusText,- url- }- }- )- );-- return response;- } catch (error) {- const durationMs = Math.round(performance.now() - startedAt);-- logIfEnabled(- this.createLog(- MCPConnectionPhase.ERROR,- `HTTP ${method} ${url} failed: ${formatDiagnosticErrorMessage(error)}`,- MCPLogLevel.ERROR,- {- browser: this.getBrowserContext(targetUrl, useProxy),- durationMs,- error: this.summarizeError(error),- hints: this.getConnectionHints(targetUrl, config, error),- request,- serverName- }- )- );-- throw error;- }- }- };- }-- /**- * Detect if an error indicates an expired/invalidated MCP session.- * Per MCP spec 2025-11-25: HTTP 404 means session invalidated, client MUST- * discard its session ID and start a new session with a fresh initialize request.- *- * @param error - The caught error to inspect- * @returns true if the error is a StreamableHTTP 404 (session not found)- */- static isSessionExpiredError(error: unknown): boolean {- return error instanceof StreamableHTTPError && error.code === 404;- }-- /**- * Create transport based on server configuration.- * Supports WebSocket, StreamableHTTP (modern), and SSE (legacy) transports.- * When `useProxy` is enabled, routes HTTP requests through llama-server's CORS proxy.- *- * **Fallback Order:**- * 1. WebSocket — if explicitly configured (no CORS proxy support)- * 2. StreamableHTTP — default for HTTP connections- * 3. SSE — automatic fallback if StreamableHTTP fails- *- * @param config - Server configuration with url, transport type, proxy, and auth settings- * @returns Object containing the created transport and the transport type used- * @throws {Error} If url is missing, WebSocket + proxy combination, or all transports fail- */- static createTransport(- serverName: string,- config: MCPServerConfig,- onLog?: (log: MCPConnectionLog) => void- ): {- transport: Transport;- type: MCPTransportType;- stopPhaseLogging: () => void;- } {- if (!config.url) {- throw new Error('MCP server configuration is missing url');- }-- const useProxy = config.useProxy ?? false;- const requestInit: RequestInit = {};-- if (config.headers) {- requestInit.headers = config.useProxy ? buildProxiedHeaders(config.headers) : config.headers;- }-- if (useProxy) {- requestInit.headers = {- ...getAuthHeaders(),- ...(requestInit.headers as Record<string, string>)- };- }-- if (config.credentials) {- requestInit.credentials = config.credentials;- }-- if (config.transport === MCPTransportType.WEBSOCKET) {- if (useProxy) {- throw new Error(- 'WebSocket transport is not supported when using CORS proxy. Use HTTP transport instead.'- );- }-- const url = new URL(config.url);-- if (import.meta.env.DEV && import.meta.env.VITE_DEBUG) {- console.log(`[MCPService] Creating WebSocket transport for ${url.href}`);- }-- return {- stopPhaseLogging: () => {},- transport: new WebSocketClientTransport(url),- type: MCPTransportType.WEBSOCKET- };- }-- if (config.transport === MCPTransportType.SSE) {- const url = useProxy ? buildProxiedUrl(config.url) : new URL(config.url);- const { disable: stopPhaseLogging, fetch: diagnosticFetch } = this.createDiagnosticFetch(- serverName,- config,- requestInit,- url,- useProxy,- onLog- );-- if (import.meta.env.DEV && import.meta.env.VITE_DEBUG) {- console.log(`[MCPService] Creating SSE transport for ${url.href}`);- }-- return {- stopPhaseLogging,- transport: new SSEClientTransport(url, {- eventSourceInit: { fetch: diagnosticFetch },- fetch: diagnosticFetch,- requestInit- }),- type: MCPTransportType.SSE- };- }-- const url = useProxy ? buildProxiedUrl(config.url) : new URL(config.url);- const { disable: stopPhaseLogging, fetch: diagnosticFetch } = this.createDiagnosticFetch(- serverName,- config,- requestInit,- url,- useProxy,- onLog- );-- if (useProxy && import.meta.env.DEV && import.meta.env.VITE_DEBUG) {- console.log(`[MCPService] Using CORS proxy for ${config.url} -> ${url.href}`);- }-- try {- if (import.meta.env.DEV && import.meta.env.VITE_DEBUG) {- console.log(`[MCPService] Creating StreamableHTTP transport for ${url.href}`);- }-- return {- stopPhaseLogging,- transport: new StreamableHTTPClientTransport(url, {- fetch: diagnosticFetch,- requestInit- }),- type: MCPTransportType.STREAMABLE_HTTP- };- } catch (httpError) {- console.warn(`[MCPService] StreamableHTTP failed, trying SSE transport...`, httpError);-- try {- return {- stopPhaseLogging,- transport: new SSEClientTransport(url, {- eventSourceInit: { fetch: diagnosticFetch },- fetch: diagnosticFetch,- requestInit- }),- type: MCPTransportType.SSE- };- } catch (sseError) {- const httpMsg = httpError instanceof Error ? httpError.message : String(httpError);- const sseMsg = sseError instanceof Error ? sseError.message : String(sseError);-- throw new Error(`Failed to create transport. StreamableHTTP: ${httpMsg}; SSE: ${sseMsg}`);- }- }- }-- /**- * Extract server info from SDK Implementation type.- * Normalizes the SDK's server version response into our MCPServerInfo type.- *- * @param impl - Raw Implementation object from MCP SDK- * @returns Normalized server info or undefined if input is empty- */- private static extractServerInfo(impl: Implementation | undefined): MCPServerInfo | undefined {- if (!impl) {- return undefined;- }-- return {- description: impl.description,- icons: impl.icons?.map((icon: MCPResourceIcon) => ({- mimeType: icon.mimeType,- sizes: icon.sizes,- src: icon.src,- theme: icon.theme- })),- name: impl.name,- title: impl.title,- version: impl.version,- websiteUrl: impl.websiteUrl- };- }-- /**- * Connect to a single MCP server with detailed phase tracking.- *- * Performs the full MCP connection lifecycle:- * 1. Transport creation (with automatic fallback)- * 2. Client initialization and capability exchange- * 3. Tool discovery via `listTools`- *- * Reports progress via `onPhase` callback at each step, enabling- * UI progress indicators during connection.- *- * @param serverName - Display name for the server (used in logging)- * @param serverConfig - Server URL, transport type, proxy, and auth configuration- * @param clientInfo - Optional client identification (defaults to app info)- * @param capabilities - Optional client capability declaration- * @param onPhase - Optional callback for connection phase progress updates- * @param listChangedHandlers - Optional handlers for server-initiated list change notifications- * @returns Full connection object with client, transport, tools, server info, and timing- * @throws {Error} If transport creation or connection fails- */- static async connect(- serverName: string,- serverConfig: MCPServerConfig,- clientInfo?: Implementation,- capabilities?: ClientCapabilities,- onPhase?: MCPPhaseCallback,- listChangedHandlers?: ListChangedHandlers- ): Promise<MCPConnection> {- const startTime = performance.now();- const effectiveClientInfo = clientInfo ?? DEFAULT_MCP_CONFIG.clientInfo;- const effectiveCapabilities = capabilities ?? DEFAULT_MCP_CONFIG.capabilities;-- // Phase: Creating transport- onPhase?.(- MCPConnectionPhase.TRANSPORT_CREATING,- this.createLog(- MCPConnectionPhase.TRANSPORT_CREATING,- `Creating transport for ${serverConfig.url}`- )- );-- if (import.meta.env.DEV && import.meta.env.VITE_DEBUG) {- console.log(`[MCPService][${serverName}] Creating transport...`);- }-- const {- stopPhaseLogging,- transport,- type: transportType- } = this.createTransport(serverName, serverConfig, (log) => onPhase?.(log.phase, log));-- // Setup WebSocket reconnection handler- if (transportType === MCPTransportType.WEBSOCKET) {- transport.onclose = () => {- console.log(`[MCPService][${serverName}] WebSocket closed, notifying for reconnection`);- onPhase?.(- MCPConnectionPhase.DISCONNECTED,- this.createLog(MCPConnectionPhase.DISCONNECTED, 'WebSocket connection closed')- );- };- }-- // Phase: Transport ready- onPhase?.(- MCPConnectionPhase.TRANSPORT_READY,- this.createLog(MCPConnectionPhase.TRANSPORT_READY, `Transport ready (${transportType})`),- { transportType }- );+ // Phase: Transport ready+ onPhase?.(+ MCPConnectionPhase.TRANSPORT_READY,+ this.createLog(MCPConnectionPhase.TRANSPORT_READY, `Transport ready (${transportType})`),+ { transportType }+ );const client = new Client({@@ -848,36 +442,322 @@ export class MCPService {}/**- * Disconnect from a server.- * Clears the `onclose` handler to prevent reconnection attempts on voluntary disconnect.+ * Create transport based on server configuration.+ * Supports WebSocket, StreamableHTTP (modern), and SSE (legacy) transports.+ * When `useProxy` is enabled, routes HTTP requests through llama-server's CORS proxy.+ *+ * **Fallback Order:**+ * 1. WebSocket — if explicitly configured (no CORS proxy support)+ * 2. StreamableHTTP — default for HTTP connections+ * 3. SSE — automatic fallback if StreamableHTTP fails+ *+ * @param config - Server configuration with url, transport type, proxy, and auth settings+ * @returns Object containing the created transport and the transport type used+ * @throws {Error} If url is missing, WebSocket + proxy combination, or all transports fail+ */+ static createTransport(+ serverName: string,+ config: MCPServerConfig,+ onLog?: (log: MCPConnectionLog) => void+ ): {+ transport: Transport;+ type: MCPTransportType;+ stopPhaseLogging: () => void;+ } {+ if (!config.url) {+ throw new Error('MCP server configuration is missing url');+ }++ const useProxy = config.useProxy ?? false;+ const requestInit: RequestInit = {};++ if (config.headers) {+ requestInit.headers = config.useProxy ? buildProxiedHeaders(config.headers) : config.headers;+ }++ if (useProxy) {+ requestInit.headers = {+ ...getAuthHeaders(),+ ...(requestInit.headers as Record<string, string>)+ };+ }++ if (config.credentials) {+ requestInit.credentials = config.credentials;+ }++ if (config.transport === MCPTransportType.WEBSOCKET) {+ if (useProxy) {+ throw new Error(+ 'WebSocket transport is not supported when using CORS proxy. Use HTTP transport instead.'+ );+ }++ const url = new URL(config.url);++ if (import.meta.env.DEV && import.meta.env.VITE_DEBUG) {+ console.log(`[MCPService] Creating WebSocket transport for ${url.href}`);+ }++ return {+ stopPhaseLogging: () => {},+ transport: new WebSocketClientTransport(url),+ type: MCPTransportType.WEBSOCKET+ };+ }++ if (config.transport === MCPTransportType.SSE) {+ const url = useProxy ? buildProxiedUrl(config.url) : new URL(config.url);+ const { disable: stopPhaseLogging, fetch: diagnosticFetch } = this.createDiagnosticFetch(+ serverName,+ config,+ requestInit,+ url,+ useProxy,+ onLog+ );++ if (import.meta.env.DEV && import.meta.env.VITE_DEBUG) {+ console.log(`[MCPService] Creating SSE transport for ${url.href}`);+ }++ return {+ stopPhaseLogging,+ transport: new SSEClientTransport(url, {+ eventSourceInit: { fetch: diagnosticFetch },+ fetch: diagnosticFetch,+ requestInit+ }),+ type: MCPTransportType.SSE+ };+ }++ const url = useProxy ? buildProxiedUrl(config.url) : new URL(config.url);+ const { disable: stopPhaseLogging, fetch: diagnosticFetch } = this.createDiagnosticFetch(+ serverName,+ config,+ requestInit,+ url,+ useProxy,+ onLog+ );++ if (useProxy && import.meta.env.DEV && import.meta.env.VITE_DEBUG) {+ console.log(`[MCPService] Using CORS proxy for ${config.url} -> ${url.href}`);+ }++ try {+ if (import.meta.env.DEV && import.meta.env.VITE_DEBUG) {+ console.log(`[MCPService] Creating StreamableHTTP transport for ${url.href}`);+ }++ return {+ stopPhaseLogging,+ transport: new StreamableHTTPClientTransport(url, {+ fetch: diagnosticFetch,+ requestInit+ }),+ type: MCPTransportType.STREAMABLE_HTTP+ };+ } catch (httpError) {+ console.warn(`[MCPService] StreamableHTTP failed, trying SSE transport...`, httpError);++ try {+ return {+ stopPhaseLogging,+ transport: new SSEClientTransport(url, {+ eventSourceInit: { fetch: diagnosticFetch },+ fetch: diagnosticFetch,+ requestInit+ }),+ type: MCPTransportType.SSE+ };+ } catch (sseError) {+ const httpMsg = httpError instanceof Error ? httpError.message : String(httpError);+ const sseMsg = sseError instanceof Error ? sseError.message : String(sseError);++ throw new Error(`Failed to create transport. StreamableHTTP: ${httpMsg}; SSE: ${sseMsg}`);+ }+ }+ }++ /**+ * Disconnect from a server.+ * Clears the `onclose` handler to prevent reconnection attempts on voluntary disconnect.+ *+ * @param connection - The active MCP connection to close+ */+ static async disconnect(connection: MCPConnection): Promise<void> {+ if (import.meta.env.DEV && import.meta.env.VITE_DEBUG) {+ console.log(`[MCPService][${connection.serverName}] Disconnecting...`);+ }++ try {+ // Terminate the session first for streamable-http transports to cleanly+ // close streams, matching the inspector's disconnect flow.+ if (connection.transport instanceof StreamableHTTPClientTransport) {+ await connection.transport.terminateSession();+ }++ // Clear error handlers before closing to prevent noise from expected+ // abort errors during shutdown. The inspector avoids this entirely+ // by not setting onerror, but since we use it for protocol logging,+ // we must clear it before disconnect.+ connection.client.onerror = undefined;++ if (connection.transport.onclose) {+ connection.transport.onclose = undefined;+ }++ await connection.client.close();+ } catch (error) {+ console.warn(`[MCPService][${connection.serverName}] Error during disconnect:`, error);+ }+ }++ /**+ * Get a specific prompt with arguments.+ * Unlike list operations, this throws on failure since the caller explicitly+ * requested a specific prompt and needs to handle the error.+ *+ * @param connection - The MCP connection to use+ * @param name - The prompt name to retrieve+ * @param args - Optional key-value arguments to pass to the prompt+ * @returns The prompt result with messages and metadata+ * @throws {Error} If the prompt retrieval fails+ */+ static async getPrompt(+ connection: MCPConnection,+ name: string,+ args?: Record<string, string>+ ): Promise<GetPromptResult> {+ try {+ return await connection.client.getPrompt({ arguments: args, name });+ } catch (error) {+ console.error(`[MCPService][${connection.serverName}] Failed to get prompt:`, error);++ throw error;+ }+ }++ /**+ * Detect if an error indicates an expired/invalidated MCP session.+ * Per MCP spec 2025-11-25: HTTP 404 means session invalidated, client MUST+ * discard its session ID and start a new session with a fresh initialize request.+ *+ * @param error - The caught error to inspect+ * @returns true if the error is a StreamableHTTP 404 (session not found)+ */+ static isSessionExpiredError(error: unknown): boolean {+ return error instanceof StreamableHTTPError && error.code === 404;+ }++ /**+ * List all resources from a connection (handles pagination automatically).+ * @param connection - The MCP connection to use+ * @returns Array of all available resources+ */+ static async listAllResources(connection: MCPConnection): Promise<MCPResource[]> {+ return this.paginate(+ connection,+ (cursor) => this.listResources(connection, cursor),+ (result) => result.resources+ );+ }++ /**+ * List all resource templates from a connection (handles pagination automatically).+ * @param connection - The MCP connection to use+ * @returns Array of all available resource templates+ */+ static async listAllResourceTemplates(connection: MCPConnection): Promise<MCPResourceTemplate[]> {+ return this.paginate(+ connection,+ (cursor) => this.listResourceTemplates(connection, cursor),+ (result) => result.resourceTemplates+ );+ }++ /**+ * List prompts from a connection.+ * Silently returns empty array on failure (logged as warning).*- * @param connection - The active MCP connection to close+ * @param connection - The MCP connection to query+ * @returns Array of available prompts, or empty array on error*/- static async disconnect(connection: MCPConnection): Promise<void> {- if (import.meta.env.DEV && import.meta.env.VITE_DEBUG) {- console.log(`[MCPService][${connection.serverName}] Disconnecting...`);+ static async listPrompts(connection: MCPConnection): Promise<Prompt[]> {+ try {+ const result = await connection.client.listPrompts();++ return result.prompts ?? [];+ } catch (error) {+ // Let session-expired errors propagate for reconnection handling+ if (this.isSessionExpiredError(error)) {+ throw error;+ }++ console.warn(`[MCPService][${connection.serverName}] Failed to list prompts:`, error);++ return [];}+ }+ /**+ * List resources from a connection.+ * @param connection - The MCP connection to use+ * @param cursor - Optional pagination cursor+ * @returns Array of available resources and optional next cursor+ */+ static async listResources(+ connection: MCPConnection,+ cursor?: string+ ): Promise<{ resources: MCPResource[]; nextCursor?: string }> {try {- // Terminate the session first for streamable-http transports to cleanly- // close streams, matching the inspector's disconnect flow.- if (connection.transport instanceof StreamableHTTPClientTransport) {- await connection.transport.terminateSession();+ const result = await connection.client.listResources(cursor ? { cursor } : undefined);++ return {+ nextCursor: result.nextCursor,+ resources: (result.resources ?? []) as MCPResource[]+ };+ } catch (error) {+ if (this.isSessionExpiredError(error)) {+ throw error;}- // Clear error handlers before closing to prevent noise from expected- // abort errors during shutdown. The inspector avoids this entirely- // by not setting onerror, but since we use it for protocol logging,- // we must clear it before disconnect.- connection.client.onerror = undefined;+ console.warn(`[MCPService][${connection.serverName}] Failed to list resources:`, error);- if (connection.transport.onclose) {- connection.transport.onclose = undefined;- }+ return { resources: [] };+ }+ }- await connection.client.close();+ /**+ * List resource templates from a connection.+ * @param connection - The MCP connection to use+ * @param cursor - Optional pagination cursor+ * @returns Array of available resource templates and optional next cursor+ */+ static async listResourceTemplates(+ connection: MCPConnection,+ cursor?: string+ ): Promise<{ resourceTemplates: MCPResourceTemplate[]; nextCursor?: string }> {+ try {+ const result = await connection.client.listResourceTemplates(cursor ? { cursor } : undefined);++ return {+ nextCursor: result.nextCursor,+ resourceTemplates: (result.resourceTemplates ?? []) as MCPResourceTemplate[]+ };} catch (error) {- console.warn(`[MCPService][${connection.serverName}] Error during disconnect:`, error);+ if (this.isSessionExpiredError(error)) {+ throw error;+ }++ console.warn(+ `[MCPService][${connection.serverName}] Failed to list resource templates:`,+ error+ );++ return { resourceTemplates: [] };}}@@ -906,386 +786,506 @@ export class MCPService {}/**- * List prompts from a connection.- * Silently returns empty array on failure (logged as warning).- *- * @param connection - The MCP connection to query- * @returns Array of available prompts, or empty array on error+ * Read the contents of a resource.+ * @param connection - The MCP connection to use+ * @param uri - The URI of the resource to read+ * @returns The resource contents*/- static async listPrompts(connection: MCPConnection): Promise<Prompt[]> {+ static async readResource(+ connection: MCPConnection,+ uri: string+ ): Promise<MCPReadResourceResult> {try {- const result = await connection.client.listPrompts();+ const result = await connection.client.readResource({ uri });- return result.prompts ?? [];+ return {+ _meta: result._meta,+ contents: (result.contents ?? []) as MCPResourceContent[]+ };} catch (error) {- // Let session-expired errors propagate for reconnection handling- if (this.isSessionExpiredError(error)) {- throw error;- }-- console.warn(`[MCPService][${connection.serverName}] Failed to list prompts:`, error);+ console.error(`[MCPService][${connection.serverName}] Failed to read resource:`, error);- return [];+ throw error;}}/**- * Get a specific prompt with arguments.- * Unlike list operations, this throws on failure since the caller explicitly- * requested a specific prompt and needs to handle the error.- *+ * Subscribe to updates for a resource.+ * The server will send notifications/resources/updated when the resource changes.* @param connection - The MCP connection to use- * @param name - The prompt name to retrieve- * @param args - Optional key-value arguments to pass to the prompt- * @returns The prompt result with messages and metadata- * @throws {Error} If the prompt retrieval fails+ * @param uri - The URI of the resource to subscribe to*/- static async getPrompt(- connection: MCPConnection,- name: string,- args?: Record<string, string>- ): Promise<GetPromptResult> {+ static async subscribeResource(connection: MCPConnection, uri: string): Promise<void> {try {- return await connection.client.getPrompt({ arguments: args, name });+ await connection.client.subscribeResource({ uri });++ console.log(`[MCPService][${connection.serverName}] Subscribed to resource: ${uri}`);} catch (error) {- console.error(`[MCPService][${connection.serverName}] Failed to get prompt:`, error);+ console.error(+ `[MCPService][${connection.serverName}] Failed to subscribe to resource:`,+ error+ );throw error;}}/**- * Execute a tool call on a connection.- * Supports abort signal for cancellable operations (e.g., when user stops generation).- * Formats the raw tool result into a string representation.+ * Check if a connection supports resources.+ * Per MCP spec: presence of the `resources` key (even as empty object `{}`) indicates support.+ * Empty object means resources are supported but no sub-features (subscribe, listChanged).*- * @param connection - The MCP connection to execute against- * @param params - Tool name and arguments to execute- * @param signal - Optional AbortSignal for cancellation support- * @returns Formatted tool execution result with content string and error flag- * @throws {Error} If tool execution fails or is aborted+ * @param connection - The MCP connection to check+ * @returns Whether the server declares the resources capability*/- static async callTool(- connection: MCPConnection,- params: ToolCallParams,- signal?: AbortSignal- ): Promise<ToolExecutionResult> {- throwIfAborted(signal);+ static supportsResources(connection: MCPConnection): boolean {+ // Per MCP spec: "Servers that support resources MUST declare the resources capability"+ // The presence of the key indicates support, even if it's an empty object+ return connection.serverCapabilities?.resources !== undefined;+ }++ /**+ * Check if a connection supports resource subscriptions.+ * @param connection - The MCP connection to check+ * @returns Whether the server supports resource subscriptions+ */+ static supportsResourceSubscriptions(connection: MCPConnection): boolean {+ return !!connection.serverCapabilities?.resources?.subscribe;+ }+ /**+ * Unsubscribe from updates for a resource.+ * @param connection - The MCP connection to use+ * @param uri - The URI of the resource to unsubscribe from+ */+ static async unsubscribeResource(connection: MCPConnection, uri: string): Promise<void> {try {- const result = await connection.client.callTool(- { arguments: params.arguments, name: params.name },- undefined,- { signal, timeout: connection.requestTimeoutMs }+ await connection.client.unsubscribeResource({ uri });++ if (import.meta.env.DEV && import.meta.env.VITE_DEBUG) {+ console.log(`[MCPService][${connection.serverName}] Unsubscribed from resource: ${uri}`);+ }+ } catch (error) {+ console.error(+ `[MCPService][${connection.serverName}] Failed to unsubscribe from resource:`,+ error);- return {- content: this.formatToolResult(result as ToolCallResult),- isError: (result as ToolCallResult).isError ?? false- };- } catch (error) {- if (isAbortError(error)) {- throw error;- }+ throw error;+ }+ }++ private static addRequestHeaders(+ requestHeaders: Headers,+ headers: HeadersInit,+ useProxy: boolean+ ) {+ for (const [key, value] of new Headers(headers).entries()) {+ const proxiedKey =+ useProxy && !key.toLowerCase().startsWith(CORS_PROXY.HEADER_PREFIX)+ ? `${CORS_PROXY.HEADER_PREFIX}${key}`+ : key;++ requestHeaders.set(proxiedKey, value);+ }+ }++ private static createDiagnosticFetch(+ serverName: string,+ config: MCPServerConfig,+ baseInit: RequestInit,+ targetUrl: URL,+ useProxy: boolean,+ onLog?: (log: MCPConnectionLog) => void+ ): {+ fetch: typeof fetch;+ disable: () => void;+ } {+ let enabled = true;++ const logIfEnabled = (log: MCPConnectionLog) => {+ if (enabled) {+ onLog?.(log);+ }+ };++ return {+ disable: () => {+ enabled = false;+ },+ fetch: async (input, init) => {+ if (useProxy && typeof window !== 'undefined') {+ let requestUrlStr = '';++ if (typeof input === 'string') {+ requestUrlStr = input;+ } else if (input instanceof URL) {+ requestUrlStr = input.href;+ }++ if (requestUrlStr) {+ const parsedRequestUrl = new URL(requestUrlStr, window.location.origin);++ if (+ parsedRequestUrl.origin === window.location.origin &&+ !parsedRequestUrl.pathname.includes(CORS_PROXY_ENDPOINT)+ ) {+ const originalConfigUrl = new URL(config.url);+ const realTargetUrl = new URL(+ parsedRequestUrl.pathname + parsedRequestUrl.search,+ originalConfigUrl.origin+ );+ const proxiedUrl = buildProxiedUrl(realTargetUrl.href);- // Let session-expired errors propagate unwrapped for reconnection handling- if (this.isSessionExpiredError(error)) {- throw error;- }+ if (typeof input === 'string') {+ input = proxiedUrl.href;+ } else if (input instanceof URL) {+ input = proxiedUrl;+ }+ }+ }+ }- const message = error instanceof Error ? error.message : String(error);+ const startedAt = performance.now();+ const requestHeaders = new Headers(baseInit.headers);- throw new Error(- `Tool "${params.name}" execution failed on server "${connection.serverName}": ${message}`,- { cause: error instanceof Error ? error : undefined }- );- }- }+ if (typeof Request !== 'undefined' && input instanceof Request) {+ this.addRequestHeaders(requestHeaders, input.headers, useProxy);+ }- /**- * Format tool result content items to a single string.- * Handles text, image (base64 data URL), and embedded resource content types.- *- * @param result - Raw tool call result from MCP SDK- * @returns Concatenated string representation of all content items- */- private static formatToolResult(result: ToolCallResult): string {- const content = result.content;+ if (init?.headers) {+ this.addRequestHeaders(requestHeaders, init.headers, useProxy);+ }- if (!Array.isArray(content)) return '';+ const request = this.createDiagnosticRequestDetails(+ input,+ init,+ baseInit,+ requestHeaders,+ Object.keys(config.headers ?? {})+ );+ const { method, url } = request;- const formatted = content- .map((item) => this.formatSingleContent(item))- .filter(Boolean)- .join(NEWLINE);+ logIfEnabled(+ this.createLog(+ MCPConnectionPhase.INITIALIZING,+ `HTTP ${method} ${url}`,+ MCPLogLevel.INFO,+ {+ request,+ serverName+ }+ )+ );- if (formatted !== '') {- return formatted;- }+ if (method === 'DELETE' && url.includes(CORS_PROXY_ENDPOINT)) {+ const response = new Response(null, { status: 200, statusText: 'OK' });- if (result.structuredContent && typeof result.structuredContent === 'object') {- return JSON.stringify(result.structuredContent);- }+ logIfEnabled(+ this.createLog(+ MCPConnectionPhase.INITIALIZING,+ `HTTP 200 ${method} ${url} (fake response)`,+ MCPLogLevel.INFO,+ {+ response: {+ durationMs: 0,+ isFake: true,+ status: response.status,+ statusText: response.statusText,+ url+ }+ }+ )+ );- return '';- }+ // fake response, bypass real fetch()+ return response;+ }- private static formatSingleContent(content: ToolResultContentItem): string {- if (content.type === MCPContentType.TEXT && content.text) {- return content.text;- }+ try {+ const response = await fetch(input, {+ ...baseInit,+ ...init,+ headers: requestHeaders+ });+ const durationMs = Math.round(performance.now() - startedAt);- if (content.type === MCPContentType.IMAGE && content.data) {- return createBase64DataUrl(content.mimeType ?? DEFAULT_IMAGE_MIME_TYPE, content.data);- }+ logIfEnabled(+ this.createLog(+ MCPConnectionPhase.INITIALIZING,+ `HTTP ${response.status} ${method} ${url} (${durationMs}ms)`,+ response.ok ? MCPLogLevel.INFO : MCPLogLevel.WARN,+ {+ response: {+ durationMs,+ headers: sanitizeHeaders(response.headers, undefined, HEADERS.PARTIAL_REDACT),+ status: response.status,+ statusText: response.statusText,+ url+ }+ }+ )+ );- if (content.type === MCPContentType.RESOURCE && content.resource) {- const resource = content.resource;+ return response;+ } catch (error) {+ const durationMs = Math.round(performance.now() - startedAt);- if (resource.text) return resource.text;+ logIfEnabled(+ this.createLog(+ MCPConnectionPhase.ERROR,+ `HTTP ${method} ${url} failed: ${formatDiagnosticErrorMessage(error)}`,+ MCPLogLevel.ERROR,+ {+ browser: this.getBrowserContext(targetUrl, useProxy),+ durationMs,+ error: this.summarizeError(error),+ hints: this.getConnectionHints(targetUrl, config, error),+ request,+ serverName+ }+ )+ );- if (resource.blob) return resource.blob;+ throw error;+ }+ }+ };+ }- return JSON.stringify(resource);- }+ private static createDiagnosticRequestDetails(+ input: RequestInfo | URL,+ init: RequestInit | undefined,+ baseInit: RequestInit,+ requestHeaders: Headers,+ extraRedactedHeaders?: Iterable<string>+ ): DiagnosticRequestDetails {+ const body = getRequestBody(input, init);+ const details: DiagnosticRequestDetails = {+ body: summarizeRequestBody(body),+ credentials: init?.credentials ?? baseInit.credentials,+ headers: sanitizeHeaders(requestHeaders, extraRedactedHeaders, HEADERS.PARTIAL_REDACT),+ method: getRequestMethod(input, init, baseInit).toUpperCase(),+ mode: init?.mode ?? baseInit.mode,+ url: getRequestUrl(input)+ };+ const jsonRpcMethods = extractJsonRpcMethods(body);- if (content.data && content.mimeType) {- return createBase64DataUrl(content.mimeType, content.data);+ if (jsonRpcMethods) {+ details.jsonRpcMethods = jsonRpcMethods;}- return JSON.stringify(content);+ return details;}/**+ * Create a connection log entry for phase tracking.*- *- * Completions Operations- *- *+ * @param phase - The connection phase this log belongs to+ * @param message - Human-readable log message+ * @param level - Log severity level (default: INFO)+ * @param details - Optional structured details for debugging+ * @returns Formatted connection log entry*/+ private static createLog(+ phase: MCPConnectionPhase,+ message: string,+ level: MCPLogLevel = MCPLogLevel.INFO,+ details?: unknown+ ): MCPConnectionLog {+ return {+ details,+ level,+ message,+ phase,+ timestamp: new Date()+ };+ }/**- * Request completion suggestions from a server.- * Used for autocompleting prompt arguments or resource URI templates.+ * Extract server info from SDK Implementation type.+ * Normalizes the SDK's server version response into our MCPServerInfo type.*- * @param connection - The MCP connection to use- * @param ref - Reference to the prompt or resource template- * @param argument - The argument being completed (name and current value)- * @returns Completion result with suggested values+ * @param impl - Raw Implementation object from MCP SDK+ * @returns Normalized server info or undefined if input is empty*/- static async complete(- connection: MCPConnection,- ref: { type: MCPRefType.PROMPT; name: string } | { type: MCPRefType.RESOURCE; uri: string },- argument: { name: string; value: string }- ): Promise<{ values: string[]; total?: number; hasMore?: boolean } | null> {- try {- const result = await connection.client.complete({- argument,- ref- });+ private static extractServerInfo(impl: Implementation | undefined): MCPServerInfo | undefined {+ if (!impl) {+ return undefined;+ }- return result.completion;- } catch (error) {- console.error(`[MCPService] Failed to get completions:`, error);+ return {+ description: impl.description,+ icons: impl.icons?.map((icon: MCPResourceIcon) => ({+ mimeType: icon.mimeType,+ sizes: icon.sizes,+ src: icon.src,+ theme: icon.theme+ })),+ name: impl.name,+ title: impl.title,+ version: impl.version,+ websiteUrl: impl.websiteUrl+ };+ }++ private static formatSingleContent(content: ToolResultContentItem): string {+ if (content.type === MCPContentType.TEXT && content.text) {+ return content.text;+ }- return null;+ if (content.type === MCPContentType.IMAGE && content.data) {+ return createBase64DataUrl(content.mimeType ?? DEFAULT_IMAGE_MIME_TYPE, content.data);}- }- /**- *- *- * Resources Operations- *- *- */+ if (content.type === MCPContentType.RESOURCE && content.resource) {+ const resource = content.resource;- /**- * List resources from a connection.- * @param connection - The MCP connection to use- * @param cursor - Optional pagination cursor- * @returns Array of available resources and optional next cursor- */- static async listResources(- connection: MCPConnection,- cursor?: string- ): Promise<{ resources: MCPResource[]; nextCursor?: string }> {- try {- const result = await connection.client.listResources(cursor ? { cursor } : undefined);+ if (resource.text) return resource.text;- return {- nextCursor: result.nextCursor,- resources: (result.resources ?? []) as MCPResource[]- };- } catch (error) {- if (this.isSessionExpiredError(error)) {- throw error;- }+ if (resource.blob) return resource.blob;- console.warn(`[MCPService][${connection.serverName}] Failed to list resources:`, error);+ return JSON.stringify(resource);+ }- return { resources: [] };+ if (content.data && content.mimeType) {+ return createBase64DataUrl(content.mimeType, content.data);}++ return JSON.stringify(content);}/**- * List all resources from a connection (handles pagination automatically).- * @param connection - The MCP connection to use- * @returns Array of all available resources+ * Format tool result content items to a single string.+ * Handles text, image (base64 data URL), and embedded resource content types.+ *+ * @param result - Raw tool call result from MCP SDK+ * @returns Concatenated string representation of all content items*/- static async listAllResources(connection: MCPConnection): Promise<MCPResource[]> {- const allResources: MCPResource[] = [];+ private static formatToolResult(result: ToolCallResult): string {+ const content = result.content;- let cursor: string | undefined;+ if (!Array.isArray(content)) return '';- do {- const result = await this.listResources(connection, cursor);+ const formatted = content+ .map((item) => this.formatSingleContent(item))+ .filter(Boolean)+ .join(NEWLINE);- allResources.push(...result.resources);- cursor = result.nextCursor;- } while (cursor);+ if (formatted !== '') {+ return formatted;+ }++ if (result.structuredContent && typeof result.structuredContent === 'object') {+ return JSON.stringify(result.structuredContent);+ }- return allResources;+ return '';}- /**- * List resource templates from a connection.- * @param connection - The MCP connection to use- * @param cursor - Optional pagination cursor- * @returns Array of available resource templates and optional next cursor- */- static async listResourceTemplates(- connection: MCPConnection,- cursor?: string- ): Promise<{ resourceTemplates: MCPResourceTemplate[]; nextCursor?: string }> {- try {- const result = await connection.client.listResourceTemplates(cursor ? { cursor } : undefined);+ private static getBrowserContext(+ targetUrl: URL,+ useProxy: boolean+ ): Record<string, unknown> | undefined {+ if (typeof window === 'undefined') {+ return undefined;+ }- return {- nextCursor: result.nextCursor,- resourceTemplates: (result.resourceTemplates ?? []) as MCPResourceTemplate[]- };- } catch (error) {- if (this.isSessionExpiredError(error)) {- throw error;+ return {+ isSecureContext: window.isSecureContext,+ location: window.location.href,+ origin: window.location.origin,+ protocol: window.location.protocol,+ sameOrigin: window.location.origin === targetUrl.origin,+ targetOrigin: targetUrl.origin,+ targetProtocol: targetUrl.protocol,+ useProxy+ };+ }++ private static getConnectionHints(+ targetUrl: URL,+ config: MCPServerConfig,+ error: unknown+ ): string[] {+ const hints: string[] = [];+ const message = error instanceof Error ? error.message : String(error);+ const headerNames = Object.keys(config.headers ?? {});++ if (typeof window !== 'undefined') {+ if (+ window.location.protocol === 'https:' &&+ targetUrl.protocol === 'http:' &&+ !config.useProxy+ ) {+ hints.push(+ 'The page is running over HTTPS but the MCP server is HTTP. Browsers often block this as mixed content; enable the proxy or use HTTPS/WSS for the MCP server.'+ );}- console.warn(- `[MCPService][${connection.serverName}] Failed to list resource templates:`,- error+ if (window.location.origin !== targetUrl.origin && !config.useProxy) {+ hints.push(+ 'This is a cross-origin browser request. If the server is reachable from curl or Node but not from the browser, missing CORS headers are the most likely cause.'+ );+ }+ }++ if (headerNames.length > 0) {+ hints.push(+ `Custom request headers are configured (${headerNames.join(', ')}). That triggers a CORS preflight, so the server must allow OPTIONS and include the matching Access-Control-Allow-Headers response.`+ );+ }++ if (config.credentials && config.credentials !== 'omit') {+ hints.push(+ 'Credentials are enabled for this connection. Cross-origin credentialed requests need Access-Control-Allow-Credentials: true and cannot use a wildcard Access-Control-Allow-Origin.');+ }- return { resourceTemplates: [] };+ if (message.includes('Failed to fetch')) {+ hints.push(+ '"Failed to fetch" is a browser-level network failure. Common causes are CORS rejection, mixed-content blocking, certificate/TLS errors, DNS failures, or nothing listening on the target port.'+ );}++ return hints;}/**- * List all resource templates from a connection (handles pagination automatically).- * @param connection - The MCP connection to use- * @returns Array of all available resource templates+ * Walk a cursor-paginated MCP list endpoint, collecting every page.*/- static async listAllResourceTemplates(connection: MCPConnection): Promise<MCPResourceTemplate[]> {- const allTemplates: MCPResourceTemplate[] = [];+ private static async paginate<T, R extends { nextCursor?: string }>(+ connection: MCPConnection,+ fetchPage: (cursor?: string) => Promise<R>,+ extract: (result: R) => T[]+ ): Promise<T[]> {+ const all: T[] = [];let cursor: string | undefined;do {- const result = await this.listResourceTemplates(connection, cursor);+ const result = await fetchPage(cursor);- allTemplates.push(...result.resourceTemplates);+ all.push(...extract(result));cursor = result.nextCursor;} while (cursor);- return allTemplates;+ return all;}- /**- * Read the contents of a resource.- * @param connection - The MCP connection to use- * @param uri - The URI of the resource to read- * @returns The resource contents- */- static async readResource(- connection: MCPConnection,- uri: string- ): Promise<MCPReadResourceResult> {- try {- const result = await connection.client.readResource({ uri });-+ private static summarizeError(error: unknown): Record<string, unknown> {+ if (error instanceof Error) {return {- _meta: result._meta,- contents: (result.contents ?? []) as MCPResourceContent[]+ cause:+ error.cause instanceof Error+ ? { message: error.cause.message, name: error.cause.name }+ : error.cause,+ message: error.message,+ name: error.name,+ stack: error.stack?.split('\n').slice(0, 6).join('\n')};- } catch (error) {- console.error(`[MCPService][${connection.serverName}] Failed to read resource:`, error);-- throw error;- }- }-- /**- * Subscribe to updates for a resource.- * The server will send notifications/resources/updated when the resource changes.- * @param connection - The MCP connection to use- * @param uri - The URI of the resource to subscribe to- */- static async subscribeResource(connection: MCPConnection, uri: string): Promise<void> {- try {- await connection.client.subscribeResource({ uri });-- console.log(`[MCPService][${connection.serverName}] Subscribed to resource: ${uri}`);- } catch (error) {- console.error(- `[MCPService][${connection.serverName}] Failed to subscribe to resource:`,- error- );-- throw error;- }- }-- /**- * Unsubscribe from updates for a resource.- * @param connection - The MCP connection to use- * @param uri - The URI of the resource to unsubscribe from- */- static async unsubscribeResource(connection: MCPConnection, uri: string): Promise<void> {- try {- await connection.client.unsubscribeResource({ uri });-- if (import.meta.env.DEV && import.meta.env.VITE_DEBUG) {- console.log(`[MCPService][${connection.serverName}] Unsubscribed from resource: ${uri}`);- }- } catch (error) {- console.error(- `[MCPService][${connection.serverName}] Failed to unsubscribe from resource:`,- error- );-- throw error;}- }-- /**- * Check if a connection supports resources.- * Per MCP spec: presence of the `resources` key (even as empty object `{}`) indicates support.- * Empty object means resources are supported but no sub-features (subscribe, listChanged).- *- * @param connection - The MCP connection to check- * @returns Whether the server declares the resources capability- */- static supportsResources(connection: MCPConnection): boolean {- // Per MCP spec: "Servers that support resources MUST declare the resources capability"- // The presence of the key indicates support, even if it's an empty object- return connection.serverCapabilities?.resources !== undefined;- }- /**- * Check if a connection supports resource subscriptions.- * @param connection - The MCP connection to check- * @returns Whether the server supports resource subscriptions- */- static supportsResourceSubscriptions(connection: MCPConnection): boolean {- return !!connection.serverCapabilities?.resources?.subscribe;+ return { value: String(error) };}}diff --git a/tools/ui/src/lib/services/migration.service.ts b/tools/ui/src/lib/services/migration.service.tsindex 2626a42b3c..5d321b3ba2 100644--- a/tools/ui/src/lib/services/migration.service.ts+++ b/tools/ui/src/lib/services/migration.service.ts@@ -1,20 +1,11 @@/**- * Migration Service - Unified data migration hook+ * MigrationService - Unified data migration hook*- * Centralizes all data migrations (localStorage, IndexedDB, legacy formats) into a single- * initialization point. Each migration copies data to new format WITHOUT deleting the old.- *- * **Architecture:**- * - Migrations are defined as objects with `id` and `run()` methods- * - Migration state is tracked in localStorage to avoid re-running- * - `runAllMigrations()` should be called once at app startup- * - All migrations are NON-DESTRUCTIVE - legacy data is preserved for downgrade compatibility- *- * **Current Migrations:**- * 1. localStorage prefix: Copy LlamaCppWebui.* → LlamaUi.* (both preserved)- * 2. IndexedDB database: Copy LlamacppWebui → LlamaUi (both preserved)- * 3. Legacy message format: Transform in-place (preserves structure, migrates markers)- * 4. Theme key: Copy standalone `theme` → config object (both preserved)+ * Centralizes all data migrations (localStorage, IndexedDB, legacy formats)+ * into a single initialization point. Each migration copies data to the new+ * format WITHOUT deleting the old, and state is tracked in localStorage so+ * `runAllMigrations()` (called once at startup) never re-runs a completed+ * migration. All migrations are non-destructive for downgrade compatibility.*/import {diff --git a/tools/ui/src/lib/services/models.service.ts b/tools/ui/src/lib/services/models.service.tsindex 84832e086f..bb1bbd356a 100644--- a/tools/ui/src/lib/services/models.service.ts+++ b/tools/ui/src/lib/services/models.service.ts@@ -1,24 +1,54 @@+/**+ * ModelsService - Stateless model management API layer+ *+ * Wraps the /models endpoints (list, load, unload) and the /models/sse+ * status feed in MODEL and ROUTER modes. No reactive state; consumed by+ * modelsStore and its status manager.+ */+import { base } from '$app/paths';-import {- API_MODELS,- MODEL_ID,- SSE_DATA_PREFIX,- SSE_LINE_SEPARATOR,- SSE_RECORD_SEPARATOR-} from '$lib/constants';+import { API_MODELS, MODEL_ID } from '$lib/constants';import { ServerModelStatus } from '$lib/enums';import type { ParsedModelId } from '$lib/types/models';-import { apiFetch, apiPost, normalizeModelName } from '$lib/utils';+import {+ apiFetch,+ apiPost,+ extractSseDataPayload,+ normalizeModelName,+ splitSseRecords+} from '$lib/utils';import { getAuthHeaders } from '$lib/utils/api-headers';export class ModelsService {+ private static readonly SSE_RECONNECT_MS = 1000;+/**+ * Check if a model is loaded based on its metadata.*+ * @param model - Model data entry from the API response+ * @returns True if the model status is LOADED+ */+ static isModelLoaded(model: ApiModelDataEntry): boolean {+ return model.status.value === ServerModelStatus.LOADED;+ }++ /***- * Listing*+ * Load/Unload*+ *+ */++ /**+ * Check if a model is currently loading.+ *+ * @param model - Model data entry from the API response+ * @returns True if the model status is LOADING*/+ static isModelLoading(model: ApiModelDataEntry): boolean {+ return model.status.value === ServerModelStatus.LOADING;+ }/*** Fetch list of models from OpenAI-compatible endpoint.@@ -41,14 +71,6 @@ export class ModelsService {return apiFetch<ApiRouterModelsListResponse>(API_MODELS.LIST);}- /**- *- *- * Load/Unload- *- *- */-/*** Load a model (ROUTER mode only).* Sends POST request to `/models/load`. Note: the endpoint returns success@@ -68,137 +90,6 @@ export class ModelsService {return apiPost<ApiRouterModelsLoadResponse>(API_MODELS.LOAD, payload);}- /**- * Unload a model (ROUTER mode only).- * Sends POST request to `/models/unload`. Note: the endpoint returns success- * before unloading completes — use polling to await actual unload status.- *- * @param modelId - Model identifier to unload- * @returns Unload response from the server- */- static async unload(modelId: string): Promise<ApiRouterModelsUnloadResponse> {- return apiPost<ApiRouterModelsUnloadResponse>(API_MODELS.UNLOAD, { model: modelId });- }-- /**- *- *- * Status- *- *- */-- /**- * Check if a model is loaded based on its metadata.- *- * @param model - Model data entry from the API response- * @returns True if the model status is LOADED- */- static isModelLoaded(model: ApiModelDataEntry): boolean {- return model.status.value === ServerModelStatus.LOADED;- }-- /**- * Check if a model is currently loading.- *- * @param model - Model data entry from the API response- * @returns True if the model status is LOADING- */- static isModelLoading(model: ApiModelDataEntry): boolean {- return model.status.value === ServerModelStatus.LOADING;- }-- /**- *- *- * Status Feed- *- *- */-- private static readonly SSE_RECONNECT_MS = 1000;-- /**- * Read the /models/sse feed and invoke onEvent for each parsed envelope.- * Reconnects on network drops until the signal aborts. Splits the byte- * stream into SSE records on the blank line boundary; the payload rides in- * the data lines as a JSON envelope with its own model, event and data fields.- */- static async watchModelEvents(- signal: AbortSignal,- onEvent: (event: ApiModelsSseEvent) => void- ): Promise<void> {- const decoder = new TextDecoder();-- while (!signal.aborted) {- try {- const response = await fetch(`${base}${API_MODELS.SSE}`, {- headers: getAuthHeaders(),- signal- });-- if (response.ok && response.body) {- const reader = response.body.getReader();-- let buffer = '';-- while (!signal.aborted) {- const { done, value } = await reader.read();-- if (done) break;-- buffer += decoder.decode(value, { stream: true });-- let boundary = buffer.indexOf(SSE_RECORD_SEPARATOR);-- while (boundary !== -1) {- const event = ModelsService.parseStatusRecord(buffer.slice(0, boundary));-- if (event) onEvent(event);-- buffer = buffer.slice(boundary + SSE_RECORD_SEPARATOR.length);- boundary = buffer.indexOf(SSE_RECORD_SEPARATOR);- }- }- }- } catch {- // network drop or abort falls through to the reconnect delay- }-- if (signal.aborted) return;-- await new Promise((resolve) => setTimeout(resolve, ModelsService.SSE_RECONNECT_MS));- }- }-- /**- * Parse one SSE record into its JSON envelope, or null when the record- * carries no data payload or malformed JSON.- */- private static parseStatusRecord(record: string): ApiModelsSseEvent | null {- const payload = record- .split(SSE_LINE_SEPARATOR)- .filter((line) => line.startsWith(SSE_DATA_PREFIX))- .map((line) => line.slice(SSE_DATA_PREFIX.length).trim())- .join(SSE_LINE_SEPARATOR);-- if (payload.length === 0) return null;-- try {- return JSON.parse(payload) as ApiModelsSseEvent;- } catch {- return null;- }- }-- /**- *- *- * Parsing- *- *- */-/*** Parse a model ID string into its structured components.*@@ -311,4 +202,84 @@ export class ModelsService {return result;}++ /**+ * Unload a model (ROUTER mode only).+ * Sends POST request to `/models/unload`. Note: the endpoint returns success+ * before unloading completes — use polling to await actual unload status.+ *+ * @param modelId - Model identifier to unload+ * @returns Unload response from the server+ */+ static async unload(modelId: string): Promise<ApiRouterModelsUnloadResponse> {+ return apiPost<ApiRouterModelsUnloadResponse>(API_MODELS.UNLOAD, { model: modelId });+ }++ /**+ * Read the /models/sse feed and invoke onEvent for each parsed envelope.+ * Reconnects on network drops until the signal aborts. Splits the byte+ * stream into SSE records on the blank line boundary; the payload rides in+ * the data lines as a JSON envelope with its own model, event and data fields.+ */+ static async watchModelEvents(+ signal: AbortSignal,+ onEvent: (event: ApiModelsSseEvent) => void+ ): Promise<void> {+ const decoder = new TextDecoder();++ while (!signal.aborted) {+ try {+ const response = await fetch(`${base}${API_MODELS.SSE}`, {+ headers: getAuthHeaders(),+ signal+ });++ if (response.ok && response.body) {+ const reader = response.body.getReader();++ let buffer = '';++ while (!signal.aborted) {+ const { done, value } = await reader.read();++ if (done) break;++ buffer += decoder.decode(value, { stream: true });++ const { records, rest } = splitSseRecords(buffer);++ buffer = rest;++ for (const record of records) {+ const event = ModelsService.parseStatusRecord(record);++ if (event) onEvent(event);+ }+ }+ }+ } catch {+ // network drop or abort falls through to the reconnect delay+ }++ if (signal.aborted) return;++ await new Promise((resolve) => setTimeout(resolve, ModelsService.SSE_RECONNECT_MS));+ }+ }++ /**+ * Parse one SSE record into its JSON envelope, or null when the record+ * carries no data payload or malformed JSON.+ */+ private static parseStatusRecord(record: string): ApiModelsSseEvent | null {+ const payload = extractSseDataPayload(record);++ if (payload.length === 0) return null;++ try {+ return JSON.parse(payload) as ApiModelsSseEvent;+ } catch {+ return null;+ }+ }}diff --git a/tools/ui/src/lib/services/parameter-sync.service.ts b/tools/ui/src/lib/services/parameter-sync.service.tsindex 0ed9ebd48c..467e7c2dbd 100644--- a/tools/ui/src/lib/services/parameter-sync.service.ts+++ b/tools/ui/src/lib/services/parameter-sync.service.ts@@ -1,3 +1,11 @@+/**+ * ParameterSyncService - Syncs sampling parameters with the server+ *+ * Decides for each sampling parameter whether the user's setting is an+ * override of the server default, and normalizes floating-point values.+ * No reactive state; consumed by settingsStore.+ */+import { SETTINGS_KEYS, SYNCABLE_PARAMETERS } from '$lib/constants';import { ParameterSource, SyncableParameterType } from '$lib/enums';import type { ParameterInfo, ParameterRecord, ParameterValue } from '$lib/types';@@ -5,22 +13,47 @@ import { normalizeFloatingPoint } from '$lib/utils';export class ParameterSyncService {/**+ * Check if a parameter can be synced from server.*- *- * Extraction- *- *+ * @param key - The parameter key to check+ * @returns True if the parameter is in the syncable parameters list*/+ static canSyncParameter(key: string): boolean {+ return SYNCABLE_PARAMETERS.some((param) => param.key === key && param.canSync);+ }/**- * Round floating-point numbers to avoid JavaScript precision issues.- * E.g., 0.1 + 0.2 = 0.30000000000000004 → 0.3+ * Create a diff between current settings and server defaults.+ * Shows which parameters differ from server values, useful for debugging+ * and for the "Reset to defaults" functionality.*- * @param value - Parameter value to normalize- * @returns Precision-normalized value+ * @param currentSettings - Current parameter values in the settings store+ * @param serverDefaults - Default values extracted from server props+ * @returns Record of parameter diffs with current value, server value, and whether they differ*/- private static roundFloatingPoint(value: ParameterValue): ParameterValue {- return normalizeFloatingPoint(value) as ParameterValue;+ static createParameterDiff(+ currentSettings: ParameterRecord,+ serverDefaults: ParameterRecord+ ): Record<string, { current: ParameterValue; server: ParameterValue; differs: boolean }> {+ const diff: Record<+ string,+ { current: ParameterValue; server: ParameterValue; differs: boolean }+ > = {};++ for (const key of this.getSyncableParameterKeys()) {+ const currentValue = currentSettings[key];+ const serverValue = serverDefaults[key];++ if (serverValue !== undefined) {+ diff[key] = {+ current: currentValue,+ differs: currentValue !== serverValue,+ server: serverValue+ };+ }+ }++ return diff;}/**@@ -59,49 +92,6 @@ export class ParameterSyncService {return extracted;}- /**- *- *- * Merging- *- *- */-- /**- * Merge server defaults with current user settings.- * User overrides always take priority — only parameters not in `userOverrides`- * set will be updated from server defaults.- *- * @param currentSettings - Current parameter values in the settings store- * @param serverDefaults - Default values extracted from server props- * @param userOverrides - Set of parameter keys explicitly overridden by the user- * @returns Merged parameter record with user overrides preserved- */- static mergeWithServerDefaults(- currentSettings: ParameterRecord,- serverDefaults: ParameterRecord,- userOverrides: Set<string> = new Set()- ): ParameterRecord {- const merged = { ...currentSettings };-- for (const [key, serverValue] of Object.entries(serverDefaults)) {- // Only update if user hasn't explicitly overridden this parameter- if (!userOverrides.has(key)) {- merged[key] = this.roundFloatingPoint(serverValue);- }- }-- return merged;- }-- /**- *- *- * Info- *- *- */-/*** Get parameter information including source and values.* Used by SettingsChatParameterSourceIndicator to display the correct badge@@ -133,22 +123,39 @@ export class ParameterSyncService {}/**- * Check if a parameter can be synced from server.+ * Get all syncable parameter keys.*- * @param key - The parameter key to check- * @returns True if the parameter is in the syncable parameters list+ * @returns Array of parameter keys that can be synced from server*/- static canSyncParameter(key: string): boolean {- return SYNCABLE_PARAMETERS.some((param) => param.key === key && param.canSync);+ static getSyncableParameterKeys(): string[] {+ return SYNCABLE_PARAMETERS.filter((param) => param.canSync).map((param) => param.key);}/**- * Get all syncable parameter keys.+ * Merge server defaults with current user settings.+ * User overrides always take priority — only parameters not in `userOverrides`+ * set will be updated from server defaults.*- * @returns Array of parameter keys that can be synced from server+ * @param currentSettings - Current parameter values in the settings store+ * @param serverDefaults - Default values extracted from server props+ * @param userOverrides - Set of parameter keys explicitly overridden by the user+ * @returns Merged parameter record with user overrides preserved*/- static getSyncableParameterKeys(): string[] {- return SYNCABLE_PARAMETERS.filter((param) => param.canSync).map((param) => param.key);+ static mergeWithServerDefaults(+ currentSettings: ParameterRecord,+ serverDefaults: ParameterRecord,+ userOverrides: Set<string> = new Set()+ ): ParameterRecord {+ const merged = { ...currentSettings };++ for (const [key, serverValue] of Object.entries(serverDefaults)) {+ // Only update if user hasn't explicitly overridden this parameter+ if (!userOverrides.has(key)) {+ merged[key] = this.roundFloatingPoint(serverValue);+ }+ }++ return merged;}/**@@ -176,44 +183,13 @@ export class ParameterSyncService {}/**+ * Round floating-point numbers to avoid JavaScript precision issues.+ * E.g., 0.1 + 0.2 = 0.30000000000000004 → 0.3*- *- * Diff- *- *- */-- /**- * Create a diff between current settings and server defaults.- * Shows which parameters differ from server values, useful for debugging- * and for the "Reset to defaults" functionality.- *- * @param currentSettings - Current parameter values in the settings store- * @param serverDefaults - Default values extracted from server props- * @returns Record of parameter diffs with current value, server value, and whether they differ+ * @param value - Parameter value to normalize+ * @returns Precision-normalized value*/- static createParameterDiff(- currentSettings: ParameterRecord,- serverDefaults: ParameterRecord- ): Record<string, { current: ParameterValue; server: ParameterValue; differs: boolean }> {- const diff: Record<- string,- { current: ParameterValue; server: ParameterValue; differs: boolean }- > = {};-- for (const key of this.getSyncableParameterKeys()) {- const currentValue = currentSettings[key];- const serverValue = serverDefaults[key];-- if (serverValue !== undefined) {- diff[key] = {- current: currentValue,- differs: currentValue !== serverValue,- server: serverValue- };- }- }-- return diff;+ private static roundFloatingPoint(value: ParameterValue): ParameterValue {+ return normalizeFloatingPoint(value) as ParameterValue;}}diff --git a/tools/ui/src/lib/services/props.service.ts b/tools/ui/src/lib/services/props.service.tsindex 46f4915fad..488a67b641 100644--- a/tools/ui/src/lib/services/props.service.ts+++ b/tools/ui/src/lib/services/props.service.ts@@ -1,14 +1,14 @@+/**+ * PropsService - Fetches server properties from /props+ *+ * Returns global server settings and capabilities, including per-model+ * modalities in MODEL mode. No reactive state; consumed by serverStore and+ * the model props manager.+ */+import { apiFetchWithParams } from '$lib/utils';export class PropsService {- /**- *- *- * Fetching- *- *- */-/*** Fetches global server properties from the `/props` endpoint.* In MODEL mode, returns modalities for the single loaded model.diff --git a/tools/ui/src/lib/services/read-media.service.ts b/tools/ui/src/lib/services/read-media.service.tsindex 8de9bbbea5..2858795e8b 100644--- a/tools/ui/src/lib/services/read-media.service.ts+++ b/tools/ui/src/lib/services/read-media.service.ts@@ -1,3 +1,10 @@+/**+ * ReadMediaService - Reads local media files for the read_media tool+ *+ * Encodes image and audio files as base64 data URLs with the metadata the+ * model needs. No reactive state; consumed by toolsStore.+ */+import { ToolsService } from './tools.service';import {FILE_EXTENSION_SEPARATOR,@@ -40,7 +47,7 @@ function fileExtension(path: string): string {* actually use the result - the server has no idea which model is selected.** @see buildReadMediaToolDefinition in constants/read-media.ts - tool schema sent to the LLM- * @see agenticStore in stores/agentic.svelte.ts - tool dispatch and attachment extraction+ * @see agenticStore in stores/agentic/index.svelte.ts - tool dispatch and attachment extraction*/export class ReadMediaService {static async executeTool(diff --git a/tools/ui/src/lib/services/router.service.ts b/tools/ui/src/lib/services/router.service.tsindex 59de4cb6fe..217de38f3a 100644--- a/tools/ui/src/lib/services/router.service.ts+++ b/tools/ui/src/lib/services/router.service.ts@@ -1,3 +1,10 @@+/**+ * RouterService - Builds app route paths+ *+ * Returns chat and settings route strings from a single source of truth+ * (ROUTES). No state.+ */+import { ROUTES } from '$lib/constants';export class RouterService {diff --git a/tools/ui/src/lib/services/sandbox-harness.ts b/tools/ui/src/lib/services/sandbox-harness.tsindex 189ff59a5e..29f9ad2a56 100644--- a/tools/ui/src/lib/services/sandbox-harness.ts+++ b/tools/ui/src/lib/services/sandbox-harness.ts@@ -1,3 +1,10 @@+/**+ * Sandbox harness - builds the srcdoc document for the sandboxed iframe+ *+ * Produces the HTML/CSP/worker shim that runs untrusted model code in an+ * opaque origin. Consumed by sandbox.service.+ */+import WORKER_SHIM from './sandbox-worker.js?raw';import { NEWLINE } from '$lib/constants';diff --git a/tools/ui/src/lib/services/sandbox.service.ts b/tools/ui/src/lib/services/sandbox.service.tsindex 27da9d2634..bdc63e4edf 100644--- a/tools/ui/src/lib/services/sandbox.service.ts+++ b/tools/ui/src/lib/services/sandbox.service.ts@@ -1,3 +1,11 @@+/**+ * SandboxService - Runs untrusted code in a sandboxed worker+ *+ * Executes model-generated code inside a CSP-restricted, opaque-origin+ * iframe worker with output and timeout limits. No reactive state; consumed+ * by toolsStore for code-execution tools.+ */+import { buildSandboxHarness } from './sandbox-harness';import {NEWLINE,@@ -8,7 +16,7 @@ import {SANDBOX_TOOL_NAME,SANDBOX_TRUNCATION_NOTICE} from '$lib/constants';-import { settingsStore } from '$lib/stores/settings.svelte';+import { settingsStore } from '$lib/stores/settings/index.svelte';import type { ToolExecutionResult } from '$lib/types';/** Cached harnesses keyed by whether nerdamer is included. */diff --git a/tools/ui/src/lib/services/tools.service.ts b/tools/ui/src/lib/services/tools.service.tsindex 2b3a2c0dc7..78229756ce 100644--- a/tools/ui/src/lib/services/tools.service.ts+++ b/tools/ui/src/lib/services/tools.service.ts@@ -1,3 +1,10 @@+/**+ * ToolsService - Stateless server tools API layer+ *+ * Fetches the server's /tools listing and streams tool execution results.+ * No reactive state; consumed by toolsStore.+ */+import { base } from '$app/paths';import { API_TOOLS, HEADERS } from '$lib/constants';import { ToolResponseField } from '$lib/enums';@@ -7,15 +14,6 @@ import { getJsonHeaders } from '$lib/utils/api-headers';import { parseSseJsonStream, type SseJsonEvent } from '$lib/utils/sse';export class ToolsService {- /**- * Fetch the list of server tools from the server.- *- * @returns Array of tool definitions in OpenAI-compatible format- */- static async list(): Promise<ServerToolInfo[]> {- return apiFetch<ServerToolInfo[]>(API_TOOLS.LIST);- }-/*** Execute a server tool on the server.*@@ -76,6 +74,15 @@ export class ToolsService {});}+ /**+ * Fetch the list of server tools from the server.+ *+ * @returns Array of tool definitions in OpenAI-compatible format+ */+ static async list(): Promise<ServerToolInfo[]> {+ return apiFetch<ServerToolInfo[]>(API_TOOLS.LIST);+ }+/*** Stream a server tool's output chunks from the server. The server* `POST /tools` endpoint with `{stream: true}` emits `data: {"chunk": "..."}`diff --git a/tools/ui/src/lib/stores/agentic/gates.svelte.ts b/tools/ui/src/lib/stores/agentic/gates.svelte.tsnew file mode 100644index 0000000000..6b52fa3aff--- /dev/null+++ b/tools/ui/src/lib/stores/agentic/gates.svelte.ts@@ -0,0 +1,208 @@+/**+ * AgenticGates - User interaction gates for the agentic loop+ *+ * Owns the state the loop waits on between turns: tool permission requests,+ * turn-limit continue prompts and queued steering messages. The loop awaits+ * requestPermission/requestContinue; the UI resolves them through+ * resolvePermission/resolveContinue. Owned by agenticStore, no host coupling.+ */++import { ToolPermissionDecision } from '$lib/enums';+// direct imports between stores, not via the barrel, to avoid circular deps+import { permissionsStore } from '$lib/stores/permissions.svelte';+import { toolsStore } from '$lib/stores/tools.svelte';+import type { DatabaseMessageExtra, SteeringMessage } from '$lib/types';+import { SvelteMap } from 'svelte/reactivity';++export class AgenticGates {+ /** Resolve functions for pending continue Promises; nothing derives from this map */+ private continueResolvers = new SvelteMap<string, (shouldContinue: boolean) => void>();+ /** Dedicated reactive state for pending continue requests (turn limit reached) */+ private pendingContinueRequests = new SvelteMap<string, boolean>();++ /** Dedicated reactive state for pending permission requests (ensures immediate UI updates) */+ private pendingPermissions = new SvelteMap<+ string,+ { toolName: string; serverLabel: string } | null+ >();+ /** Resolve functions for pending permission Promises; nothing derives from this map */+ private permissionResolvers = new SvelteMap<string, (decision: ToolPermissionDecision) => void>();++ /** Reactive: queued steering messages to inject between turns */+ private steeringMessages = new SvelteMap<string, SteeringMessage>();++ /**+ * Drop all pending gate state for a conversation, e.g. when a flow exits.+ */+ clear(conversationId: string): void {+ this.pendingPermissions.set(conversationId, null);+ this.permissionResolvers.delete(conversationId);+ this.pendingContinueRequests.set(conversationId, false);+ this.continueResolvers.delete(conversationId);+ this.steeringMessages.delete(conversationId);+ }++ /**+ * Clear the pending steering message without consuming it.+ */+ clearSteeringMessage(conversationId: string): void {+ this.steeringMessages.delete(conversationId);+ }++ /**+ * Consume and return the pending steering message for re-sending.+ * Called by chatStore after the agentic flow exits.+ */+ consumePendingSteeringMessage(conversationId: string): SteeringMessage | null {+ const msg = this.steeringMessages.get(conversationId);++ if (!msg) return null;++ this.steeringMessages.delete(conversationId);++ return msg;+ }++ getPendingContinueRequest(conversationId: string): boolean {+ return this.pendingContinueRequests.get(conversationId) ?? false;+ }++ getPendingPermissionRequest(+ conversationId: string+ ): { toolName: string; serverLabel: string } | null {+ return this.pendingPermissions.get(conversationId) ?? null;+ }++ getPendingSteeringMessageContent(conversationId: string): string | null {+ return this.steeringMessages.get(conversationId)?.content ?? null;+ }++ getPendingSteeringMessageExtras(conversationId: string): DatabaseMessageExtra[] | undefined {+ return this.steeringMessages.get(conversationId)?.extras;+ }++ hasPendingSteeringMessage(conversationId: string): boolean {+ return this.steeringMessages.has(conversationId);+ }++ /**+ * Queue a steering message. When the current agentic turn completes,+ * the flow exits and the caller re-sends the message as a normal chat message.+ */+ injectSteeringMessage(+ conversationId: string,+ content: string,+ extras?: DatabaseMessageExtra[]+ ): void {+ this.steeringMessages.set(conversationId, { content, extras });+ }++ async requestContinue(conversationId: string, signal?: AbortSignal): Promise<boolean> {+ this.pendingContinueRequests.set(conversationId, true);++ return new Promise<boolean>((resolve) => {+ if (signal?.aborted) {+ this.pendingContinueRequests.set(conversationId, false);+ resolve(false);++ return;+ }++ this.continueResolvers.set(conversationId, (shouldContinue) => {+ this.pendingContinueRequests.set(conversationId, false);+ resolve(shouldContinue);+ });++ signal?.addEventListener(+ 'abort',+ () => {+ const resolver = this.continueResolvers.get(conversationId);++ if (resolver) {+ this.continueResolvers.delete(conversationId);+ this.pendingContinueRequests.set(conversationId, false);+ resolve(false);+ }+ },+ { once: true }+ );+ });+ }++ async requestPermission(+ conversationId: string,+ toolName: string,+ serverLabel: string,+ signal?: AbortSignal+ ): Promise<ToolPermissionDecision> {+ const permissionKey = toolsStore.getPermissionKey(toolName);++ if (permissionKey && permissionsStore.hasTool(permissionKey)) {+ return ToolPermissionDecision.ONCE;+ }++ this.pendingPermissions.set(conversationId, { serverLabel, toolName });++ return new Promise<ToolPermissionDecision>((resolve) => {+ if (signal?.aborted) {+ this.pendingPermissions.set(conversationId, null);+ resolve(ToolPermissionDecision.DENY);++ return;+ }++ this.permissionResolvers.set(conversationId, (decision) => {+ this.pendingPermissions.set(conversationId, null);++ if (decision === ToolPermissionDecision.ALWAYS && permissionKey) {+ permissionsStore.allowTool(permissionKey);+ } else if (decision === ToolPermissionDecision.ALWAYS_SERVER) {+ const serverToolKeys = toolsStore.allTools+ .filter((t) =>+ t.serverName+ ? t.serverName === serverLabel+ : toolsStore.getToolServerLabel(t.definition.function.name) === serverLabel+ )+ .map((t) => toolsStore.getPermissionKey(t.definition.function.name)!)+ .filter((k): k is string => k !== null);++ permissionsStore.allowTools(serverToolKeys);+ }++ resolve(decision);+ });++ signal?.addEventListener(+ 'abort',+ () => {+ const resolver = this.permissionResolvers.get(conversationId);++ if (resolver) {+ this.permissionResolvers.delete(conversationId);+ this.pendingPermissions.set(conversationId, null);+ resolve(ToolPermissionDecision.DENY);+ }+ },+ { once: true }+ );+ });+ }++ resolveContinue(conversationId: string, shouldContinue: boolean): void {+ const resolver = this.continueResolvers.get(conversationId);++ if (resolver) {+ this.continueResolvers.delete(conversationId);+ resolver(shouldContinue);+ }+ }++ resolvePermission(conversationId: string, decision: ToolPermissionDecision): void {+ const resolver = this.permissionResolvers.get(conversationId);++ if (resolver) {+ this.permissionResolvers.delete(conversationId);+ resolver(decision);+ }+ }+}diff --git a/tools/ui/src/lib/stores/agentic.svelte.ts b/tools/ui/src/lib/stores/agentic/index.svelte.tssimilarity index 77%rename from tools/ui/src/lib/stores/agentic.svelte.tsrename to tools/ui/src/lib/stores/agentic/index.svelte.tsindex d2a2ea8871..a91e0ba46f 100644--- a/tools/ui/src/lib/stores/agentic.svelte.ts+++ b/tools/ui/src/lib/stores/agentic/index.svelte.ts@@ -1,23 +1,13 @@/**- * agenticStore - Reactive State Store for Agentic Loop Orchestration+ * AgenticStore - Multi-turn agentic loop orchestration*- * Manages multi-turn agentic loop with MCP tools:- * - LLM streaming with tool call detection- * - Tool execution via mcpStore- * - Session state management- * - Turn limit enforcement+ * Drives the agentic loop over MCP tools: streams each LLM turn, detects+ * tool calls, executes them via mcpStore, and enforces the turn limit. Each+ * turn produces one assistant message (with tool_calls) and one tool result+ * message per executed call, persisted as separate DB rows.*- * Each agentic turn produces separate DB messages:- * - One assistant message per LLM turn (with tool_calls if any)- * - One tool result message per tool call execution- *- * **Architecture & Relationships:**- * - **ChatService**: Stateless API layer (sendMessage, streaming)- * - **mcpStore**: MCP connection management and tool execution- * - **agenticStore** (this): Reactive state + business logic- *- * @see ChatService in services/chat.service.ts for API operations- * @see mcpStore in stores/mcp.svelte.ts for MCP operations+ * Uses ChatService for streaming and mcpStore for tool execution; waits on+ * the permission/continue/steering gates owned by {@link AgenticGates}.*/import { DEFAULT_AGENTIC_CONFIG, NEWLINE } from '$lib/constants';@@ -43,11 +33,11 @@ import { ReadMediaService } from '$lib/services/read-media.service';import { SandboxService } from '$lib/services/sandbox.service';import { ToolsService } from '$lib/services/tools.service';// direct imports between stores, not via the barrel, to avoid circular deps-import { conversationsStore } from '$lib/stores/conversations.svelte';-import { mcpStore } from '$lib/stores/mcp.svelte';-import { modelsStore } from '$lib/stores/models.svelte';-import { permissionsStore } from '$lib/stores/permissions.svelte';-import { settingsStore } from '$lib/stores/settings.svelte';+import { AgenticGates } from '$lib/stores/agentic/gates.svelte';+import { conversationsStore } from '$lib/stores/conversations/index.svelte';+import { mcpStore } from '$lib/stores/mcp/index.svelte';+import { modelsStore } from '$lib/stores/models/index.svelte';+import { settingsStore } from '$lib/stores/settings/index.svelte';import { toolsStore } from '$lib/stores/tools.svelte';import type {AgenticConfig,@@ -152,141 +142,140 @@ function toAgenticMessages(messages: ApiChatMessageData[]): AgenticMessage[] {}class AgenticStore {- private _sessions = new SvelteMap<string, AgenticSession>();- /** Dedicated reactive state for pending permission requests (ensures immediate UI updates) */- private _pendingPermissions = new SvelteMap<- string,- { toolName: string; serverLabel: string } | null- >();- /** Non-reactive: stores resolve functions for pending permission Promises */- private _permissionResolvers = new Map<string, (decision: ToolPermissionDecision) => void>();-- /** Dedicated reactive state for pending continue requests (turn limit reached) */- private _pendingContinueRequests = new SvelteMap<string, boolean>();- /** Non-reactive: stores resolve functions for pending continue Promises */- private _continueResolvers = new Map<string, (shouldContinue: boolean) => void>();-- /** Reactive: queued steering messages to inject between turns */- private _steeringMessages = new SvelteMap<string, SteeringMessage>();+ // permission, continue and steering gates the loop waits on between turns+ private gates = new AgenticGates();+ private sessions = new SvelteMap<string, AgenticSession>();- get isReady(): boolean {- return true;- }get isAnyRunning(): boolean {- for (const session of this._sessions.values()) {+ for (const session of this.sessions.values()) {if (session.isRunning) return true;}return false;}- getSession(conversationId: string): AgenticSession {- let session = this._sessions.get(conversationId);+ get isReady(): boolean {+ return true;+ }- if (!session) {- session = createDefaultSession();- this._sessions.set(conversationId, session);- }+ clearError(conversationId: string): void {+ this.updateSession(conversationId, { lastError: null });+ }- return session;+ clearSession(conversationId: string): void {+ this.sessions.delete(conversationId);}- private updateSession(conversationId: string, update: Partial<AgenticSession>): void {- const session = this.getSession(conversationId);+ /**+ * Clear the pending steering message without consuming it.+ */+ clearSteeringMessage(conversationId: string): void {+ this.gates.clearSteeringMessage(conversationId);+ }- this._sessions.set(conversationId, { ...session, ...update });+ constructor() {+ // drop per-conversation session state when the conversation is deleted,+ // otherwise every conversation that ever ran a flow leaks a session here+ conversationsStore.onConversationsDeleted((convIds) => {+ for (const convId of convIds) {+ this.sessions.delete(convId);+ }+ });}- clearSession(conversationId: string): void {- this._sessions.delete(conversationId);+ /**+ * Consume and return the pending steering message for re-sending.+ * Called by chatStore after the agentic flow exits.+ */+ consumePendingSteeringMessage(conversationId: string): SteeringMessage | null {+ return this.gates.consumePendingSteeringMessage(conversationId);}getActiveSessions(): Array<{ conversationId: string; session: AgenticSession }> {const active: Array<{ conversationId: string; session: AgenticSession }> = [];- for (const [conversationId, session] of this._sessions.entries()) {+ for (const [conversationId, session] of this.sessions.entries()) {if (session.isRunning) active.push({ conversationId, session });}return active;}- isRunning(conversationId: string): boolean {- return this._sessions.get(conversationId)?.isRunning ?? false;- }+ getConfig(settings: SettingsConfigType, perChatOverrides?: McpServerOverride[]): AgenticConfig {+ const maxTurns = Number(settings.agenticMaxTurns) || DEFAULT_AGENTIC_CONFIG.maxTurns;+ const hasTools =+ mcpStore.hasEnabledServers(perChatOverrides) ||+ toolsStore.serverTools.length > 0 ||+ toolsStore.browserTools.length > 0 ||+ toolsStore.customTools.length > 0;- // read-only: safe to call from derivations, unlike getSession- getLiveLlmTotals(conversationId: string): AgenticSession['liveLlm'] {- return this._sessions.get(conversationId)?.liveLlm ?? null;+ return {+ enabled: hasTools && DEFAULT_AGENTIC_CONFIG.enabled,+ maxTurns+ };}- // read-only: safe to call from derivations, unlike getSession- getFlowRootMessageId(conversationId: string): string | null {- return this._sessions.get(conversationId)?.flowRootMessageId ?? null;+ getCurrentTurn(conversationId: string): number {+ return this.sessions.get(conversationId)?.currentTurn ?? 0;}- currentTurn(conversationId: string): number {- return this._sessions.get(conversationId)?.currentTurn ?? 0;+ getExecutingToolCallId(conversationId: string): string | null {+ return this.sessions.get(conversationId)?.executingToolCallId ?? null;}- totalToolCalls(conversationId: string): number {- return this._sessions.get(conversationId)?.totalToolCalls ?? 0;+ // read-only: safe to call from derivations, unlike getSession+ getFlowRootMessageId(conversationId: string): string | null {+ return this.sessions.get(conversationId)?.flowRootMessageId ?? null;}- lastError(conversationId: string): Error | null {- return this._sessions.get(conversationId)?.lastError ?? null;+ getLastError(conversationId: string): Error | null {+ return this.sessions.get(conversationId)?.lastError ?? null;}- streamingToolCall(conversationId: string): { name: string; arguments: string } | null {- return this._sessions.get(conversationId)?.streamingToolCall ?? null;+ // read-only: safe to call from derivations, unlike getSession+ getLiveLlmTotals(conversationId: string): AgenticSession['liveLlm'] {+ return this.sessions.get(conversationId)?.liveLlm ?? null;}- executingToolCallId(conversationId: string): string | null {- return this._sessions.get(conversationId)?.executingToolCallId ?? null;+ getPendingContinueRequest(conversationId: string): boolean {+ return this.gates.getPendingContinueRequest(conversationId);}- pendingPermissionRequest(+ getPendingPermissionRequest(conversationId: string): { toolName: string; serverLabel: string } | null {- return this._pendingPermissions.get(conversationId) ?? null;+ return this.gates.getPendingPermissionRequest(conversationId);}- pendingContinueRequest(conversationId: string): boolean {- return this._pendingContinueRequests.get(conversationId) ?? false;+ getPendingSteeringMessageContent(conversationId: string): string | null {+ return this.gates.getPendingSteeringMessageContent(conversationId);}- resolveContinue(conversationId: string, shouldContinue: boolean): void {- const resolver = this._continueResolvers.get(conversationId);-- if (resolver) {- this._continueResolvers.delete(conversationId);- resolver(shouldContinue);- }+ getPendingSteeringMessageExtras(conversationId: string): DatabaseMessageExtra[] | undefined {+ return this.gates.getPendingSteeringMessageExtras(conversationId);}- resolvePermission(conversationId: string, decision: ToolPermissionDecision): void {- const resolver = this._permissionResolvers.get(conversationId);+ getSession(conversationId: string): AgenticSession {+ let session = this.sessions.get(conversationId);- if (resolver) {- this._permissionResolvers.delete(conversationId);- resolver(decision);+ if (!session) {+ session = createDefaultSession();+ this.sessions.set(conversationId, session);}- }- clearError(conversationId: string): void {- this.updateSession(conversationId, { lastError: null });+ return session;}- hasPendingSteeringMessage(conversationId: string): boolean {- return this._steeringMessages.has(conversationId);+ getStreamingToolCall(conversationId: string): { name: string; arguments: string } | null {+ return this.sessions.get(conversationId)?.streamingToolCall ?? null;}- pendingSteeringMessageContent(conversationId: string): string | null {- return this._steeringMessages.get(conversationId)?.content ?? null;+ getTotalToolCalls(conversationId: string): number {+ return this.sessions.get(conversationId)?.totalToolCalls ?? 0;}- pendingSteeringMessageExtras(conversationId: string): DatabaseMessageExtra[] | undefined {- return this._steeringMessages.get(conversationId)?.extras;+ hasPendingSteeringMessage(conversationId: string): boolean {+ return this.gates.hasPendingSteeringMessage(conversationId);}/**@@ -298,143 +287,19 @@ class AgenticStore {content: string,extras?: DatabaseMessageExtra[]): void {- this._steeringMessages.set(conversationId, { content, extras });- }-- /**- * Clear the pending steering message without consuming it.- */- clearSteeringMessage(conversationId: string): void {- this._steeringMessages.delete(conversationId);- }-- /**- * Consume and return the pending steering message for re-sending.- * Called by chatStore after the agentic flow exits.- */- consumePendingSteeringMessage(conversationId: string): SteeringMessage | null {- const msg = this._steeringMessages.get(conversationId);-- if (!msg) return null;-- this._steeringMessages.delete(conversationId);-- return msg;+ this.gates.injectSteeringMessage(conversationId, content, extras);}- getConfig(settings: SettingsConfigType, perChatOverrides?: McpServerOverride[]): AgenticConfig {- const maxTurns = Number(settings.agenticMaxTurns) || DEFAULT_AGENTIC_CONFIG.maxTurns;- const hasTools =- mcpStore.hasEnabledServers(perChatOverrides) ||- toolsStore.serverTools.length > 0 ||- toolsStore.browserTools.length > 0 ||- toolsStore.customTools.length > 0;-- return {- enabled: hasTools && DEFAULT_AGENTIC_CONFIG.enabled,- maxTurns- };- }-- private parseToolArguments(args: string | Record<string, unknown>): Record<string, unknown> {- if (typeof args === 'object') return args;-- const trimmed = args.trim();-- if (trimmed === '') return {};-- return JSON.parse(trimmed) as Record<string, unknown>;+ isRunning(conversationId: string): boolean {+ return this.sessions.get(conversationId)?.isRunning ?? false;}- private async requestPermission(- conversationId: string,- toolName: string,- serverLabel: string,- signal?: AbortSignal- ): Promise<ToolPermissionDecision> {- const permissionKey = toolsStore.getPermissionKey(toolName);-- if (permissionKey && permissionsStore.hasTool(permissionKey)) {- return ToolPermissionDecision.ONCE;- }-- this._pendingPermissions.set(conversationId, { serverLabel, toolName });-- return new Promise<ToolPermissionDecision>((resolve) => {- if (signal?.aborted) {- this._pendingPermissions.set(conversationId, null);- resolve(ToolPermissionDecision.DENY);-- return;- }-- this._permissionResolvers.set(conversationId, (decision) => {- this._pendingPermissions.set(conversationId, null);-- if (decision === ToolPermissionDecision.ALWAYS && permissionKey) {- permissionsStore.allowTool(permissionKey);- } else if (decision === ToolPermissionDecision.ALWAYS_SERVER) {- const serverToolKeys = toolsStore.allTools- .filter((t) =>- t.serverName- ? t.serverName === serverLabel- : toolsStore.getToolServerLabel(t.definition.function.name) === serverLabel- )- .map((t) => toolsStore.getPermissionKey(t.definition.function.name)!)- .filter((k): k is string => k !== null);-- permissionsStore.allowTools(serverToolKeys);- }-- resolve(decision);- });-- signal?.addEventListener(- 'abort',- () => {- const resolver = this._permissionResolvers.get(conversationId);-- if (resolver) {- this._permissionResolvers.delete(conversationId);- this._pendingPermissions.set(conversationId, null);- resolve(ToolPermissionDecision.DENY);- }- },- { once: true }- );- });+ resolveContinue(conversationId: string, shouldContinue: boolean): void {+ this.gates.resolveContinue(conversationId, shouldContinue);}- private async requestContinue(conversationId: string, signal?: AbortSignal): Promise<boolean> {- this._pendingContinueRequests.set(conversationId, true);-- return new Promise<boolean>((resolve) => {- if (signal?.aborted) {- this._pendingContinueRequests.set(conversationId, false);- resolve(false);-- return;- }-- this._continueResolvers.set(conversationId, (shouldContinue) => {- this._pendingContinueRequests.set(conversationId, false);- resolve(shouldContinue);- });-- signal?.addEventListener(- 'abort',- () => {- const resolver = this._continueResolvers.get(conversationId);-- if (resolver) {- this._continueResolvers.delete(conversationId);- this._pendingContinueRequests.set(conversationId, false);- resolve(false);- }- },- { once: true }- );- });+ resolvePermission(conversationId: string, decision: ToolPermissionDecision): void {+ this.gates.resolvePermission(conversationId, decision);}async runAgenticFlow(params: AgenticFlowParams): Promise<AgenticFlowResult> {@@ -449,11 +314,7 @@ class AgenticStore {} = params;// Clear any pending permissions/continue requests for this conversation when starting a new flow- this._pendingPermissions.set(conversationId, null);- this._permissionResolvers.delete(conversationId);- this._pendingContinueRequests.set(conversationId, false);- this._continueResolvers.delete(conversationId);- this._steeringMessages.delete(conversationId);+ this.gates.clear(conversationId);// Ensure server tools are fetched before checking if agentic is enabledif (toolsStore.serverTools.length === 0 && !toolsStore.loading) {@@ -482,26 +343,8 @@ class AgenticStore {console.log(`[AgenticStore] Starting agentic flow with ${tools.length} tools`);- const normalizedMessages: ApiChatMessageData[] = (- await Promise.all(- messages.map((msg) => {- if ('id' in msg && 'convId' in msg && 'timestamp' in msg)- return ChatService.convertDbMessageToApiChatMessageData(- msg as DatabaseMessage & { extra?: DatabaseMessageExtra[] }- );-- return msg as ApiChatMessageData;- })- )- ).filter((msg: { role: ChatRole; content: string | ApiChatMessageContentPart[] }) => {- if (msg.role === MessageRole.SYSTEM) {- const content = typeof msg.content === 'string' ? msg.content : '';-- return content.trim().length > 0;- }-- return true;- });+ const normalizedMessages: ApiChatMessageData[] =+ await ChatService.normalizeMessagesForApi(messages);this.updateSession(conversationId, {currentTurn: 0,@@ -550,6 +393,30 @@ class AgenticStore {}}+ private buildAttachmentName(mimeType: string, index: number): string {+ const extension = mimeType.startsWith(MimeTypePrefix.AUDIO)+ ? (AUDIO_MIME_TO_EXTENSION[mimeType] ?? DEFAULT_AUDIO_EXTENSION)+ : (IMAGE_MIME_TO_EXTENSION[mimeType] ?? DEFAULT_IMAGE_EXTENSION);++ return `${MCP_ATTACHMENT_NAME_PREFIX}-${Date.now()}-${index}.${extension}`;+ }++ private buildFinalTimings(+ capturedTimings: ChatMessageTimings | undefined,+ agenticTimings: ChatMessageAgenticTimings+ ): ChatMessageTimings | undefined {+ if (agenticTimings.toolCallsCount === 0) return capturedTimings;++ return {+ agentic: agenticTimings,+ cache_n: capturedTimings?.cache_n,+ predicted_ms: capturedTimings?.predicted_ms,+ predicted_n: capturedTimings?.predicted_n,+ prompt_ms: capturedTimings?.prompt_ms,+ prompt_n: capturedTimings?.prompt_n+ };+ }+private async executeAgenticLoop(params: {conversationId: string;messages: ApiChatMessageData[];@@ -596,7 +463,7 @@ class AgenticStore {while (true) {if (turn >= maxTurns) {// Turn limit reached - ask user whether to continue- const shouldContinue = await this.requestContinue(conversationId, signal);+ const shouldContinue = await this.gates.requestContinue(conversationId, signal);// Yield to allow Svelte to flush the UI updateawait new Promise((r) => setTimeout(r, 0));@@ -769,7 +636,7 @@ class AgenticStore {// === Steering check: if a user message was queued during this turn, exit the flow.// The caller (chatStore) will consume the pending message and re-send it normally.- if (this._steeringMessages.has(conversationId)) {+ if (this.gates.hasPendingSteeringMessage(conversationId)) {console.log('[AgenticStore] Steering message detected after turn, exiting agentic flow');await onAssistantTurnComplete?.(turnContent,@@ -847,7 +714,7 @@ class AgenticStore {}// Check for pending steering message - skip remaining tool calls- if (this._steeringMessages.has(conversationId)) {+ if (this.gates.hasPendingSteeringMessage(conversationId)) {console.log(`[AgenticStore] Steering message detected, skipping ${normalizedCalls.length - i} remaining tool call(s)`);@@ -872,7 +739,7 @@ class AgenticStore {const toolName = toolCall.function.name;const serverLabel = toolsStore.getToolServerLabel(toolName);// Ask for permission before executing the tool- const permission = await this.requestPermission(+ const permission = await this.gates.requestPermission(conversationId,toolName,serverLabel,@@ -959,8 +826,8 @@ class AgenticStore {executionResult = await ReadMediaService.executeTool(args,{- audio: modelsStore.modelSupportsAudio(effectiveModel),- vision: modelsStore.modelSupportsVision(effectiveModel)+ audio: modelsStore.props.modelSupportsAudio(effectiveModel),+ vision: modelsStore.props.modelSupportsVision(effectiveModel)},signal,conversationsStore.activeConversation?.cwd@@ -1058,7 +925,7 @@ class AgenticStore {for (const attachment of attachments) {if (attachment.type === AttachmentType.AUDIO) {- if (modelsStore.modelSupportsAudio(effectiveModel)) {+ if (modelsStore.props.modelSupportsAudio(effectiveModel)) {contentParts.push({input_audio: {data: (attachment as DatabaseMessageExtraAudioFile).base64Data,@@ -1070,7 +937,7 @@ class AgenticStore {});}} else if (attachment.type === AttachmentType.IMAGE) {- if (modelsStore.modelSupportsVision(effectiveModel)) {+ if (modelsStore.props.modelSupportsVision(effectiveModel)) {contentParts.push({image_url: {url: (attachment as DatabaseMessageExtraImageFile).base64Url@@ -1101,7 +968,7 @@ class AgenticStore {}// If tools were interrupted by a steering message, exit now instead of starting another LLM turn- if (this._steeringMessages.has(conversationId)) {+ if (this.gates.hasPendingSteeringMessage(conversationId)) {console.log('[AgenticStore] Steering message detected after tool execution, exiting agentic flow');@@ -1114,35 +981,6 @@ class AgenticStore {}}- private buildFinalTimings(- capturedTimings: ChatMessageTimings | undefined,- agenticTimings: ChatMessageAgenticTimings- ): ChatMessageTimings | undefined {- if (agenticTimings.toolCallsCount === 0) return capturedTimings;-- return {- agentic: agenticTimings,- cache_n: capturedTimings?.cache_n,- predicted_ms: capturedTimings?.predicted_ms,- predicted_n: capturedTimings?.predicted_n,- prompt_ms: capturedTimings?.prompt_ms,- prompt_n: capturedTimings?.prompt_n- };- }-- private normalizeToolCalls(toolCalls: ApiChatCompletionToolCall[]): AgenticToolCallList {- if (!toolCalls) return [];-- return toolCalls.map((call, index) => ({- function: {- arguments: call?.function?.arguments ?? '',- name: call?.function?.name ?? ''- },- id: call?.id ?? `tool_${index}`,- type: (call?.type as ToolCallType.FUNCTION) ?? ToolCallType.FUNCTION- }));- }-private extractBase64Attachments(result: string): {cleanedResult: string;attachments: DatabaseMessageExtra[];@@ -1198,12 +1036,33 @@ class AgenticStore {return { attachments, cleanedResult: cleanedLines.join(NEWLINE) };}- private buildAttachmentName(mimeType: string, index: number): string {- const extension = mimeType.startsWith(MimeTypePrefix.AUDIO)- ? (AUDIO_MIME_TO_EXTENSION[mimeType] ?? DEFAULT_AUDIO_EXTENSION)- : (IMAGE_MIME_TO_EXTENSION[mimeType] ?? DEFAULT_IMAGE_EXTENSION);+ private normalizeToolCalls(toolCalls: ApiChatCompletionToolCall[]): AgenticToolCallList {+ if (!toolCalls) return [];- return `${MCP_ATTACHMENT_NAME_PREFIX}-${Date.now()}-${index}.${extension}`;+ return toolCalls.map((call, index) => ({+ function: {+ arguments: call?.function?.arguments ?? '',+ name: call?.function?.name ?? ''+ },+ id: call?.id ?? `tool_${index}`,+ type: (call?.type as ToolCallType.FUNCTION) ?? ToolCallType.FUNCTION+ }));+ }++ private parseToolArguments(args: string | Record<string, unknown>): Record<string, unknown> {+ if (typeof args === 'object') return args;++ const trimmed = args.trim();++ if (trimmed === '') return {};++ return JSON.parse(trimmed) as Record<string, unknown>;+ }++ private updateSession(conversationId: string, update: Partial<AgenticSession>): void {+ const session = this.getSession(conversationId);++ this.sessions.set(conversationId, { ...session, ...update });}}diff --git a/tools/ui/src/lib/stores/chat.svelte.ts b/tools/ui/src/lib/stores/chat.svelte.tsdeleted file mode 100644index b7add77779..0000000000--- a/tools/ui/src/lib/stores/chat.svelte.ts+++ /dev/null@@ -1,2868 +0,0 @@-/**- * chatStore - Reactive State Store for Chat Operations- *- * Manages chat lifecycle, streaming, message operations, and processing state.- *- * **Architecture & Relationships:**- * - **ChatService**: Stateless API layer (sendMessage, streaming)- * - **chatStore** (this): Reactive state + business logic- * - **conversationsStore**: Conversation persistence and navigation- *- * @see ChatService in services/chat.service.ts for API operations- */--import {- CONVERSATION_ID_SEPARATOR,- CWD_CLEARED_TEXT,- INACTIVE_CONVERSATION,- STREAM_RESUME_RETRY_MS,- SYSTEM_MESSAGE_PLACEHOLDER,- TITLE_GENERATION-} from '$lib/constants';-import {- ContinueIntentKind,- ErrorDialogType,- MessageRole,- MessageType,- ReasoningEffort,- StreamConnectionState-} from '$lib/enums';-import { ChatService } from '$lib/services/chat.service';-import { DatabaseService } from '$lib/services/database.service';-// direct imports between stores, not via the barrel, to avoid circular deps-import { agenticStore } from '$lib/stores/agentic.svelte';-import { conversationsStore } from '$lib/stores/conversations.svelte';-import { mcpStore } from '$lib/stores/mcp.svelte';-import { modelsStore } from '$lib/stores/models.svelte';-import { serverStore } from '$lib/stores/server.svelte';-import { settingsStore } from '$lib/stores/settings.svelte';-import { toolsStore } from '$lib/stores/tools.svelte';-import type {- ApiChatMessageData,- ApiProcessingState,- ApiStreamSession,- ChatMessagePromptProgress,- ChatMessageTimings,- ChatStreamCallbacks,- DatabaseMessage,- DatabaseMessageExtra,- ErrorDialogState-} from '$lib/types';-import {- classifyContinueIntent,- filterByLeafNodeId,- findDescendantMessages,- findLeafNode,- findMessageById,- formatCwdMessage,- generateConversationTitle,- getConversationModel,- isAbortError,- normalizeModelName,- streamIdentity-} from '$lib/utils';-import { SvelteMap, SvelteSet } from 'svelte/reactivity';--interface ConversationStateEntry {- lastAccessed: number;-}--class ChatStore {- activeProcessingState = $state<ApiProcessingState | null>(null);- currentResponse = $state('');- errorDialogState = $state<ErrorDialogState | null>(null);- isLoading = $state(false);- // true while the active conversation streams reasoning content but no visible content yet- isReasoning = $state(false);- // resumable stream connection state for the active conversation- // streaming -> bytes flowing normally, resuming -> waiting on /v1/stream reconnect, lost -> unrecoverable- streamConnectionState = $state<StreamConnectionState>(StreamConnectionState.STREAMING);- chatLoadingStates = new SvelteMap<string, boolean>();- chatReasoningStates = new SvelteMap<string, boolean>();- chatStreamingStates = new SvelteMap<- string,- { response: string; messageId: string; model?: string | null }- >();- // convs that the backend reports as having a running session, populated by the global sync- // at app mount and on visibilitychange. it does not overlap with chatLoadingStates which- // tracks inferences driven by this browser, both are unioned to feed the sidebar spinners- private remoteRunningConvs = new SvelteSet<string>();- // per conv attach lifecycle, used to derive the global streaming flag without flipping it- // off when one conv finishes while another is still streaming. mirrors chatLoadingStates- // in scope but tracks the attach + tee replay path specifically- private attachingConvs = new SvelteSet<string>();- // pending resume retry timers while an owning model loads, one per conv- private resumeRetryTimers = new SvelteMap<string, ReturnType<typeof setTimeout>>();- // convs whose resume waits on a model load: their loading state belongs to the retry loop,- // so discoverActiveStream must not treat it as a live send and bail- private resumePendingConvs = new SvelteSet<string>();- // in-flight discoverActiveStream guard, keyed by conv id- private discoveringConvs = new SvelteSet<string>();- private abortControllers = new SvelteMap<string, AbortController>();- private preEncodeAbortController: AbortController | null = null;- private processingStates = new SvelteMap<string, ApiProcessingState | null>();- private conversationStateTimestamps = new SvelteMap<string, ConversationStateEntry>();- private activeConversationId = $state<string | null>(null);- private isStreamingActive = $state(false);- private isEditModeActive = $state(false);- private addFilesHandler: ((files: File[]) => void) | null = $state(null);- pendingEditMessageId = $state<string | null>(null);- private _pendingDraftMessage = $state<string>('');- private _pendingDraftFiles = $state<ChatUploadedFile[]>([]);-- /** Reactive: queued pending messages for non-agentic streaming */- private _pendingMessages = new SvelteMap<- string,- { content: string; extras?: DatabaseMessageExtra[] }- >();-- private setChatLoading(convId: string, loading: boolean): void {- this.touchConversationState(convId);-- if (loading) {- this.chatLoadingStates.set(convId, true);-- if (convId === conversationsStore.activeConversation?.id) this.isLoading = true;- } else {- this.chatLoadingStates.delete(convId);-- if (convId === conversationsStore.activeConversation?.id) this.isLoading = false;-- this.setChatReasoning(convId, false);- // the local pipe is the authoritative observer of session end: when it finishes (clean- // onComplete or explicit Stop), the backend session is finalized too, so we drop the- // sidebar hint for this conv right away instead of waiting for the next visibilitychange- // snapshot. without this the spinner ghosts until the user toggles the tab- this.remoteRunningConvs.delete(convId);- }- }-- private setChatReasoning(convId: string, reasoning: boolean): void {- if (reasoning) {- this.chatReasoningStates.set(convId, true);-- if (convId === conversationsStore.activeConversation?.id) this.isReasoning = true;- } else {- this.chatReasoningStates.delete(convId);-- if (convId === conversationsStore.activeConversation?.id) this.isReasoning = false;- }- }- private setChatStreaming(- convId: string,- response: string,- messageId: string,- model?: string | null- ): void {- this.touchConversationState(convId);- this.chatStreamingStates.set(convId, {- messageId,- model: model ?? this.chatStreamingStates.get(convId)?.model,- response- });-- if (convId === conversationsStore.activeConversation?.id) this.currentResponse = response;- }- private clearChatStreaming(convId: string, messageId?: string): void {- // session aware: a stale generation must not wipe a newer one's streaming state on the- // same conversation, that would drop the frozen stop identity and stop the wrong session- if (messageId !== undefined) {- const cur = this.chatStreamingStates.get(convId);-- if (cur && cur.messageId !== messageId) return;- }-- this.chatStreamingStates.delete(convId);-- if (convId === conversationsStore.activeConversation?.id) this.currentResponse = '';- }- private getChatStreamingState(- convId: string- ): { response: string; messageId: string } | undefined {- return this.chatStreamingStates.get(convId);- }- syncLoadingStateForChat(convId: string): void {- this.isLoading = this.chatLoadingStates.get(convId) || false;- this.isReasoning = this.chatReasoningStates.get(convId) || false;- const s = this.chatStreamingStates.get(convId);-- this.currentResponse = s?.response || '';- this.isStreamingActive = s !== undefined;- this.setActiveProcessingConversation(convId);-- // Sync streaming content to activeMessages so UI displays current content- if (s?.response && s?.messageId) {- const idx = conversationsStore.findMessageIndex(s.messageId);-- if (idx !== -1) {- conversationsStore.updateMessageAtIndex(idx, { content: s.response });- }- }- }- /**- * Server side stream discovery, split in three pieces:- *- * probeServerStream(convId) -> hits POST /v1/streams/lookup with the conv id, returns the session to attach- * to or null. Pure read, no side effect, no UI lock. Safe to fire in parallel with anything.- *- * attachServerStream(convId) -> flips the spinner immediately, fetches the replay stream- * from byte 0, finds the assistant slot to splice into (creates a placeholder if the conv has- * no assistant message yet, for cross device or fresh local DB cases), and pipes the SSE bytes- * into the message via handleStreamResponse.- *- * discoverActiveStream(convId) -> probe + attach in one call. Used by callers that do not need- * to overlap the probe with other async work.- *- * The mount of the chat page in +page.svelte calls probeServerStream in parallel with- * loadConversation, then attachServerStream once both have settled. This gives the earliest- * possible time to spinner and avoids racing against an empty activeMessages array.- */- async probeServerStream(convId: string): Promise<ApiStreamSession | null> {- if (!convId) return null;-- let sessions: ApiStreamSession[];-- try {- sessions = await ChatService.lookupStreamSessions([convId]);- } catch (e) {- console.warn(`probeServerStream failed for conv ${convId}:`, e);-- return null;- }-- return ChatService.selectActiveStream(sessions);- }-- async attachServerStream(convId: string, streamId?: string): Promise<void> {- if (!convId) return;-- if (this.chatStreamingStates.has(convId)) return;-- // flip the spinner immediately, the user sees activity as soon as the conv becomes active.- // the global isStreamingActive flag is derived from attachingConvs.size, so adding here- // turns it on, and removing in unlock only turns it off when this is the last attach- this.setChatLoading(convId, true);- this.attachingConvs.add(convId);- this.setStreamingActive(true);-- // only set the active processing conv if we are looking at it, otherwise a background- // attach would steal the indicator from the conv the user is currently viewing- if (convId === conversationsStore.activeConversation?.id) {- this.setActiveProcessingConversation(convId);- }-- const unlock = () => {- this.attachingConvs.delete(convId);-- // flip the global flag off only when no other conv is still attaching- if (this.attachingConvs.size === 0) {- this.setStreamingActive(false);- }-- this.setChatLoading(convId, false);- this.clearChatStreaming(convId);- };- // fetch the replay stream from byte 0, rebuild the assistant message from scratch.- // resolve the server side identity, fall back to streamIdentity when the caller does not- // pass a streamId. probeServerStream returns the full id (with ::model suffix when present)- const id = streamId || streamIdentity(convId, modelsStore.selectedModelName);-- let response: Response;-- try {- response = await ChatService.fetchStreamReplay(id);- } catch (e) {- console.error(`attachServerStream replay failed for conv ${convId}:`, e);- unlock();-- return;- }-- // load the target conversation messages by id, not via the active store. when multiple- // attaches run in parallel the active store may reflect another conv and writing through- // its index mixes content across convs (CoT flicker, message bleed). by going through the- // DB we stay isolated, and only mirror into the active store when the attached conv is- // the one currently displayed- let messages: DatabaseMessage[];-- try {- messages = await DatabaseService.getConversationMessages(convId);- } catch (e) {- console.error('attachServerStream load messages failed:', e);- unlock();-- return;- }-- // locate the slot to splice into, create a placeholder assistant message if there is none.- // we use the conv-scoped findLastAssistantIdx helpers, they only depend on the array- let targetIdx = this.findLastAssistantIdx(messages);-- if (targetIdx === -1) {- const lastUserIdx = this.findLastUserIdx(messages);-- if (lastUserIdx === -1) {- console.warn(- `attachServerStream: conv ${convId} has no user or assistant message, cannot splice`- );- unlock();-- return;- }-- try {- const placeholder = await DatabaseService.createMessageBranch(- {- children: [],- content: '',- convId,- parent: messages[lastUserIdx].id,- role: MessageRole.ASSISTANT,- timestamp: Date.now(),- toolCalls: '',- type: MessageType.TEXT- } as Omit<DatabaseMessage, 'id'>,- messages[lastUserIdx].id- );-- messages = [...messages, placeholder];- targetIdx = messages.length - 1;-- // only push into the active store when this conv is the one displayed right now- if (convId === conversationsStore.activeConversation?.id) {- conversationsStore.addMessageToActive(placeholder);- }- } catch (e) {- console.error('attachServerStream placeholder creation failed:', e);- unlock();-- return;- }- }-- if (targetIdx === -1) {- unlock();-- return;- }-- const targetMessage = messages[targetIdx];- const targetMessageId = targetMessage.id;- // when the assistant slot already has content, the running session is a continue or- // another append flow and its buffer holds only the appended deltas. preserve the prefix- // and let the replay add to it. when the slot is empty the session buffer holds the whole- // message so we wipe and rebuild from byte 0- const existingContent = targetMessage.content ?? '';- const existingReasoning = targetMessage.reasoningContent ?? '';- const isAppendMode = existingContent.length > 0;- // helper: write to the active store only when the attached conv is currently displayed.- // the lookup by message id is robust to reordering of activeMessages, two parallel attaches- // can no longer step on each other's indices- const writeActive = (updates: Partial<DatabaseMessage>) => {- if (convId !== conversationsStore.activeConversation?.id) {- return;- }-- const liveIdx = conversationsStore.findMessageIndex(targetMessageId);-- if (liveIdx === -1) return;-- conversationsStore.updateMessageAtIndex(liveIdx, updates);- };-- if (!isAppendMode) {- writeActive({ content: '', reasoningContent: undefined });- }-- // extract the model suffix, the resume calls in handleStreamResponse must reuse the model- // the session was tagged with, not the live dropdown- const sepIdx = id.indexOf(CONVERSATION_ID_SEPARATOR);- const attachedModel: string | null = sepIdx === -1 ? null : id.slice(sepIdx + 2);-- this.setChatStreaming(convId, existingContent, targetMessageId, attachedModel);- const abortController = this.getOrCreateAbortController(convId);-- let streamedContent = '';- let streamedReasoningContent = '';-- const cleanup = () => {- unlock();- this.setProcessingState(convId, null);- };-- try {- await ChatService.handleStreamResponse(- response,- (chunk: string) => {- streamedContent += chunk;- const displayed = isAppendMode ? existingContent + streamedContent : streamedContent;-- writeActive({ content: displayed });- this.setChatStreaming(convId, displayed, targetMessageId);- },- async (- finalContent?: string,- reasoningContent?: string,- timings?: ChatMessageTimings,- toolCalls?: string- ) => {- const streamed = streamedContent || finalContent || '';- const streamedR = streamedReasoningContent || reasoningContent || '';- const content = isAppendMode ? existingContent + streamed : streamed;- const reasoning = isAppendMode ? existingReasoning + streamedR : streamedR;-- // the DB write is the source of truth, mirror to the active store only when- // the conv is currently displayed- await DatabaseService.updateMessage(targetMessageId, {- content,- reasoningContent: reasoning || undefined,- timings,- toolCalls: toolCalls || ''- });- writeActive({- content,- reasoningContent: reasoning || undefined,- timings- });- cleanup();- },- (err: Error) => {- console.error('attachServerStream pipe error:', err);- cleanup();- },- (chunk: string) => {- streamedReasoningContent += chunk;- const displayed = isAppendMode- ? existingReasoning + streamedReasoningContent- : streamedReasoningContent;-- writeActive({ reasoningContent: displayed });- },- undefined,- undefined,- undefined,- undefined,- convId,- abortController.signal,- (connState: StreamConnectionState) => {- if (convId === conversationsStore.activeConversation?.id) {- this.streamConnectionState = connState;- }- },- attachedModel- );- } catch (e) {- console.error('attachServerStream pipe crashed:', e);- cleanup();- }- }-- /**- * Model frozen at send time for a stream awaiting resume, from the persisted stream state.- * The load progress indicator targets it after a reload, when the message row has no model- * yet and the dropdown selection may not be restored.- */- getResumeModel(convId: string): string | null {- return ChatService.getStreamState(convId)?.model ?? null;- }-- async discoverActiveStream(convId: string): Promise<void> {- if (!convId) return;-- if (this.chatStreamingStates.has(convId)) return;-- if (this.chatLoadingStates.get(convId) && !this.resumePendingConvs.has(convId)) return;-- // concurrency guard: another discover may already be running for this conv (typical race- // between mount and visibilitychange on tab switch). a second concurrent fetch on the same- // /v1/stream would duplicate every byte into the DB message, this guard bounces it- if (this.discoveringConvs.has(convId)) return;-- this.discoveringConvs.add(convId);-- try {- // the model is frozen at POST time, rebuild the exact conv::model identity from the- // persisted state so the lookup key matches what the server stored. null means a single- // model conv with no ::suffix, only guess from the dropdown with no persisted state- const localState = ChatService.getStreamState(convId);- const streamId = ChatService.resumeStreamIdentity(- convId,- localState,- modelsStore.selectedModelName- );- // primary path: ask the server which sessions exist for this identity- const serverTarget = await this.probeServerStream(streamId);-- if (serverTarget) {- // pass the full server side identity (may carry a ::model suffix) so the GET routes- // straight to the owning session, no probe or fan out- await this.attachServerStream(convId, serverTarget.conversation_id);-- return;- }-- // fallback: local state remembers an interrupted byte offset for this conv, the server may- // still have a live session matching that identity (we just lost the bytes mid stream). retry- // with the frozen identity, the server probe inside attachServerStream tells us if it exists- if (!localState) {- return;- }-- // quiet status probe first: a full attach flips the loading UI on every try, probing- // keeps the retry loop invisible while the owning model is still loading (503)- const status = await ChatService.probeResumeStatus(streamId);-- if (status === 503) {- // make the wait visible: the empty assistant row persisted at send time renders- // the processing info, whose model load percentage flows from the models feed- this.resumePendingConvs.add(convId);- this.setChatLoading(convId, true);-- if (!this.resumeRetryTimers.has(convId)) {- this.resumeRetryTimers.set(- convId,- setTimeout(() => {- this.resumeRetryTimers.delete(convId);- void this.discoverActiveStream(convId);- }, STREAM_RESUME_RETRY_MS)- );- }-- return;- }-- if (this.resumePendingConvs.delete(convId) && status !== 200) {- // the wait is over without a session to attach, drop the visible loading state- this.setChatLoading(convId, false);- }-- if (status === 0) {- // transient network failure, the next mount or visibility change retries- return;- }-- if (status !== 200) {- // the session is gone (stopped, TTL expired), nothing to resume anymore- ChatService.clearStreamState(convId);-- return;- }-- await this.attachServerStream(convId, streamId);-- // if attachServerStream failed (session gone, TTL expired), clear the local state to avoid retrying forever- if (!this.chatStreamingStates.has(convId) && !this.chatLoadingStates.get(convId)) {- ChatService.clearStreamState(convId);- }- } finally {- this.discoveringConvs.delete(convId);- }- }-- private findLastAssistantIdx(messages: DatabaseMessage[]): number {- for (let i = messages.length - 1; i >= 0; i--) {- if (messages[i].role === MessageRole.ASSISTANT) return i;- }-- return -1;- }-- private findLastUserIdx(messages: DatabaseMessage[]): number {- for (let i = messages.length - 1; i >= 0; i--) {- if (messages[i].role === MessageRole.USER) return i;- }-- return -1;- }-- clearUIState(): void {- this.isLoading = false;- this.currentResponse = '';- this.isStreamingActive = false;- }-- setActiveProcessingConversation(conversationId: string | null): void {- this.activeConversationId = conversationId;- this.activeProcessingState = conversationId- ? this.processingStates.get(conversationId) || null- : null;- }-- getProcessingState(conversationId: string): ApiProcessingState | null {- return this.processingStates.get(conversationId) || null;- }-- private setProcessingState(conversationId: string, state: ApiProcessingState | null): void {- if (state === null) this.processingStates.delete(conversationId);- else this.processingStates.set(conversationId, state);-- if (conversationId === this.activeConversationId) this.activeProcessingState = state;- }-- clearProcessingState(conversationId: string): void {- this.processingStates.delete(conversationId);-- if (conversationId === this.activeConversationId) this.activeProcessingState = null;- }-- getActiveProcessingState(): ApiProcessingState | null {- return this.activeProcessingState;- }-- getCurrentProcessingStateSync(): ApiProcessingState | null {- return this.activeProcessingState;- }-- private setStreamingActive(active: boolean): void {- this.isStreamingActive = active;- }-- isStreaming(): boolean {- return this.isStreamingActive;- }-- private getOrCreateAbortController(convId: string): AbortController {- let c = this.abortControllers.get(convId);-- if (!c || c.signal.aborted) {- c = new AbortController();- this.abortControllers.set(convId, c);- }-- return c;- }-- private abortRequest(convId?: string): void {- if (convId) {- const c = this.abortControllers.get(convId);-- if (c) {- c.abort();- this.abortControllers.delete(convId);- }- } else {- for (const c of this.abortControllers.values()) c.abort();- this.abortControllers.clear();- }- }-- /**- * Abort the current agentic flow signal without clearing loading state.- * Used by "Send immediately" to force the agentic loop to exit so that- * the pending steering message can be re-sent.- *- * Any tool calls captured mid-stream are dropped before the abort so the- * pending message (or a manual follow-up) does not re-send a half-received- * tool call with invalid JSON arguments to the server. Mirrors what the- * Stop button already does through stopGenerationForChat.- */- async abortCurrentFlow(convId: string): Promise<void> {- await this.savePartialResponseIfNeeded(convId);- const c = this.abortControllers.get(convId);-- if (c) {- c.abort();- this.abortControllers.delete(convId);- }- }-- private showErrorDialog(state: ErrorDialogState | null): void {- this.errorDialogState = state;- }-- dismissErrorDialog(): void {- this.errorDialogState = null;- }-- clearEditMode(): void {- this.isEditModeActive = false;- this.addFilesHandler = null;- }-- isEditing(): boolean {- return this.isEditModeActive;- }-- setEditModeActive(handler: (files: File[]) => void): void {- this.isEditModeActive = true;- this.addFilesHandler = handler;- }-- getAddFilesHandler(): ((files: File[]) => void) | null {- return this.addFilesHandler;- }-- clearPendingEditMessageId(): void {- this.pendingEditMessageId = null;- }-- savePendingDraft(message: string, files: ChatUploadedFile[]): void {- this._pendingDraftMessage = message;- this._pendingDraftFiles = [...files];- }-- consumePendingDraft(): { message: string; files: ChatUploadedFile[] } | null {- if (!this._pendingDraftMessage && this._pendingDraftFiles.length === 0) return null;-- const d = { files: [...this._pendingDraftFiles], message: this._pendingDraftMessage };-- this._pendingDraftMessage = '';- this._pendingDraftFiles = [];-- return d;- }-- hasPendingDraft(): boolean {- return Boolean(this._pendingDraftMessage) || this._pendingDraftFiles.length > 0;- }-- getAllLoadingChats(): string[] {- // union of local (this browser is piping) and remote (backend reports a running session- // for this conv but no local pipe yet) sources. the sidebar shows one spinner per entry- const out = new SvelteSet<string>(this.chatLoadingStates.keys());-- for (const id of this.remoteRunningConvs) {- out.add(id);- }-- return Array.from(out);- }-- getAllStreamingChats(): string[] {- return Array.from(this.chatStreamingStates.keys());- }-- /**- * Resync the remote running convs set from the backend. Called by the layout at mount and on- * visibilitychange, no polling. A snapshot semantic: the set is replaced wholesale, stale entries- * for sessions that finalized while the browser was elsewhere are dropped naturally.- */- async syncRemoteRunningStreams(): Promise<void> {- // the conversations store loads from IndexedDB asynchronously, the +layout onMount caller- // fires before that finishes. read ids straight from the DB so the result does not depend- // on the store init race, and the sidebar spinners light up at first paint for every conv- // the user owns even if it has not been hydrated into the store yet- let ids: string[];-- try {- const all = await DatabaseService.getAllConversations();-- ids = all.map((c) => c.id).filter((id) => !!id);- } catch (e) {- console.warn('syncRemoteRunningStreams DB read failed:', e);-- return;- }-- // only ask about conv ids the user already owns- if (ids.length === 0) {- for (const id of Array.from(this.remoteRunningConvs)) {- this.remoteRunningConvs.delete(id);- }-- return;- }-- // rebuild the frozen conv::model identity per conv so a session started with a model still- // matches. the server response is mapped back to the bare id below for the sidebar set- const lookupIds = ids.map((id) =>- ChatService.resumeStreamIdentity(id, ChatService.getStreamState(id), null)- );-- let sessions: ApiStreamSession[];-- try {- sessions = await ChatService.lookupStreamSessions(lookupIds);- } catch (e) {- console.warn('syncRemoteRunningStreams lookup failed:', e);-- return;- }- const running = new SvelteSet<string>();-- for (const s of sessions) {- if (s && !s.is_done && typeof s.conversation_id === 'string' && s.conversation_id) {- // strip the optional ::model suffix, the sidebar set is keyed by the bare conv id- const sepIdx = s.conversation_id.indexOf(CONVERSATION_ID_SEPARATOR);- const bareId = sepIdx === -1 ? s.conversation_id : s.conversation_id.slice(0, sepIdx);-- running.add(bareId);- }- }- for (const id of Array.from(this.remoteRunningConvs)) {- if (!running.has(id)) {- this.remoteRunningConvs.delete(id);- }- }- for (const id of running) {- this.remoteRunningConvs.add(id);- }- }-- getChatStreaming(convId: string): { response: string; messageId: string } | undefined {- return this.getChatStreamingState(convId);- }-- isChatLoading(convId: string): boolean {- return this.chatLoadingStates.get(convId) || false;- }-- private isChatLoadingInternal(convId: string): boolean {- return this.chatLoadingStates.has(convId) || this.chatStreamingStates.has(convId);- }-- hasPendingMessage(convId: string): boolean {- return this._pendingMessages.has(convId);- }-- pendingMessageContent(convId: string): string | null {- return this._pendingMessages.get(convId)?.content ?? null;- }-- pendingMessageExtras(convId: string): DatabaseMessageExtra[] | undefined {- return this._pendingMessages.get(convId)?.extras;- }-- injectPendingMessage(convId: string, content: string, extras?: DatabaseMessageExtra[]): void {- this._pendingMessages.set(convId, { content, extras });- }-- clearPendingMessage(convId: string): void {- this._pendingMessages.delete(convId);- }-- consumePendingMessage(- convId: string- ): { content: string; extras?: DatabaseMessageExtra[] } | null {- const msg = this._pendingMessages.get(convId);-- if (!msg) return null;-- this._pendingMessages.delete(convId);-- return msg;- }-- private touchConversationState(convId: string): void {- this.conversationStateTimestamps.set(convId, { lastAccessed: Date.now() });- }-- cleanupOldConversationStates(activeConversationIds?: string[]): number {- const now = Date.now();- const activeIdsList = activeConversationIds ?? [];- const preserveIds = this.activeConversationId- ? [...activeIdsList, this.activeConversationId]- : activeIdsList;- const allConvIds = [- ...new Set([- ...this.chatLoadingStates.keys(),- ...this.chatStreamingStates.keys(),- ...this.abortControllers.keys(),- ...this.processingStates.keys(),- ...this.conversationStateTimestamps.keys()- ])- ];- const cleanupCandidates: Array<{ convId: string; lastAccessed: number }> = [];-- for (const convId of allConvIds) {- if (preserveIds.includes(convId)) continue;-- if (this.chatLoadingStates.get(convId)) continue;-- if (this.chatStreamingStates.has(convId)) continue;-- const ts = this.conversationStateTimestamps.get(convId);-- cleanupCandidates.push({ convId, lastAccessed: ts?.lastAccessed ?? 0 });- }- cleanupCandidates.sort((a, b) => a.lastAccessed - b.lastAccessed);- let cleanedUp = 0;-- for (const { convId, lastAccessed } of cleanupCandidates) {- if (- cleanupCandidates.length - cleanedUp > INACTIVE_CONVERSATION.MAX_STATES ||- now - lastAccessed > INACTIVE_CONVERSATION.MAX_AGE_MS- ) {- this.cleanupConversationState(convId);- cleanedUp++;- }- }-- return cleanedUp;- }- private cleanupConversationState(convId: string): void {- const c = this.abortControllers.get(convId);-- if (c && !c.signal.aborted) c.abort();-- this.chatLoadingStates.delete(convId);- this.chatStreamingStates.delete(convId);- this.abortControllers.delete(convId);- this.processingStates.delete(convId);- this.conversationStateTimestamps.delete(convId);- }- getTrackedConversationCount(): number {- return new Set([- ...this.chatLoadingStates.keys(),- ...this.chatStreamingStates.keys(),- ...this.abortControllers.keys(),- ...this.processingStates.keys()- ]).size;- }-- private getMessageByIdWithRole(- messageId: string,- expectedRole?: MessageRole- ): { message: DatabaseMessage; index: number } | null {- const index = conversationsStore.findMessageIndex(messageId);-- if (index === -1) return null;-- const message = conversationsStore.activeMessages[index];-- if (expectedRole && message.role !== expectedRole) return null;-- return { index, message };- }-- async addMessage(- role: MessageRole,- content: string,- type: MessageType = MessageType.TEXT,- parent: string = '-1',- extras?: DatabaseMessageExtra[],- isSynthetic?: boolean- ): Promise<DatabaseMessage> {- const activeConv = conversationsStore.activeConversation;-- if (!activeConv) throw new Error('No active conversation');-- let parentId: string | null = null;-- if (parent === '-1') {- const am = conversationsStore.activeMessages;-- if (am.length > 0) parentId = am[am.length - 1].id;- else {- const all = await conversationsStore.getConversationMessages(activeConv.id);- const r = all.find((m) => m.parent === null && m.type === 'root');-- parentId = r ? r.id : await DatabaseService.createRootMessage(activeConv.id);- }- } else parentId = parent;-- const message = await DatabaseService.createMessageBranch(- {- children: [],- content,- convId: activeConv.id,- extra: extras,- isSynthetic,- role,- timestamp: Date.now(),- toolCalls: '',- type- },- parentId- );-- conversationsStore.addMessageToActive(message);- await conversationsStore.updateCurrentNode(message.id);- conversationsStore.updateConversationTimestamp();-- return message;- }-- /**- * Record a working-directory change into chat history as a synthetic- * user message, so the model sees it on its next turn (the client- * sends the cwd itself via the x-tool-cwd header on tool calls).- * A plain user message is used because some chat templates reject- * tool messages without a preceding tool call.- */- async recordCwdChange(cwd: string | null): Promise<void> {- const content = cwd- ? formatCwdMessage(cwd, await toolsStore.resolveServerHome())- : CWD_CLEARED_TEXT;- // Reuse the trailing cwd row when it is already the last message, so- // repeated picks update it in place instead of stacking another row.- const last = conversationsStore.activeMessages[conversationsStore.activeMessages.length - 1];-- if (last && last.role === MessageRole.USER && last.isSynthetic === true) {- await DatabaseService.updateMessage(last.id, { content, isSynthetic: true });- conversationsStore.updateMessageAtIndex(conversationsStore.activeMessages.length - 1, {- content,- isSynthetic: true- });-- return;- }-- await this.addMessage(MessageRole.USER, content, MessageType.TEXT, '-1', undefined, true);- }-- async addSystemPrompt(): Promise<void> {- let activeConv = conversationsStore.activeConversation;-- if (!activeConv) {- await conversationsStore.createConversation();- activeConv = conversationsStore.activeConversation;- }-- if (!activeConv) return;-- try {- const allMessages = await conversationsStore.getConversationMessages(activeConv.id);- const rootMessage = allMessages.find((m) => m.type === 'root' && m.parent === null);- const rootId = rootMessage- ? rootMessage.id- : await DatabaseService.createRootMessage(activeConv.id);- const existingSystemMessage = allMessages.find(- (m) => m.role === MessageRole.SYSTEM && m.parent === rootId- );-- if (existingSystemMessage) {- this.pendingEditMessageId = existingSystemMessage.id;-- if (!conversationsStore.activeMessages.some((m) => m.id === existingSystemMessage.id))- conversationsStore.activeMessages.unshift(existingSystemMessage);-- return;- }-- const am = conversationsStore.activeMessages;- const firstActiveMessage = am.find((m) => m.parent === rootId);- const systemMessage = await DatabaseService.createSystemMessage(- activeConv.id,- SYSTEM_MESSAGE_PLACEHOLDER,- rootId- );-- if (firstActiveMessage) {- await DatabaseService.updateMessage(firstActiveMessage.id, {- parent: systemMessage.id- });- await DatabaseService.updateMessage(systemMessage.id, {- children: [firstActiveMessage.id]- });- const updatedRootChildren = rootMessage- ? rootMessage.children.filter((id: string) => id !== firstActiveMessage.id)- : [];-- await DatabaseService.updateMessage(rootId, {- children: [- ...updatedRootChildren.filter((id: string) => id !== systemMessage.id),- systemMessage.id- ]- });- const firstMsgIndex = conversationsStore.findMessageIndex(firstActiveMessage.id);-- if (firstMsgIndex !== -1)- conversationsStore.updateMessageAtIndex(firstMsgIndex, {- parent: systemMessage.id- });- }-- conversationsStore.activeMessages.unshift(systemMessage);- this.pendingEditMessageId = systemMessage.id;- conversationsStore.updateConversationTimestamp();- } catch (error) {- console.error('Failed to add system prompt:', error);- }- }-- async removeSystemPromptPlaceholder(messageId: string): Promise<boolean> {- const activeConv = conversationsStore.activeConversation;-- if (!activeConv) return false;-- try {- const allMessages = await conversationsStore.getConversationMessages(activeConv.id);- const systemMessage = findMessageById(allMessages, messageId);-- if (!systemMessage || systemMessage.role !== MessageRole.SYSTEM) return false;-- const rootMessage = allMessages.find((m) => m.type === 'root' && m.parent === null);-- if (!rootMessage) return false;-- if (allMessages.length === 2 && systemMessage.children.length === 0) {- await conversationsStore.deleteConversation(activeConv.id);-- return true;- }-- for (const childId of systemMessage.children) {- await DatabaseService.updateMessage(childId, { parent: rootMessage.id });- const childIndex = conversationsStore.findMessageIndex(childId);-- if (childIndex !== -1)- conversationsStore.updateMessageAtIndex(childIndex, { parent: rootMessage.id });- }- await DatabaseService.updateMessage(rootMessage.id, {- children: [- ...rootMessage.children.filter((id: string) => id !== messageId),- ...systemMessage.children- ]- });- await DatabaseService.deleteMessage(messageId);- const systemIndex = conversationsStore.findMessageIndex(messageId);-- if (systemIndex !== -1) conversationsStore.activeMessages.splice(systemIndex, 1);-- conversationsStore.updateConversationTimestamp();-- return false;- } catch (error) {- console.error('Failed to remove system prompt placeholder:', error);-- return false;- }- }-- private async createAssistantMessage(parentId?: string): Promise<DatabaseMessage> {- const activeConv = conversationsStore.activeConversation;-- if (!activeConv) throw new Error('No active conversation');-- return await DatabaseService.createMessageBranch(- {- children: [],- content: '',- convId: activeConv.id,- model: null,- role: MessageRole.ASSISTANT,- timestamp: Date.now(),- toolCalls: '',- type: MessageType.TEXT- },- parentId || null- );- }-- async sendMessage(content: string, extras?: DatabaseMessageExtra[]): Promise<void> {- if (!content.trim() && (!extras || extras.length === 0)) return;-- const activeConv = conversationsStore.activeConversation;-- // If agentic loop is running, inject as a steering message instead of starting a new flow- if (activeConv && agenticStore.isRunning(activeConv.id)) {- agenticStore.injectSteeringMessage(activeConv.id, content, extras);-- return;- }-- // If non-agentic streaming is active, queue as a pending message to send after completion- if (activeConv && this.isChatLoadingInternal(activeConv.id)) {- this.injectPendingMessage(activeConv.id, content, extras);-- return;- }-- // Cancel any in-flight pre-encode request- this.cancelPreEncode();-- // Consume MCP resource attachments - converts them to extras and clears the live store- const resourceExtras = mcpStore.consumeResourceAttachmentsAsExtras();- const allExtras = resourceExtras.length > 0 ? [...(extras || []), ...resourceExtras] : extras;-- let isNewConversation = false;-- if (!activeConv) {- await conversationsStore.createConversation();- isNewConversation = true;- }-- const currentConv = conversationsStore.activeConversation;-- if (!currentConv) return;-- this.showErrorDialog(null);- this.setChatLoading(currentConv.id, true);- this.clearChatStreaming(currentConv.id);- try {- let parentIdForUserMessage: string | undefined;-- if (isNewConversation) {- const rootId = await DatabaseService.createRootMessage(currentConv.id);- const currentConfig = settingsStore.config;- const systemPrompt = currentConfig.systemMessage?.toString().trim();-- let sysOrRootId = rootId;-- if (systemPrompt) {- const systemMessage = await DatabaseService.createSystemMessage(- currentConv.id,- systemPrompt,- rootId- );-- conversationsStore.addMessageToActive(systemMessage);- sysOrRootId = systemMessage.id;- }-- // Reflect a working directory picked on the new-chat screen into- // chat history before the first user message, so the model sees- // it on its first turn. createConversation() has already threaded- // the pending pick onto the conversation.- if (currentConv.cwd) {- const cwdMessage = await this.addMessage(- MessageRole.USER,- formatCwdMessage(currentConv.cwd, await toolsStore.resolveServerHome()),- MessageType.TEXT,- sysOrRootId,- undefined,- true- );-- parentIdForUserMessage = cwdMessage.id;- } else {- parentIdForUserMessage = sysOrRootId;- }- }-- const userMessage = await this.addMessage(- MessageRole.USER,- content,- MessageType.TEXT,- parentIdForUserMessage ?? '-1',- allExtras- );-- if (isNewConversation && content)- await conversationsStore.updateConversationName(- currentConv.id,- generateConversationTitle(- content,- Boolean(settingsStore.config.titleGenerationUseFirstLine)- )- );-- const assistantMessage = await this.createAssistantMessage(userMessage.id);-- conversationsStore.addMessageToActive(assistantMessage);- await this.streamChatCompletion(- conversationsStore.activeMessages.slice(0, -1),- assistantMessage,- undefined,- undefined,- undefined,- settingsStore.config.titleGenerationUseLLM && isNewConversation ? content : undefined- );- } catch (error) {- if (isAbortError(error)) {- this.setChatLoading(currentConv.id, false);-- return;- }-- console.error('Failed to send message:', error);- this.setChatLoading(currentConv.id, false);- const dialogType =- error instanceof Error && error.name === 'TimeoutError'- ? ErrorDialogType.TIMEOUT- : ErrorDialogType.SERVER;- const contextInfo = (- error as Error & { contextInfo?: { n_prompt_tokens: number; n_ctx: number } }- ).contextInfo;-- this.showErrorDialog({- contextInfo,- message: error instanceof Error ? error.message : 'Unknown error',- type: dialogType- });- }- }-- private async streamChatCompletion(- allMessages: DatabaseMessage[],- assistantMessage: DatabaseMessage,- onComplete?: (content: string) => Promise<void>,- onError?: (error: Error) => void,- modelOverride?: string | null,- firstUserMessageContent?: string- ): Promise<void> {- // the ::model suffix in the stream identity is only for router mode, where it routes to the- // owning child. in single-model mode the identity stays the bare conv id so that attach, stop- // and reattach all agree, regardless of fresh send vs regenerate passing a resolved model- let effectiveModel: string | null | undefined = undefined;-- if (serverStore.isRouterMode) {- const conversationModel = getConversationModel(allMessages);-- effectiveModel = modelOverride || modelsStore.selectedModelName || conversationModel;- }-- if (serverStore.isRouterMode && effectiveModel) {- if (!modelsStore.getModelProps(effectiveModel))- await modelsStore.fetchModelProps(effectiveModel);- }-- // Mutable state for the current message being streamed- let currentMessageId = assistantMessage.id;- let streamedContent = '';- let streamedReasoningContent = '';- let resolvedModel: string | null = null;- let modelPersisted = false;-- const convId = assistantMessage.convId;-- // Tracks the last message created in this flow. Used as the parent for the next- // turn's assistant message so createAssistantMessage does not have to read- // conversationsStore.activeMessages, which may belong to a different conversation- // after the user navigates while the loop is still running.- let lastCreatedInFlow = currentMessageId;-- // freeze the POST identity from t0 so a stop cancels with the exact session key,- // never a stale or empty model resolved later- this.setChatStreaming(convId, streamedContent, currentMessageId, effectiveModel);-- const recordModel = (modelName: string | null | undefined, persistImmediately = true): void => {- if (!modelName) return;-- const n = normalizeModelName(modelName);-- if (!n || n === resolvedModel) return;-- resolvedModel = n;- const idx = conversationsStore.findMessageIndex(currentMessageId);-- conversationsStore.updateMessageAtIndex(idx, { model: n });-- if (persistImmediately && !modelPersisted) {- modelPersisted = true;- DatabaseService.updateMessage(currentMessageId, { model: n }).catch(() => {- modelPersisted = false;- resolvedModel = null;- });- }- };-- let completionIdRecorded = false;-- const recordCompletionId = (id: string): void => {- if (!id || completionIdRecorded) return;-- completionIdRecorded = true;- const idx = conversationsStore.findMessageIndex(currentMessageId);-- conversationsStore.updateMessageAtIndex(idx, { completionId: id });- DatabaseService.updateMessage(currentMessageId, { completionId: id }).catch(() => {- completionIdRecorded = false;- });- };- const updateStreamingUI = () => {- this.setChatStreaming(convId, streamedContent, currentMessageId, effectiveModel);- const idx = conversationsStore.findMessageIndex(currentMessageId);-- conversationsStore.updateMessageAtIndex(idx, { content: streamedContent });- };- const cleanupStreamingState = () => {- this.setStreamingActive(false);- this.setChatLoading(convId, false);- this.clearChatStreaming(convId, currentMessageId);- this.setProcessingState(convId, null);- };-- this.setStreamingActive(true);- this.setActiveProcessingConversation(convId);- const abortController = this.getOrCreateAbortController(convId);- const streamCallbacks: ChatStreamCallbacks = {- createAssistantMessage: async () => {- // Reset streaming state for new message- streamedContent = '';- streamedReasoningContent = '';-- const msg = await DatabaseService.createMessageBranch(- {- children: [],- content: '',- convId,- model: resolvedModel,- role: MessageRole.ASSISTANT,- timestamp: Date.now(),- toolCalls: '',- type: MessageType.TEXT- },- lastCreatedInFlow- );-- if (conversationsStore.activeConversation?.id === convId) {- conversationsStore.addMessageToActive(msg);- }-- currentMessageId = msg.id;- lastCreatedInFlow = msg.id;-- return msg;- },- createToolResultMessage: async (- toolCallId: string,- content: string,- extras?: DatabaseMessageExtra[],- toolCwd?: string- ) => {- const msg = await DatabaseService.createMessageBranch(- {- children: [],- content,- convId,- extra: extras,- role: MessageRole.TOOL,- timestamp: Date.now(),- toolCallId,- toolCalls: '',- toolCwd,- type: MessageType.TEXT- },- currentMessageId- );-- // mirror into the active store and move the node pointer only when this- // conversation is displayed; otherwise persist the node move straight to- // the db for the owning conv so a foreign conv's currNode stays untouched- if (conversationsStore.activeConversation?.id === convId) {- conversationsStore.addMessageToActive(msg);- await conversationsStore.updateCurrentNode(msg.id);- } else {- await DatabaseService.updateCurrentNode(convId, msg.id);- }-- lastCreatedInFlow = msg.id;-- return msg;- },- onAssistantTurnComplete: async (- content: string,- reasoningContent: string | undefined,- timings: ChatMessageTimings | undefined,- toolCalls: import('$lib/types/api').ApiChatCompletionToolCall[] | undefined- ) => {- const updateData: Record<string, unknown> = {- content,- reasoningContent: reasoningContent || undefined,- timings,- toolCalls: toolCalls ? JSON.stringify(toolCalls) : ''- };-- if (resolvedModel && !modelPersisted) updateData.model = resolvedModel;-- await DatabaseService.updateMessage(currentMessageId, updateData);- const idx = conversationsStore.findMessageIndex(currentMessageId);- const uiUpdate: Partial<DatabaseMessage> = {- content,- reasoningContent: reasoningContent || undefined,- toolCalls: toolCalls ? JSON.stringify(toolCalls) : ''- };-- if (timings) uiUpdate.timings = timings;-- if (resolvedModel) uiUpdate.model = resolvedModel;-- // touch the active ui array and node pointer only when this conversation- // is displayed; otherwise persist the node move straight to the db so a- // foreign conv's currNode stays untouched- if (conversationsStore.activeConversation?.id === convId) {- conversationsStore.updateMessageAtIndex(idx, uiUpdate);- await conversationsStore.updateCurrentNode(currentMessageId);- } else {- await DatabaseService.updateCurrentNode(convId, currentMessageId);- }- },- onAttachments: (messageId: string, extras: DatabaseMessageExtra[]) => {- if (!extras.length) return;-- const idx = conversationsStore.findMessageIndex(messageId);-- if (idx === -1) return;-- const msg = conversationsStore.activeMessages[idx];- const updatedExtras = [...(msg.extra || []), ...extras];-- conversationsStore.updateMessageAtIndex(idx, { extra: updatedExtras });- DatabaseService.updateMessage(messageId, { extra: updatedExtras }).catch(console.error);- },- onChunk: (chunk: string) => {- streamedContent += chunk;- updateStreamingUI();- this.setChatReasoning(convId, false);- },- onCompletionId: (id: string) => recordCompletionId(id),- onError: async (error: Error) => {- this.setStreamingActive(false);-- if (isAbortError(error)) {- cleanupStreamingState();- // If aborted with a pending message (e.g. "Send immediately"), re-send it- const pending = this.consumePendingMessage(convId);-- if (pending) {- this.sendMessage(pending.content, pending.extras);- }-- return;- }-- console.error('Streaming error:', error);- // keep whatever was streamed so far, the message stays in memory and in DB- await this.savePartialResponseIfNeeded(convId);- cleanupStreamingState();- this.clearPendingMessage(convId);-- const contextInfo = (- error as Error & { contextInfo?: { n_prompt_tokens: number; n_ctx: number } }- ).contextInfo;-- this.showErrorDialog({- contextInfo,- message: error.message,- type: error.name === 'TimeoutError' ? ErrorDialogType.TIMEOUT : ErrorDialogType.SERVER- });-- if (onError) onError(error);- },- onFlowComplete: (finalTimings?: ChatMessageTimings) => {- if (finalTimings) {- const idx = conversationsStore.findMessageIndex(assistantMessage.id);-- conversationsStore.updateMessageAtIndex(idx, { timings: finalTimings });- DatabaseService.updateMessage(assistantMessage.id, {- timings: finalTimings- }).catch(console.error);- }-- cleanupStreamingState();-- if (onComplete) onComplete(streamedContent);-- if (serverStore.isRouterMode) modelsStore.fetchRouterModels().catch(console.error);-- // Pre-encode conversation in KV cache for faster next turn- if (settingsStore.config.preEncodeConversation) {- this.triggerPreEncode(- allMessages,- assistantMessage,- streamedContent,- effectiveModel,- !!settingsStore.config.excludeReasoningFromContext- );- }- },- onModel: (modelName: string) => recordModel(modelName),- onReasoningChunk: (chunk: string) => {- streamedReasoningContent += chunk;- // mark streaming state so a stop mid-thinking can persist the partial reasoning- this.setChatStreaming(convId, streamedContent, currentMessageId, effectiveModel);- const idx = conversationsStore.findMessageIndex(currentMessageId);-- conversationsStore.updateMessageAtIndex(idx, {- reasoningContent: streamedReasoningContent- });- this.setChatReasoning(convId, true);- },- onTimings: (timings?: ChatMessageTimings, promptProgress?: ChatMessagePromptProgress) => {- const tokensPerSecond =- timings?.predicted_ms && timings?.predicted_n- ? (timings.predicted_n / timings.predicted_ms) * 1000- : 0;-- this.updateProcessingStateFromTimings(- {- cache_n: timings?.cache_n || 0,- predicted_n: timings?.predicted_n || 0,- predicted_per_second: tokensPerSecond,- prompt_ms: timings?.prompt_ms,- prompt_n: timings?.prompt_n || 0,- prompt_progress: promptProgress- },- convId- );- },- onToolCallsStreaming: (toolCalls) => {- const idx = conversationsStore.findMessageIndex(currentMessageId);-- conversationsStore.updateMessageAtIndex(idx, {- toolCalls: JSON.stringify(toolCalls)- });- },- onTurnComplete: (intermediateTimings: ChatMessageTimings) => {- // Update the first assistant message with cumulative agentic timings- const idx = conversationsStore.findMessageIndex(assistantMessage.id);-- conversationsStore.updateMessageAtIndex(idx, { timings: intermediateTimings });- },- updateToolResultMessage: async (- messageId: string,- content: string,- extras?: DatabaseMessageExtra[]- ) => {- // Persist latest content + merged extras; mirror into the active- // store so the chat view sees live updates for streaming tools- // (e.g. exec_shell_command). The existing tool message node- // pointer stays put - the renderer is already scoped to it.- const updates: Partial<DatabaseMessage> = { content };-- if (extras) {- const idx = conversationsStore.findMessageIndex(messageId);- const existing = idx >= 0 ? (conversationsStore.activeMessages[idx]?.extra ?? []) : [];- const merged = [...existing, ...extras];-- updates.extra = merged;- }-- if (conversationsStore.activeConversation?.id === convId) {- const idx = conversationsStore.findMessageIndex(messageId);-- if (idx >= 0) conversationsStore.updateMessageAtIndex(idx, updates);- }-- await DatabaseService.updateMessage(messageId, updates);- }- };- const perChatOverrides = conversationsStore.getAllMcpServerOverrides();-- {- const agenticResult = await agenticStore.runAgenticFlow({- callbacks: streamCallbacks,- conversationId: convId,- flowRootMessageId: assistantMessage.id,- messages: allMessages,- options: {- ...this.getApiOptions(),- ...(effectiveModel ? { model: effectiveModel } : {})- },- perChatOverrides,- signal: abortController.signal- });-- if (agenticResult.handled) {- // Generate LLM based title for new conversations after agentic flow completes- if (firstUserMessageContent) {- await this.generateTitleWithLLM(firstUserMessageContent, streamedContent, convId);- }-- // Check if there's a pending steering message to re-send- const pending = agenticStore.consumePendingSteeringMessage(convId);-- if (pending) {- await this.sendMessage(pending.content, pending.extras);- }-- return;- }- }-- await ChatService.sendMessage(- allMessages,- {- ...this.getApiOptions(),- ...(effectiveModel ? { model: effectiveModel } : {}),- onChunk: streamCallbacks.onChunk,- onComplete: async (- finalContent?: string,- reasoningContent?: string,- timings?: ChatMessageTimings,- toolCalls?: string- ) => {- const content = streamedContent || finalContent || '';- const reasoning = streamedReasoningContent || reasoningContent;- const updateData: Record<string, unknown> = {- content,- reasoningContent: reasoning || undefined,- timings,- toolCalls: toolCalls || ''- };-- if (resolvedModel && !modelPersisted) updateData.model = resolvedModel;-- await DatabaseService.updateMessage(currentMessageId, updateData);- const idx = conversationsStore.findMessageIndex(currentMessageId);- const uiUpdate: Partial<DatabaseMessage> = {- content,- reasoningContent: reasoning || undefined,- toolCalls: toolCalls || ''- };-- if (timings) uiUpdate.timings = timings;-- if (resolvedModel) uiUpdate.model = resolvedModel;-- conversationsStore.updateMessageAtIndex(idx, uiUpdate);- await conversationsStore.updateCurrentNode(currentMessageId);- cleanupStreamingState();-- if (onComplete) await onComplete(content);-- if (serverStore.isRouterMode) modelsStore.fetchRouterModels().catch(console.error);-- // Generate LLM based title for new conversations (avoids stale reference- // issue when user switches conversations while streaming)- if (firstUserMessageContent) {- await this.generateTitleWithLLM(firstUserMessageContent, streamedContent, convId);- }-- // Check if there's a pending message queued during streaming- const pending = this.consumePendingMessage(convId);-- if (pending) {- await this.sendMessage(pending.content, pending.extras);- }- },- onCompletionId: streamCallbacks.onCompletionId,- onConnectionState: (state: StreamConnectionState) => {- if (convId === conversationsStore.activeConversation?.id) {- this.streamConnectionState = state;- }- },- onError: streamCallbacks.onError,- onModel: streamCallbacks.onModel,- onReasoningChunk: streamCallbacks.onReasoningChunk,- onTimings: streamCallbacks.onTimings,- stream: true- },- convId,- abortController.signal- );- }-- async stopGeneration(): Promise<void> {- const activeConv = conversationsStore.activeConversation;-- if (!activeConv) return;-- await this.stopGenerationForChat(activeConv.id);- }- async stopGenerationForChat(convId: string): Promise<void> {- await this.savePartialResponseIfNeeded(convId);- this.setStreamingActive(false);- // tell the server to stop the generation, not just drop the HTTP socket. without this the- // detached drain keeps producing tokens until eos or max_tokens. use the frozen identity- // captured when the session started, not the live dropdown- const streamStateForStop = this.chatStreamingStates.get(convId);- const modelForStop = streamStateForStop?.model ?? ChatService.getStreamState(convId)?.model;-- void ChatService.cancelServerStream(convId, modelForStop);- // an explicit stop leaves nothing to resume and kills a pending resume retry- ChatService.clearStreamState(convId);- const retryTimer = this.resumeRetryTimers.get(convId);-- if (retryTimer !== undefined) {- clearTimeout(retryTimer);- this.resumeRetryTimers.delete(convId);- }-- this.resumePendingConvs.delete(convId);- this.abortRequest(convId);- this.setChatLoading(convId, false);- this.clearChatStreaming(convId);- this.setProcessingState(convId, null);- this.clearPendingMessage(convId);- }-- private async generateTitleWithLLM(- userContent: string,- assistantContent: string,- convId: string- ): Promise<void> {- const effectiveModel =- serverStore.isRouterMode && modelsStore.selectedModelName- ? modelsStore.selectedModelName- : undefined;- const configValue = settingsStore.config;- const titlePromptTemplate =- typeof configValue.titleGenerationPrompt === 'string' &&- configValue.titleGenerationPrompt.trim()- ? configValue.titleGenerationPrompt- : TITLE_GENERATION.DEFAULT_PROMPT;- const titlePrompt = titlePromptTemplate- .replace('{{USER}}', String(userContent || ''))- .replace('{{ASSISTANT}}', String(assistantContent || ''));- const titleMessage: ApiChatMessageData = {- content: titlePrompt,- role: MessageRole.USER- };- const titleResponse = await ChatService.generateTitle(titleMessage, effectiveModel);-- if (!titleResponse) {- return;- }-- let cleanTitle = titleResponse.trim();-- cleanTitle = cleanTitle- .replace(TITLE_GENERATION.PREFIX_PATTERN, '')- .replace(TITLE_GENERATION.QUOTE_PATTERN, '')- .trim();-- if (!cleanTitle || cleanTitle.length < TITLE_GENERATION.MIN_LENGTH) {- const firstLine = userContent.split('\n').find((l) => l.trim().length > 0);-- cleanTitle = firstLine ? firstLine.trim() : TITLE_GENERATION.FALLBACK;- }-- if (cleanTitle && cleanTitle.length >= TITLE_GENERATION.MIN_LENGTH) {- await conversationsStore.updateConversationName(convId, cleanTitle);- }- }-- private async savePartialResponseIfNeeded(convId?: string): Promise<void> {- const conversationId = convId || conversationsStore.activeConversation?.id;-- if (!conversationId) return;-- const streamingState = this.getChatStreamingState(conversationId);-- if (!streamingState) return;-- const messages =- conversationId === conversationsStore.activeConversation?.id- ? conversationsStore.activeMessages- : await conversationsStore.getConversationMessages(conversationId);-- if (!messages.length) return;-- const lastMessage = messages[messages.length - 1];-- if (lastMessage?.role !== MessageRole.ASSISTANT) return;-- const partialContent = streamingState.response;- const partialReasoning = lastMessage.reasoningContent || '';- // snapshot the streamed tool calls before clearing so we still know whether- // anything was captured when deciding to skip the DB write below- const hadPartialToolCalls = !!lastMessage.toolCalls?.trim();-- // nothing to persist when content, reasoning, and streamed tool calls are all empty- // (e.g. stop before any token). otherwise drop the partial tool call and write whatever- // was streamed: incomplete arguments (truncated JSON, missing closing quote) would- // otherwise be re-sent to the server on the next turn and rejected.- if (!partialContent.trim() && !partialReasoning.trim() && !hadPartialToolCalls) return;-- try {- const updateData: {- content?: string;- reasoningContent?: string;- toolCalls?: string;- timings?: ChatMessageTimings;- } = {- toolCalls: ''- };-- if (partialContent.trim()) updateData.content = partialContent;-- if (partialReasoning.trim()) updateData.reasoningContent = partialReasoning;-- const lastKnownState = this.getProcessingState(conversationId);-- if (lastKnownState) {- updateData.timings = {- cache_n: lastKnownState.cacheTokens || 0,- predicted_ms:- lastKnownState.tokensPerSecond && lastKnownState.tokensDecoded- ? (lastKnownState.tokensDecoded / lastKnownState.tokensPerSecond) * 1000- : undefined,- predicted_n: lastKnownState.tokensDecoded || 0,- prompt_ms: lastKnownState.promptMs,- prompt_n: lastKnownState.promptTokens || 0- };- }-- await DatabaseService.updateMessage(lastMessage.id, updateData);- lastMessage.content = partialContent;- // mirror the drop into the in-memory message so the next request sent via- // sendMessage (queued pending, Send immediately, or manual follow-up) reads- // the cleared value, not whatever the streaming widget had been showing- lastMessage.toolCalls = '';-- if (updateData.timings) lastMessage.timings = updateData.timings;- } catch (error) {- lastMessage.content = partialContent;- lastMessage.toolCalls = '';- console.error('Failed to save partial response:', error);- }- }-- async updateMessage(messageId: string, newContent: string): Promise<void> {- const activeConv = conversationsStore.activeConversation;-- if (!activeConv) return;-- if (this.isChatLoadingInternal(activeConv.id)) await this.stopGeneration();-- const result = this.getMessageByIdWithRole(messageId, MessageRole.USER);-- if (!result) return;-- const { index: messageIndex, message: messageToUpdate } = result;- const originalContent = messageToUpdate.content;-- try {- const allMessages = await conversationsStore.getConversationMessages(activeConv.id);- const rootMessage = allMessages.find((m) => m.type === 'root' && m.parent === null);- const isFirstUserMessage = rootMessage && messageToUpdate.parent === rootMessage.id;-- conversationsStore.updateMessageAtIndex(messageIndex, { content: newContent });- await DatabaseService.updateMessage(messageId, { content: newContent });-- if (isFirstUserMessage && newContent.trim())- await conversationsStore.updateConversationName(- activeConv.id,- generateConversationTitle(- newContent,- Boolean(settingsStore.config.titleGenerationUseFirstLine)- )- );-- const messagesToRemove = conversationsStore.activeMessages.slice(messageIndex + 1);-- if (messagesToRemove.length > 0)- await DatabaseService.deleteMessageCascading(activeConv.id, messagesToRemove[0].id);-- conversationsStore.sliceActiveMessages(messageIndex + 1);- conversationsStore.updateConversationTimestamp();- this.setChatLoading(activeConv.id, true);- this.clearChatStreaming(activeConv.id);- const assistantMessage = await this.createAssistantMessage();-- conversationsStore.addMessageToActive(assistantMessage);- await conversationsStore.updateCurrentNode(assistantMessage.id);- await this.streamChatCompletion(- conversationsStore.activeMessages.slice(0, -1),- assistantMessage,- undefined,- () => {- conversationsStore.updateMessageAtIndex(conversationsStore.findMessageIndex(messageId), {- content: originalContent- });- }- );- } catch (error) {- if (!isAbortError(error)) console.error('Failed to update message:', error);- }- }-- async regenerateMessage(messageId: string): Promise<void> {- const activeConv = conversationsStore.activeConversation;-- if (!activeConv || this.isChatLoadingInternal(activeConv.id)) return;-- this.cancelPreEncode();- const result = this.getMessageByIdWithRole(messageId, MessageRole.ASSISTANT);-- if (!result) return;-- const { index: messageIndex } = result;-- try {- const messagesToRemove = conversationsStore.activeMessages.slice(messageIndex);-- await DatabaseService.deleteMessageCascading(activeConv.id, messagesToRemove[0].id);- conversationsStore.sliceActiveMessages(messageIndex);- conversationsStore.updateConversationTimestamp();- this.setChatLoading(activeConv.id, true);- this.clearChatStreaming(activeConv.id);- const parentMessageId =- conversationsStore.activeMessages.length > 0- ? conversationsStore.activeMessages[conversationsStore.activeMessages.length - 1].id- : undefined;- const assistantMessage = await this.createAssistantMessage(parentMessageId);-- conversationsStore.addMessageToActive(assistantMessage);- await this.streamChatCompletion(- conversationsStore.activeMessages.slice(0, -1),- assistantMessage- );- } catch (error) {- if (!isAbortError(error)) console.error('Failed to regenerate message:', error);-- this.setChatLoading(activeConv?.id || '', false);- }- }-- async regenerateMessageWithBranching(messageId: string, modelOverride?: string): Promise<void> {- const activeConv = conversationsStore.activeConversation;-- if (!activeConv || this.isChatLoadingInternal(activeConv.id)) return;-- this.cancelPreEncode();- try {- const idx = conversationsStore.findMessageIndex(messageId);-- if (idx === -1) return;-- const msg = conversationsStore.activeMessages[idx];-- if (msg.role !== MessageRole.ASSISTANT) return;-- const allMessages = await conversationsStore.getConversationMessages(activeConv.id);- const parentMessage = findMessageById(allMessages, msg.parent);-- if (!parentMessage) return;-- this.setChatLoading(activeConv.id, true);- this.clearChatStreaming(activeConv.id);- const newAssistantMessage = await DatabaseService.createMessageBranch(- {- children: [],- content: '',- convId: msg.convId,- model: null,- role: msg.role,- timestamp: Date.now(),- toolCalls: '',- type: msg.type- },- parentMessage.id- );-- await conversationsStore.updateCurrentNode(newAssistantMessage.id);- conversationsStore.updateConversationTimestamp();- await conversationsStore.refreshActiveMessages();- const conversationPath = filterByLeafNodeId(- allMessages,- parentMessage.id,- false- ) as DatabaseMessage[];- const modelToUse = modelOverride || msg.model || undefined;-- await this.streamChatCompletion(- conversationPath,- newAssistantMessage,- undefined,- undefined,- modelToUse- );- } catch (error) {- if (!isAbortError(error))- console.error('Failed to regenerate message with branching:', error);-- this.setChatLoading(activeConv?.id || '', false);- }- }-- async getDeletionInfo(messageId: string): Promise<{- totalCount: number;- userMessages: number;- assistantMessages: number;- messageTypes: string[];- }> {- const activeConv = conversationsStore.activeConversation;-- if (!activeConv)- return { assistantMessages: 0, messageTypes: [], totalCount: 0, userMessages: 0 };-- const allMessages = await conversationsStore.getConversationMessages(activeConv.id);- const messageToDelete = findMessageById(allMessages, messageId);-- // For system messages, don't count descendants as they will be preserved (reparented to root)- if (messageToDelete?.role === MessageRole.SYSTEM) {- const messagesToDelete = allMessages.filter((m) => m.id === messageId);-- let assistantMessages = 0,- userMessages = 0;-- const messageTypes: string[] = [];-- for (const msg of messagesToDelete) {- if (msg.role === MessageRole.USER) {- userMessages++;-- if (!messageTypes.includes('user message')) messageTypes.push('user message');- } else if (msg.role === MessageRole.ASSISTANT) {- assistantMessages++;-- if (!messageTypes.includes('assistant response')) messageTypes.push('assistant response');- }- }-- return { assistantMessages, messageTypes, totalCount: 1, userMessages };- }-- const descendants = findDescendantMessages(allMessages, messageId);- const allToDelete = [messageId, ...descendants];- const messagesToDelete = allMessages.filter((m) => allToDelete.includes(m.id));-- let assistantMessages = 0,- userMessages = 0;-- const messageTypes: string[] = [];-- for (const msg of messagesToDelete) {- if (msg.role === MessageRole.USER) {- userMessages++;-- if (!messageTypes.includes('user message')) messageTypes.push('user message');- } else if (msg.role === MessageRole.ASSISTANT) {- assistantMessages++;-- if (!messageTypes.includes('assistant response')) messageTypes.push('assistant response');- }- }-- return { assistantMessages, messageTypes, totalCount: allToDelete.length, userMessages };- }-- async deleteMessage(messageId: string): Promise<void> {- const activeConv = conversationsStore.activeConversation;-- if (!activeConv) return;-- try {- const allMessages = await conversationsStore.getConversationMessages(activeConv.id);- const messageToDelete = findMessageById(allMessages, messageId);-- if (!messageToDelete) return;-- const currentPath = filterByLeafNodeId(allMessages, activeConv.currNode || '', false);- const isInCurrentPath = currentPath.some((m) => m.id === messageId);-- if (isInCurrentPath && messageToDelete.parent) {- const siblings = allMessages.filter(- (m) => m.parent === messageToDelete.parent && m.id !== messageId- );-- if (siblings.length > 0) {- const latestSibling = siblings.reduce((latest, sibling) =>- sibling.timestamp > latest.timestamp ? sibling : latest- );-- await conversationsStore.updateCurrentNode(findLeafNode(allMessages, latestSibling.id));- } else if (messageToDelete.parent) {- await conversationsStore.updateCurrentNode(- findLeafNode(allMessages, messageToDelete.parent)- );- }- }-- await DatabaseService.deleteMessageCascading(activeConv.id, messageId);- await conversationsStore.refreshActiveMessages();-- conversationsStore.updateConversationTimestamp();- } catch (error) {- console.error('Failed to delete message:', error);- }- }-- /**- * Open a fresh assistant turn anchored at the last tool result of a resolved- * agentic round and let streamChatCompletion route through runAgenticFlow.- * Used by continueAssistantMessage when classifyContinueIntent returns- * next_turn, meaning the target assistant already has its tool_calls paired- * with trailing tool results and the next thing to generate is a brand new- * turn rather than a token level continuation.- */- private async continueAsNextAgenticTurn(anchorIndex: number): Promise<void> {- const activeConv = conversationsStore.activeConversation;-- if (!activeConv) return;-- const anchor = conversationsStore.activeMessages[anchorIndex];-- if (!anchor) return;-- this.cancelPreEncode();- this.setChatLoading(activeConv.id, true);- this.clearChatStreaming(activeConv.id);- try {- const allMessages = await conversationsStore.getConversationMessages(activeConv.id);- const anchorMessage = findMessageById(allMessages, anchor.id);-- if (!anchorMessage) {- this.setChatLoading(activeConv.id, false);-- return;- }-- const newAssistantMessage = await DatabaseService.createMessageBranch(- {- children: [],- content: '',- convId: activeConv.id,- model: null,- role: MessageRole.ASSISTANT,- timestamp: Date.now(),- toolCalls: '',- type: MessageType.TEXT- },- anchorMessage.id- );-- await conversationsStore.updateCurrentNode(newAssistantMessage.id);- conversationsStore.updateConversationTimestamp();- await conversationsStore.refreshActiveMessages();- const conversationPath = filterByLeafNodeId(- allMessages,- anchorMessage.id,- false- ) as DatabaseMessage[];-- await this.streamChatCompletion(conversationPath, newAssistantMessage);- } catch (error) {- if (!isAbortError(error)) console.error('Failed to continue agentic turn:', error);-- this.setChatLoading(activeConv.id, false);- }- }-- async continueAssistantMessage(messageId: string): Promise<void> {- const activeConv = conversationsStore.activeConversation;-- if (!activeConv || this.isChatLoadingInternal(activeConv.id)) return;-- const result = this.getMessageByIdWithRole(messageId, MessageRole.ASSISTANT);-- if (!result) return;-- const { index: idx, message: msg } = result;- // Decide which resume path applies. tool_calls without tool results can- // not be resumed mid sequence by continue_final_message, branch instead.- // tool_calls already paired with tool results need a fresh next turn,- // not a token level continuation of the target assistant.- const intent = classifyContinueIntent(conversationsStore.activeMessages, idx);-- if (intent.kind === ContinueIntentKind.RERUN_TURN) {- return this.regenerateMessageWithBranching(messageId);- }-- if (intent.kind === ContinueIntentKind.NEXT_TURN) {- return this.continueAsNextAgenticTurn(intent.truncateAfter);- }-- try {- this.showErrorDialog(null);- this.setChatLoading(activeConv.id, true);- this.clearChatStreaming(activeConv.id);-- const allMessages = await conversationsStore.getConversationMessages(activeConv.id);- const dbMessage = findMessageById(allMessages, messageId);-- if (!dbMessage) {- this.setChatLoading(activeConv.id, false);-- return;- }-- const originalContent = dbMessage.content;- const originalReasoning = dbMessage.reasoningContent || '';- // Hand the persisted DatabaseMessage straight to sendMessage so its- // internal converter preserves tool_calls and extras when present.- // Reconstructing a bare {role, content} here would drop those fields- // and break continue_final_message for messages with tool calls.- const contextWithContinue = conversationsStore.activeMessages.slice(0, idx + 1);-- let appendedContent = '';- let appendedReasoning = '';- let hasReceivedContent = false;-- const updateStreamingContent = (fullContent: string) => {- this.setChatStreaming(msg.convId, fullContent, msg.id);- // resolve the row by id on every write, switching to another conv mid continue makes- // this a no op instead of writing positionally into the now displayed conversation- conversationsStore.updateMessageAtIndex(conversationsStore.findMessageIndex(msg.id), {- content: fullContent- });- };- const abortController = this.getOrCreateAbortController(msg.convId);-- await ChatService.sendMessage(- contextWithContinue,- {- ...this.getApiOptions(),- continueFinalMessage: true,- onChunk: (chunk: string) => {- appendedContent += chunk;- hasReceivedContent = true;- updateStreamingContent(originalContent + appendedContent);- this.setChatReasoning(msg.convId, false);- },- onComplete: async (- finalContent?: string,- reasoningContent?: string,- timings?: ChatMessageTimings- ) => {- const finalAppendedContent = hasReceivedContent ? appendedContent : finalContent || '';- const finalAppendedReasoning = hasReceivedContent- ? appendedReasoning- : reasoningContent || '';- const fullContent = originalContent + finalAppendedContent;- const fullReasoning = originalReasoning + finalAppendedReasoning || undefined;-- await DatabaseService.updateMessage(msg.id, {- content: fullContent,- reasoningContent: fullReasoning,- timestamp: Date.now(),- timings- });-- conversationsStore.updateMessageAtIndex(conversationsStore.findMessageIndex(msg.id), {- content: fullContent,- reasoningContent: fullReasoning,- timestamp: Date.now(),- timings- });-- conversationsStore.updateConversationTimestamp(msg.convId);-- this.setChatLoading(msg.convId, false);- this.clearChatStreaming(msg.convId);- this.setProcessingState(msg.convId, null);- },- onCompletionId: (id: string) => {- if (!id) return;-- // refresh the message id so a later skip targets the live slot after a continue- conversationsStore.updateMessageAtIndex(conversationsStore.findMessageIndex(msg.id), {- completionId: id- });- DatabaseService.updateMessage(msg.id, { completionId: id }).catch(() => {});- },- onConnectionState: (state: StreamConnectionState) => {- if (msg.convId === conversationsStore.activeConversation?.id) {- this.streamConnectionState = state;- }- },- onError: async (error: Error) => {- if (isAbortError(error)) {- if (hasReceivedContent && appendedContent) {- await DatabaseService.updateMessage(msg.id, {- content: originalContent + appendedContent,- reasoningContent: originalReasoning + appendedReasoning || undefined,- timestamp: Date.now()- });-- conversationsStore.updateMessageAtIndex(- conversationsStore.findMessageIndex(msg.id),- {- content: originalContent + appendedContent,- reasoningContent: originalReasoning + appendedReasoning || undefined,- timestamp: Date.now()- }- );- }-- this.setChatLoading(msg.convId, false);- this.clearChatStreaming(msg.convId);- this.setProcessingState(msg.convId, null);-- return;- }-- console.error('Continue generation error:', error);- // keep whatever was appended so far, the message stays in memory and in DB- await DatabaseService.updateMessage(msg.id, {- content: originalContent + appendedContent,- reasoningContent: originalReasoning + appendedReasoning || undefined,- timestamp: Date.now()- });- conversationsStore.updateMessageAtIndex(conversationsStore.findMessageIndex(msg.id), {- content: originalContent + appendedContent,- reasoningContent: originalReasoning + appendedReasoning || undefined,- timestamp: Date.now()- });-- this.setChatLoading(msg.convId, false);- this.clearChatStreaming(msg.convId);- this.setProcessingState(msg.convId, null);- this.showErrorDialog({- message: error.message,- type: error.name === 'TimeoutError' ? ErrorDialogType.TIMEOUT : ErrorDialogType.SERVER- });- },- onReasoningChunk: (chunk: string) => {- appendedReasoning += chunk;- hasReceivedContent = true;- // mark streaming state so a stop mid-thinking can persist the partial reasoning- this.setChatStreaming(msg.convId, originalContent + appendedContent, msg.id);- conversationsStore.updateMessageAtIndex(conversationsStore.findMessageIndex(msg.id), {- reasoningContent: originalReasoning + appendedReasoning- });- this.setChatReasoning(msg.convId, true);- },- onTimings: (timings?: ChatMessageTimings, promptProgress?: ChatMessagePromptProgress) => {- const tokensPerSecond =- timings?.predicted_ms && timings?.predicted_n- ? (timings.predicted_n / timings.predicted_ms) * 1000- : 0;-- this.updateProcessingStateFromTimings(- {- cache_n: timings?.cache_n || 0,- predicted_n: timings?.predicted_n || 0,- predicted_per_second: tokensPerSecond,- prompt_ms: timings?.prompt_ms,- prompt_n: timings?.prompt_n || 0,- prompt_progress: promptProgress- },- msg.convId- );- }- },-- msg.convId,- abortController.signal- );- } catch (error) {- if (!isAbortError(error)) console.error('Failed to continue message:', error);-- if (activeConv) this.setChatLoading(activeConv.id, false);- }- }-- async editAssistantMessage(- messageId: string,- newContent: string,- shouldBranch: boolean- ): Promise<void> {- const activeConv = conversationsStore.activeConversation;-- if (!activeConv || this.isChatLoadingInternal(activeConv.id)) return;-- const result = this.getMessageByIdWithRole(messageId, MessageRole.ASSISTANT);-- if (!result) return;-- const { index: idx, message: msg } = result;-- try {- if (shouldBranch) {- const newMessage = await DatabaseService.createMessageBranch(- {- children: [],- content: newContent,- convId: msg.convId,- model: msg.model,- role: msg.role,- timestamp: Date.now(),- toolCalls: msg.toolCalls || '',- type: msg.type- },- msg.parent!- );-- await conversationsStore.updateCurrentNode(newMessage.id);- } else {- await DatabaseService.updateMessage(msg.id, { content: newContent });- conversationsStore.updateMessageAtIndex(idx, { content: newContent });- }-- conversationsStore.updateConversationTimestamp();-- await conversationsStore.refreshActiveMessages();- } catch (error) {- console.error('Failed to edit assistant message:', error);- }- }-- async editUserMessagePreserveResponses(- messageId: string,- newContent: string,- newExtras?: DatabaseMessageExtra[]- ): Promise<void> {- const activeConv = conversationsStore.activeConversation;-- if (!activeConv) return;-- const result = this.getMessageByIdWithRole(messageId, MessageRole.USER);-- if (!result) return;-- const { index: idx, message: msg } = result;-- try {- const updateData: Partial<DatabaseMessage> = { content: newContent };-- if (newExtras !== undefined) updateData.extra = JSON.parse(JSON.stringify(newExtras));-- await DatabaseService.updateMessage(messageId, updateData);-- conversationsStore.updateMessageAtIndex(idx, updateData);-- const allMessages = await conversationsStore.getConversationMessages(activeConv.id);- const rootMessage = allMessages.find((m) => m.type === 'root' && m.parent === null);-- if (rootMessage && msg.parent === rootMessage.id && newContent.trim()) {- await conversationsStore.updateConversationName(- activeConv.id,- generateConversationTitle(- newContent,- Boolean(settingsStore.config.titleGenerationUseFirstLine)- )- );- }-- conversationsStore.updateConversationTimestamp();- } catch (error) {- console.error('Failed to edit user message:', error);- }- }-- async editMessageWithBranching(- messageId: string,- newContent: string,- newExtras?: DatabaseMessageExtra[]- ): Promise<void> {- const activeConv = conversationsStore.activeConversation;-- if (!activeConv || this.isChatLoadingInternal(activeConv.id)) return;-- let result = this.getMessageByIdWithRole(messageId, MessageRole.USER);-- if (!result) result = this.getMessageByIdWithRole(messageId, MessageRole.SYSTEM);-- if (!result) return;-- const { index: idx, message: msg } = result;-- try {- const allMessages = await conversationsStore.getConversationMessages(activeConv.id);- const rootMessage = allMessages.find((m) => m.type === 'root' && m.parent === null);- const isFirstUserMessage =- msg.role === MessageRole.USER && rootMessage && msg.parent === rootMessage.id;- const extrasToUse =- newExtras !== undefined- ? JSON.parse(JSON.stringify(newExtras))- : msg.extra- ? JSON.parse(JSON.stringify(msg.extra))- : undefined;-- let messageIdForResponse: string;-- const dbMsg = findMessageById(allMessages, msg.id);- const hasChildren = dbMsg ? dbMsg.children.length > 0 : msg.children.length > 0;-- if (!hasChildren) {- // No responses after this message — update in place instead of branching- const updates: Partial<DatabaseMessage> = {- content: newContent,- extra: extrasToUse,- timestamp: Date.now()- };-- await DatabaseService.updateMessage(msg.id, updates);- conversationsStore.updateMessageAtIndex(idx, updates);- messageIdForResponse = msg.id;- } else {- // Has children — create a new branch as sibling- const parentId = msg.parent || rootMessage?.id;-- if (!parentId) return;-- const newMessage = await DatabaseService.createMessageBranch(- {- children: [],- content: newContent,- convId: msg.convId,- extra: extrasToUse,- model: msg.model,- role: msg.role,- timestamp: Date.now(),- toolCalls: msg.toolCalls || '',- type: msg.type- },- parentId- );-- await conversationsStore.updateCurrentNode(newMessage.id);- messageIdForResponse = newMessage.id;- }-- conversationsStore.updateConversationTimestamp();-- if (isFirstUserMessage && newContent.trim())- await conversationsStore.updateConversationName(- activeConv.id,- generateConversationTitle(- newContent,- Boolean(settingsStore.config.titleGenerationUseFirstLine)- )- );-- await conversationsStore.refreshActiveMessages();-- if (msg.role === MessageRole.USER)- await this.generateResponseForMessage(messageIdForResponse);- } catch (error) {- console.error('Failed to edit message with branching:', error);- }- }-- private async generateResponseForMessage(userMessageId: string): Promise<void> {- const activeConv = conversationsStore.activeConversation;-- if (!activeConv) return;-- this.showErrorDialog(null);- this.setChatLoading(activeConv.id, true);- this.clearChatStreaming(activeConv.id);-- try {- const allMessages = await conversationsStore.getConversationMessages(activeConv.id);- const conversationPath = filterByLeafNodeId(- allMessages,- userMessageId,- false- ) as DatabaseMessage[];- const assistantMessage = await DatabaseService.createMessageBranch(- {- children: [],- content: '',- convId: activeConv.id,- model: null,- role: MessageRole.ASSISTANT,- timestamp: Date.now(),- toolCalls: '',- type: MessageType.TEXT- },- userMessageId- );-- conversationsStore.addMessageToActive(assistantMessage);-- await this.streamChatCompletion(conversationPath, assistantMessage);- } catch (error) {- console.error('Failed to generate response:', error);- this.setChatLoading(activeConv.id, false);- }- }-- private getContextTotal(): number | null {- const activeConvId = this.activeConversationId;- const activeState = activeConvId ? this.getProcessingState(activeConvId) : null;-- if (activeState && typeof activeState.contextTotal === 'number' && activeState.contextTotal > 0)- return activeState.contextTotal;-- if (serverStore.isRouterMode) {- const modelContextSize = modelsStore.selectedModelContextSize;-- if (typeof modelContextSize === 'number' && modelContextSize > 0) {- return modelContextSize;- }- } else {- const propsContextSize = serverStore.contextSize;-- if (typeof propsContextSize === 'number' && propsContextSize > 0) {- return propsContextSize;- }- }-- return null;- }-- updateProcessingStateFromTimings(- timingData: {- prompt_n: number;- prompt_ms?: number;- predicted_n: number;- predicted_per_second: number;- cache_n: number;- prompt_progress?: ChatMessagePromptProgress;- },- conversationId?: string- ): void {- const processingState = this.parseTimingData(timingData);-- if (processingState === null) {- console.warn('Failed to parse timing data - skipping update');-- return;- }-- const targetId = conversationId || this.activeConversationId;-- if (targetId) {- this.setProcessingState(targetId, processingState);- }- }-- private parseTimingData(timingData: Record<string, unknown>): ApiProcessingState | null {- const cacheTokens = (timingData.cache_n as number) || 0,- predictedTokens = (timingData.predicted_n as number) || 0,- promptMs = (timingData.prompt_ms as number) || undefined,- promptTokens = (timingData.prompt_n as number) || 0,- tokensPerSecond = (timingData.predicted_per_second as number) || 0;- const promptProgress = timingData.prompt_progress as- | { total: number; cache: number; processed: number; time_ms: number }- | undefined;- const contextTotal = this.getContextTotal();- const currentConfig = settingsStore.config;- const outputTokensMax = currentConfig.max_tokens || -1;- const contextUsed = promptTokens + cacheTokens + predictedTokens,- outputTokensUsed = predictedTokens;- const progressCache = promptProgress?.cache || 0,- progressActualDone = (promptProgress?.processed ?? 0) - progressCache,- progressActualTotal = (promptProgress?.total ?? 0) - progressCache;- const progressPercent = promptProgress- ? Math.round((progressActualDone / progressActualTotal) * 100)- : undefined;-- return {- cacheTokens,- contextTotal,- contextUsed,- hasNextToken: predictedTokens > 0,- outputTokensMax,- outputTokensUsed,- progressPercent,- promptMs,- promptProgress,- promptTokens,- speculative: false,- status: predictedTokens > 0 ? 'generating' : promptProgress ? 'preparing' : 'idle',- temperature: currentConfig.temperature ?? 0.8,- tokensDecoded: predictedTokens,- tokensPerSecond,- tokensRemaining: outputTokensMax - predictedTokens,- topP: currentConfig.top_p ?? 0.95- };- }-- restoreProcessingStateFromMessages(messages: DatabaseMessage[], conversationId: string): void {- for (let i = messages.length - 1; i >= 0; i--) {- const message = messages[i];-- if (message.role === MessageRole.ASSISTANT && message.timings) {- const restoredState = this.parseTimingData({- cache_n: message.timings.cache_n || 0,- predicted_n: message.timings.predicted_n || 0,- predicted_per_second:- message.timings.predicted_n && message.timings.predicted_ms- ? (message.timings.predicted_n / message.timings.predicted_ms) * 1000- : 0,- prompt_ms: message.timings.prompt_ms,- prompt_n: message.timings.prompt_n || 0- });-- if (restoredState) {- this.setProcessingState(conversationId, restoredState);-- return;- }- }- }- }-- private getApiOptions(): Record<string, unknown> {- const currentConfig = settingsStore.config;- const hasValue = (value: unknown): boolean =>- value !== undefined && value !== null && value !== '';- const apiOptions: Record<string, unknown> = { stream: true, timings_per_token: true };-- if (serverStore.isRouterMode) {- const modelName = modelsStore.selectedModelName;-- if (modelName) apiOptions.model = modelName;- }-- if (currentConfig.systemMessage) apiOptions.systemMessage = currentConfig.systemMessage;-- if (currentConfig.disableReasoningParsing) apiOptions.disableReasoningParsing = true;-- if (currentConfig.excludeReasoningFromContext) apiOptions.excludeReasoningFromContext = true;-- // an explicit reasoning choice overrides the server default, DEFAULT sends nothing- const effort = conversationsStore.getReasoningEffort();-- if (effort !== ReasoningEffort.DEFAULT) {- apiOptions.enableThinking = effort !== ReasoningEffort.OFF;-- if (effort !== ReasoningEffort.OFF) apiOptions.reasoningEffort = effort;- }-- if (hasValue(currentConfig.temperature))- apiOptions.temperature = Number(currentConfig.temperature);-- if (hasValue(currentConfig.max_tokens))- apiOptions.max_tokens = Number(currentConfig.max_tokens);-- if (hasValue(currentConfig.dynatemp_range))- apiOptions.dynatemp_range = Number(currentConfig.dynatemp_range);-- if (hasValue(currentConfig.dynatemp_exponent))- apiOptions.dynatemp_exponent = Number(currentConfig.dynatemp_exponent);-- if (hasValue(currentConfig.top_k)) apiOptions.top_k = Number(currentConfig.top_k);-- if (hasValue(currentConfig.top_p)) apiOptions.top_p = Number(currentConfig.top_p);-- if (hasValue(currentConfig.min_p)) apiOptions.min_p = Number(currentConfig.min_p);-- if (hasValue(currentConfig.xtc_probability))- apiOptions.xtc_probability = Number(currentConfig.xtc_probability);-- if (hasValue(currentConfig.xtc_threshold))- apiOptions.xtc_threshold = Number(currentConfig.xtc_threshold);-- if (hasValue(currentConfig.typ_p)) apiOptions.typ_p = Number(currentConfig.typ_p);-- if (hasValue(currentConfig.repeat_last_n))- apiOptions.repeat_last_n = Number(currentConfig.repeat_last_n);-- if (hasValue(currentConfig.repeat_penalty))- apiOptions.repeat_penalty = Number(currentConfig.repeat_penalty);-- if (hasValue(currentConfig.presence_penalty))- apiOptions.presence_penalty = Number(currentConfig.presence_penalty);-- if (hasValue(currentConfig.frequency_penalty))- apiOptions.frequency_penalty = Number(currentConfig.frequency_penalty);-- if (hasValue(currentConfig.dry_multiplier))- apiOptions.dry_multiplier = Number(currentConfig.dry_multiplier);-- if (hasValue(currentConfig.dry_base)) apiOptions.dry_base = Number(currentConfig.dry_base);-- if (hasValue(currentConfig.dry_allowed_length))- apiOptions.dry_allowed_length = Number(currentConfig.dry_allowed_length);-- if (hasValue(currentConfig.dry_penalty_last_n))- apiOptions.dry_penalty_last_n = Number(currentConfig.dry_penalty_last_n);-- if (currentConfig.samplers) apiOptions.samplers = currentConfig.samplers;-- if (hasValue(currentConfig.backend_sampling))- apiOptions.backend_sampling = currentConfig.backend_sampling;-- if (currentConfig.customJson) apiOptions.custom = currentConfig.customJson;-- return apiOptions;- }-- private cancelPreEncode(): void {- if (this.preEncodeAbortController) {- this.preEncodeAbortController.abort();- this.preEncodeAbortController = null;- }- }-- private async triggerPreEncode(- allMessages: DatabaseMessage[],- assistantMessage: DatabaseMessage,- assistantContent: string,- model?: string | null,- excludeReasoning?: boolean- ): Promise<void> {- this.cancelPreEncode();- this.preEncodeAbortController = new AbortController();-- const signal = this.preEncodeAbortController.signal;-- try {- const allIdle = await ChatService.areAllSlotsIdle(model, signal);-- if (!allIdle || signal.aborted) return;-- const messagesWithAssistant: DatabaseMessage[] = [- ...allMessages,- { ...assistantMessage, content: assistantContent }- ];-- await ChatService.preEncode(messagesWithAssistant, model, excludeReasoning, signal);- } catch (err) {- if (!isAbortError(err)) {- console.warn('[ChatStore] Pre-encode failed:', err);- }- }- }-}--export const chatStore = new ChatStore();diff --git a/tools/ui/src/lib/stores/chat/activity.svelte.ts b/tools/ui/src/lib/stores/chat/activity.svelte.tsnew file mode 100644index 0000000000..cd4e0497bf--- /dev/null+++ b/tools/ui/src/lib/stores/chat/activity.svelte.ts@@ -0,0 +1,74 @@+/**+ * ChatActivityStore - Conversation activity ledger+ *+ * Single owner of the "is this conversation doing something" state:+ * - `local` - this browser is piping a stream (send, server-stream attach,+ * or resume-wait while the owning model loads)+ * - `remote` - the backend reports a running session, no local pipe yet+ * (global snapshot on mount / visibilitychange)+ *+ * The union of both drives the sidebar spinners (`loadingConvs`); `local`+ * drives the per-conversation loading flags. When a local pipe ends it is+ * the authoritative observer of session end, so it also drops the stale+ * remote hint in the same call - no cross-owner cleanup, no ghosted+ * spinners waiting for the next visibilitychange snapshot.+ *+ * Composed under chatStore.activity; not exported from the stores barrel.+ */++import { SvelteSet } from 'svelte/reactivity';++export class ChatActivityStore {+ /** Convs this browser is piping a stream for (send, attach, resume-wait). */+ private local = new SvelteSet<string>();+ /** Convs the backend reports as having a running session (snapshot sync). */+ private remote = new SvelteSet<string>();++ /** Convs with any activity, the union the sidebar spinners render. */+ loadingConvs = $derived.by(() => {+ const out = new SvelteSet<string>(this.local);++ for (const id of this.remote) out.add(id);++ return Array.from(out);+ });++ /**+ * Apply a backend snapshot of running sessions (mount / visibilitychange).+ * Diffed so unchanged entries do not re-trigger reactivity.+ */+ applyRemoteSnapshot(running: Iterable<string>): void {+ const next = new SvelteSet<string>(running);++ for (const id of Array.from(this.remote)) {+ if (!next.has(id)) this.remote.delete(id);+ }++ for (const id of next) this.remote.add(id);+ }++ isLocal(convId: string): boolean {+ return this.local.has(convId);+ }++ isRemote(convId: string): boolean {+ return this.remote.has(convId);+ }++ /**+ * A local pipe ended for the conv. Also drops the remote hint: the local+ * pipe is the authoritative observer of session end, so the sidebar hint+ * goes away right away instead of ghosting until the next snapshot.+ */+ localEnded(convId: string): void {+ this.local.delete(convId);+ this.remote.delete(convId);+ }++ /** A local pipe (send, attach or resume-wait) started for the conv. */+ markLocal(convId: string): void {+ this.local.add(convId);+ }+}++export const chatActivityStore = new ChatActivityStore();diff --git a/tools/ui/src/lib/stores/context-stats.svelte.ts b/tools/ui/src/lib/stores/chat/context-stats.svelte.tssimilarity index 56%rename from tools/ui/src/lib/stores/context-stats.svelte.tsrename to tools/ui/src/lib/stores/chat/context-stats.svelte.tsindex 1491845630..b5d22cfbda 100644--- a/tools/ui/src/lib/stores/context-stats.svelte.ts+++ b/tools/ui/src/lib/stores/chat/context-stats.svelte.ts@@ -1,5 +1,5 @@/**- * contextStatsStore - Context window usage stats for the active conversation+ * ContextStatsStore - Context window usage stats for the active conversation** Combines token usage persisted in message timings metadata with* server-originating data: model context size from /props (modelsStore)@@ -8,12 +8,17 @@import { MessageRole } from '$lib/enums';// direct imports between stores, not via the barrel, to avoid circular deps-import { agenticStore } from '$lib/stores/agentic.svelte';-import { chatStore } from '$lib/stores/chat.svelte';-import { conversationsStore } from '$lib/stores/conversations.svelte';-import { modelsStore } from '$lib/stores/models.svelte';+import { agenticStore } from '$lib/stores/agentic/index.svelte';+import { chatStore } from '$lib/stores/chat/index.svelte';+import { conversationsStore } from '$lib/stores/conversations/index.svelte';+import { modelsStore } from '$lib/stores/models/index.svelte';import { serverStore } from '$lib/stores/server.svelte';-import type { ApiProcessingState, ChatMessageTimings, DatabaseMessage } from '$lib/types';+import type {+ ApiProcessingState,+ ChatMessageAgenticTimings,+ ChatMessageTimings,+ DatabaseMessage+} from '$lib/types';interface LiveStats {freshTokens: number;@@ -22,14 +27,46 @@ interface LiveStats {outputTokens: number;}-function lastAssistantTimings(messages: DatabaseMessage[]): ChatMessageTimings | undefined {- for (let i = messages.length - 1; i >= 0; i--) {- const m = messages[i];+interface AssistantTimingsSummary {+ lastAgenticLlm: ChatMessageAgenticTimings['llm'] | undefined;+ lastTimings: ChatMessageTimings | undefined;+ cacheTotal: number;+ output: number;+ outputMs: number;+ read: number;+}++/**+ * One forward pass over the messages computing everything the deriveds+ * below need: the last assistant timings (per-turn gauges), the last+ * agentic llm totals (cumulative gauge) and the cumulative sums. During+ * streaming activeMessages churns every chunk, and each of these used to be+ * its own O(n) scan re-run per chunk.+ */+function summarizeAssistantTimings(messages: DatabaseMessage[]): AssistantTimingsSummary {+ let lastAgenticLlm: ChatMessageAgenticTimings['llm'] | undefined;+ let lastTimings: ChatMessageTimings | undefined;+ let read = 0;+ let cacheTotal = 0;+ let output = 0;+ let outputMs = 0;++ for (const m of messages) {+ if (m.role !== MessageRole.ASSISTANT || !m.timings) continue;++ lastTimings = m.timings;++ if (m.timings.agentic?.llm?.predicted_n != null) {+ lastAgenticLlm = m.timings.agentic.llm;+ }- if (m.role === MessageRole.ASSISTANT && m.timings) return m.timings;+ read += m.timings.prompt_n ?? 0;+ cacheTotal += m.timings.cache_n ?? 0;+ output += m.timings.predicted_n ?? 0;+ outputMs += m.timings.predicted_ms ?? 0;}- return undefined;+ return { cacheTotal, lastAgenticLlm, lastTimings, output, outputMs, read };}function deriveLiveStats(state: ApiProcessingState | null): LiveStats | null {@@ -52,25 +89,73 @@ class ContextStatsStore {// The canonical resolution lives in modelsStore.activeModelId.activeModelId = $derived(modelsStore.activeModelId);- isActiveModelLoaded = $derived(- this.activeModelId !== null &&- (!serverStore.isRouterMode || modelsStore.isModelLoaded(this.activeModelId))+ // shared by currentRead/Fresh/Cache/Output and cumulative so a per-chunk+ // churn of activeMessages triggers exactly one scan instead of one per+ // derived+ private assistantTimings = $derived.by(() =>+ summarizeAssistantTimings(conversationsStore.activeMessages as DatabaseMessage[]));- isActiveModelLoading = $derived(- this.activeModelId !== null && modelsStore.isModelOperationInProgress(this.activeModelId)- );+ private cumulative = $derived.by(() => {+ const convId = conversationsStore.activeConversation?.id;+ // A running agentic flow stamps llm totals on messages only when it+ // exits, so read its live session totals instead.+ const liveLlm = convId ? agenticStore.getLiveLlmTotals(convId) : null;++ if (liveLlm) {+ const outputMs = liveLlm.predicted_ms;+ const averageTokensPerSecond =+ outputMs > 0 && liveLlm.predicted_n > 0 ? (liveLlm.predicted_n / outputMs) * 1000 : null;++ return {+ averageTokensPerSecond,+ cacheTotal: 0,+ output: liveLlm.predicted_n,+ read: liveLlm.prompt_n+ };+ }++ const { cacheTotal, lastAgenticLlm, output, outputMs, read } = this.assistantTimings;++ // Agentic sessions stamp the same agentic.llm totals onto every+ // assistant message; cache_n is never per-turn so cache_total stays 0.+ if (lastAgenticLlm) {+ const averageTokensPerSecond =+ lastAgenticLlm.predicted_ms > 0 && lastAgenticLlm.predicted_n > 0+ ? (lastAgenticLlm.predicted_n / lastAgenticLlm.predicted_ms) * 1000+ : null;++ return {+ averageTokensPerSecond,+ cacheTotal: 0,+ output: lastAgenticLlm.predicted_n ?? 0,+ read: lastAgenticLlm.prompt_n ?? 0+ };+ }++ const averageTokensPerSecond = outputMs > 0 && output > 0 ? (output / outputMs) * 1000 : null;++ return { averageTokensPerSecond, cacheTotal, output, read };+ });++ averageTokensPerSecond = $derived(this.cumulative.averageTokensPerSecond);contextTotal = $derived.by(() => {- void modelsStore.propsCacheVersion;+ void modelsStore.props.cacheVersion;- return this.activeModelId ? modelsStore.getModelContextSize(this.activeModelId) : null;+ return this.activeModelId ? modelsStore.props.getModelContextSize(this.activeModelId) : null;});- private liveStats = $derived(deriveLiveStats(chatStore.activeProcessingState));+ private liveStats = $derived(deriveLiveStats(chatStore.processing.activeState));++ currentOutput = $derived.by(() => {+ if (this.liveStats && this.liveStats.outputTokens > 0) return this.liveStats.outputTokens;++ return this.assistantTimings.lastTimings?.predicted_n ?? 0;+ });currentRead = $derived.by(() => {- const timings = lastAssistantTimings(conversationsStore.activeMessages as DatabaseMessage[]);+ const timings = this.assistantTimings.lastTimings;let read = 0;@@ -87,34 +172,6 @@ class ContextStatsStore {return read;});- currentFresh = $derived.by(() => {- const timings = lastAssistantTimings(conversationsStore.activeMessages as DatabaseMessage[]);- const fresh = timings?.prompt_n ?? 0;-- return Math.max(fresh, this.liveStats?.freshTokens ?? 0);- });-- currentCache = $derived.by(() => {- const timings = lastAssistantTimings(conversationsStore.activeMessages as DatabaseMessage[]);- const cached = timings?.cache_n ?? 0;-- if (this.liveStats && this.liveStats.promptTokens > 0) {- return Math.max(cached, this.liveStats.cacheTokens);- }-- return cached;- });-- currentOutput = $derived.by(() => {- if (this.liveStats && this.liveStats.outputTokens > 0) return this.liveStats.outputTokens;-- const timings = lastAssistantTimings(conversationsStore.activeMessages as DatabaseMessage[]);-- return timings?.predicted_n ?? 0;- });-- kvTotal = $derived(this.currentRead + this.currentOutput);-contextUsed = $derived(this.currentRead + this.currentOutput);contextAvailable = $derived(@@ -127,71 +184,38 @@ class ContextStatsStore {return Math.round((this.contextUsed / this.contextTotal) * 100);});- private cumulative = $derived.by(() => {- const messages = conversationsStore.activeMessages as DatabaseMessage[];- const convId = conversationsStore.activeConversation?.id;- // A running agentic flow stamps llm totals on messages only when it- // exits, so read its live session totals instead.- const liveLlm = convId ? agenticStore.getLiveLlmTotals(convId) : null;-- if (liveLlm) {- const outputMs = liveLlm.predicted_ms;- const averageTokensPerSecond =- outputMs > 0 && liveLlm.predicted_n > 0 ? (liveLlm.predicted_n / outputMs) * 1000 : null;+ cumulativeCacheTotal = $derived(this.cumulative.cacheTotal);- return {- averageTokensPerSecond,- cacheTotal: 0,- output: liveLlm.predicted_n,- read: liveLlm.prompt_n- };- }+ cumulativeOutput = $derived(this.cumulative.output);- // Agentic sessions stamp the same agentic.llm totals onto every- // assistant message; cache_n is never per-turn so cache_total stays 0.- const agenticMessages = messages.filter(- (m) => m.role === MessageRole.ASSISTANT && m.timings?.agentic?.llm?.predicted_n != null- );+ cumulativeRead = $derived(this.cumulative.read);- if (agenticMessages.length > 0) {- const llm = agenticMessages[agenticMessages.length - 1].timings!.agentic!.llm;- const output = llm.predicted_n ?? 0;- const outputMs = llm.predicted_ms ?? 0;- const averageTokensPerSecond = outputMs > 0 && output > 0 ? (output / outputMs) * 1000 : null;+ currentCache = $derived.by(() => {+ const cached = this.assistantTimings.lastTimings?.cache_n ?? 0;- return {- averageTokensPerSecond,- cacheTotal: 0,- output,- read: llm.prompt_n ?? 0- };+ if (this.liveStats && this.liveStats.promptTokens > 0) {+ return Math.max(cached, this.liveStats.cacheTokens);}- let read = 0;- let output = 0;- let outputMs = 0;- let cacheTotal = 0;-- for (const m of messages) {- if (m.role !== MessageRole.ASSISTANT || !m.timings) continue;+ return cached;+ });- read += m.timings.prompt_n ?? 0;- cacheTotal += m.timings.cache_n ?? 0;- output += m.timings.predicted_n ?? 0;- outputMs += m.timings.predicted_ms ?? 0;- }- const averageTokensPerSecond = outputMs > 0 && output > 0 ? (output / outputMs) * 1000 : null;+ currentFresh = $derived.by(() => {+ const fresh = this.assistantTimings.lastTimings?.prompt_n ?? 0;- return { averageTokensPerSecond, cacheTotal, output, read };+ return Math.max(fresh, this.liveStats?.freshTokens ?? 0);});- cumulativeRead = $derived(this.cumulative.read);-- cumulativeOutput = $derived(this.cumulative.output);+ isActiveModelLoaded = $derived(+ this.activeModelId !== null &&+ (!serverStore.isRouterMode || modelsStore.isModelLoaded(this.activeModelId))+ );- cumulativeCacheTotal = $derived(this.cumulative.cacheTotal);+ isActiveModelLoading = $derived(+ this.activeModelId !== null && modelsStore.status.isOperationInProgress(this.activeModelId)+ );- averageTokensPerSecond = $derived(this.cumulative.averageTokensPerSecond);+ kvTotal = $derived(this.currentRead + this.currentOutput);}export const contextStatsStore = new ContextStatsStore();diff --git a/tools/ui/src/lib/stores/draft-messages.svelte.ts b/tools/ui/src/lib/stores/chat/drafts.svelte.tssimilarity index 76%rename from tools/ui/src/lib/stores/draft-messages.svelte.tsrename to tools/ui/src/lib/stores/chat/drafts.svelte.tsindex 235a59122e..f480e1efd4 100644--- a/tools/ui/src/lib/stores/draft-messages.svelte.ts+++ b/tools/ui/src/lib/stores/chat/drafts.svelte.ts@@ -1,3 +1,11 @@+/**+ * DraftMessagesStore - Per-conversation input drafts+ *+ * Keeps in-memory drafts (message text + files) keyed by conversation id,+ * plus a dedicated key for the new-chat screen, so the input box restores+ * its content when switching conversations.+ */+import { NEW_CHAT_DRAFT_KEY } from '$lib/constants';interface DraftMessage {@@ -8,6 +16,12 @@ interface DraftMessage {class DraftMessagesStore {private drafts = new Map<string, DraftMessage>();+ clearDraftMessage(chatId: string | undefined): void {+ const key = chatId ?? NEW_CHAT_DRAFT_KEY;++ this.drafts.delete(key);+ }+getDraftMessage(chatId: string | undefined): DraftMessage {const key = chatId ?? NEW_CHAT_DRAFT_KEY;@@ -23,12 +37,6 @@ class DraftMessagesStore {this.drafts.delete(key);}}-- clearDraftMessage(chatId: string | undefined): void {- const key = chatId ?? NEW_CHAT_DRAFT_KEY;-- this.drafts.delete(key);- }}export const draftMessagesStore = new DraftMessagesStore();diff --git a/tools/ui/src/lib/stores/chat/flows.svelte.ts b/tools/ui/src/lib/stores/chat/flows.svelte.tsnew file mode 100644index 0000000000..16c377bb61--- /dev/null+++ b/tools/ui/src/lib/stores/chat/flows.svelte.ts@@ -0,0 +1,794 @@+/**+ * ChatMessageFlows - Message-level flows for the active conversation+ *+ * Owns the operations that mutate chat history and (re)stream a response:+ * editing, regeneration, continuation and deletion of messages. Created and+ * owned by chatStore; the host exposes the streaming core and the+ * per-conversation state setters these flows drive.+ */++import {+ ContinueIntentKind,+ ErrorDialogType,+ MessageRole,+ MessageType,+ StreamConnectionState+} from '$lib/enums';+import { ChatService } from '$lib/services/chat.service';+import { DatabaseService } from '$lib/services/database.service';+import type { ChatProcessingStore } from '$lib/stores/chat/processing.svelte';+// direct imports between stores, not via the barrel, to avoid circular deps+import { conversationsStore } from '$lib/stores/conversations/index.svelte';+import type {+ ChatMessagePromptProgress,+ ChatMessageTimings,+ DatabaseMessage,+ DatabaseMessageExtra,+ ErrorDialogState+} from '$lib/types';+import {+ classifyContinueIntent,+ filterByLeafNodeId,+ findDescendantMessages,+ findLeafNode,+ findMessageById,+ isAbortError+} from '$lib/utils';++/**+ * The slice of chatStore the flows drive. Kept narrow on purpose so the flows+ * cannot reach around the host's full surface; chatStore implements this+ * structurally.+ */+export interface ChatFlowsHost {+ processing: ChatProcessingStore;+ streamConnectionState: StreamConnectionState;+ cancelPreEncode(): void;+ clearChatStreaming(convId: string, messageId?: string): void;+ cleanupStreaming(convId: string): void;+ createAssistantMessage(parentId?: string): Promise<DatabaseMessage>;+ getApiOptions(): Record<string, unknown>;+ getOrCreateAbortController(convId: string): AbortController;+ isChatLoadingInternal(convId: string): boolean;+ setChatLoading(convId: string, loading: boolean): void;+ setChatReasoning(convId: string, reasoning: boolean): void;+ setChatStreaming(+ convId: string,+ response: string,+ messageId: string,+ model?: string | null+ ): void;+ showErrorDialog(state: ErrorDialogState | null): void;+ stopGeneration(): Promise<void>;+ streamChatCompletion(+ allMessages: DatabaseMessage[],+ assistantMessage: DatabaseMessage,+ onComplete?: (content: string) => Promise<void>,+ onError?: (error: Error) => void,+ modelOverride?: string | null,+ firstUserMessageContent?: string+ ): Promise<void>;+}++export class ChatMessageFlows {+ constructor(private host: ChatFlowsHost) {}++ async continueAssistantMessage(messageId: string): Promise<void> {+ const activeConv = conversationsStore.activeConversation;++ if (!activeConv || this.host.isChatLoadingInternal(activeConv.id)) return;++ const result = this.getMessageByIdWithRole(messageId, MessageRole.ASSISTANT);++ if (!result) return;++ const { index: idx, message: msg } = result;+ // Decide which resume path applies. tool_calls without tool results can+ // not be resumed mid sequence by continue_final_message, branch instead.+ // tool_calls already paired with tool results need a fresh next turn,+ // not a token level continuation of the target assistant.+ const intent = classifyContinueIntent(conversationsStore.activeMessages, idx);++ if (intent.kind === ContinueIntentKind.RERUN_TURN) {+ return this.regenerateMessageWithBranching(messageId);+ }++ if (intent.kind === ContinueIntentKind.NEXT_TURN) {+ return this.continueAsNextAgenticTurn(intent.truncateAfter);+ }++ try {+ this.host.showErrorDialog(null);+ this.host.setChatLoading(activeConv.id, true);+ this.host.clearChatStreaming(activeConv.id);++ const allMessages = await conversationsStore.getConversationMessages(activeConv.id);+ const dbMessage = findMessageById(allMessages, messageId);++ if (!dbMessage) {+ this.host.setChatLoading(activeConv.id, false);++ return;+ }++ const originalContent = dbMessage.content;+ const originalReasoning = dbMessage.reasoningContent || '';+ // Hand the persisted DatabaseMessage straight to sendMessage so its+ // internal converter preserves tool_calls and extras when present.+ // Reconstructing a bare {role, content} here would drop those fields+ // and break continue_final_message for messages with tool calls.+ const contextWithContinue = conversationsStore.activeMessages.slice(0, idx + 1);++ let appendedContent = '';+ let appendedReasoning = '';+ let hasReceivedContent = false;++ const updateStreamingContent = (fullContent: string) => {+ this.host.setChatStreaming(msg.convId, fullContent, msg.id);+ // resolve the row by id on every write, switching to another conv mid continue makes+ // this a no op instead of writing positionally into the now displayed conversation+ conversationsStore.updateMessageAtIndex(conversationsStore.findMessageIndex(msg.id), {+ content: fullContent+ });+ };+ const abortController = this.host.getOrCreateAbortController(msg.convId);++ await ChatService.sendMessage(+ contextWithContinue,+ {+ ...this.host.getApiOptions(),+ continueFinalMessage: true,+ onChunk: (chunk: string) => {+ appendedContent += chunk;+ hasReceivedContent = true;+ updateStreamingContent(originalContent + appendedContent);+ this.host.setChatReasoning(msg.convId, false);+ },+ onComplete: async (+ finalContent?: string,+ reasoningContent?: string,+ timings?: ChatMessageTimings+ ) => {+ const finalAppendedContent = hasReceivedContent ? appendedContent : finalContent || '';+ const finalAppendedReasoning = hasReceivedContent+ ? appendedReasoning+ : reasoningContent || '';+ const fullContent = originalContent + finalAppendedContent;+ const fullReasoning = originalReasoning + finalAppendedReasoning || undefined;++ await DatabaseService.updateMessage(msg.id, {+ content: fullContent,+ reasoningContent: fullReasoning,+ timestamp: Date.now(),+ timings+ });++ conversationsStore.updateMessageAtIndex(conversationsStore.findMessageIndex(msg.id), {+ content: fullContent,+ reasoningContent: fullReasoning,+ timestamp: Date.now(),+ timings+ });++ conversationsStore.updateConversationTimestamp(msg.convId);++ this.host.cleanupStreaming(msg.convId);+ },+ onCompletionId: (id: string) => {+ if (!id) return;++ // refresh the message id so a later skip targets the live slot after a continue+ conversationsStore.updateMessageAtIndex(conversationsStore.findMessageIndex(msg.id), {+ completionId: id+ });+ DatabaseService.updateMessage(msg.id, { completionId: id }).catch(() => {});+ },+ onConnectionState: (state: StreamConnectionState) => {+ if (msg.convId === conversationsStore.activeConversation?.id) {+ this.host.streamConnectionState = state;+ }+ },+ onError: async (error: Error) => {+ if (isAbortError(error)) {+ if (hasReceivedContent && appendedContent) {+ await DatabaseService.updateMessage(msg.id, {+ content: originalContent + appendedContent,+ reasoningContent: originalReasoning + appendedReasoning || undefined,+ timestamp: Date.now()+ });++ conversationsStore.updateMessageAtIndex(+ conversationsStore.findMessageIndex(msg.id),+ {+ content: originalContent + appendedContent,+ reasoningContent: originalReasoning + appendedReasoning || undefined,+ timestamp: Date.now()+ }+ );+ }++ this.host.cleanupStreaming(msg.convId);++ return;+ }++ console.error('Continue generation error:', error);+ // keep whatever was appended so far, the message stays in memory and in DB+ await DatabaseService.updateMessage(msg.id, {+ content: originalContent + appendedContent,+ reasoningContent: originalReasoning + appendedReasoning || undefined,+ timestamp: Date.now()+ });+ conversationsStore.updateMessageAtIndex(conversationsStore.findMessageIndex(msg.id), {+ content: originalContent + appendedContent,+ reasoningContent: originalReasoning + appendedReasoning || undefined,+ timestamp: Date.now()+ });++ this.host.cleanupStreaming(msg.convId);+ this.host.showErrorDialog({+ message: error.message,+ type: error.name === 'TimeoutError' ? ErrorDialogType.TIMEOUT : ErrorDialogType.SERVER+ });+ },+ onReasoningChunk: (chunk: string) => {+ appendedReasoning += chunk;+ hasReceivedContent = true;+ // mark streaming state so a stop mid-thinking can persist the partial reasoning+ this.host.setChatStreaming(msg.convId, originalContent + appendedContent, msg.id);+ conversationsStore.updateMessageAtIndex(conversationsStore.findMessageIndex(msg.id), {+ reasoningContent: originalReasoning + appendedReasoning+ });+ this.host.setChatReasoning(msg.convId, true);+ },+ onTimings: (timings?: ChatMessageTimings, promptProgress?: ChatMessagePromptProgress) => {+ this.host.processing.applyStreamTimings(timings, promptProgress, msg.convId);+ }+ },++ msg.convId,+ abortController.signal+ );+ } catch (error) {+ if (!isAbortError(error)) console.error('Failed to continue message:', error);++ if (activeConv) this.host.setChatLoading(activeConv.id, false);+ }+ }++ async deleteMessage(messageId: string): Promise<void> {+ const activeConv = conversationsStore.activeConversation;++ if (!activeConv) return;++ try {+ const allMessages = await conversationsStore.getConversationMessages(activeConv.id);+ const messageToDelete = findMessageById(allMessages, messageId);++ if (!messageToDelete) return;++ const currentPath = filterByLeafNodeId(allMessages, activeConv.currNode || '', false);+ const isInCurrentPath = currentPath.some((m) => m.id === messageId);++ if (isInCurrentPath && messageToDelete.parent) {+ const siblings = allMessages.filter(+ (m) => m.parent === messageToDelete.parent && m.id !== messageId+ );++ if (siblings.length > 0) {+ const latestSibling = siblings.reduce((latest, sibling) =>+ sibling.timestamp > latest.timestamp ? sibling : latest+ );++ await conversationsStore.updateCurrentNode(findLeafNode(allMessages, latestSibling.id));+ } else if (messageToDelete.parent) {+ await conversationsStore.updateCurrentNode(+ findLeafNode(allMessages, messageToDelete.parent)+ );+ }+ }++ await DatabaseService.deleteMessageCascading(activeConv.id, messageId);+ await conversationsStore.refreshActiveMessages();++ conversationsStore.updateConversationTimestamp();+ } catch (error) {+ console.error('Failed to delete message:', error);+ }+ }++ async editAssistantMessage(+ messageId: string,+ newContent: string,+ shouldBranch: boolean+ ): Promise<void> {+ const activeConv = conversationsStore.activeConversation;++ if (!activeConv || this.host.isChatLoadingInternal(activeConv.id)) return;++ const result = this.getMessageByIdWithRole(messageId, MessageRole.ASSISTANT);++ if (!result) return;++ const { index: idx, message: msg } = result;++ try {+ if (shouldBranch) {+ const newMessage = await DatabaseService.createMessageBranch(+ {+ children: [],+ content: newContent,+ convId: msg.convId,+ model: msg.model,+ role: msg.role,+ timestamp: Date.now(),+ toolCalls: msg.toolCalls || '',+ type: msg.type+ },+ msg.parent!+ );++ await conversationsStore.updateCurrentNode(newMessage.id);+ } else {+ await DatabaseService.updateMessage(msg.id, { content: newContent });+ conversationsStore.updateMessageAtIndex(idx, { content: newContent });+ }++ conversationsStore.updateConversationTimestamp();++ await conversationsStore.refreshActiveMessages();+ } catch (error) {+ console.error('Failed to edit assistant message:', error);+ }+ }++ async editMessageWithBranching(+ messageId: string,+ newContent: string,+ newExtras?: DatabaseMessageExtra[]+ ): Promise<void> {+ const activeConv = conversationsStore.activeConversation;++ if (!activeConv || this.host.isChatLoadingInternal(activeConv.id)) return;++ let result = this.getMessageByIdWithRole(messageId, MessageRole.USER);++ if (!result) result = this.getMessageByIdWithRole(messageId, MessageRole.SYSTEM);++ if (!result) return;++ const { index: idx, message: msg } = result;++ try {+ const allMessages = await conversationsStore.getConversationMessages(activeConv.id);+ const rootMessage = allMessages.find((m) => m.type === 'root' && m.parent === null);+ const isFirstUserMessage =+ msg.role === MessageRole.USER && rootMessage && msg.parent === rootMessage.id;+ const extrasToUse =+ newExtras !== undefined+ ? JSON.parse(JSON.stringify(newExtras))+ : msg.extra+ ? JSON.parse(JSON.stringify(msg.extra))+ : undefined;++ let messageIdForResponse: string;++ const dbMsg = findMessageById(allMessages, msg.id);+ const hasChildren = dbMsg ? dbMsg.children.length > 0 : msg.children.length > 0;++ if (!hasChildren) {+ // No responses after this message - update in place instead of branching+ const updates: Partial<DatabaseMessage> = {+ content: newContent,+ extra: extrasToUse,+ timestamp: Date.now()+ };++ await DatabaseService.updateMessage(msg.id, updates);+ conversationsStore.updateMessageAtIndex(idx, updates);+ messageIdForResponse = msg.id;+ } else {+ // Has children - create a new branch as sibling+ const parentId = msg.parent || rootMessage?.id;++ if (!parentId) return;++ const newMessage = await DatabaseService.createMessageBranch(+ {+ children: [],+ content: newContent,+ convId: msg.convId,+ extra: extrasToUse,+ model: msg.model,+ role: msg.role,+ timestamp: Date.now(),+ toolCalls: msg.toolCalls || '',+ type: msg.type+ },+ parentId+ );++ await conversationsStore.updateCurrentNode(newMessage.id);+ messageIdForResponse = newMessage.id;+ }++ conversationsStore.updateConversationTimestamp();++ if (isFirstUserMessage && newContent.trim())+ await conversationsStore.applyTitleFromContent(activeConv.id, newContent);++ await conversationsStore.refreshActiveMessages();++ if (msg.role === MessageRole.USER)+ await this.generateResponseForMessage(messageIdForResponse);+ } catch (error) {+ console.error('Failed to edit message with branching:', error);+ }+ }++ async editUserMessagePreserveResponses(+ messageId: string,+ newContent: string,+ newExtras?: DatabaseMessageExtra[]+ ): Promise<void> {+ const activeConv = conversationsStore.activeConversation;++ if (!activeConv) return;++ const result = this.getMessageByIdWithRole(messageId, MessageRole.USER);++ if (!result) return;++ const { index: idx, message: msg } = result;++ try {+ const updateData: Partial<DatabaseMessage> = { content: newContent };++ if (newExtras !== undefined) updateData.extra = JSON.parse(JSON.stringify(newExtras));++ await DatabaseService.updateMessage(messageId, updateData);++ conversationsStore.updateMessageAtIndex(idx, updateData);++ const allMessages = await conversationsStore.getConversationMessages(activeConv.id);+ const rootMessage = allMessages.find((m) => m.type === 'root' && m.parent === null);++ if (rootMessage && msg.parent === rootMessage.id && newContent.trim()) {+ await conversationsStore.applyTitleFromContent(activeConv.id, newContent);+ }++ conversationsStore.updateConversationTimestamp();+ } catch (error) {+ console.error('Failed to edit user message:', error);+ }+ }++ async getDeletionInfo(messageId: string): Promise<{+ totalCount: number;+ userMessages: number;+ assistantMessages: number;+ messageTypes: string[];+ }> {+ const activeConv = conversationsStore.activeConversation;++ if (!activeConv)+ return { assistantMessages: 0, messageTypes: [], totalCount: 0, userMessages: 0 };++ const allMessages = await conversationsStore.getConversationMessages(activeConv.id);+ const messageToDelete = findMessageById(allMessages, messageId);++ // For system messages, don't count descendants as they will be preserved (reparented to root)+ if (messageToDelete?.role === MessageRole.SYSTEM) {+ const messagesToDelete = allMessages.filter((m) => m.id === messageId);++ let assistantMessages = 0,+ userMessages = 0;++ const messageTypes: string[] = [];++ for (const msg of messagesToDelete) {+ if (msg.role === MessageRole.USER) {+ userMessages++;++ if (!messageTypes.includes('user message')) messageTypes.push('user message');+ } else if (msg.role === MessageRole.ASSISTANT) {+ assistantMessages++;++ if (!messageTypes.includes('assistant response')) messageTypes.push('assistant response');+ }+ }++ return { assistantMessages, messageTypes, totalCount: 1, userMessages };+ }++ const descendants = findDescendantMessages(allMessages, messageId);+ const allToDelete = [messageId, ...descendants];+ const messagesToDelete = allMessages.filter((m) => allToDelete.includes(m.id));++ let assistantMessages = 0,+ userMessages = 0;++ const messageTypes: string[] = [];++ for (const msg of messagesToDelete) {+ if (msg.role === MessageRole.USER) {+ userMessages++;++ if (!messageTypes.includes('user message')) messageTypes.push('user message');+ } else if (msg.role === MessageRole.ASSISTANT) {+ assistantMessages++;++ if (!messageTypes.includes('assistant response')) messageTypes.push('assistant response');+ }+ }++ return { assistantMessages, messageTypes, totalCount: allToDelete.length, userMessages };+ }++ async regenerateMessage(messageId: string): Promise<void> {+ const activeConv = conversationsStore.activeConversation;++ if (!activeConv || this.host.isChatLoadingInternal(activeConv.id)) return;++ this.host.cancelPreEncode();+ const result = this.getMessageByIdWithRole(messageId, MessageRole.ASSISTANT);++ if (!result) return;++ const { index: messageIndex } = result;++ try {+ const messagesToRemove = conversationsStore.activeMessages.slice(messageIndex);++ await DatabaseService.deleteMessageCascading(activeConv.id, messagesToRemove[0].id);+ conversationsStore.sliceActiveMessages(messageIndex);+ conversationsStore.updateConversationTimestamp();+ this.host.setChatLoading(activeConv.id, true);+ this.host.clearChatStreaming(activeConv.id);+ const parentMessageId =+ conversationsStore.activeMessages.length > 0+ ? conversationsStore.activeMessages[conversationsStore.activeMessages.length - 1].id+ : undefined;+ const assistantMessage = await this.host.createAssistantMessage(parentMessageId);++ conversationsStore.addMessageToActive(assistantMessage);+ await this.host.streamChatCompletion(+ conversationsStore.activeMessages.slice(0, -1),+ assistantMessage+ );+ } catch (error) {+ if (!isAbortError(error)) console.error('Failed to regenerate message:', error);++ this.host.setChatLoading(activeConv?.id || '', false);+ }+ }++ async regenerateMessageWithBranching(messageId: string, modelOverride?: string): Promise<void> {+ const activeConv = conversationsStore.activeConversation;++ if (!activeConv || this.host.isChatLoadingInternal(activeConv.id)) return;++ this.host.cancelPreEncode();+ try {+ const idx = conversationsStore.findMessageIndex(messageId);++ if (idx === -1) return;++ const msg = conversationsStore.activeMessages[idx];++ if (msg.role !== MessageRole.ASSISTANT) return;++ const allMessages = await conversationsStore.getConversationMessages(activeConv.id);+ const parentMessage = findMessageById(allMessages, msg.parent);++ if (!parentMessage) return;++ this.host.setChatLoading(activeConv.id, true);+ this.host.clearChatStreaming(activeConv.id);+ const newAssistantMessage = await DatabaseService.createMessageBranch(+ {+ children: [],+ content: '',+ convId: msg.convId,+ model: null,+ role: msg.role,+ timestamp: Date.now(),+ toolCalls: '',+ type: msg.type+ },+ parentMessage.id+ );++ await conversationsStore.updateCurrentNode(newAssistantMessage.id);+ conversationsStore.updateConversationTimestamp();+ await conversationsStore.refreshActiveMessages();+ const conversationPath = filterByLeafNodeId(+ allMessages,+ parentMessage.id,+ false+ ) as DatabaseMessage[];+ const modelToUse = modelOverride || msg.model || undefined;++ await this.host.streamChatCompletion(+ conversationPath,+ newAssistantMessage,+ undefined,+ undefined,+ modelToUse+ );+ } catch (error) {+ if (!isAbortError(error))+ console.error('Failed to regenerate message with branching:', error);++ this.host.setChatLoading(activeConv?.id || '', false);+ }+ }++ async updateMessage(messageId: string, newContent: string): Promise<void> {+ const activeConv = conversationsStore.activeConversation;++ if (!activeConv) return;++ if (this.host.isChatLoadingInternal(activeConv.id)) await this.host.stopGeneration();++ const result = this.getMessageByIdWithRole(messageId, MessageRole.USER);++ if (!result) return;++ const { index: messageIndex, message: messageToUpdate } = result;+ const originalContent = messageToUpdate.content;++ try {+ const allMessages = await conversationsStore.getConversationMessages(activeConv.id);+ const rootMessage = allMessages.find((m) => m.type === 'root' && m.parent === null);+ const isFirstUserMessage = rootMessage && messageToUpdate.parent === rootMessage.id;++ conversationsStore.updateMessageAtIndex(messageIndex, { content: newContent });+ await DatabaseService.updateMessage(messageId, { content: newContent });++ if (isFirstUserMessage && newContent.trim())+ await conversationsStore.applyTitleFromContent(activeConv.id, newContent);++ const messagesToRemove = conversationsStore.activeMessages.slice(messageIndex + 1);++ if (messagesToRemove.length > 0)+ await DatabaseService.deleteMessageCascading(activeConv.id, messagesToRemove[0].id);++ conversationsStore.sliceActiveMessages(messageIndex + 1);+ conversationsStore.updateConversationTimestamp();+ this.host.setChatLoading(activeConv.id, true);+ this.host.clearChatStreaming(activeConv.id);+ const assistantMessage = await this.host.createAssistantMessage();++ conversationsStore.addMessageToActive(assistantMessage);+ await conversationsStore.updateCurrentNode(assistantMessage.id);+ await this.host.streamChatCompletion(+ conversationsStore.activeMessages.slice(0, -1),+ assistantMessage,+ undefined,+ () => {+ conversationsStore.updateMessageAtIndex(conversationsStore.findMessageIndex(messageId), {+ content: originalContent+ });+ }+ );+ } catch (error) {+ if (!isAbortError(error)) console.error('Failed to update message:', error);+ }+ }++ /**+ * Open a fresh assistant turn anchored at the last tool result of a resolved+ * agentic round and let streamChatCompletion route through runAgenticFlow.+ * Used by continueAssistantMessage when classifyContinueIntent returns+ * next_turn, meaning the target assistant already has its tool_calls paired+ * with trailing tool results and the next thing to generate is a brand new+ * turn rather than a token level continuation.+ */+ private async continueAsNextAgenticTurn(anchorIndex: number): Promise<void> {+ const activeConv = conversationsStore.activeConversation;++ if (!activeConv) return;++ const anchor = conversationsStore.activeMessages[anchorIndex];++ if (!anchor) return;++ this.host.cancelPreEncode();+ this.host.setChatLoading(activeConv.id, true);+ this.host.clearChatStreaming(activeConv.id);+ try {+ const allMessages = await conversationsStore.getConversationMessages(activeConv.id);+ const anchorMessage = findMessageById(allMessages, anchor.id);++ if (!anchorMessage) {+ this.host.setChatLoading(activeConv.id, false);++ return;+ }++ const newAssistantMessage = await DatabaseService.createMessageBranch(+ {+ children: [],+ content: '',+ convId: activeConv.id,+ model: null,+ role: MessageRole.ASSISTANT,+ timestamp: Date.now(),+ toolCalls: '',+ type: MessageType.TEXT+ },+ anchorMessage.id+ );++ await conversationsStore.updateCurrentNode(newAssistantMessage.id);+ conversationsStore.updateConversationTimestamp();+ await conversationsStore.refreshActiveMessages();+ const conversationPath = filterByLeafNodeId(+ allMessages,+ anchorMessage.id,+ false+ ) as DatabaseMessage[];++ await this.host.streamChatCompletion(conversationPath, newAssistantMessage);+ } catch (error) {+ if (!isAbortError(error)) console.error('Failed to continue agentic turn:', error);++ this.host.setChatLoading(activeConv.id, false);+ }+ }++ private async generateResponseForMessage(userMessageId: string): Promise<void> {+ const activeConv = conversationsStore.activeConversation;++ if (!activeConv) return;++ this.host.showErrorDialog(null);+ this.host.setChatLoading(activeConv.id, true);+ this.host.clearChatStreaming(activeConv.id);++ try {+ const allMessages = await conversationsStore.getConversationMessages(activeConv.id);+ const conversationPath = filterByLeafNodeId(+ allMessages,+ userMessageId,+ false+ ) as DatabaseMessage[];+ const assistantMessage = await DatabaseService.createMessageBranch(+ {+ children: [],+ content: '',+ convId: activeConv.id,+ model: null,+ role: MessageRole.ASSISTANT,+ timestamp: Date.now(),+ toolCalls: '',+ type: MessageType.TEXT+ },+ userMessageId+ );++ conversationsStore.addMessageToActive(assistantMessage);++ await this.host.streamChatCompletion(conversationPath, assistantMessage);+ } catch (error) {+ console.error('Failed to generate response:', error);+ this.host.setChatLoading(activeConv.id, false);+ }+ }++ private getMessageByIdWithRole(+ messageId: string,+ expectedRole?: MessageRole+ ): { message: DatabaseMessage; index: number } | null {+ const index = conversationsStore.findMessageIndex(messageId);++ if (index === -1) return null;++ const message = conversationsStore.activeMessages[index];++ if (expectedRole && message.role !== expectedRole) return null;++ return { index, message };+ }+}diff --git a/tools/ui/src/lib/stores/chat/index.svelte.ts b/tools/ui/src/lib/stores/chat/index.svelte.tsnew file mode 100644index 0000000000..aab824fd71--- /dev/null+++ b/tools/ui/src/lib/stores/chat/index.svelte.ts@@ -0,0 +1,1441 @@+/**+ * chatStore - Chat lifecycle, streaming and message operations+ *+ * Owns the active conversation's chat state: sending messages, streaming+ * responses, editing/regeneration flows and per-conversation processing+ * activity. Composes the stream manager, message flows, activity ledger and+ * processing snapshot; persists through conversationsStore.+ *+ * Uses ChatService for the API layer and conversationsStore for persistence.+ */++import { CWD_CLEARED_TEXT, SYSTEM_MESSAGE_PLACEHOLDER, TITLE_GENERATION } from '$lib/constants';+import {+ ErrorDialogType,+ MessageRole,+ MessageType,+ ReasoningEffort,+ StreamConnectionState+} from '$lib/enums';+import { ChatService } from '$lib/services/chat.service';+import { DatabaseService } from '$lib/services/database.service';+// direct imports between stores, not via the barrel, to avoid circular deps+import { agenticStore } from '$lib/stores/agentic/index.svelte';+import { chatActivityStore } from '$lib/stores/chat/activity.svelte';+import { type ChatFlowsHost, ChatMessageFlows } from '$lib/stores/chat/flows.svelte';+import { chatProcessingStore } from '$lib/stores/chat/processing.svelte';+import { type ChatStreamHost, ChatStreamManager } from '$lib/stores/chat/streams.svelte';+import { conversationsStore } from '$lib/stores/conversations/index.svelte';+import { mcpStore } from '$lib/stores/mcp/index.svelte';+import { modelsStore } from '$lib/stores/models/index.svelte';+import { serverStore } from '$lib/stores/server.svelte';+import { settingsStore } from '$lib/stores/settings/index.svelte';+import { toolsStore } from '$lib/stores/tools.svelte';+import type {+ ApiChatMessageData,+ ChatMessagePromptProgress,+ ChatMessageTimings,+ ChatStreamCallbacks,+ DatabaseMessage,+ DatabaseMessageExtra,+ ErrorDialogState+} from '$lib/types';+import {+ findMessageById,+ formatCwdMessage,+ getConversationModel,+ isAbortError,+ normalizeModelName+} from '$lib/utils';+import { SvelteMap } from 'svelte/reactivity';++class ChatStore implements ChatStreamHost, ChatFlowsHost {+ chatReasoningStates = new SvelteMap<string, boolean>();+ chatStreamingStates = new SvelteMap<+ string,+ { response: string; messageId: string; model?: string | null }+ >();+ currentResponse = $state('');+ errorDialogState = $state<ErrorDialogState | null>(null);+ // true while the active conversation has a local pipe (send, attach or resume-wait)+ isLoading = $derived(this.activity.isLocal(conversationsStore.activeConversation?.id ?? ''));+ // true while the active conversation streams reasoning content but no visible content yet+ isReasoning = $derived(+ this.chatReasoningStates.get(conversationsStore.activeConversation?.id ?? '') ?? false+ );+ pendingEditMessageId = $state<string | null>(null);+ // resumable stream connection state for the active conversation+ // streaming -> bytes flowing normally, resuming -> waiting on /v1/stream reconnect, lost -> unrecoverable+ streamConnectionState = $state<StreamConnectionState>(StreamConnectionState.STREAMING);+ private abortControllers = new SvelteMap<string, AbortController>();+ private addFilesHandler: ((files: File[]) => void) | null = $state(null);+ // message flows: edit, regenerate, continue, delete+ private flows = new ChatMessageFlows(this);+ private isEditModeActive = $state(false);+ private pendingDraftFiles = $state<ChatUploadedFile[]>([]);+ private pendingDraftMessage = $state<string>('');+ /** Reactive: queued pending messages for non-agentic streaming */+ private pendingMessages = new SvelteMap<+ string,+ { content: string; extras?: DatabaseMessageExtra[] }+ >();+ private preEncodeAbortController: AbortController | null = null;++ // server-side stream sessions: discovery, attach/replay, resume retry, remote sync+ private streams = new ChatStreamManager(this);++ /** Conv activity (local pipe / remote session), composed here. */+ get activity() {+ return chatActivityStore;+ }++ /** Processing state, composed here so consumers have a single chat scope. */+ get processing() {+ return chatProcessingStore;+ }++ /**+ * Abort the current agentic flow signal without clearing loading state.+ * Used by "Send immediately" to force the agentic loop to exit so that+ * the pending steering message can be re-sent.+ *+ * Any tool calls captured mid-stream are dropped before the abort so the+ * pending message (or a manual follow-up) does not re-send a half-received+ * tool call with invalid JSON arguments to the server. Mirrors what the+ * Stop button already does through stopGenerationForChat.+ */+ async abortCurrentFlow(convId: string): Promise<void> {+ await this.savePartialResponseIfNeeded(convId);+ const c = this.abortControllers.get(convId);++ if (c) {+ c.abort();+ this.abortControllers.delete(convId);+ }+ }++ async addMessage(+ role: MessageRole,+ content: string,+ type: MessageType = MessageType.TEXT,+ parent: string = '-1',+ extras?: DatabaseMessageExtra[],+ isSynthetic?: boolean+ ): Promise<DatabaseMessage> {+ const activeConv = conversationsStore.activeConversation;++ if (!activeConv) throw new Error('No active conversation');++ let parentId: string | null = null;++ if (parent === '-1') {+ const am = conversationsStore.activeMessages;++ if (am.length > 0) parentId = am[am.length - 1].id;+ else {+ const all = await conversationsStore.getConversationMessages(activeConv.id);+ const r = all.find((m) => m.parent === null && m.type === 'root');++ parentId = r ? r.id : await DatabaseService.createRootMessage(activeConv.id);+ }+ } else parentId = parent;++ const message = await DatabaseService.createMessageBranch(+ {+ children: [],+ content,+ convId: activeConv.id,+ extra: extras,+ isSynthetic,+ role,+ timestamp: Date.now(),+ toolCalls: '',+ type+ },+ parentId+ );++ conversationsStore.addMessageToActive(message);+ await conversationsStore.updateCurrentNode(message.id);+ conversationsStore.updateConversationTimestamp();++ return message;+ }+ async addSystemPrompt(): Promise<void> {+ let activeConv = conversationsStore.activeConversation;++ if (!activeConv) {+ await conversationsStore.createConversation();+ activeConv = conversationsStore.activeConversation;+ }++ if (!activeConv) return;++ try {+ const allMessages = await conversationsStore.getConversationMessages(activeConv.id);+ const rootMessage = allMessages.find((m) => m.type === 'root' && m.parent === null);+ const rootId = rootMessage+ ? rootMessage.id+ : await DatabaseService.createRootMessage(activeConv.id);+ const existingSystemMessage = allMessages.find(+ (m) => m.role === MessageRole.SYSTEM && m.parent === rootId+ );++ if (existingSystemMessage) {+ this.pendingEditMessageId = existingSystemMessage.id;++ if (!conversationsStore.activeMessages.some((m) => m.id === existingSystemMessage.id))+ conversationsStore.activeMessages.unshift(existingSystemMessage);++ return;+ }++ const am = conversationsStore.activeMessages;+ const firstActiveMessage = am.find((m) => m.parent === rootId);+ const systemMessage = await DatabaseService.createSystemMessage(+ activeConv.id,+ SYSTEM_MESSAGE_PLACEHOLDER,+ rootId+ );++ if (firstActiveMessage) {+ await DatabaseService.updateMessage(firstActiveMessage.id, {+ parent: systemMessage.id+ });+ await DatabaseService.updateMessage(systemMessage.id, {+ children: [firstActiveMessage.id]+ });+ const updatedRootChildren = rootMessage+ ? rootMessage.children.filter((id: string) => id !== firstActiveMessage.id)+ : [];++ await DatabaseService.updateMessage(rootId, {+ children: [+ ...updatedRootChildren.filter((id: string) => id !== systemMessage.id),+ systemMessage.id+ ]+ });+ const firstMsgIndex = conversationsStore.findMessageIndex(firstActiveMessage.id);++ if (firstMsgIndex !== -1)+ conversationsStore.updateMessageAtIndex(firstMsgIndex, {+ parent: systemMessage.id+ });+ }++ conversationsStore.activeMessages.unshift(systemMessage);+ this.pendingEditMessageId = systemMessage.id;+ conversationsStore.updateConversationTimestamp();+ } catch (error) {+ console.error('Failed to add system prompt:', error);+ }+ }+ cancelPreEncode(): void {+ if (this.preEncodeAbortController) {+ this.preEncodeAbortController.abort();+ this.preEncodeAbortController = null;+ }+ }++ /**+ * Resets the loading, streaming and processing state for a conversation+ * after a generation ends or errors. Shared by the flows' exit paths.+ */+ cleanupStreaming(convId: string): void {+ this.setChatLoading(convId, false);+ this.clearChatStreaming(convId);+ this.processing.setState(convId, null);+ }+ clearChatStreaming(convId: string, messageId?: string): void {+ // session aware: a stale generation must not wipe a newer one's streaming state on the+ // same conversation, that would drop the frozen stop identity and stop the wrong session+ if (messageId !== undefined) {+ const cur = this.chatStreamingStates.get(convId);++ if (cur && cur.messageId !== messageId) return;+ }++ this.chatStreamingStates.delete(convId);++ if (convId === conversationsStore.activeConversation?.id) this.currentResponse = '';+ }+ clearEditMode(): void {+ this.isEditModeActive = false;+ this.addFilesHandler = null;+ }++ clearPendingEditMessageId(): void {+ this.pendingEditMessageId = null;+ }++ clearPendingMessage(convId: string): void {+ this.pendingMessages.delete(convId);+ }++ /** Reset per-view state when (re)mounting the empty chat screen. */+ clearUIState(): void {+ this.currentResponse = '';+ }++ consumePendingDraft(): { message: string; files: ChatUploadedFile[] } | null {+ if (!this.pendingDraftMessage && this.pendingDraftFiles.length === 0) return null;++ const d = { files: [...this.pendingDraftFiles], message: this.pendingDraftMessage };++ this.pendingDraftMessage = '';+ this.pendingDraftFiles = [];++ return d;+ }++ consumePendingMessage(+ convId: string+ ): { content: string; extras?: DatabaseMessageExtra[] } | null {+ const msg = this.pendingMessages.get(convId);++ if (!msg) return null;++ this.pendingMessages.delete(convId);++ return msg;+ }++ async continueAssistantMessage(messageId: string): Promise<void> {+ return this.flows.continueAssistantMessage(messageId);+ }++ async createAssistantMessage(parentId?: string): Promise<DatabaseMessage> {+ const activeConv = conversationsStore.activeConversation;++ if (!activeConv) throw new Error('No active conversation');++ return await DatabaseService.createMessageBranch(+ {+ children: [],+ content: '',+ convId: activeConv.id,+ model: null,+ role: MessageRole.ASSISTANT,+ timestamp: Date.now(),+ toolCalls: '',+ type: MessageType.TEXT+ },+ parentId || null+ );+ }++ async deleteMessage(messageId: string): Promise<void> {+ return this.flows.deleteMessage(messageId);+ }++ /**+ * Server-side stream sessions (discovery, attach/replay, resume retry,+ * remote-running snapshot) live in ChatStreamManager.+ */+ async discoverActiveStream(convId: string): Promise<void> {+ return this.streams.discoverActiveStream(convId);+ }++ dismissErrorDialog(): void {+ this.errorDialogState = null;+ }++ async editAssistantMessage(+ messageId: string,+ newContent: string,+ shouldBranch: boolean+ ): Promise<void> {+ return this.flows.editAssistantMessage(messageId, newContent, shouldBranch);+ }++ async editMessageWithBranching(+ messageId: string,+ newContent: string,+ newExtras?: DatabaseMessageExtra[]+ ): Promise<void> {+ return this.flows.editMessageWithBranching(messageId, newContent, newExtras);+ }++ async editUserMessagePreserveResponses(+ messageId: string,+ newContent: string,+ newExtras?: DatabaseMessageExtra[]+ ): Promise<void> {+ return this.flows.editUserMessagePreserveResponses(messageId, newContent, newExtras);+ }++ getAddFilesHandler(): ((files: File[]) => void) | null {+ return this.addFilesHandler;+ }++ /** Convs with any activity (local pipe or remote session), sidebar spinners. */+ getAllLoadingChats(): string[] {+ return this.activity.loadingConvs;+ }++ getApiOptions(): Record<string, unknown> {+ const currentConfig = settingsStore.config;+ const hasValue = (value: unknown): boolean =>+ value !== undefined && value !== null && value !== '';+ const apiOptions: Record<string, unknown> = { stream: true, timings_per_token: true };++ if (serverStore.isRouterMode) {+ const modelName = modelsStore.selectedModelName;++ if (modelName) apiOptions.model = modelName;+ }++ if (currentConfig.systemMessage) apiOptions.systemMessage = currentConfig.systemMessage;++ if (currentConfig.disableReasoningParsing) apiOptions.disableReasoningParsing = true;++ if (currentConfig.excludeReasoningFromContext) apiOptions.excludeReasoningFromContext = true;++ // an explicit reasoning choice overrides the server default, DEFAULT sends nothing+ const effort = conversationsStore.preferences.getReasoningEffort();++ if (effort !== ReasoningEffort.DEFAULT) {+ apiOptions.enableThinking = effort !== ReasoningEffort.OFF;++ if (effort !== ReasoningEffort.OFF) apiOptions.reasoningEffort = effort;+ }++ if (hasValue(currentConfig.temperature))+ apiOptions.temperature = Number(currentConfig.temperature);++ if (hasValue(currentConfig.max_tokens))+ apiOptions.max_tokens = Number(currentConfig.max_tokens);++ if (hasValue(currentConfig.dynatemp_range))+ apiOptions.dynatemp_range = Number(currentConfig.dynatemp_range);++ if (hasValue(currentConfig.dynatemp_exponent))+ apiOptions.dynatemp_exponent = Number(currentConfig.dynatemp_exponent);++ if (hasValue(currentConfig.top_k)) apiOptions.top_k = Number(currentConfig.top_k);++ if (hasValue(currentConfig.top_p)) apiOptions.top_p = Number(currentConfig.top_p);++ if (hasValue(currentConfig.min_p)) apiOptions.min_p = Number(currentConfig.min_p);++ if (hasValue(currentConfig.xtc_probability))+ apiOptions.xtc_probability = Number(currentConfig.xtc_probability);++ if (hasValue(currentConfig.xtc_threshold))+ apiOptions.xtc_threshold = Number(currentConfig.xtc_threshold);++ if (hasValue(currentConfig.typ_p)) apiOptions.typ_p = Number(currentConfig.typ_p);++ if (hasValue(currentConfig.repeat_last_n))+ apiOptions.repeat_last_n = Number(currentConfig.repeat_last_n);++ if (hasValue(currentConfig.repeat_penalty))+ apiOptions.repeat_penalty = Number(currentConfig.repeat_penalty);++ if (hasValue(currentConfig.presence_penalty))+ apiOptions.presence_penalty = Number(currentConfig.presence_penalty);++ if (hasValue(currentConfig.frequency_penalty))+ apiOptions.frequency_penalty = Number(currentConfig.frequency_penalty);++ if (hasValue(currentConfig.dry_multiplier))+ apiOptions.dry_multiplier = Number(currentConfig.dry_multiplier);++ if (hasValue(currentConfig.dry_base)) apiOptions.dry_base = Number(currentConfig.dry_base);++ if (hasValue(currentConfig.dry_allowed_length))+ apiOptions.dry_allowed_length = Number(currentConfig.dry_allowed_length);++ if (hasValue(currentConfig.dry_penalty_last_n))+ apiOptions.dry_penalty_last_n = Number(currentConfig.dry_penalty_last_n);++ if (currentConfig.samplers) apiOptions.samplers = currentConfig.samplers;++ if (hasValue(currentConfig.backend_sampling))+ apiOptions.backend_sampling = currentConfig.backend_sampling;++ if (currentConfig.customJson) apiOptions.custom = currentConfig.customJson;++ return apiOptions;+ }++ getChatStreaming(convId: string): { response: string; messageId: string } | undefined {+ return this.getChatStreamingState(convId);+ }++ async getDeletionInfo(messageId: string): Promise<{+ totalCount: number;+ userMessages: number;+ assistantMessages: number;+ messageTypes: string[];+ }> {+ return this.flows.getDeletionInfo(messageId);+ }++ getOrCreateAbortController(convId: string): AbortController {+ let c = this.abortControllers.get(convId);++ if (!c || c.signal.aborted) {+ c = new AbortController();+ this.abortControllers.set(convId, c);+ }++ return c;+ }++ getPendingMessageContent(convId: string): string | null {+ return this.pendingMessages.get(convId)?.content ?? null;+ }++ getPendingMessageExtras(convId: string): DatabaseMessageExtra[] | undefined {+ return this.pendingMessages.get(convId)?.extras;+ }++ getResumeModel(convId: string): string | null {+ return this.streams.getResumeModel(convId);+ }++ hasPendingDraft(): boolean {+ return Boolean(this.pendingDraftMessage) || this.pendingDraftFiles.length > 0;+ }++ hasPendingMessage(convId: string): boolean {+ return this.pendingMessages.has(convId);+ }++ injectPendingMessage(convId: string, content: string, extras?: DatabaseMessageExtra[]): void {+ this.pendingMessages.set(convId, { content, extras });+ }++ isChatLoading(convId: string): boolean {+ return this.activity.isLocal(convId);+ }++ isChatLoadingInternal(convId: string): boolean {+ return this.activity.isLocal(convId) || this.chatStreamingStates.has(convId);+ }++ isEditing(): boolean {+ return this.isEditModeActive;+ }++ /** True while the active conversation has a live streaming pipe. */+ isStreaming(): boolean {+ return this.chatStreamingStates.has(conversationsStore.activeConversation?.id ?? '');+ }++ /**+ * Record a working-directory change into chat history as a synthetic+ * user message, so the model sees it on its next turn (the client+ * sends the cwd itself via the x-tool-cwd header on tool calls).+ * A plain user message is used because some chat templates reject+ * tool messages without a preceding tool call.+ */+ async recordCwdChange(cwd: string | null): Promise<void> {+ const content = cwd+ ? formatCwdMessage(cwd, await toolsStore.resolveServerHome())+ : CWD_CLEARED_TEXT;+ // Reuse the trailing cwd row when it is already the last message, so+ // repeated picks update it in place instead of stacking another row.+ const last = conversationsStore.activeMessages[conversationsStore.activeMessages.length - 1];++ if (last && last.role === MessageRole.USER && last.isSynthetic === true) {+ await DatabaseService.updateMessage(last.id, { content, isSynthetic: true });+ conversationsStore.updateMessageAtIndex(conversationsStore.activeMessages.length - 1, {+ content,+ isSynthetic: true+ });++ return;+ }++ await this.addMessage(MessageRole.USER, content, MessageType.TEXT, '-1', undefined, true);+ }++ async regenerateMessage(messageId: string): Promise<void> {+ return this.flows.regenerateMessage(messageId);+ }++ async regenerateMessageWithBranching(messageId: string, modelOverride?: string): Promise<void> {+ return this.flows.regenerateMessageWithBranching(messageId, modelOverride);+ }++ async removeSystemPromptPlaceholder(messageId: string): Promise<boolean> {+ const activeConv = conversationsStore.activeConversation;++ if (!activeConv) return false;++ try {+ const allMessages = await conversationsStore.getConversationMessages(activeConv.id);+ const systemMessage = findMessageById(allMessages, messageId);++ if (!systemMessage || systemMessage.role !== MessageRole.SYSTEM) return false;++ const rootMessage = allMessages.find((m) => m.type === 'root' && m.parent === null);++ if (!rootMessage) return false;++ if (allMessages.length === 2 && systemMessage.children.length === 0) {+ await conversationsStore.deleteConversation(activeConv.id);++ return true;+ }++ for (const childId of systemMessage.children) {+ await DatabaseService.updateMessage(childId, { parent: rootMessage.id });+ const childIndex = conversationsStore.findMessageIndex(childId);++ if (childIndex !== -1)+ conversationsStore.updateMessageAtIndex(childIndex, { parent: rootMessage.id });+ }+ await DatabaseService.updateMessage(rootMessage.id, {+ children: [+ ...rootMessage.children.filter((id: string) => id !== messageId),+ ...systemMessage.children+ ]+ });+ await DatabaseService.deleteMessage(messageId);+ const systemIndex = conversationsStore.findMessageIndex(messageId);++ if (systemIndex !== -1) conversationsStore.activeMessages.splice(systemIndex, 1);++ conversationsStore.updateConversationTimestamp();++ return false;+ } catch (error) {+ console.error('Failed to remove system prompt placeholder:', error);++ return false;+ }+ }++ savePendingDraft(message: string, files: ChatUploadedFile[]): void {+ this.pendingDraftMessage = message;+ this.pendingDraftFiles = [...files];+ }+ async sendMessage(content: string, extras?: DatabaseMessageExtra[]): Promise<void> {+ if (!content.trim() && (!extras || extras.length === 0)) return;++ const activeConv = conversationsStore.activeConversation;++ // If agentic loop is running, inject as a steering message instead of starting a new flow+ if (activeConv && agenticStore.isRunning(activeConv.id)) {+ agenticStore.injectSteeringMessage(activeConv.id, content, extras);++ return;+ }++ // If non-agentic streaming is active, queue as a pending message to send after completion+ if (activeConv && this.isChatLoadingInternal(activeConv.id)) {+ this.injectPendingMessage(activeConv.id, content, extras);++ return;+ }++ // Cancel any in-flight pre-encode request+ this.cancelPreEncode();++ // Consume MCP resource attachments - converts them to extras and clears the live store+ const resourceExtras = mcpStore.consumeResourceAttachmentsAsExtras();+ const allExtras = resourceExtras.length > 0 ? [...(extras || []), ...resourceExtras] : extras;++ let isNewConversation = false;++ if (!activeConv) {+ await conversationsStore.createConversation();+ isNewConversation = true;+ }++ const currentConv = conversationsStore.activeConversation;++ if (!currentConv) return;++ this.showErrorDialog(null);+ this.setChatLoading(currentConv.id, true);+ this.clearChatStreaming(currentConv.id);+ try {+ let parentIdForUserMessage: string | undefined;++ if (isNewConversation) {+ const rootId = await DatabaseService.createRootMessage(currentConv.id);+ const currentConfig = settingsStore.config;+ const systemPrompt = currentConfig.systemMessage?.toString().trim();++ let sysOrRootId = rootId;++ if (systemPrompt) {+ const systemMessage = await DatabaseService.createSystemMessage(+ currentConv.id,+ systemPrompt,+ rootId+ );++ conversationsStore.addMessageToActive(systemMessage);+ sysOrRootId = systemMessage.id;+ }++ // Reflect a working directory picked on the new-chat screen into+ // chat history before the first user message, so the model sees+ // it on its first turn. createConversation() has already threaded+ // the pending pick onto the conversation.+ if (currentConv.cwd) {+ const cwdMessage = await this.addMessage(+ MessageRole.USER,+ formatCwdMessage(currentConv.cwd, await toolsStore.resolveServerHome()),+ MessageType.TEXT,+ sysOrRootId,+ undefined,+ true+ );++ parentIdForUserMessage = cwdMessage.id;+ } else {+ parentIdForUserMessage = sysOrRootId;+ }+ }++ const userMessage = await this.addMessage(+ MessageRole.USER,+ content,+ MessageType.TEXT,+ parentIdForUserMessage ?? '-1',+ allExtras+ );++ if (isNewConversation && content)+ await conversationsStore.applyTitleFromContent(currentConv.id, content);++ const assistantMessage = await this.createAssistantMessage(userMessage.id);++ conversationsStore.addMessageToActive(assistantMessage);+ await this.streamChatCompletion(+ conversationsStore.activeMessages.slice(0, -1),+ assistantMessage,+ undefined,+ undefined,+ undefined,+ settingsStore.config.titleGenerationUseLLM && isNewConversation ? content : undefined+ );+ } catch (error) {+ if (isAbortError(error)) {+ this.setChatLoading(currentConv.id, false);++ return;+ }++ console.error('Failed to send message:', error);+ this.setChatLoading(currentConv.id, false);+ const dialogType =+ error instanceof Error && error.name === 'TimeoutError'+ ? ErrorDialogType.TIMEOUT+ : ErrorDialogType.SERVER;+ const contextInfo = (+ error as Error & { contextInfo?: { n_prompt_tokens: number; n_ctx: number } }+ ).contextInfo;++ this.showErrorDialog({+ contextInfo,+ message: error instanceof Error ? error.message : 'Unknown error',+ type: dialogType+ });+ }+ }++ setChatLoading(convId: string, loading: boolean): void {+ if (loading) {+ this.activity.markLocal(convId);+ } else {+ this.activity.localEnded(convId);+ this.setChatReasoning(convId, false);+ }+ }++ setChatReasoning(convId: string, reasoning: boolean): void {+ if (reasoning) this.chatReasoningStates.set(convId, true);+ else this.chatReasoningStates.delete(convId);+ }++ setChatStreaming(+ convId: string,+ response: string,+ messageId: string,+ model?: string | null+ ): void {+ this.chatStreamingStates.set(convId, {+ messageId,+ model: model ?? this.chatStreamingStates.get(convId)?.model,+ response+ });++ if (convId === conversationsStore.activeConversation?.id) this.currentResponse = response;+ }++ setEditModeActive(handler: (files: File[]) => void): void {+ this.isEditModeActive = true;+ this.addFilesHandler = handler;+ }++ showErrorDialog(state: ErrorDialogState | null): void {+ this.errorDialogState = state;+ }++ async stopGeneration(): Promise<void> {+ const activeConv = conversationsStore.activeConversation;++ if (!activeConv) return;++ await this.stopGenerationForChat(activeConv.id);+ }++ async stopGenerationForChat(convId: string): Promise<void> {+ await this.savePartialResponseIfNeeded(convId);+ // tell the server to stop the generation, not just drop the HTTP socket. without this the+ // detached drain keeps producing tokens until eos or max_tokens. use the frozen identity+ // captured when the session started, not the live dropdown+ const streamStateForStop = this.chatStreamingStates.get(convId);+ const modelForStop = streamStateForStop?.model ?? ChatService.getStreamState(convId)?.model;++ void ChatService.cancelServerStream(convId, modelForStop);+ // an explicit stop leaves nothing to resume and kills a pending resume retry+ ChatService.clearStreamState(convId);+ this.streams.cancelResumeRetry(convId);+ this.abortRequest(convId);+ this.setChatLoading(convId, false);+ this.clearChatStreaming(convId);+ this.processing.setState(convId, null);+ this.clearPendingMessage(convId);+ }++ async streamChatCompletion(+ allMessages: DatabaseMessage[],+ assistantMessage: DatabaseMessage,+ onComplete?: (content: string) => Promise<void>,+ onError?: (error: Error) => void,+ modelOverride?: string | null,+ firstUserMessageContent?: string+ ): Promise<void> {+ // the ::model suffix in the stream identity is only for router mode, where it routes to the+ // owning child. in single-model mode the identity stays the bare conv id so that attach, stop+ // and reattach all agree, regardless of fresh send vs regenerate passing a resolved model+ let effectiveModel: string | null | undefined = undefined;++ if (serverStore.isRouterMode) {+ const conversationModel = getConversationModel(allMessages);++ effectiveModel = modelOverride || modelsStore.selectedModelName || conversationModel;+ }++ if (serverStore.isRouterMode && effectiveModel) {+ if (!modelsStore.props.getModelProps(effectiveModel))+ await modelsStore.props.fetchModelProps(effectiveModel);+ }++ // Mutable state for the current message being streamed+ let currentMessageId = assistantMessage.id;+ let streamedContent = '';+ let streamedReasoningContent = '';+ let resolvedModel: string | null = null;+ let modelPersisted = false;++ const convId = assistantMessage.convId;++ // Tracks the last message created in this flow. Used as the parent for the next+ // turn's assistant message so createAssistantMessage does not have to read+ // conversationsStore.activeMessages, which may belong to a different conversation+ // after the user navigates while the loop is still running.+ let lastCreatedInFlow = currentMessageId;++ // freeze the POST identity from t0 so a stop cancels with the exact session key,+ // never a stale or empty model resolved later+ this.setChatStreaming(convId, streamedContent, currentMessageId, effectiveModel);++ const recordModel = (modelName: string | null | undefined, persistImmediately = true): void => {+ if (!modelName) return;++ const n = normalizeModelName(modelName);++ if (!n || n === resolvedModel) return;++ resolvedModel = n;+ const idx = conversationsStore.findMessageIndex(currentMessageId);++ conversationsStore.updateMessageAtIndex(idx, { model: n });++ if (persistImmediately && !modelPersisted) {+ modelPersisted = true;+ DatabaseService.updateMessage(currentMessageId, { model: n }).catch(() => {+ modelPersisted = false;+ resolvedModel = null;+ });+ }+ };++ let completionIdRecorded = false;++ const recordCompletionId = (id: string): void => {+ if (!id || completionIdRecorded) return;++ completionIdRecorded = true;+ const idx = conversationsStore.findMessageIndex(currentMessageId);++ conversationsStore.updateMessageAtIndex(idx, { completionId: id });+ DatabaseService.updateMessage(currentMessageId, { completionId: id }).catch(() => {+ completionIdRecorded = false;+ });+ };+ const updateStreamingUI = () => {+ this.setChatStreaming(convId, streamedContent, currentMessageId, effectiveModel);+ const idx = conversationsStore.findMessageIndex(currentMessageId);++ conversationsStore.updateMessageAtIndex(idx, { content: streamedContent });+ };+ const cleanupStreamingState = () => {+ this.setChatLoading(convId, false);+ this.clearChatStreaming(convId, currentMessageId);+ this.processing.setState(convId, null);+ };++ this.processing.setActiveConversation(convId);+ const abortController = this.getOrCreateAbortController(convId);+ const streamCallbacks: ChatStreamCallbacks = {+ createAssistantMessage: async () => {+ // Reset streaming state for new message+ streamedContent = '';+ streamedReasoningContent = '';++ const msg = await DatabaseService.createMessageBranch(+ {+ children: [],+ content: '',+ convId,+ model: resolvedModel,+ role: MessageRole.ASSISTANT,+ timestamp: Date.now(),+ toolCalls: '',+ type: MessageType.TEXT+ },+ lastCreatedInFlow+ );++ if (conversationsStore.activeConversation?.id === convId) {+ conversationsStore.addMessageToActive(msg);+ }++ currentMessageId = msg.id;+ lastCreatedInFlow = msg.id;++ return msg;+ },+ createToolResultMessage: async (+ toolCallId: string,+ content: string,+ extras?: DatabaseMessageExtra[],+ toolCwd?: string+ ) => {+ const msg = await DatabaseService.createMessageBranch(+ {+ children: [],+ content,+ convId,+ extra: extras,+ role: MessageRole.TOOL,+ timestamp: Date.now(),+ toolCallId,+ toolCalls: '',+ toolCwd,+ type: MessageType.TEXT+ },+ currentMessageId+ );++ // mirror into the active store and move the node pointer only when this+ // conversation is displayed; otherwise persist the node move straight to+ // the db for the owning conv so a foreign conv's currNode stays untouched+ if (conversationsStore.activeConversation?.id === convId) {+ conversationsStore.addMessageToActive(msg);+ await conversationsStore.updateCurrentNode(msg.id);+ } else {+ await DatabaseService.updateCurrentNode(convId, msg.id);+ }++ lastCreatedInFlow = msg.id;++ return msg;+ },+ onAssistantTurnComplete: async (+ content: string,+ reasoningContent: string | undefined,+ timings: ChatMessageTimings | undefined,+ toolCalls: import('$lib/types/api').ApiChatCompletionToolCall[] | undefined+ ) => {+ const updateData: Record<string, unknown> = {+ content,+ reasoningContent: reasoningContent || undefined,+ timings,+ toolCalls: toolCalls ? JSON.stringify(toolCalls) : ''+ };++ if (resolvedModel && !modelPersisted) updateData.model = resolvedModel;++ await DatabaseService.updateMessage(currentMessageId, updateData);+ const idx = conversationsStore.findMessageIndex(currentMessageId);+ const uiUpdate: Partial<DatabaseMessage> = {+ content,+ reasoningContent: reasoningContent || undefined,+ toolCalls: toolCalls ? JSON.stringify(toolCalls) : ''+ };++ if (timings) uiUpdate.timings = timings;++ if (resolvedModel) uiUpdate.model = resolvedModel;++ // touch the active ui array and node pointer only when this conversation+ // is displayed; otherwise persist the node move straight to the db so a+ // foreign conv's currNode stays untouched+ if (conversationsStore.activeConversation?.id === convId) {+ conversationsStore.updateMessageAtIndex(idx, uiUpdate);+ await conversationsStore.updateCurrentNode(currentMessageId);+ } else {+ await DatabaseService.updateCurrentNode(convId, currentMessageId);+ }+ },+ onAttachments: (messageId: string, extras: DatabaseMessageExtra[]) => {+ if (!extras.length) return;++ const idx = conversationsStore.findMessageIndex(messageId);++ if (idx === -1) return;++ const msg = conversationsStore.activeMessages[idx];+ const updatedExtras = [...(msg.extra || []), ...extras];++ conversationsStore.updateMessageAtIndex(idx, { extra: updatedExtras });+ DatabaseService.updateMessage(messageId, { extra: updatedExtras }).catch(console.error);+ },+ onChunk: (chunk: string) => {+ streamedContent += chunk;+ updateStreamingUI();+ this.setChatReasoning(convId, false);+ },+ onCompletionId: (id: string) => recordCompletionId(id),+ onError: async (error: Error) => {+ if (isAbortError(error)) {+ cleanupStreamingState();+ // If aborted with a pending message (e.g. "Send immediately"), re-send it+ const pending = this.consumePendingMessage(convId);++ if (pending) {+ this.sendMessage(pending.content, pending.extras);+ }++ return;+ }++ console.error('Streaming error:', error);+ // keep whatever was streamed so far, the message stays in memory and in DB+ await this.savePartialResponseIfNeeded(convId);+ cleanupStreamingState();+ this.clearPendingMessage(convId);++ const contextInfo = (+ error as Error & { contextInfo?: { n_prompt_tokens: number; n_ctx: number } }+ ).contextInfo;++ this.showErrorDialog({+ contextInfo,+ message: error.message,+ type: error.name === 'TimeoutError' ? ErrorDialogType.TIMEOUT : ErrorDialogType.SERVER+ });++ if (onError) onError(error);+ },+ onFlowComplete: (finalTimings?: ChatMessageTimings) => {+ if (finalTimings) {+ const idx = conversationsStore.findMessageIndex(assistantMessage.id);++ conversationsStore.updateMessageAtIndex(idx, { timings: finalTimings });+ DatabaseService.updateMessage(assistantMessage.id, {+ timings: finalTimings+ }).catch(console.error);+ }++ cleanupStreamingState();++ if (onComplete) onComplete(streamedContent);++ if (serverStore.isRouterMode) modelsStore.fetchRouterModels().catch(console.error);++ // Pre-encode conversation in KV cache for faster next turn+ if (settingsStore.config.preEncodeConversation) {+ this.triggerPreEncode(+ allMessages,+ assistantMessage,+ streamedContent,+ effectiveModel,+ !!settingsStore.config.excludeReasoningFromContext+ );+ }+ },+ onModel: (modelName: string) => recordModel(modelName),+ onReasoningChunk: (chunk: string) => {+ streamedReasoningContent += chunk;+ // mark streaming state so a stop mid-thinking can persist the partial reasoning+ this.setChatStreaming(convId, streamedContent, currentMessageId, effectiveModel);+ const idx = conversationsStore.findMessageIndex(currentMessageId);++ conversationsStore.updateMessageAtIndex(idx, {+ reasoningContent: streamedReasoningContent+ });+ this.setChatReasoning(convId, true);+ },+ onTimings: (timings?: ChatMessageTimings, promptProgress?: ChatMessagePromptProgress) => {+ this.processing.applyStreamTimings(timings, promptProgress, convId);+ },+ onToolCallsStreaming: (toolCalls) => {+ const idx = conversationsStore.findMessageIndex(currentMessageId);++ conversationsStore.updateMessageAtIndex(idx, {+ toolCalls: JSON.stringify(toolCalls)+ });+ },+ onTurnComplete: (intermediateTimings: ChatMessageTimings) => {+ // Update the first assistant message with cumulative agentic timings+ const idx = conversationsStore.findMessageIndex(assistantMessage.id);++ conversationsStore.updateMessageAtIndex(idx, { timings: intermediateTimings });+ },+ updateToolResultMessage: async (+ messageId: string,+ content: string,+ extras?: DatabaseMessageExtra[]+ ) => {+ // Persist latest content + merged extras; mirror into the active+ // store so the chat view sees live updates for streaming tools+ // (e.g. exec_shell_command). The existing tool message node+ // pointer stays put - the renderer is already scoped to it.+ const updates: Partial<DatabaseMessage> = { content };++ if (extras) {+ const idx = conversationsStore.findMessageIndex(messageId);+ const existing = idx >= 0 ? (conversationsStore.activeMessages[idx]?.extra ?? []) : [];+ const merged = [...existing, ...extras];++ updates.extra = merged;+ }++ if (conversationsStore.activeConversation?.id === convId) {+ const idx = conversationsStore.findMessageIndex(messageId);++ if (idx >= 0) conversationsStore.updateMessageAtIndex(idx, updates);+ }++ await DatabaseService.updateMessage(messageId, updates);+ }+ };+ const perChatOverrides = conversationsStore.preferences.getAllMcpServerOverrides();++ {+ const agenticResult = await agenticStore.runAgenticFlow({+ callbacks: streamCallbacks,+ conversationId: convId,+ flowRootMessageId: assistantMessage.id,+ messages: allMessages,+ options: {+ ...this.getApiOptions(),+ ...(effectiveModel ? { model: effectiveModel } : {})+ },+ perChatOverrides,+ signal: abortController.signal+ });++ if (agenticResult.handled) {+ // Generate LLM based title for new conversations after agentic flow completes+ if (firstUserMessageContent) {+ await this.generateTitleWithLLM(firstUserMessageContent, streamedContent, convId);+ }++ // Check if there's a pending steering message to re-send+ const pending = agenticStore.consumePendingSteeringMessage(convId);++ if (pending) {+ await this.sendMessage(pending.content, pending.extras);+ }++ return;+ }+ }++ await ChatService.sendMessage(+ allMessages,+ {+ ...this.getApiOptions(),+ ...(effectiveModel ? { model: effectiveModel } : {}),+ onChunk: streamCallbacks.onChunk,+ onComplete: async (+ finalContent?: string,+ reasoningContent?: string,+ timings?: ChatMessageTimings,+ toolCalls?: string+ ) => {+ const content = streamedContent || finalContent || '';+ const reasoning = streamedReasoningContent || reasoningContent;+ const updateData: Record<string, unknown> = {+ content,+ reasoningContent: reasoning || undefined,+ timings,+ toolCalls: toolCalls || ''+ };++ if (resolvedModel && !modelPersisted) updateData.model = resolvedModel;++ await DatabaseService.updateMessage(currentMessageId, updateData);+ const idx = conversationsStore.findMessageIndex(currentMessageId);+ const uiUpdate: Partial<DatabaseMessage> = {+ content,+ reasoningContent: reasoning || undefined,+ toolCalls: toolCalls || ''+ };++ if (timings) uiUpdate.timings = timings;++ if (resolvedModel) uiUpdate.model = resolvedModel;++ conversationsStore.updateMessageAtIndex(idx, uiUpdate);+ await conversationsStore.updateCurrentNode(currentMessageId);+ cleanupStreamingState();++ if (onComplete) await onComplete(content);++ if (serverStore.isRouterMode) modelsStore.fetchRouterModels().catch(console.error);++ // Generate LLM based title for new conversations (avoids stale reference+ // issue when user switches conversations while streaming)+ if (firstUserMessageContent) {+ await this.generateTitleWithLLM(firstUserMessageContent, streamedContent, convId);+ }++ // Check if there's a pending message queued during streaming+ const pending = this.consumePendingMessage(convId);++ if (pending) {+ await this.sendMessage(pending.content, pending.extras);+ }+ },+ onCompletionId: streamCallbacks.onCompletionId,+ onConnectionState: (state: StreamConnectionState) => {+ if (convId === conversationsStore.activeConversation?.id) {+ this.streamConnectionState = state;+ }+ },+ onError: streamCallbacks.onError,+ onModel: streamCallbacks.onModel,+ onReasoningChunk: streamCallbacks.onReasoningChunk,+ onTimings: streamCallbacks.onTimings,+ stream: true+ },+ convId,+ abortController.signal+ );+ }++ syncLoadingStateForChat(convId: string): void {+ const s = this.chatStreamingStates.get(convId);++ this.currentResponse = s?.response || '';+ this.processing.setActiveConversation(convId);++ // Sync streaming content to activeMessages so UI displays current content+ if (s?.response && s?.messageId) {+ const idx = conversationsStore.findMessageIndex(s.messageId);++ if (idx !== -1) {+ conversationsStore.updateMessageAtIndex(idx, { content: s.response });+ }+ }+ }++ async syncRemoteRunningStreams(): Promise<void> {+ return this.streams.syncRemoteRunningStreams();+ }++ /**+ * Message flows (edit / regenerate / continue / delete) live in+ * ChatMessageFlows; these delegate so consumers keep a single entry point.+ */+ async updateMessage(messageId: string, newContent: string): Promise<void> {+ return this.flows.updateMessage(messageId, newContent);+ }+ private abortRequest(convId?: string): void {+ if (convId) {+ const c = this.abortControllers.get(convId);++ if (c) {+ c.abort();+ this.abortControllers.delete(convId);+ }+ } else {+ for (const c of this.abortControllers.values()) c.abort();+ this.abortControllers.clear();+ }+ }++ private async generateTitleWithLLM(+ userContent: string,+ assistantContent: string,+ convId: string+ ): Promise<void> {+ const effectiveModel =+ serverStore.isRouterMode && modelsStore.selectedModelName+ ? modelsStore.selectedModelName+ : undefined;+ const configValue = settingsStore.config;+ const titlePromptTemplate =+ typeof configValue.titleGenerationPrompt === 'string' &&+ configValue.titleGenerationPrompt.trim()+ ? configValue.titleGenerationPrompt+ : TITLE_GENERATION.DEFAULT_PROMPT;+ const titlePrompt = titlePromptTemplate+ .replace('{{USER}}', String(userContent || ''))+ .replace('{{ASSISTANT}}', String(assistantContent || ''));+ const titleMessage: ApiChatMessageData = {+ content: titlePrompt,+ role: MessageRole.USER+ };+ const titleResponse = await ChatService.generateTitle(titleMessage, effectiveModel);++ if (!titleResponse) {+ return;+ }++ let cleanTitle = titleResponse.trim();++ cleanTitle = cleanTitle+ .replace(TITLE_GENERATION.PREFIX_PATTERN, '')+ .replace(TITLE_GENERATION.QUOTE_PATTERN, '')+ .trim();++ if (!cleanTitle || cleanTitle.length < TITLE_GENERATION.MIN_LENGTH) {+ const firstLine = userContent.split('\n').find((l) => l.trim().length > 0);++ cleanTitle = firstLine ? firstLine.trim() : TITLE_GENERATION.FALLBACK;+ }++ if (cleanTitle && cleanTitle.length >= TITLE_GENERATION.MIN_LENGTH) {+ await conversationsStore.updateConversationName(convId, cleanTitle);+ }+ }++ private getChatStreamingState(+ convId: string+ ): { response: string; messageId: string } | undefined {+ return this.chatStreamingStates.get(convId);+ }++ private async savePartialResponseIfNeeded(convId?: string): Promise<void> {+ const conversationId = convId || conversationsStore.activeConversation?.id;++ if (!conversationId) return;++ const streamingState = this.getChatStreamingState(conversationId);++ if (!streamingState) return;++ const messages =+ conversationId === conversationsStore.activeConversation?.id+ ? conversationsStore.activeMessages+ : await conversationsStore.getConversationMessages(conversationId);++ if (!messages.length) return;++ const lastMessage = messages[messages.length - 1];++ if (lastMessage?.role !== MessageRole.ASSISTANT) return;++ const partialContent = streamingState.response;+ const partialReasoning = lastMessage.reasoningContent || '';+ // snapshot the streamed tool calls before clearing so we still know whether+ // anything was captured when deciding to skip the DB write below+ const hadPartialToolCalls = !!lastMessage.toolCalls?.trim();++ // nothing to persist when content, reasoning, and streamed tool calls are all empty+ // (e.g. stop before any token). otherwise drop the partial tool call and write whatever+ // was streamed: incomplete arguments (truncated JSON, missing closing quote) would+ // otherwise be re-sent to the server on the next turn and rejected.+ if (!partialContent.trim() && !partialReasoning.trim() && !hadPartialToolCalls) return;++ try {+ const updateData: {+ content?: string;+ reasoningContent?: string;+ toolCalls?: string;+ timings?: ChatMessageTimings;+ } = {+ toolCalls: ''+ };++ if (partialContent.trim()) updateData.content = partialContent;++ if (partialReasoning.trim()) updateData.reasoningContent = partialReasoning;++ const lastKnownState = this.processing.getState(conversationId);++ if (lastKnownState) {+ updateData.timings = {+ cache_n: lastKnownState.cacheTokens || 0,+ predicted_ms:+ lastKnownState.tokensPerSecond && lastKnownState.tokensDecoded+ ? (lastKnownState.tokensDecoded / lastKnownState.tokensPerSecond) * 1000+ : undefined,+ predicted_n: lastKnownState.tokensDecoded || 0,+ prompt_ms: lastKnownState.promptMs,+ prompt_n: lastKnownState.promptTokens || 0+ };+ }++ await DatabaseService.updateMessage(lastMessage.id, updateData);+ lastMessage.content = partialContent;+ // mirror the drop into the in-memory message so the next request sent via+ // sendMessage (queued pending, Send immediately, or manual follow-up) reads+ // the cleared value, not whatever the streaming widget had been showing+ lastMessage.toolCalls = '';++ if (updateData.timings) lastMessage.timings = updateData.timings;+ } catch (error) {+ lastMessage.content = partialContent;+ lastMessage.toolCalls = '';+ console.error('Failed to save partial response:', error);+ }+ }++ private async triggerPreEncode(+ allMessages: DatabaseMessage[],+ assistantMessage: DatabaseMessage,+ assistantContent: string,+ model?: string | null,+ excludeReasoning?: boolean+ ): Promise<void> {+ this.cancelPreEncode();+ this.preEncodeAbortController = new AbortController();++ const signal = this.preEncodeAbortController.signal;++ try {+ const allIdle = await ChatService.areAllSlotsIdle(model, signal);++ if (!allIdle || signal.aborted) return;++ const messagesWithAssistant: DatabaseMessage[] = [+ ...allMessages,+ { ...assistantMessage, content: assistantContent }+ ];++ await ChatService.preEncode(messagesWithAssistant, model, excludeReasoning, signal);+ } catch (err) {+ if (!isAbortError(err)) {+ console.warn('[ChatStore] Pre-encode failed:', err);+ }+ }+ }+}++export const chatStore = new ChatStore();diff --git a/tools/ui/src/lib/stores/chat/processing.svelte.ts b/tools/ui/src/lib/stores/chat/processing.svelte.tsnew file mode 100644index 0000000000..69c1a69256--- /dev/null+++ b/tools/ui/src/lib/stores/chat/processing.svelte.ts@@ -0,0 +1,188 @@+/**+ * chatProcessingStore - Per-conversation processing state+ *+ * Owns the live processing snapshot shown while a conversation streams:+ * token counts, tokens/sec, prompt progress. Updated from stream timings,+ * restored from persisted message timings when a conversation loads.+ *+ * Composed under chatStore.processing; not exported from the stores barrel.+ */++import { MessageRole } from '$lib/enums';+// direct imports between stores, not via the barrel, to avoid circular deps+import { modelsStore } from '$lib/stores/models/index.svelte';+import { serverStore } from '$lib/stores/server.svelte';+import { settingsStore } from '$lib/stores/settings/index.svelte';+import type {+ ApiProcessingState,+ ChatMessagePromptProgress,+ ChatMessageTimings,+ DatabaseMessage+} from '$lib/types';+import { SvelteMap } from 'svelte/reactivity';++interface ProcessingTimingData {+ cache_n: number;+ predicted_n: number;+ predicted_per_second: number;+ prompt_ms?: number;+ prompt_n: number;+ prompt_progress?: ChatMessagePromptProgress;+}++export class ChatProcessingStore {+ private _activeConversationId = $state<string | null>(null);+ private states = new SvelteMap<string, ApiProcessingState>();++ /** Processing state of the conversation currently shown in the UI. */+ activeState = $derived(+ this._activeConversationId ? (this.states.get(this._activeConversationId) ?? null) : null+ );++ get activeConversationId(): string | null {+ return this._activeConversationId;+ }++ /**+ * Applies a stream timings event (tokens/sec + token counts) to the given+ * conversation's processing state. Shared by the chat and continue flows.+ */+ applyStreamTimings(+ timings?: ChatMessageTimings,+ promptProgress?: ChatMessagePromptProgress,+ conversationId?: string+ ): void {+ const tokensPerSecond =+ timings?.predicted_ms && timings?.predicted_n+ ? (timings.predicted_n / timings.predicted_ms) * 1000+ : 0;++ this.updateFromTimings(+ {+ cache_n: timings?.cache_n || 0,+ predicted_n: timings?.predicted_n || 0,+ predicted_per_second: tokensPerSecond,+ prompt_ms: timings?.prompt_ms,+ prompt_n: timings?.prompt_n || 0,+ prompt_progress: promptProgress+ },+ conversationId+ );+ }++ getConversationIds(): string[] {+ return Array.from(this.states.keys());+ }++ getState(conversationId: string): ApiProcessingState | null {+ return this.states.get(conversationId) ?? null;+ }++ restoreFromMessages(messages: DatabaseMessage[], conversationId: string): void {+ for (let i = messages.length - 1; i >= 0; i--) {+ const message = messages[i];++ if (message.role === MessageRole.ASSISTANT && message.timings) {+ this.setState(+ conversationId,+ this.parseTimingData({+ cache_n: message.timings.cache_n || 0,+ predicted_n: message.timings.predicted_n || 0,+ predicted_per_second:+ message.timings.predicted_n && message.timings.predicted_ms+ ? (message.timings.predicted_n / message.timings.predicted_ms) * 1000+ : 0,+ prompt_ms: message.timings.prompt_ms,+ prompt_n: message.timings.prompt_n || 0+ })+ );++ return;+ }+ }+ }++ setActiveConversation(conversationId: string | null): void {+ this._activeConversationId = conversationId;+ }++ /** Passing null clears the state for the conversation. */+ setState(conversationId: string, state: ApiProcessingState | null): void {+ if (state === null) this.states.delete(conversationId);+ else this.states.set(conversationId, state);+ }++ updateFromTimings(timingData: ProcessingTimingData, conversationId?: string): void {+ const targetId = conversationId || this._activeConversationId;++ if (targetId) {+ this.setState(targetId, this.parseTimingData(timingData));+ }+ }++ private getContextTotal(): number | null {+ const activeConvId = this._activeConversationId;+ const activeState = activeConvId ? this.getState(activeConvId) : null;++ if (activeState && typeof activeState.contextTotal === 'number' && activeState.contextTotal > 0)+ return activeState.contextTotal;++ if (serverStore.isRouterMode) {+ const modelContextSize = modelsStore.selectedModelContextSize;++ if (typeof modelContextSize === 'number' && modelContextSize > 0) {+ return modelContextSize;+ }+ } else {+ const propsContextSize = serverStore.contextSize;++ if (typeof propsContextSize === 'number' && propsContextSize > 0) {+ return propsContextSize;+ }+ }++ return null;+ }++ private parseTimingData(timingData: ProcessingTimingData): ApiProcessingState {+ const cacheTokens = timingData.cache_n || 0,+ predictedTokens = timingData.predicted_n || 0,+ promptMs = timingData.prompt_ms || undefined,+ promptTokens = timingData.prompt_n || 0,+ tokensPerSecond = timingData.predicted_per_second || 0;+ const promptProgress = timingData.prompt_progress;+ const contextTotal = this.getContextTotal();+ const currentConfig = settingsStore.config;+ const outputTokensMax = currentConfig.max_tokens || -1;+ const contextUsed = promptTokens + cacheTokens + predictedTokens,+ outputTokensUsed = predictedTokens;+ const progressCache = promptProgress?.cache || 0,+ progressActualDone = (promptProgress?.processed ?? 0) - progressCache,+ progressActualTotal = (promptProgress?.total ?? 0) - progressCache;+ const progressPercent = promptProgress+ ? Math.round((progressActualDone / progressActualTotal) * 100)+ : undefined;++ return {+ cacheTokens,+ contextTotal,+ contextUsed,+ hasNextToken: predictedTokens > 0,+ outputTokensMax,+ outputTokensUsed,+ progressPercent,+ promptMs,+ promptProgress,+ promptTokens,+ speculative: false,+ status: predictedTokens > 0 ? 'generating' : promptProgress ? 'preparing' : 'idle',+ temperature: currentConfig.temperature ?? 0.8,+ tokensDecoded: predictedTokens,+ tokensPerSecond,+ tokensRemaining: outputTokensMax - predictedTokens,+ topP: currentConfig.top_p ?? 0.95+ };+ }+}++export const chatProcessingStore = new ChatProcessingStore();diff --git a/tools/ui/src/lib/stores/chat/streams.svelte.ts b/tools/ui/src/lib/stores/chat/streams.svelte.tsnew file mode 100644index 0000000000..5abbc81fb6--- /dev/null+++ b/tools/ui/src/lib/stores/chat/streams.svelte.ts@@ -0,0 +1,494 @@+/**+ * ChatStreamManager - Server-side stream sessions for conversations+ *+ * Owns the attach lifecycle for streams that live on the server: discovery,+ * replay from byte 0, and resume retry while the owning model loads. The+ * remote-running snapshot it produces feeds the chat activity ledger+ * (chatStore.activity), which owns the actual running-conv state. Created+ * and owned by chatStore; the host exposes the per-conversation state setters.+ */++import { CONVERSATION_ID_SEPARATOR, STREAM_RESUME_RETRY_MS } from '$lib/constants';+import { MessageRole, MessageType, StreamConnectionState } from '$lib/enums';+import { ChatService } from '$lib/services/chat.service';+import { DatabaseService } from '$lib/services/database.service';+import type { ChatActivityStore } from '$lib/stores/chat/activity.svelte';+import type { ChatProcessingStore } from '$lib/stores/chat/processing.svelte';+// direct imports between stores, not via the barrel, to avoid circular deps+import { conversationsStore } from '$lib/stores/conversations/index.svelte';+import { modelsStore } from '$lib/stores/models/index.svelte';+import type { ApiStreamSession, ChatMessageTimings, DatabaseMessage } from '$lib/types';+import { streamIdentity } from '$lib/utils';+import { SvelteMap, SvelteSet } from 'svelte/reactivity';++/**+ * The slice of chatStore the manager drives. Kept narrow on purpose so the+ * manager cannot reach around the host's full surface; chatStore implements+ * this structurally.+ */+export interface ChatStreamHost {+ activity: ChatActivityStore;+ processing: ChatProcessingStore;+ chatStreamingStates: SvelteMap<+ string,+ { response: string; messageId: string; model?: string | null }+ >;+ streamConnectionState: StreamConnectionState;+ getOrCreateAbortController(convId: string): AbortController;+ setChatLoading(convId: string, loading: boolean): void;+ setChatStreaming(+ convId: string,+ response: string,+ messageId: string,+ model?: string | null+ ): void;+ clearChatStreaming(convId: string, messageId?: string): void;+}++export class ChatStreamManager {+ // in-flight discoverActiveStream guard, keyed by conv id+ private discoveringConvs = new SvelteSet<string>();+ // convs whose resume waits on a model load: their loading state belongs to the retry loop,+ // so discoverActiveStream must not treat it as a live send and bail+ private resumePendingConvs = new SvelteSet<string>();+ // pending resume retry timers while an owning model loads, one per conv+ private resumeRetryTimers = new SvelteMap<string, ReturnType<typeof setTimeout>>();++ /** Kill a pending resume retry, e.g. on explicit stop. */+ cancelResumeRetry(convId: string): void {+ const timer = this.resumeRetryTimers.get(convId);++ if (timer !== undefined) {+ clearTimeout(timer);+ this.resumeRetryTimers.delete(convId);+ }++ this.resumePendingConvs.delete(convId);+ }++ constructor(private host: ChatStreamHost) {}++ async discoverActiveStream(convId: string): Promise<void> {+ if (!convId) return;++ if (this.host.chatStreamingStates.has(convId)) return;++ if (this.host.activity.isLocal(convId) && !this.resumePendingConvs.has(convId)) return;++ // concurrency guard: another discover may already be running for this conv (typical race+ // between mount and visibilitychange on tab switch). a second concurrent fetch on the same+ // /v1/stream would duplicate every byte into the DB message, this guard bounces it+ if (this.discoveringConvs.has(convId)) return;++ this.discoveringConvs.add(convId);++ try {+ // the model is frozen at POST time, rebuild the exact conv::model identity from the+ // persisted state so the lookup key matches what the server stored. null means a single+ // model conv with no ::suffix, only guess from the dropdown with no persisted state+ const localState = ChatService.getStreamState(convId);+ const streamId = ChatService.resumeStreamIdentity(+ convId,+ localState,+ modelsStore.selectedModelName+ );+ // primary path: ask the server which sessions exist for this identity+ const serverTarget = await this.probeServerStream(streamId);++ if (serverTarget) {+ // pass the full server side identity (may carry a ::model suffix) so the GET routes+ // straight to the owning session, no probe or fan out+ await this.attachServerStream(convId, serverTarget.conversation_id);++ return;+ }++ // fallback: local state remembers an interrupted byte offset for this conv, the server may+ // still have a live session matching that identity (we just lost the bytes mid stream). retry+ // with the frozen identity, the server probe inside attachServerStream tells us if it exists+ if (!localState) {+ return;+ }++ // quiet status probe first: a full attach flips the loading UI on every try, probing+ // keeps the retry loop invisible while the owning model is still loading (503)+ const status = await ChatService.probeResumeStatus(streamId);++ if (status === 503) {+ // make the wait visible: the empty assistant row persisted at send time renders+ // the processing info, whose model load percentage flows from the models feed+ this.resumePendingConvs.add(convId);+ this.host.setChatLoading(convId, true);++ if (!this.resumeRetryTimers.has(convId)) {+ this.resumeRetryTimers.set(+ convId,+ setTimeout(() => {+ this.resumeRetryTimers.delete(convId);+ void this.discoverActiveStream(convId);+ }, STREAM_RESUME_RETRY_MS)+ );+ }++ return;+ }++ if (this.resumePendingConvs.delete(convId) && status !== 200) {+ // the wait is over without a session to attach, drop the visible loading state+ this.host.setChatLoading(convId, false);+ }++ if (status === 0) {+ // transient network failure, the next mount or visibility change retries+ return;+ }++ if (status !== 200) {+ // the session is gone (stopped, TTL expired), nothing to resume anymore+ ChatService.clearStreamState(convId);++ return;+ }++ await this.attachServerStream(convId, streamId);++ // if attachServerStream failed (session gone, TTL expired), clear the local state to avoid retrying forever+ if (!this.host.chatStreamingStates.has(convId) && !this.host.activity.isLocal(convId)) {+ ChatService.clearStreamState(convId);+ }+ } finally {+ this.discoveringConvs.delete(convId);+ }+ }++ /**+ * Model frozen at send time for a stream awaiting resume, from the persisted stream state.+ * The load progress indicator targets it after a reload, when the message row has no model+ * yet and the dropdown selection may not be restored.+ */+ getResumeModel(convId: string): string | null {+ return ChatService.getStreamState(convId)?.model ?? null;+ }++ /**+ * Resync the activity ledger's remote set from the backend. Called by the layout at mount and+ * on visibilitychange, no polling. A snapshot semantic: stale entries for sessions that+ * finalized while the browser was elsewhere are dropped naturally.+ */+ async syncRemoteRunningStreams(): Promise<void> {+ // the conversations store loads from IndexedDB asynchronously, the +layout onMount caller+ // fires before that finishes. read ids straight from the DB so the result does not depend+ // on the store init race, and the sidebar spinners light up at first paint for every conv+ // the user owns even if it has not been hydrated into the store yet+ let ids: string[];++ try {+ const all = await DatabaseService.getAllConversations();++ ids = all.map((c) => c.id).filter((id) => !!id);+ } catch (e) {+ console.warn('syncRemoteRunningStreams DB read failed:', e);++ return;+ }++ // only ask about conv ids the user already owns+ if (ids.length === 0) {+ this.host.activity.applyRemoteSnapshot([]);++ return;+ }++ // rebuild the frozen conv::model identity per conv so a session started with a model still+ // matches. the server response is mapped back to the bare id below for the sidebar set+ const lookupIds = ids.map((id) =>+ ChatService.resumeStreamIdentity(id, ChatService.getStreamState(id), null)+ );++ let sessions: ApiStreamSession[];++ try {+ sessions = await ChatService.lookupStreamSessions(lookupIds);+ } catch (e) {+ console.warn('syncRemoteRunningStreams lookup failed:', e);++ return;+ }+ const running = new SvelteSet<string>();++ for (const s of sessions) {+ if (s && !s.is_done && typeof s.conversation_id === 'string' && s.conversation_id) {+ // strip the optional ::model suffix, the sidebar set is keyed by the bare conv id+ const sepIdx = s.conversation_id.indexOf(CONVERSATION_ID_SEPARATOR);+ const bareId = sepIdx === -1 ? s.conversation_id : s.conversation_id.slice(0, sepIdx);++ running.add(bareId);+ }+ }+ this.host.activity.applyRemoteSnapshot(running);+ }++ private async attachServerStream(convId: string, streamId?: string): Promise<void> {+ if (!convId) return;++ if (this.host.chatStreamingStates.has(convId)) return;++ // flip the spinner immediately, the user sees activity as soon as the conv becomes active+ this.host.setChatLoading(convId, true);++ // only set the active processing conv if we are looking at it, otherwise a background+ // attach would steal the indicator from the conv the user is currently viewing+ if (convId === conversationsStore.activeConversation?.id) {+ this.host.processing.setActiveConversation(convId);+ }++ const unlock = () => {+ this.host.setChatLoading(convId, false);+ this.host.clearChatStreaming(convId);+ };+ // fetch the replay stream from byte 0, rebuild the assistant message from scratch.+ // resolve the server side identity, fall back to streamIdentity when the caller does not+ // pass a streamId. probeServerStream returns the full id (with ::model suffix when present)+ const id = streamId || streamIdentity(convId, modelsStore.selectedModelName);++ let response: Response;++ try {+ response = await ChatService.fetchStreamReplay(id);+ } catch (e) {+ console.error(`attachServerStream replay failed for conv ${convId}:`, e);+ unlock();++ return;+ }++ // load the target conversation messages by id, not via the active store. when multiple+ // attaches run in parallel the active store may reflect another conv and writing through+ // its index mixes content across convs (CoT flicker, message bleed). by going through the+ // DB we stay isolated, and only mirror into the active store when the attached conv is+ // the one currently displayed+ let messages: DatabaseMessage[];++ try {+ messages = await DatabaseService.getConversationMessages(convId);+ } catch (e) {+ console.error('attachServerStream load messages failed:', e);+ unlock();++ return;+ }++ // locate the slot to splice into, create a placeholder assistant message if there is none.+ // we use the conv-scoped findLastAssistantIdx helpers, they only depend on the array+ let targetIdx = this.findLastAssistantIdx(messages);++ if (targetIdx === -1) {+ const lastUserIdx = this.findLastUserIdx(messages);++ if (lastUserIdx === -1) {+ console.warn(+ `attachServerStream: conv ${convId} has no user or assistant message, cannot splice`+ );+ unlock();++ return;+ }++ try {+ const placeholder = await DatabaseService.createMessageBranch(+ {+ children: [],+ content: '',+ convId,+ parent: messages[lastUserIdx].id,+ role: MessageRole.ASSISTANT,+ timestamp: Date.now(),+ toolCalls: '',+ type: MessageType.TEXT+ } as Omit<DatabaseMessage, 'id'>,+ messages[lastUserIdx].id+ );++ messages = [...messages, placeholder];+ targetIdx = messages.length - 1;++ // only push into the active store when this conv is the one displayed right now+ if (convId === conversationsStore.activeConversation?.id) {+ conversationsStore.addMessageToActive(placeholder);+ }+ } catch (e) {+ console.error('attachServerStream placeholder creation failed:', e);+ unlock();++ return;+ }+ }++ if (targetIdx === -1) {+ unlock();++ return;+ }++ const targetMessage = messages[targetIdx];+ const targetMessageId = targetMessage.id;+ // when the assistant slot already has content, the running session is a continue or+ // another append flow and its buffer holds only the appended deltas. preserve the prefix+ // and let the replay add to it. when the slot is empty the session buffer holds the whole+ // message so we wipe and rebuild from byte 0+ const existingContent = targetMessage.content ?? '';+ const existingReasoning = targetMessage.reasoningContent ?? '';+ const isAppendMode = existingContent.length > 0;+ // helper: write to the active store only when the attached conv is currently displayed.+ // the lookup by message id is robust to reordering of activeMessages, two parallel attaches+ // can no longer step on each other's indices+ const writeActive = (updates: Partial<DatabaseMessage>) => {+ if (convId !== conversationsStore.activeConversation?.id) {+ return;+ }++ const liveIdx = conversationsStore.findMessageIndex(targetMessageId);++ if (liveIdx === -1) return;++ conversationsStore.updateMessageAtIndex(liveIdx, updates);+ };++ if (!isAppendMode) {+ writeActive({ content: '', reasoningContent: undefined });+ }++ // extract the model suffix, the resume calls in handleStreamResponse must reuse the model+ // the session was tagged with, not the live dropdown+ const sepIdx = id.indexOf(CONVERSATION_ID_SEPARATOR);+ const attachedModel: string | null = sepIdx === -1 ? null : id.slice(sepIdx + 2);++ this.host.setChatStreaming(convId, existingContent, targetMessageId, attachedModel);+ const abortController = this.host.getOrCreateAbortController(convId);++ let streamedContent = '';+ let streamedReasoningContent = '';++ const cleanup = () => {+ unlock();+ this.host.processing.setState(convId, null);+ };++ try {+ await ChatService.handleStreamResponse(+ response,+ (chunk: string) => {+ streamedContent += chunk;+ const displayed = isAppendMode ? existingContent + streamedContent : streamedContent;++ writeActive({ content: displayed });+ this.host.setChatStreaming(convId, displayed, targetMessageId);+ },+ async (+ finalContent?: string,+ reasoningContent?: string,+ timings?: ChatMessageTimings,+ toolCalls?: string+ ) => {+ const streamed = streamedContent || finalContent || '';+ const streamedR = streamedReasoningContent || reasoningContent || '';+ const content = isAppendMode ? existingContent + streamed : streamed;+ const reasoning = isAppendMode ? existingReasoning + streamedR : streamedR;++ // the DB write is the source of truth, mirror to the active store only when+ // the conv is currently displayed+ await DatabaseService.updateMessage(targetMessageId, {+ content,+ reasoningContent: reasoning || undefined,+ timings,+ toolCalls: toolCalls || ''+ });+ writeActive({+ content,+ reasoningContent: reasoning || undefined,+ timings+ });+ cleanup();+ },+ (err: Error) => {+ console.error('attachServerStream pipe error:', err);+ cleanup();+ },+ (chunk: string) => {+ streamedReasoningContent += chunk;+ const displayed = isAppendMode+ ? existingReasoning + streamedReasoningContent+ : streamedReasoningContent;++ writeActive({ reasoningContent: displayed });+ },+ undefined,+ undefined,+ undefined,+ undefined,+ convId,+ abortController.signal,+ (connState: StreamConnectionState) => {+ if (convId === conversationsStore.activeConversation?.id) {+ this.host.streamConnectionState = connState;+ }+ },+ attachedModel+ );+ } catch (e) {+ console.error('attachServerStream pipe crashed:', e);+ cleanup();+ }+ }++ private findLastAssistantIdx(messages: DatabaseMessage[]): number {+ for (let i = messages.length - 1; i >= 0; i--) {+ if (messages[i].role === MessageRole.ASSISTANT) return i;+ }++ return -1;+ }++ private findLastUserIdx(messages: DatabaseMessage[]): number {+ for (let i = messages.length - 1; i >= 0; i--) {+ if (messages[i].role === MessageRole.USER) return i;+ }++ return -1;+ }++ /**+ * Server side stream discovery, split in three pieces:+ *+ * probeServerStream(convId) -> hits POST /v1/streams/lookup with the conv id, returns the session to attach+ * to or null. Pure read, no side effect, no UI lock. Safe to fire in parallel with anything.+ *+ * attachServerStream(convId) -> flips the spinner immediately, fetches the replay stream+ * from byte 0, finds the assistant slot to splice into (creates a placeholder if the conv has+ * no assistant message yet, for cross device or fresh local DB cases), and pipes the SSE bytes+ * into the message via handleStreamResponse.+ *+ * discoverActiveStream(convId) -> probe + attach in one call. Used by callers that do not need+ * to overlap the probe with other async work.+ *+ * The chat page in +page.svelte calls discoverActiveStream once the conversation is active+ * (immediately if it already is, after loadConversation settles otherwise), and re-runs it on+ * visibilitychange. Attaching only after the conversation is loaded gives the earliest+ * possible time to spinner and avoids racing against an empty activeMessages array.+ */+ private async probeServerStream(convId: string): Promise<ApiStreamSession | null> {+ if (!convId) return null;++ let sessions: ApiStreamSession[];++ try {+ sessions = await ChatService.lookupStreamSessions([convId]);+ } catch (e) {+ console.warn(`probeServerStream failed for conv ${convId}:`, e);++ return null;+ }++ return ChatService.selectActiveStream(sessions);+ }+}diff --git a/tools/ui/src/lib/stores/conversations.svelte.ts b/tools/ui/src/lib/stores/conversations/index.svelte.tssimilarity index 61%rename from tools/ui/src/lib/stores/conversations.svelte.tsrename to tools/ui/src/lib/stores/conversations/index.svelte.tsindex d2184b3593..7d6dc326c4 100644--- a/tools/ui/src/lib/stores/conversations.svelte.ts+++ b/tools/ui/src/lib/stores/conversations/index.svelte.ts@@ -1,135 +1,67 @@/**- * conversationsStore - Reactive State Store for Conversations+ * conversationsStore - Conversation lifecycle, persistence and navigation*- * Manages conversation lifecycle, persistence, navigation, and MCP server overrides.- *- * **Architecture & Relationships:**- * - **DatabaseService**: Stateless IndexedDB layer- * - **conversationsStore** (this): Reactive state + business logic- * - **chatStore**: Chat-specific state (streaming, loading)- *- * **Key Responsibilities:**- * - Conversation CRUD (create, load, delete)- * - Message management and tree navigation- * - MCP server per-chat overrides- * - Import/Export functionality- * - Title management with confirmation- *- * @see DatabaseService in services/database.ts for IndexedDB operations+ * Owns conversation CRUD, message tree navigation, import/export and title+ * management, persisted through DatabaseService. Per-chat options (MCP+ * overrides, reasoning effort, cwd) live in ConversationPreferences,+ * composed as {@link ConversationsStore.preferences}.*/import { browser } from '$app/environment';import { goto } from '$app/navigation';-import { REASONING_EFFORT_DEFAULT_LOCALSTORAGE_KEY, ROUTES } from '$lib/constants';-import { MessageRole, ReasoningEffort } from '$lib/enums';+import { ROUTES } from '$lib/constants';+import { MessageRole } from '$lib/enums';import { ConversationTransferService } from '$lib/services/conversation-transfer.service';import { DatabaseService } from '$lib/services/database.service';import { MigrationService } from '$lib/services/migration.service';import { RouterService } from '$lib/services/router.service';// direct imports between stores, not via the barrel, to avoid circular deps-import { mcpStore } from '$lib/stores/mcp.svelte';-import { settingsStore } from '$lib/stores/settings.svelte';-import type { McpServerOverride } from '$lib/types/database';+import {+ ConversationPreferences,+ type ConversationsPreferencesHost+} from '$lib/stores/conversations/preferences.svelte';+import { settingsStore } from '$lib/stores/settings/index.svelte';import { filterByLeafNodeId, findLeafNode, generateConversationTitle } from '$lib/utils';import { SvelteSet } from 'svelte/reactivity';import { toast } from 'svelte-sonner';-class ConversationsStore {- /**- *- *- * State- *- *- */-- /** List of all conversations */- conversations = $state<DatabaseConversation[]>([]);-+class ConversationsStore implements ConversationsPreferencesHost {/** Currently active conversation */activeConversation = $state<DatabaseConversation | null>(null);/** Messages in the active conversation (filtered by currNode path) */activeMessages = $state<DatabaseMessage[]>([]);+ /** List of all conversations */+ conversations = $state<DatabaseConversation[]>([]);+/** Whether the store has been initialized */isInitialized = $state(false);- /** Global (non-conversation-specific) reasoning effort default */- pendingReasoningEffort = $state<ReasoningEffort>(ConversationsStore.loadReasoningEffortDefault());+ /** Per-chat options (MCP overrides, reasoning effort, cwd), composed here. */+ private _preferences = new ConversationPreferences(this);/**- * Working directory picked on the empty new-chat screen, before any- * conversation exists. Consumed by `chatStore.sendMessage()`, which- * records it into chat history as a synthetic message on first send.- * Cleared by `loadConversation` and `clearActiveConversation` so a- * stale pick can't bleed onto an unrelated chat.+ * Listeners notified with the ids of conversations that were deleted.+ * Lets dependent stores (e.g. agenticStore) drop per-conversation state+ * without introducing a circular import back into this store.*/- pendingCwd = $state<string | null>(null);-- /** Load reasoning effort default from localStorage, DEFAULT defers to the server */- private static loadReasoningEffortDefault(): ReasoningEffort {- if (typeof globalThis.localStorage === 'undefined') return ReasoningEffort.DEFAULT;-- try {- const raw = localStorage.getItem(REASONING_EFFORT_DEFAULT_LOCALSTORAGE_KEY);-- return (raw as ReasoningEffort) || ReasoningEffort.DEFAULT;- } catch {- return ReasoningEffort.DEFAULT;- }- }-- /** Persist reasoning effort default to localStorage */- private saveReasoningEffortDefaults(): void {- if (typeof globalThis.localStorage === 'undefined') return;-- localStorage.setItem(REASONING_EFFORT_DEFAULT_LOCALSTORAGE_KEY, this.pendingReasoningEffort);- }+ private conversationDeletionListeners = new Set<(convIds: string[]) => void>();/** In-flight init run; shared by concurrent callers, reset on failure to allow retry */private initPromise: Promise<void> | null = null;/**- *- *- * Lifecycle- *- *- */-- /**- * Initialize the store by loading conversations from database.- * Safe to call multiple times: concurrent callers share a single run,- * and a failed run can be retried by calling again.+ * Memo of the last findMessageIndex() lookup. Streaming calls it once per+ * chunk for the same message, so a validated cache hit keeps that O(1)+ * instead of a linear scan of activeMessages on every token.*/- init(): Promise<void> {- if (!browser) return Promise.resolve();-- if (this.initPromise) return this.initPromise;-- this.initPromise = (async () => {- try {- await MigrationService.runAllMigrations();- await this.loadConversations();- this.isInitialized = true;- } catch (error) {- console.error('Failed to initialize conversations:', error);- this.initPromise = null;- }- })();+ private lastMessageIndex: { id: string; index: number } | null = null;- return this.initPromise;+ get preferences() {+ return this._preferences;}- /**- *- *- * Message Array Operations- *- *- */-/*** Adds a message to the active messages array*/@@ -138,67 +70,172 @@ class ConversationsStore {}/**- * Updates a message at a specific index in active messages+ * Applies a field update to a conversation row, mirroring it into both the+ * conversations list and the active conversation when it is the target.+ * Shared by the rename/pin/preferences flows so no caller can forget to+ * mirror one side.*/- updateMessageAtIndex(index: number, updates: Partial<DatabaseMessage>): void {- const message = index === -1 ? undefined : this.activeMessages[index];+ applyConversationUpdate(id: string, updates: Partial<DatabaseConversation>): void {+ const convIndex = this.conversations.findIndex((c) => c.id === id);- if (!message) return;-- // Assign field by field rather than replacing the object. Replacing it- // changes the array slot, which invalidates every consumer that merely- // walks the list - notably ChatMessages.displayMessages, which rebuilds- // entries for every message in the conversation. Deep $state proxies make- // per-field writes fine-grained, so only readers of the changed field wake.- const target = message as unknown as Record<string, unknown>;+ if (convIndex !== -1) {+ const target = this.conversations[convIndex] as unknown as Record<string, unknown>;- for (const [key, value] of Object.entries(updates)) {- if (target[key] !== value) {- target[key] = value;+ for (const [key, value] of Object.entries(updates)) {+ if (target[key] !== value) target[key] = value;}}++ if (this.activeConversation?.id === id) {+ this.activeConversation = { ...this.activeConversation, ...updates };+ }}/**- * Finds the index of a message in active messages+ * Derives a conversation title from its first message content and applies+ * it, honoring the title-generation setting. Shared by every flow that+ * edits or creates the first user message.*/- findMessageIndex(messageId: string): number {- return this.activeMessages.findIndex((m) => m.id === messageId);+ async applyTitleFromContent(convId: string, content: string): Promise<void> {+ await this.updateConversationName(+ convId,+ generateConversationTitle(content, Boolean(settingsStore.config.titleGenerationUseFirstLine))+ );}/**- * Removes messages from active messages starting at an index+ * Deletes multiple conversations in sequence.+ * Mirrors deleteConversation() per-id; navigates to NEW_CHAT only if the+ * currently-open chat was among the deleted ones.+ * @param convIds - Conversation IDs to delete*/- sliceActiveMessages(startIndex: number): void {- this.activeMessages = this.activeMessages.slice(0, startIndex);+ async bulkDeleteConversations(convIds: string[]): Promise<void> {+ if (convIds.length === 0) return;++ try {+ const idsToRemove = new SvelteSet(convIds);+ // Collect all descendants recursively so the local cache stays consistent+ // even when deleteWithForks is omitted.+ const queue = [...convIds];++ while (queue.length > 0) {+ const parentId = queue.pop()!;++ for (const c of this.conversations) {+ if (c.forkedFromConversationId === parentId && !idsToRemove.has(c.id)) {+ idsToRemove.add(c.id);+ queue.push(c.id);+ }+ }+ }++ const activeWasDeleted =+ this.activeConversation !== null && idsToRemove.has(this.activeConversation.id);++ await DatabaseService.bulkDeleteConversations([...idsToRemove]);++ this.conversations = this.conversations.filter((c) => !idsToRemove.has(c.id));+ this.notifyConversationsDeleted([...idsToRemove]);++ if (activeWasDeleted) {+ this.clearActiveConversation();+ await goto(ROUTES.NEW_CHAT);+ }++ toast.success(+ idsToRemove.size === 1+ ? 'Conversation deleted'+ : `${idsToRemove.size} conversations deleted`+ );+ } catch (error) {+ console.error('Failed to bulk delete conversations:', error);+ toast.error('Failed to delete conversations');+ }}/**- * Removes a message from active messages by index+ * Bundles the given conversations into a single zip archive and triggers a+ * browser download (one JSONL file per conversation).+ * @param convIds - Conversation IDs to export*/- removeMessageAtIndex(index: number): DatabaseMessage | undefined {- if (index !== -1) {- return this.activeMessages.splice(index, 1)[0];- }+ async bulkExportConversations(convIds: string[]): Promise<void> {+ if (convIds.length === 0) return;- return undefined;+ try {+ const fetched = await DatabaseService.getConversationsWithMessages(convIds);+ const activeId = this.activeConversation?.id;+ const overridden = fetched.get(activeId ?? '');++ if (overridden && activeId) {+ overridden.conv = { ...this.activeConversation! };+ }++ const exported = [...fetched.values()];++ if (exported.length === 0) {+ toast.error('No conversations to export');++ return;+ }++ ConversationTransferService.downloadConversationsArchive(exported);++ toast.success(+ exported.length === 1+ ? 'Conversation exported'+ : `${exported.length} conversations exported`+ );+ } catch (error) {+ console.error('Failed to bulk export conversations:', error);+ toast.error('Failed to export conversations');+ }}/**- *- *- * Conversation CRUD- *- *+ * Toggles the pinned state of each conversation individually.+ * Mixed-pin selections are intentionally not normalised here; the bulk+ * action UI surfaces them as a disabled mixed-state instead.+ * @param convIds - Conversation IDs to toggle*/+ async bulkToggleConversationPin(convIds: string[]): Promise<void> {+ if (convIds.length === 0) return;++ try {+ const updates = await DatabaseService.bulkToggleConversationPins(convIds);+ const activeId = this.activeConversation?.id;++ if (activeId && updates.has(activeId)) {+ this.activeConversation = {+ ...this.activeConversation!,+ pinned: updates.get(activeId)!+ };+ }++ for (let i = 0; i < this.conversations.length; i++) {+ const newPinned = updates.get(this.conversations[i].id);++ if (newPinned !== undefined) this.conversations[i].pinned = newPinned;+ }++ toast.success(+ convIds.length === 1+ ? 'Conversation pin toggled'+ : `Updated pin state for ${convIds.length} conversations`+ );+ } catch (error) {+ console.error('Failed to bulk toggle pin:', error);+ toast.error('Failed to update pin state');+ }+ }/**- * Loads all conversations from the database+ * Clears the active conversation and messages.*/- async loadConversations(): Promise<void> {- const conversations = await DatabaseService.getAllConversations();-- this.conversations = conversations;+ clearActiveConversation(): void {+ this.activeConversation = null;+ this.activeMessages = [];+ // reload defaults so new chats inherit persisted state+ this.preferences.resetPending();}/**@@ -208,17 +245,15 @@ class ConversationsStore {*/async createConversation(name?: string): Promise<string> {const conversationName = name || `Chat ${new Date().toLocaleString()}`;- // No MCP override list is seeded: getAllMcpServerOverrides resolves- // servers without a per-conversation override to `mcpServers[i].enabled`,- // and only explicit toggles are stored on the conversation.- // Working directory picked on the new-chat screen gets threaded in- // here too, then cleared so it doesn't bleed onto subsequent new chats.+ // Working directory and reasoning effort picked on the new-chat screen+ // get threaded into the new conversation here, then cleared so they+ // don't bleed onto subsequent new chats.const conversation = await DatabaseService.createConversation(conversationName, {- cwd: this.pendingCwd ?? undefined,- reasoningEffort: this.pendingReasoningEffort+ cwd: this.preferences.pendingCwd ?? undefined,+ reasoningEffort: this.preferences.pendingReasoningEffort});- this.pendingCwd = null;+ this.preferences.pendingCwd = null;this.conversations = [conversation, ...this.conversations];this.activeConversation = conversation;@@ -230,58 +265,28 @@ class ConversationsStore {}/**- * Loads a specific conversation and its messages- * @param convId - The conversation ID to load- * @returns True if conversation was loaded successfully+ * Deletes all conversations and their messages*/- async loadConversation(convId: string): Promise<boolean> {+ async deleteAll(): Promise<void> {try {- const conversation = await DatabaseService.getConversation(convId);-- if (!conversation) {- return false;- }-- // Drop any cwd the user drafted on the empty new-chat screen -- // it doesn't belong to this conversation.- this.pendingCwd = null;-- this.activeConversation = conversation;+ const allConversations = await DatabaseService.getAllConversations();+ const allIds = allConversations.map((c) => c.id);- if (conversation.currNode) {- const allMessages = await DatabaseService.getConversationMessages(convId);- const filteredMessages = filterByLeafNodeId(- allMessages,- conversation.currNode,- false- ) as DatabaseMessage[];+ await DatabaseService.bulkDeleteConversations(allIds);- this.activeMessages = filteredMessages;- } else {- const messages = await DatabaseService.getConversationMessages(convId);+ this.clearActiveConversation();+ this.conversations = [];+ this.notifyConversationsDeleted(allIds);- this.activeMessages = messages;- }+ toast.success('All conversations deleted');- return true;+ await goto(ROUTES.NEW_CHAT);} catch (error) {- console.error('Failed to load conversation:', error);-- return false;+ console.error('Failed to delete all conversations:', error);+ toast.error('Failed to delete conversations');}}- /**- * Clears the active conversation and messages.- */- clearActiveConversation(): void {- this.activeConversation = null;- this.activeMessages = [];- // reload defaults so new chats inherit persisted state- this.pendingReasoningEffort = ConversationsStore.loadReasoningEffortDefault();- this.pendingCwd = null;- }-/*** Deletes a conversation and all its messages* @param convId - The conversation ID to delete@@ -311,6 +316,8 @@ class ConversationsStore {this.clearActiveConversation();await goto(ROUTES.NEW_CHAT);}++ this.notifyConversationsDeleted([...idsToRemove]);} else {// Reparent direct children to deleted conv's parent (or promote to top-level)const deletedConv = this.conversations.find((c) => c.id === convId);@@ -328,6 +335,8 @@ class ConversationsStore {this.clearActiveConversation();await goto(ROUTES.NEW_CHAT);}++ this.notifyConversationsDeleted([convId]);}} catch (error) {console.error('Failed to delete conversation:', error);@@ -335,178 +344,87 @@ class ConversationsStore {}/**- * Deletes all conversations and their messages+ * Downloads a single conversation as a JSONL file, serializing the full message tree.+ * @param convId - The conversation ID to download*/- async deleteAll(): Promise<void> {- try {- const allConversations = await DatabaseService.getAllConversations();-- await DatabaseService.bulkDeleteConversations(allConversations.map((c) => c.id));+ async downloadConversation(convId: string): Promise<void> {+ const conversation =+ this.activeConversation?.id === convId+ ? this.activeConversation+ : await DatabaseService.getConversation(convId);- this.clearActiveConversation();- this.conversations = [];+ if (!conversation) return;- toast.success('All conversations deleted');+ const messages = await DatabaseService.getConversationMessages(convId);- await goto(ROUTES.NEW_CHAT);- } catch (error) {- console.error('Failed to delete all conversations:', error);- toast.error('Failed to delete conversations');- }+ ConversationTransferService.downloadConversationFile({ conv: conversation, messages });}/**- * Deletes multiple conversations in sequence.- * Mirrors deleteConversation() per-id; navigates to NEW_CHAT only if the- * currently-open chat was among the deleted ones.- * @param convIds - Conversation IDs to delete+ * Finds the index of a message in active messages.+ *+ * The last lookup is memoized and reused when it still validates against+ * the current array (same id at the same position), which covers the+ * streaming hot path where the same message is looked up on every chunk+ * while the array itself only mutates by field. Any structural change+ * (splice, reassignment, reordering) fails validation and falls back to a+ * full scan.*/- async bulkDeleteConversations(convIds: string[]): Promise<void> {- if (convIds.length === 0) return;-- try {- const idsToRemove = new SvelteSet(convIds);- // Collect all descendants recursively so the local cache stays consistent- // even when deleteWithForks is omitted.- const queue = [...convIds];-- while (queue.length > 0) {- const parentId = queue.pop()!;-- for (const c of this.conversations) {- if (c.forkedFromConversationId === parentId && !idsToRemove.has(c.id)) {- idsToRemove.add(c.id);- queue.push(c.id);- }- }- }-- const activeWasDeleted =- this.activeConversation !== null && idsToRemove.has(this.activeConversation.id);-- await DatabaseService.bulkDeleteConversations([...idsToRemove]);-- this.conversations = this.conversations.filter((c) => !idsToRemove.has(c.id));-- if (activeWasDeleted) {- this.clearActiveConversation();- await goto(ROUTES.NEW_CHAT);- }-- toast.success(- idsToRemove.size === 1- ? 'Conversation deleted'- : `${idsToRemove.size} conversations deleted`- );- } catch (error) {- console.error('Failed to bulk delete conversations:', error);- toast.error('Failed to delete conversations');+ findMessageIndex(messageId: string): number {+ const last = this.lastMessageIndex;+ const messages = this.activeMessages;++ if (+ last &&+ last.id === messageId &&+ last.index >= 0 &&+ last.index < messages.length &&+ messages[last.index]?.id === messageId+ ) {+ return last.index;}- }-- /**- * Toggles the pinned state of each conversation individually.- * Mixed-pin selections are intentionally not normalised here; the bulk- * action UI surfaces them as a disabled mixed-state instead.- * @param convIds - Conversation IDs to toggle- */- async bulkToggleConversationPin(convIds: string[]): Promise<void> {- if (convIds.length === 0) return;- try {- const updates = await DatabaseService.bulkToggleConversationPins(convIds);- const activeId = this.activeConversation?.id;+ const index = messages.findIndex((m) => m.id === messageId);- if (activeId && updates.has(activeId)) {- this.activeConversation = {- ...this.activeConversation!,- pinned: updates.get(activeId)!- };- }+ this.lastMessageIndex = { id: messageId, index };- for (let i = 0; i < this.conversations.length; i++) {- const newPinned = updates.get(this.conversations[i].id);-- if (newPinned !== undefined) this.conversations[i].pinned = newPinned;- }-- toast.success(- convIds.length === 1- ? 'Conversation pin toggled'- : `Updated pin state for ${convIds.length} conversations`- );- } catch (error) {- console.error('Failed to bulk toggle pin:', error);- toast.error('Failed to update pin state');- }+ return index;}/**- * Bundles the given conversations into a single zip archive and triggers a- * browser download (one JSONL file per conversation).- * @param convIds - Conversation IDs to export+ * Forks a conversation at a specific message, creating a new conversation+ * containing messages from root up to the target message, then navigates to it.+ *+ * @param messageId - The message ID to fork at+ * @param options - Fork options (name and whether to include attachments)+ * @returns The new conversation ID, or null if fork failed*/- async bulkExportConversations(convIds: string[]): Promise<void> {- if (convIds.length === 0) return;+ async forkConversation(+ messageId: string,+ options: { name: string; includeAttachments: boolean }+ ): Promise<string | null> {+ if (!this.activeConversation) return null;try {- const fetched = await DatabaseService.getConversationsWithMessages(convIds);- const activeId = this.activeConversation?.id;- const overridden = fetched.get(activeId ?? '');-- if (overridden && activeId) {- overridden.conv = { ...this.activeConversation! };- }-- const exported = [...fetched.values()];-- if (exported.length === 0) {- toast.error('No conversations to export');-- return;- }-- ConversationTransferService.downloadConversationsArchive(exported);-- toast.success(- exported.length === 1- ? 'Conversation exported'- : `${exported.length} conversations exported`+ const newConv = await DatabaseService.forkConversation(+ this.activeConversation.id,+ messageId,+ options);- } catch (error) {- console.error('Failed to bulk export conversations:', error);- toast.error('Failed to export conversations');- }- }- /**- *- *- * Message Management- *- *- */+ this.conversations = [newConv, ...this.conversations];- /**- * Refreshes active messages based on currNode after branch navigation.- */- async refreshActiveMessages(): Promise<void> {- if (!this.activeConversation) return;+ await goto(RouterService.chat(newConv.id));- const allMessages = await DatabaseService.getConversationMessages(this.activeConversation.id);+ toast.success('Conversation forked');- if (allMessages.length === 0) {- this.activeMessages = [];+ return newConv.id;+ } catch (error) {+ console.error('Failed to fork conversation:', error);+ toast.error('Failed to fork conversation');- return;+ return null;}-- const leafNodeId =- this.activeConversation.currNode ||- allMessages.reduce((latest, msg) => (msg.timestamp > latest.timestamp ? msg : latest)).id;- const currentPath = filterByLeafNodeId(allMessages, leafNodeId, false) as DatabaseMessage[];-- this.activeMessages = currentPath;}/**@@ -519,112 +437,95 @@ class ConversationsStore {}/**- *- *- * Title Management- *- *+ * Imports conversations from provided data (without file picker)+ * @param data - Array of conversation data with messages+ * @returns The conversations written to the database and the ones skipped*/+ async importConversationsData(+ data: ExportedConversations+ ): Promise<{ imported: DatabaseConversation[]; skipped: DatabaseConversation[] }> {+ const result = await DatabaseService.importConversations(data);++ await this.loadConversations();++ return result;+ }/**- * Updates the name of a conversation.- * @param convId - The conversation ID to update- * @param name - The new name for the conversation+ * Initialize the store by loading conversations from database.+ * Safe to call multiple times: concurrent callers share a single run,+ * and a failed run can be retried by calling again.*/- async updateConversationName(convId: string, name: string): Promise<void> {- try {- await DatabaseService.updateConversation(convId, { name });+ initialize(): Promise<void> {+ if (!browser) return Promise.resolve();- const convIndex = this.conversations.findIndex((c) => c.id === convId);+ if (this.initPromise) return this.initPromise;- if (convIndex !== -1) {- this.conversations[convIndex].name = name;+ this.initPromise = (async () => {+ try {+ await MigrationService.runAllMigrations();+ await this.loadConversations();+ this.isInitialized = true;+ } catch (error) {+ console.error('Failed to initialize conversations:', error);+ this.initPromise = null;}+ })();- if (this.activeConversation?.id === convId) {- this.activeConversation = { ...this.activeConversation, name };- }- } catch (error) {- console.error('Failed to update conversation name:', error);- }+ return this.initPromise;}/**- * Toggles the pinned status of a conversation.- * @param convId - The conversation ID to toggle- * @returns The new pinned status+ * Loads a specific conversation and its messages+ * @param convId - The conversation ID to load+ * @returns True if conversation was loaded successfully*/- async toggleConversationPin(convId: string): Promise<boolean> {+ async loadConversation(convId: string): Promise<boolean> {try {- const newPinnedState = await DatabaseService.toggleConversationPin(convId);- const convIndex = this.conversations.findIndex((c) => c.id === convId);+ const conversation = await DatabaseService.getConversation(convId);++ if (!conversation) {+ return false;+ }++ // Drop any cwd the user drafted on the empty new-chat screen -+ // it doesn't belong to this conversation.+ this.preferences.pendingCwd = null;++ this.activeConversation = conversation;++ if (conversation.currNode) {+ const allMessages = await DatabaseService.getConversationMessages(convId);+ const filteredMessages = filterByLeafNodeId(+ allMessages,+ conversation.currNode,+ false+ ) as DatabaseMessage[];- if (convIndex !== -1) {- this.conversations[convIndex].pinned = newPinnedState;- }+ this.activeMessages = filteredMessages;+ } else {+ const messages = await DatabaseService.getConversationMessages(convId);- if (this.activeConversation?.id === convId) {- this.activeConversation = { ...this.activeConversation, pinned: newPinnedState };+ this.activeMessages = messages;}- return newPinnedState;+ return true;} catch (error) {- console.error('Failed to toggle conversation pin:', error);+ console.error('Failed to load conversation:', error);return false;}}/**- * Marks a conversation as recently active: stamps lastModified (persisted)- * and moves it to the top of the list. Only message-activity flows call- * this; metadata updates (rename, pin, settings) do not.- *- * @param convId - Conversation that produced the activity, defaults to the active one- */- updateConversationTimestamp(convId?: string): void {- const targetId = convId ?? this.activeConversation?.id;-- if (!targetId) return;-- const now = Date.now();- const chatIndex = this.conversations.findIndex((c) => c.id === targetId);-- if (chatIndex !== -1) {- this.conversations[chatIndex].lastModified = now;- const updatedConv = this.conversations.splice(chatIndex, 1)[0];-- this.conversations = [updatedConv, ...this.conversations];- }-- if (this.activeConversation?.id === targetId) {- this.activeConversation = { ...this.activeConversation, lastModified: now };- }-- DatabaseService.updateConversation(targetId, { lastModified: now }).catch((error) =>- console.error('Failed to update conversation timestamp:', error)- );- }-- /**- * Updates the current node of the active conversation- * @param nodeId - The new current node ID+ * Loads all conversations from the database*/- async updateCurrentNode(nodeId: string): Promise<void> {- if (!this.activeConversation) return;+ async loadConversations(): Promise<void> {+ const conversations = await DatabaseService.getAllConversations();- await DatabaseService.updateCurrentNode(this.activeConversation.id, nodeId);- this.activeConversation = { ...this.activeConversation, currNode: nodeId };+ this.conversations = conversations;}- /**- *- *- * Branch Navigation- *- *- */-/*** Navigates to a specific sibling branch by updating currNode and refreshing messages.* @param siblingId - The sibling message ID to navigate to@@ -655,279 +556,124 @@ class ConversationsStore {newFirstUserMessage.id !== currentFirstUserMessage.id ||newFirstUserMessage.content.trim() !== currentFirstUserMessage.content.trim())) {- await this.updateConversationName(- this.activeConversation.id,- generateConversationTitle(- newFirstUserMessage.content,- Boolean(settingsStore.config.titleGenerationUseFirstLine)- )- );+ await this.applyTitleFromContent(this.activeConversation.id, newFirstUserMessage.content);}}}/**- *- *- * MCP Server Overrides- *- *- */-- /**- * Resolve the default enabled value for a server: its own `enabled`- * flag in `mcpServers`, so the global on/off state lives in one place.- */- #getDefaultOverride(serverId: string): McpServerOverride | undefined {- const server = mcpStore.getServers().find((s) => s.id === serverId);-- if (!server) return undefined;-- return { enabled: server.enabled, serverId };- }-- /**- * Gets the effective MCP server override for a specific server.- * A per-conversation override wins when present; a server without one- * resolves to its `mcpServers[i].enabled` default.- * @param serverId - The server ID to check- * @returns The effective override, undefined if no matching server- */- getMcpServerOverride(serverId: string): McpServerOverride | undefined {- const override = this.activeConversation?.mcpServerOverrides?.find(- (o: McpServerOverride) => o.serverId === serverId- );-- if (override) return override;-- return this.#getDefaultOverride(serverId);- }-- /**- * Gets the effective override list for the current conversation:- * one entry per configured server, resolved per server. The stored- * per-conversation list is sparse and only holds explicit toggles.+ * Registers a listener invoked with the ids of deleted conversations.+ * Returns an unsubscribe function.*/- getAllMcpServerOverrides(): McpServerOverride[] {- const overrides = this.activeConversation?.mcpServerOverrides;+ onConversationsDeleted(listener: (convIds: string[]) => void): () => void {+ this.conversationDeletionListeners.add(listener);- return mcpStore.getServers().map((s) => {- const override = overrides?.find((o: McpServerOverride) => o.serverId === s.id);-- return { enabled: override?.enabled ?? s.enabled, serverId: s.id };- });+ return () => this.conversationDeletionListeners.delete(listener);}/**- * Checks if an MCP server is enabled for the active conversation.- * @param serverId - The server ID to check- * @returns True if server is enabled for this conversation+ * Refreshes active messages based on currNode after branch navigation.*/- isMcpServerEnabledForChat(serverId: string): boolean {- const override = this.getMcpServerOverride(serverId);+ async refreshActiveMessages(): Promise<void> {+ if (!this.activeConversation) return;- return override?.enabled ?? false;- }+ const allMessages = await DatabaseService.getConversationMessages(this.activeConversation.id);- /**- * Sets or removes MCP server override for the active conversation.- * If no conversation exists, persists `enabled` onto `mcpServers[i].enabled`- * (the single source of truth for new-chat defaults).- * @param serverId - The server ID to override- * @param enabled - The enabled state, or undefined to remove per-conversation override- */- async setMcpServerOverride(serverId: string, enabled: boolean | undefined): Promise<void> {- if (!this.activeConversation) {- if (enabled !== undefined) {- mcpStore.updateServer(serverId, { enabled });- }+ if (allMessages.length === 0) {+ this.activeMessages = [];return;}- // Clone to plain objects to avoid Proxy serialization issues with IndexedDB- const currentOverrides = (this.activeConversation.mcpServerOverrides || []).map(- (o: McpServerOverride) => ({- enabled: o.enabled,- serverId: o.serverId- })- );-- let newOverrides: McpServerOverride[];-- if (enabled === undefined) {- newOverrides = currentOverrides.filter((o: McpServerOverride) => o.serverId !== serverId);- } else {- const existingIndex = currentOverrides.findIndex(- (o: McpServerOverride) => o.serverId === serverId- );-- if (existingIndex >= 0) {- newOverrides = [...currentOverrides];- newOverrides[existingIndex] = { enabled, serverId };- } else {- newOverrides = [...currentOverrides, { enabled, serverId }];- }- }-- await DatabaseService.updateConversation(this.activeConversation.id, {- mcpServerOverrides: newOverrides.length > 0 ? newOverrides : undefined- });-- this.activeConversation = {- ...this.activeConversation,- mcpServerOverrides: newOverrides.length > 0 ? newOverrides : undefined- };-- const convIndex = this.conversations.findIndex((c) => c.id === this.activeConversation!.id);+ const leafNodeId =+ this.activeConversation.currNode ||+ allMessages.reduce((latest, msg) => (msg.timestamp > latest.timestamp ? msg : latest)).id;+ const currentPath = filterByLeafNodeId(allMessages, leafNodeId, false) as DatabaseMessage[];- if (convIndex !== -1) {- this.conversations[convIndex].mcpServerOverrides =- newOverrides.length > 0 ? newOverrides : undefined;- }+ this.activeMessages = currentPath;}/**- * Toggles MCP server enabled state for the active conversation.- * @param serverId - The server ID to toggle+ * Removes a message from active messages by index*/- async toggleMcpServerForChat(serverId: string): Promise<void> {- const currentEnabled = this.isMcpServerEnabledForChat(serverId);-- await this.setMcpServerOverride(serverId, !currentEnabled);- }+ removeMessageAtIndex(index: number): DatabaseMessage | undefined {+ if (index !== -1) {+ return this.activeMessages.splice(index, 1)[0];+ }- /**- * Removes MCP server override for the active conversation.- * @param serverId - The server ID to remove override for- */- async removeMcpServerOverride(serverId: string): Promise<void> {- await this.setMcpServerOverride(serverId, undefined);+ return undefined;}/**- * Gets the effective reasoning effort for the active conversation.- * Returns the conversation override if set, otherwise the global default.- * DEFAULT means no override is sent and the server decides.+ * Removes messages from active messages starting at an index*/- getReasoningEffort(): ReasoningEffort {- if (this.activeConversation) {- if (this.activeConversation.reasoningEffort !== undefined) {- return this.activeConversation.reasoningEffort;- }-- // conversations created before the tri-state store an explicit- // opt-out only as thinkingEnabled = false- if (this.activeConversation.thinkingEnabled === false) {- return ReasoningEffort.OFF;- }- }-- return this.pendingReasoningEffort;+ sliceActiveMessages(startIndex: number): void {+ this.activeMessages = this.activeMessages.slice(0, startIndex);}/**- * Sets the reasoning effort for the active conversation.- * If no conversation exists, stores the global default.- * @param effort - The effort level ('default' | 'off' | 'low' | 'medium' | 'high' | 'max')+ * Toggles the pinned status of a conversation.+ * @param convId - The conversation ID to toggle+ * @returns The new pinned status*/- async setReasoningEffort(effort: ReasoningEffort): Promise<void> {- if (!this.activeConversation) {- this.pendingReasoningEffort = effort;- this.saveReasoningEffortDefaults();-- return;- }-- this.activeConversation = {- ...this.activeConversation,- reasoningEffort: effort- };+ async toggleConversationPin(convId: string): Promise<boolean> {+ try {+ const newPinnedState = await DatabaseService.toggleConversationPin(convId);- await DatabaseService.updateConversation(this.activeConversation.id, {- reasoningEffort: effort- });+ this.applyConversationUpdate(convId, { pinned: newPinnedState });- const convIndex = this.conversations.findIndex((c) => c.id === this.activeConversation!.id);+ return newPinnedState;+ } catch (error) {+ console.error('Failed to toggle conversation pin:', error);- if (convIndex !== -1) {- this.conversations[convIndex].reasoningEffort = effort;+ return false;}}/**- * Sets the working directory for the active conversation. Pass `null` or- * an empty string to clear it, which restores the picker's empty state.- *- * On the empty new-chat screen (no active conversation yet), the value- * is buffered into `pendingCwd` so the user can pick before- * sending the first message; `createConversation()` consumes it.- *- * @param value - Absolute server-side path to the working directory, or null to clear+ * Updates the name of a conversation.+ * @param convId - The conversation ID to update+ * @param name - The new name for the conversation*/- async setCwd(value: string | null): Promise<void> {- const trimmed = value?.trim() || undefined;-- // No chat yet - buffer for the first chat the user creates.- if (!this.activeConversation) {- this.pendingCwd = trimmed ?? null;-- return;- }-- this.activeConversation = {- ...this.activeConversation,- cwd: trimmed- };-- await DatabaseService.updateConversation(this.activeConversation.id, {- cwd: trimmed- });-- const convIndex = this.conversations.findIndex((c) => c.id === this.activeConversation!.id);+ async updateConversationName(convId: string, name: string): Promise<void> {+ try {+ await DatabaseService.updateConversation(convId, { name });- if (convIndex !== -1) {- this.conversations[convIndex].cwd = trimmed;- this.conversations = [...this.conversations];+ this.applyConversationUpdate(convId, { name });+ } catch (error) {+ console.error('Failed to update conversation name:', error);}-- this.pendingCwd = null;}/**- * Forks a conversation at a specific message, creating a new conversation- * containing messages from root up to the target message, then navigates to it.+ * Marks a conversation as recently active: stamps lastModified (persisted)+ * and moves it to the top of the list. Only message-activity flows call+ * this; metadata updates (rename, pin, settings) do not.*- * @param messageId - The message ID to fork at- * @param options - Fork options (name and whether to include attachments)- * @returns The new conversation ID, or null if fork failed+ * @param convId - Conversation that produced the activity, defaults to the active one*/- async forkConversation(- messageId: string,- options: { name: string; includeAttachments: boolean }- ): Promise<string | null> {- if (!this.activeConversation) return null;-- try {- const newConv = await DatabaseService.forkConversation(- this.activeConversation.id,- messageId,- options- );+ updateConversationTimestamp(convId?: string): void {+ const targetId = convId ?? this.activeConversation?.id;- this.conversations = [newConv, ...this.conversations];+ if (!targetId) return;- await goto(RouterService.chat(newConv.id));+ const now = Date.now();+ const chatIndex = this.conversations.findIndex((c) => c.id === targetId);- toast.success('Conversation forked');+ if (chatIndex !== -1) {+ this.conversations[chatIndex].lastModified = now;+ const updatedConv = this.conversations.splice(chatIndex, 1)[0];- return newConv.id;- } catch (error) {- console.error('Failed to fork conversation:', error);- toast.error('Failed to fork conversation');+ this.conversations = [updatedConv, ...this.conversations];+ }- return null;+ if (this.activeConversation?.id === targetId) {+ this.activeConversation = { ...this.activeConversation, lastModified: now };}++ DatabaseService.updateConversation(targetId, { lastModified: now }).catch((error) =>+ console.error('Failed to update conversation timestamp:', error)+ );}/**@@ -939,35 +685,44 @@ class ConversationsStore {*//**- * Downloads a single conversation as a JSONL file, serializing the full message tree.- * @param convId - The conversation ID to download+ * Updates the current node of the active conversation+ * @param nodeId - The new current node ID*/- async downloadConversation(convId: string): Promise<void> {- const conversation =- this.activeConversation?.id === convId- ? this.activeConversation- : await DatabaseService.getConversation(convId);-- if (!conversation) return;-- const messages = await DatabaseService.getConversationMessages(convId);+ async updateCurrentNode(nodeId: string): Promise<void> {+ if (!this.activeConversation) return;- ConversationTransferService.downloadConversationFile({ conv: conversation, messages });+ await DatabaseService.updateCurrentNode(this.activeConversation.id, nodeId);+ this.activeConversation = { ...this.activeConversation, currNode: nodeId };}/**- * Imports conversations from provided data (without file picker)- * @param data - Array of conversation data with messages- * @returns The conversations written to the database and the ones skipped+ * Updates a message at a specific index in active messages*/- async importConversationsData(- data: ExportedConversations- ): Promise<{ imported: DatabaseConversation[]; skipped: DatabaseConversation[] }> {- const result = await DatabaseService.importConversations(data);+ updateMessageAtIndex(index: number, updates: Partial<DatabaseMessage>): void {+ const message = index === -1 ? undefined : this.activeMessages[index];- await this.loadConversations();+ if (!message) return;- return result;+ // Assign field by field rather than replacing the object. Replacing it+ // changes the array slot, which invalidates every consumer that merely+ // walks the list - notably ChatMessages.displayMessages, which rebuilds+ // entries for every message in the conversation. Deep $state proxies make+ // per-field writes fine-grained, so only readers of the changed field wake.+ const target = message as unknown as Record<string, unknown>;++ for (const [key, value] of Object.entries(updates)) {+ if (target[key] !== value) {+ target[key] = value;+ }+ }+ }++ private notifyConversationsDeleted(convIds: string[]): void {+ if (convIds.length === 0) return;++ for (const listener of this.conversationDeletionListeners) {+ listener(convIds);+ }}}diff --git a/tools/ui/src/lib/stores/conversations/preferences.svelte.ts b/tools/ui/src/lib/stores/conversations/preferences.svelte.tsnew file mode 100644index 0000000000..65a02344b6--- /dev/null+++ b/tools/ui/src/lib/stores/conversations/preferences.svelte.ts@@ -0,0 +1,254 @@+/**+ * ConversationPreferences - Per-chat options with global fallback+ *+ * Owns the options that resolve per conversation: MCP server overrides,+ * reasoning effort, and the working directory. Cwd and reasoning effort are+ * buffered as pending state and threaded into the next created conversation+ * by the host; MCP server overrides edit the sparse `mcpServerOverrides`+ * list on the active row (new-chat toggles edit the server's global flag).+ * Created and owned by conversationsStore; the host owns the conversation+ * rows these options persist onto.+ */++import { REASONING_EFFORT_DEFAULT_LOCALSTORAGE_KEY } from '$lib/constants';+import { ReasoningEffort } from '$lib/enums';+import { DatabaseService } from '$lib/services/database.service';+// direct imports between stores, not via the barrel, to avoid circular deps+import { mcpStore } from '$lib/stores/mcp/index.svelte';+import type { McpServerOverride } from '$lib/types/database';++/** Load reasoning effort default from localStorage, DEFAULT defers to the server */+function loadReasoningEffortDefault(): ReasoningEffort {+ if (typeof globalThis.localStorage === 'undefined') return ReasoningEffort.DEFAULT;++ try {+ const raw = localStorage.getItem(REASONING_EFFORT_DEFAULT_LOCALSTORAGE_KEY);++ return (raw as ReasoningEffort) || ReasoningEffort.DEFAULT;+ } catch {+ return ReasoningEffort.DEFAULT;+ }+}++/** Persist reasoning effort default to localStorage */+function saveReasoningEffortDefault(effort: ReasoningEffort): void {+ if (typeof globalThis.localStorage === 'undefined') return;++ localStorage.setItem(REASONING_EFFORT_DEFAULT_LOCALSTORAGE_KEY, effort);+}++/**+ * The slice of conversationsStore the preferences read and write. Kept narrow+ * on purpose so they cannot reach around the host's full surface;+ * conversationsStore implements this structurally.+ */+export interface ConversationsPreferencesHost {+ activeConversation: DatabaseConversation | null;+ conversations: DatabaseConversation[];+ applyConversationUpdate(id: string, updates: Partial<DatabaseConversation>): void;+}++export class ConversationPreferences {+ /**+ * Working directory picked on the empty new-chat screen, before any+ * conversation exists. Consumed by `chatStore.sendMessage()`, which+ * records it into chat history as a synthetic message on first send.+ * Cleared by `loadConversation` and `clearActiveConversation` so a+ * stale pick can't bleed onto an unrelated chat.+ */+ pendingCwd = $state<string | null>(null);++ /** Global (non-conversation-specific) reasoning effort default */+ pendingReasoningEffort = $state<ReasoningEffort>(loadReasoningEffortDefault());++ constructor(private host: ConversationsPreferencesHost) {}++ /**+ * Gets the effective override list for the current conversation:+ * one entry per configured server, resolved per server. The stored+ * per-conversation list is sparse and only holds explicit toggles.+ */+ getAllMcpServerOverrides(): McpServerOverride[] {+ const overrides = this.host.activeConversation?.mcpServerOverrides;++ return mcpStore.getServers().map((s) => {+ const override = overrides?.find((o: McpServerOverride) => o.serverId === s.id);++ return { enabled: override?.enabled ?? s.enabled, serverId: s.id };+ });+ }++ /**+ * Gets the effective MCP server override for a specific server.+ * A per-conversation override wins when present; a server without one+ * resolves to its `mcpServers[i].enabled` default.+ */+ getMcpServerOverride(serverId: string): McpServerOverride | undefined {+ const override = this.host.activeConversation?.mcpServerOverrides?.find(+ (o: McpServerOverride) => o.serverId === serverId+ );++ if (override) return override;++ return this.getDefaultOverride(serverId);+ }++ /**+ * Gets the effective reasoning effort for the active conversation.+ * Returns the conversation override if set, otherwise the global default.+ * DEFAULT means no override is sent and the server decides.+ */+ getReasoningEffort(): ReasoningEffort {+ if (this.host.activeConversation) {+ if (this.host.activeConversation.reasoningEffort !== undefined) {+ return this.host.activeConversation.reasoningEffort;+ }++ // conversations created before the tri-state store an explicit+ // opt-out only as thinkingEnabled = false+ if (this.host.activeConversation.thinkingEnabled === false) {+ return ReasoningEffort.OFF;+ }+ }++ return this.pendingReasoningEffort;+ }++ /** Checks if an MCP server is enabled for the active conversation. */+ isMcpServerEnabledForChat(serverId: string): boolean {+ const override = this.getMcpServerOverride(serverId);++ return override?.enabled ?? false;+ }++ /** Removes MCP server override for the active conversation. */+ async removeMcpServerOverride(serverId: string): Promise<void> {+ await this.setMcpServerOverride(serverId, undefined);+ }++ /** Reload persisted defaults, e.g. when the active conversation is cleared. */+ resetPending(): void {+ this.pendingReasoningEffort = loadReasoningEffortDefault();+ this.pendingCwd = null;+ }++ /**+ * Sets the working directory for the active conversation. Pass `null` or+ * an empty string to clear it, which restores the picker's empty state.+ *+ * On the empty new-chat screen (no active conversation yet), the value+ * is buffered into `pendingCwd` so the user can pick before+ * sending the first message; `createConversation()` consumes it.+ *+ * @param value - Absolute server-side path to the working directory, or null to clear+ */+ async setCwd(value: string | null): Promise<void> {+ const trimmed = value?.trim() || undefined;++ // No chat yet - buffer for the first chat the user creates.+ if (!this.host.activeConversation) {+ this.pendingCwd = trimmed ?? null;++ return;+ }++ this.host.applyConversationUpdate(this.host.activeConversation.id, {+ cwd: trimmed+ });++ await DatabaseService.updateConversation(this.host.activeConversation.id, {+ cwd: trimmed+ });++ this.pendingCwd = null;+ }++ /**+ * Sets or removes MCP server override for the active conversation.+ * If no conversation exists, persists `enabled` onto `mcpServers[i].enabled`+ * (the single source of truth for new-chat defaults).+ */+ async setMcpServerOverride(serverId: string, enabled: boolean | undefined): Promise<void> {+ if (!this.host.activeConversation) {+ if (enabled !== undefined) {+ mcpStore.updateServer(serverId, { enabled });+ }++ return;+ }++ // Clone to plain objects to avoid Proxy serialization issues with IndexedDB+ const currentOverrides = (this.host.activeConversation.mcpServerOverrides || []).map(+ (o: McpServerOverride) => ({+ enabled: o.enabled,+ serverId: o.serverId+ })+ );++ let newOverrides: McpServerOverride[];++ if (enabled === undefined) {+ newOverrides = currentOverrides.filter((o: McpServerOverride) => o.serverId !== serverId);+ } else {+ const existingIndex = currentOverrides.findIndex(+ (o: McpServerOverride) => o.serverId === serverId+ );++ if (existingIndex >= 0) {+ newOverrides = [...currentOverrides];+ newOverrides[existingIndex] = { enabled, serverId };+ } else {+ newOverrides = [...currentOverrides, { enabled, serverId }];+ }+ }++ await DatabaseService.updateConversation(this.host.activeConversation.id, {+ mcpServerOverrides: newOverrides.length > 0 ? newOverrides : undefined+ });++ this.host.applyConversationUpdate(this.host.activeConversation.id, {+ mcpServerOverrides: newOverrides.length > 0 ? newOverrides : undefined+ });+ }++ /**+ * Sets the reasoning effort for the active conversation.+ * If no conversation exists, stores the global default.+ * @param effort - The effort level ('default' | 'off' | 'low' | 'medium' | 'high' | 'max')+ */+ async setReasoningEffort(effort: ReasoningEffort): Promise<void> {+ if (!this.host.activeConversation) {+ this.pendingReasoningEffort = effort;+ saveReasoningEffortDefault(effort);++ return;+ }++ this.host.applyConversationUpdate(this.host.activeConversation.id, {+ reasoningEffort: effort+ });++ await DatabaseService.updateConversation(this.host.activeConversation.id, {+ reasoningEffort: effort+ });+ }++ /** Toggles MCP server enabled state for the active conversation. */+ async toggleMcpServerForChat(serverId: string): Promise<void> {+ const currentEnabled = this.isMcpServerEnabledForChat(serverId);++ await this.setMcpServerOverride(serverId, !currentEnabled);+ }++ /**+ * Resolve the default enabled value for a server: its own `enabled`+ * flag in `mcpServers`, so the global on/off state lives in one place.+ */+ private getDefaultOverride(serverId: string): McpServerOverride | undefined {+ const server = mcpStore.getServers().find((s) => s.id === serverId);++ if (!server) return undefined;++ return { enabled: server.enabled, serverId };+ }+}diff --git a/tools/ui/src/lib/stores/device.svelte.ts b/tools/ui/src/lib/stores/device.svelte.tsindex 08ce2f2054..42aaf45891 100644--- a/tools/ui/src/lib/stores/device.svelte.ts+++ b/tools/ui/src/lib/stores/device.svelte.ts@@ -34,11 +34,11 @@ class DeviceStore {readonly isIOSDevice: boolean = false;/** The Safari browser app on iOS, excluding other iOS browsers and WKWebViews. */readonly isIOSSafari: boolean = false;+ /** PWA standalone mode: the page was launched from the home screen icon. */+ isStandalone = $state(false);/** Any WKWebView context on iOS: in-app browsers, embedded web views, and the* third-party iOS browsers (all of which share the WKWebView engine). */readonly isWKWebView: boolean = false;- /** PWA standalone mode: the page was launched from the home screen icon. */- isStandalone = $state(false);/** OS color scheme preference; the user override lives in settingsStore. */readonly systemTheme = $state({ isDark: false });diff --git a/tools/ui/src/lib/stores/index.ts b/tools/ui/src/lib/stores/index.tsindex 1aea8a6dab..db227158f4 100644--- a/tools/ui/src/lib/stores/index.ts+++ b/tools/ui/src/lib/stores/index.ts@@ -18,34 +18,32 @@*/// CHAT / MESSAGING-export { chatStore } from './chat.svelte';+export { chatStore } from './chat/index.svelte';-export { draftMessagesStore } from './draft-messages.svelte';+export { draftMessagesStore } from './chat/drafts.svelte';++// CONTEXT STATS (active conversation context window usage)+export { contextStatsStore } from './chat/context-stats.svelte';// AGENTIC (multi-turn tool orchestration)-export { agenticStore } from './agentic.svelte';+export { agenticStore } from './agentic/index.svelte';// CONVERSATIONS-export { conversationsStore } from './conversations.svelte';--// CONTEXT STATS (active conversation context window usage)-export { contextStatsStore } from './context-stats.svelte';+export { conversationsStore } from './conversations/index.svelte';// MCP-export { mcpStore } from './mcp.svelte';--export { mcpResourceStore } from './mcp-resources.svelte';+export { mcpStore } from './mcp/index.svelte';// MODELS-export { modelsStore } from './models.svelte';+export { modelsStore } from './models/index.svelte';// SERVERexport { serverStore } from './server.svelte';// SETTINGS / UI PREFERENCES-export { settingsStore } from './settings.svelte';+export { settingsStore } from './settings/index.svelte';-export { settingsReferrer } from './settings-referrer.svelte';+export { settingsReferrer } from './settings/referrer.svelte';export { permissionsStore } from './permissions.svelte';diff --git a/tools/ui/src/lib/stores/init.ts b/tools/ui/src/lib/stores/init.tsindex 1faa803033..d52c34d0fe 100644--- a/tools/ui/src/lib/stores/init.ts+++ b/tools/ui/src/lib/stores/init.ts@@ -13,9 +13,9 @@*/// direct imports, not via the barrel, to avoid circular deps-import { conversationsStore } from './conversations.svelte';+import { conversationsStore } from './conversations/index.svelte';import { permissionsStore } from './permissions.svelte';-import { settingsStore } from './settings.svelte';+import { settingsStore } from './settings/index.svelte';import { toolsStore } from './tools.svelte';import { versionStore } from './version.svelte';import { browser } from '$app/environment';@@ -33,7 +33,7 @@ export function initStores(): Promise<void> {permissionsStore.initialize();toolsStore.initialize();void versionStore.initialize();- void conversationsStore.init();+ void conversationsStore.initialize();})();return startup;diff --git a/tools/ui/src/lib/stores/mcp/health.svelte.ts b/tools/ui/src/lib/stores/mcp/health.svelte.tsnew file mode 100644index 0000000000..fffa6ea92b--- /dev/null+++ b/tools/ui/src/lib/stores/mcp/health.svelte.ts@@ -0,0 +1,298 @@+/**+ * MCPHealthCheckManager - Health checks for MCP servers+ *+ * Owns per-server connectivity probes: connection reuse, capability+ * snapshots, and promotion of a successful check to an active connection.+ * Created and owned by mcpStore; the host owns the connection registry the+ * probes draw from and promote into.+ */++import { DEFAULT_MCP_CONFIG } from '$lib/constants';+import { HealthCheckStatus, MCPConnectionPhase, MCPLogLevel } from '$lib/enums';+import { MCPService } from '$lib/services/mcp.service';+import type {+ ClientCapabilities,+ HealthCheckParams,+ HealthCheckState,+ MCPCapabilitiesInfo,+ MCPConnection,+ MCPConnectionLog,+ MCPServerConfig,+ ServerCapabilities+} from '$lib/types';+import { detectMcpTransportFromUrl } from '$lib/utils';++// module-level so the timestamp is not flagged as reactive state by prefer-svelte-reactivity+function createConnectionErrorLog(message: string): MCPConnectionLog {+ return {+ level: MCPLogLevel.ERROR,+ message: `Connection failed: ${message}`,+ phase: MCPConnectionPhase.ERROR,+ timestamp: new Date()+ };+}++/**+ * The slice of mcpStore the probes drive. Kept narrow on purpose so the+ * probes cannot reach around the host's full surface; mcpStore implements+ * this structurally.+ */+export interface McpHealthHost {+ autoReconnect(serverName: string): Promise<void>;+ getExistingConnection(serverId: string): MCPConnection | undefined;+ getRequestTimeoutMs(): number;+ promoteHealthCheckToConnection(serverId: string, connection: MCPConnection): void;+ registerServerConfig(name: string, config: MCPServerConfig): void;+ removeConnection(serverId: string): void;+}++export class MCPHealthCheckManager {+ private _checks = $state<Record<string, HealthCheckState>>({});++ /** Raw per-server check states, for host-side capability scans. */+ get checks(): Record<string, HealthCheckState> {+ return this._checks;+ }++ clear(serverId: string): void {+ const { [serverId]: _removed, ...rest } = this._checks;++ this._checks = rest;+ }++ constructor(private host: McpHealthHost) {}++ getState(serverId: string): HealthCheckState {+ return this._checks[serverId] ?? { status: HealthCheckStatus.IDLE };+ }++ hasState(serverId: string): boolean {+ return serverId in this._checks && this._checks[serverId].status !== HealthCheckStatus.IDLE;+ }++ /**+ * Run a health check for a server.+ * If the server already has an active connection, reuses it instead of creating a new one.+ * If promoteToActive is true and server is enabled, the connection will be kept+ * and promoted to an active connection instead of being disconnected.+ */+ async run(server: HealthCheckParams, promoteToActive = false): Promise<void> {+ const existingConnection = this.host.getExistingConnection(server.id);++ if (existingConnection) {+ // Reuse existing connection - just refresh tools list+ try {+ const tools = await MCPService.listTools(existingConnection);+ const capabilities = this.buildCapabilitiesInfo(+ existingConnection.serverCapabilities,+ existingConnection.clientCapabilities+ );++ this.setState(server.id, {+ capabilities,+ connectionTimeMs: existingConnection.connectionTimeMs,+ instructions: existingConnection.instructions,+ logs: [],+ protocolVersion: existingConnection.protocolVersion,+ serverInfo: existingConnection.serverInfo,+ status: HealthCheckStatus.SUCCESS,+ tools: tools.map((tool) => ({+ description: tool.description,+ name: tool.name,+ title: tool.title+ })),+ transportType: existingConnection.transportType+ });++ return;+ } catch (error) {+ console.warn(+ `[MCPStore] Failed to reuse connection for ${server.id}, creating new one:`,+ error+ );+ // Connection may be stale, remove it and create new one+ this.host.removeConnection(server.id);+ }+ }++ const trimmedUrl = server.url.trim();+ const logs: MCPConnectionLog[] = [];++ let currentPhase: MCPConnectionPhase = MCPConnectionPhase.IDLE;++ if (!trimmedUrl) {+ this.setState(server.id, {+ logs: [],+ message: 'Please enter a server URL first.',+ status: HealthCheckStatus.ERROR+ });++ return;+ }++ this.setState(server.id, {+ logs: [],+ phase: MCPConnectionPhase.TRANSPORT_CREATING,+ status: HealthCheckStatus.CONNECTING+ });++ const timeoutMs = this.host.getRequestTimeoutMs();+ const headers = this.parseHeaders(server.headers);++ try {+ const serverConfig: MCPServerConfig = {+ handshakeTimeoutMs: DEFAULT_MCP_CONFIG.connectionTimeoutMs,+ headers,+ requestTimeoutMs: timeoutMs,+ transport: detectMcpTransportFromUrl(trimmedUrl),+ url: trimmedUrl,+ useProxy: server.useProxy+ };++ this.host.registerServerConfig(server.id, serverConfig);++ const connection = await MCPService.connect(+ server.id,+ serverConfig,+ DEFAULT_MCP_CONFIG.clientInfo,+ DEFAULT_MCP_CONFIG.capabilities,+ (phase, log) => {+ currentPhase = phase;+ logs.push(log);+ this.setState(server.id, {+ logs: [...logs],+ phase,+ status: HealthCheckStatus.CONNECTING+ });++ if (phase === MCPConnectionPhase.DISCONNECTED && promoteToActive) {+ console.log(+ `[MCPStore][${server.id}] Connection lost during health check, starting auto-reconnect`+ );+ this.host.autoReconnect(server.id);+ }+ }+ );+ const tools = connection.tools.map((tool) => ({+ description: tool.description,+ name: tool.name,+ title: tool.title+ }));+ const capabilities = this.buildCapabilitiesInfo(+ connection.serverCapabilities,+ connection.clientCapabilities+ );++ this.setState(server.id, {+ capabilities,+ connectionTimeMs: connection.connectionTimeMs,+ instructions: connection.instructions,+ logs,+ protocolVersion: connection.protocolVersion,+ serverInfo: connection.serverInfo,+ status: HealthCheckStatus.SUCCESS,+ tools,+ transportType: connection.transportType+ });++ if (promoteToActive && server.enabled) {+ this.host.promoteHealthCheckToConnection(server.id, connection);+ } else {+ await MCPService.disconnect(connection);+ }+ } catch (error) {+ const message = error instanceof Error ? error.message : 'Unknown error occurred';++ if (logs.at(-1)?.phase !== MCPConnectionPhase.ERROR) {+ logs.push(createConnectionErrorLog(message));+ }++ this.setState(server.id, {+ logs,+ message,+ phase: currentPhase,+ status: HealthCheckStatus.ERROR+ });+ }+ }++ async runForServers(+ servers: {+ id: string;+ enabled: boolean;+ url: string;+ headers?: string;+ }[],+ skipIfChecked = true,+ promoteToActive = false+ ): Promise<void> {+ const serversToCheck = skipIfChecked+ ? servers.filter((s) => !this.hasState(s.id) && s.url.trim())+ : servers.filter((s) => s.url.trim());++ if (serversToCheck.length === 0) {+ return;+ }++ const BATCH_SIZE = 5;++ for (let i = 0; i < serversToCheck.length; i += BATCH_SIZE) {+ const batch = serversToCheck.slice(i, i + BATCH_SIZE);++ await Promise.allSettled(batch.map((server) => this.run(server, promoteToActive)));+ }+ }++ /**+ * Builds capabilities info from server and client capabilities.+ */+ private buildCapabilitiesInfo(+ serverCaps?: ServerCapabilities,+ clientCaps?: ClientCapabilities+ ): MCPCapabilitiesInfo {+ return {+ client: {+ elicitation: clientCaps?.elicitation+ ? { form: !!clientCaps.elicitation.form, url: !!clientCaps.elicitation.url }+ : undefined,+ roots: clientCaps?.roots ? { listChanged: clientCaps.roots.listChanged } : undefined,+ sampling: !!clientCaps?.sampling,+ tasks: !!clientCaps?.tasks+ },+ server: {+ completions: !!serverCaps?.completions,+ logging: !!serverCaps?.logging,+ prompts: serverCaps?.prompts ? { listChanged: serverCaps.prompts.listChanged } : undefined,+ resources: serverCaps?.resources+ ? {+ listChanged: serverCaps.resources.listChanged,+ subscribe: serverCaps.resources.subscribe+ }+ : undefined,+ tasks: !!serverCaps?.tasks,+ tools: serverCaps?.tools ? { listChanged: serverCaps.tools.listChanged } : undefined+ }+ };+ }++ private parseHeaders(headersJson?: string): Record<string, string> | undefined {+ if (!headersJson?.trim()) {+ return undefined;+ }++ try {+ const parsed = JSON.parse(headersJson);++ if (typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed))+ return parsed as Record<string, string>;+ } catch {+ console.warn('[MCPStore] Failed to parse custom headers JSON:', headersJson);+ }++ return undefined;+ }++ private setState(serverId: string, state: HealthCheckState): void {+ this._checks = { ...this._checks, [serverId]: state };+ }+}diff --git a/tools/ui/src/lib/stores/mcp.svelte.ts b/tools/ui/src/lib/stores/mcp/index.svelte.tssimilarity index 67%rename from tools/ui/src/lib/stores/mcp.svelte.tsrename to tools/ui/src/lib/stores/mcp/index.svelte.tsindex 3e0cb8e1e3..ccd53bc9d2 100644--- a/tools/ui/src/lib/stores/mcp.svelte.ts+++ b/tools/ui/src/lib/stores/mcp/index.svelte.ts@@ -1,69 +1,38 @@/**- * mcpStore - Reactive State Store for MCP Operations+ * mcpStore - MCP host: server connections and tool operations*- * Implements the "Host" role in MCP architecture, coordinating multiple server- * connections and providing a unified interface for tool operations.- *- * **Architecture & Relationships:**- * - **MCPService**: Stateless protocol layer (transport, connect, callTool)- * - **mcpStore** (this): Reactive state + business logic- *- * **Key Responsibilities:**- * - Lifecycle management (initialize, shutdown)- * - Multi-server coordination- * - Tool name conflict detection and resolution- * - Automatic tool-to-server routing- * - Health checks- *- * MCP connection state and raw `Tool[]` per server are owned here; the- * OpenAI-compatible wire format for those tools is built in `toolsStore`- * (see {@link toolsStore.mcpEntries} / {@link toolsStore.getEnabledToolsForLLM}).- *- * @see MCPService in services/mcp.service.ts for protocol operations+ * Implements the MCP "Host" role, coordinating multiple server connections+ * and exposing a unified tool interface: lifecycle, name-conflict detection+ * and automatic tool-to-server routing. Owns connection state and raw+ * `Tool[]` per server; the OpenAI-compatible wire format is built in+ * toolsStore. Composes the health-check manager; uses MCPService for the+ * protocol layer.*/import type { ListChangedHandlers } from '@modelcontextprotocol/sdk/types.js';import { browser } from '$app/environment';import { SETTINGS_KEYS } from '$lib/constants';-import {- CACHE,- DEFAULT_MCP_CONFIG,- EXPECTED_THEMED_ICON_PAIR_COUNT,- MCP_ALLOWED_ICON_MIME_TYPES,- MCP_RECONNECT,- MCP_SERVER_ID_PREFIX-} from '$lib/constants';-import {- ColorMode,- HealthCheckStatus,- MCPConnectionPhase,- MCPLogLevel,- MCPRefType,- UrlProtocol-} from '$lib/enums';+import { CACHE, DEFAULT_MCP_CONFIG, MCP_RECONNECT, MCP_SERVER_ID_PREFIX } from '$lib/constants';+import { ColorMode, HealthCheckStatus, MCPConnectionPhase, MCPRefType } from '$lib/enums';import { MCPService } from '$lib/services/mcp.service';// direct imports between stores, not via the barrel, to avoid circular deps-import { mcpResourceStore } from '$lib/stores/mcp-resources.svelte';+import { MCPHealthCheckManager, type McpHealthHost } from '$lib/stores/mcp/health.svelte';+import { mcpResourceStore } from '$lib/stores/mcp/resources.svelte';import { serverStore } from '$lib/stores/server.svelte';-import { settingsStore } from '$lib/stores/settings.svelte';+import { settingsStore } from '$lib/stores/settings/index.svelte';import type {- ClientCapabilities,GetPromptResult,HealthCheckParams,HealthCheckState,- MCPCapabilitiesInfo,MCPClientConfig,MCPConnection,- MCPConnectionLog,MCPPromptInfo,MCPResourceAttachment,MCPResourceContent,- MCPResourceIcon,MCPServerConfig,MCPServerDisplayInfo,MCPServerSettingsEntry,MCPToolCall,- ServerCapabilities,ServerStatus,Tool,ToolExecutionResult@@ -72,541 +41,269 @@ import type { DatabaseMessageExtraMcpResource, McpServerOverride } from '$lib/tyimport type { SettingsConfigType } from '$lib/types/settings';import {detectMcpTransportFromUrl,- extractRootDomain,+ getMcpIconUrl,+ getMcpServerFaviconFallback,+ getMcpServerLabel,parseMcpServerSettings,uuid} from '$lib/utils';import { mode } from 'mode-watcher';-class MCPStore {- private _isInitializing = $state(false);+class MCPStore implements McpHealthHost {private _error = $state<string | null>(null);+ private _isInitializing = $state(false);private _toolCount = $state(0);- private _connectedServers = $state<string[]>([]);- private _healthChecks = $state<Record<string, HealthCheckState>>({});+ private activeFlowCount = 0;- private connections = new Map<string, MCPConnection>();- private toolsIndex = new Map<string, string>();- private serverConfigs = new Map<string, MCPServerConfig>(); // Store configs for reconnection- private reconnectingServers = new Set<string>(); // Guard against concurrent reconnectionsprivate configSignature: string | null = null;+ private connectedServers = $state<string[]>([]);+ private connections = new Map<string, MCPConnection>();+ // health checks: per-server connectivity probes with optional promotion to active connections+ private health = new MCPHealthCheckManager(this);private initPromise: Promise<boolean> | null = null;- private activeFlowCount = 0;-- get isProxyAvailable(): boolean {- return serverStore.props?.cors_proxy_enabled ?? false;- }-- /**- * Generates a unique server ID from an optional ID string or index.- */- #generateServerId(id: unknown, index: number): string {- if (typeof id === 'string' && id.trim()) {- return id.trim();- }-- return `${MCP_SERVER_ID_PREFIX}-${index + 1}`;- }-- /**- * Parses raw server settings from config into MCPServerSettingsEntry array.- */- #parseServerSettings(rawServers: unknown): MCPServerSettingsEntry[] {- if (!rawServers) {- return [];- }-- let parsed: unknown;-- if (typeof rawServers === 'string') {- const trimmed = rawServers.trim();-- if (!trimmed) {- return [];- }-- try {- parsed = JSON.parse(trimmed);- } catch (error) {- console.warn('[MCP] Failed to parse mcpServers JSON:', error);-- return [];- }- } else {- parsed = rawServers;- }-- if (!Array.isArray(parsed)) {- return [];- }-- return parsed.map((entry, index) => {- const url = typeof entry?.url === 'string' ? entry.url.trim() : '';- const headers = typeof entry?.headers === 'string' ? entry.headers.trim() : undefined;+ private reconnectingServers = new Set<string>(); // Guard against concurrent reconnections+ private serverConfigs = new Map<string, MCPServerConfig>(); // Store configs for reconnection+ private serversCache: { raw: unknown; servers: MCPServerSettingsEntry[] } | null = null;+ private toolsIndex = new Map<string, string>();- return {- displayName: (entry as { displayName?: string })?.displayName,- enabled: Boolean((entry as { enabled?: unknown })?.enabled),- headers: headers || undefined,- id: this.#generateServerId((entry as { id?: unknown })?.id, index),- name: (entry as { name?: string })?.name,- url,- useProxy: Boolean((entry as { useProxy?: unknown })?.useProxy)- } satisfies MCPServerSettingsEntry;- });+ get availableTools(): string[] {+ return Array.from(this.toolsIndex.keys());}- /**- * Request timeout in milliseconds, read live from the global setting- * so a change in Settings applies to every server immediately.- */- #requestTimeoutMs(): number {- const seconds =- Number(settingsStore.config.mcpRequestTimeoutSeconds) ||- DEFAULT_MCP_CONFIG.requestTimeoutSeconds;-- return Math.round(seconds * 1000);+ get connectedServerCount(): number {+ return this.connectedServers.length;}- /**- * Builds server configuration from a settings entry.- */- #buildServerConfig(- entry: MCPServerSettingsEntry,- connectionTimeoutMs = DEFAULT_MCP_CONFIG.connectionTimeoutMs- ): MCPServerConfig | undefined {- if (!entry?.url) {- return undefined;- }-- let headers: Record<string, string> | undefined;-- if (entry.headers) {- try {- const parsed = JSON.parse(entry.headers);-- if (typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed))- headers = parsed as Record<string, string>;- } catch {- console.warn('[MCP] Failed to parse custom headers JSON:', entry.headers);- }- }-- return {- handshakeTimeoutMs: connectionTimeoutMs,- headers,- requestTimeoutMs: this.#requestTimeoutMs(),- transport: detectMcpTransportFromUrl(entry.url),- url: entry.url,- useProxy: entry.useProxy- };+ get connectedServerNames(): string[] {+ return this.connectedServers;}- /**- * Checks if a server is enabled for a given chat.- * A per-chat override wins when present; a server without one resolves- * to its own `enabled` flag in `mcpServers`.- */- #checkServerEnabled(- server: MCPServerSettingsEntry,- perChatOverrides?: McpServerOverride[]- ): boolean {- // Per-chat overrides win when present; missing entries inherit the- // server's own `enabled` flag so partial override lists are not all- // treated as disabled.- const override = perChatOverrides?.find((o) => o.serverId === server.id);-- return override?.enabled ?? server.enabled;+ get error(): string | null {+ return this._error;}- /**- * Builds MCP client configuration from settings.- */- #buildMcpClientConfig(- cfg: SettingsConfigType,- perChatOverrides?: McpServerOverride[]- ): MCPClientConfig | undefined {- const rawServers = this.#parseServerSettings(cfg.mcpServers);-- if (!rawServers.length) {- return undefined;- }-- const servers: Record<string, MCPServerConfig> = {};-- for (const [index, entry] of rawServers.entries()) {- if (!this.#checkServerEnabled(entry, perChatOverrides)) continue;-- const normalized = this.#buildServerConfig(entry);-- if (normalized) servers[this.#generateServerId(entry.id, index)] = normalized;- }-- if (Object.keys(servers).length === 0) {- return undefined;- }+ get isEnabled(): boolean {+ const mcpConfig = this.buildMcpClientConfig(settingsStore.config);- return {- capabilities: DEFAULT_MCP_CONFIG.capabilities,- clientInfo: DEFAULT_MCP_CONFIG.clientInfo,- protocolVersion: DEFAULT_MCP_CONFIG.protocolVersion,- requestTimeoutMs: this.#requestTimeoutMs(),- servers- };+ return (+ mcpConfig !== null && mcpConfig !== undefined && Object.keys(mcpConfig.servers).length > 0+ );}- /**- * Builds capabilities info from server and client capabilities.- */- #buildCapabilitiesInfo(- serverCaps?: ServerCapabilities,- clientCaps?: ClientCapabilities- ): MCPCapabilitiesInfo {- return {- client: {- elicitation: clientCaps?.elicitation- ? { form: !!clientCaps.elicitation.form, url: !!clientCaps.elicitation.url }- : undefined,- roots: clientCaps?.roots ? { listChanged: clientCaps.roots.listChanged } : undefined,- sampling: !!clientCaps?.sampling,- tasks: !!clientCaps?.tasks- },- server: {- completions: !!serverCaps?.completions,- logging: !!serverCaps?.logging,- prompts: serverCaps?.prompts ? { listChanged: serverCaps.prompts.listChanged } : undefined,- resources: serverCaps?.resources- ? {- listChanged: serverCaps.resources.listChanged,- subscribe: serverCaps.resources.subscribe- }- : undefined,- tasks: !!serverCaps?.tasks,- tools: serverCaps?.tools ? { listChanged: serverCaps.tools.listChanged } : undefined- }- };+ get isInitialized(): boolean {+ return this.connections.size > 0;}get isInitializing(): boolean {return this._isInitializing;}- get isInitialized(): boolean {- return this.connections.size > 0;+ get isProxyAvailable(): boolean {+ return serverStore.props?.cors_proxy_enabled ?? false;}- get error(): string | null {- return this._error;+ /** Resource state, composed here so consumers have a single MCP scope. */+ get resources() {+ return mcpResourceStore;}get toolCount(): number {return this._toolCount;}- get connectedServerCount(): number {- return this._connectedServers.length;- }-- get connectedServerNames(): string[] {- return this._connectedServers;+ acquireConnection(): void {+ this.activeFlowCount++;}- get isEnabled(): boolean {- const mcpConfig = this.#buildMcpClientConfig(settingsStore.config);+ addServer(+ serverData: Omit<MCPServerSettingsEntry, 'id'> & { id?: string }+ ): MCPServerSettingsEntry {+ const servers = this.getServers();+ const newServer: MCPServerSettingsEntry = {+ displayName: serverData.displayName,+ enabled: serverData.enabled,+ headers: serverData.headers?.trim() || undefined,+ id: serverData.id || (uuid() ?? `server-${Date.now()}`),+ name: serverData.name,+ url: serverData.url.trim(),+ useProxy: serverData.useProxy+ };- return (- mcpConfig !== null && mcpConfig !== undefined && Object.keys(mcpConfig.servers).length > 0- );- }+ settingsStore.updateConfig(SETTINGS_KEYS.MCP_SERVERS, JSON.stringify([...servers, newServer]));- get availableTools(): string[] {- return Array.from(this.toolsIndex.keys());+ return newServer;}- private updateState(state: {- isInitializing?: boolean;- error?: string | null;- toolCount?: number;- connectedServers?: string[];- }): void {- if (state.isInitializing !== undefined) {- this._isInitializing = state.isInitializing;- }+ /**+ * Add a resource as attachment to chat context.+ * Automatically fetches content if not cached.+ */+ async attachResource(uri: string): Promise<MCPResourceAttachment | null> {+ const resourceInfo = mcpResourceStore.findResourceByUri(uri);- if (state.error !== undefined) {- this._error = state.error;- }+ if (!resourceInfo) {+ console.error(`[MCPStore] Resource not found: ${uri}`);- if (state.toolCount !== undefined) {- this._toolCount = state.toolCount;+ return null;}- if (state.connectedServers !== undefined) {- this._connectedServers = state.connectedServers;+ if (mcpResourceStore.isAttached(uri)) {+ return null;}- }- updateHealthCheck(serverId: string, state: HealthCheckState): void {- this._healthChecks = { ...this._healthChecks, [serverId]: state };- }-- getHealthCheckState(serverId: string): HealthCheckState {- return this._healthChecks[serverId] ?? { status: HealthCheckStatus.IDLE };- }-- hasHealthCheck(serverId: string): boolean {- return (- serverId in this._healthChecks &&- this._healthChecks[serverId].status !== HealthCheckStatus.IDLE- );- }-- clearHealthCheck(serverId: string): void {- const { [serverId]: _removed, ...rest } = this._healthChecks;+ const attachment = mcpResourceStore.addAttachment(resourceInfo);- this._healthChecks = rest;- }+ try {+ const content = await this.readResource(uri);- clearAllHealthChecks(): void {- this._healthChecks = {};- }+ if (content) {+ mcpResourceStore.updateAttachmentContent(attachment.id, content);+ } else {+ mcpResourceStore.updateAttachmentError(attachment.id, 'Failed to read resource');+ }+ } catch (error) {+ const message = error instanceof Error ? error.message : String(error);- clearError(): void {- this._error = null;- }+ mcpResourceStore.updateAttachmentError(attachment.id, message);+ }- getServers(): MCPServerSettingsEntry[] {- return parseMcpServerSettings(settingsStore.config.mcpServers);+ return mcpResourceStore.getAttachment(attachment.id) ?? null;}/**- * Get all active MCP connections.- * @returns Map of server names to connections+ * Auto-reconnect to a server with exponential backoff.+ * Continues indefinitely until successful.+ *+ * Race-condition safety: when the phase callback fires a DISCONNECTED event+ * while we are still inside this function (e.g., the server drops right after+ * a successful connect()), a naive inner `autoReconnect()` call would be+ * swallowed by the `reconnectingServers` guard, leaving the server+ * permanently disconnected once the outer call exits. We solve this by+ * deferring the new reconnection via the `needsReconnect` flag: the flag is+ * set inside the phase callback and honoured in the `finally` block after+ * the guard entry has been removed.*/- getConnections(): Map<string, MCPConnection> {- return this.connections;- }+ async autoReconnect(serverName: string): Promise<void> {+ // Guard against concurrent reconnections+ if (this.reconnectingServers.has(serverName)) {+ console.log(`[MCPStore][${serverName}] Reconnection already in progress, skipping`);- /**- * Resolves the raw label for a server: user-defined display name first,- * then server-reported title or name when the health check succeeded,- * then the configured name (admin baseline or legacy data), then URL.- */- #serverBaseLabel(server: MCPServerDisplayInfo): string {- if (server.displayName) return server.displayName;-- const healthState = this.getHealthCheckState(server.id);-- if (healthState?.status === HealthCheckStatus.SUCCESS)- return (- healthState.serverInfo?.title || healthState.serverInfo?.name || server.name || server.url- );-- return server.name || server.url;- }-- /**- * Returns the display label for a server, suffixed with a positional- * counter when several configured servers resolve to the same base label- * (e.g. two endpoints of the same host reporting an identical name).- * Numbering follows config order, so it is stable across renders.- */- getServerLabel(server: MCPServerDisplayInfo): string {- const label = this.#serverBaseLabel(server);- const twins = this.getServers().filter((s) => this.#serverBaseLabel(s) === label);-- if (twins.length < 2) return label;-- const position = twins.findIndex((s) => s.id === server.id);+ return;+ }- return position < 0 ? label : `${label} (${position + 1})`;- }+ const serverConfig = this.serverConfigs.get(serverName);- getServerById(serverId: string): MCPServerSettingsEntry | undefined {- return this.getServers().find((s) => s.id === serverId);- }+ if (!serverConfig) {+ console.error(`[MCPStore] No config found for ${serverName}, cannot reconnect`);- /**- * Get display name for an MCP server by its ID.- * Falls back to the server ID if server is not found.- */- getServerDisplayName(serverId: string): string {- const server = this.getServerById(serverId);+ return;+ }- return server ? this.getServerLabel(server) : serverId;- }+ this.reconnectingServers.add(serverName);+ let backoff = MCP_RECONNECT.INITIAL_DELAY;+ // Flag set by the phase callback when a DISCONNECTED event fires while+ // reconnectingServers still holds this server (see JSDoc above).+ let needsReconnect = false;- /**- * Validates that an icon URI uses a safe scheme (https: or data:).- */- #isValidIconUri(src: string): boolean {try {- if (src.startsWith(UrlProtocol.DATA)) return true;-- const url = new URL(src);-- return url.protocol === UrlProtocol.HTTPS;- } catch {- return false;- }- }-- /**- * Selects the best icon URL from an MCP icons array.- * Follows security guidelines from the MCP specification:- * - Only allows https: and data: URIs- * - Filters to supported MIME types- *- * Selection priority:- * 1. Icon matching the current color scheme (dark/light)- * 2. Universal icon (no theme specified); if exactly 2, assumes [0]=light, [1]=dark- * 3. First valid icon as last resort- */- #getMcpIconUrl(icons: MCPResourceIcon[] | undefined, isDark = false): string | null {- if (!icons?.length) return null;+ while (true) {+ await new Promise((resolve) => setTimeout(resolve, backoff));- const validIcons = icons.filter((icon) => {- if (!icon.src || !this.#isValidIconUri(icon.src)) return false;+ console.log(`[MCPStore][${serverName}] Auto-reconnecting...`);- if (icon.mimeType && !MCP_ALLOWED_ICON_MIME_TYPES.has(icon.mimeType)) return false;+ try {+ // Per-attempt timeout: reject if the server doesn't respond in time,+ // then fall through to backoff logic as with any other failure.+ const timeoutPromise = new Promise<never>((_, reject) =>+ setTimeout(+ () =>+ reject(+ new Error(+ `Reconnect attempt timed out after ${MCP_RECONNECT.ATTEMPT_TIMEOUT_MS}ms`+ )+ ),+ MCP_RECONNECT.ATTEMPT_TIMEOUT_MS+ )+ );- return true;- });+ needsReconnect = false;+ const listChangedHandlers = this.createListChangedHandlers(serverName);+ const connectPromise = MCPService.connect(+ serverName,+ serverConfig,+ DEFAULT_MCP_CONFIG.clientInfo,+ DEFAULT_MCP_CONFIG.capabilities,+ (phase) => {+ if (phase === MCPConnectionPhase.DISCONNECTED) {+ if (this.reconnectingServers.has(serverName)) {+ // Reconnect loop is active; defer to after it exits.+ needsReconnect = true;+ } else {+ console.log(+ `[MCPStore][${serverName}] Connection lost, restarting auto-reconnect`+ );+ this.autoReconnect(serverName);+ }+ }+ },+ listChangedHandlers+ );+ const connection = await Promise.race([connectPromise, timeoutPromise]);- if (validIcons.length === 0) return null;+ this.connections.set(serverName, connection);- const preferredTheme = isDark ? ColorMode.DARK : ColorMode.LIGHT;- // 1. Prefer icon explicitly matching the current color scheme- const themedIcon = validIcons.find((icon) => icon.theme === preferredTheme);+ // Rebuild tool index for this server+ this.indexServerTools(serverName, connection.tools);- if (themedIcon) return themedIcon.src;+ console.log(`[MCPStore][${serverName}] Reconnected successfully`);- // 2. Handle universal icons (no theme specified)- const universalIcons = validIcons.filter((icon) => !icon.theme);+ break;+ } catch (error) {+ console.warn(`[MCPStore][${serverName}] Reconnection failed:`, error);+ backoff = Math.min(backoff * MCP_RECONNECT.BACKOFF_MULTIPLIER, MCP_RECONNECT.MAX_DELAY);+ }+ }+ } finally {+ this.reconnectingServers.delete(serverName);- if (universalIcons.length === EXPECTED_THEMED_ICON_PAIR_COUNT) {- // Heuristic: two theme-less icons → assume [0] = light, [1] = dark- return universalIcons[isDark ? 1 : 0].src;+ // If the phase callback signalled a disconnect while this function held+ // the guard, kick off a fresh reconnect now that the guard is released.+ if (needsReconnect) {+ console.log(+ `[MCPStore][${serverName}] Deferred disconnect detected, restarting auto-reconnect`+ );+ this.autoReconnect(serverName);+ }}+ }- if (universalIcons.length > 0) {- return universalIcons[0].src;- }+ clearError(): void {+ this._error = null;+ }- // 3. Last resort: use opposite-theme icon- return validIcons[0].src;+ clearHealthCheck(serverId: string): void {+ this.health.clear(serverId);}/**- * Get icon URL for an MCP server by its ID.- * Returns the best icon from the MCP server's `icons` array- * (see MCP spec: spec.modelcontextprotocol.io).- * Returns null if no icon is available.+ * Clear all resource attachments.*/- getServerFavicon(serverId: string): string | null {- const server = this.getServerById(serverId);-- if (!server) {- return null;- }-- const isDark = mode.current === ColorMode.DARK;- const healthState = this.getHealthCheckState(serverId);-- if (healthState.status === HealthCheckStatus.SUCCESS && healthState.serverInfo?.icons) {- const mcpIconUrl = this.#getMcpIconUrl(healthState.serverInfo.icons, isDark);-- if (mcpIconUrl) {- return mcpIconUrl;- }- }-- return this.#getServerFaviconFallback(server.url);+ clearResourceAttachments(): void {+ mcpResourceStore.clearAttachments();}/**- * Construct a fallback favicon URL from the MCP server URL.- * e.g. https://mcp.example.com/sse -> https://example.com/favicon.ico+ * Convert current resource attachments to DatabaseMessageExtra[] and clear them.+ * Called during message send to persist resources with the user message.*/- #getServerFaviconFallback(serverUrl: string): string | null {- try {- const url = new URL(serverUrl);- const rootDomain = extractRootDomain(url);-- if (!rootDomain) return null;-- const origin = `${url.protocol}//${rootDomain}`;- const candidates = ['favicon.ico', 'favicon.png'];-- for (const path of candidates) {- const faviconUrl = `${origin}/${path}`;+ consumeResourceAttachmentsAsExtras(): DatabaseMessageExtraMcpResource[] {+ const extras = mcpResourceStore.toMessageExtras();- if (this.#isValidIconUri(faviconUrl)) {- return faviconUrl;- }- }- } catch {- // Invalid URL, return null+ if (extras.length > 0) {+ mcpResourceStore.clearAttachments();}- return null;- }-- addServer(- serverData: Omit<MCPServerSettingsEntry, 'id'> & { id?: string }- ): MCPServerSettingsEntry {- const servers = this.getServers();- const newServer: MCPServerSettingsEntry = {- displayName: serverData.displayName,- enabled: serverData.enabled,- headers: serverData.headers?.trim() || undefined,- id: serverData.id || (uuid() ?? `server-${Date.now()}`),- name: serverData.name,- url: serverData.url.trim(),- useProxy: serverData.useProxy- };-- settingsStore.updateConfig(SETTINGS_KEYS.MCP_SERVERS, JSON.stringify([...servers, newServer]));-- return newServer;- }-- updateServer(id: string, updates: Partial<MCPServerSettingsEntry>): void {- const servers = this.getServers();-- settingsStore.updateConfig(- SETTINGS_KEYS.MCP_SERVERS,- JSON.stringify(- servers.map((server) => (server.id === id ? { ...server, ...updates } : server))- )- );- }-- removeServer(id: string): void {- const servers = this.getServers();-- settingsStore.updateConfig(- SETTINGS_KEYS.MCP_SERVERS,- JSON.stringify(servers.filter((s) => s.id !== id))- );- this.clearHealthCheck(id);- }-- hasAvailableServers(): boolean {- return parseMcpServerSettings(settingsStore.config.mcpServers).some(- (s) => s.enabled && s.url.trim()- );- }- hasEnabledServers(perChatOverrides?: McpServerOverride[]): boolean {- return Boolean(this.#buildMcpClientConfig(settingsStore.config, perChatOverrides));- }-- getEnabledServersForConversation(- perChatOverrides?: McpServerOverride[]- ): MCPServerSettingsEntry[] {- return this.getServers().filter((server) => {- return this.#checkServerEnabled(server, perChatOverrides);- });+ return extras;}async ensureInitialized(perChatOverrides?: McpServerOverride[]): Promise<boolean> {@@ -614,7 +311,7 @@ class MCPStore {return false;}- const mcpConfig = this.#buildMcpClientConfig(settingsStore.config, perChatOverrides);+ const mcpConfig = this.buildMcpClientConfig(settingsStore.config, perChatOverrides);const signature = mcpConfig ? JSON.stringify(mcpConfig) : null;if (!signature) {@@ -636,403 +333,357 @@ class MCPStore {return this.initialize(signature, mcpConfig!);}- private async initialize(signature: string, mcpConfig: MCPClientConfig): Promise<boolean> {- this.updateState({ error: null, isInitializing: true });- this.configSignature = signature;+ async executeTool(toolCall: MCPToolCall, signal?: AbortSignal): Promise<ToolExecutionResult> {+ return this.executeToolByName(+ toolCall.function.name,+ this.parseToolArguments(toolCall.function.arguments),+ signal+ );+ }- const serverEntries = Object.entries(mcpConfig.servers);+ async executeToolByName(+ toolName: string,+ args: Record<string, unknown>,+ signal?: AbortSignal+ ): Promise<ToolExecutionResult> {+ const serverName = this.toolsIndex.get(toolName);- if (serverEntries.length === 0) {- this.updateState({ connectedServers: [], isInitializing: false, toolCount: 0 });+ if (!serverName) throw new Error(`Unknown tool: ${toolName}`);- return false;- }+ const connection = this.connections.get(serverName);- this.initPromise = this.doInitialize(signature, mcpConfig, serverEntries);+ if (!connection) throw new Error(`Server "${serverName}" is not connected`);- return this.initPromise;- }+ try {+ return await MCPService.callTool(connection, { arguments: args, name: toolName }, signal);+ } catch (error) {+ if (MCPService.isSessionExpiredError(error)) {+ await this.reconnectServer(serverName);- private async doInitialize(- signature: string,- mcpConfig: MCPClientConfig,- serverEntries: [string, MCPClientConfig['servers'][string]][]- ): Promise<boolean> {- const clientInfo = mcpConfig.clientInfo ?? DEFAULT_MCP_CONFIG.clientInfo;- const capabilities = mcpConfig.capabilities ?? DEFAULT_MCP_CONFIG.capabilities;- const results = await Promise.allSettled(- serverEntries.map(async ([name, serverConfig]) => {- // Store config for reconnection- this.serverConfigs.set(name, serverConfig);+ const newConnection = this.connections.get(serverName);- const listChangedHandlers = this.createListChangedHandlers(name);- const connection = await MCPService.connect(- name,- serverConfig,- clientInfo,- capabilities,- (phase) => {- // Handle WebSocket disconnection- if (phase === MCPConnectionPhase.DISCONNECTED) {- console.log(`[MCPStore][${name}] Connection lost, starting auto-reconnect`);- this.autoReconnect(name);- }- },- listChangedHandlers- );-- return { connection, name };- })- );+ if (!newConnection) throw new Error(`Failed to reconnect to "${serverName}"`);- if (this.configSignature !== signature) {- for (const result of results) {- if (result.status === 'fulfilled')- await MCPService.disconnect(result.value.connection).catch(console.warn);+ return MCPService.callTool(newConnection, { arguments: args, name: toolName }, signal);}- return false;+ throw error;}+ }- for (const result of results) {- if (result.status === 'fulfilled') {- const { connection, name } = result.value;+ /**+ * Fetch resources from all connected servers that support them.+ * Updates mcpResourceStore with the results.+ * @param forceRefresh - If true, bypass cache and fetch fresh data+ */+ async fetchAllResources(forceRefresh: boolean = false): Promise<void> {+ const serversWithResources = this.getServersWithResources();- this.connections.set(name, connection);+ if (serversWithResources.length === 0) {+ return;+ }- for (const tool of connection.tools) {- if (this.toolsIndex.has(tool.name))- console.warn(- `[MCPStore] Tool name conflict: "${tool.name}" exists in "${this.toolsIndex.get(tool.name)}" and "${name}". Using tool from "${name}".`- );+ // Check if we have cached resources and they're recent (unless force refresh)+ if (!forceRefresh) {+ const allServersCached = serversWithResources.every((serverName) => {+ const serverRes = mcpResourceStore.getServerResources(serverName);- this.toolsIndex.set(tool.name, name);+ if (!serverRes || !serverRes.lastFetched) {+ return false;}- } else {- console.error(`[MCPStore] Failed to connect:`, result.reason);- }- }- const successCount = this.connections.size;+ // Cache is valid for 5 minutes+ const age = Date.now() - serverRes.lastFetched.getTime();- if (successCount === 0 && serverEntries.length > 0) {- this.updateState({- connectedServers: [],- error: 'All MCP server connections failed',- isInitializing: false,- toolCount: 0+ return age < CACHE.DEFAULT_TTL_MS;});- this.initPromise = null;-- return false;- }-- this.updateState({- connectedServers: Array.from(this.connections.keys()),- error: null,- isInitializing: false,- toolCount: this.toolsIndex.size- });- this.initPromise = null;-- return true;- }- private createListChangedHandlers(serverName: string): ListChangedHandlers {- return {- prompts: {- onChanged: (error: Error | null) => {- if (error) {- console.warn(`[MCPStore][${serverName}] Prompts list changed error:`, error);+ if (allServersCached) {+ console.log('[MCPStore] Using cached resources');- return;- }- }- },- tools: {- onChanged: (error: Error | null, tools: Tool[] | null) => {- if (error) {- console.warn(`[MCPStore][${serverName}] Tools list changed error:`, error);+ return;+ }+ }- return;- }+ mcpResourceStore.setLoading(true);- this.handleToolsListChanged(serverName, tools ?? []);- }- }- };+ try {+ await Promise.all(+ serversWithResources.map((serverName) => this.fetchServerResources(serverName))+ );+ } finally {+ mcpResourceStore.setLoading(false);+ }}- private handleToolsListChanged(serverName: string, tools: Tool[]): void {+ /**+ * Fetch resources from a specific server.+ * Updates mcpResourceStore with the results.+ */+ async fetchServerResources(serverName: string): Promise<void> {const connection = this.connections.get(serverName);if (!connection) {+ console.warn(`[MCPStore] No connection found for server: ${serverName}`);+return;}- for (const [toolName, ownerServer] of this.toolsIndex.entries()) {- if (ownerServer === serverName) this.toolsIndex.delete(toolName);+ if (!MCPService.supportsResources(connection)) {+ return;}- connection.tools = tools;+ mcpResourceStore.setServerLoading(serverName, true);- for (const tool of tools) {- if (this.toolsIndex.has(tool.name))- console.warn(- `[MCPStore] Tool name conflict after list change: "${tool.name}" exists in "${this.toolsIndex.get(tool.name)}" and "${serverName}". Using tool from "${serverName}".`- );+ try {+ const [resources, templates] = await Promise.all([+ MCPService.listAllResources(connection),+ MCPService.listAllResourceTemplates(connection)+ ]);- this.toolsIndex.set(tool.name, serverName);- }- this.updateState({ toolCount: this.toolsIndex.size });- }+ mcpResourceStore.setServerResources(serverName, resources, templates);+ } catch (error) {+ const message = error instanceof Error ? error.message : String(error);- acquireConnection(): void {- this.activeFlowCount++;+ mcpResourceStore.setServerError(serverName, message);+ console.error(`[MCPStore][${serverName}] Failed to fetch resources:`, error);+ }}/**- * Release a connection reference.- * By default, keeps connections alive for reuse (shutdownIfUnused=false).- * MCP spec encourages long-lived sessions to avoid reconnection overhead.+ * Resolve which configured MCP server owns a given tool name. Looks at+ * active connections first (fast path), then falls back to per-server+ * health-check data so server-side MCP proxies (where llama-server+ * executes MCP tools but the browser does not hold a direct connection)+ * still resolve tool names to their owning server.*/- async releaseConnection(shutdownIfUnused = false): Promise<void> {- this.activeFlowCount = Math.max(0, this.activeFlowCount - 1);+ findServerForTool(toolName: string): string | undefined {+ const fromIndex = this.toolsIndex.get(toolName);- if (shutdownIfUnused && this.activeFlowCount === 0) {- await this.shutdown();+ if (fromIndex) return fromIndex;++ for (const server of this.getServers()) {+ const health = this.health.checks[server.id];++ if (!health || health.status !== HealthCheckStatus.SUCCESS) continue;++ if (health.tools.some((tool) => tool.name === toolName)) {+ return server.id;+ }}- }+ return undefined;+ }getActiveFlowCount(): number {return this.activeFlowCount;}- async shutdown(): Promise<void> {- if (this.initPromise) {- await this.initPromise.catch(() => {});- this.initPromise = null;- }+ async getAllPrompts(): Promise<MCPPromptInfo[]> {+ const results: MCPPromptInfo[] = [];- if (this.connections.size === 0) {- return;+ for (const [serverName, connection] of this.connections) {+ if (!connection.serverCapabilities?.prompts) continue;++ const prompts = await MCPService.listPrompts(connection);++ for (const prompt of prompts) {+ results.push({+ arguments: prompt.arguments?.map((arg) => ({+ description: arg.description,+ name: arg.name,+ required: arg.required+ })),+ description: prompt.description,+ name: prompt.name,+ serverName,+ title: prompt.title+ });+ }}- await Promise.all(- Array.from(this.connections.values()).map((conn) =>- MCPService.disconnect(conn).catch((error) =>- console.warn(`[MCPStore] Error disconnecting ${conn.serverName}:`, error)- )- )- );+ return results;+ }- this.connections.clear();- this.toolsIndex.clear();- this.serverConfigs.clear();- this.configSignature = null;- this.updateState({- connectedServers: [],- error: null,- isInitializing: false,- toolCount: 0+ /**+ * Get all active MCP connections.+ * @returns Map of server names to connections+ */+ getConnections(): Map<string, MCPConnection> {+ return this.connections;+ }++ getEnabledServersForConversation(+ perChatOverrides?: McpServerOverride[]+ ): MCPServerSettingsEntry[] {+ return this.getServers().filter((server) => {+ return this.checkServerEnabled(server, perChatOverrides);});}/**- * Immediately reconnect to a server by creating a fresh transport and session.- * Used when a session-expired error (HTTP 404) is detected during tool execution.- * Per MCP spec 2025-11-25: client MUST discard session ID and re-initialize.- *- * Unlike autoReconnect (which uses exponential backoff for connectivity issues),- * this performs a single immediate reconnection attempt since the server is known- * to be reachable (it responded with 404).+ * Check if a server already has an active connection that can be reused.+ * Returns the existing connection if available.*/- private async reconnectServer(serverName: string): Promise<void> {- const serverConfig = this.serverConfigs.get(serverName);+ getExistingConnection(serverId: string): MCPConnection | undefined {+ return this.connections.get(serverId);+ }- if (!serverConfig) {- throw new Error(`[MCPStore] No config found for ${serverName}, cannot reconnect`);+ /**+ * Get server instructions from health check results (for display before active connection).+ * Useful for showing instructions in settings UI.+ */+ getHealthCheckInstructions(): Array<{+ serverId: string;+ serverTitle?: string;+ instructions: string;+ }> {+ const results: Array<{ serverId: string; serverTitle?: string; instructions: string }> = [];++ for (const [serverId, state] of Object.entries(this.health.checks)) {+ if (state.status === HealthCheckStatus.SUCCESS && state.instructions) {+ results.push({+ instructions: state.instructions,+ serverId,+ serverTitle: state.serverInfo?.title || state.serverInfo?.name+ });+ }}- // Disconnect stale connection (clears old transport + session ID)- const oldConnection = this.connections.get(serverName);-- if (oldConnection) {- await MCPService.disconnect(oldConnection).catch(console.warn);- this.connections.delete(serverName);- }-- console.log(`[MCPStore][${serverName}] Session expired, reconnecting with fresh session...`);-- const listChangedHandlers = this.createListChangedHandlers(serverName);- const connection = await MCPService.connect(- serverName,- serverConfig,- DEFAULT_MCP_CONFIG.clientInfo,- DEFAULT_MCP_CONFIG.capabilities,- (phase) => {- if (phase === MCPConnectionPhase.DISCONNECTED) {- console.log(`[MCPStore][${serverName}] Connection lost, starting auto-reconnect`);- this.autoReconnect(serverName);- }- },- listChangedHandlers- );-- // Replace connection and rebuild tool index for this server- this.connections.set(serverName, connection);- for (const tool of connection.tools) {- this.toolsIndex.set(tool.name, serverName);- }-- console.log(`[MCPStore][${serverName}] Session recovered successfully`);- }+ return results;+ }/**- * Auto-reconnect to a server with exponential backoff.- * Continues indefinitely until successful.- *- * Race-condition safety: when the phase callback fires a DISCONNECTED event- * while we are still inside this function (e.g., the server drops right after- * a successful connect()), a naive inner `autoReconnect()` call would be- * swallowed by the `reconnectingServers` guard, leaving the server- * permanently disconnected once the outer call exits. We solve this by- * deferring the new reconnection via the `needsReconnect` flag: the flag is- * set inside the phase callback and honoured in the `finally` block after- * the guard entry has been removed.+ * Health checks live in MCPHealthCheckManager; these delegate so+ * consumers keep a single entry point.*/- private async autoReconnect(serverName: string): Promise<void> {- // Guard against concurrent reconnections- if (this.reconnectingServers.has(serverName)) {- console.log(`[MCPStore][${serverName}] Reconnection already in progress, skipping`);+ getHealthCheckState(serverId: string): HealthCheckState {+ return this.health.getState(serverId);+ }- return;- }+ async getPrompt(+ serverName: string,+ promptName: string,+ args?: Record<string, string>+ ): Promise<GetPromptResult> {+ const connection = this.connections.get(serverName);- const serverConfig = this.serverConfigs.get(serverName);+ if (!connection) throw new Error(`Server "${serverName}" not found for prompt "${promptName}"`);- if (!serverConfig) {- console.error(`[MCPStore] No config found for ${serverName}, cannot reconnect`);+ return MCPService.getPrompt(connection, promptName, args);+ }- return;- }+ async getPromptCompletions(+ serverName: string,+ promptName: string,+ argumentName: string,+ argumentValue: string+ ): Promise<{ values: string[]; total?: number; hasMore?: boolean } | null> {+ const connection = this.connections.get(serverName);- this.reconnectingServers.add(serverName);- let backoff = MCP_RECONNECT.INITIAL_DELAY;- // Flag set by the phase callback when a DISCONNECTED event fires while- // reconnectingServers still holds this server (see JSDoc above).- let needsReconnect = false;+ if (!connection) {+ console.warn(`[MCPStore] Server "${serverName}" is not connected`);- try {- while (true) {- await new Promise((resolve) => setTimeout(resolve, backoff));+ return null;+ }- console.log(`[MCPStore][${serverName}] Auto-reconnecting...`);+ if (!connection.serverCapabilities?.completions) {+ return null;+ }- try {- // Per-attempt timeout: reject if the server doesn't respond in time,- // then fall through to backoff logic as with any other failure.- const timeoutPromise = new Promise<never>((_, reject) =>- setTimeout(- () =>- reject(- new Error(- `Reconnect attempt timed out after ${MCP_RECONNECT.ATTEMPT_TIMEOUT_MS}ms`- )- ),- MCP_RECONNECT.ATTEMPT_TIMEOUT_MS- )- );+ return MCPService.complete(+ connection,+ { name: promptName, type: MCPRefType.PROMPT },+ { name: argumentName, value: argumentValue }+ );+ }- needsReconnect = false;- const listChangedHandlers = this.createListChangedHandlers(serverName);- const connectPromise = MCPService.connect(- serverName,- serverConfig,- DEFAULT_MCP_CONFIG.clientInfo,- DEFAULT_MCP_CONFIG.capabilities,- (phase) => {- if (phase === MCPConnectionPhase.DISCONNECTED) {- if (this.reconnectingServers.has(serverName)) {- // Reconnect loop is active; defer to after it exits.- needsReconnect = true;- } else {- console.log(- `[MCPStore][${serverName}] Connection lost, restarting auto-reconnect`- );- this.autoReconnect(serverName);- }- }- },- listChangedHandlers- );- const connection = await Promise.race([connectPromise, timeoutPromise]);+ /**+ * Request timeout in milliseconds, read live from the global setting+ * so a change in Settings applies to every server immediately.+ */+ getRequestTimeoutMs(): number {+ const seconds =+ Number(settingsStore.config.mcpRequestTimeoutSeconds) ||+ DEFAULT_MCP_CONFIG.requestTimeoutSeconds;- // Replace old connection with new one- this.connections.set(serverName, connection);+ return Math.round(seconds * 1000);+ }- // Rebuild tool index for this server- for (const tool of connection.tools) {- this.toolsIndex.set(tool.name, serverName);- }+ /**+ * Get completions for a resource template argument.+ * Uses the MCP Completion API with ref/resource.+ */+ async getResourceCompletions(+ serverName: string,+ uriTemplate: string,+ argumentName: string,+ argumentValue: string+ ): Promise<{ values: string[]; total?: number; hasMore?: boolean } | null> {+ const connection = this.connections.get(serverName);- console.log(`[MCPStore][${serverName}] Reconnected successfully`);+ if (!connection) {+ console.warn(`[MCPStore] Server "${serverName}" is not connected`);- break;- } catch (error) {- console.warn(`[MCPStore][${serverName}] Reconnection failed:`, error);- backoff = Math.min(backoff * MCP_RECONNECT.BACKOFF_MULTIPLIER, MCP_RECONNECT.MAX_DELAY);- }- }- } finally {- this.reconnectingServers.delete(serverName);+ return null;+ }- // If the phase callback signalled a disconnect while this function held- // the guard, kick off a fresh reconnect now that the guard is released.- if (needsReconnect) {- console.log(- `[MCPStore][${serverName}] Deferred disconnect detected, restarting auto-reconnect`- );- this.autoReconnect(serverName);- }+ if (!connection.serverCapabilities?.completions) {+ return null;}++ return MCPService.complete(+ connection,+ { type: MCPRefType.RESOURCE, uri: uriTemplate },+ { name: argumentName, value: argumentValue }+ );}- getToolNames(): string[] {- return Array.from(this.toolsIndex.keys());+ /**+ * Get formatted resource context for chat.+ */+ getResourceContextForChat(): string {+ return mcpResourceStore.formatAttachmentsForContext();}- hasTool(toolName: string): boolean {- return this.toolsIndex.has(toolName);+ getServerById(serverId: string): MCPServerSettingsEntry | undefined {+ return this.getServers().find((s) => s.id === serverId);}- getToolServer(toolName: string): string | undefined {- return this.toolsIndex.get(toolName);+ /**+ * Get display name for an MCP server by its ID.+ * Falls back to the server ID if server is not found.+ */+ getServerDisplayName(serverId: string): string {+ const server = this.getServerById(serverId);++ return server ? this.getServerLabel(server) : serverId;}/**- * Resolve which configured MCP server owns a given tool name. Looks at- * active connections first (fast path), then falls back to per-server- * health-check data so server-side MCP proxies (where llama-server- * executes MCP tools but the browser does not hold a direct connection)- * still resolve tool names to their owning server.+ * Get icon URL for an MCP server by its ID.+ * Returns the best icon from the MCP server's `icons` array+ * (see MCP spec: spec.modelcontextprotocol.io).+ * Returns null if no icon is available.*/- findServerForTool(toolName: string): string | undefined {- const fromIndex = this.toolsIndex.get(toolName);+ getServerFavicon(serverId: string): string | null {+ const server = this.getServerById(serverId);- if (fromIndex) return fromIndex;+ if (!server) {+ return null;+ }- for (const server of this.getServers()) {- const health = this._healthChecks[server.id];+ const isDark = mode.current === ColorMode.DARK;+ const healthState = this.health.getState(serverId);- if (!health || health.status !== HealthCheckStatus.SUCCESS) continue;+ if (healthState.status === HealthCheckStatus.SUCCESS && healthState.serverInfo?.icons) {+ const mcpIconUrl = getMcpIconUrl(healthState.serverInfo.icons, isDark);- if (health.tools.some((tool) => tool.name === toolName)) {- return server.id;+ if (mcpIconUrl) {+ return mcpIconUrl;}}- return undefined;+ return getMcpServerFaviconFallback(server.url);}/**@@ -1051,26 +702,126 @@ class MCPStore {return this.getServerFavicon(serverId);}- hasPromptsSupport(): boolean {- for (const connection of this.connections.values()) {- if (connection.serverCapabilities?.prompts) {- return true;+ /**+ * Get aggregated server instructions from all connected servers.+ * Returns an array of { serverName, serverTitle, instructions } objects.+ */+ getServerInstructions(): Array<{+ serverName: string;+ serverTitle?: string;+ instructions: string;+ }> {+ const results: Array<{ serverName: string; serverTitle?: string; instructions: string }> = [];++ for (const [serverName, connection] of this.connections) {+ if (connection.instructions) {+ results.push({+ instructions: connection.instructions,+ serverName,+ serverTitle: connection.serverInfo?.title || connection.serverInfo?.name+ });}}- return false;+ return results;}- /**- * Check if any enabled server with successful health check supports prompts.- * Uses health check state since servers may not have active connections until- * the user actually sends a message or uses prompts.- * @param perChatOverrides - Per-chat server overrides to filter by enabled servers.- * If provided (even empty array), only checks enabled servers.- * If undefined, falls back to each server's own `enabled` flag.- */- hasPromptsCapability(perChatOverrides?: McpServerOverride[]): boolean {- let enabledServerIds: Set<string>;+ getServerLabel(server: MCPServerDisplayInfo): string {+ return getMcpServerLabel(server, this.getServers(), this.health.checks);+ }++ getServers(): MCPServerSettingsEntry[] {+ const raw = settingsStore.config.mcpServers;++ // cache the parse: the config string rarely changes and getServers is+ // called from hot paths (per-tool display lookups, capability checks)+ if (this.serversCache && this.serversCache.raw === raw) {+ return this.serversCache.servers;+ }++ const servers = parseMcpServerSettings(raw);++ this.serversCache = { raw, servers };++ return servers;+ }++ getServersStatus(): ServerStatus[] {+ const statuses: ServerStatus[] = [];++ for (const [name, connection] of this.connections) {+ statuses.push({+ error: undefined,+ isConnected: true,+ name,+ toolCount: connection.tools.length+ });+ }++ return statuses;+ }++ /**+ * Get list of enabled servers that support resources.+ * Checks active connections first, then health check state as fallback.+ */+ getServersWithResources(): string[] {+ const enabledServerIds = new Set(+ this.getServers()+ .filter((s) => s.enabled)+ .map((s) => s.id)+ );+ const servers: string[] = [];++ for (const [name, connection] of this.connections) {+ if (!enabledServerIds.has(name)) continue;++ if (MCPService.supportsResources(connection) && !servers.includes(name)) {+ servers.push(name);+ }+ }++ // Also check health check states for servers not yet connected+ for (const [serverId, state] of Object.entries(this.health.checks)) {+ if (!enabledServerIds.has(serverId)) continue;++ if (+ !servers.includes(serverId) &&+ state.status === HealthCheckStatus.SUCCESS &&+ state.capabilities?.server?.resources !== undefined+ ) {+ servers.push(serverId);+ }+ }++ return servers;+ }++ getToolNames(): string[] {+ return Array.from(this.toolsIndex.keys());+ }++ getToolServer(toolName: string): string | undefined {+ return this.toolsIndex.get(toolName);+ }++ hasAvailableServers(): boolean {+ return parseMcpServerSettings(settingsStore.config.mcpServers).some(+ (s) => s.enabled && s.url.trim()+ );+ }++ hasEnabledServers(perChatOverrides?: McpServerOverride[]): boolean {+ return Boolean(this.buildMcpClientConfig(settingsStore.config, perChatOverrides));+ }++ /**+ * Check if any enabled server with successful health check supports prompts.+ * Uses health check state since servers may not have active connections until+ * the user actually sends a message or uses prompts.+ */+ hasPromptsCapability(perChatOverrides?: McpServerOverride[]): boolean {+ let enabledServerIds: Set<string>;if (perChatOverrides !== undefined) {enabledServerIds = new Set(perChatOverrides.filter((o) => o.enabled).map((o) => o.serverId));@@ -1086,7 +837,7 @@ class MCPStore {return false;}- for (const [serverId, state] of Object.entries(this._healthChecks)) {+ for (const [serverId, state] of Object.entries(this.health.checks)) {if (!enabledServerIds.has(serverId)) continue;if (@@ -1108,185 +859,134 @@ class MCPStore {return false;}- async getAllPrompts(): Promise<MCPPromptInfo[]> {- const results: MCPPromptInfo[] = [];-- for (const [serverName, connection] of this.connections) {- if (!connection.serverCapabilities?.prompts) continue;-- const prompts = await MCPService.listPrompts(connection);-- for (const prompt of prompts) {- results.push({- arguments: prompt.arguments?.map((arg) => ({- description: arg.description,- name: arg.name,- required: arg.required- })),- description: prompt.description,- name: prompt.name,- serverName,- title: prompt.title- });+ hasPromptsSupport(): boolean {+ for (const connection of this.connections.values()) {+ if (connection.serverCapabilities?.prompts) {+ return true;}}- return results;- }-- async getPrompt(- serverName: string,- promptName: string,- args?: Record<string, string>- ): Promise<GetPromptResult> {- const connection = this.connections.get(serverName);-- if (!connection) throw new Error(`Server "${serverName}" not found for prompt "${promptName}"`);-- return MCPService.getPrompt(connection, promptName, args);+ return false;}- async executeTool(toolCall: MCPToolCall, signal?: AbortSignal): Promise<ToolExecutionResult> {- const toolName = toolCall.function.name;- const serverName = this.toolsIndex.get(toolName);+ /**+ * Check if any enabled server with successful health check supports resources.+ * Uses health check state since servers may not have active connections until+ * the user actually sends a message or uses prompts.+ */+ hasResourcesCapability(perChatOverrides?: McpServerOverride[]): boolean {+ let enabledServerIds: Set<string>;- if (!serverName) throw new Error(`Unknown tool: ${toolName}`);+ if (perChatOverrides !== undefined) {+ enabledServerIds = new Set(perChatOverrides.filter((o) => o.enabled).map((o) => o.serverId));+ } else {+ enabledServerIds = new Set(+ this.getServers()+ .filter((s) => s.enabled)+ .map((s) => s.id)+ );+ }- const connection = this.connections.get(serverName);+ if (enabledServerIds.size === 0) {+ return false;+ }- if (!connection) throw new Error(`Server "${serverName}" is not connected`);+ for (const [serverId, state] of Object.entries(this.health.checks)) {+ if (!enabledServerIds.has(serverId)) continue;- const args = this.parseToolArguments(toolCall.function.arguments);+ if (+ state.status === HealthCheckStatus.SUCCESS &&+ state.capabilities?.server?.resources !== undefined+ ) {+ return true;+ }+ }- try {- return await MCPService.callTool(connection, { arguments: args, name: toolName }, signal);- } catch (error) {- // Session expired (server restarted) - reconnect and retry once- if (MCPService.isSessionExpiredError(error)) {- await this.reconnectServer(serverName);+ for (const [serverName, connection] of this.connections) {+ if (!enabledServerIds.has(serverName)) continue;- const newConnection = this.connections.get(serverName);+ if (MCPService.supportsResources(connection)) {+ return true;+ }+ }- if (!newConnection) throw new Error(`Failed to reconnect to "${serverName}"`);+ return false;+ }- return MCPService.callTool(newConnection, { arguments: args, name: toolName }, signal);+ /**+ * Check if any connected server has instructions.+ */+ hasServerInstructions(): boolean {+ for (const connection of this.connections.values()) {+ if (connection.instructions) {+ return true;}-- throw error;}++ return false;}- async executeToolByName(- toolName: string,- args: Record<string, unknown>,- signal?: AbortSignal- ): Promise<ToolExecutionResult> {- const serverName = this.toolsIndex.get(toolName);+ hasTool(toolName: string): boolean {+ return this.toolsIndex.has(toolName);+ }- if (!serverName) throw new Error(`Unknown tool: ${toolName}`);+ /**+ * Promote a health check connection to an active connection.+ * This avoids the need to reconnect when the server is needed for agentic flows.+ */+ promoteHealthCheckToConnection(serverId: string, connection: MCPConnection): void {+ this.indexServerTools(serverId, connection.tools);- const connection = this.connections.get(serverName);+ this.connections.set(serverId, connection);- if (!connection) throw new Error(`Server "${serverName}" is not connected`);+ this.updateState({+ connectedServers: Array.from(this.connections.keys()),+ toolCount: this.toolsIndex.size+ });+ }- try {- return await MCPService.callTool(connection, { arguments: args, name: toolName }, signal);- } catch (error) {- if (MCPService.isSessionExpiredError(error)) {- await this.reconnectServer(serverName);+ /**+ * Read resource content from a server.+ * Caches the result in mcpResourceStore.+ */+ async readResource(uri: string): Promise<MCPResourceContent[] | null> {+ const cached = mcpResourceStore.getCachedContent(uri);- const newConnection = this.connections.get(serverName);+ if (cached) {+ return cached.content;+ }- if (!newConnection) throw new Error(`Failed to reconnect to "${serverName}"`);+ // Find which server has this resource+ const serverName = mcpResourceStore.findServerForUri(uri);- return MCPService.callTool(newConnection, { arguments: args, name: toolName }, signal);- }+ if (!serverName) {+ console.error(`[MCPStore] No server found for resource URI: ${uri}`);- throw error;+ return null;}- }- private parseToolArguments(args: string | Record<string, unknown>): Record<string, unknown> {- if (typeof args === 'string') {- const trimmed = args.trim();+ const connection = this.connections.get(serverName);- if (trimmed === '') {- return {};- }+ if (!connection) {+ console.error(`[MCPStore] No connection found for server: ${serverName}`);- try {- const parsed = JSON.parse(trimmed);+ return null;+ }- if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed))- throw new Error(- `Tool arguments must be an object, got ${Array.isArray(parsed) ? 'array' : typeof parsed}`- );+ try {+ const result = await MCPService.readResource(connection, uri);+ const resourceInfo = mcpResourceStore.findResourceByUri(uri);- return parsed as Record<string, unknown>;- } catch (error) {- throw new Error(`Failed to parse tool arguments as JSON: ${(error as Error).message}`);+ if (resourceInfo) {+ mcpResourceStore.cacheResourceContent(resourceInfo, result.contents);}- }- if (typeof args === 'object' && args !== null && !Array.isArray(args)) {- return args;- }-- throw new Error(`Invalid tool arguments type: ${typeof args}`);- }-- async getPromptCompletions(- serverName: string,- promptName: string,- argumentName: string,- argumentValue: string- ): Promise<{ values: string[]; total?: number; hasMore?: boolean } | null> {- const connection = this.connections.get(serverName);-- if (!connection) {- console.warn(`[MCPStore] Server "${serverName}" is not connected`);-- return null;- }-- if (!connection.serverCapabilities?.completions) {- return null;- }-- return MCPService.complete(- connection,- { name: promptName, type: MCPRefType.PROMPT },- { name: argumentName, value: argumentValue }- );- }-- /**- * Get completions for a resource template argument.- * Uses the MCP Completion API with ref/resource.- */- async getResourceCompletions(- serverName: string,- uriTemplate: string,- argumentName: string,- argumentValue: string- ): Promise<{ values: string[]; total?: number; hasMore?: boolean } | null> {- const connection = this.connections.get(serverName);-- if (!connection) {- console.warn(`[MCPStore] Server "${serverName}" is not connected`);-- return null;- }+ return result.contents;+ } catch (error) {+ console.error(`[MCPStore] Failed to read resource ${uri}:`, error);- if (!connection.serverCapabilities?.completions) {return null;}-- return MCPService.complete(- connection,- { type: MCPRefType.RESOURCE, uri: uriTemplate },- { name: argumentName, value: argumentValue }- );}/**@@ -1313,21 +1013,51 @@ class MCPStore {}}- private parseHeaders(headersJson?: string): Record<string, string> | undefined {- if (!headersJson?.trim()) {- return undefined;- }+ /** Store a server config so auto-reconnect can rebuild the session. */+ registerServerConfig(name: string, config: MCPServerConfig): void {+ this.serverConfigs.set(name, config);+ }- try {- const parsed = JSON.parse(headersJson);+ /**+ * Release a connection reference.+ * By default, keeps connections alive for reuse (shutdownIfUnused=false).+ * MCP spec encourages long-lived sessions to avoid reconnection overhead.+ */+ async releaseConnection(shutdownIfUnused = false): Promise<void> {+ this.activeFlowCount = Math.max(0, this.activeFlowCount - 1);- if (typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed))- return parsed as Record<string, string>;- } catch {- console.warn('[MCPStore] Failed to parse custom headers JSON:', headersJson);+ if (shutdownIfUnused && this.activeFlowCount === 0) {+ await this.shutdown();}+ }- return undefined;+ /**+ * Drop a connection without disconnecting, e.g. when a health check finds+ * it stale and recreates it.+ */+ removeConnection(serverId: string): void {+ this.connections.delete(serverId);+ }++ /**+ * Remove a resource attachment from chat context.+ */+ removeResourceAttachment(attachmentId: string): void {+ mcpResourceStore.removeAttachment(attachmentId);+ }++ removeServer(id: string): void {+ const servers = this.getServers();++ settingsStore.updateConfig(+ SETTINGS_KEYS.MCP_SERVERS,+ JSON.stringify(servers.filter((s) => s.id !== id))+ );+ this.clearHealthCheck(id);+ }++ async runHealthCheck(server: HealthCheckParams, promoteToActive = false): Promise<void> {+ return this.health.run(server, promoteToActive);}async runHealthChecksForServers(@@ -1340,644 +1070,467 @@ class MCPStore {skipIfChecked = true,promoteToActive = false): Promise<void> {- const serversToCheck = skipIfChecked- ? servers.filter((s) => !this.hasHealthCheck(s.id) && s.url.trim())- : servers.filter((s) => s.url.trim());+ return this.health.runForServers(servers, skipIfChecked, promoteToActive);+ }- if (serversToCheck.length === 0) {- return;+ async shutdown(): Promise<void> {+ if (this.initPromise) {+ await this.initPromise.catch(() => {});+ this.initPromise = null;}- const BATCH_SIZE = 5;-- for (let i = 0; i < serversToCheck.length; i += BATCH_SIZE) {- const batch = serversToCheck.slice(i, i + BATCH_SIZE);-- await Promise.allSettled(batch.map((server) => this.runHealthCheck(server, promoteToActive)));+ if (this.connections.size === 0) {+ return;}- }- /**- * Check if a server already has an active connection that can be reused.- * Returns the existing connection if available.- */- getExistingConnection(serverId: string): MCPConnection | undefined {- return this.connections.get(serverId);+ await Promise.all(+ Array.from(this.connections.values()).map((conn) =>+ MCPService.disconnect(conn).catch((error) =>+ console.warn(`[MCPStore] Error disconnecting ${conn.serverName}:`, error)+ )+ )+ );++ this.connections.clear();+ this.toolsIndex.clear();+ this.serverConfigs.clear();+ this.configSignature = null;+ this.updateState({+ connectedServers: [],+ error: null,+ isInitializing: false,+ toolCount: 0+ });}/**- * Run a health check for a server.- * If the server already has an active connection, reuses it instead of creating a new one.- * If promoteToActive is true and server is enabled, the connection will be kept- * and promoted to an active connection instead of being disconnected.+ * Subscribe to resource updates.*/- async runHealthCheck(server: HealthCheckParams, promoteToActive = false): Promise<void> {- // Check if we already have an active connection for this server- const existingConnection = this.connections.get(server.id);-- if (existingConnection) {- // Reuse existing connection - just refresh tools list- try {- const tools = await MCPService.listTools(existingConnection);- const capabilities = this.#buildCapabilitiesInfo(- existingConnection.serverCapabilities,- existingConnection.clientCapabilities- );+ async subscribeToResource(uri: string): Promise<boolean> {+ const serverName = mcpResourceStore.findServerForUri(uri);- this.updateHealthCheck(server.id, {- capabilities,- connectionTimeMs: existingConnection.connectionTimeMs,- instructions: existingConnection.instructions,- logs: [],- protocolVersion: existingConnection.protocolVersion,- serverInfo: existingConnection.serverInfo,- status: HealthCheckStatus.SUCCESS,- tools: tools.map((tool) => ({- description: tool.description,- name: tool.name,- title: tool.title- })),- transportType: existingConnection.transportType- });+ if (!serverName) {+ console.error(`[MCPStore] No server found for resource URI: ${uri}`);- return;- } catch (error) {- console.warn(- `[MCPStore] Failed to reuse connection for ${server.id}, creating new one:`,- error- );- // Connection may be stale, remove it and create new one- this.connections.delete(server.id);- }+ return false;}- const trimmedUrl = server.url.trim();- const logs: MCPConnectionLog[] = [];-- let currentPhase: MCPConnectionPhase = MCPConnectionPhase.IDLE;+ const connection = this.connections.get(serverName);- if (!trimmedUrl) {- this.updateHealthCheck(server.id, {- logs: [],- message: 'Please enter a server URL first.',- status: HealthCheckStatus.ERROR- });+ if (!connection) {+ console.error(`[MCPStore] No connection found for server: ${serverName}`);- return;+ return false;}- this.updateHealthCheck(server.id, {- logs: [],- phase: MCPConnectionPhase.TRANSPORT_CREATING,- status: HealthCheckStatus.CONNECTING- });-- const timeoutMs = this.#requestTimeoutMs();- const headers = this.parseHeaders(server.headers);+ if (!MCPService.supportsResourceSubscriptions(connection)) {+ return false;+ }try {- const serverConfig: MCPServerConfig = {- handshakeTimeoutMs: DEFAULT_MCP_CONFIG.connectionTimeoutMs,- headers,- requestTimeoutMs: timeoutMs,- transport: detectMcpTransportFromUrl(trimmedUrl),- url: trimmedUrl,- useProxy: server.useProxy- };-- // Store config for reconnection- this.serverConfigs.set(server.id, serverConfig);-- const connection = await MCPService.connect(- server.id,- serverConfig,- DEFAULT_MCP_CONFIG.clientInfo,- DEFAULT_MCP_CONFIG.capabilities,- (phase, log) => {- currentPhase = phase;- logs.push(log);- this.updateHealthCheck(server.id, {- logs: [...logs],- phase,- status: HealthCheckStatus.CONNECTING- });-- // Handle WebSocket disconnection- if (phase === MCPConnectionPhase.DISCONNECTED && promoteToActive) {- console.log(- `[MCPStore][${server.id}] Connection lost during health check, starting auto-reconnect`- );- this.autoReconnect(server.id);- }- }- );- const tools = connection.tools.map((tool) => ({- description: tool.description,- name: tool.name,- title: tool.title- }));- const capabilities = this.#buildCapabilitiesInfo(- connection.serverCapabilities,- connection.clientCapabilities- );-- this.updateHealthCheck(server.id, {- capabilities,- connectionTimeMs: connection.connectionTimeMs,- instructions: connection.instructions,- logs,- protocolVersion: connection.protocolVersion,- serverInfo: connection.serverInfo,- status: HealthCheckStatus.SUCCESS,- tools,- transportType: connection.transportType- });+ await MCPService.subscribeResource(connection, uri);+ mcpResourceStore.addSubscription(uri, serverName);- // Promote to active connection or disconnect- if (promoteToActive && server.enabled) {- this.promoteHealthCheckToConnection(server.id, connection);- } else {- await MCPService.disconnect(connection);- }+ return true;} catch (error) {- const message = error instanceof Error ? error.message : 'Unknown error occurred';-- if (logs.at(-1)?.phase !== MCPConnectionPhase.ERROR) {- logs.push({- level: MCPLogLevel.ERROR,- message: `Connection failed: ${message}`,- phase: MCPConnectionPhase.ERROR,- timestamp: new Date()- });- }+ console.error(`[MCPStore] Failed to subscribe to resource ${uri}:`, error);- this.updateHealthCheck(server.id, {- logs,- message,- phase: currentPhase,- status: HealthCheckStatus.ERROR- });+ return false;}}/**- * Promote a health check connection to an active connection.- * This avoids the need to reconnect when the server is needed for agentic flows.+ * Unsubscribe from resource updates.*/- private promoteHealthCheckToConnection(serverId: string, connection: MCPConnection): void {- // Register tools from the connection- for (const tool of connection.tools) {- if (this.toolsIndex.has(tool.name)) {- console.warn(- `[MCPStore] Tool name conflict during promotion: "${tool.name}" exists in "${this.toolsIndex.get(tool.name)}" and "${serverId}". Using tool from "${serverId}".`- );- }-- this.toolsIndex.set(tool.name, serverId);- }-- // Add to active connections- this.connections.set(serverId, connection);-- // Update state- this.updateState({- connectedServers: Array.from(this.connections.keys()),- toolCount: this.toolsIndex.size- });- }+ async unsubscribeFromResource(uri: string): Promise<boolean> {+ const serverName = mcpResourceStore.findServerForUri(uri);- getServersStatus(): ServerStatus[] {- const statuses: ServerStatus[] = [];+ if (!serverName) {+ console.error(`[MCPStore] No server found for resource URI: ${uri}`);- for (const [name, connection] of this.connections) {- statuses.push({- error: undefined,- isConnected: true,- name,- toolCount: connection.tools.length- });+ return false;}- return statuses;- }+ const connection = this.connections.get(serverName);- /**- * Get aggregated server instructions from all connected servers.- * Returns an array of { serverName, serverTitle, instructions } objects.- */- getServerInstructions(): Array<{- serverName: string;- serverTitle?: string;- instructions: string;- }> {- const results: Array<{ serverName: string; serverTitle?: string; instructions: string }> = [];+ if (!connection) {+ console.error(`[MCPStore] No connection found for server: ${serverName}`);- for (const [serverName, connection] of this.connections) {- if (connection.instructions) {- results.push({- instructions: connection.instructions,- serverName,- serverTitle: connection.serverInfo?.title || connection.serverInfo?.name- });- }+ return false;}- return results;- }+ try {+ await MCPService.unsubscribeResource(connection, uri);+ mcpResourceStore.removeSubscription(uri);- /**- * Get server instructions from health check results (for display before active connection).- * Useful for showing instructions in settings UI.- */- getHealthCheckInstructions(): Array<{- serverId: string;- serverTitle?: string;- instructions: string;- }> {- const results: Array<{ serverId: string; serverTitle?: string; instructions: string }> = [];+ return true;+ } catch (error) {+ console.error(`[MCPStore] Failed to unsubscribe from resource ${uri}:`, error);- for (const [serverId, state] of Object.entries(this._healthChecks)) {- if (state.status === HealthCheckStatus.SUCCESS && state.instructions) {- results.push({- instructions: state.instructions,- serverId,- serverTitle: state.serverInfo?.title || state.serverInfo?.name- });- }+ return false;}-- return results;}- /**- * Check if any connected server has instructions.- */- hasServerInstructions(): boolean {- for (const connection of this.connections.values()) {- if (connection.instructions) {- return true;- }- }+ updateServer(id: string, updates: Partial<MCPServerSettingsEntry>): void {+ const servers = this.getServers();- return false;+ settingsStore.updateConfig(+ SETTINGS_KEYS.MCP_SERVERS,+ JSON.stringify(+ servers.map((server) => (server.id === id ? { ...server, ...updates } : server))+ )+ );}/**- *- *- * Resources Operations- *- *- */-- /**- * Check if any enabled server with successful health check supports resources.- * Uses health check state since servers may not have active connections until- * the user actually sends a message or uses prompts.- * @param perChatOverrides - Per-chat server overrides to filter by enabled servers.- * If provided (even empty array), only checks enabled servers.- * If undefined, falls back to each server's own `enabled` flag.+ * Builds MCP client configuration from settings.*/- hasResourcesCapability(perChatOverrides?: McpServerOverride[]): boolean {- let enabledServerIds: Set<string>;-- if (perChatOverrides !== undefined) {- enabledServerIds = new Set(perChatOverrides.filter((o) => o.enabled).map((o) => o.serverId));- } else {- enabledServerIds = new Set(- this.getServers()- .filter((s) => s.enabled)- .map((s) => s.id)- );- }-- if (enabledServerIds.size === 0) {- return false;- }-- for (const [serverId, state] of Object.entries(this._healthChecks)) {- if (!enabledServerIds.has(serverId)) continue;-- if (- state.status === HealthCheckStatus.SUCCESS &&- state.capabilities?.server?.resources !== undefined- ) {- return true;- }- }-- for (const [serverName, connection] of this.connections) {- if (!enabledServerIds.has(serverName)) continue;+ private buildMcpClientConfig(+ cfg: SettingsConfigType,+ perChatOverrides?: McpServerOverride[]+ ): MCPClientConfig | undefined {+ const rawServers = parseMcpServerSettings(cfg.mcpServers);- if (MCPService.supportsResources(connection)) {- return true;- }+ if (!rawServers.length) {+ return undefined;}- return false;- }+ const servers: Record<string, MCPServerConfig> = {};- /**- * Get list of enabled servers that support resources.- * Checks active connections first, then health check state as fallback.- */- getServersWithResources(): string[] {- const enabledServerIds = new Set(- this.getServers()- .filter((s) => s.enabled)- .map((s) => s.id)- );- const servers: string[] = [];+ for (const [index, entry] of rawServers.entries()) {+ if (!this.checkServerEnabled(entry, perChatOverrides)) continue;- // Check active connections- for (const [name, connection] of this.connections) {- if (!enabledServerIds.has(name)) continue;+ const normalized = this.buildServerConfig(entry);- if (MCPService.supportsResources(connection) && !servers.includes(name)) {- servers.push(name);- }+ if (normalized) servers[this.generateServerId(entry.id, index)] = normalized;}- // Also check health check states for servers not yet connected- for (const [serverId, state] of Object.entries(this._healthChecks)) {- if (!enabledServerIds.has(serverId)) continue;-- if (- !servers.includes(serverId) &&- state.status === HealthCheckStatus.SUCCESS &&- state.capabilities?.server?.resources !== undefined- ) {- servers.push(serverId);- }+ if (Object.keys(servers).length === 0) {+ return undefined;}- return servers;+ return {+ capabilities: DEFAULT_MCP_CONFIG.capabilities,+ clientInfo: DEFAULT_MCP_CONFIG.clientInfo,+ protocolVersion: DEFAULT_MCP_CONFIG.protocolVersion,+ requestTimeoutMs: this.getRequestTimeoutMs(),+ servers+ };}/**- * Fetch resources from all connected servers that support them.- * Updates mcpResourceStore with the results.- * @param forceRefresh - If true, bypass cache and fetch fresh data+ * Builds server configuration from a settings entry.*/- async fetchAllResources(forceRefresh: boolean = false): Promise<void> {- const serversWithResources = this.getServersWithResources();-- if (serversWithResources.length === 0) {- return;+ private buildServerConfig(+ entry: MCPServerSettingsEntry,+ connectionTimeoutMs = DEFAULT_MCP_CONFIG.connectionTimeoutMs+ ): MCPServerConfig | undefined {+ if (!entry?.url) {+ return undefined;}- // Check if we have cached resources and they're recent (unless force refresh)- if (!forceRefresh) {- const allServersCached = serversWithResources.every((serverName) => {- const serverRes = mcpResourceStore.getServerResources(serverName);-- if (!serverRes || !serverRes.lastFetched) {- return false;- }-- // Cache is valid for 5 minutes- const age = Date.now() - serverRes.lastFetched.getTime();-- return age < CACHE.DEFAULT_TTL_MS;- });+ let headers: Record<string, string> | undefined;- if (allServersCached) {- console.log('[MCPStore] Using cached resources');+ if (entry.headers) {+ try {+ const parsed = JSON.parse(entry.headers);- return;+ if (typeof parsed === 'object' && parsed !== null && !Array.isArray(parsed))+ headers = parsed as Record<string, string>;+ } catch {+ console.warn('[MCP] Failed to parse custom headers JSON:', entry.headers);}}- mcpResourceStore.setLoading(true);-- try {- await Promise.all(- serversWithResources.map((serverName) => this.fetchServerResources(serverName))- );- } finally {- mcpResourceStore.setLoading(false);- }+ return {+ handshakeTimeoutMs: connectionTimeoutMs,+ headers,+ requestTimeoutMs: this.getRequestTimeoutMs(),+ transport: detectMcpTransportFromUrl(entry.url),+ url: entry.url,+ useProxy: entry.useProxy+ };}/**- * Fetch resources from a specific server.- * Updates mcpResourceStore with the results.+ * Checks if a server is enabled for a given chat.+ * A per-chat override wins when present; a server without one resolves+ * to its own `enabled` flag in `mcpServers`.*/- async fetchServerResources(serverName: string): Promise<void> {- const connection = this.connections.get(serverName);-- if (!connection) {- console.warn(`[MCPStore] No connection found for server: ${serverName}`);-- return;- }+ private checkServerEnabled(+ server: MCPServerSettingsEntry,+ perChatOverrides?: McpServerOverride[]+ ): boolean {+ const override = perChatOverrides?.find((o) => o.serverId === server.id);- if (!MCPService.supportsResources(connection)) {- return;- }+ return override?.enabled ?? server.enabled;+ }- mcpResourceStore.setServerLoading(serverName, true);+ private createListChangedHandlers(serverName: string): ListChangedHandlers {+ return {+ prompts: {+ onChanged: (error: Error | null) => {+ if (error) {+ console.warn(`[MCPStore][${serverName}] Prompts list changed error:`, error);- try {- const [resources, templates] = await Promise.all([- MCPService.listAllResources(connection),- MCPService.listAllResourceTemplates(connection)- ]);+ return;+ }+ }+ },+ tools: {+ onChanged: (error: Error | null, tools: Tool[] | null) => {+ if (error) {+ console.warn(`[MCPStore][${serverName}] Tools list changed error:`, error);- mcpResourceStore.setServerResources(serverName, resources, templates);- } catch (error) {- const message = error instanceof Error ? error.message : String(error);+ return;+ }- mcpResourceStore.setServerError(serverName, message);- console.error(`[MCPStore][${serverName}] Failed to fetch resources:`, error);- }+ this.handleToolsListChanged(serverName, tools ?? []);+ }+ }+ };}- /**- * Read resource content from a server.- * Caches the result in mcpResourceStore.- */- async readResource(uri: string): Promise<MCPResourceContent[] | null> {- // Check cache first- const cached = mcpResourceStore.getCachedContent(uri);+ private async doInitialize(+ signature: string,+ mcpConfig: MCPClientConfig,+ serverEntries: [string, MCPClientConfig['servers'][string]][]+ ): Promise<boolean> {+ const clientInfo = mcpConfig.clientInfo ?? DEFAULT_MCP_CONFIG.clientInfo;+ const capabilities = mcpConfig.capabilities ?? DEFAULT_MCP_CONFIG.capabilities;+ const results = await Promise.allSettled(+ serverEntries.map(async ([name, serverConfig]) => {+ this.serverConfigs.set(name, serverConfig);- if (cached) {- return cached.content;- }+ const listChangedHandlers = this.createListChangedHandlers(name);+ const connection = await MCPService.connect(+ name,+ serverConfig,+ clientInfo,+ capabilities,+ (phase) => {+ if (phase === MCPConnectionPhase.DISCONNECTED) {+ console.log(`[MCPStore][${name}] Connection lost, starting auto-reconnect`);+ this.autoReconnect(name);+ }+ },+ listChangedHandlers+ );- // Find which server has this resource- const serverName = mcpResourceStore.findServerForUri(uri);+ return { connection, name };+ })+ );- if (!serverName) {- console.error(`[MCPStore] No server found for resource URI: ${uri}`);+ if (this.configSignature !== signature) {+ for (const result of results) {+ if (result.status === 'fulfilled')+ await MCPService.disconnect(result.value.connection).catch(console.warn);+ }- return null;+ return false;}- const connection = this.connections.get(serverName);+ for (const result of results) {+ if (result.status === 'fulfilled') {+ const { connection, name } = result.value;- if (!connection) {- console.error(`[MCPStore] No connection found for server: ${serverName}`);+ this.connections.set(name, connection);- return null;+ this.indexServerTools(name, connection.tools);+ } else {+ console.error(`[MCPStore] Failed to connect:`, result.reason);+ }}- try {- const result = await MCPService.readResource(connection, uri);- const resourceInfo = mcpResourceStore.findResourceByUri(uri);-- if (resourceInfo) {- mcpResourceStore.cacheResourceContent(resourceInfo, result.contents);- }+ const successCount = this.connections.size;- return result.contents;- } catch (error) {- console.error(`[MCPStore] Failed to read resource ${uri}:`, error);+ if (successCount === 0 && serverEntries.length > 0) {+ this.updateState({+ connectedServers: [],+ error: 'All MCP server connections failed',+ isInitializing: false,+ toolCount: 0+ });+ this.initPromise = null;- return null;+ return false;}++ this.updateState({+ connectedServers: Array.from(this.connections.keys()),+ error: null,+ isInitializing: false,+ toolCount: this.toolsIndex.size+ });+ this.initPromise = null;++ return true;}/**- * Subscribe to resource updates.+ * Generates a unique server ID from an optional ID string or index.*/- async subscribeToResource(uri: string): Promise<boolean> {- const serverName = mcpResourceStore.findServerForUri(uri);-- if (!serverName) {- console.error(`[MCPStore] No server found for resource URI: ${uri}`);-- return false;+ private generateServerId(id: unknown, index: number): string {+ if (typeof id === 'string' && id.trim()) {+ return id.trim();}+ return `${MCP_SERVER_ID_PREFIX}-${index + 1}`;+ }++ private handleToolsListChanged(serverName: string, tools: Tool[]): void {const connection = this.connections.get(serverName);if (!connection) {- console.error(`[MCPStore] No connection found for server: ${serverName}`);-- return false;+ return;}- if (!MCPService.supportsResourceSubscriptions(connection)) {- return false;+ for (const [toolName, ownerServer] of this.toolsIndex.entries()) {+ if (ownerServer === serverName) this.toolsIndex.delete(toolName);}- try {- await MCPService.subscribeResource(connection, uri);- mcpResourceStore.addSubscription(uri, serverName);+ connection.tools = tools;- return true;- } catch (error) {- console.error(`[MCPStore] Failed to subscribe to resource ${uri}:`, error);+ for (const tool of tools) {+ if (this.toolsIndex.has(tool.name))+ console.warn(+ `[MCPStore] Tool name conflict after list change: "${tool.name}" exists in "${this.toolsIndex.get(tool.name)}" and "${serverName}". Using tool from "${serverName}".`+ );- return false;+ this.toolsIndex.set(tool.name, serverName);}+ this.updateState({ toolCount: this.toolsIndex.size });}/**- * Unsubscribe from resource updates.+ * Registers the tools exposed by a server into the global name->server index,+ * warning on conflicts. Shared by connect, reconnect and auto-reconnect.*/- async unsubscribeFromResource(uri: string): Promise<boolean> {- const serverName = mcpResourceStore.findServerForUri(uri);-- if (!serverName) {- console.error(`[MCPStore] No server found for resource URI: ${uri}`);+ private indexServerTools(serverName: string, tools: Tool[]): void {+ for (const tool of tools) {+ if (this.toolsIndex.has(tool.name))+ console.warn(+ `[MCPStore] Tool name conflict: "${tool.name}" exists in "${this.toolsIndex.get(tool.name)}" and "${serverName}". Using tool from "${serverName}".`+ );- return false;+ this.toolsIndex.set(tool.name, serverName);}+ }- const connection = this.connections.get(serverName);-- if (!connection) {- console.error(`[MCPStore] No connection found for server: ${serverName}`);-- return false;- }+ private async initialize(signature: string, mcpConfig: MCPClientConfig): Promise<boolean> {+ this.updateState({ error: null, isInitializing: true });+ this.configSignature = signature;- try {- await MCPService.unsubscribeResource(connection, uri);- mcpResourceStore.removeSubscription(uri);+ const serverEntries = Object.entries(mcpConfig.servers);- return true;- } catch (error) {- console.error(`[MCPStore] Failed to unsubscribe from resource ${uri}:`, error);+ if (serverEntries.length === 0) {+ this.updateState({ connectedServers: [], isInitializing: false, toolCount: 0 });return false;}- }- /**- * Add a resource as attachment to chat context.- * Automatically fetches content if not cached.- */- async attachResource(uri: string): Promise<MCPResourceAttachment | null> {- const resourceInfo = mcpResourceStore.findResourceByUri(uri);+ this.initPromise = this.doInitialize(signature, mcpConfig, serverEntries);- if (!resourceInfo) {- console.error(`[MCPStore] Resource not found: ${uri}`);+ return this.initPromise;+ }- return null;- }+ private parseToolArguments(args: string | Record<string, unknown>): Record<string, unknown> {+ if (typeof args === 'string') {+ const trimmed = args.trim();- // Check if already attached- if (mcpResourceStore.isAttached(uri)) {- return null;- }+ if (trimmed === '') {+ return {};+ }- // Add attachment (initially loading)- const attachment = mcpResourceStore.addAttachment(resourceInfo);+ try {+ const parsed = JSON.parse(trimmed);- // Fetch content- try {- const content = await this.readResource(uri);+ if (typeof parsed !== 'object' || parsed === null || Array.isArray(parsed))+ throw new Error(+ `Tool arguments must be an object, got ${Array.isArray(parsed) ? 'array' : typeof parsed}`+ );- if (content) {- mcpResourceStore.updateAttachmentContent(attachment.id, content);- } else {- mcpResourceStore.updateAttachmentError(attachment.id, 'Failed to read resource');+ return parsed as Record<string, unknown>;+ } catch (error) {+ throw new Error(`Failed to parse tool arguments as JSON: ${(error as Error).message}`);}- } catch (error) {- const message = error instanceof Error ? error.message : String(error);+ }- mcpResourceStore.updateAttachmentError(attachment.id, message);+ if (typeof args === 'object' && args !== null && !Array.isArray(args)) {+ return args;}- return mcpResourceStore.getAttachment(attachment.id) ?? null;+ throw new Error(`Invalid tool arguments type: ${typeof args}`);}/**- * Remove a resource attachment from chat context.+ * Immediately reconnect to a server by creating a fresh transport and session.+ * Used when a session-expired error (HTTP 404) is detected during tool execution.+ * Per MCP spec 2025-11-25: client MUST discard session ID and re-initialize.+ *+ * Unlike autoReconnect (which uses exponential backoff for connectivity issues),+ * this performs a single immediate reconnection attempt since the server is known+ * to be reachable (it responded with 404).*/- removeResourceAttachment(attachmentId: string): void {- mcpResourceStore.removeAttachment(attachmentId);- }+ private async reconnectServer(serverName: string): Promise<void> {+ const serverConfig = this.serverConfigs.get(serverName);- /**- * Clear all resource attachments.- */- clearResourceAttachments(): void {- mcpResourceStore.clearAttachments();- }+ if (!serverConfig) {+ throw new Error(`[MCPStore] No config found for ${serverName}, cannot reconnect`);+ }- /**- * Get formatted resource context for chat.- */- getResourceContextForChat(): string {- return mcpResourceStore.formatAttachmentsForContext();+ // Disconnect stale connection (clears old transport + session ID)+ const oldConnection = this.connections.get(serverName);++ if (oldConnection) {+ await MCPService.disconnect(oldConnection).catch(console.warn);+ this.connections.delete(serverName);+ }++ console.log(`[MCPStore][${serverName}] Session expired, reconnecting with fresh session...`);++ const listChangedHandlers = this.createListChangedHandlers(serverName);+ const connection = await MCPService.connect(+ serverName,+ serverConfig,+ DEFAULT_MCP_CONFIG.clientInfo,+ DEFAULT_MCP_CONFIG.capabilities,+ (phase) => {+ if (phase === MCPConnectionPhase.DISCONNECTED) {+ console.log(`[MCPStore][${serverName}] Connection lost, starting auto-reconnect`);+ this.autoReconnect(serverName);+ }+ },+ listChangedHandlers+ );++ this.connections.set(serverName, connection);+ this.indexServerTools(serverName, connection.tools);++ console.log(`[MCPStore][${serverName}] Session recovered successfully`);}- /**- * Convert current resource attachments to DatabaseMessageExtra[] and clear them.- * Called during message send to persist resources with the user message.- */- consumeResourceAttachmentsAsExtras(): DatabaseMessageExtraMcpResource[] {- const extras = mcpResourceStore.toMessageExtras();+ private updateState(state: {+ isInitializing?: boolean;+ error?: string | null;+ toolCount?: number;+ connectedServers?: string[];+ }): void {+ if (state.isInitializing !== undefined) {+ this._isInitializing = state.isInitializing;+ }- if (extras.length > 0) {- mcpResourceStore.clearAttachments();+ if (state.error !== undefined) {+ this._error = state.error;}- return extras;+ if (state.toolCount !== undefined) {+ this._toolCount = state.toolCount;+ }++ if (state.connectedServers !== undefined) {+ this.connectedServers = state.connectedServers;+ }}}diff --git a/tools/ui/src/lib/stores/mcp-resources.svelte.ts b/tools/ui/src/lib/stores/mcp/resources.svelte.tssimilarity index 96%rename from tools/ui/src/lib/stores/mcp-resources.svelte.tsrename to tools/ui/src/lib/stores/mcp/resources.svelte.tsindex b68def89f5..79ff2c2092 100644--- a/tools/ui/src/lib/stores/mcp-resources.svelte.ts+++ b/tools/ui/src/lib/stores/mcp/resources.svelte.ts@@ -38,32 +38,40 @@ function generateAttachmentId(): string {}class MCPResourceStore {- private _serverResources = $state<SvelteMap<string, MCPServerResources>>(new SvelteMap());- private _cachedResources = $state<SvelteMap<string, MCPCachedResource>>(new SvelteMap());- private _subscriptions = $state<SvelteMap<string, MCPResourceSubscription>>(new SvelteMap());private _attachments = $state<MCPResourceAttachment[]>([]);+ private _cachedResources = $state<SvelteMap<string, MCPCachedResource>>(new SvelteMap());private _isLoading = $state(false);+ private _serverResources = $state<SvelteMap<string, MCPServerResources>>(new SvelteMap());+ private _subscriptions = $state<SvelteMap<string, MCPResourceSubscription>>(new SvelteMap());- get serverResources(): Map<string, MCPServerResources> {- return this._serverResources;+ get attachmentCount(): number {+ return this._attachments.length;}- get cachedResources(): Map<string, MCPCachedResource> {- return this._cachedResources;+ get attachments(): MCPResourceAttachment[] {+ return this._attachments;}- get subscriptions(): Map<string, MCPResourceSubscription> {- return this._subscriptions;+ get cachedResources(): Map<string, MCPCachedResource> {+ return this._cachedResources;}- get attachments(): MCPResourceAttachment[] {- return this._attachments;+ get hasAttachments(): boolean {+ return this._attachments.length > 0;}get isLoading(): boolean {return this._isLoading;}+ get serverResources(): Map<string, MCPServerResources> {+ return this._serverResources;+ }++ get subscriptions(): Map<string, MCPResourceSubscription> {+ return this._subscriptions;+ }+get totalResourceCount(): number {let count = 0;@@ -84,134 +92,89 @@ class MCPResourceStore {return count;}- get attachmentCount(): number {- return this._attachments.length;- }-- get hasAttachments(): boolean {- return this._attachments.length > 0;- }-/**- *- *- * Server Resources Management- *- *+ * Add a resource attachment to the current chat context*/+ addAttachment(resource: MCPResourceInfo): MCPResourceAttachment {+ const attachment: MCPResourceAttachment = {+ id: generateAttachmentId(),+ loading: true,+ resource+ };++ this._attachments = [...this._attachments, attachment];+ console.log(`[MCPResources] Added attachment: ${resource.uri}`);++ return attachment;+ }/**- * Set resources for a server (called after listResources)+ * Register a subscription for a resource*/- setServerResources(- serverName: string,- resources: MCPResource[],- templates: MCPResourceTemplate[]- ): void {- this._serverResources.set(serverName, {- error: undefined,- lastFetched: new Date(),- loading: false,- resources,+ addSubscription(uri: string, serverName: string): void {+ this._subscriptions.set(uri, {serverName,- templates+ subscribedAt: new Date(),+ uri});- console.log(- `[MCPResources][${serverName}] Set ${resources.length} resources, ${templates.length} templates`- );- }- /**- * Set loading state for a server's resources- */- setServerLoading(serverName: string, loading: boolean): void {- const existing = this._serverResources.get(serverName);+ const cached = this._cachedResources.get(uri);- if (existing) {- this._serverResources.set(serverName, { ...existing, loading });- } else {- this._serverResources.set(serverName, {- error: undefined,- loading,- resources: [],- serverName,- templates: []- });+ if (cached) {+ this._cachedResources.set(uri, { ...cached, subscribed: true });}++ console.log(`[MCPResources] Added subscription: ${uri}`);}/**- * Set error state for a server's resources+ * Cache resource content after reading*/- setServerError(serverName: string, error: string): void {- const existing = this._serverResources.get(serverName);+ cacheResourceContent(resource: MCPResourceInfo, content: MCPResourceContent[]): void {+ // Enforce cache size limit+ if (this._cachedResources.size >= MCP_RESOURCE_CACHE.MAX_ENTRIES) {+ const oldestKey = this._cachedResources.keys().next().value;- if (existing) {- this._serverResources.set(serverName, { ...existing, error, loading: false });- } else {- this._serverResources.set(serverName, {- error,- loading: false,- resources: [],- serverName,- templates: []- });+ if (oldestKey) {+ this._cachedResources.delete(oldestKey);+ }}++ this._cachedResources.set(resource.uri, {+ content,+ fetchedAt: new Date(),+ resource,+ subscribed: this._subscriptions.has(resource.uri)+ });+ console.log(`[MCPResources] Cached content for: ${resource.uri}`);}/**- * Get resources for a specific server+ * Clear all state (e.g., on full reset)*/- getServerResources(serverName: string): MCPServerResources | undefined {- return this._serverResources.get(serverName);+ clear(): void {+ this._serverResources.clear();+ this._cachedResources.clear();+ this._subscriptions.clear();+ this._attachments = [];+ this._isLoading = false;+ console.log(`[MCPResources] Cleared all state`);}/**- * Get all resources as MCPResourceInfo array (flattened with server names)+ * Clear all attachments*/- getAllResourceInfos(): MCPResourceInfo[] {- const result: MCPResourceInfo[] = [];-- for (const [serverName, serverRes] of this._serverResources) {- for (const resource of serverRes.resources) {- result.push({- annotations: resource.annotations,- description: resource.description,- icons: resource.icons,- mimeType: resource.mimeType,- name: resource.name,- serverName,- title: resource.title,- uri: resource.uri- });- }- }-- return result;+ clearAttachments(): void {+ this._attachments = [];+ console.log(`[MCPResources] Cleared all attachments`);}/**- * Get all templates as MCPResourceTemplateInfo array (flattened with server names)+ * Clear all cached content*/- getAllTemplateInfos(): MCPResourceTemplateInfo[] {- const result: MCPResourceTemplateInfo[] = [];-- for (const [serverName, serverRes] of this._serverResources) {- for (const template of serverRes.templates) {- result.push({- annotations: template.annotations,- description: template.description,- icons: template.icons,- mimeType: template.mimeType,- name: template.name,- serverName,- title: template.title,- uriTemplate: template.uriTemplate- });- }- }-- return result;+ clearCache(): void {+ this._cachedResources.clear();+ console.log(`[MCPResources] Cleared all cached content`);}/**@@ -220,14 +183,12 @@ class MCPResourceStore {clearServerResources(serverName: string): void {this._serverResources.delete(serverName);- // Also clear cached content for this server's resourcesfor (const [uri, cached] of this._cachedResources) {if (cached.resource.serverName === serverName) {this._cachedResources.delete(uri);}}- // Clear subscriptions for this serverfor (const [uri, sub] of this._subscriptions) {if (sub.serverName === serverName) {this._subscriptions.delete(uri);@@ -238,152 +199,170 @@ class MCPResourceStore {}/**- *- *- * Resource Content Caching- *- *+ * Find resource info by URI across all servers*/+ findResourceByUri(uri: string): MCPResourceInfo | undefined {+ const normalizedUri = normalizeResourceUri(uri);- /**- * Cache resource content after reading- */- cacheResourceContent(resource: MCPResourceInfo, content: MCPResourceContent[]): void {- // Enforce cache size limit- if (this._cachedResources.size >= MCP_RESOURCE_CACHE.MAX_ENTRIES) {- // Remove oldest entry- const oldestKey = this._cachedResources.keys().next().value;+ for (const [serverName, serverRes] of this._serverResources) {+ const resource =+ serverRes.resources.find((r) => r.uri === uri) ??+ serverRes.resources.find((r) => normalizeResourceUri(r.uri) === normalizedUri);- if (oldestKey) {- this._cachedResources.delete(oldestKey);+ if (resource) {+ return {+ annotations: resource.annotations,+ description: resource.description,+ icons: resource.icons,+ mimeType: resource.mimeType,+ name: resource.name,+ serverName,+ title: resource.title,+ uri: resource.uri+ };}}- this._cachedResources.set(resource.uri, {- content,- fetchedAt: new Date(),- resource,- subscribed: this._subscriptions.has(resource.uri)- });- console.log(`[MCPResources] Cached content for: ${resource.uri}`);+ return undefined;}/**- * Get cached content for a resource+ * Find server name for a resource URI*/- getCachedContent(uri: string): MCPCachedResource | undefined {- const cached = this._cachedResources.get(uri);-- if (!cached) return undefined;-- // Check if cache is still valid- const age = Date.now() - cached.fetchedAt.getTime();-- if (age > MCP_RESOURCE_CACHE.TTL_MS && !cached.subscribed) {- // Cache expired and not subscribed, remove it- this._cachedResources.delete(uri);-- return undefined;+ findServerForUri(uri: string): string | undefined {+ for (const [serverName, serverRes] of this._serverResources) {+ if (serverRes.resources.some((r) => r.uri === uri)) {+ return serverName;+ }}- return cached;+ return undefined;}/**- * Invalidate cached content for a resource (e.g., on update notification)+ * Get resource content as text for chat context+ * Formats content for inclusion in LLM prompts*/- invalidateCache(uri: string): void {- this._cachedResources.delete(uri);- console.log(`[MCPResources] Invalidated cache for: ${uri}`);- }+ formatAttachmentsForContext(): string {+ if (this._attachments.length === 0) return '';- /**- * Clear all cached content- */- clearCache(): void {- this._cachedResources.clear();- console.log(`[MCPResources] Cleared all cached content`);- }+ const parts: string[] = [];- /**- *- *- * Subscriptions- *- *- */+ for (const attachment of this._attachments) {+ if (attachment.error) continue;- /**- * Register a subscription for a resource- */- addSubscription(uri: string, serverName: string): void {- this._subscriptions.set(uri, {- serverName,- subscribedAt: new Date(),- uri- });+ if (!attachment.content || attachment.content.length === 0) continue;- // Update cached resource if exists- const cached = this._cachedResources.get(uri);+ const resourceName = attachment.resource.title || attachment.resource.name;+ const serverName = attachment.resource.serverName;- if (cached) {- this._cachedResources.set(uri, { ...cached, subscribed: true });+ for (const content of attachment.content) {+ if ('text' in content && content.text) {+ parts.push(`\n\n--- Resource: ${resourceName} (from ${serverName}) ---\n${content.text}`);+ } else if ('blob' in content && content.blob) {+ // For binary content, just note it exists+ parts.push(+ `\n\n--- Resource: ${resourceName} (from ${serverName}) ---\n[${BINARY_CONTENT_LABEL}: ${content.mimeType || RESOURCE_UNKNOWN_TYPE}]`+ );+ }+ }}- console.log(`[MCPResources] Added subscription: ${uri}`);+ return parts.join('');}/**- * Remove a subscription for a resource+ * Get all resources as MCPResourceInfo array (flattened with server names)*/- removeSubscription(uri: string): void {- this._subscriptions.delete(uri);+ getAllResourceInfos(): MCPResourceInfo[] {+ const result: MCPResourceInfo[] = [];- // Update cached resource if exists- const cached = this._cachedResources.get(uri);+ for (const [serverName, serverRes] of this._serverResources) {+ for (const resource of serverRes.resources) {+ result.push({+ annotations: resource.annotations,+ description: resource.description,+ icons: resource.icons,+ mimeType: resource.mimeType,+ name: resource.name,+ serverName,+ title: resource.title,+ uri: resource.uri+ });+ }+ }- if (cached) {- this._cachedResources.set(uri, { ...cached, subscribed: false });+ return result;+ }++ /**+ * Get all templates as MCPResourceTemplateInfo array (flattened with server names)+ */+ getAllTemplateInfos(): MCPResourceTemplateInfo[] {+ const result: MCPResourceTemplateInfo[] = [];++ for (const [serverName, serverRes] of this._serverResources) {+ for (const template of serverRes.templates) {+ result.push({+ annotations: template.annotations,+ description: template.description,+ icons: template.icons,+ mimeType: template.mimeType,+ name: template.name,+ serverName,+ title: template.title,+ uriTemplate: template.uriTemplate+ });+ }}- console.log(`[MCPResources] Removed subscription: ${uri}`);+ return result;}/**- * Check if a resource is subscribed+ * Get attachment by ID*/- isSubscribed(uri: string): boolean {- return this._subscriptions.has(uri);+ getAttachment(attachmentId: string): MCPResourceAttachment | undefined {+ return this._attachments.find((att) => att.id === attachmentId);}/**- * Handle resource update notification+ * Get cached content for a resource*/- handleResourceUpdate(uri: string): void {- // Invalidate cache so next read gets fresh content- this.invalidateCache(uri);+ getCachedContent(uri: string): MCPCachedResource | undefined {+ const cached = this._cachedResources.get(uri);- // Update subscription last update time- const sub = this._subscriptions.get(uri);+ if (!cached) return undefined;- if (sub) {- this._subscriptions.set(uri, { ...sub, lastUpdate: new Date() });+ const age = Date.now() - cached.fetchedAt.getTime();++ if (age > MCP_RESOURCE_CACHE.TTL_MS && !cached.subscribed) {+ // Cache expired and not subscribed, remove it+ this._cachedResources.delete(uri);++ return undefined;}- console.log(`[MCPResources] Resource updated: ${uri}`);+ return cached;+ }++ /**+ * Get resources for a specific server+ */+ getServerResources(serverName: string): MCPServerResources | undefined {+ return this._serverResources.get(serverName);}/*** Handle resources list changed notification*/handleResourcesListChanged(serverName: string): void {- // Mark server resources as needing refreshconst existing = this._serverResources.get(serverName);if (existing) {this._serverResources.set(serverName, {...existing,- lastFetched: undefined // Mark as stale+ lastFetched: undefined});}@@ -399,60 +378,27 @@ class MCPResourceStore {*//**- * Add a resource attachment to the current chat context- */- addAttachment(resource: MCPResourceInfo): MCPResourceAttachment {- const attachment: MCPResourceAttachment = {- id: generateAttachmentId(),- loading: true,- resource- };-- this._attachments = [...this._attachments, attachment];- console.log(`[MCPResources] Added attachment: ${resource.uri}`);-- return attachment;- }-- /**- * Update attachment with fetched content+ * Handle resource update notification*/- updateAttachmentContent(attachmentId: string, content: MCPResourceContent[]): void {- this._attachments = this._attachments.map((att) =>- att.id === attachmentId ? { ...att, content, error: undefined, loading: false } : att- );- }+ handleResourceUpdate(uri: string): void {+ // Invalidate cache so next read gets fresh content+ this.invalidateCache(uri);- /**- * Update attachment with error- */- updateAttachmentError(attachmentId: string, error: string): void {- this._attachments = this._attachments.map((att) =>- att.id === attachmentId ? { ...att, error, loading: false } : att- );- }+ const sub = this._subscriptions.get(uri);- /**- * Remove an attachment- */- removeAttachment(attachmentId: string): void {- this._attachments = this._attachments.filter((att) => att.id !== attachmentId);- console.log(`[MCPResources] Removed attachment: ${attachmentId}`);- }+ if (sub) {+ this._subscriptions.set(uri, { ...sub, lastUpdate: new Date() });+ }- /**- * Clear all attachments- */- clearAttachments(): void {- this._attachments = [];- console.log(`[MCPResources] Cleared all attachments`);+ console.log(`[MCPResources] Resource updated: ${uri}`);}/**- * Get attachment by ID+ * Invalidate cached content for a resource (e.g., on update notification)*/- getAttachment(attachmentId: string): MCPResourceAttachment | undefined {- return this._attachments.find((att) => att.id === attachmentId);+ invalidateCache(uri: string): void {+ this._cachedResources.delete(uri);+ console.log(`[MCPResources] Invalidated cache for: ${uri}`);}/**@@ -467,103 +413,99 @@ class MCPResourceStore {}/**- *- *- * Utility Methods- *- *+ * Check if a resource is subscribed*/+ isSubscribed(uri: string): boolean {+ return this._subscriptions.has(uri);+ }/**- * Set global loading state+ * Remove an attachment*/- setLoading(loading: boolean): void {- this._isLoading = loading;+ removeAttachment(attachmentId: string): void {+ this._attachments = this._attachments.filter((att) => att.id !== attachmentId);+ console.log(`[MCPResources] Removed attachment: ${attachmentId}`);}/**- * Find resource info by URI across all servers+ * Remove a subscription for a resource*/- findResourceByUri(uri: string): MCPResourceInfo | undefined {- const normalizedUri = normalizeResourceUri(uri);+ removeSubscription(uri: string): void {+ this._subscriptions.delete(uri);- for (const [serverName, serverRes] of this._serverResources) {- const resource =- serverRes.resources.find((r) => r.uri === uri) ??- serverRes.resources.find((r) => normalizeResourceUri(r.uri) === normalizedUri);+ const cached = this._cachedResources.get(uri);- if (resource) {- return {- annotations: resource.annotations,- description: resource.description,- icons: resource.icons,- mimeType: resource.mimeType,- name: resource.name,- serverName,- title: resource.title,- uri: resource.uri- };- }+ if (cached) {+ this._cachedResources.set(uri, { ...cached, subscribed: false });}- return undefined;+ console.log(`[MCPResources] Removed subscription: ${uri}`);}/**- * Find server name for a resource URI+ * Set global loading state*/- findServerForUri(uri: string): string | undefined {- for (const [serverName, serverRes] of this._serverResources) {- if (serverRes.resources.some((r) => r.uri === uri)) {- return serverName;- }- }-- return undefined;+ setLoading(loading: boolean): void {+ this._isLoading = loading;}/**- * Clear all state (e.g., on full reset)+ * Set error state for a server's resources*/- clear(): void {- this._serverResources.clear();- this._cachedResources.clear();- this._subscriptions.clear();- this._attachments = [];- this._isLoading = false;- console.log(`[MCPResources] Cleared all state`);+ setServerError(serverName: string, error: string): void {+ const existing = this._serverResources.get(serverName);++ if (existing) {+ this._serverResources.set(serverName, { ...existing, error, loading: false });+ } else {+ this._serverResources.set(serverName, {+ error,+ loading: false,+ resources: [],+ serverName,+ templates: []+ });+ }}/**- * Get resource content as text for chat context- * Formats content for inclusion in LLM prompts+ * Set loading state for a server's resources*/- formatAttachmentsForContext(): string {- if (this._attachments.length === 0) return '';-- const parts: string[] = [];-- for (const attachment of this._attachments) {- if (attachment.error) continue;-- if (!attachment.content || attachment.content.length === 0) continue;-- const resourceName = attachment.resource.title || attachment.resource.name;- const serverName = attachment.resource.serverName;+ setServerLoading(serverName: string, loading: boolean): void {+ const existing = this._serverResources.get(serverName);- for (const content of attachment.content) {- if ('text' in content && content.text) {- parts.push(`\n\n--- Resource: ${resourceName} (from ${serverName}) ---\n${content.text}`);- } else if ('blob' in content && content.blob) {- // For binary content, just note it exists- parts.push(- `\n\n--- Resource: ${resourceName} (from ${serverName}) ---\n[${BINARY_CONTENT_LABEL}: ${content.mimeType || RESOURCE_UNKNOWN_TYPE}]`- );- }- }+ if (existing) {+ this._serverResources.set(serverName, { ...existing, loading });+ } else {+ this._serverResources.set(serverName, {+ error: undefined,+ loading,+ resources: [],+ serverName,+ templates: []+ });}+ }- return parts.join('');+ /**+ * Set resources for a server (called after listResources)+ */+ setServerResources(+ serverName: string,+ resources: MCPResource[],+ templates: MCPResourceTemplate[]+ ): void {+ this._serverResources.set(serverName, {+ error: undefined,+ lastFetched: new Date(),+ loading: false,+ resources,+ serverName,+ templates+ });+ console.log(+ `[MCPResources][${serverName}] Set ${resources.length} resources, ${templates.length} templates`+ );}/**@@ -605,6 +547,24 @@ class MCPResourceStore {return extras;}++ /**+ * Update attachment with fetched content+ */+ updateAttachmentContent(attachmentId: string, content: MCPResourceContent[]): void {+ this._attachments = this._attachments.map((att) =>+ att.id === attachmentId ? { ...att, content, error: undefined, loading: false } : att+ );+ }++ /**+ * Update attachment with error+ */+ updateAttachmentError(attachmentId: string, error: string): void {+ this._attachments = this._attachments.map((att) =>+ att.id === attachmentId ? { ...att, error, loading: false } : att+ );+ }}export const mcpResourceStore = new MCPResourceStore();diff --git a/tools/ui/src/lib/stores/models.svelte.ts b/tools/ui/src/lib/stores/models.svelte.tsdeleted file mode 100644index c741d144c4..0000000000--- a/tools/ui/src/lib/stores/models.svelte.ts+++ /dev/null@@ -1,1077 +0,0 @@-import { FAVORITE_MODELS_LOCALSTORAGE_KEY, MODEL_PROPS_CACHE } from '$lib/constants';-import {- FileTypeCategory,- ModelModality,- ServerModelsSseEventType,- ServerModelStatus-} from '$lib/enums';-import { ModelsService } from '$lib/services/models.service';-import { PropsService } from '$lib/services/props.service';-// direct imports between stores, not via the barrel, to avoid circular deps-import { conversationsStore } from '$lib/stores/conversations.svelte';-import { serverStore } from '$lib/stores/server.svelte';-// deep imports, not the '$lib/utils' barrel: it re-exports modules that reach back-// into the stores, and going through it here would read a half-built module-import { TTLCache } from '$lib/utils/cache-ttl';-import {- detectThinkingSupport,- detectThinkingSupportWithReason-} from '$lib/utils/chat-template-thinking-detector';-import { getConversationModel } from '$lib/utils/conversation-utils';-import { SvelteMap, SvelteSet } from 'svelte/reactivity';-import { toast } from 'svelte-sonner';--/**- * modelsStore - Reactive store for model management in both MODEL and ROUTER modes.- *- * **Architecture & Relationships:**- * - **ModelsService**: Stateless service for model API communication- * - **PropsService**: Stateless service for props/modalities fetching- * - **modelsStore** (this class): Reactive store for model state- * - **conversationsStore**: Tracks which conversations use which models- *- * **API Inconsistency Workaround:**- * In MODEL mode, `/props` returns modalities for the single model.- * In ROUTER mode, `/props` has no modalities — must use `/props?model=<id>` per model.- * This store normalizes this behavior so consumers don't need to know the server mode.- */-class ModelsStore {- /**- *- *- * State- *- *- */-- models = $state<ModelOption[]>([]);- routerModels = $state<ApiModelDataEntry[]>([]);- loading = $state(false);- updating = $state(false);- error = $state<string | null>(null);- selectedModelId = $state<string | null>(null);- selectedModelName = $state<string | null>(null);-- // Dedup concurrent fetch() callers — all awaiters share the same inflight promise.- // Without this, ?model=<name> URL handler races an in-progress fetch and sees an empty list.- private inflightFetch: Promise<void> | null = null;-- private modelUsage = $state<Map<string, SvelteSet<string>>>(new Map());- private modelLoadingStates = new SvelteMap<string, boolean>();-- // /models/sse feed state, the single source of truth for status and load progress- private statusAbort: AbortController | null = null;- private statusReaderActive = false;- private loadProgress = new SvelteMap<string, ModelLoadProgress>();- private statusWaiters = new Map<- string,- { target: ServerModelStatus; resolve: () => void; reject: (e: Error) => void }- >();-- favoriteModelIds = $state<Set<string>>(this.loadFavoritesFromStorage());-- /**- * Model-specific props cache with TTL.- * Key: modelId, Value: props data including modalities.- * TTL: 10 minutes — props don't change frequently.- */- private modelPropsCache = new TTLCache<string, ApiLlamaCppServerProps>({- maxEntries: MODEL_PROPS_CACHE.MAX_ENTRIES,- ttlMs: MODEL_PROPS_CACHE.TTL_MS- });- private modelPropsFetching = $state<Set<string>>(new Set());-- /**- * Version counter for props cache — used to trigger reactivity when props are updated.- */- propsCacheVersion = $state(0);-- /**- *- *- * Computed Getters- *- *- */-- get selectedModel(): ModelOption | null {- if (!this.selectedModelId) return null;-- return this.models.find((m) => m.id === this.selectedModelId) ?? null;- }-- get loadedModelIds(): string[] {- return this.routerModels- .filter(- (m) =>- m.status.value === ServerModelStatus.LOADED ||- m.status.value === ServerModelStatus.SLEEPING- )- .map((m) => m.id);- }-- get loadingModelIds(): string[] {- return Array.from(this.modelLoadingStates.entries())- .filter(([, loading]) => loading)- .map(([id]) => id);- }-- /**- * Get model name in MODEL mode (single model).- * Extracts from model_path or model_alias from server props.- * In ROUTER mode, returns null (model is per-conversation).- */- get singleModelName(): string | null {- if (serverStore.isRouterMode) return null;-- const props = serverStore.props;-- if (props?.model_alias) return props.model_alias;-- if (!props?.model_path) return null;-- return props.model_path.split(/(\\|\/)/).pop() || null;- }-- /**- * Model the active conversation view resolves to. Router mode: the user's- * selection first, then the conversation's own model. Otherwise the single- * served model, from the models list or the server props as a fallback.- */- get activeModelId(): string | null {- if (!serverStore.isRouterMode) {- return this.models.length > 0 ? this.models[0].model : this.singleModelName;- }-- if (this.selectedModelId) {- const selected = this.models.find((m) => m.id === this.selectedModelId);-- if (selected) return selected.model;- }-- const conversationModel = getConversationModel(conversationsStore.activeMessages);-- if (conversationModel) {- const model = this.models.find((m) => m.model === conversationModel);-- if (model) return model.model;- }-- return null;- }-- get selectedModelContextSize(): number | null {- if (!this.selectedModelName) return null;-- return this.getModelContextSize(this.selectedModelName);- }-- /**- *- *- * Modalities- *- *- */-- getModelModalities(modelId: string): ModelModalities | null {- if (!serverStore.isRouterMode && serverStore.props?.modalities) {- return this.buildModalities(serverStore.props.modalities);- }-- const model = this.models.find((m) => m.model === modelId || m.id === modelId);-- if (model?.modalities) {- return model.modalities;- }-- const props = this.modelPropsCache.get(modelId);-- if (props?.modalities) {- return this.buildModalities(props.modalities);- }-- return null;- }-- modelSupportsVision(modelId: string): boolean {- return this.getModelModalities(modelId)?.vision ?? false;- }-- modelSupportsAudio(modelId: string): boolean {- return this.getModelModalities(modelId)?.audio ?? false;- }-- modelSupportsVideo(modelId: string): boolean {- return this.getModelModalities(modelId)?.video ?? false;- }-- getModelModalitiesArray(modelId: string): ModelModality[] {- const modalities = this.getModelModalities(modelId);-- if (!modalities) return [];-- const result: ModelModality[] = [];-- if (modalities.vision) result.push(ModelModality.VISION);-- if (modalities.audio) result.push(ModelModality.AUDIO);-- if (modalities.video) result.push(ModelModality.VIDEO);-- return result;- }-- getModelProps(modelId: string): ApiLlamaCppServerProps | null {- return this.modelPropsCache.get(modelId);- }-- getModelContextSize(modelId: string): number | null {- const props = this.getModelProps(modelId);- const nCtx = props?.default_generation_settings?.n_ctx;-- return typeof nCtx === 'number' ? nCtx : null;- }-- isModelPropsFetching(modelId: string): boolean {- return this.modelPropsFetching.has(modelId);- }-- /**- *- *- * Status Queries- *- *- */-- isModelLoaded(modelId: string): boolean {- const model = this.routerModels.find((m) => m.id === modelId);-- return (- model?.status.value === ServerModelStatus.LOADED ||- model?.status.value === ServerModelStatus.SLEEPING- );- }-- isModelOperationInProgress(modelId: string): boolean {- return this.modelLoadingStates.get(modelId) ?? false;- }-- getModelStatus(modelId: string): ServerModelStatus | null {- const model = this.routerModels.find((m) => m.id === modelId);-- return model?.status.value ?? null;- }-- getModelUsage(modelId: string): SvelteSet<string> {- return this.modelUsage.get(modelId) ?? new SvelteSet<string>();- }-- isModelInUse(modelId: string): boolean {- const usage = this.modelUsage.get(modelId);-- return usage !== undefined && usage.size > 0;- }- //- // Thinking Support Detection- //-- /**- * Whether the selected model's chat template supports thinking/reasoning.- * Uses heuristic detection on the model's chat_template from /props.- *- * - MODEL mode: the global /props already describes the single loaded model,- * so its chat_template is used directly and no per-model cache is involved- * - ROUTER mode: fetches /props?model=<id> for the selected model (cached),- * triggering an async fetch if not yet cached- */- get supportsThinking(): boolean {- if (!serverStore.isRouterMode) {- return detectThinkingSupport(serverStore.props?.chat_template ?? '');- }-- const modelId = this.selectedModelName;-- if (!modelId) return false;-- if (!this.modelPropsCache.get(modelId)) {- this.fetchModelProps(modelId);- }-- const props = this.getModelProps(modelId);-- return detectThinkingSupport(props?.chat_template ?? '');- }-- /**- * Check if a specific model supports thinking.- * In MODEL mode the global /props describes the single loaded model.- * In ROUTER mode, fetches model props if not cached.- */- checkModelSupportsThinking(modelId: string): boolean {- if (!serverStore.isRouterMode) {- return detectThinkingSupport(serverStore.props?.chat_template ?? '');- }-- if (!modelId) return false;-- if (!this.modelPropsCache.get(modelId)) {- this.fetchModelProps(modelId);- }-- const props = this.getModelProps(modelId);-- return detectThinkingSupport(props?.chat_template ?? '');- }-- /**- * Detailed thinking support detection result with reason for debugging/UI.- */- get thinkingSupportDetails(): { supported: boolean; reason: string } {- if (!serverStore.isRouterMode) {- return detectThinkingSupportWithReason(serverStore.props?.chat_template ?? '');- }-- const modelId = this.selectedModelName;-- if (!modelId) {- return { reason: 'No model selected', supported: false };- }-- if (!this.modelPropsCache.get(modelId)) {- this.fetchModelProps(modelId);- }-- const props = this.getModelProps(modelId);-- return detectThinkingSupportWithReason(props?.chat_template ?? '');- }-- /**- *- *- * Data Fetching- *- *- */-- /**- * Fetch list of models from server and detect server role.- * Also fetches modalities for MODEL mode (single model).- */- async fetch(force = false): Promise<void> {- if (this.inflightFetch) return this.inflightFetch;-- if (this.models.length > 0 && !force) return;-- this.inflightFetch = this.runFetch();- try {- await this.inflightFetch;- } finally {- this.inflightFetch = null;- }- }-- private async runFetch(): Promise<void> {- this.loading = true;- this.error = null;-- try {- if (!serverStore.props) {- await serverStore.fetch();- }-- const router = serverStore.isRouterMode;-- if (router) {- const response = await ModelsService.listRouter();-- this.routerModels = response.data;- this.models = this.buildModelOptions(response);-- await this.fetchModalitiesForLoadedModels();-- const visible = this.getVisibleModels();-- if (visible.length === 1 && this.isModelLoaded(visible[0].model)) {- this.selectModelById(visible[0].id);- }- } else {- this.models = await this.fetchModelModeInternal();- }- } catch (error) {- this.models = [];- this.error = error instanceof Error ? error.message : 'Failed to load models';-- throw error;- } finally {- this.loading = false;- }- }-- /** Fetch models in MODEL mode (single model, standard OpenAI-compatible). */- private async fetchModelModeInternal(): Promise<ModelOption[]> {- const response = await ModelsService.list();-- return this.buildModelOptions(response);- }-- /**- * Build ModelOption[] from an API response.- * Both MODEL and ROUTER modes share the same mapping logic;- * they differ only in which endpoint is called.- */- private buildModelOptions(- response: ApiModelListResponse | ApiRouterModelsListResponse- ): ModelOption[] {- return response.data.map((item: ApiModelDataEntry, index: number) => {- const details = response.models?.[index];- const rawCapabilities = Array.isArray(details?.capabilities) ? details?.capabilities : [];- const displayNameSource =- details?.name && details.name.trim().length > 0 ? details.name : item.id;- const modelId = details?.model || item.id;-- return {- aliases: item.aliases ?? [],- capabilities: rawCapabilities.filter((value: unknown): value is string => Boolean(value)),- description: details?.description,- details: details?.details,- id: item.id,- meta: item.meta ?? null,- modalities: this.buildArchitectureModalities(item.architecture),- model: modelId,- name: this.toDisplayName(displayNameSource),- parsedId: ModelsService.parseModelId(modelId),- tags: item.tags ?? []- };- });- }-- /**- * Fetch router models with full metadata (ROUTER mode only).- * No-op in router mode — fetch() already calls listRouter() internally.- * Kept for API compatibility (e.g. handleOpenChange dropdown open handler).- */- async fetchRouterModels(): Promise<void> {- if (!serverStore.isRouterMode) return;-- try {- const response = await ModelsService.listRouter();-- this.routerModels = response.data;- await this.fetchModalitiesForLoadedModels();-- const visible = this.getVisibleModels();-- if (visible.length === 1 && this.isModelLoaded(visible[0].model)) {- this.selectModelById(visible[0].id);- }- } catch (error) {- console.warn('Failed to fetch router models:', error);- this.routerModels = [];- }- }-- /**- * Fetch props for a specific model from /props endpoint.- * Uses caching to avoid redundant requests.- *- * In ROUTER mode, this only fetches props if the model is loaded,- * since unloaded models return 400 from /props endpoint.- *- * @param modelId - Model identifier to fetch props for- * @returns Props data or null if fetch failed or model not loaded- */- async fetchModelProps(modelId: string): Promise<ApiLlamaCppServerProps | null> {- const cached = this.modelPropsCache.get(modelId);-- if (cached) return cached;-- if (serverStore.isRouterMode && !this.isModelLoaded(modelId)) {- return null;- }-- if (this.modelPropsFetching.has(modelId)) return null;-- this.modelPropsFetching.add(modelId);-- try {- const props = await PropsService.fetchForModel(modelId);-- this.modelPropsCache.set(modelId, props);- this.propsCacheVersion++;-- return props;- } catch (error) {- console.warn(`Failed to fetch props for model ${modelId}:`, error);-- return null;- } finally {- this.modelPropsFetching.delete(modelId);- }- }-- /** Fetch modalities for all loaded models from /props endpoint. */- async fetchModalitiesForLoadedModels(): Promise<void> {- const loadedModelIds = this.loadedModelIds;-- if (loadedModelIds.length === 0) return;-- const propsPromises = loadedModelIds.map((modelId) => this.fetchModelProps(modelId));-- try {- const results = await Promise.all(propsPromises);-- this.models = this.models.map((model) => {- const modelIndex = loadedModelIds.indexOf(model.model);-- if (modelIndex === -1) return model;-- const props = results[modelIndex];-- if (!props?.modalities) return model;-- return { ...model, modalities: this.buildModalities(props.modalities) };- });-- this.propsCacheVersion++;- } catch (error) {- console.warn('Failed to fetch modalities for loaded models:', error);- }- }-- /**- * Update modalities for a specific model.- * Called when a model is loaded or when we need fresh modality data.- */- async updateModelModalities(modelId: string): Promise<void> {- const props = await this.fetchModelProps(modelId);-- if (!props?.modalities) return;-- this.models = this.models.map((model) =>- model.model === modelId- ? { ...model, modalities: this.buildModalities(props.modalities!) }- : model- );-- this.propsCacheVersion++;- }-- /**- * Filter to models visible in the UI (ui !== false).- */- private getVisibleModels(): ModelOption[] {- return this.models.filter((option) => this.getModelProps(option.model)?.ui !== false);- }-- /**- * Gets the model name from the last assistant message in the active conversation.- * Used by both the chat page and settings page to maintain model consistency.- */- getModelFromLastAssistantResponse(): string | null {- const messages = conversationsStore.activeMessages;-- if (!messages || messages.length === 0) return null;-- for (let i = messages.length - 1; i >= 0; i--) {- if (messages[i].model) {- return messages[i].model;- }- }-- return null;- }-- /**- * Auto-selects the model from the last assistant response if available and loaded.- * Returns true if a model was selected, false otherwise.- */- async selectModelFromLastAssistantResponse(): Promise<boolean> {- const lastModel = this.getModelFromLastAssistantResponse();-- if (!lastModel || this.selectedModelName === lastModel) return false;-- const matchingModel = this.models.find((option) => option.model === lastModel);-- if (!matchingModel || !this.isModelLoaded(lastModel)) return false;-- try {- await this.selectModelById(matchingModel.id);- console.log(`[modelsStore] Automatically selected model: ${lastModel} from last message`);-- return true;- } catch (error) {- console.warn('[modelsStore] Failed to automatically select model from last message:', error);-- return false;- }- }-- /**- * Auto-selects the first available model if none is selected.- * Prioritizes:- * 1. Model from active conversation's last assistant response (if loaded)- * 2. Model from active conversation's last assistant response (if not loaded)- * 3. First loaded model (not from active conversation)- * 4. A favorite model- * 5. First available model- */- async ensureFirstModelSelected(): Promise<void> {- if (this.selectedModelName) return;-- const availableModels = this.getVisibleModels();-- if (availableModels.length === 0) return;-- // Try to select model from last assistant response first- const lastModel = this.getModelFromLastAssistantResponse();-- if (lastModel) {- const lastModelOption = availableModels.find((m) => m.model === lastModel);-- if (lastModelOption) {- await this.selectModelById(lastModelOption.id);-- if (this.isModelLoaded(lastModel)) {- await this.fetchModelProps(lastModel);- }-- return;- }- }-- // Try a loaded model first- const loadedModel = availableModels.find((m) => this.isModelLoaded(m.model));-- if (loadedModel) {- await this.selectModelById(loadedModel.id);- await this.fetchModelProps(loadedModel.model);-- return;- }-- // Try loading a favorite model- const favorite = this.favoriteModelIds.values().next()?.value;-- if (favorite) {- await this.selectModelById(favorite);-- return;- }-- // Fall back to the first available model- await this.selectModelById(availableModels[0].id);- }-- /**- *- *- * Model Selection- *- *- */-- async selectModelById(modelId: string): Promise<void> {- if (!modelId || this.updating) return;-- if (this.selectedModelId === modelId) return;-- const option = this.models.find((model) => model.id === modelId);-- if (!option) throw new Error('Selected model is not available');-- this.updating = true;- this.error = null;-- try {- this.selectedModelId = option.id;- this.selectedModelName = option.model;- } finally {- this.updating = false;- }- }-- /**- * Select a model by its model name (used for syncing with conversation model).- */- selectModelByName(modelName: string): void {- const option = this.models.find((model) => model.model === modelName);-- if (option) {- this.selectedModelId = option.id;- this.selectedModelName = option.model;- }- }-- clearSelection(): void {- this.selectedModelId = null;- this.selectedModelName = null;- }-- findModelByName(modelName: string): ModelOption | null {- return (- this.models.find(- (model) =>- model.model === modelName || model.id === modelName || model.aliases?.includes(modelName)- ) ?? null- );- }-- findModelById(modelId: string): ModelOption | null {- return this.models.find((model) => model.id === modelId) ?? null;- }-- hasModel(modelName: string): boolean {- return this.models.some((model) => model.model === modelName);- }-- /**- *- *- * Loading / Unloading Models- *- *- */-- // reconnect delay after the feed drops or the server is not ready yet- /**- * Open the /models/sse feed and keep it live with auto reconnect.- * Idempotent and router mode only. The feed drives status and progress,- * so it replaces any post-operation polling.- */- subscribeStatus(): void {- if (this.statusReaderActive) return;-- if (!serverStore.isRouterMode) return;-- this.statusReaderActive = true;- this.statusAbort = new AbortController();- void this.runStatusReader(this.statusAbort.signal);- }-- /**- * Close the /models/sse feed and drop transient progress.- */- unsubscribeStatus(): void {- this.statusReaderActive = false;- this.statusAbort?.abort();- this.statusAbort = null;- this.loadProgress.clear();- }-- /**- * Current load progress for a model, or null when not loading.- */- getLoadProgress(modelId: string): ModelLoadProgress | null {- return this.loadProgress.get(modelId) ?? null;- }-- /**- * Read the feed and reconnect until unsubscribed.- */- private async runStatusReader(signal: AbortSignal): Promise<void> {- await ModelsService.watchModelEvents(signal, (event) => this.applyStatusEvent(event));- }-- /**- * Route one feed record by event kind. Only the status_* events carry a- * status payload, models_reload triggers a list refresh, model_remove drops- * the row, download_* belong to the download surface, not here.- */- private applyStatusEvent(event: ApiModelsSseEvent): void {- switch (event.event) {- case ServerModelsSseEventType.STATUS_CHANGE:- case ServerModelsSseEventType.MODEL_STATUS:- case ServerModelsSseEventType.STATUS_UPDATE:- this.applyModelStatus(event);-- break;- case ServerModelsSseEventType.MODELS_RELOAD:- void this.fetchRouterModels();-- break;- case ServerModelsSseEventType.MODEL_REMOVE:- this.removeRouterModel(event.model);-- break;- case ServerModelsSseEventType.DOWNLOAD_PROGRESS:- break;- }- }-- /**- * Apply a status envelope: update the model row, track or clear progress,- * settle any pending load or unload awaiter.- */- private applyModelStatus(event: ApiModelsSseEvent): void {- const model = event.model;- const data = event.data;-- if (!model || !data?.status) return;-- const status = data.status;-- this.setRouterModelStatus(model, status);-- if (status === ServerModelStatus.LOADING) {- if (data.progress) this.loadProgress.set(model, data.progress);- } else {- this.loadProgress.delete(model);- }-- if (status === ServerModelStatus.LOADED) {- void this.updateModelModalities(model);- }-- const failed =- status === ServerModelStatus.FAILED ||- (status === ServerModelStatus.UNLOADED && (data.exit_code ?? 0) !== 0);-- if (failed) {- this.rejectStatus(model, new Error(`Model failed: ${this.toDisplayName(model)}`));-- return;- }-- this.settleStatus(model, status);- }-- /**- * Drop a model row reported gone by the feed and settle its awaiters.- */- private removeRouterModel(modelId: string): void {- if (this.routerModels.findIndex((m) => m.id === modelId) === -1) return;-- this.routerModels = this.routerModels.filter((m) => m.id !== modelId);- this.loadProgress.delete(modelId);- this.rejectStatus(modelId, new Error(`Model removed: ${this.toDisplayName(modelId)}`));- }-- /**- * Update one model row status in place, reassigning to trigger reactivity.- */- private setRouterModelStatus(modelId: string, status: ServerModelStatus): void {- const idx = this.routerModels.findIndex((m) => m.id === modelId);-- if (idx === -1) return;-- const current = this.routerModels[idx];-- if (current.status.value === status) return;-- const next = [...this.routerModels];-- next[idx] = { ...current, status: { ...current.status, value: status } };- this.routerModels = next;- }-- /**- * Register an awaiter that resolves when the feed reports target status.- * One operation runs per model at a time, so one awaiter per model is kept.- */- private waitForStatus(modelId: string, target: ServerModelStatus): Promise<void> {- return new Promise((resolve, reject) => {- this.statusWaiters.set(modelId, { reject, resolve, target });- });- }-- /**- * Resolve and drop the awaiter when the model reaches its target status.- */- private settleStatus(modelId: string, status: ServerModelStatus): void {- const waiter = this.statusWaiters.get(modelId);-- if (waiter && waiter.target === status) {- this.statusWaiters.delete(modelId);- waiter.resolve();- }- }-- /**- * Reject and drop the awaiter for a model.- */- private rejectStatus(modelId: string, error: Error): void {- const waiter = this.statusWaiters.get(modelId);-- if (waiter) {- this.statusWaiters.delete(modelId);- waiter.reject(error);- }- }-- async loadModel(modelId: string): Promise<void> {- if (this.isModelLoaded(modelId)) return;-- if (this.modelLoadingStates.get(modelId)) return;-- this.modelLoadingStates.set(modelId, true);- this.error = null;-- // the feed drives completion, so it must be live before the request- this.subscribeStatus();-- const reachedLoaded = this.waitForStatus(modelId, ServerModelStatus.LOADED);-- reachedLoaded.catch(() => {});-- try {- await ModelsService.load(modelId);- await reachedLoaded;- toast.success(`Model loaded: ${this.toDisplayName(modelId)}`);- } catch (error) {- this.rejectStatus(modelId, error instanceof Error ? error : new Error('load failed'));- this.error = error instanceof Error ? error.message : 'Failed to load model';- toast.error(`Failed to load model: ${this.toDisplayName(modelId)}`);-- throw error;- } finally {- this.modelLoadingStates.set(modelId, false);- }- }-- async unloadModel(modelId: string): Promise<void> {- if (!this.isModelLoaded(modelId)) return;-- if (this.modelLoadingStates.get(modelId)) return;-- this.modelLoadingStates.set(modelId, true);- this.error = null;-- this.subscribeStatus();-- const reachedUnloaded = this.waitForStatus(modelId, ServerModelStatus.UNLOADED);-- reachedUnloaded.catch(() => {});-- try {- await ModelsService.unload(modelId);- await reachedUnloaded;- toast.info(`Model unloaded: ${this.toDisplayName(modelId)}`);- } catch (error) {- this.rejectStatus(modelId, error instanceof Error ? error : new Error('unload failed'));- this.error = error instanceof Error ? error.message : 'Failed to unload model';- toast.error(`Failed to unload model: ${this.toDisplayName(modelId)}`);-- throw error;- } finally {- this.modelLoadingStates.set(modelId, false);- }- }-- async ensureModelLoaded(modelId: string): Promise<void> {- if (this.isModelLoaded(modelId)) return;-- await this.loadModel(modelId);- }-- /**- *- *- * Favorites- *- *- */-- isFavorite(modelId: string): boolean {- return this.favoriteModelIds.has(modelId);- }-- toggleFavorite(modelId: string): void {- const next = new SvelteSet(this.favoriteModelIds);-- if (next.has(modelId)) {- next.delete(modelId);- } else {- next.add(modelId);- }-- this.favoriteModelIds = next;-- try {- localStorage.setItem(FAVORITE_MODELS_LOCALSTORAGE_KEY, JSON.stringify([...next]));- } catch {- toast.error('Failed to save favorite models to local storage');- }- }-- private loadFavoritesFromStorage(): Set<string> {- try {- const raw = localStorage.getItem(FAVORITE_MODELS_LOCALSTORAGE_KEY);-- return raw ? new Set(JSON.parse(raw) as string[]) : new Set();- } catch {- toast.error('Failed to load favorite models from local storage');-- return new Set();- }- }-- /**- *- *- * Utilities- *- *- */-- private toDisplayName(id: string): string {- const segments = id.split(/\\|\//);- const candidate = segments.pop();-- return candidate && candidate.trim().length > 0 ? candidate : id;- }-- private buildModalities(- modalities: NonNullable<ApiLlamaCppServerProps['modalities']>- ): ModelModalities {- return {- audio: modalities.audio ?? false,- video: modalities.video ?? false,- vision: modalities.vision ?? false- };- }-- /** Map the router modalities, the only source available while a model is not loaded. */- private buildArchitectureModalities(- architecture: ApiModelDataEntry['architecture']- ): ModelModalities | undefined {- if (!architecture) return undefined;-- const inputs = architecture.input_modalities;-- return {- audio: inputs.includes(FileTypeCategory.AUDIO),- video: inputs.includes(FileTypeCategory.VIDEO),- vision: inputs.includes(FileTypeCategory.IMAGE)- };- }-- clear(): void {- this.unsubscribeStatus();- this.statusWaiters.forEach((waiter) => waiter.reject(new Error('Models store cleared')));- this.statusWaiters.clear();- this.models = [];- this.routerModels = [];- this.loading = false;- this.updating = false;- this.error = null;- this.selectedModelId = null;- this.selectedModelName = null;- this.modelUsage.clear();- this.modelLoadingStates.clear();- this.modelPropsCache.clear();- this.modelPropsFetching.clear();- }-- /**- * Prune expired entries from caches.- * Call periodically for proactive memory cleanup.- */- pruneExpiredCache(): number {- return this.modelPropsCache.prune();- }-}--export const modelsStore = new ModelsStore();diff --git a/tools/ui/src/lib/stores/models/index.svelte.ts b/tools/ui/src/lib/stores/models/index.svelte.tsnew file mode 100644index 0000000000..90d6fe76b7--- /dev/null+++ b/tools/ui/src/lib/stores/models/index.svelte.ts@@ -0,0 +1,451 @@+/**+ * modelsStore - Model management for MODEL and ROUTER modes+ *+ * Owns model lists, selection, favorites and load/unload state. Composes the+ * per-model props cache (modalities, thinking detection) as+ * {@link ModelsStore.props} and the /models/sse status feed as+ * {@link ModelsStore.status}; tracks which conversations use which models.+ */++import { FAVORITE_MODELS_LOCALSTORAGE_KEY } from '$lib/constants';+import { ServerModelStatus } from '$lib/enums';+import { ModelsService } from '$lib/services/models.service';+// direct imports between stores, not via the barrel, to avoid circular deps+import { conversationsStore } from '$lib/stores/conversations/index.svelte';+import { type ModelPropsHost, ModelPropsManager } from '$lib/stores/models/props.svelte';+import { type ModelStatusHost, ModelStatusManager } from '$lib/stores/models/status.svelte';+import { serverStore } from '$lib/stores/server.svelte';+import { getConversationModel } from '$lib/utils/conversation-utils';+import { SvelteSet } from 'svelte/reactivity';+import { toast } from 'svelte-sonner';++class ModelsStore implements ModelPropsHost, ModelStatusHost {+ error = $state<string | null>(null);+ favoriteModelIds = $state<Set<string>>(this.loadFavoritesFromStorage());+ loading = $state(false);+ models = $state<ModelOption[]>([]);+ routerModels = $state<ApiModelDataEntry[]>([]);+ selectedModelId = $state<string | null>(null);+ selectedModelName = $state<string | null>(null);++ updating = $state(false);++ /** Per-model props cache, modalities and thinking detection, composed here. */+ private _props = new ModelPropsManager(this);++ /** Load/unload operations and the /models/sse status feed, composed here. */+ private _status = new ModelStatusManager(this);++ // Dedup concurrent fetch() callers — all awaiters share the same inflight promise.+ // Without this, ?model=<name> URL handler races an in-progress fetch and sees an empty list.+ private inflightFetch: Promise<void> | null = null;++ /**+ * Model the active conversation view resolves to. Router mode: the user's+ * selection first, then the conversation's own model. Otherwise the single+ * served model, from the models list or the server props as a fallback.+ */+ get activeModelId(): string | null {+ if (!serverStore.isRouterMode) {+ return this.models.length > 0 ? this.models[0].model : this.singleModelName;+ }++ if (this.selectedModelId) {+ const selected = this.models.find((m) => m.id === this.selectedModelId);++ if (selected) return selected.model;+ }++ const conversationModel = getConversationModel(conversationsStore.activeMessages);++ if (conversationModel) {+ const model = this.models.find((m) => m.model === conversationModel);++ if (model) return model.model;+ }++ return null;+ }++ get loadedModelIds(): string[] {+ return this.routerModels+ .filter(+ (m) =>+ m.status.value === ServerModelStatus.LOADED ||+ m.status.value === ServerModelStatus.SLEEPING+ )+ .map((m) => m.id);+ }++ get props() {+ return this._props;+ }++ get selectedModel(): ModelOption | null {+ if (!this.selectedModelId) return null;++ return this.models.find((m) => m.id === this.selectedModelId) ?? null;+ }++ get selectedModelContextSize(): number | null {+ if (!this.selectedModelName) return null;++ return this.props.getModelContextSize(this.selectedModelName);+ }++ /**+ * Get model name in MODEL mode (single model).+ * Extracts from model_path or model_alias from server props.+ * In ROUTER mode, returns null (model is per-conversation).+ */+ get singleModelName(): string | null {+ if (serverStore.isRouterMode) return null;++ const props = serverStore.props;++ if (props?.model_alias) return props.model_alias;++ if (!props?.model_path) return null;++ return props.model_path.split(/(\\|\/)/).pop() || null;+ }++ get status() {+ return this._status;+ }++ clearSelection(): void {+ this.selectedModelId = null;+ this.selectedModelName = null;+ }++ /**+ * Auto-selects the first available model if none is selected.+ * Prioritizes:+ * 1. Model from active conversation's last assistant response (if loaded)+ * 2. Model from active conversation's last assistant response (if not loaded)+ * 3. First loaded model (not from active conversation)+ * 4. A favorite model+ * 5. First available model+ */+ async ensureFirstModelSelected(): Promise<void> {+ if (this.selectedModelName) return;++ const availableModels = this.getVisibleModels();++ if (availableModels.length === 0) return;++ // Try to select model from last assistant response first+ const lastModel = this.getModelFromLastAssistantResponse();++ if (lastModel) {+ const lastModelOption = availableModels.find((m) => m.model === lastModel);++ if (lastModelOption) {+ await this.selectModelById(lastModelOption.id);++ if (this.isModelLoaded(lastModel)) {+ await this.props.fetchModelProps(lastModel);+ }++ return;+ }+ }++ // Try a loaded model first+ const loadedModel = availableModels.find((m) => this.isModelLoaded(m.model));++ if (loadedModel) {+ await this.selectModelById(loadedModel.id);+ await this.props.fetchModelProps(loadedModel.model);++ return;+ }++ // Try loading a favorite model+ const favorite = this.favoriteModelIds.values().next()?.value;++ if (favorite) {+ await this.selectModelById(favorite);++ return;+ }++ // Fall back to the first available model+ await this.selectModelById(availableModels[0].id);+ }++ /**+ * Fetch list of models from server and detect server role.+ * Also fetches modalities for MODEL mode (single model).+ */+ async fetch(force = false): Promise<void> {+ if (this.inflightFetch) return this.inflightFetch;++ if (this.models.length > 0 && !force) return;++ this.inflightFetch = this.runFetch();+ try {+ await this.inflightFetch;+ } finally {+ this.inflightFetch = null;+ }+ }++ /**+ * Fetch router models with full metadata (ROUTER mode only).+ * No-op in router mode — fetch() already calls listRouter() internally.+ * Kept for API compatibility (e.g. handleOpenChange dropdown open handler).+ */+ async fetchRouterModels(): Promise<void> {+ if (!serverStore.isRouterMode) return;++ try {+ const response = await ModelsService.listRouter();++ this.routerModels = response.data;+ await this.props.fetchModalitiesForLoadedModels();++ const visible = this.getVisibleModels();++ if (visible.length === 1 && this.isModelLoaded(visible[0].model)) {+ this.selectModelById(visible[0].id);+ }+ } catch (error) {+ console.warn('Failed to fetch router models:', error);+ this.routerModels = [];+ }+ }++ findModelById(modelId: string): ModelOption | null {+ return this.models.find((model) => model.id === modelId) ?? null;+ }++ findModelByName(modelName: string): ModelOption | null {+ return (+ this.models.find(+ (model) =>+ model.model === modelName || model.id === modelName || model.aliases?.includes(modelName)+ ) ?? null+ );+ }++ /**+ * Gets the model name from the last assistant message in the active conversation.+ * Used by both the chat page and settings page to maintain model consistency.+ */+ getModelFromLastAssistantResponse(): string | null {+ const messages = conversationsStore.activeMessages;++ if (!messages || messages.length === 0) return null;++ for (let i = messages.length - 1; i >= 0; i--) {+ if (messages[i].model) {+ return messages[i].model;+ }+ }++ return null;+ }++ getModelStatus(modelId: string): ServerModelStatus | null {+ const model = this.routerModels.find((m) => m.id === modelId);++ return model?.status.value ?? null;+ }++ hasModel(modelName: string): boolean {+ return this.models.some((model) => model.model === modelName);+ }++ isFavorite(modelId: string): boolean {+ return this.favoriteModelIds.has(modelId);+ }++ isModelLoaded(modelId: string): boolean {+ const model = this.routerModels.find((m) => m.id === modelId);++ return (+ model?.status.value === ServerModelStatus.LOADED ||+ model?.status.value === ServerModelStatus.SLEEPING+ );+ }++ async selectModelById(modelId: string): Promise<void> {+ if (!modelId || this.updating) return;++ if (this.selectedModelId === modelId) return;++ const option = this.models.find((model) => model.id === modelId);++ if (!option) throw new Error('Selected model is not available');++ this.updating = true;+ this.error = null;++ try {+ this.selectedModelId = option.id;+ this.selectedModelName = option.model;+ } finally {+ this.updating = false;+ }+ }++ /**+ * Select a model by its model name (used for syncing with conversation model).+ */+ selectModelByName(modelName: string): void {+ const option = this.models.find((model) => model.model === modelName);++ if (option) {+ this.selectedModelId = option.id;+ this.selectedModelName = option.model;+ }+ }++ /**+ * Auto-selects the model from the last assistant response if available and loaded.+ * Returns true if a model was selected, false otherwise.+ */+ async selectModelFromLastAssistantResponse(): Promise<boolean> {+ const lastModel = this.getModelFromLastAssistantResponse();++ if (!lastModel || this.selectedModelName === lastModel) return false;++ const matchingModel = this.models.find((option) => option.model === lastModel);++ if (!matchingModel || !this.isModelLoaded(lastModel)) return false;++ try {+ await this.selectModelById(matchingModel.id);+ console.log(`[modelsStore] Automatically selected model: ${lastModel} from last message`);++ return true;+ } catch (error) {+ console.warn('[modelsStore] Failed to automatically select model from last message:', error);++ return false;+ }+ }++ toDisplayName(id: string): string {+ const segments = id.split(/\\|\//);+ const candidate = segments.pop();++ return candidate && candidate.trim().length > 0 ? candidate : id;+ }++ toggleFavorite(modelId: string): void {+ const next = new SvelteSet(this.favoriteModelIds);++ if (next.has(modelId)) {+ next.delete(modelId);+ } else {+ next.add(modelId);+ }++ this.favoriteModelIds = next;++ try {+ localStorage.setItem(FAVORITE_MODELS_LOCALSTORAGE_KEY, JSON.stringify([...next]));+ } catch {+ toast.error('Failed to save favorite models to local storage');+ }+ }++ /**+ * Build ModelOption[] from an API response.+ * Both MODEL and ROUTER modes share the same mapping logic;+ * they differ only in which endpoint is called.+ */+ private buildModelOptions(+ response: ApiModelListResponse | ApiRouterModelsListResponse+ ): ModelOption[] {+ return response.data.map((item: ApiModelDataEntry, index: number) => {+ const details = response.models?.[index];+ const rawCapabilities = Array.isArray(details?.capabilities) ? details?.capabilities : [];+ const displayNameSource =+ details?.name && details.name.trim().length > 0 ? details.name : item.id;+ const modelId = details?.model || item.id;++ return {+ aliases: item.aliases ?? [],+ capabilities: rawCapabilities.filter((value: unknown): value is string => Boolean(value)),+ description: details?.description,+ details: details?.details,+ id: item.id,+ meta: item.meta ?? null,+ modalities: this.props.buildArchitectureModalities(item.architecture),+ model: modelId,+ name: this.toDisplayName(displayNameSource),+ parsedId: ModelsService.parseModelId(modelId),+ tags: item.tags ?? []+ };+ });+ }++ /** Fetch models in MODEL mode (single model, standard OpenAI-compatible). */+ private async fetchModelModeInternal(): Promise<ModelOption[]> {+ const response = await ModelsService.list();++ return this.buildModelOptions(response);+ }++ /**+ * Filter to models visible in the UI (ui !== false).+ */+ private getVisibleModels(): ModelOption[] {+ return this.models.filter((option) => this.props.getModelProps(option.model)?.ui !== false);+ }++ private loadFavoritesFromStorage(): Set<string> {+ try {+ const raw = localStorage.getItem(FAVORITE_MODELS_LOCALSTORAGE_KEY);++ return raw ? new Set(JSON.parse(raw) as string[]) : new Set();+ } catch {+ toast.error('Failed to load favorite models from local storage');++ return new Set();+ }+ }++ private async runFetch(): Promise<void> {+ this.loading = true;+ this.error = null;++ try {+ if (!serverStore.props) {+ await serverStore.fetch();+ }++ const router = serverStore.isRouterMode;++ if (router) {+ const response = await ModelsService.listRouter();++ this.routerModels = response.data;+ this.models = this.buildModelOptions(response);++ await this.props.fetchModalitiesForLoadedModels();++ const visible = this.getVisibleModels();++ if (visible.length === 1 && this.isModelLoaded(visible[0].model)) {+ this.selectModelById(visible[0].id);+ }+ } else {+ this.models = await this.fetchModelModeInternal();+ }+ } catch (error) {+ this.models = [];+ this.error = error instanceof Error ? error.message : 'Failed to load models';++ throw error;+ } finally {+ this.loading = false;+ }+ }+}++export const modelsStore = new ModelsStore();diff --git a/tools/ui/src/lib/stores/models/props.svelte.ts b/tools/ui/src/lib/stores/models/props.svelte.tsnew file mode 100644index 0000000000..9d2d817acb--- /dev/null+++ b/tools/ui/src/lib/stores/models/props.svelte.ts@@ -0,0 +1,273 @@+/**+ * ModelPropsManager - Per-model props cache, modalities and thinking detection+ *+ * Owns the /props?model=<id> cache with TTL, the modality views over it,+ * and chat-template thinking detection. Created and owned by modelsStore;+ * the host owns the model lists that fetched modalities are mirrored onto.+ *+ * **API Inconsistency Workaround:**+ * In MODEL mode, `/props` returns modalities for the single model.+ * In ROUTER mode, `/props` has no modalities - must use `/props?model=<id>` per model.+ */++import { MODEL_PROPS_CACHE } from '$lib/constants';+import { FileTypeCategory, ModelModality } from '$lib/enums';+import { PropsService } from '$lib/services/props.service';+// direct imports between stores, not via the barrel, to avoid circular deps+import { serverStore } from '$lib/stores/server.svelte';+// deep imports, not the '$lib/utils' barrel: it re-exports modules that reach back+// into the stores, and going through it here would read a half-built module+import { TTLCache } from '$lib/utils/cache-ttl';+import { detectThinkingSupport } from '$lib/utils/chat-template-thinking-detector';+import { SvelteSet } from 'svelte/reactivity';++/**+ * The slice of modelsStore the manager reads. Kept narrow on purpose so it+ * cannot reach around the host's full surface; modelsStore implements this+ * structurally.+ */+export interface ModelPropsHost {+ /** Model rows the manager mirrors fetched modalities onto. */+ models: ModelOption[];+ readonly selectedModelName: string | null;+ readonly loadedModelIds: string[];+ isModelLoaded(modelId: string): boolean;+}++export class ModelPropsManager {+ /** Version counter for the cache - bumped on writes so $derived consumers recompute. */+ cacheVersion = $state(0);+ /**+ * Model-specific props cache with TTL.+ * Key: modelId, Value: props data including modalities.+ */+ private cache = new TTLCache<string, ApiLlamaCppServerProps>({+ maxEntries: MODEL_PROPS_CACHE.MAX_ENTRIES,+ ttlMs: MODEL_PROPS_CACHE.TTL_MS+ });+ private fetching = new SvelteSet<string>();++ /**+ * Whether the selected model's chat template supports thinking/reasoning.+ * Uses heuristic detection on the model's chat_template from /props.+ *+ * - MODEL mode: the global /props already describes the single loaded model,+ * so its chat_template is used directly and no per-model cache is involved+ * - ROUTER mode: fetches /props?model=<id> for the selected model (cached),+ * triggering an async fetch if not yet cached+ */+ get supportsThinking(): boolean {+ if (!serverStore.isRouterMode) {+ return detectThinkingSupport(serverStore.props?.chat_template ?? '');+ }++ const modelId = this.host.selectedModelName;++ if (!modelId) return false;++ if (!this.cache.get(modelId)) {+ this.fetchModelProps(modelId);+ }++ const props = this.getModelProps(modelId);++ return detectThinkingSupport(props?.chat_template ?? '');+ }++ /** Map the router modalities, the only source available while a model is not loaded. */+ buildArchitectureModalities(+ architecture: ApiModelDataEntry['architecture']+ ): ModelModalities | undefined {+ if (!architecture) return undefined;++ const inputs = architecture.input_modalities;++ return {+ audio: inputs.includes(FileTypeCategory.AUDIO),+ video: inputs.includes(FileTypeCategory.VIDEO),+ vision: inputs.includes(FileTypeCategory.IMAGE)+ };+ }++ /**+ * Check if a specific model supports thinking.+ * In MODEL mode the global /props describes the single loaded model.+ * In ROUTER mode, fetches model props if not cached.+ */+ checkModelSupportsThinking(modelId: string): boolean {+ if (!serverStore.isRouterMode) {+ return detectThinkingSupport(serverStore.props?.chat_template ?? '');+ }++ if (!modelId) return false;++ if (!this.cache.get(modelId)) {+ this.fetchModelProps(modelId);+ }++ const props = this.getModelProps(modelId);++ return detectThinkingSupport(props?.chat_template ?? '');+ }++ constructor(private host: ModelPropsHost) {}++ /** Fetch modalities for all loaded models from /props endpoint. */+ async fetchModalitiesForLoadedModels(): Promise<void> {+ const loadedModelIds = this.host.loadedModelIds;++ if (loadedModelIds.length === 0) return;++ const propsPromises = loadedModelIds.map((modelId) => this.fetchModelProps(modelId));++ try {+ const results = await Promise.all(propsPromises);++ this.host.models = this.host.models.map((model) => {+ const modelIndex = loadedModelIds.indexOf(model.model);++ if (modelIndex === -1) return model;++ const props = results[modelIndex];++ if (!props?.modalities) return model;++ return { ...model, modalities: this.buildModalities(props.modalities) };+ });++ this.cacheVersion++;+ } catch (error) {+ console.warn('Failed to fetch modalities for loaded models:', error);+ }+ }++ /**+ * Fetch props for a specific model from /props endpoint.+ * Uses caching to avoid redundant requests.+ *+ * In ROUTER mode, this only fetches props if the model is loaded,+ * since unloaded models return 400 from /props endpoint.+ *+ * @param modelId - Model identifier to fetch props for+ * @returns Props data or null if fetch failed or model not loaded+ */+ async fetchModelProps(modelId: string): Promise<ApiLlamaCppServerProps | null> {+ const cached = this.cache.get(modelId);++ if (cached) return cached;++ if (serverStore.isRouterMode && !this.host.isModelLoaded(modelId)) {+ return null;+ }++ if (this.fetching.has(modelId)) return null;++ this.fetching.add(modelId);++ try {+ const props = await PropsService.fetchForModel(modelId);++ this.cache.set(modelId, props);+ this.cacheVersion++;++ return props;+ } catch (error) {+ console.warn(`Failed to fetch props for model ${modelId}:`, error);++ return null;+ } finally {+ this.fetching.delete(modelId);+ }+ }++ getModelContextSize(modelId: string): number | null {+ const props = this.getModelProps(modelId);+ const nCtx = props?.default_generation_settings?.n_ctx;++ return typeof nCtx === 'number' ? nCtx : null;+ }++ getModelModalities(modelId: string): ModelModalities | null {+ if (!serverStore.isRouterMode && serverStore.props?.modalities) {+ return this.buildModalities(serverStore.props.modalities);+ }++ const model = this.host.models.find((m) => m.model === modelId || m.id === modelId);++ if (model?.modalities) {+ return model.modalities;+ }++ const props = this.cache.get(modelId);++ if (props?.modalities) {+ return this.buildModalities(props.modalities);+ }++ return null;+ }++ getModelModalitiesArray(modelId: string): ModelModality[] {+ const modalities = this.getModelModalities(modelId);++ if (!modalities) return [];++ const result: ModelModality[] = [];++ if (modalities.vision) result.push(ModelModality.VISION);++ if (modalities.audio) result.push(ModelModality.AUDIO);++ if (modalities.video) result.push(ModelModality.VIDEO);++ return result;+ }++ getModelProps(modelId: string): ApiLlamaCppServerProps | null {+ return this.cache.get(modelId);+ }++ isModelPropsFetching(modelId: string): boolean {+ return this.fetching.has(modelId);+ }++ modelSupportsAudio(modelId: string): boolean {+ return this.getModelModalities(modelId)?.audio ?? false;+ }++ modelSupportsVideo(modelId: string): boolean {+ return this.getModelModalities(modelId)?.video ?? false;+ }++ modelSupportsVision(modelId: string): boolean {+ return this.getModelModalities(modelId)?.vision ?? false;+ }++ /**+ * Update modalities for a specific model.+ * Called when a model is loaded or when we need fresh modality data.+ */+ async updateModelModalities(modelId: string): Promise<void> {+ const props = await this.fetchModelProps(modelId);++ if (!props?.modalities) return;++ this.host.models = this.host.models.map((model) =>+ model.model === modelId+ ? { ...model, modalities: this.buildModalities(props.modalities!) }+ : model+ );++ this.cacheVersion++;+ }++ private buildModalities(+ modalities: NonNullable<ApiLlamaCppServerProps['modalities']>+ ): ModelModalities {+ return {+ audio: modalities.audio ?? false,+ video: modalities.video ?? false,+ vision: modalities.vision ?? false+ };+ }+}diff --git a/tools/ui/src/lib/stores/models/status.svelte.ts b/tools/ui/src/lib/stores/models/status.svelte.tsnew file mode 100644index 0000000000..d0160aa4da--- /dev/null+++ b/tools/ui/src/lib/stores/models/status.svelte.ts@@ -0,0 +1,278 @@+/**+ * ModelStatusManager - Model load/unload operations and the /models/sse feed+ *+ * Owns the status feed subscription, load progress tracking, and the+ * awaiters that settle load/unload operations. The feed drives status and+ * progress, so it replaces any post-operation polling. Created and owned by+ * modelsStore; the host owns the router model rows the feed updates.+ */++import { ServerModelsSseEventType, ServerModelStatus } from '$lib/enums';+import { ModelsService } from '$lib/services/models.service';+import type { ModelPropsManager } from '$lib/stores/models/props.svelte';+// direct imports between stores, not via the barrel, to avoid circular deps+import { serverStore } from '$lib/stores/server.svelte';+import { SvelteMap } from 'svelte/reactivity';+import { toast } from 'svelte-sonner';++/**+ * The slice of modelsStore the manager drives. Kept narrow on purpose so it+ * cannot reach around the host's full surface; modelsStore implements this+ * structurally.+ */+export interface ModelStatusHost {+ error: string | null;+ readonly props: ModelPropsManager;+ /** Router model rows the status feed updates. */+ routerModels: ApiModelDataEntry[];+ fetchRouterModels(): Promise<void>;+ isModelLoaded(modelId: string): boolean;+ toDisplayName(id: string): string;+}++export class ModelStatusManager {+ private loadingStates = new SvelteMap<string, boolean>();+ private loadProgress = new SvelteMap<string, ModelLoadProgress>();+ // /models/sse feed state, the single source of truth for status and load progress+ private statusAbort: AbortController | null = null;+ private statusReaderActive = false;+ private statusWaiters = new SvelteMap<+ string,+ { target: ServerModelStatus; resolve: () => void; reject: (e: Error) => void }+ >();++ constructor(private host: ModelStatusHost) {}++ async ensureLoaded(modelId: string): Promise<void> {+ if (this.host.isModelLoaded(modelId)) return;++ await this.load(modelId);+ }++ /**+ * Current load progress for a model, or null when not loading.+ */+ getLoadProgress(modelId: string): ModelLoadProgress | null {+ return this.loadProgress.get(modelId) ?? null;+ }++ isOperationInProgress(modelId: string): boolean {+ return this.loadingStates.get(modelId) ?? false;+ }++ async load(modelId: string): Promise<void> {+ if (this.host.isModelLoaded(modelId)) return;++ if (this.loadingStates.get(modelId)) return;++ this.loadingStates.set(modelId, true);+ this.host.error = null;++ // the feed drives completion, so it must be live before the request+ this.subscribe();++ const reachedLoaded = this.waitForStatus(modelId, ServerModelStatus.LOADED);++ reachedLoaded.catch(() => {});++ try {+ await ModelsService.load(modelId);+ await reachedLoaded;+ toast.success(`Model loaded: ${this.host.toDisplayName(modelId)}`);+ } catch (error) {+ this.rejectStatus(modelId, error instanceof Error ? error : new Error('load failed'));+ this.host.error = error instanceof Error ? error.message : 'Failed to load model';+ toast.error(`Failed to load model: ${this.host.toDisplayName(modelId)}`);++ throw error;+ } finally {+ this.loadingStates.set(modelId, false);+ }+ }++ /**+ * Open the /models/sse feed and keep it live with auto reconnect.+ * Idempotent and router mode only.+ */+ subscribe(): void {+ if (this.statusReaderActive) return;++ if (!serverStore.isRouterMode) return;++ this.statusReaderActive = true;+ this.statusAbort = new AbortController();+ void this.runStatusReader(this.statusAbort.signal);+ }++ async unload(modelId: string): Promise<void> {+ if (!this.host.isModelLoaded(modelId)) return;++ if (this.loadingStates.get(modelId)) return;++ this.loadingStates.set(modelId, true);+ this.host.error = null;++ this.subscribe();++ const reachedUnloaded = this.waitForStatus(modelId, ServerModelStatus.UNLOADED);++ reachedUnloaded.catch(() => {});++ try {+ await ModelsService.unload(modelId);+ await reachedUnloaded;+ toast.info(`Model unloaded: ${this.host.toDisplayName(modelId)}`);+ } catch (error) {+ this.rejectStatus(modelId, error instanceof Error ? error : new Error('unload failed'));+ this.host.error = error instanceof Error ? error.message : 'Failed to unload model';+ toast.error(`Failed to unload model: ${this.host.toDisplayName(modelId)}`);++ throw error;+ } finally {+ this.loadingStates.set(modelId, false);+ }+ }++ /**+ * Close the /models/sse feed and drop transient progress.+ */+ unsubscribe(): void {+ this.statusReaderActive = false;+ this.statusAbort?.abort();+ this.statusAbort = null;+ this.loadProgress.clear();+ }++ /**+ * Apply a status envelope: update the model row, track or clear progress,+ * settle any pending load or unload awaiter.+ */+ private applyModelStatus(event: ApiModelsSseEvent): void {+ const model = event.model;+ const data = event.data;++ if (!model || !data?.status) return;++ const status = data.status;++ this.setRouterModelStatus(model, status);++ if (status === ServerModelStatus.LOADING) {+ if (data.progress) this.loadProgress.set(model, data.progress);+ } else {+ this.loadProgress.delete(model);+ }++ if (status === ServerModelStatus.LOADED) {+ void this.host.props.updateModelModalities(model);+ }++ const failed =+ status === ServerModelStatus.FAILED ||+ (status === ServerModelStatus.UNLOADED && (data.exit_code ?? 0) !== 0);++ if (failed) {+ this.rejectStatus(model, new Error(`Model failed: ${this.host.toDisplayName(model)}`));++ return;+ }++ this.settleStatus(model, status);+ }++ /**+ * Route one feed record by event kind. Only the status_* events carry a+ * status payload, models_reload triggers a list refresh, model_remove drops+ * the row, download_* belong to the download surface, not here.+ */+ private applyStatusEvent(event: ApiModelsSseEvent): void {+ switch (event.event) {+ case ServerModelsSseEventType.STATUS_CHANGE:+ case ServerModelsSseEventType.MODEL_STATUS:+ case ServerModelsSseEventType.STATUS_UPDATE:+ this.applyModelStatus(event);++ break;+ case ServerModelsSseEventType.MODELS_RELOAD:+ void this.host.fetchRouterModels();++ break;+ case ServerModelsSseEventType.MODEL_REMOVE:+ this.removeRouterModel(event.model);++ break;+ case ServerModelsSseEventType.DOWNLOAD_PROGRESS:+ break;+ }+ }++ /**+ * Reject and drop the awaiter for a model.+ */+ private rejectStatus(modelId: string, error: Error): void {+ const waiter = this.statusWaiters.get(modelId);++ if (waiter) {+ this.statusWaiters.delete(modelId);+ waiter.reject(error);+ }+ }++ /**+ * Drop a model row reported gone by the feed and settle its awaiters.+ */+ private removeRouterModel(modelId: string): void {+ if (this.host.routerModels.findIndex((m) => m.id === modelId) === -1) return;++ this.host.routerModels = this.host.routerModels.filter((m) => m.id !== modelId);+ this.loadProgress.delete(modelId);+ this.rejectStatus(modelId, new Error(`Model removed: ${this.host.toDisplayName(modelId)}`));+ }++ /**+ * Read the feed and reconnect until unsubscribed.+ */+ private async runStatusReader(signal: AbortSignal): Promise<void> {+ await ModelsService.watchModelEvents(signal, (event) => this.applyStatusEvent(event));+ }++ /**+ * Update one model row status in place, reassigning to trigger reactivity.+ */+ private setRouterModelStatus(modelId: string, status: ServerModelStatus): void {+ const idx = this.host.routerModels.findIndex((m) => m.id === modelId);++ if (idx === -1) return;++ const current = this.host.routerModels[idx];++ if (current.status.value === status) return;++ const next = [...this.host.routerModels];++ next[idx] = { ...current, status: { ...current.status, value: status } };+ this.host.routerModels = next;+ }++ /**+ * Resolve and drop the awaiter when the model reaches its target status.+ */+ private settleStatus(modelId: string, status: ServerModelStatus): void {+ const waiter = this.statusWaiters.get(modelId);++ if (waiter && waiter.target === status) {+ this.statusWaiters.delete(modelId);+ waiter.resolve();+ }+ }++ /**+ * Register an awaiter that resolves when the feed reports target status.+ * One operation runs per model at a time, so one awaiter per model is kept.+ */+ private waitForStatus(modelId: string, target: ServerModelStatus): Promise<void> {+ return new Promise((resolve, reject) => {+ this.statusWaiters.set(modelId, { reject, resolve, target });+ });+ }+}diff --git a/tools/ui/src/lib/stores/permissions.svelte.ts b/tools/ui/src/lib/stores/permissions.svelte.tsindex 3e83538e95..f4eae4b7e6 100644--- a/tools/ui/src/lib/stores/permissions.svelte.ts+++ b/tools/ui/src/lib/stores/permissions.svelte.ts@@ -1,3 +1,11 @@+/**+ * permissionsStore - Allowed tool permissions+ *+ * Owns the set of tools the user has permanently allowed, persisted to+ * localStorage. The agentic loop's permission gates consult it to run a+ * tool without prompting.+ */+import { browser } from '$app/environment';import { ALWAYS_ALLOWED_TOOLS_LOCALSTORAGE_KEY } from '$lib/constants';import { SvelteSet } from 'svelte/reactivity';@@ -5,6 +13,24 @@ import { SvelteSet } from 'svelte/reactivity';class PermissionsStore {private _tools = $state(new SvelteSet<string>());+ get tools(): ReadonlySet<string> {+ return this._tools;+ }++ allowTool(key: string): void {+ this._tools.add(key);+ this.persist();+ }++ allowTools(keys: string[]): void {+ for (const key of keys) this._tools.add(key);+ this.persist();+ }++ hasTool(key: string): boolean {+ return this._tools.has(key);+ }+/*** Load persisted permissions. Called by initStores() after migrations* have run.@@ -29,30 +55,12 @@ class PermissionsStore {}}- get tools(): ReadonlySet<string> {- return this._tools;- }-- hasTool(key: string): boolean {- return this._tools.has(key);- }-- allowTool(key: string): void {- this._tools.add(key);- this._persist();- }-- allowTools(keys: string[]): void {- for (const key of keys) this._tools.add(key);- this._persist();- }-revokeTool(key: string): void {this._tools.delete(key);- this._persist();+ this.persist();}- private _persist(): void {+ private persist(): void {try {localStorage.setItem(ALWAYS_ALLOWED_TOOLS_LOCALSTORAGE_KEY, JSON.stringify([...this._tools]));} catch (err) {diff --git a/tools/ui/src/lib/stores/server.svelte.ts b/tools/ui/src/lib/stores/server.svelte.tsindex 7de5850b9e..e145e2891d 100644--- a/tools/ui/src/lib/stores/server.svelte.ts+++ b/tools/ui/src/lib/stores/server.svelte.ts@@ -1,79 +1,57 @@+/**+ * serverStore - Server connection state, configuration and role detection+ *+ * Owns the connection state and properties fetched from /props, plus MODEL+ * vs ROUTER role detection and server-wide generation defaults. Uses+ * PropsService for the /props fetch.+ */+import { ServerRole } from '$lib/enums';import { PropsService } from '$lib/services/props.service';import { ApiError } from '$lib/utils';const LOADING_RETRY_INTERVAL_MS = 1000;-/**- * serverStore - Server connection state, configuration, and role detection- *- * This store manages the server connection state and properties fetched from `/props`.- * It provides reactive state for server configuration and role detection.- *- * **Architecture & Relationships:**- * - **PropsService**: Stateless service for fetching `/props` data- * - **serverStore** (this class): Reactive store for server state- * - **modelsStore**: Independent store for model management (uses PropsService directly)- *- * **Key Features:**- * - **Server State**: Connection status, loading, error handling- * - **Role Detection**: MODEL (single model) vs ROUTER (multi-model)- * - **Default Params**: Server-wide generation defaults- */class ServerStore {- /**- *- *- * State- *- *- */-- props = $state<ApiLlamaCppServerProps | null>(null);- loading = $state(false);error = $state<string | null>(null);- status = $state<number | null>(null);+ loading = $state(false);+ props = $state<ApiLlamaCppServerProps | null>(null);role = $state<ServerRole | null>(null);+ status = $state<number | null>(null);private fetchPromise: Promise<void> | null = null;private retryTimer: ReturnType<typeof setTimeout> | null = null;- /**- *- *- * Getters- *- *- */-- get defaultParams(): ApiLlamaCppServerProps['default_generation_settings']['params'] | null {- return this.props?.default_generation_settings?.params || null;- }-get contextSize(): number | null {const nCtx = this.props?.default_generation_settings?.n_ctx;return typeof nCtx === 'number' ? nCtx : null;}- get uiSettings(): Record<string, string | number | boolean> | undefined {- return this.props?.ui_settings ?? this.props?.webui_settings;+ get defaultParams(): ApiLlamaCppServerProps['default_generation_settings']['params'] | null {+ return this.props?.default_generation_settings?.params || null;+ }++ get isModelMode(): boolean {+ return this.role === ServerRole.MODEL;}get isRouterMode(): boolean {return this.role === ServerRole.ROUTER;}- get isModelMode(): boolean {- return this.role === ServerRole.MODEL;+ get uiSettings(): Record<string, string | number | boolean> | undefined {+ return this.props?.ui_settings ?? this.props?.webui_settings;}- /**- *- *- * Data Handling- *- *- */+ clear(): void {+ this.clearRetryTimer();+ this.props = null;+ this.error = null;+ this.status = null;+ this.loading = false;+ this.role = null;+ this.fetchPromise = null;+ }/*** @param background - Set by the automatic "still loading" poll. Skips the@@ -124,25 +102,6 @@ class ServerStore {await fetchPromise;}- clear(): void {- this.clearRetryTimer();- this.props = null;- this.error = null;- this.status = null;- this.loading = false;- this.role = null;- this.fetchPromise = null;- }-- private scheduleRetry(): void {- if (this.retryTimer) return;-- this.retryTimer = setTimeout(() => {- this.retryTimer = null;- this.fetch({ background: true });- }, LOADING_RETRY_INTERVAL_MS);- }-private clearRetryTimer(): void {if (this.retryTimer) {clearTimeout(this.retryTimer);@@ -150,14 +109,6 @@ class ServerStore {}}- /**- *- *- * Utilities- *- *- */-private detectRole(props: ApiLlamaCppServerProps): void {const newRole = props?.role === ServerRole.ROUTER ? ServerRole.ROUTER : ServerRole.MODEL;@@ -166,6 +117,15 @@ class ServerStore {console.info(`Server running in ${newRole === ServerRole.ROUTER ? 'ROUTER' : 'MODEL'} mode`);}}++ private scheduleRetry(): void {+ if (this.retryTimer) return;++ this.retryTimer = setTimeout(() => {+ this.retryTimer = null;+ this.fetch({ background: true });+ }, LOADING_RETRY_INTERVAL_MS);+ }}export const serverStore = new ServerStore();diff --git a/tools/ui/src/lib/stores/settings.svelte.ts b/tools/ui/src/lib/stores/settings/index.svelte.tssimilarity index 89%rename from tools/ui/src/lib/stores/settings.svelte.tsrename to tools/ui/src/lib/stores/settings/index.svelte.tsindex f23f6953ae..0373ade420 100644--- a/tools/ui/src/lib/stores/settings.svelte.ts+++ b/tools/ui/src/lib/stores/settings/index.svelte.ts@@ -1,34 +1,10 @@/*** settingsStore - Application configuration and theme management*- * This store manages all application settings including AI model parameters, UI preferences,- * and theme configuration. It provides persistent storage through localStorage with reactive- * state management using Svelte 5 runes.- *- * **Architecture & Relationships:**- * - **settingsStore** (this class): Configuration state management- * - Manages AI model parameters (temperature, max tokens, etc.)- * - Handles theme switching and persistence- * - Provides localStorage synchronization- * - Offers reactive configuration access- *- * - **ChatService**: Reads model parameters for API requests- * - **UI Components**: Subscribe to theme and configuration changes- *- * **Key Features:**- * - **Model Parameters**: Temperature, max tokens, top-p, top-k, repeat penalty- * - **Theme Management**: Auto, light, dark theme switching- * - **Persistence**: Automatic localStorage synchronization- * - **Reactive State**: Svelte 5 runes for automatic UI updates- * - **Default Handling**: Graceful fallback to defaults for missing settings- * - **Batch Updates**: Efficient multi-setting updates- * - **Reset Functionality**: Restore defaults for individual or all settings- *- * **Configuration Categories:**- * - Generation parameters (temperature, tokens, sampling)- * - UI preferences (theme, display options)- * - System settings (model selection, prompts)- * - Advanced options (seed, penalties, context handling)+ * Owns generation parameters, UI preferences and theme, persisted to+ * localStorage with Svelte 5 runes. Applies the admin's server ui_settings+ * as defaults on first visit; sampling parameters sync with the server via+ * ParameterSyncService.*/import { browser } from '$app/environment';@@ -53,14 +29,6 @@ import {import { setMode } from 'mode-watcher';class SettingsStore {- /**- *- *- * State- *- *- */-config = $state<SettingsConfigType>({ ...SETTING_CONFIG_DEFAULT });isInitialized = $state(false);userOverrides = $state<Set<string>>(new Set());@@ -69,208 +37,210 @@ class SettingsStore {// application of server ui_settings defaults for new users.private isFirstVisit = false;+ canSyncParameter(key: string): boolean {+ return ParameterSyncService.canSyncParameter(key);+ }/**- *- *- * Utilities (private helpers)- *- *- */-- /**- * Helper method to get server defaults with null safety- * Centralizes the pattern of getting and extracting server defaults+ * Clear all user overrides (for debugging)*/- private getServerDefaults(): Record<string, string | number | boolean> {- return ParameterSyncService.extractServerDefaults(serverStore.defaultParams);+ clearAllUserOverrides(): void {+ this.userOverrides.clear();+ this.saveConfig();+ console.log('Cleared all user overrides');}/**- *- *- * Lifecycle- *- *+ * Export all settings as a versioned JSON-compatible object.+ * The export captures the full config (excluding sensitive values like API key)+ * and user overrides. Sensitive fields are filtered out for security by default.+ * @param includeSensitiveData - If true, include sensitive fields (apiKey, MCP server headers) in export*/+ exportSettings(includeSensitiveData: boolean = false): SettingsExportType {+ // Build config excluding sensitive data unless user opts in+ const configToExport: Record<string, string | number | boolean | undefined> =+ includeSensitiveData+ ? { ...this.config }+ : Object.fromEntries(Object.entries(this.config).filter(([key]) => key !== 'apiKey'));- /**- * Initialize the settings store by loading from localStorage.- * Called by initStores() after migrations have run.- */- initialize() {- if (!browser) return;+ // Handle MCP servers: exclude custom headers unless user opts in+ if ('mcpServers' in configToExport && !includeSensitiveData) {+ try {+ const mcpServers = JSON.parse(configToExport.mcpServers as string) as Array<+ Record<string, unknown>+ >;+ const safeServers = mcpServers.map((server) => {+ delete server.headers;- try {- this.loadConfig();- this.migrateLegacyTheme();- // Apply the persisted theme from config on initial load- setMode(this.config[SETTINGS_KEYS.THEME] as ColorMode);- this.isInitialized = true;- } catch (error) {- console.error('Failed to initialize settings store:', error);+ return server;+ });++ configToExport.mcpServers = JSON.stringify(safeServers);+ } catch {+ // If parsing fails, just exclude the entire mcpServers field+ delete (configToExport as Record<string, unknown>).mcpServers;+ }}++ return {+ config: configToExport,+ timestamp: Date.now(),+ userOverrides: Array.from(this.userOverrides),+ version: 1+ };}/**- * Load configuration from localStorage- * Returns default values for missing keys to prevent breaking changes+ * Reset all parameters to their default values (from props)+ * This is used by the "Reset to Default" functionality+ * Prioritizes Server defaults from /props, falls back to UI defaults*/- private loadConfig() {- if (!browser) return;+ forceSyncWithServerDefaults(): void {+ const propsDefaults = this.getServerDefaults();+ const uiSettings = serverStore.uiSettings;- try {- const storedConfigRaw = localStorage.getItem(CONFIG_LOCALSTORAGE_KEY);+ for (const key of ParameterSyncService.getSyncableParameterKeys()) {+ if (uiSettings && key in uiSettings) {+ // UI setting from admin config: write actual value+ setConfigValue(this.config, key, uiSettings[key]);+ } else if (propsDefaults[key] !== undefined) {+ // sampling param: clear it, let server decide+ setConfigValue(this.config, key, '');+ } else if (key in SETTING_CONFIG_DEFAULT) {+ setConfigValue(this.config, key, getConfigValue(SETTING_CONFIG_DEFAULT, key));+ }- // First visit: no stored config yet. Server ui_settings apply once in- // this state, then the user's config diverges freely.- this.isFirstVisit = storedConfigRaw === null;+ this.userOverrides.delete(key);+ }- const savedVal = JSON.parse(storedConfigRaw || '{}');+ // Non-syncable keys: reset is a full return to the instance state, the+ // admin baseline value when defined, the factory default otherwise.+ for (const key of Object.keys(SETTING_CONFIG_DEFAULT)) {+ if (ParameterSyncService.canSyncParameter(key)) {+ continue;+ }- // Merge with defaults to prevent breaking changes- this.config = {- ...SETTING_CONFIG_DEFAULT,- ...savedVal- };+ const value =+ uiSettings && key in uiSettings && uiSettings[key] !== undefined+ ? uiSettings[key]+ : getConfigValue(SETTING_CONFIG_DEFAULT, key);- // Default sendOnEnter to false on mobile when the user has no saved preference- if (!(SETTINGS_KEYS.SEND_ON_ENTER in savedVal)) {- if (deviceStore.isMobile) {- this.config[SETTINGS_KEYS.SEND_ON_ENTER] = false;- }- }+ setConfigValue(this.config, key, value);- // Load user overrides- const savedOverrides = JSON.parse(- localStorage.getItem(USER_OVERRIDES_LOCALSTORAGE_KEY) || '[]'- );+ if (key === SETTINGS_KEYS.THEME) {+ setMode(value as ColorMode);+ }- this.userOverrides = new Set(savedOverrides);- } catch (error) {- console.warn('Failed to parse config from localStorage, using defaults:', error);- this.config = { ...SETTING_CONFIG_DEFAULT };- this.userOverrides = new Set();+ this.userOverrides.delete(key);}++ this.saveConfig();}/**- * Migrate the legacy un-namespaced "theme" localStorage key into config.- * Previously theme was stored separately in localStorage("theme") — now it lives- * inside the config object alongside all other settings.- * After migration the legacy key is removed.+ * Get the entire configuration object+ * @returns The complete configuration object*/- private migrateLegacyTheme() {- if (!browser) return;-- const legacyTheme = localStorage.getItem('theme');-- if (legacyTheme) {- this.config[SETTINGS_KEYS.THEME] = legacyTheme;- localStorage.removeItem('theme');- this.saveConfig();- setMode(legacyTheme as ColorMode);- }+ getAllConfig(): SettingsConfigType {+ return { ...this.config };}+/**- *- *- * Config Updates- *- *+ * Get a specific configuration value+ * @param key - The configuration key to get+ * @returns The configuration value*/+ getConfig<K extends keyof SettingsConfigType>(key: K): SettingsConfigType[K] {+ return this.config[key];+ }/**- * Update a specific configuration setting- * @param key - The configuration key to update- * @param value - The new value for the configuration key+ * Get diff between current settings and server defaults*/- updateConfig<K extends keyof SettingsConfigType>(key: K, value: SettingsConfigType[K]): void {- this.config[key] = value;-- if (ParameterSyncService.canSyncParameter(key as string)) {- const propsDefaults = this.getServerDefaults();- const propsDefault = propsDefaults[key as string];+ getParameterDiff() {+ const serverDefaults = this.getServerDefaults();- if (propsDefault !== undefined) {- const normalizedValue = normalizeFloatingPoint(value);- const normalizedDefault = normalizeFloatingPoint(propsDefault);+ if (Object.keys(serverDefaults).length === 0) return {};- if (normalizedValue === normalizedDefault) {- this.userOverrides.delete(key as string);- } else {- this.userOverrides.add(key as string);- }- }- }+ const configAsRecord = configToParameterRecord(+ this.config,+ ParameterSyncService.getSyncableParameterKeys()+ );- this.saveConfig();+ return ParameterSyncService.createParameterDiff(configAsRecord, serverDefaults);}/**- * Update multiple configuration settings at once- * @param updates - Object containing the configuration updates+ * Get parameter information including source for a specific parameter*/- updateMultipleConfig(updates: Partial<SettingsConfigType>) {- Object.assign(this.config, updates);-+ getParameterInfo(key: string) {const propsDefaults = this.getServerDefaults();+ const currentValue = getConfigValue(this.config, key);- for (const [key, value] of Object.entries(updates)) {- if (ParameterSyncService.canSyncParameter(key)) {- const propsDefault = propsDefaults[key];+ return ParameterSyncService.getParameterInfo(+ key,+ currentValue ?? '',+ propsDefaults,+ this.userOverrides+ );+ }- if (propsDefault !== undefined) {- const normalizedValue = normalizeFloatingPoint(value);- const normalizedDefault = normalizeFloatingPoint(propsDefault);+ /**+ * Import settings from a previously exported object.+ * Restores config (including theme) and user overrides.+ * @param data - The exported settings object+ */+ importSettings(data: SettingsExportType): void {+ if (!browser) return;- if (normalizedValue === normalizedDefault) {- this.userOverrides.delete(key);- } else {- this.userOverrides.add(key);- }- }- }+ if (!data || !data.config) {+ throw new Error('Invalid settings data: missing config');}+ // Restore config (theme is included in config)+ this.config = {+ ...SETTING_CONFIG_DEFAULT,+ ...data.config+ };++ // Restore user overrides (derived state — may be stale if server defaults differ)+ this.userOverrides = new Set(data.userOverrides ?? []);++ // Persist to localStoragethis.saveConfig();++ // Apply theme for immediate visual feedback+ setMode(this.config[SETTINGS_KEYS.THEME] as ColorMode);++ console.log('Settings imported successfully');}/**- * Save the current configuration to localStorage+ * Initialize the settings store by loading from localStorage.+ * Called by initStores() after migrations have run.*/- private saveConfig() {+ initialize() {if (!browser) return;try {- localStorage.setItem(CONFIG_LOCALSTORAGE_KEY, JSON.stringify(this.config));-- localStorage.setItem(- USER_OVERRIDES_LOCALSTORAGE_KEY,- JSON.stringify(Array.from(this.userOverrides))- );+ this.loadConfig();+ this.migrateLegacyTheme();+ // Apply the persisted theme from config on initial load+ setMode(this.config[SETTINGS_KEYS.THEME] as ColorMode);+ this.isInitialized = true;} catch (error) {- console.error('Failed to save config to localStorage:', error);+ console.error('Failed to initialize settings store:', error);}}/**- * Update the theme setting.- * @param newTheme - The new theme value+ * Reset all settings to defaults.*/- updateTheme(newTheme: string) {- this.updateConfig(SETTINGS_KEYS.THEME, newTheme);+ resetAll() {+ this.resetConfig();- setMode(newTheme as ColorMode);+ this.resetTheme();}- /**- *- *- * Reset- *- *- */-/*** Reset configuration to defaults*/@@ -280,25 +250,6 @@ class SettingsStore {this.saveConfig();}- /**- * Reset theme to default value.- * Theme is now stored inside the config object.- */- resetTheme() {- this.updateConfig(SETTINGS_KEYS.THEME, SETTING_CONFIG_DEFAULT[SETTINGS_KEYS.THEME]);-- setMode(SETTING_CONFIG_DEFAULT[SETTINGS_KEYS.THEME] as ColorMode);- }-- /**- * Reset all settings to defaults.- */- resetAll() {- this.resetConfig();-- this.resetTheme();- }-/*** Reset a parameter to Server default (or UI default if no Server default)*/@@ -316,18 +267,20 @@ class SettingsStore {setConfigValue(this.config, key, getConfigValue(SETTING_CONFIG_DEFAULT, key));}- this.userOverrides.delete(key);- this.saveConfig();+ this.userOverrides.delete(key);+ this.saveConfig();+ }++ /**+ * Reset theme to default value.+ * Theme is now stored inside the config object.+ */+ resetTheme() {+ this.updateConfig(SETTINGS_KEYS.THEME, SETTING_CONFIG_DEFAULT[SETTINGS_KEYS.THEME]);++ setMode(SETTING_CONFIG_DEFAULT[SETTINGS_KEYS.THEME] as ColorMode);}- /**- *- *- * Server Sync- *- *- */-/*** Initialize settings with props defaults when server properties are first loaded* This sets up the default values from /props endpoint@@ -385,47 +338,27 @@ class SettingsStore {}/**- * Reset all parameters to their default values (from props)- * This is used by the "Reset to Default" functionality- * Prioritizes Server defaults from /props, falls back to UI defaults+ * Update a specific configuration setting+ * @param key - The configuration key to update+ * @param value - The new value for the configuration key*/- forceSyncWithServerDefaults(): void {- const propsDefaults = this.getServerDefaults();- const uiSettings = serverStore.uiSettings;-- for (const key of ParameterSyncService.getSyncableParameterKeys()) {- if (uiSettings && key in uiSettings) {- // UI setting from admin config: write actual value- setConfigValue(this.config, key, uiSettings[key]);- } else if (propsDefaults[key] !== undefined) {- // sampling param: clear it, let server decide- setConfigValue(this.config, key, '');- } else if (key in SETTING_CONFIG_DEFAULT) {- setConfigValue(this.config, key, getConfigValue(SETTING_CONFIG_DEFAULT, key));- }-- this.userOverrides.delete(key);- }-- // Non-syncable keys: reset is a full return to the instance state, the- // admin baseline value when defined, the factory default otherwise.- for (const key of Object.keys(SETTING_CONFIG_DEFAULT)) {- if (ParameterSyncService.canSyncParameter(key)) {- continue;- }+ updateConfig<K extends keyof SettingsConfigType>(key: K, value: SettingsConfigType[K]): void {+ this.config[key] = value;- const value =- uiSettings && key in uiSettings && uiSettings[key] !== undefined- ? uiSettings[key]- : getConfigValue(SETTING_CONFIG_DEFAULT, key);+ if (ParameterSyncService.canSyncParameter(key as string)) {+ const propsDefaults = this.getServerDefaults();+ const propsDefault = propsDefaults[key as string];- setConfigValue(this.config, key, value);+ if (propsDefault !== undefined) {+ const normalizedValue = normalizeFloatingPoint(value);+ const normalizedDefault = normalizeFloatingPoint(propsDefault);- if (key === SETTINGS_KEYS.THEME) {- setMode(value as ColorMode);+ if (normalizedValue === normalizedDefault) {+ this.userOverrides.delete(key as string);+ } else {+ this.userOverrides.add(key as string);+ }}-- this.userOverrides.delete(key);}this.saveConfig();@@ -434,148 +367,143 @@ class SettingsStore {/****- * Utilities+ * Import / Export***//**- * Get a specific configuration value- * @param key - The configuration key to get- * @returns The configuration value- */- getConfig<K extends keyof SettingsConfigType>(key: K): SettingsConfigType[K] {- return this.config[key];- }-- /**- * Get the entire configuration object- * @returns The complete configuration object+ * Update multiple configuration settings at once+ * @param updates - Object containing the configuration updates*/- getAllConfig(): SettingsConfigType {- return { ...this.config };- }-- canSyncParameter(key: string): boolean {- return ParameterSyncService.canSyncParameter(key);- }+ updateMultipleConfig(updates: Partial<SettingsConfigType>) {+ Object.assign(this.config, updates);- /**- * Get parameter information including source for a specific parameter- */- getParameterInfo(key: string) {const propsDefaults = this.getServerDefaults();- const currentValue = getConfigValue(this.config, key);-- return ParameterSyncService.getParameterInfo(- key,- currentValue ?? '',- propsDefaults,- this.userOverrides- );- }- /**- * Get diff between current settings and server defaults- */- getParameterDiff() {- const serverDefaults = this.getServerDefaults();+ for (const [key, value] of Object.entries(updates)) {+ if (ParameterSyncService.canSyncParameter(key)) {+ const propsDefault = propsDefaults[key];- if (Object.keys(serverDefaults).length === 0) return {};+ if (propsDefault !== undefined) {+ const normalizedValue = normalizeFloatingPoint(value);+ const normalizedDefault = normalizeFloatingPoint(propsDefault);- const configAsRecord = configToParameterRecord(- this.config,- ParameterSyncService.getSyncableParameterKeys()- );+ if (normalizedValue === normalizedDefault) {+ this.userOverrides.delete(key);+ } else {+ this.userOverrides.add(key);+ }+ }+ }+ }- return ParameterSyncService.createParameterDiff(configAsRecord, serverDefaults);+ this.saveConfig();}/**- * Clear all user overrides (for debugging)+ * Update the theme setting.+ * @param newTheme - The new theme value*/- clearAllUserOverrides(): void {- this.userOverrides.clear();- this.saveConfig();- console.log('Cleared all user overrides');+ updateTheme(newTheme: string) {+ this.updateConfig(SETTINGS_KEYS.THEME, newTheme);++ setMode(newTheme as ColorMode);}/****- * Import / Export+ * Utilities (private helpers)***//**- * Export all settings as a versioned JSON-compatible object.- * The export captures the full config (excluding sensitive values like API key)- * and user overrides. Sensitive fields are filtered out for security by default.- * @param includeSensitiveData - If true, include sensitive fields (apiKey, MCP server headers) in export+ * Helper method to get server defaults with null safety+ * Centralizes the pattern of getting and extracting server defaults*/- exportSettings(includeSensitiveData: boolean = false): SettingsExportType {- // Build config excluding sensitive data unless user opts in- const configToExport: Record<string, string | number | boolean | undefined> =- includeSensitiveData- ? { ...this.config }- : Object.fromEntries(Object.entries(this.config).filter(([key]) => key !== 'apiKey'));+ private getServerDefaults(): Record<string, string | number | boolean> {+ return ParameterSyncService.extractServerDefaults(serverStore.defaultParams);+ }- // Handle MCP servers: exclude custom headers unless user opts in- if ('mcpServers' in configToExport && !includeSensitiveData) {- try {- const mcpServers = JSON.parse(configToExport.mcpServers as string) as Array<- Record<string, unknown>- >;- const safeServers = mcpServers.map((server) => {- delete server.headers;+ /**+ * Load configuration from localStorage+ * Returns default values for missing keys to prevent breaking changes+ */+ private loadConfig() {+ if (!browser) return;- return server;- });+ try {+ const storedConfigRaw = localStorage.getItem(CONFIG_LOCALSTORAGE_KEY);- configToExport.mcpServers = JSON.stringify(safeServers);- } catch {- // If parsing fails, just exclude the entire mcpServers field- delete (configToExport as Record<string, unknown>).mcpServers;+ // First visit: no stored config yet. Server ui_settings apply once in+ // this state, then the user's config diverges freely.+ this.isFirstVisit = storedConfigRaw === null;++ const savedVal = JSON.parse(storedConfigRaw || '{}');++ // Merge with defaults to prevent breaking changes+ this.config = {+ ...SETTING_CONFIG_DEFAULT,+ ...savedVal+ };++ // Default sendOnEnter to false on mobile when the user has no saved preference+ if (!(SETTINGS_KEYS.SEND_ON_ENTER in savedVal)) {+ if (deviceStore.isMobile) {+ this.config[SETTINGS_KEYS.SEND_ON_ENTER] = false;+ }}- }- return {- config: configToExport,- timestamp: Date.now(),- userOverrides: Array.from(this.userOverrides),- version: 1- };+ // Load user overrides+ const savedOverrides = JSON.parse(+ localStorage.getItem(USER_OVERRIDES_LOCALSTORAGE_KEY) || '[]'+ );++ this.userOverrides = new Set(savedOverrides);+ } catch (error) {+ console.warn('Failed to parse config from localStorage, using defaults:', error);+ this.config = { ...SETTING_CONFIG_DEFAULT };+ this.userOverrides = new Set();+ }}/**- * Import settings from a previously exported object.- * Restores config (including theme) and user overrides.- * @param data - The exported settings object+ * Migrate the legacy un-namespaced "theme" localStorage key into config.+ * Previously theme was stored separately in localStorage("theme") — now it lives+ * inside the config object alongside all other settings.+ * After migration the legacy key is removed.*/- importSettings(data: SettingsExportType): void {+ private migrateLegacyTheme() {if (!browser) return;- if (!data || !data.config) {- throw new Error('Invalid settings data: missing config');- }-- // Restore config (theme is included in config)- this.config = {- ...SETTING_CONFIG_DEFAULT,- ...data.config- };+ const legacyTheme = localStorage.getItem('theme');- // Restore user overrides (derived state — may be stale if server defaults differ)- this.userOverrides = new Set(data.userOverrides ?? []);+ if (legacyTheme) {+ this.config[SETTINGS_KEYS.THEME] = legacyTheme;+ localStorage.removeItem('theme');+ this.saveConfig();+ setMode(legacyTheme as ColorMode);+ }+ }- // Persist to localStorage- this.saveConfig();+ /**+ * Save the current configuration to localStorage+ */+ private saveConfig() {+ if (!browser) return;- // Apply theme for immediate visual feedback- setMode(this.config[SETTINGS_KEYS.THEME] as ColorMode);+ try {+ localStorage.setItem(CONFIG_LOCALSTORAGE_KEY, JSON.stringify(this.config));- console.log('Settings imported successfully');+ localStorage.setItem(+ USER_OVERRIDES_LOCALSTORAGE_KEY,+ JSON.stringify(Array.from(this.userOverrides))+ );+ } catch (error) {+ console.error('Failed to save config to localStorage:', error);+ }}}diff --git a/tools/ui/src/lib/stores/settings-referrer.svelte.ts b/tools/ui/src/lib/stores/settings/referrer.svelte.tssimilarity index 50%rename from tools/ui/src/lib/stores/settings-referrer.svelte.tsrename to tools/ui/src/lib/stores/settings/referrer.svelte.tsindex 297a0d6a45..9679049df9 100644--- a/tools/ui/src/lib/stores/settings-referrer.svelte.ts+++ b/tools/ui/src/lib/stores/settings/referrer.svelte.ts@@ -1,3 +1,10 @@+/**+ * settingsReferrer - Remembers the settings route to return to after exit+ *+ * Tracks the last settings section the user was on so the app can return+ * there after a fallback exit. Standalone reactive value, no host.+ */+import { SETTINGS_FALLBACK_EXIT_ROUTE } from '$lib/constants';let _url = $state<string>(SETTINGS_FALLBACK_EXIT_ROUTE);diff --git a/tools/ui/src/lib/stores/tools.svelte.ts b/tools/ui/src/lib/stores/tools.svelte.tsindex 9f044c83e6..e255b8a43e 100644--- a/tools/ui/src/lib/stores/tools.svelte.ts+++ b/tools/ui/src/lib/stores/tools.svelte.ts@@ -1,3 +1,12 @@+/**+ * toolsStore - Tool registry and enablement+ *+ * Owns the server tool listing (with working-directory resolution), built-in+ * browser tools, MCP tools and per-tool enablement, exposed as a unified+ * tool set for the LLM and the tools UI. Consumed by the agentic loop and+ * the chat flows.+ */+import { browser } from '$app/environment';import {buildBrowserInfoToolDefinition,@@ -18,9 +27,9 @@ import {} from '$lib/enums';import { ToolsService } from '$lib/services/tools.service';// direct imports between stores, not via the barrel, to avoid circular deps-import { mcpStore } from '$lib/stores/mcp.svelte';-import { modelsStore } from '$lib/stores/models.svelte';-import { settingsStore } from '$lib/stores/settings.svelte';+import { mcpStore } from '$lib/stores/mcp/index.svelte';+import { modelsStore } from '$lib/stores/models/index.svelte';+import { settingsStore } from '$lib/stores/settings/index.svelte';import type { OpenAIToolDefinition, ToolEntry, ToolGroup } from '$lib/types';import { buildSandboxToolDefinition } from '$lib/utils';import { SvelteMap, SvelteSet } from 'svelte/reactivity';@@ -28,156 +37,74 @@ import { SvelteMap, SvelteSet } from 'svelte/reactivity';/** Stable selection identity for a tool, shared by the disabled set and the permission store */class ToolsStore {- private _serverTools = $state<OpenAIToolDefinition[]>([]);- private _loading = $state(false);- private _error = $state<string | null>(null);private _disabledTools = $state(new SvelteSet<string>());+ private _error = $state<string | null>(null);+ private _loading = $state(false);+ private _serverHome = $state<string | null | undefined>(undefined);+ private _serverTools = $state<OpenAIToolDefinition[]>([]);+ private _toolsEndpointUnreachable = $state(false);// server tools that resolve their paths against the working directory,// as declared by the server in its `/tools` listing- private _cwdAwareTools = $state(new SvelteSet<string>());- private _toolsEndpointUnreachable = $state(false);- private _serverHome = $state<string | null | undefined>(undefined);-- /**- * Load persisted disabled tools and fetch the builtin tool list.- * Called by initStores() after migrations have run.- */- initialize(): void {- // browser-only init: skip on SSR to avoid localStorage/fetch side effects- if (!browser) return;-- try {- const stored = localStorage.getItem(DISABLED_TOOL_KEYS_LOCALSTORAGE_KEY);-- if (stored) {- const parsed = JSON.parse(stored);-- if (Array.isArray(parsed)) {- for (const key of parsed) {- if (typeof key === 'string') this._disabledTools.add(key);- }- }- }- } catch (err) {- console.error('[ToolsStore] Failed to load disabled tools from localStorage:', err);- }-- this.fetchServerTools();- }-- private persistDisabledTools(): void {- try {- localStorage.setItem(- DISABLED_TOOL_KEYS_LOCALSTORAGE_KEY,- JSON.stringify([...this._disabledTools])- );- } catch {- // ignore storage errors- }- }-- private toolKey(source: ToolSource, name: string, serverId?: string): string {- switch (source) {- case ToolSource.MCP:- return serverId ? `mcp-${serverId}:${name}` : `mcp:${name}`;- case ToolSource.CUSTOM:- return `custom:${name}`;- case ToolSource.BROWSER:- return `browser:${name}`;- default:- return `server:${name}`;- }- }-- private inferTypeFromDefault(value: unknown): string | undefined {- if (typeof value === 'string') return 'string';-- if (typeof value === 'boolean') return 'boolean';-- if (typeof value === 'number') return Number.isInteger(value) ? 'integer' : 'number';-- if (Array.isArray(value)) return 'array';-- if (value !== null && typeof value === 'object') return 'object';+ private cwdAwareTools = $state(new SvelteSet<string>());- return undefined;+ get allToolDefinitions(): OpenAIToolDefinition[] {+ return this.allTools.map((t) => t.definition);}- /**- * Recursively normalize a JSON Schema object: infers `type` from `default`- * for properties / items that omit it, and descends into nested `properties`- * and `items`. Returns a new object -- does not mutate the input.- */- private normalizeJsonSchema(schema: Record<string, unknown>): Record<string, unknown> {- if (!schema || typeof schema !== 'object') return schema;-- const normalized: Record<string, unknown> = { ...schema };-- if (normalized.properties && typeof normalized.properties === 'object') {- const props = normalized.properties as Record<string, Record<string, unknown>>;- const normalizedProps: Record<string, Record<string, unknown>> = {};-- for (const [key, prop] of Object.entries(props)) {- if (!prop || typeof prop !== 'object') {- normalizedProps[key] = prop;-- continue;- }-- const normalizedProp: Record<string, unknown> = { ...prop };+ /** Canonical flat list of tool entries with source metadata and stable keys, deduped by key */+ get allTools(): ToolEntry[] {+ const entries: ToolEntry[] = [];+ const seen = new SvelteSet<string>();+ const push = (entry: ToolEntry) => {+ if (seen.has(entry.key)) return;- if (!normalizedProp.type && normalizedProp.default !== undefined) {- const inferred = this.inferTypeFromDefault(normalizedProp.default);+ seen.add(entry.key);+ entries.push(entry);+ };- if (inferred) normalizedProp.type = inferred;- }+ for (const def of this._serverTools) {+ const name = def.function.name;- if (normalizedProp.properties) {- Object.assign(- normalizedProp,- this.normalizeJsonSchema(normalizedProp as Record<string, unknown>)- );- }+ push({+ definition: def,+ key: this.toolKey(ToolSource.SERVER, name),+ source: ToolSource.SERVER+ });+ }- if (normalizedProp.items && typeof normalizedProp.items === 'object') {- normalizedProp.items = this.normalizeJsonSchema(- normalizedProp.items as Record<string, unknown>- );- }+ for (const def of this.browserTools) {+ const name = def.function.name;- normalizedProps[key] = normalizedProp;- }- normalized.properties = normalizedProps;+ push({+ definition: def,+ key: this.toolKey(ToolSource.BROWSER, name),+ source: ToolSource.BROWSER+ });}- return normalized;- }+ for (const { definition, serverId, serverName } of this.mcpEntries()) {+ const name = definition.function.name;- private mcpDefinition(- name: string,- description: string | undefined,- schema?: Record<string, unknown>- ): OpenAIToolDefinition {- return {- function: {- description,- name,- parameters: schema ?? { properties: {}, required: [], type: JsonSchemaType.OBJECT }- },- type: ToolCallType.FUNCTION- };- }+ push({+ definition,+ key: this.toolKey(ToolSource.MCP, name, serverId),+ serverId,+ serverName,+ source: ToolSource.MCP+ });+ }- get serverTools(): OpenAIToolDefinition[] {- return this._serverTools;- }+ for (const def of this.customTools) {+ const name = def.function.name;- get serverHome(): string | null {- return this._serverHome ?? null;- }+ push({+ definition: def,+ key: this.toolKey(ToolSource.CUSTOM, name),+ source: ToolSource.CUSTOM+ });+ }- get mcpTools(): OpenAIToolDefinition[] {- return this.mcpEntries().map((e) => e.definition);+ return entries;}get browserTools(): OpenAIToolDefinition[] {@@ -199,31 +126,6 @@ class ToolsStore {return tools;}- private hasServerTool(name: BuiltInTool): boolean {- return this._serverTools.some((def) => def.function.name === name);- }-- /**- * `read_media` runs in the browser on top of the server's `read_file`, so it- * exists only when that tool is served and the active model can perceive the- * bytes. The server cannot make this call - it does not know which model the- * conversation uses.- */- private readMediaTool(): OpenAIToolDefinition | null {- if (!this.hasServerTool(BuiltInTool.SERVER_READ_FILE)) return null;-- const model = modelsStore.selectedModelName ?? modelsStore.models[0]?.model ?? '';-- if (!model) return null;-- const vision = modelsStore.modelSupportsVision(model);- const audio = modelsStore.modelSupportsAudio(model);-- if (!vision && !audio) return null;-- return buildReadMediaToolDefinition(vision, audio);- }-get customTools(): OpenAIToolDefinition[] {const raw = settingsStore.config.customJson;@@ -248,109 +150,52 @@ class ToolsStore {}}- /** Normalize MCP tools from live connections when available, fall back to health check data */- private mcpEntries(): {- serverId: string;- serverName: string;- definition: OpenAIToolDefinition;- }[] {- const out: { serverId: string; serverName: string; definition: OpenAIToolDefinition }[] = [];- const connections = mcpStore.getConnections();+ get disabledTools(): SvelteSet<string> {+ return this._disabledTools;+ }- if (connections.size > 0) {- for (const [serverId, connection] of connections) {- const serverName = mcpStore.getServerDisplayName(serverId);+ get error(): string | null {+ return this._error;+ }- for (const tool of connection.tools) {- const rawSchema = (tool.inputSchema as Record<string, unknown>) ?? {- properties: {},- required: [],- type: JsonSchemaType.OBJECT- };+ /**+ * Check if a working directory is worth setting: at least one server tool+ * that reads it is both served and left enabled by the user.+ */+ get hasEnabledCwdTools(): boolean {+ return this._serverTools.some((def) => {+ const name = def.function.name;- out.push({- definition: {- function: {- description: tool.description,- name: tool.name,- parameters: this.normalizeJsonSchema(rawSchema)- },- type: ToolCallType.FUNCTION- },- serverId,- serverName- });- }- }- } else {- for (const { serverId, serverName, tools } of this.getMcpToolsFromHealthChecks()) {- for (const tool of tools) {- out.push({- definition: this.mcpDefinition(tool.name, tool.description),- serverId,- serverName- });- }- }- }-- return out;+ return (+ this.cwdAwareTools.has(name) &&+ !this._disabledTools.has(this.toolKey(ToolSource.SERVER, name))+ );+ });}- /** Canonical flat list of tool entries with source metadata and stable keys, deduped by key */- get allTools(): ToolEntry[] {- const entries: ToolEntry[] = [];- const seen = new SvelteSet<string>();- const push = (entry: ToolEntry) => {- if (seen.has(entry.key)) return;-- seen.add(entry.key);- entries.push(entry);- };-- for (const def of this._serverTools) {- const name = def.function.name;-- push({- definition: def,- key: this.toolKey(ToolSource.SERVER, name),- source: ToolSource.SERVER- });- }-- for (const def of this.browserTools) {- const name = def.function.name;-- push({- definition: def,- key: this.toolKey(ToolSource.BROWSER, name),- source: ToolSource.BROWSER- });- }+ /** Check if there are any enabled tools available (server, MCP, or custom) */+ get hasEnabledTools(): boolean {+ return this.getEnabledToolsForLLM().length > 0;+ }- for (const { definition, serverId, serverName } of this.mcpEntries()) {- const name = definition.function.name;+ get isToolsEndpointUnreachable(): boolean {+ return this._toolsEndpointUnreachable;+ }- push({- definition,- key: this.toolKey(ToolSource.MCP, name, serverId),- serverId,- serverName,- source: ToolSource.MCP- });- }+ get loading(): boolean {+ return this._loading;+ }- for (const def of this.customTools) {- const name = def.function.name;+ get mcpTools(): OpenAIToolDefinition[] {+ return this.mcpEntries().map((e) => e.definition);+ }- push({- definition: def,- key: this.toolKey(ToolSource.CUSTOM, name),- source: ToolSource.CUSTOM- });- }+ get serverHome(): string | null {+ return this._serverHome ?? null;+ }- return entries;+ get serverTools(): OpenAIToolDefinition[] {+ return this._serverTools;}/** Tools grouped by category for tree display, derived from the canonical entries */@@ -382,16 +227,47 @@ class ToolsStore {return groups;}- private groupLabel(entry: ToolEntry): string {- switch (entry.source) {- case ToolSource.MCP:- return entry.serverName ?? '';- case ToolSource.CUSTOM:- return TOOL_GROUP_LABELS[ToolSource.CUSTOM];- case ToolSource.BROWSER:- return TOOL_GROUP_LABELS[ToolSource.BROWSER];- default:- return TOOL_GROUP_LABELS[ToolSource.SERVER];+ /** Enable all tools belonging to a specific MCP server */+ enableAllToolsForServer(serverId: string): void {+ const connection = mcpStore.getConnections().get(serverId);++ if (!connection) return;++ for (const tool of connection.tools) {+ this._disabledTools.delete(this.toolKey(ToolSource.MCP, tool.name, serverId));+ }+ this.persistDisabledTools();+ }++ async fetchServerTools(): Promise<void> {+ if (this._loading) return;++ this._loading = true;+ this._error = null;+ this._toolsEndpointUnreachable = false;++ try {+ const toolInfos = await ToolsService.list();++ this._serverTools = toolInfos.map((info) => info.definition);+ this.cwdAwareTools = new SvelteSet(+ toolInfos.filter((info) => info.uses_cwd).map((info) => info.tool)+ );+ } catch (err) {+ const errorMessage = err instanceof Error ? err.message : String(err);++ this._error = errorMessage;++ // 403 from /tools means the server was started without --tools+ // TODO: check status code instead of relying on message+ if (errorMessage.includes('this feature is disabled')) {+ this._toolsEndpointUnreachable = true;+ console.info('[ToolsStore] Server tools are disabled on the server');+ } else {+ console.error('[ToolsStore] Failed to fetch server tools:', err);+ }+ } finally {+ this._loading = false;}}@@ -430,38 +306,92 @@ class ToolsStore {return result;}- get allToolDefinitions(): OpenAIToolDefinition[] {- return this.allTools.map((t) => t.definition);+ /** Permission key for a tool name, identical to the selection key */+ getPermissionKey(toolName: string): string | null {+ return this.findEntryByName(toolName)?.key ?? null;}- get loading(): boolean {- return this._loading;+ /** Get the display label for the server that owns a given tool */+ getToolServerLabel(toolName: string): string {+ const entry = this.findEntryByName(toolName);++ if (!entry) return '';++ if (entry.serverName) return mcpStore.getServerDisplayName(entry.serverName);++ if (entry.source === ToolSource.SERVER) return TOOL_SERVER_LABELS[ToolSource.SERVER];++ if (entry.source === ToolSource.CUSTOM) return TOOL_SERVER_LABELS[ToolSource.CUSTOM];++ if (entry.source === ToolSource.BROWSER) return TOOL_SERVER_LABELS[ToolSource.BROWSER];++ return '';}- get error(): string | null {- return this._error;+ /** Determine the source of a tool by its name */+ getToolSource(toolName: string): ToolSource | null {+ return this.findEntryByName(toolName)?.source ?? null;}- get isToolsEndpointUnreachable(): boolean {- return this._toolsEndpointUnreachable;+ /**+ * Load persisted disabled tools and fetch the builtin tool list.+ * Called by initStores() after migrations have run.+ */+ initialize(): void {+ // browser-only init: skip on SSR to avoid localStorage/fetch side effects+ if (!browser) return;++ try {+ const stored = localStorage.getItem(DISABLED_TOOL_KEYS_LOCALSTORAGE_KEY);++ if (stored) {+ const parsed = JSON.parse(stored);++ if (Array.isArray(parsed)) {+ for (const key of parsed) {+ if (typeof key === 'string') this._disabledTools.add(key);+ }+ }+ }+ } catch (err) {+ console.error('[ToolsStore] Failed to load disabled tools from localStorage:', err);+ }++ this.fetchServerTools();}- get disabledTools(): SvelteSet<string> {- return this._disabledTools;+ isGroupFullyEnabled(group: ToolGroup): boolean {+ return group.tools.length > 0 && group.tools.every((t) => this.isToolEnabled(t.key));}isToolEnabled(key: string): boolean {return !this._disabledTools.has(key);}- toggleTool(key: string): void {- if (this._disabledTools.has(key)) {- this._disabledTools.delete(key);- } else {- this._disabledTools.add(key);+ /**+ * Absolute home directory on the server, resolved once per session via+ * file_glob_search's `base` field (the server expands `~`). Anchors the+ * directory picker's search scope and the `~` abbreviation of cwd+ * displays. Returns null when tools are unavailable.+ */+ async resolveServerHome(): Promise<string | null> {+ if (this._serverHome !== undefined) return this._serverHome;++ try {+ const res = await ToolsService.executeToolRaw(BuiltInTool.SERVER_FILE_GLOB_SEARCH, {+ limit: 1,+ max_depth: 1,+ path: HOME_TILDE,+ type: GlobSearchType.DIR+ });++ this._serverHome = typeof res.base === 'string' ? res.base : null;+ } catch {+ // searches still work via a literal `~`, only `~` abbreviation degrades+ this._serverHome = null;}- this.persistDisabledTools();+ return this._serverHome;}setToolEnabled(key: string, enabled: boolean): void {@@ -472,18 +402,6 @@ class ToolsStore {}}- /** Enable all tools belonging to a specific MCP server */- enableAllToolsForServer(serverId: string): void {- const connection = mcpStore.getConnections().get(serverId);-- if (!connection) return;-- for (const tool of connection.tools) {- this._disabledTools.delete(this.toolKey(ToolSource.MCP, tool.name, serverId));- }- this.persistDisabledTools();- }-toggleGroup(group: ToolGroup): void {const allEnabled = group.tools.every((t) => this.isToolEnabled(t.key));const target = !allEnabled;@@ -495,8 +413,23 @@ class ToolsStore {this.persistDisabledTools();}- isGroupFullyEnabled(group: ToolGroup): boolean {- return group.tools.length > 0 && group.tools.every((t) => this.isToolEnabled(t.key));+ toggleTool(key: string): void {+ if (this._disabledTools.has(key)) {+ this._disabledTools.delete(key);+ } else {+ this._disabledTools.add(key);+ }++ this.persistDisabledTools();+ }++ /** First canonical entry matching a tool name, runtime tool calls resolve by name */+ private findEntryByName(toolName: string): ToolEntry | null {+ for (const entry of this.allTools) {+ if (entry.definition.function.name === toolName) return entry;+ }++ return null;}/** Get MCP tools from health check data, used when live connections aren't established yet */@@ -524,118 +457,194 @@ class ToolsStore {return result;}- /** First canonical entry matching a tool name, runtime tool calls resolve by name */- private findEntryByName(toolName: string): ToolEntry | null {- for (const entry of this.allTools) {- if (entry.definition.function.name === toolName) return entry;+ private groupLabel(entry: ToolEntry): string {+ switch (entry.source) {+ case ToolSource.MCP:+ return entry.serverName ?? '';+ case ToolSource.CUSTOM:+ return TOOL_GROUP_LABELS[ToolSource.CUSTOM];+ case ToolSource.BROWSER:+ return TOOL_GROUP_LABELS[ToolSource.BROWSER];+ default:+ return TOOL_GROUP_LABELS[ToolSource.SERVER];}-- return null;}- /** Determine the source of a tool by its name */- getToolSource(toolName: string): ToolSource | null {- return this.findEntryByName(toolName)?.source ?? null;+ private hasServerTool(name: BuiltInTool): boolean {+ return this._serverTools.some((def) => def.function.name === name);}- /** Get the display label for the server that owns a given tool */- getToolServerLabel(toolName: string): string {- const entry = this.findEntryByName(toolName);-- if (!entry) return '';+ private inferTypeFromDefault(value: unknown): string | undefined {+ if (typeof value === 'string') return 'string';- if (entry.serverName) return mcpStore.getServerDisplayName(entry.serverName);+ if (typeof value === 'boolean') return 'boolean';- if (entry.source === ToolSource.SERVER) return TOOL_SERVER_LABELS[ToolSource.SERVER];+ if (typeof value === 'number') return Number.isInteger(value) ? 'integer' : 'number';- if (entry.source === ToolSource.CUSTOM) return TOOL_SERVER_LABELS[ToolSource.CUSTOM];+ if (Array.isArray(value)) return 'array';- if (entry.source === ToolSource.BROWSER) return TOOL_SERVER_LABELS[ToolSource.BROWSER];+ if (value !== null && typeof value === 'object') return 'object';- return '';+ return undefined;}- /** Permission key for a tool name, identical to the selection key */- getPermissionKey(toolName: string): string | null {- return this.findEntryByName(toolName)?.key ?? null;+ private mcpDefinition(+ name: string,+ description: string | undefined,+ schema?: Record<string, unknown>+ ): OpenAIToolDefinition {+ return {+ function: {+ description,+ name,+ parameters: schema ?? { properties: {}, required: [], type: JsonSchemaType.OBJECT }+ },+ type: ToolCallType.FUNCTION+ };}- /** Check if there are any enabled tools available (server, MCP, or custom) */- get hasEnabledTools(): boolean {- return this.getEnabledToolsForLLM().length > 0;+ /** Normalize MCP tools from live connections when available, fall back to health check data */+ private mcpEntries(): {+ serverId: string;+ serverName: string;+ definition: OpenAIToolDefinition;+ }[] {+ const out: { serverId: string; serverName: string; definition: OpenAIToolDefinition }[] = [];+ const connections = mcpStore.getConnections();++ if (connections.size > 0) {+ for (const [serverId, connection] of connections) {+ const serverName = mcpStore.getServerDisplayName(serverId);++ for (const tool of connection.tools) {+ const rawSchema = (tool.inputSchema as Record<string, unknown>) ?? {+ properties: {},+ required: [],+ type: JsonSchemaType.OBJECT+ };++ out.push({+ definition: {+ function: {+ description: tool.description,+ name: tool.name,+ parameters: this.normalizeJsonSchema(rawSchema)+ },+ type: ToolCallType.FUNCTION+ },+ serverId,+ serverName+ });+ }+ }+ } else {+ for (const { serverId, serverName, tools } of this.getMcpToolsFromHealthChecks()) {+ for (const tool of tools) {+ out.push({+ definition: this.mcpDefinition(tool.name, tool.description),+ serverId,+ serverName+ });+ }+ }+ }++ return out;}/**- * Check if a working directory is worth setting: at least one server tool- * that reads it is both served and left enabled by the user.+ * Recursively normalize a JSON Schema object: infers `type` from `default`+ * for properties / items that omit it, and descends into nested `properties`+ * and `items`. Returns a new object -- does not mutate the input.*/- get hasEnabledCwdTools(): boolean {- return this._serverTools.some((def) => {- const name = def.function.name;+ private normalizeJsonSchema(schema: Record<string, unknown>): Record<string, unknown> {+ if (!schema || typeof schema !== 'object') return schema;- return (- this._cwdAwareTools.has(name) &&- !this._disabledTools.has(this.toolKey(ToolSource.SERVER, name))- );- });- }+ const normalized: Record<string, unknown> = { ...schema };- async fetchServerTools(): Promise<void> {- if (this._loading) return;+ if (normalized.properties && typeof normalized.properties === 'object') {+ const props = normalized.properties as Record<string, Record<string, unknown>>;+ const normalizedProps: Record<string, Record<string, unknown>> = {};- this._loading = true;- this._error = null;- this._toolsEndpointUnreachable = false;+ for (const [key, prop] of Object.entries(props)) {+ if (!prop || typeof prop !== 'object') {+ normalizedProps[key] = prop;- try {- const toolInfos = await ToolsService.list();+ continue;+ }- this._serverTools = toolInfos.map((info) => info.definition);- this._cwdAwareTools = new SvelteSet(- toolInfos.filter((info) => info.uses_cwd).map((info) => info.tool)- );- } catch (err) {- const errorMessage = err instanceof Error ? err.message : String(err);+ const normalizedProp: Record<string, unknown> = { ...prop };- this._error = errorMessage;+ if (!normalizedProp.type && normalizedProp.default !== undefined) {+ const inferred = this.inferTypeFromDefault(normalizedProp.default);- // 403 from /tools means the server was started without --tools- // TODO: check status code instead of relying on message- if (errorMessage.includes('this feature is disabled')) {- this._toolsEndpointUnreachable = true;- console.info('[ToolsStore] Server tools are disabled on the server');- } else {- console.error('[ToolsStore] Failed to fetch server tools:', err);+ if (inferred) normalizedProp.type = inferred;+ }++ if (normalizedProp.properties) {+ Object.assign(+ normalizedProp,+ this.normalizeJsonSchema(normalizedProp as Record<string, unknown>)+ );+ }++ if (normalizedProp.items && typeof normalizedProp.items === 'object') {+ normalizedProp.items = this.normalizeJsonSchema(+ normalizedProp.items as Record<string, unknown>+ );+ }++ normalizedProps[key] = normalizedProp;}- } finally {- this._loading = false;+ normalized.properties = normalizedProps;+ }++ return normalized;+ }++ private persistDisabledTools(): void {+ try {+ localStorage.setItem(+ DISABLED_TOOL_KEYS_LOCALSTORAGE_KEY,+ JSON.stringify([...this._disabledTools])+ );+ } catch {+ // ignore storage errors}}/**- * Absolute home directory on the server, resolved once per session via- * file_glob_search's `base` field (the server expands `~`). Anchors the- * directory picker's search scope and the `~` abbreviation of cwd- * displays. Returns null when tools are unavailable.+ * `read_media` runs in the browser on top of the server's `read_file`, so it+ * exists only when that tool is served and the active model can perceive the+ * bytes. The server cannot make this call - it does not know which model the+ * conversation uses.*/- async resolveServerHome(): Promise<string | null> {- if (this._serverHome !== undefined) return this._serverHome;+ private readMediaTool(): OpenAIToolDefinition | null {+ if (!this.hasServerTool(BuiltInTool.SERVER_READ_FILE)) return null;- try {- const res = await ToolsService.executeToolRaw(BuiltInTool.SERVER_FILE_GLOB_SEARCH, {- limit: 1,- max_depth: 1,- path: HOME_TILDE,- type: GlobSearchType.DIR- });+ const model = modelsStore.selectedModelName ?? modelsStore.models[0]?.model ?? '';- this._serverHome = typeof res.base === 'string' ? res.base : null;- } catch {- // searches still work via a literal `~`, only `~` abbreviation degrades- this._serverHome = null;- }+ if (!model) return null;- return this._serverHome;+ const vision = modelsStore.props.modelSupportsVision(model);+ const audio = modelsStore.props.modelSupportsAudio(model);++ if (!vision && !audio) return null;++ return buildReadMediaToolDefinition(vision, audio);+ }++ private toolKey(source: ToolSource, name: string, serverId?: string): string {+ switch (source) {+ case ToolSource.MCP:+ return serverId ? `mcp-${serverId}:${name}` : `mcp:${name}`;+ case ToolSource.CUSTOM:+ return `custom:${name}`;+ case ToolSource.BROWSER:+ return `browser:${name}`;+ default:+ return `server:${name}`;+ }}}diff --git a/tools/ui/src/lib/types/agentic.d.ts b/tools/ui/src/lib/types/agentic.d.tsindex e7c6d34e1d..1a604476bf 100644--- a/tools/ui/src/lib/types/agentic.d.ts+++ b/tools/ui/src/lib/types/agentic.d.ts@@ -205,7 +205,7 @@ export interface AgenticSection {/** ID of the model-side tool call (matches tool_calls[i].id). Lets* downstream consumers correlate a section with the agentic loop's* currently-executing tool, e.g. to drive live-streaming UI state- * by matching against agenticStore.executingToolCallId. */+ * by matching against agenticStore.getExecutingToolCallId. */toolCallId?: string;wasInterrupted?: boolean;}diff --git a/tools/ui/src/lib/utils/api-fetch.ts b/tools/ui/src/lib/utils/api-fetch.tsindex 65e1129def..2059200049 100644--- a/tools/ui/src/lib/utils/api-fetch.ts+++ b/tools/ui/src/lib/utils/api-fetch.ts@@ -1,7 +1,6 @@import { getAuthHeaders, getJsonHeaders } from './api-headers';import { base } from '$app/paths';-import { ERROR_MESSAGES, HTTP_CODE_TO_STRING } from '$lib/constants';-import { UrlProtocol } from '$lib/enums';+import { API_ABSOLUTE_URL_PROTOCOLS, ERROR_MESSAGES, HTTP_CODE_TO_STRING } from '$lib/constants';/*** API Fetch Utilities@@ -63,10 +62,8 @@ export async function apiFetch<T>(path: string, options: ApiFetchOptions = {}):const { authOnly = false, headers: customHeaders, ...fetchOptions } = options;const baseHeaders = authOnly ? getAuthHeaders() : getJsonHeaders();const headers = { ...baseHeaders, ...customHeaders };- const url =- path.startsWith(UrlProtocol.HTTP) || path.startsWith(UrlProtocol.HTTPS)- ? path- : `${base}${path}`;+ // absolute URLs with an allowed protocol pass through untouched; relative paths get the base prefix+ const url = API_ABSOLUTE_URL_PROTOCOLS.some((p) => path.startsWith(p)) ? path : `${base}${path}`;let response;@@ -117,28 +114,7 @@ export async function apiFetchWithParams<T>(}}- const { authOnly = false, headers: customHeaders, ...fetchOptions } = options;- const baseHeaders = authOnly ? getAuthHeaders() : getJsonHeaders();- const headers = { ...baseHeaders, ...customHeaders };-- let response;-- try {- response = await fetch(url.toString(), {- ...fetchOptions,- headers- });- } catch (e) {- throw new Error(beautifyNetworkError(e));- }-- if (!response.ok) {- const errorMessage = await parseErrorMessage(response);-- throw new ApiError(errorMessage, response.status);- }-- return response.json() as Promise<T>;+ return apiFetch<T>(url.toString(), options);}/**diff --git a/tools/ui/src/lib/utils/api-headers.ts b/tools/ui/src/lib/utils/api-headers.tsindex 4b2b19d442..49d56d0619 100644--- a/tools/ui/src/lib/utils/api-headers.ts+++ b/tools/ui/src/lib/utils/api-headers.ts@@ -1,7 +1,7 @@import { redactValue } from './redact';import { CORS_PROXY, HEADERS } from '$lib/constants';import { MimeTypeApplication } from '$lib/enums';-import { settingsStore } from '$lib/stores/settings.svelte';+import { settingsStore } from '$lib/stores/settings/index.svelte';/*** Get authorization headers for API requestsdiff --git a/tools/ui/src/lib/utils/api-key-validation.ts b/tools/ui/src/lib/utils/api-key-validation.tsindex 8cde154fd2..187199afc2 100644--- a/tools/ui/src/lib/utils/api-key-validation.ts+++ b/tools/ui/src/lib/utils/api-key-validation.ts@@ -3,7 +3,7 @@ import { browser } from '$app/environment';import { base } from '$app/paths';import { HEADERS } from '$lib/constants';import { MimeTypeApplication } from '$lib/enums';-import { settingsStore } from '$lib/stores/settings.svelte';+import { settingsStore } from '$lib/stores/settings/index.svelte';/*** Validates API key by making a request to the server props endpointdiff --git a/tools/ui/src/lib/utils/audio-recording.ts b/tools/ui/src/lib/utils/audio-recording.tsindex 1241d6e055..4cfe173784 100644--- a/tools/ui/src/lib/utils/audio-recording.ts+++ b/tools/ui/src/lib/utils/audio-recording.ts@@ -14,10 +14,37 @@ import { MimeTypeAudio } from '$lib/enums';* - Proper cleanup and resource management*/export class AudioRecorder {- private mediaRecorder: MediaRecorder | null = null;private audioChunks: Blob[] = [];- private stream: MediaStream | null = null;+ private mediaRecorder: MediaRecorder | null = null;private recordingState: boolean = false;+ private stream: MediaStream | null = null;++ cancelRecording(): void {+ const recorder = this.mediaRecorder;+ const stream = this.stream;++ this.mediaRecorder = null;+ this.audioChunks = [];+ this.stream = null;+ this.recordingState = false;++ if (recorder && recorder.state !== 'inactive') {+ // Drop the original handlers so the pending stop event does not touch the instance+ recorder.onstop = null;+ recorder.onerror = null;+ recorder.stop();+ }++ if (stream) {+ for (const track of stream.getTracks()) {+ track.stop();+ }+ }+ }++ isRecording(): boolean {+ return this.recordingState;+ }async startRecording(): Promise<void> {try {@@ -90,33 +117,6 @@ export class AudioRecorder {});}- isRecording(): boolean {- return this.recordingState;- }-- cancelRecording(): void {- const recorder = this.mediaRecorder;- const stream = this.stream;-- this.mediaRecorder = null;- this.audioChunks = [];- this.stream = null;- this.recordingState = false;-- if (recorder && recorder.state !== 'inactive') {- // Drop the original handlers so the pending stop event does not touch the instance- recorder.onstop = null;- recorder.onerror = null;- recorder.stop();- }-- if (stream) {- for (const track of stream.getTracks()) {- track.stop();- }- }- }-private initializeRecorder(stream: MediaStream): void {const options: MediaRecorderOptions = {};diff --git a/tools/ui/src/lib/utils/cache-ttl.ts b/tools/ui/src/lib/utils/cache-ttl.tsindex bb0100755b..bec40989c4 100644--- a/tools/ui/src/lib/utils/cache-ttl.ts+++ b/tools/ui/src/lib/utils/cache-ttl.ts@@ -31,9 +31,29 @@ interface CacheEntry<T> {export class TTLCache<K extends string, V> {private cache = new Map<K, CacheEntry<V>>();- private readonly ttlMs: number;private readonly maxEntries: number;private readonly onEvict?: (key: string, value: unknown) => void;+ private readonly ttlMs: number;++ /**+ * Get the number of entries (including potentially expired ones).+ */+ get size(): number {+ return this.cache.size;+ }++ /**+ * Clear all entries from cache.+ */+ clear(): void {+ if (this.onEvict) {+ for (const [key, entry] of this.cache) {+ this.onEvict(key, entry.value);+ }+ }++ this.cache.clear();+ }constructor(options: TTLCacheOptions = {}) {this.ttlMs = options.ttlMs ?? CACHE.DEFAULT_TTL_MS;@@ -41,6 +61,19 @@ export class TTLCache<K extends string, V> {this.onEvict = options.onEvict;}+ /**+ * Delete a specific key from cache.+ */+ delete(key: K): boolean {+ const entry = this.cache.get(key);++ if (entry && this.onEvict) {+ this.onEvict(key, entry.value);+ }++ return this.cache.delete(key);+ }+/*** Get a value from cache. Returns null if expired or not found.*/@@ -61,25 +94,6 @@ export class TTLCache<K extends string, V> {return entry.value;}- /**- * Set a value in cache with TTL.- */- set(key: K, value: V, customTtlMs?: number): void {- // Evict oldest entries if at capacity- if (this.cache.size >= this.maxEntries && !this.cache.has(key)) {- this.evictOldest();- }-- const ttl = customTtlMs ?? this.ttlMs;- const now = Date.now();-- this.cache.set(key, {- expiresAt: now + ttl,- lastAccessed: now,- value- });- }-/*** Check if key exists and is not expired.*/@@ -98,36 +112,19 @@ export class TTLCache<K extends string, V> {}/**- * Delete a specific key from cache.+ * Get all valid (non-expired) keys.*/- delete(key: K): boolean {- const entry = this.cache.get(key);-- if (entry && this.onEvict) {- this.onEvict(key, entry.value);- }-- return this.cache.delete(key);- }+ keys(): K[] {+ const now = Date.now();+ const validKeys: K[] = [];- /**- * Clear all entries from cache.- */- clear(): void {- if (this.onEvict) {- for (const [key, entry] of this.cache) {- this.onEvict(key, entry.value);+ for (const [key, entry] of this.cache) {+ if (now <= entry.expiresAt) {+ validKeys.push(key);}}- this.cache.clear();- }-- /**- * Get the number of entries (including potentially expired ones).- */- get size(): number {- return this.cache.size;+ return validKeys;}/**@@ -150,38 +147,22 @@ export class TTLCache<K extends string, V> {}/**- * Get all valid (non-expired) keys.+ * Set a value in cache with TTL.*/- keys(): K[] {- const now = Date.now();- const validKeys: K[] = [];-- for (const [key, entry] of this.cache) {- if (now <= entry.expiresAt) {- validKeys.push(key);- }+ set(key: K, value: V, customTtlMs?: number): void {+ // Evict oldest entries if at capacity+ if (this.cache.size >= this.maxEntries && !this.cache.has(key)) {+ this.evictOldest();}- return validKeys;- }-- /**- * Evict the oldest (least recently accessed) entry.- */- private evictOldest(): void {- let oldestKey: K | null = null;- let oldestTime = Infinity;-- for (const [key, entry] of this.cache) {- if (entry.lastAccessed < oldestTime) {- oldestTime = entry.lastAccessed;- oldestKey = key;- }- }+ const ttl = customTtlMs ?? this.ttlMs;+ const now = Date.now();- if (oldestKey !== null) {- this.delete(oldestKey);- }+ this.cache.set(key, {+ expiresAt: now + ttl,+ lastAccessed: now,+ value+ });}/**@@ -205,6 +186,25 @@ export class TTLCache<K extends string, V> {return true;}++ /**+ * Evict the oldest (least recently accessed) entry.+ */+ private evictOldest(): void {+ let oldestKey: K | null = null;+ let oldestTime = Infinity;++ for (const [key, entry] of this.cache) {+ if (entry.lastAccessed < oldestTime) {+ oldestTime = entry.lastAccessed;+ oldestKey = key;+ }+ }++ if (oldestKey !== null) {+ this.delete(oldestKey);+ }+ }}/**@@ -213,14 +213,26 @@ export class TTLCache<K extends string, V> {*/export class ReactiveTTLMap<K extends string, V> {private entries = $state<Map<K, CacheEntry<V>>>(new Map());- private readonly ttlMs: number;private readonly maxEntries: number;+ private readonly ttlMs: number;++ get size(): number {+ return this.entries.size;+ }++ clear(): void {+ this.entries.clear();+ }constructor(options: TTLCacheOptions = {}) {this.ttlMs = options.ttlMs ?? CACHE.DEFAULT_TTL_MS;this.maxEntries = options.maxEntries ?? CACHE.DEFAULT_MAX_ENTRIES;}+ delete(key: K): boolean {+ return this.entries.delete(key);+ }+get(key: K): V | null {const entry = this.entries.get(key);@@ -237,21 +249,6 @@ export class ReactiveTTLMap<K extends string, V> {return entry.value;}- set(key: K, value: V, customTtlMs?: number): void {- if (this.entries.size >= this.maxEntries && !this.entries.has(key)) {- this.evictOldest();- }-- const ttl = customTtlMs ?? this.ttlMs;- const now = Date.now();-- this.entries.set(key, {- expiresAt: now + ttl,- lastAccessed: now,- value- });- }-has(key: K): boolean {const entry = this.entries.get(key);@@ -266,18 +263,6 @@ export class ReactiveTTLMap<K extends string, V> {return true;}- delete(key: K): boolean {- return this.entries.delete(key);- }-- clear(): void {- this.entries.clear();- }-- get size(): number {- return this.entries.size;- }-prune(): number {const now = Date.now();@@ -293,6 +278,21 @@ export class ReactiveTTLMap<K extends string, V> {return pruned;}+ set(key: K, value: V, customTtlMs?: number): void {+ if (this.entries.size >= this.maxEntries && !this.entries.has(key)) {+ this.evictOldest();+ }++ const ttl = customTtlMs ?? this.ttlMs;+ const now = Date.now();++ this.entries.set(key, {+ expiresAt: now + ttl,+ lastAccessed: now,+ value+ });+ }+private evictOldest(): void {let oldestKey: K | null = null;let oldestTime = Infinity;diff --git a/tools/ui/src/lib/utils/chat-form-input-rich-tokenizer.ts b/tools/ui/src/lib/utils/chat-form-input-rich-tokenizer.tsindex c09afd018b..626b10b29b 100644--- a/tools/ui/src/lib/utils/chat-form-input-rich-tokenizer.ts+++ b/tools/ui/src/lib/utils/chat-form-input-rich-tokenizer.ts@@ -38,7 +38,7 @@ import {SETTINGS_KEYS} from '$lib/constants';import { BooleanString, ChatFormInputRichTokenKind } from '$lib/enums';-import { settingsStore } from '$lib/stores/settings.svelte';+import { settingsStore } from '$lib/stores/settings/index.svelte';import { toolsStore } from '$lib/stores/tools.svelte';import type { ChatFormInputRichToken } from '$lib/types/chat-form-input-rich';diff --git a/tools/ui/src/lib/utils/convert-files-to-extra.ts b/tools/ui/src/lib/utils/convert-files-to-extra.tsindex e348f25fe9..735e91c44a 100644--- a/tools/ui/src/lib/utils/convert-files-to-extra.ts+++ b/tools/ui/src/lib/utils/convert-files-to-extra.ts@@ -4,8 +4,8 @@ import { isLikelyTextFile, readFileAsText } from './text-files';import { isWebpMimeType, webpBase64UrlToPngDataURL } from './webp-to-png';import { SETTINGS_KEYS } from '$lib/constants';import { AttachmentType, FileTypeCategory, SpecialFileType } from '$lib/enums';-import { modelsStore } from '$lib/stores/models.svelte';-import { settingsStore } from '$lib/stores/settings.svelte';+import { modelsStore } from '$lib/stores/models/index.svelte';+import { settingsStore } from '$lib/stores/settings/index.svelte';import type { ChatUploadedFile, DatabaseMessageExtra, FileProcessingResult } from '$lib/types';import { getFileTypeCategory } from '$lib/utils';import { toast } from 'svelte-sonner';@@ -112,7 +112,7 @@ export async function parseFilesToMessageExtras(const currentConfig = settingsStore.config;// Use per-model vision check for router modeconst hasVisionSupport = activeModelId- ? modelsStore.modelSupportsVision(activeModelId)+ ? modelsStore.props.modelSupportsVision(activeModelId): false;// Force PDF-to-text for non-vision modelsdiff --git a/tools/ui/src/lib/utils/index.ts b/tools/ui/src/lib/utils/index.tsindex 239f9f5724..079cdc871c 100644--- a/tools/ui/src/lib/utils/index.ts+++ b/tools/ui/src/lib/utils/index.ts@@ -130,7 +130,7 @@ export { getImageErrorFallbackHtml } from './image-error-fallback';// SSE-with-JSON stream iterator (used by server tool streaming, decoupled// from chat.service.ts which embeds its own SSE parser for resume support)-export { parseSseJsonStream } from './sse';+export { extractSseDataPayload, parseSseJsonStream, splitSseRecords } from './sse';// Stream session identity (conversation-id based)export { streamIdentity } from './stream-identity';@@ -150,7 +150,10 @@ export {getResourceIcon,getResourceTextContent,getResourceBlobContent,- downloadResourceContent+ downloadResourceContent,+ getMcpIconUrl,+ getMcpServerFaviconFallback,+ getMcpServerLabel} from './mcp';// URI Template utilitiesdiff --git a/tools/ui/src/lib/utils/mcp.ts b/tools/ui/src/lib/utils/mcp.tsindex 61d5f8a9a5..c60a59e80e 100644--- a/tools/ui/src/lib/utils/mcp.ts+++ b/tools/ui/src/lib/utils/mcp.ts@@ -1,3 +1,4 @@+import { extractRootDomain } from './url';import {AlertTriangle,Code,@@ -12,8 +13,10 @@ import {CODE_FILE_EXTENSION_REGEX,DEFAULT_RESOURCE_FILENAME,DISPLAY_NAME_SEPARATOR_REGEX,+ EXPECTED_THEMED_ICON_PAIR_COUNT,FILE_EXTENSION_REGEX,IMAGE_FILE_EXTENSION_REGEX,+ MCP_ALLOWED_ICON_MIME_TYPES,MCP_SERVER_ID_PREFIX,MCP_SSE,MIME_TYPE_PREFIXES,@@ -24,8 +27,22 @@ import {TEXT_FILE_EXTENSION_REGEX,URI_PATTERNS} from '$lib/constants';-import { MCPLogLevel, MCPTransportType, MimeTypeText, UrlProtocol } from '$lib/enums';-import type { MCPResourceContent, MCPResourceInfo, MCPServerSettingsEntry } from '$lib/types';+import {+ ColorMode,+ HealthCheckStatus,+ MCPLogLevel,+ MCPTransportType,+ MimeTypeText,+ UrlProtocol+} from '$lib/enums';+import type {+ HealthCheckState,+ MCPResourceContent,+ MCPResourceIcon,+ MCPResourceInfo,+ MCPServerDisplayInfo,+ MCPServerSettingsEntry+} from '$lib/types';import type { MimeTypeUnion } from '$lib/types/common';import type { Component } from 'svelte';@@ -316,3 +333,132 @@ export function downloadResourceContent(document.body.removeChild(a);URL.revokeObjectURL(url);}++/**+ * Validates that an icon URI uses a safe scheme (https: or data:).+ */+function isValidMcpIconUri(src: string): boolean {+ try {+ if (src.startsWith(UrlProtocol.DATA)) return true;++ const url = new URL(src);++ return url.protocol === UrlProtocol.HTTPS;+ } catch {+ return false;+ }+}++/**+ * Selects the best icon URL from an MCP icons array.+ * Follows security guidelines from the MCP specification:+ * - Only allows https: and data: URIs+ * - Filters to supported MIME types+ *+ * Selection priority:+ * 1. Icon matching the current color scheme (dark/light)+ * 2. Universal icon (no theme specified); if exactly 2, assumes [0]=light, [1]=dark+ * 3. First valid icon as last resort+ */+export function getMcpIconUrl(icons: MCPResourceIcon[] | undefined, isDark = false): string | null {+ if (!icons?.length) return null;++ const validIcons = icons.filter((icon) => {+ if (!icon.src || !isValidMcpIconUri(icon.src)) return false;++ if (icon.mimeType && !MCP_ALLOWED_ICON_MIME_TYPES.has(icon.mimeType)) return false;++ return true;+ });++ if (validIcons.length === 0) return null;++ const preferredTheme = isDark ? ColorMode.DARK : ColorMode.LIGHT;+ // 1. Prefer icon explicitly matching the current color scheme+ const themedIcon = validIcons.find((icon) => icon.theme === preferredTheme);++ if (themedIcon) return themedIcon.src;++ // 2. Handle universal icons (no theme specified)+ const universalIcons = validIcons.filter((icon) => !icon.theme);++ if (universalIcons.length === EXPECTED_THEMED_ICON_PAIR_COUNT) {+ // Heuristic: two theme-less icons → assume [0] = light, [1] = dark+ return universalIcons[isDark ? 1 : 0].src;+ }++ if (universalIcons.length > 0) {+ return universalIcons[0].src;+ }++ // 3. Last resort: use opposite-theme icon+ return validIcons[0].src;+}++/**+ * Construct a fallback favicon URL from the MCP server URL.+ * e.g. https://mcp.example.com/sse -> https://example.com/favicon.ico+ */+export function getMcpServerFaviconFallback(serverUrl: string): string | null {+ try {+ const url = new URL(serverUrl);+ const rootDomain = extractRootDomain(url);++ if (!rootDomain) return null;++ const origin = `${url.protocol}//${rootDomain}`;+ const candidates = ['favicon.ico', 'favicon.png'];++ for (const path of candidates) {+ const faviconUrl = `${origin}/${path}`;++ if (isValidMcpIconUri(faviconUrl)) {+ return faviconUrl;+ }+ }+ } catch {+ // Invalid URL, return null+ }++ return null;+}++/**+ * Resolves the raw label for a server: user-defined display name first,+ * then server-reported title or name when the health check succeeded,+ * then the configured name (admin baseline or legacy data), then URL.+ */+function getMcpServerBaseLabel(+ server: MCPServerDisplayInfo,+ healthState?: HealthCheckState+): string {+ if (server.displayName) return server.displayName;++ if (healthState?.status === HealthCheckStatus.SUCCESS)+ return (+ healthState.serverInfo?.title || healthState.serverInfo?.name || server.name || server.url+ );++ return server.name || server.url;+}++/**+ * Returns the display label for a server, suffixed with a positional+ * counter when several configured servers resolve to the same base label+ * (e.g. two endpoints of the same host reporting an identical name).+ * Numbering follows config order, so it is stable across renders.+ */+export function getMcpServerLabel(+ server: MCPServerDisplayInfo,+ servers: MCPServerDisplayInfo[],+ healthChecks: Record<string, HealthCheckState>+): string {+ const label = getMcpServerBaseLabel(server, healthChecks[server.id]);+ const twins = servers.filter((s) => getMcpServerBaseLabel(s, healthChecks[s.id]) === label);++ if (twins.length < 2) return label;++ const position = twins.findIndex((s) => s.id === server.id);++ return position < 0 ? label : `${label} (${position + 1})`;+}diff --git a/tools/ui/src/lib/utils/process-uploaded-files.ts b/tools/ui/src/lib/utils/process-uploaded-files.tsindex 49bdd2412f..e71371345c 100644--- a/tools/ui/src/lib/utils/process-uploaded-files.ts+++ b/tools/ui/src/lib/utils/process-uploaded-files.ts@@ -4,8 +4,8 @@ import { isSvgMimeType, svgBase64UrlToPngDataURL } from './svg-to-png';import { isWebpMimeType, webpBase64UrlToPngDataURL } from './webp-to-png';import { SETTINGS_KEYS } from '$lib/constants';import { FileTypeCategory } from '$lib/enums';-import { modelsStore } from '$lib/stores/models.svelte';-import { settingsStore } from '$lib/stores/settings.svelte';+import { modelsStore } from '$lib/stores/models/index.svelte';+import { settingsStore } from '$lib/stores/settings/index.svelte';import { getFileTypeCategory } from '$lib/utils';import { toast } from 'svelte-sonner';@@ -108,7 +108,7 @@ export async function processFilesToChatUploaded(// Show suggestion toast if vision model is available but PDF as image is disabledconst hasVisionSupport = activeModelId- ? modelsStore.modelSupportsVision(activeModelId)+ ? modelsStore.props.modelSupportsVision(activeModelId): false;const currentConfig = settingsStore.config;diff --git a/tools/ui/src/lib/utils/source-history.ts b/tools/ui/src/lib/utils/source-history.tsindex 32995ae034..6228ae7e49 100644--- a/tools/ui/src/lib/utils/source-history.ts+++ b/tools/ui/src/lib/utils/source-history.ts@@ -12,9 +12,9 @@ export interface SourceHistoryEntry {}export class SourceHistory {- private undoStack: SourceHistoryEntry[] = [];- private redoStack: SourceHistoryEntry[] = [];private lastPush = 0;+ private redoStack: SourceHistoryEntry[] = [];+ private undoStack: SourceHistoryEntry[] = [];constructor(private limit = 100,@@ -32,24 +32,24 @@ export class SourceHistory {this.redoStack = [];}- undo(current: SourceHistoryEntry): SourceHistoryEntry | null {- const entry = this.undoStack.pop();+ redo(current: SourceHistoryEntry): SourceHistoryEntry | null {+ const entry = this.redoStack.pop();if (!entry) return null;- this.redoStack.push(current);- this.lastPush = 0; // the next edit after an undo starts a new group+ this.undoStack.push(current);+ this.lastPush = 0;return entry;}- redo(current: SourceHistoryEntry): SourceHistoryEntry | null {- const entry = this.redoStack.pop();+ undo(current: SourceHistoryEntry): SourceHistoryEntry | null {+ const entry = this.undoStack.pop();if (!entry) return null;- this.undoStack.push(current);- this.lastPush = 0;+ this.redoStack.push(current);+ this.lastPush = 0; // the next edit after an undo starts a new groupreturn entry;}diff --git a/tools/ui/src/lib/utils/sse.ts b/tools/ui/src/lib/utils/sse.tsindex 41d9a1152a..c984e77ee6 100644--- a/tools/ui/src/lib/utils/sse.ts+++ b/tools/ui/src/lib/utils/sse.ts@@ -25,6 +25,30 @@ export interface SseJsonEvent<T = unknown> {data: T;}+/**+ * Splits a raw SSE byte buffer into complete records on the blank-line+ * boundary, returning the leftover partial record separately. Shared by the+ * record-based consumers (parseSseJsonStream, models.service).+ */+export function splitSseRecords(buffer: string): { records: string[]; rest: string } {+ const parts = buffer.split(SSE_RECORD_SEPARATOR);++ return { records: parts.slice(0, -1), rest: parts[parts.length - 1] ?? '' };+}++/**+ * Extracts the joined `data:` payload from one SSE record (the data lines+ * concatenated with a newline), or an empty string when the record carries+ * no data lines. Used by models.service to parse status envelopes.+ */+export function extractSseDataPayload(record: string): string {+ return record+ .split(SSE_LINE_SEPARATOR)+ .filter((line) => line.startsWith(SSE_DATA_PREFIX))+ .map((line) => line.slice(SSE_DATA_PREFIX.length).trim())+ .join(SSE_LINE_SEPARATOR);+}+export async function* parseSseJsonStream<T = unknown>(response: Response,signal?: AbortSignal@@ -46,9 +70,9 @@ export async function* parseSseJsonStream<T = unknown>(if (done) break;buffer += decoder.decode(value, { stream: true });- const records = buffer.split(SSE_RECORD_SEPARATOR);+ const { records, rest } = splitSseRecords(buffer);- buffer = records.pop() ?? '';+ buffer = rest;for (const record of records) {if (!record) continue;diff --git a/tools/ui/src/routes/(chat)/+page.svelte b/tools/ui/src/routes/(chat)/+page.svelteindex 224d264c43..de8574e352 100644--- a/tools/ui/src/routes/(chat)/+page.svelte+++ b/tools/ui/src/routes/(chat)/+page.svelte@@ -47,8 +47,8 @@serverStore.isRouterMode &&!modelsStore.isModelLoaded(model.id)) {- modelsStore- .loadModel(model.id)+ modelsStore.status+ .load(model.id).catch((error) => console.error('Failed to load model:', error));}} catch (error) {@@ -77,7 +77,7 @@onMount(async () => {if (!conversationsStore.isInitialized) {- await conversationsStore.init();+ await conversationsStore.initialize();}conversationsStore.clearActiveConversation();diff --git a/tools/ui/src/routes/+layout.svelte b/tools/ui/src/routes/+layout.svelteindex 8314cd2a2d..f87bbe26a2 100644--- a/tools/ui/src/routes/+layout.svelte+++ b/tools/ui/src/routes/+layout.svelte@@ -216,11 +216,11 @@if (!serverStore.isRouterMode) return;untrack(() => {- modelsStore.subscribeStatus();+ modelsStore.status.subscribe();});return () => {- modelsStore.unsubscribeStatus();+ modelsStore.status.unsubscribe();};});diff --git a/tools/ui/tests/client/agentic-stream.perf.svelte.test.ts b/tools/ui/tests/client/agentic-stream.perf.svelte.test.tsindex 0b06d57a5b..b4d6df4538 100644--- a/tools/ui/tests/client/agentic-stream.perf.svelte.test.ts+++ b/tools/ui/tests/client/agentic-stream.perf.svelte.test.ts@@ -14,7 +14,7 @@ import { perfState } from './components/agentic-perf-state.svelte';import AgenticPerfWrapper from './components/AgenticPerfWrapper.svelte';import ChatMessagesPerfWrapper from './components/ChatMessagesPerfWrapper.svelte';import { MessageRole } from '$lib/enums';-import { conversationsStore } from '$lib/stores/conversations.svelte';+import { conversationsStore } from '$lib/stores/conversations/index.svelte';import type { DatabaseMessage } from '$lib/types';import { tick } from 'svelte';import { describe, it } from 'vitest';diff --git a/tools/ui/tests/client/apikey-splash.svelte.test.ts b/tools/ui/tests/client/apikey-splash.svelte.test.tsindex bad7f6ccb0..b2705dd8ca 100644--- a/tools/ui/tests/client/apikey-splash.svelte.test.ts+++ b/tools/ui/tests/client/apikey-splash.svelte.test.ts@@ -1,5 +1,5 @@import { CONFIG_LOCALSTORAGE_KEY } from '$lib/constants';-import { settingsStore } from '$lib/stores/settings.svelte';+import { settingsStore } from '$lib/stores/settings/index.svelte';import { validateApiKey } from '$lib/utils/api-key-validation';import { beforeEach, describe, expect, it } from 'vitest';diff --git a/tools/ui/tests/client/chat-form-enter-code-block.svelte.test.ts b/tools/ui/tests/client/chat-form-enter-code-block.svelte.test.tsindex 485dc39655..3454170b6b 100644--- a/tools/ui/tests/client/chat-form-enter-code-block.svelte.test.ts+++ b/tools/ui/tests/client/chat-form-enter-code-block.svelte.test.ts@@ -7,7 +7,7 @@import ChatFormTestWrapper from './components/ChatFormTestWrapper.svelte';import { SETTINGS_KEYS } from '$lib/constants';-import { settingsStore } from '$lib/stores/settings.svelte';+import { settingsStore } from '$lib/stores/settings/index.svelte';import { tick } from 'svelte';import { beforeEach, describe, expect, it, vi } from 'vitest';import { userEvent } from 'vitest/browser';diff --git a/tools/ui/tests/client/components/ChatMessagesPerfWrapper.svelte b/tools/ui/tests/client/components/ChatMessagesPerfWrapper.svelteindex 504f685973..ab5cc38bc9 100644--- a/tools/ui/tests/client/components/ChatMessagesPerfWrapper.svelte+++ b/tools/ui/tests/client/components/ChatMessagesPerfWrapper.svelte@@ -4,7 +4,7 @@// toolMessages array) rather than a single message subtree.import ChatMessages from '$lib/components/app/chat/ChatMessages/ChatMessages.svelte';import * as Tooltip from '$lib/components/ui/tooltip';- import { conversationsStore } from '$lib/stores/conversations.svelte';+ import { conversationsStore } from '$lib/stores/conversations/index.svelte';</script><Tooltip.Provider>diff --git a/tools/ui/tests/client/mcp-display-name.svelte.test.ts b/tools/ui/tests/client/mcp-display-name.svelte.test.tsindex f17e08cf1b..7db0ffd42e 100644--- a/tools/ui/tests/client/mcp-display-name.svelte.test.ts+++ b/tools/ui/tests/client/mcp-display-name.svelte.test.ts@@ -1,6 +1,6 @@import { McpServerForm } from '$lib/components/app/mcp';-import { mcpStore } from '$lib/stores/mcp.svelte';-import { settingsStore } from '$lib/stores/settings.svelte';+import { mcpStore } from '$lib/stores/mcp/index.svelte';+import { settingsStore } from '$lib/stores/settings/index.svelte';import { beforeEach, describe, expect, it } from 'vitest';import { render } from 'vitest-browser-svelte';diff --git a/tools/ui/tests/client/sandbox.service.svelte.test.ts b/tools/ui/tests/client/sandbox.service.svelte.test.tsindex 7c0d7926f8..547e3ac1f2 100644--- a/tools/ui/tests/client/sandbox.service.svelte.test.ts+++ b/tools/ui/tests/client/sandbox.service.svelte.test.ts@@ -10,7 +10,7 @@ const run = (code: string, timeoutMs?: number) =>describe('sandbox service', () => {beforeEach(async () => {- const { settingsStore } = await import('$lib/stores/settings.svelte');+ const { settingsStore } = await import('$lib/stores/settings/index.svelte');settingsStore.config = {...settingsStore.config,diff --git a/tools/ui/tests/client/settings-registry-invariants.svelte.test.ts b/tools/ui/tests/client/settings-registry-invariants.svelte.test.tsindex 45af7e0d15..0ed6996b53 100644--- a/tools/ui/tests/client/settings-registry-invariants.svelte.test.ts+++ b/tools/ui/tests/client/settings-registry-invariants.svelte.test.ts@@ -1,7 +1,7 @@import { CONFIG_LOCALSTORAGE_KEY, SETTING_CONFIG_DEFAULT } from '$lib/constants';import { ParameterSyncService } from '$lib/services/parameter-sync.service';import { serverStore } from '$lib/stores/server.svelte';-import { settingsStore } from '$lib/stores/settings.svelte';+import { settingsStore } from '$lib/stores/settings/index.svelte';import type { SettingsConfigType } from '$lib/types';import { beforeEach, describe, expect, it } from 'vitest';diff --git a/tools/ui/tests/client/settings-render-keys-migration.svelte.test.ts b/tools/ui/tests/client/settings-render-keys-migration.svelte.test.tsindex 32f4ff3dd4..ce65aeb700 100644--- a/tools/ui/tests/client/settings-render-keys-migration.svelte.test.ts+++ b/tools/ui/tests/client/settings-render-keys-migration.svelte.test.ts@@ -6,7 +6,7 @@import { CONFIG_LOCALSTORAGE_KEY } from '$lib/constants';import { MigrationService } from '$lib/services/migration.service';-import { settingsStore } from '$lib/stores/settings.svelte';+import { settingsStore } from '$lib/stores/settings/index.svelte';import { beforeEach, describe, expect, it } from 'vitest';const RENDER_KEYS_MIGRATION_ID = 'render-keys-unfold-v1';diff --git a/tools/ui/tests/client/ui-settings-sync.svelte.test.ts b/tools/ui/tests/client/ui-settings-sync.svelte.test.tsindex 6dca891c85..ca9268e2e0 100644--- a/tools/ui/tests/client/ui-settings-sync.svelte.test.ts+++ b/tools/ui/tests/client/ui-settings-sync.svelte.test.ts@@ -1,6 +1,6 @@import { CONFIG_LOCALSTORAGE_KEY } from '$lib/constants';import { serverStore } from '$lib/stores/server.svelte';-import { settingsStore } from '$lib/stores/settings.svelte';+import { settingsStore } from '$lib/stores/settings/index.svelte';import { beforeEach, describe, expect, it } from 'vitest';function mockProps(uiSettings: Record<string, string | number | boolean>) {diff --git a/tools/ui/tests/client/update-message-in-place.svelte.test.ts b/tools/ui/tests/client/update-message-in-place.svelte.test.tsindex 65298b44b8..ea3b65d0cc 100644--- a/tools/ui/tests/client/update-message-in-place.svelte.test.ts+++ b/tools/ui/tests/client/update-message-in-place.svelte.test.ts@@ -8,7 +8,7 @@// -> 3.07ms at 40). Mutating in place keeps it flat.import { MessageRole } from '$lib/enums';-import { conversationsStore } from '$lib/stores/conversations.svelte';+import { conversationsStore } from '$lib/stores/conversations/index.svelte';import type { DatabaseMessage } from '$lib/types';import { describe, expect, it } from 'vitest';diff --git a/tools/ui/tests/stories/ChatMessage.stories.svelte b/tools/ui/tests/stories/ChatMessage.stories.svelteindex 84fee2ea1c..e9bf7a6f6f 100644--- a/tools/ui/tests/stories/ChatMessage.stories.svelte+++ b/tools/ui/tests/stories/ChatMessage.stories.svelte@@ -105,7 +105,7 @@message: userMessage}}play={async () => {- const { settingsStore } = await import('$lib/stores/settings.svelte');+ const { settingsStore } = await import('$lib/stores/settings/index.svelte');settingsStore.updateConfig('showRawOutputSwitch', false);}}@@ -118,7 +118,7 @@message: assistantMessage}}play={async () => {- const { settingsStore } = await import('$lib/stores/settings.svelte');+ const { settingsStore } = await import('$lib/stores/settings/index.svelte');settingsStore.updateConfig('showRawOutputSwitch', false);}}@@ -131,7 +131,7 @@message: assistantWithReasoning}}play={async () => {- const { settingsStore } = await import('$lib/stores/settings.svelte');+ const { settingsStore } = await import('$lib/stores/settings/index.svelte');settingsStore.updateConfig('showRawOutputSwitch', false);}}@@ -144,7 +144,7 @@message: rawOutputMessage}}play={async () => {- const { settingsStore } = await import('$lib/stores/settings.svelte');+ const { settingsStore } = await import('$lib/stores/settings/index.svelte');settingsStore.updateConfig('showRawOutputSwitch', true);}}@@ -157,7 +157,7 @@}}asChildplay={async () => {- const { settingsStore } = await import('$lib/stores/settings.svelte');+ const { settingsStore } = await import('$lib/stores/settings/index.svelte');settingsStore.updateConfig('showRawOutputSwitch', false);// Phase 1: Stream reasoning content in chunks@@ -213,11 +213,11 @@message: processingMessage}}play={async () => {- const { settingsStore } = await import('$lib/stores/settings.svelte');+ const { settingsStore } = await import('$lib/stores/settings/index.svelte');settingsStore.updateConfig('showRawOutputSwitch', false);// Import the chat store to simulate loading state- const { chatStore } = await import('$lib/stores/chat.svelte');+ const { chatStore } = await import('$lib/stores/chat/index.svelte');// Set loading state to true to trigger the processing UIchatStore.isLoading = true;diff --git a/tools/ui/tests/stories/ModelsSelector.stories.svelte b/tools/ui/tests/stories/ModelsSelector.stories.svelteindex d63300cb21..7018d09e7b 100644--- a/tools/ui/tests/stories/ModelsSelector.stories.svelte+++ b/tools/ui/tests/stories/ModelsSelector.stories.svelte@@ -4,7 +4,7 @@import ModelsSelectorOption from '$lib/components/app/models/ModelsSelectorOption.svelte';import type { GroupedModelOptions, ModelItem } from '$lib/components/app/models/utils';import { ServerModelStatus } from '$lib/enums';- import { modelsStore } from '$lib/stores/models.svelte';+ import { modelsStore } from '$lib/stores/models/index.svelte';const { Story } = defineMeta({parameters: {diff --git a/tools/ui/tests/stories/SidebarNavigation.stories.svelte b/tools/ui/tests/stories/SidebarNavigation.stories.svelteindex 6359926012..ddaa90485d 100644--- a/tools/ui/tests/stories/SidebarNavigation.stories.svelte+++ b/tools/ui/tests/stories/SidebarNavigation.stories.svelte@@ -53,7 +53,7 @@asChildname="Default"play={async () => {- const { conversationsStore } = await import('$lib/stores/conversations.svelte');+ const { conversationsStore } = await import('$lib/stores/conversations/index.svelte');waitFor(() =>setTimeout(() => {@@ -71,7 +71,7 @@asChildname="SearchActive"play={async ({ userEvent }) => {- const { conversationsStore } = await import('$lib/stores/conversations.svelte');+ const { conversationsStore } = await import('$lib/stores/conversations/index.svelte');waitFor(() =>setTimeout(() => {@@ -98,7 +98,7 @@name="Empty"play={async () => {// Mock empty conversations store- const { conversationsStore } = await import('$lib/stores/conversations.svelte');+ const { conversationsStore } = await import('$lib/stores/conversations/index.svelte');conversationsStore.conversations = [];}}diff --git a/tools/ui/tests/stories/fixtures/storybook-mocks.ts b/tools/ui/tests/stories/fixtures/storybook-mocks.tsindex 7366746904..ac9fb63cd0 100644--- a/tools/ui/tests/stories/fixtures/storybook-mocks.ts+++ b/tools/ui/tests/stories/fixtures/storybook-mocks.ts@@ -1,4 +1,4 @@-import { modelsStore } from '$lib/stores/models.svelte';+import { modelsStore } from '$lib/stores/models/index.svelte';import { serverStore } from '$lib/stores/server.svelte';/**diff --git a/tools/ui/tests/unit/chat-activity.test.ts b/tools/ui/tests/unit/chat-activity.test.tsnew file mode 100644index 0000000000..051648ead6--- /dev/null+++ b/tools/ui/tests/unit/chat-activity.test.ts@@ -0,0 +1,77 @@+import { ChatActivityStore } from '$lib/stores/chat/activity.svelte';+import { beforeEach, describe, expect, it } from 'vitest';++describe('ChatActivityStore', () => {+ let store: ChatActivityStore;++ beforeEach(() => {+ store = new ChatActivityStore();+ });++ it('starts with no local or remote activity', () => {+ expect(store.loadingConvs).toEqual([]);+ expect(store.isLocal('a')).toBe(false);+ expect(store.isRemote('a')).toBe(false);+ });++ it('markLocal adds a conv to the local set and the loading union', () => {+ store.markLocal('a');++ expect(store.isLocal('a')).toBe(true);+ expect(store.isRemote('a')).toBe(false);+ expect(store.loadingConvs).toEqual(['a']);+ });++ it('localEnded removes a local conv', () => {+ store.markLocal('a');+ store.localEnded('a');++ expect(store.isLocal('a')).toBe(false);+ expect(store.loadingConvs).toEqual([]);+ });++ it('localEnded also drops a stale remote hint for the same conv', () => {+ store.markLocal('a');+ store.applyRemoteSnapshot(['a']);+ expect(store.isRemote('a')).toBe(true);++ store.localEnded('a');++ expect(store.isLocal('a')).toBe(false);+ expect(store.isRemote('a')).toBe(false);+ expect(store.loadingConvs).toEqual([]);+ });++ it('applyRemoteSnapshot adds remote convs and unions them with local', () => {+ store.markLocal('local');+ store.applyRemoteSnapshot(['remote']);++ expect(store.isRemote('remote')).toBe(true);+ expect(store.loadingConvs).toEqual(['local', 'remote']);+ });++ it('applyRemoteSnapshot removes remote convs missing from the snapshot', () => {+ store.applyRemoteSnapshot(['a', 'b']);+ store.applyRemoteSnapshot(['a']);++ expect(store.isRemote('a')).toBe(true);+ expect(store.isRemote('b')).toBe(false);+ expect(store.loadingConvs).toEqual(['a']);+ });++ it('applyRemoteSnapshot keeps local convs absent from the snapshot', () => {+ store.markLocal('local');+ store.applyRemoteSnapshot(['remote']);+ store.applyRemoteSnapshot([]);++ expect(store.isLocal('local')).toBe(true);+ expect(store.loadingConvs).toEqual(['local']);+ });++ it('loadingConvs does not duplicate a conv that is both local and remote', () => {+ store.markLocal('a');+ store.applyRemoteSnapshot(['a']);++ expect(store.loadingConvs).toEqual(['a']);+ });+});diff --git a/tools/ui/tests/unit/mcp-override-fallback.test.ts b/tools/ui/tests/unit/mcp-override-fallback.test.tsindex 47d6ac2536..12ed6e4c4b 100644--- a/tools/ui/tests/unit/mcp-override-fallback.test.ts+++ b/tools/ui/tests/unit/mcp-override-fallback.test.ts@@ -46,7 +46,7 @@ describe('conversationsStore MCP override resolution', () => {// The settings store constructor bails in node env (no `browser`),// so seed the config directly. The shape mirrors what `loadConfig`// would build from localStorage.- const { settingsStore } = await import('$lib/stores/settings.svelte');+ const { settingsStore } = await import('$lib/stores/settings/index.svelte');const raw = localStorage.getItem(CONFIG_LOCALSTORAGE_KEY) ?? '{}';const saved = JSON.parse(raw) as Record<string, unknown>;@@ -73,77 +73,77 @@ describe('conversationsStore MCP override resolution', () => {}it('inherits server.enabled when no conversation is active', async () => {- const { conversationsStore } = await import('$lib/stores/conversations.svelte');+ const { conversationsStore } = await import('$lib/stores/conversations/index.svelte');conversationsStore.activeConversation = null;- expect(conversationsStore.isMcpServerEnabledForChat('alpha')).toBe(false);- expect(conversationsStore.isMcpServerEnabledForChat('bravo')).toBe(true);+ expect(conversationsStore.preferences.isMcpServerEnabledForChat('alpha')).toBe(false);+ expect(conversationsStore.preferences.isMcpServerEnabledForChat('bravo')).toBe(true);});it('inherits server.enabled on a newly created chat with no overrides', async () => {- const { conversationsStore } = await import('$lib/stores/conversations.svelte');+ const { conversationsStore } = await import('$lib/stores/conversations/index.svelte');conversationsStore.activeConversation = makeConversation();// Empty override list: must fall back to global server.enabled, not all-off.- expect(conversationsStore.isMcpServerEnabledForChat('alpha')).toBe(false);- expect(conversationsStore.isMcpServerEnabledForChat('bravo')).toBe(true);+ expect(conversationsStore.preferences.isMcpServerEnabledForChat('alpha')).toBe(false);+ expect(conversationsStore.preferences.isMcpServerEnabledForChat('bravo')).toBe(true);});it('inherits server.enabled on a newly created chat when overrides is undefined', async () => {- const { conversationsStore } = await import('$lib/stores/conversations.svelte');+ const { conversationsStore } = await import('$lib/stores/conversations/index.svelte');conversationsStore.activeConversation = makeConversation(undefined);- expect(conversationsStore.isMcpServerEnabledForChat('alpha')).toBe(false);- expect(conversationsStore.isMcpServerEnabledForChat('bravo')).toBe(true);+ expect(conversationsStore.preferences.isMcpServerEnabledForChat('alpha')).toBe(false);+ expect(conversationsStore.preferences.isMcpServerEnabledForChat('bravo')).toBe(true);});it('uses explicit per-chat overrides, with defaults for non-overridden servers', async () => {- const { conversationsStore } = await import('$lib/stores/conversations.svelte');+ const { conversationsStore } = await import('$lib/stores/conversations/index.svelte');// Override flips bravo off for this chat, alpha keeps its global default.conversationsStore.activeConversation = makeConversation([{ enabled: false, serverId: 'bravo' }]);- expect(conversationsStore.isMcpServerEnabledForChat('alpha')).toBe(false);- expect(conversationsStore.isMcpServerEnabledForChat('bravo')).toBe(false);+ expect(conversationsStore.preferences.isMcpServerEnabledForChat('alpha')).toBe(false);+ expect(conversationsStore.preferences.isMcpServerEnabledForChat('bravo')).toBe(false);});it('getAllMcpServerOverrides returns a complete list merged from defaults', async () => {- const { conversationsStore } = await import('$lib/stores/conversations.svelte');+ const { conversationsStore } = await import('$lib/stores/conversations/index.svelte');conversationsStore.activeConversation = makeConversation([{ enabled: true, serverId: 'alpha' }]);- expect(conversationsStore.getAllMcpServerOverrides()).toEqual([+ expect(conversationsStore.preferences.getAllMcpServerOverrides()).toEqual([{ enabled: true, serverId: 'alpha' },{ enabled: true, serverId: 'bravo' }]);});it('getAllMcpServerOverrides falls back to defaults when there are no explicit overrides', async () => {- const { conversationsStore } = await import('$lib/stores/conversations.svelte');+ const { conversationsStore } = await import('$lib/stores/conversations/index.svelte');conversationsStore.activeConversation = makeConversation();- expect(conversationsStore.getAllMcpServerOverrides()).toEqual([+ expect(conversationsStore.preferences.getAllMcpServerOverrides()).toEqual([{ enabled: false, serverId: 'alpha' },{ enabled: true, serverId: 'bravo' }]);});it('getMcpServerOverride returns the global default when the server has no explicit override', async () => {- const { conversationsStore } = await import('$lib/stores/conversations.svelte');+ const { conversationsStore } = await import('$lib/stores/conversations/index.svelte');conversationsStore.activeConversation = makeConversation([{ enabled: true, serverId: 'alpha' }]);- expect(conversationsStore.getMcpServerOverride('bravo')).toEqual({+ expect(conversationsStore.preferences.getMcpServerOverride('bravo')).toEqual({enabled: true,serverId: 'bravo'});diff --git a/tools/ui/tests/unit/stream-resume.test.ts b/tools/ui/tests/unit/stream-resume.test.tsindex 43d89272ef..ce4eee9aa7 100644--- a/tools/ui/tests/unit/stream-resume.test.ts+++ b/tools/ui/tests/unit/stream-resume.test.ts@@ -92,6 +92,67 @@ describe('ChatService stream resume', () => {expect(ChatService.getStreamState('conv-a')!.model).toBe('model-y');});+ describe('throttled saves (per-chunk path)', () => {+ // unique conversation ids: the throttle tracker is module state and+ // outlives beforeEach's localStorage.clear()+ let counter = 0;++ const freshConv = () => `conv-throttle-${++counter}`;++ it('writes immediately when no write was recorded for the conversation', () => {+ const conv = freshConv();++ ChatService.saveStreamStateThrottled(conv, 100);+ expect(ChatService.getStreamState(conv)!.bytesReceived).toBe(100);+ });++ it('holds a save pending when it lands inside the interval, flush forces it out', () => {+ const conv = freshConv();++ ChatService.saveStreamStateThrottled(conv, 100);+ ChatService.saveStreamStateThrottled(conv, 200);+ expect(ChatService.getStreamState(conv)!.bytesReceived).toBe(100);++ ChatService.flushStreamState(conv);+ expect(ChatService.getStreamState(conv)!.bytesReceived).toBe(200);+ });++ it('flush is a no-op when nothing is pending', () => {+ const conv = freshConv();++ ChatService.saveStreamStateThrottled(conv, 100);+ ChatService.flushStreamState(conv);+ ChatService.flushStreamState(conv);+ expect(ChatService.getStreamState(conv)!.bytesReceived).toBe(100);+ });++ it('an immediate save resets the throttle window', () => {+ const conv = freshConv();++ ChatService.saveStreamStateThrottled(conv, 100);+ ChatService.saveStreamState(conv, 150);+ expect(ChatService.getStreamState(conv)!.bytesReceived).toBe(150);++ ChatService.saveStreamStateThrottled(conv, 200);+ expect(ChatService.getStreamState(conv)!.bytesReceived).toBe(150);++ ChatService.flushStreamState(conv);+ expect(ChatService.getStreamState(conv)!.bytesReceived).toBe(200);+ });++ it('clearStreamState drops the pending throttled state', () => {+ const conv = freshConv();++ ChatService.saveStreamStateThrottled(conv, 100);+ ChatService.saveStreamStateThrottled(conv, 200);+ ChatService.clearStreamState(conv);+ expect(ChatService.getStreamState(conv)).toBeNull();++ ChatService.flushStreamState(conv);+ expect(ChatService.getStreamState(conv)).toBeNull();+ });+ });+describe('resumeStreamIdentity', () => {it('appends the persisted model so the resume key matches the frozen POST identity', () => {ChatService.saveStreamState('conv-a', 10, 'model-x');