agentgui 1.0.939 → 1.0.941

package/site/app/js/backend.js

@@ -27,14 +27,17 @@ function withToken(url) {
   return url + (url.includes('?') ? '&' : '?') + 'token=' + encodeURIComponent(tok);
 }
 
+function lsGet(k) { try { return localStorage.getItem(k); } catch { return null; } }
+function lsSet(k, v) { try { localStorage.setItem(k, v); } catch {} }
+
 export function getBackend() {
   const u = new URL(location.href);
   const fromQs = u.searchParams.get('backend');
-  if (fromQs) { localStorage.setItem(KEY, fromQs); return fromQs; }
-  return localStorage.getItem(KEY) || DEFAULT_BACKEND;
+  if (fromQs) { lsSet(KEY, fromQs); return fromQs; }
+  return lsGet(KEY) || DEFAULT_BACKEND;
 }
 
-export function setBackend(url) { localStorage.setItem(KEY, url); }
+export function setBackend(url) { lsSet(KEY, url); }
 
 export async function probeBackend(base) {
   try {
@@ -203,12 +206,28 @@ function addSessionListener(sessionId, fn) {
 
 // ---------- Agents / models (WS) ----------
 
-export async function listModels(base) {
+export async function listAgents(base) {
   const { agents } = await wsCall(base, 'agents.list', {});
-  // Compatibility shape: app.js expects an array of {id, name?, ...}
   return agents || [];
 }
 
+export async function listActiveChats(base) {
+  try { const { sessions } = await wsCall(base, 'chat.active', {}); return sessions || []; }
+  catch { return []; }
+}
+
+export async function cancelChat(base, sessionId) {
+  return wsCall(base, 'chat.cancel', { sessionId });
+}
+
+export async function listAgentModels(base, agentId) {
+  if (!agentId) return [];
+  try {
+    const { models } = await wsCall(base, 'agents.models', { id: agentId });
+    return models || [];
+  } catch { return []; }
+}
+
 // ---------- Streaming chat (WS) ----------
 //
 // Yields events of shape:
@@ -218,29 +237,15 @@ export async function listModels(base) {
 //   { type: 'error', error: '...' }
 //
 // Caller signature kept compatible with the previous HTTP/SSE impl.
-export async function* streamChat(base, { model, messages, signal, agentId, resumeSid }) {
-  // The last user message is the prompt; agentgui's claude-runner doesn't
-  // accept a full message list — it spawns the agent for a single prompt.
-  // For multi-turn, the agent's own session/resume handles continuity.
+export async function* streamChat(base, { model, messages, signal, agentId, resumeSid, cwd }) {
+  // The last user message is the prompt; agentgui's claude-runner spawns the
+  // agent for a single prompt. Multi-turn continuity is the agent's own resume.
   const last = messages[messages.length - 1];
   const content = last?.content || '';
   if (!content) return;
 
-  // app.js treats the "model" picker as the agent picker (selects from
-  // agents.list ids). If no explicit agentId is given, model IS the agent.
-  // If `model` looks like a real model id (has a slash), keep it as model
-  // and default agent to claude-code.
-  let resolvedAgentId = agentId;
-  let resolvedModel = model;
-  if (!resolvedAgentId) {
-    if (!model || /^[a-z][a-z0-9-]*$/.test(model)) {
-      // Bare slug — treat as agentId.
-      resolvedAgentId = model || 'claude-code';
-      resolvedModel = undefined;
-    } else {
-      resolvedAgentId = 'claude-code';
-    }
-  }
+  const resolvedAgentId = agentId || 'claude-code';
+  const resolvedModel = model || undefined;
 
   // Queue events here; the async iterator pulls from it.
   const queue = [];
@@ -252,7 +257,7 @@ export async function* streamChat(base, { model, messages, signal, agentId, resu
   // Kick off the chat on the server.
   let started;
   try {
-    started = await wsCall(base, 'chat.sendMessage', { content, agentId: resolvedAgentId, model: resolvedModel, resumeSid });
+    started = await wsCall(base, 'chat.sendMessage', { content, agentId: resolvedAgentId, model: resolvedModel, resumeSid, cwd });
   } catch (e) {
     yield { type: 'error', error: e.message };
     return;
@@ -260,25 +265,31 @@ export async function* streamChat(base, { model, messages, signal, agentId, resu
   const sessionId = started?.sessionId;
   if (!sessionId) { yield { type: 'error', error: 'no sessionId from server' }; return; }
 
+  const finish = () => { done = true; if (resolveWait) { resolveWait(); resolveWait = null; } };
+
   const unsub = addSessionListener(sessionId, (ev) => {
     if (ev.type === 'streaming_progress') {
       const block = ev.block;
       if (block?.type === 'text' && block.text) push({ type: 'text', text: block.text });
       else if (block?.type === 'tool_use') push({ type: 'tool', block });
-      else if (block?.type === 'tool_result') push({ type: 'tool', block });
+      else if (block?.type === 'tool_result') push({ type: 'tool_result', block });
       else if (block?.type === 'result') push({ type: 'result', block });
     } else if (ev.type === 'streaming_complete') {
-      done = true;
-      if (resolveWait) { resolveWait(); resolveWait = null; }
+      finish();
     } else if (ev.type === 'streaming_error') {
       errored = ev.error || 'streaming error';
-      done = true;
-      if (resolveWait) { resolveWait(); resolveWait = null; }
+      finish();
     }
   });
 
-  // Wire AbortSignal to chat.cancel.
-  const onAbort = () => { wsCall(base, 'chat.cancel', { sessionId }).catch(() => {}); };
+  // If the websocket drops mid-stream, streaming_complete will never arrive —
+  // surface an error and end the iterator instead of hanging forever.
+  const onWs = (s) => { if ((s === 'closed' || s === 'error') && !done) { errored = errored || 'connection lost during stream'; finish(); } };
+  const unsubWs = onWsStatus ? onWsStatus(onWs) : null;
+
+  // Wire AbortSignal to chat.cancel — and end the iterator immediately so the
+  // caller's busy state clears even if the server never emits a final event.
+  const onAbort = () => { wsCall(base, 'chat.cancel', { sessionId }).catch(() => {}); finish(); };
   if (signal) {
     if (signal.aborted) onAbort();
     else signal.addEventListener('abort', onAbort, { once: true });
@@ -295,6 +306,7 @@ export async function* streamChat(base, { model, messages, signal, agentId, resu
     if (errored) yield { type: 'error', error: errored };
   } finally {
     unsub();
+    if (typeof unsubWs === 'function') unsubWs();
     if (signal) signal.removeEventListener?.('abort', onAbort);
   }
 }