turbollm 1.5.4 → 1.6.1

package/LICENSE.md

@@ -1,105 +1,105 @@
-# Functional Source License, Version 1.1, ALv2 Future License
-
-## Abbreviation
-
-FSL-1.1-ALv2
-
-## Notice
-
-Copyright 2026 Mohit Soni
-
-## Terms and Conditions
-
-### Licensor ("We")
-
-The party offering the Software under these Terms and Conditions.
-
-### The Software
-
-The "Software" is each version of the software that we make available under
-these Terms and Conditions, as indicated by our inclusion of these Terms and
-Conditions with the Software.
-
-### License Grant
-
-Subject to your compliance with this License Grant and the Patents,
-Redistribution and Trademark clauses below, we hereby grant you the right to
-use, copy, modify, create derivative works, publicly perform, publicly display
-and redistribute the Software for any Permitted Purpose identified below.
-
-### Permitted Purpose
-
-A Permitted Purpose is any purpose other than a Competing Use. A Competing Use
-means making the Software available to others in a commercial product or
-service that:
-
-1. substitutes for the Software;
-
-2. substitutes for any other product or service we offer using the Software
-   that exists as of the date we make the Software available; or
-
-3. offers the same or substantially similar functionality as the Software.
-
-Permitted Purposes specifically include using the Software:
-
-1. for your internal use and access;
-
-2. for non-commercial education;
-
-3. for non-commercial research; and
-
-4. in connection with professional services that you provide to a licensee
-   using the Software in accordance with these Terms and Conditions.
-
-### Patents
-
-To the extent your use for a Permitted Purpose would necessarily infringe our
-patents, the license grant above includes a license under our patents. If you
-make a claim against any party that the Software infringes or contributes to
-the infringement of any patent, then your patent license to the Software ends
-immediately.
-
-### Redistribution
-
-The Terms and Conditions apply to all copies, modifications and derivatives of
-the Software.
-
-If you redistribute any copies, modifications or derivatives of the Software,
-you must include a copy of or a link to these Terms and Conditions and not
-remove any copyright notices provided in or with the Software.
-
-### Disclaimer
-
-THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTIES OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING WITHOUT LIMITATION WARRANTIES OF FITNESS FOR A PARTICULAR
-PURPOSE, MERCHANTABILITY, TITLE OR NON-INFRINGEMENT.
-
-IN NO EVENT WILL WE HAVE ANY LIABILITY TO YOU ARISING OUT OF OR RELATED TO THE
-SOFTWARE, INCLUDING INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES,
-EVEN IF WE HAVE BEEN INFORMED OF THEIR POSSIBILITY IN ADVANCE.
-
-### Trademarks
-
-Except for displaying the License Details and identifying us as the origin of
-the Software, you have no right under these Terms and Conditions to use our
-trademarks, trade names, service marks or product names.
-
-## Grant of Future License
-
-We hereby irrevocably grant you an additional license to use the Software under
-the Apache License, Version 2.0 that is effective on the second anniversary of
-the date we make the Software available. On or after that date, you may use the
-Software under the Apache License, Version 2.0, in which case the following
-will apply:
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License.
-
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software distributed
-under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-CONDITIONS OF ANY KIND, either express or implied. See the License for the
-specific language governing permissions and limitations under the License.
+# Functional Source License, Version 1.1, ALv2 Future License
+
+## Abbreviation
+
+FSL-1.1-ALv2
+
+## Notice
+
+Copyright 2026 Mohit Soni
+
+## Terms and Conditions
+
+### Licensor ("We")
+
+The party offering the Software under these Terms and Conditions.
+
+### The Software
+
+The "Software" is each version of the software that we make available under
+these Terms and Conditions, as indicated by our inclusion of these Terms and
+Conditions with the Software.
+
+### License Grant
+
+Subject to your compliance with this License Grant and the Patents,
+Redistribution and Trademark clauses below, we hereby grant you the right to
+use, copy, modify, create derivative works, publicly perform, publicly display
+and redistribute the Software for any Permitted Purpose identified below.
+
+### Permitted Purpose
+
+A Permitted Purpose is any purpose other than a Competing Use. A Competing Use
+means making the Software available to others in a commercial product or
+service that:
+
+1. substitutes for the Software;
+
+2. substitutes for any other product or service we offer using the Software
+   that exists as of the date we make the Software available; or
+
+3. offers the same or substantially similar functionality as the Software.
+
+Permitted Purposes specifically include using the Software:
+
+1. for your internal use and access;
+
+2. for non-commercial education;
+
+3. for non-commercial research; and
+
+4. in connection with professional services that you provide to a licensee
+   using the Software in accordance with these Terms and Conditions.
+
+### Patents
+
+To the extent your use for a Permitted Purpose would necessarily infringe our
+patents, the license grant above includes a license under our patents. If you
+make a claim against any party that the Software infringes or contributes to
+the infringement of any patent, then your patent license to the Software ends
+immediately.
+
+### Redistribution
+
+The Terms and Conditions apply to all copies, modifications and derivatives of
+the Software.
+
+If you redistribute any copies, modifications or derivatives of the Software,
+you must include a copy of or a link to these Terms and Conditions and not
+remove any copyright notices provided in or with the Software.
+
+### Disclaimer
+
+THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTIES OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING WITHOUT LIMITATION WARRANTIES OF FITNESS FOR A PARTICULAR
+PURPOSE, MERCHANTABILITY, TITLE OR NON-INFRINGEMENT.
+
+IN NO EVENT WILL WE HAVE ANY LIABILITY TO YOU ARISING OUT OF OR RELATED TO THE
+SOFTWARE, INCLUDING INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES,
+EVEN IF WE HAVE BEEN INFORMED OF THEIR POSSIBILITY IN ADVANCE.
+
+### Trademarks
+
+Except for displaying the License Details and identifying us as the origin of
+the Software, you have no right under these Terms and Conditions to use our
+trademarks, trade names, service marks or product names.
+
+## Grant of Future License
+
+We hereby irrevocably grant you an additional license to use the Software under
+the Apache License, Version 2.0 that is effective on the second anniversary of
+the date we make the Software available. On or after that date, you may use the
+Software under the Apache License, Version 2.0, in which case the following
+will apply:
+
+Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+this file except in compliance with the License.
+
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed
+under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied. See the License for the
+specific language governing permissions and limitations under the License.

package/README.md

@@ -194,8 +194,10 @@ the detail:
 - **Image input** for vision models, and **TurboLLM Expert** — a built-in assistant that knows
   the app and your hardware for onboarding and troubleshooting without leaving the UI.
 - **Agentic tools** — built-in `web_search` (Tavily), `fetch_url`, and sandboxed `run_code`, plus
-  **MCP server support** (stdio / SSE) so any MCP server's tools appear in every chat. A **Research**
-  persona forces multi-step web search and cites sources inline.
+  an **MCP marketplace** in Customize: one-click connect for hosted MCPs (GitHub, Linear, Stripe,
+  Atlassian, Neon, Supabase, Cloudflare, Zapier, Apify, Mixpanel) and open-source local MCPs
+  (filesystem, git, postgres, playwright, …), plus your own custom servers. Connected tools appear
+  in every chat with no restart. A **Research** persona forces multi-step web search and cites sources inline.
 
 </details>
 

package/bin/turbollm.mjs

@@ -1,25 +1,25 @@
-#!/usr/bin/env node
-// Hand-written launcher shim — NOT bundled by tsup. It runs before the bundled
-// daemon (dist/cli.js) loads, so it can do two things that must happen before
-// node:sqlite is imported (the bundle hoists that import, emitting an experimental
-// warning that PowerShell renders as a scary red error block on every run):
-//   1. Guard the Node version with a friendly message (node:sqlite needs Node 22+).
-//   2. Register a 'warning' filter that swallows the node:sqlite experimental notice
-//      while still printing every other warning.
-// Then it hands off to the real CLI via dynamic import (same process; argv intact).
-const major = Number(process.versions.node.split('.')[0])
-if (major < 22) {
-  process.stderr.write(
-    `TurboLLM requires Node.js 22 or newer.\n` +
-      `You are running Node.js ${process.versions.node}.\n` +
-      `Please upgrade: https://nodejs.org\n`,
-  )
-  process.exit(1)
-}
-
-process.on('warning', (w) => {
-  if (w.name === 'ExperimentalWarning' && /SQLite/i.test(w.message)) return
-  process.stderr.write(`${w.stack ?? `${w.name}: ${w.message}`}\n`)
-})
-
-await import('../dist/cli.js')
+#!/usr/bin/env node
+// Hand-written launcher shim — NOT bundled by tsup. It runs before the bundled
+// daemon (dist/cli.js) loads, so it can do two things that must happen before
+// node:sqlite is imported (the bundle hoists that import, emitting an experimental
+// warning that PowerShell renders as a scary red error block on every run):
+//   1. Guard the Node version with a friendly message (node:sqlite needs Node 22+).
+//   2. Register a 'warning' filter that swallows the node:sqlite experimental notice
+//      while still printing every other warning.
+// Then it hands off to the real CLI via dynamic import (same process; argv intact).
+const major = Number(process.versions.node.split('.')[0])
+if (major < 22) {
+  process.stderr.write(
+    `TurboLLM requires Node.js 22 or newer.\n` +
+      `You are running Node.js ${process.versions.node}.\n` +
+      `Please upgrade: https://nodejs.org\n`,
+  )
+  process.exit(1)
+}
+
+process.on('warning', (w) => {
+  if (w.name === 'ExperimentalWarning' && /SQLite/i.test(w.message)) return
+  process.stderr.write(`${w.stack ?? `${w.name}: ${w.message}`}\n`)
+})
+
+await import('../dist/cli.js')

package/dist/cli.js

@@ -3746,7 +3746,15 @@ function resolveProfile(m, sys, saved, overrides, defaults) {
     // missing some fields) keeps the rest of the defaults instead of going undefined.
     gpu: { ...base2.gpu, ...saved?.gpu ?? {}, ...overrides?.gpu ?? {} },
     // vllm deep-merged for the same reason — old/partial profiles keep the defaults.
-    vllm: { ...base2.vllm, ...saved?.vllm ?? {}, ...overrides?.vllm ?? {} }
+    vllm: { ...base2.vllm, ...saved?.vllm ?? {}, ...overrides?.vllm ?? {} },
+    // useMmproj has no UI control (only mmprojGpu — GPU-vs-CPU placement — is user-facing;
+    // see ModelDetailDialog's "Vision encoder on GPU" toggle), so there is no legitimate way
+    // for a saved profile or draft override to carry a meaningful `false` here. Forcing it to
+    // track the model's own vision capability makes it self-healing: any profile saved with a
+    // stale/incorrect useMmproj (e.g. auto-tune runs prior to the bench.ts fix that persisted
+    // false) is corrected on the very next resolve, for every user, with no reset/migration
+    // needed and no other tuned setting touched.
+    useMmproj: m.vision
   };
 }
 function profileToArgs(p, m, caps, cores = 0) {
@@ -4991,7 +4999,7 @@ var BenchRunner = class {
     const saved = this.store.snapshot().modelProfiles[modelKey];
     const defaults = this.store.snapshot().modelDefaults;
     const resolved = resolveProfile(entry, sys, saved, base2, defaults);
-    const baseProfile = { ...resolved, speculative: "off", mtpHeadPath: "", draftModelPath: "", useMmproj: false };
+    const baseProfile = { ...resolved, speculative: "off", mtpHeadPath: "", draftModelPath: "" };
     const results = [];
     let best = null;
     const kvCandidates = pickKvQuants(baseProfile.kvTypeK, caps.kvTypes);
@@ -6412,7 +6420,6 @@ function execRunCode(args, requireConfirmation = false) {
 
 // src/tools/mcp-client.ts
 import { spawn as spawn2 } from "child_process";
-import { EventEmitter } from "events";
 var StdioMcpClient = class {
   serverId;
   serverName;
@@ -6433,7 +6440,10 @@ var StdioMcpClient = class {
   }
   async connect() {
     if (this.proc) return;
-    this.proc = spawn2(this.command, this.args, {
+    const isWin = process.platform === "win32";
+    const file = isWin ? "cmd.exe" : this.command;
+    const args = isWin ? ["/c", this.command, ...this.args] : this.args;
+    this.proc = spawn2(file, args, {
       env: { ...process.env, ...this.env },
       stdio: ["pipe", "pipe", "pipe"]
     });
@@ -6527,70 +6537,28 @@ var SseMcpClient = class {
   serverId;
   serverName;
   baseUrl;
+  headers;
   msgId = 0;
-  sseEndpoint = "";
-  sseAbort = null;
-  emitter = new EventEmitter();
+  sessionId = null;
   initialized = false;
   constructor(opts) {
     this.serverId = opts.id;
     this.serverName = opts.name;
     this.baseUrl = opts.url.replace(/\/$/, "");
+    this.headers = opts.headers ?? {};
   }
   async connect() {
     if (this.initialized) return;
-    this.sseAbort = new AbortController();
-    const endpoint = await new Promise((resolve2, reject) => {
-      const timer = setTimeout(() => reject(new Error("SSE connect timeout")), 15e3);
-      fetch(`${this.baseUrl}/sse`, { signal: this.sseAbort.signal }).then(async (resp) => {
-        if (!resp.ok || !resp.body) {
-          clearTimeout(timer);
-          reject(new Error(`SSE connect failed: ${resp.status}`));
-          return;
-        }
-        const reader = resp.body.getReader();
-        const decoder = new TextDecoder();
-        let buf = "";
-        let resolved = false;
-        while (true) {
-          const { done, value } = await reader.read();
-          if (done) break;
-          buf += decoder.decode(value, { stream: true });
-          const lines = buf.split("\n");
-          buf = lines.pop() ?? "";
-          for (const line of lines) {
-            if (line.startsWith("data:")) {
-              const data = line.slice(5).trim();
-              if (!resolved) {
-                resolved = true;
-                clearTimeout(timer);
-                resolve2(data);
-              }
-              try {
-                const msg2 = JSON.parse(data);
-                if (msg2.id != null) this.emitter.emit(`rpc:${msg2.id}`, msg2);
-              } catch {
-              }
-            }
-          }
-        }
-      }).catch((e) => {
-        clearTimeout(timer);
-        if (!this.sseAbort?.signal.aborted) reject(e);
-      });
-    });
-    this.sseEndpoint = endpoint.startsWith("http") ? endpoint : `${this.baseUrl}${endpoint}`;
     await this.sendRequest("initialize", {
       protocolVersion: "2024-11-05",
       capabilities: { tools: {} },
       clientInfo: { name: "turbollm", version: "0.7.0" }
     });
-    await this.post({ jsonrpc: "2.0", method: "notifications/initialized", params: {} });
+    void this.postNotification({ jsonrpc: "2.0", method: "notifications/initialized", params: {} });
     this.initialized = true;
   }
   disconnect() {
-    this.sseAbort?.abort();
-    this.sseAbort = null;
+    this.sessionId = null;
     this.initialized = false;
   }
   async listTools() {
@@ -6607,36 +6575,79 @@ var SseMcpClient = class {
   async sendRequest(method, params) {
     const id = ++this.msgId;
     const req = { jsonrpc: "2.0", id, method, params };
-    return new Promise((resolve2, reject) => {
-      const timer = setTimeout(() => {
-        this.emitter.removeAllListeners(`rpc:${id}`);
-        reject(new Error(`MCP SSE request timeout: ${method}`));
-      }, 3e4);
-      this.emitter.once(`rpc:${id}`, (msg2) => {
-        clearTimeout(timer);
-        if (msg2.error) reject(new Error(msg2.error.message));
-        else resolve2(msg2.result);
-      });
-      this.post(req).catch((e) => {
-        clearTimeout(timer);
-        reject(e);
-      });
+    const reqHeaders = {
+      "Content-Type": "application/json",
+      "Accept": "application/json, text/event-stream",
+      ...this.headers
+    };
+    if (this.sessionId) reqHeaders["Mcp-Session-Id"] = this.sessionId;
+    const resp = await fetch(this.baseUrl, {
+      method: "POST",
+      headers: reqHeaders,
+      body: JSON.stringify(req),
+      signal: AbortSignal.timeout(3e4)
     });
+    if (!resp.ok) {
+      const txt = await resp.text().catch(() => "");
+      throw new Error(`MCP HTTP ${resp.status}: ${txt.slice(0, 200)}`);
+    }
+    const newSession = resp.headers.get("mcp-session-id");
+    if (newSession) this.sessionId = newSession;
+    const ct = resp.headers.get("content-type") ?? "";
+    if (ct.includes("text/event-stream")) return this.readSSEResult(resp, id);
+    const json = await resp.json();
+    if (json.error) throw new Error(json.error.message);
+    return json.result;
+  }
+  async readSSEResult(resp, targetId) {
+    if (!resp.body) throw new Error("SSE response body is null");
+    const reader = resp.body.getReader();
+    const dec = new TextDecoder();
+    let buf = "";
+    try {
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) break;
+        buf += dec.decode(value, { stream: true });
+        const lines = buf.split("\n");
+        buf = lines.pop() ?? "";
+        for (const line of lines) {
+          if (!line.startsWith("data:")) continue;
+          let msg2;
+          try {
+            msg2 = JSON.parse(line.slice(5).trim());
+          } catch {
+            continue;
+          }
+          if (msg2.id === targetId) {
+            if (msg2.error) throw new Error(msg2.error.message);
+            return msg2.result;
+          }
+        }
+      }
+    } finally {
+      await reader.cancel().catch(() => {
+      });
+    }
+    throw new Error(`SSE stream ended without response for id ${targetId}`);
   }
-  async post(msg2) {
-    const url = this.sseEndpoint || `${this.baseUrl}/messages`;
-    await fetch(url, {
+  async postNotification(msg2) {
+    const headers = { "Content-Type": "application/json", ...this.headers };
+    if (this.sessionId) headers["Mcp-Session-Id"] = this.sessionId;
+    await fetch(this.baseUrl, {
       method: "POST",
-      headers: { "Content-Type": "application/json" },
+      headers,
       body: JSON.stringify(msg2),
       signal: AbortSignal.timeout(1e4)
+    }).catch(() => {
     });
   }
 };
 function createMcpClient(server2) {
   if (server2.transport === "sse") {
     if (!server2.url) throw new Error(`MCP server "${server2.name}" has transport=sse but no url`);
-    return new SseMcpClient({ id: server2.id, name: server2.name, url: server2.url });
+    const headers = server2.apiKey ? { Authorization: `Bearer ${server2.apiKey}` } : void 0;
+    return new SseMcpClient({ id: server2.id, name: server2.name, url: server2.url, headers });
   }
   if (!server2.command) throw new Error(`MCP server "${server2.name}" has transport=stdio but no command`);
   return new StdioMcpClient({
@@ -6776,7 +6787,7 @@ var GenerationGate = class {
 };
 
 // src/agents/runner.ts
-import { EventEmitter as EventEmitter2 } from "events";
+import { EventEmitter } from "events";
 
 // src/chat/parser.ts
 var THINK_OPEN = "<think>";
@@ -7551,7 +7562,7 @@ var AgentRunner = class {
     const pending = this.queue.shift();
     this.active = pending.id;
     const buffer = new RunBuffer();
-    const emitter = new EventEmitter2();
+    const emitter = new EventEmitter();
     emitter.setMaxListeners(50);
     const ac = new AbortController();
     this.buffers.set(pending.id, buffer);
@@ -11131,6 +11142,7 @@ function registerApi(app2, d) {
     });
     if (b.tavilyApiKey !== void 0 || b.search !== void 0) {
       d.tools?.updateConfig(d.store.snapshot().tools);
+      await d.tools?.buildToolDefinitions();
     }
     const after = d.store.snapshot().daemon;
     const lanChanged = after.lanBind !== before.lanBind;
@@ -11156,14 +11168,22 @@ function registerApi(app2, d) {
       name: b.name.trim(),
       transport,
       enabled: b.enabled !== false,
-      ...transport === "stdio" ? { command: b.command.trim(), args: b.args ?? [], env: b.env ?? {} } : { url: b.url.trim() }
+      ...transport === "stdio" ? { command: b.command.trim(), args: b.args ?? [], env: b.env ?? {} } : { url: b.url.trim(), ...b.apiKey ? { apiKey: b.apiKey } : {} }
     };
+    const isMemoryServer = server2.transport === "stdio" && (server2.command?.includes("server-memory") || server2.args?.some((a) => a.includes("server-memory")));
+    if (isMemoryServer && !server2.env?.MEMORY_FILE_PATH) {
+      server2.env = { ...server2.env, MEMORY_FILE_PATH: join22(homedir3(), ".turbollm", "mcp-memory.jsonl") };
+    }
     d.store.update((cfg2) => {
       cfg2.mcp.servers.push(server2);
     });
-    if (server2.enabled) await d.tools?.syncMcpServers(d.store.snapshot().mcp.servers).catch(() => {
-    });
-    return c.json(server2, 201);
+    if (server2.enabled) {
+      await d.tools?.syncMcpServers(d.store.snapshot().mcp.servers).catch(() => {
+      });
+      await d.tools?.buildToolDefinitions();
+    }
+    const { apiKey: _created, ...safeServer } = server2;
+    return c.json(safeServer, 201);
   });
   app2.put("/api/v1/mcp/servers/:id", async (c) => {
     const id = c.req.param("id");
@@ -11181,12 +11201,16 @@ function registerApi(app2, d) {
       if (b.args !== void 0) s.args = b.args;
       if (b.env !== void 0) s.env = b.env;
       if (b.url !== void 0) s.url = b.url;
+      if (b.apiKey !== void 0) s.apiKey = b.apiKey || void 0;
     });
     await d.tools?.syncMcpServers(d.store.snapshot().mcp.servers).catch(() => {
     });
-    return c.json(d.store.snapshot().mcp.servers.find((s) => s.id === id));
+    await d.tools?.buildToolDefinitions();
+    const updated = d.store.snapshot().mcp.servers.find((s) => s.id === id);
+    const { apiKey: _updated, ...safeUpdated } = updated;
+    return c.json(safeUpdated);
   });
-  app2.delete("/api/v1/mcp/servers/:id", (c) => {
+  app2.delete("/api/v1/mcp/servers/:id", async (c) => {
     const id = c.req.param("id");
     const cfg2 = d.store.snapshot();
     if (!cfg2.mcp.servers.some((s) => s.id === id)) return err2(c, 404, "not_found", "MCP server not found.");
@@ -11194,6 +11218,7 @@ function registerApi(app2, d) {
       c2.mcp.servers = c2.mcp.servers.filter((s) => s.id !== id);
     });
     void d.tools?.syncMcpServers(d.store.snapshot().mcp.servers);
+    await d.tools?.buildToolDefinitions();
     return c.json({ ok: true });
   });
   app2.get("/api/v1/telemetry/preview", (c) => {
@@ -11446,7 +11471,8 @@ function settingsPayload(d) {
       kagiKeySet: !!cfg2.tools.search?.kagiApiKey,
       searxngUrl: cfg2.tools.search?.searxngUrl ?? ""
     },
-    mcp: cfg2.mcp,
+    // apiKey is write-only: strip before echoing so Bearer tokens never reach the frontend.
+    mcp: { ...cfg2.mcp, servers: cfg2.mcp.servers.map(({ apiKey: _k, ...s }) => s) },
     // Build environment (ADR-100): folders prepended to PATH for compile-from-source so a
     // conda-env / custom-path CUDA Toolkit + compiler are found. Not secret — echoed back.
     build: { toolchainDirs: cfg2.build.toolchainDirs }
@@ -12050,9 +12076,10 @@ async function* streamToAnthropic(oaiStream, modelName, msgId, onUsage, onLive)
       yield cbStop(blockIdx);
       blockIdx++;
     }
+    const nonCachedInput = Math.max(0, inputTokens - cacheReadTokens);
     yield sse("message_delta", {
       delta: { stop_reason: stopReason, stop_sequence: null },
-      usage: { input_tokens: inputTokens, output_tokens: outputTokens, cache_read_input_tokens: cacheReadTokens }
+      usage: { input_tokens: nonCachedInput, output_tokens: outputTokens, cache_read_input_tokens: cacheReadTokens }
     });
     yield sse("message_stop", {});
     if (onUsage) {
@@ -12525,6 +12552,7 @@ var toolRegistry = new ToolRegistry(store.snapshot().tools);
 void (async () => {
   const cfg2 = store.snapshot();
   await toolRegistry.syncMcpServers(cfg2.mcp.servers);
+  void toolRegistry.buildToolDefinitions();
 })();
 var startedAt = Date.now();
 var appUpdates = new AppUpdateChecker(version);

package/dist/webdist/assets/{AgentsScreen-8OttuI7h.js → AgentsScreen-Bm0dlNUs.js}

@@ -1,2 +1,2 @@
-import{j as e}from"./radix-4XwKfE88.js";import{r as u}from"./vendor-CKtmMAvG.js";import{c as w,d as k,A as T,e as v,L as h,f as S,b,g as C,h as q,X as A}from"./index-aRpf26fA.js";import{P as N}from"./plus-CBiMXB28.js";import{C as y}from"./circle-x-ED1-1ibi.js";import{C as O}from"./circle-check-CR9l1s2L.js";import{W as E}from"./wrench-TCdFNEP4.js";const _=[["circle",{cx:"12",cy:"12",r:"10",key:"1mglay"}],["circle",{cx:"12",cy:"12",r:"1",key:"41hilf"}]],D=w("circle-dot",_);const L=[["circle",{cx:"12",cy:"12",r:"10",key:"1mglay"}],["path",{d:"M12 6v6l4 2",key:"mmk7yg"}]],P=w("clock",L),p={all:["agent-runs"],list:()=>[...p.all,"list"],detail:t=>[...p.all,"detail",t]};async function g(t,a){const l={Accept:"application/json",...k(),...a?.headers??{}},i=await fetch(t,{...a,headers:l});if(i.status===204)return;const r=await i.text(),o=r?JSON.parse(r):void 0;if(!i.ok){const d=o;throw new T(d?.error?.code??"http_error",d?.error?.message??`Request failed with status ${i.status}.`,i.status)}return o}async function $(){return g("/api/v1/agents/runs")}async function I(t){return g(`/api/v1/agents/runs/${t}`)}async function Q(t){return g("/api/v1/agents/runs",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify(t)})}async function K(t){await g(`/api/v1/agents/runs/${t}`,{method:"DELETE"})}async function*F(t,a=0,l){const i=`/api/v1/agents/runs/${t}/stream?fromSeq=${a}`,r=await fetch(i,{headers:{Accept:"text/event-stream",...k()},signal:l});if(!r.ok||!r.body)throw new Error(`Stream error: ${r.status}`);const o=r.body.getReader(),d=new TextDecoder;let m="";try{for(;;){const{done:s,value:x}=await o.read();if(s)break;m+=d.decode(x,{stream:!0});const c=m.split(`
+import{j as e}from"./radix-4XwKfE88.js";import{r as u}from"./vendor-CKtmMAvG.js";import{c as w,b as k,A as T,u as v,L as h,d as S,a as b,e as C,f as q,X as A}from"./index-BEuak5p5.js";import{P as N}from"./plus-CYdaHYzw.js";import{C as y}from"./circle-x-A-lKHO2r.js";import{C as O}from"./circle-check-CYzq3xdq.js";import{W as E}from"./wrench-C8ZOI3oB.js";const _=[["circle",{cx:"12",cy:"12",r:"10",key:"1mglay"}],["circle",{cx:"12",cy:"12",r:"1",key:"41hilf"}]],D=w("circle-dot",_);const L=[["circle",{cx:"12",cy:"12",r:"10",key:"1mglay"}],["path",{d:"M12 6v6l4 2",key:"mmk7yg"}]],P=w("clock",L),p={all:["agent-runs"],list:()=>[...p.all,"list"],detail:t=>[...p.all,"detail",t]};async function g(t,a){const l={Accept:"application/json",...k(),...a?.headers??{}},i=await fetch(t,{...a,headers:l});if(i.status===204)return;const r=await i.text(),o=r?JSON.parse(r):void 0;if(!i.ok){const d=o;throw new T(d?.error?.code??"http_error",d?.error?.message??`Request failed with status ${i.status}.`,i.status)}return o}async function $(){return g("/api/v1/agents/runs")}async function I(t){return g(`/api/v1/agents/runs/${t}`)}async function Q(t){return g("/api/v1/agents/runs",{method:"POST",headers:{"Content-Type":"application/json"},body:JSON.stringify(t)})}async function K(t){await g(`/api/v1/agents/runs/${t}`,{method:"DELETE"})}async function*F(t,a=0,l){const i=`/api/v1/agents/runs/${t}/stream?fromSeq=${a}`,r=await fetch(i,{headers:{Accept:"text/event-stream",...k()},signal:l});if(!r.ok||!r.body)throw new Error(`Stream error: ${r.status}`);const o=r.body.getReader(),d=new TextDecoder;let m="";try{for(;;){const{done:s,value:x}=await o.read();if(s)break;m+=d.decode(x,{stream:!0});const c=m.split(`
 `);m=c.pop()??"";let n="message";for(const f of c){if(f.startsWith("event: ")){n=f.slice(7).trim();continue}if(f.startsWith("data: ")){const j=f.slice(6).trim();if(j==="[DONE]")return;try{const R=JSON.parse(j);if(yield{event:n,data:R},n==="done"||n==="error")return}catch{}n="message"}}}}finally{o.cancel()}}const J={queued:e.jsx(P,{size:12}),running:e.jsx(h,{size:12,className:"animate-spin"}),done:e.jsx(O,{size:12}),failed:e.jsx(y,{size:12}),cancelled:e.jsx(y,{size:12}),interrupted:e.jsx(y,{size:12})},M={queued:"text-muted",running:"text-accent",done:"text-green-500",failed:"text-red-500",cancelled:"text-muted",interrupted:"text-orange-500"};function z({status:t}){return e.jsxs("span",{className:b("flex items-center gap-1 text-[11px] capitalize",M[t]),children:[J[t],t]})}function W(t){const a=Date.now()-new Date(t).getTime();return a<6e4?"just now":a<36e5?`${Math.floor(a/6e4)}m ago`:a<864e5?`${Math.floor(a/36e5)}h ago`:new Date(t).toLocaleDateString()}const U=[{id:"web_search",label:"Web search",hint:"Search the web (needs a provider configured in Settings)"},{id:"fetch_url",label:"Fetch URL",hint:"Read the contents of a web page"},{id:"run_code",label:"Run code",hint:"Execute JS in a sandbox — no mid-run confirmation, opt in only if you trust the task"}];function B({onClose:t,onCreated:a}){const[l,i]=u.useState(""),[r,o]=u.useState(""),[d,m]=u.useState({web_search:!0,fetch_url:!0,run_code:!1}),s=C(),x=n=>m(f=>({...f,[n]:!f[n]})),c=q({mutationFn:()=>Q({title:l.slice(0,60)||"Agent run",systemPrompt:r||void 0,userMessage:l,allowedTools:Object.entries(d).filter(([,n])=>n).map(([n])=>n)}),onSuccess:n=>{s.invalidateQueries({queryKey:p.list()}),a(n.id),t()}});return e.jsx("div",{className:"fixed inset-0 z-50 flex items-center justify-center bg-black/40",onClick:t,children:e.jsxs("div",{className:"w-full max-w-lg rounded-xl border border-border bg-panel p-5 shadow-xl",onClick:n=>n.stopPropagation(),children:[e.jsxs("div",{className:"mb-4 flex items-center justify-between",children:[e.jsx("h2",{className:"text-[15px] font-semibold",children:"New agent run"}),e.jsx("button",{type:"button",onClick:t,className:"text-faint hover:text-ink",children:e.jsx(A,{size:16})})]}),e.jsx("label",{className:"mb-1 block text-[12px] text-muted",children:"Task"}),e.jsx("textarea",{autoFocus:!0,value:l,onChange:n=>i(n.target.value),placeholder:"Describe what the agent should do…",rows:4,className:"mb-3 w-full resize-none rounded-lg border border-border bg-input px-3 py-2 text-[13px] text-ink placeholder:text-faint focus:border-accent focus:outline-none"}),e.jsxs("label",{className:"mb-1 block text-[12px] text-muted",children:["System prompt ",e.jsx("span",{className:"text-faint",children:"(optional)"})]}),e.jsx("textarea",{value:r,onChange:n=>o(n.target.value),placeholder:"You are a helpful assistant…",rows:2,className:"mb-4 w-full resize-none rounded-lg border border-border bg-input px-3 py-2 text-[13px] text-ink placeholder:text-faint focus:border-accent focus:outline-none"}),e.jsx("label",{className:"mb-1.5 block text-[12px] text-muted",children:"Tools"}),e.jsx("div",{className:"mb-4 space-y-1.5",children:U.map(n=>e.jsxs("label",{className:"flex cursor-pointer items-start gap-2 rounded-lg border border-border px-2.5 py-2 hover:bg-panel-2",children:[e.jsx("input",{type:"checkbox",checked:d[n.id],onChange:()=>x(n.id),className:"mt-0.5 accent-[var(--accent)]"}),e.jsxs("span",{className:"min-w-0",children:[e.jsx("span",{className:"block text-[13px] font-medium text-ink",children:n.label}),e.jsx("span",{className:"block text-[11px] leading-snug text-faint",children:n.hint})]})]},n.id))}),e.jsxs("div",{className:"flex items-center justify-end gap-2",children:[e.jsx("button",{type:"button",onClick:t,className:"rounded-lg px-3 py-1.5 text-[13px] text-muted hover:text-ink",children:"Cancel"}),e.jsxs("button",{type:"button",disabled:!l.trim()||c.isPending,onClick:()=>c.mutate(),className:"flex items-center gap-1.5 rounded-lg bg-accent px-3 py-1.5 text-[13px] font-medium text-white disabled:opacity-50",children:[c.isPending?e.jsx(h,{size:13,className:"animate-spin"}):e.jsx(S,{size:13}),"Run agent"]})]}),c.isError&&e.jsx("p",{className:"mt-2 text-[12px]",style:{color:"var(--err)"},children:c.error.message})]})})}function X({call:t}){const[a,l]=u.useState(!1),i=typeof t.args?.query=="string"?t.args.query:typeof t.args?.url=="string"?t.args.url:JSON.stringify(t.args??{});return e.jsxs("div",{className:"w-full max-w-[85%] rounded-lg border border-border bg-panel px-2.5 py-1.5 text-[12px]",children:[e.jsxs("button",{type:"button",onClick:()=>l(r=>!r),className:"flex w-full items-center gap-1.5 text-left text-muted hover:text-ink",children:[e.jsx(E,{size:12,className:"shrink-0 text-accent"}),e.jsx("span",{className:"font-medium text-ink",children:t.name}),e.jsx("span",{className:"truncate text-faint",children:i})]}),a&&e.jsx("pre",{className:"mt-1.5 max-h-48 overflow-auto whitespace-pre-wrap break-words rounded bg-panel-2 p-2 text-[11px] text-muted",children:t.result})]})}function H({run:t}){const a=C(),l=u.useRef(null),[i,r]=u.useState(""),o=u.useRef(null),d=q({mutationFn:()=>K(t.id),onSuccess:()=>{a.invalidateQueries({queryKey:p.list()})}});u.useEffect(()=>{if(t.status!=="running"&&t.status!=="queued")return;const s=new AbortController;l.current=s;let x="";return(async()=>{try{for await(const c of F(t.id,0,s.signal))if(c.event==="delta")x+=c.data.delta,r(x);else if(c.event==="done"||c.event==="error"){r(""),a.invalidateQueries({queryKey:p.detail(t.id)}),a.invalidateQueries({queryKey:p.list()});break}}catch{}})(),()=>{s.abort(),l.current=null}},[t.id,t.status,a]),u.useEffect(()=>{o.current?.scrollIntoView({behavior:"smooth"})},[i,t.messages?.length]);const m=t.messages??[];return e.jsxs("div",{className:"flex h-full flex-col",children:[e.jsxs("div",{className:"flex items-center justify-between border-b border-border px-4 py-2.5",children:[e.jsxs("div",{children:[e.jsx("p",{className:"text-[14px] font-medium text-ink",children:t.title}),e.jsx(z,{status:t.status})]}),(t.status==="running"||t.status==="queued")&&e.jsx("button",{type:"button",onClick:()=>d.mutate(),className:"rounded-lg border border-border px-3 py-1 text-[12px] text-muted transition-colors hover:border-red-400 hover:text-red-500",children:d.isPending?e.jsx(h,{size:12,className:"inline animate-spin"}):"Cancel"})]}),e.jsxs("div",{className:"flex-1 space-y-3 overflow-y-auto p-4",children:[m.map(s=>e.jsxs("div",{className:b("flex flex-col gap-1.5",s.role==="user"?"items-end":"items-start"),children:[s.toolCalls?.map(x=>e.jsx(X,{call:x},x.id)),(s.content||s.role==="user"||t.status==="running")&&e.jsx("div",{className:b("max-w-[85%] rounded-xl px-3 py-2 text-[13px] leading-relaxed",s.role==="user"?"bg-accent/15 text-ink":"bg-panel-2 text-ink"),children:e.jsx("p",{className:"whitespace-pre-wrap break-words",children:s.content||(s.role==="assistant"&&t.status==="running"?"…":"")})})]},s.id)),i&&e.jsx("div",{className:"flex gap-2",children:e.jsx("div",{className:"max-w-[85%] rounded-xl bg-panel-2 px-3 py-2 text-[13px] leading-relaxed text-ink",children:e.jsx("p",{className:"whitespace-pre-wrap break-words",children:i})})}),t.error&&e.jsxs("div",{className:"rounded-lg bg-red-500/10 px-3 py-2 text-[12px] text-red-500",children:["Error: ",t.error]}),e.jsx("div",{ref:o})]})]})}function ne(){const[t,a]=u.useState(null),[l,i]=u.useState(!1),r=v({queryKey:p.list(),queryFn:$,refetchInterval:s=>(s.state.data??[]).some(n=>n.status==="queued"||n.status==="running")?3e3:!1}),o=v({queryKey:p.detail(t??""),queryFn:()=>I(t),enabled:!!t,refetchInterval:s=>{const x=s.state.data;return x?.status==="queued"||x?.status==="running"?5e3:!1}}),d=r.data??[],m=o.data;return e.jsxs("div",{className:"flex h-full",children:[e.jsxs("div",{className:"flex w-64 shrink-0 flex-col border-r border-border",children:[e.jsxs("div",{className:"flex items-center justify-between border-b border-border px-3 py-2.5",children:[e.jsx("span",{className:"text-[13px] font-semibold text-ink",children:"Agents"}),e.jsxs("button",{type:"button",title:"New agent run",onClick:()=>i(!0),className:"flex items-center gap-1 rounded-lg bg-accent px-2 py-1 text-[11px] font-medium text-white transition-opacity hover:opacity-90",children:[e.jsx(N,{size:11})," New"]})]}),e.jsxs("div",{className:"flex-1 overflow-y-auto",children:[r.isLoading&&e.jsx("div",{className:"flex h-20 items-center justify-center",children:e.jsx(h,{size:16,className:"animate-spin text-faint"})}),d.length===0&&!r.isLoading&&e.jsxs("div",{className:"px-4 py-8 text-center",children:[e.jsx(S,{size:28,className:"mx-auto mb-2 text-faint"}),e.jsx("p",{className:"text-[12px] text-muted",children:"No agent runs yet."}),e.jsx("p",{className:"mt-0.5 text-[11px] text-faint",children:"Click “New” to start one."})]}),d.map(s=>e.jsxs("button",{type:"button",onClick:()=>a(s.id),className:b("w-full border-b border-border px-3 py-2.5 text-left transition-colors hover:bg-panel-2",t===s.id&&"bg-panel-2"),children:[e.jsx("p",{className:"mb-0.5 truncate text-[13px] font-medium text-ink",children:s.title}),e.jsxs("div",{className:"flex items-center justify-between",children:[e.jsx(z,{status:s.status}),e.jsx("span",{className:"text-[10px] text-faint",children:W(s.createdAt)})]})]},s.id))]})]}),e.jsx("div",{className:"flex min-w-0 flex-1 flex-col",children:t?o.isLoading?e.jsx("div",{className:"flex h-full items-center justify-center",children:e.jsx(h,{size:20,className:"animate-spin text-faint"})}):m?e.jsx(H,{run:m}):null:e.jsxs("div",{className:"flex h-full flex-col items-center justify-center text-center",children:[e.jsx(D,{size:32,className:"mb-3 text-faint"}),e.jsx("p",{className:"text-[14px] font-medium text-ink",children:"Select a run"}),e.jsx("p",{className:"mt-1 text-[12px] text-muted",children:"or create a new agent run to get started"}),e.jsxs("button",{type:"button",onClick:()=>i(!0),className:"mt-4 flex items-center gap-1.5 rounded-lg bg-accent px-3 py-1.5 text-[13px] font-medium text-white hover:opacity-90",children:[e.jsx(N,{size:13})," New agent run"]})]})}),l&&e.jsx(B,{onClose:()=>i(!1),onCreated:s=>{a(s),r.refetch()}})]})}export{ne as AgentsScreen};