mirror of
https://github.com/stablyai/orca.git
synced 2026-09-29 16:02:50 +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.
162 lines
4.7 KiB
TypeScript
162 lines
4.7 KiB
TypeScript
import type { NotificationDispatchRequest } from '../../shared/notification-settings-types'
|
|
|
|
const NOTIFICATION_AGENT_LABEL_MAX_LENGTH = 40
|
|
const NOTIFICATION_TITLE_CONTEXT_MAX_LENGTH = 80
|
|
const NOTIFICATION_BODY_PREVIEW_MAX_LENGTH = 180
|
|
|
|
const AGENT_TYPE_LABELS: Readonly<Record<string, string>> = {
|
|
claude: 'Claude',
|
|
openclaude: 'OpenClaude',
|
|
codex: 'Codex',
|
|
gemini: 'Gemini',
|
|
antigravity: 'Antigravity',
|
|
opencode: 'OpenCode',
|
|
cursor: 'Cursor',
|
|
aider: 'Aider',
|
|
pi: 'Pi',
|
|
omp: 'OMP',
|
|
droid: 'Droid',
|
|
grok: 'Grok',
|
|
hermes: 'Hermes'
|
|
}
|
|
|
|
export function buildNotificationOptions(args: NotificationDispatchRequest): {
|
|
title: string
|
|
body: string
|
|
silent?: boolean
|
|
sound?: string
|
|
} {
|
|
if (args.source === 'terminal-bell') {
|
|
return {
|
|
title: `Bell in ${args.worktreeLabel ?? 'workspace'}`,
|
|
body: args.repoLabel ? `${args.repoLabel} · Attention requested` : 'Attention requested'
|
|
}
|
|
}
|
|
|
|
if (args.source === 'test') {
|
|
return {
|
|
title: 'Orca notifications are on',
|
|
body: 'This is a test notification from Orca.'
|
|
}
|
|
}
|
|
|
|
const richOptions = buildAgentTaskCompleteNotificationOptions(args)
|
|
if (richOptions) {
|
|
return richOptions
|
|
}
|
|
|
|
return buildAgentTaskCompleteFallbackNotificationOptions(args)
|
|
}
|
|
|
|
function buildAgentTaskCompleteNotificationOptions(
|
|
args: NotificationDispatchRequest
|
|
): { title: string; body: string } | null {
|
|
if (!hasAgentNotificationSnapshot(args)) {
|
|
return null
|
|
}
|
|
|
|
const agentLabel = formatNotificationAgentLabel(args.agentType)
|
|
const worktreeContext = formatNotificationWorktreeContext(args)
|
|
const statusText =
|
|
args.agentState === 'blocked' || args.agentState === 'waiting'
|
|
? 'needs input'
|
|
: args.agentState === 'done' && args.agentInterrupted
|
|
? 'stopped'
|
|
: 'finished'
|
|
|
|
return {
|
|
title: `${worktreeContext} - ${agentLabel} ${statusText}`,
|
|
body: buildAgentTaskCompleteRichBody(args) ?? `${agentLabel} ${statusText}.`
|
|
}
|
|
}
|
|
|
|
function formatNotificationWorktreeContext(args: NotificationDispatchRequest): string {
|
|
const worktreeLabel = normalizeNotificationText(
|
|
args.worktreeLabel,
|
|
NOTIFICATION_TITLE_CONTEXT_MAX_LENGTH
|
|
)
|
|
const repoLabel = normalizeNotificationText(args.repoLabel, NOTIFICATION_TITLE_CONTEXT_MAX_LENGTH)
|
|
if (args.hasMultipleActiveRepos && repoLabel && worktreeLabel) {
|
|
return normalizeNotificationText(
|
|
`${repoLabel} / ${worktreeLabel}`,
|
|
NOTIFICATION_TITLE_CONTEXT_MAX_LENGTH
|
|
)
|
|
}
|
|
return worktreeLabel || repoLabel || 'workspace'
|
|
}
|
|
|
|
function hasAgentNotificationSnapshot(args: NotificationDispatchRequest): boolean {
|
|
return Boolean(
|
|
args.agentType ||
|
|
args.agentState ||
|
|
args.agentPrompt ||
|
|
args.agentToolName ||
|
|
args.agentToolInput ||
|
|
args.agentLastAssistantMessage ||
|
|
args.agentInterrupted
|
|
)
|
|
}
|
|
|
|
function buildAgentTaskCompleteRichBody(args: NotificationDispatchRequest): string | null {
|
|
const assistantMessage = normalizeNotificationText(
|
|
args.agentLastAssistantMessage,
|
|
NOTIFICATION_BODY_PREVIEW_MAX_LENGTH
|
|
)
|
|
if (assistantMessage) {
|
|
return assistantMessage
|
|
}
|
|
|
|
const toolName = normalizeNotificationText(args.agentToolName, 60)
|
|
const toolInput = normalizeNotificationText(
|
|
args.agentToolInput,
|
|
NOTIFICATION_BODY_PREVIEW_MAX_LENGTH
|
|
)
|
|
if (toolName && toolInput) {
|
|
return `Using ${toolName}: ${toolInput}`
|
|
}
|
|
if (toolName) {
|
|
return `Using ${toolName}`
|
|
}
|
|
if (toolInput) {
|
|
return `Tool input: ${toolInput}`
|
|
}
|
|
|
|
return null
|
|
}
|
|
|
|
function buildAgentTaskCompleteFallbackNotificationOptions(args: NotificationDispatchRequest): {
|
|
title: string
|
|
body: string
|
|
} {
|
|
return {
|
|
title: `Task complete in ${args.worktreeLabel ?? 'workspace'}`,
|
|
body: buildAgentTaskCompleteFallbackBody(args)
|
|
}
|
|
}
|
|
|
|
function buildAgentTaskCompleteFallbackBody(args: NotificationDispatchRequest): string {
|
|
return args.repoLabel
|
|
? `${args.repoLabel}${args.terminalTitle ? ` · ${args.terminalTitle}` : ''}`
|
|
: (args.terminalTitle ?? 'A coding agent finished working.')
|
|
}
|
|
|
|
function formatNotificationAgentLabel(agentType: string | null | undefined): string {
|
|
const normalized = normalizeNotificationText(agentType, NOTIFICATION_AGENT_LABEL_MAX_LENGTH)
|
|
if (!normalized || normalized === 'unknown') {
|
|
return 'Agent'
|
|
}
|
|
return AGENT_TYPE_LABELS[normalized] ?? normalized
|
|
}
|
|
|
|
function normalizeNotificationText(value: string | null | undefined, maxLength: number): string {
|
|
const normalized = value?.replace(/\s+/g, ' ').trim() ?? ''
|
|
if (normalized.length <= maxLength) {
|
|
return normalized
|
|
}
|
|
const truncated = normalized.slice(0, maxLength - 1)
|
|
const lastCode = truncated.charCodeAt(truncated.length - 1)
|
|
const safeTruncated =
|
|
lastCode >= 0xd800 && lastCode <= 0xdbff ? truncated.slice(0, -1) : truncated
|
|
return `${safeTruncated}…`
|
|
}
|