mirror of
https://github.com/stablyai/orca.git
synced 2026-10-31 00:57:45 +00:00
* fix(persistence): worktree meta and lineage writes take the row's host, not the id (R4-2b) * fix(persistence): review fixes for host-targeted worktree writes * test: SAFETY notes on partial runtime store mocks * test: drop imports duplicated by the rebase onto #30797
114 lines
5.5 KiB
TypeScript
114 lines
5.5 KiB
TypeScript
import type { SourceControlAiSettingsInput } from '../../shared/source-control-ai'
|
|
import { LOCAL_EXECUTION_HOST_ID, type ExecutionHostId } from '../../shared/execution-host'
|
|
import type { Repo } from '../../shared/repo-types'
|
|
import type { GitPushTarget, GitWorktreeInfo, Worktree } from '../../shared/worktree/types'
|
|
import type { GitRuntimeOptions } from '../git/git-runtime-options'
|
|
import { getWorktreeSharedLinkPaths } from '../git/worktree-shared-directories'
|
|
import {
|
|
ExecutionHostNotDispatchableError,
|
|
resolveGitRouteForHost
|
|
} from '../providers/execution-host-provider-dispatch'
|
|
import type { createLocalGitProvider, LocalGitProvider } from '../providers/local-git-provider'
|
|
import { SshHostNotServedError } from '../providers/ssh-host-not-served-error'
|
|
import type { CommitMessageAgentEnvironmentResolvers } from '../text-generation/commit-message-agent-environment'
|
|
import type { PullRequestLinkedIssueMeta } from '../source-control/pull-request-linked-issue'
|
|
import { normalizeRuntimeRelativePath } from './runtime-relative-paths'
|
|
|
|
export type ResolvedRuntimeGitWorktree = Worktree & { git: GitWorktreeInfo }
|
|
|
|
export type RuntimeGitTarget = {
|
|
worktree: ResolvedRuntimeGitWorktree
|
|
/**
|
|
* Display and settings metadata only (shared-link paths, source-control AI defaults). It can be
|
|
* a same-id row from another host when the worktree's own host carries none, so it must not
|
|
* decide routing — `executionHostId` does.
|
|
*/
|
|
repo?: Repo
|
|
/**
|
|
* The host this worktree's Git runs on. Never optional and never null: the field it replaced
|
|
* (`connectionId?: string`) spelled "runtime host", "unresolved" and "genuinely local" all as
|
|
* `undefined`, so every path that could not resolve answered "local" and ran remote work on the
|
|
* client (#11163). Unresolved now fails at resolution time instead of arriving here as a
|
|
* silently-local target.
|
|
*/
|
|
executionHostId: ExecutionHostId
|
|
/** Only consulted when `executionHostId` is `local`; see `localGitOptionsForTarget`. */
|
|
localGitOptions?: GitRuntimeOptions
|
|
}
|
|
|
|
export type RuntimeGitCommandHost = {
|
|
resolveRuntimeGitTarget(selector: string): Promise<RuntimeGitTarget>
|
|
getRuntimeSettings(): SourceControlAiSettingsInput
|
|
getCommitMessageAgentEnvironment?(): CommitMessageAgentEnvironmentResolvers | undefined
|
|
/** `undefined` keeps cached metadata; `null` is the authoritative unlinked answer. */
|
|
getWorktreeLinkedIssue?(worktreeId: string): number | null | undefined
|
|
getWorktreeLinkedIssueMeta?(worktreeId: string): PullRequestLinkedIssueMeta | null | undefined
|
|
/** Why (#17828 review follow-up): RuntimeGitSyncCommands deliberately materializes with
|
|
* no store (avoids unrelated ownership-inheritance/refspec-migration side effects), so a
|
|
* lazily-minted remote still needs a way back into the store's `pushTarget.remoteCreated`
|
|
* for #17842's orphan sweep. Called only when materialize reports `remoteCreated: true`. */
|
|
persistMaterializedPushTarget?(
|
|
worktree: Pick<Worktree, 'id' | 'hostId'>,
|
|
pushTarget: GitPushTarget
|
|
): void
|
|
}
|
|
|
|
/**
|
|
* The two hosts this process can itself execute a runtime Git command on, narrowed from the shared
|
|
* host-keyed route in `src/main/providers/execution-host-provider-dispatch.ts`.
|
|
*
|
|
* `runtime:<env>` is deliberately not a variant. Its Git is executed by that environment's own
|
|
* server, and the SSH target on its repo row is that server's *nested* one — addressable only as
|
|
* the pair (environmentId, targetId). Handing that id to this client's SSH table dials a
|
|
* same-named target in the wrong namespace, so it throws rather than routing.
|
|
*/
|
|
export type RuntimeGitRoute =
|
|
| { kind: 'local'; createProvider: typeof createLocalGitProvider }
|
|
/** An SSH target this process does not serve; it fails or reports unavailable, never runs here. */
|
|
| { kind: 'ssh'; connectionId: string }
|
|
|
|
export function runtimeGitRouteForTarget(target: RuntimeGitTarget): RuntimeGitRoute {
|
|
const route = resolveGitRouteForHost(target.executionHostId)
|
|
switch (route.kind) {
|
|
case 'local':
|
|
return { kind: 'local', createProvider: route.createProvider }
|
|
case 'ssh':
|
|
return { kind: 'ssh', connectionId: route.connectionId }
|
|
case 'runtime':
|
|
throw new ExecutionHostNotDispatchableError(route.hostId)
|
|
}
|
|
}
|
|
|
|
/** The local route for work this process runs itself; `ssh:` and `runtime:` hosts throw. */
|
|
export function requireLocalRuntimeGitRoute(
|
|
target: RuntimeGitTarget
|
|
): Extract<RuntimeGitRoute, { kind: 'local' }> {
|
|
const route = runtimeGitRouteForTarget(target)
|
|
if (route.kind === 'ssh') {
|
|
throw new SshHostNotServedError(route.connectionId)
|
|
}
|
|
return route
|
|
}
|
|
|
|
/** A provider for the target's own host; an `ssh:` host and a `runtime:` host both throw. */
|
|
export function requireRuntimeGitProvider(target: RuntimeGitTarget): LocalGitProvider {
|
|
return requireLocalRuntimeGitRoute(target).createProvider({
|
|
...localGitOptionsForTarget(target),
|
|
getSharedLinkPaths: () => (target.repo ? getWorktreeSharedLinkPaths(target.repo) : [])
|
|
})
|
|
}
|
|
|
|
export function localGitOptionsForTarget(target: RuntimeGitTarget): GitRuntimeOptions {
|
|
// WSL routing describes *this* machine; no remote host may inherit it.
|
|
return target.executionHostId === LOCAL_EXECUTION_HOST_ID ? (target.localGitOptions ?? {}) : {}
|
|
}
|
|
|
|
export function normalizeRuntimeGitRelativePath(filePath: string): string {
|
|
const relativePath = normalizeRuntimeRelativePath(filePath)
|
|
if (relativePath === '') {
|
|
// Why: an empty Git pathspec can mutate the whole worktree.
|
|
throw new Error('invalid_relative_path')
|
|
}
|
|
return relativePath
|
|
}
|