mirror of
https://github.com/paperclipai/paperclip.git
synced 2026-11-06 23:20:53 +01:00
## Thinking Path > - Paperclip manages AI agents and their work. > - The experimental Runner owns provider processes and durable sessions. > - Pi needs working task execution and human controls. > - The five-PR stack must preserve changes already on master. > - Each layer now carries the complete integrated source for a safe sequential fallback. > - This PR belongs to native GitHub stack #15602, ending at #14956. ## Linked Issues or Issue Description Refs #14436, #14631, #14743 and #14956. Ship Pi 1.0 through the experimental Paperclip Runner. The five PRs are #14921, #14922, #14923, #14924 and #14956. The user authorized the complete merge after checks pass. Existing `pi_local` execution is unchanged. Accounting and wider provider/platform qualification remain deferred. ## What Changed - Recover missing final replies after workspace finalization changes owners, using accepted-turn evidence without rerunning work or granting external-chat publication. - Preserve the admitted Pi instruction root across warm runs, while retaining changed-root rejection. - Give Pi a bounded 15-second default shutdown grace so stop, drain acknowledgement and durable suspension can complete. Explicit deadlines and other providers retain their existing behavior. - Integrate the Pi 1.0 runtime and master contracts. - Use Pi profile 22. Preserve explicit caller-selected models and exact native thinking levels. Keep Pi's wrapper, helper, extension and question/control behavior unchanged from the qualified profile-19 runtime. - Preserve master's Dot lifecycle and consent fields, configured task environment, status guards and current Codex/Claude dependency versions. Cursor stays qualified. Copilot stays pending; profile 17 binds the changed shared protocol validation sources. - Exclude general AWS IAM credentials from Pi static/custom provider bindings and selected task projections; preserve the provider-scoped Bedrock bearer key. Profile 21 is retained as historical provenance. Rust and cloud install probes use the current declaration. - Patch bundled brace-expansion 5.0.9 to the exact official 5.0.12 payload. Pin the patch and complete runtime closures. Include the patch in normal installed setup tooling. Keep the upstream Pi shrinkwrap as provenance and permit only this exact security correction. - Include current attestation files in the Docker build context. Keep the repository lockfile unchanged from master. CI and private image builds resolve manifest changes before their frozen installation. ## Verification - Full local `pnpm -r typecheck` passes, including Runner Rust, server and UI. Focused integration checks pass: 194 Runner admission/environment tests, 63 profile/credential tests with one expected skip, 152 Dot/UI configuration tests, and Pi transcript/notice tests. - Full local `pnpm build` passes on the final source. - Fresh final-source checks pass: all 698 Rust workspace tests (32 binaries), 156 credential/profile/controller tests with one expected skip, Runner TypeScript typecheck, and 20 package/setup/sandbox tests. - The profile-21 Pi materializer passes on the native host with the official pinned Node 24.21.0 and its npm. It verifies all 150 locked packages, the patched dependency and the exact closure. Setup/package bundle tests and UI token gates pass. - The old hashes were reproduced for all three supported targets before calculating the patched graph. New closure hashes are darwin-arm64 `282022db10150c6632b3444df421342e7d534bdf5d5fb1097a2e79d0625a2bcf`, darwin-x64 `64e251e19009f755c0b04f73ce2138246faab71a961b0f13d75ebfcc34bef12e`, and linux-x64 `713b1fdff42fb56a1518bdc084f181d70bee8ebadc3e4b1d76321ed9108c8410`. Independent native platform execution is separate from graph identity reproduction. - Historical cloud qualification remains unchanged: all seven core cases pass on shipping source `10dc43c9ec65d88c2f782d62afb296d09494f215`, harness `1a4408a48cfb5a1f094a311141c257c92cd7a893`, image `sha256:5b3a775b383591bda1b0c1889e509acc70ce7f37c53f09733c81d59037f02280`, and accepted Sonnet 4.6/low fixture. All 215 canonical files and all seven cleanup checks pass independent verification. These are profile-19 results and are not relabeled as fresh profile-22 runs. - Current Pi digest: `sha256:e92078bee3c23bec4100aa589013a44613d054cd686826534025d8019e9f39a9`. [The readiness plan](https://github.com/paperclipai/paperclip/blob/codex/pi-production-readiness/doc/plans/2026-10-02-pi-production-readiness.md) preserves campaign and failed-attempt provenance. - Merge only after every PR's current-head CI and fresh review pass. Linux CI covers the full suites, build and browser tests. The local embedded Postgres API-authority suite cannot start on this macOS/Node 26 host, so Linux CI must confirm that suite. ### Fresh profile-22 core qualification — 2026-10-08 All seven accepted core cases pass canonically on Pi profile 22, with `openrouter/anthropic/claude-sonnet-4.6` and native-confirmed low thinking. This model is a fixture; production accepts the caller's explicit Pi provider/model. Runtime/install source: `3241a992f2a7703e59e97ed0fd3e5d6405de4401`. Frozen accepted harness: `1a4408a48cfb5a1f094a311141c257c92cd7a893`. Immutable cloud image: `ghcr.io/paperclipai/paperclip-daytona-runner@sha256:506f22db7edd78f37c0c40bec1cc084af1850455026dbf467194bfbb8fcef141`. Pi digest: `sha256:e92078bee3c23bec4100aa589013a44613d054cd686826534025d8019e9f39a9`. [Hosted Linux image and clean-install verification](https://github.com/paperclipai/paperclip/actions/runs/37868328023) passes, including all 20 source-bound archives, normal CLI/Pi setup, companion import and the production pack reader. This exact installation source includes the latest master integration and the corrected Pi warm instruction-root fence. Full local typecheck/build and current-head hosted CI verify the final stack. All 13 focused real-root regressions pass. The full local executor suite passed 662 tests; 15 database tests could not start the Mac embedded PostgreSQL service. Hosted Linux CI passes the full required verification and E2E checks. These fresh results keep their own source identity; profile-19 results remain historical. | Core path | Canonical campaign | Retained archive SHA-256 | | --- | --- | --- | | File edit, validation, download and Done | `pi-core22-replyfix-0-1791511228` | 23 files; `a473e8603a3dd4737863291f8d3d1e392391f0b16d433c3e0e0e9d8baf7a97b0` | | Pending question and controller restart | `pi-core22-replyfix-1-1791511376` | 33 files; `6b829c4eb74e1f32a89c692a4ae7130dbfc1c6d3cf13915effe2103d9e242c8e` | | Three-turn session/process/workspace continuity | `pi-core22-replyfix-2-1791511587` | 23 files; `7a87021f8f9a3fdd3c58bb4467f8d82c635e3ea4795d6e75f144d9aa14818df8` | | Four typed questions and browser reconnects | `pi-core22-replyfix-3-1791511881` | 42 files; `9e31755252be1f4f9cb0626c984c142d4d1ae5f5bee3a7af08444db8d12c280a` | | Plan approval and completion | `pi-core22-replyfix-4-1791512031` | 22 files; `a0383ce1aab38e7b5a25ce0e9dd3bebea5c037ebd96ae6b29dae19015da2ae2c` | | Same-turn steering and permission denial | `pi-core22-replyfix-5-1791512261` | 39 files; `c929b8c7070f0b66aedc17e65ca46e6beab1e363926ac9f7e2a75fb250f05949` | | Stop during pending permission | `pi-core22-replyfix-6-1791512390` | 33 files; `7f0a58ae0f4d5bfc76149435f4e322537089c5bd16e7ffe9b5ad71f10a621a07` | All 215 canonical files (28714587 bytes) are independently hash-verified. All seven cleanup grades pass, with no owned runtime process or temporary root after each case. Automatic retries are zero. The owned cloud host stopped normally after retention. The prior profile-22 warm attempt remains failed and separately retained: archive SHA-256 `1e54eba5ec72b50cee1534b23d1d1d4f21a090006b8a64501ba70db972abfde5`. Its original canonical classification is preserved. Diagnosis reproduced a product bug comparing an agent-files root against an unset checkpoint-only field. The fix stores the admitted physical root separately from the adopted per-run collection capability. The real-root regression fails before the fix and passes afterward, including rejection of a changed physical root. Fixture, grader, model and all seven accepted case IDs are unchanged; this fresh campaign tests final-reply publication after file registration first. The intermediate restart attempt also remains failed and retained: archive SHA-256 `5dcaefdf1d17cf4cd54fd4cf810f45e736667392339b8ce7caf08bb4e225277f`. Its original canonical classification is preserved. Pi resumed, wrote the verified answer and completed its task; exact runner suspension was proven, but idle stop consumed about 5.2s and left under 3s for the drain acknowledgement. The Pi-only default shutdown grace is now 15s, preserving a full 5s drain round trip and a finite suspension reserve. Explicit caller deadlines, other provider defaults, literal drain receipts and exact suspension identity checks remain unchanged. The timing regression fails before this correction and passes afterward; all 18 focused settlement tests and Runner typecheck pass. The final-source file attempt is also preserved as failed (`candidate_failure`), archive SHA-256 `db6767b6773ea618997927ac77bdb005a5ac81492c7b9c0ffbc900449f829bc9`. Native edit, validation, exact downloadable artifact and Done/succeeded all passed, and the exact final reply was durably recorded. A workspace recovery owner completed before the live heartbeat reached presentation, leaving that reply absent from task chat. Recovery now materializes only a completed final reply from the accepted turn of an ordinary internal Done task, preserving issue/run/contract binding, suppression, external-chat authorization and same-run deduplication. The database regression covers the generated file-preparation receipt, suppression, unapproved external continuation and replay. Server typecheck and all 49 response-selection tests pass; hosted Linux verifies the database regression because embedded PostgreSQL cannot start on this Mac. The delayed-final-answer database regression passes on [the final root-source Linux server shard](https://github.com/paperclipai/paperclip/actions/runs/37868262553/job/113628594152), alongside 1,108 passing tests. The first root Runner shard had one unchanged durable-resume test exceed its 5-second timeout; the identical top-source shard and the isolated exact test passed. One rerun of that failed job and its required aggregate passed without source or test changes. The original failed job log and the single-rerun receipt remain retained. ### October 9 merge verification Current merge head: `5a8fe63512a7166aaef5cf50065a25008aa8b44b`. All current-head checks pass, including `ci / verify` and `ci / e2e`; exact-head Greptile review is 5/5 with no unresolved threads. Current master conflicts are resolved. The user authorized the maintainer override of the code-owner review gate after these checks. The seven retained live core cases remain bound to source `3241a992f2a7703e59e97ed0fd3e5d6405de4401` and its recorded cloud image. ## Risks - The security correction changes the dependency closure and profile identity. Old sessions must reopen on the new profile. Exact identities and credential bindings fail closed. - The runner remains experimental and requires explicit selection. Legacy Pi Local is unchanged. Caller model IDs pass through; the E2E model is a fixture. - Accounting and the broad platform/provider matrix remain deferred. This merge does not publish a release or deploy a service. ## Model Used OpenAI GPT-6 through Codex assisted with reasoning, repository inspection, editing and tool use. The exact serving ID and context window are not exposed in this session. Final live qualification uses Pi 1.0.0 with `openrouter/anthropic/claude-sonnet-4.6` and native-confirmed low thinking. ## 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 #` 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 - [x] All Paperclip CI gates are green - [x] Greptile is 5/5 with no open P2s, recommendations, or follow-ups - [x] I will address all Greptile and reviewer comments before requesting merge --------- Co-authored-by: Paperclip <noreply@paperclip.ing>
643 lines
22 KiB
TypeScript
643 lines
22 KiB
TypeScript
import { execFile } from "node:child_process";
|
|
import fs from "node:fs/promises";
|
|
import path from "node:path";
|
|
import { readLinuxProcessStartedAt, type LinuxProcessStartOptions } from "../vendor/paperclip-runner/index.js";
|
|
import {
|
|
resolvePaperclipHomeDir,
|
|
resolvePaperclipInstanceId,
|
|
resolvePaperclipInstanceRoot,
|
|
} from "../home-paths.js";
|
|
|
|
export const HOT_RESTART_INTENT_FILENAME = "hot-restart-intent.json";
|
|
export const HOT_RESTART_REPORT_FILENAME = "hot-restart-report.json";
|
|
const HOT_RESTART_LOCK_SUFFIX = ".lock";
|
|
const HOT_RESTART_LOCK_STALE_MS = 30_000;
|
|
const HOT_RESTART_LOCK_TIMEOUT_MS = 10_000;
|
|
|
|
type ProcessCommandRunner = (command: string, args: string[]) => Promise<string>;
|
|
|
|
export type HotRestartIntentRun = {
|
|
runId: string;
|
|
companyId: string;
|
|
agentId: string;
|
|
adapterType: string;
|
|
status: string;
|
|
processPid: number | null;
|
|
processGroupId: number | null;
|
|
issueId: string | null;
|
|
runtimeMode?: string | null;
|
|
nativeSessionId?: string | null;
|
|
runnerInstanceId?: string | null;
|
|
processStartedAt?: string | null;
|
|
};
|
|
|
|
export type HotRestartIntent = {
|
|
version: 1;
|
|
requestedAt: string;
|
|
recoveryRequestId?: string | null;
|
|
previousServerPid: number;
|
|
previousServerIdentity?: string | null;
|
|
previousServerStartedAt?: string | null;
|
|
previousServerVersion: string | null;
|
|
drainRequired: boolean;
|
|
drainReason?: "requested" | "active_acp_run" | null;
|
|
drainRunIds?: string[];
|
|
requestedByRunId: string | null;
|
|
preflightActiveRunIds: string[];
|
|
shutdownSnapshot?: {
|
|
capturedAt: string;
|
|
signal: "SIGINT" | "SIGTERM";
|
|
activeRuns: HotRestartIntentRun[];
|
|
};
|
|
};
|
|
|
|
export type HotRestartReportRun = HotRestartIntentRun & {
|
|
classification:
|
|
| "adopted"
|
|
| "finalized_while_down"
|
|
| "lost"
|
|
| "skipped";
|
|
reason: string;
|
|
};
|
|
|
|
export type HotRestartReport = {
|
|
version: 1;
|
|
requestedAt: string;
|
|
completedAt: string;
|
|
drainRequired: boolean;
|
|
drainReason: "requested" | "active_acp_run" | null;
|
|
previousServerPid: number;
|
|
newServerPid: number;
|
|
previousServerVersion: string | null;
|
|
newServerVersion: string;
|
|
adoptedRunIds: string[];
|
|
finalizedWhileDownRunIds: string[];
|
|
lostRunIds: string[];
|
|
skippedRunIds: string[];
|
|
runs: HotRestartReportRun[];
|
|
};
|
|
|
|
function resolveHotRestartPath(filename: string, homeDir?: string) {
|
|
return path.join(resolvePaperclipInstanceRoot({ homeDir }), filename);
|
|
}
|
|
|
|
function resolveLegacyHotRestartPath(filename: string, homeDir?: string) {
|
|
return path.join(resolvePaperclipHomeDir(homeDir), filename);
|
|
}
|
|
|
|
export function resolveHotRestartIntentPath(homeDir?: string) {
|
|
return resolveHotRestartPath(HOT_RESTART_INTENT_FILENAME, homeDir);
|
|
}
|
|
|
|
export function resolveLegacyHotRestartIntentPath(homeDir?: string) {
|
|
return resolveLegacyHotRestartPath(HOT_RESTART_INTENT_FILENAME, homeDir);
|
|
}
|
|
|
|
export function resolveHotRestartReportPath(homeDir?: string) {
|
|
return resolveHotRestartPath(HOT_RESTART_REPORT_FILENAME, homeDir);
|
|
}
|
|
|
|
async function writeJsonFileAtomic(filePath: string, value: unknown) {
|
|
await fs.mkdir(path.dirname(filePath), { recursive: true });
|
|
const tempPath = `${filePath}.${process.pid}.${Date.now()}.tmp`;
|
|
await fs.writeFile(tempPath, `${JSON.stringify(value, null, 2)}\n`, "utf8");
|
|
await fs.rename(tempPath, filePath);
|
|
}
|
|
|
|
async function writeJsonFileExclusiveAtomic(filePath: string, value: unknown) {
|
|
await fs.mkdir(path.dirname(filePath), { recursive: true });
|
|
const tempPath = `${filePath}.${process.pid}.${Date.now()}.tmp`;
|
|
await fs.writeFile(tempPath, `${JSON.stringify(value, null, 2)}\n`, "utf8");
|
|
try {
|
|
await fs.link(tempPath, filePath);
|
|
} finally {
|
|
await fs.unlink(tempPath).catch(() => undefined);
|
|
}
|
|
}
|
|
|
|
function isRecord(value: unknown): value is Record<string, unknown> {
|
|
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
}
|
|
|
|
function asString(value: unknown): string | null {
|
|
return typeof value === "string" && value.trim().length > 0 ? value : null;
|
|
}
|
|
|
|
function asNumber(value: unknown): number | null {
|
|
return typeof value === "number" && Number.isInteger(value) && value > 0 ? value : null;
|
|
}
|
|
|
|
function asBoolean(value: unknown): boolean {
|
|
return value === true;
|
|
}
|
|
|
|
function asDrainReason(value: unknown) {
|
|
return value === "requested" || value === "active_acp_run" ? value : null;
|
|
}
|
|
|
|
function asDateString(value: unknown): string | null {
|
|
const candidate = asString(value);
|
|
if (!candidate) return null;
|
|
const timestamp = Date.parse(candidate);
|
|
return Number.isFinite(timestamp) ? new Date(timestamp).toISOString() : null;
|
|
}
|
|
|
|
function asStringArray(value: unknown): string[] {
|
|
if (!Array.isArray(value)) return [];
|
|
return [...new Set(value.map(asString).filter((entry): entry is string => entry !== null))];
|
|
}
|
|
|
|
function isProcessAlive(pid: number) {
|
|
try {
|
|
process.kill(pid, 0);
|
|
return true;
|
|
} catch (error) {
|
|
return (error as NodeJS.ErrnoException | undefined)?.code === "EPERM";
|
|
}
|
|
}
|
|
|
|
function runProcessCommand(command: string, args: string[]) {
|
|
return new Promise<string>((resolve, reject) => {
|
|
execFile(
|
|
command,
|
|
args,
|
|
{
|
|
encoding: "utf8",
|
|
timeout: 1_500,
|
|
windowsHide: true,
|
|
},
|
|
(error, stdout) => {
|
|
if (error) reject(error);
|
|
else resolve(stdout);
|
|
},
|
|
);
|
|
});
|
|
}
|
|
|
|
export async function readProcessStartedAt(
|
|
pid: number,
|
|
options: {
|
|
platform?: NodeJS.Platform;
|
|
linuxProcessStart?: LinuxProcessStartOptions;
|
|
runCommand?: ProcessCommandRunner;
|
|
} = {},
|
|
) {
|
|
const platform = options.platform ?? process.platform;
|
|
const runCommand = options.runCommand ?? runProcessCommand;
|
|
|
|
if (platform === "linux") {
|
|
return readLinuxProcessStartedAt(pid, options.linuxProcessStart);
|
|
}
|
|
|
|
if (["darwin", "freebsd", "openbsd", "aix", "sunos"].includes(platform)) {
|
|
const stdout = await runCommand("ps", ["-o", "lstart=", "-p", String(pid)]);
|
|
const startedAt = asDateString(stdout.trim());
|
|
if (!startedAt) {
|
|
throw new Error(`Could not parse ${platform} process start time for PID ${pid}`);
|
|
}
|
|
return startedAt;
|
|
}
|
|
|
|
if (platform === "win32") {
|
|
const script = [
|
|
`$process = Get-Process -Id ${pid} -ErrorAction Stop`,
|
|
"$process.StartTime.ToUniversalTime().ToString('o')",
|
|
].join("; ");
|
|
let stdout: string;
|
|
try {
|
|
stdout = await runCommand("powershell.exe", [
|
|
"-NoLogo",
|
|
"-NoProfile",
|
|
"-NonInteractive",
|
|
"-Command",
|
|
script,
|
|
]);
|
|
} catch {
|
|
stdout = await runCommand("pwsh.exe", [
|
|
"-NoLogo",
|
|
"-NoProfile",
|
|
"-NonInteractive",
|
|
"-Command",
|
|
script,
|
|
]);
|
|
}
|
|
const startedAt = asDateString(stdout.trim());
|
|
if (!startedAt) {
|
|
throw new Error(`Could not parse Windows process start time for PID ${pid}`);
|
|
}
|
|
return startedAt;
|
|
}
|
|
|
|
return null;
|
|
}
|
|
|
|
export function isObservedHotRestartTargetAlive(
|
|
intent: HotRestartIntent,
|
|
observation: {
|
|
alive: boolean;
|
|
startedAt: string | null;
|
|
replacement?: Pick<
|
|
HotRestartIntent,
|
|
"previousServerPid" | "previousServerIdentity" | "previousServerStartedAt"
|
|
>;
|
|
},
|
|
) {
|
|
if (!observation.alive) return false;
|
|
|
|
if (observation.replacement?.previousServerPid === intent.previousServerPid) {
|
|
if (
|
|
observation.replacement.previousServerIdentity
|
|
&& intent.previousServerIdentity
|
|
) {
|
|
return observation.replacement.previousServerIdentity
|
|
=== intent.previousServerIdentity;
|
|
}
|
|
|
|
if (
|
|
observation.replacement.previousServerIdentity
|
|
&& !intent.previousServerIdentity
|
|
) {
|
|
const replacementStartedAt = Date.parse(
|
|
observation.replacement.previousServerIdentity,
|
|
);
|
|
const requestedAt = Date.parse(intent.requestedAt);
|
|
if (Number.isFinite(replacementStartedAt) && Number.isFinite(requestedAt)) {
|
|
// The health endpoint's processStartedAt value is also the current
|
|
// server boot identity. If that process started after an older marker
|
|
// was requested, the shared numeric PID was necessarily recycled.
|
|
return replacementStartedAt <= requestedAt;
|
|
}
|
|
}
|
|
|
|
if (!intent.previousServerIdentity) {
|
|
const replacementStartedAt = observation.replacement.previousServerStartedAt
|
|
? Date.parse(observation.replacement.previousServerStartedAt)
|
|
: Number.NaN;
|
|
const requestedAt = Date.parse(intent.requestedAt);
|
|
if (Number.isFinite(replacementStartedAt) && Number.isFinite(requestedAt)) {
|
|
return replacementStartedAt <= requestedAt;
|
|
}
|
|
}
|
|
}
|
|
|
|
const observedStartedAt = observation.startedAt
|
|
? Date.parse(observation.startedAt)
|
|
: Number.NaN;
|
|
const recordedStartedAt = intent.previousServerStartedAt
|
|
? Date.parse(intent.previousServerStartedAt)
|
|
: Number.NaN;
|
|
if (Number.isFinite(observedStartedAt) && Number.isFinite(recordedStartedAt)) {
|
|
return observedStartedAt === recordedStartedAt;
|
|
}
|
|
|
|
const requestedAt = Date.parse(intent.requestedAt);
|
|
if (Number.isFinite(observedStartedAt) && Number.isFinite(requestedAt)) {
|
|
// Older markers have no recorded process start. A process that started
|
|
// after the request necessarily reused the marker's numeric PID.
|
|
return observedStartedAt <= requestedAt;
|
|
}
|
|
|
|
throw new Error(
|
|
`Cannot establish process identity for live hot-restart target PID ${intent.previousServerPid}`,
|
|
);
|
|
}
|
|
|
|
async function isOriginalServerProcessAlive(
|
|
intent: HotRestartIntent,
|
|
replacement: HotRestartIntent,
|
|
) {
|
|
const alive = isProcessAlive(intent.previousServerPid);
|
|
const startedAt = alive
|
|
? await readProcessStartedAt(intent.previousServerPid)
|
|
: null;
|
|
return isObservedHotRestartTargetAlive(intent, {
|
|
alive,
|
|
startedAt,
|
|
replacement,
|
|
});
|
|
}
|
|
|
|
async function removeStaleHotRestartLock(lockDir: string) {
|
|
let shouldRemove = false;
|
|
try {
|
|
const owner = JSON.parse(
|
|
await fs.readFile(path.join(lockDir, "owner.json"), "utf8"),
|
|
) as { pid?: unknown; createdAt?: unknown };
|
|
const pid = typeof owner.pid === "number" ? owner.pid : 0;
|
|
const createdAt = typeof owner.createdAt === "string"
|
|
? Date.parse(owner.createdAt)
|
|
: Number.NaN;
|
|
const ageMs = Number.isFinite(createdAt)
|
|
? Date.now() - createdAt
|
|
: HOT_RESTART_LOCK_STALE_MS + 1;
|
|
shouldRemove = !isProcessAlive(pid) || ageMs > HOT_RESTART_LOCK_STALE_MS;
|
|
} catch {
|
|
const stat = await fs.stat(lockDir).catch(() => null);
|
|
shouldRemove = !stat
|
|
|| Date.now() - stat.mtimeMs > HOT_RESTART_LOCK_STALE_MS;
|
|
}
|
|
if (!shouldRemove) return false;
|
|
await fs.rm(lockDir, { recursive: true, force: true }).catch(() => undefined);
|
|
return true;
|
|
}
|
|
|
|
async function acquireHotRestartPathLock(filePath: string) {
|
|
const lockDir = `${filePath}${HOT_RESTART_LOCK_SUFFIX}`;
|
|
const deadline = Date.now() + HOT_RESTART_LOCK_TIMEOUT_MS;
|
|
while (true) {
|
|
try {
|
|
await fs.mkdir(lockDir);
|
|
try {
|
|
await fs.writeFile(
|
|
path.join(lockDir, "owner.json"),
|
|
`${JSON.stringify({ pid: process.pid, createdAt: new Date().toISOString() })}\n`,
|
|
"utf8",
|
|
);
|
|
} catch (error) {
|
|
await fs.rm(lockDir, { recursive: true, force: true }).catch(() => undefined);
|
|
throw error;
|
|
}
|
|
return async () => {
|
|
await fs.rm(lockDir, { recursive: true, force: true });
|
|
};
|
|
} catch (error) {
|
|
if ((error as NodeJS.ErrnoException).code !== "EEXIST") throw error;
|
|
if (await removeStaleHotRestartLock(lockDir)) continue;
|
|
if (Date.now() >= deadline) {
|
|
throw new Error(`Timed out waiting for hot-restart compatibility lock at ${lockDir}`);
|
|
}
|
|
await new Promise((resolve) => setTimeout(resolve, 25));
|
|
}
|
|
}
|
|
}
|
|
|
|
async function withHotRestartPathLock<T>(filePath: string, operation: () => Promise<T>) {
|
|
await fs.mkdir(path.dirname(filePath), { recursive: true });
|
|
const release = await acquireHotRestartPathLock(filePath);
|
|
try {
|
|
return await operation();
|
|
} finally {
|
|
await release();
|
|
}
|
|
}
|
|
|
|
function isSameHotRestartRequest(left: HotRestartIntent, right: HotRestartIntent) {
|
|
return left.requestedAt === right.requestedAt
|
|
&& left.previousServerPid === right.previousServerPid
|
|
&& left.drainRequired === right.drainRequired
|
|
&& left.requestedByRunId === right.requestedByRunId
|
|
&& (left.recoveryRequestId ?? null) === (right.recoveryRequestId ?? null);
|
|
}
|
|
|
|
function parseRun(value: unknown): HotRestartIntentRun | null {
|
|
if (!isRecord(value)) return null;
|
|
const runId = asString(value.runId);
|
|
const companyId = asString(value.companyId);
|
|
const agentId = asString(value.agentId);
|
|
const adapterType = asString(value.adapterType);
|
|
const status = asString(value.status);
|
|
if (!runId || !companyId || !agentId || !adapterType || !status) return null;
|
|
return {
|
|
runId,
|
|
companyId,
|
|
agentId,
|
|
adapterType,
|
|
status,
|
|
processPid: asNumber(value.processPid),
|
|
processGroupId: asNumber(value.processGroupId),
|
|
issueId: asString(value.issueId),
|
|
runtimeMode: asString(value.runtimeMode),
|
|
nativeSessionId: asString(value.nativeSessionId),
|
|
runnerInstanceId: asString(value.runnerInstanceId),
|
|
processStartedAt: asDateString(value.processStartedAt),
|
|
};
|
|
}
|
|
|
|
export function parseHotRestartIntent(value: unknown): HotRestartIntent | null {
|
|
if (!isRecord(value) || value.version !== 1) return null;
|
|
const requestedAt = asString(value.requestedAt);
|
|
const previousServerPid = asNumber(value.previousServerPid);
|
|
if (!requestedAt || !previousServerPid) return null;
|
|
|
|
const intent: HotRestartIntent = {
|
|
version: 1,
|
|
requestedAt,
|
|
recoveryRequestId: asString(value.recoveryRequestId),
|
|
previousServerPid,
|
|
previousServerIdentity: asString(value.previousServerIdentity),
|
|
previousServerStartedAt: asDateString(value.previousServerStartedAt),
|
|
previousServerVersion: asString(value.previousServerVersion),
|
|
drainRequired: asBoolean(value.drainRequired),
|
|
drainReason: asDrainReason(value.drainReason),
|
|
drainRunIds: asStringArray(value.drainRunIds),
|
|
requestedByRunId: asString(value.requestedByRunId),
|
|
preflightActiveRunIds: asStringArray(value.preflightActiveRunIds),
|
|
};
|
|
|
|
const snapshot = isRecord(value.shutdownSnapshot) ? value.shutdownSnapshot : null;
|
|
const signal = snapshot?.signal === "SIGINT" || snapshot?.signal === "SIGTERM"
|
|
? snapshot.signal
|
|
: null;
|
|
const capturedAt = asString(snapshot?.capturedAt);
|
|
const activeRuns = Array.isArray(snapshot?.activeRuns)
|
|
? snapshot.activeRuns.map(parseRun).filter((run): run is HotRestartIntentRun => run !== null)
|
|
: [];
|
|
if (signal && capturedAt) {
|
|
intent.shutdownSnapshot = { capturedAt, signal, activeRuns };
|
|
}
|
|
|
|
return intent;
|
|
}
|
|
|
|
async function readHotRestartIntentAtPath(filePath: string) {
|
|
try {
|
|
const raw = await fs.readFile(filePath, "utf8");
|
|
return parseHotRestartIntent(JSON.parse(raw));
|
|
} catch (error) {
|
|
if ((error as NodeJS.ErrnoException).code === "ENOENT") return null;
|
|
throw error;
|
|
}
|
|
}
|
|
|
|
export async function readHotRestartIntent(homeDir?: string) {
|
|
const instanceIntent = await readHotRestartIntentAtPath(resolveHotRestartIntentPath(homeDir));
|
|
let legacyIntent: HotRestartIntent | null;
|
|
try {
|
|
legacyIntent = await readHotRestartIntentAtPath(resolveLegacyHotRestartIntentPath(homeDir));
|
|
} catch (error) {
|
|
if (instanceIntent) return instanceIntent;
|
|
throw error;
|
|
}
|
|
|
|
if (!instanceIntent) {
|
|
// The home-root marker predates instances. Only the default instance may
|
|
// consume it without an instance-root request to correlate against.
|
|
return resolvePaperclipInstanceId() === "default" ? legacyIntent : null;
|
|
}
|
|
if (!legacyIntent || !isSameHotRestartRequest(instanceIntent, legacyIntent)) {
|
|
return instanceIntent;
|
|
}
|
|
|
|
// A pre-instance server rewrites only the legacy marker when it captures
|
|
// its shutdown snapshot. Preserve the instance-scoped request fields while
|
|
// importing that snapshot only after the immutable request identity matches.
|
|
return legacyIntent.shutdownSnapshot
|
|
? { ...instanceIntent, shutdownSnapshot: legacyIntent.shutdownSnapshot }
|
|
: instanceIntent;
|
|
}
|
|
|
|
export function findMissingHotRestartSnapshotRunIds(intent: HotRestartIntent) {
|
|
const snapshotRunIds = new Set(intent.shutdownSnapshot?.activeRuns.map((run) => run.runId) ?? []);
|
|
return intent.preflightActiveRunIds.filter((runId) => !snapshotRunIds.has(runId));
|
|
}
|
|
|
|
export async function writeHotRestartIntent(input: {
|
|
previousServerPid: number;
|
|
previousServerIdentity?: string | null;
|
|
previousServerStartedAt?: string | null;
|
|
previousServerVersion?: string | null;
|
|
drainRequired?: boolean;
|
|
drainReason?: "requested" | "active_acp_run" | null;
|
|
requestedByRunId?: string | null;
|
|
preflightActiveRunIds?: string[];
|
|
requestedAt?: Date;
|
|
recoveryRequestId?: string | null;
|
|
homeDir?: string;
|
|
}) {
|
|
const previousServerStartedAt = input.previousServerStartedAt === undefined
|
|
? await readProcessStartedAt(input.previousServerPid)
|
|
: asDateString(input.previousServerStartedAt);
|
|
const previousServerIdentity = asString(input.previousServerIdentity);
|
|
if (!previousServerIdentity && !previousServerStartedAt) {
|
|
throw new Error(
|
|
`Cannot create hot-restart intent for PID ${input.previousServerPid}: `
|
|
+ "server boot identity and operating-system process start time are unavailable",
|
|
);
|
|
}
|
|
const intent: HotRestartIntent = {
|
|
version: 1,
|
|
requestedAt: (input.requestedAt ?? new Date()).toISOString(),
|
|
recoveryRequestId: input.recoveryRequestId ?? null,
|
|
previousServerPid: input.previousServerPid,
|
|
previousServerIdentity,
|
|
previousServerStartedAt,
|
|
previousServerVersion: input.previousServerVersion ?? null,
|
|
drainRequired: input.drainRequired ?? false,
|
|
drainReason: input.drainReason ?? (input.drainRequired ? "requested" : null),
|
|
requestedByRunId: input.requestedByRunId ?? null,
|
|
preflightActiveRunIds: asStringArray(input.preflightActiveRunIds),
|
|
};
|
|
const instancePath = resolveHotRestartIntentPath(input.homeDir);
|
|
const legacyPath = resolveLegacyHotRestartIntentPath(input.homeDir);
|
|
// The legacy location is shared by every instance under PAPERCLIP_HOME.
|
|
// Claim it without replacement so concurrent staged restarts fail closed
|
|
// instead of making the first old server consume another instance's PID.
|
|
await withHotRestartPathLock(legacyPath, () => claimLegacyHotRestartIntent(legacyPath, intent));
|
|
try {
|
|
await withHotRestartPathLock(instancePath, () => writeJsonFileAtomic(instancePath, intent));
|
|
} catch (error) {
|
|
await withHotRestartPathLock(
|
|
legacyPath,
|
|
() => removeMatchingHotRestartIntent(legacyPath, intent),
|
|
).catch(() => undefined);
|
|
throw error;
|
|
}
|
|
return intent;
|
|
}
|
|
|
|
export async function writeHotRestartShutdownSnapshot(input: {
|
|
intent: HotRestartIntent;
|
|
signal: "SIGINT" | "SIGTERM";
|
|
activeRuns: HotRestartIntentRun[];
|
|
drainReason?: "active_acp_run";
|
|
drainRunIds?: string[];
|
|
capturedAt?: Date;
|
|
homeDir?: string;
|
|
}) {
|
|
const updated: HotRestartIntent = {
|
|
...input.intent,
|
|
...(input.drainReason
|
|
? {
|
|
drainRequired: true,
|
|
drainReason: input.drainReason,
|
|
drainRunIds: asStringArray(input.drainRunIds),
|
|
}
|
|
: {}),
|
|
shutdownSnapshot: {
|
|
capturedAt: (input.capturedAt ?? new Date()).toISOString(),
|
|
signal: input.signal,
|
|
activeRuns: input.activeRuns,
|
|
},
|
|
};
|
|
const instancePath = resolveHotRestartIntentPath(input.homeDir);
|
|
await withHotRestartPathLock(instancePath, () => writeJsonFileAtomic(instancePath, updated));
|
|
const legacyPath = resolveLegacyHotRestartIntentPath(input.homeDir);
|
|
await withHotRestartPathLock(legacyPath, async () => {
|
|
const legacyIntent = await readHotRestartIntentAtPath(legacyPath).catch(() => null);
|
|
if (legacyIntent && isSameHotRestartRequest(legacyIntent, input.intent)) {
|
|
await writeJsonFileAtomic(legacyPath, updated);
|
|
}
|
|
});
|
|
return updated;
|
|
}
|
|
|
|
export async function writeHotRestartReport(report: HotRestartReport, homeDir?: string) {
|
|
await writeJsonFileAtomic(resolveHotRestartReportPath(homeDir), report);
|
|
return report;
|
|
}
|
|
|
|
async function removeMatchingHotRestartIntent(filePath: string, expected?: HotRestartIntent) {
|
|
try {
|
|
if (expected) {
|
|
const current = await readHotRestartIntentAtPath(filePath);
|
|
if (!current || !isSameHotRestartRequest(current, expected)) return;
|
|
}
|
|
await fs.unlink(filePath);
|
|
} catch (error) {
|
|
if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error;
|
|
}
|
|
}
|
|
|
|
async function claimLegacyHotRestartIntent(filePath: string, intent: HotRestartIntent) {
|
|
try {
|
|
await writeJsonFileExclusiveAtomic(filePath, intent);
|
|
return;
|
|
} catch (error) {
|
|
if ((error as NodeJS.ErrnoException).code !== "EEXIST") throw error;
|
|
|
|
const existing = await readHotRestartIntentAtPath(filePath).catch(() => null);
|
|
if (
|
|
!existing
|
|
|| await isOriginalServerProcessAlive(existing, intent)
|
|
) {
|
|
throw error;
|
|
}
|
|
|
|
// An interrupted restart can leave the shared claim behind after its
|
|
// target server exits. Remove only that exact abandoned request, then
|
|
// compete normally for a fresh exclusive claim.
|
|
await removeMatchingHotRestartIntent(filePath, existing);
|
|
await writeJsonFileExclusiveAtomic(filePath, intent);
|
|
}
|
|
}
|
|
|
|
export async function removeHotRestartIntent(homeDir?: string, expected?: HotRestartIntent) {
|
|
const instancePath = resolveHotRestartIntentPath(homeDir);
|
|
await withHotRestartPathLock(
|
|
instancePath,
|
|
() => removeMatchingHotRestartIntent(instancePath, expected),
|
|
);
|
|
const legacyPath = resolveLegacyHotRestartIntentPath(homeDir);
|
|
await withHotRestartPathLock(
|
|
legacyPath,
|
|
() => removeMatchingHotRestartIntent(legacyPath, expected),
|
|
);
|
|
}
|
|
|
|
export function shouldHonorHotRestartIntentForProcess(
|
|
intent: HotRestartIntent,
|
|
pid = process.pid,
|
|
) {
|
|
return !intent.drainRequired && intent.previousServerPid === pid;
|
|
}
|