mirror of
https://github.com/stablyai/orca.git
synced 2026-10-30 16:47:34 +00:00
* perf(claude): run the Windows Claude hook as a native orca-hook.exe
Each Claude hook event on Windows started cmd.exe (plus the user's cmd
AutoRun) and then curl.exe on top of the agent's own shell. A small signed
Rust binary now does the same synchronous POST in one process, under Git
Bash, PowerShell and direct CreateProcess alike.
- native/windows-agent-hook: std-only crate, same contract as the .cmd hook
(prints {}, env guards before stdin, endpoint re-read, 0.5s/1.5s caps,
waits for the listener reply, always exit 0). Its installed file name
selects the agent profile, so the registration stays a bare path.
- Packaged as resources/bin/orca-hook.exe (SignPath signs it with the other
inner PEs); afterPack fails on a missing or wrong-machine binary.
- Claude install copies it verbatim to ~/.orca/agent-hooks/claude-hook.exe
(temp + rename, running copy moved aside) and registers it; it falls back
to the .cmd hook when the bundle is missing, unsigned or cannot be copied.
Only Claude opts in, via windowsNativeHookExecutable.
- The managed-command matcher sweeps .exe entries alongside .cmd/.ps1/.sh.
- The CLI launcher and hook builds share windows-rust-executable-build.mjs,
which now also checks the PE machine.
Refs #20913
* fix(build): publish native Windows binaries atomically so parallel builds cannot collide
The Windows CI lane runs every orca-hook.exe suite in one vitest
invocation, each building through build-windows-agent-hook.mjs. The build
copied straight onto native/windows-agent-hook/.build/orca-hook.exe, and
CopyFile opens its destination unshared, so a second build (or a scanner
still holding the fresh image) failed with EBUSY.
- windows-rust-executable-build.mjs skips the publish when the output
already has the built bytes, otherwise stages a per-process temp file and
renames it over the output, retrying briefly while another handle holds it.
- The test fixture hands each suite a private copy of the build output, so
no suite reads or starts the shared file while another build replaces it.
Refs #20913
* refactor(claude): simplify the native Windows hook to one Claude binary
Review follow-up on the native hook (#20913): the same behaviour with less
machinery.
- The binary is built, shipped and installed as claude-hook.exe, so the
installed name matches its PE OriginalFilename. It is Claude-only, so the
file-name profile table and the per-agent opt-in flag are gone; the
registration is gated by the existing Claude-only usesWindowsEntry check.
- Install and refresh reuse writeManagedScript / refreshManagedScriptIfPresent
(now accepting bytes): temp file, rename, skip when identical. A copy whose
hook is still running cannot be replaced; install then registers the .cmd
hook and refresh keeps the old build until a later start, instead of the
rename-aside and *.retired sweep.
- The install-time Authenticode-presence check is dropped. Release CI now
requires resources\bin\claude-hook.exe to be signed (release-cut and the
signing rehearsal), next to resources\bin\orca.exe.
- getStatus counts either Windows form through findManagedEventHookForms in
hook-settings.ts, replacing managed-event-hook-status.ts.
- Rust: plain Claude constants, one endpoint-file lookup (last assignment
wins, as under `call`), one request write and a deadline-bounded drain.
Guard order and form encoding are unchanged.
- Build: PR CI builds the hook once before the Windows tests, so the suites
only read it; the launcher publish goes back to copyFileSync and the retry
loop and its test are gone. The PE-machine check lives only in afterPack.
Cargo.lock joins both crates' build fingerprints, and the launcher's alias
exports are removed.
Refs #20913
* test(ci): run the managed hook stdin-lifecycle suite in the Windows lane
Its claude-hook.exe case (and the other Windows-only cases) are gated per
test, so the lane-registration guard did not require the file and it ran
only on Linux, where those cases skip. Register it in both Windows lists.
Refs #20913
* feat(agent-hooks): ship the native hook as orca-agent-hook.exe <agent>
The native Windows hook (#20913) becomes one general binary that stays
Claude-only in behaviour.
- Named orca-agent-hook.exe everywhere: build output, PE OriginalFilename
and InternalName, resources\bin, the afterPack check, the installed copy
in ~/.orca/agent-hooks, and the release signed-target lists.
- It takes the agent as its first argument and Claude registers
`<path> claude`. The CLAUDE_JOB_DIR exit and the Grok/Devin drain belong
to that agent; an unknown or missing agent answers {} without reading
stdin. The managed-command matcher owns `orca-agent-hook.exe claude` and
still owns the old claude-hook.exe entry, so installs migrate; install
deletes a leftover claude-hook.exe when nothing runs it.
- A copy still running from the previous build no longer forces the .cmd
fallback. Identical bytes are not rewritten; otherwise the temp file is
renamed over the target, and when Windows refuses because the image is
mapped, the running copy is renamed to orca-agent-hook.exe.old first.
Install deletes a stale .old; only when that copy is also still running
does the install fall back to .cmd. writeManagedScript and
refreshManagedScriptIfPresent take the aside path, sharing one helper.
Refs #20913
* fix(agent-hooks): roll back a failed aside rename and keep an installed hook exe
Design-review follow-up on the native hook (#20913).
- If the running copy was moved to orca-agent-hook.exe.old but the new
file then could not take its name, the copy is renamed back before the
error is rethrown, so settings.json never points at a missing exe. The
rename helper now owns the `.old` name, next to the comment that
explains it; a mocked-fs unit test covers both the sync and async paths.
- A failed write, or a build with no bundled exe, keeps registering a copy
that is already installed (every build knows `claude`), so a dev checkout
and an installed build no longer flip settings.json between forms.
- The claude-hook.exe migration is gone: no release ever shipped that
name, so the legacy sweep, the `.exe` matcher needle and their test are
removed.
Refs #20913
* fix(agent-hooks): derive the native hook's agent with win32 path rules
getWindowsNativeHookAgent took the host's basename of the managed script
path, so on a POSIX host (Linux CI) a Windows path was not split and the
registered command became `orca-agent-hook.exe C:\...\claude`. It now takes
the path and applies path.win32.basename itself. The install destination
and the `.old` aside stay on host paths: they name files the host opens.
Refs #20913
---------
Co-authored-by: Orca Worker <orca-worker@localhost>
151 lines
4.9 KiB
JavaScript
151 lines
4.9 KiB
JavaScript
import { spawnSync } from 'node:child_process'
|
|
import { createHash } from 'node:crypto'
|
|
import { copyFileSync, existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
|
|
import { dirname, join } from 'node:path'
|
|
import { findDynamicVcRuntimeImports, readPeImportedDllNames } from './windows-pe-imports.mjs'
|
|
|
|
// Why explicit triples: both architectures cross-compile from one x64 runner.
|
|
const RUST_TARGETS = {
|
|
x64: 'x86_64-pc-windows-msvc',
|
|
arm64: 'aarch64-pc-windows-msvc'
|
|
}
|
|
|
|
export function windowsRustExecutableFingerprint(inputPaths, version) {
|
|
const hash = createHash('sha256').update(version)
|
|
for (const inputPath of inputPaths) {
|
|
hash.update('\0').update(readFileSync(inputPath))
|
|
}
|
|
return hash.digest('hex')
|
|
}
|
|
|
|
export function shouldReuseCompiledWindowsRustExecutable(outputPath, fingerprint) {
|
|
const fingerprintPath = `${outputPath}.sha256`
|
|
return (
|
|
existsSync(outputPath) &&
|
|
existsSync(fingerprintPath) &&
|
|
readFileSync(fingerprintPath, 'utf8') === fingerprint
|
|
)
|
|
}
|
|
|
|
/**
|
|
* The four-part numeric version Windows records in the PE. A prerelease suffix
|
|
* survives only in ProductVersion, which is a free-form string.
|
|
*/
|
|
export function windowsRustExecutableFileVersion(version) {
|
|
const match = /^(\d+)\.(\d+)\.(\d+)(?:-[0-9A-Za-z.-]+)?(?:\+[0-9A-Za-z.-]+)?$/.exec(version ?? '')
|
|
if (!match || match.slice(1).some((part) => Number(part) > 65534)) {
|
|
throw new Error(`Invalid Windows executable version: ${version}`)
|
|
}
|
|
return `${match.slice(1).join('.')}.0`
|
|
}
|
|
|
|
export function windowsRustExecutableTarget(arch) {
|
|
if (arch === undefined) {
|
|
return null
|
|
}
|
|
const target = RUST_TARGETS[arch]
|
|
if (!target) {
|
|
throw new Error(`Unsupported Windows executable architecture: ${arch}`)
|
|
}
|
|
return target
|
|
}
|
|
|
|
/**
|
|
* Compiles one std-only Windows binary crate with cargo, reusing a restored build
|
|
* whose inputs are unchanged, and refuses an output that needs the VC++
|
|
* Redistributable.
|
|
*/
|
|
export function compileWindowsRustExecutable({
|
|
repoRoot,
|
|
crateRoot,
|
|
binName,
|
|
label,
|
|
fingerprintInputs,
|
|
arch,
|
|
outputPath,
|
|
buildEnv
|
|
}) {
|
|
if (process.platform !== 'win32') {
|
|
// Why: electron-builder treats a skipped native build like success and can
|
|
// continue toward a Windows package whose declared binary does not exist.
|
|
throw new Error(`${label} compilation requires a Windows host; refusing to package without it.`)
|
|
}
|
|
const manifestPath = join(crateRoot, 'Cargo.toml')
|
|
const { version } = JSON.parse(readFileSync(join(repoRoot, 'package.json'), 'utf8'))
|
|
// Throws on a version the PE cannot represent, before anything is compiled.
|
|
windowsRustExecutableFileVersion(version)
|
|
const rustTarget = windowsRustExecutableTarget(arch)
|
|
const fingerprint = windowsRustExecutableFingerprint(
|
|
[
|
|
join(crateRoot, 'src', 'main.rs'),
|
|
join(crateRoot, 'build.rs'),
|
|
manifestPath,
|
|
join(crateRoot, 'Cargo.lock'),
|
|
join(crateRoot, 'app.manifest'),
|
|
join(crateRoot, '.cargo', 'config.toml'),
|
|
join(repoRoot, 'config/scripts/windows-rust-executable-build.mjs'),
|
|
...fingerprintInputs
|
|
],
|
|
rustTarget ? `${version}\0${rustTarget}` : version
|
|
)
|
|
|
|
mkdirSync(dirname(outputPath), { recursive: true })
|
|
if (shouldReuseCompiledWindowsRustExecutable(outputPath, fingerprint)) {
|
|
console.log(`[native-build] reusing ${label} at ${outputPath}`)
|
|
return
|
|
}
|
|
|
|
rmSync(`${outputPath}.sha256`, { force: true })
|
|
const targetDirectory = join(crateRoot, 'target')
|
|
const result = spawnSync(
|
|
'cargo',
|
|
[
|
|
'build',
|
|
'--release',
|
|
'--locked',
|
|
'--manifest-path',
|
|
manifestPath,
|
|
'--target-dir',
|
|
targetDirectory,
|
|
...(rustTarget ? ['--target', rustTarget] : [])
|
|
],
|
|
{
|
|
cwd: crateRoot,
|
|
stdio: 'inherit',
|
|
env: { ...process.env, ...buildEnv(version) }
|
|
}
|
|
)
|
|
|
|
if (result.signal) {
|
|
process.kill(process.pid, result.signal)
|
|
}
|
|
if (result.error) {
|
|
// Why named explicitly: a bare ENOENT here reads as a missing source file
|
|
// rather than a host without the toolchain the package needs.
|
|
throw new Error(
|
|
`Unable to run cargo for the ${label}: ${result.error.message}. Install Rust (https://rustup.rs) and retry.`
|
|
)
|
|
}
|
|
if (result.status !== 0) {
|
|
process.exit(result.status ?? 1)
|
|
}
|
|
|
|
const builtPath = join(
|
|
targetDirectory,
|
|
...(rustTarget ? [rustTarget] : []),
|
|
'release',
|
|
`${binName}.exe`
|
|
)
|
|
const vcRuntimeImports = findDynamicVcRuntimeImports(
|
|
readPeImportedDllNames(readFileSync(builtPath))
|
|
)
|
|
if (vcRuntimeImports.length > 0) {
|
|
// Why fatal: those DLLs ship with the Visual C++ Redistributable, so the binary would fail to start on a clean Windows install.
|
|
throw new Error(
|
|
`${binName}.exe imports ${vcRuntimeImports.join(', ')}; the C runtime must be linked statically (${join(crateRoot, '.cargo', 'config.toml')}).`
|
|
)
|
|
}
|
|
copyFileSync(builtPath, outputPath)
|
|
writeFileSync(`${outputPath}.sha256`, fingerprint)
|
|
}
|