@songsid/agend 2.1.4-beta.30 → 2.1.4-beta.32

package/dist/fleet-manager.d.ts

@@ -1021,6 +1021,10 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
      * Returns null on success (menu shown), or a fallback string to send.
      */
     promptModelMenu(instanceName: string, userId: string, channelId: string, adapter: ChannelAdapter, chatId: string, threadId?: string): Promise<string | null>;
+    /** Cached-or-live account catalog behind "/model → more models" (claude). */
+    private claudeApiModelOptions;
+    /** Replace a consumed "/model" menu with the full account catalog tier. */
+    private expandClaudeModelMenu;
     /** Consume a `/model` selection callback. Returns true for all model-select ids (incl. stale). */
     private handleModelSelection;
     /** Apply a model to an instance: runtime paste (claude-code) or persist + restart (others). */

package/dist/fleet-manager.js

@@ -5109,7 +5109,7 @@ export class FleetManager {
      * longer parses) collapses the clicked message so the dead button stops
      * inviting clicks — the same courtesy the cancel button extends.
      */
-    consumeNonceCallback(prefix, actionRe, data, callbackAdapterId, receivingAdapter) {
+    consumeNonceCallback(prefix, actionRe, data, callbackAdapterId, receivingAdapter, staleHandling) {
         if (!data.callbackData.startsWith(prefix))
             return null;
         const match = data.callbackData.match(actionRe);
@@ -5121,7 +5121,17 @@ export class FleetManager {
             pending = undefined;
         if (!match || !pending) {
             const adapter = receivingAdapter ?? this.adapter;
-            adapter?.editMessageRemoveButtons?.(data.chatId, data.messageId, t("buttons.stale"), data.threadId).catch(() => { });
+            if (staleHandling?.keepText && adapter?.removeMessageButtons) {
+                adapter.removeMessageButtons(data.chatId, data.messageId, data.threadId)
+                    .catch(() => { });
+            }
+            else {
+                adapter?.editMessageRemoveButtons?.(data.chatId, data.messageId, t("buttons.stale"), data.threadId).catch(() => { });
+            }
+            if (staleHandling?.notice) {
+                adapter?.sendText(data.chatId, staleHandling.notice, { threadId: data.threadId })
+                    .catch(() => { });
+            }
             return "consumed";
         }
         // Bind the capability to the exact message/world that created it. Telegram
@@ -5294,7 +5304,12 @@ export class FleetManager {
         }
     }
     async handleTipDismiss(data, callbackAdapterId, receivingAdapter) {
-        const claimed = this.consumeNonceCallback(TIP_DISMISS_CALLBACK_PREFIX, /^tip-dismiss:([0-9a-f]+):(dismiss|confused)$/, data, callbackAdapterId, receivingAdapter);
+        const claimed = this.consumeNonceCallback(TIP_DISMISS_CALLBACK_PREFIX, /^tip-dismiss:([0-9a-f]+):(dismiss|confused)$/, data, callbackAdapterId, receivingAdapter, 
+        // A restart orphans the expiry timer, so tip buttons can outlive their
+        // nonce by days. Keep the tip text readable and always tell the clicker
+        // what to do next (the keyboard edit itself can be refused: Telegram
+        // rejects edits on messages older than 48h).
+        { keepText: true, notice: t("tips.expired_use_tips") });
         if (claimed === null)
             return false;
         if (claimed === "consumed")
@@ -5363,7 +5378,7 @@ export class FleetManager {
         return true;
     }
     async handleTipUnlock(data, callbackAdapterId, receivingAdapter) {
-        const claimed = this.consumeNonceCallback(TIP_UNLOCK_CALLBACK_PREFIX, /^tip-unlock:([0-9a-f]+):(unlock)$/, data, callbackAdapterId, receivingAdapter);
+        const claimed = this.consumeNonceCallback(TIP_UNLOCK_CALLBACK_PREFIX, /^tip-unlock:([0-9a-f]+):(unlock)$/, data, callbackAdapterId, receivingAdapter, { keepText: true, notice: t("tips.expired_use_tips") });
         if (claimed === null)
             return false;
         if (claimed === "consumed")
@@ -7504,6 +7519,13 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
                 if (previous?.models?.length)
                     env.models = previous.models;
             }
+            // Same protection for the extended catalog: one offline moment must not
+            // blank a good account list for the whole cache TTL.
+            if (!env.apiModels?.length) {
+                const previous = this.readCliEnv(backend);
+                if (previous?.apiModels?.length)
+                    env.apiModels = previous.apiModels;
+            }
             const path = this.cliEnvPath(backend);
             mkdirSync(dirname(path), { recursive: true });
             writeFileSync(path, JSON.stringify(env, null, 2));
@@ -7839,13 +7861,17 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
         // Raw id for ✓-matching options; display resolves an inherited CLI default.
         const { model: currentModel, display: currentDisplay } = this.resolveInstanceModel(name);
         const nonce = randomBytes(6).toString("hex");
-        const choices = options.slice(0, 25).map(o => ({
+        const isClaude = this.backendNameForInstance(name) === "claude-code";
+        const choices = options.slice(0, isClaude ? 24 : 25).map(o => ({
             id: `${MODEL_SELECT_CALLBACK_PREFIX}${nonce}:${o.id}`,
             label: this.modelChoiceLabel(o, currentModel),
         }));
+        if (isClaude) {
+            choices.push({ id: `${MODEL_SELECT_CALLBACK_PREFIX}${nonce}:__more__`, label: t("model.more") });
+        }
         const timer = setTimeout(() => this.pendingModelSelects.delete(nonce), CLASSIC_BACKEND_SELECTION_TIMEOUT_MS);
         timer.unref?.();
-        this.pendingModelSelects.set(nonce, { instanceName: name, model: "", userId: data.userId, channelId: data.channelId, timer, respond: data.respond });
+        this.pendingModelSelects.set(nonce, { instanceName: name, model: "", userId: data.userId, channelId: data.channelId, timer, respond: data.respond, respondChoices: data.respondChoices });
         try {
             await data.respondChoices(t("model.menu", `**${currentDisplay}**`), choices);
         }
@@ -7868,10 +7894,15 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
         }
         const { model: currentModel, display: currentDisplay } = this.resolveInstanceModel(instanceName);
         const nonce = randomBytes(6).toString("hex");
-        const choices = options.slice(0, 25).map(o => ({
+        const isClaude = this.backendNameForInstance(instanceName) === "claude-code";
+        // Keep the more-models entry inside Discord's 25-option select cap.
+        const choices = options.slice(0, isClaude ? 24 : 25).map(o => ({
             id: `${MODEL_SELECT_CALLBACK_PREFIX}${nonce}:${o.id}`,
             label: this.modelChoiceLabel(o, currentModel),
         }));
+        if (isClaude) {
+            choices.push({ id: `${MODEL_SELECT_CALLBACK_PREFIX}${nonce}:__more__`, label: t("model.more") });
+        }
         const respond = async (text) => {
             await adapter.sendText(chatId, text, { threadId });
             return undefined;
@@ -7899,6 +7930,62 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
             return t("model.usage");
         }
     }
+    /** Cached-or-live account catalog behind "/model → more models" (claude). */
+    async claudeApiModelOptions() {
+        const cached = this.readCliEnv("claude-code");
+        if (cached?.apiModels?.length)
+            return cached.apiModels;
+        const env = await this.probeBackend("claude-code");
+        return env?.apiModels ?? [];
+    }
+    /** Replace a consumed "/model" menu with the full account catalog tier. */
+    async expandClaudeModelMenu(pending) {
+        const expanded = await this.claudeApiModelOptions();
+        if (!expanded.length) {
+            await pending.respond(t("model.more_unavailable")).catch(() => { });
+            return;
+        }
+        const { model: currentModel, display: currentDisplay } = this.resolveInstanceModel(pending.instanceName);
+        const nonce = randomBytes(6).toString("hex");
+        const choices = expanded.slice(0, 25).map(o => ({
+            id: `${MODEL_SELECT_CALLBACK_PREFIX}${nonce}:${o.id}`,
+            label: this.modelChoiceLabel(o, currentModel),
+        }));
+        const timer = setTimeout(() => {
+            const p = this.pendingModelSelects.get(nonce);
+            if (p) {
+                this.pendingModelSelects.delete(nonce);
+                p.respond(t("model.selection_expired")).catch(() => { });
+            }
+        }, CLASSIC_BACKEND_SELECTION_TIMEOUT_MS);
+        timer.unref?.();
+        this.pendingModelSelects.set(nonce, { ...pending, model: "", timer });
+        try {
+            if (pending.respondChoices) {
+                // Discord select menu: edit the same interaction reply in place.
+                await pending.respondChoices(t("model.menu", `**${currentDisplay}**`), choices);
+                return;
+            }
+            if (pending.adapter && pending.adapterChatId) {
+                // Telegram: retire the tier-1 keyboard, then post the expanded menu.
+                if (pending.menuMessageId && pending.adapter.editMessageRemoveButtons) {
+                    await pending.adapter.editMessageRemoveButtons(pending.adapterChatId, pending.menuMessageId, t("model.more"), pending.adapterThreadId).catch(() => { });
+                }
+                const menuMessageId = await pending.adapter.promptUser(pending.adapterChatId, t("model.menu", currentDisplay), choices, { threadId: pending.adapterThreadId });
+                const fresh = this.pendingModelSelects.get(nonce);
+                if (fresh)
+                    fresh.menuMessageId = menuMessageId;
+                return;
+            }
+            await pending.respond(t("model.more_unavailable")).catch(() => { });
+        }
+        catch (err) {
+            this.pendingModelSelects.delete(nonce);
+            clearTimeout(timer);
+            this.logger.warn({ err, instanceName: pending.instanceName }, "Expanded model menu failed");
+            await pending.respond(t("model.more_unavailable")).catch(() => { });
+        }
+    }
     /** Consume a `/model` selection callback. Returns true for all model-select ids (incl. stale). */
     async handleModelSelection(data) {
         if (!data.callbackData.startsWith(MODEL_SELECT_CALLBACK_PREFIX))
@@ -7918,6 +8005,12 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
         this.pendingModelSelects.delete(match[1]);
         clearTimeout(pending.timer);
         const model = match[2];
+        // "More models…" is a navigation choice, not a model: swap the menu for the
+        // full account catalog (live /v1/models with [1m] variants).
+        if (model === "__more__") {
+            await this.expandClaudeModelMenu(pending);
+            return true;
+        }
         // Send immediate "⏳ Switching..." feedback, then apply in background.
         const progressText = t("model.switching", pending.instanceName, model);
         let progressMsgId;