mirror of
https://github.com/stablyai/orca.git
synced 2026-09-29 16:02:50 +00:00
`computeWorkspaceRoot` resolves a WSL repo's mirror root through `getWslHome`,
which is a synchronous `execFileSync('wsl.exe', ...)` with a 5s timeout. Two
worktree preparation paths ran it on the Electron main thread:
`prepareLocalWorktreeRootForRepo` (repo registration, clone completion, repo
update, project host setup, folder->git upgrade) and `prepareWorktreeCreateForRepo`
(the speculative checkout started while the create composer is open). On a stopped
or cold distro that froze every window for up to 5s. Being fire-and-forget did not
help: only 3 of the 16 `prepareLocalWorktreeRootForRepo` call sites are `void`-ed,
the other 13 are awaited inside IPC handlers, and the sync probe blocks the main
thread either way. `prepareLocalWorktreeRootsForRepos` runs the same probe for
every repo from the settings-save handler.
Adopt the existing `computeWorkspaceRootAsync` (now exported) at those two call
sites, and give the two resolvers a shared mirror-distro decision and shared
root-from-home layout so they cannot drift apart.
Also thread the mirror distro into the prepare-side path settings.
`createLocalWorktree` passes `getWorktreeMirrorDistro(store, repo)` and
`prepareWorktreeCreateForRepo` did not, so a `C:\` repo on a WSL project runtime
prepared under `C:\workspaces` while the create click looked under the mirrored
WSL root: the keys never matched and every prepared checkout was discarded, after
paying for a full checkout that sat until the 5min TTL. Pre-existing on main;
included because it is the same line and the same resolver.
Scope of the win, stated precisely: only those two preparation paths stop
blocking. On a reachable distro `getWslHome` caches on success, so before this
change the first repo paid one blocking probe and the rest were cache hits -- the
change makes that one probe non-blocking, it does not remove N probes. Failed
probes are never cached, so on a stopped distro N repos did pay N sequential 5s
blocking probes and now share one in-flight async probe.
Costs: five sync `computeWorkspaceRoot` callers remain (allowed-roots resolution,
the create click in worktree-remote, CLI create, watch targets, worktree trash),
and `getWslHome` reads only `wslHomeCache` -- it cannot join an in-flight async
probe. The guaranteed synchronous cache warm-up therefore becomes a window in
which one of those callers can still block and can spawn a second concurrent
`wsl.exe`. Concretely: opening the create composer and clicking Create within a
few hundred ms on a cold distro now pays the freeze on the click instead of on the
background prep. Separately, the mirror-distro fix makes prepare spawn an async
`wsl.exe` home probe for `C:\` repos on a WSL runtime, where it previously spawned
none.
No race added: `prepareWorktreeCreateForRepo` computes the preparation key and
inserts the registry entry in one synchronous run after the await, so two
concurrent creates still dedupe to a single prepared checkout.
`worktree-create-preparation-wsl-root.test.ts` runs the real resolver through
prepare and then claims the entry with the production consume-side call shape
(including the mirror distro), so a divergence between the two resolvers fails a
test instead of silently discarding every prepared checkout.
394 lines
14 KiB
TypeScript
394 lines
14 KiB
TypeScript
import { resolve, relative, isAbsolute, posix, sep, win32 } from 'node:path'
|
|
import type { GlobalSettings, OrcaWorkspaceLayout } from '../../shared/global-settings-types'
|
|
import type { Repo } from '../../shared/repo-types'
|
|
import { isWindowsAbsolutePathLike, resolveRuntimePath } from '../../shared/cross-platform-path'
|
|
import { isWslUncPath, resolveWslRepoWorktreeBasePath } from '../../shared/wsl-paths'
|
|
import { splitWorktreeId } from '../../shared/worktree/id'
|
|
import { replaceKnownEmojiWithShortcodes } from '../../shared/emoji-shortcode-catalog'
|
|
import { getWslHome, getWslHomeAsync, parseWslPath } from '../wsl'
|
|
|
|
type WorktreePathSettings = Pick<GlobalSettings, 'nestWorkspaces' | 'workspaceDir'> & {
|
|
/** Distro to mirror the workspace root into when the repo itself sits on a
|
|
* Windows drive but this project's git runs in WSL. Omitted = today's
|
|
* placement, so any caller that cannot resolve the runtime is unaffected. */
|
|
wslMirrorDistro?: string
|
|
}
|
|
type WorktreeBasePathRepo = Pick<Repo, 'path' | 'worktreeBasePath'>
|
|
|
|
export {
|
|
computeBranchName,
|
|
getConfiguredBranchPrefix,
|
|
computeValidatedBranchName
|
|
} from './worktree-branch-name'
|
|
export { mergeWorktree } from './worktree-metadata-merge'
|
|
export { areWorktreePathsEqual } from './worktree-path-comparison'
|
|
|
|
/**
|
|
* Sanitize a worktree name for use in branch names and directory paths.
|
|
* Strips unsafe characters and collapses runs of special chars to a single hyphen.
|
|
*/
|
|
export function sanitizeWorktreeName(input: string): string {
|
|
// Why: keep Unicode letters/numbers (CJK, accented Latin, etc.) so users can
|
|
// name workspaces in their own language. Git ref-format permits non-ASCII
|
|
// bytes, and modern filesystems handle UTF-8 paths. Only strip characters
|
|
// git or the filesystem actually rejects.
|
|
const sanitized = replaceKnownEmojiWithShortcodes(input)
|
|
.trim()
|
|
.replace(/[^\p{L}\p{N}._-]+/gu, '-')
|
|
.replace(/-+/g, '-')
|
|
// Why: git check-ref-format rejects any ref containing `..`, so a prompt
|
|
// like "../../foo" that survives slugification as `..-..-foo` would
|
|
// produce a branch name git refuses to create. Collapse runs of dots
|
|
// to a single dot before the leading/trailing trim so internal `..`
|
|
// sequences can't reach git.
|
|
.replace(/\.{2,}/g, '.')
|
|
.replace(/^[.-]+|[.-]+$/g, '')
|
|
|
|
if (!sanitized && containsEmoji(input)) {
|
|
return 'workspace'
|
|
}
|
|
|
|
if (!sanitized || sanitized === '.' || sanitized === '..') {
|
|
throw new Error('Invalid worktree name')
|
|
}
|
|
|
|
return sanitized
|
|
}
|
|
|
|
function containsEmoji(input: string): boolean {
|
|
return /[\p{Emoji_Presentation}\p{Extended_Pictographic}\p{Regional_Indicator}\u20e3]/u.test(
|
|
input
|
|
)
|
|
}
|
|
|
|
export {
|
|
resolveWorktreeCreateDisplayName,
|
|
resolveWorktreeCreateDisplayNameRequest,
|
|
resolveWorktreeCreateDisplayNameMeta,
|
|
sanitizeWorktreeDisplayName,
|
|
shouldSetDisplayName
|
|
} from './worktree-display-name'
|
|
|
|
/**
|
|
* Ensure a target path is within the workspace directory (prevent path traversal).
|
|
*/
|
|
export function ensurePathWithinWorkspace(targetPath: string, workspaceDir: string): string {
|
|
const resolvedWorkspaceDir = resolve(workspaceDir)
|
|
const resolvedTargetPath = resolve(targetPath)
|
|
const rel = relative(resolvedWorkspaceDir, resolvedTargetPath)
|
|
|
|
if (isAbsolute(rel) || rel === '..' || rel.startsWith(`..${sep}`)) {
|
|
throw new Error('Invalid worktree path')
|
|
}
|
|
|
|
return resolvedTargetPath
|
|
}
|
|
|
|
/**
|
|
* Compute the filesystem path where the worktree directory will be created.
|
|
*
|
|
* Why WSL special case: when the repo lives on a WSL filesystem, worktrees
|
|
* must also live on the WSL filesystem. Creating them on the Windows side
|
|
* (/mnt/c/...) would be extremely slow due to cross-filesystem I/O and
|
|
* the terminal would open a Windows shell instead of WSL. We mirror the
|
|
* Windows workspace layout inside ~/orca/workspaces on the WSL filesystem
|
|
* (e.g. \\wsl.localhost\Ubuntu\home\user\orca\workspaces\repo\feature).
|
|
*/
|
|
export function computeWorktreePath(
|
|
sanitizedName: string,
|
|
repoPath: string,
|
|
settings: WorktreePathSettings
|
|
): string {
|
|
return computeWorktreePathFromWorkspaceRoot(
|
|
sanitizedName,
|
|
repoPath,
|
|
computeWorkspaceRoot(repoPath, settings),
|
|
settings.nestWorkspaces
|
|
)
|
|
}
|
|
|
|
/** Layout half shared by both computeWorktreePath variants, so the sync and async paths cannot
|
|
* disagree on placement once the root is resolved. */
|
|
function computeWorktreePathFromWorkspaceRoot(
|
|
sanitizedName: string,
|
|
repoPath: string,
|
|
workspaceRoot: string,
|
|
nestWorkspaces: boolean
|
|
): string {
|
|
const pathOps = getRuntimePathOps(repoPath, workspaceRoot)
|
|
if (nestWorkspaces) {
|
|
const repoName = pathOps.basename(repoPath).replace(/\.git$/, '')
|
|
return pathOps.join(workspaceRoot, repoName, sanitizedName)
|
|
}
|
|
return pathOps.join(workspaceRoot, sanitizedName)
|
|
}
|
|
|
|
/** Async twin of computeWorktreePath. Same result; resolves the WSL home without blocking the main
|
|
* thread, so callers off the create path never freeze the app on a stopped distro. */
|
|
export async function computeWorktreePathAsync(
|
|
sanitizedName: string,
|
|
repoPath: string,
|
|
settings: WorktreePathSettings
|
|
): Promise<string> {
|
|
return computeWorktreePathFromWorkspaceRoot(
|
|
sanitizedName,
|
|
repoPath,
|
|
await computeWorkspaceRootAsync(repoPath, settings),
|
|
settings.nestWorkspaces
|
|
)
|
|
}
|
|
|
|
/** Async twin of computeWorkspaceRoot. Same result; the WSL home probe spawns `wsl.exe`, so
|
|
* background preparation uses this variant rather than blocking the Electron main thread for up
|
|
* to the probe timeout. The sync twin below still serves callers that cannot await (allowed-roots
|
|
* resolution, the create click, CLI create, watch targets, worktree trash). */
|
|
export async function computeWorkspaceRootAsync(
|
|
repoPath: string,
|
|
settings: { workspaceDir: string; wslMirrorDistro?: string }
|
|
): Promise<string> {
|
|
const distro = mirrorDistroForWorkspaceRoot(repoPath, settings)
|
|
return workspaceRootForMirrorHome(
|
|
repoPath,
|
|
settings.workspaceDir,
|
|
distro ? await getWslHomeAsync(distro) : null
|
|
)
|
|
}
|
|
|
|
export function computeWorkspaceRoot(
|
|
repoPath: string,
|
|
settings: { workspaceDir: string; wslMirrorDistro?: string }
|
|
): string {
|
|
const distro = mirrorDistroForWorkspaceRoot(repoPath, settings)
|
|
return workspaceRootForMirrorHome(
|
|
repoPath,
|
|
settings.workspaceDir,
|
|
distro ? getWslHome(distro) : null
|
|
)
|
|
}
|
|
|
|
/** Distro to mirror the workspace root into, or undefined when the configured root is used as-is.
|
|
* Shared by both resolvers so the sync and async paths can never disagree on placement. */
|
|
function mirrorDistroForWorkspaceRoot(
|
|
repoPath: string,
|
|
settings: { workspaceDir: string; wslMirrorDistro?: string }
|
|
): string | undefined {
|
|
const distro = resolveMirrorDistro(repoPath, settings)
|
|
return distro && shouldMirrorWorkspaceDirInsideWsl(repoPath, settings.workspaceDir)
|
|
? distro
|
|
: undefined
|
|
}
|
|
|
|
function workspaceRootForMirrorHome(
|
|
repoPath: string,
|
|
workspaceDir: string,
|
|
wslHome: string | null
|
|
): string {
|
|
// Why: WSL UNC paths are still Windows paths from Node's perspective.
|
|
// Mirror absolute local desktop workspace roots inside the distro so
|
|
// terminals stay on the WSL filesystem; repo-relative roots can resolve
|
|
// directly against the WSL repo path.
|
|
return wslHome
|
|
? win32.join(wslHome, 'orca', 'workspaces')
|
|
: resolveWorkspaceDirForRepo(repoPath, workspaceDir)
|
|
}
|
|
|
|
export function computeRemoteWorktreePath(
|
|
sanitizedName: string,
|
|
repoPath: string,
|
|
settings: WorktreePathSettings,
|
|
options: { useConfiguredAbsolutePath?: boolean } = {}
|
|
): string {
|
|
if (
|
|
options.useConfiguredAbsolutePath ||
|
|
isWorkspaceDirRelativeToRepo(repoPath, settings.workspaceDir)
|
|
) {
|
|
return computeWorktreePath(sanitizedName, repoPath, settings)
|
|
}
|
|
// Why: absolute global workspaceDir values belong to the desktop machine.
|
|
// SSH falls back to repo-qualified sibling paths so origin/main is not shared.
|
|
const pathOps = getRuntimePathOps(repoPath, repoPath)
|
|
const repoName = pathOps.basename(repoPath).replace(/\.git$/, '')
|
|
return pathOps.join(repoPath, '..', `${repoName}-${sanitizedName}`)
|
|
}
|
|
|
|
export function getWorktreePathSettings(
|
|
repo: WorktreeBasePathRepo,
|
|
settings: WorktreePathSettings,
|
|
wslMirrorDistro?: string
|
|
): WorktreePathSettings {
|
|
return {
|
|
nestWorkspaces: settings.nestWorkspaces,
|
|
workspaceDir: getEffectiveWorktreeBasePath(repo, settings),
|
|
// Why pass it through rather than resolve here: placement has to agree
|
|
// across create, allowed-roots and watch-targets, so the distro is
|
|
// resolved once by the caller that owns the store and threaded down.
|
|
...(wslMirrorDistro ? { wslMirrorDistro } : {})
|
|
}
|
|
}
|
|
|
|
export function getWorktreeCreationLayout(
|
|
repo: WorktreeBasePathRepo,
|
|
settings: WorktreePathSettings
|
|
): OrcaWorkspaceLayout {
|
|
return {
|
|
path: getEffectiveWorktreeBasePath(repo, settings),
|
|
nestWorkspaces: settings.nestWorkspaces
|
|
}
|
|
}
|
|
|
|
export function hasRepoWorktreeBasePath(repo: Pick<Repo, 'worktreeBasePath'>): boolean {
|
|
return getRepoWorktreeBasePath(repo) !== undefined
|
|
}
|
|
|
|
function getRuntimePathOps(
|
|
repoPath: string,
|
|
workspaceDir: string
|
|
): Pick<typeof posix, 'basename' | 'isAbsolute' | 'join' | 'normalize'> {
|
|
return isWindowsAbsolutePathLike(repoPath) || isWindowsAbsolutePathLike(workspaceDir)
|
|
? win32
|
|
: posix
|
|
}
|
|
|
|
function resolveWorkspaceDirForRepo(repoPath: string, workspaceDir: string): string {
|
|
const pathOps = getRuntimePathOps(repoPath, workspaceDir)
|
|
return pathOps.isAbsolute(workspaceDir)
|
|
? pathOps.normalize(workspaceDir)
|
|
: resolveRuntimePath(repoPath, workspaceDir)
|
|
}
|
|
|
|
function isWorkspaceDirRelativeToRepo(repoPath: string, workspaceDir: string): boolean {
|
|
return !getRuntimePathOps(repoPath, workspaceDir).isAbsolute(workspaceDir)
|
|
}
|
|
|
|
function getEffectiveWorktreeBasePath(
|
|
repo: WorktreeBasePathRepo,
|
|
settings: WorktreePathSettings
|
|
): string {
|
|
const basePath = getRepoWorktreeBasePath(repo)
|
|
if (basePath === undefined) {
|
|
return settings.workspaceDir
|
|
}
|
|
return resolveWslRepoWorktreeBasePath(repo.path, basePath)
|
|
}
|
|
|
|
function getRepoWorktreeBasePath(repo: Pick<Repo, 'worktreeBasePath'>): string | undefined {
|
|
const trimmed = repo.worktreeBasePath?.trim()
|
|
return trimmed || undefined
|
|
}
|
|
|
|
/**
|
|
* Which distro's filesystem this repo's worktrees belong on, if any.
|
|
*
|
|
* A repo already inside WSL names its own distro. A repo on a Windows drive
|
|
* names none — but if this project's git runs in WSL, its worktrees still
|
|
* belong on the Linux side: `git status` stats every working-tree file, and
|
|
* doing that across the 9p mount is ~20x slower than the same clean tree on
|
|
* ext4 (`git worktree add` ~26x), with only the gitdir left on the Windows drive.
|
|
*/
|
|
function resolveMirrorDistro(
|
|
repoPath: string,
|
|
settings: { wslMirrorDistro?: string }
|
|
): string | undefined {
|
|
const wsl = parseWslPath(repoPath)
|
|
if (wsl) {
|
|
return wsl.distro
|
|
}
|
|
return isWindowsAbsolutePathLike(repoPath) ? settings.wslMirrorDistro : undefined
|
|
}
|
|
|
|
function shouldMirrorWorkspaceDirInsideWsl(repoPath: string, workspaceDir: string): boolean {
|
|
if (isWorkspaceDirRelativeToRepo(repoPath, workspaceDir)) {
|
|
return false
|
|
}
|
|
return !isWslUncPath(workspaceDir)
|
|
}
|
|
|
|
/**
|
|
* Determine whether a display name should be persisted.
|
|
* A display name is set only when the user's requested name differs from
|
|
* both the branch name and the sanitized name (i.e. it was modified).
|
|
*/
|
|
/**
|
|
* Parse a composite worktreeId ("repoId::worktreePath") into its parts.
|
|
*/
|
|
export function parseWorktreeId(worktreeId: string): { repoId: string; worktreePath: string } {
|
|
const parsed = splitWorktreeId(worktreeId)
|
|
if (!parsed) {
|
|
throw new Error(`Invalid worktreeId: ${worktreeId}`)
|
|
}
|
|
return parsed
|
|
}
|
|
|
|
/**
|
|
* Check whether a git error indicates the worktree is no longer tracked by git.
|
|
* This happens when a worktree's internal git tracking is removed (e.g. via
|
|
* `git worktree prune`) but the directory still exists on disk.
|
|
*/
|
|
export function isOrphanedWorktreeError(error: unknown): boolean {
|
|
if (!(error instanceof Error)) {
|
|
return false
|
|
}
|
|
const msg = (error as { stderr?: string }).stderr || error.message
|
|
return /is not a working tree/.test(msg)
|
|
}
|
|
|
|
export function isWindowsLongPathWorktreeRemovalError(
|
|
error: unknown,
|
|
platform: NodeJS.Platform = process.platform
|
|
): boolean {
|
|
if (platform !== 'win32' || typeof error !== 'object' || error === null) {
|
|
return false
|
|
}
|
|
const errorWithDetails = error as { message?: unknown; stderr?: unknown; stdout?: unknown }
|
|
const details = [errorWithDetails.stderr, errorWithDetails.stdout, errorWithDetails.message]
|
|
.filter((value): value is string => typeof value === 'string' && value.trim().length > 0)
|
|
.join('\n')
|
|
|
|
// Why: Git for Windows has reported this failure through both stderr and the
|
|
// thrown message, with wording that varies between "filename" and "path".
|
|
return /(?:file ?name|path).{0,40}too long|too long.{0,40}(?:file ?name|path)/i.test(details)
|
|
}
|
|
|
|
export function isOrphanCompatiblePreflightError(error: unknown): boolean {
|
|
if (isOrphanedWorktreeError(error)) {
|
|
return true
|
|
}
|
|
if (!(error instanceof Error)) {
|
|
return false
|
|
}
|
|
const errorWithDetails = error as Error & { code?: unknown; stderr?: string; stdout?: string }
|
|
const details = [
|
|
errorWithDetails.stderr,
|
|
errorWithDetails.stdout,
|
|
errorWithDetails.message,
|
|
typeof errorWithDetails.code === 'string' ? errorWithDetails.code : undefined
|
|
]
|
|
.filter((value): value is string => Boolean(value))
|
|
.join('\n')
|
|
return /not a git repository/i.test(details) || /\bENOENT\b/i.test(details)
|
|
}
|
|
|
|
/**
|
|
* Format a human-readable error message for worktree removal failures.
|
|
*/
|
|
export function formatWorktreeRemovalError(
|
|
error: unknown,
|
|
worktreePath: string,
|
|
force: boolean
|
|
): string {
|
|
const fallback = force
|
|
? `Failed to force delete worktree at ${worktreePath}.`
|
|
: `Failed to delete worktree at ${worktreePath}.`
|
|
|
|
if (!(error instanceof Error)) {
|
|
return fallback
|
|
}
|
|
|
|
const errorWithStreams = error as Error & { stderr?: string; stdout?: string }
|
|
const details = [errorWithStreams.stderr, errorWithStreams.stdout, error.message]
|
|
.map((value) => value?.trim())
|
|
.find(Boolean)
|
|
|
|
return details ? `${fallback} ${details}` : fallback
|
|
}
|