mirror of
https://github.com/stablyai/orca.git
synced 2026-10-31 00:57:45 +00:00
* build: share one pnpm virtual store across worktrees, off under CI
Each worktree carried a full node_modules; the global virtual store links
one slot per package version instead. pnpm keeps an explicit setting on
under CI, so a pnpmfile hook turns it off there: CI packages from,
caches and verifies a project-local node_modules.
* fix(build): keep shared electron and windows-process-tree dirs untouched under GVS
Every worktree runs Electron from the one shared electron package, so the
per-repo dist cache must not swap that dist and a foreign-arch install must
not land in it. The relay addon builder now repairs and compiles a private
copy instead of the shared windows-process-tree dir.
* fix(build): accept CLI runtime imports reached through an in-artifact store link
Under the global virtual store node_modules/<pkg> realpaths into a store
outside the repo. The check still rejects anything not reached through a
node_modules link inside the artifact, such as a stray ~/node_modules.
* docs: explain the global virtual store layout and the ~/node_modules hazard
* test: compare CLI closure paths with POSIX separators so the suite passes on Windows
* build: keep Windows on the normal pnpm layout unless ORCA_PNPM_GLOBAL_VIRTUAL_STORE=1
Store links are true symlinks on Windows, and installs without admin or
Developer Mode are unverified; CI still forces the normal layout first.
* fix(build): close the remaining shared-slot gaps under the global virtual store
- verify-skills-cli-runtime resolves each import from the importer's realpath,
as Node does, so an artifact-local copy can't mask a ~/node_modules load.
- A concurrent sibling install of the shared Electron dist is kept, not swapped out.
- rebuild:node goes through ensure-native-runtime, which builds a shared
node-pty beside the slot instead of node-gyp cleaning its build/ dir.
* fix(build): keep pnpm rebuild:node a forced rebuild
It replaced pnpm rebuild node-pty, which always rebuilt; without --force it
only rebuilt a node-pty that failed to load.
* docs: note that the store switches must stay set, since pnpm run relinks
* build: move the pnpmfile under config/ to keep the repo root allowlisted
pnpm-workspace.yaml points pnpm at it; the lockfile checksum is unchanged
because the content is.
* fix(build): enable the global virtual store from the pnpmfile, not the workspace file
pnpm exec derives NODE_PATH from the file setting, so even with the store
forced off under CI every child process got the root node_modules on its
NODE_PATH; a Windows rebuild fixture then resolved the real
@orca/windows-registry it deliberately omits. The hook now sets the store
both ways, and ORCA_PNPM_GLOBAL_VIRTUAL_STORE=0/1 is the one switch.
* test(pty): keep F3's concurrent spawns on the node-pty mock
Two concurrent first import('node-pty') calls race vitest's mock registry
and the loser loads the real addon under the mocked linux platform. It
passed only where a platform-agnostic build/Release happened to exist,
so it failed on every shared-store worktree.
* ci: fail PRs whose packages need a dependency they never declared
A new dependency_isolation job installs with the global virtual store
forced on (ORCA_PNPM_FORCE_GLOBAL_VIRTUAL_STORE_IN_CI), HOME and the store
in an empty temp dir, then runs pnpm tc and the undeclared-dependency test.
Postinstall now warns when a node_modules above the shared store, such as
~/node_modules, would mask the same class of bug locally.
* ci: set the isolation job's HOME and store through GITHUB_ENV
Job-level env cannot read the runner context, which made pr.yml invalid.
146 lines
5.4 KiB
JavaScript
146 lines
5.4 KiB
JavaScript
import { execFileSync } from 'node:child_process'
|
|
import { randomUUID } from 'node:crypto'
|
|
import { existsSync, lstatSync, mkdirSync, readFileSync, rmSync } from 'node:fs'
|
|
import path from 'node:path'
|
|
import { makeTreeReadOnly, shareTree } from './space-sharing-copy.mjs'
|
|
import { publishSharedTree, sharedTreeStagingPath } from './shared-tree-publish.mjs'
|
|
import { isSharedPackageDir } from './native-build-entry.cjs'
|
|
|
|
const IDENTITY_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]*$/
|
|
// Sibling of path.txt, never inside dist: an install replaces dist wholesale.
|
|
const MARKER_FILENAME = '.orca-shared-dist'
|
|
|
|
/**
|
|
* Where sibling worktrees of one repository keep their shared extracted Electron.
|
|
*
|
|
* Null means "install normally" -- every caller treats a missing entry as "do what you did before".
|
|
*/
|
|
export function resolveSharedElectronDistEntry(options) {
|
|
const { repoRoot, version, targetPlatform, targetArch } = options
|
|
const env = options.env ?? process.env
|
|
// Packaging jobs get a fresh checkout per run, so a cache only adds a failure mode.
|
|
if (env.CI === '1' || env.CI === 'true') {
|
|
return null
|
|
}
|
|
if (![version, targetPlatform, targetArch].every((part) => IDENTITY_PATTERN.test(part ?? ''))) {
|
|
return null
|
|
}
|
|
// Under pnpm's global virtual store every worktree already shares one electron package dir;
|
|
// adopting a cache entry would swap the dist out from under worktrees running it.
|
|
if ((options.isSharedPackageDir ?? isSharedPackageDir)(options.electronPackageDir, repoRoot)) {
|
|
return null
|
|
}
|
|
let gitCommonDir
|
|
try {
|
|
gitCommonDir = resolveGitCommonDir(repoRoot, options.execFile ?? execFileSync)
|
|
} catch {
|
|
return null // Folder workspace, or no Git on PATH.
|
|
}
|
|
const cacheRoot = path.join(gitCommonDir, 'orca-cache', 'electron')
|
|
return {
|
|
cacheRoot,
|
|
entryPath: path.join(cacheRoot, `${version}-${targetPlatform}-${targetArch}`),
|
|
markerPath: path.join(options.electronPackageDir, MARKER_FILENAME)
|
|
}
|
|
}
|
|
|
|
export function resolveGitCommonDir(repoRoot, execFile = execFileSync) {
|
|
const rawPath = execFile('git', ['-C', repoRoot, 'rev-parse', '--git-common-dir'], {
|
|
encoding: 'utf8',
|
|
stdio: ['ignore', 'pipe', 'ignore']
|
|
}).trim()
|
|
if (!rawPath) {
|
|
throw new Error('Git returned an empty common directory')
|
|
}
|
|
return path.resolve(repoRoot, rawPath)
|
|
}
|
|
|
|
/** True once this worktree's dist is already a clone of the current cache entry. */
|
|
export function hasAdoptedSharedElectronDist(entry) {
|
|
try {
|
|
return readFileSync(entry.markerPath, 'utf8') === path.basename(entry.entryPath)
|
|
} catch {
|
|
return false
|
|
}
|
|
}
|
|
|
|
export function recordAdoptedSharedElectronDist(entry, write) {
|
|
try {
|
|
write(entry.markerPath, path.basename(entry.entryPath))
|
|
} catch {
|
|
// The marker is only an optimization: a missing one costs one extra clone.
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Share a validated cache entry into `stagePath`. Deliberately never falls back to a byte copy --
|
|
* with no storage to share the caller is better off with its normal install, which this must not
|
|
* slow down.
|
|
*/
|
|
export function shareElectronDistFromCache(entry, stagePath, options) {
|
|
const { version, platformPath } = options
|
|
if (!isUsableElectronDist(entry.entryPath, version, platformPath)) {
|
|
return false
|
|
}
|
|
try {
|
|
;(options.share ?? shareTree)(entry.entryPath, stagePath)
|
|
} catch {
|
|
return false
|
|
}
|
|
return isUsableElectronDist(stagePath, version, platformPath)
|
|
}
|
|
|
|
/**
|
|
* Publish this worktree's dist as the shared entry, best effort.
|
|
*
|
|
* No lock: staging names are unique and `rename` onto a populated directory fails with ENOTEMPTY,
|
|
* so a concurrent publisher either wins the rename or cleans up its own staging tree. Neither can
|
|
* observe a half-written entry, and a usable entry already in place is never overwritten.
|
|
*/
|
|
export function publishSharedElectronDist(distPath, entry, options = {}) {
|
|
const { version, platformPath } = options
|
|
const uuid = options.uuid ?? randomUUID
|
|
const canValidate = Boolean(version) && Boolean(platformPath)
|
|
// Without an identity to check against, "unusable" is unknowable -- never discard on a guess.
|
|
if (existsSync(entry.entryPath) && (!canValidate || isUsable(entry, version, platformPath))) {
|
|
return false
|
|
}
|
|
|
|
const stagePath = sharedTreeStagingPath(entry.entryPath, uuid)
|
|
try {
|
|
mkdirSync(entry.cacheRoot, { recursive: true })
|
|
;(options.share ?? shareTree)(distPath, stagePath)
|
|
// Before publishing, not after: an entry is visible the instant the rename lands, and under
|
|
// hardlink sharing this is the only thing standing between a stray write and every worktree.
|
|
;(options.protect ?? makeTreeReadOnly)(stagePath)
|
|
} catch {
|
|
rmSync(stagePath, { recursive: true, force: true })
|
|
return false
|
|
}
|
|
|
|
// An entry we cannot judge counts as good: another worktree got there first, so keep theirs.
|
|
return publishSharedTree(stagePath, entry.entryPath, {
|
|
isUsable: () => !canValidate || isUsable(entry, version, platformPath),
|
|
uuid,
|
|
rename: options.rename
|
|
})
|
|
}
|
|
|
|
function isUsable(entry, version, platformPath) {
|
|
return isUsableElectronDist(entry.entryPath, version, platformPath)
|
|
}
|
|
|
|
export function isUsableElectronDist(distPath, version, platformPath) {
|
|
try {
|
|
if (!lstatSync(distPath).isDirectory()) {
|
|
return false
|
|
}
|
|
const installedVersion = readFileSync(path.join(distPath, 'version'), 'utf8')
|
|
.trim()
|
|
.replace(/^v/, '')
|
|
return installedVersion === version && existsSync(path.join(distPath, platformPath))
|
|
} catch {
|
|
return false
|
|
}
|
|
}
|