mirror of
https://github.com/stablyai/orca.git
synced 2026-09-25 16:02:38 +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.
109 lines
3.0 KiB
TypeScript
109 lines
3.0 KiB
TypeScript
import type {
|
|
ProviderRateLimits,
|
|
RateLimitRuntimeTarget,
|
|
RateLimitWindow
|
|
} from './rate-limit-types'
|
|
import type { CodexManagedAccountSummary } from './managed-account-types'
|
|
|
|
export type CodexResetCreditExpectedScope = {
|
|
target: RateLimitRuntimeTarget
|
|
accountId: string
|
|
accountRevision: number
|
|
offerRevision: string
|
|
}
|
|
|
|
type BuildCodexResetCreditExpectedScopeOptions = {
|
|
target: RateLimitRuntimeTarget
|
|
account: Pick<
|
|
CodexManagedAccountSummary,
|
|
'id' | 'managedHomeRuntime' | 'wslDistro' | 'updatedAt'
|
|
> | null
|
|
limits: ProviderRateLimits | null
|
|
}
|
|
|
|
function windowRevision(window: RateLimitWindow | null): readonly unknown[] | null {
|
|
if (!window) {
|
|
return null
|
|
}
|
|
return [window.usedPercent, window.windowMinutes, window.resetsAt]
|
|
}
|
|
|
|
function buildOfferRevision(limits: ProviderRateLimits): string {
|
|
const credits = limits.rateLimitResetCredits
|
|
const creditRows = [...(credits?.credits ?? [])]
|
|
.map((credit) => [credit.status, credit.expiresAt, credit.grantedAt] as const)
|
|
.sort((left, right) => {
|
|
const leftKey = JSON.stringify(left)
|
|
const rightKey = JSON.stringify(right)
|
|
return leftKey < rightKey ? -1 : leftKey > rightKey ? 1 : 0
|
|
})
|
|
|
|
// Why: clients treat this as an opaque compare-and-swap token. Including the
|
|
// fetched-at revision makes a refresh invalidate a confirmation based on old quota data.
|
|
return `v1:${JSON.stringify([
|
|
credits?.availableCount ?? 0,
|
|
credits?.totalEarnedCount ?? null,
|
|
credits?.nextExpiresAt ?? null,
|
|
creditRows,
|
|
windowRevision(limits.session),
|
|
windowRevision(limits.weekly),
|
|
limits.updatedAt
|
|
])}`
|
|
}
|
|
|
|
export function buildCodexResetCreditExpectedScope({
|
|
target,
|
|
account,
|
|
limits
|
|
}: BuildCodexResetCreditExpectedScopeOptions): CodexResetCreditExpectedScope | null {
|
|
if (!account || limits?.provider !== 'codex') {
|
|
return null
|
|
}
|
|
if ((limits.rateLimitResetCredits?.availableCount ?? 0) <= 0) {
|
|
return null
|
|
}
|
|
if (
|
|
!account.id.trim() ||
|
|
account.id.length > 512 ||
|
|
!Number.isSafeInteger(account.updatedAt) ||
|
|
account.updatedAt < 0 ||
|
|
!Number.isSafeInteger(limits.updatedAt) ||
|
|
limits.updatedAt < 0
|
|
) {
|
|
return null
|
|
}
|
|
|
|
const accountRuntime = account.managedHomeRuntime ?? 'host'
|
|
if (target.runtime === 'host') {
|
|
if (target.wslDistro !== null || accountRuntime !== 'host') {
|
|
return null
|
|
}
|
|
} else {
|
|
const targetDistro = target.wslDistro?.trim()
|
|
const accountDistro = account.wslDistro?.trim()
|
|
if (
|
|
!targetDistro ||
|
|
targetDistro.length > 255 ||
|
|
accountRuntime !== 'wsl' ||
|
|
accountDistro !== targetDistro
|
|
) {
|
|
return null
|
|
}
|
|
}
|
|
|
|
const offerRevision = buildOfferRevision(limits)
|
|
if (offerRevision.length > 4_096) {
|
|
return null
|
|
}
|
|
|
|
return {
|
|
target: {
|
|
runtime: target.runtime,
|
|
wslDistro: target.runtime === 'wsl' ? target.wslDistro!.trim() : null
|
|
},
|
|
accountId: account.id,
|
|
accountRevision: account.updatedAt,
|
|
offerRevision
|
|
}
|
|
}
|