agent-loft 0.2.31 → 0.2.33

package/web/views/interaction.js

@@ -28,7 +28,13 @@ export function upsertInteraction(ix) {
     return;
   }
   if (ix.settled) return;
-  // 卡片插在这一轮中间：之前的输出先封口，之后的输出接在卡片下面，顺序才对
+  insertCard(ix);
+  notifyIfHidden(ix);
+}
+
+/** 把卡片放进对话：插在这一轮中间的话，之前的输出先封口，之后的输出接在卡片下面，顺序才对 */
+export function insertCard(ix) {
+  if (S.items.some((i) => i.type === "ix" && i.id === ix.id)) return;
   if (S.turnAi && !S.turnAi.done) {
     S.turnAi.done = true;
     S.turnAi.segment = true;
@@ -36,9 +42,11 @@ export function upsertInteraction(ix) {
     S.turnAi = null;
   }
   addItem({ type: "ix", id: ix.id, ix });
-  notifyIfHidden(ix);
 }
 
+/** 已处理：「已回答 · 已在 Web 处理」。从会话记录里还原的不知道是谁处理的，只写结果 */
+const settledText = (s) => [SETTLE_LABEL[s.settlement] ?? s.settlement, s.by].filter(Boolean).join(" · ");
+
 function notifyIfHidden(ix) {
   // 桌面端由服务端的 notice 统一弹，这里再弹就重复了
   if (desktop || document.visibilityState === "visible" || !("Notification" in window)) return;
@@ -82,7 +90,7 @@ export function renderInteraction(item) {
       h("div", { class: "ix-title" }, settled ? "" : "⚠️", spec.title),
       h("div", { class: "ix-detail" }, renderMarkdown(spec.detail)),
       settled
-        ? h("div", { class: "ix-meta" }, `${SETTLE_LABEL[settled.settlement] ?? settled.settlement} · ${settled.by}`)
+        ? h("div", { class: "ix-meta" }, settledText(settled))
         : h(
             "div",
             { class: "ix-buttons" },
@@ -128,7 +136,7 @@ export function renderInteraction(item) {
       );
     }),
     settled
-      ? h("div", { class: "ix-meta" }, `${SETTLE_LABEL[settled.settlement] ?? settled.settlement} · ${settled.by}`)
+      ? h("div", { class: "ix-meta" }, settledText(settled))
       : h(
           "div",
           { class: "ix-buttons" },

package/web/views/layout.js

@@ -1,9 +1,11 @@
 import { $app, fill, h, icon, toast } from "../lib/dom.js";
 import { api } from "../lib/api.js";
-import { desktop, desktopQuota, desktopSettings, S, ui } from "../state.js";
+import { desktop, desktopMenu, desktopQuota, desktopSettings, S, ui } from "../state.js";
 import { clearAppBadge, WS } from "../lib/ws.js";
 import { showAuth } from "./auth.js";
 import {
+  applyBootstrap,
+  bootstrapQuery,
   closeSide,
   marquee,
   moveProjectDir,
@@ -18,10 +20,11 @@ import {
   stopMarquee,
 } from "./sidebar.js";
 import { applyDesktopQuota, loadQuota, renderQuota } from "./quota.js";
-import { openBotConversations, openConvContextMenu, usableAgents } from "./topbar.js";
+import { openBotConversations, openConvContextMenu, runDesktopMenu, usableAgents } from "./topbar.js";
 import { showMenu } from "../lib/overlay.js";
 import { bindScrollWatch, newDraft, openConversation, scrollToBottom } from "./messages.js";
 import { renderComposer } from "./composer.js";
+import { createNav } from "./msg-nav.js";
 import { renameConv } from "./conv-actions.js";
 import { releaseForeignPushSub } from "../lib/push.js";
 
@@ -32,13 +35,14 @@ import { releaseForeignPushSub } from "../lib/push.js";
  * 加载期间弹窗还没出来，连点 / 桌面端重复触发都会再开一层，所以加载中的再调用直接忽略。
  */
 let settingsLoading = false;
-function openSettings() {
+/** tab：直接打开哪一页，如「技能」 */
+export function openSettings(tab) {
   if (settingsLoading) return;
   settingsLoading = true;
   import("../settings/index.js").then(
     (m) => {
       settingsLoading = false;
-      return m.openSettings();
+      return m.openSettings(tab);
     },
     (err) => {
       settingsLoading = false;
@@ -61,14 +65,14 @@ export async function boot() {
   WS.stopped = false;
   WS.epoch = null;
   WS.hellos = 0;
-  const data = await api("/api/bootstrap");
+  const data = await api(`/api/bootstrap${bootstrapQuery()}`);
   S.user = data.user ?? me.user ?? null;
   S.agents = data.agents;
   S.bots = data.bots;
   S.workspaceRoot = data.workspaceRoot;
   S.quotaRefreshMin = data.quotaRefreshMin ?? 10;
   S.quotaEnabled = data.quotaEnabled !== false;
-  S.convs = new Map(data.conversations.map((c) => [c.key, c]));
+  applyBootstrap(data);
   S.pending = new Map(data.pending.map((i) => [i.id, i]));
   const enabled = usableAgents().map((a) => a.id);
   if (!S.draftAgent || !enabled.includes(S.draftAgent)) S.draftAgent = enabled[0] ?? null;
@@ -84,10 +88,15 @@ export async function boot() {
   else if (fromHash && S.convs.has(fromHash)) await openConversation(fromHash);
   else if (latest) await openConversation(latest.key);
   else newDraft();
+  // 以前的技能页地址：技能现在在设置里
+  if (fromHash === "skills") openSettings("技能");
   // 点了桌面端的系统通知 / 菜单栏里的待处理项：跳到对应会话
   desktop?.onOpen((key) => {
-    if (key && S.convs.has(key) && key !== S.current) void openConversation(key);
+    // 不要求在 S.convs 里：侧栏分页，那条可能还没拉到；openConversation 会去服务端拿
+    if (key && key !== S.current) void openConversation(key);
   });
+  // 页面的「更多」菜单在桌面端顶栏的「更多」里：点了哪项
+  if (desktopMenu) desktop.onMenu(runDesktopMenu);
   // 桌面端「更多」里点了这台服务器的设置；已经开着就不再叠一层
   if (desktopSettings) {
     desktop.onOpenSettings(() => {
@@ -102,7 +111,7 @@ export async function boot() {
     navigator.serviceWorker.addEventListener("message", (e) => {
       if (e.data?.type !== "open") return;
       const key = decodeURIComponent(new URL(e.data.url, location.origin).hash.slice(1));
-      if (key && S.convs.has(key) && key !== S.current) void openConversation(key);
+      if (key && key !== S.current) void openConversation(key);
     });
   }
 }
@@ -171,17 +180,15 @@ function renderLayout() {
     // 「最近」上面的入口，像 ChatGPT 的 Tasks。当前在任务页时高亮（renderSidebar 里切换）
     (ui.tasksNav = h("button", { class: "btn new-chat side-nav", onclick: () => openTasksView() }, icon("clock"), "定时任务")),
     ui.convList,
-    h(
+    // 底部只有额度：没有额度可显示（关了查询、还没查到）时整块藏起来，连分隔线一起
+    (ui.sideBottom = h(
       "div",
-      { class: "side-bottom" },
+      { class: "side-bottom", hidden: true },
       (ui.quota = h("div", { class: "quota", onpointerenter: () => renderQuota() })),
-      h("button", { class: "icon-btn side-gear", title: "设置", onclick: () => (openSettings(), closeSide()) }, icon("gear")),
-    ),
+    )),
     h("div", { class: "side-resizer", title: "拖动调整宽度，双击恢复默认", onpointerdown: startSideResize, ondblclick: () => setSideWidth(null) }),
   );
   ui.topbar = h("div", { class: "topbar" });
-  // 聊天 / 工作切换在顶栏右上角；先建好，renderTopbar 每次把它放回去
-  ui.modeSlot = h("span", { class: "mode-slot" });
   ui.msgInner = h("div", { class: "messages-inner" });
   ui.spacer = h("div", { class: "messages-spacer", "aria-hidden": "true" });
   ui.messages = h("div", { class: "messages", tabindex: "-1" }, ui.msgInner, ui.spacer);
@@ -189,7 +196,7 @@ function renderLayout() {
   ui.follow = true;
   bindScrollWatch();
   ui.composerWrap = h("div", { class: "composer-wrap" });
-  ui.main = h("main", { class: "main" }, ui.topbar, ui.messages, ui.composerWrap);
+  ui.main = h("main", { class: "main" }, ui.topbar, ui.messages, createNav(), ui.composerWrap);
   ui.layout = h("div", { class: "layout" }, ui.sidebar, h("div", { class: "scrim", onclick: closeSide }), ui.main);
   fill($app, ui.layout, h("div", { class: "edge-strip", "aria-hidden": "true" }));
   renderComposer();

package/web/views/mention.js

@@ -0,0 +1,193 @@
+import { fill, h } from "../lib/dom.js";
+import { api } from "../lib/api.js";
+
+// ---------- @ 技能补全 ----------
+//
+// 光标前面是「@xxx」（@ 在开头或者前面是空白、标点）时弹出能用的技能，选中后补成「@name 」。
+// 输入框和定时任务的「要做的事」共用：发出去之后由服务端认消息里的 @name（skill-runtime.ts），
+// 前端只负责补全，不用另外传选了哪些。
+// 列表缓存半分钟；技能有变化时服务端推 { t: "skills" }，缓存作废。
+
+let cache = null;
+document.addEventListener("aim:skills", () => (cache = null));
+
+async function loadSkills() {
+  if (cache && Date.now() - cache.at < 30_000) return cache.list;
+  const data = await api("/api/skills/mention");
+  cache = { at: Date.now(), list: data.skills };
+  return data.skills;
+}
+
+/** 光标前的 @ 片段：返回 { start, query }，不在 @ 里就是 null */
+function mentionAt(input) {
+  const pos = input.selectionStart ?? input.value.length;
+  if (pos !== (input.selectionEnd ?? pos)) return null;
+  const m = /(^|[\s(（，。,.!！?？:：;；"'“”‘’、])@([a-z0-9_-]*)$/i.exec(input.value.slice(0, pos));
+  if (!m) return null;
+  return { start: pos - m[2].length - 1, query: m[2].toLowerCase() };
+}
+
+function match(list, q) {
+  if (!q) return list;
+  const tiers = [[], [], []];
+  for (const s of list) {
+    if (s.name.startsWith(q)) tiers[0].push(s);
+    else if (s.name.includes(q)) tiers[1].push(s);
+    else if (s.description.toLowerCase().includes(q)) tiers[2].push(s);
+  }
+  return tiers.flat();
+}
+
+/**
+ * 给一个输入框挂上 @ 补全。menu 是放菜单的元素（调用方决定放哪、怎么定位，样式用 .slash-menu）。
+ * onEmpty：一个技能都没有时，菜单里给个入口（去设置里的技能页）。返回 { update, keydown, close }：
+ * 输入框的 input / keydown / blur 里分别调用。
+ */
+export function attachMention(input, menu, { onEmpty, onPicked } = {}) {
+  const st = { open: false, items: [], index: 0, token: 0, at: null };
+
+  const close = () => {
+    st.open = false;
+    st.items = [];
+    st.index = 0;
+    st.token++;
+    menu.hidden = true;
+  };
+
+  const highlight = () => {
+    menu.querySelectorAll(".slash-item").forEach((el, i) => el.classList.toggle("on", i === st.index));
+    menu.querySelector(".slash-item.on")?.scrollIntoView({ block: "nearest" });
+  };
+
+  const pick = (s) => {
+    const at = mentionAt(input);
+    if (!at) return close();
+    const before = input.value.slice(0, at.start);
+    const after = input.value.slice(input.selectionStart);
+    const insert = `@${s.name}${after.startsWith(" ") ? "" : " "}`;
+    input.value = `${before}${insert}${after}`;
+    const caret = before.length + insert.length;
+    input.setSelectionRange(caret, caret);
+    close();
+    input.dispatchEvent(new Event("input", { bubbles: true }));
+    input.focus();
+    onPicked?.(s);
+  };
+
+  const render = (items, note) => {
+    st.open = true;
+    menu.hidden = false;
+    if (!items) {
+      fill(menu, h("div", { class: "slash-empty" }, note ?? h("span", { class: "spinner" })));
+      return;
+    }
+    fill(
+      menu,
+      items.map((s, i) =>
+        h(
+          "button",
+          {
+            class: `slash-item${i === st.index ? " on" : ""}`,
+            type: "button",
+            onmousedown: (e) => {
+              e.preventDefault();
+              pick(s);
+            },
+            onmousemove: () => {
+              if (st.index !== i) {
+                st.index = i;
+                highlight();
+              }
+            },
+          },
+          h(
+            "div",
+            { class: "slash-head" },
+            h("span", { class: "slash-name" }, `@${s.name}`),
+            s.kind === "machine" ? h("span", { class: "badge" }, "本机") : null,
+          ),
+          h("div", { class: "slash-desc" }, s.description || "（无说明）"),
+        ),
+      ),
+    );
+    highlight();
+  };
+
+  const update = async () => {
+    const at = mentionAt(input);
+    if (!at) return close();
+    const token = ++st.token;
+    if (!st.open) render(null);
+    let list;
+    try {
+      list = await loadSkills();
+    } catch (err) {
+      if (token === st.token) render(null, `读取技能失败：${err.message}`);
+      return;
+    }
+    const now = mentionAt(input);
+    if (token !== st.token || !now) return;
+    if (list.length === 0) {
+      if (now.query || !onEmpty) return close();
+      st.items = [];
+      st.open = true;
+      menu.hidden = false;
+      fill(
+        menu,
+        h(
+          "button",
+          {
+            class: "slash-item on",
+            type: "button",
+            onmousedown: (e) => {
+              e.preventDefault();
+              close();
+              onEmpty();
+            },
+          },
+          h("div", { class: "slash-head" }, h("span", { class: "slash-name" }, "还没有技能")),
+          h("div", { class: "slash-desc" }, "去「设置 → 技能」新建、上传"),
+        ),
+      );
+      return;
+    }
+    const items = match(list, now.query);
+    if (items.length === 0) return close();
+    st.items = items;
+    st.index = Math.min(st.index, items.length - 1);
+    render(items);
+  };
+
+  /** 菜单开着时接管方向键 / Tab / 回车 / Esc；返回 true 表示已处理 */
+  const keydown = (e) => {
+    if (!st.open) return false;
+    if (e.isComposing) return false;
+    if (e.key === "Escape") {
+      close();
+      return true;
+    }
+    if (st.items.length === 0) return false;
+    switch (e.key) {
+      case "ArrowDown":
+        st.index = (st.index + 1) % st.items.length;
+        highlight();
+        return true;
+      case "ArrowUp":
+        st.index = (st.index - 1 + st.items.length) % st.items.length;
+        highlight();
+        return true;
+      case "Tab":
+        pick(st.items[st.index]);
+        return true;
+      case "Enter":
+        if (e.shiftKey) return false;
+        pick(st.items[st.index]);
+        return true;
+    }
+    return false;
+  };
+
+  // 光标移动（点击、方向键离开 @ 片段）也要跟着开关
+  input.addEventListener("click", () => void update());
+  return { update, keydown, close, get open() { return st.open; } };
+}