Files
orca/src/main/runtime/runtime-git-target-execution-host.test.ts
T
Neil d5750648c2 fix(runtime): route runtime Git by resolved execution host, not repo connectionId (#18307)
`RuntimeGitTarget` carried `connectionId?: string` and no host id, so `undefined`
spelled three different answers at once — "runtime: host", "unresolved", and
"genuinely local". Its sole resolver read `store.getRepo(worktree.repoId)?.connectionId`
and never looked at `worktree.hostId`, which outranks every repo row, so one
arbitrarily chosen row decided the execution host for 36 downstream dispatches.

The target now carries `executionHostId: ExecutionHostId` (never null, never
optional), resolved through the shared rule that landed with #17909/#17919 and
dispatched through the host-keyed routes from #18296. Dispatch sites call
`requireRuntimeGitProvider`, where `null` means exactly one thing: the host is
`local` and the command runs here as free functions.

Four answers that used to collapse into one:

- `ssh:x` with a rival row on `ssh:y` — routes to x. Previously the first row won,
  which is the reproduced cross-host leak.
- `local` with a surviving `connectionId` — a row contradicting itself; no SSH
  connection is handed out.
- `runtime:<env>` — throws `ExecutionHostNotDispatchableError`. Its repo row's
  connection names a target in the *server's* namespace; dialling it here reaches a
  same-named target on this client.
- rival rows disagreeing with no worktree host — `worktree_execution_host_unresolved`,
  matching the launch path rather than guessing a row.

An unreachable SSH host still throws `SSH_GIT_PROVIDER_UNAVAILABLE_MESSAGE`; loss of
contact is never evidence of locality (docs/reference/ssh-execution-boundary.md).

`resolveWorktreeLaunchHost` keeps its exact signature and now delegates to
`resolveWorktreeHostRouting`, the same resolution answering "which host is this on"
rather than "what may this client dial" — the git target needs the first question
because `local` and `runtime:` are two different non-SSH answers.

No wire change: `RuntimeGitTarget` is main-process internal, and the SSH and local
model-discovery host keys are byte-identical to before.

`RuntimeFileTarget` has the same defect in ~30 filesystem dispatches and is
deliberately left for a follow-up.
2026-09-02 19:26:07 -07:00

206 lines
7.2 KiB
TypeScript

// `resolveRuntimeGitTarget` read `store.getRepo(worktree.repoId)?.connectionId` and never looked at
// `worktree.hostId`, so one arbitrarily chosen row decided the execution host for ~36 downstream
// Git dispatches. `undefined` there meant "runtime host", "unresolved" and "genuinely local" at
// once (#11163). These cases pin all four answers end to end, through the real SSH provider table.
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
vi.mock('electron', () => ({
BrowserWindow: { fromId: vi.fn(() => null) },
webContents: { fromId: vi.fn(() => null) },
ipcMain: { on: vi.fn(), removeListener: vi.fn() },
app: { getPath: vi.fn(() => '/tmp'), isPackaged: false }
}))
import type * as GitStatusModule from '../git/status'
const mocks = vi.hoisted(() => ({ getStatus: vi.fn() }))
vi.mock('../git/status', async () => ({
...(await vi.importActual<typeof GitStatusModule>('../git/status')),
getStatus: mocks.getStatus
}))
import { ExecutionHostNotDispatchableError } from '../providers/execution-host-provider-dispatch'
import { registerSshGitProvider, unregisterSshGitProvider } from '../providers/ssh-git-dispatch'
import { OrcaRuntimeService } from './orca-runtime'
const REMOTE_PATH = '/srv/app-feature'
const WORKTREE_ID = 'repo-shared::/srv/app-feature'
type RuntimeInternals = {
resolveWorktreeSelector: (selector: string) => Promise<unknown>
}
function makeRuntime(repos: readonly Record<string, unknown>[], hostId?: string) {
const store = {
getSettings: () => ({ disabledTuiAgents: [], workspaceDir: '/tmp/workspaces' }),
getProjectHostSetups: () => [],
getProjects: () => [],
getRepos: () => repos,
getRepo: (id: string) => repos.find((repo) => repo.id === id)
}
const runtime = new OrcaRuntimeService(store as never)
vi.spyOn(runtime as unknown as RuntimeInternals, 'resolveWorktreeSelector').mockResolvedValue({
id: WORKTREE_ID,
repoId: 'repo-shared',
path: REMOTE_PATH,
git: { path: REMOTE_PATH, branch: 'main', isBare: false, isMainWorktree: false },
...(hostId ? { hostId } : {})
})
return runtime
}
function stubProvider() {
return { getStatus: vi.fn().mockResolvedValue({ entries: [] }) }
}
describe('runtime Git target execution host', () => {
const registered: string[] = []
function register(connectionId: string) {
const provider = stubProvider()
registerSshGitProvider(connectionId, provider as never)
registered.push(connectionId)
return provider
}
beforeEach(() => {
vi.restoreAllMocks()
mocks.getStatus.mockReset().mockResolvedValue({ entries: [] })
})
afterEach(() => {
for (const connectionId of registered.splice(0)) {
unregisterSshGitProvider(connectionId)
}
})
// The case whose absence let the original cross-host leak through review: two SSH hosts, and the
// rival row is the one `getRepo` returns first.
it('serves an ssh worktree from the host it names, not from a rival row on another ssh host', async () => {
const openclaw = register('openclaw')
const m4air = register('m4air')
const runtime = makeRuntime(
[
{ id: 'repo-shared', path: '/home/me/app', connectionId: 'openclaw' },
{ id: 'repo-shared', path: '/srv/app', connectionId: 'm4air' }
],
'ssh:m4air'
)
await runtime.getRuntimeGitStatus(`id:${WORKTREE_ID}`)
expect(m4air.getStatus).toHaveBeenCalledWith(REMOTE_PATH)
expect(openclaw.getStatus).not.toHaveBeenCalled()
expect(mocks.getStatus).not.toHaveBeenCalled()
})
it("routes to the worktree's host even when the only repo row names a different ssh host", async () => {
const openclaw = register('openclaw')
const m4air = register('m4air')
const runtime = makeRuntime(
[{ id: 'repo-shared', path: '/home/me/app', connectionId: 'openclaw' }],
'ssh:m4air'
)
await runtime.getRuntimeGitStatus(`id:${WORKTREE_ID}`)
expect(m4air.getStatus).toHaveBeenCalledWith(REMOTE_PATH)
expect(openclaw.getStatus).not.toHaveBeenCalled()
})
// `local` has no SSH namespace to nest in, so a surviving `connectionId` is a row contradicting
// itself. The old shape handed it out and dialled a remote host for a local workspace.
it('ignores a stale connection on a row that declares itself local', async () => {
const m4air = register('m4air')
const runtime = makeRuntime(
[
{
id: 'repo-shared',
path: '/home/me/app',
executionHostId: 'local',
connectionId: 'm4air'
}
],
'local'
)
await runtime.getRuntimeGitStatus(`id:${WORKTREE_ID}`)
expect(m4air.getStatus).not.toHaveBeenCalled()
expect(mocks.getStatus).toHaveBeenCalled()
})
// A `runtime:` row's `connectionId` names a target in the *server's* namespace. Dialling it here
// reaches a same-named target on this client — a silent-wrong-host answer, worse than the
// silent-local one it replaced.
it('refuses a runtime host whose nested ssh target is also registered on this client', async () => {
const impostor = register('nested-1')
const runtime = makeRuntime(
[
{
id: 'repo-shared',
path: '/srv/app',
executionHostId: 'runtime:env-a',
connectionId: 'nested-1'
}
],
'runtime:env-a'
)
await expect(runtime.getRuntimeGitStatus(`id:${WORKTREE_ID}`)).rejects.toThrow(
ExecutionHostNotDispatchableError
)
expect(impostor.getStatus).not.toHaveBeenCalled()
expect(mocks.getStatus).not.toHaveBeenCalled()
})
it('refuses a runtime host with no nested ssh target rather than answering locally', async () => {
const runtime = makeRuntime(
[{ id: 'repo-shared', path: '/srv/app', executionHostId: 'runtime:env-a' }],
'runtime:env-a'
)
await expect(runtime.getRuntimeGitStatus(`id:${WORKTREE_ID}`)).rejects.toThrow(
ExecutionHostNotDispatchableError
)
expect(mocks.getStatus).not.toHaveBeenCalled()
})
it('refuses rather than guessing when rival rows disagree and the worktree names no host', async () => {
register('m4air')
const runtime = makeRuntime([
{ id: 'repo-shared', path: '/srv/app', connectionId: 'm4air' },
{ id: 'repo-shared', path: '/home/me/app' }
])
await expect(runtime.getRuntimeGitStatus(`id:${WORKTREE_ID}`)).rejects.toThrow(
'worktree_execution_host_unresolved'
)
expect(mocks.getStatus).not.toHaveBeenCalled()
})
it('still answers from the single row when the worktree names no host', async () => {
const m4air = register('m4air')
const runtime = makeRuntime([{ id: 'repo-shared', path: '/srv/app', connectionId: 'm4air' }])
await runtime.getRuntimeGitStatus(`id:${WORKTREE_ID}`)
expect(m4air.getStatus).toHaveBeenCalledWith(REMOTE_PATH)
})
// Losing contact with a remote host is never evidence that its files are here
// (docs/reference/ssh-execution-boundary.md).
it('reports the dropped connection instead of reading a remote path locally', async () => {
const runtime = makeRuntime(
[{ id: 'repo-shared', path: '/srv/app', connectionId: 'm4air' }],
'ssh:m4air'
)
await expect(runtime.getRuntimeGitStatus(`id:${WORKTREE_ID}`)).rejects.toThrow(
/Remote connection dropped/
)
expect(mocks.getStatus).not.toHaveBeenCalled()
})
})