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

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.
@@ -9224,9 +9243,10 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
                     const lastActivity = inst.classic
                         ? Math.max(persistedInboundAt ?? 0, readClassicLastActivityAt(this.dataDir, inst.name) ?? 0) || null
                         : (persistedInboundAt ?? this.lastActivityMs(inst.name)) || null;
-                    const backend = inst.classic
-                        ? this.classicChannels?.getBackendByInstance(inst.name, this.fleetConfig?.defaults.backend) ?? "claude-code"
-                        : config?.backend ?? "claude-code";
+                    const backend = this.backendNameForInstance(inst.name);
+                    const resolvedModel = this.resolveInstanceModel(inst.name);
+                    const effortStrategy = this.effortStrategyFor(inst.name);
+                    const resolvedEffort = this.resolveInstanceEffort(inst.name);
                     // Find claimed tasks for this instance
                     let currentTask = null;
                     try {
@@ -9241,6 +9261,14 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
                         ...inst,
                         description: config?.description ?? ("classicName" in inst ? inst.classicName : null),
                         backend,
+                        // Settings renders these runtime-effective values rather than the
+                        // sparse user-authored YAML. `auto` means the supported CLI is
+                        // using its own effort default; null is reserved for unsupported.
+                        model: resolvedModel.model,
+                        model_display: resolvedModel.display,
+                        model_source: resolvedModel.source,
+                        effort: effortStrategy === "unsupported" ? null : (resolvedEffort.effort ?? "auto"),
+                        effort_supported: effortStrategy !== "unsupported",
                         tool_set: config?.tool_set ?? "full",
                         general_topic: config?.general_topic ?? false,
                         // User activity is persisted by the daemon, so both the board and