agent-loft 0.2.14 → 0.2.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agent-loft",
-  "version": "0.2.14",
+  "version": "0.2.15",
   "type": "module",
   "description": "多个 agent 的工作台：把本机 Claude Code / Codex 放到一处统一管理，用飞书和 Web 页面随时驱动——会话、审批、模型切换都共用",
   "keywords": [

package/src/agents/health.ts

@@ -134,6 +134,20 @@ async function codexHealth(): Promise<AgentHealth> {
 
 let cache: { at: number; value: AgentHealth[] } | null = null;
 
+/**
+ * 不等体检、立刻给出的「这个 agent 能不能用」：用最近一次体检的结果（多旧都算），
+ * 结果超过 5 分钟就顺手在后台再查一次。还没查过返回 null（当作能用，不挡人）。
+ * 新对话里只列出能用的 agent，没装、没登录的不出现。
+ */
+export function agentAvailability(id: AgentHealth["id"]): { available: boolean; reason?: string } | null {
+  if (!cache || Date.now() - cache.at > 5 * 60_000) void agentHealth().catch(() => {});
+  const h = cache?.value.find((a) => a.id === id);
+  if (!h) return null;
+  if (!h.installed) return { available: false, reason: "未安装" };
+  if (h.loggedIn === false) return { available: false, reason: "未登录" };
+  return { available: true };
+}
+
 /** 装了 / 登录了什么之后，下次体检不用缓存 */
 export function invalidateHealth(): void {
   cache = null;

package/src/channels/web/api.ts

@@ -12,7 +12,7 @@ import { getConversation, updateConversation } from "../../core/store.js";
 import { resolveUploadFile, saveBuffer, sniff } from "../../core/uploads.js";
 import type { SavedAttachment } from "../../core/types.js";
 import { listAllowlist, setAllowlist } from "../../agents/claude/permissions.js";
-import { agentHealth, invalidateHealth } from "../../agents/health.js";
+import { agentAvailability, agentHealth, invalidateHealth } from "../../agents/health.js";
 import { installCodex, upgrade, useInstalledCodex, versionInfo } from "../../core/upgrade.js";
 import { feishuBots } from "../feishu/index.js";
 import { beginRegistration, initRegistration, pollRegistration, qrSvg } from "../feishu/register.js";
@@ -317,6 +317,8 @@ export async function handleApi(req: IncomingMessage, res: ServerResponse, url:
           capabilities: d?.capabilities ?? {},
           // 输入框模型列表里显示哪些，空 = 全部
           models: config().agents[id].models.filter((m) => typeof m === "string"),
+          // 没装 / 没登录：新对话里不出现（null = 还没查过，当作能用）
+          ...(agentAvailability(id) ?? {}),
         };
       }),
       bots: config().feishu.bots.map((b) => ({ id: b.id, name: b.name, agents: b.agents, enabled: b.enabled })),

package/src/main.ts

@@ -5,6 +5,7 @@ import { flushStore, getConversation, isExpired } from "./core/store.js";
 import { sweepUploads } from "./core/uploads.js";
 import { ClaudeDriver } from "./agents/claude/driver.js";
 import { CodexDriver } from "./agents/codex/driver.js";
+import { agentHealth } from "./agents/health.js";
 import { startFeishu, stopFeishu } from "./channels/feishu/index.js";
 import { startWeb, stopWeb } from "./channels/web/server.js";
 import { home } from "./home.js";
@@ -40,6 +41,8 @@ async function main(): Promise<void> {
 
   startFeishu();
   if (config().web.enabled) await startWeb();
+  // 先查一遍 agent 装没装、登没登录，网页打开时新对话里就只列出能用的
+  void agentHealth().catch(() => {});
 
   console.log(`[启动] workspace=${config().workspaceRoot}`);
   if (config().workspaceRoot === process.cwd()) {

package/web/app.js

@@ -265,6 +265,8 @@ const ui = {};
  * 桌面端收不到 Web Push，系统通知、Dock 角标、菜单栏的待处理数都交给它。
  */
 const desktop = window.agentLoftDesktop ?? null;
+// 桌面端里：顶栏、侧栏顶部可以按住拖动窗口（样式见 style.css 的 .in-desktop）
+if (desktop) document.documentElement.classList.add("in-desktop");
 
 // ---------- WebSocket ----------
 
@@ -528,7 +530,7 @@ async function boot() {
   S.quotaRefreshMin = data.quotaRefreshMin ?? 10;
   S.convs = new Map(data.conversations.map((c) => [c.key, c]));
   S.pending = new Map(data.pending.map((i) => [i.id, i]));
-  const enabled = S.agents.filter((a) => a.enabled).map((a) => a.id);
+  const enabled = usableAgents().map((a) => a.id);
   if (!S.draftAgent || !enabled.includes(S.draftAgent)) S.draftAgent = enabled[0] ?? null;
   renderLayout();
   reportDesktop();
@@ -1113,8 +1115,18 @@ function currentCwd() {
   return c ? c.cwd : (S.draftCwd ?? S.workspaceRoot ?? "");
 }
 
+/**
+ * 新对话能选的 agent：启用了、并且服务端查过是装好登录了的（available 为 false 的不出现）。
+ * 一个能用的都没有时退回到全部启用的，至少能看到报错，而不是什么都选不了。
+ */
+function usableAgents() {
+  const enabled = S.agents.filter((a) => a.enabled);
+  const usable = enabled.filter((a) => a.available !== false);
+  return usable.length ? usable : enabled;
+}
+
 function pickAgentMenu(anchor) {
-  const allowed = S.agents.filter((a) => a.enabled).map((a) => a.id);
+  const allowed = usableAgents().map((a) => a.id);
   if (allowed.length < 2) return;
   if (ui.menu?.dataset.for === "agent") return closeMenu();
   const pop = showPopover(anchor, { align: "left" });
@@ -1205,7 +1217,7 @@ function renderContext() {
   if (!ui.ctxBar) return;
   const c = S.current ? S.convs.get(S.current) : null;
   const cwd = currentCwd();
-  const multi = S.agents.filter((a) => a.enabled).length > 1;
+  const multi = usableAgents().length > 1;
   // 会话里不能换 agent（两个 agent 的会话互不相通），只显示；新对话里可以选
   const agentId = c ? c.agent : S.draftAgent;
   const agentEl = c || !multi
@@ -1437,7 +1449,7 @@ function newDraft() {
 }
 
 function renderEmpty() {
-  const enabled = S.agents.filter((a) => a.enabled);
+  const enabled = usableAgents();
   const cwd = S.draftCwd ?? S.workspaceRoot ?? "";
   fill(ui.msgInner,
     h(
@@ -2382,7 +2394,7 @@ function oneLine(text, max = 80) {
 
 function currentAgentId() {
   const c = S.current ? S.convs.get(S.current) : null;
-  return c?.agent ?? S.draftAgent ?? S.agents.find((a) => a.enabled)?.id ?? "claude";
+  return c?.agent ?? S.draftAgent ?? usableAgents()[0]?.id ?? "claude";
 }
 
 async function loadCommands(agent) {
@@ -2593,14 +2605,14 @@ async function switchAgent(id) {
   await doAction("agent", id);
 }
 
-function modal({ title, body, foot, wide }) {
+function modal({ title, body, foot, wide, tall }) {
   const close = () => overlay.remove();
   const overlay = h(
     "div",
     { class: "overlay", onclick: (e) => e.target === overlay && close() },
     h(
       "div",
-      { class: `modal${wide ? " wide" : ""}` },
+      { class: `modal${wide ? " wide" : ""}${tall ? " tall" : ""}` },
       h("div", { class: "modal-head" }, h("h3", {}, title), h("button", { class: "icon-btn", onclick: close }, icon("x"))),
       body,
       foot ?? null,
@@ -3045,7 +3057,8 @@ async function deleteConv(key = S.current) {
 async function openSettings() {
   const nav = h("div", { class: "settings-nav" });
   const panel = h("div", { class: "settings-body" });
-  const close = modal({ title: "设置", wide: true, body: h("div", { class: "settings" }, nav, panel) });
+  // 设置弹窗高度固定，切标签页时不跟着内容一伸一缩
+  const close = modal({ title: "设置", wide: true, tall: true, body: h("div", { class: "settings" }, nav, panel) });
   let cfg;
   try {
     cfg = await api("/api/config");
@@ -3232,12 +3245,12 @@ function field(label, input, hint) {
 function serverVersionSection() {
   const box = h("div", { class: "section" });
   const load = async (refresh) => {
-    box.replaceChildren(h("h4", {}, "服务端版本", h("span", { class: "grow" }), h("span", { class: "spinner" })));
+    fill(box, h("h4", {}, "服务端版本", h("span", { class: "grow" }), h("span", { class: "spinner" })));
     let v;
     try {
       v = await api(`/api/server/version${refresh ? "?refresh=1" : ""}`);
     } catch (err) {
-      box.replaceChildren(h("h4", {}, "服务端版本"), h("div", { class: "error-text" }, err.message));
+      fill(box, h("h4", {}, "服务端版本"), h("div", { class: "error-text" }, err.message));
       return;
     }
     const recheck = h("button", { class: "btn small", onclick: () => load(true) }, "检查更新");
@@ -3269,7 +3282,8 @@ function serverVersionSection() {
             "升级",
           )
         : null;
-    box.replaceChildren(
+    fill(
+      box,
       h("h4", {}, "服务端版本", h("span", { class: "grow" }), upgradeBtn, recheck),
       h("div", { class: "health-meta" }, `当前 ${v.version} · ${status}`),
       v.updateAvailable && !v.canUpgrade && v.reason ? h("div", { class: "health-meta" }, v.reason) : null,
@@ -3767,15 +3781,23 @@ function agentHealthSection() {
   const box = h("div", { class: "section" });
   const load = async (refresh) => {
     const recheck = h("button", { class: "btn small", onclick: () => load(true) }, "重新检查");
-    box.replaceChildren(h("h4", {}, "运行环境", h("span", { class: "grow" }), h("span", { class: "spinner" })));
+    fill(box, h("h4", {}, "运行环境", h("span", { class: "grow" }), h("span", { class: "spinner" })));
     let data;
     try {
       data = await api(`/api/agents/health${refresh ? "?refresh=1" : ""}`);
     } catch (err) {
-      box.replaceChildren(h("h4", {}, "运行环境", h("span", { class: "grow" }), recheck), h("div", { class: "error-text" }, err.message));
+      fill(box, h("h4", {}, "运行环境", h("span", { class: "grow" }), recheck), h("div", { class: "error-text" }, err.message));
       return;
     }
-    box.replaceChildren(
+    // 体检结果顺手同步到新对话的 agent 列表：刚装好 / 登录好的立刻能选，不行的立刻消失
+    for (const a of data.agents) {
+      const known = S.agents.find((x) => x.id === a.id);
+      if (known) known.available = a.installed && a.loggedIn !== false;
+    }
+    if (!usableAgents().some((a) => a.id === S.draftAgent)) S.draftAgent = usableAgents()[0]?.id ?? null;
+    if (!S.current) renderEmpty();
+    fill(
+      box,
       h("h4", {}, "运行环境", h("span", { class: "grow" }), recheck),
       ...data.agents.map((a) => {
         const ok = a.installed && a.loggedIn === true;

package/web/style.css

@@ -2300,6 +2300,11 @@ button.ctx-item:hover {
   max-width: 860px;
 }
 
+/* 设置弹窗：固定高度 */
+.modal.tall {
+  height: 86vh;
+}
+
 .modal-head {
   display: flex;
   align-items: center;
@@ -2747,6 +2752,10 @@ button.list-item:hover {
     align-items: center;
   }
 
+  .modal.tall {
+    height: 92vh;
+  }
+
   .modal,
   .modal.wide {
     max-width: none;
@@ -3214,3 +3223,13 @@ button.list-item:hover {
   background: var(--code-bg);
   font-size: 12px;
 }
+
+/* 桌面端（Agent Loft for macOS）里：顶栏和侧栏顶部按住能拖动窗口，里面的按钮照常能点 */
+.in-desktop .topbar,
+.in-desktop .side-top {
+  -webkit-app-region: drag;
+}
+.in-desktop .topbar :is(button, a, input, select, textarea, label, .conv-name),
+.in-desktop .side-top :is(button, a, input, select, textarea, label) {
+  -webkit-app-region: no-drag;
+}