mirror of
https://github.com/stablyai/orca.git
synced 2026-10-30 16:47:34 +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.
68 lines
2.7 KiB
TypeScript
68 lines
2.7 KiB
TypeScript
import { ipcMain } from 'electron'
|
|
import type { ExecutionHostId } from '../../shared/execution-host'
|
|
import type { PersistedUIState } from '../../shared/persisted-ui-state-types'
|
|
import type { WorkspaceSessionState } from '../../shared/workspace-session-state-types'
|
|
import type { Store } from '../persistence'
|
|
|
|
type StageBeforeUnloadSyncArgs = {
|
|
sessions: { state: WorkspaceSessionState; hostId?: ExecutionHostId }[]
|
|
ui: Partial<PersistedUIState>
|
|
}
|
|
|
|
export type ShutdownCheckpointResult = { ok: boolean }
|
|
|
|
/** Matches the will-quit teardown budget so a stalled disk can't strand a restart. */
|
|
export const SHUTDOWN_CHECKPOINT_FLUSH_DEADLINE_MS = 20_000
|
|
|
|
function flushStagedStateWithDeadline(store: Store): Promise<ShutdownCheckpointResult> {
|
|
const controller = new AbortController()
|
|
let timer: ReturnType<typeof setTimeout> | null = null
|
|
const deadline = new Promise<ShutdownCheckpointResult>((resolve) => {
|
|
timer = setTimeout(() => {
|
|
controller.abort()
|
|
console.error('[app] Timed out persisting staged renderer state')
|
|
resolve({ ok: false })
|
|
}, SHUTDOWN_CHECKPOINT_FLUSH_DEADLINE_MS)
|
|
})
|
|
// Why not drain to stable: Store retries a superseded staged write without
|
|
// chasing unrelated live mutations, which the deadline would otherwise cut off.
|
|
const flush = store
|
|
.flushPendingOrThrowAsync({ signal: controller.signal, drainToStableGeneration: false })
|
|
.then((): ShutdownCheckpointResult => ({ ok: true }))
|
|
.catch((error): ShutdownCheckpointResult => {
|
|
console.error('[app] Failed to persist staged renderer state:', error)
|
|
return { ok: false }
|
|
})
|
|
return Promise.race([flush, deadline]).finally(() => {
|
|
if (timer) {
|
|
clearTimeout(timer)
|
|
}
|
|
})
|
|
}
|
|
|
|
export function registerRendererShutdownCheckpointHandler(store: Store): void {
|
|
// Why: beforeunload cannot await, so the sync reply only reports staging.
|
|
// Durability is joined out-of-band by paths that are about to navigate.
|
|
let pendingCheckpoint: Promise<ShutdownCheckpointResult> = Promise.resolve({ ok: true })
|
|
|
|
ipcMain.on('app:stage-before-unload-sync', (event, args: StageBeforeUnloadSyncArgs) => {
|
|
let ok = true
|
|
try {
|
|
for (const { state, hostId } of args.sessions) {
|
|
store.stageWorkspaceSessionBeforeUnload(state, hostId)
|
|
}
|
|
store.updateUI(args.ui)
|
|
} catch (error) {
|
|
console.error('[app] Failed to stage renderer state before unload:', error)
|
|
ok = false
|
|
}
|
|
pendingCheckpoint = ok ? flushStagedStateWithDeadline(store) : Promise.resolve({ ok: false })
|
|
event.returnValue = { ok }
|
|
})
|
|
|
|
ipcMain.handle(
|
|
'app:await-before-unload-checkpoint',
|
|
(): Promise<ShutdownCheckpointResult> => pendingCheckpoint
|
|
)
|
|
}
|