@songsid/agend 2.1.5-beta.20 → 2.1.5-beta.21

package/dist/fleet-manager.js

@@ -33,7 +33,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, resolveInstanceContext, forgetInstanceContext } from "./topic-commands.js";
+import { TopicCommands, saveCommandForBackend, parseSaveFilename, parsePauseWakeCommand, SAVE_FILENAME_RE, resolveInstanceContext, forgetInstanceContext, readStatuslineModel } from "./topic-commands.js";
 import { DailySummary } from "./daily-summary.js";
 import { WebhookEmitter } from "./webhook-emitter.js";
 import { TmuxControlClient } from "./tmux-control.js";
@@ -11077,11 +11077,9 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
         const instances = names.map(name => {
             const statusFile = join(this.getInstanceDir(name), "statusline.json");
             let cost = 0;
-            let model = "";
             try {
                 const data = JSON.parse(readFileSync(statusFile, "utf-8"));
                 cost = data.cost?.total_cost_usd ?? 0;
-                model = data.model?.display_name ?? "";
             }
             catch (err) {
                 this.logger.debug({ err, name }, "statusline.json read failed (getUiStatus)");
@@ -11094,8 +11092,40 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
                     ?? 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 };
+            // context_pct: null when unavailable, not 0
+            const context_pct = context ?? null;
+            // Model: Only Claude Code has live statusline; others use the effective resolver.
+            // readStatuslineModel provides the /ctx-aligned display_name+id combo for Claude.
+            // Non-Claude backends must NOT read statusline.json model (may be stale from previous Claude run).
+            const resolved = this.resolveInstanceModel(name);
+            const liveModel = backend === "claude-code" ? readStatuslineModel(this.dataDir, name) : null;
+            // Display value: live model for Claude, resolved.display for others (includes "auto (default)" for Kiro)
+            const model = liveModel ?? resolved.display;
+            // model_source: "live" when Claude statusline succeeded, else the resolver's source
+            const model_source = liveModel ? "live" : resolved.source;
+            // Effort: aligned with /ctx's effortLineFor — unsupported and antigravity don't show effort.
+            const effortStrategy = this.effortStrategyFor(name);
+            const isAgy = backend === "antigravity" || backend === "agy";
+            const effortResolved = this.resolveInstanceEffort(name);
+            // Only show effort if backend supports it and it's not antigravity
+            const effort = (effortStrategy === "unsupported" || isAgy) ? null : effortResolved.effort;
+            const effort_source = (effortStrategy === "unsupported" || isAgy) ? null : effortResolved.source;
+            // Display name: fleet config → classic channel → undefined
+            const display_name = classic
+                ? this.classicChannels?.getAll().find(ch => ch.instanceName === name)?.displayName
+                : this.fleetConfig?.instances[name]?.display_name;
+            return {
+                name,
+                display_name: display_name || undefined,
+                status: this.getInstanceStatus(name),
+                context_pct,
+                cost,
+                model,
+                model_source,
+                backend,
+                effort,
+                effort_source,
+            };
         });
         return {
             instances,