@songsid/agend 2.3.5-alpha.5 → 2.3.5-beta.1

package/dist/ui/panel-log.js

@@ -21,8 +21,8 @@ import { HeaderSlot, HeaderTools } from "/assets/header-tools.js";
 import { Empty, ErrorState, Skeleton } from "/assets/ui-states.js";
 import { Icon } from "/assets/ui-icons.js";
 import { toast } from "/assets/ui-toast.js";
-import "/assets/chat-strings.js";
-import { chatTime, chatTimeFull } from "/assets/chat-time.js";
+import "./chat-strings.js";
+import { chatTime, chatTimeFull } from "./chat-time.js";
 import { confirmedWrite } from "./settings-confirm.js";
 
 register("log", {

package/dist/ui/panel-needs.js

@@ -9,9 +9,6 @@
 // - Acknowledge on a delivery (POST /ui/needs/ack), which clears it everywhere;
 // - Open: that instance's chat.
 // Something resolved anywhere (Discord, Telegram, the web) leaves the list by itself.
-// alpha.2 (M-2300): an agent's Windows request waiting for a web-only fleet's owner is the app store's `proposals`, read
-// by agent-proposals.js (owner only, on the stream's `agent_proposals` ping) — Approve / Reject POST its decision. Only
-// on a tab opened before an upgrade (app.js never installed it) does this panel install it, once.
 import { html, useEffect, useState } from "/assets/app-html.js";
 import { t, register } from "/assets/app-i18n.js";
 import { appStore, createStore, useStore } from "/assets/app-store.js";
@@ -19,19 +16,11 @@ import { useLease } from "/assets/app-ctx.js";
 import { PanelHeader, setTitle } from "/assets/app-shell.js";
 import { chatPath } from "/assets/app-route.js";
 import { namesOf, namesStore } from "/assets/instance-nav.js";
-import { Empty } from "/assets/ui-states.js";
+import { Empty, Skeleton } from "/assets/ui-states.js";
 import { Icon } from "/assets/ui-icons.js";
 import { toast } from "/assets/ui-toast.js";
 import { notifyStore, notifySupport, configDetail, reasonText, refreshNotify, setNotify } from "/assets/app-needs.js";
 import { openSignIn, signInOffered } from "./backend-signin.js";
-import { decideProposal, installProposals } from "./agent-proposals.js";
-import { GeneralLocation } from "./general-location.js";
-
-// A pre-upgrade tab retains app-i18n.js. Register these reasons when the updated panel is loaded, too.
-register("app", {
-  en: { needs_reason_hub_proposal: "Hub action proposed: review locally", needs_reason_hub_execution_hold: "Hub work held: review locally", needs_reason_hub_unavailable: "Hub not running" },
-  "zh-TW": { needs_reason_hub_proposal: "Hub 提議操作：請在本機檢視", needs_reason_hub_execution_hold: "Hub 工作已暫停：請在本機檢視", needs_reason_hub_unavailable: "Hub 未在執行" },
-});
 
 register("needs", {
   en: {
@@ -46,18 +35,6 @@ register("needs", {
     notifyInsecure: "Notifications need a secure address (localhost or the HTTPS public link), not a plain-HTTP LAN address.",
     notifyUnsupported: "This browser cannot show notifications.", turnOn: "Turn on", turnOff: "Turn off",
     typePrompt: "Fleet prompt", typeAwaiting: "At its terminal", typeInstance: "Instance", typeDelivery: "Delivery", typeMissed: "Missed while offline",
-    proposals: "Agent requests", proposalFrom: "Request from {0}", proposalHint: "Nothing is created or changed until you approve. When you do, AgEnD checks the request, the target machine and your sign-in again, then runs it once.",
-    approve: "Approve", reject: "Reject", deciding: "Working…", expiresIn: "expires in {0} min", expiresSoon: "expires in under a minute",
-    applying: "Being applied…", openAgent: "Open the new agent's chat", decided: "Decided here", failedReason: "Reason: {0}",
-    f_runtime: "Runs on", f_machine: "Machine", f_thisPc: "This PC (Windows)", f_topic_name: "Name", f_backend: "CLI", f_model: "Model", f_directory: "Folder",
-    f_sandbox: "Access", f_description: "Description", f_display_name: "Display name", f_tags: "Tags", sb_read_only: "read-only", sb_workspace_write: "can write in its folder",
-    createWindows: "Create a Windows agent", changeAgent: "Change {0}",
-    r_applied: "Approved: the change is applied.", r_rejected: "Rejected: nothing was changed.", r_withdrawn: "Withdrawn by the agent: nothing was changed.",
-    r_expired: "This request ran out before it was decided: nothing was changed.", r_fleet_stopped: "The fleet stopped before it was applied: nothing was changed.",
-    r_request_no_longer_current: "The request is no longer current (the fleet or the Windows switch changed): nothing was changed.",
-    r_settings_changed: "The settings changed since the request: nothing was changed.", r_apply_failed: "It could not be applied.",
-    e_owner_required: "Only this fleet's owner, signed in on the AgEnD computer itself, can decide an agent's request.",
-    e_confirmation_not_pending: "This request was already decided or ran out.", e_not_found: "This request is no longer here.",
   },
   "zh-TW": {
     title: "等你處理", empty: "目前沒有需要你處理的事", emptyHint: "agent 在等你時，會出現在這裡——也會出現在聊天 app 的 General。", emptyHintWeb: "agent 在等你時，會出現在這裡。",
@@ -71,18 +48,6 @@ register("needs", {
     notifyInsecure: "通知需要安全的網址（localhost 或 HTTPS 公開連結），區網的一般 HTTP 網址不行。",
     notifyUnsupported: "這個瀏覽器無法顯示通知。", turnOn: "開啟", turnOff: "關閉",
     typePrompt: "Fleet 提示", typeAwaiting: "在終端機上", typeInstance: "Instance", typeDelivery: "傳送", typeMissed: "離線時錯過",
-    proposals: "代理人的請求", proposalFrom: "{0} 的請求", proposalHint: "在你核准之前，不會建立或修改任何東西。核准時，AgEnD 會再次檢查這個請求、目標電腦和你的登入，然後只執行一次。",
-    approve: "核准", reject: "拒絕", deciding: "處理中…", expiresIn: "{0} 分鐘後過期", expiresSoon: "不到一分鐘後過期",
-    applying: "正在套用…", openAgent: "開啟新 agent 的聊天", decided: "已在這裡決定", failedReason: "原因：{0}",
-    f_runtime: "執行於", f_machine: "電腦", f_thisPc: "這台電腦（Windows）", f_topic_name: "名稱", f_backend: "CLI", f_model: "模型", f_directory: "資料夾",
-    f_sandbox: "存取權限", f_description: "說明", f_display_name: "顯示名稱", f_tags: "標籤", sb_read_only: "唯讀", sb_workspace_write: "可寫入它的資料夾",
-    createWindows: "建立 Windows agent", changeAgent: "修改 {0}",
-    r_applied: "已核准：變更已套用。", r_rejected: "已拒絕：沒有任何變更。", r_withdrawn: "agent 已撤回：沒有任何變更。",
-    r_expired: "這個請求在決定前就過期了：沒有任何變更。", r_fleet_stopped: "套用前 fleet 已停止：沒有任何變更。",
-    r_request_no_longer_current: "這個請求已不再有效（fleet 或 Windows 開關已改變）：沒有任何變更。",
-    r_settings_changed: "提出請求後設定已變更：沒有任何變更。", r_apply_failed: "無法套用。",
-    e_owner_required: "只有在 AgEnD 這台電腦上登入的 fleet 擁有者，才能決定 agent 的請求。",
-    e_confirmation_not_pending: "這個請求已經被決定或已過期。", e_not_found: "這個請求已不在這裡。",
   },
 });
 const tn = (k, ...v) => t(`needs.${k}`, ...v);
@@ -166,21 +131,9 @@ export function groupNeeds(items) {
   return [...groups.values()];
 }
 
-/**
- * alpha.2 (M-2300): what this page decided, kept for the life of the page — the request's id → "busy" while its POST is
- * out, then the server's answer ({ view, agent, message }): it stays shown after the list drops the request.
- */
-export const decisions = createStore({});
-
 export function NeedsPanel({ navKey }) {
   const lease = useLease(navKey);
-  const { needs, chatOwner: owner, instances, connections, proposals } = useStore(appStore);
-  // A tab opened before an upgrade has this panel but not the app.js that installs the list (it never set `proposals`):
-  // install it here then. On a current page app.js already did, and this panel reads nothing itself (#1374).
-  useEffect(() => { if (appStore.get().proposals === undefined) installProposals(); }, []);
-  const asks = Array.isArray(proposals) ? proposals : [];
-  const done = useStore(decisions);
-  const decidedHere = Object.entries(done).filter(([id, d]) => d && d !== "busy" && !asks.some((p) => p.id === id));
+  const { ready, needsLoaded, needs, chatOwner: owner, instances, connections } = useStore(appStore);
   // #1854: a fleet with no chat connection (web only, or not known yet) has no General to point at.
   const chatApp = connections > 0;
   const names = useStore(namesStore);
@@ -196,14 +149,9 @@ export function NeedsPanel({ navKey }) {
   const groups = groupNeeds(items);
   const nowMs = Date.now();
   return html`<div data-effect-panel="needs" class="panel p-needs">
-    <${PanelHeader} title=${tn("title")} sub=${items.length + asks.length ? t("app.needsCount", items.length + asks.length) : null} />
+    <${PanelHeader} title=${tn("title")} sub=${items.length ? t("app.needsCount", items.length) : null} />
     <div data-trust="panel-content" class="panel-body"><div class="col">
-      ${asks.length || decidedHere.length ? html`<section class="n-group n-proposals" aria-label=${tn("proposals")}>
-        <h2 class="n-group-head">${tn("proposals")}</h2>
-        ${asks.map((p) => html`<${ProposalItem} key=${p.id} proposal=${p} nowMs=${nowMs} />`)}
-        ${decidedHere.map(([id, d]) => html`<${ProposalResult} key=${id} result=${d} />`)}
-      </section>` : null}
-      ${!items.length && !asks.length && !decidedHere.length ? html`<${Empty} icon="check" title=${tn("empty")} hint=${tn(chatApp ? "emptyHint" : "emptyHintWeb")} />`
+      ${(!ready || needsLoaded === false) && !items.length ? html`<${Skeleton} variant="rows" lines=${3} />` : !items.length ? html`<${Empty} icon="check" title=${tn("empty")} hint=${tn(chatApp ? "emptyHint" : "emptyHintWeb")} />`
         : groups.map((g) => html`<section key=${JSON.stringify([g.instance, g.items[0]?.type === "config"])} class="n-group" aria-label=${g.instance}>
           <h2 class="n-group-head">${g.instance ? html`<a href=${chatPath(g.instance)} title=${g.instance}>${nameFor(g.instance)}</a>` : g.items[0]?.type === "config" ? t("app.settings") : tn(g.items.some(i => i.type === "backend") ? "fleetSignIns" : "noAssignee")}</h2>
           ${g.items.map((item) => html`<${NeedsItem} key=${item.id} item=${item} nowMs=${nowMs} owner=${owner} />`)}
@@ -257,8 +205,6 @@ function NeedsItem({ item, nowMs, owner }) {
     <div class="n-body">
       <div class="n-title"><strong>${itemReason(item)}</strong><span class="n-age">${age(item.since, nowMs)}</span></div>
       ${detailOf(item) ? html`<p class="n-detail">${detailOf(item)}</p>` : null}
-      ${item.type === "hub" && item.hubProposal ? html`<p class="n-detail">${item.hubProposal.action}</p><pre>${item.hubProposal.arguments}</pre><p class="n-detail">${item.hubProposal.consequences}</p>` : null}
-      ${item.generalLocation ? html`<${GeneralLocation} name=${item.instance} attentionOnly=${true} />` : null}
       <div class="n-actions">
         ${item.type === "prompt" && Array.isArray(item.actions) ? item.actions.filter((a) => !a.input).map((a) => html`<button key=${a.id} type="button" class="btn btn-sm"
             disabled=${promptBusy} onClick=${() => answer(a.id)}>${(p ? p.busy : fallback === "busy") ? tn("answering") : a.label}</button>`) : null}
@@ -273,110 +219,6 @@ function NeedsItem({ item, nowMs, owner }) {
   </article>`;
 }
 
-/**
- * alpha.2 (M-2300): the request's summary as the owner reads it (junsion's §6: the machine, the CLI, the model, the
- * folder, the access). The server's lines are the settings diff, escaped for a chat's markdown ("new\_instance.directory:
- * absent → C:\\work"): here, unescaped and named — a create's fields as "Folder: C:\work", "Machine: This PC" when it
- * names none; a change's as "Model: a → b"; any other line as it is. Text only (rendered as text, never markup).
- */
-export function proposalLines(summary) {
-  const unescape = (s) => String(s).replace(/\\([\\`*_~[\]()<>|])/g, "$1").replace(/\[at\]/g, "@");
-  const lines = (Array.isArray(summary) ? summary : []).map(unescape);
-  const create = lines.some((l) => /^POST \/ui\/instances$/.test(l));
-  const out = [], label = (k) => { const key = `f_${k}`, s = tn(key); return s === `needs.${key}` ? k : s; };
-  // The access field's values, in words (matched by value: the two the request's schema allows).
-  const ACCESS = { "read-only": "sb_read_only", "workspace-write": "sb_workspace_write" };
-  const value = (_k, v) => (Object.hasOwn(ACCESS, v) ? tn(ACCESS[v]) : v);
-  let machine = false;
-  for (const l of lines) {
-    if (/^POST \/ui\/instances$/.test(l)) continue;
-    const m = /^new_instance\.([A-Za-z_]+): absent → (.*)$/.exec(l);
-    if (m) { if (m[1] === "machineId") machine = true; out.push(`${label(m[1] === "machineId" ? "machine" : m[1])}: ${value(m[1], m[2])}`); continue; }
-    const ch = /^(\S+) ([A-Za-z_]+): (.*) → (.*)$/.exec(l);
-    if (ch) { out.push(`${tn("changeAgent", ch[1])} · ${label(ch[2])}: ${ch[3]} → ${ch[4]}`); continue; }
-    out.push(l);
-  }
-  if (create && !machine) out.splice(1, 0, `${label("machine")}: ${tn("f_thisPc")}`);
-  return create ? [tn("createWindows"), ...out] : out;
-}
-
-/**
- * alpha.2 polish: a decided request's outcome in the PAGE's language (the server says it in the fleet's — an English page
- * read 「變更已套用。」): by its reason code, else its state; the server's words only for a code this page does not know.
- */
-export function outcomeText(outcome) {
-  if (!outcome) return t("app.failed");
-  for (const code of [outcome.reason_code, outcome.state]) {
-    if (typeof code !== "string") continue;
-    const key = `r_${code}`, s = tn(key);
-    if (s !== `needs.${key}`) return s;
-  }
-  return outcome.message || t("app.failed");
-}
-/** Why a click decided nothing, in the page's language (by the server's error code; its words only as a fallback). */
-export function decideErrorText(r) {
-  const key = r && r.error ? `e_${r.error}` : "";
-  const s = key ? tn(key) : "";
-  return key && s !== `needs.${key}` ? s : (r && r.message) || t("app.failed");
-}
-
-/**
- * alpha.2 (M-2300): one agent's request waiting for this web-only fleet's owner — what it would do (the server's own
- * summary: the machine, the CLI, the model, the folder, the access), when it runs out, and Approve / Reject. One click
- * per request on this page (claimed before the POST); the answer is the server's: applied, rejected, run out, already
- * decided elsewhere, or failed with its reason.
- */
-function ProposalItem({ proposal: p, nowMs }) {
-  const d = useStore(decisions)[p.id];
-  const busy = d === "busy" || p.state === "applying";
-  const [failed, setFailed] = useState(null);
-  const decide = async (decision) => {
-    if (decisions.get()[p.id]) return;                                 // one POST in flight per request on this page
-    setFailed(null);
-    decisions.set((s) => ({ ...s, [p.id]: "busy" }));
-    const r = await decideProposal(p.id, decision);
-    // #2997 review (Prism P2): nothing decided (the network failed, the owner was refused, a bad answer) and the request
-    // still waits — the claim is released and why is said here, so the next click is taken; a decided one is kept.
-    const decided = r.view && r.view.state !== "pending";
-    if (!decided) {
-      decisions.set((s) => { const next = { ...s }; delete next[p.id]; return next; });
-      setFailed(decideErrorText(r));
-      return;
-    }
-    decisions.set((s) => ({ ...s, [p.id]: { ...r, decision } }));
-    toast(r.view.outcome ? outcomeText(r.view.outcome) : decideErrorText(r), r.view.state === "applied");
-  };
-  const minutes = Math.floor((p.remaining_ms || 0) / 60_000);
-  return html`<article data-trust="permission" class="n-item">
-    <span class="n-icon"><${Icon} name="alert" size=${18} /></span>
-    <div class="n-body">
-      <div class="n-title"><strong>${tn("proposalFrom", p.requested_by)}</strong><span class="n-age">${age(p.requested_at, nowMs)} · ${minutes >= 1 ? tn("expiresIn", minutes) : tn("expiresSoon")}</span></div>
-      <ul class="n-detail">${proposalLines(p.summary).map((line, i) => html`<li key=${i}>${line}</li>`)}</ul>
-      <p class="note">${tn("proposalHint")}</p>
-      ${failed ? html`<p class="note n-proposal-error" role="alert">${failed}</p>` : null}
-      <div class="n-actions">
-        <button type="button" class="btn btn-sm btn-primary" disabled=${busy} onClick=${() => decide("confirm")}>${busy ? (p.state === "applying" ? tn("applying") : tn("deciding")) : tn("approve")}</button>
-        <button type="button" class="btn btn-sm" disabled=${busy} onClick=${() => decide("reject")}>${tn("reject")}</button>
-      </div>
-    </div>
-  </article>`;
-}
-
-/** A request decided on this page: the server's outcome (and its reason), and the new agent's chat when one was created. */
-function ProposalResult({ result: r }) {
-  const v = r.view, outcome = v && v.outcome;
-  const ok = !!(v && v.state === "applied");
-  return html`<article data-trust="permission" class=${`n-item${ok || (v && v.state === "rejected") ? "" : " bad"}`}>
-    <span class="n-icon"><${Icon} name=${ok ? "check" : "alert"} size=${18} /></span>
-    <div class="n-body">
-      <div class="n-title"><strong>${outcome ? outcomeText(outcome) : decideErrorText(r)}</strong><span class="n-age">${tn("decided")}</span></div>
-      ${v ? html`<ul class="n-detail">${proposalLines(v.summary).map((line, i) => html`<li key=${i}>${line}</li>`)}</ul>` : null}
-      ${outcome && outcome.detail ? html`<p class="note">${tn("failedReason", outcome.detail)}</p>` : null}
-      ${ok && r.agent ? html`<div class="n-actions"><a class="btn btn-sm btn-primary" href=${chatPath(r.agent)} title=${r.agent}>${tn("openAgent")}</a></div>` : null}
-    </div>
-  </article>`;
-}
-
 /** The device's choice, as the page knows it (app-needs.js notifyStore): every mounted toggle shows the same. */
 function NotifyToggle() {
   const support = notifySupport();

package/dist/ui/panel-notices.js

@@ -8,7 +8,7 @@ import { appStore, applyNoticesSeen, useStore } from "/assets/app-store.js";
 import { useLease } from "/assets/app-ctx.js";
 import { PanelHeader, setTitle } from "/assets/app-shell.js";
 import { chatPath } from "/assets/app-route.js";
-import { Empty } from "/assets/ui-states.js";
+import { Empty, ErrorState, Skeleton } from "/assets/ui-states.js";
 import { Icon } from "/assets/ui-icons.js";
 
 register("notices", {
@@ -64,7 +64,7 @@ function markShown() {
 
 export function NoticesPanel({ navKey }) {
   const lease = useLease(navKey);
-  const { notices, instances } = useStore(appStore);
+  const { notices, noticesError, instances, connections } = useStore(appStore);
   const items = notices && Array.isArray(notices.items) ? notices.items : [];
   // What was unread when the page opened stays marked "New" while it is open (it is marked read on the server at once).
   const [seenAtOpen] = useState(() => (notices ? notices.seen | 0 : 0));
@@ -82,7 +82,8 @@ export function NoticesPanel({ navKey }) {
     <${PanelHeader} title=${tn("title")} />
     <div data-trust="panel-content" class="panel-body"><div class="col">
       ${items.length ? html`<p class="note notice-sub">${tn("sub")}</p>` : null}
-      ${!items.length ? html`<${Empty} icon="bell" title=${tn("empty")} hint=${tn("emptyHint")} />`
+      ${!notices && noticesError ? html`<${ErrorState} onRetry=${() => appStore.get().readNotices?.()} />`
+        : !notices && (connections == null || connections === 0) ? html`<${Skeleton} variant="rows" lines=${3} />` : !items.length ? html`<${Empty} icon="bell" title=${tn("empty")} hint=${tn("emptyHint")} />`
         : items.map((n) => html`<article key=${n.id} class=${`n-item notice${n.id > seenAtOpen ? " unread" : ""}${n.kind === "fleet" ? " bad" : ""}`}>
           <span class="n-icon"><${Icon} name=${ICON[n.kind] || "info"} size=${18} /></span>
           <div class="n-body">