Files
orca/src/main/runtime/runtime-folder-workspace.test.ts
T
Neil 77f23b013f refactor(shared): drop the shared/types barrel and import from the real modules (#14447)
#14397 split `shared/types.ts` into 46 per-domain modules but kept the path as
a re-export barrel so the import sites did not have to change. This removes
the barrel: every consumer now imports from the module that actually declares
the type, and `src/shared/types.ts` is deleted.

Barrels hide where a type lives, make every consumer look like it depends on
the whole domain, and let an unrelated edit invalidate a module that ~2,000
files transitively import.

2,323 import declarations across 2,321 files. Rewritten mechanically: each
specifier was resolved to an absolute path via the TypeScript AST and
recomputed, rather than string-substituted, so alias forms (`@/../../shared/
types`) and per-specifier `type` modifiers survive.

Four cases the mechanical pass had to handle, each found by a gate rather than
by reading the diff:

- Modules inside `src/shared` import the barrel as `./types`, not
  `shared/types`. A pre-filter on the latter string skipped 176 of them and
  left imports dangling at a deleted file, which surfaced as confusing
  `Property 'x' is optional in type 'Repo' but required in Pick<Repo, ...>`
  errors rather than "module not found".
- The barrel RENAMED one type on the way through
  (`WorkspaceSource as WorkspaceCreateTelemetrySource`), so the original name
  in the owning module has to be re-aliased at each consumer.
- Three test files put `;(globalThis as ...)` on the line after the import.
  TypeScript parses that `;` as the import statement's terminator, so
  replacing through `statement.getEnd()` deletes it and breaks ASI. The
  rewrite now stops at the module specifier.
- A file that already imported directly from a module got a SECOND import
  from it, because the barrel re-exported those same names — which trips
  `import/no-duplicates` under `--deny-warnings`. A post-pass merges
  declarations sharing a specifier and type-only-ness; the `import type` plus
  `import` pair from one module is left alone, since that form is allowed.

Splitting one barrel import into several genuinely adds lines, which pushed
`terminal-layout-pty-ownership.ts` to 301 counted lines: its 107-character
import must wrap, and neither local type collapses onto one line (101 and 116
characters). Rather than contort a type declaration to fit a line budget,
`collectLeafIds` and `pruneLeaves` move to `terminal-pane-layout-tree.ts` —
they are pure structural operations on the layout tree and independent of PTY
ownership. `visible-worktrees.ts` similarly loses its own mini-barrel
re-export of `isDefaultBranchWorkspace`, with the four real consumers
repointed at the declaring module. No `max-lines` bypass added.

Verified: cold `tsc --noEmit` green on node, cli, and web (buildinfo deleted
first — these projects are `composite: true` and reuse stale caches); the full
`pnpm lint` green, not just bare oxlint — the narrower local check is what let
the duplicate imports reach CI; max-lines ratchet OK at 344.
2026-08-13 22:48:24 -07:00

192 lines
6.2 KiB
TypeScript

import { describe, expect, it } from 'vitest'
import type { Repo } from '../../shared/repo-types'
import type { WorktreeMeta } from '../../shared/worktree/meta-types'
import { FOLDER_WORKSPACE_INSTANCE_SEPARATOR } from '../../shared/worktree/id'
import {
getRuntimeFolderWorkspaceInstanceId,
getRuntimeFolderWorkspaceRootId,
isRuntimeFolderWorkspaceIdForRepo,
mergeRuntimeFolderWorkspace
} from './runtime-folder-workspace'
// characterization: current behavior
function repo(overrides: Partial<Repo> = {}): Repo {
return {
id: 'repo-1',
path: '/Users/dev/projects/site',
displayName: 'site',
badgeColor: '#000000',
addedAt: 0,
...overrides
}
}
function meta(overrides: Partial<WorktreeMeta> = {}): WorktreeMeta {
return {
displayName: '',
comment: '',
linkedIssue: null,
linkedPR: null,
linkedLinearIssue: null,
isArchived: false,
isUnread: false,
isPinned: false,
sortOrder: 0,
lastActivityAt: 0,
...overrides
}
}
describe('getRuntimeFolderWorkspaceRootId', () => {
it.each([
{ label: 'posix path', input: repo(), expected: 'repo-1::/Users/dev/projects/site' },
{
label: 'windows path',
input: repo({ path: 'C:\\Users\\dev\\site' }),
expected: 'repo-1::C:\\Users\\dev\\site'
},
{
label: 'ssh repo (connectionId is not part of the id)',
input: repo({ connectionId: 'ssh-1', path: '/home/dev/site' }),
expected: 'repo-1::/home/dev/site'
},
{ label: 'empty path', input: repo({ path: '' }), expected: 'repo-1::' }
])('joins repo id and path for $label', ({ input, expected }) => {
expect(getRuntimeFolderWorkspaceRootId(input)).toBe(expected)
})
})
describe('getRuntimeFolderWorkspaceInstanceId', () => {
it('appends the instance id after the separator', () => {
expect(getRuntimeFolderWorkspaceInstanceId(repo(), 'abc')).toBe(
`repo-1::/Users/dev/projects/site${FOLDER_WORKSPACE_INSTANCE_SEPARATOR}abc`
)
})
it('appends an empty instance id without complaint', () => {
expect(getRuntimeFolderWorkspaceInstanceId(repo(), '')).toBe(
`repo-1::/Users/dev/projects/site${FOLDER_WORKSPACE_INSTANCE_SEPARATOR}`
)
})
})
describe('isRuntimeFolderWorkspaceIdForRepo', () => {
const root = 'repo-1::/Users/dev/projects/site'
it.each([
{ label: 'the root id itself', worktreeId: root, expected: true },
{
label: 'an instance id under the root',
worktreeId: `${root}${FOLDER_WORKSPACE_INSTANCE_SEPARATOR}abc`,
expected: true
},
{
label: 'a sibling path that merely shares the root as a prefix',
worktreeId: `${root}-other`,
expected: false
},
{ label: 'another repo', worktreeId: 'repo-2::/Users/dev/projects/site', expected: false },
{ label: 'an unrelated id', worktreeId: '', expected: false }
])('$label', ({ worktreeId, expected }) => {
expect(isRuntimeFolderWorkspaceIdForRepo(repo(), worktreeId)).toBe(expected)
})
})
describe('mergeRuntimeFolderWorkspace', () => {
it('projects repo + meta onto a branchless, headless worktree', () => {
const merged = mergeRuntimeFolderWorkspace(repo(), 'repo-1::/Users/dev/projects/site', meta())
expect(merged).toEqual({
id: 'repo-1::/Users/dev/projects/site',
repoId: 'repo-1',
path: '/Users/dev/projects/site',
head: '',
branch: '',
isBare: false,
isMainWorktree: true,
displayName: 'site',
comment: '',
linkedIssue: null,
linkedPR: null,
linkedLinearIssue: null,
linkedLinearIssueWorkspaceId: null,
linkedLinearIssueOrganizationUrlKey: null,
linkedGitLabMR: null,
linkedGitLabIssue: null,
linkedBitbucketPR: null,
linkedAzureDevOpsPR: null,
linkedGiteaPR: null,
linkedWorkItem: null,
linkedTaskSourceContext: null,
isArchived: false,
isUnread: false,
isPinned: false,
sortOrder: 0,
lastActivityAt: 0,
workspaceStatus: 'in-progress',
diffComments: undefined,
mobileDiffReview: undefined
})
})
it('marks a non-root id as a secondary workspace', () => {
const worktreeId = `repo-1::/Users/dev/projects/site${FOLDER_WORKSPACE_INSTANCE_SEPARATOR}abc`
const merged = mergeRuntimeFolderWorkspace(repo(), worktreeId, meta({ instanceId: 'abc' }))
expect(merged.isMainWorktree).toBe(false)
expect(merged.instanceId).toBe('abc')
expect(merged.path).toBe('/Users/dev/projects/site')
})
it('falls back to the repo display name when meta has a blank one', () => {
expect(mergeRuntimeFolderWorkspace(repo(), 'id', meta()).displayName).toBe('site')
expect(
mergeRuntimeFolderWorkspace(repo(), 'id', meta({ displayName: 'custom' })).displayName
).toBe('custom')
})
it('omits optional keys rather than writing undefined for them', () => {
const merged = mergeRuntimeFolderWorkspace(repo(), 'id', meta())
expect('instanceId' in merged).toBe(false)
expect('projectId' in merged).toBe(false)
expect('hostId' in merged).toBe(false)
expect('projectHostSetupId' in merged).toBe(false)
expect('manualOrder' in merged).toBe(false)
expect('createdAt' in merged).toBe(false)
expect('createdWithAgent' in merged).toBe(false)
expect('automationProvenance' in merged).toBe(false)
expect('cliProvenance' in merged).toBe(false)
expect('priorWorktreeIds' in merged).toBe(false)
})
it('carries project-first ownership fields through when present', () => {
const merged = mergeRuntimeFolderWorkspace(
repo(),
'id',
meta({
projectId: 'project-1',
hostId: 'local',
projectHostSetupId: 'setup-1',
manualOrder: 3,
createdAt: 42,
priorWorktreeIds: ['old-id']
})
)
expect(merged.projectId).toBe('project-1')
expect(merged.hostId).toBe('local')
expect(merged.projectHostSetupId).toBe('setup-1')
expect(merged.manualOrder).toBe(3)
expect(merged.createdAt).toBe(42)
expect(merged.priorWorktreeIds).toEqual(['old-id'])
})
it('keeps an explicit workspace status instead of the default', () => {
expect(
mergeRuntimeFolderWorkspace(repo(), 'id', meta({ workspaceStatus: 'done' })).workspaceStatus
).toBe('done')
})
})