agent-loft 0.2.19 → 0.2.21

package/src/channels/feishu/client.ts

@@ -112,6 +112,28 @@ export class FeishuClient {
     }
   }
 
+  /**
+   * 群名 / 是不是私聊，Web 上选「在哪个飞书聊天继续」时显示用。
+   * 要 im:chat 读权限，没有就返回 undefined，调用方退回显示 chat_id。成功的结果缓存起来。
+   */
+  private chatInfoCache = new Map<string, { name?: string; mode?: string }>();
+  async chatInfo(chatId: string): Promise<{ name?: string; mode?: string } | undefined> {
+    const cached = this.chatInfoCache.get(chatId);
+    if (cached) return cached;
+    try {
+      const res = await this.lark.im.v1.chat.get({ path: { chat_id: chatId } });
+      if (res.code !== 0 || !res.data) return undefined;
+      const info = {
+        ...(res.data.name ? { name: res.data.name } : {}),
+        ...(res.data.chat_mode ? { mode: res.data.chat_mode } : {}),
+      };
+      rememberBounded(this.chatInfoCache, chatId, info, 200);
+      return info;
+    } catch {
+      return undefined;
+    }
+  }
+
   /** 飞书没有给机器人开放 typing 指示器，表情回复是最接近的替代。 */
   async addTypingReaction(messageId: string): Promise<string | undefined> {
     try {

package/src/channels/feishu/envelope.ts

@@ -23,7 +23,11 @@ export type EnvelopeAction =
   | { a: "agent"; g: string; k: string }
   | { a: "resume"; s: string; k: string; c?: string }
   /** 命令列表卡上的「执行」：c 是命令名，不带斜杠 */
-  | { a: "cmd"; c: string; k: string };
+  | { a: "cmd"; c: string; k: string }
+  /** 把飞书会话 k 挂到 Web 会话 w 上 */
+  | { a: "attach"; w: string; k: string }
+  /** 飞书会话 k 不再挂着 Web 会话 */
+  | { a: "detach"; k: string };
 
 export type CardEnvelope = EnvelopeAction & {
   oc: typeof ENVELOPE_VERSION;
@@ -103,6 +107,10 @@ function validAction(v: Record<string, unknown>): boolean {
     case "cmd":
       // 只放行命令名该有的字符（skill 名会带冒号），别让参数、换行之类混进来
       return str(v.c) && /^[\w:.-]+$/.test(v.c) && str(v.k);
+    case "attach":
+      return str(v.w) && v.w.startsWith("web:") && str(v.k);
+    case "detach":
+      return str(v.k);
     default:
       return false;
   }

package/src/channels/web/api.ts

@@ -518,6 +518,20 @@ export async function handleApi(req: IncomingMessage, res: ServerResponse, url:
       sendJson(res, 200, { info: hub.info(newKey) });
       return;
     }
+    if (sub === "feishu" && method === "POST") {
+      // 在飞书继续：把选中的飞书聊天挂到这条 Web 会话上
+      if (conv.channel !== "web" || conv.hidden) throw new HttpError(400, "只有 Web 会话能到飞书继续");
+      const body = await readJsonBody<{ botId?: string; chatId?: string }>(req);
+      const bot = feishuBots().find((b) => b.id === body.botId);
+      if (!bot) throw new HttpError(404, "这个飞书机器人没有在运行");
+      const chatId = String(body.chatId ?? "");
+      // 只能挂到这个机器人聊过的聊天上，不能拿它往任意 chat_id 发消息
+      if (!bot.hasChat(chatId)) {
+        throw new HttpError(404, "这个机器人没在那个聊天里说过话");
+      }
+      sendJson(res, 200, { text: await bot.attachTo(bot.keyOf(chatId), key) });
+      return;
+    }
     if (sub === "sessions" && method === "GET") {
       sendJson(res, 200, await hub.sessions(key, url.searchParams.get("all") === "1"));
       return;
@@ -652,6 +666,8 @@ export async function handleApi(req: IncomingMessage, res: ServerResponse, url:
       const commands = await hub.commandCatalog(m[1]!, {
         ...(conv ? { cwd: conv.cwd } : {}),
         allowedAgents: hub.enabledAgents().map((d) => d.id),
+        // 带 key 是输入框补全：只列 Web 能用的；不带是设置页排序，全列
+        ...(conv ? { channel: "web" } : {}),
       });
       sendJson(res, 200, { commands });
       return;
@@ -712,6 +728,14 @@ export async function handleApi(req: IncomingMessage, res: ServerResponse, url:
     sendJson(res, 200, { ok: true });
     return;
   }
+  if (p === "/api/feishu/targets" && method === "GET") {
+    // 「在飞书继续」能选的地方：每个运行中的机器人，以及它聊过的聊天
+    const bots = await Promise.all(
+      feishuBots().map(async (b) => ({ id: b.id, name: b.cfg.name, state: b.status.state, chats: await b.knownChats() })),
+    );
+    sendJson(res, 200, { bots });
+    return;
+  }
   if (p === "/api/feishu/status" && method === "GET") {
     sendJson(res, 200, feishuBots().map((b) => ({ id: b.id, name: b.cfg.name, ...b.status })));
     return;

package/src/core/command-catalog.ts

@@ -7,7 +7,14 @@
 // 顺序和隐藏按 agent 分开存在配置里（设置 → 命令），用户自己排。
 
 /** agent-loft 内置命令。name 不带斜杠；args 里尖括号是必填、方括号是可选 */
-export type BuiltinSpec = { name: string; args?: string; description: string; multiAgentOnly?: boolean };
+export type BuiltinSpec = {
+  name: string;
+  args?: string;
+  description: string;
+  multiAgentOnly?: boolean;
+  /** 只在飞书里有意义（挂到 Web 会话上 / 退回来），Web 的补全里不列 */
+  feishuOnly?: boolean;
+};
 
 export const BUILTIN_COMMANDS: BuiltinSpec[] = [
   { name: "new", args: "[模型]", description: "开一条新会话" },
@@ -24,6 +31,8 @@ export const BUILTIN_COMMANDS: BuiltinSpec[] = [
   { name: "cd", args: "<相对目录>", description: "切换工作目录（限 workspace 内）" },
   { name: "pwd", description: "显示当前工作目录" },
   { name: "autoedit", args: "[on|off]", description: "本对话自动允许改工作目录内的文件（Bash 仍询问）" },
+  { name: "web", description: "接上一条 Web 会话，在飞书里查看和回复", feishuOnly: true },
+  { name: "detach", description: "不再接着 Web 会话，回到这个聊天自己的会话", feishuOnly: true },
   { name: "approve", args: "<请求ID> allow-once|allow-always|allow-session|deny", description: "审批兜底（卡片失效时用）" },
   { name: "help", description: "显示帮助" },
 ];
@@ -129,11 +138,14 @@ export function buildCatalog(params: {
   allowedAgents: string[];
   native: AgentCommand[];
   prefs: CommandPrefs | undefined;
+  /** 给哪个渠道看：不是飞书就不列飞书专用的命令。不给就全列（设置页排序用） */
+  channel?: string;
 }): CommandEntry[] {
   const multi = params.allowedAgents.length > 1;
   const builtin: CommandEntry[] = BUILTIN_COMMANDS.filter(
     (c) =>
       (!c.multiAgentOnly || multi) &&
+      (!c.feishuOnly || params.channel === undefined || params.channel === "feishu") &&
       // /claude /codex 只在这个渠道能用对应 agent 时才有意义
       (!["claude", "codex"].includes(c.name) || params.allowedAgents.includes(c.name)),
   ).map((c) => ({

package/src/core/commands.ts

@@ -84,7 +84,7 @@ export function parseCommand(raw: string): ParsedCommand {
   }
 }
 
-export function helpText(agents: string[]): string {
+export function helpText(agents: string[], channel?: string): string {
   const multi = agents.length > 1;
   return [
     "直接说话即可，会自动接着上次的会话。闲置太久会自动开新会话。",
@@ -94,6 +94,7 @@ export function helpText(agents: string[]): string {
     "**命令**（需整条消息只有命令；只发一个 `/` 可以列出全部命令，包括 agent 自己的）",
     "",
     ...BUILTIN_COMMANDS.filter((c) => !c.multiAgentOnly || multi)
+      .filter((c) => !c.feishuOnly || channel === "feishu")
       .filter((c) => !["claude", "codex"].includes(c.name))
       .map((c) =>
         c.name === "agent"

package/src/core/hub.ts

@@ -50,6 +50,8 @@ export type Origin = {
   channelId: string;
   /** 显示用的人名 / 设备名 */
   name?: string;
+  /** 飞书：从哪个聊天说的（一条会话可能同时挂在好几个飞书聊天上，回显时要分清） */
+  chatId?: string;
 };
 
 export type ConvEvent =
@@ -1113,14 +1115,24 @@ class Hub extends EventEmitter<{ event: [EventEnvelope] }> {
   }
 
   /** 执行一条已解析的命令。chat 不在这里处理。 */
-  async command(key: string, cmd: ParsedCommand, ctx: { allowedAgents: string[]; by: string }): Promise<CommandReply> {
+  /** ctx.channel：命令是从哪个渠道发的（飞书聊天挂在 Web 会话上时，和会话自己的渠道不一样） */
+  async command(
+    key: string,
+    cmd: ParsedCommand,
+    ctx: { allowedAgents: string[]; by: string; channel?: string },
+  ): Promise<CommandReply> {
     const text = (t: string): CommandReply => ({ type: "text", text: t });
+    const channel = ctx.channel ?? getConversation(key)?.channel;
     switch (cmd.kind) {
       case "help":
-        return text(helpText(ctx.allowedAgents));
+        return text(helpText(ctx.allowedAgents, channel));
       case "commands": {
         const conv = getConversation(key)!;
-        const all = await this.commandCatalog(conv.agent, { cwd: conv.cwd, allowedAgents: ctx.allowedAgents });
+        const all = await this.commandCatalog(conv.agent, {
+          cwd: conv.cwd,
+          allowedAgents: ctx.allowedAgents,
+          ...(channel ? { channel } : {}),
+        });
         return { type: "commands", agent: conv.agent, commands: all.filter((c) => !c.hidden) };
       }
       case "pwd":
@@ -1180,7 +1192,7 @@ class Hub extends EventEmitter<{ event: [EventEnvelope] }> {
    */
   async commandCatalog(
     agent: string,
-    opts: { cwd?: string; allowedAgents: string[] },
+    opts: { cwd?: string; allowedAgents: string[]; channel?: string },
   ): Promise<CommandEntry[]> {
     const driver = this.enabledAgents().find((d) => d.id === agent);
     let native: AgentCommand[] = [];
@@ -1191,7 +1203,7 @@ class Hub extends EventEmitter<{ event: [EventEnvelope] }> {
       });
     }
     const prefs = (config().commands as Record<string, CommandPrefs | undefined>)[agent];
-    return buildCatalog({ allowedAgents: opts.allowedAgents, native, prefs });
+    return buildCatalog({ allowedAgents: opts.allowedAgents, native, prefs, ...(opts.channel ? { channel: opts.channel } : {}) });
   }
 
   async shutdown(): Promise<void> {

package/web/app.js

@@ -1428,10 +1428,64 @@ function openConvContextMenu(key, at) {
       },
     },
     { label: "重命名", onclick: () => renameConv(key) },
+    ...(c.channel === "web" && S.bots.length > 0 ? [{ label: "在飞书继续…", onclick: () => continueInFeishu(key) }] : []),
     ...(c.channel === "web" ? [{ label: "删除", danger: true, onclick: () => deleteConv(key) }] : []),
   ]);
 }
 
+/**
+ * 在飞书继续：选一个机器人聊过的飞书聊天，把它接到这条 Web 会话上。
+ * 之后在那个聊天里说话就进这条会话，回复、授权、提问也发过去；飞书里发 /detach 退回来。
+ * 只有一个聊天可选时直接接上，不弹窗。
+ */
+async function continueInFeishu(key) {
+  let data;
+  try {
+    data = await api("/api/feishu/targets");
+  } catch (err) {
+    return toast(err.message);
+  }
+  const targets = data.bots.flatMap((b) => b.chats.map((c) => ({ bot: b, chat: c })));
+  if (data.bots.length === 0) return toast("没有运行中的飞书机器人");
+  if (targets.length === 0) return toast("机器人还没有聊天：先在飞书里给它发一条消息，再回来推过去");
+  const go = async (t, close) => {
+    try {
+      const r = await api(`/api/conversations/${encodeURIComponent(key)}/feishu`, {
+        method: "POST",
+        body: { botId: t.bot.id, chatId: t.chat.chatId },
+      });
+      close?.();
+      toast(r.text);
+    } catch (err) {
+      toast(err.message);
+    }
+  };
+  if (targets.length === 1) return go(targets[0]);
+  const multiBot = data.bots.filter((b) => b.chats.length > 0).length > 1;
+  const body = h("div", { class: "modal-body" });
+  const close = modal({ title: "在飞书继续", body });
+  fill(
+    body,
+    h("div", { class: "muted" }, "选一个飞书聊天，之后在那里说话就会发进这条会话，回复和授权也会发过去。在飞书里发 /detach 回到那个聊天自己的会话。"),
+    ...targets.map((t) => {
+      const here = t.chat.attached === key;
+      const other = t.chat.attached && !here ? S.convs.get(t.chat.attached) : null;
+      const note = here ? "已接着这条" : other ? `正接着「${convTitle(other)}」，选它会换过来` : "";
+      return h(
+        "button",
+        { class: `list-item${here ? " on" : ""}`, onclick: () => go(t, close) },
+        h("span", { class: "brand-icon", html: ICON.feishu }),
+        h(
+          "div",
+          { class: "grow" },
+          h("div", { class: "t" }, multiBot ? `${t.bot.name} · ${t.chat.label}` : t.chat.label),
+          h("div", { class: "s" }, [`${relTime(t.chat.activeAt)}活跃`, t.bot.state !== "connected" ? "机器人未连上" : "", note].filter(Boolean).join(" · ")),
+        ),
+      );
+    }),
+  );
+}
+
 /** 飞书机器人的历史会话：这个机器人的所有聊天，按活跃时间排，点一下打开 */
 function openBotConversations(botId) {
   const bot = S.bots.find((b) => b.id === botId);
@@ -2120,9 +2174,11 @@ const VOICE_ERR = {
 };
 
 /** rec：当前识别实例；before/after：开始时光标前后的文字；committed：已确认的识别结果 */
-const voice = { rec: null, want: false, before: "", after: "", committed: "", target: null };
+const voice = { rec: null, want: false, before: "", after: "", committed: "", target: null, stopTimer: null };
 
 function toggleVoice() {
+  // 点过停止、正在等收尾（按钮已经不亮了）：再点就是要重新开始，先丢掉旧的
+  if (voice.rec && !voice.want) cancelVoice();
   if (voice.rec) stopVoice();
   else startVoice();
 }
@@ -2145,61 +2201,121 @@ function startVoice() {
   updateMicBtn();
 }
 
+/**
+ * 正常结束的识别实例留着下次复用：iOS Safari 每次 new 一个新实例，
+ * 第二次开始往往一个结果都不回。被 abort / 卡住的实例不复用，下次换新的。
+ */
+let spareRec = null;
+
+/** voice.rec 是一轮识别（run）：{ rec, heard, shown, done }，事件都按 run 对号入座 */
 function listenOnce() {
-  const rec = new SpeechRec();
-  rec.lang = navigator.language || "zh-CN";
-  rec.continuous = voiceContinuous;
-  rec.interimResults = true;
-  let heard = "";
-  rec.onresult = (e) => {
-    let fin = "";
-    let interim = "";
-    for (const r of e.results) {
-      if (r.isFinal) fin += r[0].transcript;
-      else interim += r[0].transcript;
-    }
-    heard = fin;
-    showVoiceText(joinVoice(voice.committed, fin + interim));
-  };
-  rec.onerror = (e) => {
-    if (e.error === "no-speech" || e.error === "aborted") return;
-    voice.want = false;
-    toast(VOICE_ERR[e.error] ?? `语音识别出错：${e.error}`);
-  };
-  rec.onend = () => {
-    if (voice.rec !== rec) return; // 已被取消
-    voice.committed = joinVoice(voice.committed, heard);
-    showVoiceText(voice.committed);
-    // 这一轮什么都没听到就当说完了，避免麦克风一直开着
-    if (voice.want && heard) {
-      try {
-        listenOnce();
-        return;
-      } catch {
-        // 续不上就结束
+  const run = { rec: null, heard: "", shown: "", done: false };
+  const wire = (rec) => {
+    rec.lang = navigator.language || "zh-CN";
+    rec.continuous = voiceContinuous;
+    rec.interimResults = true;
+    rec.onresult = (e) => {
+      if (voice.rec !== run) return;
+      let fin = "";
+      let interim = "";
+      for (const r of e.results) {
+        if (r.isFinal) fin += r[0].transcript;
+        else interim += r[0].transcript;
       }
-    }
-    voice.rec = null;
-    voice.want = false;
-    updateMicBtn();
+      run.heard = fin;
+      run.shown = fin + interim;
+      showVoiceText(joinVoice(voice.committed, run.shown));
+    };
+    rec.onerror = (e) => {
+      if (voice.rec !== run) return;
+      if (e.error === "no-speech" || e.error === "aborted") return;
+      voice.want = false;
+      toast(VOICE_ERR[e.error] ?? `语音识别出错：${e.error}`);
+    };
+    rec.onend = () => {
+      if (voice.rec !== run) return; // 已被取消 / 已被强制结束
+      finishRun(run, true);
+    };
+    return rec;
   };
-  voice.rec = rec;
-  rec.start();
+  let rec = wire(spareRec ?? new SpeechRec());
+  spareRec = null;
+  run.rec = rec;
+  voice.rec = run;
+  try {
+    rec.start();
+  } catch (err) {
+    // 复用的实例还没完全停下（InvalidStateError）：换个新的再来
+    if (err?.name !== "InvalidStateError") throw err;
+    rec = wire(new SpeechRec());
+    run.rec = rec;
+    rec.start();
+  }
+}
+
+/** 一轮识别结束：把这轮听到的定下来，需要的话接着听下一轮 */
+function finishRun(run, clean) {
+  if (run.done) return;
+  run.done = true;
+  clearTimeout(voice.stopTimer);
+  // Safari 有时整轮都不给 isFinal：没有定稿就以屏幕上显示的为准，不能把已经显示的字吞掉
+  const heard = run.heard || run.shown;
+  voice.committed = joinVoice(voice.committed, heard);
+  showVoiceText(voice.committed);
+  if (clean) spareRec = run.rec;
+  // 这一轮什么都没听到就当说完了，避免麦克风一直开着
+  if (clean && voice.want && heard) {
+    try {
+      listenOnce();
+      return;
+    } catch {
+      // 续不上就结束
+    }
+  }
+  voice.rec = null;
+  voice.want = false;
+  updateMicBtn();
 }
 
 /** 用户点停止：让浏览器把最后一句定稿后再结束 */
 function stopVoice() {
+  const run = voice.rec;
+  if (!run) return;
   voice.want = false;
-  voice.rec?.stop();
+  // 先把按钮恢复，用户能立刻看到已经停了
+  if (ui.micBtn) ui.micBtn.classList.remove("recording");
+  try {
+    run.rec.stop();
+  } catch {
+    // 已经停了
+  }
+  // iOS 上 stop() 之后有时永远等不来 onend，按钮就一直卡在「录音中」，再点只会又 stop 一次。
+  // 等一会儿还没结束就强制收尾，这个实例不再复用
+  clearTimeout(voice.stopTimer);
+  voice.stopTimer = setTimeout(() => {
+    if (voice.rec !== run) return;
+    try {
+      run.rec.abort();
+    } catch {
+      // 忽略
+    }
+    finishRun(run, false);
+  }, 1500);
 }
 
 /** 发送、切会话、用户手动改输入框时：立刻丢掉识别，不再往输入框写 */
 function cancelVoice() {
-  const rec = voice.rec;
-  if (!rec) return;
+  const run = voice.rec;
+  if (!run) return;
+  clearTimeout(voice.stopTimer);
+  run.done = true;
   voice.rec = null;
   voice.want = false;
-  rec.abort();
+  try {
+    run.rec.abort();
+  } catch {
+    // 忽略
+  }
   updateMicBtn();
 }
 
@@ -2238,6 +2354,13 @@ function hasDraft() {
 
 function updateSendBtn() {
   if (!ui.sendBtn) return;
+  // 已经点了发送、还在等服务器确认：转圈，不能再点，避免以为没点上又点一次
+  if (S.sending) {
+    ui.sendBtn.innerHTML = '<span class="send-spinner"></span>';
+    ui.sendBtn.title = "发送中…";
+    ui.sendBtn.disabled = true;
+    return;
+  }
   const stop = S.busy && !hasDraft();
   ui.sendBtn.innerHTML = stop ? ICON.stop : ICON.send;
   ui.sendBtn.title = stop ? "停止" : "发送";
@@ -2348,7 +2471,18 @@ async function addFiles(files) {
   }
 }
 
+/** 发送中：按钮转圈、输入框只读（确认后要清空它，期间再打的字会丢） */
+function setSending(on) {
+  S.sending = on;
+  if (ui.input) {
+    ui.input.readOnly = on;
+    ui.input.classList.toggle("sending", on);
+  }
+  updateSendBtn();
+}
+
 async function sendMessage() {
+  if (S.sending) return;
   cancelVoice();
   const text = ui.input.value;
   if (!text.trim() && S.uploads.length === 0) return;
@@ -2359,6 +2493,7 @@ async function sendMessage() {
   closeSlashMenu();
   let key;
   let res;
+  setSending(true);
   try {
     key = await ensureConversation();
     if ("Notification" in window && Notification.permission === "default") void Notification.requestPermission();
@@ -2367,6 +2502,8 @@ async function sendMessage() {
   } catch (err) {
     toast(err.message);
     return;
+  } finally {
+    setSending(false);
   }
   if (!res?.reply) {
     sentKeys.add(key);
@@ -3519,7 +3656,7 @@ function modelPicker(agent, model, effort, defaultLabel) {
 }
 
 /** agent-loft 内置命令名（和服务端 BUILTIN_COMMANDS 一致），自定义命令不能用 */
-const BUILTIN_NAMES = ["new", "status", "stop", "model", "effort", "sessions", "resume", "fork", "agent", "claude", "codex", "cd", "pwd", "autoedit", "approve", "help"];
+const BUILTIN_NAMES = ["new", "status", "stop", "model", "effort", "sessions", "resume", "fork", "agent", "claude", "codex", "cd", "pwd", "autoedit", "web", "detach", "approve", "help"];
 
 /**
  * 添加 / 编辑一条自定义命令。onSave 返回 true 才关窗；失败（比如服务端校验没过）留着让用户改。

package/web/style.css

@@ -180,6 +180,15 @@ select.input {
   opacity: 0.7;
 }
 
+/* 放在 .field 里的复选框 / 单选框不套用上面输入框的宽度和内边距：
+   否则复选框被撑宽，旁边的文字会被挤成两行（比如飞书机器人的「可用的 Agent」） */
+.field input[type="checkbox"],
+.field input[type="radio"] {
+  width: auto;
+  padding: 0;
+  flex-shrink: 0;
+}
+
 .input:focus,
 .field input:focus,
 .field select:focus,
@@ -2091,6 +2100,24 @@ button.ctx-item:hover {
   opacity: 0.4;
 }
 
+.send-btn:has(.send-spinner) {
+  opacity: 1;
+}
+
+/* 发送中：按钮里转圈，颜色跟着按钮的前景色走（深浅模式都看得清） */
+.send-spinner {
+  width: 14px;
+  height: 14px;
+  border: 2px solid currentColor;
+  border-right-color: transparent;
+  border-radius: 50%;
+  animation: spin 0.8s linear infinite;
+}
+
+textarea.sending {
+  opacity: 0.6;
+}
+
 .send-btn svg {
   width: 15px;
   height: 15px;