@songsid/agend 2.1.5-beta.7 → 2.1.5-beta.9

package/dist/fleet-manager.d.ts

@@ -473,6 +473,13 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
      */
     private startClassicInstanceUnattended;
     private backendNameOf;
+    /**
+     * Every configured instance whose backend may share credentials. ClassicBot
+     * rows live only in classicBot.yaml, so backend-wide operations must not use
+     * fleetConfig.instances as their roster. Set keeps a malformed name collision
+     * from restarting the same process twice; backendNameOf defines ownership.
+     */
+    private configuredBackendInstanceNames;
     /**
      * One fleet-level notice per burst, not one per instance: a post-update herd
      * fails many instances within the same second. Two notices per incident at

package/dist/fleet-manager.js

@@ -1745,15 +1745,31 @@ export class FleetManager {
     }
     backendNameOf(name) {
         const fleetDefault = this.fleetConfig?.defaults?.backend;
-        const configured = this.fleetConfig?.instances[name]?.backend;
-        if (configured)
-            return configured;
+        const fleetInstance = this.fleetConfig?.instances[name];
+        // A malformed/manual config can give a fleet and Classic entry the same
+        // instance name. Fleet ownership wins, including its inherited default;
+        // otherwise a Classic override could make backend-scoped recovery restart
+        // the shared process under the wrong login result.
+        if (fleetInstance)
+            return fleetInstance.backend ?? fleetDefault ?? "claude-code";
         // ClassicBot channels pick their own backend; the fleet default is only the fallback.
         if (this.classicChannels?.getAll().some(channel => channel.instanceName === name)) {
             return this.classicChannels.getBackendByInstance(name, fleetDefault);
         }
         return fleetDefault ?? "claude-code";
     }
+    /**
+     * Every configured instance whose backend may share credentials. ClassicBot
+     * rows live only in classicBot.yaml, so backend-wide operations must not use
+     * fleetConfig.instances as their roster. Set keeps a malformed name collision
+     * from restarting the same process twice; backendNameOf defines ownership.
+     */
+    configuredBackendInstanceNames() {
+        const names = new Set(Object.keys(this.fleetConfig?.instances ?? {}));
+        for (const channel of this.classicChannels?.getAll() ?? [])
+            names.add(channel.instanceName);
+        return [...names];
+    }
     /**
      * One fleet-level notice per burst, not one per instance: a post-update herd
      * fails many instances within the same second. Two notices per incident at
@@ -7132,8 +7148,8 @@ export class FleetManager {
     /** Post the backend chooser for a bare `/login`. Caller enforces admin. */
     async promptLoginBackends(chat) {
         const configured = new Set();
-        for (const [, config] of Object.entries(this.fleetConfig?.instances ?? {})) {
-            configured.add(config.backend ?? this.fleetConfig?.defaults?.backend ?? "claude-code");
+        for (const name of this.configuredBackendInstanceNames()) {
+            configured.add(this.backendNameOf(name));
         }
         const choices = Object.keys(LOGIN_FLOWS)
             .filter(backend => configured.size === 0 || configured.has(backend))
@@ -7536,9 +7552,8 @@ export class FleetManager {
     async recoverBackendInstances(backend) {
         const woken = [];
         const restarted = [];
-        for (const [name, config] of Object.entries(this.fleetConfig?.instances ?? {})) {
-            const effective = config.backend ?? this.fleetConfig?.defaults?.backend ?? "claude-code";
-            if (effective !== backend)
+        for (const name of this.configuredBackendInstanceNames()) {
+            if (this.backendNameOf(name) !== backend)
                 continue;
             const status = this.getInstanceStatus(name);
             try {