Merge branch 'worktree-agent-a1383b58'

# Conflicts:
#	.planning/STATE.md
#	src/main/database.ts
This commit is contained in:
ZacharyZhang-NY committed 2026-03-26 19:07:13 -04:00
commit 63ff0f2625
8 files changed
+998 -107

No files matched your search

+4 -4
View File
@@ -485,7 +485,7 @@ export function createOrchestrationService({
const agentBusy = hasActiveRun({ agentId, companyId });
const runId = startAgentHeartbeatRun(agentId, companyId, trigger);
if (!runId && agentBusy) {
db.enqueuePendingWake(companyId, agentId, trigger);
db.enqueueWakeupRequest(companyId, agentId, trigger, trigger);
}
return runId;
}
@@ -701,9 +701,9 @@ export function createOrchestrationService({
logger.info(`[heartbeat] Released ${staleReleased} stale workspace lock(s)`);
publishDomainChanged();
}
const stalePendingWakes = db.purgeExpiredPendingWakes();
if (stalePendingWakes > 0) {
logger.info(`[heartbeat] Purged ${stalePendingWakes} stale pending wake(s)`);
const staleWakeups = db.purgeExpiredWakeupRequests();
if (staleWakeups > 0) {
logger.info(`[heartbeat] Purged ${staleWakeups} expired wakeup request(s)`);
}
} catch (error) {
logger.error(`[heartbeat] Stale lock cleanup failed: ${error instanceof Error ? error.message : String(error)}`);