mirror of
https://github.com/stablyai/orca.git
synced 2026-09-22 16:02:32 +00:00
Flip `anti-slop/no-shape-in-symbol-names` from "off" to "error" and clear
every violation under src, config, tests and mobile.
What the rule bans
------------------
The case-insensitive substring "shape" in any JS/TS identifier: variables,
functions, parameters, types, type parameters, class members, private names,
object-literal keys and JSX identifiers. The one exemption is a statically
accessed member read owned by another value (`zodObject.shape` is fine), so
third-party APIs stay readable without a suppression.
"Shape" names a value's structure rather than its domain role. `UserShape`,
`validateArgShape` and `errorShape` all tell you the symbol is "an object
with some fields" -- which is already what a type says -- while saying
nothing about what the value is for or who owns it. The rule forces the
name to carry the domain instead.
Violations fixed
----------------
689 violations across 109 files at baseline (verified by re-running the
audit against the pre-change tree with the rule set to "error").
Fix pattern
-----------
Rename for the domain role, not the structure:
-type FieldShape = 'list' | 'map' | 'whole'
-const FIELD_SHAPES = { ... } satisfies Record<keyof Observation, FieldShape>
+type FieldEncoding = 'list' | 'map' | 'whole'
+const FIELD_ENCODINGS = { ... } satisfies Record<keyof Observation, FieldEncoding>
-function assertGitPushTargetShape(target: unknown): void
+function assertValidGitPushTarget(target: unknown): void
-function describeReadDirPathShape(p: string): ReadDirPathKind
+function classifyReadDirPath(p: string): ReadDirPathKind
Predicates became statements about the value (`isDeltaShapedProviderFrameKind`
-> `isDeltaProviderFrameKind`, `isDeleteShapedDiscardEntry` ->
`discardDeletesEntryFile`, `isSkillsCliAgentKeyShaped` ->
`isUsableSkillsCliAgentKey`). Type aliases dropped the suffix where the
remaining name was already unambiguous (`GhGraphqlErrorShape` ->
`GhGraphqlError`).
No wire-visible name was renamed: no IPC or RPC channel, stream opcode,
request/response param, persisted field, or i18n key. The `--shape=symlink|copy`
CLI flag read by .github/workflows/skill-update-roundtrip.yml is unchanged --
only the local variable holding it was renamed.
Exemptions
----------
They are file-scoped entries in config/oxlint-anti-slop.json, not inline
`oxlint-disable` comments. An inline directive naming an anti-slop rule reads
back as an UNUSED directive under the root lint scan, which does not load this
plugin -- the changed-code quality gate counts that warning, so the comment form
cannot be used for a rule that lives only in this config.
* src/renderer/src/components/browser-pane/annotate/**:
in the screenshot annotator a "shape" is the drawn geometry -- pen, arrow,
rect, ellipse, highlight. That is a genuine domain noun, and it pervades
every symbol in the module.
* repo-icon.tsx, repo-header-project-actions.tsx, mobile MobileRepoIcon.tsx:
lucide exports the icon component as `Shapes`. The name is theirs, and the
matching REPO_LUCIDE_ICONS key is the persisted icon name shared with the
desktop picker -- renaming it would orphan saved repo icons.
* src/shared/onboarding-state-types.ts, src/shared/constants.ts:
`shapedSidebar` is a persisted onboarding-checklist field and a telemetry
enum member; renaming it would orphan saved state.
* src/shared/rpc-contract/rpc-send-params.ts: matching zod's own literal `shape`
property is what selects the ZodObject branch of the conditional type.
No exemption was added merely to avoid a rename. Eight symbols initially
suppressed as "a cross-module refactor outside this change" were proven to have
zero non-TypeScript references repo-wide and renamed instead.
Zod's `ZodRawShape` needed no exemption at all: `Readonly<Record<string,
z.ZodType>>` is its definition, so repo-update-params.ts and
ui-update-value-tolerance-params.ts spell it out instead. Likewise
telemetry-event-classification.ts now reads `.shape` through an `in` narrowing,
which also retires two pre-existing type assertions; three more assertions the
rename had dragged onto changed lines (two `JSON.parse` sites, one node:sqlite
row read) became annotations and an explicit row mapping.
Verified
--------
* Audit reports zero violations; confirmed the rule genuinely fires by
planting a probe violation.
* node config/scripts/run-typecheck-projects-in-parallel.mjs exits 0.
* Vitest over src/shared, src/main/github/project-view, the annotate module,
the repo-icon components and the Chromium SameSite electron spec: all green.
* All 66 removed "shape" identifiers grepped repo-wide across every file type;
none survive.
* node config/scripts/generate-rpc-params-catalog.mjs --check exits 0.
* node --check on every changed .mjs; oxfmt clean on all changed files.
* `pnpm run check:code-quality:changed` reports 0 findings.
Not machine-verified: the 3 mobile/ files (its Vitest run cannot resolve
`expo/tsconfig.base.json` in this worktree), and the WSL- and Playwright-gated
specs. All are rename- or comment-only hunks, read in full.
136 lines
5.4 KiB
TypeScript
136 lines
5.4 KiB
TypeScript
import { z } from 'zod'
|
|
|
|
import { eventSchemas } from './telemetry-event-registry'
|
|
import type { cohortSchema } from './telemetry-onboarding-foundation-schemas'
|
|
|
|
export type EventMap = { [N in keyof typeof eventSchemas]: z.infer<(typeof eventSchemas)[N]> }
|
|
export type EventName = keyof EventMap
|
|
export type EventProps<N extends EventName> = EventMap[N]
|
|
|
|
// Why: non-`ZodObject` schemas have no `.shape`; return null so `key in undefined` can't throw at module load.
|
|
// Why `object` and not zod's own field-record type: callers only ask `key in fields`.
|
|
function eventSchemaFields(schema: z.ZodTypeAny): object | null {
|
|
if (schema instanceof z.ZodObject) {
|
|
return schema.shape
|
|
}
|
|
|
|
// Why: refined object schemas may expose `.shape` even when refinement breaks `instanceof ZodObject`.
|
|
if ('shape' in schema && typeof schema.shape === 'object' && schema.shape !== null) {
|
|
return schema.shape
|
|
}
|
|
return null
|
|
}
|
|
|
|
function eventsDeclaringKey(key: string): ReadonlySet<EventName> {
|
|
return new Set(
|
|
(Object.entries(eventSchemas) as [EventName, z.ZodTypeAny][])
|
|
.filter(([, schema]) => {
|
|
const fields = eventSchemaFields(schema)
|
|
return fields !== null && key in fields
|
|
})
|
|
.map(([name]) => name)
|
|
)
|
|
}
|
|
|
|
// Cohort injection is gated on this derived set because `.strict()` schemas drop events that don't declare `nth_repo_added`.
|
|
const COHORT_EXTENDED_SET = eventsDeclaringKey('nth_repo_added')
|
|
|
|
// Compile-time roster guarding the runtime injection set against silent schema drift.
|
|
type _CohortExtendedRoster =
|
|
| 'app_opened'
|
|
| 'app_starred_orca'
|
|
| 'star_nag_outcome'
|
|
| 'feature_interaction_usage_bucket_reached'
|
|
| 'repo_added'
|
|
| 'add_repo_setup_step_action'
|
|
| 'add_repo_existing_workspaces_detected'
|
|
| 'add_repo_default_checkout_handoff'
|
|
| 'add_repo_nested_scan_result'
|
|
| 'add_repo_nested_import_action'
|
|
| 'add_repo_nested_import_result'
|
|
| 'workspace_created'
|
|
| 'workspace_create_failed'
|
|
| 'setup_script_prompt_shown'
|
|
| 'setup_script_prompt_action'
|
|
| 'agent_started'
|
|
| 'agent_prompt_sent'
|
|
| 'agent_error'
|
|
| 'orca_cli_feature_tip_shown'
|
|
| 'orca_cli_feature_tip_setup_clicked'
|
|
| 'orca_cli_feature_tip_setup_result'
|
|
| 'cmd_j_palette_feature_tip_shown'
|
|
| 'cmd_j_palette_feature_tip_acknowledged'
|
|
// Why: strict empty payloads infer a string index signature; ignore index-only keys so they aren't pulled into keyed rosters.
|
|
type _KnownPayloadKeys<T> = string extends keyof T ? never : keyof T
|
|
type _DerivedCohortExtendedEvents = {
|
|
[N in EventName]: 'nth_repo_added' extends _KnownPayloadKeys<EventMap[N]> ? N : never
|
|
}[EventName]
|
|
type _CohortExtendedRosterSync = _CohortExtendedRoster extends _DerivedCohortExtendedEvents
|
|
? _DerivedCohortExtendedEvents extends _CohortExtendedRoster
|
|
? true
|
|
: never
|
|
: never
|
|
const _cohortExtendedRosterSyncCheck: _CohortExtendedRosterSync = true
|
|
void _cohortExtendedRosterSyncCheck
|
|
|
|
export function isCohortExtendedEvent(name: EventName): boolean {
|
|
return COHORT_EXTENDED_SET.has(name)
|
|
}
|
|
|
|
// Events whose schema declares `cohort`: the IPC handler injects cohort only for these — a `.strict()` schema without it would reject the event.
|
|
const ONBOARDING_COHORT_SET = eventsDeclaringKey('cohort')
|
|
// `NonNullable` strips `undefined` introduced by `cohortSchema`'s `.optional()`.
|
|
export type OnboardingCohort = NonNullable<z.infer<typeof cohortSchema>>
|
|
|
|
// Compile-time roster: dropping `cohort` from any of these fails tsc, rather than silently at runtime (`.optional()` would tolerate that).
|
|
type _OnboardingCohortRoster =
|
|
| 'onboarding_started'
|
|
| 'onboarding_step_viewed'
|
|
| 'onboarding_step_completed'
|
|
| 'onboarding_step_skipped'
|
|
| 'onboarding_tour_outcome'
|
|
| 'onboarding_step4_path_clicked'
|
|
| 'onboarding_step4_path_failed'
|
|
| 'onboarding_task_sources_snapshot'
|
|
| 'onboarding_windows_terminal_snapshot'
|
|
| 'onboarding_completed'
|
|
| 'onboarding_dismissed'
|
|
| 'onboarding_agent_picked'
|
|
| 'onboarding_ghostty_discovered'
|
|
| 'onboarding_ghostty_import_clicked'
|
|
| 'onboarding_ghostty_import_failed'
|
|
| 'onboarding_feature_setup_toggled'
|
|
| 'onboarding_feature_setup_run'
|
|
| 'onboarding_feature_setup_terminal_opened'
|
|
| 'onboarding_feature_setup_terminal_interacted'
|
|
type _DerivedOnboardingCohortEvents = {
|
|
[N in EventName]: 'cohort' extends _KnownPayloadKeys<EventMap[N]> ? N : never
|
|
}[EventName]
|
|
type _OnboardingCohortRosterSync = _OnboardingCohortRoster extends _DerivedOnboardingCohortEvents
|
|
? _DerivedOnboardingCohortEvents extends _OnboardingCohortRoster
|
|
? true
|
|
: never
|
|
: never
|
|
const _onboardingCohortRosterSyncCheck: _OnboardingCohortRosterSync = true
|
|
void _onboardingCohortRosterSyncCheck
|
|
|
|
export function isOnboardingEvent(name: EventName): boolean {
|
|
return ONBOARDING_COHORT_SET.has(name)
|
|
}
|
|
|
|
// No `env` discriminator: every transmitted event is from an official CI build (dev/contributor builds only console-mirror).
|
|
// The per-field `.max(64)` is the validator's string-length cap — there is no separate post-parse length check.
|
|
export const commonPropsSchema = z
|
|
.object({
|
|
app_version: z.string().max(64),
|
|
platform: z.string().max(64),
|
|
arch: z.string().max(64),
|
|
os_release: z.string().max(64),
|
|
// `.min(1)`: an empty install_id/session_id would collapse unrelated events into one synthetic user/session, corrupting analytics.
|
|
install_id: z.string().min(1).max(64),
|
|
session_id: z.string().min(1).max(64),
|
|
orca_channel: z.enum(['stable', 'rc'])
|
|
})
|
|
.strict()
|
|
export type CommonProps = z.infer<typeof commonPropsSchema>
|