@songsid/agend 2.1.4-beta.21 → 2.1.4-beta.22

package/dist/fleet-context.d.ts

@@ -58,6 +58,8 @@ export interface FleetContext {
     getDeliveryEpoch?(name: string): number;
     /** Subscription provider IDs used by running or paused fleet/Classic instances. */
     getActiveUsageProviderIds?(): ReadonlySet<string>;
+    /** Effective backend IDs used by running or paused fleet/Classic instances. */
+    getActiveBackendIds?(): ReadonlySet<string>;
     toggleFleetCollab(instanceName: string): boolean;
     /** Apply a model to an instance (runtime paste or persist + restart). Returns a status string. */
     applyModel(instanceName: string, model: string): Promise<string>;

package/dist/fleet-manager.d.ts

@@ -289,6 +289,8 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
      * Classic channels use their effective backend merge chain, not the raw row.
      */
     getActiveUsageProviderIds(): ReadonlySet<string>;
+    /** Effective backends with a running or persisted-paused fleet/Classic instance. */
+    getActiveBackendIds(): ReadonlySet<string>;
     isClassicInstance(name: string): boolean;
     private cacheInstanceExecutionState;
     private cancelIdleButtonRetirement;
@@ -600,13 +602,14 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
      */
     private postNonceButtonPrompt;
     /**
-     * Claim a nonce-armed callback exactly once.
+     * Validate a nonce-armed callback and optionally claim it exactly once.
      *
      * Returns:
      *  - null       — the callback is not for this prefix; try the next handler
      *  - "consumed" — for this prefix but stale/denied/malformed; stop dispatch
-     *  - the entry+action — the click is authorized and now claimed (removed
-     *    from the map before any await, so double clicks cannot act twice)
+     *  - the entry+action — the click is authorized; consuming actions are
+     *    claimed before any await, while explicitly non-consuming actions keep
+     *    the prompt available for a later decision
      *
      * A stale click (expired nonce, or a pre-upgrade button whose payload no
      * longer parses) collapses the clicked message so the dead button stops

package/dist/fleet-manager.js

@@ -56,7 +56,7 @@ import { GENERAL_PAUSE_ERROR, isGeneralInstance } from "./general-instance.js";
 import { loadOrCreateWebToken, WEB_TOKEN_INVALID_MESSAGE } from "./web-auth.js";
 import { RestartProgress } from "./restart-progress.js";
 import { collectRedundantInstanceDefaultPaths } from "./fleet-yaml-slim.js";
-import { canUnlockAdvancedTips, DailyTipScheduler, selectTip } from "./tips.js";
+import { canUnlockAdvancedTips, DailyTipScheduler, selectTip, visibleTipLevels, } from "./tips.js";
 import { getTmuxSession } from "./config.js";
 export function resolveReplyThreadId(argsThreadId, instanceConfig) {
     if (typeof argsThreadId === "string" && argsThreadId.length > 0) {
@@ -835,13 +835,22 @@ export class FleetManager {
      */
     getActiveUsageProviderIds() {
         const providers = new Set();
+        for (const backend of this.getActiveBackendIds()) {
+            const provider = usageProviderIdForBackend(backend);
+            if (provider)
+                providers.add(provider);
+        }
+        return providers;
+    }
+    /** Effective backends with a running or persisted-paused fleet/Classic instance. */
+    getActiveBackendIds() {
+        const backends = new Set();
         const add = (name, backend) => {
             const status = this.getInstanceStatus(name);
             if (status !== "running" && status !== "paused")
                 return;
-            const provider = usageProviderIdForBackend(backend);
-            if (provider)
-                providers.add(provider);
+            if (backend)
+                backends.add(backend);
         };
         for (const [name, config] of Object.entries(this.fleetConfig?.instances ?? {})) {
             // loadFleetConfig() has already merged the fleet default into each row.
@@ -850,7 +859,7 @@ export class FleetManager {
         for (const channel of this.classicChannels?.getAll() ?? []) {
             add(channel.instanceName, this.classicChannels?.getBackendByInstance(channel.instanceName, this.fleetConfig?.defaults?.backend));
         }
-        return providers;
+        return backends;
     }
     isClassicInstance(name) {
         return this.classicChannels?.getAll().some(channel => channel.instanceName === name) ?? false;
@@ -5039,19 +5048,20 @@ export class FleetManager {
         }
     }
     /**
-     * Claim a nonce-armed callback exactly once.
+     * Validate a nonce-armed callback and optionally claim it exactly once.
      *
      * Returns:
      *  - null       — the callback is not for this prefix; try the next handler
      *  - "consumed" — for this prefix but stale/denied/malformed; stop dispatch
-     *  - the entry+action — the click is authorized and now claimed (removed
-     *    from the map before any await, so double clicks cannot act twice)
+     *  - the entry+action — the click is authorized; consuming actions are
+     *    claimed before any await, while explicitly non-consuming actions keep
+     *    the prompt available for a later decision
      *
      * A stale click (expired nonce, or a pre-upgrade button whose payload no
      * 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, consume = true) {
         if (!data.callbackData.startsWith(prefix))
             return null;
         const match = data.callbackData.match(actionRe);
@@ -5085,11 +5095,13 @@ export class FleetManager {
             this.logger.warn({ instanceName: pending.instanceName, prefix, userId: data.userId }, "Rejected unauthorized or mismatched button callback");
             return "consumed";
         }
-        // Claim before any await: double clicks and duplicate callback delivery can
-        // never act twice.
-        this.pendingNonceButtons.delete(match[1]);
-        if (pending.timer)
-            clearTimeout(pending.timer);
+        if (consume) {
+            // Claim before any await: double clicks and duplicate callback delivery
+            // can never act twice for state-changing actions.
+            this.pendingNonceButtons.delete(match[1]);
+            if (pending.timer)
+                clearTimeout(pending.timer);
+        }
         return { entry: pending, action: match[2] };
     }
     /** Collapse a consumed prompt's buttons into a final status line. */
@@ -5128,7 +5140,9 @@ export class FleetManager {
     }
     pickAvailableTip() {
         const state = this.readTipState();
-        return state ? selectTip(state.dismissed, Math.random, state.advancedUnlocked) : null;
+        return state
+            ? selectTip(state.dismissed, Math.random, state.advancedUnlocked, this.getActiveBackendIds())
+            : null;
     }
     tipText(tip) {
         return getLocale() === "zh-TW" ? tip.text_zh : tip.text_en;
@@ -5158,12 +5172,14 @@ export class FleetManager {
         const state = this.readTipState();
         if (!state)
             return "unavailable";
-        if (!state.advancedUnlocked && canUnlockAdvancedTips(state.dismissed)) {
+        if (!state.advancedUnlocked
+            && visibleTipLevels(true).has("advanced")
+            && canUnlockAdvancedTips(state.dismissed)) {
             return await this.promptAdvancedTipUnlock(generalName, adapter, chatId, threadId)
                 ? "posted"
                 : "unavailable";
         }
-        const tip = selectTip(state.dismissed, Math.random, state.advancedUnlocked);
+        const tip = selectTip(state.dismissed, Math.random, state.advancedUnlocked, this.getActiveBackendIds());
         if (!tip)
             return this.scheduler ? "empty" : "unavailable";
         const nonce = await this.postNonceButtonPrompt({
@@ -5175,7 +5191,10 @@ export class FleetManager {
             chatId,
             threadId,
             message: this.formatTip(tip),
-            choices: [{ action: "dismiss", label: t("tips.dismiss") }],
+            choices: [
+                { action: "dismiss", label: t("tips.dismiss") },
+                { action: "confused", label: t("tips.confused") },
+            ],
             // Expiry removes only the stale button; the useful tip remains readable.
             expiredText: this.formatTip(tip),
             extra: { allowAnyUser: true, tipId: tip.id },
@@ -5217,12 +5236,40 @@ export class FleetManager {
         }
     }
     async handleTipDismiss(data, callbackAdapterId, receivingAdapter) {
-        const claimed = this.consumeNonceCallback(TIP_DISMISS_CALLBACK_PREFIX, /^tip-dismiss:([0-9a-f]+):(dismiss)$/, data, callbackAdapterId, receivingAdapter);
+        const isConfused = data.callbackData.endsWith(":confused");
+        const claimed = this.consumeNonceCallback(TIP_DISMISS_CALLBACK_PREFIX, /^tip-dismiss:([0-9a-f]+):(dismiss|confused)$/, data, callbackAdapterId, receivingAdapter, !isConfused);
         if (claimed === null)
             return false;
         if (claimed === "consumed")
             return true;
         const { entry: pending } = claimed;
+        if (claimed.action === "confused") {
+            if (!pending.tipId || !data.userId || !this.scheduler) {
+                this.logger.error({ tipId: pending.tipId, userId: data.userId }, "Tip feedback has incomplete persistence context");
+                await pending.adapter.sendText(pending.chatId, t("tips.unavailable"), { threadId: pending.threadId });
+                return true;
+            }
+            try {
+                this.scheduler.db.recordTipFeedback(data.userId, pending.tipId, "confused");
+            }
+            catch (err) {
+                this.logger.warn({ err, tipId: pending.tipId, userId: data.userId }, "Failed to persist tip feedback");
+                await pending.adapter.sendText(pending.chatId, t("tips.unavailable"), { threadId: pending.threadId }).catch(() => { });
+                return true;
+            }
+            this.logger.info({
+                tipId: pending.tipId,
+                userId: data.userId,
+                feedbackType: "confused",
+            }, "Tip feedback recorded");
+            this.eventLog?.insert(pending.instanceName, "tip_feedback", {
+                tipId: pending.tipId,
+                userId: data.userId,
+                feedbackType: "confused",
+            });
+            await pending.adapter.sendText(pending.chatId, t("tips.feedback_recorded"), { threadId: pending.threadId }).catch(err => this.logger.warn({ err, tipId: pending.tipId }, "Failed to acknowledge tip feedback"));
+            return true;
+        }
         if (!pending.tipId || !data.userId || !this.scheduler) {
             this.logger.error({ tipId: pending.tipId, userId: data.userId }, "Tip dismissal has incomplete persistence context");
             await this.retireNonceButtons(pending, pending.messageId ?? data.messageId, t("tips.unavailable"));