@songsid/agend 2.1.1-beta.11 → 2.1.1-beta.13

package/dist/fleet-manager.js

@@ -26,7 +26,7 @@ import { processAttachments } from "./channel/attachment-handler.js";
 import { routeToolCall } from "./channel/tool-router.js";
 import { Scheduler } from "./scheduler/index.js";
 import { DEFAULT_SCHEDULER_CONFIG } from "./scheduler/index.js";
-import { TopicCommands, saveCommandForBackend, parseSaveFilename, parsePauseWakeCommand, SAVE_FILENAME_RE, SAVE_UNSUPPORTED_MSG } from "./topic-commands.js";
+import { TopicCommands, saveCommandForBackend, parseSaveFilename, parsePauseWakeCommand, SAVE_FILENAME_RE, SAVE_UNSUPPORTED_MSG, resolveInstanceContext } from "./topic-commands.js";
 import { DailySummary } from "./daily-summary.js";
 import { WebhookEmitter } from "./webhook-emitter.js";
 import { TmuxControlClient } from "./tmux-control.js";
@@ -38,6 +38,7 @@ import { StatuslineWatcher } from "./statusline-watcher.js";
 import { outboundHandlers } from "./outbound-handlers.js";
 import { handleWebRequest, broadcastSseEvent } from "./web-api.js";
 import { handleViewRequest, isViewPath } from "./view-api.js";
+import { handleUsageRequest, isUsagePath } from "./usage/usage-api.js";
 import { handleSettingsRequest } from "./settings-api.js";
 import { setLocale, detectLocale, t } from "./locale.js";
 import { handleAgentRequest } from "./agent-endpoint.js";
@@ -163,6 +164,10 @@ export class FleetManager {
     failoverActive = new Map(); // instance → current failover model
     // IPC reconnect: tracks instances being intentionally stopped (skip reconnect)
     ipcStoppingInstances = new Set();
+    /** Coalesce concurrent connection attempts for the same daemon socket. */
+    ipcConnectInFlight = new Map();
+    /** At most one reconnect/backoff loop may exist per instance. */
+    ipcReconnectInFlight = new Map();
     // Adapter restart: prevents re-entrant restart attempts
     adapterRestarting = new Set();
     // Adapter isolation: track state per adapter for retry + visibility
@@ -651,7 +656,7 @@ export class FleetManager {
         await new Promise(resolve => setTimeout(resolve, 250));
         await this.startClassicInstance(instanceName, this.classicChannels.getBackendByInstance(instanceName, this.fleetConfig?.defaults?.backend), this.classicChannels.getPreTaskCommand(channel.channelId, channel.adapterId), this.classicChannels.getModel(channel.channelId, channel.adapterId, this.fleetConfig?.defaults?.model), this.classicChannels.getAutoPauseAfter(channel.channelId, channel.adapterId, this.fleetConfig?.defaults?.auto_pause_after));
     }
-    async startInstance(name, config, topicMode) {
+    async startInstance(name, config, topicMode, kind = "fleet-topic") {
         if (this.lifecycle.isPaused(name)) {
             this.logger.info({ name }, "Persisted paused instance — skipping startup");
             return;
@@ -667,7 +672,11 @@ export class FleetManager {
             this.ensureGeneralInstructions(config.working_directory, config.backend);
         }
         this.instanceProcessStatus.delete(name);
-        await this.lifecycle.start(name, config, topicMode);
+        await this.lifecycle.start(name, config, topicMode, {
+            kind,
+            backend: config.backend ?? this.fleetConfig?.defaults?.backend ?? "claude-code",
+            model: this.resolveInstanceModel(name).display,
+        });
         // Auto-connect IPC — daemon.start() ensures socket is ready before resolving
         await this.connectIpcToInstance(name);
     }
@@ -978,6 +987,11 @@ export class FleetManager {
             // Rotate fleet.log daily too (besides the startup size check above), so a
             // long-running fleet doesn't accumulate an unbounded log.
             rotateLogIfNeeded(join(this.dataDir, "fleet.log"));
+            // Instance output.log is pipe-pane (TUI ANSI). Daemon health ticks also
+            // rotate it; this is the daily safety net for idle/stopped instances.
+            for (const name of Object.keys(this.fleetConfig?.instances ?? {})) {
+                rotateLogIfNeeded(join(this.dataDir, "instances", name, "output.log"));
+            }
         }, () => {
             const instances = Object.keys(this.fleetConfig?.instances ?? {});
             const costMap = new Map();
@@ -1931,19 +1945,38 @@ export class FleetManager {
         this.logger.info({ adapterId, type: channelConfig.type }, "Additional adapter started");
     }
     /** Connect IPC to a single instance with all handlers */
-    async connectIpcToInstance(name) {
+    connectIpcToInstance(name) {
+        const inFlight = this.ipcConnectInFlight.get(name);
+        if (inFlight)
+            return inFlight;
+        const connection = this.connectIpcToInstanceInternal(name)
+            .finally(() => {
+            if (this.ipcConnectInFlight.get(name) === connection) {
+                this.ipcConnectInFlight.delete(name);
+            }
+        });
+        this.ipcConnectInFlight.set(name, connection);
+        return connection;
+    }
+    async connectIpcToInstanceInternal(name) {
         // Close existing client to prevent socket leak on reconnect
         const existing = this.instanceIpcClients.get(name);
         if (existing) {
-            this.ipcStoppingInstances.add(name);
+            // Remove application listeners before destroying the socket. Even if a
+            // future regression creates two clients, the replaced one cannot keep
+            // handling fleet_outbound messages as an orphan.
+            existing.removeAllListeners();
             try {
-                existing.close();
+                await existing.close();
             }
             catch (err) {
                 this.logger.debug({ err, name }, "IPC client close failed (likely already closed)");
             }
-            this.instanceIpcClients.delete(name);
-            this.ipcStoppingInstances.delete(name);
+            finally {
+                if (this.instanceIpcClients.get(name) === existing) {
+                    this.instanceIpcClients.delete(name);
+                }
+            }
         }
         const sockPath = join(this.getInstanceDir(name), "channel.sock");
         if (!existsSync(sockPath))
@@ -2021,6 +2054,10 @@ export class FleetManager {
             }
             // Auto-reconnect on disconnect (unless intentionally stopping)
             ipc.on("disconnect", () => {
+                // A delayed event from a replaced/stale client must never delete the
+                // current connection or start another reconnect loop.
+                if (this.instanceIpcClients.get(name) !== ipc)
+                    return;
                 this.instanceIpcClients.delete(name);
                 if (this.ipcStoppingInstances.has(name))
                     return;
@@ -2032,7 +2069,20 @@ export class FleetManager {
         }
     }
     /** Attempt IPC reconnection with exponential backoff */
-    async ipcReconnect(name) {
+    ipcReconnect(name) {
+        const inFlight = this.ipcReconnectInFlight.get(name);
+        if (inFlight)
+            return inFlight;
+        const reconnect = this.runIpcReconnect(name)
+            .finally(() => {
+            if (this.ipcReconnectInFlight.get(name) === reconnect) {
+                this.ipcReconnectInFlight.delete(name);
+            }
+        });
+        this.ipcReconnectInFlight.set(name, reconnect);
+        return reconnect;
+    }
+    async runIpcReconnect(name) {
         for (let attempt = 1;; attempt++) {
             if (this.ipcStoppingInstances.has(name) || !this.daemons.has(name))
                 return;
@@ -4771,7 +4821,7 @@ When users create specialized instances, suggest these configurations:
             ...(preTaskCommand ? { pre_task_command: preTaskCommand } : {}),
         };
         const topicMode = this.fleetConfig?.channel?.mode === "topic";
-        await this.startInstance(instanceName, config, topicMode);
+        await this.startInstance(instanceName, config, topicMode, "classic");
     }
     /** Handle /start slash command — register classic channel */
     async handleClassicStart(channelId, channelName, userId, guildId, adapterId, backend) {
@@ -5372,6 +5422,10 @@ When users create specialized instances, suggest these configurations:
                 // /view routes accept the read-only view.token (or web.token) and do
                 // their own per-method auth in view-api.ts — skip the web-token gate.
             }
+            else if (isUsagePath(new URL(req.url ?? "/", `http://localhost:${port}`).pathname)) {
+                // /api/ai-usage is read-only GET data for the /view Usage panel — open
+                // like the other /view data routes (usage-api.ts rejects non-GET).
+            }
             else {
                 // All other endpoints require a valid token (query ?token= or X-Agend-Token header).
                 // /ui/* will also re-check in web-api.ts, which is harmless.
@@ -5400,20 +5454,22 @@ When users create specialized instances, suggest these configurations:
             if (req.method === "GET" && req.url === "/status") {
                 const instances = Object.keys(this.fleetConfig?.instances ?? {}).map(name => {
                     const statusFile = join(this.getInstanceDir(name), "statusline.json");
-                    let context_pct = 0;
                     let cost = 0;
                     try {
                         const data = JSON.parse(readFileSync(statusFile, "utf-8"));
-                        context_pct = data.context_window?.used_percentage ?? 0;
                         cost = data.cost?.total_cost_usd ?? 0;
                     }
                     catch (err) {
                         this.logger.debug({ err, name }, "statusline.json read failed (/status)");
                     }
+                    const backend = this.fleetConfig?.instances[name]?.backend
+                        ?? this.fleetConfig?.defaults?.backend
+                        ?? "claude-code";
+                    const { context } = resolveInstanceContext(this.dataDir, name, backend);
                     return {
                         name,
                         status: this.getInstanceStatus(name),
-                        context_pct,
+                        context_pct: context ?? 0,
                         cost,
                     };
                 });
@@ -5584,6 +5640,8 @@ When users create specialized instances, suggest these configurations:
             const url = new URL(req.url ?? "/", `http://localhost:${port}`);
             if (handleViewRequest(req, res, url, this))
                 return;
+            if (handleUsageRequest(req, res, url, this))
+                return;
             if (handleSettingsRequest(req, res, url, this))
                 return;
             if (handleWebRequest(req, res, url, this))
@@ -5630,20 +5688,35 @@ When users create specialized instances, suggest these configurations:
         this.logger.info({ url: `http://localhost:${port}/view?token=${this.viewToken}` }, "Web View available");
     }
     getUiStatus() {
-        const instances = Object.keys(this.fleetConfig?.instances ?? {}).map(name => {
+        const fleetNames = Object.keys(this.fleetConfig?.instances ?? {});
+        // Classic rooms live only in classicBot.yaml — /api/profiles merges them into
+        // the View roster, but previously getUiStatus skipped them so context_pct was
+        // always 0 (live map miss → l?.context_pct ?? 0).
+        const classicOnly = (this.classicChannels?.getAll() ?? [])
+            .map(ch => ch.instanceName)
+            .filter(name => !fleetNames.includes(name));
+        const names = [...fleetNames, ...classicOnly];
+        const instances = names.map(name => {
             const statusFile = join(this.getInstanceDir(name), "statusline.json");
-            let context_pct = 0;
             let cost = 0;
             let model = "";
             try {
                 const data = JSON.parse(readFileSync(statusFile, "utf-8"));
-                context_pct = data.context_window?.used_percentage ?? 0;
                 cost = data.cost?.total_cost_usd ?? 0;
                 model = data.model?.display_name ?? "";
             }
             catch (err) {
                 this.logger.debug({ err, name }, "statusline.json read failed (getUiStatus)");
             }
+            // Align with /ctx: statusline for claude-code, pane scrape for kiro/grok/codex.
+            const classic = classicOnly.includes(name);
+            const backend = classic
+                ? this.classicChannels.getBackendByInstance(name, this.fleetConfig?.defaults?.backend)
+                : (this.fleetConfig?.instances[name]?.backend
+                    ?? this.fleetConfig?.defaults?.backend
+                    ?? "claude-code");
+            const { context } = resolveInstanceContext(this.dataDir, name, backend);
+            const context_pct = context ?? 0;
             return { name, status: this.getInstanceStatus(name), context_pct, cost, model };
         });
         return {