@songsid/agend 2.1.11-beta.4 → 2.1.11-beta.5

package/dist/fleet-manager.d.ts

@@ -955,6 +955,11 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     };
     /** Start the primary adapter (backward-compatible, sets this.adapter) */
     private startSingleAdapter;
+    /**
+     * Register a Telegram connection's command menus; any other kind of channel has none to register. Started, not
+     * awaited: a slow api.telegram.org must never hold up the adapter's login (each call has its own timeout). Never fatal.
+     */
+    private registerTelegramCommandsFor;
     /** Start an additional (non-primary) adapter */
     private startAdditionalAdapter;
     /** Connect IPC to a single instance with all handlers */
@@ -2131,6 +2136,11 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     private effortSuffix;
     /** Read recent chat log for agent context */
     private getRecentChatLog;
+    /**
+     * The ClassicBot /start replies say how to talk to the agent, and that differs by platform (#1196): on Telegram
+     * you @mention the bot; on Discord, @mention or `/chat`. The chat's platform is the adapter it came through.
+     */
+    private classicStartKey;
     /** Return a user-facing blocker without mutating ClassicBot state. */
     private validateClassicStart;
     private isBackendInstalled;

package/dist/fleet-manager.js

@@ -2794,10 +2794,8 @@ export class FleetManager {
         // it before lifecycle.start() can turn a crash-loop daemon's dead pane into
         // a falsely running instance when lifecycle.start() returns early.
         this.instanceProcessStatus.delete(name);
-        try {
-            unlinkSync(join(this.getInstanceDir(name), "crash-state.json"));
-        }
-        catch { /* consumed or absent */ }
+        // Recovery intent belongs to Daemon.start. lifecycle.start can return
+        // before reaching it, so an await here is not proof the marker was read.
         // Auto-connect IPC — daemon.start() ensures socket is ready before resolving
         await this.connectIpcToInstance(name);
         this.requestDiscordUsagePresenceRefresh();
@@ -4517,7 +4515,8 @@ export class FleetManager {
                 return;
             await this.dispatchSlash(data, adapterId, adapter);
         }, this.logger, "adapter.slash_command"));
-        await this.topicCommands.registerBotCommands().catch(e => this.logger.warn({ err: e }, "registerBotCommands failed (non-fatal)"));
+        // This adapter's own Telegram menus — each Telegram adapter registers its own when it starts (#1191).
+        this.registerTelegramCommandsFor(channelConfig);
         // Background-probe each backend's CLI env (version/models) → cli-env cache.
         // Non-blocking: /model & status views read the cache; never delays startup.
         this.probeCliEnvs();
@@ -4572,6 +4571,15 @@ export class FleetManager {
             this.pruneStaleExternalSessions().catch(err => this.logger.debug({ err }, "Session prune failed"));
         }, 5 * 60 * 1000);
     }
+    /**
+     * Register a Telegram connection's command menus; any other kind of channel has none to register. Started, not
+     * awaited: a slow api.telegram.org must never hold up the adapter's login (each call has its own timeout). Never fatal.
+     */
+    registerTelegramCommandsFor(channelConfig) {
+        if (channelConfig.type !== "telegram")
+            return;
+        void this.topicCommands.registerBotCommands(channelConfig).catch(e => this.logger.warn({ err: e, adapterId: channelConfig.id ?? channelConfig.type }, "registerBotCommands failed (non-fatal)"));
+    }
     /** Start an additional (non-primary) adapter */
     async startAdditionalAdapter(channelConfig, registerCommands = true, onStarted) {
         const adapterId = channelConfig.id ?? channelConfig.type;
@@ -4647,6 +4655,9 @@ export class FleetManager {
             this.logger.error({ err, adapterId }, "Additional adapter fatal error");
             this.restartAdapter(adapter, adapterId).catch(() => { });
         });
+        // A secondary Telegram connection (a ClassicBot next to a Discord fleet, say) has menus of its own to register —
+        // at fleet start, on retry, and when Settings rebinds it or rotates its token: all of them start it here (#1191).
+        this.registerTelegramCommandsFor(channelConfig);
         // Register lifecycle listeners before login; a fast ready/error must not be lost.
         await adapter.start();
         if (channelConfig.group_id) {
@@ -11923,6 +11934,14 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
             return undefined;
         }
     }
+    /**
+     * The ClassicBot /start replies say how to talk to the agent, and that differs by platform (#1196): on Telegram
+     * you @mention the bot; on Discord, @mention or `/chat`. The chat's platform is the adapter it came through.
+     */
+    classicStartKey(key, adapterId) {
+        const adapter = (adapterId ? this.worlds.get(adapterId)?.adapter : undefined) ?? this.adapter;
+        return adapter?.type === "telegram" ? `${key}.telegram` : key;
+    }
     /** Return a user-facing blocker without mutating ClassicBot state. */
     validateClassicStart(channelId, userId, guildId, adapterId) {
         if (!this.classicChannels)
@@ -11944,7 +11963,7 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
             return t("classic.not_authorized_guild");
         }
         if (this.classicChannels.isClassicChannel(channelId, adapterId))
-            return t("classic.already_active");
+            return t(this.classicStartKey("classic.already_active", adapterId));
         if (this.routing.resolve(channelId))
             return t("classic.topic_bound");
         return undefined;
@@ -12131,7 +12150,7 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
             classicChannels.toggleCollab(channelId, adapterId);
         }
         this.logger.info({ channelId, adapterId, instanceName, userId }, "Classic channel started");
-        return t("classic.started");
+        return t(this.classicStartKey("classic.started", adapterId));
     }
     /** Handle /stop slash command — unregister classic channel */
     async handleClassicStop(channelId, adapterId) {