@songsid/agend 2.1.10-beta.3 → 2.1.10-beta.5

package/README.md

@@ -124,7 +124,7 @@ graph LR
 | Grok Build | `curl -fsSL https://x.ai/cli/install.sh \| bash` | `grok` (x.ai OAuth device flow). Needs CLI 1.0.13 or later; run `grok update` if the server refuses an older one |
 | Meta Muse Code | `mkdir -p "$HOME/.local/bin" && curl -fsSL https://api.meta.ai/muse-launcher.sh -o "$HOME/.local/bin/muse" && chmod +x "$HOME/.local/bin/muse" && MUSE_LAUNCHER_INSTALL=1 "$HOME/.local/bin/muse"` (the launcher keeps its binary beside itself, so it is saved first) | `muse login` |
 
-**Or install from chat with `/install-cli <backend>`** (`/install_cli` on Telegram; beta, fleet admins only), without SSH-ing into the host. It runs the command above in a fleet window, then finds the CLI where its installer put it, adds that directory to the fleet's PATH and offers `/login`. It is offered for every backend above except Gemini CLI.
+**Or install from chat with `/login <backend>`** (beta, fleet admins only), without SSH-ing into the host: when the CLI is not installed yet, `/login` runs the command above in a fleet window, finds the CLI where its installer put it, adds that directory to the fleet's PATH, and goes on to sign in. A bare `/login` offers every backend above except Gemini CLI (`/login gemini-cli` still installs it).
 
 **Tested CLI versions (AgEnD 2.1.9).** Codex 0.155 to 0.159. Claude Code 2.1.286 (first-run, trust and resume screens captured from the real CLI). Kiro CLI 2.21 to 2.27 run live; older 2.x versions still start, with a warning to update, and anything newer than 2.27 is launched only after its own `--help` confirms the flags AgEnD pins (the legacy UI on kiro's v1 engine, the terminal UI on v2). A kiro-cli that can no longer run an instance that way is refused, not started on another engine (#1109). `kiro_ui: v3` is not supported yet (#849). Grok CLI 1.0.13 or later. Muse 1.3.0. Antigravity and OpenCode have no pinned version. Other versions usually work, but a new CLI release can change its screens, so AgEnD only claims a version after testing against it.
 

package/README.zh-TW.md

@@ -109,7 +109,7 @@ graph LR
 | Grok Build | `curl -fsSL https://x.ai/cli/install.sh \| bash` | `grok`（x.ai OAuth device flow）。CLI 需 1.0.13 以上，舊版會被伺服器拒絕，請執行 `grok update` |
 | Meta Muse Code | `mkdir -p "$HOME/.local/bin" && curl -fsSL https://api.meta.ai/muse-launcher.sh -o "$HOME/.local/bin/muse" && chmod +x "$HOME/.local/bin/muse" && MUSE_LAUNCHER_INSTALL=1 "$HOME/.local/bin/muse"`（launcher 會把 binary 放在自己旁邊，所以要先存檔） | `muse login` |
 
-**也可以在聊天室用 `/install-cli <backend>` 安裝**（Telegram 上是 `/install_cli`；beta、僅限 fleet 管理員），不必 SSH 進主機。它會在 fleet 視窗執行上表的指令，接著到安裝程式實際放置的位置找到 CLI，把那個目錄加進 fleet 的 PATH，並提供 `/login`。上表除了 Gemini CLI 以外的 backend 都可以用。
+**也可以在聊天室用 `/login <backend>` 安裝**（beta、僅限 fleet 管理員），不必 SSH 進主機：CLI 還沒安裝時，`/login` 會在 fleet 視窗執行上表的指令，到安裝程式實際放置的位置找到 CLI，把那個目錄加進 fleet 的 PATH，然後接著登入。單獨輸入 `/login` 會列出上表除了 Gemini CLI 以外的所有 backend（`/login gemini-cli` 仍可安裝它）。
 
 **已測試的 CLI 版本（AgEnD 2.1.9）**：Codex 0.155 到 0.159；Claude Code 2.1.286（首次啟動、trust、resume 畫面都從真實 CLI 擷取）；Kiro CLI 2.21 到 2.27 實際跑過；更舊的 2.x 仍可啟動，但會提醒更新；比 2.27 更新的版本，要先用它自己的 `--help` 確認 AgEnD 鎖定的參數（legacy UI 搭 kiro 的 v1 engine、terminal UI 搭 v2）還在才會啟動。若 kiro-cli 已無法這樣執行某個 instance，AgEnD 會拒絕啟動，不會換成別的 engine 執行（#1109）。`kiro_ui: v3` 尚未支援（#849）；Grok CLI 1.0.13 以上；Muse 1.3.0。Antigravity 與 OpenCode 沒有釘定版本。其他版本通常也能用，但 CLI 新版可能改動畫面，所以 AgEnD 只在實測過後才宣稱支援某個版本。
 

package/dist/channel/adapters/discord.d.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from "node:events";
-import { Client } from "discord.js";
+import { Client, ActionRowBuilder, ButtonBuilder } from "discord.js";
 import type { ChannelAdapter, ApprovalHandle, SendOpts, SentMessage, PermissionPrompt, Choice, AlertData, AdapterHealthSnapshot, TopicPresence } from "../types.js";
 import type { AccessManager } from "../access-manager.js";
 /** Curated ClassicBot backends for Discord's native slash-option dropdown. */
@@ -34,6 +34,8 @@ export interface DiscordAdapterOptions {
     categoryName?: string;
     generalChannelId?: string;
     registerCommands?: boolean;
+    /** This fleet's label, appended to the `/login` description. */
+    fleetLabel?: string;
     /** Test seams; production callers leave these unset. */
     clientFactory?: () => Client;
     now?: () => number;
@@ -41,6 +43,22 @@ export interface DiscordAdapterOptions {
     staleThresholdMs?: number;
     reconnectBaseDelayMs?: number;
 }
+/**
+ * Buttons laid out in rows of five (#1133). One row used to hold them all, and
+ * Discord rejects a row of more than five, so a chooser of seven backends
+ * could never be posted. More than 25 cannot be shown at all — an
+ * error, never a silent truncation.
+ */
+export declare function buttonRows(choices: ReadonlyArray<{
+    id: string;
+    label: string;
+}>): ActionRowBuilder<ButtonBuilder>[];
+/**
+ * A slash command description that names its fleet: every AgEnD bot in a
+ * guild registers `/login`, and the menu shows them side by side. Discord
+ * caps descriptions at 100 characters.
+ */
+export declare function withFleetLabel(description: string, label: string | undefined): string;
 export declare class DiscordAdapter extends EventEmitter implements ChannelAdapter {
     readonly type = "discord";
     readonly topology: "channels";
@@ -75,6 +93,7 @@ export declare class DiscordAdapter extends EventEmitter implements ChannelAdapt
     private categoryName;
     private generalChannelId?;
     private registerCommands;
+    private fleetLabel;
     private queue;
     private lastChatId;
     private attachmentUrls;

package/dist/channel/adapters/discord.js

@@ -6,7 +6,7 @@ import { join } from "node:path";
 import { pipeline } from "node:stream/promises";
 import { Readable } from "node:stream";
 import { createWriteStream } from "node:fs";
-import { Client, GatewayIntentBits, Partials, ActionRowBuilder, ButtonBuilder, ButtonStyle, StringSelectMenuBuilder, ApplicationCommandOptionType, ChannelType, PermissionFlagsBits, MessageFlags, Status, ActivityType, } from "discord.js";
+import { Client, GatewayIntentBits, Partials, ActionRowBuilder, ButtonBuilder, ButtonStyle, StringSelectMenuBuilder, ApplicationCommandOptionType, ChannelType, PermissionFlagsBits, MessageFlags, Events, Status, ActivityType, } from "discord.js";
 import { MessageQueue } from "../message-queue.js";
 import { splitTextFenceAware, truncatePreview, fenceBlock } from "../markdown-chunk.js";
 const DISCORD_MAX_LENGTH = 2000;
@@ -25,6 +25,62 @@ export const DISCORD_START_BACKEND_CHOICES = [
     { name: "Meta Muse Code", value: "muse" },
 ];
 const CLASSIC_START_BACKEND_SELECT_ID = "classic-start-backend";
+/** Discord's limits: 5 buttons to an action row, 5 rows to a message. */
+const BUTTONS_PER_ROW = 5;
+const MAX_BUTTON_ROWS = 5;
+/**
+ * Buttons laid out in rows of five (#1133). One row used to hold them all, and
+ * Discord rejects a row of more than five, so a chooser of seven backends
+ * could never be posted. More than 25 cannot be shown at all — an
+ * error, never a silent truncation.
+ */
+export function buttonRows(choices) {
+    if (choices.length > BUTTONS_PER_ROW * MAX_BUTTON_ROWS) {
+        throw new Error(`Discord shows at most ${BUTTONS_PER_ROW * MAX_BUTTON_ROWS} buttons on one message (${choices.length} requested)`);
+    }
+    const rows = [];
+    for (let i = 0; i < choices.length; i += BUTTONS_PER_ROW) {
+        rows.push(new ActionRowBuilder().addComponents(choices.slice(i, i + BUTTONS_PER_ROW).map(choice => new ButtonBuilder()
+            .setCustomId(choice.id)
+            .setLabel(choice.label.slice(0, 80))
+            .setStyle(ButtonStyle.Secondary))));
+    }
+    return rows;
+}
+/**
+ * The click's acknowledgement (#1133). The click itself was acknowledged on
+ * arrival (deferUpdate, inside Discord's 3 s window); a notice — why nothing
+ * happened — goes to the clicker alone as an ephemeral follow-up.
+ */
+function privateNotice(interaction, adapterId) {
+    let done = false;
+    return (notice) => {
+        if (done)
+            return;
+        done = true;
+        if (!notice)
+            return;
+        // Never throws into the caller: the fleet's decision is already made.
+        Promise.resolve().then(() => interaction.followUp({ content: notice, flags: MessageFlags.Ephemeral }))
+            .catch(err => console.warn(`[discord:${adapterId}] could not send a private button notice (${err.message})`));
+    };
+}
+/**
+ * A nonce-armed prompt button (`postNonceButtonPrompt`): `<prefix>:<32 hex>:<action>`.
+ * Fleet-manager validates these against the prompt that created them.
+ */
+const NONCE_BUTTON_ID = /^[a-z][a-z-]*:[0-9a-f]{32}:[a-z0-9-]+$/;
+/**
+ * A slash command description that names its fleet: every AgEnD bot in a
+ * guild registers `/login`, and the menu shows them side by side. Discord
+ * caps descriptions at 100 characters.
+ */
+export function withFleetLabel(description, label) {
+    if (!label)
+        return description;
+    const suffix = ` · ${label}`;
+    return description.length + suffix.length <= 100 ? description + suffix : `${description.slice(0, 100 - suffix.length - 1)}…${suffix}`;
+}
 export class DiscordAdapter extends EventEmitter {
     type = "discord";
     topology = "channels";
@@ -59,6 +115,7 @@ export class DiscordAdapter extends EventEmitter {
     categoryName;
     generalChannelId;
     registerCommands;
+    fleetLabel;
     queue;
     lastChatId = null;
     attachmentUrls = new Map();
@@ -73,6 +130,7 @@ export class DiscordAdapter extends EventEmitter {
         this.categoryName = opts.categoryName ?? "AgEnD Agents";
         this.generalChannelId = opts.generalChannelId;
         this.registerCommands = opts.registerCommands !== false;
+        this.fleetLabel = opts.fleetLabel;
         mkdirSync(this.inboxDir, { recursive: true });
         this.clientFactory = opts.clientFactory ?? (() => this.buildClient());
         this.now = opts.now ?? Date.now;
@@ -203,7 +261,7 @@ export class DiscordAdapter extends EventEmitter {
             if (packet.t)
                 this.lastDispatchAt = this.now();
         });
-        client.once("ready", () => void this.handleClientReady(client, generation));
+        client.once(Events.ClientReady, () => void this.handleClientReady(client, generation));
         // Reactions on the bot's messages, as inbound events (#408). Both add and remove
         // are reported so an agent can see an approval being withdrawn.
         const onReaction = async (reaction, user, action) => {
@@ -461,8 +519,12 @@ export class DiscordAdapter extends EventEmitter {
         // interaction expires (>3s). Catch to prevent crashing the entire daemon.
         client.on("interactionCreate", async (interaction) => {
             try {
-                if (!this.isCurrentClient(client, generation))
+                if (!this.isCurrentClient(client, generation)) {
+                    // A replaced client is destroyed, so this should never fire; if it
+                    // does, the click is not lost without a trace (#1133).
+                    console.info(`[discord:${this.id}] ignored an interaction on a replaced gateway client`);
                     return;
+                }
                 // Buttons: acknowledge IMMEDIATELY, before any guild/channel filtering.
                 // A button has a 3s ack window; any early return (unknown guild/channel)
                 // or a downstream no-op (e.g. the cancel button was already cleared) would
@@ -474,9 +536,14 @@ export class DiscordAdapter extends EventEmitter {
                         await interaction.deferUpdate();
                     }
                     catch { /* already acknowledged / unknown interaction */ }
-                    // Only act on buttons from the primary guild or a known open channel.
-                    if (interaction.guildId !== this.guildId && !this.openChannels.has(interaction.channelId ?? "")) {
-                        // console.log(`[discord] ignoring button from non-primary guild ${interaction.guildId} channel ${interaction.channelId}`);
+                    // Act on buttons from the primary guild or a known open channel, and
+                    // on nonce-armed prompts from anywhere (#1131): a slash command is
+                    // accepted from other guilds, so the prompt it posts there must be
+                    // clickable. Fleet-manager checks those fail-closed — nonce, chat,
+                    // message and fleet admin. Anything else is dropped, with a log line.
+                    if (interaction.guildId !== this.guildId && !this.openChannels.has(interaction.channelId ?? "")
+                        && !NONCE_BUTTON_ID.test(interaction.customId)) {
+                        console.info(`[discord:${this.id}] ignored a button outside the primary guild (guild ${interaction.guildId ?? "none"}, channel ${interaction.channelId ?? "none"})`);
                         return;
                     }
                     this.emitFromClient(client, generation, "callback_query", {
@@ -485,6 +552,7 @@ export class DiscordAdapter extends EventEmitter {
                         threadId: interaction.channelId,
                         messageId: interaction.message.id,
                         userId: interaction.user.id,
+                        ack: privateNotice(interaction, this.id),
                     });
                     return;
                 }
@@ -513,6 +581,7 @@ export class DiscordAdapter extends EventEmitter {
                         threadId: interaction.channelId,
                         messageId: interaction.message.id,
                         userId: interaction.user.id,
+                        ack: privateNotice(interaction, this.id),
                     });
                     return;
                 }
@@ -550,7 +619,8 @@ export class DiscordAdapter extends EventEmitter {
                         // Discord ephemeral interaction replies cannot.
                         const fullRestart = interaction.commandName === "restart"
                             && interaction.options.getString("mode") === "full";
-                        await interaction.deferReply({ ephemeral: interaction.commandName !== "update" && !fullRestart });
+                        const ephemeral = interaction.commandName !== "update" && !fullRestart;
+                        await interaction.deferReply(ephemeral ? { flags: MessageFlags.Ephemeral } : {});
                         // Extract options as key-value pairs for fleet-manager
                         const options = {};
                         for (const opt of interaction.options.data) {
@@ -894,7 +964,7 @@ export class DiscordAdapter extends EventEmitter {
             // a guild with the primary — only the primary owns the guild's commands).
             if (this.registerCommands)
                 try {
-                    await client.application?.commands.set([
+                    const registered = await client.application?.commands.set([
                         {
                             name: "start", description: t("slash.start"),
                             options: [{
@@ -963,7 +1033,7 @@ export class DiscordAdapter extends EventEmitter {
                                 }],
                         },
                         {
-                            name: "login", description: "🔒 " + t("slash.login"),
+                            name: "login", description: withFleetLabel("🔒 " + t("slash.login"), this.fleetLabel),
                             options: [
                                 {
                                     name: "backend", description: t("slash.option.login_backend"),
@@ -975,29 +1045,12 @@ export class DiscordAdapter extends EventEmitter {
                                         { name: "grok", value: "grok" },
                                         { name: "muse", value: "muse" },
                                         { name: "antigravity", value: "antigravity" },
+                                        { name: "opencode", value: "opencode" },
                                     ],
                                 },
                                 { name: "code", description: t("slash.option.login_code"), type: ApplicationCommandOptionType.String, required: false },
                                 { name: "cancel", description: t("slash.option.login_cancel"), type: ApplicationCommandOptionType.Boolean, required: false },
-                            ],
-                        },
-                        {
-                            name: "install-cli", description: "🔒 " + t("slash.install_cli"),
-                            options: [
-                                {
-                                    name: "backend", description: t("slash.option.install_backend"),
-                                    type: ApplicationCommandOptionType.String, required: false,
-                                    choices: [
-                                        { name: "claude-code", value: "claude-code" },
-                                        { name: "codex", value: "codex" },
-                                        { name: "kiro-cli", value: "kiro-cli" },
-                                        { name: "grok", value: "grok" },
-                                        { name: "muse", value: "muse" },
-                                        { name: "antigravity", value: "antigravity" },
-                                        { name: "opencode", value: "opencode" },
-                                    ],
-                                },
-                                { name: "cancel", description: t("slash.option.install_cancel"), type: ApplicationCommandOptionType.Boolean, required: false },
+                                { name: "reinstall", description: t("slash.option.login_reinstall"), type: ApplicationCommandOptionType.Boolean, required: false },
                             ],
                         },
                         { name: "clear", description: "🔒 " + t("slash.clear") },
@@ -1030,9 +1083,19 @@ export class DiscordAdapter extends EventEmitter {
                         },
                         { name: "cancel", description: t("slash.cancel") },
                     ]);
+                    this.emitFromClient(client, generation, "slash_registration", { ok: true, count: registered?.size });
                 }
                 catch (err) {
-                    // Non-fatal — slash commands may fail on network issues
+                    // Non-fatal, and no retry here (the next ready registers again) — but
+                    // never silent (#1131): Discord keeps the previous command list when a
+                    // registration is rejected, so a new command just never appears.
+                    const e = err;
+                    this.emitFromClient(client, generation, "slash_registration", {
+                        ok: false,
+                        code: e?.code,
+                        status: e?.status,
+                        message: String(e?.message ?? err),
+                    });
                 }
             if (!this.isCurrentClient(client, generation))
                 return;
@@ -1089,7 +1152,7 @@ export class DiscordAdapter extends EventEmitter {
         const chunks = splitTextFenceAware(reply, EMBED_MAX);
         const message = await interaction.editReply({ content: "", embeds: [{ description: chunks[0] }], components: [] });
         for (let i = 1; i < chunks.length; i++) {
-            await interaction.followUp({ ephemeral: true, embeds: [{ description: chunks[i] }] });
+            await interaction.followUp({ flags: MessageFlags.Ephemeral, embeds: [{ description: chunks[i] }] });
         }
         return message.id;
     }
@@ -1178,13 +1241,16 @@ export class DiscordAdapter extends EventEmitter {
     async editMessageRemoveButtons(chatId, messageId, text, threadId) {
         // Prefer the exact channel (handles forum-topic threads, which a GuildText
         // scan misses); fall back to scanning top-level text channels.
+        let exactError;
         try {
             const channel = await this._fetchTextChannel(threadId ?? chatId);
             const msg = await channel.messages.fetch(messageId);
             await msg.edit({ content: truncatePreview(text, DISCORD_MAX_LENGTH), components: [] });
             return;
         }
-        catch { /* not in that channel — fall through to scan */ }
+        catch (err) {
+            exactError = err; /* not in that channel — fall through to scan */
+        }
         try {
             const guild = await (await this.readyClient()).guilds.fetch(this.guildId);
             const channels = guild.channels.cache.filter((c) => c.type === ChannelType.GuildText);
@@ -1200,7 +1266,11 @@ export class DiscordAdapter extends EventEmitter {
                 }
             }
         }
-        catch { /* message gone — nothing to clear */ }
+        catch { /* no guild to scan — the edit failed */ }
+        // Nothing was edited: say so (#1133). The text may be the only place an
+        // outcome is shown (a cancel, a resend's result), and a caller that
+        // believes it landed has no reason to post it another way.
+        throw exactError instanceof Error ? exactError : new Error("the message could not be edited");
     }
     async deleteMessage(chatId, messageId, threadId) {
         // Prefer the exact channel (handles forum-topic threads, which a GuildText
@@ -1451,15 +1521,14 @@ export class DiscordAdapter extends EventEmitter {
         if (alert.choices && alert.choices.length > 0) {
             const channelId = opts?.threadId ?? chatId;
             const channel = await this._fetchTextChannel(channelId);
-            const row = new ActionRowBuilder();
-            for (const choice of alert.choices) {
-                row.addComponents(new ButtonBuilder()
-                    .setCustomId(choice.id)
-                    .setLabel(choice.label.slice(0, 80))
-                    .setStyle(ButtonStyle.Secondary));
-            }
-            const msg = await channel.send({ content: alert.message, components: [row] });
-            return { messageId: msg.id, chatId, threadId: opts?.threadId };
+            const msg = await channel.send({ content: alert.message, components: buttonRows(alert.choices) });
+            // The address this adapter's own callbacks report for these buttons
+            // (guild + channel as thread), not the caller's spelling of it (#1131).
+            // A native slash command addresses its channel as the chat; the button
+            // click then arrived with chatId = guild and every nonce check rejected it.
+            // Exactly the callback's value, even when no group_id is configured
+            // (guildId is then "" in both places).
+            return { messageId: msg.id, chatId: this.guildId, threadId: channelId };
         }
         return this.sendText(chatId, alert.message, opts);
     }
@@ -1480,16 +1549,9 @@ export class DiscordAdapter extends EventEmitter {
     async editAlert(chatId, messageId, alert, opts) {
         const channel = await this._fetchTextChannel(opts?.threadId ?? chatId);
         const msg = await channel.messages.fetch(messageId);
-        const row = new ActionRowBuilder();
-        for (const choice of alert.choices ?? []) {
-            row.addComponents(new ButtonBuilder()
-                .setCustomId(choice.id)
-                .setLabel(choice.label.slice(0, 80))
-                .setStyle(ButtonStyle.Secondary));
-        }
         await msg.edit({
             content: truncatePreview(alert.message, DISCORD_MAX_LENGTH),
-            components: row.components.length > 0 ? [row] : [],
+            components: buttonRows(alert.choices ?? []),
         });
     }
     // ── Topology: create channel ────────────────────────────────────────────