mirror of
https://github.com/stablyai/orca.git
synced 2026-09-30 08:03:12 +00:00
* fix(host-routing): resolve the execution host before reading a connection Three issues in one defect class: a resolver reads one spelling of one arbitrarily chosen row instead of resolving the worktree's execution host, so something local answers a question about a remote. returned that row's connectionId. With duplicate repo rows for one repo id it could pair a runtime owner with a client-owned SSH connection. It now resolves through the same ambiguity-aware index getRuntimeEnvironmentIdForWorktree uses, prefers the repo row for the host the worktree names, and derives the connection from the resolved host. Conflicting rows return `undefined` (this module's documented "cannot determine the host"), never `null`. `store.getRepo(worktree.repoId)?.connectionId ?? null`. `getRepo` is host-blind and the same repo id can exist on local, SSH and runtime hosts, so a remote worktree could spawn its PTY on the client with the remote cwd. resolveWorktreeLaunchHost picks the row for the worktree's host and reads the connection off that host; conflicting rows are unresolved, not local. session-partition owner maps that contradict each other. Both now compute through one shared function whose argument records the divergence. No behaviour change on either side: converging needs a read-both migration, since both partitions hold real data written by shipping builds. * fix(host-routing): keep nested SSH connections resolvable under a runtime host getRepoSshConnectionId read only the resolved execution host, so a repo row owned by a runtime that reaches a nested SSH target (connectionId: ssh-*, executionHostId: runtime:*) resolved to no connection — answering 'local' for a remote worktree, the same defect #17909 fixed in the other direction. * fix(host-routing): resolve both sides of the execution host through one rule The renderer resolver leaked between two different SSH hosts: a worktree on `ssh:m4air` whose only indexed repo row belonged to `openclaw` answered 'openclaw', because the host-scoped lookup missing fell through to an id-only one. Main's resolver, in the same change, answered 'm4air' — two resolvers, one right and one wrong, on identical input. Both sides now adapt one shared rule (`worktree-execution-host-resolution.ts`): the worktree's own host outranks every repo row, and a row on a different host is never evidence about this one. The renderer's WeakMap index becomes the memoizing adapter it always was; `resolveWorktreeLaunchHost` becomes main's mapping of unresolved onto its throw. Settles the rule the change previously answered two ways. `getRepoSshConnectionId` and `getSshTargetIdForExecutionHost` disagreed for a runtime host carrying a nested `connectionId`; they now compose, so the execution host is the single authority. On a `runtime:*` row that field is a paired HUB's private SSH target, spread through by `repoWithFetchedOwner` and unaddressable from this client — the project-first successor of the row nulls it for exactly that reason. That also fixes the `kind !== 'ssh'` fallback, which fired for `local`: a row declaring itself local handed out an SSH connection.
173 lines
7.8 KiB
TypeScript
173 lines
7.8 KiB
TypeScript
import { afterEach, describe, expect, it, vi } from 'vitest'
|
|
import {
|
|
ALL_EXECUTION_HOSTS_SCOPE,
|
|
LOCAL_EXECUTION_HOST_ID,
|
|
getLocalExecutionHostLabel,
|
|
getRepoExecutionHostId,
|
|
getRepoSshConnectionId,
|
|
getSettingsFocusedExecutionHostId,
|
|
getSshTargetIdForExecutionHost,
|
|
getWorktreeExecutionHostId,
|
|
normalizeExecutionHostOrder,
|
|
normalizeExecutionHostScope,
|
|
normalizeVisibleExecutionHostIds,
|
|
parseExecutionHostId,
|
|
requestedExecutionHostScope,
|
|
toRuntimeExecutionHostId,
|
|
toSshExecutionHostId
|
|
} from './execution-host'
|
|
|
|
describe('execution host identity', () => {
|
|
// Why: the navigator cases below replace globalThis.navigator; restore it after
|
|
// each test so the stub can't bleed into the rest of the suite.
|
|
afterEach(() => {
|
|
vi.unstubAllGlobals()
|
|
})
|
|
|
|
it('normalizes local, SSH, and runtime host ids', () => {
|
|
expect(parseExecutionHostId('local')).toEqual({ kind: 'local', id: 'local' })
|
|
expect(parseExecutionHostId(toSshExecutionHostId('win vm'))).toEqual({
|
|
kind: 'ssh',
|
|
id: 'ssh:win%20vm',
|
|
targetId: 'win vm'
|
|
})
|
|
expect(parseExecutionHostId(toRuntimeExecutionHostId('prod/server'))).toEqual({
|
|
kind: 'runtime',
|
|
id: 'runtime:prod%2Fserver',
|
|
environmentId: 'prod/server'
|
|
})
|
|
})
|
|
|
|
it('labels the local host by platform and by navigator detection', () => {
|
|
expect(getLocalExecutionHostLabel('darwin')).toBe('Local Mac')
|
|
expect(getLocalExecutionHostLabel('win32')).toBe('Local Windows')
|
|
expect(getLocalExecutionHostLabel('linux')).toBe('Local Linux')
|
|
expect(getLocalExecutionHostLabel('freebsd')).toBe('This computer')
|
|
|
|
// With no explicit platform, the label is derived from navigator.userAgent
|
|
// (the path the live host-selector dialog uses).
|
|
vi.stubGlobal('navigator', { userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64)' })
|
|
expect(getLocalExecutionHostLabel()).toBe('Local Windows')
|
|
|
|
vi.stubGlobal('navigator', { userAgent: 'Mozilla/5.0 (X11; Linux x86_64)' })
|
|
expect(getLocalExecutionHostLabel()).toBe('Local Linux')
|
|
|
|
vi.stubGlobal('navigator', { userAgent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7)' })
|
|
expect(getLocalExecutionHostLabel()).toBe('Local Mac')
|
|
|
|
// Non-matching userAgent falls through to process.platform; compare against the
|
|
// explicit-platform label so the assertion is deterministic on any CI OS.
|
|
vi.stubGlobal('navigator', { userAgent: 'totally-unknown-agent' })
|
|
expect(getLocalExecutionHostLabel()).toBe(getLocalExecutionHostLabel(process.platform))
|
|
})
|
|
|
|
it('falls back invalid scopes to all hosts', () => {
|
|
expect(normalizeExecutionHostScope(null)).toBe(ALL_EXECUTION_HOSTS_SCOPE)
|
|
expect(normalizeExecutionHostScope('')).toBe(ALL_EXECUTION_HOSTS_SCOPE)
|
|
expect(normalizeExecutionHostScope('bogus')).toBe(ALL_EXECUTION_HOSTS_SCOPE)
|
|
expect(normalizeExecutionHostScope('ssh:')).toBe(ALL_EXECUTION_HOSTS_SCOPE)
|
|
expect(normalizeExecutionHostScope('all')).toBe(ALL_EXECUTION_HOSTS_SCOPE)
|
|
})
|
|
|
|
it('defaults an omitted scope request to this host, not a fan-out', () => {
|
|
expect(requestedExecutionHostScope(undefined)).toBe(LOCAL_EXECUTION_HOST_ID)
|
|
expect(requestedExecutionHostScope(null)).toBe(LOCAL_EXECUTION_HOST_ID)
|
|
// An empty or unrecognized scope is a real value, so it still fans out.
|
|
expect(requestedExecutionHostScope('')).toBe(ALL_EXECUTION_HOSTS_SCOPE)
|
|
expect(requestedExecutionHostScope('bogus')).toBe(ALL_EXECUTION_HOSTS_SCOPE)
|
|
expect(requestedExecutionHostScope('all')).toBe(ALL_EXECUTION_HOSTS_SCOPE)
|
|
expect(requestedExecutionHostScope('ssh:dev%20box')).toBe('ssh:dev%20box')
|
|
})
|
|
|
|
it('normalizes visible host id arrays', () => {
|
|
expect(normalizeVisibleExecutionHostIds(null)).toBeNull()
|
|
expect(normalizeVisibleExecutionHostIds([])).toBeNull()
|
|
expect(normalizeVisibleExecutionHostIds(['local', 'bogus', 'ssh:win%20vm', 'local'])).toEqual([
|
|
'local',
|
|
'ssh:win%20vm'
|
|
])
|
|
})
|
|
|
|
it('normalizes host order arrays', () => {
|
|
expect(normalizeExecutionHostOrder(null)).toEqual([])
|
|
expect(normalizeExecutionHostOrder([])).toEqual([])
|
|
expect(normalizeExecutionHostOrder(['ssh:win%20vm', 'bogus', 'local', 'ssh:win%20vm'])).toEqual(
|
|
['ssh:win%20vm', 'local']
|
|
)
|
|
})
|
|
|
|
it('derives repo ownership from SSH connection ids', () => {
|
|
expect(getRepoExecutionHostId({ connectionId: null })).toBe(LOCAL_EXECUTION_HOST_ID)
|
|
expect(getRepoExecutionHostId({ connectionId: 'ssh-target-1' })).toBe('ssh:ssh-target-1')
|
|
})
|
|
|
|
it('prefers explicit worktree ownership before repo and focused-host fallbacks', () => {
|
|
expect(
|
|
getWorktreeExecutionHostId(
|
|
{ hostId: 'runtime:workspace-owner' },
|
|
{ connectionId: 'repo-owner' },
|
|
'runtime:focused-host'
|
|
)
|
|
).toBe('runtime:workspace-owner')
|
|
expect(
|
|
getWorktreeExecutionHostId({}, { connectionId: 'repo-owner' }, 'runtime:focused-host')
|
|
).toBe('ssh:repo-owner')
|
|
expect(getWorktreeExecutionHostId({}, {}, 'runtime:focused-host')).toBe('runtime:focused-host')
|
|
})
|
|
|
|
// These two look interchangeable and are not: one answers "which SSH target holds this row's
|
|
// files", the other "which connection may this client dial". They agree except on a runtime
|
|
// host, where a nested target exists but is not dialable from here — so the pane that reads it
|
|
// needs one answer and the PTY route needs the other.
|
|
it('distinguishes the SSH target holding a row from the connection this client may dial', () => {
|
|
// Legacy spelling: `connectionId` alone *is* the host, so both answers agree.
|
|
expect(getRepoSshConnectionId({ connectionId: 'openclaw' })).toBe('openclaw')
|
|
expect(getSshTargetIdForExecutionHost('ssh:openclaw')).toBe('openclaw')
|
|
// Unified spelling, no legacy field.
|
|
expect(getRepoSshConnectionId({ executionHostId: 'ssh:m4air' })).toBe('m4air')
|
|
|
|
// A row declaring itself local hands out no SSH connection, whatever the legacy field says:
|
|
// `local` has no SSH namespace to nest in, so the two spellings are contradicting each other.
|
|
expect(
|
|
getRepoSshConnectionId({ executionHostId: 'local', connectionId: 'openclaw' })
|
|
).toBeNull()
|
|
|
|
// A runtime host does have its own namespace, and a nested target appears only in this field.
|
|
// Dropping it would make a nested-SSH workspace read as local — which is what decides whether
|
|
// this client tries to read the transcript itself.
|
|
expect(
|
|
getRepoSshConnectionId({ executionHostId: 'runtime:env-a', connectionId: 'ssh-nested' })
|
|
).toBe('ssh-nested')
|
|
// ...but that id is not dialable from this client alone, so the routing answer stays null.
|
|
expect(getSshTargetIdForExecutionHost('runtime:env-a')).toBeNull()
|
|
// A runtime host with no nested target is simply not on SSH.
|
|
expect(getRepoSshConnectionId({ executionHostId: 'runtime:env-a' })).toBeNull()
|
|
|
|
// An ephemeral-VM target is an ordinary client-dialable target and stays an `ssh:` host.
|
|
expect(getRepoSshConnectionId({ connectionId: 'runtime-ssh-vm-1' })).toBe('runtime-ssh-vm-1')
|
|
expect(getRepoExecutionHostId({ connectionId: 'runtime-ssh-vm-1' })).toBe(
|
|
'ssh:runtime-ssh-vm-1'
|
|
)
|
|
})
|
|
|
|
it('derives focused host compatibility from active runtime settings', () => {
|
|
expect(getSettingsFocusedExecutionHostId(null)).toBe(LOCAL_EXECUTION_HOST_ID)
|
|
expect(getSettingsFocusedExecutionHostId({ activeRuntimeEnvironmentId: 'runtime-1' })).toBe(
|
|
'runtime:runtime-1'
|
|
)
|
|
})
|
|
})
|
|
|
|
describe('execution host id delimiter invariant', () => {
|
|
it('rejects an unencoded pipe so a crafted id cannot rebind a worktree identity alias', () => {
|
|
// composeWorktreeHostIdentity splits at the first `|`, so `ssh:a|b` would resolve as `ssh:a`.
|
|
expect(parseExecutionHostId('ssh:a|b')).toBeNull()
|
|
expect(parseExecutionHostId('runtime:a|b')).toBeNull()
|
|
expect(parseExecutionHostId(toSshExecutionHostId('a|b'))).toEqual({
|
|
kind: 'ssh',
|
|
id: 'ssh:a%7Cb',
|
|
targetId: 'a|b'
|
|
})
|
|
})
|
|
})
|