Files
PaperClipAI/server/src/shutdown.ts
T
DottaandClaude Opus 5.5 c4ba3974a7 fix(heartbeat): close run admission before a graceful shutdown closes its listener (t09) (#20102)
## Thinking Path

> - Paperclip is the open source app people use to manage AI agents for
work
> - A graceful restart (K2) drains the control plane: it closes HTTP
admission, suspends running runs, and the next boot resumes them
> - Run admission stayed open while the HTTP listener closed.
Heartbeat's shutdown flag was set only later, inside hot-restart
preparation
> - A run that finished in that window released its issue and promoted
the queued comment wake. That started a new run that had no callback
listener
> - A remote warm continuation then failed with
`local_runtime_api_listener_unavailable`, and the task needed a Retry
(restart chaos t09)
> - This pull request closes run admission before the listener closes,
so the promoted wake stays queued for the next boot
> - The benefit is that a comment sent during a deploy continues on its
own after the restart

## Linked Issues or Issue Description

Refs #19596

**What happened?**
In restart-chaos wave w-20261108T192459-s9501 (Daytona warm, Codex C1,
K2), a K2 SIGTERM started a graceful drain at 19:42:52 UTC, and the HTTP
listener closed first. At 19:43:03 the running turn finished and
released its issue. That promoted the queued comment wake, and
`startNextQueuedRunForAgent` started a new run about 11 s into the
drain. Backend setup resolved the local runtime API URL, found the
listener closed, and threw `local_runtime_api_listener_unavailable`. The
remote target is excluded from the closed-listener handoff, so the run
failed, and the task waited for a manual Retry.

**Expected behavior**
No queued run starts once a graceful shutdown has begun. A wake promoted
during the drain stays queued, and the next boot starts it with no
Retry.

**Steps to reproduce**
1. Run a remote warm task and post a comment while its turn runs, so the
comment wake queues behind it.
2. Send SIGTERM to the control plane just before the turn finishes.
3. Before this change, a new run starts during the drain and fails with
`local_runtime_api_listener_unavailable`.

**Paperclip version or commit**
master at d007afbf86 (the wave ran on c5a172a183).

## What Changed

- `heartbeat/run-admission.ts` (new): a process-wide run admission gate
(`closeProcessRunAdmission`, `isProcessRunAdmissionClosed`). HTTP routes
build their own heartbeat instances, so the gate cannot live in one
instance.
- `heartbeat/queue.ts`: a new optional dependency,
`isRunAdmissionClosed`, which defaults to the process-wide gate.
`startNextQueuedRunForAgent`, `resumeQueuedRuns` and
`resumeQueuedRunsAfterDrain` start nothing (and read nothing) once it
returns true. Wakes are still recorded and promoted; only the start is
held.
- `heartbeat.ts`: also honors its own `shutdownInProgress` flag.
- `shutdown.ts`: `closeHttpListenerForShutdown` takes
`closeRunAdmission` and calls it first, before it checks or closes the
listener. `index.ts` passes `closeProcessRunAdmission`.

## Verification

- Red/green, new tests:
- `queue.test.ts`: "starts no run once shutdown closed run admission"
(for `startNextQueuedRunForAgent` and `resumeQueuedRuns`), and "honors
the process-wide run admission gate in every heartbeat instance".
- `shutdown.test.ts`: "closes run admission before it stops accepting
requests".
- `pnpm exec vitest run src/services/heartbeat/queue.test.ts
src/services/heartbeat/recovery.test.ts
src/__tests__/heartbeat-comment-wake-batching.test.ts
src/services/native-runtime/native-startup-retry.integration.test.ts
src/shutdown.test.ts` (server): 5 files, 277 tests passed.
- `PAPERCLIP_TYPECHECK_LOW_MEMORY=1 pnpm typecheck` (server): passed.

## Risks

- Low risk. Only queued-run starts are held during a shutdown that has
already begun; wakes, drains, suspension and finalizers are unchanged.
The next boot's queued-run dispatch starts held runs.
- Known remaining window: a run admitted just before shutdown can still
reach backend setup after the listener closed. A local runner hands off
to restart recovery there. A remote warm continuation still fails,
because the remote target is excluded from that handoff (#19596) and the
bootstrap retry does not cover warm continuations. This change removes
the t09 sequence, where the run started after shutdown had begun; it
does not remove that narrower window.

## Model Used

- Claude Opus 5.5 (`claude-opus-5-5`), via Claude Code with tool use
(shell, file edits, test execution, a read-only research subagent).

## Checklist

- [x] I have included a thinking path that traces from project context
to this change
- [x] I have specified the model used (with version and capability
details)
- [x] I have checked ROADMAP.md and confirmed this PR does not duplicate
planned core work
- [x] I have searched GitHub for duplicate or related PRs and linked
them above
- [x] I have either (a) linked existing issues with `Fixes: #` / `Closes
#` / `Refs #` OR (b) described the issue in-PR following the relevant
issue template
- [x] I have not referenced internal/instance-local Paperclip issues or
links (only public GitHub `#NNN` / `github.com/paperclipai/paperclip`
URLs)
- [x] My branch name describes the change (e.g. `docs/...`, `fix/...`)
and contains no internal Paperclip ticket id or instance-derived details
- [x] I have run tests locally and they pass
- [x] I have added or updated tests where applicable
- [x] I have updated relevant documentation to reflect my changes
- [x] I have considered and documented any risks above
- [ ] All Paperclip CI gates are green
- [ ] Greptile is 5/5 with no open P2s, recommendations, or follow-ups
- [x] I will address all Greptile and reviewer comments before
requesting merge

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-08 14:59:55 -06:00

370 lines
13 KiB
TypeScript

type HotRestartShutdownPreparation = {
skipDrain: boolean;
};
type ShutdownLogger = {
info(obj: object, msg: string): void;
error(obj: object, msg: string): void;
};
export const PRE_DRAIN_SHUTDOWN_BUDGET_MS = 20_000;
export type ShutdownStepResult<T> =
| { outcome: "completed"; value: T; durationMs: number }
| { outcome: "timed_out"; durationMs: number }
| { outcome: "failed"; error: unknown; durationMs: number };
export async function runBoundedShutdownStep<T>(input: {
step: string;
signal: "SIGINT" | "SIGTERM";
timeoutMs: number;
run: () => Promise<T>;
log: ShutdownLogger;
now?: () => number;
}): Promise<ShutdownStepResult<T>> {
const now = input.now ?? Date.now;
const startedAt = now();
const timeoutMs = Math.max(0, input.timeoutMs);
let timer: NodeJS.Timeout | null = null;
try {
const result = await Promise.race([
Promise.resolve()
.then(input.run)
.then(
(value) => ({ outcome: "completed" as const, value }),
(error: unknown) => ({ outcome: "failed" as const, error }),
),
new Promise<{ outcome: "timed_out" }>((resolve) => {
timer = setTimeout(() => resolve({ outcome: "timed_out" }), timeoutMs);
timer.unref?.();
}),
]);
const durationMs = now() - startedAt;
const fields = { signal: input.signal, step: input.step, durationMs, timeoutMs };
if (result.outcome === "completed") {
input.log.info(fields, "shutdown step completed");
return { outcome: "completed", value: result.value, durationMs };
}
if (result.outcome === "failed") {
input.log.error({ ...fields, err: result.error }, "shutdown step failed; continuing shutdown");
return { outcome: "failed", error: result.error, durationMs };
}
input.log.info(fields, "shutdown step timed out; continuing shutdown without it");
return { outcome: "timed_out", durationMs };
} finally {
if (timer) clearTimeout(timer);
}
}
export function createPreDrainShutdownBudget(input: {
signal: "SIGINT" | "SIGTERM";
budgetMs?: number;
log: ShutdownLogger;
now?: () => number;
}) {
const now = input.now ?? Date.now;
const deadline = now() + (input.budgetMs ?? PRE_DRAIN_SHUTDOWN_BUDGET_MS);
return {
run<T>(step: string, run: () => Promise<T>) {
return runBoundedShutdownStep({
step,
signal: input.signal,
timeoutMs: deadline - now(),
run,
log: input.log,
now,
});
},
};
}
export async function drainRunExecutionFinalizersForShutdown(input: {
signal: "SIGINT" | "SIGTERM";
drain: (() => Promise<void>) | null;
timeoutMs?: number;
log: ShutdownLogger;
}): Promise<"drained" | "timed_out" | "unavailable"> {
if (!input.drain) return "unavailable";
const timeoutMs = input.timeoutMs ?? 5_000;
let timer: NodeJS.Timeout | null = null;
try {
const result = await Promise.race([
input.drain().then(() => "drained" as const),
new Promise<"timed_out">((resolve) => {
timer = setTimeout(() => resolve("timed_out"), timeoutMs);
timer.unref?.();
}),
]);
if (result === "timed_out") {
input.log.info(
{ signal: input.signal, timeoutMs },
"bounded heartbeat execution finalizer drain timed out",
);
}
return result;
} finally {
if (timer) clearTimeout(timer);
}
}
type ShutdownHttpListener = {
listening: boolean;
close(callback?: (err?: Error) => void): unknown;
closeIdleConnections?: () => void;
closeAllConnections?: () => void;
};
/**
* Stops the HTTP listener from accepting new requests and waits, for at most
* `timeoutMs`, for the open connections to finish. Idle keep-alive sockets
* close at once; whatever is still open when the grace period ends is closed
* forcibly, so the teardown never hangs on a long-lived client. Call this
* before the database pool ends, so no request can reach a route after
* `sql.end()` and fail with a connection-ended error.
*/
export async function closeHttpListenerForShutdown(input: {
server: ShutdownHttpListener;
signal: "SIGINT" | "SIGTERM";
timeoutMs?: number;
drainRequests?: (signal: AbortSignal) => Promise<void>;
closeRunAdmission?: () => void;
log: ShutdownLogger;
}): Promise<"closed" | "timed_out" | "not_listening"> {
input.closeRunAdmission?.();
if (!input.server.listening) return "not_listening";
const timeoutMs = input.timeoutMs ?? 5_000;
let timer: NodeJS.Timeout | null = null;
const controller = new AbortController();
try {
const closed = new Promise<"closed">((resolve) => {
input.server.close((err) => {
if (err && (err as NodeJS.ErrnoException).code !== "ERR_SERVER_NOT_RUNNING") {
input.log.error({ err, signal: input.signal }, "HTTP listener close failed");
}
resolve("closed");
});
input.server.closeIdleConnections?.();
});
return await Promise.race([
input.drainRequests ? input.drainRequests(controller.signal).then(() => {
input.server.closeIdleConnections?.();
return "closed" as const;
}) : closed,
new Promise<"timed_out">((resolve) => {
timer = setTimeout(() => {
input.log.info(
{ signal: input.signal, timeoutMs },
"HTTP listener drain timed out; closing the remaining connections",
);
input.server.closeAllConnections?.();
resolve("timed_out");
}, timeoutMs);
timer.unref?.();
}),
]);
} finally {
if (timer) clearTimeout(timer);
controller.abort();
}
}
/**
* Runs the final, ordered teardown of the server. It awaits the application
* service cleanup first, so a live setup-token login session stops and releases
* its sandbox lease before the database and the provider stop. The caller runs
* `process.exit(0)` only after this helper resolves, so an orderly shutdown
* never leaves a sandbox lease or confidential login state alive past the
* process exit.
*
* A step that rejects does not stop the teardown. The helper logs the error and
* continues to the next step. A failed setup-token lease release stays a
* durable record for the startup reaper; the helper surfaces it in the log
* instead of blocking the exit path.
*/
export async function finalizeServerShutdown(input: {
signal: "SIGINT" | "SIGTERM";
shutdownAppServices: (() => Promise<void>) | undefined;
/**
* Stops the HTTP listener and drains its connections (see
* `closeHttpListenerForShutdown`). Runs first, while every application
* service is still available to the requests being drained, so no request
* runs against a half-dismantled service or an ended pool.
*/
closeHttpListener?: (() => Promise<unknown>) | null;
/**
* Waits for every run-failure Sentry report still in flight. Runs after the
* application services and before the database pool ends, so a report that
* started just before shutdown still gets its database read and reaches
* Sentry before `shutdownSentry` flushes and closes the client.
*/
drainPendingRunFailureReports?: (() => Promise<void>) | null;
/**
* Ends the server's PostgreSQL client pools. Runs after the application
* services (which still need the database) and before the embedded
* provider stops, so the backends close in order and none outlive the
* process.
*/
closeDatabase?: (() => Promise<void>) | null;
stopEmbeddedPostgres: (() => Promise<void>) | null;
shutdownInstrumentation: () => Promise<void>;
shutdownSentry: () => Promise<void>;
log: ShutdownLogger;
}): Promise<void> {
const { signal } = input;
// Stop accepting requests and drain the open ones before any service goes
// away, so a request that is still in flight sees a fully working server.
if (input.closeHttpListener) {
try {
await input.closeHttpListener();
} catch (err) {
input.log.error({ err, signal }, "HTTP listener shutdown failed");
}
}
// Await the application service cleanup, so a live setup-token login session
// releases its sandbox lease before the database and the provider stop. A
// rejected cleanup stays durable for the reaper; it does not block the exit.
try {
await input.shutdownAppServices?.();
} catch (err) {
input.log.error({ err, signal }, "Application service shutdown failed");
}
// Wait for every in-flight run-failure Sentry report before the database
// pool ends. `reportRunFailure` is fire-and-forget: without this wait, a
// report that started just before shutdown can lose its database read to
// the pool end below, or lose its Sentry call to the flush further down.
if (input.drainPendingRunFailureReports) {
try {
await input.drainPendingRunFailureReports();
} catch (err) {
input.log.error({ err, signal }, "run-failure report drain failed");
}
}
// End the client pools once nothing needs them any more. Without this the
// process exit leaves the pooled backends to PostgreSQL's own TCP keepalive
// reaping, and a restart loop can pile up enough of them to hit
// `max_connections` before the next boot gets a connection.
if (input.closeDatabase) {
try {
await input.closeDatabase();
} catch (err) {
input.log.error({ err, signal }, "Database client shutdown failed");
}
}
if (input.stopEmbeddedPostgres) {
input.log.info({ signal }, "Stopping embedded PostgreSQL");
try {
await input.stopEmbeddedPostgres();
} catch (err) {
input.log.error({ err }, "Failed to stop embedded PostgreSQL cleanly");
}
}
// Flush buffered OTel spans before the process goes away; without this await
// the exporter's final batch is dropped on exit.
await input.shutdownInstrumentation();
// Flush buffered Sentry events before the process goes away; without this
// await the last events are dropped on exit.
await input.shutdownSentry();
}
const COORDINATED_SHUTDOWN_SIGNALS = ["SIGINT", "SIGTERM"] as const;
type ShutdownSignalTarget = {
rawListeners(eventName: string): Function[];
removeListener(eventName: string, listener: (...args: any[]) => void): unknown;
};
/**
* Some dependencies eagerly install process signal handlers as an import side
* effect. Paperclip must remain the sole owner of SIGINT/SIGTERM ordering: its
* handler first snapshots live heartbeat runs and only then stops embedded
* infrastructure. Remove only listeners added by the supplied import, while
* preserving every listener that was already registered.
*/
export async function loadWithoutCoordinatedShutdownSignalHooks<T>(
load: () => Promise<T>,
signalTarget: ShutdownSignalTarget = process,
) {
const listenersBeforeLoad = new Map(
COORDINATED_SHUTDOWN_SIGNALS.map((signal) => [
signal,
signalTarget.rawListeners(signal),
]),
);
let loaded: T;
try {
loaded = await load();
} finally {
for (const signal of COORDINATED_SHUTDOWN_SIGNALS) {
const remainingBeforeLoad = [...(listenersBeforeLoad.get(signal) ?? [])];
for (const listener of signalTarget.rawListeners(signal)) {
const existingIndex = remainingBeforeLoad.indexOf(listener);
if (existingIndex >= 0) {
remainingBeforeLoad.splice(existingIndex, 1);
continue;
}
signalTarget.removeListener(signal, listener as (...args: any[]) => void);
}
}
}
return loaded;
}
export async function coordinateHeartbeatSchedulerShutdown<
TPreparation extends HotRestartShutdownPreparation,
>(input: {
signal: "SIGINT" | "SIGTERM";
prepareHotRestartShutdown: ((signal: "SIGINT" | "SIGTERM") => Promise<TPreparation>) | null;
waitForHeartbeatSchedulerIdle: () => Promise<void>;
}): Promise<{
hotRestart: TPreparation | null;
preparationError: unknown;
waitedForSchedulerIdle: boolean;
}> {
let hotRestart: TPreparation | null = null;
let preparationError: unknown = null;
// The signal handler stops the scheduler before entering this coordinator.
// Quiesce any callback that was already in flight before querying running
// rows for the shutdown snapshot, otherwise a late queue claim can create a
// run that is absent from both the snapshot and the selective drain set.
await input.waitForHeartbeatSchedulerIdle();
if (input.prepareHotRestartShutdown) {
try {
hotRestart = await input.prepareHotRestartShutdown(input.signal);
} catch (err) {
preparationError = err;
}
}
return {
hotRestart,
preparationError,
waitedForSchedulerIdle: true,
};
}
export async function finishServiceShutdown(
stop: () => Promise<void>,
cleanup: () => Promise<void>,
): Promise<void> {
const failures: unknown[] = [];
let retryStop = false;
try { await stop(); } catch { retryStop = true; }
try { await cleanup(); } catch (error) { failures.push(error); }
if (retryStop) {
try { await stop(); } catch (error) { failures.unshift(error); }
}
if (failures.length === 1) throw failures[0];
if (failures.length > 1) throw new AggregateError(failures, "Service shutdown failed");
}