mirror of
https://github.com/wu736139669/hapi.git
synced 2026-11-07 01:21:37 +00:00
* fix(runner,hub): reap detached driver CLI on archive and tracking loss Archive always verifies via stopRunnerSession; runner stopSession scans argv orphans and awaits webhook-timeout tree-kill so PPID=1 children cannot accumulate after KillSession miss or map drop. Fixes #1910 Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli): keep --hapi-session-id reap-only; test orphan kill path Claude/cursor swallow the stamp without bootstrap reuse, and reapRunnerSpawnedOrphans is unit-tested as the stopSession map-miss path. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli,hub): address #1911 CI and bot Majors Use Vitest in orphanReap tests, add Pi session.on mock, refuse archive when machine StopSession is unreachable, trust full tree-kill results, and argv-sweep orphans after every mapped stop. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(runner): gate late-webhook kill on timeout orphans; fail closed on scan error Track webhook-timeout PIDs separately so recovered shared roots are not killed, and treat ps-list failures as still_alive rather than empty. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(runner): keep shared Codex wrapper alive when archiving one root StopSession must detach a single shared root without tree-killing the wrapper PID while sibling roots remain, including after KillSession has already marked the runtime inactive. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(runner): keep shared Codex siblings after restart tracking loss Before persisted-PID or argv orphan kills, consult the durable runtime registry for active sibling roots on the same wrapper PID so archiving one root after a runner restart cannot tree-kill live shared sessions. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(hub,cli): deliver hub-authored archive metadata to reconnecting CLIs When KillSession misses and archive is written via markSessionArchivedFromHub, emit Socket.IO update-session to the session room. On reconnect, ApiSessionClient reconciles GET /cli/sessions/:id metadata so hub-archived still fires. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(runner): argv-scan orphans even when shared siblings remain Remove session-wide early returns that skipped orphan reaping whenever any shared wrapper had active siblings. Keep only the PID-specific filter so older untracked CLIs with the same HAPI id are still reaped. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(runner): protect tracked shared wrappers when runtime registry is empty Argv orphan sweeps must exclude in-memory shared wrapper PIDs that still host sibling roots, not only durable registry siblings — otherwise a missing runtime record lets the sweep tree-kill the wrapper while archiving one root. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(runner): adopt untracked nonshared CLIs after runner restart When a runner-spawned Claude webhook arrives with no TrackedSession (typical after restart mid-bootstrap), durably adopt the PID instead of ignoring it so StopSession can reap. Keep killing only nonshared timeout orphans; never kill shared Codex wrappers on late webhooks. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(runner): keep recovered shared wrappers for registry siblings After restart adoption tracks only a newly reported Codex root, archiving it must consult the durable registry before tree-killing the wrapper PID so older active sibling roots survive. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(hub): do not archive on KillSession ack when StopSession is unknown KillSession returns before cleanupAndExit finishes. When the runner cannot find the PID (unknown), wait for the session KillSession handler to drop before archiving; refuse if the CLI socket remains reachable. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(hub,cli): confirm KillSession pid via StopSession before archive KillSession now returns the CLI pid. When session-id StopSession is unknown, archive confirms that OS pid (without treating socket loss as exit) and still refuses when confirmation stays unknown or still_alive. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(runner,hub): tree-kill adopted CLIs and require PID start markers Adopted post-restart runner sessions now use killProcessTreeByPid when no ChildProcess handle exists. KillSession carries a process-start marker so raw PID confirmation cannot tree-kill a reused OS pid. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(runner,hub): verify adopted PID markers and hub-archive after stop Adopted sessions compare the persisted start marker before tree-kill and drop stale tracking on mismatch. After confirmed StopSession, hub-authors archive metadata when the CLI did not finish its flush. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(runner): refuse unconfirmed shared/adopted stops Keep shared wrappers when siblings remain, but return unknown unless runtimeControl already ended the root. Adopted PIDs without a start marker no longer tree-kill by tracked PID alone. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(runner): require inactive binding before sibling-kept archive Siblings alone must not flip StopSession to stopped on retry, while an acknowledged inactive Codex registry binding remains stop proof. Handle PID- markers before any tracked kill so reuse cannot nuke strangers. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(runner): distinguish orphan reap from unknown keep-wrapper base Pass unknown into finishWithOrphanSweep so a successful argv reap stays stopped instead of being overwritten by an absent registry binding. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(runner): honor orphan reap when adopted PID lacks a start marker finishWithOrphanSweep with an unknown base lets a successful argv kill report stopped instead of forcing unknown after the marker probe fails. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(hub): confirm archive via metadata.hostPid tombstone When StopSession(sessionId) is unknown and KillSession supplies no confirmable pid+marker, probe PID-<metadata.hostPid>. already_gone allows archive; still_alive/unknown still refuse (#1911 Peer #1820). Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli): escalate Windows taskkill to /F like SIGTERM→SIGKILL Soft taskkill /T is refused on win32 console trees; orphanReap left orphans still_alive. waitForProcessToDie now force-escalates on both platforms so cross-platform reaping matches. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli): widen process.kill mock signal to string | number Match @types/node process.kill(pid, signal?: string | number) so the Windows taskkill escalation mocks typecheck on tip 54f141368. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli): tasklist liveness + immediate /F after soft taskkill refuse Windows orphan reap still failed in 5ms on Teemo: soft taskkill refused but escalate waited on an unreliable process.kill(0) probe. Prefer tasklist for win32 liveness and escalate to /F as soon as the PID is still live after soft kill. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli): coerce win32 ps-list PIDs and escalate soft taskkill to /F String PIDs from ps-list made Number.isFinite fail so orphan kill returned still_alive without calling taskkill. Coerce PIDs, prefer tasklist liveness, and escalate soft taskkill to /F like SIGTERM→SIGKILL. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli): Windows orphan scan via CIM CommandLine + taskkill /F escalate ps-list/fastlist is missing CommandLine and often missing from single-exe bundles, so Teemo orphan reap returned scan_failed (logged as live PIDs). List via Win32_Process CIM, coerce PIDs, escalate soft taskkill to /F. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli): grace-wait after successful soft taskkill before /F Escalate immediately only when soft taskkill is refused. When soft succeeds but the PID is still draining, honor the existing grace period before force (Codex Major on #1911). Co-authored-by: Cursor <cursoragent@cursor.com> * fix(runner): re-verify start marker before orphan argv tree-kill Capture getProcessStartMarker after the argv match list, re-check immediately before killTree, and skip on mismatch/null-while-alive so PID reuse cannot tree-kill an unrelated process on the orphan fallback. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(hub): preallocate HAPI id before fresh machine spawn Fresh POST /machines/:id/spawn omitted existingSessionId, so argv never got a reap stamp. Preallocate the hub row (fork/clear pattern) and pass that id so a runner restart before the first webhook remains reapeable. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli,hub): close three post-prealloc unreapable paths Pass --hapi-session-id into Claude/cursor/kimi/copilot bootstrap so the preallocated hub row is used. Treat null marker re-check while alive as still_alive (not stopped). Keep the preallocated stub when spawn-fail StopSession cannot confirm the child is gone. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli): adopt-stub via reservedSessionId, not existingSessionId `--hapi-session-id` binds a fresh create bootstrap to a hub-preallocated UUID (getOrCreateSession id) without taking the reopen path. Non-UUID stamps stay reap-only to match hub create schema. Restores integration spawn invariants broken by mapping hapi→existingSessionId. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli,hub): close Opus cold-read B1–B3 for #1911 B1: capture start markers from the same process snapshot as argv match (POSIX ps lstart / Win32 CreationDate); re-check before kill. Continue other orphans when one target is unconfirmed. B2: Windows killProcessTreeByPid verifies every collected descendant, not root-only — taskkill /T exit 0 is signalled, not gone. B3: runner sets childStarted:false on pre-exec rejection; hub deletes the preallocated stub without StopSession. Post-exec ambiguity still keeps the row until stop confirms. Terminal archives no longer refuse when no runner is connected. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli,hub): explicit adopt for hub-preallocated session stubs Fresh machine spawn preallocates with tag machine-spawn:<uuid>; CLI create with a different tag and the same id 409'd on identity conflict. Add adoptPreallocatedSession (hub-internal stub check) and POST /cli/sessions { adopt: true, id } so create binds the reserved row and overwrites tag/metadata without guessing the hub tag. Tests fail-first on the real prealloc→CLI create path. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli): preserve snapshot markers + unify Windows CIM start markers Runner stopSession was still on findOrphans (PID-only), discarding same-snapshot markers and reopening the PID-reuse kill window. Switch both call sites to findTargets. Force UTC ISO 'o' CreationDate for list and single-PID probe so ConvertTo-Json cannot disagree with getProcessStartMarker on WinPS 5.1. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli): exercise production orphan sweep wiring in tests Extract findStopSessionOrphanTargets as the stopSession discovery path both run.ts sweeps call. Add tests that drive that helper end-to-end (not an injected findOrphans seam), assert run.ts source wiring, and cover CIM-list ISO vs probe ISO agreement plus the broken WinPS shape mismatch. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(hub,cli): never delete live spawn on RPC timeout; release stub tags Ambiguous machine-spawn failures (timeout / unset childStarted) no longer call stopRunnerSession or deleteSession — that path killed healthy late boots and CASCADE-wiped transcripts. Pre-exec delete still requires a real machine-spawn stub (store tag check). Metadata updates release the stub tag so reopen flavors are not permanently adoptable; adopt refuses archived stubs. POSIX pgrep ENOENT fails closed instead of root-only verify. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli): parseable Windows tree scan + fail closed on CIM failure Space-joined PowerShell for collectWindowsProcessTree was a WinPS parse error ($seen=@{} $bfs=@()), so every scan fell open to [root] and B2 false-stopped again. Join with newlines; return scan_failed on error/empty; killProcessTreeByPid refuses root-only verify. Assert on generated command text (Teemo-confirmed) so mocks cannot hide the next malformed script. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli,hub): reopen stamps existing-session-id; scan-fail signals root Opus Critical on #1911: runner always stamps --existing-session-id for known hub ids so Claude/Kimi/Copilot reopen does not hit adopt-stub 409. On pgrep/CIM tree-scan failure still signal the verified root but never claim stopped. Archive when both KillSession and machine RPC are missing. Empty Win process-list stdout and strict Codex registry reads fail closed. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli,hub): OK: sentinel for Windows tree scan; adopt CAS CIM failure under SilentlyContinue printed root-only with exit 0 — byte-identical to a healthy childless tree, so scan_failed never fired and killProcessTreeByPid false-stopped (#1911 Overseer B1). Require ErrorActionPreference=Stop, trap exit 1, and an OK: success sentinel; parse anything else as scan_failed. Same Stop/trap on the machine-wide list command. Execute the generated scripts under Docker pwsh in CI when the image is present. Treat pgrep status=null as scan_failed; coarsen Windows tasklist poll; wrap adoptPreallocatedSession in a transaction with stub-tag CAS. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli,hub): reservedSessionId for fresh prealloc; signal Win survivors Fresh machine-spawn stubs must not stamp --existing-session-id — that sends Codex down reopen without a thread binding (#1911 bot Major) and re-broke local HTTP non-UUID hints as reopen (round-4). Hub passes prealloc as reservedSessionId; buildCliArgs stamps --hapi-session-id for reserved/sessionId and --existing-session-id only for live reopen. Codex parses --hapi-session-id and adopts via bootstrapSession. Windows tree kill now taskkills surviving pre-scan PIDs after /T misses broken intermediate links. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli,hub): fail-loud Docker pwsh CI; scope Codex registry; stub leak CI skipped all four windowsProcessTree.pwsh tests on 48bb (image inspect without pull). Pull the image in test.yml and throw under CI when missing. Scope strict runtime-registry failure to Codex stop contexts so one bad JSON cannot block archive machine-wide. Stamp childStarted:false on machine RPC outside_workspace_roots. Add Codex reservedSessionId prealloc and runSharedCodex regression coverage for the #1911 Critical. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli,hub): single-use reservedSessionId; skip UUID HTTP hints Consume the machine-spawn reservation on first prepare() so a second Codex root/fork cannot re-adopt a consumed stub (409). Stop stamping UUID local-HTTP sessionId as --hapi-session-id (adopt hard-fail). Update stale hub spawn mocks for the reservedSessionId arity. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(hub): archive never-started machine-spawn stubs on unknown Ambiguous keep-stubs (startedBy=runner, no hostPid, still machine-spawn tagged) made StopSession return unknown forever while the runner was online, so archive threw permanently. Treat unknown + prealloc stub + no hostPid as already_gone. Also reject spawn success when the runner reports a different id than the preallocated stub. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(hub,cli): refuse dual-RPC-miss archive; generation-check Win survivors Both KillSession and StopSession missing is not proof a detached CLI exited — keep the row unconfirmed until the runner reconnects. Windows tree kill now re-checks process-start markers before individually signalling survivors so PID reuse is not killed. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli): refuse archived reopen in bootstrapExistingSession Hub-archived rows could be resurrected when a late-booting child hit --existing-session-id: buildSessionMetadata stamped lifecycleState=running and updateMetadata overwrote the archive. Adopt already rejected archived stubs; reopen now matches. Intentional revive still goes through hub reopenSession first. Correct stub-hatch comment (no post-archive argv sweep). Co-authored-by: Cursor <cursoragent@cursor.com> * fix(hub,cli): reject un-archive in updateSessionMetadata CAS Hub-side transactional guard (Discovery #1911 M1): refuse metadata writes that clear archived lifecycle unless allowUnarchive (reopen clear). Client stops infinite updateMetadata backoff when mismatch applies archived. Clear archive immediately before spawn so Pi/PTY attempt snapshots stay valid. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(hub,cli): success+preserve hub archive; M3 reservedSessionId split Replace version-mismatch refuse (livelock in CAS backoff) with success + merge-preserve of hub-archived fields unless allowUnarchive. Ack path routes through noteHubArchived so the CLI exits (criterion 6). Clear- before-spawn remains the authorized revive. Thread --hapi-session-id to reservedSessionId for shared-parser flavors (adopt≠reopen). Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli): fail-closed orphan ps signal; PID- registry; spawn timeouts Overseer B1: signalled ps (status null) is scan_failed, not empty table. B2: unreadable registry on PID-* stops returns null (no soft []). B3: 10s timeout on process/orphanReap spawn.sync. Narrow bootstrap archived belt to archivedBy=hub to match hub merge-preserve. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli,hub): hubArchived latch; PTY archiveSnapshot durability Criterion 6: noteHubArchived latches hubArchived so late registerKillSessionHandler registrations still EXIT (EventEmitter does not replay). Mirror Pi: persist archiveSnapshot on ptyResumeAttempt across clear-before-spawn and quarantine, restore on failed-resume cleanup (#1911 Discovery Majors). Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli): Codex hub-archived exit; AC6 latch test production order C2: SharedCodexRoot registers hub-archived (and latch check) beside its private KillSession — Codex never called registerKillSessionHandler. C1: keep latch+subscribe; test write-then-register order Discovery proved. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli): type Codex hub-archived end mock for tsc vi.fn(async () => {}) inferred zero-arg calls; RootHost['end'] signature unblocks end.mock.calls[0][0] (TS2493). Co-authored-by: Cursor <cursoragent@cursor.com> * fix(cli): catch hub-archived Codex host.end rejection void this.host.end() discarded archive-RPC failures as unhandled rejections; Codex has no unhandledRejection handler, so Node can exit the shared wrapper and kill sibling roots mid-turn. Co-authored-by: Cursor <cursoragent@cursor.com> --------- Co-authored-by: Cursor <cursoragent@cursor.com>
344 lines
12 KiB
TypeScript
344 lines
12 KiB
TypeScript
/**
|
|
* HTTP client helpers for runner communication
|
|
* Used by CLI commands to interact with running runner
|
|
*/
|
|
|
|
import { logger } from '@/ui/logger';
|
|
import { clearRunnerState, readRunnerState, readSettings } from '@/persistence';
|
|
import { Metadata } from '@/api/types';
|
|
import packageJson from '../../package.json';
|
|
import { existsSync, statSync } from 'node:fs';
|
|
import { join } from 'node:path';
|
|
import { isBunCompiled, projectPath } from '@/projectPath';
|
|
import { isProcessAlive, getHapiRunnerProcessIdentity, killProcess } from '@/utils/process';
|
|
import { configuration } from '@/configuration';
|
|
import { hashRunnerCliApiToken, hashRunnerExtraHeaders, isRunnerStateCompatibleWithIdentity } from './runnerIdentity';
|
|
|
|
export function getInstalledCliMtimeMs(): number | undefined {
|
|
if (isBunCompiled()) {
|
|
try {
|
|
return statSync(process.execPath).mtimeMs;
|
|
} catch {
|
|
return undefined;
|
|
}
|
|
}
|
|
|
|
const packageJsonPath = join(projectPath(), 'package.json');
|
|
if (!existsSync(packageJsonPath)) {
|
|
return undefined;
|
|
}
|
|
|
|
try {
|
|
return statSync(packageJsonPath).mtimeMs;
|
|
} catch {
|
|
return undefined;
|
|
}
|
|
}
|
|
|
|
async function runnerPost(path: string, body?: any): Promise<{ error?: string } | any> {
|
|
const state = await readRunnerState();
|
|
if (!state?.httpPort) {
|
|
const errorMessage = 'No runner running, no state file found';
|
|
logger.debug(`[CONTROL CLIENT] ${errorMessage}`);
|
|
return {
|
|
error: errorMessage
|
|
};
|
|
}
|
|
|
|
if (!isProcessAlive(state.pid)) {
|
|
const errorMessage = 'Runner is not running, file is stale';
|
|
logger.debug(`[CONTROL CLIENT] ${errorMessage}`);
|
|
return {
|
|
error: errorMessage
|
|
};
|
|
}
|
|
|
|
try {
|
|
const timeout = process.env.HAPI_RUNNER_HTTP_TIMEOUT ? parseInt(process.env.HAPI_RUNNER_HTTP_TIMEOUT) : 10_000;
|
|
const response = await fetch(`http://127.0.0.1:${state.httpPort}${path}`, {
|
|
method: 'POST',
|
|
headers: { 'Content-Type': 'application/json' },
|
|
body: JSON.stringify(body || {}),
|
|
// Mostly increased for stress test
|
|
signal: AbortSignal.timeout(timeout)
|
|
});
|
|
|
|
if (!response.ok) {
|
|
const errorMessage = `Request failed: ${path}, HTTP ${response.status}`;
|
|
logger.debug(`[CONTROL CLIENT] ${errorMessage}`);
|
|
return {
|
|
error: errorMessage
|
|
};
|
|
}
|
|
|
|
return await response.json();
|
|
} catch (error) {
|
|
const errorMessage = `Request failed: ${path}, ${error instanceof Error ? error.message : 'Unknown error'}`;
|
|
logger.debug(`[CONTROL CLIENT] ${errorMessage}`);
|
|
return {
|
|
error: errorMessage
|
|
}
|
|
}
|
|
}
|
|
|
|
export async function notifyRunnerSessionStarted(
|
|
sessionId: string,
|
|
metadata: Metadata
|
|
): Promise<{ error?: string } | any> {
|
|
return await runnerPost('/session-started', {
|
|
sessionId,
|
|
metadata
|
|
});
|
|
}
|
|
|
|
export async function listRunnerSessions(): Promise<any[]> {
|
|
const result = await runnerPost('/list');
|
|
return result.children || [];
|
|
}
|
|
|
|
export async function stopRunnerSession(sessionId: string): Promise<'stopped' | 'already_gone' | 'still_alive' | 'unknown'> {
|
|
const result = await runnerPost('/stop-session', { sessionId });
|
|
return result.status === 'stopped' || result.status === 'already_gone' || result.status === 'still_alive' || result.status === 'unknown'
|
|
? result.status
|
|
: 'still_alive';
|
|
}
|
|
|
|
export async function spawnRunnerSession(directory: string, sessionId?: string): Promise<any> {
|
|
const result = await runnerPost('/spawn-session', { directory, sessionId });
|
|
return result;
|
|
}
|
|
|
|
export async function stopRunnerHttp(): Promise<void> {
|
|
await runnerPost('/stop');
|
|
}
|
|
|
|
/**
|
|
* The version check is still quite naive.
|
|
* For instance we are not handling the case where we upgraded hapi,
|
|
* the runner is still running, and it recieves a new message to spawn a new session.
|
|
* This is a tough case - we need to somehow figure out to restart ourselves,
|
|
* yet still handle the original request.
|
|
*
|
|
* Options:
|
|
* 1. Periodically check during the health checks whether our version is the same as CLIs version. If not - restart.
|
|
* 2. Wait for a command from the machine session, or any other signal to
|
|
* check for version & restart.
|
|
* a. Handle the request first
|
|
* b. Let the request fail, restart and rely on the client retrying the request
|
|
*
|
|
* I like option 1 a little better.
|
|
* Maybe we can ... wait for it ... have another runner to make sure
|
|
* our runner is always alive and running the latest version.
|
|
*
|
|
* That seems like an overkill and yet another process to manage - lets not do this :D
|
|
*
|
|
* TODO: This function should return a state object with
|
|
* clear state - if it is running / or errored out or something else.
|
|
* Not just a boolean.
|
|
*
|
|
* We can destructure the response on the caller for richer output.
|
|
* For instance when running `hapi runner status` we can show more information.
|
|
*/
|
|
export async function checkIfRunnerRunningAndCleanupStaleState(): Promise<boolean> {
|
|
const state = await readRunnerState();
|
|
if (!state) {
|
|
return false;
|
|
}
|
|
|
|
// Verify PID is alive AND belongs to hapi (not a reused PID from another process)
|
|
const identity = getHapiRunnerProcessIdentity(state.pid);
|
|
if (identity === 'runner') {
|
|
return true;
|
|
}
|
|
|
|
if (identity === 'unknown') {
|
|
// The pid is alive but unidentifiable. Reporting it as the runner would let
|
|
// callers signal a process that may not be ours, and clearing the state would
|
|
// drop the lock that keeps a second runner from starting. Do neither.
|
|
logger.debug('[RUNNER RUN] Runner PID could not be identified, leaving state untouched');
|
|
return false;
|
|
}
|
|
|
|
logger.debug('[RUNNER RUN] Runner PID not running or not a hapi process, cleaning up state');
|
|
await cleanupRunnerState();
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* Check if the running runner version matches the current CLI version.
|
|
* This should work from both the runner itself & a new CLI process.
|
|
* Works via the runner.state.json file.
|
|
*
|
|
* @returns true if versions match, false if versions differ or no runner running
|
|
*/
|
|
export async function isRunnerRunningCurrentlyInstalledHappyVersion(): Promise<boolean> {
|
|
logger.debug('[RUNNER CONTROL] Checking if runner is running same version');
|
|
const runningRunner = await checkIfRunnerRunningAndCleanupStaleState();
|
|
if (!runningRunner) {
|
|
logger.debug('[RUNNER CONTROL] No runner running, returning false');
|
|
return false;
|
|
}
|
|
|
|
const state = await readRunnerState();
|
|
if (!state) {
|
|
logger.debug('[RUNNER CONTROL] No runner state found, returning false');
|
|
return false;
|
|
}
|
|
|
|
const settings = await readSettings();
|
|
const currentApiUrl = process.env.HAPI_API_URL
|
|
|| settings.apiUrl
|
|
|| settings.serverUrl
|
|
|| configuration.apiUrl;
|
|
const currentCliApiToken = process.env.CLI_API_TOKEN
|
|
|| settings.cliApiToken
|
|
|| configuration.cliApiToken;
|
|
const currentMachineId = settings.machineId;
|
|
|
|
try {
|
|
// When HAPI_DISABLE_VERSION_HANDOFF=1 is set on the live runner (operator
|
|
// owns supervision via systemd/tmux/custom rebuild pipelines), a fresh CLI invocation must NOT
|
|
// treat the running runner as stale just because source mtimes shifted.
|
|
// Otherwise `hapi runner start` would kill the live runner mid-rebuild.
|
|
//
|
|
// Per Codex review #814 [Major]: the env var is commonly only set on the
|
|
// supervising service (systemd unit file), NOT on the operator's
|
|
// interactive shell. To honour the running runner's opt-out from any
|
|
// caller, OR the live env-var check with the persisted-at-start snapshot
|
|
// in state.startedWithVersionHandoffDisabled.
|
|
if (
|
|
process.env.HAPI_DISABLE_VERSION_HANDOFF === '1'
|
|
|| state.startedWithVersionHandoffDisabled === true
|
|
) {
|
|
logger.debug('[RUNNER CONTROL] Version handoff disabled (env or persisted state), skipping mtime/version drift check');
|
|
} else {
|
|
const currentCliMtimeMs = getInstalledCliMtimeMs();
|
|
if (typeof currentCliMtimeMs === 'number' && typeof state.startedWithCliMtimeMs === 'number') {
|
|
logger.debug(`[RUNNER CONTROL] Current CLI mtime: ${currentCliMtimeMs}, Runner started with mtime: ${state.startedWithCliMtimeMs}`);
|
|
if (currentCliMtimeMs !== state.startedWithCliMtimeMs) {
|
|
return false;
|
|
}
|
|
} else {
|
|
const currentCliVersion = packageJson.version;
|
|
logger.debug(`[RUNNER CONTROL] Current CLI version: ${currentCliVersion}, Runner started with version: ${state.startedWithCliVersion}`);
|
|
if (currentCliVersion !== state.startedWithCliVersion) {
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
|
|
const currentIdentityMatches = isRunnerStateCompatibleWithIdentity(state, {
|
|
apiUrl: currentApiUrl,
|
|
machineId: currentMachineId,
|
|
cliApiTokenHash: hashRunnerCliApiToken(currentCliApiToken),
|
|
extraHeadersHash: hashRunnerExtraHeaders(configuration.extraHeaders)
|
|
});
|
|
logger.debug(`[RUNNER CONTROL] Runner identity match: ${currentIdentityMatches}`, {
|
|
currentApiUrl,
|
|
currentMachineId,
|
|
runnerStartedWithApiUrl: state.startedWithApiUrl,
|
|
runnerStartedWithMachineId: state.startedWithMachineId
|
|
});
|
|
return currentIdentityMatches;
|
|
} catch (error) {
|
|
logger.debug('[RUNNER CONTROL] Error checking runner version', error);
|
|
return false;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Poll the runner state file waiting for a different PID to take ownership.
|
|
* Used by the self-restart handoff in run.ts so the dying runner does not exit
|
|
* until its replacement has actually come up and written its own state.
|
|
*
|
|
* Returns true when runner.state.json shows a different (and live) PID than
|
|
* `oldPid`, false on timeout.
|
|
*/
|
|
export async function waitForRunnerHandoff(
|
|
oldPid: number,
|
|
options: { timeoutMs?: number; pollIntervalMs?: number } = {}
|
|
): Promise<boolean> {
|
|
const timeoutMs = options.timeoutMs ?? 30_000;
|
|
const pollIntervalMs = options.pollIntervalMs ?? 500;
|
|
const deadline = Date.now() + timeoutMs;
|
|
|
|
while (Date.now() < deadline) {
|
|
try {
|
|
const state = await readRunnerState();
|
|
if (state && state.pid !== oldPid && isProcessAlive(state.pid)) {
|
|
logger.debug(`[RUNNER CONTROL] Handoff confirmed: new runner PID ${state.pid} replaced ${oldPid}`);
|
|
return true;
|
|
}
|
|
} catch (error) {
|
|
logger.debug('[RUNNER CONTROL] Error polling runner state during handoff wait', error);
|
|
}
|
|
await new Promise(resolve => setTimeout(resolve, pollIntervalMs));
|
|
}
|
|
logger.debug(`[RUNNER CONTROL] Handoff timeout: no replacement runner registered within ${timeoutMs}ms`);
|
|
return false;
|
|
}
|
|
|
|
export async function cleanupRunnerState(): Promise<void> {
|
|
try {
|
|
await clearRunnerState();
|
|
logger.debug('[RUNNER RUN] Runner state file removed');
|
|
} catch (error) {
|
|
logger.debug('[RUNNER RUN] Error cleaning up runner metadata', error);
|
|
}
|
|
}
|
|
|
|
export async function stopRunner() {
|
|
try {
|
|
const state = await readRunnerState();
|
|
if (!state) {
|
|
logger.debug('No runner state found');
|
|
return;
|
|
}
|
|
|
|
// Every stop is a signal to the persisted pid and port, so gate the whole
|
|
// sequence on a confirmed identity. Callers derive their decision from a
|
|
// boolean, and a pid we cannot identify may belong to an unrelated process
|
|
// that reused it, whose port may have been reused as well.
|
|
const identity = getHapiRunnerProcessIdentity(state.pid);
|
|
if (identity !== 'runner') {
|
|
logger.debug(`Not stopping PID ${state.pid}: identity is ${identity}`);
|
|
return;
|
|
}
|
|
|
|
logger.debug(`Stopping runner with PID ${state.pid}`);
|
|
|
|
// Try HTTP graceful stop
|
|
try {
|
|
await stopRunnerHttp();
|
|
|
|
// Wait for runner to die
|
|
await waitForProcessDeath(state.pid, 2000);
|
|
logger.debug('Runner stopped gracefully via HTTP');
|
|
return;
|
|
} catch (error) {
|
|
logger.debug('HTTP stop failed, will force kill', error);
|
|
}
|
|
|
|
const killed = await killProcess(state.pid, true);
|
|
if (killed) {
|
|
logger.debug('Force killed runner');
|
|
} else {
|
|
logger.debug('Runner already dead or could not be killed');
|
|
}
|
|
} catch (error) {
|
|
logger.debug('Error stopping runner', error);
|
|
}
|
|
}
|
|
|
|
async function waitForProcessDeath(pid: number, timeout: number): Promise<void> {
|
|
const start = Date.now();
|
|
while (Date.now() - start < timeout) {
|
|
if (isProcessAlive(pid)) {
|
|
await new Promise(resolve => setTimeout(resolve, 100));
|
|
continue;
|
|
}
|
|
return; // Process is dead
|
|
}
|
|
throw new Error('Process did not die within timeout');
|
|
}
|