@songsid/agend 2.3.3-beta.2 → 2.3.3-beta.4

package/dist/fleet-manager.d.ts

@@ -466,6 +466,10 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     private kiroMigrationRuns;
     /** #1386 "Needs you": the list, its live chat messages and Acknowledge. Started with the fleet (finishStartup). */
     private needsYou;
+    private configHistory;
+    private configHistoryTimer;
+    private loadedFleetSource;
+    private getConfigHistory;
     /** When the fleet first saw an instance crashed, for its "Needs you" age; cleared when it is not. */
     private readonly needsCrashedAt;
     /** Pause reason/time read from the marker, per paused instance; dropped on any attention change of it, and at most
@@ -1065,7 +1069,10 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     webhookEmit(event: string, name: string, data?: Record<string, unknown>): void;
     getSysInfo(): import("./fleet-context.js").SysInfo;
     /** Load fleet.yaml and build routing table */
-    loadConfig(configPath: string): FleetConfig;
+    loadConfig(configPath: string, options?: {
+        startup?: boolean;
+        remember?: boolean;
+    }): FleetConfig;
     private relayLoginModeWarned;
     /** `login.mode: relay` was removed (#1139). Still accepted so an upgrade cannot stop a fleet from starting. */
     private warnAboutRemovedLoginMode;

package/dist/fleet-manager.js

@@ -67,7 +67,7 @@ const __dirname = dirname(__filename);
 const DEFAULT_OPEN_ACCESS = { mode: "open", allowed_users: [], max_pending_codes: 0, code_expiry_minutes: 0 };
 import { STATUS_EMOJI_CONFIG_KEYS, STATUS_EMOJI_KEYS, STATUS_EMOJI_SUGGESTIONS, TELEGRAM_REACTION_EMOJIS, builtinStatusEmojis, customEmojiValue, emojiImageUrl, normalizeEmoji, previewStatusEmojis, reactionForm, reactionMatchKey, resolveStatusEmojis, statusAvoidList, statusEmojiProblem, statusMatchKey, statusMatchKeys, textForm, } from "./status-emojis.js";
 import { isProbeableRouteTarget } from "./fleet-context.js";
-import { getEffectiveInstanceDefaults, loadFleetConfig, loadRawFleetConfig, DEFAULT_COST_GUARD, DEFAULT_DAILY_SUMMARY, DEFAULT_INSTANCE_CONFIG, autoGeneralInstanceConfig } from "./config.js";
+import { getEffectiveInstanceDefaults, loadFleetConfig, loadRawFleetConfig, loadFleetConfigSource, loadRawFleetConfigSource, DEFAULT_COST_GUARD, DEFAULT_DAILY_SUMMARY, DEFAULT_INSTANCE_CONFIG, autoGeneralInstanceConfig } from "./config.js";
 import { EventLog } from "./event-log.js";
 import { binaryProbe } from "./binary-probe.js";
 import { AVAILABILITY_STALE_MS, BackendAvailabilityStore, hostAvailabilityProbes } from "./backend-availability.js";
@@ -234,6 +234,7 @@ import { remoteCardAction, remoteCardChoiceLabel, remoteCardOutcomeText, remoteC
 import { recentChatContext } from "./log-tail.js";
 import { describeSignalSource, recordInternalRequest, withOrigin } from "./fleet-control-audit.js";
 import { handleAgentRequest, ToolNotPermittedError } from "./agent-endpoint.js";
+import { ConfigHistory, ConfigSyntaxError, configIssueText } from "./config-history.js";
 import { ClassicChannelManager, classicWebEchoOn, getClassicBackendChoices, inferClassicChannelType, isSelectableClassicBackend, readClassicLastActivityAt, readClassicRoomNames } from "./classic-channel-manager.js";
 import { assertExplicitInstanceRemoval } from "./instance-removal.js";
 import { KNOWN_BACKENDS, validateFleetConfig } from "./config-validator.js";
@@ -906,6 +907,12 @@ export class FleetManager {
     kiroMigrationRuns = new Map();
     /** #1386 "Needs you": the list, its live chat messages and Acknowledge. Started with the fleet (finishStartup). */
     needsYou = null;
+    configHistory = null;
+    configHistoryTimer = null;
+    loadedFleetSource = null;
+    getConfigHistory() {
+        return this.configHistory ??= new ConfigHistory(this.dataDir, () => this.needsYou?.poke(), message => this.logger.warn(message));
+    }
     /** When the fleet first saw an instance crashed, for its "Needs you" age; cleared when it is not. */
     needsCrashedAt = new Map();
     /** Pause reason/time read from the marker, per paused instance; dropped on any attention change of it, and at most
@@ -3101,7 +3108,8 @@ export class FleetManager {
             // fleet.yaml, sent SIGHUP, and got no reaction and no explanation.
             this.logger.error({ err }, "SIGHUP config reload failed");
             const message = err instanceof Error ? err.message : String(err);
-            this.notifyFleetError(t("fleet.reload_failed", message));
+            if (!(err instanceof ConfigSyntaxError))
+                this.notifyFleetError(t("fleet.reload_failed", message));
         });
     }
     /**
@@ -3337,19 +3345,19 @@ export class FleetManager {
         };
     }
     /** Load fleet.yaml and build routing table */
-    loadConfig(configPath) {
+    loadConfig(configPath, options = {}) {
         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}`);
-        }
-        const raw = loadRawFleetConfig(configPath);
-        const loaded = loadFleetConfig(configPath);
+        const history = this.getConfigHistory();
+        history.track("fleet.yaml", configPath);
+        const selected = existsSync(configPath) ? history.read("fleet.yaml", configPath, options.startup) : { source: "{}\n", fallback: false };
+        this.rawFleetDocument = parseDocument(selected.source, { keepSourceTokens: true });
+        const raw = loadRawFleetConfigSource(selected.source);
+        const loaded = loadFleetConfigSource(selected.source);
         this.assertProviderSecretEnvKeys(loaded);
         this.rawFleetConfig = raw;
         this.settingsRuntimeRevision++;
         this.fleetConfig = loaded;
+        this.loadedFleetSource = selected;
         this.savedFleetConfigSnapshot = structuredClone(this.fleetConfig);
         this.warnAboutRemovedLoginMode(loaded);
         this.enforceGuestSwitch();
@@ -3358,6 +3366,8 @@ export class FleetManager {
         // Scope the path to its owning data directory so another inherited home's override cannot enable CW.
         process.env.AGEND_FLEET_DATA_DIR = resolvePath(this.dataDir);
         process.env.AGEND_FLEET_CONFIG_PATH = resolvePath(configPath);
+        if (options.remember !== false && existsSync(configPath))
+            history.accepted("fleet.yaml", configPath, selected);
         return this.fleetConfig;
     }
     relayLoginModeWarned = false;
@@ -8167,7 +8177,7 @@ export class FleetManager {
         this.tmuxExecHelperTimer ??= setInterval(() => tmuxExecHelper.maintain(), 5_000);
         this.tmuxExecHelperTimer.unref?.();
         this.rotateFleetLogs();
-        const fleet = this.loadConfig(configPath);
+        const fleet = this.loadConfig(configPath, { startup: true });
         this.slimFleetConfigAtStartup();
         this.logConfigWarningsAtStartup();
         setLocale(detectLocale(fleet)); // user-facing text language (fleet.yaml defaults.locale / timezone)
@@ -8245,7 +8255,7 @@ export class FleetManager {
         // migrates legacy single-bot entries and names without a suffix. Classic
         // routing does NOT go through the routing engine (single-key, can't hold two
         // bots in one channel) — it resolves per-bot via getInstanceByChannel.
-        this.classicChannels = new ClassicChannelManager(this.dataDir, this.logger);
+        this.classicChannels = new ClassicChannelManager(this.dataDir, this.logger, this.getConfigHistory());
         const classicAdapters = fleet.channels?.length ? fleet.channels : (fleet.channel ? [fleet.channel] : []);
         this.classicChannels.configureAdapters(classicAdapters);
         // The unrecoverable-id report is deliberately NOT sent here: no adapter
@@ -8263,6 +8273,9 @@ export class FleetManager {
         // rooms), before the dashboard serves anything; from now on every change is written back (off the loop).
         this.restoreWebChat(fleet);
         this.startSearchIndex(fleet);
+        // Parse-only source monitoring; it does not apply hand-edited Fleet settings.
+        this.configHistoryTimer = setInterval(() => this.configHistory?.check(), 1_000);
+        this.configHistoryTimer.unref?.();
         // Poll classicBot.yaml for external changes every 30s
         this.classicReloadTimer = setInterval(() => {
             // Attributes the synchronous part, up to the reload's first await (#1235).
@@ -8401,7 +8414,7 @@ export class FleetManager {
             fleet.instances[name] = autoGeneralInstanceConfig(fleet.defaults, generalDir, need.adapterId); // #2598: its kiro_ui is the fleet's
             generalsCreated = true;
         }
-        if (generalsCreated)
+        if (generalsCreated && !this.configHistory?.isFallback(this.configPath))
             this.saveFleetConfig();
         if (topicMode && (fleet.channel || fleet.channels?.length)) {
             const schedulerConfig = {
@@ -8577,7 +8590,7 @@ export class FleetManager {
                     fixedGeneral = true;
                 }
             }
-            if (fixedGeneral)
+            if (fixedGeneral && !this.configHistory?.isFallback(this.configPath))
                 this.saveFleetConfig();
             // Auto-create topics AFTER adapter is ready (needs adapter.createTopic)
             await this.topicCommands.autoCreateTopics();
@@ -12604,6 +12617,7 @@ export class FleetManager {
             },
         });
         this.rawFleetConfig = loadRawFleetConfig(this.configPath);
+        this.configHistory?.accepted("fleet.yaml", this.configPath, { source: output, fallback: false });
         // The instance map is defaults-expanded. A defaults edit changes that view even when it writes no instance
         // leaves. Re-resolve from the committed YAML so inherited values cannot become stale overrides on the next save.
         // Keep the FleetConfig object itself: Settings and other request contexts hold it.
@@ -12682,6 +12696,8 @@ export class FleetManager {
     }
     /** One-time upgrade migration; invalid YAML is never rewritten. */
     migrateNoticeDeliveryStorage() {
+        if (this.configHistory?.isFallback(this.configPath))
+            return;
         if (this.fleetConfig && this.configPath && (this.fleetConfig.web?.notify_login === "dm" || this.fleetConfig.defaults.tips === "dm"
             || this.fleetConfig.web?.notice_delivery !== undefined)
             && validateFleetConfig(this.rawFleetConfig).valid) {
@@ -12696,6 +12712,8 @@ export class FleetManager {
         }
     }
     migrateOfficeStorage() {
+        if (this.configHistory?.isFallback(this.configPath))
+            return;
         if (!this.fleetConfig || !this.configPath || !hasLegacyOffice(this.rawFleetConfig) || !validateFleetConfig(this.rawFleetConfig).valid)
             return;
         try {
@@ -12719,6 +12737,8 @@ export class FleetManager {
         }
     }
     slimFleetConfigAtStartup() {
+        if (this.configHistory?.isFallback(this.configPath))
+            return;
         this.migrateOfficeStorage();
         this.migrateNoticeDeliveryStorage();
         const redundantPaths = collectRedundantInstanceDefaultPaths(this.rawFleetConfig);
@@ -15083,6 +15103,9 @@ export class FleetManager {
             },
             tasks: () => this.needsYouTaskItems(),
             backendSignIns: () => this.needsYouBackendSignIns(),
+            configIssues: () => (this.configHistory?.currentIssues() ?? []).map(issue => ({
+                ...issue, detail: configIssueText(issue, t), owner: this.worlds.keys().next().value,
+            })),
             taskAction: action => this.taskActionFromChat(action),
             settings: () => ({
                 liveMessage: this.fleetConfig?.needs_you?.live_message !== false,
@@ -21222,6 +21245,9 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
         const sharesStopped = this.officeSharesInstance?.close(); // #2636: every Office share ends, and its tunnel
         // #1386: every live "Needs you" message says the fleet stopped (capabilities revoked first) — while the
         // adapters can still edit. Bounded: a platform that does not answer must not hold the shutdown.
+        if (this.configHistoryTimer)
+            clearInterval(this.configHistoryTimer);
+        this.configHistoryTimer = null;
         const needsStopped = this.stopNeedsYou();
         // #1490 P3: stop() now returns a Promise; await it so the final
         // ledger flush completes before process.exit(0) in doStopAll's caller.
@@ -21567,14 +21593,16 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
         const previousRawConfig = this.rawFleetConfig;
         const previousRawDocument = this.rawFleetDocument;
         const previousSavedSnapshot = this.savedFleetConfigSnapshot;
+        const previousSource = this.loadedFleetSource;
         try {
-            this.loadConfig(this.configPath);
+            this.loadConfig(this.configPath, { remember: false });
         }
         catch (err) {
             this.fleetConfig = oldConfig;
             this.rawFleetConfig = previousRawConfig;
             this.rawFleetDocument = previousRawDocument;
             this.savedFleetConfigSnapshot = previousSavedSnapshot;
+            this.loadedFleetSource = previousSource;
             throw err;
         }
         const validation = validateFleetConfig(this.rawFleetConfig);
@@ -21590,6 +21618,7 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
             this.rawFleetConfig = previousRawConfig;
             this.rawFleetDocument = previousRawDocument;
             this.savedFleetConfigSnapshot = previousSavedSnapshot;
+            this.loadedFleetSource = previousSource;
             this.observeWebAuthority(); // #2453 review: the configuration back in force is the one seen
             this.logger.error({
                 oldCount,
@@ -21610,6 +21639,8 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
             // mark every row done and tell the user "changes applied".
             return { rejected: why };
         }
+        if (this.loadedFleetSource)
+            this.getConfigHistory().accepted("fleet.yaml", this.configPath, this.loadedFleetSource);
         this.migrateOfficeStorage();
         this.migrateNoticeDeliveryStorage();
         if (canvasWorkerEnabled(oldConfig?.web) !== this.canvasWorkerEnabled()) {
@@ -21824,7 +21855,7 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
      * the panel shows the mismatch instead of a button.
      */
     checkStartupSignatureConsistency() {
-        if (!this.configPath) {
+        if (!this.configPath || this.configHistory?.isFallback(this.configPath)) {
             this.fleetSignatureMismatch = null;
             return;
         }