@songsid/agend 2.1.0-beta.23 → 2.1.0-beta.4

package/dist/fleet-manager.js

@@ -5,13 +5,13 @@ import { join, dirname, basename } from "node:path";
 import { fileURLToPath } from "node:url";
 import { getAgendHome, ensureWorkspaceGit } from "./paths.js";
 import { sdNotify } from "./sd-notify.js";
-import { isScalar, parseDocument } from "yaml";
+import yaml from "js-yaml";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 /** Fallback access policy for a channel with no `access:` block — open (no gate). */
 const DEFAULT_OPEN_ACCESS = { mode: "open", allowed_users: [], max_pending_codes: 0, code_expiry_minutes: 0 };
 import { isProbeableRouteTarget } from "./fleet-context.js";
-import { loadFleetConfig, loadRawFleetConfig, DEFAULT_COST_GUARD, DEFAULT_DAILY_SUMMARY, DEFAULT_INSTANCE_CONFIG } from "./config.js";
+import { loadFleetConfig, DEFAULT_COST_GUARD, DEFAULT_DAILY_SUMMARY, DEFAULT_INSTANCE_CONFIG } from "./config.js";
 import { EventLog } from "./event-log.js";
 import { AdapterWorld } from "./adapter-world.js";
 import { CostGuard, formatCents } from "./cost-guard.js";
@@ -39,7 +39,7 @@ import { handleViewRequest, isViewPath } from "./view-api.js";
 import { handleSettingsRequest } from "./settings-api.js";
 import { setLocale, detectLocale, t } from "./locale.js";
 import { handleAgentRequest } from "./agent-endpoint.js";
-import { ClassicChannelManager, getClassicBackendChoices, isSelectableClassicBackend } from "./classic-channel-manager.js";
+import { ClassicChannelManager } from "./classic-channel-manager.js";
 import { getTmuxSession } from "./config.js";
 export function resolveReplyThreadId(argsThreadId, instanceConfig) {
     if (typeof argsThreadId === "string" && argsThreadId.length > 0) {
@@ -58,8 +58,6 @@ const CANCEL_BTN_MAX_RETRIES = 3;
  * buttons no clear trigger reached (e.g. a scheduled/HTTP turn that never called
  * reply). 5min (not the old 2s idle-watch) so Thinking isn't misread as idle. */
 const CANCEL_BTN_IDLE_CHECK_INTERVAL_MS = 5 * 60_000;
-const CLASSIC_BACKEND_SELECTION_TIMEOUT_MS = 60_000;
-const CLASSIC_BACKEND_CALLBACK_PREFIX = "classic-backend:";
 export class FleetManager {
     dataDir;
     children = new Map();
@@ -67,9 +65,6 @@ export class FleetManager {
     /** @deprecated Use lifecycle.daemons — kept for backward compat */
     get daemons() { return this.lifecycle.daemons; }
     fleetConfig = null;
-    rawFleetConfig = {};
-    rawFleetDocument = null;
-    savedFleetConfigSnapshot = null;
     adapter = null;
     worlds = new Map();
     adapters = new Map(); // derived view for backward compat
@@ -98,8 +93,6 @@ export class FleetManager {
     // Topic icon + auto-archive state
     topicIcons = {};
     lastActivity = new Map();
-    /** Latest pane-derived execution snapshot reported by each daemon. */
-    instanceStateCache = new Map();
     lastInboundUser = new Map(); // instanceName → last username
     // Active "🛑 Cancel" buttons, tracked per button (keyed by messageId) rather
     // than one-per-instance. A button is retired (deleted, with bounded retry) on
@@ -111,7 +104,6 @@ export class FleetManager {
     topicArchiver;
     controlClient = null;
     classicChannels = null;
-    pendingClassicStarts = new Map();
     // Model failover state
     failoverActive = new Map(); // instance → current failover model
     // IPC reconnect: tracks instances being intentionally stopped (skip reconnect)
@@ -168,7 +160,6 @@ export class FleetManager {
         const instances = Object.keys(this.fleetConfig?.instances ?? {}).map(name => ({
             name,
             status: this.getInstanceStatus(name),
-            state: this.getInstanceExecutionState(name),
             ipc: this.instanceIpcClients.has(name),
             costCents: this.costGuard?.getDailyCostCents(name) ?? 0,
             rateLimits: this.statuslineWatcher.getRateLimits(name) ?? null,
@@ -183,21 +174,9 @@ export class FleetManager {
     }
     /** Load fleet.yaml and build routing table */
     loadConfig(configPath) {
-        this.configPath = configPath;
-        const source = existsSync(configPath) ? readFileSync(configPath, "utf-8") : "{}\n";
-        this.rawFleetDocument = parseDocument(source, { keepSourceTokens: true });
-        if (this.rawFleetDocument.errors.length > 0) {
-            throw new Error(`Invalid fleet.yaml: ${this.rawFleetDocument.errors[0].message}`);
-        }
-        this.rawFleetConfig = loadRawFleetConfig(configPath);
         this.fleetConfig = loadFleetConfig(configPath);
-        this.savedFleetConfigSnapshot = structuredClone(this.fleetConfig);
         return this.fleetConfig;
     }
-    /** User-authored fleet.yaml, before defaults are merged into instances. */
-    getRawFleetConfig() {
-        return structuredClone(this.rawFleetConfig);
-    }
     /** Build topic routing table: { topicId -> RouteTarget } */
     buildRoutingTable() {
         if (this.fleetConfig) {
@@ -286,19 +265,14 @@ export class FleetManager {
      */
     bindInstanceAdapter(name, adapterId, fromInbound = false) {
         const cfg = this.fleetConfig?.instances[name];
-        if (fromInbound) {
-            // Skip inbound-derived binding for any instance that doesn't have an
-            // explicit channel_id — those default to primary adapter deterministically.
-            // This prevents a non-deterministic race where whichever adapter delivers
-            // first after restart wins the binding.
-            if (cfg?.general_topic || cfg?.channel_id)
-                return;
-            if (cfg && !cfg.channel_id)
-                return; // fleet instance without explicit binding → use primary
-            // Classic instance: don't override an existing binding (authoritative from /start)
-            if (this.classicChannels?.getChannelIdByInstance(name) !== undefined && this.instanceWorldBinding.has(name))
-                return;
-        }
+        if (fromInbound && (cfg?.general_topic || cfg?.channel_id))
+            return;
+        // A classic instance is bound authoritatively at /start. Don't let an inbound
+        // (seen by every same-guild bot) override an existing binding — but if there
+        // is none yet (e.g. after a restart, before v2.1 persistence), allow inbound
+        // to re-establish it so replies don't fall back to the primary bot forever.
+        if (fromInbound && this.classicChannels?.getChannelIdByInstance(name) !== undefined && this.instanceWorldBinding.has(name))
+            return;
         this.instanceWorldBinding.set(name, adapterId);
     }
     getInstanceStatus(name) {
@@ -316,25 +290,6 @@ export class FleetManager {
             return "crashed";
         }
     }
-    getInstanceExecutionState(name) {
-        if (this.lifecycle.isPaused(name))
-            return null;
-        return this.instanceStateCache.get(name)?.state ?? null;
-    }
-    cacheInstanceExecutionState(name, msg) {
-        const state = msg.state;
-        if (state !== "idle" && state !== "working" && state !== "stuck")
-            return;
-        const previous = this.instanceStateCache.get(name);
-        const now = Date.now();
-        const numberOr = (value, fallback) => typeof value === "number" && Number.isFinite(value) ? value : fallback;
-        this.instanceStateCache.set(name, {
-            state,
-            unchangedForMs: numberOr(msg.unchangedForMs, previous?.unchangedForMs ?? 0),
-            observedAt: numberOr(msg.observedAt, now),
-            stateChangedAt: numberOr(msg.stateChangedAt, previous?.state === state ? previous.stateChangedAt : now),
-        });
-    }
     /** Single delivery facade: wake an auto-paused CLI before sending to daemon IPC. */
     async deliverToInstance(instanceName, payload) {
         if (this.lifecycle.isPaused(instanceName)) {
@@ -412,7 +367,6 @@ export class FleetManager {
     }
     async stopInstance(name) {
         this.failoverActive.delete(name);
-        this.instanceStateCache.delete(name);
         return this.lifecycle.stop(name);
     }
     /** Restart a single instance, reloading fleet.yaml first to pick up config changes. */
@@ -998,8 +952,6 @@ export class FleetManager {
             await this.handleInboundMessage(msg);
         }, this.logger, "adapter.message"));
         this.adapter.on("callback_query", safeHandler(async (data) => {
-            if (await this.handleClassicBackendSelection(data))
-                return;
             if (data.callbackData.startsWith("hang:")) {
                 const parts = data.callbackData.split(":");
                 const action = parts[1];
@@ -1038,14 +990,8 @@ export class FleetManager {
         // Handle classic bot slash commands (/start, /stop, /chat, /compact, /save, /load)
         this.adapter.on("slash_command", safeHandler(async (data) => {
             if (data.command === "start") {
-                const requestedBackend = typeof data.options?.backend === "string" ? data.options.backend : undefined;
-                if (requestedBackend) {
-                    const reply = await this.handleClassicStart(data.channelId, data.channelName, data.userId, data.guildId, adapterId, requestedBackend);
-                    await data.respond(reply);
-                }
-                else {
-                    await this.beginClassicBackendSelection(data, this.adapter);
-                }
+                const reply = await this.handleClassicStart(data.channelId, data.channelName, data.userId, data.guildId, adapterId);
+                await data.respond(reply);
             }
             else if (data.command === "stop") {
                 const reply = await this.handleClassicStop(data.channelId, adapterId);
@@ -1289,8 +1235,6 @@ export class FleetManager {
             await this.handleInboundMessage(msg);
         }, this.logger, `adapter[${adapterId}].message`));
         adapter.on("callback_query", safeHandler(async (data) => {
-            if (await this.handleClassicBackendSelection(data))
-                return;
             if (data.callbackData.startsWith("hang:")) {
                 const parts = data.callbackData.split(":");
                 const action = parts[1];
@@ -1325,14 +1269,8 @@ export class FleetManager {
         // Slash commands: classic bot + admin commands
         adapter.on("slash_command", safeHandler(async (data) => {
             if (data.command === "start") {
-                const requestedBackend = typeof data.options?.backend === "string" ? data.options.backend : undefined;
-                if (requestedBackend) {
-                    const reply = await this.handleClassicStart(data.channelId, data.channelName, data.userId, data.guildId, adapterId, requestedBackend);
-                    await data.respond(reply);
-                }
-                else {
-                    await this.beginClassicBackendSelection(data, adapter);
-                }
+                const reply = await this.handleClassicStart(data.channelId, data.channelName, data.userId, data.guildId, adapterId);
+                await data.respond(reply);
             }
             else if (data.command === "stop") {
                 const reply = await this.handleClassicStop(data.channelId, adapterId);
@@ -1594,16 +1532,10 @@ export class FleetManager {
                 else if (msg.type === "fleet_set_description") {
                     this.handleSetDescription(name, msg);
                 }
-                else if (msg.type === "instance_state" || msg.type === "instance_state_response") {
-                    this.cacheInstanceExecutionState(name, msg);
-                }
             }, this.logger, `ipc.message[${name}]`));
             // Ask daemon for any sessions that registered before we connected
             // (fixes race condition where mcp_ready was broadcast before fleet manager connected)
             ipc.send({ type: "query_sessions" });
-            // The initial state transition may have happened before FleetManager
-            // connected, so seed the cache instead of waiting for another transition.
-            ipc.send({ type: "query_instance_state", requestId: `fleet-state-${Date.now()}` });
             this.logger.debug({ name }, "Connected to instance IPC");
             if (!this.statuslineWatcher.has(name)) {
                 this.statuslineWatcher.watch(name);
@@ -1866,21 +1798,9 @@ export class FleetManager {
                         }
                     }
                     const channelName = msg.username || chatId;
-                    const requestedBackend = text.slice("/start".length).trim().split(/\s+/, 1)[0] || undefined;
-                    if (requestedBackend) {
-                        // handleClassicStart binds the instance to this adapter authoritatively.
-                        const reply = await this.handleClassicStart(chatId, channelName, msg.userId, undefined, msg.adapterId, requestedBackend);
-                        await msgAdapter?.sendText(chatId, reply);
-                    }
-                    else if (msgAdapter) {
-                        await this.beginClassicBackendSelection({
-                            command: "start",
-                            channelId: chatId,
-                            channelName,
-                            userId: msg.userId,
-                            respond: async (reply) => (await msgAdapter.sendText(chatId, reply)).messageId,
-                        }, msgAdapter);
-                    }
+                    // handleClassicStart binds the instance to this adapter authoritatively.
+                    const reply = await this.handleClassicStart(chatId, channelName, msg.userId, undefined, msg.adapterId);
+                    await msgAdapter?.sendText(chatId, reply);
                     return;
                 }
                 // Handle /stop command
@@ -2030,7 +1950,6 @@ export class FleetManager {
                             user_id: msg.userId,
                             ts: msg.timestamp.toISOString(),
                             thread_id: "",
-                            adapter_id: msg.adapterId,
                             source: msg.source,
                             ...(msg.replyToText ? { reply_to_text: msg.replyToText } : {}),
                             ...extraMeta,
@@ -2123,7 +2042,6 @@ export class FleetManager {
                     user_id: msg.userId,
                     ts: msg.timestamp.toISOString(),
                     thread_id: msg.threadId ?? "",
-                    adapter_id: msg.adapterId,
                     source: msg.source,
                     ...(msg.replyToText ? { reply_to_text: msg.replyToText } : {}),
                     ...extraMeta,
@@ -2746,92 +2664,73 @@ export class FleetManager {
             }
         }, 5 * 60_000);
     }
-    /**
-     * Patch only values changed in the effective config into the original YAML
-     * document. Unknown keys, explicit overrides and comments remain untouched.
-     */
-    saveFleetConfig(explicitPatches = []) {
+    /** Save fleet config back to fleet.yaml */
+    saveFleetConfig() {
         if (!this.fleetConfig || !this.configPath)
             return;
-        if (!this.savedFleetConfigSnapshot)
-            this.savedFleetConfigSnapshot = structuredClone(this.fleetConfig);
-        // Re-read immediately before patching so an unrelated concurrent/manual
-        // edit is retained. Invalid concurrent YAML is never overwritten.
-        const source = existsSync(this.configPath) ? readFileSync(this.configPath, "utf-8") : "{}\n";
-        this.rawFleetDocument = parseDocument(source, { keepSourceTokens: true });
-        if (this.rawFleetDocument.errors.length > 0) {
-            throw new Error(`Refusing to overwrite invalid fleet.yaml: ${this.rawFleetDocument.errors[0].message}`);
-        }
-        this.rawFleetConfig = loadRawFleetConfig(this.configPath);
-        this.patchFleetDocument(this.rawFleetDocument, [], this.savedFleetConfigSnapshot, this.fleetConfig);
-        // Settings edits are expressed against the raw config. Persist them even
-        // when the chosen override equals the inherited effective value, a case
-        // the before/after runtime diff cannot observe.
-        for (const patch of explicitPatches) {
-            if (patch.remove) {
-                this.rawFleetDocument.deleteIn(patch.path);
-            }
-            else {
-                const before = this.rawFleetDocument.getIn(patch.path);
-                this.patchFleetDocument(this.rawFleetDocument, patch.path, before, patch.value);
-            }
-        }
-        const output = String(this.rawFleetDocument);
-        const tempPath = `${this.configPath}.tmp-${process.pid}`;
-        writeFileSync(tempPath, output, "utf-8");
-        if (existsSync(this.configPath))
-            chmodSync(tempPath, statSync(this.configPath).mode);
-        renameSync(tempPath, this.configPath);
-        this.rawFleetConfig = loadRawFleetConfig(this.configPath);
-        this.savedFleetConfigSnapshot = structuredClone(this.fleetConfig);
-        this.logger.info({ path: this.configPath }, "Saved fleet config (lossless patch)");
-    }
-    patchFleetDocument(document, path, before, after) {
-        if (Object.is(before, after))
-            return;
-        if (Array.isArray(before) && Array.isArray(after)) {
-            const shared = Math.min(before.length, after.length);
-            for (let i = 0; i < shared; i++) {
-                this.patchFleetDocument(document, [...path, i], before[i], after[i]);
-            }
-            // Remove from the end so YAML sequence indexes do not shift underneath us.
-            for (let i = before.length - 1; i >= after.length; i--)
-                document.deleteIn([...path, i]);
-            for (let i = shared; i < after.length; i++)
-                document.setIn([...path, i], after[i]);
-            return;
-        }
-        const isRecord = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
-        if (isRecord(before) && isRecord(after)) {
-            const keys = new Set([...Object.keys(before), ...Object.keys(after)]);
-            for (const key of keys) {
-                // `channel` is a derived alias when the raw file uses `channels`.
-                if (path.length === 0 && key === "channel" && this.rawFleetConfig.channels)
-                    continue;
-                // Conversely, `channels` is a normalized alias for a legacy `channel`.
-                // Keep the user's original shape unless the caller explicitly removed
-                // `channel` (the Settings channels endpoint intentionally migrates it).
-                if (path.length === 0 && key === "channels" && this.rawFleetConfig.channel && !this.rawFleetConfig.channels && after.channel !== undefined)
-                    continue;
-                this.patchFleetDocument(document, [...path, key], before[key], after[key]);
-            }
-            return;
-        }
-        if (after === undefined) {
-            document.deleteIn(path);
-        }
-        else if (path.length === 0) {
-            document.contents = document.createNode(after);
-        }
-        else {
-            const currentNode = document.getIn(path, true);
-            if (isScalar(currentNode) && (after === null || typeof after !== "object")) {
-                currentNode.value = after;
-            }
-            else {
-                document.setIn(path, after);
-            }
-        }
+        const toSave = {};
+        if (this.fleetConfig.project_roots)
+            toSave.project_roots = this.fleetConfig.project_roots;
+        if (this.fleetConfig.channels && this.fleetConfig.channels.length > 0) {
+            toSave.channels = this.fleetConfig.channels;
+        }
+        else if (this.fleetConfig.channel) {
+            toSave.channel = this.fleetConfig.channel;
+        }
+        if (this.fleetConfig.health_port)
+            toSave.health_port = this.fleetConfig.health_port;
+        if (Object.keys(this.fleetConfig.defaults).length > 0)
+            toSave.defaults = this.fleetConfig.defaults;
+        if (this.fleetConfig.teams && Object.keys(this.fleetConfig.teams).length > 0) {
+            toSave.teams = this.fleetConfig.teams;
+        }
+        if (this.fleetConfig.templates && Object.keys(this.fleetConfig.templates).length > 0) {
+            toSave.templates = this.fleetConfig.templates;
+        }
+        if (this.fleetConfig.profiles && Object.keys(this.fleetConfig.profiles).length > 0) {
+            toSave.profiles = this.fleetConfig.profiles;
+        }
+        toSave.instances = {};
+        for (const [name, inst] of Object.entries(this.fleetConfig.instances)) {
+            const serialized = {
+                working_directory: inst.working_directory,
+                topic_id: inst.topic_id,
+            };
+            // Preserve all optional user-configured fields so saveFleetConfig() never silently drops them
+            if (inst.general_topic)
+                serialized.general_topic = true;
+            if (inst.display_name)
+                serialized.display_name = inst.display_name;
+            if (inst.channel_id)
+                serialized.channel_id = inst.channel_id;
+            if (inst.description)
+                serialized.description = inst.description;
+            if (inst.tags?.length)
+                serialized.tags = inst.tags;
+            if (inst.model)
+                serialized.model = inst.model;
+            if (inst.model_failover?.length)
+                serialized.model_failover = inst.model_failover;
+            if (inst.worktree_source)
+                serialized.worktree_source = inst.worktree_source;
+            if (inst.backend)
+                serialized.backend = inst.backend;
+            if (inst.systemPrompt)
+                serialized.systemPrompt = inst.systemPrompt;
+            if (inst.skipPermissions)
+                serialized.skipPermissions = inst.skipPermissions;
+            if (inst.lightweight)
+                serialized.lightweight = inst.lightweight;
+            if (inst.cost_guard)
+                serialized.cost_guard = inst.cost_guard;
+            if (inst.workflow !== undefined)
+                serialized.workflow = inst.workflow;
+            if (inst.agent_mode)
+                serialized.agent_mode = inst.agent_mode;
+            toSave.instances[name] = serialized;
+        }
+        writeFileSync(this.configPath, yaml.dump(toSave, { lineWidth: 120 }));
+        this.logger.info({ path: this.configPath }, "Saved fleet config");
     }
     async removeInstance(name) {
         // Clean up schedules (scheduler is fleet-level, not lifecycle-level)
@@ -2874,10 +2773,6 @@ export class FleetManager {
     startStatuslineWatcher(name) {
         this.statuslineWatcher.watch(name);
     }
-    stopStatuslineWatcher(name) {
-        // Pausing stops I/O but retains the last observed limits for status views.
-        this.statuslineWatcher.unwatch(name, true);
-    }
     reactMessageStatus(instanceName, chatId, messageId, emoji) {
         // React via the adapter BOUND to this instance — NOT the first discord world.
         // Otherwise, in a same-channel/same-guild multi-bot setup, the inbound 👀
@@ -3228,7 +3123,7 @@ export class FleetManager {
             return [];
         }
     }
-    async sendHangNotification(instanceName, unchangedForMs) {
+    async sendHangNotification(instanceName) {
         const adapter = this.getAdapterForInstance(instanceName) ?? this.adapter;
         if (!adapter)
             return;
@@ -3237,18 +3132,11 @@ export class FleetManager {
         if (!groupId)
             return;
         const threadId = this.fleetConfig?.instances[instanceName]?.topic_id;
-        const instanceHangConfig = this.fleetConfig?.instances[instanceName]?.hang_detector;
-        const configuredMinutes = instanceHangConfig?.timeout_minutes
-            ?? this.fleetConfig?.defaults?.hang_detector?.timeout_minutes
-            ?? 15;
-        const unchangedMinutes = unchangedForMs == null
-            ? configuredMinutes
-            : Math.max(1, Math.floor(unchangedForMs / 60_000));
         this.setTopicIcon(instanceName, "red");
         await adapter.notifyAlert(String(groupId), {
             type: "hang",
             instanceName,
-            message: `⚠️ ${instanceName} may be stuck — pane unchanged for ${unchangedMinutes}min, ready prompt not recognized`,
+            message: `⚠️ ${instanceName} appears hung (no activity for 15+ minutes)`,
             choices: [
                 { id: `hang:restart:${instanceName}`, label: "🔄 Force restart" },
                 { id: `hang:wait:${instanceName}`, label: "⏳ Keep waiting" },
@@ -3756,7 +3644,6 @@ When users create specialized instances, suggest these configurations:
             user_id: msg.userId,
             ts: msg.timestamp.toISOString(),
             thread_id: msg.threadId ?? "",
-            ...(msg.adapterId ? { adapter_id: msg.adapterId } : {}),
             source: msg.source,
             ...extraMeta,
             ...(msg.replyToText ? { reply_to_text: msg.replyToText } : {}),
@@ -3813,104 +3700,6 @@ When users create specialized instances, suggest these configurations:
             return undefined;
         }
     }
-    /** Return a user-facing blocker without mutating ClassicBot state. */
-    validateClassicStart(channelId, userId, guildId, adapterId) {
-        if (!this.classicChannels)
-            return "Classic channel manager not initialized.";
-        if (guildId && !this.classicChannels.isGuildAllowed(guildId)) {
-            const generalId = this.findGeneralInstance(adapterId);
-            if (generalId)
-                this.notifyInstanceTopic(generalId, t("alert.unauth_guild", guildId, userId));
-            return t("classic.not_authorized_guild");
-        }
-        if (this.classicChannels.isClassicChannel(channelId, adapterId))
-            return t("classic.already_active");
-        if (this.routing.resolve(channelId))
-            return t("classic.topic_bound");
-        return undefined;
-    }
-    /** Present platform-native backend choices, then start on selection or timeout. */
-    async beginClassicBackendSelection(data, adapter) {
-        const adapterId = adapter.id;
-        const blocker = this.validateClassicStart(data.channelId, data.userId, data.guildId, adapterId);
-        if (blocker) {
-            await data.respond(blocker);
-            return;
-        }
-        const nonce = randomBytes(6).toString("hex");
-        const choices = getClassicBackendChoices().map(choice => ({
-            id: `${CLASSIC_BACKEND_CALLBACK_PREFIX}${nonce}:${choice.id}`,
-            label: choice.label,
-        }));
-        const complete = data.respondChoices
-            ? async (text) => { await data.respond(text); }
-            : async (text, messageId) => {
-                if (messageId && adapter.editMessageRemoveButtons) {
-                    try {
-                        await adapter.editMessageRemoveButtons(data.channelId, messageId, text);
-                        return;
-                    }
-                    catch { /* fall back to a new message */ }
-                }
-                await data.respond(text);
-            };
-        const timer = setTimeout(() => {
-            void this.finishClassicBackendSelection(nonce).catch(err => this.logger.warn({ err, channelId: data.channelId, adapterId }, "Classic backend selection timeout fallback failed"));
-        }, CLASSIC_BACKEND_SELECTION_TIMEOUT_MS);
-        timer.unref?.();
-        const pending = {
-            channelId: data.channelId,
-            channelName: data.channelName,
-            userId: data.userId,
-            guildId: data.guildId,
-            adapterId,
-            timer,
-            complete,
-        };
-        this.pendingClassicStarts.set(nonce, pending);
-        try {
-            pending.messageId = data.respondChoices
-                ? await data.respondChoices(t("classic.choose_backend"), choices)
-                : await adapter.promptUser(data.channelId, t("classic.choose_backend"), choices);
-        }
-        catch (err) {
-            // A menu transport failure should not make /start unusable: consume the
-            // pending request and immediately use the configured default.
-            this.logger.warn({ err, channelId: data.channelId, adapterId }, "Classic backend menu failed; using default");
-            await this.finishClassicBackendSelection(nonce);
-        }
-    }
-    /** Consume a selection callback. Returns true for all ClassicBot callback IDs, including stale ones. */
-    async handleClassicBackendSelection(data) {
-        if (!data.callbackData.startsWith(CLASSIC_BACKEND_CALLBACK_PREFIX))
-            return false;
-        const match = data.callbackData.match(/^classic-backend:([0-9a-f]+):(.+)$/);
-        if (!match)
-            return true;
-        const pending = this.pendingClassicStarts.get(match[1]);
-        if (!pending)
-            return true;
-        // Telegram keyboards are visible to everyone in a group. Only the user who
-        // issued /start may consume the pending selection.
-        if (data.userId && data.userId !== pending.userId)
-            return true;
-        const callbackChannelId = data.threadId ?? data.chatId;
-        if (callbackChannelId !== pending.channelId && data.chatId !== pending.channelId)
-            return true;
-        await this.finishClassicBackendSelection(match[1], match[2]);
-        return true;
-    }
-    /** Atomically claim one pending request so timeout/click races create at most one instance. */
-    async finishClassicBackendSelection(nonce, backend) {
-        const pending = this.pendingClassicStarts.get(nonce);
-        if (!pending)
-            return;
-        this.pendingClassicStarts.delete(nonce);
-        clearTimeout(pending.timer);
-        const selectedBackend = isSelectableClassicBackend(backend) ? backend : undefined;
-        const reply = await this.handleClassicStart(pending.channelId, pending.channelName, pending.userId, pending.guildId, pending.adapterId, selectedBackend);
-        await pending.complete(reply, pending.messageId);
-    }
     /** Start a classic channel instance with lightweight config */
     async startClassicInstance(instanceName, backend, preTaskCommand, model) {
         if (this.daemons.has(instanceName))
@@ -3930,26 +3719,35 @@ When users create specialized instances, suggest these configurations:
         await this.startInstance(instanceName, config, topicMode);
     }
     /** Handle /start slash command — register classic channel */
-    async handleClassicStart(channelId, channelName, userId, guildId, adapterId, backend) {
-        const blocker = this.validateClassicStart(channelId, userId, guildId, adapterId);
-        if (blocker)
-            return blocker;
-        const classicChannels = this.classicChannels;
-        if (!classicChannels)
+    async handleClassicStart(channelId, channelName, userId, guildId, adapterId) {
+        if (!this.classicChannels)
             return "Classic channel manager not initialized.";
-        const instanceName = classicChannels.deriveInstanceName(channelName || channelId, channelId, adapterId);
-        const selectedBackend = isSelectableClassicBackend(backend) ? backend : undefined;
-        classicChannels.register(channelId, adapterId, instanceName, channelName || channelId, userId, selectedBackend);
+        if (guildId && !this.classicChannels.isGuildAllowed(guildId)) {
+            const generalId = this.findGeneralInstance();
+            if (generalId) {
+                this.notifyInstanceTopic(generalId, t("alert.unauth_guild", guildId, userId));
+            }
+            return t("classic.not_authorized_guild");
+        }
+        // Per-bot check: a second bot may /start in the same channel (own agent).
+        if (this.classicChannels.isClassicChannel(channelId, adapterId))
+            return t("classic.already_active");
+        // Classic no longer lives in the routing engine, so this only guards against
+        // a fleet topic-mode instance colliding with the channel.
+        if (this.routing.resolve(channelId))
+            return t("classic.topic_bound");
+        const instanceName = this.classicChannels.deriveInstanceName(channelName || channelId, channelId, adapterId);
+        this.classicChannels.register(channelId, adapterId, instanceName, channelName || channelId, userId);
         // Bind this classic instance to the bot that started it (authoritative), so
         // replies/cancel go out through that bot even though every same-guild bot
         // also sees the channel's messages.
         if (adapterId)
             this.bindInstanceAdapter(instanceName, adapterId);
-        await this.startClassicInstance(instanceName, classicChannels.getBackend(channelId, adapterId, this.fleetConfig?.defaults?.backend), classicChannels.getPreTaskCommand(channelId, adapterId), classicChannels.getModel(channelId, adapterId, this.fleetConfig?.defaults?.model));
+        await this.startClassicInstance(instanceName, this.classicChannels.getBackend(channelId, adapterId, this.fleetConfig?.defaults?.backend), this.classicChannels.getPreTaskCommand(channelId, adapterId), this.classicChannels.getModel(channelId, adapterId, this.fleetConfig?.defaults?.model));
         this.reregisterClassicChannels();
         // Auto-enable collab for Discord classic channels (TG uses @mention directly without collab mode)
-        if (guildId && !classicChannels.isCollab(channelId, adapterId)) {
-            classicChannels.toggleCollab(channelId, adapterId);
+        if (guildId && !this.classicChannels.isCollab(channelId, adapterId)) {
+            this.classicChannels.toggleCollab(channelId, adapterId);
         }
         this.logger.info({ channelId, adapterId, instanceName, userId }, "Classic channel started");
         return t("classic.started");
@@ -4006,9 +3804,6 @@ When users create specialized instances, suggest these configurations:
             clearInterval(this.classicReloadTimer);
             this.classicReloadTimer = null;
         }
-        for (const pending of this.pendingClassicStarts.values())
-            clearTimeout(pending.timer);
-        this.pendingClassicStarts.clear();
         this.topicArchiver.stop();
         this.scheduler?.shutdown();
         // Stop instances in parallel batches to avoid long sequential waits.
@@ -4554,7 +4349,6 @@ When users create specialized instances, suggest these configurations:
                         lastActivity: this.lastActivityMs(inst.name) || null,
                         currentTask,
                         idle: this.getInstanceIdle(inst.name),
-                        state: this.getInstanceExecutionState(inst.name),
                     };
                 });
                 res.setHeader("Access-Control-Allow-Origin", "*");