heartbeat: avoid false sentry expectation when autostart is off

Author: benvinegar

pi/extensions/heartbeat.test.mjs

@@ -29,8 +29,13 @@ function clampInt(value, min, max, fallback) {
   return Math.min(max, Math.max(min, parsed));
 }
 
-function getExpectedSessions(envValue) {
+function getExpectedSessions(envValue, discovered = null) {
   if (envValue) return envValue.split(",").map((s) => s.trim()).filter(Boolean);
+  if (discovered && discovered.success === true) {
+    if (discovered.packagesCount > 0) {
+      return discovered.autostartAliases;
+    }
+  }
   return ["sentry-agent"];
 }
 
@@ -248,6 +253,33 @@ describe("heartbeat v2: getExpectedSessions", () => {
     const result = getExpectedSessions("sentry-agent,,monitor,");
     assert.deepEqual(result, ["sentry-agent", "monitor"]);
   });
+
+  it("returns discovered autostart aliases when discovery succeeds", () => {
+    const result = getExpectedSessions(undefined, {
+      success: true,
+      packagesCount: 2,
+      autostartAliases: ["sentry-agent"],
+    });
+    assert.deepEqual(result, ["sentry-agent"]);
+  });
+
+  it("returns empty when discovery succeeds and all subagents are non-autostart", () => {
+    const result = getExpectedSessions(undefined, {
+      success: true,
+      packagesCount: 2,
+      autostartAliases: [],
+    });
+    assert.deepEqual(result, []);
+  });
+
+  it("falls back to default when discovery succeeds but no packages exist", () => {
+    const result = getExpectedSessions(undefined, {
+      success: true,
+      packagesCount: 0,
+      autostartAliases: [],
+    });
+    assert.deepEqual(result, ["sentry-agent"]);
+  });
 });
 
 describe("heartbeat v2: computeBackoffMs", () => {

pi/extensions/heartbeat.ts

@@ -79,17 +79,15 @@ function getExpectedSessions(): string[] {
   try {
     const discovery = discoverSubagentPackages();
     const state = readSubagentState();
-    const fromSubagents = discovery.packages
-      .map((pkg) => ({
-        effective: resolveEffectiveState(pkg, state),
-        alias: pkg.manifest.ready_alias,
-      }))
-      .filter((entry) => entry.effective.installed && entry.effective.enabled && entry.effective.autostart)
-      .map((entry) => entry.alias)
-      .filter(Boolean);
-
-    if (fromSubagents.length > 0) {
-      return fromSubagents;
+    if (discovery.packages.length > 0) {
+      return discovery.packages
+        .map((pkg) => ({
+          effective: resolveEffectiveState(pkg, state),
+          alias: pkg.manifest.ready_alias,
+        }))
+        .filter((entry) => entry.effective.installed && entry.effective.enabled && entry.effective.autostart)
+        .map((entry) => entry.alias)
+        .filter(Boolean);
     }
   } catch {
     // fall back to historical default