agentgui 1.0.401 → 1.0.402

package/lib/ws-handlers-util.js

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import { execSync } from 'child_process';
+import { execSync, spawn } from 'child_process';
 
 function err(code, message) { const e = new Error(message); e.code = code; throw e; }
 
@@ -9,7 +9,7 @@ export function register(router, deps) {
   const { queries, wsOptimizer, modelDownloadState, ensureModelsDownloaded,
     broadcastSync, getSpeech, getProviderConfigs, saveProviderConfig,
     startGeminiOAuth, exchangeGeminiOAuthCode, geminiOAuthState,
-    STARTUP_CWD } = deps;
+    STARTUP_CWD, activeScripts } = deps;
 
   router.handle('home', () => ({ home: os.homedir(), cwd: STARTUP_CWD }));
 
@@ -183,4 +183,52 @@ export function register(router, deps) {
   });
 
   router.handle('ws.stats', () => wsOptimizer.getStats());
+
+  router.handle('conv.scripts', (p) => {
+    const conv = queries.getConversation(p.id);
+    if (!conv) err(404, 'Not found');
+    const wd = conv.workingDirectory || STARTUP_CWD;
+    let hasStart = false, hasDev = false;
+    try {
+      const pkg = JSON.parse(fs.readFileSync(path.join(wd, 'package.json'), 'utf-8'));
+      const scripts = pkg.scripts || {};
+      hasStart = !!scripts.start;
+      hasDev = !!scripts.dev;
+    } catch {}
+    const running = activeScripts.has(p.id);
+    const runningScript = running ? activeScripts.get(p.id).script : null;
+    return { hasStart, hasDev, running, runningScript };
+  });
+
+  router.handle('conv.run-script', (p) => {
+    const conv = queries.getConversation(p.id);
+    if (!conv) err(404, 'Not found');
+    if (activeScripts.has(p.id)) err(409, 'Script already running');
+    const script = p.script;
+    if (script !== 'start' && script !== 'dev') err(400, 'Invalid script');
+    const wd = conv.workingDirectory || STARTUP_CWD;
+    try {
+      const pkg = JSON.parse(fs.readFileSync(path.join(wd, 'package.json'), 'utf-8'));
+      if (!pkg.scripts || !pkg.scripts[script]) err(400, `Script "${script}" not found`);
+    } catch (e) { if (e.code) throw e; err(400, 'No package.json'); }
+    const childEnv = { ...process.env, FORCE_COLOR: '1' };
+    delete childEnv.PORT; delete childEnv.BASE_URL; delete childEnv.HOT_RELOAD;
+    const isWindows = os.platform() === 'win32';
+    const child = spawn('npm', ['run', script], { cwd: wd, stdio: ['ignore', 'pipe', 'pipe'], detached: true, env: childEnv, shell: isWindows });
+    activeScripts.set(p.id, { process: child, script, startTime: Date.now() });
+    broadcastSync({ type: 'script_started', conversationId: p.id, script, timestamp: Date.now() });
+    const onData = (stream) => (chunk) => broadcastSync({ type: 'script_output', conversationId: p.id, data: chunk.toString(), stream, timestamp: Date.now() });
+    child.stdout.on('data', onData('stdout'));
+    child.stderr.on('data', onData('stderr'));
+    child.on('error', (e) => { activeScripts.delete(p.id); broadcastSync({ type: 'script_stopped', conversationId: p.id, code: 1, error: e.message, timestamp: Date.now() }); });
+    child.on('close', (code) => { activeScripts.delete(p.id); broadcastSync({ type: 'script_stopped', conversationId: p.id, code: code || 0, timestamp: Date.now() }); });
+    return { ok: true, script, pid: child.pid };
+  });
+
+  router.handle('conv.stop-script', (p) => {
+    const entry = activeScripts.get(p.id);
+    if (!entry) err(404, 'No running script');
+    try { process.kill(-entry.process.pid, 'SIGTERM'); } catch { try { entry.process.kill('SIGTERM'); } catch {} }
+    return { ok: true };
+  });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentgui",
-  "version": "1.0.401",
+  "version": "1.0.402",
   "description": "Multi-agent ACP client with real-time communication",
   "type": "module",
   "main": "server.js",
@@ -22,6 +22,9 @@
   },
   "dependencies": {
     "@anthropic-ai/claude-code": "^2.1.37",
+    "@google/gemini-cli": "latest",
+    "@kilocode/cli": "latest",
+    "opencode-ai": "latest",
     "@huggingface/transformers": "^3.8.1",
     "audio-decode": "^2.2.3",
     "better-sqlite3": "^12.6.2",

package/server.js

@@ -311,6 +311,8 @@ expressApp.use(BASE_URL + '/files/:conversationId', (req, res, next) => {
 
 function findCommand(cmd) {
   const isWindows = os.platform() === 'win32';
+  const localBin = path.join(path.dirname(fileURLToPath(import.meta.url)), 'node_modules', '.bin', isWindows ? cmd + '.cmd' : cmd);
+  if (fs.existsSync(localBin)) return localBin;
   try {
     if (isWindows) {
       const result = execSync(`where ${cmd}`, { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'ignore'] }).trim();
@@ -3892,7 +3894,7 @@ registerUtilHandlers(wsRouter, {
   broadcastSync, getSpeech, getProviderConfigs, saveProviderConfig,
   startGeminiOAuth, exchangeGeminiOAuthCode,
   geminiOAuthState: () => geminiOAuthState,
-  STARTUP_CWD
+  STARTUP_CWD, activeScripts
 });
 
 wsRouter.onLegacy((data, ws) => {

package/static/app.js

@@ -131,8 +131,7 @@ class GMGUIApp {
 
   async fetchMessages(conversationId) {
     try {
-      const res = await fetch(BASE_URL + `/api/conversations/${conversationId}/messages`);
-      const data = await res.json();
+      const data = await window.wsClient.rpc('msg.ls', { id: conversationId });
       return data.messages || [];
     } catch (e) {
       console.error('[APP] Error fetching messages:', e);
@@ -289,18 +288,8 @@ class GMGUIApp {
     if (!content || !this.currentConversation || !this.selectedAgent) return;
 
     try {
-      const res = await fetch(BASE_URL + `/api/conversations/${this.currentConversation}/messages`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({
-          content,
-          agentId: this.selectedAgent
-        })
-      });
-
-      if (res.ok) {
-        input.value = '';
-      }
+      await window.wsClient.rpc('msg.send', { id: this.currentConversation, content, agentId: this.selectedAgent });
+      input.value = '';
     } catch (e) {
       console.error('[APP] Error sending message:', e);
     }

package/static/js/agent-auth.js

@@ -1,5 +1,4 @@
 (function() {
-  var BASE = window.__BASE_URL || '';
   var btn = document.getElementById('agentAuthBtn');
   var dropdown = document.getElementById('agentAuthDropdown');
   var agents = [], providers = {}, authRunning = false, editingProvider = null;
@@ -20,13 +19,13 @@
   function refresh() { fetchAuthStatus(); fetchProviderConfigs(); }
 
   function fetchAuthStatus() {
-    fetch(BASE + '/api/agents/auth-status').then(function(r) { return r.json(); })
+    window.wsClient.rpc('agent.authstat')
       .then(function(data) { agents = data.agents || []; updateButton(); renderDropdown(); })
       .catch(function() {});
   }
 
   function fetchProviderConfigs() {
-    fetch(BASE + '/api/auth/configs').then(function(r) { return r.json(); })
+    window.wsClient.rpc('auth.configs')
       .then(function(data) { providers = data || {}; updateButton(); renderDropdown(); })
       .catch(function() {});
   }
@@ -114,12 +113,10 @@
   function toggleEdit(pid) { editingProvider = editingProvider === pid ? null : pid; renderDropdown(); }
 
   function saveProviderKey(providerId, apiKey) {
-    fetch(BASE + '/api/auth/save-config', {
-      method: 'POST', headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ providerId: providerId, apiKey: apiKey, defaultModel: '' })
-    }).then(function(r) { return r.json(); }).then(function(data) {
-      if (data.success) { editingProvider = null; fetchProviderConfigs(); }
-    }).catch(function() { editingProvider = null; renderDropdown(); });
+    window.wsClient.rpc('auth.save', { providerId: providerId, apiKey: apiKey, defaultModel: '' })
+      .then(function(data) {
+        if (data.success) { editingProvider = null; fetchProviderConfigs(); }
+      }).catch(function() { editingProvider = null; renderDropdown(); });
   }
 
   function toggleDropdown(e) {
@@ -201,64 +198,62 @@
     if (submitBtn) { submitBtn.disabled = true; submitBtn.textContent = 'Verifying...'; }
     if (errorEl) errorEl.style.display = 'none';
 
-    fetch(BASE + '/api/gemini-oauth/complete', {
-      method: 'POST', headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ url: url })
-    }).then(function(r) { return r.json(); }).then(function(data) {
-      if (data.success) {
-        cleanupOAuthPolling();
-        authRunning = false;
-        removeOAuthModal();
-        refresh();
-      } else {
-        if (errorEl) { errorEl.textContent = data.error || 'Failed to complete authentication.'; errorEl.style.display = 'block'; }
+    window.wsClient.rpc('gemini.complete', { url: url })
+      .then(function(data) {
+        if (data.success) {
+          cleanupOAuthPolling();
+          authRunning = false;
+          removeOAuthModal();
+          refresh();
+        } else {
+          if (errorEl) { errorEl.textContent = data.error || 'Failed to complete authentication.'; errorEl.style.display = 'block'; }
+          if (submitBtn) { submitBtn.disabled = false; submitBtn.textContent = 'Complete Sign-In'; }
+        }
+      }).catch(function(e) {
+        if (errorEl) { errorEl.textContent = e.message; errorEl.style.display = 'block'; }
         if (submitBtn) { submitBtn.disabled = false; submitBtn.textContent = 'Complete Sign-In'; }
-      }
-    }).catch(function(e) {
-      if (errorEl) { errorEl.textContent = e.message; errorEl.style.display = 'block'; }
-      if (submitBtn) { submitBtn.disabled = false; submitBtn.textContent = 'Complete Sign-In'; }
-    });
+      });
   }
 
   function triggerAuth(agentId) {
     if (authRunning) return;
-    fetch(BASE + '/api/agents/' + agentId + '/auth', {
-      method: 'POST', headers: { 'Content-Type': 'application/json' }, body: '{}'
-    }).then(function(r) { return r.json(); }).then(function(data) {
-      if (data.ok) {
-        authRunning = true; showTerminalTab(); switchToTerminalView();
-        var term = getTerminal();
-        if (term) { term.clear(); term.writeln('\x1b[36m[authenticating ' + agentId + ']\x1b[0m\r\n'); }
-        if (data.authUrl) {
-          window.open(data.authUrl, '_blank');
-          if (agentId === 'gemini') {
-            showOAuthWaitingModal();
-            cleanupOAuthPolling();
-            oauthPollInterval = setInterval(function() {
-              fetch(BASE + '/api/gemini-oauth/status').then(function(r) { return r.json(); }).then(function(status) {
-                if (status.status === 'success') {
-                  cleanupOAuthPolling();
-                  authRunning = false;
-                  removeOAuthModal();
-                  refresh();
-                } else if (status.status === 'error') {
-                  cleanupOAuthPolling();
-                  authRunning = false;
-                  removeOAuthModal();
-                }
-              }).catch(function() {});
-            }, 1500);
-            oauthFallbackTimer = setTimeout(function() {
-              if (authRunning) showOAuthPasteFallback();
-            }, 30000);
-            oauthPollTimeout = setTimeout(function() {
+    window.wsClient.rpc('agent.auth', { id: agentId })
+      .then(function(data) {
+        if (data.ok) {
+          authRunning = true; showTerminalTab(); switchToTerminalView();
+          var term = getTerminal();
+          if (term) { term.clear(); term.writeln('\x1b[36m[authenticating ' + agentId + ']\x1b[0m\r\n'); }
+          if (data.authUrl) {
+            window.open(data.authUrl, '_blank');
+            if (agentId === 'gemini') {
+              showOAuthWaitingModal();
               cleanupOAuthPolling();
-              if (authRunning) { authRunning = false; removeOAuthModal(); }
-            }, 5 * 60 * 1000);
+              oauthPollInterval = setInterval(function() {
+                window.wsClient.rpc('gemini.status')
+                  .then(function(status) {
+                    if (status.status === 'success') {
+                      cleanupOAuthPolling();
+                      authRunning = false;
+                      removeOAuthModal();
+                      refresh();
+                    } else if (status.status === 'error') {
+                      cleanupOAuthPolling();
+                      authRunning = false;
+                      removeOAuthModal();
+                    }
+                  }).catch(function() {});
+              }, 1500);
+              oauthFallbackTimer = setTimeout(function() {
+                if (authRunning) showOAuthPasteFallback();
+              }, 30000);
+              oauthPollTimeout = setTimeout(function() {
+                cleanupOAuthPolling();
+                if (authRunning) { authRunning = false; removeOAuthModal(); }
+              }, 5 * 60 * 1000);
+            }
           }
         }
-      }
-    }).catch(function() {});
+      }).catch(function() {});
   }
 
   function onWsMessage(e) {

package/static/js/client.js

@@ -14,9 +14,10 @@ class AgentGUIClient {
       ...config
     };
 
-    // Initialize components
+    // Initialize components - reuse global wsManager/wsClient if available
     this.renderer = new StreamingRenderer(config.renderer || {});
-    this.wsManager = new WebSocketManager(config.websocket || {});
+    this.wsManager = window.wsManager || new WebSocketManager(config.websocket || {});
+    if (!window.wsManager) window.wsManager = this.wsManager;
     this.eventProcessor = new EventProcessor(config.eventProcessor || {});
 
     // Application state
@@ -881,8 +882,7 @@ class AgentGUIClient {
 
   async _promptPushIfWeOwnRemote() {
     try {
-      const result = await fetch(window.__BASE_URL + '/api/git/check-remote-ownership');
-      const { ownsRemote, hasChanges, hasUnpushed, remoteUrl } = await result.json();
+      const { ownsRemote, hasChanges, hasUnpushed, remoteUrl } = await window.wsClient.rpc('git.check');
       if (ownsRemote && (hasChanges || hasUnpushed)) {
         const conv = this.state.currentConversation;
         if (conv) {
@@ -987,8 +987,7 @@ class AgentGUIClient {
     if (!outputEl) return;
 
     try {
-      const response = await fetch(window.__BASE_URL + `/api/conversations/${conversationId}/queue`);
-      const { queue } = await response.json();
+      const { queue } = await window.wsClient.rpc('q.ls', { id: conversationId });
 
       let queueEl = outputEl.querySelector('.queue-indicator');
       if (!queue || queue.length === 0) {
@@ -1015,7 +1014,7 @@ class AgentGUIClient {
           const index = parseInt(e.target.dataset.index);
           const msgId = queue[index].messageId;
           if (await window.UIDialog.confirm('Delete this queued message?', 'Delete Message')) {
-            await fetch(window.__BASE_URL + `/api/conversations/${conversationId}/queue/${msgId}`, { method: 'DELETE' });
+            await window.wsClient.rpc('q.del', { id: conversationId, messageId: msgId });
           }
         });
       });
@@ -1026,11 +1025,7 @@ class AgentGUIClient {
           const q = queue[index];
           const newContent = await window.UIDialog.prompt('Edit message:', q.content, 'Edit Queued Message');
           if (newContent !== null && newContent !== q.content) {
-            fetch(window.__BASE_URL + `/api/conversations/${conversationId}/queue/${q.messageId}`, {
-              method: 'PATCH',
-              headers: { 'Content-Type': 'application/json' },
-              body: JSON.stringify({ content: newContent })
-            });
+            window.wsClient.rpc('q.upd', { id: conversationId, messageId: q.messageId, content: newContent });
           }
         });
       });
@@ -1281,12 +1276,7 @@ class AgentGUIClient {
       } else {
         const body = { agentId, title: savedPrompt.substring(0, 50) };
         if (model) body.model = model;
-        const response = await fetch(window.__BASE_URL + '/api/conversations', {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify(body)
-        });
-        const { conversation } = await response.json();
+        const { conversation } = await window.wsClient.rpc('conv.new', body);
         this.state.currentConversation = conversation;
         this.lockAgentAndModel(agentId, model);
 
@@ -1351,10 +1341,7 @@ class AgentGUIClient {
     if (lastSeq < 0) return;
 
     try {
-      const url = `${window.__BASE_URL}/api/sessions/${sessionId}/chunks?sinceSeq=${lastSeq}`;
-      const resp = await fetch(url);
-      if (!resp.ok) return;
-      const { chunks: rawChunks } = await resp.json();
+      const { chunks: rawChunks } = await window.wsClient.rpc('sess.chunks', { id: sessionId, sinceSeq: lastSeq });
       if (!rawChunks || rawChunks.length === 0) return;
 
       const chunks = rawChunks.map(c => ({
@@ -1545,43 +1532,29 @@ class AgentGUIClient {
         this.wsManager.sendMessage({ type: 'subscribe', conversationId });
       }
 
-      const streamBody = { content: prompt, agentId };
+      const streamBody = { id: conversationId, content: prompt, agentId };
       if (model) streamBody.model = model;
-      const response = await fetch(`${window.__BASE_URL}/api/conversations/${conversationId}/stream`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(streamBody)
-      });
-
-      if (response.status === 404) {
-        console.warn('Conversation not found, recreating:', conversationId);
-        const conv = this.state.currentConversation;
-        const createBody = {
-          agentId,
-          title: conv?.title || prompt.substring(0, 50),
-          workingDirectory: conv?.workingDirectory || null
-        };
-        if (model) createBody.model = model;
-        const createResp = await fetch(window.__BASE_URL + '/api/conversations', {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify(createBody)
-        });
-        if (!createResp.ok) throw new Error(`Failed to recreate conversation: HTTP ${createResp.status}`);
-        const { conversation: newConv } = await createResp.json();
-        this.state.currentConversation = newConv;
-        if (window.conversationManager) {
-          window.conversationManager.loadConversations();
-          window.conversationManager.select(newConv.id);
+      let result;
+      try {
+        result = await window.wsClient.rpc('msg.stream', streamBody);
+      } catch (e) {
+        if (e.code === 404) {
+          console.warn('Conversation not found, recreating:', conversationId);
+          const conv = this.state.currentConversation;
+          const createBody = { agentId, title: conv?.title || prompt.substring(0, 50), workingDirectory: conv?.workingDirectory || null };
+          if (model) createBody.model = model;
+          const { conversation: newConv } = await window.wsClient.rpc('conv.new', createBody);
+          this.state.currentConversation = newConv;
+          if (window.conversationManager) {
+            window.conversationManager.loadConversations();
+            window.conversationManager.select(newConv.id);
+          }
+          this.updateUrlForConversation(newConv.id);
+          return this.streamToConversation(newConv.id, prompt, agentId, model);
         }
-        this.updateUrlForConversation(newConv.id);
-        return this.streamToConversation(newConv.id, prompt, agentId, model);
+        throw e;
       }
 
-      if (!response.ok) throw new Error(`HTTP ${response.status}`);
-
-      const result = await response.json();
-
       if (result.queued) {
         console.log('Message queued, position:', result.queuePosition);
         return;
@@ -1607,26 +1580,8 @@ class AgentGUIClient {
   async fetchChunks(conversationId, since = 0) {
     if (!conversationId) return [];
 
-    if (this.chunkPollState.abortController) {
-      this.chunkPollState.abortController.abort();
-    }
-    this.chunkPollState.abortController = new AbortController();
-    const signal = this.chunkPollState.abortController.signal;
-
     try {
-      const params = new URLSearchParams();
-      if (since > 0) {
-        params.append('since', since.toString());
-      }
-
-      const url = `${window.__BASE_URL}/api/conversations/${conversationId}/chunks?${params.toString()}`;
-      const response = await fetch(url, { signal });
-
-      if (!response.ok) {
-        throw new Error(`HTTP ${response.status}`);
-      }
-
-      const data = await response.json();
+      const data = await window.wsClient.rpc('conv.chunks', { id: conversationId, since: since > 0 ? since : 0 });
       if (!data.ok || !Array.isArray(data.chunks)) {
         throw new Error('Invalid chunks response');
       }
@@ -1663,9 +1618,8 @@ class AgentGUIClient {
 
     const checkSessionStatus = async () => {
       if (!this.state.currentSession?.id) return false;
-      const sessionResponse = await fetch(`${window.__BASE_URL}/api/sessions/${this.state.currentSession.id}`);
-      if (!sessionResponse.ok) return false;
-      const { session } = await sessionResponse.json();
+      let session;
+      try { ({ session } = await window.wsClient.rpc('sess.get', { id: this.state.currentSession.id })); } catch { return false; }
       if (session && (session.status === 'complete' || session.status === 'error')) {
         if (session.status === 'complete') {
           this.handleStreamingComplete({ sessionId: session.id, conversationId, timestamp: Date.now() });
@@ -1867,8 +1821,7 @@ class AgentGUIClient {
   async loadAgents() {
     return this._dedupedFetch('loadAgents', async () => {
       try {
-        const response = await fetch(window.__BASE_URL + '/api/agents');
-        const { agents } = await response.json();
+        const { agents } = await window.wsClient.rpc('agent.ls');
         this.state.agents = agents;
 
         if (this.ui.agentSelector) {
@@ -1891,8 +1844,7 @@ class AgentGUIClient {
 
   async checkSpeechStatus() {
     try {
-      const response = await fetch(window.__BASE_URL + '/api/speech-status');
-      const status = await response.json();
+      const status = await window.wsClient.rpc('speech.status');
       if (status.modelsComplete) {
         this._modelDownloadProgress = { done: true, complete: true };
         this._modelDownloadInProgress = false;
@@ -1918,8 +1870,7 @@ class AgentGUIClient {
       return;
     }
     try {
-      const response = await fetch(window.__BASE_URL + `/api/agents/${agentId}/models`);
-      const { models } = await response.json();
+      const { models } = await window.wsClient.rpc('agent.models', { id: agentId });
       this._modelCache.set(agentId, models || []);
       this._populateModelSelector(models || []);
     } catch (error) {
@@ -1990,8 +1941,7 @@ class AgentGUIClient {
   async loadConversations() {
     return this._dedupedFetch('loadConversations', async () => {
       try {
-        const response = await fetch(window.__BASE_URL + '/api/conversations');
-        const { conversations } = await response.json();
+        const { conversations } = await window.wsClient.rpc('conv.ls');
         this.state.conversations = conversations;
         return conversations;
       } catch (error) {
@@ -2180,17 +2130,7 @@ class AgentGUIClient {
       if (workingDirectory) body.workingDirectory = workingDirectory;
       if (model) body.model = model;
 
-      const response = await fetch(window.__BASE_URL + '/api/conversations', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(body)
-      });
-
-      if (!response.ok) {
-        throw new Error(`Failed to create conversation: ${response.status}`);
-      }
-
-      const { conversation } = await response.json();
+      const { conversation } = await window.wsClient.rpc('conv.new', body);
 
       await this.loadConversations();
 
@@ -2282,20 +2222,22 @@ class AgentGUIClient {
 
       this._showSkeletonLoading(conversationId);
 
-      const resp = await fetch(window.__BASE_URL + `/api/conversations/${conversationId}/full`, { signal: convSignal });
-      if (resp.status === 404) {
-        console.warn('Conversation no longer exists:', conversationId);
-        this.state.currentConversation = null;
-        if (window.conversationManager) {
-          window.conversationManager.loadConversations();
+      let fullData;
+      try {
+        fullData = await window.wsClient.rpc('conv.full', { id: conversationId });
+      } catch (e) {
+        if (e.code === 404) {
+          console.warn('Conversation no longer exists:', conversationId);
+          this.state.currentConversation = null;
+          if (window.conversationManager) window.conversationManager.loadConversations();
+          const outputEl = document.getElementById('output');
+          if (outputEl) outputEl.innerHTML = '<p class="text-secondary" style="padding:2rem;text-align:center">Conversation not found. It may have been lost during a server restart.</p>';
+          this.enableControls();
+          return;
         }
-        const outputEl = document.getElementById('output');
-        if (outputEl) outputEl.innerHTML = '<p class="text-secondary" style="padding:2rem;text-align:center">Conversation not found. It may have been lost during a server restart.</p>';
-        this.enableControls();
-        return;
+        throw e;
       }
-      if (!resp.ok) throw new Error(`HTTP ${resp.status}`);
-      const { conversation, isActivelyStreaming, latestSession, chunks: rawChunks, totalChunks, messages: allMessages } = await resp.json();
+      const { conversation, isActivelyStreaming, latestSession, chunks: rawChunks, totalChunks, messages: allMessages } = fullData;
 
       this.state.currentConversation = conversation;
       const hasActivity = (allMessages && allMessages.length > 0) || isActivelyStreaming || latestSession || this.state.streamingConversations.has(conversationId);
@@ -2337,11 +2279,9 @@ class AgentGUIClient {
             loadMoreBtn.disabled = true;
             loadMoreBtn.textContent = 'Loading...';
             try {
-              const fullResp = await fetch(window.__BASE_URL + `/api/conversations/${conversationId}/full?allChunks=1`);
-              if (fullResp.ok) {
-                this.invalidateCache(conversationId);
-                await this.loadConversationMessages(conversationId);
-              }
+              await window.wsClient.rpc('conv.full', { id: conversationId, allChunks: true });
+              this.invalidateCache(conversationId);
+              await this.loadConversationMessages(conversationId);
             } catch (e) {
               loadMoreBtn.textContent = 'Failed to load. Try again.';
               loadMoreBtn.disabled = false;

package/static/js/script-runner.js

@@ -1,5 +1,4 @@
 (function() {
-  const BASE = window.__BASE_URL || '';
   let currentConversationId = null;
   let currentWorkingDirectory = null;
   let scriptState = { running: false, script: null, hasStart: false, hasDev: false };
@@ -59,25 +58,18 @@
 
   function fetchConversationAndCheckScripts() {
     if (!currentConversationId) return;
-    
-    fetch(BASE + '/api/conversations/' + currentConversationId)
-      .then(function(r) { return r.json(); })
+    window.wsClient.rpc('conv.get', { id: currentConversationId })
       .then(function(data) {
         currentWorkingDirectory = data.conversation?.workingDirectory || null;
-        if (currentWorkingDirectory) {
-          showTerminalTab();
-        }
+        if (currentWorkingDirectory) showTerminalTab();
         checkScripts();
       })
-      .catch(function() {
-        checkScripts();
-      });
+      .catch(function() { checkScripts(); });
   }
 
   function checkScripts() {
     if (!currentConversationId) return;
-    fetch(BASE + '/api/conversations/' + currentConversationId + '/scripts')
-      .then(function(r) { return r.json(); })
+    window.wsClient.rpc('conv.scripts', { id: currentConversationId })
       .then(function(data) {
         scriptState.hasStart = data.hasStart;
         scriptState.hasDev = data.hasDev;
@@ -115,42 +107,29 @@
 
   function runScript(script) {
     if (!currentConversationId || scriptState.running) return;
-    fetch(BASE + '/api/conversations/' + currentConversationId + '/run-script', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({ script: script })
-    })
-    .then(function(r) { return r.json(); })
-    .then(function(data) {
-      if (data.ok) {
-        scriptState.running = true;
-        scriptState.script = script;
-        hasTerminalContent = false;
-        updateButtons();
-        showTerminalTab();
-        switchToTerminalView();
-        
-        var term = getTerminal();
-        if (term) {
-          term.clear();
-          term.writeln('\x1b[36m[running npm run ' + script + ']\x1b[0m\r\n');
+    window.wsClient.rpc('conv.run-script', { id: currentConversationId, script: script })
+      .then(function(data) {
+        if (data.ok) {
+          scriptState.running = true;
+          scriptState.script = script;
+          hasTerminalContent = false;
+          updateButtons();
+          showTerminalTab();
+          switchToTerminalView();
+          var term = getTerminal();
+          if (term) {
+            term.clear();
+            term.writeln('\x1b[36m[running npm run ' + script + ']\x1b[0m\r\n');
+          }
         }
-      }
-    })
-    .catch(function(err) {
-      console.error('Failed to start script:', err);
-    });
+      })
+      .catch(function(err) { console.error('Failed to start script:', err); });
   }
 
   function stopScript() {
     if (!currentConversationId) return;
-    fetch(BASE + '/api/conversations/' + currentConversationId + '/stop-script', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: '{}'
-    }).catch(function(err) {
-      console.error('Failed to stop script:', err);
-    });
+    window.wsClient.rpc('conv.stop-script', { id: currentConversationId })
+      .catch(function(err) { console.error('Failed to stop script:', err); });
   }
 
   function showTerminalTab() {

package/static/js/ws-client.js

@@ -78,3 +78,6 @@ class WsClient {
 }
 
 window.WsClient = WsClient;
+
+window.wsManager = new WebSocketManager();
+window.wsClient = new WsClient(window.wsManager);