@songsid/agend 2.3.0-beta.25 → 2.3.0-beta.27

package/dist/ui/chat-render.js

@@ -509,27 +509,17 @@
   /** Whether the chat shows "working" and its Stop button for an instance in this execution state. */
   function isBusy(state) { return state === "working" || state === "stuck"; }
 
-  /** What a key in the composer does: Enter sends, Shift+Enter is a new line, nothing happens mid-IME-composition. */
-  function composerKey(ev) {
+  /**
+   * What a key in the composer does: Enter sends, Shift+Enter is a new line, nothing happens mid-IME-composition.
+   * #2478 (the user's request): on a touch screen (a coarse pointer) Return is a new line — the Send button sends.
+   */
+  function composerKey(ev, opts) {
     if (!ev || ev.key !== "Enter" || ev.isComposing || ev.keyCode === 229) return "none";
+    if (opts && opts.touch) return "newline";
     if (ev.shiftKey || ev.altKey || ev.ctrlKey || ev.metaKey) return "newline";
     return "send";
   }
 
-  /**
-   * A send that failed: where does its text go? Back into the composer only if that composer is the same
-   * target's, still on screen and empty; otherwise it is kept aside for that target (never put into another
-   * target's composer, never over a draft someone is typing) and offered back when that chat is open.
-   */
-  function settleFailedSend(target, current, composerPresent, composerValue) {
-    return target === current && composerPresent && !composerValue ? "restore" : "keep";
-  }
-
-  /** "Put back" for a kept message: in front of whatever is being typed now, never replacing it. */
-  function putBack(failedText, draft) {
-    return draft ? failedText + "\n" + draft : failedText;
-  }
-
   /** The defaults of the upload limits the server enforces (web-upload.ts UPLOAD_LIMITS), for a page that was given none. */
   var FILE_LIMITS = { maxFileBytes: 50 * 1024 * 1024, maxFiles: 5, maxTotalBytes: 100 * 1024 * 1024 };
   /**
@@ -666,7 +656,7 @@
   return {
     renderMarkdown: renderMarkdown, escapeHtml: escapeHtml, mergeMessages: mergeMessages, applyReplyButtons: applyReplyButtons, composerKey: composerKey,
     pollRemaining: pollRemaining,
-    settleFailedSend: settleFailedSend, putBack: putBack,
+    
     FILE_LIMITS: FILE_LIMITS, fileLimits: fileLimits, fileRejection: fileRejection, formatSize: formatSize, checkFiles: checkFiles, attachmentsHtml: attachmentsHtml, isHtmlAttachment: isHtmlAttachment,
     nextDeliveryState: nextDeliveryState, applyDelivery: applyDelivery, deliveryHtml: deliveryHtml, isBusy: isBusy,
     applyReactions: applyReactions, reactionsHtml: reactionsHtml,

package/dist/ui/chat-store.js

@@ -42,7 +42,7 @@ const COMPACT_PAGE_LIMIT_MS = 11 * 60_000;
 /** Build a store. `deps` (fetch, toast, announce, t, now) are injected so tests can drive every path. */
 export function createChatStore(deps) {
   const s = {
-    msgs: {}, drafts: {}, replies: {}, failedSends: {}, pendingFiles: {}, sending: {}, inFlightFiles: {}, sendFailures: {}, instanceStatus: {}, waking: {},
+    msgs: {}, drafts: {}, replies: {}, pendingFiles: {}, sending: {}, outgoing: {}, instanceStatus: {}, waking: {},
     prompts: {}, workingSince: {}, stopping: {}, cancelling: {}, scrollMemo: {}, historyRead: new Set(), rbBusy: new Set(),
     pollMine: readPollMine(),
     // #1823 (#1828 review): the server's clock minus this device's. A poll's deadline is the server's; a page whose clock
@@ -108,6 +108,8 @@ export function createChatStore(deps) {
     liveReplies.message(m, extra);
     const before = s.msgs[m.instance];
     s.msgs[m.instance] = R().mergeMessages(before, [m], 500);
+    // The live copy of a message this page sent carries its clientId: its pending bubble goes in this same redraw.
+    if (settleOutgoing(m.instance, m.role === "user" ? m.clientId : undefined) && s.msgs[m.instance] === before) changed(m.instance, "msgs");
     if (m.instance === s.current && s.msgs[m.instance] !== before && m.role !== "status" && !isUser(m, m.instance) && (s.msgs[m.instance] || []).length > (before || []).length) deps.announce(tf("chat.a11yReplied", m.sender));
     if (s.msgs[m.instance] !== before) changed(m.instance, "msgs");
   }
@@ -166,6 +168,7 @@ export function createChatStore(deps) {
       // Kept even when the person has moved on: the store is page-lived, and the answer belongs to `name`.
       for (const m of r.messages) liveReplies.message(m);
       s.msgs[name] = R().mergeMessages(s.msgs[name], r.messages, 500);
+      settleOutgoing(name);
       changed(name, "msgs");
     } catch { s.historyRead.delete(name); /* the live stream still works; the next visit tries again */ }
     void lease;
@@ -242,71 +245,186 @@ export function createChatStore(deps) {
   }
   const promptsFor = (instance) => Object.values(s.prompts).filter(p => p.instance === instance);
 
-  // ── Sending. Never lose anything: a failed send's files go back to that chat's list and its text back into its own
-  // composer when that is empty, otherwise it is kept for its chat and offered back (Put back).
-  async function uploadFile(target, file) {
-    const r = await deps.fetch(`/ui/upload?instance=${encodeURIComponent(target)}`, {
-      method: "POST",
-      headers: { "Content-Type": file.type || "application/octet-stream", "X-Agend-Filename": encodeURIComponent(file.name || "file") },
-      body: file,
+  // ── Sending (Discord-like, the user's request): a message shows at once as its own bubble, dimmed while it goes; its
+  // files show their upload progress. The server's copy replaces it when it arrives — matched by the page's clientId
+  // (on the live copy) or the messageId the send answered with — so it is never shown twice. A send that fails stays,
+  // marked, with Retry and Delete: nothing is lost, and nothing is put back into the composer behind the person's back.
+  // Sends of one chat go out in order, one at a time; a later one waits behind an earlier one still going.
+  let outSeq = 0;
+  const objectUrl = (f) => { try { return globalThis.URL && typeof URL.createObjectURL === "function" && /^image\/(png|jpeg|gif|webp)$/.test(f.type || "") ? URL.createObjectURL(f) : null; } catch { return null; } };
+  const freeUrl = (u) => { try { if (u) URL.revokeObjectURL(u); } catch { /* gone */ } };
+  const newClientId = () => {
+    const bytes = new Uint8Array(12);
+    try { globalThis.crypto.getRandomValues(bytes); } catch { for (let i = 0; i < bytes.length; i++) bytes[i] = Math.floor(Math.random() * 256); }
+    return "c" + [...bytes].map((x) => x.toString(16).padStart(2, "0")).join("");
+  };
+  /** Pending bubbles the server's copy now stands for go (their previews freed). Returns whether any went. */
+  function settleOutgoing(name, clientId) {
+    const list = s.outgoing[name];
+    if (!list || !list.length) return false;
+    const ids = new Set((s.msgs[name] || []).map((m) => m.messageId).filter(Boolean)), clients = new Set(clientId ? [clientId] : []);
+    const kept = list.filter((e) => !((e.messageId && ids.has(e.messageId)) || clients.has(e.clientId)));
+    if (kept.length === list.length) return false;
+    for (const e of list) if (!kept.includes(e)) for (const f of e.files) freeUrl(f.url);
+    s.outgoing[name] = kept;
+    return true;
+  }
+  /** The thread as drawn: the server's messages, then this page's pending ones. */
+  function threadRows(name) {
+    const out = s.outgoing[name];
+    return out && out.length ? (s.msgs[name] || []).concat(out) : (s.msgs[name] || []);
+  }
+  /** Upload one file, its progress told as it goes (XHR: fetch cannot report an upload's progress). */
+  async function uploadFile(target, file, onProgress) {
+    const url = `/ui/upload?instance=${encodeURIComponent(target)}`;
+    const X = deps.XMLHttpRequest;
+    if (!X) {                                                            // no XHR given (a test): the whole file at once
+      const r = await deps.fetch(url, { method: "POST", headers: { "Content-Type": file.type || "application/octet-stream", "X-Agend-Filename": encodeURIComponent(file.name || "file") }, body: file });
+      let body = {};
+      try { body = await r.json(); } catch { /* not JSON */ }
+      if (!r.ok || !body || typeof body.id !== "string") throw new Error(body && body.error ? `${file.name}: ${body.error}` : `${file.name}: upload failed (${r.status})`);
+      onProgress?.(file.size || 0, file.size || 0);
+      return body;
+    }
+    // The CSRF header the page's fetch adds (agend-auth.js), added here too; a 401 ends the session as fetch's would.
+    const csrf = globalThis.AgendAuth && typeof globalThis.AgendAuth.csrf === "function" ? await globalThis.AgendAuth.csrf().catch(() => null) : null;
+    return new Promise((resolve, reject) => {
+      const xhr = new X();
+      xhr.open("POST", url);
+      xhr.setRequestHeader("Content-Type", file.type || "application/octet-stream");
+      xhr.setRequestHeader("X-Agend-Filename", encodeURIComponent(file.name || "file"));
+      if (csrf) xhr.setRequestHeader("X-Agend-CSRF", csrf);
+      if (xhr.upload && onProgress) xhr.upload.onprogress = (ev) => { if (ev.lengthComputable) onProgress(ev.loaded, ev.total); };
+      xhr.onload = () => {
+        let body = {};
+        try { body = JSON.parse(xhr.responseText || "{}"); } catch { /* not JSON */ }
+        if (xhr.status === 401) globalThis.AgendAuth?.unauthorized?.();
+        if (xhr.status >= 200 && xhr.status < 300 && body && typeof body.id === "string") resolve(body);
+        else reject(new Error(body && body.error ? `${file.name}: ${body.error}` : `${file.name}: upload failed (${xhr.status})`));
+      };
+      xhr.onerror = () => reject(new Error(`${file.name}: ${t("chat.uploadNoConnection")}`));
+      xhr.onabort = () => reject(new Error(`${file.name}: ${t("chat.uploadNoConnection")}`));
+      xhr.send(file);
     });
-    let body = {};
-    try { body = await r.json(); } catch { /* not JSON */ }
-    if (!r.ok || !body || typeof body.id !== "string") throw new Error(body && body.error ? `${file.name}: ${body.error}` : `${file.name}: upload failed (${r.status})`);
-    return body;
   }
-  async function send(target) {
+  /** Send what the composer holds: its bubble at once, then out in this chat's order. */
+  function send(target) {
     const txt = (s.drafts[target] || "").trim();
-    const quote = s.replies[target];         // #2272: the message this one replies to (its row; the server reads the rest)
     const files = (s.pendingFiles[target] || []).slice();
-    if ((!txt && !files.length) || !target || s.sending[target]) return;
-    s.sending[target] = true;
-    s.waking[target] = s.instanceStatus[target] === "paused";
-    delete s.sendFailures[target];
+    if ((!txt && !files.length) || !target) return;
+    const quote = s.replies[target];
+    const e = {
+      // "You" until the server's copy (with the person's name) replaces it: no request is made for a name.
+      boot: "out", id: ++outSeq, instance: target, role: "user", sender: t("chat.you"), text: txt,
+      ts: new Date().toISOString(), clientId: newClientId(), replyTo: quote ? { boot: quote.boot, id: quote.id, sender: quote.sender, text: quote.text, media: quote.media } : undefined,
+      quote, outgoing: { state: "queued" },
+      files: files.map((f) => ({ file: f, name: f.name || "file", size: f.size || 0, type: f.type || "", url: objectUrl(f), loaded: 0, total: f.size || 0, state: "waiting", id: null })),
+    };
+    (s.outgoing[target] = s.outgoing[target] || []).push(e);
     s.drafts[target] = "";
-    s.pendingFiles[target] = []; s.inFlightFiles[target] = files;
+    s.pendingFiles[target] = [];
+    if (quote) delete s.replies[target];
+    changed(target, "msgs");
     changed(target);
     changed(target, "sent");          // your own message: the thread goes to the bottom
+    return pump(target);
+  }
+  /** Take this chat's waiting sends, one after another. */
+  async function pump(target) {
+    if (s.sending[target]) return;
+    s.sending[target] = true;
+    try {
+      for (let e = nextQueued(target); e; e = nextQueued(target)) await deliver(target, e);
+    } finally { s.sending[target] = false; delete s.waking[target]; changed(target); }
+  }
+  const nextQueued = (target) => (s.outgoing[target] || []).find((x) => x.outgoing.state === "queued");
+  /** One send: its files (each with its own progress), then the message. */
+  async function deliver(target, e) {
+    e.outgoing = { state: "sending" };
+    s.waking[target] = s.instanceStatus[target] === "paused";
+    changed(target, "msgs"); changed(target);
     let r;
     try {
-      const ids = [];
-      for (const f of files) ids.push((await uploadFile(target, f)).id);
-      const body = ids.length ? { instance: target, message: txt, attachments: ids } : { instance: target, message: txt };
-      if (quote) body.replyTo = { boot: quote.boot, id: quote.id };
+      for (const f of e.files) {
+        if (f.id) continue;                                              // uploaded by an earlier try
+        f.state = "uploading"; f.loaded = 0; changed(target, "progress");
+        let last = 0;
+        const body = await uploadFile(target, f.file, (loaded, total) => {
+          f.loaded = loaded; f.total = total || f.total;
+          const at = deps.now ? deps.now() : Date.now();
+          if (at - last > 60 || loaded >= f.total) { last = at; changed(target, "progress"); }
+        });
+        f.id = body.id; f.state = "done"; f.loaded = f.total; changed(target, "progress");
+      }
+      const body = { instance: target, message: e.text, clientId: e.clientId };
+      const ids = e.files.map((f) => f.id);
+      if (ids.length) body.attachments = ids;
+      if (e.quote) body.replyTo = { boot: e.quote.boot, id: e.quote.id };
       r = await api("POST", "/ui/send", body);
-    } catch (err) { r = { error: err && err.message ? err.message : t("chat.disconnected") }; }
-    s.sending[target] = false;
-    delete s.waking[target];
-    delete s.inFlightFiles[target];
-    if (r && !r.error) { if (s.replies[target] === quote) delete s.replies[target]; changed(target); return; }
-    // #2272: the quoted message is gone: the reply goes, the text and files stay (sent again without it, or re-aimed).
-    if (r && r.reason === "reply_gone" && s.replies[target] === quote) delete s.replies[target];
-    if (files.length) s.pendingFiles[target] = R().checkFiles(files, s.pendingFiles[target] || []).kept;
-    if (txt) {
-      const shown = s.current === target;
-      if (R().settleFailedSend(target, s.current, shown, shown ? (s.drafts[target] || "") : "") === "restore") s.drafts[target] = txt;
-      else s.failedSends[target] = s.failedSends[target] ? `${s.failedSends[target]}\n${txt}` : txt;
+    } catch (err) {
+      const f = e.files.find((x) => x.state === "uploading");
+      if (f) f.state = "failed";
+      // The browser's own words for a request that never reached the server (Chrome, Firefox, Safari): the page's.
+      const offline = err && err.name === "TypeError" && /failed to fetch|networkerror|load failed/i.test(err.message || "");
+      r = { error: offline ? t("chat.sendNoConnection") : err && err.message ? err.message : t("chat.disconnected") };
     }
+    if (!(s.outgoing[target] || []).includes(e)) return;                // deleted meanwhile
+    if (r && !r.error && r.sent !== false) {
+      e.outgoing = { state: "sent" };
+      if (typeof r.messageId === "string") e.messageId = r.messageId;
+      settleOutgoing(target);
+      changed(target, "msgs"); changed(target);
+      return;
+    }
+    // Files the server no longer holds (they are released when a delivery fails) are uploaded again on Retry.
+    if (r && typeof r.error === "string" && /files? (are|is) not available|no such file|already sent/i.test(r.error)) for (const f of e.files) { f.id = null; f.state = "waiting"; }
+    // #2272: the quoted message is gone: Retry sends it without the quote.
+    if (r && r.reason === "reply_gone") { e.quote = undefined; e.replyTo = undefined; }
     const why = r && r.reason;
     const key = typeof why === "string" ? `chat.sendFailure_${why}` : "";
     const localized = key ? t(key) : "";
-    const error = localized && localized !== key ? localized : (r && r.error ? r.error : t("chat.disconnected"));
-    s.sendFailures[target] = { error, text: txt, files };
-    changed(target);
-    deps.toast(error, false);
+    e.outgoing = { state: "failed", error: localized && localized !== key ? localized : (r && r.error ? r.error : t("chat.disconnected")) };
+    changed(target, "msgs"); changed(target);
+    deps.toast(e.outgoing.error, false);
+  }
+  /** A failed send, sent again (the same bubble; files already uploaded are not uploaded again). */
+  function retryOutgoing(target, clientId) {
+    const e = (s.outgoing[target] || []).find((x) => x.clientId === clientId);
+    if (!e || e.outgoing.state !== "failed") return;
+    e.outgoing = { state: "queued" };
+    for (const f of e.files) if (f.state === "failed") f.state = "waiting";
+    changed(target, "msgs");
+    return pump(target);
+  }
+  /** A failed send, let go (its previews freed). */
+  function deleteOutgoing(target, clientId) {
+    const list = s.outgoing[target] || [];
+    const e = list.find((x) => x.clientId === clientId);
+    if (!e || e.outgoing.state !== "failed") return;
+    for (const f of e.files) freeUrl(f.url);
+    s.outgoing[target] = list.filter((x) => x !== e);
+    changed(target, "msgs"); changed(target);
   }
-  function canRetrySend(target) {
-    const failed = s.sendFailures[target], files = s.pendingFiles[target] || [];
-    return !!failed && !s.sending[target] && !s.failedSends[target]
-      && (s.drafts[target] || "").trim() === failed.text
-      && files.length === failed.files.length && files.every((f, i) => f === failed.files[i]);
+  /**
+   * A failed send, back in the composer to change it: its text before what is typed there now, its files (within the
+   * limits) and its reply, if none is started; the bubble goes. The page records the composer's undo step first.
+   */
+  function putBackOutgoing(target, clientId) {
+    const list = s.outgoing[target] || [];
+    const e = list.find((x) => x.clientId === clientId);
+    if (!e || e.outgoing.state !== "failed") return;
+    const draft = s.drafts[target] || "";
+    s.drafts[target] = e.text ? (draft ? e.text + "\n" + draft : e.text) : draft;
+    for (const f of e.files) freeUrl(f.url);
+    s.outgoing[target] = list.filter((x) => x !== e);
+    if (e.quote && !s.replies[target]) s.replies[target] = e.quote;
+    changed(target, "msgs");
+    if (e.files.length) addFiles(target, e.files.map((f) => f.file)); else changed(target);
   }
-  function retrySend(target) { if (canRetrySend(target)) return send(target); }
   function addFiles(target, list) {
     if (!target) return;
-    const inFlight = s.inFlightFiles[target] || [];
-    const res = R().checkFiles(inFlight.concat(s.pendingFiles[target] || []), [...(list || [])]);
-    s.pendingFiles[target] = res.kept.slice(inFlight.length);
+    const res = R().checkFiles(s.pendingFiles[target] || [], [...(list || [])]);
+    s.pendingFiles[target] = res.kept;
     for (const x of res.rejected) { const why = R().fileRejection(x.reason); deps.toast(`${x.name}: ${t(why.key, ...why.values)}`, false); }
     changed(target);
   }
@@ -316,7 +434,7 @@ export function createChatStore(deps) {
     if (!target) return false;
     const stamp = new Date().toISOString().slice(0, 19).replace(/[-:T]/g, "");
     const f = new File([text], `pasted-${stamp}.txt`, { type: "text/plain" });
-    const taken = (s.inFlightFiles[target] || []).concat(s.pendingFiles[target] || []);
+    const taken = s.pendingFiles[target] || [];
     if (R().checkFiles(taken, [f]).rejected.length) { deps.toast(t("chat.pasteKeptAsText")); return false; }
     pastedTexts.set(f, text);
     addFiles(target, [f]);
@@ -333,16 +451,8 @@ export function createChatStore(deps) {
     changed(target);
   }
   const isPasted = (f) => pastedTexts.has(f);
-  function putBack(target) {
-    const kept = s.failedSends[target];
-    if (!kept) return;
-    s.drafts[target] = R().putBack(kept, s.drafts[target] || "");
-    delete s.failedSends[target];
-    changed(target);
-  }
-  function discardFailed(target) { delete s.failedSends[target]; changed(target); }
-  /** Typing stays local, except a failed send's Retry button must follow edits too. */
-  function setDraft(target, value) { s.drafts[target] = value; if (s.sendFailures[target]) changed(target); }
+  /** Typing stays local. */
+  function setDraft(target, value) { s.drafts[target] = value; }
   /**
    * #2272: reply to a message of this chat — what the bar above the composer shows (its sender and first words); only
    * its row is sent. One at a time per chat: a new one replaces it.
@@ -363,7 +473,7 @@ export function createChatStore(deps) {
     if (has()) return true;
     try {
       const r = await api("GET", `/ui/history?instance=${encodeURIComponent(name)}&limit=500`);
-      if (r && Array.isArray(r.messages)) { s.msgs[name] = R().mergeMessages(s.msgs[name], r.messages, 500); changed(name, "msgs"); }
+      if (r && Array.isArray(r.messages)) { s.msgs[name] = R().mergeMessages(s.msgs[name], r.messages, 500); settleOutgoing(name); changed(name, "msgs"); }
     } catch { /* the jump says it is not there */ }
     return has();
   }
@@ -461,7 +571,7 @@ export function createChatStore(deps) {
     attach, applyStatus, applyActivity, ingest, applyDeliveries, openHistory,
     onPrompt, applyPrompts, resolvePrompt, answerPrompt, answerByNonce, holdPrompt, releasePrompt, promptsFor,
     applyReplyButtons, clickReplyButton,
-    uploadFile, send, canRetrySend, retrySend, addFiles, removeFile, attachPastedText, fileBackAsText, isPasted, putBack, discardFailed, setDraft,
+    uploadFile, send, retryOutgoing, deleteOutgoing, putBackOutgoing, threadRows, addFiles, removeFile, attachPastedText, fileBackAsText, isPasted, setDraft,
     startReply, clearReply, findQuoted,
     cancelReply, isUser, runCommand, dismissCommand, commandFree,
   };

package/dist/ui/chat-strings.js

@@ -4,6 +4,9 @@ import { register } from "/assets/app-i18n.js";
 register("chat", {
   en: {
     waking: "Waking {0}…", retrySend: "Retry send",
+    // A message being sent (its own bubble at once) and its files' uploads.
+    you: "You", sending: "Sending…", uploadingFile: "Uploading {0}", uploadWaiting: "waiting", uploadFailed: "failed",
+    uploadNoConnection: "the upload was cut off — check the connection", sendNoConnection: "it did not reach AgEnD — check the connection", notSentBecause: "Not sent: {0}", deleteUnsent: "Delete",
     sendFailure_wake_capacity: "No slot is free to wake this instance. Retry when another instance is idle.",
     sendFailure_wake_credentials: "The instance could not sign in. Check its account on the host, then retry.",
     sendFailure_wake_timeout: "The instance did not become ready in time. Retry, or check its status on the host.",
@@ -53,7 +56,7 @@ register("chat", {
     a11yWorking: "{0} started working", a11yIdle: "{0} finished", a11yReplied: "{0} replied", conversationWith: "Conversation with {0}",
     stopping: "Stopping {0}…", awaiting: "{0} is waiting for your input", approxNote: "Read from the terminal, so approximate", elapsedTitle: "Time since this page saw it start (approximate)",
     dropHere: "Drop files to attach them", asText: "As text", pasteAttached: "A long paste ({0} characters) was attached as a text file", pasteKeptAsText: "No room for another attachment: the long paste stays as text",
-    send: "Send", composerPlaceholder: "Message {0}…", composerHint: "Enter to send · Shift+Enter for a new line", composerMore: "/ for commands · Esc stops the reply", guestMore: "Esc stops the reply",
+    send: "Send", composerPlaceholder: "Message {0}…", composerHint: "Enter to send · Shift+Enter for a new line", composerHintTouch: "Return adds a line · tap Send to send", composerMore: "/ for commands · Esc stops the reply", guestMore: "Esc stops the reply",
     guestNote: "You're a guest: the agent sees your messages as a guest's (recognition only).", guestNoCommands: "Guests can't run commands — send it without the leading /.", attachTitle: "Attach files (any type — or paste / drop them)",
     pvPreview: "Preview", pvStop: "Stop", pvDownload: "Download", pvMenu: "Preview options", pvHtml: "HTML",
     pvAllowButton: "Allow previews", pvAllow: "Allow HTML previews — they may be able to send data out", pvDisallow: "Stop allowing HTML previews",
@@ -110,7 +113,7 @@ register("chat", {
     disconnected: "disconnected", tick_queued: "Waiting behind another message", tick_processing: "Handed to the agent", tick_delivered: "The agent has it", tick_failed: "Not delivered", tick_cancelled: "Dropped by Stop", reactedBy: "{0} reacted",
     promptAnswering: "Answering…", promptGone: "This prompt is no longer open", promptFor: "{0}: {1}",
     working: "{0} is working…", stuck: "{0} looks stuck", stopReply: "Stop reply", stopReplyTitle: "Stop the current reply (like Esc) and drop the messages still waiting. The instance keeps running.", stopSent: "Stopped",
-    file_empty: "empty file", file_too_large: "over {0} MB", file_too_large_public: "over {0} MB — the most the public link carries in one upload", file_too_many: "at most {0} files per message", file_too_much: "the files together would be over {0} MB", removeFile: "Remove", notSent: "Not sent:", putBack: "Put back", discard: "Discard",
+    file_empty: "empty file", file_too_large: "over {0} MB", file_too_large_public: "over {0} MB — the most the public link carries in one upload", file_too_many: "at most {0} files per message", file_too_much: "the files together would be over {0} MB", removeFile: "Remove", putBack: "Put back", 
     noMessages: "Type a task below.",
     pick: "Choose an agent to start chatting.", noAgents: "Create an agent to start chatting.", newAgent: "New agent", notFound: "No instance called “{0}”", notFoundHint: "It may have been deleted or renamed.", backToList: "Choose an agent",
     details: "Instance details", start: "Start instance", stopInstance: "Stop instance", restart: "Restart instance", delete: "Delete instance…",
@@ -143,6 +146,8 @@ register("chat", {
   },
   "zh-TW": {
     waking: "正在喚醒 {0}…", retrySend: "重試傳送",
+    you: "你", sending: "傳送中…", uploadingFile: "正在上傳 {0}", uploadWaiting: "等待中", uploadFailed: "失敗",
+    uploadNoConnection: "上傳中斷了，請檢查網路連線", sendNoConnection: "沒有送到 AgEnD，請檢查網路連線", notSentBecause: "沒有送出：{0}", deleteUnsent: "刪除",
     sendFailure_wake_capacity: "目前沒有空位可喚醒這個實例。請等其他實例閒置後重試。",
     sendFailure_wake_credentials: "實例無法登入。請先在主機檢查它的帳號，再重試。",
     sendFailure_wake_timeout: "實例未能及時就緒。請重試，或在主機檢查它的狀態。",
@@ -192,7 +197,7 @@ register("chat", {
     a11yWorking: "{0} 開始工作", a11yIdle: "{0} 已完成", a11yReplied: "{0} 已回覆", conversationWith: "與 {0} 的對話",
     stopping: "正在中止 {0}…", awaiting: "{0} 正在等你回應", approxNote: "從終端畫面判讀，僅供參考", elapsedTitle: "從這個頁面看到它開始工作起算（約略）",
     dropHere: "放開即可附加檔案", asText: "改為文字", pasteAttached: "貼上的長文字（{0} 個字元）已改為文字檔附加", pasteKeptAsText: "附件已滿，貼上的長文字保留為一般文字",
-    send: "送出", composerPlaceholder: "傳訊息給 {0}…", composerHint: "Enter 送出 · Shift+Enter 換行", composerMore: "/ 叫出指令 · Esc 中止回覆", guestMore: "Esc 中止回覆",
+    send: "送出", composerPlaceholder: "傳訊息給 {0}…", composerHint: "Enter 送出 · Shift+Enter 換行", composerHintTouch: "Return 換行 · 按「送出」傳送", composerMore: "/ 叫出指令 · Esc 中止回覆", guestMore: "Esc 中止回覆",
     guestNote: "你是訪客：agent 會把你的訊息視為訪客的訊息（僅供辨識）。", guestNoCommands: "訪客不能執行指令，請去掉開頭的 / 再送出。", attachTitle: "附加檔案（任何類型，也可以貼上或拖曳）",
     pvPreview: "預覽", pvStop: "停止", pvDownload: "下載", pvMenu: "預覽選項", pvHtml: "HTML",
     pvAllowButton: "允許預覽", pvAllow: "允許預覽 HTML（預覽可能把資料傳出去）", pvDisallow: "不再允許預覽 HTML",
@@ -247,7 +252,7 @@ register("chat", {
     disconnected: "已斷線", tick_queued: "排在前一則訊息之後", tick_processing: "已交給 agent", tick_delivered: "agent 已收到", tick_failed: "未送達", tick_cancelled: "已被中止取消", reactedBy: "{0} 的回應",
     promptAnswering: "回覆中…", promptGone: "這個提示已經結束", promptFor: "{0}：{1}",
     working: "{0} 處理中…", stuck: "{0} 似乎卡住了", stopReply: "中止回覆", stopReplyTitle: "中止目前的回覆（同 Esc），並取消還在排隊的訊息。instance 會繼續運行。", stopSent: "已中止",
-    file_empty: "空檔案", file_too_large: "超過 {0} MB", file_too_large_public: "超過 {0} MB，這是公開連結單次上傳的上限", file_too_many: "每則訊息最多 {0} 個檔案", file_too_much: "檔案合計會超過 {0} MB", removeFile: "移除", notSent: "未送出：", putBack: "放回輸入框", discard: "捨棄",
+    file_empty: "空檔案", file_too_large: "超過 {0} MB", file_too_large_public: "超過 {0} MB，這是公開連結單次上傳的上限", file_too_many: "每則訊息最多 {0} 個檔案", file_too_much: "檔案合計會超過 {0} MB", removeFile: "移除", putBack: "放回輸入框", 
     noMessages: "直接在下方輸入任務。",
     pick: "選一個 Agent 開始聊天。", noAgents: "先建立一個 Agent，再開始聊天。", newAgent: "新增 Agent", notFound: "沒有叫「{0}」的 instance", notFoundHint: "它可能已被刪除或改名。", backToList: "選擇 Agent",
     details: "Instance 詳細資料", start: "啟動 instance", stopInstance: "停止 instance", restart: "重新啟動 instance", delete: "刪除 instance…",

package/dist/ui/chat-thread.js

@@ -132,6 +132,7 @@ export function createThread(list, scroller, opts) {
     // #1770: the label ("17:38", "Yesterday 17:38", "10/11 17:38") depends on today, so it is not part of the html a node
     // is kept by: it is written into the node (timeLabels) — crossing midnight relabels in place and reloads no preview.
     const time = x.ts ? `<span class="time" data-ts="${escAttr(x.ts)}" title="${escAttr(chatTimeFull(x.ts))}"></span>` : `<span class="time"></span>`;
+    if (x.outgoing) return outgoingHtml(x);
     const trial = readCanvasTrialMessage(x);
     if (trial) return canvasWorkerEnabled() ? trialHtml(trial, time, x) : "";
     if (x.role === "status") return statusHtml(x, time);
@@ -147,6 +148,48 @@ export function createThread(list, scroller, opts) {
     const act = opts.canReply?.() === false ? "" : `<div data-trust="thread-control" class="msg-actions"><button type="button" class="chip-btn icon-only" data-act="reply" data-arg="${escAttr(key)}" title="${escAttr(tr("chat.reply"))}" aria-label="${escAttr(tr("chat.reply"))}">${REPLY}</button></div>`;
     return `<div class="msg ${u ? "user" : "agent"}" data-key="${escAttr(key)}" tabindex="-1">${act}<div class="meta"><span class="sender">${escAttr(x.sender)}</span>${time}${ticks}</div>${quoteHtml(x.replyTo)}<div class="body">${clicked ? clickHtml(x.click) : `<div class="md">${renderedMarkdown(x.text, x.role === "agent", opts.emojis, opts.mentions)}</div>`}${R().attachmentsHtml(x.attachments, { htmlCards: x.role === "agent", goneTitle: tr("chat.attGone"), goneLabel: tr("chat.attUnavailable"), inlinePreviews: !PUBLIC_LINK() })}${buttons}</div>${R().reactionsHtml(x.reactions, tr("chat.reactedBy", x.instance || ""))}${tools}</div>`;
   }
+  /**
+   * A message this page is sending (chat-store.js): its own bubble at once, dimmed with "Sending…" until the server
+   * takes it, then as sent until the server's copy replaces it; failed: marked, with Retry and Delete. Each file shows
+   * its upload — a picture as itself (a local preview), anything else by name — with its own bar, moved in place by
+   * progress() (the html does not hold the numbers, so a moving bar never redraws the bubble). No data-key: it is no
+   * message yet (nothing replies to it, links to it or copies it).
+   */
+  function outgoingHtml(x) {
+    const st = x.outgoing.state, going = st === "queued" || st === "sending";
+    const files = (x.files || []).map((f, i) => {
+      const pic = f.url ? `<img class="out-pic" src="${escAttr(f.url)}" alt="${escAttr(f.name)}">` : `<span class="out-doc" aria-hidden="true"></span>`;
+      return `<div class="out-file" data-i="${escAttr(i)}">${pic}<div class="out-file-info"><span class="out-name">${escAttr(f.name)}</span>`
+        + `<span class="out-bar" role="progressbar" aria-label="${escAttr(trf("chat.uploadingFile", f.name))}" aria-valuemin="0" aria-valuemax="100"><span class="out-fill"></span></span>`
+        + `<span class="out-pct"></span></div></div>`;
+    }).join("");
+    const failed = st === "failed" ? `<div data-trust="thread-control" class="out-note lbar" role="alert"><span class="out-error">${escAttr(trf("chat.notSentBecause", x.outgoing.error || ""))}</span>`
+      + `<span class="out-actions"><button type="button" class="btn btn-sm btn-primary" data-act="retryOut" data-arg="${escAttr(x.clientId)}">${escAttr(tr("chat.retrySend"))}</button>`
+      + `<button type="button" class="btn btn-sm" data-act="putBackOut" data-arg="${escAttr(x.clientId)}">${escAttr(tr("chat.putBack"))}</button>`
+      + `<button type="button" class="btn btn-sm" data-act="deleteOut" data-arg="${escAttr(x.clientId)}">${escAttr(tr("chat.deleteUnsent"))}</button></span></div>` : "";
+    const state = going ? `<span class="out-state" role="status"><span class="out-spin" aria-hidden="true"></span>${escAttr(tr("chat.sending"))}</span>` : "";
+    return `<div class="msg user out out-${st}" data-out="${escAttr(x.clientId)}"${going ? ' aria-busy="true"' : ""} tabindex="-1"><div class="meta"><span class="sender">${escAttr(x.sender)}</span>${state}</div>`
+      + `${quoteHtml(x.replyTo)}<div class="body">${x.text ? `<div class="md">${renderedMarkdown(x.text, false, opts.emojis, opts.mentions)}</div>` : ""}`
+      + `${files ? `<div class="out-files">${files}</div>` : ""}</div>${failed}</div>`;
+  }
+  /** The pending bubbles' upload bars and percentages, as their files stand now (in place: CSSOM, no redraw). */
+  function progress() {
+    for (const v of nodes.values()) {
+      const x = v.x;
+      if (!x || !x.outgoing || !x.files || !x.files.length) continue;
+      for (const el of v.node.querySelectorAll(".out-file[data-i]")) {
+        const f = x.files[Number(el.dataset.i)];
+        if (!f) continue;
+        const pct = f.state === "done" ? 100 : f.total > 0 ? Math.min(100, Math.floor((f.loaded / f.total) * 100)) : 0;
+        el.dataset.state = f.state;
+        const bar = el.querySelector(".out-bar"), fill = el.querySelector(".out-fill"), label = el.querySelector(".out-pct");
+        if (bar) bar.setAttribute("aria-valuenow", String(pct));
+        if (fill) fill.style.transform = `scaleX(${pct / 100})`;
+        if (label) { const text = f.state === "failed" ? tr("chat.uploadFailed") : f.state === "waiting" ? tr("chat.uploadWaiting") : `${pct}%`; if (label.textContent !== text) label.textContent = text; }
+      }
+    }
+  }
+
   /**
    * #2272: what a reply quotes, above its body — the quoted sender and first words (or that it had files), as the server
    * read them when it was sent; a button that shows that message. A guest that may not see it gets only "an earlier
@@ -678,6 +721,7 @@ export function createThread(list, scroller, opts) {
     armDay();
     armPolls();
     rove();
+    progress();
     return added;
   }
   /**
@@ -777,6 +821,9 @@ export function createThread(list, scroller, opts) {
     } else if (act === "showButtons") { const x = msgs.find(y => y.buttons && y.buttons.id === el.dataset.arg); if (x) reveal(msgKey(x)); }
     else if (act === "reply") { const x = msgs.find(y => msgKey(y) === el.dataset.arg); if (x) opts.startReply?.(x); }
     else if (act === "jumpQuote") void jumpTo(el.dataset.arg);
+    else if (act === "retryOut") opts.retryOutgoing?.(el.dataset.arg);                 // a failed send, again
+    else if (act === "putBackOut") opts.putBackOutgoing?.(el.dataset.arg);              // back in the composer, to change it
+    else if (act === "deleteOut") opts.deleteOutgoing?.(el.dataset.arg);
   }
   /**
    * #2272: show the message a reply quotes, flashed — drawn now, or after the chat reads back the longest history the
@@ -834,5 +881,5 @@ export function createThread(list, scroller, opts) {
     armPolls();
   }
 
-  return { render, onScroll, onClick, jumpLatest, reveal, jumpTo, messageOf, rove, refreshCards, park, attach, dispose, nodes, get unseen() { return unseen; } };
+  return { render, progress, onScroll, onClick, jumpLatest, reveal, jumpTo, messageOf, rove, refreshCards, park, attach, dispose, nodes, get unseen() { return unseen; } };
 }

package/dist/ui/fleet-canvas-layout.js

@@ -10,6 +10,9 @@
  */
 export const OC = { NW: 184, NH: 56, GAP: 28, PAD: 32, GAP_NARROW: 18, PAD_NARROW: 24, HEAD: 34, TEAM_GAP: 72, ROW_GAP: 96, ROW_MAX: 1400, ROW_MAX_NARROW: 460, LW: 232, LH: 68, TOP_Y: 20, BUS: 44, FOLDED: 64, TRUNK: -30 };
 const colsFor = (n, narrow) => (n <= 1 ? 1 : n <= 4 || narrow ? 2 : 3);
+/** A search's needle, and whether a node matches it (its name or nickname): the canvas's Find, the Office view's too. */
+export const needle = (q) => String(q || "").trim().toLowerCase();
+export const hits = (node, q) => !!q && (node.name.toLowerCase().includes(q) || (!!node.i && typeof node.i.display_name === "string" && node.i.display_name.toLowerCase().includes(q)));
 /** The key a team folds by (per device): its name; the instances in no team have one of their own no team name can be. */
 export const REST_KEY = "\u0000rest";