@burtson-labs/bandit-engine 2.0.39 → 2.0.41

package/dist/management/management.js

@@ -12,11 +12,11 @@ var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __copyProps = (to, from9, except, desc) => {
-  if (from9 && typeof from9 === "object" || typeof from9 === "function") {
-    for (let key of __getOwnPropNames(from9))
+var __copyProps = (to, from10, except, desc) => {
+  if (from10 && typeof from10 === "object" || typeof from10 === "function") {
+    for (let key of __getOwnPropNames(from10))
       if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from9[key], enumerable: !(desc = __getOwnPropDesc(from9, key)) || desc.enumerable });
+        __defProp(to, key, { get: () => from10[key], enumerable: !(desc = __getOwnPropDesc(from10, key)) || desc.enumerable });
   }
   return to;
 };
@@ -1656,57 +1656,15 @@ var init_gateway_service = __esm({
        */
       chat(request) {
         const endpoint = request.provider === "ollama" ? `/api/${request.provider}/chat` : request.provider ? `/api/${request.provider}/chat/completions` : "/api/chat/completions";
-        const url = `${this._baseUrl}${endpoint}`;
-        debugLogger.debug(`Gateway chat request to ${url} with provider: ${request.provider || "default"}`, {
-          model: request.model,
-          messageCount: request.messages.length,
-          hasImages: !!(request.images && request.images.length > 0),
-          imageCount: request.images?.length || 0
-        });
-        const requestBody = { ...request, stream: request.stream !== false };
+        const fallbackEndpoint = request.provider === "bandit" ? "/completions" : null;
+        const normalizedModel = request.provider === "bandit" ? (() => {
+          const trimmed = (request.model ?? "").replace(/^bandit:/, "").trim();
+          return trimmed !== "" ? trimmed : "bandit-core-1";
+        })() : request.model;
+        const requestBody = { ...request, model: normalizedModel, stream: request.stream !== false };
         return new import_rxjs6.Observable((observer) => {
           const controller = new AbortController();
-          const task = fetch(url, {
-            method: "POST",
-            headers: this._getHeaders(),
-            body: JSON.stringify(requestBody),
-            signal: controller.signal
-          });
-          task.then(async (response) => {
-            debugLogger.debug(`Gateway chat response status: ${response.status} for provider: ${request.provider || "default"}`);
-            if (!response.ok) {
-              let errorText = "";
-              let errorData = null;
-              try {
-                errorText = await response.text();
-                debugLogger.error("GatewayService chat error response body", {
-                  status: response.status,
-                  statusText: response.statusText,
-                  url: response.url,
-                  body: errorText
-                });
-              } catch (readError) {
-                debugLogger.error("GatewayService chat failed to read error response body", { error: readError });
-                errorText = `Request failed with status ${response.status}`;
-              }
-              try {
-                errorData = JSON.parse(errorText);
-                debugLogger.error("GatewayService chat parsed error payload", errorData);
-              } catch (parseError) {
-                debugLogger.error("GatewayService chat error payload was not valid JSON");
-                errorData = { message: errorText };
-              }
-              const error = this._createHttpError(
-                `POST ${url} failed: ${response.status} ${response.statusText ?? ""}`,
-                {
-                  status: response.status,
-                  statusText: response.statusText ?? "",
-                  data: errorData,
-                  url
-                }
-              );
-              throw error;
-            }
+          const handleStreamingResponse = async (response) => {
             const reader = response.body?.getReader();
             const decoder = new TextDecoder();
             let buffer = "";
@@ -1781,14 +1739,75 @@ var init_gateway_service = __esm({
               }).catch((err) => observer.error(err));
             };
             read();
-          }).catch((err) => {
-            debugLogger.error("GatewayService chat fetch error", {
-              error: err,
-              url,
-              provider: request.provider
+          };
+          const sendRequest = (targetEndpoint, allowFallback) => {
+            const url = `${this._baseUrl}${targetEndpoint}`;
+            debugLogger.debug(`Gateway chat request to ${url} with provider: ${request.provider || "default"}`, {
+              model: normalizedModel,
+              messageCount: request.messages.length,
+              hasImages: !!(request.images && request.images.length > 0),
+              imageCount: request.images?.length || 0
             });
-            observer.error(err);
-          });
+            fetch(url, {
+              method: "POST",
+              headers: this._getHeaders(),
+              body: JSON.stringify(requestBody),
+              signal: controller.signal
+            }).then(async (response) => {
+              debugLogger.debug(`Gateway chat response status: ${response.status} for provider: ${request.provider || "default"}`);
+              if (response.status === 404 && allowFallback && fallbackEndpoint) {
+                debugLogger.warn("GatewayService chat endpoint returned 404, attempting fallback route", {
+                  provider: request.provider,
+                  attemptedEndpoint: targetEndpoint,
+                  fallbackEndpoint
+                });
+                sendRequest(fallbackEndpoint, false);
+                return;
+              }
+              if (!response.ok) {
+                let errorText = "";
+                let errorData = null;
+                try {
+                  errorText = await response.text();
+                  debugLogger.error("GatewayService chat error response body", {
+                    status: response.status,
+                    statusText: response.statusText,
+                    url: response.url,
+                    body: errorText
+                  });
+                } catch (readError) {
+                  debugLogger.error("GatewayService chat failed to read error response body", { error: readError });
+                  errorText = `Request failed with status ${response.status}`;
+                }
+                try {
+                  errorData = JSON.parse(errorText);
+                  debugLogger.error("GatewayService chat parsed error payload", errorData);
+                } catch (parseError) {
+                  debugLogger.error("GatewayService chat error payload was not valid JSON");
+                  errorData = { message: errorText };
+                }
+                const error = this._createHttpError(
+                  `POST ${url} failed: ${response.status} ${response.statusText ?? ""}`,
+                  {
+                    status: response.status,
+                    statusText: response.statusText ?? "",
+                    data: errorData,
+                    url
+                  }
+                );
+                throw error;
+              }
+              await handleStreamingResponse(response);
+            }).catch((err) => {
+              debugLogger.error("GatewayService chat fetch error", {
+                error: err,
+                url,
+                provider: request.provider
+              });
+              observer.error(err);
+            });
+          };
+          sendRequest(endpoint, true);
           return () => {
             try {
               controller.abort();
@@ -1803,12 +1822,18 @@ var init_gateway_service = __esm({
       generate(request) {
         const endpoint = request.provider ? `/api/${request.provider}/generate` : "/api/generate";
         const url = `${this._baseUrl}${endpoint}`;
-        debugLogger.debug(`Gateway generate request to ${url} with provider: ${request.provider || "default"}`);
+        const normalizedModel = request.provider === "bandit" ? (() => {
+          const trimmed = (request.model ?? "").replace(/^bandit:/, "").trim();
+          return trimmed !== "" ? trimmed : "bandit-core-1";
+        })() : request.model;
+        debugLogger.debug(`Gateway generate request to ${url} with provider: ${request.provider || "default"}`, {
+          model: normalizedModel
+        });
         return new import_rxjs6.Observable((observer) => {
           const task = fetch(url, {
             method: "POST",
             headers: this._getHeaders(),
-            body: JSON.stringify({ ...request, stream: request.stream !== false })
+            body: JSON.stringify({ ...request, model: normalizedModel, stream: request.stream !== false })
           });
           task.then(async (response) => {
             if (!response.ok) {
@@ -1915,18 +1940,46 @@ var init_gateway_service = __esm({
         );
       }
       _getHeaders() {
-        const token = this._tokenFactory();
+        const rawToken2 = this._tokenFactory();
         const headers = {
           "Content-Type": "application/json"
         };
-        if (token && token.trim() !== "") {
-          headers["Authorization"] = `Bearer ${token}`;
-          debugLogger.debug("Authorization header set with token");
-        } else {
+        if (!rawToken2) {
           debugLogger.warn("GatewayService: No token found, skipping Authorization header");
+          return headers;
+        }
+        const token = rawToken2.trim();
+        if (token === "") {
+          debugLogger.warn("GatewayService: Token factory returned empty string");
+          return headers;
+        }
+        if (/^(Bearer|ApiKey)\s+/i.test(token)) {
+          headers["Authorization"] = token;
+          debugLogger.debug("GatewayService: Authorization header set with explicit scheme");
+          return headers;
         }
+        if (this._isLikelyBanditApiKey(token)) {
+          headers["Authorization"] = `ApiKey ${token}`;
+          headers["X-Burtson-Api-Key"] = token;
+          debugLogger.debug("GatewayService: Authorization header set using API key");
+          return headers;
+        }
+        if (this._isLikelyJwt(token)) {
+          headers["Authorization"] = `Bearer ${token}`;
+          debugLogger.debug("GatewayService: Authorization header set using bearer token");
+          return headers;
+        }
+        headers["Authorization"] = `Bearer ${token}`;
+        debugLogger.debug("GatewayService: Authorization header defaulted to bearer scheme");
         return headers;
       }
+      _isLikelyJwt(token) {
+        const segments = token.split(".");
+        return segments.length === 3 && segments.every((segment) => segment.length > 0);
+      }
+      _isLikelyBanditApiKey(value) {
+        return /^bai_[a-z0-9]{10,}$/i.test(value);
+      }
       /**
        * Submit feedback to the gateway API
        */
@@ -2406,6 +2459,112 @@ var init_ollama_gateway_service = __esm({
   }
 });
 
+// src/services/gateway/bandit-gateway.service.ts
+var import_operators5, normalizeBanditModel, isGatewayMessageContent, normalizeBanditMessages, BanditAIGatewayService;
+var init_bandit_gateway_service = __esm({
+  "src/services/gateway/bandit-gateway.service.ts"() {
+    "use strict";
+    init_gateway_service();
+    import_operators5 = require("rxjs/operators");
+    init_debugLogger();
+    normalizeBanditModel = (model) => {
+      if (typeof model !== "string" || model.trim() === "") {
+        return "bandit-core-1";
+      }
+      const normalized = model.replace(/^bandit:/, "").trim();
+      return normalized === "" ? "bandit-core-1" : normalized;
+    };
+    isGatewayMessageContent = (value) => {
+      if (!value || typeof value !== "object") return false;
+      const candidate = value;
+      if (candidate.type !== "text" && candidate.type !== "image_url") {
+        return false;
+      }
+      if (candidate.type === "text") {
+        return typeof candidate.text === "string";
+      }
+      if (candidate.type === "image_url") {
+        return !!candidate.image_url && typeof candidate.image_url.url === "string";
+      }
+      return false;
+    };
+    normalizeBanditMessages = (messages) => messages.map((message) => {
+      const content = message.content;
+      if (typeof content === "string") {
+        return { role: message.role, content };
+      }
+      if (Array.isArray(content)) {
+        const filtered = content.filter(isGatewayMessageContent);
+        if (filtered.length === 0) {
+          return { role: message.role, content: JSON.stringify(content) };
+        }
+        return {
+          role: message.role,
+          content: filtered
+        };
+      }
+      return { role: message.role, content: content != null ? String(content) : "" };
+    });
+    BanditAIGatewayService = class {
+      _gatewayService;
+      constructor(gatewayUrl, tokenFactory) {
+        this._gatewayService = new GatewayService(gatewayUrl, tokenFactory);
+        debugLogger.info("BanditAIGatewayService initialized", { gatewayUrl });
+      }
+      async validateServiceAvailability(args) {
+        return this._gatewayService.validateServiceAvailability(args);
+      }
+      chat(request) {
+        const model = normalizeBanditModel(request.model);
+        const messages = normalizeBanditMessages(request.messages);
+        const gatewayRequest = {
+          ...request,
+          messages,
+          model,
+          provider: "bandit",
+          stream: request.stream
+        };
+        debugLogger.debug("Bandit Gateway chat request", {
+          model,
+          messageCount: request.messages.length,
+          stream: request.stream
+        });
+        return this._gatewayService.chat(gatewayRequest);
+      }
+      complete(prompt, options) {
+        const model = normalizeBanditModel(options.model);
+        const gatewayRequest = {
+          model,
+          prompt,
+          temperature: options.temperature,
+          max_tokens: options.max_tokens,
+          stream: options.stream,
+          stop: options.stop,
+          provider: "bandit"
+        };
+        debugLogger.debug("Bandit Gateway generate request", {
+          model,
+          promptLength: prompt.length,
+          stream: options.stream
+        });
+        return this._gatewayService.generate(gatewayRequest);
+      }
+      listModels() {
+        debugLogger.debug("Fetching Bandit models through gateway");
+        return this._gatewayService.listModelsByProvider("bandit");
+      }
+      getHealth() {
+        return this._gatewayService.getHealth().pipe(
+          (0, import_operators5.map)((health) => ({
+            ...health,
+            bandit_status: health.providers.find((p) => p.name === "bandit")?.status || "unavailable"
+          }))
+        );
+      }
+    };
+  }
+});
+
 // src/services/ai-provider/providers/gateway.provider.ts
 var import_rxjs7, GatewayProvider;
 var init_gateway_provider = __esm({
@@ -2419,6 +2578,7 @@ var init_gateway_provider = __esm({
     init_azure_openai_gateway_service();
     init_anthropic_gateway_service();
     init_ollama_gateway_service();
+    init_bandit_gateway_service();
     GatewayProvider = class {
       config;
       gatewayService;
@@ -2460,6 +2620,9 @@ var init_gateway_provider = __esm({
           case "anthropic":
             this.providerSpecificService = new AnthropicGatewayService(gatewayUrl, tokenFactory);
             break;
+          case "bandit":
+            this.providerSpecificService = new BanditAIGatewayService(gatewayUrl, tokenFactory);
+            break;
           case "ollama":
             this.providerSpecificService = new OllamaGatewayService(gatewayUrl, tokenFactory);
             break;
@@ -2474,6 +2637,16 @@ var init_gateway_provider = __esm({
           role: msg.role,
           content: msg.content
         }));
+        const normalizeImageUrl2 = (value) => {
+          if (!value) {
+            return value;
+          }
+          const trimmed = value.trim();
+          if (/^data:/i.test(trimmed) || /^https?:\/\//i.test(trimmed)) {
+            return trimmed;
+          }
+          return `data:image/jpeg;base64,${trimmed}`;
+        };
         if (request.images && request.images.length > 0) {
           const lastUserMessageIndex = messages.map((m) => m.role).lastIndexOf("user");
           if (this.config.provider === "ollama") {
@@ -2483,7 +2656,7 @@ var init_gateway_provider = __esm({
                 images: request.images
               };
             }
-          } else if (["openai", "azure-openai", "anthropic"].includes(this.config.provider || "")) {
+          } else if (["openai", "azure-openai", "anthropic", "bandit"].includes(this.config.provider || "")) {
             if (lastUserMessageIndex !== -1) {
               const currentMessage = messages[lastUserMessageIndex];
               const contentArray = [
@@ -2492,11 +2665,11 @@ var init_gateway_provider = __esm({
                   text: currentMessage.content
                 }
               ];
-              request.images.forEach((base64Image) => {
+              request.images.forEach((imageRef) => {
                 contentArray.push({
                   type: "image_url",
                   image_url: {
-                    url: base64Image.startsWith("data:") ? base64Image : `data:image/jpeg;base64,${base64Image}`,
+                    url: normalizeImageUrl2(imageRef),
                     detail: "auto"
                   }
                 });
@@ -2505,6 +2678,11 @@ var init_gateway_provider = __esm({
                 ...messages[lastUserMessageIndex],
                 content: contentArray
               };
+              debugLogger.debug("Gateway provider injected image attachments", {
+                provider: this.config.provider,
+                imageCount: request.images.length,
+                messageIndex: lastUserMessageIndex
+              });
             }
           }
         }
@@ -3013,6 +3191,244 @@ var init_xai_provider = __esm({
   }
 });
 
+// src/services/ai-provider/providers/bandit-ai.provider.ts
+var import_rxjs10, DEFAULT_BANDIT_BASE, normalizeImageUrl, injectImagesIntoMessages, BanditAIProvider;
+var init_bandit_ai_provider = __esm({
+  "src/services/ai-provider/providers/bandit-ai.provider.ts"() {
+    "use strict";
+    import_rxjs10 = require("rxjs");
+    init_common_types();
+    init_debugLogger();
+    DEFAULT_BANDIT_BASE = "https://api.burtson.ai";
+    normalizeImageUrl = (value) => {
+      if (!value) {
+        return null;
+      }
+      const trimmed = value.trim();
+      if (!trimmed) {
+        return null;
+      }
+      if (/^data:/i.test(trimmed) || /^https?:\/\//i.test(trimmed)) {
+        return trimmed;
+      }
+      return `data:image/jpeg;base64,${trimmed}`;
+    };
+    injectImagesIntoMessages = (messages, images) => {
+      const normalized = messages.map((message) => ({
+        role: message.role,
+        content: message.content
+      }));
+      if (!images || images.length === 0) {
+        return normalized;
+      }
+      const normalizedImages = images.map(normalizeImageUrl).filter((url) => Boolean(url));
+      if (normalizedImages.length === 0) {
+        return normalized;
+      }
+      const lastUserIndex = normalized.map((msg) => msg.role).lastIndexOf("user");
+      if (lastUserIndex === -1) {
+        return normalized;
+      }
+      const target = normalized[lastUserIndex];
+      const baseContent = typeof target.content === "string" && target.content.trim().length > 0 ? [
+        {
+          type: "text",
+          text: target.content
+        }
+      ] : [];
+      const imageContent = normalizedImages.map((url) => ({
+        type: "image_url",
+        image_url: { url, detail: "auto" }
+      }));
+      normalized[lastUserIndex] = {
+        role: target.role,
+        content: [...baseContent, ...imageContent]
+      };
+      return normalized;
+    };
+    BanditAIProvider = class {
+      config;
+      baseUrl;
+      constructor(config) {
+        this.config = config;
+        this.baseUrl = (config.baseUrl || DEFAULT_BANDIT_BASE).replace(/\/$/, "");
+      }
+      chat(request) {
+        const url = `${this.baseUrl}/chat/completions`;
+        const messages = injectImagesIntoMessages(request.messages, request.images);
+        const payload = {
+          model: request.model,
+          messages,
+          stream: Boolean(request.stream),
+          temperature: request.temperature,
+          max_tokens: request.maxTokens
+        };
+        if (request.stream) {
+          return this.streamChatRequest(url, payload);
+        }
+        return this.nonStreamChatRequest(url, payload);
+      }
+      generate(request) {
+        const chatRequest = {
+          model: request.model,
+          messages: [{ role: "user", content: request.prompt }],
+          stream: request.stream,
+          options: request.options
+        };
+        return this.chat(chatRequest).pipe(
+          (0, import_rxjs10.map)((response) => ({
+            response: response.message.content,
+            done: response.done
+          }))
+        );
+      }
+      listModels() {
+        const url = `${this.baseUrl}/models`;
+        return (0, import_rxjs10.from)(fetch(url, { headers: this.getHeaders() })).pipe(
+          (0, import_rxjs10.switchMap)((response) => {
+            if (!response.ok) {
+              debugLogger.error("BanditAI listModels failed", { status: response.status, url });
+              return (0, import_rxjs10.throwError)(() => new Error(`Failed to list Bandit models: ${response.status}`));
+            }
+            return (0, import_rxjs10.from)(response.json());
+          }),
+          (0, import_rxjs10.map)(
+            (data) => data.data.map((model) => ({
+              name: model.id,
+              details: {
+                format: "bandit",
+                family: model.object
+              }
+            }))
+          )
+        );
+      }
+      async validateServiceAvailability(args) {
+        const attempt = async (url) => {
+          try {
+            const controller = new AbortController();
+            const timeoutId = setTimeout(() => controller.abort(), args.timeoutMs);
+            const response = await fetch(`${url}/models`, {
+              headers: this.getHeaders(),
+              signal: controller.signal
+            });
+            clearTimeout(timeoutId);
+            return response.ok;
+          } catch (error) {
+            debugLogger.warn("BanditAI availability check failed", { url, error });
+            return false;
+          }
+        };
+        const primary = await attempt(this.baseUrl);
+        if (primary) {
+          return { url: this.baseUrl, isAvailable: true };
+        }
+        if (args.fallbackUrl) {
+          const fallback = args.fallbackUrl.replace(/\/$/, "");
+          if (await attempt(fallback)) {
+            this.baseUrl = fallback;
+            return { url: fallback, isAvailable: true };
+          }
+        }
+        return { url: this.baseUrl, isAvailable: false };
+      }
+      getProviderType() {
+        return "bandit" /* BANDIT */;
+      }
+      getConfig() {
+        return this.config;
+      }
+      streamChatRequest(url, payload) {
+        return new import_rxjs10.Observable((observer) => {
+          const task = fetch(url, {
+            method: "POST",
+            headers: {
+              ...this.getHeaders(),
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify(payload)
+          });
+          task.then((response) => {
+            if (!response.ok) {
+              observer.error(new Error(`BanditAI request failed: ${response.status}`));
+              return;
+            }
+            const reader = response.body?.getReader();
+            const decoder = new TextDecoder();
+            let buffer = "";
+            const read = () => {
+              reader?.read().then(({ done, value }) => {
+                if (done) {
+                  observer.next({ message: { content: "", role: "assistant" }, done: true });
+                  observer.complete();
+                  return;
+                }
+                buffer += decoder.decode(value, { stream: true });
+                const lines = buffer.split("\n");
+                buffer = lines.pop() ?? "";
+                for (const rawLine of lines) {
+                  const line = rawLine.trim();
+                  if (!line.startsWith("data: ")) {
+                    continue;
+                  }
+                  const data = line.slice(6).trim();
+                  if (data === "[DONE]") {
+                    observer.next({ message: { content: "", role: "assistant" }, done: true });
+                    observer.complete();
+                    return;
+                  }
+                  try {
+                    const parsed = JSON.parse(data);
+                    const content = parsed.choices?.[0]?.delta?.content ?? "";
+                    if (content) {
+                      observer.next({ message: { content, role: "assistant" }, done: false });
+                    }
+                  } catch (error) {
+                    debugLogger.error("BanditAI stream chunk parse failure", { data, error });
+                  }
+                }
+                read();
+              }).catch((err) => observer.error(err));
+            };
+            read();
+          }).catch((err) => observer.error(err));
+        });
+      }
+      nonStreamChatRequest(url, payload) {
+        return (0, import_rxjs10.from)(fetch(url, {
+          method: "POST",
+          headers: {
+            ...this.getHeaders(),
+            "Content-Type": "application/json"
+          },
+          body: JSON.stringify(payload)
+        })).pipe(
+          (0, import_rxjs10.switchMap)((response) => {
+            if (!response.ok) {
+              return (0, import_rxjs10.throwError)(() => new Error(`BanditAI request failed: ${response.status}`));
+            }
+            return (0, import_rxjs10.from)(response.json());
+          }),
+          (0, import_rxjs10.map)((data) => ({
+            message: {
+              content: data.choices?.[0]?.message?.content ?? "",
+              role: "assistant"
+            },
+            done: true
+          }))
+        );
+      }
+      getHeaders() {
+        const headers = {};
+        if (this.config.apiKey) {
+          headers["Authorization"] = `Bearer ${this.config.apiKey}`;
+        }
+        return headers;
+      }
+    };
+  }
+});
+
 // src/services/ai-provider/ai-provider.factory.ts
 var AIProviderFactory;
 var init_ai_provider_factory = __esm({
@@ -3026,6 +3442,7 @@ var init_ai_provider_factory = __esm({
     init_gateway_provider();
     init_playground_provider();
     init_xai_provider();
+    init_bandit_ai_provider();
     AIProviderFactory = class {
       static createProvider(config) {
         switch (config.type) {
@@ -3039,6 +3456,8 @@ var init_ai_provider_factory = __esm({
             return new AnthropicProvider(config);
           case "xai" /* XAI */:
             return new XAIProvider(config);
+          case "bandit" /* BANDIT */:
+            return new BanditAIProvider(config);
           case "gateway" /* GATEWAY */:
             return new GatewayProvider(config);
           case "playground" /* PLAYGROUND */:
@@ -3053,6 +3472,7 @@ var init_ai_provider_factory = __esm({
           "openai" /* OPENAI */,
           "azure-openai" /* AZURE_OPENAI */,
           "xai" /* XAI */,
+          "bandit" /* BANDIT */,
           "gateway" /* GATEWAY */,
           "playground" /* PLAYGROUND */
         ];
@@ -3070,6 +3490,8 @@ var init_ai_provider_factory = __esm({
             return !!config.apiKey;
           case "xai" /* XAI */:
             return !!config.apiKey;
+          case "bandit" /* BANDIT */:
+            return !!config.apiKey;
           case "gateway" /* GATEWAY */:
             return !!(config.gatewayUrl && config.provider);
           case "playground" /* PLAYGROUND */:
@@ -3445,11 +3867,11 @@ var init_notificationService = __esm({
 });
 
 // src/services/prompts/conversationStarters.ts
-var import_rxjs10, generateConversationStarters;
+var import_rxjs11, generateConversationStarters;
 var init_conversationStarters = __esm({
   "src/services/prompts/conversationStarters.ts"() {
     "use strict";
-    import_rxjs10 = require("rxjs");
+    import_rxjs11 = require("rxjs");
     init_aiProviderStore();
     init_packageSettingsStore();
     init_getStableQuestionPrompt();
@@ -3470,7 +3892,7 @@ var init_conversationStarters = __esm({
           stream: false,
           options: { temperature: 1.5, num_predict: 250 }
         });
-        const questions$ = data$.pipe((0, import_rxjs10.map)((d) => {
+        const questions$ = data$.pipe((0, import_rxjs11.map)((d) => {
           const sanitizeLine = (line) => {
             const withoutNumbering = line.replace(/^[0-9]+[.)\-\s:]+/, "").replace(/^[•*+-]\s+/, "");
             const withoutQuotes = withoutNumbering.replace(/^[“"']+/, "").replace(/[”"']+$/, "");
@@ -3492,7 +3914,7 @@ var init_conversationStarters = __esm({
           });
           return unique;
         }));
-        const starters = await (0, import_rxjs10.lastValueFrom)(questions$);
+        const starters = await (0, import_rxjs11.lastValueFrom)(questions$);
         if (starters.length === 0) {
           debugLogger.warn("No meaningful conversation starters generated");
           return [];
@@ -3508,11 +3930,11 @@ var init_conversationStarters = __esm({
 });
 
 // src/services/prompts/moodDetection.ts
-var import_rxjs11, detectMessageMood;
+var import_rxjs12, detectMessageMood;
 var init_moodDetection = __esm({
   "src/services/prompts/moodDetection.ts"() {
     "use strict";
-    import_rxjs11 = require("rxjs");
+    import_rxjs12 = require("rxjs");
     init_aiProviderStore();
     init_packageSettingsStore();
     init_debugLogger();
@@ -3543,8 +3965,8 @@ Response:`;
           options: { temperature: 0.3, num_predict: 10 }
         });
         const chunks$ = response$.pipe(
-          (0, import_rxjs11.map)((chunk) => chunk.response.trim().toLowerCase()),
-          (0, import_rxjs11.toArray)()
+          (0, import_rxjs12.map)((chunk) => chunk.response.trim().toLowerCase()),
+          (0, import_rxjs12.toArray)()
         );
         const result = await chunks$.toPromise();
         const finalResult = (result || []).join("").trim();
@@ -3561,11 +3983,11 @@ Response:`;
 });
 
 // src/services/prompts/detectUserInterestAndExcitement.ts
-var import_rxjs12, detectUserInterestAndExcitement;
+var import_rxjs13, detectUserInterestAndExcitement;
 var init_detectUserInterestAndExcitement = __esm({
   "src/services/prompts/detectUserInterestAndExcitement.ts"() {
     "use strict";
-    import_rxjs12 = require("rxjs");
+    import_rxjs13 = require("rxjs");
     init_aiProviderStore();
     init_packageSettingsStore();
     init_debugLogger();
@@ -3612,10 +4034,10 @@ var init_detectUserInterestAndExcitement = __esm({
           options: { temperature: 0.1, num_predict: 5 }
         });
         const chunks$ = response$.pipe(
-          (0, import_rxjs12.map)((chunk) => chunk.response.trim().toUpperCase()),
-          (0, import_rxjs12.toArray)()
+          (0, import_rxjs13.map)((chunk) => chunk.response.trim().toUpperCase()),
+          (0, import_rxjs13.toArray)()
         );
-        const result = await (0, import_rxjs12.lastValueFrom)(chunks$);
+        const result = await (0, import_rxjs13.lastValueFrom)(chunks$);
         const decision = result.join("").trim();
         debugLogger.llmDebug("detectUserInterestAndExcitement result", { decision });
         return decision.includes("YES");
@@ -3628,11 +4050,11 @@ var init_detectUserInterestAndExcitement = __esm({
 });
 
 // src/services/prompts/documentSummarization.ts
-var import_rxjs13, summarizeDocument;
+var import_rxjs14, summarizeDocument;
 var init_documentSummarization = __esm({
   "src/services/prompts/documentSummarization.ts"() {
     "use strict";
-    import_rxjs13 = require("rxjs");
+    import_rxjs14 = require("rxjs");
     init_aiProviderStore();
     init_packageSettingsStore();
     init_debugLogger();
@@ -3660,8 +4082,8 @@ ${content.slice(0, 4e3)}
           stream: false,
           options: { temperature: 0.3, num_predict: 100 }
         });
-        const summary$ = data$.pipe((0, import_rxjs13.map)((d) => d.response.trim()));
-        const summary = await (0, import_rxjs13.lastValueFrom)(summary$);
+        const summary$ = data$.pipe((0, import_rxjs14.map)((d) => d.response.trim()));
+        const summary = await (0, import_rxjs14.lastValueFrom)(summary$);
         debugLogger.ragDebug("summarizeDocument result", { name, summary });
         return summary || `Document summary for ${name}`;
       } catch (error) {
@@ -3673,11 +4095,11 @@ ${content.slice(0, 4e3)}
 });
 
 // src/services/prompts/documentRelevance.ts
-var import_rxjs14, determineRelevantDocuments;
+var import_rxjs15, determineRelevantDocuments;
 var init_documentRelevance = __esm({
   "src/services/prompts/documentRelevance.ts"() {
     "use strict";
-    import_rxjs14 = require("rxjs");
+    import_rxjs15 = require("rxjs");
     init_aiProviderStore();
     init_packageSettingsStore();
     init_debugLogger();
@@ -3718,10 +4140,10 @@ Response:`;
           options: { temperature: 0.2, num_predict: 50 }
         });
         const chunks$ = response$.pipe(
-          (0, import_rxjs14.map)((chunk) => chunk.response.trim()),
-          (0, import_rxjs14.toArray)()
+          (0, import_rxjs15.map)((chunk) => chunk.response.trim()),
+          (0, import_rxjs15.toArray)()
         );
-        const result = await (0, import_rxjs14.lastValueFrom)(chunks$);
+        const result = await (0, import_rxjs15.lastValueFrom)(chunks$);
         const vetResult = result.join("").trim().toLowerCase();
         debugLogger.ragDebug("determineRelevantDocuments result", { vetResult });
         if (vetResult.includes("none") || !vetResult) {
@@ -7106,13 +7528,17 @@ var init_conversationStore = __esm({
           const updatedConversations = conversations.map((c) => {
             if (c.id === currentId && c.history.length > 0) {
               const updatedHistory = [...c.history];
+              const existingImages = updatedHistory[updatedHistory.length - 1].images;
+              const nextImages = Array.isArray(images) && images.length > 0 ? [...images] : Array.isArray(existingImages) && existingImages.length > 0 ? [...existingImages] : existingImages;
               updatedHistory[updatedHistory.length - 1] = {
                 ...updatedHistory[updatedHistory.length - 1],
                 answer,
                 memoryUpdated,
-                images: images ?? updatedHistory[updatedHistory.length - 1].images,
+                images: nextImages,
                 sourceFiles: sourceFiles ?? updatedHistory[updatedHistory.length - 1].sourceFiles,
-                cancelled: cancelled ?? updatedHistory[updatedHistory.length - 1].cancelled
+                cancelled: cancelled ?? updatedHistory[updatedHistory.length - 1].cancelled,
+                placeholder: false,
+                rawQuestion: void 0
               };
               return normalizeConversation({ ...c, history: updatedHistory, updatedAt: /* @__PURE__ */ new Date() });
             }
@@ -7193,6 +7619,24 @@ var init_conversationStore = __esm({
                 });
                 continue;
               }
+              if (Array.isArray(existing.history) && Array.isArray(conversation.history)) {
+                const mergedHistory = conversation.history.map((incomingEntry, index) => {
+                  const existingEntry = existing.history[index];
+                  if (!existingEntry) {
+                    return incomingEntry;
+                  }
+                  const mergedImagesSource = Array.isArray(incomingEntry.images) && incomingEntry.images.length > 0 ? incomingEntry.images : existingEntry.images;
+                  const mergedImages = Array.isArray(mergedImagesSource) && mergedImagesSource.length > 0 ? [...mergedImagesSource] : mergedImagesSource;
+                  return {
+                    ...existingEntry,
+                    ...incomingEntry,
+                    images: mergedImages,
+                    placeholder: incomingEntry.placeholder ?? existingEntry.placeholder,
+                    rawQuestion: incomingEntry.rawQuestion ?? existingEntry.rawQuestion
+                  };
+                });
+                conversation.history = mergedHistory;
+              }
             }
             next.set(conversation.id, conversation);
             toPersist.push(conversation);
@@ -11005,11 +11449,11 @@ var init_ttsSanitizer = __esm({
 });
 
 // src/services/tts/tts-client.ts
-var import_rxjs15, getOrAppendAuthHeader;
+var import_rxjs16, getOrAppendAuthHeader;
 var init_tts_client = __esm({
   "src/services/tts/tts-client.ts"() {
     "use strict";
-    import_rxjs15 = require("rxjs");
+    import_rxjs16 = require("rxjs");
     init_authenticationService();
     init_voiceStore();
     init_ttsSanitizer();
@@ -11029,11 +11473,11 @@ var init_tts_client = __esm({
 });
 
 // src/services/tts/streaming-tts.ts
-var import_rxjs16, StreamingTTSClient, getStreamingTTSClient, speakStream, stopTTS;
+var import_rxjs17, StreamingTTSClient, getStreamingTTSClient, speakStream, stopTTS;
 var init_streaming_tts = __esm({
   "src/services/tts/streaming-tts.ts"() {
     "use strict";
-    import_rxjs16 = require("rxjs");
+    import_rxjs17 = require("rxjs");
     init_debugLogger();
     init_packageSettingsStore();
     init_tts_client();
@@ -11045,8 +11489,8 @@ var init_streaming_tts = __esm({
       // Store event handler references for proper cleanup
       audioHandlers = /* @__PURE__ */ new Map();
       // State management
-      stateSubject = new import_rxjs16.BehaviorSubject("IDLE" /* IDLE */);
-      progressSubject = new import_rxjs16.Subject();
+      stateSubject = new import_rxjs17.BehaviorSubject("IDLE" /* IDLE */);
+      progressSubject = new import_rxjs17.Subject();
       constructor() {
       }
       static getInstance() {
@@ -11077,7 +11521,7 @@ var init_streaming_tts = __esm({
        * Speak text with simple streaming
        */
       speakStream(text, voice, options = {}) {
-        return new import_rxjs16.Observable((subscriber) => {
+        return new import_rxjs17.Observable((subscriber) => {
           this.performSimpleStreaming(text, voice, options, subscriber);
         });
       }
@@ -18799,6 +19243,8 @@ var init_chat_scroll_to_bottom_button = __esm({
       drawerOpen = false,
       isMobile = false
     }) => {
+      const verticalBuffer = isMobile ? 36 : 56;
+      const bottomOffset = Math.max(inputHeight + verticalBuffer, verticalBuffer + 72);
       return /* @__PURE__ */ (0, import_jsx_runtime27.jsx)(
         import_material28.IconButton,
         {
@@ -18807,12 +19253,12 @@ var init_chat_scroll_to_bottom_button = __esm({
             position: "fixed",
             left: drawerOpen && !isMobile ? "calc(50% + 170px)" : "50%",
             transform: "translateX(-50%)",
-            bottom: inputHeight + 10,
+            bottom: bottomOffset,
             bgcolor: (theme) => theme.palette.background.paper,
             color: (theme) => theme.palette.text.primary,
             border: "1px solid",
             borderColor: (theme) => theme.palette.divider,
-            zIndex: 999,
+            zIndex: (theme) => Math.max(theme.zIndex.modal + 1, 1400),
             boxShadow: 3,
             transition: "bottom 0.3s ease, left 0.3s ease-in-out",
             "&:hover": {
@@ -19474,28 +19920,28 @@ var init_create_audio_blob = __esm({
 });
 
 // src/services/stt/sound-recorder.service.ts
-var import_rxjs20, SoundRecorderService;
+var import_rxjs21, SoundRecorderService;
 var init_sound_recorder_service = __esm({
   "src/services/stt/sound-recorder.service.ts"() {
     "use strict";
-    import_rxjs20 = require("rxjs");
+    import_rxjs21 = require("rxjs");
     init_create_audio_blob();
     SoundRecorderService = class {
       _mediaRecorder;
       start() {
-        const mediaStream = (0, import_rxjs20.from)(navigator.mediaDevices.getUserMedia({ audio: true }));
-        this._mediaRecorder = mediaStream.pipe((0, import_rxjs20.map)((stream) => {
+        const mediaStream = (0, import_rxjs21.from)(navigator.mediaDevices.getUserMedia({ audio: true }));
+        this._mediaRecorder = mediaStream.pipe((0, import_rxjs21.map)((stream) => {
           const rec = new MediaRecorder(stream);
           rec.start();
           return rec;
-        }), (0, import_rxjs20.shareReplay)(1));
+        }), (0, import_rxjs21.shareReplay)(1));
         const dataAvailableEvent = this._mediaRecorder.pipe(
-          (0, import_rxjs20.switchMap)((recorder) => (0, import_rxjs20.fromEvent)(recorder, "dataavailable"))
+          (0, import_rxjs21.switchMap)((recorder) => (0, import_rxjs21.fromEvent)(recorder, "dataavailable"))
         );
         const blob = dataAvailableEvent.pipe(
-          (0, import_rxjs20.first)(),
-          (0, import_rxjs20.map)((event) => createAudioBlob(event.data)),
-          (0, import_rxjs20.shareReplay)(1)
+          (0, import_rxjs21.first)(),
+          (0, import_rxjs21.map)((event) => createAudioBlob(event.data)),
+          (0, import_rxjs21.shareReplay)(1)
         );
         return blob;
       }
@@ -19503,7 +19949,7 @@ var init_sound_recorder_service = __esm({
         if (!this._mediaRecorder) {
           return;
         }
-        this._mediaRecorder.pipe((0, import_rxjs20.first)()).subscribe((recorder) => {
+        this._mediaRecorder.pipe((0, import_rxjs21.first)()).subscribe((recorder) => {
           recorder.stop();
         });
       }
@@ -19623,7 +20069,7 @@ var init_stt_client = __esm({
 });
 
 // src/services/stt/transcriber.tsx
-var import_react38, import_Mic, import_Check6, import_Close7, import_material31, import_rxjs21, import_jsx_runtime31, initialButtonStyles, Transcriber, transcriber_default;
+var import_react38, import_Mic, import_Check6, import_Close7, import_material31, import_rxjs22, import_jsx_runtime31, initialButtonStyles, Transcriber, transcriber_default;
 var init_transcriber = __esm({
   "src/services/stt/transcriber.tsx"() {
     "use strict";
@@ -19634,7 +20080,7 @@ var init_transcriber = __esm({
     init_sound_recorder_service();
     init_stt_client();
     import_material31 = require("@mui/material");
-    import_rxjs21 = require("rxjs");
+    import_rxjs22 = require("rxjs");
     init_debugLogger();
     import_jsx_runtime31 = require("react/jsx-runtime");
     initialButtonStyles = (badgeBackground, fileText, hoverBadgeBackground) => ({
@@ -19653,14 +20099,14 @@ var init_transcriber = __esm({
       const [status, setStatus] = (0, import_react38.useState)("IDLE");
       const recorderRef = (0, import_react38.useRef)(new SoundRecorderService());
       const [iconButtonStyles] = (0, import_react38.useState)(() => initialButtonStyles(badgeBackground, fileText, hoverBadgeBackground));
-      const [recordingSub, setRecordingSub] = (0, import_react38.useState)(() => new import_rxjs21.Subscription());
+      const [recordingSub, setRecordingSub] = (0, import_react38.useState)(() => new import_rxjs22.Subscription());
       const start = () => {
         recordingSub.unsubscribe();
         const recording = recorderRef.current.start();
         const text = recording.pipe(
-          (0, import_rxjs21.switchMap)((blob) => {
+          (0, import_rxjs22.switchMap)((blob) => {
             debugLogger.debug("Processing audio blob for transcription");
-            return (0, import_rxjs21.from)(STTClient.transcribe(blob));
+            return (0, import_rxjs22.from)(STTClient.transcribe(blob));
           })
         );
         const sub = text.subscribe({
@@ -20532,11 +20978,11 @@ ${sanitize(
 });
 
 // src/chat/hooks/useMemoryEnhancer.tsx
-var import_rxjs22, MEMORY_LIMIT, MIN_MEMORY_WORDS, MERGE_THRESHOLD, REJECT_ECHO_THRESHOLD, REJECT_DUPLICATE_THRESHOLD, CONTEXTUAL_DIVERGENCE_THRESHOLD, normalizeText, isStructurallyDuplicate, isAboutBandit, hasEngagementValue, isMemoryTooShortOrGeneric, isPersonalText, mergeMemory, isVoiceShifted, sanitizeMemory, sanitizeMemoryText, shouldAcceptMemory, isContextuallyDivergent, useMemoryEnhancer;
+var import_rxjs23, MEMORY_LIMIT, MIN_MEMORY_WORDS, MERGE_THRESHOLD, REJECT_ECHO_THRESHOLD, REJECT_DUPLICATE_THRESHOLD, CONTEXTUAL_DIVERGENCE_THRESHOLD, normalizeText, isStructurallyDuplicate, isAboutBandit, hasEngagementValue, isMemoryTooShortOrGeneric, isPersonalText, mergeMemory, isVoiceShifted, sanitizeMemory, sanitizeMemoryText, shouldAcceptMemory, isContextuallyDivergent, useMemoryEnhancer;
 var init_useMemoryEnhancer = __esm({
   "src/chat/hooks/useMemoryEnhancer.tsx"() {
     "use strict";
-    import_rxjs22 = require("rxjs");
+    import_rxjs23 = require("rxjs");
     init_memoryStore();
     init_aiProviderStore();
     init_packageSettingsStore();
@@ -20928,8 +21374,8 @@ var init_useMemoryEnhancer = __esm({
               stream: false,
               options: { temperature: 0.1, num_predict: 150 }
             });
-            const suggestion = await (0, import_rxjs22.lastValueFrom)(
-              result$.pipe((0, import_rxjs22.map)((chunk) => chunk.response))
+            const suggestion = await (0, import_rxjs23.lastValueFrom)(
+              result$.pipe((0, import_rxjs23.map)((chunk) => chunk.response))
             );
             debugLogger.memoryDebug(`LLM memory suggestion received (${attempt})`, {
               suggestion: typeof suggestion === "string" ? suggestion.slice(0, 200) : suggestion,
@@ -21620,10 +22066,22 @@ var init_useAIProvider = __esm({
           setResponse("");
           setStreamBuffer("");
           clearFlushTimer();
-          setPendingMessage({ question, images });
+          const imageList = Array.isArray(images) ? [...images] : [];
+          const conversationStoreState = useConversationStore.getState();
+          const { addToCurrent, replaceLastAnswer, conversations, currentId } = conversationStoreState;
+          const currentConv = conversations.find((c) => c.id === currentId);
+          const lastEntry = currentConv?.history.at(-1);
+          const lastWasPlaceholder = !!lastEntry && lastEntry.answer === "..." && (lastEntry.placeholder === true || lastEntry.rawQuestion === question || lastEntry.question === question);
+          const pendingQuestion = lastWasPlaceholder ? lastEntry?.question ?? question : question;
+          const pendingImagesRaw = lastWasPlaceholder && Array.isArray(lastEntry?.images) && lastEntry.images.length > 0 ? lastEntry.images : imageList;
+          const pendingImages = Array.isArray(pendingImagesRaw) && pendingImagesRaw.length > 0 ? [...pendingImagesRaw] : void 0;
+          setPendingMessage({
+            question: pendingQuestion,
+            images: pendingImages
+          });
           const modelName = usePackageSettingsStore.getState().settings?.defaultModel || "bandit-core:4b-it-qat";
           const CONFIG = modelConfigs[modelName] ?? modelConfigs["bandit-core:4b-it-qat"];
-          const base64Images = images.map((img) => img.split(",")[1]);
+          const base64Images = imageList.map((img) => img.split(",")[1]);
           const latestEntries = history.slice(-CONFIG.historyMessages);
           const contextMessages = latestEntries.flatMap((entry) => [
             { role: "user", content: entry.question },
@@ -22009,11 +22467,8 @@ ${protocol}`;
             }, delay);
           };
           const stream = provider.chat(request);
-          const { addToCurrent, conversations, currentId, replaceLastAnswer } = useConversationStore.getState();
-          const currentConv = conversations.find((c) => c.id === currentId);
-          const lastEntry = currentConv?.history.at(-1);
-          const isPlaceholder = lastEntry?.question === question && lastEntry?.answer === "...";
-          lastPartialRef.current = { text: "", images, usedDocs, question };
+          const initialPlaceholderQuestion = lastEntry?.question;
+          lastPartialRef.current = { text: "", images: [...imageList], usedDocs, question };
           if (currentSubRef.current) {
             try {
               currentSubRef.current.unsubscribe();
@@ -22272,14 +22727,24 @@ ${items.map((item, index) => {
                 } else {
                   debugLogger.info("Memory scan skipped - disabled in preferences");
                 }
-                const { addToCurrent: addToCurrent2, replaceLastAnswer: replaceLastAnswer2 } = useConversationStore.getState();
-                const current = useConversationStore.getState();
-                const conv = current.conversations.find((c) => c.id === current.currentId);
+                const currentState = useConversationStore.getState();
+                const conv = currentState.conversations.find((c) => c.id === currentState.currentId);
                 const last = conv?.history.at(-1);
-                if (!last || last.answer !== "..." || last.question !== question) {
-                  addToCurrent2({ question, answer: enhancedMessage, images, memoryUpdated, sourceFiles: usedDocs });
+                const lastIsPlaceholder = !!last && last.answer === "..." && last.placeholder !== false;
+                const preservedImagesSource = imageList.length > 0 ? imageList : lastPartialRef.current.images.length > 0 ? lastPartialRef.current.images : last?.images;
+                const preservedImages = Array.isArray(preservedImagesSource) && preservedImagesSource.length > 0 ? [...preservedImagesSource] : void 0;
+                if (lastIsPlaceholder) {
+                  replaceLastAnswer(enhancedMessage, preservedImages, memoryUpdated, usedDocs);
                 } else {
-                  replaceLastAnswer2(enhancedMessage, images, memoryUpdated, usedDocs);
+                  const historyQuestion = last && last.answer === "..." && last.question || initialPlaceholderQuestion || question;
+                  addToCurrent({
+                    question: historyQuestion,
+                    answer: enhancedMessage,
+                    images: preservedImages,
+                    memoryUpdated,
+                    sourceFiles: usedDocs,
+                    rawQuestion: question
+                  });
                 }
                 setInputValue("");
                 setPastedImages([]);
@@ -26522,15 +26987,15 @@ var init_chat_app_bar = __esm({
 });
 
 // src/chat/hooks/useConversationNameGenerator.tsx
-var import_rxjs23, import_operators5, useConversationNameGenerator;
+var import_rxjs24, import_operators6, useConversationNameGenerator;
 var init_useConversationNameGenerator = __esm({
   "src/chat/hooks/useConversationNameGenerator.tsx"() {
     "use strict";
     init_aiProviderStore();
     init_packageSettingsStore();
     init_debugLogger();
-    import_rxjs23 = require("rxjs");
-    import_operators5 = require("rxjs/operators");
+    import_rxjs24 = require("rxjs");
+    import_operators6 = require("rxjs/operators");
     init_conversationStore();
     useConversationNameGenerator = () => {
       const generateName = async (userMessage) => {
@@ -26565,8 +27030,8 @@ Respond with just the title and nothing else.
               num_predict: 20
             }
           });
-          const title = await (0, import_rxjs23.lastValueFrom)(
-            result$.pipe((0, import_operators5.map)((d) => d.response?.trim().replace(/["']/g, "")))
+          const title = await (0, import_rxjs24.lastValueFrom)(
+            result$.pipe((0, import_operators6.map)((d) => d.response?.trim().replace(/["']/g, "")))
           );
           if (title && title.length > 0) {
             const sanitizedTitle = sanitizeConversationName(title, 60);
@@ -27846,12 +28311,20 @@ var init_chat2 = __esm({
         (question, images, displayQuestion) => {
           const requestStartTime = trackRequestStart();
           const questionForDisplay = displayQuestion || question;
-          setPendingMessage({ question: questionForDisplay, images });
+          const pendingImages = images.length > 0 ? [...images] : void 0;
+          setPendingMessage({ question: questionForDisplay, images: pendingImages });
           setIsStreaming(true);
           setResponseStarted(true);
           setStreamBuffer("");
           const { addToCurrent } = useConversationStore.getState();
-          addToCurrent({ question: questionForDisplay, answer: "...", images });
+          const placeholderImages = pendingImages ? [...pendingImages] : void 0;
+          addToCurrent({
+            question: questionForDisplay,
+            answer: "...",
+            images: placeholderImages,
+            placeholder: true,
+            rawQuestion: question
+          });
           const getCurrentModel = useModelStore.getState().getCurrentModel;
           const systemPrompt = getCurrentModel()?.systemPrompt ?? "You are a helpful assistant.";
           const { currentId: currentId2, conversations: conversations2, createConversation, renameConversation } = useConversationStore.getState();
@@ -27865,8 +28338,16 @@ var init_chat2 = __esm({
                 if (!newCurrentId) return;
                 setResponse("");
                 const { addToCurrent: addToNew } = useConversationStore.getState();
-                addToNew({ question: questionForDisplay, answer: "...", images });
-                aiProvider(systemPrompt, question, images);
+                const newPlaceholderImages = pendingImages ? [...pendingImages] : void 0;
+                addToNew({
+                  question: questionForDisplay,
+                  answer: "...",
+                  images: newPlaceholderImages,
+                  placeholder: true,
+                  rawQuestion: question
+                });
+                const providerImages2 = pendingImages ? [...pendingImages] : [];
+                aiProvider(systemPrompt, question, providerImages2);
               }, 0);
             });
             return;
@@ -27916,7 +28397,8 @@ var init_chat2 = __esm({
             }, 50);
           }
           setResponse("");
-          aiProvider(systemPrompt, question, images);
+          const providerImages = pendingImages ? [...pendingImages] : [];
+          aiProvider(systemPrompt, question, providerImages);
         },
         [
           aiProvider,
@@ -28750,7 +29232,7 @@ init_modelStore();
 init_ai_response_text_field();
 init_memory_modal();
 init_streaming_tts();
-var import_rxjs17 = require("rxjs");
+var import_rxjs18 = require("rxjs");
 init_debugLogger();
 init_util();
 var import_jsx_runtime10 = require("react/jsx-runtime");
@@ -28779,7 +29261,7 @@ var AIQueriesDrawer = ({ drawerOpen, onClose, onClearComplete, onNavigateToMain
   const [memoryModalOpen, setMemoryModalOpen] = (0, import_react15.useState)(false);
   const [contextMode, setContextMode] = (0, import_react15.useState)("local");
   const [expandedSections, setExpandedSections] = (0, import_react15.useState)(/* @__PURE__ */ new Set(["history", "voice"]));
-  const [audioSub, setAudioSub] = (0, import_react15.useState)(new import_rxjs17.Subscription());
+  const [audioSub, setAudioSub] = (0, import_react15.useState)(new import_rxjs18.Subscription());
   const [isContextSwitching, setIsContextSwitching] = (0, import_react15.useState)(false);
   const [isDrawerLoading, setIsDrawerLoading] = (0, import_react15.useState)(false);
   (0, import_react15.useEffect)(() => {
@@ -30442,7 +30924,7 @@ init_debugLogger();
 init_banditTheme();
 init_themeMap();
 init_useTTS();
-var import_rxjs18 = require("rxjs");
+var import_rxjs19 = require("rxjs");
 var import_jsx_runtime15 = require("react/jsx-runtime");
 var FULL_SCREEN_THRESHOLD = 100;
 var CDN_BASE = "https://cdn.burtson.ai/";
@@ -30509,7 +30991,7 @@ var ChatModal = ({
   const [modalLogo, setModalLogo] = (0, import_react22.useState)("https://cdn.burtson.ai/logos/bandit-ai-logo.png");
   const [modelAnchorEl, setModelAnchorEl] = (0, import_react22.useState)(null);
   const [voiceAnchorEl, setVoiceAnchorEl] = (0, import_react22.useState)(null);
-  const [audioSub, setAudioSub] = (0, import_react22.useState)(new import_rxjs18.Subscription());
+  const [audioSub, setAudioSub] = (0, import_react22.useState)(new import_rxjs19.Subscription());
   const [selectedTheme, setSelectedTheme] = (0, import_react22.useState)(null);
   const [themeLoading, setThemeLoading] = (0, import_react22.useState)(true);
   const [autoFullscreenTriggered, setAutoFullscreenTriggered] = (0, import_react22.useState)(false);
@@ -33050,7 +33532,7 @@ init_conversationSyncStore();
 
 // src/hooks/useGatewayQueries.ts
 var import_react25 = require("react");
-var import_rxjs19 = require("rxjs");
+var import_rxjs20 = require("rxjs");
 var import_react_query = require("@tanstack/react-query");
 init_packageSettingsStore();
 init_gateway_service();
@@ -33081,7 +33563,7 @@ var useGatewayHealth = (options) => {
       if (!service) {
         throw new Error("Gateway service is not configured");
       }
-      return (0, import_rxjs19.lastValueFrom)(service.getHealth());
+      return (0, import_rxjs20.lastValueFrom)(service.getHealth());
     },
     enabled
   });
@@ -37849,26 +38331,7 @@ var AIProviderInitService = class _AIProviderInitService {
           if (providerConfig.type === "anthropic" /* ANTHROPIC */) {
             providerConfig = this.convertAnthropicConfig(providerConfig, settings?.gatewayApiUrl);
           }
-          if ((providerConfig.type === "ollama" /* OLLAMA */ || providerConfig.type === "gateway" /* GATEWAY */) && !providerConfig.tokenFactory) {
-            providerConfig.tokenFactory = () => {
-              let token = authenticationService.getToken();
-              if (!token) {
-                token = localStorage.getItem("authToken");
-              }
-              if (!token) {
-                try {
-                  const { useAuthenticationStore: useAuthenticationStore2 } = require("../../store/authenticationStore");
-                  const authStore = useAuthenticationStore2.getState();
-                  token = authStore.token;
-                } catch (e) {
-                }
-              }
-              debugLogger.info("AI Provider Init: IndexedDB config token factory", {
-                hasToken: !!token
-              });
-              return token;
-            };
-          }
+          providerConfig = this.ensureTokenFactory(providerConfig);
           try {
             const { createProvider } = useAIProviderStore.getState();
             createProvider(providerConfig);
@@ -37896,27 +38359,7 @@ var AIProviderInitService = class _AIProviderInitService {
       if (providerConfig.type === "anthropic" /* ANTHROPIC */) {
         providerConfig = this.convertAnthropicConfig(providerConfig, settings.gatewayApiUrl);
       }
-      if (providerConfig.type === "ollama" /* OLLAMA */ && !providerConfig.tokenFactory) {
-        providerConfig.tokenFactory = () => {
-          let token = authenticationService.getToken();
-          if (!token) {
-            token = localStorage.getItem("authToken");
-          }
-          if (!token) {
-            try {
-              const { useAuthenticationStore: useAuthenticationStore2 } = require("../../store/authenticationStore");
-              const authStore = useAuthenticationStore2.getState();
-              token = authStore.token;
-            } catch (e) {
-            }
-          }
-          debugLogger.info("AIProviderInit: Explicit config tokenFactory", {
-            hasToken: !!token,
-            localStorage: !!localStorage.getItem("authToken")
-          });
-          return token;
-        };
-      }
+      providerConfig = this.ensureTokenFactory(providerConfig);
       debugLogger.info("Using explicit AI provider config", providerConfig);
     } else {
       providerConfig = {
@@ -38028,9 +38471,10 @@ var AIProviderInitService = class _AIProviderInitService {
    */
   switchProvider(config) {
     try {
+      const normalizedConfig = this.ensureTokenFactory({ ...config });
       const { switchProvider } = useAIProviderStore.getState();
-      switchProvider(config);
-      debugLogger.info(`Switched to AI provider: ${config.type}`);
+      switchProvider(normalizedConfig);
+      debugLogger.info(`Switched to AI provider: ${normalizedConfig.type}`);
     } catch (error) {
       debugLogger.error("Failed to switch AI provider:", { error });
       throw error;
@@ -38064,6 +38508,49 @@ var AIProviderInitService = class _AIProviderInitService {
     debugLogger.info("AI Provider Init: Converted direct Anthropic provider to gateway configuration");
     return normalized;
   }
+  /**
+   * Ensure providers that require auth have a token factory configured.
+   * Handles both UI auth tokens and API key scenarios.
+   */
+  ensureTokenFactory(config) {
+    if (config.type === "ollama" /* OLLAMA */ || config.type === "gateway" /* GATEWAY */) {
+      const existingFactory = config.tokenFactory;
+      if (existingFactory) {
+        return config;
+      }
+      if (typeof config.apiKey === "string" && config.apiKey.trim() !== "") {
+        const key = config.apiKey.trim();
+        config.tokenFactory = () => key;
+        debugLogger.info("AIProviderInit: Using API key for token factory", {
+          type: config.type,
+          hasKey: true
+        });
+        return config;
+      }
+      config.tokenFactory = () => {
+        let token = authenticationService.getToken();
+        if (!token && typeof localStorage !== "undefined") {
+          try {
+            token = localStorage.getItem("authToken");
+          } catch {
+          }
+        }
+        if (!token) {
+          try {
+            const { useAuthenticationStore: useAuthenticationStore2 } = require("../../store/authenticationStore");
+            const authStore = useAuthenticationStore2.getState();
+            token = authStore.token;
+          } catch {
+          }
+        }
+        debugLogger.info("AIProviderInit: Token factory resolved auth token", {
+          hasToken: !!token
+        });
+        return token;
+      };
+    }
+    return config;
+  }
 };
 var aiProviderInitService = AIProviderInitService.getInstance();
 
@@ -38087,6 +38574,8 @@ var ProviderTab = () => {
         return "gpt-4o-mini";
       case "xai" /* XAI */:
         return "grok-beta";
+      case "bandit" /* BANDIT */:
+        return "bandit-core-1";
       default:
         return "";
     }
@@ -38094,7 +38583,7 @@ var ProviderTab = () => {
   const applyDefaultModel = (0, import_react33.useCallback)((config) => {
     const normalized = { ...config };
     const trimmed = typeof normalized.defaultModel === "string" ? normalized.defaultModel.trim() : void 0;
-    const requiresModel = normalized.type === "openai" /* OPENAI */ || normalized.type === "xai" /* XAI */;
+    const requiresModel = normalized.type === "openai" /* OPENAI */ || normalized.type === "xai" /* XAI */ || normalized.type === "bandit" /* BANDIT */;
     if (trimmed) {
       normalized.defaultModel = trimmed;
       return normalized;
@@ -38117,11 +38606,16 @@ var ProviderTab = () => {
       const trimmed = sanitized.defaultModel.trim();
       sanitized.defaultModel = trimmed || void 0;
     }
+    if (typeof sanitized.apiKey === "string") {
+      const trimmedKey = sanitized.apiKey.trim();
+      sanitized.apiKey = trimmedKey || void 0;
+    }
     return sanitized;
   }, []);
   const [providerConfig, setProviderConfig] = (0, import_react33.useState)({
-    type: "ollama",
-    baseUrl: "http://localhost:11434"
+    type: "gateway",
+    gatewayUrl: packageSettings?.gatewayApiUrl || "",
+    provider: "bandit"
   });
   const [isProviderConfigOpen, setIsProviderConfigOpen] = (0, import_react33.useState)(false);
   const [snackbarMessage, setSnackbarMessage] = (0, import_react33.useState)("");
@@ -38245,11 +38739,19 @@ var ProviderTab = () => {
           apiKey: ""
         }));
         break;
+      case "bandit" /* BANDIT */:
+        setProviderConfig(applyDefaultModel({
+          ...baseConfig,
+          baseUrl: "https://api.burtson.ai",
+          apiKey: "",
+          defaultModel: "bandit-core-1"
+        }));
+        break;
       case "gateway" /* GATEWAY */:
         setProviderConfig(applyDefaultModel({
           ...baseConfig,
           gatewayUrl: packageSettings?.gatewayApiUrl || "",
-          provider: "openai"
+          provider: "bandit"
         }));
         break;
       case "playground" /* PLAYGROUND */:
@@ -38263,7 +38765,7 @@ var ProviderTab = () => {
     try {
       const normalizedConfigIntermediate = sanitizeConfigForSave(providerConfig);
       const normalizedConfig = convertAnthropicConfig(normalizedConfigIntermediate) || normalizedConfigIntermediate;
-      const requiresModel = normalizedConfig.type === "openai" /* OPENAI */ || normalizedConfig.type === "xai" /* XAI */;
+      const requiresModel = normalizedConfig.type === "openai" /* OPENAI */ || normalizedConfig.type === "xai" /* XAI */ || normalizedConfig.type === "bandit" /* BANDIT */;
       if (requiresModel && !normalizedConfig.defaultModel) {
         showMessage("Please provide a default model ID for the selected provider.", "error");
         return;
@@ -38388,6 +38890,7 @@ var ProviderTab = () => {
                 /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(import_material25.MenuItem, { value: "ollama", children: "Ollama" }),
                 /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(import_material25.MenuItem, { value: "openai", children: "OpenAI" }),
                 /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(import_material25.MenuItem, { value: "azure-openai", children: "Azure OpenAI" }),
+                /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(import_material25.MenuItem, { value: "bandit", children: "Bandit AI" }),
                 /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(import_material25.MenuItem, { value: "xai", children: "xAI" }),
                 /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(import_material25.MenuItem, { value: "playground", children: "Playground (Mock Demo)" })
               ]
@@ -38422,6 +38925,7 @@ var ProviderTab = () => {
                   /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(import_material25.MenuItem, { value: "azure-openai", children: "Azure OpenAI" }),
                   /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(import_material25.MenuItem, { value: "anthropic", children: "Anthropic" }),
                   /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(import_material25.MenuItem, { value: "ollama", children: "Ollama" }),
+                  /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(import_material25.MenuItem, { value: "bandit", children: "Bandit AI" }),
                   /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(import_material25.MenuItem, { value: "xai", children: "xAI" })
                 ]
               }
@@ -38437,6 +38941,52 @@ var ProviderTab = () => {
               placeholder: "http://localhost:11434"
             }
           ),
+          providerConfig.type === "bandit" && /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(import_material25.Box, { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+              import_material25.TextField,
+              {
+                label: "API Base URL",
+                value: providerConfig.baseUrl || "",
+                onChange: (e) => setProviderConfig((prev) => ({
+                  ...prev,
+                  baseUrl: e.target.value
+                })),
+                fullWidth: true,
+                sx: { mb: 2 },
+                placeholder: "https://api.burtson.ai",
+                helperText: "Defaults to https://api.burtson.ai"
+              }
+            ),
+            /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+              import_material25.TextField,
+              {
+                label: "API Key",
+                type: "password",
+                value: providerConfig.apiKey || "",
+                onChange: (e) => setProviderConfig((prev) => ({
+                  ...prev,
+                  apiKey: e.target.value
+                })),
+                fullWidth: true,
+                sx: { mb: 2 },
+                placeholder: "bai_..."
+              }
+            ),
+            /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
+              import_material25.TextField,
+              {
+                label: "Default Model ID",
+                value: providerConfig.defaultModel || "",
+                onChange: (e) => setProviderConfig((prev) => ({
+                  ...prev,
+                  defaultModel: e.target.value
+                })),
+                fullWidth: true,
+                placeholder: "bandit-core-1",
+                helperText: "Example: bandit-core-1 (Bandit Core canonical alias)."
+              }
+            )
+          ] }),
           providerConfig.type === "openai" && /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(import_material25.Box, { children: [
             /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
               import_material25.TextField,
@@ -38777,20 +39327,20 @@ var MCPToolsTabV2 = () => {
     }
   }, [isLoaded]);
   const localEnabledMap = (0, import_react34.useMemo)(() => {
-    const map21 = /* @__PURE__ */ new Map();
+    const map23 = /* @__PURE__ */ new Map();
     const sortedTools = [...localTools].sort((a, b) => {
       if (a.isBuiltIn && !b.isBuiltIn) return -1;
       if (!a.isBuiltIn && b.isBuiltIn) return 1;
       return a.id.length - b.id.length;
     });
     sortedTools.forEach((t) => {
-      map21.set(t.function.name, t.enabled);
-      map21.set(t.id, t.enabled);
+      map23.set(t.function.name, t.enabled);
+      map23.set(t.id, t.enabled);
       if (t.name) {
-        map21.set(t.name, t.enabled);
+        map23.set(t.name, t.enabled);
       }
     });
-    return map21;
+    return map23;
   }, [localTools]);
   return /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(import_material26.Box, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime25.jsxs)(import_material26.Box, { sx: { display: "flex", alignItems: "center", justifyContent: "space-between", mb: 2 }, children: [