Skip to content

A self-improving RLM agent for coding workflows and long-running autonomous tasks.

Rust

refactor(coding-agent): derive scoped heartbeats at render time (#1857)

Sebastian Müller85c236d5fc5b
diff --git a/packages/coding-agent/.changes/derive-scoped-heartbeats.md b/packages/coding-agent/.changes/derive-scoped-heartbeats.md
new file mode 100644
index 0000000000..d917a1484e
--- /dev/null
+++ b/packages/coding-agent/.changes/derive-scoped-heartbeats.md
@@ -0,0 +1 @@
+- Kept heartbeat lists current when session or subagent scope changes.
diff --git a/packages/coding-agent/src/modes/interactive/components/heartbeat-manager.ts b/packages/coding-agent/src/modes/interactive/components/heartbeat-manager.ts
index 0c6b8efea9..28e9344ec7 100644
--- a/packages/coding-agent/src/modes/interactive/components/heartbeat-manager.ts
+++ b/packages/coding-agent/src/modes/interactive/components/heartbeat-manager.ts
@@ -14,6 +14,7 @@ const HEARTBEAT_SCROLL_INDICATOR_ROWS = 1;
type HeartbeatManagerMode = { type: "list" } | { type: "actions"; heartbeatId: string; selectedIndex: number };
export interface HeartbeatManagerOptions {
+ getHeartbeats: () => readonly AgentConnectionHeartbeat[];
getRows: () => number;
onAction: (heartbeat: AgentConnectionHeartbeat, action: AgentHeartbeatManagementAction) => Promise<void>;
onClose: () => void;
@@ -21,19 +22,13 @@ export interface HeartbeatManagerOptions {
}
export class HeartbeatManagerComponent implements Component, Focusable {
- private heartbeats: AgentConnectionHeartbeat[] = [];
- private selectedIndex = 0;
+ private selectedHeartbeatId: string | undefined;
private mode: HeartbeatManagerMode = { type: "list" };
private busy = false;
private error: string | undefined;
private _focused = false;
- constructor(
- heartbeats: readonly AgentConnectionHeartbeat[],
- private readonly options: HeartbeatManagerOptions,
- ) {
- this.setHeartbeats(heartbeats);
- }
+ constructor(private readonly options: HeartbeatManagerOptions) {}
get focused(): boolean {
return this._focused;
@@ -45,22 +40,13 @@ export class HeartbeatManagerComponent implements Component, Focusable {
invalidate(): void {}
- setHeartbeats(heartbeats: readonly AgentConnectionHeartbeat[]): void {
- const selectedId = this.heartbeats[this.selectedIndex]?.job.id;
- this.heartbeats = [...heartbeats].sort((left, right) => {
+ private get heartbeats(): AgentConnectionHeartbeat[] {
+ return [...this.options.getHeartbeats()].sort((left, right) => {
const sessionOrder = this.sessionLabel(left).localeCompare(this.sessionLabel(right));
if (sessionOrder !== 0) return sessionOrder;
if (left.job.source !== right.job.source) return left.job.source === "heartbeat" ? -1 : 1;
return left.job.createdAt.localeCompare(right.job.createdAt);
});
- const nextIndex = selectedId
- ? this.heartbeats.findIndex((heartbeat) => heartbeat.job.id === selectedId)
- : this.selectedIndex;
- this.selectedIndex = Math.max(0, Math.min(nextIndex < 0 ? 0 : nextIndex, this.heartbeats.length - 1));
- if (this.mode.type !== "list" && !this.findHeartbeat(this.mode.heartbeatId)) {
- this.mode = { type: "list" };
- }
- this.options.requestRender();
}
handleInput(data: string): void {
@@ -98,6 +84,14 @@ export class HeartbeatManagerComponent implements Component, Focusable {
}
render(width: number): string[] {
+ const heartbeats = this.heartbeats;
+ if (!heartbeats.some((heartbeat) => heartbeat.job.id === this.selectedHeartbeatId)) {
+ this.selectedHeartbeatId = heartbeats[0]?.job.id;
+ }
+ if (this.mode.type !== "list") {
+ const heartbeatId = this.mode.heartbeatId;
+ if (!heartbeats.some((heartbeat) => heartbeat.job.id === heartbeatId)) this.mode = { type: "list" };
+ }
const panel = this.mode.type === "list" ? this.createHeartbeatListPanel() : this.createActionPanel(this.mode);
const safeWidth = Math.max(1, width);
const panelWidth = Math.min(safeWidth, HEARTBEAT_PANEL_MAX_WIDTH);
@@ -127,19 +121,21 @@ export class HeartbeatManagerComponent implements Component, Focusable {
}
private populateHeartbeatList(list: MenuList): void {
- if (this.heartbeats.length === 0) {
+ const heartbeats = this.heartbeats;
+ if (heartbeats.length === 0) {
list.addChild(new TruncatedText(theme.fg("muted", "No running or paused heartbeats"), 1, 0));
return;
}
+ const selectedIndex = this.getSelectedIndex(heartbeats);
const visibleItems = this.getListLayout().visibleItems;
const startIndex = Math.max(
0,
- Math.min(this.selectedIndex - Math.floor(visibleItems / 2), this.heartbeats.length - visibleItems),
+ Math.min(selectedIndex - Math.floor(visibleItems / 2), heartbeats.length - visibleItems),
);
- const endIndex = Math.min(startIndex + visibleItems, this.heartbeats.length);
+ const endIndex = Math.min(startIndex + visibleItems, heartbeats.length);
for (let index = startIndex; index < endIndex; index++) {
- const heartbeat = this.heartbeats[index];
+ const heartbeat = heartbeats[index];
if (!heartbeat) continue;
const source = this.sourceLabel(heartbeat);
const label = heartbeat.job.label?.trim();
@@ -152,15 +148,13 @@ export class HeartbeatManagerComponent implements Component, Focusable {
primary: label || this.singleLine(heartbeat.job.prompt) || this.defaultHeartbeatName(heartbeat),
secondary: details,
meta: this.formatStatus(heartbeat),
- selected: index === this.selectedIndex,
+ selected: index === selectedIndex,
}),
);
}
- if (startIndex > 0 || endIndex < this.heartbeats.length) {
- list.addChild(
- new TruncatedText(theme.fg("muted", ` (${this.selectedIndex + 1}/${this.heartbeats.length})`), 1, 0),
- );
+ if (startIndex > 0 || endIndex < heartbeats.length) {
+ list.addChild(new TruncatedText(theme.fg("muted", ` (${selectedIndex + 1}/${heartbeats.length})`), 1, 0));
}
}
@@ -198,8 +192,11 @@ export class HeartbeatManagerComponent implements Component, Focusable {
private moveSelection(delta: number): void {
if (this.mode.type === "list") {
- if (this.heartbeats.length === 0) return;
- this.selectedIndex = Math.max(0, Math.min(this.selectedIndex + delta, this.heartbeats.length - 1));
+ const heartbeats = this.heartbeats;
+ if (heartbeats.length === 0) return;
+ const selectedIndex = this.getSelectedIndex(heartbeats);
+ const nextIndex = Math.max(0, Math.min(selectedIndex + delta, heartbeats.length - 1));
+ this.selectedHeartbeatId = heartbeats[nextIndex]?.job.id;
} else {
const count = this.availableActions(this.findHeartbeat(this.mode.heartbeatId)).length;
this.mode = { ...this.mode, selectedIndex: Math.max(0, Math.min(this.mode.selectedIndex + delta, count - 1)) };
@@ -209,7 +206,8 @@ export class HeartbeatManagerComponent implements Component, Focusable {
private async confirmSelection(): Promise<void> {
if (this.mode.type === "list") {
- const heartbeat = this.heartbeats[this.selectedIndex];
+ const heartbeats = this.heartbeats;
+ const heartbeat = heartbeats[this.getSelectedIndex(heartbeats)];
if (heartbeat) {
this.mode = { type: "actions", heartbeatId: heartbeat.job.id, selectedIndex: 0 };
this.options.requestRender();
@@ -254,6 +252,11 @@ export class HeartbeatManagerComponent implements Component, Focusable {
];
}
+ private getSelectedIndex(heartbeats: readonly AgentConnectionHeartbeat[]): number {
+ const index = heartbeats.findIndex((heartbeat) => heartbeat.job.id === this.selectedHeartbeatId);
+ return index < 0 ? 0 : index;
+ }
+
private findHeartbeat(id: string): AgentConnectionHeartbeat | undefined {
return this.heartbeats.find((heartbeat) => heartbeat.job.id === id);
}
diff --git a/packages/coding-agent/src/modes/interactive/interactive-mode.ts b/packages/coding-agent/src/modes/interactive/interactive-mode.ts
index 45ffca379b..b5d59e2ef1 100644
--- a/packages/coding-agent/src/modes/interactive/interactive-mode.ts
+++ b/packages/coding-agent/src/modes/interactive/interactive-mode.ts
@@ -990,12 +990,12 @@ export class InteractiveMode {
private connectionState: AgentConnectionState | undefined;
private connectionResourceSnapshot: AgentConnectionResourceSnapshot | undefined;
private heartbeatCatalog: AgentConnectionHeartbeat[] = [];
- private heartbeats: AgentConnectionHeartbeat[] = [];
private heartbeatRefreshPromise: Promise<void> | undefined;
private heartbeatRefreshRequested = false;
private heartbeatManager: HeartbeatManagerComponent | undefined;
private heartbeatManagerHandle: OverlayHandle | undefined;
private heartbeatManagerRefreshTimer: ReturnType<typeof setTimeout> | undefined;
+ private heartbeatManagerRefreshAt: number | undefined;
// Registry of images pasted this session, keyed by the `[image #N]` marker
// shown to the user. Insertion-ordered; the bytes persist (bounded by
@@ -2553,32 +2553,19 @@ export class InteractiveMode {
private applyHeartbeatCatalog(heartbeats: AgentConnectionHeartbeat[]): void {
this.heartbeatCatalog = heartbeats;
- this.updateScopedHeartbeats();
- }
-
- private updateScopedHeartbeats(): void {
- const heartbeats = scopeHeartbeatsToSession(
- this.heartbeatCatalog,
- this.connectionState,
- this.subagentSnapshots.values(),
- );
- if (
- heartbeats.length === this.heartbeats.length &&
- heartbeats.every((heartbeat, index) => heartbeat === this.heartbeats[index])
- ) {
- return;
- }
- this.heartbeats = heartbeats;
- this.heartbeatManager?.setHeartbeats(heartbeats);
this.scheduleHeartbeatManagerRefresh();
this.updateSubagentSummaryLine();
this.ui.requestRender();
}
+ private getScopedHeartbeats(): AgentConnectionHeartbeat[] {
+ return scopeHeartbeatsToSession(this.heartbeatCatalog, this.connectionState, this.subagentSnapshots.values());
+ }
+
private applyConnectionStateSnapshot(state: AgentConnectionState): void {
this.bindPromptStashSession(state.sessionId);
this.connectionState = state;
- this.updateScopedHeartbeats();
+ this.scheduleHeartbeatManagerRefresh();
// Don't touch contextUsageTokenBaseline: a mid-stream snapshot reflects only completed
// turns (the in-flight message isn't persisted yet), so the in-flight delta must keep
// accumulating. The baseline is managed at turn end (refreshConnectionContextUsage) and
@@ -5944,7 +5931,7 @@ export class InteractiveMode {
}
private refreshSubagentSummary(): void {
- this.updateScopedHeartbeats();
+ this.scheduleHeartbeatManagerRefresh();
this.updateSubagentSummaryLine();
this.updateWorkingPulse();
this.syncWorkingLoader();
@@ -5975,7 +5962,7 @@ export class InteractiveMode {
this.subagentSnapshots.clear();
this.rlmNodeId = undefined;
this.updateSubagentSummaryLine();
- this.updateScopedHeartbeats();
+ this.scheduleHeartbeatManagerRefresh();
// Clearing snapshots can drop the last running subagent; reconcile the
// pulse and loader so neither lingers when nothing is in flight.
this.updateWorkingPulse();
@@ -6096,11 +6083,12 @@ export class InteractiveMode {
}
private getTrayHeartbeatLabel(): string | undefined {
- if (this.heartbeats.length === 0) {
+ const heartbeats = this.getScopedHeartbeats();
+ if (heartbeats.length === 0) {
return undefined;
}
- const paused = this.heartbeats.filter((heartbeat) => heartbeat.job.status === "paused").length;
- const count = `${this.heartbeats.length} heartbeat${this.heartbeats.length === 1 ? "" : "s"}`;
+ const paused = heartbeats.filter((heartbeat) => heartbeat.job.status === "paused").length;
+ const count = `${heartbeats.length} heartbeat${heartbeats.length === 1 ? "" : "s"}`;
const pausedLabel = paused ? ` · ${paused} paused` : "";
const shortcut = keyText("app.heartbeats.open");
return `${count}${pausedLabel}${shortcut ? ` (${shortcut})` : ""}`;
@@ -9569,7 +9557,8 @@ export class InteractiveMode {
this.showError(error instanceof Error ? error.message : String(error));
return;
}
- const manager = new HeartbeatManagerComponent(this.heartbeats, {
+ const manager = new HeartbeatManagerComponent({
+ getHeartbeats: () => this.getScopedHeartbeats(),
getRows: () => this.ui.terminal.rows,
onAction: (heartbeat, action) => this.manageHeartbeat(heartbeat, action),
onClose: () => this.closeHeartbeatManager(),
@@ -9584,10 +9573,7 @@ export class InteractiveMode {
}
private closeHeartbeatManager(): void {
- if (this.heartbeatManagerRefreshTimer) {
- clearTimeout(this.heartbeatManagerRefreshTimer);
- this.heartbeatManagerRefreshTimer = undefined;
- }
+ this.clearHeartbeatManagerRefreshTimer();
this.heartbeatManagerHandle?.hide();
this.heartbeatManagerHandle = undefined;
this.heartbeatManager = undefined;
@@ -9595,25 +9581,37 @@ export class InteractiveMode {
}
private scheduleHeartbeatManagerRefresh(): void {
- if (this.heartbeatManagerRefreshTimer) {
- clearTimeout(this.heartbeatManagerRefreshTimer);
- this.heartbeatManagerRefreshTimer = undefined;
- }
if (!this.heartbeatManager) {
+ this.clearHeartbeatManagerRefreshTimer();
return;
}
- const nextRunAt = this.heartbeats
+ const nextRunAt = this.getScopedHeartbeats()
.filter((heartbeat) => heartbeat.job.status === "active" && heartbeat.job.nextRunAt)
.map((heartbeat) => Date.parse(heartbeat.job.nextRunAt!))
.filter(Number.isFinite)
.sort((left, right) => left - right)[0];
if (nextRunAt === undefined) {
+ this.clearHeartbeatManagerRefreshTimer();
return;
}
const untilNextRun = nextRunAt - Date.now();
const delay = untilNextRun > 0 ? Math.min(60_000, untilNextRun + 250) : 5_000;
+ const refreshAt = Date.now() + delay;
+ // Subagent snapshots re-derive this schedule constantly; keep an earlier
+ // pending refresh instead of re-arming, or an overdue heartbeat's 5s
+ // fallback would be postponed for as long as children stay busy.
+ if (
+ this.heartbeatManagerRefreshTimer &&
+ this.heartbeatManagerRefreshAt !== undefined &&
+ this.heartbeatManagerRefreshAt <= refreshAt
+ ) {
+ return;
+ }
+ this.clearHeartbeatManagerRefreshTimer();
+ this.heartbeatManagerRefreshAt = refreshAt;
this.heartbeatManagerRefreshTimer = setTimeout(() => {
this.heartbeatManagerRefreshTimer = undefined;
+ this.heartbeatManagerRefreshAt = undefined;
if (!this.heartbeatManager) {
return;
}
@@ -9622,6 +9620,14 @@ export class InteractiveMode {
this.heartbeatManagerRefreshTimer.unref?.();
}
+ private clearHeartbeatManagerRefreshTimer(): void {
+ if (this.heartbeatManagerRefreshTimer) {
+ clearTimeout(this.heartbeatManagerRefreshTimer);
+ this.heartbeatManagerRefreshTimer = undefined;
+ }
+ this.heartbeatManagerRefreshAt = undefined;
+ }
+
private async manageHeartbeat(
heartbeat: AgentConnectionHeartbeat,
action: AgentHeartbeatManagementAction,
diff --git a/packages/coding-agent/test/heartbeat-manager.test.ts b/packages/coding-agent/test/heartbeat-manager.test.ts
index bc8ae2e711..58901c6c91 100644
--- a/packages/coding-agent/test/heartbeat-manager.test.ts
+++ b/packages/coding-agent/test/heartbeat-manager.test.ts
@@ -48,8 +48,8 @@ describe("HeartbeatManagerComponent", () => {
});
it("groups user and agent heartbeats and stays within terminal width", () => {
- const component = new HeartbeatManagerComponent(
- [
+ const component = new HeartbeatManagerComponent({
+ getHeartbeats: () => [
heartbeat("user", { source: "heartbeat" }),
heartbeat("agent", {
source: "rlm_heartbeat",
@@ -59,8 +59,11 @@ describe("HeartbeatManagerComponent", () => {
lastError: "the previous delivery failed",
}),
],
- { getRows: () => 20, onAction: async () => {}, onClose: () => {}, requestRender: () => {} },
- );
+ getRows: () => 20,
+ onAction: async () => {},
+ onClose: () => {},
+ requestRender: () => {},
+ });
for (const width of [32, 48, 80]) {
const lines = component.render(width);
expect(lines.every((line) => visibleWidth(line) === width)).toBe(true);
@@ -81,9 +84,25 @@ describe("HeartbeatManagerComponent", () => {
expect(rendered.find((line) => line.includes("Esc close"))?.indexOf("Esc close")).toBe(titleColumn);
});
+ it("reads the current heartbeat list when rendered", () => {
+ let heartbeats = [heartbeat("user", { source: "heartbeat" })];
+ const component = new HeartbeatManagerComponent({
+ getHeartbeats: () => heartbeats,
+ getRows: () => 20,
+ onAction: async () => {},
+ onClose: () => {},
+ requestRender: () => {},
+ });
+
+ expect(stripAnsi(component.render(80).join("\n"))).toContain("1 heartbeat.");
+ heartbeats = [heartbeat("user", { source: "heartbeat" }), heartbeat("agent", { source: "rlm_heartbeat" })];
+ expect(stripAnsi(component.render(80).join("\n"))).toContain("2 heartbeats.");
+ });
+
it("uses arrows to open and go back, and closes with escape or the toggle shortcut", () => {
let closeCount = 0;
- const component = new HeartbeatManagerComponent([heartbeat("user", { source: "heartbeat" })], {
+ const component = new HeartbeatManagerComponent({
+ getHeartbeats: () => [heartbeat("user", { source: "heartbeat" })],
getRows: () => 20,
onAction: async () => {},
onClose: () => closeCount++,
@@ -114,7 +133,8 @@ describe("HeartbeatManagerComponent", () => {
it("pauses and stops individual heartbeats immediately", async () => {
const actions: Array<{ id: string; action: AgentHeartbeatManagementAction }> = [];
- const component = new HeartbeatManagerComponent([heartbeat("user", { source: "heartbeat" })], {
+ const component = new HeartbeatManagerComponent({
+ getHeartbeats: () => [heartbeat("user", { source: "heartbeat" })],
getRows: () => 20,
onAction: async (entry, action) => {
actions.push({ id: entry.job.id, action });
diff --git a/packages/coding-agent/test/interactive-heartbeat-management.test.ts b/packages/coding-agent/test/interactive-heartbeat-management.test.ts
index c7923fd8db..664779e00e 100644
--- a/packages/coding-agent/test/interactive-heartbeat-management.test.ts
+++ b/packages/coding-agent/test/interactive-heartbeat-management.test.ts
@@ -8,7 +8,6 @@ import { InteractiveMode } from "../src/modes/interactive/interactive-mode.js";
interface HeartbeatManagementHarness {
heartbeatCatalog: AgentConnectionHeartbeat[];
- heartbeats: AgentConnectionHeartbeat[];
agentConnection: {
manageHeartbeat(
activeSessionId: string,
@@ -25,24 +24,30 @@ interface HeartbeatManagementHarness {
interface HeartbeatScopeHarness {
heartbeatCatalog: AgentConnectionHeartbeat[];
- heartbeats: AgentConnectionHeartbeat[];
connectionState: { activeSessionId: string; sessionId: string };
subagentSnapshots: Map<string, AgentConnectionRlmChildAgentSnapshot>;
- heartbeatManager: { setHeartbeats(heartbeats: AgentConnectionHeartbeat[]): void } | undefined;
ui: { requestRender(): void };
scheduleHeartbeatManagerRefresh(): void;
updateSubagentSummaryLine(): void;
applyHeartbeatCatalog(heartbeats: AgentConnectionHeartbeat[]): void;
+ getScopedHeartbeats(): AgentConnectionHeartbeat[];
}
interface ChildIdentityUpdateHarness {
subagentSnapshots: Map<string, AgentConnectionRlmChildAgentSnapshot>;
- refreshSubagentSummary(): void;
+ ui: { requestRender(): void };
updateSubagentSummary(child: AgentConnectionRlmChildAgentSnapshot): void;
+ scheduleHeartbeatManagerRefresh(): void;
+ updateSubagentSummaryLine(): void;
+ updateWorkingPulse(): void;
+ syncWorkingLoader(): void;
+ updateWorkingLoaderMessage(): void;
}
interface HeartbeatRefreshHarness {
- heartbeats: AgentConnectionHeartbeat[];
+ heartbeatCatalog: AgentConnectionHeartbeat[];
+ connectionState: { activeSessionId: string; sessionId: string };
+ subagentSnapshots: Map<string, AgentConnectionRlmChildAgentSnapshot>;
heartbeatManager: object | undefined;
heartbeatManagerRefreshTimer: ReturnType<typeof setTimeout> | undefined;
refreshHeartbeatCatalog(): Promise<void>;
@@ -74,8 +79,7 @@ describe("interactive heartbeat management", () => {
const stopped = { ...current, status: "cancelled" as const, nextRunAt: undefined };
const patches: Array<{ heartbeat: AgentCronJob | null }> = [];
const harness = Object.create(InteractiveMode.prototype) as HeartbeatManagementHarness;
- harness.heartbeats = [{ job: current }];
- harness.heartbeatCatalog = harness.heartbeats;
+ harness.heartbeatCatalog = [{ job: current }];
harness.connectionState = { activeSessionId: current.activeSessionId };
harness.agentConnection = {
manageHeartbeat: vi.fn(async () => stopped),
@@ -95,8 +99,7 @@ describe("interactive heartbeat management", () => {
const current = heartbeat();
const paused = { ...current, status: "paused" as const, nextRunAt: undefined };
const harness = Object.create(InteractiveMode.prototype) as HeartbeatManagementHarness;
- harness.heartbeats = [{ job: current, sessionName: "Primary session" }];
- harness.heartbeatCatalog = harness.heartbeats;
+ harness.heartbeatCatalog = [{ job: current, sessionName: "Primary session" }];
harness.connectionState = { activeSessionId: current.activeSessionId };
harness.agentConnection = { manageHeartbeat: vi.fn(async () => paused) };
harness.patchConnectionState = vi.fn();
@@ -123,7 +126,6 @@ describe("interactive heartbeat management", () => {
};
const harness = Object.create(InteractiveMode.prototype) as HeartbeatScopeHarness;
harness.heartbeatCatalog = [];
- harness.heartbeats = [];
harness.connectionState = { activeSessionId: "active-1", sessionId: "session-1" };
harness.subagentSnapshots = new Map([
[
@@ -137,7 +139,6 @@ describe("interactive heartbeat management", () => {
},
],
]);
- harness.heartbeatManager = { setHeartbeats: vi.fn() };
harness.ui = { requestRender: vi.fn() };
harness.scheduleHeartbeatManagerRefresh = vi.fn();
harness.updateSubagentSummaryLine = vi.fn();
@@ -145,8 +146,7 @@ describe("interactive heartbeat management", () => {
harness.applyHeartbeatCatalog([own, child, unrelated]);
expect(harness.heartbeatCatalog).toEqual([own, child, unrelated]);
- expect(harness.heartbeats).toEqual([own, child]);
- expect(harness.heartbeatManager.setHeartbeats).toHaveBeenCalledWith([own, child]);
+ expect(harness.getScopedHeartbeats()).toEqual([own, child]);
expect(harness.updateSubagentSummaryLine).toHaveBeenCalledOnce();
});
@@ -159,12 +159,17 @@ describe("interactive heartbeat management", () => {
};
const harness = Object.create(InteractiveMode.prototype) as ChildIdentityUpdateHarness;
harness.subagentSnapshots = new Map([[existing.id, existing]]);
- harness.refreshSubagentSummary = vi.fn();
+ harness.ui = { requestRender: vi.fn() };
+ harness.scheduleHeartbeatManagerRefresh = vi.fn();
+ harness.updateSubagentSummaryLine = vi.fn();
+ harness.updateWorkingPulse = vi.fn();
+ harness.syncWorkingLoader = vi.fn();
+ harness.updateWorkingLoaderMessage = vi.fn();
harness.updateSubagentSummary({ ...existing, activeSessionId: "active-2" });
expect(harness.subagentSnapshots.get(existing.id)?.activeSessionId).toBe("active-2");
- expect(harness.refreshSubagentSummary).toHaveBeenCalledOnce();
+ expect(harness.scheduleHeartbeatManagerRefresh).toHaveBeenCalledOnce();
});
it("refreshes an open manager after the next scheduled run", async () => {
@@ -172,7 +177,9 @@ describe("interactive heartbeat management", () => {
try {
vi.setSystemTime(new Date("2026-01-01T00:00:00.000Z"));
const harness = Object.create(InteractiveMode.prototype) as HeartbeatRefreshHarness;
- harness.heartbeats = [{ job: { ...heartbeat(), nextRunAt: "2026-01-01T00:00:01.000Z" } }];
+ harness.heartbeatCatalog = [{ job: { ...heartbeat(), nextRunAt: "2026-01-01T00:00:01.000Z" } }];
+ harness.connectionState = { activeSessionId: "active-1", sessionId: "session-1" };
+ harness.subagentSnapshots = new Map();
harness.heartbeatManager = {};
harness.heartbeatManagerRefreshTimer = undefined;
harness.refreshHeartbeatCatalog = vi.fn(async () => {});
@@ -185,4 +192,57 @@ describe("interactive heartbeat management", () => {
vi.useRealTimers();
}
});
+
+ it("keeps the overdue refresh deadline when subagent updates re-derive the schedule", async () => {
+ vi.useFakeTimers();
+ try {
+ // nextRunAt (00:05) is already in the past, so the 5s overdue fallback applies.
+ vi.setSystemTime(new Date("2026-01-01T00:10:00.000Z"));
+ const harness = Object.create(InteractiveMode.prototype) as HeartbeatRefreshHarness;
+ harness.heartbeatCatalog = [{ job: heartbeat() }];
+ harness.connectionState = { activeSessionId: "active-1", sessionId: "session-1" };
+ harness.subagentSnapshots = new Map();
+ harness.heartbeatManager = {};
+ harness.heartbeatManagerRefreshTimer = undefined;
+ harness.refreshHeartbeatCatalog = vi.fn(async () => {});
+
+ harness.scheduleHeartbeatManagerRefresh();
+ // Subagent snapshot updates re-derive the schedule more often than
+ // every 5s; they must not postpone the pending overdue refresh.
+ for (let i = 0; i < 5; i++) {
+ await vi.advanceTimersByTimeAsync(1_000);
+ harness.scheduleHeartbeatManagerRefresh();
+ }
+
+ expect(harness.refreshHeartbeatCatalog).toHaveBeenCalledOnce();
+ } finally {
+ vi.useRealTimers();
+ }
+ });
+
+ it("re-arms to an earlier deadline when a sooner heartbeat appears", async () => {
+ vi.useFakeTimers();
+ try {
+ vi.setSystemTime(new Date("2026-01-01T00:00:00.000Z"));
+ const harness = Object.create(InteractiveMode.prototype) as HeartbeatRefreshHarness;
+ // Two minutes out, so the first schedule arms the capped 60s poll.
+ harness.heartbeatCatalog = [{ job: { ...heartbeat(), nextRunAt: "2026-01-01T00:02:00.000Z" } }];
+ harness.connectionState = { activeSessionId: "active-1", sessionId: "session-1" };
+ harness.subagentSnapshots = new Map();
+ harness.heartbeatManager = {};
+ harness.heartbeatManagerRefreshTimer = undefined;
+ harness.refreshHeartbeatCatalog = vi.fn(async () => {});
+
+ harness.scheduleHeartbeatManagerRefresh();
+ // A sooner heartbeat must pull the pending refresh forward, not sit
+ // behind the already-armed 60s poll.
+ harness.heartbeatCatalog = [{ job: { ...heartbeat(), nextRunAt: "2026-01-01T00:00:02.000Z" } }];
+ harness.scheduleHeartbeatManagerRefresh();
+ await vi.advanceTimersByTimeAsync(3_000);
+
+ expect(harness.refreshHeartbeatCatalog).toHaveBeenCalledOnce();
+ } finally {
+ vi.useRealTimers();
+ }
+ });
});
diff --git a/packages/coding-agent/test/interactive-mode-status.test.ts b/packages/coding-agent/test/interactive-mode-status.test.ts
index 0add19419e..b23232f6a6 100644
--- a/packages/coding-agent/test/interactive-mode-status.test.ts
+++ b/packages/coding-agent/test/interactive-mode-status.test.ts
@@ -4253,8 +4253,11 @@ describe("InteractiveMode goal status announcements", () => {
describe("InteractiveMode tray goal label", () => {
type TrayUsage = { contextWindow: number; tokens: number | null; percent: number | null };
type TrayLabelHarness = {
- heartbeats: AgentConnectionHeartbeat[];
+ heartbeatCatalog: AgentConnectionHeartbeat[];
+ subagentSnapshots: Map<string, never>;
connectionState: {
+ activeSessionId: string;
+ sessionId: string;
goal: GoalState;
heartbeat?: AgentCronJob | null;
contextUsage: TrayUsage | undefined;
@@ -4284,8 +4287,11 @@ describe("InteractiveMode tray goal label", () => {
test("shows active goals in the lower tray without an objective", () => {
const fakeThis = Object.create(InteractiveMode.prototype) as TrayLabelHarness;
- fakeThis.heartbeats = [];
+ fakeThis.heartbeatCatalog = [];
+ fakeThis.subagentSnapshots = new Map<string, never>();
fakeThis.connectionState = {
+ activeSessionId: "active-1",
+ sessionId: "session-1",
goal: {
active: true,
status: "active",
@@ -4303,8 +4309,11 @@ describe("InteractiveMode tray goal label", () => {
test("combines active goals with token/context usage in one lower-tray label", () => {
const fakeThis = Object.create(InteractiveMode.prototype) as TrayLabelHarness;
- fakeThis.heartbeats = [];
+ fakeThis.heartbeatCatalog = [];
+ fakeThis.subagentSnapshots = new Map<string, never>();
fakeThis.connectionState = {
+ activeSessionId: "active-1",
+ sessionId: "session-1",
goal: {
active: true,
status: "active",
@@ -4322,8 +4331,11 @@ describe("InteractiveMode tray goal label", () => {
test("combines active goals, active heartbeats, and context usage in one lower-tray label", () => {
const fakeThis = Object.create(InteractiveMode.prototype) as TrayLabelHarness;
- fakeThis.heartbeats = [{ job: createHeartbeat("active") }];
+ fakeThis.heartbeatCatalog = [{ job: createHeartbeat("active") }];
+ fakeThis.subagentSnapshots = new Map<string, never>();
fakeThis.connectionState = {
+ activeSessionId: "active-1",
+ sessionId: "session-1",
goal: {
active: true,
status: "active",
@@ -4342,8 +4354,11 @@ describe("InteractiveMode tray goal label", () => {
test("omits the usage segment when token count is unknown", () => {
const fakeThis = Object.create(InteractiveMode.prototype) as TrayLabelHarness;
- fakeThis.heartbeats = [];
+ fakeThis.heartbeatCatalog = [];
+ fakeThis.subagentSnapshots = new Map<string, never>();
fakeThis.connectionState = {
+ activeSessionId: "active-1",
+ sessionId: "session-1",
goal: {
active: true,
status: "active",
diff --git a/packages/coding-agent/test/subagent-summary-line.test.ts b/packages/coding-agent/test/subagent-summary-line.test.ts
index 38959d6eeb..71037d7a6b 100644
--- a/packages/coding-agent/test/subagent-summary-line.test.ts
+++ b/packages/coding-agent/test/subagent-summary-line.test.ts
@@ -133,7 +133,6 @@ describe("SubagentSummaryLine", () => {
rlmNodeId: undefined,
heartbeatCatalog: [],
subagentSummaryLine: line,
- updateScopedHeartbeats: vi.fn(),
updateWorkingPulse: vi.fn(),
syncWorkingLoader: vi.fn(),
updateWorkingLoaderMessage: vi.fn(),
@@ -159,7 +158,6 @@ describe("SubagentSummaryLine", () => {
rlmNodeId: undefined,
heartbeatCatalog: [],
subagentSummaryLine: line,
- updateScopedHeartbeats: vi.fn(),
updateWorkingPulse: vi.fn(),
syncWorkingLoader: vi.fn(),
updateWorkingLoaderMessage: vi.fn(),
@@ -188,7 +186,6 @@ describe("SubagentSummaryLine", () => {
rlmNodeId: undefined,
heartbeatCatalog: [],
subagentSummaryLine: line,
- updateScopedHeartbeats: vi.fn(),
updateWorkingPulse: vi.fn(),
syncWorkingLoader: vi.fn(),
updateWorkingLoaderMessage: vi.fn(),
@@ -220,7 +217,6 @@ describe("SubagentSummaryLine", () => {
rlmNodeId: undefined,
heartbeatCatalog: [],
subagentSummaryLine: line,
- updateScopedHeartbeats: vi.fn(),
updateWorkingPulse: vi.fn(),
syncWorkingLoader: vi.fn(),
updateWorkingLoaderMessage: vi.fn(),