@songsid/agend 2.1.4-beta.31 → 2.1.4-beta.33

package/dist/fleet-manager.js

@@ -3932,8 +3932,6 @@ export class FleetManager {
     }
     /** Handle outbound tool calls from a daemon instance */
     async handleOutboundFromInstance(instanceName, msg) {
-        if (this.worlds.size === 0)
-            return;
         this.touchActivity(instanceName);
         this.setTopicIcon(instanceName, "green");
         const tool = msg.tool;
@@ -3943,13 +3941,21 @@ export class FleetManager {
         const senderSessionName = msg.senderSessionName;
         const respond = (result, error) => {
             const ipc = this.instanceIpcClients.get(instanceName);
+            let sent = false;
             if (fleetRequestId) {
-                ipc?.send({ type: "fleet_outbound_response", fleetRequestId, result, error });
+                sent = ipc?.send({ type: "fleet_outbound_response", fleetRequestId, result, error }) ?? false;
             }
             else {
-                ipc?.send({ type: "fleet_outbound_response", requestId, result, error });
+                sent = ipc?.send({ type: "fleet_outbound_response", requestId, result, error }) ?? false;
+            }
+            if (!sent) {
+                this.logger.warn({ instanceName, tool, requestId, fleetRequestId, error }, "Fleet outbound result could not be returned — instance IPC is disconnected");
             }
         };
+        if (this.worlds.size === 0) {
+            respond(null, "Channel adapters are not ready — retry shortly");
+            return;
+        }
         // Resolve threadId: use sender's topic_id if sender is a known fleet instance,
         // fall back to general topic if sender is unknown, or IPC owner if no sender.
         const senderInstanceName = senderSessionName && this.fleetConfig?.instances[senderSessionName]
@@ -3994,17 +4000,30 @@ export class FleetManager {
         if (tool === "reply") {
             const ticket = this.replyDeduper.begin(instanceName, String(args.text ?? ""), Array.isArray(args.files) ? args.files : []);
             if (ticket.duplicate) {
-                this.logger.info({ instanceName }, "Duplicate reply suppressed — replaying the original send's outcome");
+                this.logger.info({ instanceName }, "Concurrent duplicate reply joined — awaiting the original send's outcome");
                 ticket.subscribe(respond);
                 return;
             }
             const original = respond;
             const respondAndRecord = (result, error) => {
                 ticket.complete(result, error);
+                // Return the platform outcome first. Bookkeeping below must never turn
+                // a confirmed Discord/Telegram POST into a tool error if a secondary
+                // log/button side effect happens to throw.
                 original(result, error);
+                // The adapter resolves only after the platform POST returns. Keep
+                // outward-facing logs/cancel state on the same confirmation boundary:
+                // a routed-but-failed reply is not a delivered reply.
+                if (!error && result != null) {
+                    try {
+                        this.afterReplyRouted(instanceName, args, senderSessionName);
+                    }
+                    catch (err) {
+                        this.logger.warn({ err, instanceName }, "Reply delivered but post-delivery bookkeeping failed");
+                    }
+                }
             };
             if (routeToolCall(outAdapter, tool, args, threadId, respondAndRecord)) {
-                this.afterReplyRouted(instanceName, args, senderSessionName);
                 return;
             }
             // routeToolCall knows "reply"; not handling it means the world changed.
@@ -5109,7 +5128,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 +5140,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 +5323,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 +5397,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")