The open-source app everyone uses to manage agents at work
TypeScript acpxagent-orchestrationagent-skillsagentic-aiai-agentsai-engineeringai-governanceai-toolsautonomous-agentsclaudeclaude-codeclaude-skillscodexhermesllmmcpmulti-agentopenclawproject-managementworkflow-automation
fix: preserve session continuity for timer/heartbeat wakes
Edin Mujkanovic70702ce74f0c
diff --git a/server/src/__tests__/heartbeat-workspace-session.test.ts b/server/src/__tests__/heartbeat-workspace-session.test.tsindex 7fab2b429d..fe8c7d58c2 100644--- a/server/src/__tests__/heartbeat-workspace-session.test.ts+++ b/server/src/__tests__/heartbeat-workspace-session.test.ts@@ -4,6 +4,7 @@ import { sessionCodec as codexSessionCodec } from "@paperclipai/adapter-codex-loimport { resolveDefaultAgentWorkspaceDir } from "../home-paths.js";import {buildExplicitResumeSessionOverride,+ deriveTaskKeyWithHeartbeatFallback,formatRuntimeWorkspaceWarningLog,prioritizeProjectWorkspaceCandidatesForRun,parseSessionCompactionPolicy,@@ -184,6 +185,34 @@ describe("shouldResetTaskSessionForWake", () => {});});+describe("deriveTaskKeyWithHeartbeatFallback", () => {+ it("returns explicit taskKey when present", () => {+ expect(deriveTaskKeyWithHeartbeatFallback({ taskKey: "issue-123" }, null)).toBe("issue-123");+ });++ it("returns explicit issueId when no taskKey", () => {+ expect(deriveTaskKeyWithHeartbeatFallback({ issueId: "issue-456" }, null)).toBe("issue-456");+ });++ it("returns __heartbeat__ for timer wakes with no explicit key", () => {+ expect(deriveTaskKeyWithHeartbeatFallback({ wakeSource: "timer" }, null)).toBe("__heartbeat__");+ });++ it("prefers explicit key over heartbeat fallback even on timer wakes", () => {+ expect(+ deriveTaskKeyWithHeartbeatFallback({ wakeSource: "timer", taskKey: "issue-789" }, null),+ ).toBe("issue-789");+ });++ it("returns null for non-timer wakes with no explicit key", () => {+ expect(deriveTaskKeyWithHeartbeatFallback({ wakeSource: "on_demand" }, null)).toBeNull();+ });++ it("returns null for empty context", () => {+ expect(deriveTaskKeyWithHeartbeatFallback({}, null)).toBeNull();+ });+});+describe("buildExplicitResumeSessionOverride", () => {it("reuses saved task session params when they belong to the selected failed run", () => {const result = buildExplicitResumeSessionOverride({diff --git a/server/src/services/heartbeat.ts b/server/src/services/heartbeat.tsindex c909b9b77c..6e88c37d39 100644--- a/server/src/services/heartbeat.ts+++ b/server/src/services/heartbeat.ts@@ -524,6 +524,14 @@ function parseIssueAssigneeAdapterOverrides(};}+/**+ * Synthetic task key for timer/heartbeat wakes that have no issue context.+ * This allows timer wakes to participate in the `agentTaskSessions` system+ * and benefit from robust session resume, instead of relying solely on the+ * simpler `agentRuntimeState.sessionId` fallback.+ */+const HEARTBEAT_TASK_KEY = "__heartbeat__";+function deriveTaskKey(contextSnapshot: Record<string, unknown> | null | undefined,payload: Record<string, unknown> | null | undefined,@@ -539,6 +547,28 @@ function deriveTaskKey();}+/**+ * Extended task key derivation that falls back to a stable synthetic key+ * for timer/heartbeat wakes. This ensures timer wakes can resume their+ * previous session via `agentTaskSessions` instead of starting fresh.+ *+ * The synthetic key is only used when:+ * - No explicit task/issue key exists in the context+ * - The wake source is "timer" (scheduled heartbeat)+ */+export function deriveTaskKeyWithHeartbeatFallback(+ contextSnapshot: Record<string, unknown> | null | undefined,+ payload: Record<string, unknown> | null | undefined,+) {+ const explicit = deriveTaskKey(contextSnapshot, payload);+ if (explicit) return explicit;++ const wakeSource = readNonEmptyString(contextSnapshot?.wakeSource);+ if (wakeSource === "timer") return HEARTBEAT_TASK_KEY;++ return null;+}+export function shouldResetTaskSessionForWake(contextSnapshot: Record<string, unknown> | null | undefined,) {@@ -1512,7 +1542,7 @@ export function heartbeatService(db: Db) {) {const contextSnapshot = parseObject(run.contextSnapshot);const issueId = readNonEmptyString(contextSnapshot.issueId);- const taskKey = deriveTaskKey(contextSnapshot, null);+ const taskKey = deriveTaskKeyWithHeartbeatFallback(contextSnapshot, null);const sessionBefore = await resolveSessionBeforeForWakeup(agent, taskKey);const retryContextSnapshot = {...contextSnapshot,@@ -1967,7 +1997,7 @@ export function heartbeatService(db: Db) {const runtime = await ensureRuntimeState(agent);const context = parseObject(run.contextSnapshot);- const taskKey = deriveTaskKey(context, null);+ const taskKey = deriveTaskKeyWithHeartbeatFallback(context, null);const sessionCodec = getAdapterSessionCodec(agent.adapterType);const issueId = readNonEmptyString(context.issueId);const issueContext = issueId