mirror of
https://github.com/stablyai/orca.git
synced 2026-10-26 16:02:42 +00:00
#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.
143 lines
5.2 KiB
TypeScript
143 lines
5.2 KiB
TypeScript
import { mkdtempSync, rmSync } from 'node:fs'
|
|
import { tmpdir } from 'node:os'
|
|
import { join } from 'node:path'
|
|
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
|
|
import type { WorktreeMeta } from '../../shared/worktree/meta-types'
|
|
import type * as GitStatusModule from '../git/status'
|
|
import type * as CommitMessageTextGenerationModule from '../text-generation/commit-message-text-generation'
|
|
import type * as WorktreeModule from '../git/worktree'
|
|
import { OrcaRuntimeService } from './orca-runtime'
|
|
|
|
const mocks = vi.hoisted(() => ({
|
|
listWorktrees: vi.fn(),
|
|
getStagedCommitContext: vi.fn(),
|
|
generateCommitMessageFromContext: vi.fn(),
|
|
resolveCommitMessageSettings: vi.fn()
|
|
}))
|
|
|
|
vi.mock('../git/worktree', async () => ({
|
|
...(await vi.importActual<typeof WorktreeModule>('../git/worktree')),
|
|
listWorktrees: mocks.listWorktrees,
|
|
listWorktreesStrict: mocks.listWorktrees
|
|
}))
|
|
|
|
vi.mock('../git/status', async () => ({
|
|
...(await vi.importActual<typeof GitStatusModule>('../git/status')),
|
|
getStagedCommitContext: mocks.getStagedCommitContext
|
|
}))
|
|
|
|
vi.mock('../text-generation/commit-message-text-generation', async () => ({
|
|
...(await vi.importActual<typeof CommitMessageTextGenerationModule>(
|
|
'../text-generation/commit-message-text-generation'
|
|
)),
|
|
generateCommitMessageFromContext: mocks.generateCommitMessageFromContext,
|
|
resolveCommitMessageSettings: mocks.resolveCommitMessageSettings
|
|
}))
|
|
|
|
const REPO_ID = 'repo-1'
|
|
const STAGED_CONTEXT = { branch: 'main', stagedSummary: 'M\tREADME.md', stagedPatch: '+hello' }
|
|
const PARAMS = { agentId: 'codex', model: 'gpt-5.4-mini' }
|
|
|
|
const tempDirs: string[] = []
|
|
|
|
/**
|
|
* Store double narrow enough to drive worktree resolution, so the runtime runs
|
|
* its real hydration (`listResolvedWorktrees` → `mergeWorktree` → cache) instead
|
|
* of a hand-built worktree fixture carrying `linkedIssue`.
|
|
*/
|
|
function makeStore(worktreePath: string) {
|
|
const worktreeId = `${REPO_ID}::${worktreePath}`
|
|
const worktreeMeta: Record<string, WorktreeMeta> = {
|
|
[worktreeId]: {
|
|
instanceId: worktreeId,
|
|
displayName: 'wt',
|
|
comment: '',
|
|
linkedIssue: null,
|
|
linkedPR: null,
|
|
linkedLinearIssue: null,
|
|
isArchived: false,
|
|
isUnread: false,
|
|
isPinned: false,
|
|
sortOrder: 0,
|
|
lastActivityAt: 0
|
|
}
|
|
}
|
|
return {
|
|
worktreeId,
|
|
updateLinkedIssue: (linkedIssue: number | null): void => {
|
|
// Why: mirrors `worktrees:updateMeta`, which persists the link without
|
|
// invalidating the runtime's resolved-worktree cache.
|
|
worktreeMeta[worktreeId] = { ...worktreeMeta[worktreeId], linkedIssue }
|
|
},
|
|
store: {
|
|
getRepos: () => [
|
|
{ id: REPO_ID, path: worktreePath, displayName: 'repo', badgeColor: 'blue', addedAt: 1 }
|
|
],
|
|
getRepo: (id: string) =>
|
|
id === REPO_ID
|
|
? { id: REPO_ID, path: worktreePath, displayName: 'repo', badgeColor: 'blue', addedAt: 1 }
|
|
: undefined,
|
|
getAllWorktreeMeta: () => worktreeMeta,
|
|
getWorktreeMeta: (id: string) => worktreeMeta[id],
|
|
setWorktreeMeta: (id: string, updates: Partial<WorktreeMeta>) => {
|
|
worktreeMeta[id] = { ...worktreeMeta[id], ...updates }
|
|
return worktreeMeta[id]
|
|
},
|
|
getSettings: () => ({})
|
|
}
|
|
}
|
|
}
|
|
|
|
async function generatedCommitContext(
|
|
runtime: OrcaRuntimeService,
|
|
worktreeId: string
|
|
): Promise<Record<string, unknown>> {
|
|
mocks.generateCommitMessageFromContext.mockClear()
|
|
await runtime.generateRuntimeCommitMessage(`id:${worktreeId}`)
|
|
return mocks.generateCommitMessageFromContext.mock.calls[0][0]
|
|
}
|
|
|
|
describe('runtime commit-message generation linked-issue freshness', () => {
|
|
beforeEach(() => {
|
|
mocks.listWorktrees.mockReset()
|
|
mocks.getStagedCommitContext.mockReset()
|
|
mocks.generateCommitMessageFromContext.mockReset()
|
|
mocks.resolveCommitMessageSettings.mockReset()
|
|
mocks.getStagedCommitContext.mockResolvedValue(STAGED_CONTEXT)
|
|
mocks.generateCommitMessageFromContext.mockResolvedValue({ success: true, message: 'docs' })
|
|
mocks.resolveCommitMessageSettings.mockReturnValue({ ok: true, params: PARAMS })
|
|
})
|
|
|
|
afterEach(() => {
|
|
while (tempDirs.length > 0) {
|
|
rmSync(tempDirs.pop()!, { recursive: true, force: true })
|
|
}
|
|
})
|
|
|
|
it('substitutes the linked issue persisted since the last worktree resolution', async () => {
|
|
const worktreePath = mkdtempSync(join(tmpdir(), 'orca-linked-issue-'))
|
|
tempDirs.push(worktreePath)
|
|
const { store, worktreeId, updateLinkedIssue } = makeStore(worktreePath)
|
|
mocks.listWorktrees.mockResolvedValue([
|
|
{
|
|
path: worktreePath,
|
|
head: 'a'.repeat(40),
|
|
branch: 'main',
|
|
isBare: false,
|
|
isMainWorktree: true
|
|
}
|
|
])
|
|
const runtime = new OrcaRuntimeService(store as never)
|
|
|
|
// Why: the first generation warms the resolved-worktree cache with the
|
|
// unlinked projection, so a stale read would still answer `unlinked` below.
|
|
expect(await generatedCommitContext(runtime, worktreeId)).not.toHaveProperty('linkedIssue')
|
|
|
|
updateLinkedIssue(321)
|
|
expect(await generatedCommitContext(runtime, worktreeId)).toMatchObject({ linkedIssue: 321 })
|
|
|
|
updateLinkedIssue(null)
|
|
expect(await generatedCommitContext(runtime, worktreeId)).not.toHaveProperty('linkedIssue')
|
|
})
|
|
})
|