@vellumai/assistant 0.10.12 → 0.11.0-staging.1

package/src/daemon/message-types/messages.ts

@@ -1,28 +1,5 @@
 // User/assistant messages, tool results, confirmations, secrets, errors, and generation lifecycle.
 
-import type { AssistantActivityStateEvent } from "../../api/events/assistant-activity-state.js";
-import type { AssistantTextDeltaEvent } from "../../api/events/assistant-text-delta.js";
-import type { AssistantThinkingDeltaEvent } from "../../api/events/assistant-thinking-delta.js";
-import type { AssistantTurnStartEvent } from "../../api/events/assistant-turn-start.js";
-import type { ConfirmationRequestEvent } from "../../api/events/confirmation-request.js";
-import type { ConfirmationStateChangedEvent } from "../../api/events/confirmation-state-changed.js";
-import type { ConversationInferenceProfileUpdatedEvent } from "../../api/events/conversation-inference-profile-updated.js";
-import type { ErrorEvent } from "../../api/events/error.js";
-import type { InteractionResolvedEvent } from "../../api/events/interaction-resolved.js";
-import type { MessageCompleteEvent } from "../../api/events/message-complete.js";
-import type { MessageDequeuedEvent } from "../../api/events/message-dequeued.js";
-import type { MessageQueuedEvent } from "../../api/events/message-queued.js";
-import type { MessageQueuedDeletedEvent } from "../../api/events/message-queued-deleted.js";
-import type { MessageRequestCompleteEvent } from "../../api/events/message-request-complete.js";
-import type { MessageSteeredEvent } from "../../api/events/message-steered.js";
-import type { QuestionRequestEvent } from "../../api/events/question-request.js";
-import type { SecretRequestEvent } from "../../api/events/secret-request.js";
-import type { ToolInputDeltaEvent } from "../../api/events/tool-input-delta.js";
-import type { ToolOutputChunkEvent } from "../../api/events/tool-output-chunk.js";
-import type { ToolResultEvent } from "../../api/events/tool-result.js";
-import type { ToolUsePreviewStartEvent } from "../../api/events/tool-use-preview-start.js";
-import type { ToolUseStartEvent } from "../../api/events/tool-use-start.js";
-import type { UserMessageEchoEvent } from "../../api/events/user-message-echo.js";
 import type { ChannelId, InterfaceId } from "../../channels/types.js";
 import type { CommandIntent, UserMessageAttachment } from "./shared.js";
 
@@ -74,28 +51,3 @@ export type _MessagesClientMessages =
   | UserMessage
   | ConfirmationResponse
   | SecretResponse;
-
-export type _MessagesServerMessages =
-  | UserMessageEchoEvent
-  | AssistantTurnStartEvent
-  | AssistantTextDeltaEvent
-  | AssistantThinkingDeltaEvent
-  | ToolUseStartEvent
-  | ToolUsePreviewStartEvent
-  | ToolOutputChunkEvent
-  | ToolInputDeltaEvent
-  | ToolResultEvent
-  | ConfirmationRequestEvent
-  | SecretRequestEvent
-  | QuestionRequestEvent
-  | MessageCompleteEvent
-  | ErrorEvent
-  | MessageQueuedEvent
-  | MessageDequeuedEvent
-  | MessageRequestCompleteEvent
-  | MessageQueuedDeletedEvent
-  | MessageSteeredEvent
-  | ConfirmationStateChangedEvent
-  | AssistantActivityStateEvent
-  | ConversationInferenceProfileUpdatedEvent
-  | InteractionResolvedEvent;

package/src/daemon/message-types/notifications.ts

@@ -1,6 +1,3 @@
-import type { NotificationConversationCreatedEvent } from "../../api/events/notification-conversation-created.js";
-import type { NotificationIntentEvent } from "../../api/events/notification-intent.js";
-
 /** Client ack sent after UNUserNotificationCenter.add() completes (or fails). */
 export interface NotificationIntentResult {
   type: "notification_intent_result";
@@ -42,7 +39,3 @@ export type _NotificationsClientMessages =
   | NotificationIntentResult
   | ConversationSeenSignal
   | ConversationUnreadSignal;
-
-export type _NotificationsServerMessages =
-  | NotificationIntentEvent
-  | NotificationConversationCreatedEvent;

package/src/daemon/message-types/skills.ts

@@ -4,7 +4,6 @@
 // `api/events` wire schema; the remaining exports are HTTP-API response shapes
 // consumed by the skills routes.
 
-import type { SkillStateChangedEvent } from "../../api/events/skill-state-changed.js";
 import type { PartnerAudit } from "../../skills/skillssh-audit-types.js";
 import type { OwnerInfo } from "../../tools/types.js";
 
@@ -174,7 +173,3 @@ export interface SkillFileContentResponse {
   isBinary: boolean;
   content: string | null;
 }
-
-// --- Domain-level union aliases (consumed by the barrel file) ---
-
-export type _SkillsServerMessages = SkillStateChangedEvent;

package/src/daemon/message-types/surfaces.ts

@@ -155,12 +155,3 @@ export type UiSurfaceShowWorkResult = UiSurfaceShowFor<"work_result">;
 // types above are daemon-side construction helpers derived from the same
 // canonical `UISurfaceShowEvent` — they narrow `surfaceType` ↔ `data` for
 // typed construction and are assignable to the opaque wire type.
-
-// --- Domain-level union aliases (consumed by the barrel file) ---
-
-export type _SurfacesServerMessages =
-  | UISurfaceShowEvent
-  | UISurfaceUpdateEvent
-  | UISurfaceDismissEvent
-  | UISurfaceCompleteEvent
-  | UISurfaceUndoResultEvent;

package/src/daemon/message-types/sync.ts

@@ -59,5 +59,3 @@ export function buildSyncChangedMessage(
     ...(trimmedOrigin ? { originClientId: trimmedOrigin } : {}),
   });
 }
-
-export type _SyncInvalidationServerMessages = SyncChangedEvent;

package/src/daemon/process-message.ts

@@ -12,6 +12,7 @@ import {
   createAssistantMessage,
   createUserMessage,
 } from "../agent/message-types.js";
+import type { AssistantEvent } from "../api/index.js";
 import {
   type ChannelId,
   type InterfaceId,
@@ -69,14 +70,13 @@ import {
   preactivateHostProxySkills,
   shouldAttachHostProxyForCapability,
 } from "./host-proxy-preactivation.js";
-import type { ServerMessage } from "./message-protocol.js";
 import type { SubagentToolGateMode } from "./tool-setup-types.js";
 
 const log = getLogger("process-message");
 
 type ProcessMessageOptions = ConversationCreateOptions & {
   /** Per-turn observer for live agent-loop events. Does not replace SSE broadcast. */
-  onEvent?: (msg: ServerMessage) => void;
+  onEvent?: (msg: AssistantEvent) => void;
   /** IDs of user-uploaded attachments to resolve and include in the turn. */
   attachmentIds?: string[];
   /** Originating channel (e.g. "slack", "telegram"). Defaults to "vellum". */
@@ -152,9 +152,9 @@ export function deriveIngressIdempotencyKey(options?: {
 }
 
 function buildEventEmitter(
-  observer?: (msg: ServerMessage) => void,
-): (msg: ServerMessage) => void {
-  if (!observer) return broadcastMessage;
+  observer?: (msg: AssistantEvent) => void,
+): (msg: AssistantEvent) => void {
+  if (!observer) {return broadcastMessage;}
   return (msg) => {
     broadcastMessage(msg);
     try {

package/src/daemon/skill-memory-refresh.ts

@@ -5,9 +5,9 @@ import {
   seedUninstalledCatalogSkillMemories,
 } from "../plugins/defaults/memory/graph/capability-seed.js";
 import {
-  maybeSeedMemoryV2CliCommands,
-  maybeSeedMemoryV2Skills,
-} from "../plugins/defaults/memory/v3/substrate/memory-v2-startup.js";
+  maybeSeedCapabilitySkills,
+  maybeSeedCliCommandCards,
+} from "../plugins/defaults/memory/substrate/boot-maintenance.js";
 import { getLogger } from "../util/logger.js";
 
 const log = getLogger("skill-memory-refresh");
@@ -16,8 +16,8 @@ export function refreshSkillCapabilityMemories(
   config: AssistantConfig = getConfig(),
 ): void {
   seedSkillGraphNodes();
-  maybeSeedMemoryV2Skills(config);
-  maybeSeedMemoryV2CliCommands(config);
+  maybeSeedCapabilitySkills(config);
+  maybeSeedCliCommandCards(config);
   void seedUninstalledCatalogSkillMemories()
     .then(() => {
       // Re-run after the async catalog fetch populates the cache so stale

package/src/daemon/tool-side-effects.ts

@@ -9,13 +9,14 @@
 
 import { isAbsolute, resolve, sep } from "node:path";
 
+import type { AssistantEvent } from "../api/index.js";
 import { addAppConversationId, getApp } from "../apps/app-store.js";
 import { findActiveSession } from "../channels/gateway-verification-sessions.js";
 import { getConfig } from "../config/loader.js";
 import { generateAppIcon } from "../media/app-icon-generator.js";
-import { invalidateEdgeIndex } from "../plugins/defaults/memory/v3/substrate/edge-index.js";
-import { invalidatePageIndex } from "../plugins/defaults/memory/v3/substrate/page-index.js";
-import { getConceptsDir } from "../plugins/defaults/memory/v3/substrate/page-store.js";
+import { invalidateEdgeIndex } from "../plugins/defaults/memory/substrate/edge-index.js";
+import { invalidatePageIndex } from "../plugins/defaults/memory/substrate/page-index.js";
+import { getConceptsDir } from "../plugins/defaults/memory/substrate/page-store.js";
 import { broadcastMessage } from "../runtime/assistant-event-hub.js";
 import { publishAppsChanged } from "../runtime/sync/resource-sync-events.js";
 import { deliverVerificationSlack } from "../runtime/verification-outbound-actions.js";
@@ -26,7 +27,6 @@ import { getWorkspaceDir } from "../util/platform.js";
 import { ensureAppSourceWatcher } from "./app-source-watcher.js";
 import { refreshSurfacesForApp } from "./conversation-surfaces.js";
 import { isDoordashCommand, updateDoordashProgress } from "./doordash-steps.js";
-import type { ServerMessage } from "./message-protocol.js";
 import type { ToolSetupContext } from "./tool-setup-types.js";
 
 const log = getLogger("tool-side-effects");
@@ -181,7 +181,7 @@ registerAppSurfaceRefreshHook("app_update");
 
 registerHook("voice_config_update", (_name, input) => {
   const setting = input.setting as string | undefined;
-  if (!setting) return;
+  if (!setting) {return;}
 
   const SETTING_TO_KEY: Record<string, string> = {
     activation_key: "pttActivationKey",
@@ -191,7 +191,7 @@ registerHook("voice_config_update", (_name, input) => {
     fish_audio_reference_id: "fishAudioReferenceId",
   };
   const key = SETTING_TO_KEY[setting];
-  if (!key) return;
+  if (!key) {return;}
 
   // `ttsVoiceId` is an ElevenLabs concept on the desktop client. When the
   // active provider is managed (vellum) or anything else, the voice lives only
@@ -222,7 +222,7 @@ registerHook("voice_config_update", (_name, input) => {
     type: "client_settings_update",
     key,
     value: coerced,
-  } as unknown as ServerMessage);
+  } as unknown as AssistantEvent);
 });
 
 // Dispatch pending Slack DM delivery when a CLI verification command
@@ -231,8 +231,8 @@ registerHook("voice_config_update", (_name, input) => {
 // This hook runs in the unsandboxed daemon process and delivers the DM.
 registerHook("bash", async (_name, input, result) => {
   const command = (input.command ?? "") as string;
-  if (!command.includes("channel-verification-sessions")) return;
-  if (!result.content.includes("_pendingSlackDm")) return;
+  if (!command.includes("channel-verification-sessions")) {return;}
+  if (!result.content.includes("_pendingSlackDm")) {return;}
 
   type PendingDm = { userId: string; text: string; assistantId: string };
   type Parsed = { _pendingSlackDm?: PendingDm };
@@ -288,18 +288,18 @@ registerHook("bash", async (_name, input, result) => {
     // multi-object output (e.g. cancel + create chained with &&).
   }
   if (singleObject !== undefined) {
-    if ((await dispatch(singleObject)) !== null) return;
+    if ((await dispatch(singleObject)) !== null) {return;}
   }
   for (const line of result.content.split("\n")) {
     const trimmed = line.trim();
-    if (!trimmed.startsWith("{")) continue;
+    if (!trimmed.startsWith("{")) {continue;}
     let parsed: Parsed;
     try {
       parsed = JSON.parse(trimmed) as Parsed;
     } catch {
       continue;
     }
-    if ((await dispatch(parsed)) === "delivered") return;
+    if ((await dispatch(parsed)) === "delivered") {return;}
   }
 });
 
@@ -311,7 +311,7 @@ function invalidateEdgeIndexIfConceptPage(
   input: Record<string, unknown>,
 ): void {
   const rawPath = input.path;
-  if (typeof rawPath !== "string" || rawPath.length === 0) return;
+  if (typeof rawPath !== "string" || rawPath.length === 0) {return;}
   const workspaceDir = getWorkspaceDir();
   const conceptsRoot = getConceptsDir(workspaceDir);
   const absPath = isAbsolute(rawPath)

package/src/daemon/trust-context.ts

@@ -7,7 +7,7 @@
 import type { ChannelConversationType } from "@vellumai/gateway-client";
 
 import { isHttpAuthDisabled } from "../config/env.js";
-import { shouldExposePersonalMemory } from "../plugins/defaults/memory/v3/substrate/static-context.js";
+import { shouldExposePersonalMemory } from "../plugins/defaults/memory/substrate/static-context.js";
 import type { TrustClass } from "../runtime/trust-class.js";
 import type { TrustContext } from "./trust-context-types.js";
 

package/src/daemon/wake-conversation-ops.ts

@@ -13,6 +13,7 @@
  */
 
 import type { AgentEvent } from "../agent/loop.js";
+import type { AssistantEvent } from "../api/index.js";
 import {
   addMessage,
   getConversation,
@@ -27,7 +28,6 @@ import { publishConversationMessagesChanged } from "../runtime/sync/resource-syn
 import type { CompletedBackgroundTool } from "../tools/background-tool-registry.js";
 import { getLogger } from "../util/logger.js";
 import type { Conversation } from "./conversation.js";
-import type { ServerMessage } from "./message-protocol.js";
 import type {
   SubagentToolGateMode,
   WakeToolContextPin,
@@ -37,7 +37,7 @@ const log = getLogger("wake-conversation-ops");
 
 /**
  * Translate a raw {@link AgentEvent} from the agent loop into the
- * corresponding {@link ServerMessage} wire frame. The normal user-turn
+ * corresponding {@link AssistantEvent} wire frame. The normal user-turn
  * path does this via the full state-aware handler in
  * `conversation-agent-loop-handlers.ts`; the wake path has no tool
  * accounting, title generation, or activity-state tracking to worry
@@ -48,7 +48,7 @@ const log = getLogger("wake-conversation-ops");
 function translateAgentEventToServerMessage(
   event: AgentEvent,
   conversationId: string,
-): ServerMessage | null {
+): AssistantEvent | null {
   switch (event.type) {
     case "text_delta":
       return {
@@ -176,7 +176,7 @@ export function emitWakeAgentEvent(
     event,
     conversation.conversationId,
   );
-  if (!frame) return;
+  if (!frame) {return;}
   broadcastMessage(frame);
 }
 

package/src/heartbeat/__tests__/heartbeat-run-store.test.ts

@@ -4,9 +4,11 @@ import { sql } from "drizzle-orm";
 
 import { getDb } from "../../persistence/db-connection.js";
 import { initializeDb } from "../../persistence/db-init.js";
+import { heartbeatRuns } from "../../persistence/schema/index.js";
 import {
   completeHeartbeatRun,
   countCompletedHeartbeatRuns,
+  getLastHeartbeatRunAt,
   insertPendingHeartbeatRun,
   listHeartbeatRuns,
   markStaleRunningAsError,
@@ -18,6 +20,19 @@ import {
 
 await initializeDb();
 
+/**
+ * Raw read-back of every row (any status). `listHeartbeatRuns` serves run
+ * history and hides bookkeeping rows (pending/superseded), so tests that
+ * assert on those statuses read the table directly.
+ */
+function allRuns() {
+  return getDb()
+    .select()
+    .from(heartbeatRuns)
+    .orderBy(sql`${heartbeatRuns.scheduledFor} DESC`)
+    .all();
+}
+
 describe("heartbeat-run-store", () => {
   beforeEach(() => {
     const db = getDb();
@@ -29,7 +44,7 @@ describe("heartbeat-run-store", () => {
     const id = insertPendingHeartbeatRun(scheduledFor);
     expect(id).toBeTruthy();
 
-    const rows = listHeartbeatRuns();
+    const rows = allRuns();
     expect(rows).toHaveLength(1);
     expect(rows[0].id).toBe(id);
     expect(rows[0].status).toBe("pending");
@@ -134,7 +149,7 @@ describe("heartbeat-run-store", () => {
     const ok = supersedePendingRun(id);
     expect(ok).toBe(true);
 
-    const rows = listHeartbeatRuns();
+    const rows = allRuns();
     expect(rows[0].status).toBe("superseded");
   });
 
@@ -156,7 +171,7 @@ describe("heartbeat-run-store", () => {
     const count = markStaleRunsAsMissed(5 * 60 * 1000);
     expect(count).toBe(2);
 
-    const rows = listHeartbeatRuns();
+    const rows = allRuns();
     const byId = Object.fromEntries(rows.map((r) => [r.id, r]));
     expect(byId[id1].status).toBe("missed");
     expect(byId[id2].status).toBe("missed");
@@ -185,9 +200,9 @@ describe("heartbeat-run-store", () => {
 
   test("listHeartbeatRuns returns rows ordered by scheduledFor desc", () => {
     const now = Date.now();
-    insertPendingHeartbeatRun(now - 2000);
-    insertPendingHeartbeatRun(now);
-    insertPendingHeartbeatRun(now - 1000);
+    skipHeartbeatRun(insertPendingHeartbeatRun(now - 2000), "overlap");
+    skipHeartbeatRun(insertPendingHeartbeatRun(now), "overlap");
+    skipHeartbeatRun(insertPendingHeartbeatRun(now - 1000), "overlap");
 
     const rows = listHeartbeatRuns();
     expect(rows).toHaveLength(3);
@@ -199,13 +214,48 @@ describe("heartbeat-run-store", () => {
   test("listHeartbeatRuns respects limit", () => {
     const now = Date.now();
     for (let i = 0; i < 5; i++) {
-      insertPendingHeartbeatRun(now + i);
+      skipHeartbeatRun(insertPendingHeartbeatRun(now + i), "overlap");
     }
 
     const rows = listHeartbeatRuns(3);
     expect(rows).toHaveLength(3);
   });
 
+  test("listHeartbeatRuns hides bookkeeping rows (pending, superseded)", () => {
+    const now = Date.now();
+
+    // Superseded rows: pending runs replaced by timer resets, scheduled in
+    // the future at insert time — never ran.
+    for (let i = 0; i < 3; i++) {
+      supersedePendingRun(insertPendingHeartbeatRun(now + 60 * 60 * 1000 + i));
+    }
+    // The not-yet-fired next scheduled run.
+    insertPendingHeartbeatRun(now + 60 * 60 * 1000 + 10);
+
+    // Real history: a completed run, a skipped run, a missed run, and one
+    // in flight.
+    const okId = insertPendingHeartbeatRun(now - 3000);
+    startHeartbeatRun(okId);
+    completeHeartbeatRun(okId, { status: "ok", conversationId: "conv-1" });
+    const skippedId = insertPendingHeartbeatRun(now - 2000);
+    skipHeartbeatRun(skippedId, "outside_active_hours");
+    const missedId = insertPendingHeartbeatRun(now - 10 * 60 * 1000);
+    markStaleRunsAsMissed(5 * 60 * 1000);
+    const runningId = insertPendingHeartbeatRun(now - 1000);
+    startHeartbeatRun(runningId);
+
+    const rows = listHeartbeatRuns();
+    expect(rows.map((r) => r.id).sort()).toEqual(
+      [okId, skippedId, missedId, runningId].sort(),
+    );
+
+    // The pagination cursor path applies the same filter.
+    const paged = listHeartbeatRuns(10, now + 2 * 60 * 60 * 1000);
+    expect(paged.map((r) => r.id).sort()).toEqual(
+      [okId, skippedId, missedId, runningId].sort(),
+    );
+  });
+
   test("countCompletedHeartbeatRuns counts only ok rows", () => {
     const now = Date.now();
 
@@ -240,4 +290,47 @@ describe("heartbeat-run-store", () => {
 
     expect(countCompletedHeartbeatRuns()).toBe(0);
   });
+
+  test("getLastHeartbeatRunAt returns the newest executed-run timestamp", () => {
+    const now = Date.now();
+
+    const oldId = insertPendingHeartbeatRun(now - 5000);
+    startHeartbeatRun(oldId);
+    completeHeartbeatRun(oldId, { status: "ok", conversationId: "conv-1" });
+
+    const newId = insertPendingHeartbeatRun(now - 1000);
+    startHeartbeatRun(newId);
+    completeHeartbeatRun(newId, { status: "error", error: "fail" });
+
+    // Non-executed rows never contribute, even when newer.
+    skipHeartbeatRun(insertPendingHeartbeatRun(now), "outside_active_hours");
+    insertPendingHeartbeatRun(now + 60 * 60 * 1000);
+
+    const newRow = allRuns().find((r) => r.id === newId);
+    expect(getLastHeartbeatRunAt()).toBe(newRow!.finishedAt!);
+  });
+
+  test("getLastHeartbeatRunAt falls back to startedAt when finishedAt is null", () => {
+    const now = Date.now();
+    const id = insertPendingHeartbeatRun(now - 60 * 60 * 1000);
+    startHeartbeatRun(id);
+    const db = getDb();
+    const backdatedStartedAt = now - 60 * 60 * 1000;
+    db.run(
+      sql`UPDATE heartbeat_runs SET started_at = ${backdatedStartedAt} WHERE id = ${id}`,
+    );
+    // Crash sweep finalizes the row as error without a finishedAt.
+    markStaleRunningAsError(45 * 60 * 1000);
+
+    expect(getLastHeartbeatRunAt()).toBe(backdatedStartedAt);
+  });
+
+  test("getLastHeartbeatRunAt returns null when no run ever executed", () => {
+    expect(getLastHeartbeatRunAt()).toBeNull();
+
+    skipHeartbeatRun(insertPendingHeartbeatRun(Date.now()), "disabled");
+    supersedePendingRun(insertPendingHeartbeatRun(Date.now() + 1));
+
+    expect(getLastHeartbeatRunAt()).toBeNull();
+  });
 });

package/src/heartbeat/__tests__/heartbeat-service.test.ts

@@ -178,6 +178,7 @@ mock.module("../../credential-health/credential-health-service.js", () => ({
 // Stub the heartbeat-run-store so the tests don't need a populated SQLite
 // schema. Each function is a no-op that returns sensible defaults.
 let heartbeatRunIdCounter = 0;
+let lastRunAtFromHistory: number | null = null;
 const skipHeartbeatRunCalls: Array<{ runId: string; reason: string }> = [];
 mock.module("../heartbeat-run-store.js", () => ({
   insertPendingHeartbeatRun: () => `heartbeat-run-${++heartbeatRunIdCounter}`,
@@ -192,6 +193,7 @@ mock.module("../heartbeat-run-store.js", () => ({
   countCompletedHeartbeatRuns: () => 10,
   countCompletedRunsToday: () => 0,
   countRecentConsecutiveRuns: () => 0,
+  getLastHeartbeatRunAt: () => lastRunAtFromHistory,
 }));
 
 // Stub the pre-first-message gate so tests can flip it on/off without
@@ -202,6 +204,16 @@ mock.module("../../runtime/pre-first-message-gate.js", () => ({
   hasReceivedUserMessage: () => preFirstMessageGateOpen,
 }));
 
+// Stub the drain quiesce lease so tests can flip it without a database.
+// Defaults to INACTIVE so existing tests keep passing.
+const realLifecycleQuiesce =
+  await import("../../persistence/lifecycle-quiesce.js");
+let quiesceLeaseActive = false;
+mock.module("../../persistence/lifecycle-quiesce.js", () => ({
+  ...realLifecycleQuiesce,
+  isLifecycleQuiesced: () => quiesceLeaseActive,
+}));
+
 const { HeartbeatService } = await import("../heartbeat-service.js");
 
 let origWorkspaceDir: string | undefined;
@@ -215,6 +227,7 @@ beforeEach(() => {
   onBroadcast = null;
   runBackgroundJobCalls.length = 0;
   skipHeartbeatRunCalls.length = 0;
+  lastRunAtFromHistory = null;
   preFirstMessageGateOpen = true;
   seedHeartbeat();
   runBackgroundJobImpl = async () => ({
@@ -260,6 +273,24 @@ describe("HeartbeatService", () => {
     expect(call.prompt).toContain("<heartbeat-disposition>");
   });
 
+  test("lastRunAt rehydrates from run history when unset in memory", async () => {
+    const historicalRunAt = Date.now() - 60 * 60 * 1000;
+    lastRunAtFromHistory = historicalRunAt;
+
+    const service = new HeartbeatService();
+    expect(service.lastRunAt).toBe(historicalRunAt);
+
+    // An in-process run takes over from the rehydrated value.
+    await service.runOnce({ force: true });
+    expect(service.lastRunAt).toBeGreaterThan(historicalRunAt);
+  });
+
+  test("lastRunAt is null when no run has ever executed", () => {
+    lastRunAtFromHistory = null;
+    const service = new HeartbeatService();
+    expect(service.lastRunAt).toBeNull();
+  });
+
   test("fires onConversationCreated synchronously via the runner BEFORE the runner returns", async () => {
     const created: Array<{ conversationId: string; title: string }> = [];
     let runnerHasResolved = false;
@@ -389,6 +420,42 @@ describe("HeartbeatService", () => {
     ).toBe(false);
   });
 
+  test("scheduled run skips with reason 'quiesced' while the drain lease is active", async () => {
+    quiesceLeaseActive = true;
+    const service = new HeartbeatService();
+    service.start();
+    skipHeartbeatRunCalls.length = 0;
+
+    try {
+      const result = await service.runOnce({ force: false });
+
+      expect(result).toBe(false);
+      expect(runBackgroundJobCalls).toHaveLength(0);
+      expect(skipHeartbeatRunCalls.some((c) => c.reason === "quiesced")).toBe(
+        true,
+      );
+    } finally {
+      await service.stop();
+      quiesceLeaseActive = false;
+    }
+  });
+
+  test("forced run bypasses the quiesce gate (manual operator action)", async () => {
+    quiesceLeaseActive = true;
+    const service = new HeartbeatService();
+
+    try {
+      await service.runOnce({ force: true });
+
+      expect(runBackgroundJobCalls).toHaveLength(1);
+      expect(skipHeartbeatRunCalls.some((c) => c.reason === "quiesced")).toBe(
+        false,
+      );
+    } finally {
+      quiesceLeaseActive = false;
+    }
+  });
+
   describe("max consecutive runs cap", () => {
     test("skips with reason 'max_consecutive_runs' after the cap is hit", async () => {
       seedHeartbeat({ maxConsecutiveRuns: 2 });