The NOT NULL constraint forced heartbeat runs to synthesize a fake task row (`[Heartbeat] X — Check for work`) so the FK could resolve. Three layers of code — acquireHeartbeatTask, findReusableHeartbeatTask, cleanupDuplicateHeartbeatTasks, plus the is_heartbeat flag column + UI filter — existed to paper over one bad constraint. Remove the constraint and the whole workaround vanishes. SQLite table rebuild with data preservation. Live production DB, no backup — migration is atomic, idempotent, and verified before DROP. ## Migration v35 (rebuild runs with nullable task_id) Uses `fn:` form so it can: - Snapshot `COUNT(*) FROM runs` before copy - Walk `PRAGMA table_info(runs)` to detect drift columns (v34 declared a column set; any additive ALTER since v14 shows up here) - Assert `COUNT(*) FROM runs_new == beforeCount` before `DROP TABLE runs` - `PRAGMA defer_foreign_keys = ON` so run_events(run_id) FK defers to commit time, by which runs has the same id set under the new name - Recreate all 6 indexes on the new table If the assertion fails, the migration throws inside the existing `transaction()` wrapper. SQLite rolls back the whole migration, old `runs` table is untouched, `schema_migrations` never records v35. Next app start retries cleanly. ## Migration v36 (drop tasks.is_heartbeat + synthetic rows) Runs now carry `task_id = NULL` for heartbeat dispatches. The `is_heartbeat` flag is dead data going forward. 1. `UPDATE runs SET task_id = NULL WHERE task_id IN (SELECT id FROM tasks WHERE is_heartbeat = 1)` 2. `DELETE FROM tasks WHERE is_heartbeat = 1` (synthetic rows, not real work) 3. Rebuild `tasks` without the `is_heartbeat` column (same defer-FK + row-count-assert pattern as v35) ## Code cleanup - `RunRecord.taskId: string | null`; `createRun` / `cancelRunForDeletion` / `finishRun` guard every `UPDATE tasks` path with a null-check. - `TaskRecord.isHeartbeat` removed; every SELECT / filter / UI reference dropped. - Delete `acquireHeartbeatTask` / `findReusableHeartbeatTask` / `cleanupDuplicateHeartbeatTasks` — dead after the constraint lifts. - Delete `src/main/orchestration/heartbeat-task.ts` (pure workaround constant file). - `heartbeat.ts` creates runs with `taskId: null` when the agent has no assigned work. Turn context already supports nullable task (heartbeatFallbackSection); prompt surface unchanged. - `validateTaskCreation` drops the `isHeartbeat` parameter — user- authored + automation-authored tasks are never heartbeat. - Renderer: `run.taskId ? taskMap.get(...) : undefined` in Dashboard / RunCenter / RunDetail / RunQueue. - Delete `tests/unit/heartbeat-coalescing.test.ts` (12 tests that exercised the deleted DB methods). - Drop 1 isHeartbeat-bypass test from `task-quality-gates.test.ts`. ## Grep verification - `isHeartbeatTaskTitle src/` → 0 - `acquireHeartbeatTask src/` → migration comment only - `is_heartbeat src/` → schema.ts migration history only - `isHeartbeat src/` → 0 Tests: 578/578 (was 591 — delta is 13 tests that tested deleted code).
141 lines
4.9 KiB
TypeScript
141 lines
4.9 KiB
TypeScript
import type { WorkerServiceDependencies } from "./worker-types";
|
|
import { resolveWorkspaceWithLockMode } from "../orchestration/resolve-workspace";
|
|
|
|
export function handleWorkerExit(
|
|
code: number | null,
|
|
{
|
|
db,
|
|
logger,
|
|
isQuitting,
|
|
publishDomainChanged,
|
|
emitEvent: _emitEvent,
|
|
wakeAgentIfPossible,
|
|
dispatchRunToWorker,
|
|
}: Pick<WorkerServiceDependencies, "db" | "logger" | "isQuitting" | "publishDomainChanged" | "emitEvent" | "wakeAgentIfPossible" | "dispatchRunToWorker">,
|
|
createWorker: () => void,
|
|
getWorker: () => ReturnType<typeof import("electron").utilityProcess.fork> | null,
|
|
) {
|
|
if (isQuitting()) return;
|
|
|
|
logger.warn(`[worker] Worker exited with code ${code}, recovering...`);
|
|
|
|
const snapshot = db.listSnapshot();
|
|
const affectedAgentIds = new Set<string>();
|
|
const affectedCompanyIds = new Map<string, string>();
|
|
const requeueCandidates: Array<{
|
|
id: string;
|
|
taskId: string | null;
|
|
agentId: string;
|
|
companyId: string;
|
|
workspaceId: string | null;
|
|
connectorId: string;
|
|
}> = [];
|
|
|
|
for (const run of snapshot.runs) {
|
|
if (run.status === "running") {
|
|
db.finishRun({
|
|
runId: run.id,
|
|
status: "interrupted",
|
|
summary: "Worker process crashed.",
|
|
errorMessage: "Worker process exited unexpectedly.",
|
|
exitCode: code,
|
|
signal: null,
|
|
model: null,
|
|
sessionDisplayId: null,
|
|
unattributedCost: true,
|
|
});
|
|
if (run.workspaceId) {
|
|
db.releaseWorkspaceLock(run.workspaceId, run.id);
|
|
}
|
|
// EXEC-02: Release execution lock on crash recovery
|
|
if (run.taskId) {
|
|
db.releaseTaskLock(run.taskId, run.id);
|
|
}
|
|
affectedAgentIds.add(run.agentId);
|
|
affectedCompanyIds.set(run.agentId, run.companyId);
|
|
|
|
const chain = db.getChainOfCommand(run.agentId);
|
|
if (chain.length > 0) {
|
|
wakeAgentIfPossible(chain[0].id, run.companyId, "report_failed");
|
|
}
|
|
} else if (run.status === "queued") {
|
|
requeueCandidates.push({
|
|
id: run.id,
|
|
taskId: run.taskId,
|
|
agentId: run.agentId,
|
|
companyId: run.companyId,
|
|
workspaceId: run.workspaceId,
|
|
connectorId: run.connectorId,
|
|
});
|
|
}
|
|
}
|
|
|
|
for (const agentId of affectedAgentIds) {
|
|
// EXEC-05: Promote deferred wakes after crash recovery
|
|
const cid = affectedCompanyIds.get(agentId) ?? "";
|
|
const promoted = db.promoteWakeupRequests(agentId, cid);
|
|
if (promoted > 0) {
|
|
logger.info(`[worker] Promoted ${promoted} deferred wake(s) for agent ${agentId} after crash recovery`);
|
|
}
|
|
const pendingWakeTrigger = db.getPreferredWakeTrigger(agentId, cid);
|
|
if (pendingWakeTrigger) {
|
|
wakeAgentIfPossible(agentId, cid, pendingWakeTrigger);
|
|
}
|
|
}
|
|
|
|
publishDomainChanged();
|
|
|
|
createWorker();
|
|
|
|
const worker = getWorker();
|
|
if (requeueCandidates.length > 0 && worker) {
|
|
logger.info(`[worker] Re-enqueuing ${requeueCandidates.length} queued run(s) after worker restart.`);
|
|
const recoverySnapshot = db.listSnapshot();
|
|
for (const candidate of requeueCandidates) {
|
|
try {
|
|
// The crashed run may still own a workspace lock acquired during the
|
|
// original dispatch; release it before re-dispatch so the replay
|
|
// does not self-collide with "Workspace is locked by another run".
|
|
if (candidate.workspaceId) {
|
|
db.releaseWorkspaceLock(candidate.workspaceId, candidate.id);
|
|
}
|
|
const task = candidate.taskId ? db.getTask(candidate.taskId) : null;
|
|
const agent = db.getAgent(candidate.agentId);
|
|
const connector = db.getConnector(agent.connectorId);
|
|
const { workspace, lockMode } = resolveWorkspaceWithLockMode(db, task, agent, candidate.companyId);
|
|
const recoveryCompany = recoverySnapshot.companies.find((company) => company.id === candidate.companyId);
|
|
|
|
dispatchRunToWorker({
|
|
runId: candidate.id,
|
|
companyId: candidate.companyId,
|
|
agent,
|
|
task,
|
|
connector,
|
|
workspace,
|
|
workspaceMode: lockMode,
|
|
companyName: recoveryCompany?.name ?? "Company",
|
|
companyDescription: recoveryCompany?.description ?? "",
|
|
snapshot: recoverySnapshot,
|
|
trigger: "recovery",
|
|
});
|
|
} catch (error) {
|
|
logger.warn(`[worker] Failed to re-enqueue run ${candidate.id}: ${error instanceof Error ? error.message : String(error)}`);
|
|
db.finishRun({
|
|
runId: candidate.id,
|
|
status: "interrupted",
|
|
summary: "Could not re-enqueue after worker restart.",
|
|
errorMessage: error instanceof Error ? error.message : String(error),
|
|
exitCode: null,
|
|
signal: null,
|
|
model: null,
|
|
sessionDisplayId: null,
|
|
unattributedCost: true,
|
|
});
|
|
if (candidate.workspaceId) {
|
|
db.releaseWorkspaceLock(candidate.workspaceId, candidate.id);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|