clay-server 2.19.0 → 2.20.0-beta.2

package/lib/public/modules/tools.js

@@ -389,6 +389,9 @@ function submitAskUserAnswer(container, toolId, questions, answers, multiSelecti
   enableMainInput();
   if (ctx.stopUrgentBlink) ctx.stopUrgentBlink();
 
+  // Show user's answers inline
+  showAnswerSummary(container, questions, result);
+
   if (ctx.ws && ctx.connected) {
     ctx.ws.send(JSON.stringify({
       type: "ask_user_response",
@@ -398,11 +401,72 @@ function submitAskUserAnswer(container, toolId, questions, answers, multiSelecti
   }
 }
 
-export function markAskUserAnswered(toolId) {
+function showAnswerSummary(container, questions, answers) {
+  if (!answers || Object.keys(answers).length === 0) return;
+  var existing = container.querySelector(".ask-user-answer-summary");
+  if (existing) return;
+  var summary = document.createElement("div");
+  summary.className = "ask-user-answer-summary";
+  for (var key in answers) {
+    if (!answers.hasOwnProperty(key)) continue;
+    var row = document.createElement("div");
+    row.className = "ask-user-answer-row";
+    var qi = parseInt(key, 10);
+    var label = (questions && questions[qi] && questions[qi].question) ? questions[qi].question : "Answer";
+    row.innerHTML = '<span class="ask-user-answer-label">' + escapeHtml(label) + '</span>' +
+      '<span class="ask-user-answer-value">' + escapeHtml(String(answers[key])) + '</span>';
+    summary.appendChild(row);
+  }
+  // Insert before submit button
+  var submitBtn = container.querySelector(".ask-user-submit");
+  if (submitBtn) {
+    submitBtn.parentNode.insertBefore(summary, submitBtn);
+  } else {
+    container.appendChild(summary);
+  }
+}
+
+export function markAskUserAnswered(toolId, answers) {
   var container = document.querySelector('.ask-user-container[data-tool-id="' + toolId + '"]');
   if (container && !container.classList.contains("answered")) {
     container.classList.add("answered");
     enableMainInput();
+    // Restore answers from history replay
+    if (answers && Object.keys(answers).length > 0) {
+      // Find matching questions from the tool_executing input
+      var questions = null;
+      var askQuestions = container.querySelectorAll(".ask-user-question");
+      if (askQuestions.length > 0) {
+        questions = [];
+        for (var qi = 0; qi < askQuestions.length; qi++) {
+          var qTextEl = askQuestions[qi].querySelector(".ask-user-question-text");
+          questions.push({ question: qTextEl ? qTextEl.textContent : "" });
+        }
+      }
+      showAnswerSummary(container, questions, answers);
+      // Also mark selected options to match the answers
+      for (var key in answers) {
+        if (!answers.hasOwnProperty(key)) continue;
+        var idx = parseInt(key, 10);
+        if (askQuestions[idx]) {
+          var answerVal = String(answers[key]);
+          var options = askQuestions[idx].querySelectorAll(".ask-user-option");
+          var matched = false;
+          for (var oi = 0; oi < options.length; oi++) {
+            var labelEl = options[oi].querySelector(".option-label");
+            if (labelEl && labelEl.textContent === answerVal) {
+              options[oi].classList.add("selected");
+              matched = true;
+            }
+          }
+          // If not matched to an option, fill the "Other" input
+          if (!matched) {
+            var otherInput = askQuestions[idx].querySelector(".ask-user-other input");
+            if (otherInput) otherInput.value = answerVal;
+          }
+        }
+      }
+    }
   }
 }
 
@@ -1345,17 +1409,22 @@ export function startThinking() {
     var el = thinkingGroup.el;
     el.classList.remove("done");
     el.querySelector(".thinking-content").textContent = "";
-    // Mate mode: restore dots row, hide thinking header
+    // Mate mode: restore sparkle activity row, hide thinking header
     if (el.classList.contains("mate-thinking")) {
-      var dotsRow = el.querySelector(".mate-thinking-row");
-      if (dotsRow) dotsRow.style.display = "flex";
+      var actRow = el.querySelector(".mate-thinking-activity");
+      if (actRow) {
+        actRow.style.display = "";
+        actRow.querySelector(".activity-text").textContent = randomThinkingVerb() + "...";
+      }
       var header = el.querySelector(".thinking-header");
       if (header) header.style.display = "none";
     }
     currentThinking = { el: el, fullText: "", startTime: Date.now() };
     refreshIcons();
     ctx.scrollToBottom();
-    ctx.setActivity(randomThinkingVerb() + "...");
+    if (!el.classList.contains("mate-thinking")) {
+      ctx.setActivity(randomThinkingVerb() + "...");
+    }
     return;
   }
 
@@ -1369,9 +1438,10 @@ export function startThinking() {
     el.innerHTML =
       '<img class="dm-bubble-avatar dm-bubble-avatar-mate" src="' + escapeHtml(mateAvatar) + '" alt="">' +
       '<div class="dm-bubble-content">' +
-      '<div class="mate-thinking-row">' +
-      '<span class="dm-bubble-name">' + escapeHtml(mateName) + '</span>' +
-      '<span class="mate-thinking-dots"><span></span><span></span><span></span></span>' +
+      '<div class="dm-bubble-header"><span class="dm-bubble-name">' + escapeHtml(mateName) + '</span></div>' +
+      '<div class="activity-inline mate-thinking-activity">' +
+      '<span class="activity-icon">' + iconHtml("sparkles") + '</span>' +
+      '<span class="activity-text">' + randomThinkingVerb() + '...</span>' +
       '</div>' +
       '<div class="thinking-header" style="display:none">' +
       '<span class="thinking-chevron">' + iconHtml("chevron-right") + '</span>' +
@@ -1401,7 +1471,9 @@ export function startThinking() {
   ctx.scrollToBottom();
   thinkingGroup = { el: el, count: 0, totalDuration: 0 };
   currentThinking = { el: el, fullText: "", startTime: Date.now() };
-  ctx.setActivity(randomThinkingVerb() + "...");
+  if (!ctx.isMateDm()) {
+    ctx.setActivity(randomThinkingVerb() + "...");
+  }
 }
 
 export function appendThinking(text) {
@@ -1422,10 +1494,10 @@ export function stopThinking(duration) {
   } else {
     currentThinking.el.querySelector(".thinking-duration").textContent = " " + secs.toFixed(1) + "s";
   }
-  // In mate mode: hide dots, show compact expandable thinking header
+  // In mate mode: hide sparkle activity, show compact expandable thinking header
   if (currentThinking.el.classList.contains("mate-thinking")) {
-    var dotsRow = currentThinking.el.querySelector(".mate-thinking-row");
-    if (dotsRow) dotsRow.style.display = "none";
+    var actRow = currentThinking.el.querySelector(".mate-thinking-activity");
+    if (actRow) actRow.style.display = "none";
     var header = currentThinking.el.querySelector(".thinking-header");
     if (header) {
       header.style.display = "";

package/lib/public/modules/user-settings.js

@@ -3,6 +3,7 @@
 
 import { refreshIcons } from './icons.js';
 import { showToast } from './utils.js';
+import { toggleDarkMode, getCurrentTheme } from './theme.js';
 
 var ctx = null;
 var settingsEl = null;
@@ -66,17 +67,40 @@ export function initUserSettings(appCtx) {
   var pinInput = document.getElementById('us-pin-input');
   var pinSave = document.getElementById('us-pin-save');
   if (pinInput && pinSave) {
-    pinInput.addEventListener('input', function () {
+    function validatePin() {
       pinSave.disabled = !/^\d{6}$/.test(pinInput.value);
-    });
+    }
+    pinInput.addEventListener('input', validatePin);
+    pinInput.addEventListener('keyup', function (e) { e.stopPropagation(); validatePin(); });
     pinInput.addEventListener('keydown', stopProp);
-    pinInput.addEventListener('keyup', stopProp);
     pinInput.addEventListener('keypress', stopProp);
     pinSave.addEventListener('click', function () {
       savePin(pinInput.value);
     });
   }
 
+  // Auto-continue toggle
+  var autoContinueToggle = document.getElementById('us-auto-continue');
+  if (autoContinueToggle) {
+    autoContinueToggle.addEventListener('change', function () {
+      fetch('/api/user/auto-continue', {
+        method: 'PUT',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({ enabled: this.checked }),
+      }).then(function (r) { return r.json(); }).then(function (data) {
+        if (data.ok) showToast(data.autoContinueOnRateLimit ? 'Auto-continue on' : 'Auto-continue off');
+      }).catch(function () {});
+    });
+  }
+
+  // Theme toggle (light/dark)
+  var themeToggle = document.getElementById('us-theme-toggle');
+  if (themeToggle) {
+    themeToggle.addEventListener('change', function () {
+      toggleDarkMode();
+    });
+  }
+
   // Logout button
   var logoutBtn = document.getElementById('us-logout-btn');
   if (logoutBtn) {
@@ -139,6 +163,15 @@ function populateAccount() {
     if (accountNav && !data.username) {
       accountNav.style.display = 'none';
     }
+    // Auto-continue toggle
+    var acToggle = document.getElementById('us-auto-continue');
+    if (acToggle) acToggle.checked = !!data.autoContinueOnRateLimit;
+    // Theme toggle
+    var thToggle = document.getElementById('us-theme-toggle');
+    if (thToggle) {
+      var theme = getCurrentTheme();
+      thToggle.checked = theme && theme.variant === 'light';
+    }
   }).catch(function () {});
 }
 
@@ -148,36 +181,36 @@ function savePin(pin) {
   var pinMsg = document.getElementById('us-pin-msg');
 
   pinSave.disabled = true;
-  pinSave.textContent = 'Saving...';
+  pinSave.textContent = 'Saving\u2026';
 
   fetch('/api/user/pin', {
     method: 'PUT',
     headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({ pin: pin }),
+    body: JSON.stringify({ newPin: pin }),
   }).then(function (r) { return r.json(); }).then(function (data) {
     if (data.ok) {
       pinInput.value = '';
-      pinSave.textContent = 'Update PIN';
+      pinSave.textContent = 'Change PIN';
       if (pinMsg) {
-        pinMsg.textContent = 'PIN updated successfully.';
+        pinMsg.textContent = 'Your PIN has been changed.';
         pinMsg.className = 'us-pin-msg us-pin-msg-ok';
         pinMsg.classList.remove('hidden');
       }
-      showToast('PIN updated');
+      showToast('PIN changed');
     } else {
       pinSave.disabled = false;
-      pinSave.textContent = 'Update PIN';
+      pinSave.textContent = 'Change PIN';
       if (pinMsg) {
-        pinMsg.textContent = data.error || 'Failed to update PIN.';
+        pinMsg.textContent = data.error || 'Could not change your PIN. Please try again.';
         pinMsg.className = 'us-pin-msg us-pin-msg-err';
         pinMsg.classList.remove('hidden');
       }
     }
   }).catch(function () {
     pinSave.disabled = false;
-    pinSave.textContent = 'Update PIN';
+    pinSave.textContent = 'Change PIN';
     if (pinMsg) {
-      pinMsg.textContent = 'Network error.';
+      pinMsg.textContent = 'Connection lost. Check your network and try again.';
       pinMsg.className = 'us-pin-msg us-pin-msg-err';
       pinMsg.classList.remove('hidden');
     }

package/lib/sdk-bridge.js

@@ -59,14 +59,14 @@ function createSDKBridge(opts) {
   var isMate = opts.isMate || (slug.indexOf("mate-") === 0);
   var dangerouslySkipPermissions = opts.dangerouslySkipPermissions || false;
   var onProcessingChanged = opts.onProcessingChanged || function () {};
-
+  var onTurnDone = opts.onTurnDone || null;
 
   // --- Skill discovery helpers ---
 
   function discoverSkillDirs() {
     var skills = {};
     var dirs = [
-      path.join(os.homedir(), ".claude", "skills"),
+      path.join(require("./config").REAL_HOME, ".claude", "skills"),
       path.join(cwd, ".claude", "skills"),
     ];
     for (var d = 0; d < dirs.length; d++) {
@@ -387,9 +387,13 @@ function createSDKBridge(opts) {
         });
       }
       // Reset for next turn in the same query
+      var donePreview = session.responsePreview || "";
       session.responsePreview = "";
       session.streamedText = false;
       sm.broadcastSessionList();
+      if (onTurnDone) {
+        try { onTurnDone(session, donePreview); } catch (e) {}
+      }
 
     } else if (parsed.type === "system" && parsed.subtype === "status") {
       if (parsed.status === "compacting") {
@@ -459,6 +463,18 @@ function createSDKBridge(opts) {
 
     } else if (parsed.type === "rate_limit_event" && parsed.rate_limit_info) {
       var info = parsed.rate_limit_info;
+
+      // Broadcast reset time for top-bar usage link
+      if (info.rateLimitType && info.resetsAt) {
+        send({
+          type: "rate_limit_usage",
+          rateLimitType: info.rateLimitType,
+          resetsAt: info.resetsAt * 1000,
+          status: info.status,
+        });
+      }
+
+      // Warning/rejection handling (existing behavior)
       if (info.status === "allowed_warning" || info.status === "rejected") {
         sendAndRecord(session, {
           type: "rate_limit",
@@ -832,14 +848,12 @@ function createSDKBridge(opts) {
     }
 
     if (dangerouslySkipPermissions) {
-      queryOptions.permissionMode = "bypassPermissions";
       queryOptions.allowDangerouslySkipPermissions = true;
-    } else {
-      var modeToApply = session.acceptEditsAfterStart ? "acceptEdits" : sm.currentPermissionMode;
-      if (session.acceptEditsAfterStart) delete session.acceptEditsAfterStart;
-      if (modeToApply && modeToApply !== "default") {
-        queryOptions.permissionMode = modeToApply;
-      }
+    }
+    var modeToApply = session.acceptEditsAfterStart ? "acceptEdits" : sm.currentPermissionMode;
+    if (session.acceptEditsAfterStart) delete session.acceptEditsAfterStart;
+    if (modeToApply && modeToApply !== "default") {
+      queryOptions.permissionMode = modeToApply;
     }
 
     if (session.cliSessionId) {
@@ -980,27 +994,19 @@ function createSDKBridge(opts) {
             sm.broadcastSessionList();
           }
           cleanupSessionWorker(session);
-          // Auto-continue for scheduler sessions on rate limit
+          // Auto-continue on rate limit (scheduler sessions, or user setting)
           var workerDidScheduleAC = false;
+          var workerACEnabled = session.onQueryComplete || (typeof opts.getAutoContinueSetting === "function" && opts.getAutoContinueSetting(session));
           if (session.rateLimitResetsAt && session.rateLimitResetsAt > Date.now()
-              && session.onQueryComplete && !session.destroying) {
-            var wacDelay = session.rateLimitResetsAt - Date.now() + 3000;
+              && workerACEnabled && !session.destroying) {
             var wacResetsAt = session.rateLimitResetsAt;
             session.rateLimitResetsAt = null;
             session.rateLimitAutoContinuePending = true;
             workerDidScheduleAC = true;
-            console.log("[sdk-bridge] Rate limited (worker), scheduling auto-continue in " + Math.round(wacDelay / 1000) + "s for session " + session.localId);
-            sendAndRecord(session, { type: "auto_continue_scheduled", resetsAt: wacResetsAt });
-            session.autoContinueTimer = setTimeout(function () {
-              session.autoContinueTimer = null;
-              session.rateLimitAutoContinuePending = false;
-              if (session.destroying) return;
-              console.log("[sdk-bridge] Auto-continue (worker) firing for session " + session.localId);
-              session.isProcessing = true;
-              onProcessingChanged();
-              sendAndRecord(session, { type: "auto_continue_fired" });
-              startQuery(session, "continue", null, session.lastLinuxUser || null);
-            }, wacDelay);
+            console.log("[sdk-bridge] Rate limited (worker), scheduling auto-continue via scheduleMessage for session " + session.localId);
+            if (typeof opts.scheduleMessage === "function") {
+              opts.scheduleMessage(session, "continue", wacResetsAt);
+            }
           }
           if (session.onQueryComplete && !workerDidScheduleAC) {
             try { session.onQueryComplete(session); } catch (err) {
@@ -1149,6 +1155,52 @@ function createSDKBridge(opts) {
       if (mateAutoTools[toolName]) {
         return Promise.resolve({ behavior: "allow", updatedInput: input });
       }
+      // Auto-approve safe Bash commands (read-only, non-destructive)
+      if (toolName === "Bash" && input && input.command) {
+        var cmd = input.command.trim();
+        var firstWord = cmd.split(/[\s;|&]/)[0];
+        var safeBashCommands = {
+          ls: true, cat: true, head: true, tail: true, wc: true, file: true,
+          // File/dir inspection
+          ls: true, cat: true, head: true, tail: true, wc: true, file: true,
+          stat: true, find: true, tree: true, du: true, df: true,
+          readlink: true, realpath: true, basename: true, dirname: true,
+          // Search
+          grep: true, rg: true, ag: true, ack: true, fgrep: true, egrep: true,
+          // Lookup
+          which: true, type: true, whereis: true, command: true, hash: true,
+          // Environment/system info
+          echo: true, printf: true, env: true, printenv: true, pwd: true,
+          whoami: true, id: true, groups: true,
+          date: true, uname: true, hostname: true, uptime: true, arch: true,
+          nproc: true, free: true, lsb_release: true, sw_vers: true,
+          locale: true, timedatectl: true,
+          // Version checks
+          git: true, dotnet: true, ruby: true, java: true, javac: true,
+          rustc: true, gcc: true, clang: true, cmake: true,
+          // Text processing (pure stdin/stdout, no side effects)
+          jq: true, yq: true, sort: true, uniq: true, cut: true, tr: true,
+          awk: true, sed: true, paste: true, column: true, fold: true,
+          rev: true, tac: true, nl: true, expand: true, unexpand: true,
+          fmt: true, pr: true, csplit: true, comm: true, join: true,
+          // Comparison/hashing
+          diff: true, cmp: true, md5sum: true, sha256sum: true, sha1sum: true,
+          shasum: true, cksum: true, sum: true, b2sum: true, base64: true,
+          xxd: true, od: true, hexdump: true,
+          // Misc read-only
+          test: true, true: true, false: true, seq: true, yes: true,
+          sleep: true, tee: true, xargs: true, time: true,
+          man: true, help: true, info: true, apropos: true,
+          cal: true, bc: true, expr: true, factor: true,
+          lsof: true, ps: true, top: true, htop: true, pgrep: true,
+          netstat: true, ss: true, ifconfig: true, ip: true, dig: true,
+          nslookup: true, host: true, ping: true, traceroute: true,
+          curl: true, wget: true, http: true,
+        };
+        if (safeBashCommands[firstWord]) {
+          return Promise.resolve({ behavior: "allow", updatedInput: input });
+        }
+      }
     }
 
     // AskUserQuestion: wait for user answers via WebSocket
@@ -1373,27 +1425,19 @@ function createSDKBridge(opts) {
       session.pendingAskUser = {};
       session.pendingElicitations = {};
 
-      // Auto-continue for scheduler (Ralph Loop) sessions on rate limit
+      // Auto-continue on rate limit (scheduler sessions, or user setting)
       var didScheduleAutoContinue = false;
+      var acEnabled = session.onQueryComplete || (typeof opts.getAutoContinueSetting === "function" && opts.getAutoContinueSetting(session));
       if (session.rateLimitResetsAt && session.rateLimitResetsAt > Date.now()
-          && session.onQueryComplete && !session.destroying) {
-        var acDelay = session.rateLimitResetsAt - Date.now() + 3000;
+          && acEnabled && !session.destroying) {
         var acResetsAt = session.rateLimitResetsAt;
         session.rateLimitResetsAt = null;
         session.rateLimitAutoContinuePending = true;
         didScheduleAutoContinue = true;
-        console.log("[sdk-bridge] Rate limited, scheduling auto-continue in " + Math.round(acDelay / 1000) + "s for session " + session.localId);
-        sendAndRecord(session, { type: "auto_continue_scheduled", resetsAt: acResetsAt });
-        session.autoContinueTimer = setTimeout(function () {
-          session.autoContinueTimer = null;
-          session.rateLimitAutoContinuePending = false;
-          if (session.destroying) return;
-          console.log("[sdk-bridge] Auto-continue firing for session " + session.localId);
-          session.isProcessing = true;
-          onProcessingChanged();
-          sendAndRecord(session, { type: "auto_continue_fired" });
-          startQuery(session, "continue", null, session.lastLinuxUser || null);
-        }, acDelay);
+        console.log("[sdk-bridge] Rate limited, scheduling auto-continue via scheduleMessage for session " + session.localId);
+        if (typeof opts.scheduleMessage === "function") {
+          opts.scheduleMessage(session, "continue", acResetsAt);
+        }
       }
 
       // Ralph Loop: notify completion so loop orchestrator can proceed
@@ -1527,15 +1571,13 @@ function createSDKBridge(opts) {
     }
 
     if (dangerouslySkipPermissions) {
-      queryOptions.permissionMode = "bypassPermissions";
       queryOptions.allowDangerouslySkipPermissions = true;
-    } else {
-      // Pass permissionMode in queryOptions at creation time to avoid race condition
-      var modeToApply = session.acceptEditsAfterStart ? "acceptEdits" : sm.currentPermissionMode;
-      if (session.acceptEditsAfterStart) delete session.acceptEditsAfterStart;
-      if (modeToApply && modeToApply !== "default") {
-        queryOptions.permissionMode = modeToApply;
-      }
+    }
+    // Pass permissionMode in queryOptions at creation time to avoid race condition
+    var modeToApply = session.acceptEditsAfterStart ? "acceptEdits" : sm.currentPermissionMode;
+    if (session.acceptEditsAfterStart) delete session.acceptEditsAfterStart;
+    if (modeToApply && modeToApply !== "default") {
+      queryOptions.permissionMode = modeToApply;
     }
 
     if (session.cliSessionId) {
@@ -1745,12 +1787,6 @@ function createSDKBridge(opts) {
   }
 
   async function setPermissionMode(session, mode) {
-    // When dangerouslySkipPermissions is active, ignore mode changes from UI
-    // to prevent accidentally downgrading from bypassPermissions
-    if (dangerouslySkipPermissions) {
-      send({ type: "config_state", model: sm.currentModel || "", mode: "bypassPermissions", effort: sm.currentEffort || "medium", betas: sm.currentBetas || [] });
-      return;
-    }
     if (session.worker) {
       session.worker.send({ type: "set_permission_mode", mode: mode });
       return;
@@ -1819,9 +1855,7 @@ function createSDKBridge(opts) {
 
     var query;
     try {
-      query = sdk.query({
-        prompt: mq,
-        options: {
+      var mentionQueryOptions = {
           cwd: cwd,
           systemPrompt: opts.claudeMd,
           settingSources: ["user"],
@@ -1837,18 +1871,32 @@ function createSDKBridge(opts) {
               message: "Read-only access. You cannot make changes via @mention.",
             });
           },
-        },
+        };
+      if (opts.model) mentionQueryOptions.model = opts.model;
+      query = sdk.query({
+        prompt: mq,
+        options: mentionQueryOptions,
       });
     } catch (e) {
       opts.onError("Failed to create mention query: " + (e.message || e));
       return null;
     }
 
-    // Push the initial message (context + question)
+    // Push the initial message (context + question, with optional images)
     var initialPrompt = opts.initialContext + "\n\n" + opts.initialMessage;
+    var initialContent = [];
+    if (opts.initialImages && opts.initialImages.length > 0) {
+      for (var ii = 0; ii < opts.initialImages.length; ii++) {
+        initialContent.push({
+          type: "image",
+          source: { type: "base64", media_type: opts.initialImages[ii].mediaType, data: opts.initialImages[ii].data },
+        });
+      }
+    }
+    initialContent.push({ type: "text", text: initialPrompt });
     mq.push({
       type: "user",
-      message: { role: "user", content: [{ type: "text", text: initialPrompt }] },
+      message: { role: "user", content: initialContent },
     });
 
     // Background stream processing loop
@@ -1951,7 +1999,7 @@ function createSDKBridge(opts) {
 
     return {
       // Push a follow-up message to the existing mention session
-      pushMessage: function (text, callbacks) {
+      pushMessage: function (text, callbacks, images) {
         currentOnDelta = callbacks.onDelta;
         currentOnDone = callbacks.onDone;
         currentOnError = callbacks.onError;
@@ -1959,11 +2007,24 @@ function createSDKBridge(opts) {
         mentionBlocks = {};
         responseFullText = "";
         responseStreamedText = false;
+        var content = [];
+        if (images && images.length > 0) {
+          for (var pi = 0; pi < images.length; pi++) {
+            content.push({
+              type: "image",
+              source: { type: "base64", media_type: images[pi].mediaType, data: images[pi].data },
+            });
+          }
+        }
+        content.push({ type: "text", text: text });
         mq.push({
           type: "user",
-          message: { role: "user", content: [{ type: "text", text: text }] },
+          message: { role: "user", content: content },
         });
       },
+      abort: function () {
+        try { abortController.abort(); } catch (e) {}
+      },
       close: function () {
         alive = false;
         try { mq.end(); } catch (e) {}