mirror of
https://github.com/stablyai/orca.git
synced 2026-09-22 08:02:28 +00:00
Neil
77f23b013f
#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.
79 lines
2.8 KiB
TypeScript
79 lines
2.8 KiB
TypeScript
import { cleanGeneratedCommitMessage, truncateDiffForPrompt } from './commit-message-prompt'
|
|
import type { TuiAgent } from './tui-agent'
|
|
|
|
export type CommitMessageDraftAgent = TuiAgent | 'custom'
|
|
|
|
export type CommitMessageDraftContext = {
|
|
branch: string | null
|
|
stagedSummary: string
|
|
stagedPatch: string
|
|
/** Workspace-linked GitHub issue number. Omitted entirely when none resolves. */
|
|
linkedIssue?: number | null
|
|
}
|
|
|
|
export type GeneratedCommitMessage = {
|
|
subject: string
|
|
body: string
|
|
message: string
|
|
}
|
|
|
|
function limitSection(value: string, maxChars: number): string {
|
|
if (value.length <= maxChars) {
|
|
return value
|
|
}
|
|
const omitted = value.length - maxChars
|
|
return `${value.slice(0, maxChars)}\n\n[truncated: ${omitted} characters omitted]`
|
|
}
|
|
|
|
export function buildCommitMessagePrompt(
|
|
context: CommitMessageDraftContext,
|
|
customPrompt: string
|
|
): string {
|
|
// Why: the staged patch is dropped when it's too large to read, so fall back to
|
|
// the file summary and tell the agent why the diff is missing.
|
|
const patch = context.stagedPatch.trim()
|
|
? truncateDiffForPrompt(context.stagedPatch)
|
|
: '(diff omitted — too large to read; infer the change from the staged file list above)'
|
|
const base = [
|
|
'You are generating a single git commit message.',
|
|
'Return only the commit message text. Do not include a preamble, quotes, or code fences.',
|
|
'',
|
|
'Rules:',
|
|
'- First line: imperative mood, <= 72 chars, no trailing period.',
|
|
'- Optional body: blank line, then short wrapped bullet points or prose explaining WHY.',
|
|
'- Capture the primary user-visible or developer-visible change.',
|
|
'- Use only the staged changes below as context.',
|
|
'- Do not include "Co-authored-by" or other git trailers.',
|
|
'',
|
|
`Branch: ${context.branch ?? '(detached)'}`,
|
|
'',
|
|
'Staged files:',
|
|
limitSection(context.stagedSummary, 6_000),
|
|
'',
|
|
'Staged patch:',
|
|
'```diff',
|
|
patch,
|
|
'```'
|
|
].join('\n')
|
|
|
|
const trimmedPrompt = customPrompt.trim()
|
|
if (!trimmedPrompt) {
|
|
return base
|
|
}
|
|
return [base, '', 'Additional user prompt:', limitSection(trimmedPrompt, 4_000)].join('\n')
|
|
}
|
|
|
|
export function splitGeneratedCommitMessage(message: string): GeneratedCommitMessage {
|
|
const normalized = cleanGeneratedCommitMessage(message)
|
|
const firstNewline = normalized.indexOf('\n')
|
|
const subjectLine = firstNewline === -1 ? normalized : normalized.slice(0, firstNewline)
|
|
const subject = subjectLine.trim().replace(/[.]+$/g, '').slice(0, 72).trimEnd()
|
|
const body = firstNewline === -1 ? '' : normalized.slice(firstNewline + 1).trim()
|
|
const safeSubject = subject.length > 0 ? subject : 'Update project files'
|
|
return {
|
|
subject: safeSubject,
|
|
body,
|
|
message: body.length > 0 ? `${safeSubject}\n\n${body}` : safeSubject
|
|
}
|
|
}
|