agentgui 1.0.659 → 1.0.661

package/lib/ws-handlers-conv.js

@@ -1,7 +1,9 @@
 import path from 'path';
+import os from 'os';
 
 function fail(code, message) { const e = new Error(message); e.code = code; throw e; }
 function notFound(msg = 'Not found') { fail(404, msg); }
+function expandTilde(p) { return p && p.startsWith('~') ? path.join(os.homedir(), p.slice(1)) : p; }
 
 export function register(router, deps) {
   const { queries, activeExecutions, messageQueues, rateLimitState,
@@ -14,7 +16,7 @@ export function register(router, deps) {
   });
 
   router.handle('conv.new', (p) => {
-    const wd = p.workingDirectory ? path.resolve(p.workingDirectory) : null;
+    const wd = p.workingDirectory ? path.resolve(expandTilde(p.workingDirectory)) : null;
     const conv = queries.createConversation(p.agentId, p.title, wd, p.model || null, p.subAgent || null);
     queries.createEvent('conversation.created', { agentId: p.agentId, workingDirectory: conv.workingDirectory, model: conv.model, subAgent: conv.subAgent }, conv.id);
     broadcastSync({ type: 'conversation_created', conversation: conv });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentgui",
-  "version": "1.0.659",
+  "version": "1.0.661",
   "description": "Multi-agent ACP client with real-time communication",
   "type": "module",
   "main": "server.js",

package/server.js

@@ -1153,8 +1153,9 @@ const server = http.createServer(async (req, res) => {
 
     if (pathOnly === '/api/conversations' && req.method === 'POST') {
       const body = await parseBody(req);
-      // Normalize working directory to avoid Windows path issues
-      const normalizedWorkingDir = body.workingDirectory ? path.resolve(body.workingDirectory) : null;
+      // Normalize working directory to avoid Windows path issues; expand ~ to home
+      const expandTilde = p => p && p.startsWith('~') ? path.join(os.homedir(), p.slice(1)) : p;
+      const normalizedWorkingDir = body.workingDirectory ? path.resolve(expandTilde(body.workingDirectory)) : null;
       const conversation = queries.createConversation(body.agentId, body.title, normalizedWorkingDir, body.model || null);
       queries.createEvent('conversation.created', { agentId: body.agentId, workingDirectory: conversation.workingDirectory, model: conversation.model }, conversation.id);
       broadcastSync({ type: 'conversation_created', conversation });
@@ -1181,9 +1182,10 @@ const server = http.createServer(async (req, res) => {
 
       if (req.method === 'POST' || req.method === 'PUT') {
         const body = await parseBody(req);
-        // Normalize working directory if present to avoid Windows path issues
+        // Normalize working directory if present to avoid Windows path issues; expand ~ to home
         if (body.workingDirectory) {
-          body.workingDirectory = path.resolve(body.workingDirectory);
+          const expandTilde = p => p && p.startsWith('~') ? path.join(os.homedir(), p.slice(1)) : p;
+          body.workingDirectory = path.resolve(expandTilde(body.workingDirectory));
         }
         const conv = queries.updateConversation(convMatch[1], body);
         if (!conv) { sendJSON(req, res, 404, { error: 'Conversation not found' }); return; }

package/static/index.html

@@ -3047,7 +3047,7 @@
         <button class="clone-cancel-btn" id="cloneCancelBtn" title="Cancel">&times;</button>
       </div>
        <ul class="sidebar-list" data-conversation-list>
-         <li class="sidebar-empty" data-conversation-empty>No conversations yet</li>
+         <li class="sidebar-empty" data-conversation-empty>Loading...</li>
        </ul>
        <!-- PM2 Monitor Panel: hidden until active processes detected -->
        <div class="pm2-monitor-panel" id="pm2MonitorPanel" style="display:none">

package/static/js/client.js

@@ -1140,14 +1140,25 @@ class AgentGUIClient {
     }
 
     const sessionId = data.sessionId || this.state.currentSession?.id;
+
+    // Remove all orphaned streaming indicators (handles case where session never started)
+    const outputEl2 = document.getElementById('output');
+    if (outputEl2) {
+      outputEl2.querySelectorAll('.streaming-indicator').forEach(ind => {
+        ind.innerHTML = `<span style="color:var(--color-error);">Error: ${this.escapeHtml(data.error || 'Unknown error')}</span>`;
+      });
+    }
+
     const streamingEl = document.getElementById(`streaming-${sessionId}`);
     if (streamingEl) {
+      streamingEl.classList.remove('streaming-message');
       const indicator = streamingEl.querySelector('.streaming-indicator');
       if (indicator) {
         indicator.innerHTML = `<span style="color:var(--color-error);">Error: ${this.escapeHtml(data.error || 'Unknown error')}</span>`;
       }
     }
 
+    this.unlockAgentAndModel();
     this.enableControls();
     this.emit('streaming:error', data);
   }
@@ -1306,6 +1317,7 @@ class AgentGUIClient {
       }
     }
 
+    outputEl.querySelectorAll('p.text-secondary').forEach(p => p.remove());
     const messageHtml = `
       <div class="message message-${data.message.role}" data-msg-id="${data.message.id}">
         <div class="message-role">${data.message.role.charAt(0).toUpperCase() + data.message.role.slice(1)}</div>
@@ -1723,6 +1735,7 @@ class AgentGUIClient {
   _showOptimisticMessage(pendingId, content) {
     const messagesEl = document.querySelector('.conversation-messages');
     if (!messagesEl) return;
+    messagesEl.querySelectorAll('p.text-secondary').forEach(p => p.remove());
     const div = document.createElement('div');
     div.className = 'message message-user message-sending';
     div.id = pendingId;

package/static/js/conversations.js

@@ -46,13 +46,14 @@ class ConversationManager {
   async init() {
     this.newBtn?.addEventListener('click', () => this.openFolderBrowser());
     this.setupDelegatedListeners();
-    await this.loadAgents();
-    this.loadConversations();
+    this.showLoading();
     this.setupWebSocketListener();
     this.setupFolderBrowser();
     this.setupCloneUI();
     this.setupDeleteAllButton();
 
+    await Promise.all([this.loadAgents(), this.loadConversations()]);
+
     this._pollInterval = setInterval(() => this.loadConversations(), 30000);
 
     window.addEventListener('beforeunload', () => this.destroy());
@@ -67,7 +68,10 @@ class ConversationManager {
 
   async loadAgents() {
     try {
-      const data = await window.wsClient.rpc('agent.ls');
+      const base = window.__BASE_URL || '/gm';
+      const res = await fetch(base + '/api/agents');
+      if (!res.ok) throw new Error('HTTP ' + res.status);
+      const data = await res.json();
       for (const agent of data.agents || []) {
         this.agents.set(agent.id, agent);
       }
@@ -409,9 +413,21 @@ class ConversationManager {
     }
   }
 
+  showLoading() {
+    if (!this.listEl) return;
+    this.listEl.innerHTML = '';
+    if (this.emptyEl) {
+      this.emptyEl.textContent = 'Loading...';
+      this.emptyEl.style.display = 'block';
+    }
+  }
+
   async loadConversations() {
     try {
-      const data = await window.wsClient.rpc('conv.ls');
+      const base = window.__BASE_URL || '/gm';
+      const res = await fetch(base + '/api/conversations');
+      if (!res.ok) throw new Error('HTTP ' + res.status);
+      const data = await res.json();
       const convList = data.conversations || [];
 
       this._updateConversations(convList, 'poll');