@vellumai/assistant 0.10.12 → 0.11.0-staging.2

package/src/__tests__/plugin-import-boundary-guard.test.ts

@@ -79,36 +79,33 @@ const BASELINE: Record<string, readonly string[]> = {
     "../../../util/logger.js",
   ],
   memory: [
-    "../../../../../channels/types.js",
+    "../../../../../agent/image-optimize.js",
     "../../../../../config/loader.js",
     "../../../../../config/memory-v3-gate.js",
-    "../../../../../config/schema.js",
     "../../../../../config/types.js",
-    "../../../../../daemon/embedding-reconcile.js",
     "../../../../../messaging/providers/slack/message-metadata.js",
-    "../../../../../notifications/emit-signal.js",
     "../../../../../persistence/auto-analysis-constants.js",
     "../../../../../persistence/checkpoints.js",
     "../../../../../persistence/db-connection.js",
     "../../../../../persistence/embeddings/embed.js",
     "../../../../../persistence/embeddings/embedding-backend.js",
     "../../../../../persistence/embeddings/embedding-types.js",
-    "../../../../../persistence/embeddings/sparse-tokenize.js",
+    "../../../../../persistence/embeddings/qdrant-circuit-breaker.js",
+    "../../../../../persistence/embeddings/qdrant-client.js",
+    "../../../../../persistence/job-utils.js",
     "../../../../../persistence/jobs-store.js",
     "../../../../../persistence/raw-query.js",
     "../../../../../persistence/schema/index.js",
-    "../../../../../prompts/system-prompt.js",
-    "../../../../../providers/platform-proxy/context.js",
-    "../../../../../runtime/background-job-runner.js",
     "../../../../../security/untrusted-content.js",
-    "../../../../agent/image-optimize.js",
     "../../../../api/events/memory-recalled.js",
     "../../../../api/responses/memory-v3-selection-log.js",
+    "../../../../channels/types.js",
     "../../../../config/assistant-feature-flags.js",
     "../../../../config/default-profile-catalog.js",
     "../../../../config/loader.js",
     "../../../../config/memory-v3-gate.js",
     "../../../../config/schema.js",
+    "../../../../config/schemas/memory-v2.js",
     "../../../../config/skill-state.js",
     "../../../../config/skills.js",
     "../../../../config/types.js",
@@ -117,25 +114,32 @@ const BASELINE: Record<string, readonly string[]> = {
     "../../../../daemon/conversation-notices.js",
     "../../../../daemon/conversation-registry.js",
     "../../../../daemon/conversation-runtime-assembly.js",
-    "../../../../daemon/message-protocol.js",
+    "../../../../daemon/embedding-reconcile.js",
     "../../../../daemon/trust-context.js",
     "../../../../daemon/turn-latency-sub-spans.js",
+    "../../../../notifications/emit-signal.js",
     "../../../../persistence/checkpoints.js",
     "../../../../persistence/db-connection.js",
     "../../../../persistence/embeddings/embed.js",
     "../../../../persistence/embeddings/embedding-backend.js",
     "../../../../persistence/embeddings/embedding-billing-breaker.js",
     "../../../../persistence/embeddings/embedding-cache.js",
+    "../../../../persistence/embeddings/embedding-runtime-manager.js",
     "../../../../persistence/embeddings/embedding-types.js",
     "../../../../persistence/embeddings/qdrant-circuit-breaker.js",
     "../../../../persistence/embeddings/qdrant-client.js",
+    "../../../../persistence/embeddings/sparse-tokenize.js",
     "../../../../persistence/job-utils.js",
     "../../../../persistence/jobs-store.js",
-    "../../../../persistence/raw-query.js",
     "../../../../persistence/schema/conversations.js",
     "../../../../persistence/schema/index.js",
+    "../../../../prompts/persona-resolver.js",
+    "../../../../prompts/system-prompt.js",
+    "../../../../prompts/template-detection.js",
+    "../../../../providers/platform-proxy/context.js",
     "../../../../runtime/assistant-event-hub.js",
     "../../../../runtime/auth/route-policy.js",
+    "../../../../runtime/background-job-runner.js",
     "../../../../runtime/routes/errors.js",
     "../../../../runtime/routes/types.js",
     "../../../../security/secret-scanner.js",
@@ -149,7 +153,6 @@ const BASELINE: Record<string, readonly string[]> = {
     "../../../config/memory-v3-gate.js",
     "../../../config/platform-rehydration.js",
     "../../../config/schema.js",
-    "../../../config/schemas/memory-v2.js",
     "../../../config/schemas/memory.js",
     "../../../config/types.js",
     "../../../contacts/guardian-delivery-reader.js",
@@ -177,7 +180,6 @@ const BASELINE: Record<string, readonly string[]> = {
     "../../../persistence/db-maintenance.js",
     "../../../persistence/embeddings/embedding-backend.js",
     "../../../persistence/embeddings/embedding-billing-breaker.js",
-    "../../../persistence/embeddings/embedding-runtime-manager.js",
     "../../../persistence/embeddings/embedding-types.js",
     "../../../persistence/embeddings/messages-lexical-index.js",
     "../../../persistence/embeddings/qdrant-circuit-breaker.js",
@@ -192,11 +194,9 @@ const BASELINE: Record<string, readonly string[]> = {
     "../../../persistence/schema/index.js",
     "../../../prompts/persona-resolver.js",
     "../../../prompts/system-prompt.js",
-    "../../../prompts/template-detection.js",
     "../../../runtime/actor-trust-resolver.js",
     "../../../runtime/agent-wake.js",
     "../../../runtime/assistant-stream-state.js",
-    "../../../runtime/background-job-runner.js",
     "../../../runtime/capabilities.js",
     "../../../runtime/services/auto-analysis-guard.js",
     "../../../runtime/sync/resource-sync-events.js",

package/src/__tests__/processing-flag-persist-failure.test.ts

@@ -100,10 +100,6 @@ mock.module("../memory/query-builder.js", () => ({
   buildMemoryQuery: () => "",
 }));
 
-mock.module("../plugins/defaults/memory/retrieval-budget.js", () => ({
-  computeRecallBudget: () => 0,
-}));
-
 mock.module("../runtime/sync/sync-publisher.js", () => ({
   publishSyncInvalidation: () => {},
 }));

package/src/__tests__/provider-platform-proxy-integration.test.ts

@@ -153,7 +153,6 @@ function makeProvidersConfig(
     services: {
       inference: {},
       "image-generation": {
-        mode: "your-own",
         provider: "gemini",
         model: "gemini-3.1-flash-image-preview",
       },

package/src/__tests__/rebuild-index-graph-nodes.test.ts

@@ -124,7 +124,7 @@ mock.module("../persistence/db-connection.js", () => ({
 
 // ── Tests ────────────────────────────────────────────────────────────
 
-import { rebuildIndexJob } from "../plugins/defaults/memory/job-handlers/index-maintenance.js";
+import { rebuildIndexJob } from "../plugins/defaults/memory/v1/job-handlers/index-maintenance.js";
 
 describe("rebuildIndexJob", () => {
   beforeEach(() => {

package/src/__tests__/request-secret-standalone-channel-gate.test.ts

@@ -8,16 +8,16 @@
 
 import { beforeEach, describe, expect, mock, test } from "bun:test";
 
-import type { ServerMessage } from "../daemon/message-protocol.js";
+import type { AssistantEvent } from "../api/index.js";
 import { setConfig } from "./helpers/set-config.js";
 
 // A short permission timeout keeps a leaked prompt from lingering; the default
 // `secretDetection.allowOneTimeSend` (false) drives the broadcast field.
 setConfig("timeouts", { permissionTimeoutSec: 0.01 });
 
-let broadcastMessages: ServerMessage[] = [];
+let broadcastMessages: AssistantEvent[] = [];
 mock.module("../runtime/assistant-event-hub.js", () => ({
-  broadcastMessage: (msg: ServerMessage) => broadcastMessages.push(msg),
+  broadcastMessage: (msg: AssistantEvent) => broadcastMessages.push(msg),
 }));
 
 const _piStore = new Map<string, { rpcResolve?: (value: unknown) => void }>();
@@ -177,11 +177,11 @@ describe("requestSecretStandalone channel gate", () => {
   });
 
   test("falls back to a plain unsupported_channel when minting is refused", async () => {
-    // GIVEN the gateway refuses to mint (flag off / no public URL)
+    // GIVEN the gateway refuses to mint (no public URL)
     registeredConversation = {
       channelCapabilities: { supportsDynamicUi: false },
     };
-    gatewayMintResult = { ok: false, error: "flag_disabled" };
+    gatewayMintResult = { ok: false, error: "no_public_base_url" };
 
     // WHEN a standalone prompt is scoped to that conversation
     const result = await requestSecretStandalone({

package/src/__tests__/require-fresh-approval.test.ts

@@ -19,6 +19,10 @@ import {
 
 import { RiskLevel, type ScopeOption } from "../permissions/types.js";
 import type { ToolExecutionResult } from "../tools/types.js";
+import {
+  installThresholdReaderMock,
+  thresholdReaderMock,
+} from "./gateway-threshold-reader-mock.js";
 
 // ---------------------------------------------------------------------------
 // Terminal audit mock — the permission checker / executor call these directly
@@ -55,13 +59,6 @@ let riskOverride: string = "high";
 /** Scope options override — controls whether persistent decisions are offered. */
 let scopeOptionsOverride: ScopeOption[] | undefined;
 
-/**
- * Auto-approve threshold returned to the permission checker. "high" is the
- * full-access posture under which the requireFreshApproval promotion is
- * skipped; every lower value still promotes allow → prompt.
- */
-let thresholdOverride: "none" | "low" | "medium" | "high" = "medium";
-
 /**
  * Sentinel cell query the mocked builder returns. When set, the permission
  * checker must thread it into every gateway threshold read for the
@@ -69,8 +66,23 @@ let thresholdOverride: "none" | "low" | "medium" | "high" = "medium";
  */
 let cellQueryOverride: Record<string, unknown> | undefined;
 
+// Falls through to the real builder when no sentinel is set. `mock.module` is
+// process-global, so a hard-coded return here would also be the builder other
+// test files see — and silently strip the channel coordinates their contexts
+// supply, depending on which registration loaded last. The real function is
+// captured by value first: `mock.module` swaps the module's exports in place,
+// so reading it through the namespace inside the factory would resolve to this
+// mock and recurse.
+const realCellQueryModule =
+  await import("../permissions/channel-permission-query.js");
+const realBuildCellQuery = realCellQueryModule.buildChannelPermissionCellQuery;
+const realEffectiveCellThreshold =
+  realCellQueryModule.effectiveChannelCellThreshold;
 mock.module("../permissions/channel-permission-query.js", () => ({
-  buildChannelPermissionCellQuery: () => cellQueryOverride,
+  buildChannelPermissionCellQuery: (
+    ...args: Parameters<typeof realBuildCellQuery>
+  ) => cellQueryOverride ?? realBuildCellQuery(...args),
+  effectiveChannelCellThreshold: realEffectiveCellThreshold,
 }));
 
 mock.module("../permissions/checker.js", () => ({
@@ -130,28 +142,15 @@ mock.module("../tools/registry.js", () => ({
   getAllTools: () => [],
 }));
 
-/** Records every getAutoApproveThreshold call so tests can assert the cell
- * query is threaded into each read (including the background auto-approve). */
-const thresholdReadLog: Array<{
-  conversationId?: string;
-  executionContext?: string;
-  cellQuery?: Record<string, unknown>;
-}> = [];
-
-mock.module("../permissions/gateway-threshold-reader.js", () => ({
-  getAutoApproveThreshold: async (
-    conversationId?: string,
-    executionContext?: string,
-    cellQuery?: Record<string, unknown>,
-  ) => {
-    thresholdReadLog.push({ conversationId, executionContext, cellQuery });
-    return thresholdOverride;
-  },
-  // Refresh failure ("null") keeps the original decision — these tests
-  // exercise the cached-threshold paths only.
-  refreshAutoApproveThreshold: async () => null,
-  _clearGlobalCacheForTesting: () => {},
-}));
+// The mock defaults leave no cell at any cascade level, so the sensitive-tool
+// gate's capability floor stands on its own — these tests are about
+// fresh-approval promotion, not the channel matrix. `thresholdReads` records
+// every getAutoApproveThreshold call so tests can assert the cell query is
+// threaded into each read (including the background auto-approve).
+installThresholdReaderMock();
+
+/** Records every getAutoApproveThreshold call. */
+const thresholdReadLog = thresholdReaderMock.thresholdReads;
 
 // Stub the workflow run manager so the `manage_workflows` resume gate can read a
 // target run's STORED capabilities without a real journal/DB. Tests set
@@ -168,6 +167,7 @@ mock.module("../workflows/run-manager.js", () => ({
 
 mock.module("../tools/shared/filesystem/path-policy.js", () => ({
   sandboxPolicy: () => ({ ok: false }),
+  sandboxPolicyWithHostFallback: () => ({ ok: false }),
   hostPolicy: () => ({ ok: false }),
 }));
 
@@ -208,7 +208,7 @@ describe("requireFreshApproval: non-interactive guardian denial", () => {
     checkResultOverride = undefined;
     scopeOptionsOverride = undefined;
     riskOverride = "high";
-    thresholdOverride = "medium";
+    thresholdReaderMock.threshold = "medium";
     cellQueryOverride = undefined;
     thresholdReadLog.length = 0;
   });
@@ -374,7 +374,7 @@ describe("requireFreshApproval: context flag propagation", () => {
     checkResultOverride = undefined;
     scopeOptionsOverride = undefined;
     riskOverride = "high";
-    thresholdOverride = "medium";
+    thresholdReaderMock.threshold = "medium";
   });
 
   afterEach(() => {});
@@ -403,7 +403,7 @@ describe("requireFreshApproval: workflow capability grants", () => {
     checkResultOverride = undefined;
     scopeOptionsOverride = undefined;
     riskOverride = "low";
-    thresholdOverride = "medium";
+    thresholdReaderMock.threshold = "medium";
     fakeWorkflowRun = null;
   });
 
@@ -444,7 +444,7 @@ describe("requireFreshApproval: workflow capability grants", () => {
     "run_workflow side-effecting launch prompts at the %s threshold (non-full-access posture)",
     async (threshold) => {
       checkResultOverride = { decision: "allow", reason: "allowed" };
-      thresholdOverride = threshold;
+      thresholdReaderMock.threshold = threshold;
       const state = { prompted: false };
       const executor = new ToolExecutor(trackingPrompter(state));
       const ctx = makeContext();
@@ -465,7 +465,7 @@ describe("requireFreshApproval: workflow capability grants", () => {
     // Full-access posture auto-approves even high-risk tools, so the
     // requireFreshApproval promotion is skipped — the grant auto-allows.
     checkResultOverride = { decision: "allow", reason: "allowed" };
-    thresholdOverride = "high";
+    thresholdReaderMock.threshold = "high";
     const state = { prompted: false };
     const executor = new ToolExecutor(trackingPrompter(state));
     const ctx = makeContext();
@@ -487,7 +487,7 @@ describe("requireFreshApproval: workflow capability grants", () => {
     // Full access skips the fresh-approval promotion but never overrides an
     // explicit deny — deny rules win regardless of posture.
     checkResultOverride = { decision: "deny", reason: "blocked by rule" };
-    thresholdOverride = "high";
+    thresholdReaderMock.threshold = "high";
     const state = { prompted: false };
     const executor = new ToolExecutor(trackingPrompter(state));
     const ctx = makeContext();
@@ -504,7 +504,7 @@ describe("requireFreshApproval: workflow capability grants", () => {
 
   test("a deny rule still blocks a side-effecting launch at a normal threshold", async () => {
     checkResultOverride = { decision: "deny", reason: "blocked by rule" };
-    thresholdOverride = "medium";
+    thresholdReaderMock.threshold = "medium";
     const state = { prompted: false };
     const executor = new ToolExecutor(trackingPrompter(state));
     const ctx = makeContext();
@@ -522,7 +522,7 @@ describe("requireFreshApproval: workflow capability grants", () => {
   test("a read-only launch (no requireFreshApproval) is unaffected by a normal threshold", async () => {
     // No requireFreshApproval means the allow stands untouched at any posture.
     checkResultOverride = { decision: "allow", reason: "allowed" };
-    thresholdOverride = "medium";
+    thresholdReaderMock.threshold = "medium";
     const state = { prompted: false };
     const executor = new ToolExecutor(trackingPrompter(state));
     const ctx = makeContext();

package/src/__tests__/resolve-app-id.test.ts

@@ -24,6 +24,18 @@ function makeApp(id: string, updatedAt: number): AppDefinition {
   };
 }
 
+/** An app the conversation only reached through a descendant's lineage. */
+function makeInheritedApp(
+  id: string,
+  updatedAt: number,
+  conversationId: string,
+): AppDefinition {
+  return {
+    ...makeApp(id, updatedAt),
+    inheritedConversationIds: [conversationId],
+  };
+}
+
 describe("resolveAppId", () => {
   test("returns an explicit non-empty app_id unchanged", () => {
     appsByConversation = [makeApp("other", 1)];
@@ -45,6 +57,26 @@ describe("resolveAppId", () => {
     appsByConversation = [];
     expect(resolveAppId({}, "conv-1")).toBeNull();
   });
+
+  test("prefers a direct app over a more recent lineage-linked one", () => {
+    // A background subagent's app is linked into the parent thread and, being
+    // newest, heads the list — it must not capture the parent's implicit call.
+    appsByConversation = [
+      makeInheritedApp("background", 30, "conv-1"),
+      makeApp("foreground", 10),
+    ];
+    expect(resolveAppId({}, "conv-1")).toBe("foreground");
+  });
+
+  test("falls back to a lineage-linked app when the conversation has no direct one", () => {
+    appsByConversation = [makeInheritedApp("background", 30, "conv-1")];
+    expect(resolveAppId({}, "conv-1")).toBe("background");
+  });
+
+  test("an app inherited by another conversation is direct here", () => {
+    appsByConversation = [makeInheritedApp("shared", 30, "conv-other")];
+    expect(resolveAppId({}, "conv-1")).toBe("shared");
+  });
 });
 
 describe("missingAppIdError", () => {

package/src/__tests__/run-due-schedules.test.ts

@@ -41,9 +41,24 @@ mock.module("../notifications/emit-signal.js", () => ({
   emitNotificationSignal: mockEmitNotificationSignal,
 }));
 
+// Scripted quiesce-lease answers, consumed one per isLifecycleQuiesced()
+// call; empty means "no lease" (the real fail-open default), so existing
+// tests run ungated. Lets a test arm the lease BETWEEN the claim-site check
+// and the per-job re-check, which no real interleaving can do determinstically.
+let quiesceAnswers: boolean[] = [];
+const realLifecycleQuiesce =
+  await import("../persistence/lifecycle-quiesce.js");
+mock.module("../persistence/lifecycle-quiesce.js", () => ({
+  ...realLifecycleQuiesce,
+  isLifecycleQuiesced: () => quiesceAnswers.shift() ?? false,
+}));
+
 import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
-import { createSchedule } from "../schedule/schedule-store.js";
+import {
+  createSchedule,
+  deferClaimedSchedule,
+} from "../schedule/schedule-store.js";
 import { runDueSchedulesOnce } from "../schedule/scheduler.js";
 
 await initializeDb();
@@ -55,6 +70,7 @@ function rawDb(): import("bun:sqlite").Database {
 
 beforeEach(() => {
   mockEmitNotificationSignal.mockClear();
+  quiesceAnswers = [];
   const db = getDb();
   db.run("DELETE FROM cron_runs");
   db.run("DELETE FROM cron_jobs");
@@ -120,6 +136,61 @@ describe("runDueSchedulesOnce (the schedule worker's tick)", () => {
     expect(row.enabled).toBe(0);
   });
 
+  test("a lease armed between claim and start defers the job back to the queue", async () => {
+    const oneShot = await createSchedule({
+      name: "Deferred notify",
+      cronExpression: null,
+      message: "ping",
+      mode: "notify",
+      nextRunAt: Date.now() - 1000,
+    });
+
+    // Call 1 is the claim-site gate (claimDueSchedules): no lease yet.
+    // Call 2 is the per-job re-check: the lease has landed.
+    quiesceAnswers = [false, true];
+    const result = await runDueSchedulesOnce();
+
+    expect(result.claimed).toBe(1);
+    expect(result.skipped).toBe(1);
+    expect(result.completed).toBe(0);
+    // Nothing executed and nothing was lost: no notification fired, and the
+    // one-shot is back in the queue with a near-future retry time.
+    expect(mockEmitNotificationSignal).not.toHaveBeenCalled();
+    const row = rawDb()
+      .query("SELECT status, next_run_at FROM cron_jobs WHERE id = ?")
+      .get(oneShot.id) as { status: string; next_run_at: number };
+    expect(row.status).toBe("active");
+    expect(row.next_run_at).toBeGreaterThan(Date.now());
+  });
+
+  test("deferClaimedSchedule restores an exhausted recurring claim", async () => {
+    const recurring = await createSchedule({
+      name: "Bounded recurring",
+      cronExpression: "* * * * *",
+      message: "final occurrence",
+      mode: "notify",
+    });
+    // A bounded recurring schedule's FINAL occurrence is claimed by
+    // exhausting the job: enabled = false, nextRunAt = 0.
+    rawDb().run(
+      "UPDATE cron_jobs SET enabled = 0, next_run_at = 0 WHERE id = ?",
+      [recurring.id],
+    );
+
+    await deferClaimedSchedule(recurring.id, Date.now() + 30_000);
+
+    const row = rawDb()
+      .query("SELECT enabled, next_run_at, status FROM cron_jobs WHERE id = ?")
+      .get(recurring.id) as {
+      enabled: number;
+      next_run_at: number;
+      status: string;
+    };
+    expect(row.enabled).toBe(1);
+    expect(row.next_run_at).toBeGreaterThan(Date.now());
+    expect(row.status).toBe("active");
+  });
+
   test("records an error run and schedules a retry when a script fails", async () => {
     const failing = await createSchedule({
       name: "Failing script",

package/src/__tests__/runtime-events-sse-parity.test.ts

@@ -1,7 +1,7 @@
 /**
  * HTTP parity tests for the SSE assistant-events endpoint.
  *
- * Asserts that every streaming/delta ServerMessage type is preserved
+ * Asserts that every streaming/delta AssistantEvent type is preserved
  * exactly — field-for-field — when delivered through the SSE route.
  *
  * Message types covered:
@@ -17,11 +17,10 @@
  */
 import { beforeEach, describe, expect, test } from "bun:test";
 
-import type { ServerMessage } from "../daemon/message-protocol.js";
+import type { AssistantEvent, AssistantEventEnvelope } from "../api/index.js";
 import { getOrCreateConversation } from "../persistence/conversation-key-store.js";
 import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
-import type { AssistantEvent } from "../runtime/assistant-event.js";
 import { buildAssistantEvent } from "../runtime/assistant-event.js";
 import { assistantEventHub } from "../runtime/assistant-event-hub.js";
 
@@ -33,15 +32,15 @@ await initializeDb();
 
 /**
  * Subscribe to the SSE endpoint for a given conversationKey, publish one
- * event, read the first SSE frame, and return the parsed AssistantEvent.
+ * event, read the first SSE frame, and return the parsed AssistantEventEnvelope.
  *
  * Uses handleSubscribeAssistantEvents directly (bypassing HTTP) to avoid
  * chunked-transfer buffering in Bun's loopback implementation.
  */
 async function publishAndReadFrame(
   conversationKey: string,
-  message: ServerMessage,
-): Promise<AssistantEvent> {
+  message: AssistantEvent,
+): Promise<AssistantEventEnvelope> {
   const { conversationId } = getOrCreateConversation(conversationKey);
 
   const ac = new AbortController();
@@ -68,8 +67,10 @@ async function publishAndReadFrame(
   const frame = new TextDecoder().decode(value);
   // SSE frame: "event: assistant_event\nid: <id>\ndata: <json>\n\n"
   const dataLine = frame.split("\n").find((l) => l.startsWith("data: "));
-  if (!dataLine) throw new Error(`No data line in SSE frame:\n${frame}`);
-  return JSON.parse(dataLine.slice("data: ".length)) as AssistantEvent;
+  if (!dataLine) {
+    throw new Error(`No data line in SSE frame:\n${frame}`);
+  }
+  return JSON.parse(dataLine.slice("data: ".length)) as AssistantEventEnvelope;
 }
 
 // ---------------------------------------------------------------------------
@@ -317,7 +318,7 @@ describe("SSE HTTP parity — streaming/delta message types", () => {
       abortSignal: ac.signal,
     });
 
-    const msg: ServerMessage = {
+    const msg: AssistantEvent = {
       type: "assistant_text_delta" as const,
       text: "envelope test",
     };
@@ -337,7 +338,7 @@ describe("SSE HTTP parity — streaming/delta message types", () => {
     const dataLine = frame.split("\n").find((l) => l.startsWith("data: "))!;
     const received = JSON.parse(
       dataLine.slice("data: ".length),
-    ) as AssistantEvent;
+    ) as AssistantEventEnvelope;
 
     // Envelope fields
     expect(received.id).toBe(published.id);

package/src/__tests__/runtime-events-sse.test.ts

@@ -4,7 +4,7 @@
  * Tests:
  *   - 401 unauthorized (missing bearer token)
  *   - 200 when conversationKey is omitted (unfiltered subscription)
- *   - Happy path: stream receives a published AssistantEvent
+ *   - Happy path: stream receives a published AssistantEventEnvelope
  *   - Unfiltered: streams events from multiple conversations
  */
 import { beforeEach, describe, expect, test } from "bun:test";

package/src/__tests__/schedule-routes.test.ts

@@ -38,10 +38,12 @@ mock.module("../daemon/conversation-store.js", () => ({
   },
 }));
 
+import type { AssistantEventEnvelope } from "../api/index.js";
 import { SYNC_TAGS } from "../daemon/message-types/sync.js";
 import {
   insertPendingHeartbeatRun,
   startHeartbeatRun,
+  supersedePendingRun,
 } from "../heartbeat/heartbeat-run-store.js";
 import {
   archiveConversation,
@@ -51,7 +53,6 @@ import { getDb } from "../persistence/db-connection.js";
 import { initializeDb } from "../persistence/db-init.js";
 import { recordUsageEvent } from "../persistence/llm-usage-store.js";
 import { rawRun } from "../persistence/raw-query.js";
-import type { AssistantEvent } from "../runtime/assistant-event.js";
 import { assistantEventHub } from "../runtime/assistant-event-hub.js";
 import { BadRequestError, NotFoundError } from "../runtime/routes/errors.js";
 import { ROUTES as HEARTBEAT_ROUTES } from "../runtime/routes/heartbeat-routes.js";
@@ -82,7 +83,9 @@ function findRoute(endpoint: string, method: string): RouteDefinition {
   const route = SCHEDULE_ROUTES.find(
     (r) => r.endpoint === endpoint && r.method === method,
   );
-  if (!route) throw new Error(`Route ${method} ${endpoint} not found`);
+  if (!route) {
+    throw new Error(`Route ${method} ${endpoint} not found`);
+  }
   return route;
 }
 
@@ -90,7 +93,9 @@ function findHeartbeatRoute(endpoint: string, method: string): RouteDefinition {
   const route = HEARTBEAT_ROUTES.find(
     (r) => r.endpoint === endpoint && r.method === method,
   );
-  if (!route) throw new Error(`Route ${method} ${endpoint} not found`);
+  if (!route) {
+    throw new Error(`Route ${method} ${endpoint} not found`);
+  }
   return route;
 }
 
@@ -152,7 +157,9 @@ function setScheduleRunWindow({
 async function waitFor(predicate: () => boolean): Promise<void> {
   const deadline = Date.now() + 500;
   while (Date.now() < deadline) {
-    if (predicate()) return;
+    if (predicate()) {
+      return;
+    }
     await new Promise((resolve) => setTimeout(resolve, 5));
   }
   throw new Error("Timed out waiting for schedule route event");
@@ -417,7 +424,7 @@ describe("GET /schedules — default defer exclusion", () => {
   });
 
   test("mutation routes emit schedule sync invalidation", async () => {
-    const received: AssistantEvent[] = [];
+    const received: AssistantEventEnvelope[] = [];
     const subscription = assistantEventHub.subscribe({
       type: "process",
       callback: (event) => {
@@ -840,6 +847,38 @@ describe("schedule and heartbeat run metadata", () => {
 
     expect(result.runs[0].estimatedCostUsd).toBeCloseTo(0.02);
   });
+
+  test("heartbeat runs omit bookkeeping rows so timer resets don't render as runs", () => {
+    const now = Date.now();
+
+    // Timer resets (e.g. guardian messages) supersede the pending row and
+    // schedule a new one an interval into the future.
+    for (let i = 0; i < 3; i++) {
+      supersedePendingRun(insertPendingHeartbeatRun(now + 60 * 60 * 1000 + i));
+    }
+    // The next scheduled run, not yet fired.
+    insertPendingHeartbeatRun(now + 60 * 60 * 1000 + 10);
+
+    // The one run that actually executed.
+    const okId = insertPendingHeartbeatRun(now - 1000);
+    startHeartbeatRun(okId);
+    rawRun(
+      "test:setHeartbeatRunOk",
+      "UPDATE heartbeat_runs SET status = 'ok', finished_at = ?, duration_ms = ? WHERE id = ?",
+      now,
+      1000,
+      okId,
+    );
+
+    const route = findHeartbeatRoute("heartbeat/runs", "GET");
+    const result = route.handler({}) as {
+      runs: Array<{ id: string; status: string }>;
+    };
+
+    expect(result.runs).toHaveLength(1);
+    expect(result.runs[0].id).toBe(okId);
+    expect(result.runs[0].status).toBe("ok");
+  });
 });
 
 // ── schedules/usage-summary ───────────────────────────────────────────────