Files
orca/src/shared/folder-workspaces.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

117 lines
4.4 KiB
TypeScript

import type { FolderWorkspace } from './folder-workspace-types'
import type { ProjectGroup } from './project-group-types'
import { isTuiAgent } from './tui-agent-config'
import { normalizeStoredTaskSourceContext } from './task-source-context'
import { normalizeWorkspaceLinkedItem } from './workspace-linked-item'
import { isWorkspaceLinkedItemSourceContextMatch } from './workspace-linked-item-source-context'
import { normalizeWorkspaceCreatorProvenance } from './workspace-creator-provenance'
export function normalizeFolderWorkspaceName(
name: string | null | undefined,
fallback = 'Untitled workspace'
): string {
const trimmed = typeof name === 'string' ? name.trim() : ''
return trimmed.length > 0 ? trimmed : fallback
}
export function normalizeFolderWorkspaces(
value: unknown,
projectGroups: readonly ProjectGroup[]
): FolderWorkspace[] {
if (!Array.isArray(value)) {
return []
}
const folderGroups = new Map<string, ProjectGroup>()
for (const group of projectGroups) {
if (group.parentPath) {
folderGroups.set(group.id, group)
}
}
const workspaces: FolderWorkspace[] = []
const seen = new Set<string>()
for (const candidate of value) {
if (!candidate || typeof candidate !== 'object') {
continue
}
const raw = candidate as Partial<FolderWorkspace>
if (
typeof raw.id !== 'string' ||
raw.id.trim().length === 0 ||
seen.has(raw.id) ||
typeof raw.projectGroupId !== 'string' ||
!folderGroups.has(raw.projectGroupId)
) {
continue
}
const group = folderGroups.get(raw.projectGroupId)
const folderPath =
typeof raw.folderPath === 'string' && raw.folderPath.trim().length > 0
? raw.folderPath
: group?.parentPath
if (!folderPath) {
continue
}
const now = Date.now()
const linkedTask = normalizeWorkspaceLinkedItem(raw.linkedTask)
const linkedTaskSourceContext = normalizeStoredTaskSourceContext(raw.linkedTaskSourceContext)
const creatorProvenance = normalizeWorkspaceCreatorProvenance(raw.creatorProvenance)
seen.add(raw.id)
workspaces.push({
id: raw.id,
projectGroupId: raw.projectGroupId,
name: normalizeFolderWorkspaceName(raw.name),
folderPath,
connectionId:
typeof raw.connectionId === 'string'
? raw.connectionId
: raw.connectionId === null
? null
: (group?.connectionId ?? null),
...(creatorProvenance ? { creatorProvenance } : {}),
linkedTask,
linkedTaskSourceContext: isWorkspaceLinkedItemSourceContextMatch(
linkedTask,
linkedTaskSourceContext
)
? linkedTaskSourceContext
: null,
comment: typeof raw.comment === 'string' ? raw.comment : '',
isArchived: raw.isArchived === true,
isUnread: raw.isUnread === true,
isPinned: raw.isPinned === true,
sortOrder:
typeof raw.sortOrder === 'number' && Number.isFinite(raw.sortOrder) ? raw.sortOrder : now,
...(typeof raw.manualOrder === 'number' && Number.isFinite(raw.manualOrder)
? { manualOrder: raw.manualOrder }
: {}),
...(typeof raw.workspaceStatus === 'string' && raw.workspaceStatus.trim().length > 0
? { workspaceStatus: raw.workspaceStatus }
: {}),
...(isTuiAgent(raw.createdWithAgent) ? { createdWithAgent: raw.createdWithAgent } : {}),
...(raw.pendingFirstAgentMessageRename === true
? { pendingFirstAgentMessageRename: true }
: {}),
...(typeof raw.firstAgentMessageRenameError === 'string'
? { firstAgentMessageRenameError: raw.firstAgentMessageRenameError }
: raw.firstAgentMessageRenameError === null
? { firstAgentMessageRenameError: null }
: {}),
lastActivityAt:
typeof raw.lastActivityAt === 'number' && Number.isFinite(raw.lastActivityAt)
? raw.lastActivityAt
: 0,
createdAt:
typeof raw.createdAt === 'number' && Number.isFinite(raw.createdAt) ? raw.createdAt : now,
updatedAt:
typeof raw.updatedAt === 'number' && Number.isFinite(raw.updatedAt) ? raw.updatedAt : now,
// Legacy read: unreleased #14112 builds wrote notes inline. Canonical home is
// PersistedState.folderWorkspaceDiffComments.
...(Array.isArray(raw.diffComments) ? { diffComments: raw.diffComments } : {})
})
}
return workspaces.sort(
(left, right) => right.sortOrder - left.sortOrder || left.name.localeCompare(right.name)
)
}