mirror of
https://github.com/stablyai/orca.git
synced 2026-10-30 16:47:34 +00:00
Brennan Benson
0504670961
* fix: refresh host environments before structured agent command resolution * fix: ship the owning server CLI for managed remote agents * test: include the shipped CLI in remote install fixtures * Bind packaged agent CLI calls to their execution host * Keep owning-server CLI binding scoped to managed agents * Serve the last shell environment to chat starts and refresh it in the background Only the first chat start waits for the login shell; later starts get the last snapshot and refresh it in the background once it is 10 s old. On Windows hosts without the registry addon (managed server slots), the saved PATH is reread with reg.exe. The Windows server CLI launcher stager now checks the target architecture, and the CLI help says ambient selectors are ignored inside a managed server. * Keep the last good shell environment when a refresh fails, and load the Windows profile once A login-shell capture now says whether the shell produced the env or Orca fell back to its own, and only a real capture replaces the snapshot. Windows loads the PowerShell profile once per process and refreshes only the saved PATH. The reg.exe fallback queries the whole key so a missing user Path no longer drops the saved PATH. The first capture starts when the resolvers are created. * Keep the last good login-shell env for other readers while a forced refresh runs * Mark the Claude launch resolver as a reviewed router-aware module It only types the chat command resolver it injects; main's launch-routing guard (#26801) matched the name. * Keep a settled login-shell env for readers during a refresh and share the first run - Any settled cached entry, a fallback included, now serves other readers while a forced capture runs; only a real capture replaces it. - Native chat's first capture shares a run a startup reader already began, so the login shell runs once per process at startup on macOS/Linux. - Type the injected Claude resolver without naming resolveClaudeCommand. - Cover the runtime's Claude command options, the owning-host --host check, and the PTY flag drop. * Drop an inherited owning-host flag from daemon terminal panes The persistent terminal daemon merges its own environment into every pane, so an inherited ORCA_CLI_OWNING_HOST reached desktop panes even though main strips it from the spawn env. Drop it with the other per-launch CLI variables. * Route agents to their own server through ordinary launch defaults; start the first chat after an install The native-chat agent environment now sets the owning server's ORCA_USER_DATA_PATH and empty ORCA_ENVIRONMENT / ORCA_PAIRING_CODE / ORCA_REMOTE_PAIRING, which the CLI already reads as unset; empty rather than deleted, because the spawn merges the launch overlay over the server's own env. The ORCA_CLI_OWNING_HOST flag, the CLI's skip of ambient selectors, the launchers' export of it, the terminal clean-up, the help-text exception and the WSL launcher guard are gone, so a person's terminal follows their own settings as on main. A launch that finds no program in the shell snapshot waits for one shared refresh (at most one shell timeout) and resolves again; create support rereads the shell once before refusing. On Windows a failed PowerShell profile load is retried on the next refresh instead of being kept until restart. * One shared shell reread when an agent's program is missing The pre-create check for OpenCode, OMP and Pi forced its own login-shell capture on every refusal: not shared with launches, one per concurrent check, triggered by an installed-but-too-old version too, and an older capture finishing last could overwrite a newer cached environment. On Windows, every launch miss also reran a failed PowerShell profile load, bypassing the 10-second limit. - One saved shell environment per host: chat launches, their misses, the pre-create check and AI commit messages read it and share one refresh. - The pre-create check resolves the agent's program the way a launch does, so only a missing program waits for the refresh; registrations declare how to resolve their launch and check its version. - A forced login-shell capture joins one already running for the same shell, so captures cannot land out of order. - On Windows, a miss within 10 s of a failed PowerShell load rereads only the saved PATH. * One owner for the cached shell environment Review found two more races in the reread-on-miss machinery, both from the host wrapper keeping its own snapshot beside the login-shell cache: - A launch that found no program could join a reread that started before the agent was installed, and spend its one retry on the old PATH. - On Windows, saved-PATH rereads renewed the snapshot's age, so a failed PowerShell profile was never retried while launches kept missing. The login-shell cache is now the only owner of the captured environment, the run in progress and which result wins (the newest run started; a fallback never replaces a captured env). It takes three options instead of `force`: - startedAfter: a lookup that found nothing waits for a run that started no earlier than the lookup did, joining one if it has, else starting one. - refreshAfterMs: serve the last result and rerun in the background once the last attempt is older. - keepCaptured: a captured env is kept for good; only a fallback is rerun (Windows' PowerShell profile). The host wrapper keeps only policy: the 10 s interval, on Windows the saved PATH laid over the profile env on every read (a miss forces a fresh registry read), and the settings overlays. Its snapshot, pending promise, staleness and Windows "loaded" bookkeeping are gone. A lookup's start time travels with the miss (resolveAgainAfterRefreshOnMissingProgram passes it). * Read an injected shell environment once per runtime, as main does The previous commit read an injected environment on every acquisition, which broke main's 'caches shell exports but re-reads configured overrides for a resume' contract. It is read once when the resolvers are made again. * Model lists reread the environment on a missing program, as launches do Live QA: the first new chat after installing Claude showed "Claude wasn't found on the computer running this chat". The chat launch itself reread the login shell and started the new binary, but Claude's model-list check ran first, with the environment read before the install, and never retried: catalog probes were deliberately built without the miss refresh. The retry now lives in each agent's one shared lookup of its binary and environment, which a launch and a model listing both call: resolveCodexStructuredInvocation, resolveAcpLaunchInvocation, a new shared resolvePiRpcInvocation, and resolveClaudeChildEnvSources (which already had it). Each catalog probe is given the runtime's refreshAfterMissingProgram, and the catalog context no longer strips it, so a listing and a launch reread the same single-owner environment the same way. * Pass optional launch lookups through directly instead of conditional spreads * Read the host shell env through resolveLoginShellEnvironment; drop the extra wait cap CI on the merge with main failed main's new codex-workspace-relative-path test (#26684), which mocks the login-shell module with only resolveLoginShellEnvironment: the wrapper called captureLoginShellEnvironment and imported the spawn-timeout constant. The wrapper only needs the env, so it reads through resolveLoginShellEnvironment again, as on main. The miss wait no longer races its own 5 s timer: the shell run it waits for is already killed at the spawn timeout, so the second cap was a guard over the same bound. The constant goes back to private, as on main. * Test that a hung login shell holds a launch miss for at most one shell timeout The bound lives in the one owner: the shell run is killed at the spawn timeout (5 s) and settles to a fallback, which never replaces a captured snapshot. A mutation raising that timeout fails this test. * A program found through a relative PATH entry is not missing Main's #26684 runs Codex through a workspace-relative PATH entry (`bin`, `node_modules/.bin`). The lookup searches such an entry against Orca's own directory and returns the bare name; the spawn then finds the program in the chat's directory. Counting that bare name as missing made every such launch wait for a login-shell reread. The retry now fires only when the lookup truly found nothing: a bare name back from a PATH whose entries are all absolute. Each agent's one lookup tells it which PATH it searched. * Count a relative PATH entry as found only when it holds the program; Windows miss waits for a saved PATH read started after it looked A bare name with a relative PATH entry is checked from the launch's working directory, so an agent in neither entry still gets its one reread. On Windows the miss no longer joins a registry read that began before the lookup.
56 lines
2.6 KiB
JavaScript
56 lines
2.6 KiB
JavaScript
/** Mirrors ORCA_REQUIRED_TEST_INPUTS_ENV in src/main/orcad/orcad-node-slot-fixture.ts. */
|
|
export const REQUIRED_TEST_INPUTS_ENV = 'ORCA_REQUIRED_TEST_INPUTS'
|
|
|
|
// Need the pinned Bun and the last Bun orcad slot beside the built Node slot (design D7).
|
|
export const CROSS_RUNTIME_TEST_PATHS = [
|
|
'src/main/orcad/orcad-cross-runtime-daemon-adoption.integration.test.ts',
|
|
'src/main/persistence/profile-state/profile-state-cross-runtime.integration.test.ts'
|
|
]
|
|
|
|
// Need the built desktop server template; CI runs them by path after build-orcad-template.mjs.
|
|
export const TEMPLATE_TEST_PATHS = [
|
|
'src/main/orcad/orcad-packaged-structured-chat.integration.test.ts'
|
|
]
|
|
|
|
export function nodeServerTestPaths({
|
|
artifact = false,
|
|
crossRuntime = false,
|
|
template = false
|
|
} = {}) {
|
|
return [
|
|
'src/main/persistence/profile-state',
|
|
'src/main/persistence/loading-store/profile-state',
|
|
'src/main/sqlite',
|
|
'src/main/orcad/orcad-entry.test.ts',
|
|
'src/main/orcad/orcad-push-startup.test.ts',
|
|
// The orcad server's identity and stop path, which Windows SSH hosts rely on (W2).
|
|
'src/main/orcad/orcad-instance-lock.test.ts',
|
|
'src/main/orcad/orcad-process-start-time.test.ts',
|
|
'src/main/orcad/orcad-stop-request-listener.test.ts',
|
|
'src/main/orcad/orcad-managed-stop.test.ts',
|
|
'src/main/orcad/orcad-managed-stop-cancellation.test.ts',
|
|
// The directory, not a prefix: its siblings are POSIX-host unit tests pr.yml already runs.
|
|
'src/main/daemon/pty-subprocess/',
|
|
'src/main/daemon/pty-subprocess-spawn-file-foreground.test.ts',
|
|
'src/main/daemon/pty-subprocess-io-failure-native.test.ts',
|
|
...(artifact
|
|
? [
|
|
'tests/e2e/daemon-running-work-probe.unit.test.ts',
|
|
'src/shared/pty-running-work-probe.test.ts',
|
|
'src/main/orcad/orcad-packaged-node-pty.integration.test.ts',
|
|
'src/main/providers/agent-foreground-process-git-bash.win32.test.ts',
|
|
'src/main/orcad/orcad-node-launcher.integration.test.ts',
|
|
'src/main/orcad/orcad-cli-launcher.integration.test.ts',
|
|
'src/main/orcad/orcad-cli-orchestration.integration.test.ts',
|
|
'src/main/orcad/orcad-launcher-isolation.integration.test.ts',
|
|
'src/main/orcad/orcad-stop-request-shutdown.integration.test.ts',
|
|
'src/main/orcad/orcad-windows-conpty-breakaway.integration.test.ts',
|
|
'src/main/orcad/orcad-serve-parity.integration.test.ts',
|
|
'config/scripts/zip-extractor-command.test.mjs'
|
|
]
|
|
: []),
|
|
...(crossRuntime ? CROSS_RUNTIME_TEST_PATHS : []),
|
|
...(template ? TEMPLATE_TEST_PATHS : [])
|
|
]
|
|
}
|