@songsid/agend 2.1.0-beta.44 → 2.1.0-beta.46

package/dist/fleet-context.d.ts

@@ -75,4 +75,10 @@ export interface FleetContext {
         lastError?: string;
     }>;
     getInstanceExecutionState?(name: string): "idle" | "working" | "stuck" | "paused" | null;
+    /**
+     * Show a model-selection inline keyboard for the given instance in a TG topic.
+     * Returns a fallback text message if no model list is available (caller should send it).
+     * Returns null if the menu was shown successfully.
+     */
+    promptModelMenu?(instanceName: string, userId: string, channelId: string, adapter: import("./channel/types.js").ChannelAdapter, chatId: string, threadId?: string): Promise<string | null>;
 }

package/dist/fleet-manager.d.ts

@@ -379,6 +379,12 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     private getModelOptions;
     /** `/model` slash handler (admin only). No arg → DC menu; `/model <name>` → apply directly. */
     private handleModelSlash;
+    /**
+     * Show a TG inline-keyboard model-selection menu. Reuses the same
+     * pendingModelSelects coordinator as the DC Select Menu path.
+     * 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>;
     /** 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

@@ -4317,6 +4317,45 @@ When users create specialized instances, suggest these configurations:
             await data.respond("Usage: /model <name> — e.g. /model sonnet");
         }
     }
+    /**
+     * Show a TG inline-keyboard model-selection menu. Reuses the same
+     * pendingModelSelects coordinator as the DC Select Menu path.
+     * Returns null on success (menu shown), or a fallback string to send.
+     */
+    async promptModelMenu(instanceName, userId, channelId, adapter, chatId, threadId) {
+        const options = await this.getModelOptions(instanceName);
+        if (options.length === 0) {
+            return `No model list available for ${instanceName}. Use \`/model <name>\` to set one directly.`;
+        }
+        const nonce = randomBytes(6).toString("hex");
+        const choices = options.slice(0, 25).map(o => ({
+            id: `${MODEL_SELECT_CALLBACK_PREFIX}${nonce}:${o.id}`,
+            label: o.description ? `${o.label} — ${o.description}` : o.label,
+        }));
+        const respond = async (text) => {
+            await adapter.sendText(chatId, text, { threadId });
+            return undefined;
+        };
+        const timer = setTimeout(() => {
+            const p = this.pendingModelSelects.get(nonce);
+            if (p) {
+                this.pendingModelSelects.delete(nonce);
+                p.respond("⏰ Model selection expired.").catch(() => { });
+            }
+        }, CLASSIC_BACKEND_SELECTION_TIMEOUT_MS);
+        timer.unref?.();
+        this.pendingModelSelects.set(nonce, { instanceName, model: "", userId, channelId, timer, respond, adapter, adapterChatId: chatId, adapterThreadId: threadId });
+        try {
+            await adapter.promptUser(chatId, `Choose a model for ${instanceName}:`, choices, { threadId });
+            return null; // menu shown
+        }
+        catch (err) {
+            this.pendingModelSelects.delete(nonce);
+            clearTimeout(timer);
+            this.logger.warn({ err, instanceName }, "TG model menu failed");
+            return `Usage: /model <name> — e.g. /model sonnet`;
+        }
+    }
     /** 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))
@@ -4335,8 +4374,39 @@ When users create specialized instances, suggest these configurations:
             return true;
         this.pendingModelSelects.delete(match[1]);
         clearTimeout(pending.timer);
-        const result = await this.applyModel(pending.instanceName, match[2]);
-        await pending.respond(result).catch(() => { });
+        const model = match[2];
+        // Send immediate "⏳ Switching..." feedback, then apply in background.
+        const progressText = `⏳ Switching ${pending.instanceName} to \`${model}\`…`;
+        let progressMsgId;
+        if (pending.adapter && pending.adapterChatId) {
+            // TG path: send a new message and capture messageId for later edit
+            try {
+                const sent = await pending.adapter.sendText(pending.adapterChatId, progressText, { threadId: pending.adapterThreadId });
+                progressMsgId = sent.messageId;
+            }
+            catch { /* non-fatal */ }
+        }
+        else {
+            // DC path: respond immediately with progress text
+            await pending.respond(progressText).catch(() => { });
+        }
+        // Apply model in background — don't await here (keeps callback handler fast)
+        void (async () => {
+            const result = await this.applyModel(pending.instanceName, model);
+            if (pending.adapter && pending.adapterChatId) {
+                if (progressMsgId) {
+                    pending.adapter.editMessage(pending.adapterChatId, progressMsgId, result, pending.adapterThreadId).catch(() => {
+                        pending.adapter.sendText(pending.adapterChatId, result, { threadId: pending.adapterThreadId }).catch(() => { });
+                    });
+                }
+                else {
+                    pending.adapter.sendText(pending.adapterChatId, result, { threadId: pending.adapterThreadId }).catch(() => { });
+                }
+            }
+            else {
+                await pending.respond(result).catch(() => { });
+            }
+        })();
         return true;
     }
     /** Apply a model to an instance: runtime paste (claude-code) or persist + restart (others). */