mirror of
https://github.com/stablyai/orca.git
synced 2026-10-02 16:02:15 +00:00
* fix(ports): stop joining an undefined resourcesPath on a non-Electron host `resolveWorkerEntryPath` branched on `isPackaged` alone and joined `process.resourcesPath`. orcad reports `isPackaged` true — correctly, it is a production build, and ~15 consumers read it that way to gate HTTPS-only skill downloads and the real CLI name — but `process.resourcesPath` is Electron-only and `undefined` under plain Node. So the packaged branch threw `TypeError [ERR_INVALID_ARG_TYPE]: The "path" argument must be of type string` where a clean "worker unavailable" was the honest outcome. The type said `resourcesPath: string`, which is how it went unnoticed; it is now `string | undefined`, so the compiler carries the fact. A host with no Electron resources tree has no asar to look in, so it falls back to the module directory and lets the caller report a missing worker. Found by the item 1 agent while auditing the same `isPackaged` defect class in the watcher. Verified in both directions: reverting the guard reproduces the TypeError. * feat(orcad): prove node-pty loads before anything requires it Of the two ways node-pty fails, only one is catchable. A missing module throws MODULE_NOT_FOUND. A module built against the wrong libc or Node ABI is refused by the dynamic loader, and in the worst case takes the process down before any handler exists — that is #9902, which crashed the desktop app on Ubuntu 20.04 before a window appeared. There was no libc or ABI precondition anywhere in the tree. So orcad now proves the load in a CHILD process, from main.ts, before anything requires node-pty. Whatever the child does — throw, abort, die on a signal — is data rather than our own death, and the operator gets a sentence naming the host's libc, Node ABI and prebuild slot plus the command to run. Proven-unloadable exits 78 (EX_CONFIG), so a supervisor does not restart an unequippable host forever. A probe that never answered is unverifiable, not blocked: refusing to boot on an inconclusive signal would take down hosts that work. The child dlopens the file node-pty would have chosen, before requiring the package. node-pty's loader walks several directories and rethrows only the LAST error, so a refused binary reads as "Cannot find module ./prebuilds/..." — which sends the operator to install a module that is already there. It also reports through stdout: node echoes the whole -e source above a stack trace, and matching tokens against stderr made the probe's own source text answer for the verdict. Verdicts reach clients as a terminal_unavailable degradation alongside the existing browser_unavailable one, through the same cause-registry shape. degradations[].code is now an open vocabulary; clients already render only `message`. Prebuilds are compiled from PATCHED sources — the patch IS the glibc-floor fix, so an upstream tarball reproduces #9902 — into linux-{x64,arm64}-{glibc,musl} and darwin-{x64,arm64} slots. libc is in the slot name because node-pty's loader falls back to prebuilds/<platform>-<arch> and cannot tell glibc from musl. orcad installs the matching slot at boot, so a host with no compiler serves terminals. The relay's five pure toolchain-diagnosis functions moved to a transport-free module so the Node bundle can reuse them without dragging ssh2 in behind them; the relay keeps its API by re-export. macOS gets `xcode-select --install` rather than the cross-distro apt/dnf/pacman/apk menu, every line of which is wrong there. * test(orcad): pin the node-pty precondition to ground truth, not a prepared host CI's test shard runs `vitest` directly, so `ensure-native-runtime --runtime=node` never prepares node-pty for the Node ABI — `degraded` is the correct verdict there, and asserting 'ok' encoded an environment the shard does not have. Asserting whatever it returned would be vacuous, so the expectation is now derived from an independent require() of node-pty. Verified it still bites: forcing the precondition to always report 'ok' fails the suite. * feat(orcad): run the terminal daemon, and the ops contract around it orcad declared `canRecoverPersistentLocalPtys: () => false` because it did not run the terminal daemon, so every restart, update and rollback SIGKILLed every running terminal — on the host whose selling point is that work survives the client going away. That is the one property `ssh-execution-boundary.md` recommends the peer model for. Item 4 — the daemon: - Port the launch path off electron: `daemon-init.ts`, `daemon-host-relocation.ts` and `observability/logs-directory.ts` now read the `AppEnvironment` port. Relocation additionally asks whether the app root is an asar archive rather than whether the build is packaged, so a Node host answering `isPackaged() === true` no longer walks into an Electron-only NSIS-escape path (same precedent as `parcel-watcher-entry-path.ts`). - `build-orcad.mjs` emits `daemon-entry.js` beside `orcad.js`, scans the forked children's metafiles for electron/node:sqlite, and load-checks the child under plain Node. - orcad spawns and adopts the daemon; shutdown disconnects and never kills it. `canRecoverPersistentLocalPtys` now reads the live provider and is false under degraded routing, where fresh terminals would die with the process. Item 3 — the ops contract (docs/reference/orcad-operations.md): - Bind policy: `--bind`, default loopback, pinned so neither `orca serve`'s wide default nor the connected-device widen can override it, and so a paired client cannot rebind the listener from outside. - Instance lock on the data root before profile load, scoped to the runtime role so it never refuses a restart that a live daemon makes worthwhile. - Supervision: exit codes a supervisor can act on (78 = do not retry), second-signal escalation, a shutdown deadline, and crash-loop containment on daemon respawn. - Health in the readiness payload: build hash, Node ABI, and a PTY self-test that spans both processes — the daemon spawns a real PTY in its own process and the verdict crosses its socket. Both bundle load-checks now assert on exit codes: these bundles are minified onto one line, so Node's uncaught-exception report echoes every string literal in the bundle and the previous message match passed against a bundle that never loaded. * feat(orcad): deploy, activate and roll back a versioned orcad install Plan items 6 and 7 from docs/design/shipping-orcad.html. Install reuses the relay's transaction verbatim — per-version lock, staged SFTP write, .install-complete sentinel, stale-lock recovery — under a parameterized namespace, so orcad-<v>/ sits beside relay-<v>/ permanently (§06). Parameterizing GC is the trap that creates: each model now collects only its own directories, enforced twice (prefix-scoped remote listing plus a local ownership re-check), and a client picks its model from how the host is registered, never from what it finds on disk. Activation is separate from installation, because a versioned directory selects nothing. A candidate is launched, publishes orca_server_ready, and only becomes active if its cross-process health payload passes: right build hash, listening, daemon live, PTY self-test green. A rejected candidate is stopped and the incumbent restarted, so a careful deploy cannot cause the outage it was being careful about. Update and rollback are shaped by the daemon. An update restarts orcad, the daemon outlives it, and the surviving daemon was forked from the outgoing bundle — so live terminals defer the update rather than proceed, and GC pins the active version, the rollback target and the live daemon's bundle. Orca's persisted state carries no schema version, so rollback restores a pre-activation snapshot rather than trusting backward-readability; the point past which it is unsafe is the first terminal created after activation, which the snapshot cannot describe and the surviving daemon still owns. Running the generated shell for real found two bugs the text assertions missed: tar members re-quoted inside a shell variable captured nothing, and kill -0 reports a zombie as alive. * test(orcad): assert the precondition is self-consistent, not environment-shaped The real-host case cannot predict a status: CI's shard runs vitest directly, so node-pty is never built for the Node ABI and 'degraded' is correct there, while a prepared checkout gives 'ok'. The previous attempt used require('node-pty') as ground truth, which resolves the JS wrapper while the native binding loads lazily — it proved strictly less than the precondition checks, and failed CI for exactly that reason. What is invariant on a host with node-pty installed: never 'blocked', and never a degraded verdict carrying an unestablished reason. The injected-input tests keep the logic coverage. * fix(orcad): drop an eslint-disable the rule no longer needs * test(orcad): separate slot placement from the load verdict Both remaining CI failures were the same shape: tests reaching into node_modules for a pty.node that only exists after `ensure-native-runtime --runtime=node`, which CI's shard never runs because it invokes vitest directly. Slot *placement* is the logic worth checking on every host, so it now uses a synthetic payload and asserts the verdict stays honest about not loading. The three assertions that genuinely need a Node-ABI binding are gated on it existing. Verified: breaking slot installation fails both placement tests; with the real pty.node hidden the file is 17 passed / 3 skipped instead of ENOENT. * test(orcad): gate the load-dependent cases on a real load, not on the file existing CI ships a pty.node built for Electron's ABI, so existsSync was true while require still failed — the gate ran exactly the tests that host can never satisfy. It now probes the binding in a child process, so a bad one cannot take the runner down. The self-consistency assertion also allowed too little: 'blocked' is the honest verdict for a corrupt binding, alongside 'ok' on a prepared host and 'degraded' on an unprepared one. What stays invariant is that anything other than 'ok' names an established cause, so a terminal is never declined for a reason nobody worked out. Verified against all three host states: prepared (19 passed), unprepared, and a corrupt binding (17 passed / 3 skipped, no failures). * test(orcad): gate on the whole premise — binding AND spawn-helper CI has a loadable pty.node but no spawn-helper, and a slot without the helper is legitimately 'degraded'. So the previous gate let a test run whose premise ('a complete slot yields ok') that host cannot satisfy. Verified in both states: with the helper present 19 pass; with it removed the load-dependent cases skip (17 passed / 3 skipped) instead of failing. * fix(orcad): preserve degradation types after rebase
144 lines
5.8 KiB
TypeScript
144 lines
5.8 KiB
TypeScript
/**
|
|
* The two things Orca installs into `~/.orca-remote/`, and the rules that keep them from
|
|
* touching each other.
|
|
*
|
|
* `docs/design/shipping-orcad.html` §06 settles that on-disk coexistence is permanent: the
|
|
* relay is the dumb execution host for SSH-target users, orcad is the peer for paired
|
|
* environments, and no plan item retires either. So `relay-<version>/` and `orcad-<version>/`
|
|
* sit side by side forever, and the namespace has to be a parameter rather than a literal.
|
|
*
|
|
* GC ownership is the trap that parameterization creates. Each model garbage-collects ONLY
|
|
* its own directories — see `remoteInstallDirOwner`. Relay's regex happened to be narrow
|
|
* enough already; making the prefix a parameter is exactly what could have widened it into
|
|
* deleting a live orcad tree, so the ownership rule is asserted here rather than left to
|
|
* whichever regex a caller passes.
|
|
*/
|
|
import {
|
|
relayArtifactFilenames,
|
|
RELAY_INSTALL_COMPLETE_FILENAME,
|
|
RELAY_VERSION_FILENAME
|
|
} from '../../shared/relay-artifacts'
|
|
import {
|
|
orcadArtifactFilenames,
|
|
ORCAD_INSTALL_COMPLETE_FILENAME,
|
|
ORCAD_VERSION_FILENAME
|
|
} from '../../shared/orcad-artifacts'
|
|
|
|
export type RemoteInstallModelId = 'relay' | 'orcad'
|
|
|
|
export type RemoteInstallModel = {
|
|
readonly id: RemoteInstallModelId
|
|
/** Leading segment of every version dir: `<dirPrefix>-<fullVersion>`. */
|
|
readonly dirPrefix: string
|
|
/** npm package name written into the remote `package.json` for native deps. */
|
|
readonly nativeDepsPackageName: string
|
|
readonly versionFilename: string
|
|
readonly installCompleteFilename: string
|
|
/** Files whose absence means a torn install, so the probe forces a re-deploy. */
|
|
requiredArtifacts(isWindows: boolean): string[]
|
|
}
|
|
|
|
export const RELAY_INSTALL_MODEL: RemoteInstallModel = {
|
|
id: 'relay',
|
|
dirPrefix: 'relay',
|
|
nativeDepsPackageName: 'orca-relay',
|
|
versionFilename: RELAY_VERSION_FILENAME,
|
|
installCompleteFilename: RELAY_INSTALL_COMPLETE_FILENAME,
|
|
requiredArtifacts: (isWindows) => relayArtifactFilenames(isWindows)
|
|
}
|
|
|
|
export const ORCAD_INSTALL_MODEL: RemoteInstallModel = {
|
|
id: 'orcad',
|
|
dirPrefix: 'orcad',
|
|
nativeDepsPackageName: 'orca-orcad',
|
|
versionFilename: ORCAD_VERSION_FILENAME,
|
|
installCompleteFilename: ORCAD_INSTALL_COMPLETE_FILENAME,
|
|
// Why the parameter is ignored: orcad's forked children are the same three .js files on
|
|
// every host. The Windows-only console-list agent patch is a relay/node-pty concern.
|
|
requiredArtifacts: () => orcadArtifactFilenames()
|
|
}
|
|
|
|
export const REMOTE_INSTALL_MODELS: readonly RemoteInstallModel[] = [
|
|
RELAY_INSTALL_MODEL,
|
|
ORCAD_INSTALL_MODEL
|
|
]
|
|
|
|
/**
|
|
* The version half of a directory name, shared by both models.
|
|
*
|
|
* Why `[0-9]` and not `\d`: this exact source string is also embedded in an awk ERE and a
|
|
* PowerShell `-match` on the remote host. Those three dialects agree on `[0-9]`, `\.` and
|
|
* `\+`; only JavaScript understands `\d`.
|
|
*/
|
|
const VERSION_PATTERN = String.raw`v?[0-9]+\.[0-9]+\.[0-9]+(\+[0-9a-f]+)?`
|
|
|
|
/** Suffix GC leaves behind mid-delete; the listing must surface these so they can be swept. */
|
|
const TOMBSTONE_PATTERN = String.raw`\.gc-tombstone\.[0-9]+\.[0-9]+`
|
|
|
|
/**
|
|
* Why validated and not merely typed: the prefix is interpolated into a remote `find -name`
|
|
* glob, an awk regex and a single-quoted PowerShell literal. A quote or a metacharacter
|
|
* here would be a remote-shell injection on the client's own connection.
|
|
*/
|
|
function assertSafeDirPrefix(dirPrefix: string): void {
|
|
if (!/^[a-z][a-z0-9-]*$/.test(dirPrefix)) {
|
|
throw new Error(`Unsafe remote install dir prefix: ${JSON.stringify(dirPrefix)}`)
|
|
}
|
|
}
|
|
|
|
export function remoteInstallDirName(model: RemoteInstallModel, fullVersion: string): string {
|
|
assertSafeDirPrefix(model.dirPrefix)
|
|
return `${model.dirPrefix}-${fullVersion}`
|
|
}
|
|
|
|
/** Matches a live version dir for exactly one model — never a tombstone, never a sibling model. */
|
|
export function remoteInstallVersionDirRegex(model: RemoteInstallModel): RegExp {
|
|
assertSafeDirPrefix(model.dirPrefix)
|
|
return new RegExp(`^${model.dirPrefix}-(${VERSION_PATTERN})$`)
|
|
}
|
|
|
|
/** What the remote listing is allowed to return: live dirs plus their tombstones. */
|
|
export function remoteInstallListingRegexSource(model: RemoteInstallModel): string {
|
|
assertSafeDirPrefix(model.dirPrefix)
|
|
return `^${model.dirPrefix}-(${VERSION_PATTERN})(${TOMBSTONE_PATTERN})?$`
|
|
}
|
|
|
|
/**
|
|
* Which model owns a directory found in `~/.orca-remote/`, or null for anything neither
|
|
* model created.
|
|
*
|
|
* This is the answer to §06 falsifier 1's first half: **the model that created a directory
|
|
* owns it, and nothing else may delete it.** A relay GC pass that saw `orcad-0.1.0+abc`
|
|
* would be looking at the live install of a peer whose lifecycle it has no view into — the
|
|
* SSH-execution-boundary collapse in directory form.
|
|
*/
|
|
export function remoteInstallDirOwner(dirName: string): RemoteInstallModelId | null {
|
|
for (const model of REMOTE_INSTALL_MODELS) {
|
|
if (new RegExp(remoteInstallListingRegexSource(model)).test(dirName)) {
|
|
return model.id
|
|
}
|
|
}
|
|
return null
|
|
}
|
|
|
|
/** True when `model` is allowed to garbage-collect `dirName`. */
|
|
export function remoteInstallGcPermits(model: RemoteInstallModel, dirName: string): boolean {
|
|
return remoteInstallDirOwner(dirName) === model.id
|
|
}
|
|
|
|
export type RemoteInstallInventory = Record<RemoteInstallModelId | 'unknown', string[]>
|
|
|
|
/** Group a raw `~/.orca-remote/` listing by owning model, for diagnostics and the client's choice. */
|
|
export function inventoryRemoteInstallDirs(dirNames: readonly string[]): RemoteInstallInventory {
|
|
const inventory: RemoteInstallInventory = { relay: [], orcad: [], unknown: [] }
|
|
for (const name of dirNames) {
|
|
const owner = remoteInstallDirOwner(name)
|
|
if (owner) {
|
|
inventory[owner].push(name)
|
|
} else {
|
|
inventory.unknown.push(name)
|
|
}
|
|
}
|
|
return inventory
|
|
}
|