@songsid/agend 2.3.2-beta.15 → 2.3.2-beta.17

package/dist/fleet-manager.js

@@ -1,4 +1,4 @@
-import { getCachedKiroCliCompatibility, kiroV1DbPath, kiroV2SessionsDir } from "./backend/kiro.js";
+import { supportsVerifiedKiroMigration, getCachedKiroCliCompatibility, kiroV1DbPath, kiroV2SessionsDir } from "./backend/kiro.js";
 import { listKiroV1Sessions, readKiroClassicLinks } from "./backend/kiro-identity.js";
 import { readKiroV1SavedModel } from "./backend/kiro-retired-model.js";
 import { sharedKiroV2StoreLane } from "./backend/kiro-v2-store.js";
@@ -1223,6 +1223,7 @@ export class FleetManager {
                 needs: () => this.needsYouItems().map(i => i.instance),
                 hidden: name => crossInstanceVisibility(this.fleetConfig, name) === "hidden",
                 skins: this.officeSkins,
+                levels: () => this.officeLevelsSnapshot(),
             },
             manager: new ManagedTunnel({ dataDir: join(this.dataDir, OFFICE_SHARE_TUNNEL_DIR), log: () => this.logger.warn("Office share tunnel cleanup requires attention") }),
             ensure: signal => ensureCloudflared({ dataDir: this.dataDir, pinnedOnly: true, signal }),
@@ -1365,7 +1366,10 @@ export class FleetManager {
             needs.set(item.instance, (needs.get(item.instance) ?? 0) + 1);
         const classicRooms = new Map((this.classicChannels?.getAll() ?? []).map(ch => [ch.instanceName, ch]));
         let profiles = null;
+        // #2661: the levels as last worked out (never waits; none while off or not worked out yet).
+        const levels = this.officeLevelsSnapshot();
         return {
+            level: name => (levels && Object.prototype.hasOwnProperty.call(levels, name) ? levels[name].level : undefined),
             stateOf: name => {
                 if (!this.isKnownInstance(name))
                     return "missing";
@@ -1939,8 +1943,7 @@ export class FleetManager {
             },
             preflight: async (name, plan) => {
                 const compat = getCachedKiroCliCompatibility(resolveBinary("kiro-cli"));
-                if (!compat.supportsTui || !compat.supportsInstanceAgent || !compat.agentEngines?.includes("v2")
-                    || !/^2\.(?:3[4-9]|[4-9]\d|\d{3,})\./.test(compat.version ?? ""))
+                if (!supportsVerifiedKiroMigration(compat))
                     throw new Error(t("kiro_migrate.version_required"));
                 const daemon = this.daemons.get(name);
                 if (this.getInstanceStatus(name) === "running" && (!daemon || !await daemon.kiroMigrationIdle()))
@@ -2125,7 +2128,7 @@ export class FleetManager {
             this.notifyFleetError(t("kiro_reconcile.audit_failed"));
             return true;
         }
-        await this.retireNonceButtons(entry, entry.messageId ?? data.messageId, t("kiro_migrate.applying", plan.name));
+        await this.retireNonceButtons(entry, entry.messageId ?? data.messageId, t("kiro_reconcile.applying", plan.name));
         outcome = await applyKiroReconciliation(this.kiroReconcileDeps(), plan, `${adapterId}:${data.userId}`);
         try {
             this.eventLog.insert(plan.name, "kiro_reconcile", { phase: outcome.ok ? "completed" : "failed", userId: data.userId, receipt: outcome.receipt, message: outcome.text });
@@ -14401,7 +14404,7 @@ export class FleetManager {
             return;
         const read = board.summaryRead(since.toISOString(), until.toISOString(), this.dispatcherGone);
         const projects = board.listProjects(true);
-        const stats = board.projectStats();
+        const stats = board.projectStats(this.dispatcherGone);
         const names = new Map(projects.map((p) => [p.id, p.name]));
         const configured = this.getPrimaryAdapterId();
         const primary = configured !== undefined && this.worlds.has(configured) ? configured : this.worlds.keys().next().value;
@@ -15040,6 +15043,34 @@ export class FleetManager {
             messages: messages.filter(m => keep(m.instance)),
         });
     }
+    /** #2661: the Office levels as last worked out, and the work in flight (officeLevels). */
+    officeLevelsMemo = null;
+    officeLevelsRun = null;
+    /**
+     * #2661: every instance's Office level (office-levels.ts) — worked out by the cache service from the usage store, at
+     * most once per OFFICE_LEVELS_TTL_MS however many pages and share links ask (one run at a time). Null when
+     * web.office_levels is false.
+     */
+    async officeLevels() {
+        if (this.fleetConfig?.web?.office_levels === false)
+            return null;
+        const { OFFICE_LEVELS_TTL_MS } = await import("./office-levels.js");
+        const memo = this.officeLevelsMemo;
+        if (memo && performance.now() - memo.at < OFFICE_LEVELS_TTL_MS)
+            return memo.levels;
+        this.officeLevelsRun ??= this.cacheServiceFor().officeLevels(Date.now()).then((levels) => { this.officeLevelsMemo = { at: performance.now(), levels }; return levels; }).finally(() => { this.officeLevelsRun = null; });
+        return this.officeLevelsRun;
+    }
+    /**
+     * #2661: the levels as last worked out, for a synchronous reader (a share link's gateway): never waits; a stale or
+     * missing set starts the next run. Null when web.office_levels is false or none has been worked out yet.
+     */
+    officeLevelsSnapshot() {
+        if (this.fleetConfig?.web?.office_levels === false)
+            return null;
+        void this.officeLevels().catch(() => { });
+        return this.officeLevelsMemo?.levels ?? null;
+    }
     /** #2001: get_cache_report's — the same report, as last worked out (reused for a minute, until the next pass). */
     cacheReportPublished(window) {
         return this.cacheServiceFor().published(cacheWindow(window));