kiku-agent 1.0.10 → 1.0.11

package/server/agent/llmClient.js

@@ -1,209 +1,215 @@
-import { config, CLOUD_PROVIDERS, normalizeProviderModel } from './config.js';
-
-export class LLMClient {
-  constructor(options = {}) {
+import { config, CLOUD_PROVIDERS, normalizeProviderModel, savePersistedProviderKey, savePersistedActiveProvider, savePersistedProviderModel } from './config.js';
+import { parseApiErrorText } from './errors.js';
+
+export class LLMClient {
+  constructor(options = {}) {
     const providerId = (options.provider || config.activeProvider || 'lmstudio').toLowerCase();
     const providerDef = CLOUD_PROVIDERS[providerId];
     if (!providerDef) {
       throw new Error(`Unknown provider "${providerId}". Supported: ${Object.keys(CLOUD_PROVIDERS).join(', ')}`);
     }
-
-    this.provider = providerId;
-    this.providerName = providerDef.name || providerId;
-    this.baseUrl = (options.baseUrl || providerDef.baseUrl || config.lmStudio.baseUrl).replace(/\/+$/, '');
-    this.apiKey = options.apiKey !== undefined
-      ? options.apiKey
-      : (providerDef.apiKey !== undefined ? providerDef.apiKey : (providerDef.isLocal ? (config.lmStudio.apiKey || 'lm-studio') : ''));
+
+    this.provider = providerId;
+    this.providerName = providerDef.name || providerId;
+    this.baseUrl = (options.baseUrl || providerDef.baseUrl || config.lmStudio.baseUrl).replace(/\/+$/, '');
+    this.apiKey = options.apiKey !== undefined
+      ? options.apiKey
+      : (providerDef.apiKey !== undefined ? providerDef.apiKey : (providerDef.isLocal ? (config.lmStudio.apiKey || 'lm-studio') : ''));
     this.model = normalizeProviderModel(
       providerId,
       options.model || providerDef.defaultModel || config.lmStudio.model || 'google/gemma-4-e4b'
     );
-    this.timeout = options.timeout || config.lmStudio.requestTimeoutMs || 180000;
-    this.extraHeaders = { ...(providerDef.extraHeaders || {}), ...(options.extraHeaders || {}) };
-  }
-
-  switchProvider(providerId, options = {}) {
-    const pId = String(providerId || '').toLowerCase().trim();
-    const providerDef = CLOUD_PROVIDERS[pId];
-    if (!providerDef) {
-      throw new Error(`Unknown provider "${providerId}". Supported: ${Object.keys(CLOUD_PROVIDERS).join(', ')}`);
-    }
-
-    this.provider = pId;
-    this.providerName = providerDef.name || pId;
-    this.baseUrl = (options.baseUrl || providerDef.baseUrl).replace(/\/+$/, '');
-    this.apiKey = options.apiKey !== undefined ? options.apiKey : (providerDef.apiKey || '');
+    this.timeout = options.timeout || config.lmStudio.requestTimeoutMs || 180000;
+    this.extraHeaders = { ...(providerDef.extraHeaders || {}), ...(options.extraHeaders || {}) };
+  }
+
+  switchProvider(providerId, options = {}) {
+    const pId = String(providerId || '').toLowerCase().trim();
+    const providerDef = CLOUD_PROVIDERS[pId];
+    if (!providerDef) {
+      throw new Error(`Unknown provider "${providerId}". Supported: ${Object.keys(CLOUD_PROVIDERS).join(', ')}`);
+    }
+
+    this.provider = pId;
+    this.providerName = providerDef.name || pId;
+    this.baseUrl = (options.baseUrl || providerDef.baseUrl).replace(/\/+$/, '');
+    this.apiKey = options.apiKey !== undefined ? options.apiKey : (providerDef.apiKey || '');
     this.model = normalizeProviderModel(pId, options.model || providerDef.defaultModel);
-    this.extraHeaders = { ...(providerDef.extraHeaders || {}), ...(options.extraHeaders || {}) };
-    return this.getProviderInfo();
-  }
-
-  setApiKey(apiKey) {
-    this.apiKey = String(apiKey || '').trim();
-    return this.getProviderInfo();
-  }
-
-  setModel(model) {
-    const trimmed = String(model || '').trim();
-    if (!trimmed) throw new Error('A model ID is required.');
+    this.extraHeaders = { ...(providerDef.extraHeaders || {}), ...(options.extraHeaders || {}) };
+
+    savePersistedActiveProvider(pId, this.model);
+    return this.getProviderInfo();
+  }
+
+  setApiKey(apiKey, providerId = null) {
+    const targetProvider = String(providerId || this.provider).toLowerCase().trim();
+    const cleanKey = String(apiKey || '').trim();
+    savePersistedProviderKey(targetProvider, cleanKey);
+    if (targetProvider === this.provider) {
+      this.apiKey = cleanKey;
+    }
+    return this.getProviderInfo();
+  }
+
+  setModel(model) {
+    const trimmed = String(model || '').trim();
+    if (!trimmed) throw new Error('A model ID is required.');
     this.model = normalizeProviderModel(this.provider, trimmed);
-    return this.model;
-  }
-
-  getProviderInfo() {
-    const def = CLOUD_PROVIDERS[this.provider] || {};
-    return {
-      provider: this.provider,
-      providerName: this.providerName,
-      baseUrl: this.baseUrl,
-      model: this.model,
-      hasApiKey: Boolean(this.apiKey && this.apiKey !== 'lm-studio'),
-      isLocal: def.isLocal ?? false,
-      envKey: def.envKey || null,
-      docUrl: def.docUrl || null,
-      apiRefUrl: def.apiRefUrl || null,
-      pricingSummary: def.pricingSummary || null,
-      features: def.features || [],
-      recommendedModels: def.recommendedModels || [],
-    };
-  }
-
-  _buildHeaders() {
-    const headers = {
-      'Content-Type': 'application/json',
-      ...this.extraHeaders,
-    };
-
-    if (this.apiKey) {
-      headers['Authorization'] = `Bearer ${this.apiKey}`;
-      if (this.provider === 'gemini') {
-        headers['x-goog-api-key'] = this.apiKey;
-      }
-    } else if (this.provider === 'lmstudio') {
-      headers['Authorization'] = 'Bearer lm-studio';
-    }
-
-    return headers;
-  }
-
-  async checkConnection() {
-    const def = CLOUD_PROVIDERS[this.provider] || {};
-    const startTime = Date.now();
-
-    if (!def.isLocal && !this.apiKey) {
-      return {
-        connected: false,
-        provider: this.provider,
-        providerName: this.providerName,
-        error: `No API key configured for ${this.providerName}. Set ${def.envKey || 'API_KEY'} in .env or run /provider setkey <key>`,
-        models: [],
-        latencyMs: 0
-      };
-    }
-
-    try {
-      const controller = new AbortController();
-      const timeoutId = setTimeout(() => controller.abort(), 8000);
-
-      const res = await fetch(`${this.baseUrl}/models`, {
-        method: 'GET',
-        headers: this._buildHeaders(),
-        signal: controller.signal
-      });
-
-      clearTimeout(timeoutId);
-      const latencyMs = Date.now() - startTime;
-
-      if (!res.ok) {
-        let errSnippet = res.statusText;
-        try {
-          const errBody = await res.text();
-          if (errBody) {
-            try {
-              const parsed = JSON.parse(errBody);
-              errSnippet = parsed.error?.message || parsed.message || errBody.slice(0, 150);
-            } catch {
-              errSnippet = errBody.slice(0, 150);
-            }
-          }
-        } catch {}
-
-        let formattedError = `${this.providerName} returned status ${res.status}: ${errSnippet}`;
-        if (res.status === 401) {
-          formattedError = `401 Unauthorized: Invalid API key for ${this.providerName}. Check ${def.envKey || 'API key'}.`;
-        } else if (res.status === 429) {
-          formattedError = `429 Rate Limit / Quota Exceeded: ${errSnippet}`;
-        }
-
-        return {
-          connected: false,
-          provider: this.provider,
-          providerName: this.providerName,
-          error: formattedError,
-          models: [],
-          latencyMs
-        };
-      }
-
-      const data = await res.json();
-      const rawList = Array.isArray(data) ? data : (data.data || []);
-      const models = rawList.map(m => typeof m === 'string' ? m : (m.id || m.name)).filter(Boolean);
-
-      const matchedGemma = models.find(m => 
-        m === 'google/gemma-4-e4b' || 
-        m === 'gemma-4-e4b' || 
-        m.toLowerCase().includes('gemma-4-e4b') ||
-        (m.toLowerCase().includes('gemma') && m.toLowerCase().includes('e4b'))
-      );
-
-      const isAvailable = models.length === 0 ? true : models.includes(this.model);
-
-      return {
-        connected: true,
-        provider: this.provider,
-        providerName: this.providerName,
-        baseUrl: this.baseUrl,
-        models,
-        activeModel: models.includes(this.model) ? this.model : (matchedGemma || this.model),
-        isModelAvailable: isAvailable,
-        latencyMs
-      };
-    } catch (err) {
-      const latencyMs = Date.now() - startTime;
-      return {
-        connected: false,
-        provider: this.provider,
-        providerName: this.providerName,
-        error: err.name === 'AbortError' 
-          ? `Connection timed out at ${this.baseUrl} (>8s)` 
-          : `Cannot reach ${this.providerName} at ${this.baseUrl} (${err.message})`,
-        models: [],
-        latencyMs
-      };
-    }
-  }
-
-  async chat({
-    messages,
-    tools = null,
-    temperature = 0.3,
-    maxTokens = 1536,
-    stream = true,
-    signal = null,
-    onToken = null,
-    onThought = null
-  }) {
+    savePersistedProviderModel(this.provider, this.model);
+    return this.model;
+  }
+
+  getProviderInfo() {
+    const def = CLOUD_PROVIDERS[this.provider] || {};
+    return {
+      provider: this.provider,
+      providerName: this.providerName,
+      baseUrl: this.baseUrl,
+      model: this.model,
+      hasApiKey: Boolean(this.apiKey && this.apiKey !== 'lm-studio'),
+      isLocal: def.isLocal ?? false,
+      envKey: def.envKey || null,
+      docUrl: def.docUrl || null,
+      apiRefUrl: def.apiRefUrl || null,
+      pricingSummary: def.pricingSummary || null,
+      features: def.features || [],
+      recommendedModels: def.recommendedModels || [],
+    };
+  }
+
+  _buildHeaders() {
+    const headers = {
+      'Content-Type': 'application/json',
+      ...this.extraHeaders,
+    };
+
+    if (this.apiKey) {
+      headers['Authorization'] = `Bearer ${this.apiKey}`;
+      if (this.provider === 'gemini') {
+        headers['x-goog-api-key'] = this.apiKey;
+      }
+    } else if (this.provider === 'lmstudio') {
+      headers['Authorization'] = 'Bearer lm-studio';
+    }
+
+    return headers;
+  }
+
+  async checkConnection() {
+    const def = CLOUD_PROVIDERS[this.provider] || {};
+    const startTime = Date.now();
+
+    if (!def.isLocal && !this.apiKey) {
+      return {
+        connected: false,
+        provider: this.provider,
+        providerName: this.providerName,
+        error: `No API key configured for ${this.providerName}. Set ${def.envKey || 'API_KEY'} in .env or run /provider setkey <key>`,
+        models: [],
+        latencyMs: 0
+      };
+    }
+
+    try {
+      const controller = new AbortController();
+      const timeoutId = setTimeout(() => controller.abort(), 8000);
+
+      const res = await fetch(`${this.baseUrl}/models`, {
+        method: 'GET',
+        headers: this._buildHeaders(),
+        signal: controller.signal
+      });
+
+      clearTimeout(timeoutId);
+      const latencyMs = Date.now() - startTime;
+
+      if (!res.ok) {
+        let errSnippet = res.statusText;
+        try {
+          const errBody = await res.text();
+          if (errBody) {
+            errSnippet = parseApiErrorText(errBody);
+          }
+        } catch { }
+
+        let formattedError = `${this.providerName} returned status ${res.status}: ${errSnippet}`;
+        if (res.status === 401) {
+          formattedError = `401 Unauthorized: Invalid API key for ${this.providerName}. Check ${def.envKey || 'API key'}.`;
+        } else if (res.status === 402) {
+          formattedError = `402 Insufficient credits for ${this.providerName}: ${errSnippet}`;
+        } else if (res.status === 429) {
+          formattedError = `429 Rate Limit / Quota Exceeded: ${errSnippet}`;
+        }
+
+        return {
+          connected: false,
+          provider: this.provider,
+          providerName: this.providerName,
+          error: formattedError,
+          models: [],
+          latencyMs
+        };
+      }
+
+      const data = await res.json();
+      const rawList = Array.isArray(data) ? data : (data.data || []);
+      const models = rawList.map(m => typeof m === 'string' ? m : (m.id || m.name)).filter(Boolean);
+
+      const matchedGemma = models.find(m =>
+        m === 'google/gemma-4-e4b' ||
+        m === 'gemma-4-e4b' ||
+        m.toLowerCase().includes('gemma-4-e4b') ||
+        (m.toLowerCase().includes('gemma') && m.toLowerCase().includes('e4b'))
+      );
+
+      const isAvailable = models.length === 0 ? true : models.includes(this.model);
+
+      return {
+        connected: true,
+        provider: this.provider,
+        providerName: this.providerName,
+        baseUrl: this.baseUrl,
+        models,
+        activeModel: models.includes(this.model) ? this.model : (matchedGemma || this.model),
+        isModelAvailable: isAvailable,
+        latencyMs
+      };
+    } catch (err) {
+      const latencyMs = Date.now() - startTime;
+      return {
+        connected: false,
+        provider: this.provider,
+        providerName: this.providerName,
+        error: err.name === 'AbortError'
+          ? `Connection timed out at ${this.baseUrl} (>8s)`
+          : `Cannot reach ${this.providerName} at ${this.baseUrl} (${err.message})`,
+        models: [],
+        latencyMs
+      };
+    }
+  }
+
+  async chat({
+    messages,
+    tools = null,
+    temperature = 0.3,
+    maxTokens = 1536,
+    stream = true,
+    signal = null,
+    onToken = null,
+    onThought = null
+  }) {
     const isLegacyReasoningModel = /^(o1|o3|deepseek-reasoner)/i.test(this.model) || this.model.includes('reasoner');
     const usesCompletionTokenLimit = /^(o1|o3|gpt-5(?:\.|-|$))/i.test(this.model);
     const rejectsTemperature = /^(o1|o3|gpt-5(?:\.|-|$))/i.test(this.model);
-
-    const buildPayload = (includeTools = true, includeTemp = true) => {
-      const p = {
-        model: this.model,
-        messages,
-        stream
-      };
-
+
+    const buildPayload = (includeTools = true, includeTemp = true) => {
+      const p = {
+        model: this.model,
+        messages,
+        stream
+      };
+
       if (!rejectsTemperature && includeTemp && temperature !== undefined && temperature !== null) {
         p.temperature = temperature;
       }
@@ -215,162 +221,174 @@ export class LLMClient {
       }
 
       if (includeTools && tools && Array.isArray(tools) && tools.length > 0 && !isLegacyReasoningModel) {
-        p.tools = tools;
-        p.tool_choice = "auto";
-      }
-
-      return p;
-    };
-
-    let payload = buildPayload(true, true);
-
-    const controller = new AbortController();
-    let timeoutId = setTimeout(() => controller.abort(), this.timeout);
-
-    const abortHandler = () => controller.abort();
-    if (signal) signal.addEventListener('abort', abortHandler, { once: true });
-
-    const resetTimeout = () => {
-      clearTimeout(timeoutId);
-      timeoutId = setTimeout(() => controller.abort(), this.timeout);
-    };
-
-    try {
-      let res = await fetch(`${this.baseUrl}/chat/completions`, {
-        method: 'POST',
-        headers: this._buildHeaders(),
-        body: JSON.stringify(payload),
-        signal: controller.signal
-      });
-
-      resetTimeout();
-
-      // Graceful auto-retry if provider rejects tools/temperature/max_tokens with 400
-      if (!res.ok && res.status === 400) {
-        const errText = await res.text();
-        const lowerErr = errText.toLowerCase();
-        let retryNeeded = false;
-
-        if ((lowerErr.includes('tool') || lowerErr.includes('function') || lowerErr.includes('schema')) && payload.tools) {
-          payload = buildPayload(false, true);
-          retryNeeded = true;
-        } else if (lowerErr.includes('temperature') && payload.temperature !== undefined) {
-          payload = buildPayload(Boolean(payload.tools), false);
-          retryNeeded = true;
-        } else if (lowerErr.includes('max_tokens') && payload.max_tokens !== undefined) {
-          delete payload.max_tokens;
-          payload.max_completion_tokens = maxTokens;
-          retryNeeded = true;
-        }
-
-        if (retryNeeded) {
-          res = await fetch(`${this.baseUrl}/chat/completions`, {
-            method: 'POST',
-            headers: this._buildHeaders(),
-            body: JSON.stringify(payload),
-            signal: controller.signal
-          });
-          resetTimeout();
-        }
-
-        if (!res.ok) {
-          const finalErr = retryNeeded ? await res.text() : errText;
-          throw new Error(`${this.providerName} error (${res.status}): ${finalErr}`);
-        }
-      } else if (!res.ok) {
-        const errorText = await res.text();
-        throw new Error(`${this.providerName} error (${res.status}): ${errorText}`);
-      }
-
-      if (!stream) {
-        const data = await res.json();
-        clearTimeout(timeoutId);
-        if (signal) signal.removeEventListener('abort', abortHandler);
-        const msg = data.choices && data.choices[0] ? data.choices[0].message : null;
-        if (msg && !msg.reasoning_content && (msg.reasoning || msg.thinking)) {
-          msg.reasoning_content = msg.reasoning || msg.thinking;
-        }
-        return msg;
-      }
-
-      const reader = res.body.getReader();
-      const decoder = new TextDecoder('utf-8');
-      let fullContent = '';
-      let fullReasoning = '';
-      let toolCalls = [];
-      let buffer = '';
-
-      while (true) {
-        const { done, value } = await reader.read();
-        if (done) break;
-
-        resetTimeout();
-
-        buffer += decoder.decode(value, { stream: true });
-        const lines = buffer.split('\n');
-        buffer = lines.pop() || '';
-
-        for (const line of lines) {
-          const trimmed = line.trim();
-          if (!trimmed || !trimmed.startsWith('data:')) continue;
-          const jsonStr = trimmed.replace(/^data:\s*/, '');
-          if (jsonStr === '[DONE]') continue;
-
-          try {
-            const parsed = JSON.parse(jsonStr);
-            const delta = parsed.choices?.[0]?.delta;
-            if (!delta) continue;
-
-            const reasoning = delta.reasoning_content || delta.reasoning || delta.thinking;
-            if (reasoning) {
-              fullReasoning += reasoning;
-              if (onThought) onThought(reasoning);
-            }
-
-            if (delta.content) {
-              fullContent += delta.content;
-              if (onToken) onToken(delta.content);
-            }
-
-            if (delta.tool_calls) {
-              for (const tc of delta.tool_calls) {
-                const idx = tc.index ?? 0;
-                if (!toolCalls[idx]) {
-                  toolCalls[idx] = {
-                    id: tc.id || `call_${Date.now()}_${idx}`,
-                    type: 'function',
-                    function: { name: '', arguments: '' }
-                  };
-                }
-                if (tc.function?.name) toolCalls[idx].function.name += tc.function.name;
-                if (tc.function?.arguments) toolCalls[idx].function.arguments += tc.function.arguments;
-              }
-            }
-          } catch {
-          }
-        }
-      }
-
-      clearTimeout(timeoutId);
-
-      const resultMessage = {
-        role: 'assistant',
-        content: fullContent,
-        reasoning_content: fullReasoning
-      };
-
-      if (toolCalls.length > 0) {
-        resultMessage.tool_calls = toolCalls.filter(Boolean);
-      }
-
-      if (signal) signal.removeEventListener('abort', abortHandler);
-      return resultMessage;
-    } catch (err) {
-      clearTimeout(timeoutId);
-      if (signal) signal.removeEventListener('abort', abortHandler);
-      throw err;
-    }
-  }
-}
-
-export { LLMClient as LMStudioClient };
+        p.tools = tools;
+        p.tool_choice = "auto";
+      }
+
+      return p;
+    };
+
+    let payload = buildPayload(true, true);
+
+    const controller = new AbortController();
+    let timeoutId = setTimeout(() => controller.abort(), this.timeout);
+
+    const abortHandler = () => controller.abort();
+    if (signal) signal.addEventListener('abort', abortHandler, { once: true });
+
+    const resetTimeout = () => {
+      clearTimeout(timeoutId);
+      timeoutId = setTimeout(() => controller.abort(), this.timeout);
+    };
+
+    try {
+      let res = await fetch(`${this.baseUrl}/chat/completions`, {
+        method: 'POST',
+        headers: this._buildHeaders(),
+        body: JSON.stringify(payload),
+        signal: controller.signal
+      });
+
+      resetTimeout();
+
+   
+      if (!res.ok && res.status === 400) {
+        const errText = await res.text();
+        const lowerErr = errText.toLowerCase();
+        let retryNeeded = false;
+
+        if ((lowerErr.includes('tool') || lowerErr.includes('function') || lowerErr.includes('schema')) && payload.tools) {
+          payload = buildPayload(false, true);
+          retryNeeded = true;
+        } else if (lowerErr.includes('temperature') && payload.temperature !== undefined) {
+          payload = buildPayload(Boolean(payload.tools), false);
+          retryNeeded = true;
+        } else if (lowerErr.includes('max_tokens') && payload.max_tokens !== undefined) {
+          delete payload.max_tokens;
+          payload.max_completion_tokens = maxTokens;
+          retryNeeded = true;
+        }
+
+        if (retryNeeded) {
+          res = await fetch(`${this.baseUrl}/chat/completions`, {
+            method: 'POST',
+            headers: this._buildHeaders(),
+            body: JSON.stringify(payload),
+            signal: controller.signal
+          });
+          resetTimeout();
+        }
+
+        if (!res.ok) {
+          const finalErr = retryNeeded ? await res.text() : errText;
+          const cleanMsg = parseApiErrorText(finalErr);
+          const err = new Error(`${this.providerName} error (${res.status}): ${cleanMsg}`);
+          err.status = res.status;
+          err.provider = this.provider;
+          err.providerName = this.providerName;
+          err.rawError = finalErr;
+          throw err;
+        }
+      } else if (!res.ok) {
+        const errorText = await res.text();
+        const cleanMsg = parseApiErrorText(errorText);
+        const err = new Error(`${this.providerName} error (${res.status}): ${cleanMsg}`);
+        err.status = res.status;
+        err.provider = this.provider;
+        err.providerName = this.providerName;
+        err.rawError = errorText;
+        throw err;
+      }
+
+      if (!stream) {
+        const data = await res.json();
+        clearTimeout(timeoutId);
+        if (signal) signal.removeEventListener('abort', abortHandler);
+        const msg = data.choices && data.choices[0] ? data.choices[0].message : null;
+        if (msg && !msg.reasoning_content && (msg.reasoning || msg.thinking)) {
+          msg.reasoning_content = msg.reasoning || msg.thinking;
+        }
+        return msg;
+      }
+
+      const reader = res.body.getReader();
+      const decoder = new TextDecoder('utf-8');
+      let fullContent = '';
+      let fullReasoning = '';
+      let toolCalls = [];
+      let buffer = '';
+
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) break;
+
+        resetTimeout();
+
+        buffer += decoder.decode(value, { stream: true });
+        const lines = buffer.split('\n');
+        buffer = lines.pop() || '';
+
+        for (const line of lines) {
+          const trimmed = line.trim();
+          if (!trimmed || !trimmed.startsWith('data:')) continue;
+          const jsonStr = trimmed.replace(/^data:\s*/, '');
+          if (jsonStr === '[DONE]') continue;
+
+          try {
+            const parsed = JSON.parse(jsonStr);
+            const delta = parsed.choices?.[0]?.delta;
+            if (!delta) continue;
+
+            const reasoning = delta.reasoning_content || delta.reasoning || delta.thinking;
+            if (reasoning) {
+              fullReasoning += reasoning;
+              if (onThought) onThought(reasoning);
+            }
+
+            if (delta.content) {
+              fullContent += delta.content;
+              if (onToken) onToken(delta.content);
+            }
+
+            if (delta.tool_calls) {
+              for (const tc of delta.tool_calls) {
+                const idx = tc.index ?? 0;
+                if (!toolCalls[idx]) {
+                  toolCalls[idx] = {
+                    id: tc.id || `call_${Date.now()}_${idx}`,
+                    type: 'function',
+                    function: { name: '', arguments: '' }
+                  };
+                }
+                if (tc.function?.name) toolCalls[idx].function.name += tc.function.name;
+                if (tc.function?.arguments) toolCalls[idx].function.arguments += tc.function.arguments;
+              }
+            }
+          } catch {
+          }
+        }
+      }
+
+      clearTimeout(timeoutId);
+
+      const resultMessage = {
+        role: 'assistant',
+        content: fullContent,
+        reasoning_content: fullReasoning
+      };
+
+      if (toolCalls.length > 0) {
+        resultMessage.tool_calls = toolCalls.filter(Boolean);
+      }
+
+      if (signal) signal.removeEventListener('abort', abortHandler);
+      return resultMessage;
+    } catch (err) {
+      clearTimeout(timeoutId);
+      if (signal) signal.removeEventListener('abort', abortHandler);
+      throw err;
+    }
+  }
+}
+
+export { LLMClient as LMStudioClient };