@songsid/agend 2.3.4-beta.9 → 2.3.4

package/dist/fleet-manager.d.ts

@@ -62,6 +62,7 @@ export declare function applyTaskListCap<T extends {
 } | T[];
 import { type PublicPreviewForUi } from "./web-api.js";
 import { type LogAnswer, type LogQuery } from "./log-service.js";
+import { type ViewHistoryAnswer, type ViewHistoryQuery } from "./view-history.js";
 import { WebChatHistory, type WebChatPost } from "./web-chat-history.js";
 import { type WebEchoCopy } from "./web-reactions.js";
 import { SeenUsers, type MentionNames, type MentionQuery } from "./web-mentions.js";
@@ -478,6 +479,7 @@ 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 missedOfflineStore;
     private configHistory;
     private configHistoryTimer;
     private loadedFleetSource;
@@ -1221,6 +1223,11 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
     /** Board 003648ac: a web /compact followed to its end, from the transcript the Log reads (none: nothing to follow). */
     private compactWatchService;
     private get compactWatch();
+    /**
+     * Claude history in the View: an instance's earlier conversation for its View, from the transcript the Log reads —
+     * the View's route applied its own access rules first (view-api.ts); the Log's switch plays no part.
+     */
+    viewHistory(name: string, q: ViewHistoryQuery): Promise<ViewHistoryAnswer | null>;
     /** #1218: GET /ui/steps — an instance's steps, read on demand (null: no such instance). */
     logSteps(name: string, q: LogQuery): Promise<LogAnswer | null>;
     /**
@@ -2307,6 +2314,8 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
      * copies retain their permissive handling when that identity is unknown.
      */
     private isOwnerCommandCopy;
+    /** File a Telegram update that was too old to inject; Needs you lists it until Acknowledge. */
+    private recordMissedOffline;
     /**
      * #1085: coincident topic numbers must not route across Telegram groups.
      */
@@ -3549,6 +3558,8 @@ export declare class FleetManager implements FleetContext, LifecycleContext, Arc
      */
     /** Configured threshold before elapsed time appears, in ms. */
     progressMinElapsedMs(): number;
+    /** M-2391: when the instance's live (not retiring) bubble started — the current turn's start — or undefined. */
+    private liveButtonStart;
     private startProgressTicker;
     /**
      * After a reply: give the instance REPLY_RETIRE_GRACE_MS to resume working; if

package/dist/fleet-manager.js

@@ -92,6 +92,7 @@ import { formatFleetTime } from "./tz-utils.js";
 import { createAdapter } from "./channel/factory.js";
 import { isWebChannelEcho, WEB_ECHO_PREFIX } from "./web-channel-echo.js";
 import { TelegramAdapter } from "./channel/adapters/telegram.js";
+import { MissedOfflineStore } from "./missed-offline.js";
 import { createBackend } from "./backend/factory.js";
 import { readEffortMetadata } from "./backend/effort-metadata.js";
 import { codexEffort, flagEffort } from "./backend/launch-effort.js";
@@ -171,6 +172,7 @@ export function applyTaskListCap(tasks, filterAssignee, filterStatus) {
 }
 import { handleWebRequest, webPeerOf, broadcastSseEvent, broadcastToGuests, SSE_HEARTBEAT_MS } from "./web-api.js";
 import { LogService } from "./log-service.js";
+import { viewHistory } from "./view-history.js";
 import { WebChatHistory, WEB_CHAT_TEXT_MAX, isWebMessageId, newWebMessageId, webChatFrom } from "./web-chat-history.js";
 import { WEB_ECHO_COPIES_MAX, WEB_MIRROR_TIMEOUT_MS, webReactionEmoji, webReactionProblem } from "./web-reactions.js";
 import { WebChatDiskStore } from "./web-chat-store.js";
@@ -467,6 +469,8 @@ const INSTALL_TIMEOUT_MS = 10 * 60 * 1000;
  * while anything real shows signs of life well before the old two minutes.
  */
 const PROGRESS_MIN_ELAPSED_MS = 30_000;
+/** M-2391: the threshold tick fires this long after it, never a millisecond before (timers can fire early). */
+const PROGRESS_THRESHOLD_MARGIN_MS = 50;
 /** How much of a tool summary the progress line will show before eliding. */
 const PROGRESS_ACTIVITY_MAX_CHARS = 48;
 /**
@@ -926,6 +930,7 @@ export class FleetManager {
     kiroMigrationRuns = new Map();
     /** #1386 "Needs you": the list, its live chat messages and Acknowledge. Started with the fleet (finishStartup). */
     needsYou = null;
+    missedOfflineStore = null;
     configHistory = null;
     configHistoryTimer = null;
     loadedFleetSource = null;
@@ -2205,6 +2210,7 @@ export class FleetManager {
         this.topicCommands = new TopicCommands(this);
         this.topicArchiver = new TopicArchiver(this);
         this.statuslineWatcher = new StatuslineWatcher(this);
+        this.missedOfflineStore = new MissedOfflineStore(this.dataDir);
     }
     /** #1266: a reply's buttons — the store (reply-buttons.db) and what a click does. Created on first use. */
     replyButtonsCtl = null;
@@ -4095,6 +4101,13 @@ export class FleetManager {
             changed: () => this.emitSseEvent("status", this.getUiStatus()),
         });
     }
+    /**
+     * Claude history in the View: an instance's earlier conversation for its View, from the transcript the Log reads —
+     * the View's route applied its own access rules first (view-api.ts); the Log's switch plays no part.
+     */
+    viewHistory(name, q) {
+        return viewHistory((n, rq) => this.log.readBack(n, rq), name, q);
+    }
     /** #1218: GET /ui/steps — an instance's steps, read on demand (null: no such instance). */
     logSteps(name, q) { return this.log.steps(name, q); }
     /**
@@ -9446,6 +9459,11 @@ export class FleetManager {
         adapter.on("callback_query", safeHandler(async (data) => {
             await this.receiveAdapterCallback(data, adapterId, adapter, isCurrentAdapter);
         }, this.logger, "adapter.callback_query"));
+        adapter.on("missed_offline", (ev) => {
+            if (!isCurrentAdapter())
+                return;
+            this.recordMissedOffline(ev);
+        });
         this.bindTopicClosedHandler(adapter, adapterId, "adapter.topic_closed");
         // Handle classic bot slash commands (/start, /stop, /chat, /compact, /save, /load)
         adapter.on("slash_command", safeHandler(async (data) => {
@@ -9599,6 +9617,11 @@ export class FleetManager {
         adapter.on("callback_query", safeHandler(async (data) => {
             await this.receiveAdapterCallback(data, adapterId, adapter, isCurrentAdapter);
         }, this.logger, `adapter[${adapterId}].callback_query`));
+        adapter.on("missed_offline", (ev) => {
+            if (!isCurrentAdapter())
+                return;
+            this.recordMissedOffline(ev);
+        });
         this.bindTopicClosedHandler(adapter, adapterId, `adapter[${adapterId}].topic_closed`);
         // Slash commands: classic bot + admin commands
         adapter.on("slash_command", safeHandler(async (data) => {
@@ -10335,6 +10358,34 @@ export class FleetManager {
         }
         return true;
     }
+    /** File a Telegram update that was too old to inject; Needs you lists it until Acknowledge. */
+    recordMissedOffline(ev) {
+        if (!this.missedOfflineStore)
+            this.missedOfflineStore = new MissedOfflineStore(this.dataDir);
+        const stub = {
+            source: "telegram", adapterId: ev.adapterId, chatId: ev.chatId, threadId: ev.threadId,
+            messageId: ev.messageId, userId: ev.userId, username: ev.username, text: ev.preview,
+            timestamp: ev.timestamp, isBotMessage: false,
+        };
+        const threadId = this.inboundRouteThreadId(stub);
+        const target = threadId ? this.resolveInboundTarget(stub, threadId) : undefined;
+        let instance = target?.name ?? "";
+        if (!instance) {
+            instance = Object.entries(this.fleetConfig?.instances ?? {}).find(([name, cfg]) => cfg.general_topic && this.getInstanceAdapterId(name) === ev.adapterId)?.[0] ?? "";
+        }
+        const place = [ev.chatTitle, ev.threadId ? `#${ev.threadId}` : ""].filter(Boolean).join(" · ") || ev.chatId;
+        this.missedOfflineStore.add({
+            id: `missed:${ev.adapterId}:${ev.updateId}`,
+            adapterId: ev.adapterId,
+            instance,
+            username: ev.username,
+            place,
+            preview: ev.preview,
+            since: ev.timestamp.getTime(),
+        });
+        this.logger.info({ adapterId: ev.adapterId, updateId: ev.updateId, instance, chatId: ev.chatId, threadId: ev.threadId }, "Telegram message missed while AgEnD was offline — filed for Needs you");
+        this.needsYou?.poke();
+    }
     /**
      * #1085: coincident topic numbers must not route across Telegram groups.
      */
@@ -15539,6 +15590,10 @@ export class FleetManager {
                     throw new Error("the delivery outbox is not open");
                 return this.deliveryOutbox.acknowledge(deliveryId, by);
             },
+            missedOffline: () => (this.missedOfflineStore?.list(Date.now()) ?? []).map(m => ({
+                id: m.id, instance: m.instance, owner: m.adapterId, username: m.username, place: m.place, preview: m.preview, since: m.since,
+            })),
+            acknowledgeMissed: (id, by) => this.missedOfflineStore?.acknowledge(id, by) ?? false,
             tasks: () => this.needsYouTaskItems(),
             backendSignIns: () => this.needsYouBackendSignIns(),
             configIssues: () => (this.configHistory?.currentIssues() ?? []).map(issue => ({
@@ -17189,7 +17244,14 @@ export class FleetManager {
             return;
         }
         const publication = this.beginCancelButtonPublication(instanceName, correlationId);
-        const initialProgressText = FleetManager.progressText(0, null, 1, this.progressPrefixFor(instanceName, 0, 1));
+        // M-2391: a re-post below a reply (preserveProgress) continues the same turn — its elapsed time continues from
+        // the live bubble's start, as its tool list does. Restarting it at 0 meant an agent replying more often than the
+        // threshold never showed elapsed time at all. A fresh turn (no preserve) starts at 0 as before.
+        const carriedStart = preserveProgress ? this.liveButtonStart(instanceName) : undefined;
+        const carriedMs = carriedStart !== undefined ? Math.max(0, Date.now() - carriedStart) : 0;
+        const initialProgressText = carriedStart !== undefined && carriedMs >= this.progressMinElapsedMs()
+            ? FleetManager.progressText(carriedMs, null, this.progressMinElapsedMs(), this.progressPrefixFor(instanceName, carriedMs))
+            : FleetManager.progressText(0, null, 1, this.progressPrefixFor(instanceName, 0, 1));
         try {
             const sent = await adapter.notifyAlert(chatId, {
                 type: "cancel",
@@ -17212,7 +17274,7 @@ export class FleetManager {
                 // Elapsed time is measured from when this button was posted — i.e. from
                 // when the work was handed over — not from the pane's working transition,
                 // which resets if the CLI blips idle mid-turn.
-                startedAt: Date.now(),
+                startedAt: carriedStart ?? Date.now(),
                 // Matches the text notifyAlert just posted, so the first 60s tick does
                 // not re-edit identical text — which put a "(edited)" mark on Discord
                 // with nothing visibly changed.
@@ -17463,6 +17525,12 @@ export class FleetManager {
         }
         return PROGRESS_MIN_ELAPSED_MS;
     }
+    /** M-2391: when the instance's live (not retiring) bubble started — the current turn's start — or undefined. */
+    liveButtonStart(instanceName) {
+        const starts = [...this.cancelButtons.values()].filter((e) => e.instanceName === instanceName && !e.retiring && typeof e.startedAt === "number")
+            .map((e) => e.startedAt);
+        return starts.length ? Math.min(...starts) : undefined;
+    }
     startProgressTicker(entry) {
         const tick = () => this.refreshBubble(entry);
         entry.progressTimer = setInterval(tick, PROGRESS_UPDATE_INTERVAL_MS);
@@ -17472,7 +17540,9 @@ export class FleetManager {
         // one additional edit per turn that lives past the threshold.
         const firstAt = this.progressMinElapsedMs() - (Date.now() - (entry.startedAt ?? Date.now()));
         if (firstAt > 0 && firstAt < PROGRESS_UPDATE_INTERVAL_MS) {
-            const firstTick = setTimeout(tick, firstAt);
+            // M-2391: a little past the threshold — a timer can fire a millisecond before Date.now() reaches it, which
+            // rendered the unchanged "處理中…" text and skipped the edit until the next 60 s interval.
+            const firstTick = setTimeout(tick, firstAt + PROGRESS_THRESHOLD_MARGIN_MS);
             firstTick.unref?.();
         }
     }
@@ -21827,6 +21897,22 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
         // because we asked it to. Set synchronously — doStopAll runs to its first
         // await in the same tick as the signal handler, so no event can slip in.
         this.shuttingDown = true;
+        // Stop receive admission before the first await or any instance shutdown; outbound
+        // adapters remain available below to retire notices and pending prompts.
+        for (const state of this.adapterState.values()) {
+            if (state.retryTimer) {
+                clearTimeout(state.retryTimer);
+                state.retryTimer = undefined;
+            }
+        }
+        const inboundStopped = Promise.all([...this.adapters.values()].map(async (adapter) => {
+            try {
+                await adapter.stopReceiving?.();
+            }
+            catch (err) {
+                this.logger.warn({ adapterId: adapter.id, err }, "Adapter receive stop failed; inbound remains fenced");
+            }
+        }));
         this.workingRecovery?.reset();
         if (this.workingRecoveryTimer)
             clearInterval(this.workingRecoveryTimer);
@@ -21886,6 +21972,7 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
         // A login/install window is a dedicated tmux server with its own TTL
         // timer and HTTP listener living in THIS process: without an explicit
         // shutdown it would outlive us as an owner-less login CLI (sol B3).
+        await inboundStopped;
         await publicStopped;
         await sharesStopped?.catch(() => { });
         await profileStopped;
@@ -21896,13 +21983,6 @@ Plus the operational skills (fleet-health, instance-lifecycle, scheduling, sessi
         await this.cpuProfileControl?.close();
         this.cpuProfileControl = null;
         await this.shutdownLoginWindows();
-        // Cancel adapter retry timers
-        for (const state of this.adapterState.values()) {
-            if (state.retryTimer) {
-                clearTimeout(state.retryTimer);
-                state.retryTimer = undefined;
-            }
-        }
         this.clearStatuslineWatchers();
         this.costGuard?.stop();
         this.dailySummary?.stop();