agent-loft 0.2.14 → 0.2.16

package/package.json

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

package/src/agents/claude/account.ts

@@ -5,6 +5,7 @@
 //
 // 注意：SDK 把它标成了 EXPERIMENTAL，方法名以后会改。改了的话这里只会读失败，
 // /status 少几行而已，不影响别的。
+import { accountKey } from "../../core/account-key.js";
 import type { QuotaInfo } from "../../core/types.js";
 import { cachedProbe, withProbe } from "./probe.js";
 
@@ -22,6 +23,8 @@ type LimitRow = {
 export type ClaudeUsage = {
   subscriptionType: string | null;
   rows: { label: string; short: string; percent: number; resetsAt: string | null; severity?: string }[];
+  /** 账号标识（见 core/account-key.ts）；读不到账号信息时没有 */
+  account?: string;
 };
 
 function labelOf(row: LimitRow): string {
@@ -70,10 +73,16 @@ function normalize(res: {
 }
 
 async function fetchUsage(): Promise<ClaudeUsage | null> {
-  const res = await withProbe((q) =>
-    q.usage_EXPERIMENTAL_MAY_CHANGE_DO_NOT_RELY_ON_THIS_API_YET({ skipBehaviors: true }),
+  // 账号信息顺带在同一个探针进程里问，不多起进程；读不到不影响额度
+  const [res, info] = await withProbe((q) =>
+    Promise.all([
+      q.usage_EXPERIMENTAL_MAY_CHANGE_DO_NOT_RELY_ON_THIS_API_YET({ skipBehaviors: true }),
+      q.accountInfo().catch(() => null),
+    ]),
   );
-  return normalize(res as Parameters<typeof normalize>[0]);
+  const usage = normalize(res as Parameters<typeof normalize>[0]);
+  const account = info?.email ? accountKey("claude", info.email, info.organization) : undefined;
+  return usage && account ? { ...usage, account } : usage;
 }
 
 /**
@@ -107,6 +116,7 @@ export function toQuota(usage: ClaudeUsage | null): QuotaInfo | null {
       return { label: r.label, short: r.short, percent: r.percent, ...(Number.isNaN(at) ? {} : { resetsAt: at }) };
     }),
     ...(usage.rows.some((r) => r.percent >= 100) ? { reached: true } : {}),
+    ...(usage.account ? { account: usage.account } : {}),
   };
 }
 

package/src/agents/codex/account.ts

@@ -4,6 +4,7 @@
 // 而agent-loft的 `/status` 是另一条命令（同名而已），本来只报会话和目录。
 // 用的人不会关心这个区别，他只知道「同样敲 /status，这边少了额度」。
 // 与其解释，不如把它显示出来 —— app-server 本来就给了。
+import { accountKey } from "../../core/account-key.js";
 import type { QuotaInfo } from "../../core/types.js";
 import { appServer } from "./app-server.js";
 
@@ -47,6 +48,28 @@ export async function readRateLimits(): Promise<RateLimits | null> {
   return cache.value;
 }
 
+type Account = { type: "chatgpt"; email: string | null; planType?: string | null } | { type: string } | null;
+
+let accountCache: { at: number; value: string | undefined } | null = null;
+
+/**
+ * 账号标识（见 core/account-key.ts）：只有 ChatGPT 登录、拿得到邮箱时才有。
+ * app-server 常驻着，问一下很便宜；和额度同样缓存 60 秒，换了账号一分钟内就能反映出来。
+ */
+export async function readAccountKey(): Promise<string | undefined> {
+  if (accountCache && Date.now() - accountCache.at < CACHE_MS) return accountCache.value;
+  let value: string | undefined;
+  try {
+    const res = await appServer.call<{ account?: Account }>("account/read", {});
+    const acc = res.account;
+    if (acc?.type === "chatgpt" && "email" in acc) value = accountKey("codex", acc.email, acc.planType);
+  } catch (err) {
+    console.error("[账号] 读取失败:", err instanceof Error ? err.message : err);
+  }
+  accountCache = { at: Date.now(), value };
+  return value;
+}
+
 /** 300 → 「5h」，10080 → 「7d」 */
 function windowShort(mins: number): string {
   if (mins % (60 * 24) === 0) return `${mins / (60 * 24)}d`;
@@ -55,7 +78,7 @@ function windowShort(mins: number): string {
 }
 
 /** 侧栏用的结构化额度 */
-export function toQuota(limits: RateLimits | null): QuotaInfo | null {
+export function toQuota(limits: RateLimits | null, account?: string): QuotaInfo | null {
   if (!limits) return null;
   const windows = [limits.primary, limits.secondary]
     .filter((w): w is UsageWindow => !!w)
@@ -73,6 +96,7 @@ export function toQuota(limits: RateLimits | null): QuotaInfo | null {
     windows,
     ...(extra ? { extra } : {}),
     ...(limits.rateLimitReachedType ? { reached: true } : {}),
+    ...(account ? { account } : {}),
   };
 }
 

package/src/agents/codex/driver.ts

@@ -2,7 +2,7 @@
 //
 // 不用 @openai/codex-sdk：它是 `codex exec --json` 的薄封装，没有任何审批回调。
 import { appServer } from "./app-server.js";
-import { describeRateLimits, readRateLimits, toQuota } from "./account.js";
+import { describeRateLimits, readAccountKey, readRateLimits, toQuota } from "./account.js";
 import { diagnose } from "./errors.js";
 import { CodexSession, summarize } from "./session.js";
 import { config, onConfigChange } from "../../core/config.js";
@@ -209,7 +209,8 @@ export class CodexDriver implements AgentDriver {
   }
 
   async quota(): Promise<QuotaInfo | null> {
-    return toQuota(await readRateLimits());
+    const [limits, account] = await Promise.all([readRateLimits(), readAccountKey()]);
+    return toQuota(limits, account);
   }
 
   diagnose(err: unknown) {

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 })),
@@ -563,8 +565,10 @@ export async function handleApi(req: IncomingMessage, res: ServerResponse, url:
     return;
   }
   if (p === "/api/quota" && method === "GET") {
+    // ?agent=claude,codex：只问这几个。桌面端连着多台同账号的服务器时，同一个账号只在一台上问
+    const only = url.searchParams.get("agent")?.split(",").filter(Boolean);
     const results = await Promise.all(
-      hub.enabledAgents().map(async (d) => {
+      hub.enabledAgents().filter((d) => !only || only.includes(d.id)).map(async (d) => {
         if (!d.quota) return null;
         try {
           const quota = await Promise.race([

package/src/core/account-key.ts

@@ -0,0 +1,13 @@
+// 额度对应的账号标识：桌面端连着多台服务器时，靠它认出「这几台登的是同一个账号」，
+// 同一个账号只问一台，结果分给其他几台（额度是跟着账号走的，问哪台都一样）。
+//
+// 只给哈希、不给原文：接口返回里不出现邮箱。不同服务器上同一个账号算出来的值相同，
+// 这正是要的效果，所以不加盐。
+import { createHash } from "node:crypto";
+
+/** 没有能认出账号的信息（API key、第三方云之类）时返回 undefined，桌面端就照旧逐台去问 */
+export function accountKey(agent: string, ...parts: (string | null | undefined)[]): string | undefined {
+  if (!parts[0]) return undefined;
+  const text = [agent, ...parts.map((p) => (p ?? "").trim().toLowerCase())].join("\n");
+  return createHash("sha256").update(text).digest("hex").slice(0, 16);
+}

package/src/core/types.ts

@@ -116,6 +116,11 @@ export type QuotaInfo = {
   extra?: string;
   /** 已撞上限 */
   reached?: boolean;
+  /**
+   * 账号标识（邮箱等信息的哈希，见 core/account-key.ts）。多台服务器登的同一个账号时相同，
+   * 桌面端据此只问其中一台。认不出账号时不给。
+   */
+  account?: string;
 };
 
 // ---------- agent ----------

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,10 @@ const ui = {};
  * 桌面端收不到 Web Push，系统通知、Dock 角标、菜单栏的待处理数都交给它。
  */
 const desktop = window.agentLoftDesktop ?? null;
+/** 新版桌面端：额度由它统一查好推过来，页面自己不查（老版本桌面端没有 onQuota，照旧自己查） */
+const desktopQuota = typeof desktop?.onQuota === "function";
+// 桌面端里：顶栏、侧栏顶部可以按住拖动窗口（样式见 style.css 的 .in-desktop）
+if (desktop) document.documentElement.classList.add("in-desktop");
 
 // ---------- WebSocket ----------
 
@@ -528,12 +532,13 @@ 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();
   WS.connect();
-  void loadQuota();
+  if (desktopQuota) desktop.onQuota(applyDesktopQuota);
+  else void loadQuota();
   const fromHash = decodeURIComponent(location.hash.slice(1));
   // 地址里带了会话就打开它；否则打开「最近」里最近活跃的那个对话，一个都没有才进新对话页
   const latest = [...S.convs.values()].filter((c) => !c.hidden).sort((a, b) => b.activeAt - a.activeAt)[0];
@@ -664,12 +669,19 @@ function stopMarquee() {
 //   - 有会话跑完一轮：10 秒后拉；若那时服务端缓存还没过期，就推迟到过期之后，保证拿到新数据；
 //   - 切回前台：距上次超过一个刷新间隔就拉；
 //   - 点一下额度区域：立刻拉（可能拿到 60 秒内的缓存）。
+// 在桌面端里（desktopQuota）以上全都不做：桌面端统一去查（同一个账号的多台服务器只问一台），
+// 查好推过来；点一下额度区域是请桌面端去刷新。
 
 const quotaState = { data: null, at: 0, loading: false, timer: 0, idle: 0 };
 const QUOTA_SERVER_CACHE = 60_000;
 const quotaInterval = () => (S.quotaRefreshMin ?? 10) * 60_000;
 
 async function loadQuota() {
+  if (desktopQuota) {
+    ui.quota?.classList.add("loading");
+    desktop.refreshQuota();
+    return;
+  }
   if (quotaState.loading) return;
   quotaState.loading = true;
   ui.quota?.classList.add("loading");
@@ -688,10 +700,20 @@ async function loadQuota() {
   }
 }
 
+/** 桌面端推来的额度。查失败（error）时保留旧数据 */
+function applyDesktopQuota(payload) {
+  if (Array.isArray(payload?.quotas) && !payload.error) {
+    quotaState.data = payload.quotas;
+    quotaState.at = payload.at || Date.now();
+  }
+  ui.quota?.classList.remove("loading");
+  renderQuota();
+}
+
 /** 空闲定时：每次拉完重新计时，所以刚因为跑完一轮拉过，就不会紧接着又拉 */
 function scheduleIdleQuota() {
   clearTimeout(quotaState.idle);
-  if (!quotaInterval()) return;
+  if (desktopQuota || !quotaInterval()) return;
   quotaState.idle = setTimeout(() => {
     // 页面不可见就先不拉，等切回来再说
     if (document.visibilityState === "visible") void loadQuota();
@@ -700,13 +722,15 @@ function scheduleIdleQuota() {
 
 /** 一轮跑完：10 秒后拉；服务端缓存那时还没过期就推迟到过期之后 */
 function scheduleQuota() {
+  // 桌面端里：它从页面报的运行数看出跑完了一轮，自己会去查
+  if (desktopQuota) return;
   const wait = Math.max(10_000, quotaState.at + QUOTA_SERVER_CACHE + 1000 - Date.now());
   clearTimeout(quotaState.timer);
   quotaState.timer = setTimeout(() => void loadQuota(), wait);
 }
 
 document.addEventListener("visibilitychange", () => {
-  if (document.visibilityState !== "visible" || !ui.quota || !quotaInterval()) return;
+  if (desktopQuota || document.visibilityState !== "visible" || !ui.quota || !quotaInterval()) return;
   if (Date.now() - quotaState.at >= quotaInterval()) void loadQuota();
 });
 
@@ -1113,8 +1137,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 +1239,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 +1471,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 +2416,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 +2627,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 +3079,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 +3267,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 +3304,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,
@@ -3294,7 +3330,13 @@ function generalTab(cfg, panel) {
       field("工作目录（workspace）", root, "所有会话的默认目录，/cd 只能在它之内"),
       field("授权等待超时（分钟）", approval, "超时按拒绝处理"),
       field("会话闲置多久自动开新会话（小时）", ttl, "0 表示永不过期"),
-      field("额度自动刷新间隔（分钟）", quotaMin, "侧栏底部的额度，空闲时多久刷新一次；0 表示不自动刷新（跑完一轮、点击额度区域仍会刷新）"),
+      field(
+        "额度自动刷新间隔（分钟）",
+        quotaMin,
+        desktopQuota
+          ? "在桌面端里额度由桌面端统一刷新，以桌面端设置里的间隔为准；这里只对浏览器打开的页面生效"
+          : "侧栏底部的额度，空闲时多久刷新一次；0 表示不自动刷新（跑完一轮、点击额度区域仍会刷新）",
+      ),
       h(
         "div",
         { class: "row" },
@@ -3767,15 +3809,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;
+}