Files
orca/mobile/src/session/mobile-diff-comments.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

178 lines
4.6 KiB
TypeScript

import { describe, expect, it } from 'vitest'
import type { DiffComment } from '../../../src/shared/diff-comment-types'
import {
addMobileDiffComment,
formatDiffComments,
formatMobileDiffReviewPrompt,
normalizeMobileDiffComments,
removeDeliveredMobileDiffComments,
removeMobileDiffComments
} from './mobile-diff-comments'
function comment(overrides: Partial<DiffComment> & Pick<DiffComment, 'id'>): DiffComment {
const { id, ...rest } = overrides
return {
id,
worktreeId: 'wt-1',
filePath: 'src/app.ts',
source: 'diff',
lineNumber: 4,
body: 'check this',
createdAt: 100,
side: 'modified',
...rest
}
}
describe('mobile diff comments', () => {
it('normalizes persisted worktree metadata for mobile rendering', () => {
expect(
normalizeMobileDiffComments(
[
comment({ id: 'a' }),
{ id: 'missing-body', filePath: 'src/app.ts', lineNumber: 1, body: ' ' },
null
],
'wt-1'
)
).toEqual([comment({ id: 'a' })])
})
it('creates trimmed modified-side comments', () => {
const result = addMobileDiffComment([], {
id: 'mobile-1',
worktreeId: 'wt-1',
filePath: 'src/app.ts',
lineNumber: 8,
body: ' Needs tests ',
createdAt: 200
})
expect(result.comment).toMatchObject({
id: 'mobile-1',
worktreeId: 'wt-1',
filePath: 'src/app.ts',
source: 'diff',
lineNumber: 8,
body: 'Needs tests',
side: 'modified'
})
expect(result.comments).toHaveLength(1)
})
it('creates file-level scoped comments', () => {
const result = addMobileDiffComment([], {
id: 'mobile-1',
worktreeId: 'wt-1',
filePath: 'src/app.ts',
oldPath: 'src/old-app.ts',
lineNumber: 0,
body: ' File note ',
createdAt: 200,
scope: 'branch',
diffIdentity: 'd1'
})
expect(result.comment).toMatchObject({
lineNumber: 0,
body: 'File note',
scope: 'branch',
oldPath: 'src/old-app.ts',
diffIdentity: 'd1'
})
})
it('rejects blank comment bodies', () => {
const existing = [comment({ id: 'a' })]
const result = addMobileDiffComment(existing, {
id: 'mobile-1',
worktreeId: 'wt-1',
filePath: 'src/app.ts',
lineNumber: 8,
body: ' ',
createdAt: 200
})
expect(result.comment).toBeNull()
expect(result.comments).toEqual(existing)
})
it('removes delivered comments by snapshot id without touching new notes', () => {
expect(
removeMobileDiffComments(
[comment({ id: 'a' }), comment({ id: 'b' })],
new Set(['a', 'missing'])
)
).toEqual([comment({ id: 'b' })])
})
it('keeps a changed note when clearing an older delivered snapshot', () => {
const delivered = comment({ id: 'a', body: 'old note' })
expect(
removeDeliveredMobileDiffComments(
[comment({ id: 'a', body: 'new note' }), comment({ id: 'b' })],
[delivered]
)
).toEqual([comment({ id: 'a', body: 'new note' }), comment({ id: 'b' })])
})
it('uses the desktop-compatible prompt format', () => {
expect(formatDiffComments([comment({ id: 'a', body: 'quote "this"' })])).toBe(
['File: src/app.ts', 'Line: 4', 'User comment: "quote \\"this\\""'].join('\n')
)
})
it('formats file-level notes with file scope', () => {
expect(formatDiffComments([comment({ id: 'a', lineNumber: 0 })])).toBe(
['File: src/app.ts', 'Scope: file', 'User comment: "check this"'].join('\n')
)
})
it('wraps sent review notes in the mobile agent prompt', () => {
expect(formatMobileDiffReviewPrompt([comment({ id: 'a' })])).toBe(
[
'You are reviewing the current worktree. Address the following mobile review notes.',
'',
'File: src/app.ts',
'Line: 4',
'User comment: "check this"',
'',
'After applying fixes:',
'1. Summarize changed files.',
'2. Run relevant tests.',
'3. Tell me if anything remains risky.'
].join('\n')
)
})
it('keeps review metadata while normalizing persisted notes', () => {
expect(
normalizeMobileDiffComments(
[
comment({
id: 'a',
lineNumber: 0,
updatedAt: 200,
sentAt: 300,
scope: 'staged',
oldPath: 'src/old.ts',
diffIdentity: 'd1'
})
],
'wt-1'
)
).toEqual([
comment({
id: 'a',
lineNumber: 0,
updatedAt: 200,
sentAt: 300,
scope: 'staged',
oldPath: 'src/old.ts',
diffIdentity: 'd1'
})
])
})
})