mirror of
https://github.com/stablyai/orca.git
synced 2026-11-19 04:23:57 +00:00
* feat(cli): match folder workspaces by path: and name:, and keep same-id ps rows apart Adds one runtime matcher for worktrees and folder workspaces. With the new matchFolderWorkspaces opt-in (advertised as workspace-selector.folder-match.v1), path: and name: also match folder workspaces; branch:, issue: and identity: stay repo-backed. Several matches refuse with each choice's kind, host, path and selector; a folder id shared by two folder workspaces refuses with the repair step. The CLI resolves path:/name: through it, so terminal, file and ports commands reach a folder workspace, and create/set parents record a folder parent. Explicit ambiguous parents report LINEAGE_PARENT_AMBIGUOUS. worktree ps now keeps rows that share an id on different hosts apart, with their own host, identity, metadata and activity; activity whose host can't be proven attaches to neither. * test: let the cross-version ps harness pass the host-qualified summary lookup * fix(cli): read each ps row's own host session; qualify folder selector help * fix(runtime): refuse unscoped duplicate folder ids; hand lineage the matcher's typed result Unscoped folder:<id> refuses a duplicated id even when only one copy's host is derivable; a host-scoped lookup still picks that host's copy. A wsl: hook stamp counts as local host evidence. The lineage controller receives the worktree-or-folder candidate directly instead of re-deriving the kind. * docs(cli): guide the ambiguity fallback through truncated ps and id: selectors * fix(cli): report an ambiguous parent by its own choices; cover per-host sessions * fix(cli): send parents to the runtime parent resolver as typed; translate WSL paths for folders too Parent selectors skip the CLI's show-based folder lookup, so worktree.create and worktree.set classify them with parent rules: a folder spanning hosts is a valid parent, and ambiguity reports LINEAGE_PARENT_AMBIGUOUS. Caller-distro Linux path translation now also matches folder workspaces. * chore(rpc): import the computer-use recovery data directly instead of through an alias * fix(runtime): report a missing set parent as LINEAGE_PARENT_NOT_FOUND, as create does worktree set and worktree create now share one explicit-parent error conversion: several matches give LINEAGE_PARENT_AMBIGUOUS and none give LINEAGE_PARENT_NOT_FOUND, so a missing parent is no longer reported as a bare selector_not_found that could mean the child.
73 lines
2.5 KiB
TypeScript
73 lines
2.5 KiB
TypeScript
// These selectors also reach worktree rm, so translate only with proof of the caller's distro.
|
|
import { afterEach, describe, expect, it, vi } from 'vitest'
|
|
import type { RuntimeWorktreeRecord } from '../shared/runtime-types'
|
|
import type { RuntimeClient } from './runtime-client'
|
|
import { RuntimeClientError } from './runtime/types'
|
|
import { normalizeWorktreeSelectorForCaller } from './selectors'
|
|
|
|
const UBUNTU = 'Ubuntu-24.04'
|
|
const DEBIAN = 'Debian'
|
|
const LINUX_PATH = '/home/neil/qa-repo'
|
|
|
|
function uncPath(distro: string, linuxPath: string): string {
|
|
return `\\\\wsl.localhost\\${distro}${linuxPath.replace(/\//g, '\\')}`
|
|
}
|
|
|
|
function worktreeRecord(path: string): RuntimeWorktreeRecord {
|
|
return { id: `repo::${path}`, path } as RuntimeWorktreeRecord
|
|
}
|
|
|
|
function makeClient(paths: readonly string[], isRemote = false, folderPaths: string[] = []) {
|
|
const call = vi.fn(async (method: string) => {
|
|
if (method === 'worktree.show') {
|
|
// The runtime matcher is not under test here.
|
|
throw new RuntimeClientError('selector_not_found', 'selector_not_found')
|
|
}
|
|
if (method === 'folderWorkspace.list') {
|
|
return {
|
|
result: { folderWorkspaces: folderPaths.map((folderPath) => ({ id: 'hub', folderPath })) }
|
|
}
|
|
}
|
|
if (method !== 'worktree.list') {
|
|
throw new Error(`unexpected method ${method}`)
|
|
}
|
|
return {
|
|
result: { worktrees: paths.map(worktreeRecord), totalCount: paths.length, truncated: false }
|
|
}
|
|
})
|
|
return { client: { isRemote, call } as unknown as RuntimeClient, call }
|
|
}
|
|
|
|
afterEach(() => {
|
|
vi.unstubAllEnvs()
|
|
})
|
|
|
|
describe('normalizeWorktreeSelectorForCaller in a WSL shell (#16628)', () => {
|
|
it('picks the caller-distro worktree when two distros spell the same Linux path', async () => {
|
|
const { client } = makeClient([uncPath(UBUNTU, LINUX_PATH), uncPath(DEBIAN, LINUX_PATH)])
|
|
|
|
await expect(
|
|
normalizeWorktreeSelectorForCaller(
|
|
`path:${LINUX_PATH}`,
|
|
uncPath(DEBIAN, '/home/neil'),
|
|
client
|
|
)
|
|
).resolves.toBe(`path:${uncPath(DEBIAN, LINUX_PATH)}`)
|
|
})
|
|
|
|
it("translates a folder workspace's Linux path in the caller's distro only", async () => {
|
|
const { client } = makeClient([], false, [
|
|
uncPath(UBUNTU, LINUX_PATH),
|
|
uncPath(DEBIAN, LINUX_PATH)
|
|
])
|
|
|
|
await expect(
|
|
normalizeWorktreeSelectorForCaller(
|
|
`path:${LINUX_PATH}`,
|
|
uncPath(DEBIAN, '/home/neil'),
|
|
client
|
|
)
|
|
).resolves.toBe(`path:${uncPath(DEBIAN, LINUX_PATH)}`)
|
|
})
|
|
})
|