@songsid/agend 2.3.0-beta.11 → 2.3.0-beta.12

package/dist/ui/panel-chat.js

@@ -238,7 +238,12 @@ function ChatView({ name, inst, lease, navKey, exec, awaiting }) {
   }, [themeKey]);
   useEffect(() => { wrapListeners.add(setWrap); return () => wrapListeners.delete(setWrap); }, []);
   // First visit to this instance's chat on this page: its history (a navigation — it counts as use). Back again: nothing.
-  useEffect(() => { store.openHistory(name, lease); }, [name]);
+  // #2188: left before it answered (passing through on the way to another chat) — the read is aborted.
+  useEffect(() => {
+    const ac = typeof AbortController === "function" ? new AbortController() : null;
+    store.openHistory(name, lease, ac?.signal);
+    return () => ac?.abort();
+  }, [name]);
   useEffect(() => { try { localStorage.setItem("agend_last_instance", name); } catch { /* none */ } }, [name]);
   // Files dragged over the chat show where they go; a drop attaches them (counted, so moving over messages does not flicker).
   useEffect(() => {
@@ -332,6 +337,15 @@ function ChatView({ name, inst, lease, navKey, exec, awaiting }) {
 export const THREAD_KEEP = 12;
 export const THREAD_KEEP_NARROW = 6;
 export const THREAD_KEEP_NODES = 2400;
+/**
+ * #2188: a chat shown for less than this, on the way to another (clicking down the sidebar), is not kept: it is let go
+ * as it leaves, so passing through chats never evicts the ones in use. One that was already kept stays kept.
+ */
+export const THREAD_PASS_MS = 1000;
+const monotonic = () => (typeof performance === "object" && typeof performance.now === "function" ? performance.now() : Date.now());
+let now = monotonic;
+/** Tests only: the clock THREAD_PASS_MS is measured on (null: the page's monotonic clock). */
+export function setThreadClock(fn) { now = typeof fn === "function" ? fn : monotonic; }
 /**
  * The kept threads to let go, in order. `kept`: [name, drawn messages], least recently shown first; `current`: the
  * one on screen (never let go).
@@ -428,7 +442,9 @@ function Thread({ name, th }) {
     if (e) keptThreads.delete(name);
     else e = threadEntry(name, doc);
     keptThreads.set(name, e);                                              // the most recent last
-    trimKept(name);
+    // A thread already kept is trimmed against at once; a new one first has to stay (see THREAD_PASS_MS).
+    if (kept) trimKept(name);
+    const shownAt = now();
     const thread = e.thread, sc = scroller.current, ls = e.list;
     e.sink = { setJump, setEmpty };
     host.current.append(ls);
@@ -447,7 +463,9 @@ function Thread({ name, th }) {
       ls.removeEventListener("click", thread.onClick);
       e.sink = null;
       th.current = null;
-      if (keptThreads.get(name) === e) { thread.park(); ls.remove(); }   // kept for a later visit: the chat left
+      // Passed through (new, and shown under THREAD_PASS_MS): let go. Otherwise kept for a later visit, within the budget.
+      if (keptThreads.get(name) === e && !kept && now() - shownAt < THREAD_PASS_MS) { keptThreads.delete(name); letGo(e, false); }
+      else if (keptThreads.get(name) === e) { thread.park(); ls.remove(); trimKept(null); }   // kept for a later visit: the chat left
       else letGo(e, false);                                                // let go meanwhile (a new language)
     };
   }, [name]);
@@ -471,6 +489,9 @@ function Dock({ name, inst, lease, exec, awaiting, workingLabel }) {
     ${s.failedSends[name] ? html`<div class="failed-send" role="alert"><span>${t("chat.notSent")}</span><span class="txt">${s.failedSends[name]}</span>
       <button type="button" class="btn btn-primary btn-sm" onClick=${() => store.putBack(name)}>${t("chat.putBack")}</button>
       <button type="button" class="btn btn-sm" onClick=${() => store.discardFailed(name)}>${t("chat.discard")}</button></div>` : null}
+    ${s.waking[name] ? html`<p class="send-waking" role="status">${t("chat.waking", name)}</p>` : null}
+    ${s.sendFailures[name] ? html`<div class="failed-send send-failure" role="alert"><span>${s.sendFailures[name].error}</span>
+      <button type="button" class="btn btn-sm" disabled=${!store.canRetrySend(name)} onClick=${() => store.retrySend(name)}>${t("chat.retrySend")}</button></div>` : null}
     <${Composer} name=${name} lease=${lease} busy=${R().isBusy(exec)} />
     <p class="hint" title=${t(guestPage() ? "chat.guestMore" : "chat.composerMore")}>${t("chat.composerHint")}</p>
     ${guestPage() ? html`<p class="guest-note">${t("chat.guestNote")}</p>` : html`<${AuthorizeChip} />`}

package/dist/ui/panel-settings.js

@@ -511,7 +511,30 @@ function Agents({ ctx, search, openDialog }) {
   })}</div>`;
 }
 
+function ConnectionRetry({ id, ctx }) {
+  const lease = useLease(`connection-retry:${id}`);
+  const claimed = useRef(false);
+  const [busy, setBusy] = useState(false);
+  const retry = async () => {
+    if (claimed.current) return;
+    claimed.current = true; setBusy(true);
+    try {
+      const response = await lease.fetch(`/api/settings/connections/${encodeURIComponent(id)}/retry`, { method: "POST" });
+      if (!lease.current()) return;
+      toast(response.ok ? tn("connRetryQueued") : tn("connRetryFailed"));
+      await ctx.reload();
+    } catch {
+      if (lease.current()) toast(tn("connRetryFailed"));
+    } finally {
+      claimed.current = false;
+      if (lease.current()) setBusy(false);
+    }
+  };
+  return html`<button type="button" class="btn btn-sm" disabled=${busy} onClick=${retry}>${tn("connRetryNow")}</button>`;
+}
+
 function Bots({ ctx, search, openDialog }) {
+  const overPublicLink = globalThis.document?.body?.dataset?.publicLink === "1";
   const all = channelsOf(ctx.fleet);
   const needle = search.trim().toLowerCase();
   const rows = all.map((ch, i) => ({ ch, i })).filter(({ ch }) => !needle || [ch.id, ch.type, ch.group_id, ch.bot_token_env].some((v) => String(v ?? "").toLowerCase().includes(needle)));
@@ -540,6 +563,7 @@ function Bots({ ctx, search, openDialog }) {
         <span class="s-actions">
           <span class=${`tag${token ? "" : " warn"}`}>${token ? tn("tokenConfigured") : tn("tokenMissing")}</span>
           <span class=${`s-state ${state.cls}`} title=${stateText}>${stateText}</span>
+          ${!overPublicLink && ctx.fleetUp && meta.status !== "connected" ? html`<${ConnectionRetry} id=${channelId(ch, i)} ctx=${ctx} />` : null}
           <button type="button" class="btn btn-sm" onClick=${() => openDialog({ kind: "bot", id: channelId(ch, i) })}>${tn("settingsButton")}</button></span>
       </div>`;
     })}</div>`}

package/dist/ui/settings-strings.js

@@ -131,6 +131,7 @@ register("settings", {
     applyPartial: "Some changes failed",
     applyClose: "Close",
     settingsButton: "Settings",
+    connRetryNow: "Retry now", connRetryQueued: "Connection retry requested.", connRetryFailed: "Could not retry this connection. Check its status and try again.",
     modalDone: "Stage change",
     wizardButton: "Setup wizard",
     wizardTitle: "Set up AgEnD",
@@ -666,6 +667,7 @@ register("settings", {
     applyPartial: "有部分變更失敗",
     applyClose: "關閉",
     settingsButton: "設定",
+    connRetryNow: "立即重試", connRetryQueued: "已要求重新連線。", connRetryFailed: "無法重試此連線，請檢查狀態後再試。",
     modalDone: "加入待套用",
     wizardButton: "設定精靈",
     wizardTitle: "設定 AgEnD",

package/dist/ui/shared/effect-owner-source.js

@@ -74,7 +74,14 @@ export function createOwnerEffectSource({ current, readMetadata, readResource, r
     },
     descriptors() {
       if (!alive() || !metadata || error) return [];
-      const body = metadata, gen = generation, proof = safe(() => effectStockSnapshot(stock()));
+      const body = metadata, gen = generation;
+      // #2188: the stock snapshot walks the whole page (thousands of computed styles). With no slot holding an effect
+      // that could play, there is nothing for it to admit: skipped — every page change (a status, a chat switch) ran it.
+      if (!SLOTS.some(slot => body.slots[slot]?.status === "available" && failed.get(slot) !== body.slots[slot].id)) {
+        for (const slot of SLOTS) drop(slot);
+        return [];
+      }
+      const proof = safe(() => effectStockSnapshot(stock()));
       if (!fresh(body, gen)) return [];
       if (!proof) { clear(); return []; }
       const result = [];

package/dist/ui/shared/effect-registry.js

@@ -189,6 +189,12 @@ export function createEffectRegistry({ window: host, origin, boot, load, safety,
     const proposal = revision;
     if (time() === null) blocked = "clock_unavailable";
     const hidden = context?.hidden === true || host.document.visibilityState !== "visible";
+    // #2188: nothing to place, nothing to prove — the stock walk (thousands of computed styles) is not run for an empty
+    // list; a frame still held is retired as superseded, exactly as an allocation of nothing would.
+    if (!blocked && descriptors.length === 0) {
+      for (const s of [...slots.values()]) { retire(s, "superseded"); if (dead || proposal !== revision) return; }
+      results.clear(); tell(); return;
+    }
     const stock = eligible() ? coverage() : null;
     if (dead || proposal !== revision) return;
     if (blocked || !eligible() || !stock) {
@@ -440,7 +446,8 @@ export function createEffectRegistry({ window: host, origin, boot, load, safety,
     } catch { return false; }
   }
   function pointer(event) {
-    if (dead || blocked || !pointerGate() || event.isTrusted !== true) return;
+    // #2188: no frame to forward to — no gate to read (each read walks the page's computed styles, per pointer event).
+    if (dead || blocked || slots.size === 0 || !pointerGate() || event.isTrusted !== true) return;
     const kinds = { pointermove: "move", pointerdown: "down", pointerup: "up", click: "click", wheel: "wheel" }, kind = kinds[event.type];
     if (!kind || !finite(event.clientX) || !finite(event.clientY) || Math.abs(event.clientX) > 1e7 || Math.abs(event.clientY) > 1e7 || !Number.isInteger(event.buttons) || event.buttons < 0 || event.buttons > 31) return;
     try { const target = host.document.elementFromPoint(event.clientX, event.clientY); if (!target || typeof target.closest !== "function" || target.closest("[data-trust]")) return; } catch { return; }
@@ -511,7 +518,8 @@ export function createEffectRegistry({ window: host, origin, boot, load, safety,
     },
     /** Host-only content-free signal API. Raw pointer publishing is refused; native pointer metadata is coalesced here. */
     publish(type, fields, instance = null) {
-      if (dead || blocked || !globalAllowed() || context.hidden || !coverage() || !TYPES.includes(type)) return 0;
+      // #2188: no frame to send to — nothing to prove (the stock walk ran twice on every page change).
+      if (dead || blocked || slots.size === 0 || !globalAllowed() || context.hidden || !coverage() || !TYPES.includes(type)) return 0;
       const ts = time(); if (ts === null) { blocked = "clock_unavailable"; stopAll(blocked); tell(); return 0; }
       let sent = 0; const proposal = revision;
       for (const s of [...slots.values()]) {

package/dist/ui/shared/owner-css.js

@@ -80,6 +80,7 @@ function sync() {
     let valid = false;
     try { valid = link.disabled !== true && !!link.sheet && link.sheet.ownerNode === link && link.sheet.disabled !== true && link.sheet.href === new URL(href, location.href).href; } catch { /* unknown stylesheet */ }
     linkState = valid ? "on" : "unknown"; life(linkState, valid ? "loaded" : "load_unverified");
+    if (valid) shownHere(sha);                                          // #2198: an agent's trial is on this screen now
   });
   link.addEventListener("error", () => { if (!current()) return; linkState = "unknown"; life("unknown", "load_failed"); });
   life("loading", "loading");
@@ -189,12 +190,40 @@ async function reread() {
     if (body && mine === gen) reconcile(body);                         // nothing newer happened since this was asked
   } catch { /* the next change tries again */ }
 }
+/**
+ * #2198: an agent's trial (General saved it) waits on the host until a person's page shows it. This page shows it once
+ * its stylesheet has loaded on screen, and says so: the host starts the keep window then (the dead-man switch, from when
+ * a person can see the Keep button). If the host cannot be told, this page reverts it itself at KEEP_SECONDS, as it does
+ * for a version it saved.
+ */
+let waitingShown = null;   // { id, sha } of an agent's trial this page is showing and has not reported yet
+function shownHere(sha) {
+  const w = waitingShown;
+  if (!w || w.sha !== sha) return;
+  waitingShown = null;
+  const trial = ownerCssTrial.get();
+  if (!trial || trial.id !== w.id) return;
+  post("/ui/owner-css/shown", { trial: w.id }).then((r) => {
+    if (ownerCssTrial.get() !== trial) return;
+    const ms = r.ok && r.body && Number.isFinite(r.body.remaining_ms) ? r.body.remaining_ms : null;
+    if (ms === null) { startOwnerCssTrial(w.id, w.sha, trial.previous, KEEP_SECONDS, true); return; }
+    startOwnerCssTrial(w.id, w.sha, trial.previous, ms / 1000 + 1, false);
+  }, () => { if (ownerCssTrial.get() === trial) startOwnerCssTrial(w.id, w.sha, trial.previous, KEEP_SECONDS, true); });
+}
 /** Match the host: the version in force, and whether one is on trial (another device's included) — or none any more. */
 function reconcile(state) {
   const pending = state.pending && state.pending.sha === state.active && typeof state.pending.id === "string" ? state.pending : null;
   const trial = ownerCssTrial.get();
-  if (!pending) { if (trial) dropTrial(); showActive(state.active, state.effectState); return; }
+  if (!pending) { waitingShown = null; if (trial) dropTrial(); showActive(state.active, state.effectState); return; }
   if (trial && trial.id === pending.id) return;                        // already asking about this one
+  if (pending.waiting === true) {
+    // Shown here: its stylesheet goes in, and once it has loaded this page reports it (shownHere). Until then the bar
+    // waits on the host's word, as for another device's trial.
+    waitingShown = { id: pending.id, sha: pending.sha };
+    startOwnerCssTrial(pending.id, pending.sha, pending.previous, HOST_TRIAL_SECONDS, false);
+    if (linkState === "on" && ownedLink && ownedLink.getAttribute("href") === `/ui/owner-css.css?v=${encodeURIComponent(pending.sha)}`) shownHere(pending.sha);
+    return;
+  }
   // The host's own remaining time and a second (never this device's clock): it has settled the trial by then.
   const remaining = typeof pending.remaining_ms === "number" && Number.isFinite(pending.remaining_ms) ? pending.remaining_ms : 0;
   startOwnerCssTrial(pending.id, pending.sha, pending.previous, remaining / 1000 + 1, false);

package/dist/web-api.d.ts

@@ -126,8 +126,12 @@ export interface WebApiContext {
     /** #1920 §5.2: a web message's channel copy was sent — guests of that channel may see it now. */
     webMessageInChannel?(instance: string, messageId: string): void;
     /** false: definitely not delivered (the instance's IPC is gone, or it was restarted meanwhile). */
-    deliverToInstance(instanceName: string, payload: Record<string, unknown>): Promise<boolean | void>;
-    deliverHumanToInstance?(instanceName: string, payload: Record<string, unknown>, origin: HumanOrigin, originalBody: string): Promise<boolean | void>;
+    deliverToInstance(instanceName: string, payload: Record<string, unknown>, options?: {
+        stillCurrent?: () => boolean;
+    }): Promise<boolean | void>;
+    deliverHumanToInstance?(instanceName: string, payload: Record<string, unknown>, origin: HumanOrigin, originalBody: string, options?: {
+        stillCurrent?: () => boolean;
+    }): Promise<boolean | void>;
     getUiStatus(): unknown;
     /** Current owned pane reader shared with status; absent means context is unavailable. */
     getPaneContextSource?(name: string): PaneContextSource | null;

package/dist/web-api.js

@@ -280,7 +280,7 @@ function handleOwnerCss(req, res, url, ctx, path, method) {
         json(res, removed.ok ? 200 : removed.status, removed.ok ? { ok: true } : { error: removed.error });
         return true;
     }
-    if (method !== "POST" || !["/ui/owner-css", "/ui/owner-css/keep", "/ui/owner-css/revert", "/ui/owner-css/restore", "/ui/owner-css/asset"].includes(path)) {
+    if (method !== "POST" || !["/ui/owner-css", "/ui/owner-css/shown", "/ui/owner-css/keep", "/ui/owner-css/revert", "/ui/owner-css/restore", "/ui/owner-css/asset"].includes(path)) {
         json(res, 404, { error: "not found" });
         return true;
     }
@@ -329,6 +329,17 @@ function handleOwnerCss(req, res, url, ctx, path, method) {
             announce();
             json(res, 200, { sha: saved.sha, previous: saved.previous, trial: saved.trial });
         }
+        else if (path === "/ui/owner-css/shown") {
+            // #2198: this page shows the trial (its stylesheet loaded): an agent's waiting trial starts its keep window now.
+            const shown = store.shown(person, body.trial);
+            if (!shown.ok) {
+                json(res, shown.status, { error: shown.error });
+                return;
+            }
+            if (shown.started)
+                announce(); // the person's other devices take the new deadline
+            json(res, 200, { remaining_ms: shown.remaining_ms });
+        }
         else if (path === "/ui/owner-css/keep") {
             const kept = store.keep(person, body.trial);
             if (!kept.ok) {
@@ -1908,7 +1919,7 @@ export function handleWebRequest(req, res, url, ctx) {
             return true;
         }
         // Own keys only: "constructor" is in every object and names no instance.
-        const known = (ctx.fleetConfig ? Object.hasOwn(ctx.fleetConfig.instances, name) : false) || ctx.daemons.has(name);
+        const known = registeredChatInstance(ctx, name) || ctx.daemons.has(name);
         if (!ctx.cancelInstance || !known) {
             json(res, 404, { error: `Instance not found: ${name}` });
             return true;
@@ -2578,6 +2589,27 @@ function webEchoPreview(message, names) {
     const truncated = message.length > 500 || preview.length > 1400;
     return wellFormed(preview.slice(0, 1400)) + (truncated ? ` … (${t("web.echo_full_text")})` : "");
 }
+/** Registration and liveness are different: a paused CLI may have neither daemon nor IPC. */
+function registeredChatInstance(ctx, name) {
+    return (!!ctx.fleetConfig && Object.hasOwn(ctx.fleetConfig.instances, name)) || ctx.isClassicInstance?.(name) === true;
+}
+function uploadRecipient(ctx, name) {
+    return registeredChatInstance(ctx, name)
+        && (ctx.instanceIpcClients.has(name) || ctx.getInstanceStatus?.(name) === "paused");
+}
+/** Closed, path-free explanations; arbitrary launch errors stay in the host log. */
+function webDeliveryFailure(err) {
+    const message = err instanceof Error ? err.message : "";
+    if (/No warm slot is free/.test(message))
+        return { reason: "wake_capacity", error: "No slot is free to wake this instance. Retry when another instance is idle." };
+    if (/login|log in|sign in|\bauth(?:entication|orization)?\b|credential|api.?key/i.test(message))
+        return { reason: "wake_credentials", error: "The instance could not sign in. Check its account on the host, then retry." };
+    if (/timed? out|timeout/i.test(message))
+        return { reason: "wake_timeout", error: "The instance did not become ready in time. Retry, or check its status on the host." };
+    if (/Cannot wake stopped|no longer configured/.test(message))
+        return { reason: "instance_stopped", error: "This instance was stopped or removed. Start it on the host before retrying." };
+    return { reason: "delivery_unavailable", error: "The instance could not receive this message. Check its status on the host, then retry." };
+}
 /** Handle POST /ui/send — extracted for readability. */
 function handleSendMessage(req, res, ctx) {
     const arrival = webAuthorityOf(req, new URL(req.url ?? "/", "http://localhost"), ctx); // #1939 §3: again after the body
@@ -2615,8 +2647,8 @@ function handleSendMessage(req, res, ctx) {
                 json(res, 403, { error: "guest_no_commands" });
                 return;
             }
-            const ipc = ctx.instanceIpcClients.get(instance);
-            if (!ipc) {
+            const registered = registeredChatInstance(ctx, instance);
+            if (!registered && !ctx.instanceIpcClients.has(instance)) {
                 json(res, 404, { error: `Instance not found: ${instance}` });
                 return;
             }
@@ -2639,6 +2671,12 @@ function handleSendMessage(req, res, ctx) {
                 json(res, 403, { error: t("web.raw_public_refused") });
                 return;
             }
+            // Recheck the same admission all the way through a wake, before the facade's actual IPC handoff.
+            const requestUrl = new URL(req.url ?? "/", "http://localhost");
+            const admission = admissionOf(req, requestUrl, ctx);
+            const stillCurrent = () => !res.destroyed && admission !== null && admissionOf(req, requestUrl, ctx) === admission
+                && (!guest || (guest.current() && !guestChatRefusal(guest, instance)))
+                && (registered ? registeredChatInstance(ctx, instance) : ctx.instanceIpcClients.has(instance));
             const message = typed;
             // #1827: who is writing — the name agents and chats see, and the id they tell people apart by. Asked now that the
             // body is in: a session revoked meanwhile sends nothing (not as the operator).
@@ -2685,8 +2723,8 @@ function handleSendMessage(req, res, ctx) {
             let delivered;
             try {
                 const deliver = (name, payload) => ctx.deliverHumanToInstance
-                    ? ctx.deliverHumanToInstance(name, payload, webHumanOrigin(false, authority), typed)
-                    : ctx.deliverToInstance(name, payload);
+                    ? ctx.deliverHumanToInstance(name, payload, webHumanOrigin(false, authority), typed, { stillCurrent })
+                    : ctx.deliverToInstance(name, payload, { stillCurrent });
                 delivered = await deliver(instance, {
                     type: "fleet_inbound",
                     content: delivery.text,
@@ -2712,7 +2750,7 @@ function handleSendMessage(req, res, ctx) {
                 settleClassicEcho?.(false);
                 ctx.webFiles?.release(files); // not delivered: the same ids can be sent again
                 ctx.logger.error({ err, instance }, "Web message delivery failed");
-                json(res, 503, { error: "Instance delivery failed" });
+                json(res, 503, webDeliveryFailure(err));
                 return;
             }
             if (delivered === false) {
@@ -2720,7 +2758,7 @@ function handleSendMessage(req, res, ctx) {
                 settleClassicEcho?.(false);
                 ctx.webFiles?.release(files);
                 ctx.logger.error({ instance }, "Web message not delivered (the instance went away or restarted)");
-                json(res, 503, { error: "Instance delivery failed" });
+                json(res, 503, { reason: "delivery_changed", error: "The session or instance changed before this message was sent. Sign in again if needed, then retry." });
                 return;
             }
             settleEcho?.(true);
@@ -2767,7 +2805,7 @@ function handleUpload(req, res, url, ctx) {
         json(res, guestRefused.status, { error: guestRefused.error });
         return;
     }
-    if (!instance || instance.length > 128 || !safeInstanceSegment(instance) || !ctx.instanceIpcClients.has(instance)) {
+    if (!instance || instance.length > 128 || !safeInstanceSegment(instance) || !uploadRecipient(ctx, instance)) {
         json(res, 404, { error: `Instance not found: ${instance}` });
         return;
     }
@@ -2830,11 +2868,9 @@ function handleUpload(req, res, url, ctx) {
     req.on("error", () => drop()); // the client went away
     req.on("close", () => { if (!over && req.complete === false)
         drop(); });
-    // The instance is checked again now the whole body is here: it may have been deleted (and its files
-    // forgotten) or stopped while the upload streamed in; storing now would bring its id back (#1252 review).
-    // Still deliverable means: its IPC is up (a paused one is woken by the send) and it is still registered —
-    // in fleet.yaml, or as a ClassicBot room in classicBot.yaml. Asked when the body ends and again just before storing.
-    const deliverable = () => ctx.instanceIpcClients.has(instance) && (!!ctx.fleetConfig?.instances?.[instance] || ctx.isClassicInstance?.(instance) === true);
+    // Recheck registration and delivery readiness after both waits. A paused recipient may have no IPC;
+    // staging a file never wakes it. A stopped or deleted recipient must not regain an upload id.
+    const deliverable = () => uploadRecipient(ctx, instance);
     const gone = () => drop(() => json(res, 404, { error: `Instance not found: ${instance}` }));
     req.on("end", () => {
         if (over)