mirror of
https://github.com/stablyai/orca.git
synced 2026-11-19 04:23:57 +00:00
* fix(runtime): resolve workspaces, not only Git worktrees, wherever a folder id can arrive The Git-only selector resolver never matches project-group folder workspaces (no repo row), so worktree show/sleep, terminal list by workspace key, the active-terminal fallback, scrollback reads, Kitty file reads, Linear --current, browser commands, plugin context and the session tab fallbacks failed with selector_not_found for them. Route those callers through resolveWorkspaceSelector and rename the Git-only resolver to resolveGitWorktreeSelector so it reads as the repo-backed catalog only. Refs STA-12562 * test(runtime): follow the workspace resolver rename in host fakes Refs STA-12562 * test(runtime): keep partial browser host fakes and mail-routing stubs on the renamed resolver Refs STA-12562 * test(runtime): drop an accidental copy of the folder selector suite Refs STA-12562 * fix(runtime): keep folder workspaces off the skill worktree fence and the Linear meta backfill Skill installs fence a worktreeId by repo rows, so a folder id there must come through folderWorkspaceId, where its own host fence applies. Linear --current answers a folder's legacy link without writing a worktreeMeta row keyed by the folder id. Refs STA-12562
167 lines
5.8 KiB
TypeScript
167 lines
5.8 KiB
TypeScript
// Pin four execution-host answers (#11163): old repo-only lookup ignored worktree.hostId and treated unresolved/runtime/local as undefined. Refuse ssh: by name.
|
|
import { 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 { SshHostNotServedError } from '../providers/ssh-host-not-served-error'
|
|
import { OrcaRuntimeService } from './orca-runtime'
|
|
|
|
const REMOTE_PATH = '/srv/app-feature'
|
|
const WORKTREE_ID = 'repo-shared::/srv/app-feature'
|
|
|
|
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)
|
|
runtime['resolveGitWorktreeSelector'] = vi.fn().mockResolvedValue({
|
|
id: WORKTREE_ID,
|
|
repoId: 'repo-shared',
|
|
path: REMOTE_PATH,
|
|
git: { path: REMOTE_PATH, branch: 'main', isBare: false, isMainWorktree: false },
|
|
...(hostId ? { hostId } : {})
|
|
})
|
|
return runtime
|
|
}
|
|
|
|
async function expectRefusedFor(promise: Promise<unknown>, connectionId: string): Promise<void> {
|
|
const error = await promise.then(
|
|
() => null,
|
|
(caught: unknown) => caught
|
|
)
|
|
expect(error).toBeInstanceOf(SshHostNotServedError)
|
|
expect(error).toMatchObject({ connectionId })
|
|
expect(mocks.getStatus).not.toHaveBeenCalled()
|
|
}
|
|
|
|
describe('runtime Git target execution host', () => {
|
|
beforeEach(() => {
|
|
vi.restoreAllMocks()
|
|
mocks.getStatus.mockReset().mockResolvedValue({ entries: [] })
|
|
})
|
|
|
|
// Put a rival SSH row first to expose cross-host repo-id lookup.
|
|
it('routes an ssh worktree to the host it names, not to a rival row on another ssh host', async () => {
|
|
const runtime = makeRuntime(
|
|
[
|
|
{ id: 'repo-shared', path: '/home/me/app', connectionId: 'openclaw' },
|
|
{ id: 'repo-shared', path: '/srv/app', connectionId: 'm4air' }
|
|
],
|
|
'ssh:m4air'
|
|
)
|
|
|
|
await expectRefusedFor(runtime.getRuntimeGitStatus(`id:${WORKTREE_ID}`), 'm4air')
|
|
})
|
|
|
|
it("routes to the worktree's host even when the only repo row names a different ssh host", async () => {
|
|
const runtime = makeRuntime(
|
|
[{ id: 'repo-shared', path: '/home/me/app', connectionId: 'openclaw' }],
|
|
'ssh:m4air'
|
|
)
|
|
|
|
await expectRefusedFor(runtime.getRuntimeGitStatus(`id:${WORKTREE_ID}`), 'm4air')
|
|
})
|
|
|
|
// Local rows cannot carry SSH connectionId; the old target dialed remote for local workspaces.
|
|
it('ignores a stale connection on a row that declares itself local', async () => {
|
|
const runtime = makeRuntime(
|
|
[
|
|
{
|
|
id: 'repo-shared',
|
|
path: '/home/me/app',
|
|
executionHostId: 'local',
|
|
connectionId: 'm4air'
|
|
}
|
|
],
|
|
'local'
|
|
)
|
|
|
|
await runtime.getRuntimeGitStatus(`id:${WORKTREE_ID}`)
|
|
|
|
expect(mocks.getStatus).toHaveBeenCalled()
|
|
})
|
|
|
|
// Runtime connectionId names server-side SSH, never this client's same-named target.
|
|
it('refuses a runtime host whose row carries a nested ssh target', async () => {
|
|
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(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 () => {
|
|
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 routes by the single row when the worktree names no host', async () => {
|
|
const runtime = makeRuntime([{ id: 'repo-shared', path: '/srv/app', connectionId: 'm4air' }])
|
|
|
|
await expectRefusedFor(runtime.getRuntimeGitStatus(`id:${WORKTREE_ID}`), 'm4air')
|
|
})
|
|
|
|
// 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()
|
|
})
|
|
})
|