mirror of
https://github.com/stablyai/orca.git
synced 2026-10-12 16:03:03 +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.
111 lines
4.2 KiB
TypeScript
111 lines
4.2 KiB
TypeScript
// Pure consent resolver. Every call site (PR 2+) goes through `resolveConsent`
|
|
// so env-var / CI detection is centralized — no scattered `process.env.CI`
|
|
// checks can drift out of sync with the documented precedence list.
|
|
//
|
|
// Env-var and CI paths are non-persistent: they set effective consent at
|
|
// runtime only and never mutate `GlobalSettings.telemetry.optedIn`. Unsetting
|
|
// the variable on the next launch restores the user's stored preference.
|
|
|
|
import type { GlobalSettings } from '../../shared/global-settings-types'
|
|
import type { TelemetryConsentState } from '../../shared/telemetry-consent-types'
|
|
|
|
// Discriminated union instead of a boolean: the Privacy pane (PR 3) needs the
|
|
// `reason` to render the correct "disabled because X" helper text, and the
|
|
// first-launch banner must distinguish "existing user awaiting decision"
|
|
// (`pending_banner`) from "user explicitly opted out" (`disabled`). A boolean
|
|
// would force the UI to re-derive that, re-introducing the scattered env
|
|
// checks this module exists to eliminate.
|
|
//
|
|
// The type itself lives in `shared/telemetry-consent-types.ts` so the
|
|
// renderer can import it across the IPC boundary; this re-export keeps
|
|
// existing call sites in main working without a rename.
|
|
export type ConsentState = TelemetryConsentState
|
|
|
|
// Precedence for the `disabled` branches is documented alongside
|
|
// `resolveConsent` below.
|
|
const CI_ENV_VARS = [
|
|
'CI',
|
|
'GITHUB_ACTIONS',
|
|
'GITLAB_CI',
|
|
'CIRCLECI',
|
|
'TRAVIS',
|
|
'BUILDKITE',
|
|
'JENKINS_URL',
|
|
'TEAMCITY_VERSION'
|
|
] as const
|
|
|
|
// Track which env-var names have already produced a misconfiguration warning
|
|
// so a noisy shell profile that sets e.g. `DO_NOT_TRACK=yes` does not spam
|
|
// stderr on every resolve call.
|
|
const warnedMisconfigured = new Set<string>()
|
|
|
|
function warnOnceMisconfigured(name: string, raw: string): void {
|
|
if (warnedMisconfigured.has(name)) {
|
|
return
|
|
}
|
|
warnedMisconfigured.add(name)
|
|
// Stderr, not stdout — consent misconfiguration is an operator signal, not
|
|
// user-facing output. Mirrors the skills.sh-style bug note in the plan doc:
|
|
// a value like `0` / `yes` / `on` / `FALSE` silently no-oping is exactly
|
|
// the class of bug we want surfaced.
|
|
process.stderr.write(
|
|
`[telemetry] ${name}=${JSON.stringify(raw)} is not a recognized truthy value ` +
|
|
`(expected "1" or "true"); treating as unset.\n`
|
|
)
|
|
}
|
|
|
|
function isEnvVarTruthy(name: string): boolean {
|
|
const v = process.env[name]
|
|
if (!v) {
|
|
return false
|
|
}
|
|
const normalized = v.trim().toLowerCase()
|
|
if (normalized === '1' || normalized === 'true') {
|
|
return true
|
|
}
|
|
warnOnceMisconfigured(name, v)
|
|
return false
|
|
}
|
|
|
|
// Exposed for tests only — resets the one-shot warning dedupe so separate
|
|
// tests can each exercise the misconfiguration path independently.
|
|
export function _resetMisconfigWarnCacheForTests(): void {
|
|
warnedMisconfigured.clear()
|
|
}
|
|
|
|
export function resolveConsent(settings: GlobalSettings): ConsentState {
|
|
// Precedence 1: community standard kill switch. Always wins.
|
|
if (isEnvVarTruthy('DO_NOT_TRACK')) {
|
|
return { effective: 'disabled', reason: 'do_not_track' }
|
|
}
|
|
// Precedence 2: product-specific kill switch.
|
|
if (isEnvVarTruthy('ORCA_TELEMETRY_DISABLED')) {
|
|
return { effective: 'disabled', reason: 'orca_disabled' }
|
|
}
|
|
// Precedence 3: CI detection. Any presence (not just truthy) counts — many
|
|
// CI systems set `CI=true` but some legacy ones just set it to an empty
|
|
// string or a build ID, and none of those are human intent to opt in.
|
|
if (CI_ENV_VARS.some((v) => process.env[v] !== undefined && process.env[v] !== '')) {
|
|
return { effective: 'disabled', reason: 'ci' }
|
|
}
|
|
|
|
const t = settings.telemetry
|
|
// Defensive: after the PR 1 migration in `Store.load()`, every settings
|
|
// object has `telemetry` populated. If we somehow read a settings object
|
|
// that predates migration, fail closed to `pending_banner` (no transmit)
|
|
// rather than defaulting on.
|
|
if (!t) {
|
|
return { effective: 'pending_banner' }
|
|
}
|
|
|
|
if (t.optedIn === true) {
|
|
return { effective: 'enabled' }
|
|
}
|
|
if (t.optedIn === false) {
|
|
return { effective: 'disabled', reason: 'user_opt_out' }
|
|
}
|
|
|
|
// `optedIn === null` — existing-user cohort awaiting banner resolution.
|
|
return { effective: 'pending_banner' }
|
|
}
|