mirror of
https://github.com/stablyai/orca.git
synced 2026-09-22 16:02:32 +00:00
* chore(lint): upgrade oxlint to 1.71 and enable 7 new rules Upgrade oxlint 1.67.0 -> 1.71.0 (1.72 was blocked by the repo's 3-day minimum-release-age supply-chain guard; nothing here needs it). The bump is a no-op on the existing config. Enable 3 error rules (backlog autofixed to zero in this commit) and 4 warn rules (surface signal without gating CI): error (autofixed, behavior-preserving): - unicorn/prefer-node-protocol (~1531 sites: bare builtin -> node:) - typescript/no-import-type-side-effects (~36: all-inline-type -> import type) - unicorn/no-array-reverse (19: copy-then-reverse -> toReversed) warn (real signal, current fires are test-only/correct): - unicorn/no-array-fill-with-reference-type (aliasing footgun guard) - typescript/no-unsafe-function-type (bans bare Function type) - unicorn/prefer-array-flat-map (map().flat() -> flatMap()) - unicorn/prefer-regexp-test (.match() in bool ctx -> .test()) mobile/.oxlintrc.json extends root, so it inherits all 7; the autofix ran from root and covered mobile/ too. Verification (all green): oxlint 0 errors (root+mobile+aux configs), oxfmt clean, typecheck (node+cli+web), vitest 22795 passed / 0 failed, builds (electron-vite + web + cli) succeed. node: rewrites confirmed to skip embedded SSH/CLI string payloads (AST-only); all toReversed sites verified to operate on fresh copies or write-once locals. * chore(lint): bump mobile oxlint to 1.71 so inherited rules parse mobile/ is a standalone pnpm project pinning its own oxlint@1.67, which lacks unicorn/no-array-fill-with-reference-type (needs >=1.70). Since mobile/.oxlintrc.json extends the root config, mobile CI's 'cd mobile && oxlint' failed to parse the new rule. Bump mobile to match root (1.71). Verified in mobile/: oxlint 0 errors, oxfmt --check clean, tsc --noEmit pass, vitest 978 passed / 0 failed. Co-authored-by: Orca <help@stably.ai> --------- Co-authored-by: Orca <help@stably.ai>
296 lines
9.4 KiB
TypeScript
296 lines
9.4 KiB
TypeScript
import { describe, expect, it, vi } from 'vitest'
|
|
import * as path from 'node:path'
|
|
import type { GitExec } from './git-handler-ops'
|
|
import { addWorktreeOp, removeWorktreeOp } from './git-handler-worktree-ops'
|
|
|
|
function worktreeList(...entries: { path: string; branch?: string }[]): string {
|
|
return entries
|
|
.map((entry, index) =>
|
|
[
|
|
`worktree ${entry.path}`,
|
|
`HEAD ${index}`,
|
|
...(entry.branch ? [`branch refs/heads/${entry.branch}`] : [])
|
|
].join('\n')
|
|
)
|
|
.join('\n\n')
|
|
}
|
|
|
|
function resolvedRepoPath(): string {
|
|
return path.posix.resolve('/repo-feature', '/repo/.git', '..')
|
|
}
|
|
|
|
describe('addWorktreeOp', () => {
|
|
it('writes durable branch base config after creating an SSH new-branch worktree', async () => {
|
|
const git = vi.fn<GitExec>(async () => ({ stdout: '', stderr: '' }))
|
|
|
|
await addWorktreeOp(git, {
|
|
repoPath: '/repo',
|
|
branchName: 'feature/test',
|
|
targetDir: '/repo-feature',
|
|
base: 'origin/main'
|
|
})
|
|
|
|
expect(git.mock.calls.map((call) => call[0])).toEqual([
|
|
['rev-parse', '--verify', '--quiet', 'refs/remotes/origin/main^{commit}'],
|
|
[
|
|
'worktree',
|
|
'add',
|
|
'--no-track',
|
|
'-b',
|
|
'feature/test',
|
|
'/repo-feature',
|
|
'refs/remotes/origin/main'
|
|
],
|
|
[
|
|
'config',
|
|
'--local',
|
|
'--replace-all',
|
|
'branch.feature/test.base',
|
|
'refs/remotes/origin/main'
|
|
],
|
|
['config', '--get', 'push.autoSetupRemote']
|
|
])
|
|
expect(git.mock.calls.map((call) => call[0])).not.toContainEqual([
|
|
'config',
|
|
'--local',
|
|
'branch.feature/test.remote',
|
|
'origin'
|
|
])
|
|
expect(git.mock.calls.map((call) => call[0])).not.toContainEqual([
|
|
'config',
|
|
'--local',
|
|
'branch.feature/test.merge',
|
|
'refs/heads/main'
|
|
])
|
|
})
|
|
|
|
it('does not write branch base config when checking out an existing SSH branch', async () => {
|
|
const git = vi.fn<GitExec>(async () => ({ stdout: '', stderr: '' }))
|
|
|
|
await addWorktreeOp(git, {
|
|
repoPath: '/repo',
|
|
branchName: 'feature/test',
|
|
targetDir: '/repo-feature',
|
|
base: 'origin/main',
|
|
checkoutExistingBranch: true
|
|
})
|
|
|
|
expect(git.mock.calls.map((call) => call[0])).toEqual([
|
|
['worktree', 'add', '/repo-feature', 'feature/test']
|
|
])
|
|
})
|
|
|
|
it('does not write branch base config when SSH creation has no base', async () => {
|
|
const git = vi.fn<GitExec>(async () => ({ stdout: '', stderr: '' }))
|
|
|
|
await addWorktreeOp(git, {
|
|
repoPath: '/repo',
|
|
branchName: 'feature/no-base',
|
|
targetDir: '/repo-feature'
|
|
})
|
|
|
|
expect(git.mock.calls.map((call) => call[0])).toEqual([
|
|
['worktree', 'add', '--no-track', '-b', 'feature/no-base', '/repo-feature'],
|
|
['config', '--get', 'push.autoSetupRemote']
|
|
])
|
|
})
|
|
|
|
it('warns and unsets stale branch base config when SSH base persistence fails', async () => {
|
|
const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
|
|
const git = vi.fn<GitExec>(async (args) => {
|
|
if (args[0] === 'config' && args[2] === '--replace-all') {
|
|
throw new Error('config locked')
|
|
}
|
|
return { stdout: '', stderr: '' }
|
|
})
|
|
|
|
await expect(
|
|
addWorktreeOp(git, {
|
|
repoPath: '/repo',
|
|
branchName: 'feature/test',
|
|
targetDir: '/repo-feature',
|
|
base: 'origin/main'
|
|
})
|
|
).resolves.toBeUndefined()
|
|
|
|
expect(warnSpy).toHaveBeenCalledWith(
|
|
'relay addWorktree: failed to set branch.feature/test.base for /repo-feature',
|
|
expect.any(Error)
|
|
)
|
|
expect(git.mock.calls.map((call) => call[0])).toContainEqual([
|
|
'config',
|
|
'--local',
|
|
'--unset-all',
|
|
'branch.feature/test.base'
|
|
])
|
|
warnSpy.mockRestore()
|
|
})
|
|
})
|
|
|
|
describe('removeWorktreeOp', () => {
|
|
it('deletes the now-unused branch after removing an SSH worktree', async () => {
|
|
const calls: string[] = []
|
|
let listCount = 0
|
|
const git = vi.fn<GitExec>(async (args, cwd) => {
|
|
calls.push(`${cwd}$ ${args.join(' ')}`)
|
|
if (args[0] === 'rev-parse') {
|
|
return { stdout: '/repo/.git\n', stderr: '' }
|
|
}
|
|
if (args[0] === 'worktree' && args[1] === 'list') {
|
|
listCount += 1
|
|
return {
|
|
stdout:
|
|
listCount === 1
|
|
? worktreeList(
|
|
{ path: '/repo', branch: 'main' },
|
|
{ path: '/repo-feature', branch: 'feature/test' }
|
|
)
|
|
: worktreeList({ path: '/repo', branch: 'main' }),
|
|
stderr: ''
|
|
}
|
|
}
|
|
return { stdout: '', stderr: '' }
|
|
})
|
|
|
|
await removeWorktreeOp(git, { worktreePath: '/repo-feature' })
|
|
|
|
expect(calls).toEqual([
|
|
'/repo-feature$ rev-parse --git-common-dir',
|
|
`${resolvedRepoPath()}$ worktree list --porcelain -z`,
|
|
`${resolvedRepoPath()}$ worktree remove /repo-feature`,
|
|
`${resolvedRepoPath()}$ branch -d -- feature/test`
|
|
])
|
|
})
|
|
|
|
it('preserves the branch (does not throw) when `branch -d` refuses an unmerged branch', async () => {
|
|
let listCount = 0
|
|
const git = vi.fn<GitExec>(async (args) => {
|
|
if (args[0] === 'rev-parse') {
|
|
return { stdout: '/repo/.git\n', stderr: '' }
|
|
}
|
|
if (args[0] === 'worktree' && args[1] === 'list') {
|
|
listCount += 1
|
|
return {
|
|
stdout:
|
|
listCount === 1
|
|
? worktreeList(
|
|
{ path: '/repo', branch: 'main' },
|
|
{ path: '/repo-feature', branch: 'feature/test' }
|
|
)
|
|
: worktreeList({ path: '/repo', branch: 'main' }),
|
|
stderr: ''
|
|
}
|
|
}
|
|
if (args[0] === 'branch' && args[1] === '-d') {
|
|
throw new Error('error: the branch feature/test is not fully merged')
|
|
}
|
|
return { stdout: '', stderr: '' }
|
|
})
|
|
|
|
// The unmerged-branch refusal must be surfaced without failing workspace removal.
|
|
await expect(removeWorktreeOp(git, { worktreePath: '/repo-feature' })).resolves.toEqual({
|
|
preservedBranch: { branchName: 'feature/test', head: '1' }
|
|
})
|
|
|
|
expect(git).toHaveBeenCalledWith(['branch', '-d', '--', 'feature/test'], expect.any(String))
|
|
expect(git).not.toHaveBeenCalledWith(['branch', '-D', '--', 'feature/test'], expect.any(String))
|
|
})
|
|
|
|
it('force-deletes the just-created branch during failed sparse setup rollback', async () => {
|
|
let listCount = 0
|
|
const git = vi.fn<GitExec>(async (args) => {
|
|
if (args[0] === 'rev-parse') {
|
|
return { stdout: '/repo/.git\n', stderr: '' }
|
|
}
|
|
if (args[0] === 'worktree' && args[1] === 'list') {
|
|
listCount += 1
|
|
return {
|
|
stdout:
|
|
listCount === 1
|
|
? worktreeList(
|
|
{ path: '/repo', branch: 'main' },
|
|
{ path: '/repo-feature', branch: 'feature/test' }
|
|
)
|
|
: worktreeList({ path: '/repo', branch: 'main' }),
|
|
stderr: ''
|
|
}
|
|
}
|
|
return { stdout: '', stderr: '' }
|
|
})
|
|
|
|
await removeWorktreeOp(git, {
|
|
worktreePath: '/repo-feature',
|
|
force: true,
|
|
forceBranchDelete: true
|
|
})
|
|
|
|
expect(git).toHaveBeenCalledWith(['branch', '-D', '--', 'feature/test'], expect.any(String))
|
|
expect(git).not.toHaveBeenCalledWith(['branch', '-d', '--', 'feature/test'], expect.any(String))
|
|
})
|
|
|
|
it('skips branch deletion entirely when deleteBranch is false', async () => {
|
|
const calls: string[] = []
|
|
const git = vi.fn<GitExec>(async (args, cwd) => {
|
|
calls.push(`${cwd}$ ${args.join(' ')}`)
|
|
if (args[0] === 'rev-parse') {
|
|
return { stdout: '/repo/.git\n', stderr: '' }
|
|
}
|
|
if (args[0] === 'worktree' && args[1] === 'list') {
|
|
return {
|
|
stdout: worktreeList(
|
|
{ path: '/repo', branch: 'main' },
|
|
{ path: '/repo-feature', branch: 'feature/test' }
|
|
),
|
|
stderr: ''
|
|
}
|
|
}
|
|
return { stdout: '', stderr: '' }
|
|
})
|
|
|
|
await removeWorktreeOp(git, { worktreePath: '/repo-feature', deleteBranch: false })
|
|
|
|
expect(calls).toEqual([
|
|
'/repo-feature$ rev-parse --git-common-dir',
|
|
`${resolvedRepoPath()}$ worktree list --porcelain -z`,
|
|
`${resolvedRepoPath()}$ worktree remove /repo-feature`
|
|
])
|
|
})
|
|
|
|
it('keeps the branch when Git reports another SSH worktree still uses it', async () => {
|
|
let listCount = 0
|
|
const git = vi.fn<GitExec>(async (args, _cwd) => {
|
|
if (args[0] === 'rev-parse') {
|
|
return { stdout: '/repo/.git\n', stderr: '' }
|
|
}
|
|
if (args[0] === 'worktree' && args[1] === 'list') {
|
|
listCount += 1
|
|
return {
|
|
stdout:
|
|
listCount === 1
|
|
? worktreeList(
|
|
{ path: '/repo', branch: 'main' },
|
|
{ path: '/repo-feature', branch: 'feature/test' }
|
|
)
|
|
: worktreeList(
|
|
{ path: '/repo', branch: 'main' },
|
|
{ path: '/repo-other', branch: 'feature/test' }
|
|
),
|
|
stderr: ''
|
|
}
|
|
}
|
|
if (args[0] === 'branch' && args[1] === '-d') {
|
|
throw new Error(
|
|
"error: cannot delete branch 'feature/test' used by worktree at '/repo-other'"
|
|
)
|
|
}
|
|
return { stdout: '', stderr: '' }
|
|
})
|
|
|
|
await removeWorktreeOp(git, { worktreePath: '/repo-feature' })
|
|
|
|
expect(git).toHaveBeenCalledWith(['branch', '-d', '--', 'feature/test'], expect.any(String))
|
|
expect(git).toHaveBeenCalledWith(['worktree', 'prune'], expect.any(String))
|
|
expect(git).not.toHaveBeenCalledWith(['branch', '-D', '--', 'feature/test'], expect.any(String))
|
|
})
|
|
})
|