opencami 1.8.9 → 1.8.13

package/dist/server/assets/{router-BqLGFd4L.js → router-CL6A11qi.js}

@@ -12,7 +12,7 @@ import { execFile, execSync } from "node:child_process";
 import { promisify } from "node:util";
 import { readFile, mkdir, writeFile, rename, stat, readdir, rm, realpath, lstat } from "node:fs/promises";
 import { posix } from "path";
-const appCss = "/assets/styles-Ce2xZzc4.css";
+const appCss = "/assets/styles-b2XYKZYx.css";
 const swRegisterScript = `
 (() => {
   // Skip PWA service worker inside Capacitor native shell — they conflict
@@ -157,20 +157,22 @@ const accentColorScript = `
   try {
     const stored = localStorage.getItem('opencami-accent-color')
     const map = {
-      green: { accent: '#22c55e', hover: '#16a34a', light: 'rgba(34, 197, 94, 0.10)' },
-      blue: { accent: '#3b82f6', hover: '#2563eb', light: 'rgba(59, 130, 246, 0.10)' },
-      purple: { accent: '#8b5cf6', hover: '#7c3aed', light: 'rgba(139, 92, 246, 0.10)' },
-      orange: { accent: '#f97316', hover: '#ea580c', light: 'rgba(249, 115, 22, 0.10)' },
-      pink: { accent: '#ec4899', hover: '#db2777', light: 'rgba(236, 72, 153, 0.10)' },
-      red: { accent: '#ef4444', hover: '#dc2626', light: 'rgba(239, 68, 68, 0.10)' },
-      cyan: { accent: '#06b6d4', hover: '#0891b2', light: 'rgba(6, 182, 212, 0.10)' },
-      yellow: { accent: '#eab308', hover: '#ca8a04', light: 'rgba(234, 179, 8, 0.10)' },
+      green: { accent: '#22c55e', hover: '#16a34a', light: 'rgba(34, 197, 94, 0.10)', fg: '#ffffff' },
+      blue: { accent: '#3b82f6', hover: '#2563eb', light: 'rgba(59, 130, 246, 0.10)', fg: '#ffffff' },
+      purple: { accent: '#8b5cf6', hover: '#7c3aed', light: 'rgba(139, 92, 246, 0.10)', fg: '#ffffff' },
+      orange: { accent: '#f97316', hover: '#ea580c', light: 'rgba(249, 115, 22, 0.10)', fg: '#ffffff' },
+      pink: { accent: '#ec4899', hover: '#db2777', light: 'rgba(236, 72, 153, 0.10)', fg: '#ffffff' },
+      red: { accent: '#ef4444', hover: '#dc2626', light: 'rgba(239, 68, 68, 0.10)', fg: '#ffffff' },
+      cyan: { accent: '#06b6d4', hover: '#0891b2', light: 'rgba(6, 182, 212, 0.10)', fg: '#ffffff' },
+      yellow: { accent: '#eab308', hover: '#ca8a04', light: 'rgba(234, 179, 8, 0.10)', fg: '#ffffff' },
+      white: { accent: '#ffffff', hover: '#e5e5e5', light: 'rgba(255, 255, 255, 0.10)', fg: '#1a1a1a' },
     }
     const selected = map[stored] || map.green
     const root = document.documentElement
     root.style.setProperty('--opencami-accent', selected.accent)
     root.style.setProperty('--opencami-accent-hover', selected.hover)
     root.style.setProperty('--opencami-accent-light', selected.light)
+    root.style.setProperty('--opencami-accent-fg', selected.fg)
   } catch {}
 })()
 `;
@@ -329,7 +331,7 @@ function RootDocument({ children }) {
     ] })
   ] });
 }
-const $$splitComponentImporter$9 = () => import("./skills-Cy8xclXY.js");
+const $$splitComponentImporter$9 = () => import("./skills-BXUivxuo.js");
 const Route$A = createFileRoute("/skills")({
   component: lazyRouteComponent($$splitComponentImporter$9, "component")
 });
@@ -346,11 +348,11 @@ const Route$z = createFileRoute("/new")({
   },
   component: lazyRouteComponent($$splitComponentImporter$8, "component")
 });
-const $$splitComponentImporter$7 = () => import("./memory-Cxu7i8ej.js");
+const $$splitComponentImporter$7 = () => import("./memory-rBB015W-.js");
 const Route$y = createFileRoute("/memory")({
   component: lazyRouteComponent($$splitComponentImporter$7, "component")
 });
-const $$splitComponentImporter$6 = () => import("./files-DYdXlQDr.js");
+const $$splitComponentImporter$6 = () => import("./files-DLxqp-h5.js");
 const Route$x = createFileRoute("/files")({
   component: lazyRouteComponent($$splitComponentImporter$6, "component")
 });
@@ -358,23 +360,23 @@ const $$splitComponentImporter$5 = () => import("./dashboard-UYRCu_mQ.js");
 const Route$w = createFileRoute("/dashboard")({
   component: lazyRouteComponent($$splitComponentImporter$5, "component")
 });
-const $$splitComponentImporter$4 = () => import("./connect-BNabuqpW.js");
+const $$splitComponentImporter$4 = () => import("./connect-CTVBm0Vc.js");
 const Route$v = createFileRoute("/connect")({
   component: lazyRouteComponent($$splitComponentImporter$4, "component")
 });
-const $$splitComponentImporter$3 = () => import("./bots-Byt6jv0a.js");
+const $$splitComponentImporter$3 = () => import("./bots-BDHeSvSQ.js");
 const Route$u = createFileRoute("/bots")({
   component: lazyRouteComponent($$splitComponentImporter$3, "component")
 });
-const $$splitComponentImporter$2 = () => import("./agents-CmQ4vvXm.js");
+const $$splitComponentImporter$2 = () => import("./agents-BuE0Yum3.js");
 const Route$t = createFileRoute("/agents")({
   component: lazyRouteComponent($$splitComponentImporter$2, "component")
 });
-const $$splitComponentImporter$1 = () => import("./index-COElhwGA.js");
+const $$splitComponentImporter$1 = () => import("./index-C1dylvu-.js");
 const Route$s = createFileRoute("/")({
   component: lazyRouteComponent($$splitComponentImporter$1, "component")
 });
-const $$splitComponentImporter = () => import("./_sessionKey-B6iYeyCS.js").then((n) => n.$);
+const $$splitComponentImporter = () => import("./_sessionKey-DBzlGMo3.js").then((n) => n.$);
 const Route$r = createFileRoute("/chat/$sessionKey")({
   component: lazyRouteComponent($$splitComponentImporter, "component")
 });
@@ -558,7 +560,7 @@ function buildConnectParams(url, token, password, nonce) {
       mode: clientMode,
       instanceId: loadOrCreateInstanceId()
     },
-    caps: [],
+    caps: ["tool-events"],
     auth: {
       token: token || void 0,
       password: password || void 0,
@@ -729,7 +731,7 @@ class PersistentGatewayConnection {
           mode: "webchat",
           instanceId: loadOrCreateInstanceId()
         },
-        caps: [],
+        caps: ["tool-events"],
         auth: {
           token: token || void 0,
           password: password || void 0
@@ -921,14 +923,240 @@ function getPersistentConnection() {
   }
   return _proc.__opencamiGatewayInstance;
 }
+const sharedGatewayClients = /* @__PURE__ */ new Map();
+function createGatewayClient() {
+  const pendingRpcs = /* @__PURE__ */ new Map();
+  const callbacks = /* @__PURE__ */ new Set();
+  let ws = null;
+  let closed = false;
+  let connected = false;
+  let connectPromise = null;
+  function rejectAll(err) {
+    for (const [, pending] of pendingRpcs) {
+      clearTimeout(pending.timer);
+      pending.reject(err);
+    }
+    pendingRpcs.clear();
+  }
+  function waitForRes(id, timeoutMs = 3e4) {
+    return new Promise((resolve2, reject) => {
+      const timer = setTimeout(() => {
+        pendingRpcs.delete(id);
+        reject(new Error(`RPC timeout waiting for ${id}`));
+      }, timeoutMs);
+      pendingRpcs.set(id, { resolve: resolve2, reject, timer });
+    });
+  }
+  function emitError(error) {
+    for (const callback of callbacks) {
+      try {
+        callback.onError?.(error);
+      } catch {
+      }
+    }
+  }
+  function emitEvent(event) {
+    for (const callback of callbacks) {
+      try {
+        callback.onEvent?.(event);
+      } catch {
+      }
+    }
+  }
+  function handleMessage(data) {
+    try {
+      const str = typeof data === "string" ? data : data.toString();
+      const parsed = JSON.parse(str);
+      if (parsed.type === "res") {
+        const pending = pendingRpcs.get(parsed.id);
+        if (!pending) return;
+        pendingRpcs.delete(parsed.id);
+        clearTimeout(pending.timer);
+        if (parsed.ok) pending.resolve(parsed.payload);
+        else pending.reject(new GatewayResponseError(parsed.error?.message ?? "gateway error", parsed.error?.code));
+        return;
+      }
+      if (parsed.type === "event") {
+        emitEvent({
+          event: parsed.event,
+          payload: parsed.payload ?? {},
+          seq: parsed.seq
+        });
+      }
+    } catch {
+    }
+  }
+  function handleClose() {
+    const wasConnected = connected;
+    connected = false;
+    ws = null;
+    rejectAll(new Error("Connection closed"));
+    if (!closed && wasConnected) {
+      emitError(new Error("Gateway client connection closed"));
+    }
+  }
+  async function connect() {
+    if (closed) throw new Error("Gateway client closed");
+    if (connected && ws?.readyState === WebSocket.OPEN) return;
+    if (connectPromise) return connectPromise;
+    connectPromise = (async () => {
+      const { url, token, password } = getGatewayConfig();
+      const origin = process.env.OPENCAMI_ORIGIN?.trim();
+      const nextWs = origin ? new WebSocket(url, { headers: { Origin: origin } }) : new WebSocket(url);
+      ws = nextWs;
+      await new Promise((resolve2, reject) => {
+        const onOpen = () => {
+          cleanup();
+          resolve2();
+        };
+        const onError = (err) => {
+          cleanup();
+          reject(new Error(`WS open error: ${err.message}`));
+        };
+        const cleanup = () => {
+          nextWs.off("open", onOpen);
+          nextWs.off("error", onError);
+        };
+        nextWs.on("open", onOpen);
+        nextWs.on("error", onError);
+      });
+      const nonce = await new Promise((resolve2) => {
+        let done = false;
+        const timer = setTimeout(() => {
+          if (done) return;
+          done = true;
+          resolve2("");
+        }, 3e3);
+        const onMessage = (data) => {
+          try {
+            const str = typeof data === "string" ? data : data.toString();
+            const parsed = JSON.parse(str);
+            if (parsed.type === "event" && parsed.event === "connect.challenge") {
+              const n = parsed.payload?.nonce;
+              if (typeof n === "string" && n.length > 0) {
+                clearTimeout(timer);
+                nextWs.off("message", onMessage);
+                if (done) return;
+                done = true;
+                resolve2(n);
+              }
+            }
+          } catch {
+          }
+        };
+        nextWs.on("message", onMessage);
+      });
+      nextWs.on("message", handleMessage);
+      nextWs.on("close", handleClose);
+      nextWs.on("error", (err) => {
+        emitError(new Error(`Gateway client error: ${err.message}`));
+      });
+      const connectId = randomUUID();
+      const connectParams = buildConnectParams(url, token, password, nonce);
+      nextWs.send(JSON.stringify({
+        type: "req",
+        id: connectId,
+        method: "connect",
+        params: connectParams
+      }));
+      const hello = await waitForRes(connectId, 1e4);
+      if (hello?.auth?.deviceToken) {
+        const identity = loadOrCreateDeviceIdentity();
+        storeDeviceToken(identity.deviceId, url, hello.auth.deviceToken);
+      }
+      connected = true;
+    })();
+    try {
+      await connectPromise;
+    } finally {
+      connectPromise = null;
+    }
+  }
+  async function sendReq(method, params) {
+    await connect();
+    if (!ws || ws.readyState !== WebSocket.OPEN) {
+      throw new Error("Gateway client not connected");
+    }
+    const id = randomUUID();
+    ws.send(JSON.stringify({ type: "req", id, method, params }));
+    return await waitForRes(id);
+  }
+  function close() {
+    if (closed) return;
+    closed = true;
+    connected = false;
+    rejectAll(new Error("Gateway client closed"));
+    const currentWs = ws;
+    ws = null;
+    if (currentWs) {
+      currentWs.off("message", handleMessage);
+      currentWs.off("close", handleClose);
+      currentWs.close();
+    }
+    callbacks.clear();
+  }
+  function isClosed() {
+    return closed;
+  }
+  function addCallbacks(callbacksToAdd) {
+    if (!callbacksToAdd?.onEvent && !callbacksToAdd?.onError) {
+      return () => {
+      };
+    }
+    callbacks.add(callbacksToAdd);
+    return () => {
+      callbacks.delete(callbacksToAdd);
+    };
+  }
+  return { connect, sendReq, close, isClosed, addCallbacks };
+}
+function releaseGatewayClient(key) {
+  const entry = sharedGatewayClients.get(key);
+  if (!entry) return;
+  entry.refs -= 1;
+  if (entry.refs > 0) return;
+  entry.client.close();
+  sharedGatewayClients.delete(key);
+}
+async function acquireGatewayClient(key, callbacks) {
+  const existing = sharedGatewayClients.get(key);
+  if (existing && !existing.client.isClosed()) {
+    existing.refs += 1;
+    const removeCallbacks2 = existing.client.addCallbacks(callbacks);
+    return {
+      client: existing.client,
+      release: () => {
+        removeCallbacks2();
+        releaseGatewayClient(key);
+      }
+    };
+  }
+  const client = createGatewayClient();
+  const removeCallbacks = client.addCallbacks(callbacks);
+  await client.connect();
+  sharedGatewayClients.set(key, { refs: 1, client });
+  return {
+    client,
+    release: () => {
+      removeCallbacks();
+      releaseGatewayClient(key);
+    }
+  };
+}
+async function gatewayRpcShared(method, params, key) {
+  if (!key) {
+    return gatewayRpc(method, params);
+  }
+  const existing = sharedGatewayClients.get(key);
+  if (!existing || existing.client.isClosed()) {
+    return gatewayRpc(method, params);
+  }
+  return existing.client.sendReq(method, params);
+}
 async function gatewayRpc(method, params) {
   const conn = getPersistentConnection();
   return conn.rpc(method, params);
 }
-function subscribeGatewayEvents(sessionKey, listener) {
-  const conn = getPersistentConnection();
-  return conn.subscribe(sessionKey, listener);
-}
 function getDeviceStatus() {
   const conn = getPersistentConnection();
   return conn.getDeviceStatus();
@@ -1286,91 +1514,83 @@ const Route$o = createFileRoute("/api/stream")({
     handlers: {
       GET: async ({ request }) => {
         const url = new URL(request.url);
-        const sessionKey = url.searchParams.get("sessionKey");
-        if (!sessionKey) {
+        const sessionKey = url.searchParams.get("sessionKey")?.trim() || "";
+        const friendlyId = url.searchParams.get("friendlyId")?.trim() || "";
+        const key = sessionKey || friendlyId;
+        if (!key) {
           return new Response(
-            JSON.stringify({ ok: false, error: "sessionKey required" }),
+            JSON.stringify({ ok: false, error: "sessionKey or friendlyId required" }),
             { status: 400, headers: { "content-type": "application/json" } }
           );
         }
         const pass = new PassThrough();
         const encoder = new TextEncoder();
         let closed = false;
-        let unsubscribe = null;
-        function sendSSE(event, data) {
+        let heartbeat = null;
+        let releaseClient = null;
+        function writeChunk(chunk) {
           if (closed) return;
           try {
-            pass.write(encoder.encode(`event: ${event}
-data: ${JSON.stringify(data)}
-
-`));
+            pass.write(encoder.encode(chunk));
           } catch {
+            cleanup();
           }
         }
+        function send(data) {
+          writeChunk(`data: ${JSON.stringify(data)}
+
+`);
+        }
         function cleanup() {
           if (closed) return;
           closed = true;
-          if (unsubscribe) {
-            unsubscribe();
-            unsubscribe = null;
+          if (heartbeat) {
+            clearInterval(heartbeat);
+            heartbeat = null;
+          }
+          if (releaseClient) {
+            releaseClient();
+            releaseClient = null;
           }
           try {
             pass.end();
           } catch {
           }
         }
-        pass.write(encoder.encode(": connected\n\n"));
-        let gotAgentStream = false;
-        unsubscribe = subscribeGatewayEvents(sessionKey, (evt) => {
-          if (evt.event === "agent") {
-            const payload = evt.payload;
-            const agentStream = payload.stream;
-            if (agentStream === "assistant") {
-              gotAgentStream = true;
-              const data = payload.data ?? payload;
-              const text = typeof data.delta === "string" ? data.delta : typeof data.text === "string" ? data.text : typeof payload.text === "string" ? payload.text : typeof payload.delta === "string" ? payload.delta : "";
-              if (text) {
-                sendSSE("delta", { text, sessionKey });
+        writeChunk(": connected\n\n");
+        heartbeat = setInterval(() => {
+          writeChunk("event: ping\ndata: {}\n\n");
+        }, 15e3);
+        try {
+          const handle = await acquireGatewayClient(key, {
+            onEvent(event) {
+              const p = event.payload;
+              const eventSessionKey = typeof p?.sessionKey === "string" ? p.sessionKey : "";
+              if (eventSessionKey && !eventSessionKey.includes(key)) {
+                return;
               }
-            } else if (agentStream === "tool") {
-              gotAgentStream = true;
-              const tdata = payload.data ?? payload;
-              sendSSE("tool", {
-                name: tdata.name ?? tdata.toolName ?? payload.name ?? "",
-                status: tdata.phase ?? tdata.status ?? payload.phase ?? "running",
-                id: tdata.id ?? tdata.toolCallId ?? payload.id ?? "",
-                sessionKey
+              send({
+                event: event.event,
+                payload: event.payload,
+                seq: event.seq,
+                stateVersion: event.stateVersion
               });
-            } else if (agentStream === "lifecycle") {
-              const ldata = payload.data ?? payload;
-              const phase = ldata.phase ?? payload.phase;
-              if (phase === "end" || phase === "error") {
-                sendSSE("done", {
-                  sessionKey,
-                  status: phase,
-                  error: phase === "error" ? payload.error : void 0
-                });
-                cleanup();
-              }
-            }
-          } else if (evt.event === "chat") {
-            const payload = evt.payload;
-            const state = payload.state ?? payload.kind;
-            const msg = payload.message;
-            if (state === "delta" && !gotAgentStream) {
-              const content = Array.isArray(msg?.content) ? msg.content : [];
-              const firstBlock = content[0];
-              const text = typeof firstBlock?.text === "string" ? firstBlock.text : typeof payload.text === "string" ? payload.text : typeof payload.delta === "string" ? payload.delta : "";
-              if (text) {
-                sendSSE("delta", { text, sessionKey });
-              }
-            } else if (state === "final") {
-              sendSSE("done", { sessionKey, status: "end" });
-              cleanup();
+            },
+            onError(error) {
+              send({ event: "error", payload: error.message });
             }
+          });
+          if (closed) {
+            handle.release();
+          } else {
+            releaseClient = handle.release;
           }
-        });
-        request.signal?.addEventListener("abort", cleanup);
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          send({ event: "error", payload: message });
+          cleanup();
+        }
+        request.signal.addEventListener("abort", cleanup, { once: true });
         const webStream = Readable.toWeb(pass);
         return new Response(webStream, {
           headers: {
@@ -1772,7 +1992,7 @@ const Route$l = createFileRoute("/api/send")({
           if (sessionKey.length === 0) {
             sessionKey = "main";
           }
-          const res = await gatewayRpc("chat.send", {
+          const res = await gatewayRpcShared("chat.send", {
             sessionKey,
             message,
             thinking,
@@ -1781,7 +2001,7 @@ const Route$l = createFileRoute("/api/send")({
             deliver: false,
             timeoutMs: 12e4,
             idempotencyKey: typeof body.idempotencyKey === "string" ? body.idempotencyKey : randomUUID()
-          });
+          }, sessionKey);
           return json({ ok: true, ...res, sessionKey });
         } catch (err) {
           return json(

package/dist/server/assets/{search-dialog-CmI7naPN.js → search-dialog-D8DvpPZw.js}

@@ -3,30 +3,30 @@ import { useState, useRef, useEffect, useCallback, useMemo } from "react";
 import { useNavigate } from "@tanstack/react-router";
 import { HugeiconsIcon } from "@hugeicons/react";
 import { Search01Icon, Cancel01Icon, Loading03Icon } from "@hugeicons/core-free-icons";
-import { D as DialogRoot, a as DialogContent } from "./use-file-explorer-state-s7CS50ho.js";
+import { D as DialogRoot, a as DialogContent } from "./use-file-explorer-state-E6cUvMva.js";
 import { useQueryClient } from "@tanstack/react-query";
-import { c as chatQueryKeys } from "./_sessionKey-B6iYeyCS.js";
-import { c as cn } from "./button-CwY2OHFj.js";
+import { c as chatQueryKeys } from "./_sessionKey-DBzlGMo3.js";
+import { c as cn } from "./button-kI8fEIZQ.js";
 import "@base-ui/react/dialog";
 import "zustand";
-import "./tooltip-DgsSPocE.js";
+import "./tooltip-DOvOrSSS.js";
 import "@base-ui/react/tooltip";
 import "motion/react";
 import "@base-ui/react/alert-dialog";
 import "@base-ui/react/collapsible";
 import "@base-ui/react/scroll-area";
-import "./menu-D90CDTi2.js";
+import "./menu-D8cKTpmN.js";
 import "@base-ui/react/menu";
 import "./opencami-logo-C-43FL3R.js";
-import "./markdown-DoX5Q7qh.js";
+import "./markdown-CFdYXCRQ.js";
 import "marked";
 import "react-markdown";
 import "remark-breaks";
 import "remark-gfm";
-import "./index-BEWnDAH6.js";
+import "./index-B_F4DTUu.js";
 import "zustand/middleware";
 import "react-dom";
-import "./router-BqLGFd4L.js";
+import "./router-CL6A11qi.js";
 import "node:crypto";
 import "node:fs";
 import "node:os";

package/dist/server/assets/{search-sources-badge-B0rAEDs_.js → search-sources-badge-B0t8Qffy.js}

@@ -2,7 +2,7 @@ import { jsxs, jsx } from "react/jsx-runtime";
 import { useState } from "react";
 import { HugeiconsIcon } from "@hugeicons/react";
 import { Search01Icon, ArrowRight01Icon } from "@hugeicons/core-free-icons";
-import { c as cn } from "./button-CwY2OHFj.js";
+import { c as cn } from "./button-kI8fEIZQ.js";
 import "@base-ui/react/merge-props";
 import "@base-ui/react/use-render";
 import "class-variance-authority";

package/dist/server/assets/{session-export-dialog-C53RRAah.js → session-export-dialog-CgtlOnwf.js}

@@ -1,7 +1,7 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useState } from "react";
-import { D as DialogRoot, a as DialogContent, b as DialogTitle, c as DialogDescription, d as DialogClose } from "./use-file-explorer-state-s7CS50ho.js";
-import { B as Button } from "./button-CwY2OHFj.js";
+import { D as DialogRoot, a as DialogContent, b as DialogTitle, c as DialogDescription, d as DialogClose } from "./use-file-explorer-state-E6cUvMva.js";
+import { B as Button } from "./button-kI8fEIZQ.js";
 import "@base-ui/react/dialog";
 import "zustand";
 import "@base-ui/react/merge-props";