From 97ae18b62536e68de2be337da6aae55e421304cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josh=20Goldberg=20=E2=9C=A8?= Date: Wed, 11 Nov 2026 10:49:49 -0500 Subject: [PATCH 1/4] ref(cli): Lint cli tests with the package's compiler options Co-Authored-By: Claude Opus 5.5 --- packages/cli/test/lib/response-cache-store.test.ts | 2 +- packages/cli/test/tsconfig.json | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 packages/cli/test/tsconfig.json diff --git a/packages/cli/test/lib/response-cache-store.test.ts b/packages/cli/test/lib/response-cache-store.test.ts index 0a7d428fb..6820dae56 100644 --- a/packages/cli/test/lib/response-cache-store.test.ts +++ b/packages/cli/test/lib/response-cache-store.test.ts @@ -58,7 +58,7 @@ async function lastUsed(key: string, secondsAgo: number): Promise { } async function keys(): Promise { - return (await readdir(dir)).map((file) => file.split(".")[0]).sort(); + return (await readdir(dir)).map((file) => file.split(".")[0] ?? file).sort(); } describe("createFileStore", () => { diff --git a/packages/cli/test/tsconfig.json b/packages/cli/test/tsconfig.json new file mode 100644 index 000000000..07b724860 --- /dev/null +++ b/packages/cli/test/tsconfig.json @@ -0,0 +1,7 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "lib": ["ESNext", "DOM"] + }, + "include": ["**/*.ts", "**/*.tsx"] +} From 278cda92054a300f5ab60d5dc33918d4f93bc170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josh=20Goldberg=20=E2=9C=A8?= Date: Wed, 11 Nov 2026 10:56:20 -0500 Subject: [PATCH 2/4] ref(lint): Enable no-unnecessary-condition in cli Co-Authored-By: Claude Opus 5.5 --- .oxlintrc.json | 6 +++ packages/cli/script/check-doc-examples.ts | 2 +- packages/cli/script/check-env-coverage.ts | 4 +- packages/cli/script/check-installer-docs.ts | 2 +- packages/cli/script/generate-docs-sections.ts | 4 +- packages/cli/script/generate-sdk.ts | 6 +-- .../cli/script/lib/output-schema-fields.ts | 5 +-- packages/cli/script/require-shim.mjs | 6 ++- packages/cli/script/sdk-run-calls.ts | 2 +- packages/cli/script/text-import-plugin.ts | 4 +- .../cli/src/commands/alert/issues/edit.ts | 2 +- .../cli/src/commands/alert/issues/list.ts | 6 +-- .../cli/src/commands/alert/metrics/create.ts | 4 +- .../cli/src/commands/alert/metrics/edit.ts | 2 +- .../cli/src/commands/alert/metrics/list.ts | 6 +-- packages/cli/src/commands/api.ts | 2 +- packages/cli/src/commands/cli/defaults.ts | 2 +- packages/cli/src/commands/cli/upgrade.ts | 4 +- .../cli/src/commands/dashboard/resolve.ts | 2 +- packages/cli/src/commands/dashboard/view.ts | 2 +- packages/cli/src/commands/event/send.ts | 2 +- packages/cli/src/commands/feedback/view.ts | 2 +- packages/cli/src/commands/issue/list.ts | 8 +--- packages/cli/src/commands/issue/utils.ts | 10 ++--- packages/cli/src/commands/issue/view.ts | 2 +- .../cli/src/commands/local/control-plane.ts | 2 +- packages/cli/src/commands/local/daemon.ts | 2 +- .../src/commands/local/retention-buffer.ts | 2 +- packages/cli/src/commands/local/run.ts | 4 +- packages/cli/src/commands/local/server.ts | 5 ++- packages/cli/src/commands/log/list.ts | 6 +-- packages/cli/src/commands/monitor/run.ts | 4 +- packages/cli/src/commands/proguard/uuid.ts | 2 +- packages/cli/src/commands/release/list.ts | 4 +- packages/cli/src/commands/replay/list.ts | 4 +- packages/cli/src/commands/trace/view.ts | 2 +- packages/cli/src/commands/trial/list.ts | 2 +- packages/cli/src/commands/wasm-split.ts | 2 +- packages/cli/src/lib/api/chunk-upload.ts | 2 +- packages/cli/src/lib/api/infrastructure.ts | 2 +- packages/cli/src/lib/api/issues.ts | 4 +- packages/cli/src/lib/api/projects.ts | 4 +- packages/cli/src/lib/api/status-page.ts | 10 ++--- packages/cli/src/lib/banner.ts | 2 +- packages/cli/src/lib/chunk-loader.ts | 3 +- packages/cli/src/lib/clipboard.ts | 7 +-- packages/cli/src/lib/datasets.ts | 5 ++- packages/cli/src/lib/db/auth.ts | 4 +- packages/cli/src/lib/db/migration.ts | 44 +++++++++---------- packages/cli/src/lib/db/sqlite.ts | 6 ++- packages/cli/src/lib/delta-upgrade.ts | 25 ++++------- packages/cli/src/lib/detect-agent.ts | 2 +- packages/cli/src/lib/formatters/colors.ts | 13 +++--- .../cli/src/lib/formatters/event-outcomes.ts | 4 +- .../src/lib/formatters/explore-timeseries.ts | 2 +- packages/cli/src/lib/formatters/feedback.ts | 2 +- packages/cli/src/lib/formatters/human.ts | 20 ++++----- packages/cli/src/lib/formatters/local.ts | 9 ++-- packages/cli/src/lib/formatters/markdown.ts | 25 +++++------ packages/cli/src/lib/formatters/replay.ts | 2 +- packages/cli/src/lib/formatters/seer.ts | 4 +- packages/cli/src/lib/formatters/sql.ts | 2 +- packages/cli/src/lib/formatters/trace.ts | 4 +- packages/cli/src/lib/games/snake-terminal.ts | 4 +- packages/cli/src/lib/ghcr.ts | 2 +- packages/cli/src/lib/help.ts | 2 +- packages/cli/src/lib/interactive-login.ts | 2 +- packages/cli/src/lib/introspect.ts | 28 +++++------- packages/cli/src/lib/list-command.ts | 2 +- packages/cli/src/lib/region.ts | 4 +- packages/cli/src/lib/release-notes.ts | 2 +- packages/cli/src/lib/replay-search.ts | 2 +- packages/cli/src/lib/resolve-target.ts | 2 +- packages/cli/src/lib/response-cache-store.ts | 3 +- packages/cli/src/lib/scan/concurrent.ts | 6 ++- packages/cli/src/lib/scan/grep.ts | 6 +-- packages/cli/src/lib/scan/walker.ts | 4 +- packages/cli/src/lib/select-ui/ink-ui.ts | 4 +- packages/cli/src/lib/sentryclirc-import.ts | 2 +- packages/cli/src/lib/sixel.ts | 8 ++-- packages/cli/src/lib/snapshots/archive.ts | 2 +- packages/cli/src/lib/telemetry.ts | 2 +- .../src/lib/telemetry/credential-redaction.ts | 2 +- packages/cli/src/lib/upgrade.ts | 2 +- packages/cli/src/lib/walk-up.ts | 2 +- packages/cli/src/output-schemas/dashboard.ts | 2 +- packages/cli/src/types/seer.ts | 4 +- packages/cli/test/commands/api.test.ts | 12 ++--- .../cli/test/commands/dashboard/list.test.ts | 14 ++---- packages/cli/test/commands/event/view.test.ts | 6 +-- .../test/commands/issue/explain.func.test.ts | 2 +- packages/cli/test/commands/local/run.test.ts | 6 +-- packages/cli/test/commands/log/list.test.ts | 1 + .../cli/test/commands/project/list.test.ts | 6 +-- .../test/commands/sourcemap/upload.test.ts | 22 +++++----- .../cli/test/lib/api/chunk-upload.test.ts | 6 ++- .../cli/test/lib/api/infrastructure.test.ts | 12 ++--- packages/cli/test/lib/auth-hint.test.ts | 5 +-- .../cli/test/lib/completions.property.test.ts | 7 ++- .../cli/test/lib/db/open-fallback.test.ts | 2 +- packages/cli/test/lib/delta-upgrade.test.ts | 3 -- packages/cli/test/lib/dsn/env-file.test.ts | 2 +- .../test/lib/envelope/event-builder.test.ts | 4 +- .../cli/test/lib/formatters/markdown.test.ts | 2 +- .../cli/test/lib/formatters/trace.test.ts | 8 ---- packages/cli/test/lib/git-commit-log.test.ts | 7 ++- packages/cli/test/lib/id-arguments.test.ts | 2 +- packages/cli/test/lib/logger.test.ts | 2 +- .../cli/test/lib/parse-bool.property.test.ts | 4 +- .../test/lib/resolve-target-picker.test.ts | 2 +- .../lib/sentry-client.response-body.test.ts | 2 +- packages/cli/test/lib/sentry-client.test.ts | 2 +- .../test/lib/telemetry-credentials.test.ts | 2 +- .../test/lib/telemetry/offline-store.test.ts | 2 +- packages/cli/test/lib/version-check.test.ts | 2 +- packages/cli/vitest.config.ts | 2 +- 116 files changed, 282 insertions(+), 311 deletions(-) diff --git a/.oxlintrc.json b/.oxlintrc.json index 69ba99d64..79664f9be 100644 --- a/.oxlintrc.json +++ b/.oxlintrc.json @@ -138,6 +138,12 @@ "no-console": "error" } }, + { + "files": ["packages/cli/**/*.{ts,tsx,js,mjs,cjs}"], + "rules": { + "typescript/no-unnecessary-condition": "error" + } + }, { "files": ["packages/cli/script/**/*.ts"], "rules": { diff --git a/packages/cli/script/check-doc-examples.ts b/packages/cli/script/check-doc-examples.ts index 179dc7bd2..60f73dba4 100644 --- a/packages/cli/script/check-doc-examples.ts +++ b/packages/cli/script/check-doc-examples.ts @@ -154,7 +154,7 @@ function resolve( let target: RouteTarget = routes as unknown as RouteMap; let i = 0; while (isRouteMap(target)) { - const word = tokens[i]; + const word = tokens[i] as string | undefined; if (word === undefined || word.startsWith("-")) { const fallback = target.getDefaultCommand?.(); if (fallback && isCommand(fallback)) { diff --git a/packages/cli/script/check-env-coverage.ts b/packages/cli/script/check-env-coverage.ts index 7a3522bb9..3f9e3b295 100644 --- a/packages/cli/script/check-env-coverage.ts +++ b/packages/cli/script/check-env-coverage.ts @@ -115,7 +115,7 @@ for (const file of files) { const content = await readFile(file, "utf-8"); fileContents.set(file, content); for (const match of content.matchAll(ENV_CONST_RE)) { - const value = match[2] ?? match[3]; + const value = match[2] || match[3]; if (value && isUserFacing(value)) { constMap.set(match[1], value); } @@ -140,7 +140,7 @@ for (const [file, content] of fileContents) { for (const match of content.matchAll(ENV_BRACKET_RE)) { const ident = match[3]; const name = - match[1] ?? match[2] ?? (ident ? constMap.get(ident) : undefined); + match[1] || match[2] || (ident ? constMap.get(ident) : undefined); if (name) { record(name, file, content, match.index); } diff --git a/packages/cli/script/check-installer-docs.ts b/packages/cli/script/check-installer-docs.ts index 407497750..a337fb3d2 100644 --- a/packages/cli/script/check-installer-docs.ts +++ b/packages/cli/script/check-installer-docs.ts @@ -51,7 +51,7 @@ type Installer = { }; function matchAll(re: RegExp, text: string): Set { - return new Set([...text.matchAll(re)].map((m) => m[1] ?? "")); + return new Set([...text.matchAll(re)].map((m) => m[1])); } async function loadBash(): Promise { diff --git a/packages/cli/script/generate-docs-sections.ts b/packages/cli/script/generate-docs-sections.ts index fa1c3f828..709f6e1ec 100644 --- a/packages/cli/script/generate-docs-sections.ts +++ b/packages/cli/script/generate-docs-sections.ts @@ -635,8 +635,8 @@ function readGrammarAnnotations(lines: string[]): GrammarAnnotation[] { annotations.push({ start: index + 1, end: index + 1, - kind: annotation[1] ?? "", - text: annotation[2] ?? "", + kind: annotation[1], + text: annotation[2], }); } else if (continuation && previous?.end === index) { previous.text += ` ${continuation[1]}`; diff --git a/packages/cli/script/generate-sdk.ts b/packages/cli/script/generate-sdk.ts index 97d2a8499..fab7630fc 100644 --- a/packages/cli/script/generate-sdk.ts +++ b/packages/cli/script/generate-sdk.ts @@ -161,7 +161,7 @@ function inferFlagType(def: FlagDef): { /** Extract SDK-relevant flag info from a Stricli Command's parameters. */ function extractSdkFlags(command: Command): SdkFlagInfo[] { - const flagDefs = command.parameters?.flags; + const flagDefs = command.parameters.flags; if (!flagDefs) { return []; } @@ -211,7 +211,7 @@ type PositionalInfo = | { name: string; variadic: true }; function derivePositional(command: Command): PositionalInfo { - const params = command.parameters?.positional; + const params = command.parameters.positional; if (!params) { return null; } @@ -222,7 +222,7 @@ function derivePositional(command: Command): PositionalInfo { return { name, variadic: true }; } - if (params.kind === "tuple" && params.parameters.length > 0) { + if (params.parameters.length > 0) { // One param per tuple entry. A compound placeholder is a single entry whose own parser // splits it ("org/version" → orgVersion), but separate entries are separate argv tokens: // joining them into one param made every multi-positional command unusable, because the diff --git a/packages/cli/script/lib/output-schema-fields.ts b/packages/cli/script/lib/output-schema-fields.ts index d52633d9e..524c3537f 100644 --- a/packages/cli/script/lib/output-schema-fields.ts +++ b/packages/cli/script/lib/output-schema-fields.ts @@ -101,10 +101,7 @@ function valibotTypeToString(input: ValibotSchemaNode): { } { // Resolve `pipe(...)` schemas (incl. the coercion pattern) to their output // schema before inspecting the type. - const schema = input ? unwrapPipe(input) : input; - if (!schema?.type) { - return { type: "unknown", optional: false }; - } + const schema = unwrapPipe(input); // Unwrap wrapper types recursively. if (schema.type === "optional" && schema.wrapped) { diff --git a/packages/cli/script/require-shim.mjs b/packages/cli/script/require-shim.mjs index adc552fa4..4dce7f08a 100644 --- a/packages/cli/script/require-shim.mjs +++ b/packages/cli/script/require-shim.mjs @@ -29,7 +29,11 @@ if (typeof globalThis.require === "undefined") { // registerHooks() is available from Node 22.15+ (our minimum). registerHooks({ load(url, context, nextLoad) { - if (context.importAttributes?.type === "file") { + // require() loads pass no importAttributes, whatever the types say. + const importAttributes = /** @type {ImportAttributes | undefined} */ ( + context.importAttributes + ); + if (importAttributes?.type === "file") { return { format: "module", shortCircuit: true, diff --git a/packages/cli/script/sdk-run-calls.ts b/packages/cli/script/sdk-run-calls.ts index d54d13a89..1a3af6feb 100644 --- a/packages/cli/script/sdk-run-calls.ts +++ b/packages/cli/script/sdk-run-calls.ts @@ -62,7 +62,7 @@ function exampleTagBodies(comment: string): string[] { true, ts.ScriptKind.TS, ); - const statement = source.statements[0]; + const statement = source.statements[0] as ts.Statement | undefined; if (!statement) { return []; } diff --git a/packages/cli/script/text-import-plugin.ts b/packages/cli/script/text-import-plugin.ts index add15a590..31b35494f 100644 --- a/packages/cli/script/text-import-plugin.ts +++ b/packages/cli/script/text-import-plugin.ts @@ -95,13 +95,13 @@ export const textImportPlugin: Plugin = { })); build.onResolve({ filter: ANY_FILTER }, async (args) => { - if (args.with?.type === "text") { + if (args.with.type === "text") { return { path: resolvePath(args.resolveDir, args.path), namespace: TEXT_IMPORT_NS, }; } - if (args.with?.type === "file") { + if (args.with.type === "file") { const sourcePath = resolvePath(args.resolveDir, args.path); const outdir = resolveOutdir(build); mkdirSync(outdir, { recursive: true }); diff --git a/packages/cli/src/commands/alert/issues/edit.ts b/packages/cli/src/commands/alert/issues/edit.ts index 7c57aa489..e44c708f4 100644 --- a/packages/cli/src/commands/alert/issues/edit.ts +++ b/packages/cli/src/commands/alert/issues/edit.ts @@ -329,7 +329,7 @@ export const editCommand = buildCommand({ ...updated, org: target.org, project: target.project, - id: stringifyUnknown(updated.id ?? rule.id), + id: stringifyUnknown(updated.id), // The workflows endpoint returns `enabled` rather than `status`; map it // back to a status label so human/JSON output matches the create path. status: !updated.enabled ? "disabled" : "active", diff --git a/packages/cli/src/commands/alert/issues/list.ts b/packages/cli/src/commands/alert/issues/list.ts index f8bcb90a4..ada48d56d 100644 --- a/packages/cli/src/commands/alert/issues/list.ts +++ b/packages/cli/src/commands/alert/issues/list.ts @@ -329,9 +329,7 @@ async function handleResolvedTargets( ); const filteredRows = flags.query ? allRows.filter((row) => - (row.rule.name ?? "") - .toLowerCase() - .includes(flags.query?.toLowerCase() ?? ""), + row.rule.name.toLowerCase().includes(flags.query?.toLowerCase() ?? ""), ) : allRows; @@ -453,7 +451,7 @@ function formatIssueAlertListHuman(result: IssueAlertListResult): string { const tableRows: Row[] = rows.map(({ rule: r, target }) => ({ id: r.id, - name: tableCell(r.name ?? "(untitled)"), + name: tableCell(r.name), ...(isMultiProject && { project: `${target.org}/${target.project}`, }), diff --git a/packages/cli/src/commands/alert/metrics/create.ts b/packages/cli/src/commands/alert/metrics/create.ts index 6d1f79682..4772babab 100644 --- a/packages/cli/src/commands/alert/metrics/create.ts +++ b/packages/cli/src/commands/alert/metrics/create.ts @@ -237,10 +237,8 @@ export const createCommand = buildCommand({ dataset, timeWindow: flags["time-window"], triggers, + projects, }; - if (projects && projects.length > 0) { - body.projects = projects; - } if (flags.environment !== undefined) { body.environment = flags.environment; } diff --git a/packages/cli/src/commands/alert/metrics/edit.ts b/packages/cli/src/commands/alert/metrics/edit.ts index 05bbab2b7..d996649df 100644 --- a/packages/cli/src/commands/alert/metrics/edit.ts +++ b/packages/cli/src/commands/alert/metrics/edit.ts @@ -324,7 +324,7 @@ export const editCommand = buildCommand({ yield new CommandOutput({ ...updated, org: orgSlug, - id: stringifyUnknown(updated.id ?? rule.id), + id: stringifyUnknown(updated.id), // The detectors endpoint returns `enabled` rather than `status`. status: !updated.enabled ? "disabled" : "active", } satisfies MetricAlertEditOutput); diff --git a/packages/cli/src/commands/alert/metrics/list.ts b/packages/cli/src/commands/alert/metrics/list.ts index 97fd60a6f..b380a9f5d 100644 --- a/packages/cli/src/commands/alert/metrics/list.ts +++ b/packages/cli/src/commands/alert/metrics/list.ts @@ -339,9 +339,7 @@ async function handleResolvedOrgs( ); const filteredRows = flags.query ? allRows.filter((row) => - (row.rule.name ?? "") - .toLowerCase() - .includes(flags.query?.toLowerCase() ?? ""), + row.rule.name.toLowerCase().includes(flags.query?.toLowerCase() ?? ""), ) : allRows; @@ -464,7 +462,7 @@ function formatMetricAlertListHuman(result: MetricAlertListResult): string { const tableRows: Row[] = rows.map(({ rule: r, orgSlug }) => ({ id: r.id, - name: tableCell(r.name ?? "(untitled)"), + name: tableCell(r.name), ...(isMultiOrg && { org: orgSlug }), aggregate: r.aggregate, dataset: r.dataset, diff --git a/packages/cli/src/commands/api.ts b/packages/cli/src/commands/api.ts index d88748fde..b8458f205 100644 --- a/packages/cli/src/commands/api.ts +++ b/packages/cli/src/commands/api.ts @@ -876,7 +876,7 @@ function parseUrlEncodedParams( * @internal Exported for testing */ export function dataToQueryParams( - data: Record | unknown[] | string, + data: unknown, ): Record { if (typeof data === "string") { return parseUrlEncodedParams(data); diff --git a/packages/cli/src/commands/cli/defaults.ts b/packages/cli/src/commands/cli/defaults.ts index 7a0230c7e..6c2012b2b 100644 --- a/packages/cli/src/commands/cli/defaults.ts +++ b/packages/cli/src/commands/cli/defaults.ts @@ -467,7 +467,7 @@ export const defaultsCommand = buildCommand({ if (canonical === "telemetry") { const effective = computeTelemetryEffective(); if ( - effective?.source.startsWith("env:") && + effective.source.startsWith("env:") && effective.enabled !== (newValue === "on") ) { log.warn( diff --git a/packages/cli/src/commands/cli/upgrade.ts b/packages/cli/src/commands/cli/upgrade.ts index 4b4ebfc2a..c40c027c3 100644 --- a/packages/cli/src/commands/cli/upgrade.ts +++ b/packages/cli/src/commands/cli/upgrade.ts @@ -1360,13 +1360,15 @@ export const upgradeCommand = buildCommand({ database, }); } else { + // Library mode's process stand-in has no argv. + const argv = this.process.argv as readonly string[] | undefined; await executeStandardUpgrade({ method, channel, versionArg, target, execPath: this.process.execPath, - entryPath: this.process.argv?.[1], + entryPath: argv?.[1], pathEnv: this.process.env.PATH, offline, json: flags.json, diff --git a/packages/cli/src/commands/dashboard/resolve.ts b/packages/cli/src/commands/dashboard/resolve.ts index 4f78a798a..4154efda2 100644 --- a/packages/cli/src/commands/dashboard/resolve.ts +++ b/packages/cli/src/commands/dashboard/resolve.ts @@ -184,7 +184,7 @@ export async function resolveDashboardId( * @returns Resolved widget index */ export function resolveWidgetIndex( - widgets: DashboardWidget[], + widgets: readonly { title?: string }[], index: number | undefined, title: string | undefined, ): number { diff --git a/packages/cli/src/commands/dashboard/view.ts b/packages/cli/src/commands/dashboard/view.ts index 514f68951..c770e47ec 100644 --- a/packages/cli/src/commands/dashboard/view.ts +++ b/packages/cli/src/commands/dashboard/view.ts @@ -313,7 +313,7 @@ export const viewCommand = buildCommand({ // Library mode: honor external abort signal (e.g., consumer break) const externalSignal = (this.process as { abortSignal?: AbortSignal }) - ?.abortSignal; + .abortSignal; if (externalSignal) { externalSignal.addEventListener("abort", stop, { once: true }); } diff --git a/packages/cli/src/commands/event/send.ts b/packages/cli/src/commands/event/send.ts index 13cf5548b..a77b0f70d 100644 --- a/packages/cli/src/commands/event/send.ts +++ b/packages/cli/src/commands/event/send.ts @@ -75,7 +75,7 @@ async function buildFilePayload( try { const firstLine = new TextDecoder().decode(bytes).split("\n")[0] ?? "{}"; const header = JSON.parse(firstLine) as Record; - eventId = (header.event_id as string) ?? ""; + eventId = typeof header.event_id === "string" ? header.event_id : ""; } catch (err) { log.debug("Could not extract event_id from envelope header", err); } diff --git a/packages/cli/src/commands/feedback/view.ts b/packages/cli/src/commands/feedback/view.ts index f5a638de9..cc9e3ad0b 100644 --- a/packages/cli/src/commands/feedback/view.ts +++ b/packages/cli/src/commands/feedback/view.ts @@ -181,7 +181,7 @@ export const viewCommand = buildCommand({ : []; yield new CommandOutput({ - org: org ?? null, + org, feedback, event: event ?? null, replayIds, diff --git a/packages/cli/src/commands/issue/list.ts b/packages/cli/src/commands/issue/list.ts index e4ff2fa72..cc0de6392 100644 --- a/packages/cli/src/commands/issue/list.ts +++ b/packages/cli/src/commands/issue/list.ts @@ -1613,11 +1613,7 @@ function jsonTransformIssueList( const transformed = jsonTransformListResult(result, fields); // Only inject into empty paginated envelopes — helps agents discover // query syntax when their search returned nothing. - if ( - transformed && - typeof transformed === "object" && - !Array.isArray(transformed) - ) { + if (!Array.isArray(transformed)) { const envelope = transformed as Record; const data = envelope.data; if (Array.isArray(data) && data.length === 0) { @@ -1801,7 +1797,7 @@ export const listCommand = buildListCommand("issue", { const displayRows: IssueTableRow[] = [ { issue, - orgSlug: org ?? "", + orgSlug: org, formatOptions: { projectSlug: issue.project?.slug ?? "", isMultiProject: false, diff --git a/packages/cli/src/commands/issue/utils.ts b/packages/cli/src/commands/issue/utils.ts index 6bfd88821..1c5e11f34 100644 --- a/packages/cli/src/commands/issue/utils.ts +++ b/packages/cli/src/commands/issue/utils.ts @@ -88,7 +88,7 @@ export async function mapIssueArgsConcurrently( const values: T[] = []; for (const result of settled) { - if (result?.status === "fulfilled") { + if (result.status === "fulfilled") { values.push(result.value); } } @@ -307,8 +307,8 @@ async function resolveProjectSearchFallback( // due to a transient error (5xx, timeout); retrying here either succeeds // or propagates the real error to the user. const matchedProject = projects[0]; - const matchedOrg = matchedProject?.orgSlug; - if (matchedOrg && matchedProject) { + if (matchedProject?.orgSlug) { + const matchedOrg = matchedProject.orgSlug; const retryShortId = expandToFullShortId(suffix, matchedProject.slug); const issue = await getIssueByShortId(matchedOrg, retryShortId, { collapse: ISSUE_DETAIL_COLLAPSE, @@ -347,9 +347,7 @@ async function findIssuesByShortId( // Only throw when ALL results are errors — if some orgs returned clean // 404s ({ok: true, value: null}), fall through to the fallback for a // precise error message. - const realErrors = results.filter( - (r): r is AuthGuardFailure => r !== undefined && !r.ok, - ); + const realErrors = results.filter((r): r is AuthGuardFailure => !r.ok); if (realErrors.length === results.length && realErrors.length > 0) { const firstError = realErrors[0]?.error; if (firstError instanceof Error) { diff --git a/packages/cli/src/commands/issue/view.ts b/packages/cli/src/commands/issue/view.ts index a61f4aa59..b724fb700 100644 --- a/packages/cli/src/commands/issue/view.ts +++ b/packages/cli/src/commands/issue/view.ts @@ -232,7 +232,7 @@ async function buildSingleIssueViewData( : await fetchIssueDetails(orgSlug, issue.id, spans); return { - org: orgSlug ?? null, + org: orgSlug, issue, event: event ?? null, ...details, diff --git a/packages/cli/src/commands/local/control-plane.ts b/packages/cli/src/commands/local/control-plane.ts index b4fcd2f73..e3895d915 100644 --- a/packages/cli/src/commands/local/control-plane.ts +++ b/packages/cli/src/commands/local/control-plane.ts @@ -591,7 +591,7 @@ export function createLocalControlPlane({ contentType: container.getContentType(), itemTypes: parsed?.envelope[1] - .map((item) => + .map((item: unknown) => Array.isArray(item) && typeof item[0] === "object" && item[0] ? stringifyUnknown( (item[0] as { type?: unknown }).type ?? "unknown", diff --git a/packages/cli/src/commands/local/daemon.ts b/packages/cli/src/commands/local/daemon.ts index effd83222..75171ba15 100644 --- a/packages/cli/src/commands/local/daemon.ts +++ b/packages/cli/src/commands/local/daemon.ts @@ -82,7 +82,7 @@ function startupLockPath(directory: string): string { function shutdownServer(server: Server): Promise { return new Promise((resolve) => { server.close(() => resolve()); - server.closeAllConnections?.(); + server.closeAllConnections(); }); } diff --git a/packages/cli/src/commands/local/retention-buffer.ts b/packages/cli/src/commands/local/retention-buffer.ts index 80696015c..bbf95a382 100644 --- a/packages/cli/src/commands/local/retention-buffer.ts +++ b/packages/cli/src/commands/local/retention-buffer.ts @@ -80,7 +80,7 @@ export function createLocalRetentionBuffer( delegate.put(item); }; buffer.read = (filters = { timeWindow: 60 }) => { - if ("timeWindow" in filters && filters.timeWindow !== undefined) { + if ("timeWindow" in filters) { const { timeWindow, ...rest } = filters; return delegate .read({ ...rest, all: true }) diff --git a/packages/cli/src/commands/local/run.ts b/packages/cli/src/commands/local/run.ts index 2b8d7569e..c11c96654 100644 --- a/packages/cli/src/commands/local/run.ts +++ b/packages/cli/src/commands/local/run.ts @@ -696,6 +696,7 @@ async function gracefulKill(child: ChildProcess): Promise { }), ]); clearTimeout(graceTimer); + // oxlint-disable-next-line typescript/no-unnecessary-condition -- exitCode changes while awaiting; TS keeps the earlier narrowing if (!exited && child.exitCode === null) { try { child.kill("SIGKILL"); @@ -705,6 +706,7 @@ async function gracefulKill(child: ChildProcess): Promise { } // Only await close if the child hasn't exited yet — avoids hanging // if close fired between SIGKILL and listener attachment. + // oxlint-disable-next-line typescript/no-unnecessary-condition -- exitCode changes while awaiting; TS keeps the earlier narrowing if (child.exitCode === null) { await new Promise((r) => child.on("close", () => r())); } @@ -775,7 +777,7 @@ async function* runWithVerify( ); } - let signalReceived: NodeJS.Signals | null = null; + let signalReceived = null as NodeJS.Signals | null; const onSigint = () => { signalReceived = "SIGINT"; child.kill("SIGINT"); diff --git a/packages/cli/src/commands/local/server.ts b/packages/cli/src/commands/local/server.ts index 8699647b1..d8d3caeee 100644 --- a/packages/cli/src/commands/local/server.ts +++ b/packages/cli/src/commands/local/server.ts @@ -794,6 +794,7 @@ export async function consumeSSE(opts: ConsumeSSEOptions): Promise { }, }); + // oxlint-disable-next-line typescript/no-unnecessary-condition -- the signal can abort during the await; TS keeps the loop condition's narrowing if (signal.aborted || result === "retained") { return; } @@ -842,7 +843,7 @@ export async function consumeSSE(opts: ConsumeSSEOptions): Promise { async function attemptSSEConnection( opts: ConsumeSSEOnceOptions, ): Promise<"no-connection" | "connected-then-lost" | "retained"> { - let wasConnected = false; + let wasConnected = false as boolean; const augmented = { ...opts, onConnected: () => { @@ -923,7 +924,7 @@ async function consumeSSEOnce( const decoder = new TextDecoder(); const state: SSEParserState = { eventType: "", dataLines: [], id: "" }; - let retained = false; + let retained = false as boolean; const onEvent = (type: string, data: string, id: string) => { if (id) { onId(id); diff --git a/packages/cli/src/commands/log/list.ts b/packages/cli/src/commands/log/list.ts index 1512fa417..31709115c 100644 --- a/packages/cli/src/commands/log/list.ts +++ b/packages/cli/src/commands/log/list.ts @@ -463,7 +463,7 @@ async function* generateFollowLogs( config.onInitialLogs?.(initialLogs); // Poll loop — exits when SIGINT fires - while (!controller.signal.aborted) { + for (;;) { await abortableSleep(pollIntervalMs, controller.signal); if (controller.signal.aborted) { break; @@ -928,7 +928,7 @@ export const listCommand = buildListCommand( flags, onDiagnostic: (msg) => logger.warn(msg), abortSignal: (this.process as { abortSignal?: AbortSignal }) - ?.abortSignal, + .abortSignal, fetch: (statsPeriod) => listTraceLogs(org, traceId, { query: traceQuery, @@ -1001,7 +1001,7 @@ export const listCommand = buildListCommand( flags, onDiagnostic: (msg) => logger.warn(msg), abortSignal: (this.process as { abortSignal?: AbortSignal }) - ?.abortSignal, + .abortSignal, fetch: (statsPeriod, afterTimestamp) => listLogs(org, project, { query: flags.query, diff --git a/packages/cli/src/commands/monitor/run.ts b/packages/cli/src/commands/monitor/run.ts index 118fe211c..d4b3ab172 100644 --- a/packages/cli/src/commands/monitor/run.ts +++ b/packages/cli/src/commands/monitor/run.ts @@ -362,7 +362,9 @@ The wrapped command receives the \`SENTRY_MONITOR_SLUG\` environment variable.`, // Map signal kills to 128+N (Unix convention: e.g. 130 for // SIGINT, 137 for SIGKILL, 143 for SIGTERM) so CI pipelines // and shell scripts inspecting $? see the correct exit code. - const sigNum = osConstants.signals[signal]; + const signals: Partial> = + osConstants.signals; + const sigNum = signals[signal]; resolve(128 + (sigNum ?? 1)); } else { resolve(1); diff --git a/packages/cli/src/commands/proguard/uuid.ts b/packages/cli/src/commands/proguard/uuid.ts index c14a01000..7ca48aafe 100644 --- a/packages/cli/src/commands/proguard/uuid.ts +++ b/packages/cli/src/commands/proguard/uuid.ts @@ -67,7 +67,7 @@ export const uuidCommand = buildCommand({ _flags: Record, path: string, ) { - if (!path?.trim()) { + if (!path.trim()) { throw new ContextError( "Mapping file path", sentry`proguard uuid `, diff --git a/packages/cli/src/commands/release/list.ts b/packages/cli/src/commands/release/list.ts index 57e3dd950..e48093e5b 100644 --- a/packages/cli/src/commands/release/list.ts +++ b/packages/cli/src/commands/release/list.ts @@ -185,7 +185,7 @@ function formatSessionSparkline(r: SentryRelease): string { function formatCrashes(r: ReleaseWithOrg): string { const h = getHealthData(r); const v = h?.sessionsCrashed; - if (v === undefined || v === null) { + if (v === undefined) { return colorTag("muted", "—"); } return v > 0 ? colorTag("red", String(v)) : colorTag("green", "0"); @@ -519,7 +519,7 @@ async function handleAutoDetectWithProject( // Client-side sort matching the --sort flag, then trim with project guarantee const comparator = buildMergeSorter( - (effectiveExtra.sort as ReleaseSortValue) ?? "date", + (effectiveExtra.sort ?? "date") as ReleaseSortValue, ); merged.sort(comparator); const limited = isMultiProject diff --git a/packages/cli/src/commands/replay/list.ts b/packages/cli/src/commands/replay/list.ts index 462498f54..f31993e06 100644 --- a/packages/cli/src/commands/replay/list.ts +++ b/packages/cli/src/commands/replay/list.ts @@ -107,8 +107,8 @@ function parseLimit(value: string): number { */ export function parseSort(value: string): ReplaySortValue { const trimmed = value.trim(); - const normalized = trimmed.toLowerCase() as ReplaySortKey; - const mapped = SORT_MAP[normalized]; + const sortMap: Partial> = SORT_MAP; + const mapped = sortMap[trimmed.toLowerCase()]; if (mapped) { return mapped; } diff --git a/packages/cli/src/commands/trace/view.ts b/packages/cli/src/commands/trace/view.ts index d02b4e4e0..acca226a3 100644 --- a/packages/cli/src/commands/trace/view.ts +++ b/packages/cli/src/commands/trace/view.ts @@ -420,7 +420,7 @@ async function resolveTraceFromIssue( } const event = await getLatestEvent(org, issue.id); - const traceId = event?.contexts?.trace?.trace_id; + const traceId = event.contexts?.trace?.trace_id; if (!traceId) { throw new ValidationError( `Could not find a trace for issue '${issueShortId}'. The latest event has no trace context.\n\n` + diff --git a/packages/cli/src/commands/trial/list.ts b/packages/cli/src/commands/trial/list.ts index d6df14196..87668dea2 100644 --- a/packages/cli/src/commands/trial/list.ts +++ b/packages/cli/src/commands/trial/list.ts @@ -154,7 +154,7 @@ function formatTrialListHuman(entries: TrialListEntry[]): string { ? `${t.displayName} ${colorTag("muted", `(${t.name})`)}` : t.displayName, }, - { header: "STATUS", value: (t) => STATUS_LABELS[t.status] ?? t.status }, + { header: "STATUS", value: (t) => STATUS_LABELS[t.status] }, { header: "DAYS LEFT", value: (t) => { diff --git a/packages/cli/src/commands/wasm-split.ts b/packages/cli/src/commands/wasm-split.ts index 78a2927cc..0a9c21ced 100644 --- a/packages/cli/src/commands/wasm-split.ts +++ b/packages/cli/src/commands/wasm-split.ts @@ -169,7 +169,7 @@ export const wasmSplitCommand = buildCommand({ }, }, async *func(this: SentryContext, flags: WasmSplitFlags, input: string) { - if (!input?.trim()) { + if (!input.trim()) { throw new ValidationError( `Wasm file path is required: ${sentry`wasm-split `}`, "input", diff --git a/packages/cli/src/lib/api/chunk-upload.ts b/packages/cli/src/lib/api/chunk-upload.ts index 24167e32a..3157ccdf7 100644 --- a/packages/cli/src/lib/api/chunk-upload.ts +++ b/packages/cli/src/lib/api/chunk-upload.ts @@ -655,7 +655,7 @@ export async function assembleArtifactBundle( `organizations/${org}/artifactbundle/assemble/`, ); } catch (error) { - const projects = body.projects ?? []; + const { projects } = body; if (projects.length > 0 && isInvalidProjectsError(error)) { throw projectsNotFoundError(org, projects); } diff --git a/packages/cli/src/lib/api/infrastructure.ts b/packages/cli/src/lib/api/infrastructure.ts index ec9b39477..c019de156 100644 --- a/packages/cli/src/lib/api/infrastructure.ts +++ b/packages/cli/src/lib/api/infrastructure.ts @@ -480,7 +480,7 @@ export function throwApiError( const enriched = enrichDetail(response, detail, hasUsableDetail); throw new ApiError( - `${context}: ${status} ${response.statusText ?? "Unknown"}`, + `${context}: ${status} ${response.statusText}`, status, enriched.detail, undefined, diff --git a/packages/cli/src/lib/api/issues.ts b/packages/cli/src/lib/api/issues.ts index e66ef06c6..e4c89254e 100644 --- a/packages/cli/src/lib/api/issues.ts +++ b/packages/cli/src/lib/api/issues.ts @@ -359,7 +359,7 @@ export async function findIssueInOrgs( options?: { collapse?: IssueCollapseField[] }, ): Promise<{ org: string; issue: SentryIssue } | null> { const limit = pLimit(ORG_FANOUT_CONCURRENCY); - let found: { org: string; issue: SentryIssue } | null = null; + let found = null as { org: string; issue: SentryIssue } | null; let failure: unknown; await Promise.all( orgSlugs.map((org) => @@ -813,7 +813,7 @@ export async function getSharedIssue( ) { throw new ApiError( "Share link response missing a valid issue ID", - result.response?.status ?? 0, + result.response.status, undefined, path, ); diff --git a/packages/cli/src/lib/api/projects.ts b/packages/cli/src/lib/api/projects.ts index 66e073865..61e2dd83a 100644 --- a/packages/cli/src/lib/api/projects.ts +++ b/packages/cli/src/lib/api/projects.ts @@ -640,8 +640,8 @@ export async function findProjectByDsn( ): Promise { const orgs = await listOrganizations(); const limit = pLimit(ORG_FANOUT_CONCURRENCY); - let project: SentryProject | null = null; - let unsupported = false; + let project = null as SentryProject | null; + let unsupported = false as boolean; await Promise.all( orgs.map((org) => limit(async () => { diff --git a/packages/cli/src/lib/api/status-page.ts b/packages/cli/src/lib/api/status-page.ts index 3b273f8cb..d01ecdcb6 100644 --- a/packages/cli/src/lib/api/status-page.ts +++ b/packages/cli/src/lib/api/status-page.ts @@ -133,9 +133,9 @@ async function tryFetchStatuspageSummary( return; } - let summary: SummaryResponse; + let summary: SummaryResponse | null; try { - summary = (await response.json()) as SummaryResponse; + summary = (await response.json()) as SummaryResponse | null; } catch (err) { log.debug(`Statuspage summary parse failed for ${endpoint}`, err); return; @@ -152,7 +152,7 @@ async function tryFetchStatuspageSummary( .filter((c) => !c.group && typeof c.name === "string") .map((c) => ({ name: c.name as string, - status: (c.status as ComponentStatus) ?? "operational", + status: (c.status ?? "operational") as ComponentStatus, })); const incidents: StatusIncident[] = (summary.incidents ?? []).map((i) => ({ @@ -163,8 +163,8 @@ async function tryFetchStatuspageSummary( })); return { - indicator: (summary.status?.indicator as StatusIndicator) ?? "none", - description: summary.status?.description ?? "Unknown", + indicator: summary.status.indicator as StatusIndicator, + description: summary.status.description ?? "Unknown", url: summary.page?.url ?? normalized, components, incidents, diff --git a/packages/cli/src/lib/banner.ts b/packages/cli/src/lib/banner.ts index 7882bd077..e20124b05 100644 --- a/packages/cli/src/lib/banner.ts +++ b/packages/cli/src/lib/banner.ts @@ -112,7 +112,7 @@ export function bannerLinesForWidth(columns: number): BannerLine[] { * string when the terminal is too narrow for even the text mark. */ export function formatBanner( - columns: number = process.stdout.columns ?? 80, + columns: number = process.stdout.columns || 80, ): string { return bannerLinesForWidth(columns) .map(({ content, color }) => chalk.hex(color)(content)) diff --git a/packages/cli/src/lib/chunk-loader.ts b/packages/cli/src/lib/chunk-loader.ts index 6c7ec0f3d..0af301339 100644 --- a/packages/cli/src/lib/chunk-loader.ts +++ b/packages/cli/src/lib/chunk-loader.ts @@ -110,10 +110,11 @@ const MIN_NODE_MAJOR = 22; export function canLoadChunks( versions: NodeJS.ProcessVersions = process.versions, ): boolean { + const vmConstants = constants as Partial | undefined; return ( versions.bun === undefined && Number.parseInt(versions.node, 10) >= MIN_NODE_MAJOR && - constants?.USE_MAIN_CONTEXT_DEFAULT_LOADER !== undefined + vmConstants?.USE_MAIN_CONTEXT_DEFAULT_LOADER !== undefined ); } diff --git a/packages/cli/src/lib/clipboard.ts b/packages/cli/src/lib/clipboard.ts index 27916ddac..b7ef9afda 100644 --- a/packages/cli/src/lib/clipboard.ts +++ b/packages/cli/src/lib/clipboard.ts @@ -59,11 +59,8 @@ export async function copyToClipboard(text: string): Promise { stdio: ["pipe", "ignore", "ignore"], }); - const { stdin } = proc; - if (stdin) { - stdin.write(text); - stdin.end(); - } + proc.stdin.write(text); + proc.stdin.end(); const exitCode = await new Promise((resolve) => { proc.on("close", (code) => resolve(code ?? 1)); diff --git a/packages/cli/src/lib/datasets.ts b/packages/cli/src/lib/datasets.ts index 96e9a7cd5..1703e5441 100644 --- a/packages/cli/src/lib/datasets.ts +++ b/packages/cli/src/lib/datasets.ts @@ -32,7 +32,8 @@ export type ExploreDataset = | "replays"; /** Canonical user-facing name for each API dataset */ -const DISPLAY_NAMES: Record = { +const DISPLAY_NAMES: Partial> & + Record = { errors: "errors", spans: "spans", logs: "logs", @@ -59,7 +60,7 @@ const ALIASES: Record = { * User-facing name for an API dataset, e.g. `tracemetrics` to `metrics`. */ export function datasetDisplayName(dataset: string): string { - return DISPLAY_NAMES[dataset as ExploreDataset] ?? dataset; + return DISPLAY_NAMES[dataset] ?? dataset; } /** diff --git a/packages/cli/src/lib/db/auth.ts b/packages/cli/src/lib/db/auth.ts index 6ba799035..3b1b71c49 100644 --- a/packages/cli/src/lib/db/auth.ts +++ b/packages/cli/src/lib/db/auth.ts @@ -419,7 +419,7 @@ export function getAuthConfig(): AuthConfig | undefined { } return { - token: row.token ?? undefined, + token: row.token, refreshToken: row.refresh_token ?? undefined, expiresAt: row.expires_at ?? undefined, issuedAt: row.issued_at ?? undefined, @@ -711,7 +711,7 @@ export function setAuthToken( // SENTRY_HOST or `.sentryclirc` says. With none there, a new account. // Re-authorizing a specific account targets exactly that account. const existing = reauthorizeId - ? findAccountToReauthorize(reauthorizeId, options?.host) + ? findAccountToReauthorize(reauthorizeId, options.host) : options?.newAccount ? undefined : findAccountToReplace(options?.host); diff --git a/packages/cli/src/lib/db/migration.ts b/packages/cli/src/lib/db/migration.ts index 941cb2aa2..93c23dc6c 100644 --- a/packages/cli/src/lib/db/migration.ts +++ b/packages/cli/src/lib/db/migration.ts @@ -92,20 +92,20 @@ type OldConfig = { projectCache?: Record< string, { - orgSlug: string; - orgName: string; - projectSlug: string; - projectName: string; - cachedAt: number; - } + orgSlug?: string; + orgName?: string; + projectSlug?: string; + projectName?: string; + cachedAt?: number | null; + } | null >; dsnCache?: Record< string, { - dsn: string; - projectId: string; + dsn?: string; + projectId?: string; orgId?: string; - source: string; + source?: string; sourcePath?: string; resolved?: { orgSlug: string; @@ -113,12 +113,12 @@ type OldConfig = { projectSlug: string; projectName: string; }; - cachedAt: number; - } + cachedAt?: number | null; + } | null >; projectAliases?: { - aliases: Record; - cachedAt: number; + aliases?: Record; + cachedAt?: number | null; dsnFingerprint?: string; }; }; @@ -211,12 +211,12 @@ export function migrateFromJson(db: Database): void { if ( !( entry?.orgSlug && - entry?.orgName && - entry?.projectSlug && - entry?.projectName + entry.orgName && + entry.projectSlug && + entry.projectName ) || - entry?.cachedAt === null || - entry?.cachedAt === undefined + entry.cachedAt === null || + entry.cachedAt === undefined ) { continue; } @@ -244,9 +244,9 @@ export function migrateFromJson(db: Database): void { for (const [directory, entry] of Object.entries(oldConfig.dsnCache)) { // Skip malformed entries missing required fields if ( - !(entry?.dsn && entry?.projectId && entry?.source) || - entry?.cachedAt === null || - entry?.cachedAt === undefined + !(entry?.dsn && entry.projectId && entry.source) || + entry.cachedAt === null || + entry.cachedAt === undefined ) { continue; } @@ -283,7 +283,7 @@ export function migrateFromJson(db: Database): void { oldConfig.projectAliases.aliases, )) { // Skip malformed entries missing required fields - if (!(entry?.orgSlug && entry?.projectSlug)) { + if (!(entry?.orgSlug && entry.projectSlug)) { continue; } insertStmt.run( diff --git a/packages/cli/src/lib/db/sqlite.ts b/packages/cli/src/lib/db/sqlite.ts index a3000c6bf..a84d2c87a 100644 --- a/packages/cli/src/lib/db/sqlite.ts +++ b/packages/cli/src/lib/db/sqlite.ts @@ -144,11 +144,13 @@ function wrapStatement(stmt: any, kind: DriverKind): StatementWrapper { if (!target.isFinalized) { target.finalize(); } - return (row as Record) ?? null; + return ( + (row as Record | undefined) ?? null + ); } const row = target.get(...toNodeParams(params)); // Normalise no-row result to null (node:sqlite returns undefined). - return (row as Record) ?? null; + return (row as Record | undefined) ?? null; }; } if (prop === "all") { diff --git a/packages/cli/src/lib/delta-upgrade.ts b/packages/cli/src/lib/delta-upgrade.ts index d2dbc5374..4f53fd000 100644 --- a/packages/cli/src/lib/delta-upgrade.ts +++ b/packages/cli/src/lib/delta-upgrade.ts @@ -122,13 +122,6 @@ export function normalizeStableReleases( return normalized; } -function getPrimaryUpgradeSource(): UpgradeSource { - if (!PRIMARY_UPGRADE_SOURCE) { - throw new Error("No primary upgrade source is configured"); - } - return PRIMARY_UPGRADE_SOURCE; -} - const instrument: InstrumentHook = (name, fn) => withTracing(name, "http.client", fn); @@ -240,7 +233,7 @@ export function canAttemptDelta(targetVersion: string): boolean { export async function fetchRecentReleases( signal?: AbortSignal, - source: UpgradeSource = getPrimaryUpgradeSource(), + source: UpgradeSource = PRIMARY_UPGRADE_SOURCE, ): Promise { try { const response = await customFetch( @@ -361,7 +354,7 @@ export function resolveStableChain( currentVersion: string, targetVersion: string, signal?: AbortSignal, - source: UpgradeSource = getPrimaryUpgradeSource(), + source: UpgradeSource = PRIMARY_UPGRADE_SOURCE, ): Promise { return stableSource(source).resolveChain( currentVersion, @@ -379,7 +372,7 @@ export async function resolveNightlyChain(opts: { signal?: AbortSignal; source?: UpgradeSource; }): Promise { - const { source = getPrimaryUpgradeSource() } = opts; + const { source = PRIMARY_UPGRADE_SOURCE } = opts; const client = new OciClient({ registry: "https://ghcr.io", repo: source.ghcrRepo, @@ -419,7 +412,7 @@ export async function resolveNightlyChain(opts: { for (const [index, manifest] of manifests.entries()) { const tag = chainTags[index]; - if (!(manifest && tag)) { + if (!tag) { return null; } // Use the local validateChainStep (not binpatch's) so the rich 3-reason @@ -589,7 +582,7 @@ export function resolveStableDelta( destPath: string, offline?: boolean, setMessage?: SetMessage, - source: UpgradeSource = getPrimaryUpgradeSource(), + source: UpgradeSource = PRIMARY_UPGRADE_SOURCE, ): Promise { return resolveDelta( stableSource(source), @@ -608,7 +601,7 @@ export function resolveNightlyDelta( destPath: string, offline?: boolean, setMessage?: SetMessage, - source: UpgradeSource = getPrimaryUpgradeSource(), + source: UpgradeSource = PRIMARY_UPGRADE_SOURCE, ): Promise { return resolveDelta( nightlySource(source), @@ -627,7 +620,7 @@ export function attemptDeltaUpgrade( destPath: string, offline?: boolean, setMessage?: SetMessage, - source: UpgradeSource = getPrimaryUpgradeSource(), + source: UpgradeSource = PRIMARY_UPGRADE_SOURCE, ): Promise { if (!canAttemptDelta(targetVersion)) { return Promise.resolve(null); @@ -717,7 +710,7 @@ async function prefetch( export function prefetchNightlyPatches( targetVersion: string, signal?: AbortSignal, - source: UpgradeSource = getPrimaryUpgradeSource(), + source: UpgradeSource = PRIMARY_UPGRADE_SOURCE, ): Promise { return prefetch(nightlySource(source), targetVersion, signal); } @@ -725,7 +718,7 @@ export function prefetchNightlyPatches( export function prefetchStablePatches( targetVersion: string, signal?: AbortSignal, - source: UpgradeSource = getPrimaryUpgradeSource(), + source: UpgradeSource = PRIMARY_UPGRADE_SOURCE, ): Promise { return prefetch(stableSource(source), targetVersion, signal); } diff --git a/packages/cli/src/lib/detect-agent.ts b/packages/cli/src/lib/detect-agent.ts index d5c5ecd6b..ce9c0534f 100644 --- a/packages/cli/src/lib/detect-agent.ts +++ b/packages/cli/src/lib/detect-agent.ts @@ -373,7 +373,7 @@ export async function getProcessInfoFromOS( { timeout: 500 }, ); const match = result.trim().match(PS_PPID_COMM_RE); - if (match?.[1] && match?.[2]) { + if (match?.[1] && match[2]) { return { name: basename(match[2].trim()), ppid: Number(match[1]) }; } } catch (error) { diff --git a/packages/cli/src/lib/formatters/colors.ts b/packages/cli/src/lib/formatters/colors.ts index f364d054f..333abb5be 100644 --- a/packages/cli/src/lib/formatters/colors.ts +++ b/packages/cli/src/lib/formatters/colors.ts @@ -86,7 +86,8 @@ export const header = (text: string): string => muted(text); // Status-based Coloring -const STATUS_COLORS: Record string> = { +const STATUS_COLORS: Partial string>> & + Record string> = { resolved: green, resolvedInNextRelease: green, unresolved: yellow, @@ -101,15 +102,16 @@ export function statusColor(text: string, status: string | undefined): string { // Try exact match first (handles camelCase like resolvedInNextRelease), // then fall back to lowercase (handles unexpected uppercase from older instances). const colorFn = - STATUS_COLORS[status as IssueStatus] ?? - STATUS_COLORS[status?.toLowerCase() as IssueStatus] ?? + STATUS_COLORS[status ?? ""] ?? + STATUS_COLORS[status?.toLowerCase() ?? ""] ?? STATUS_COLORS.unresolved; return colorFn(text); } // Level-based Coloring -const LEVEL_COLORS: Record string> = { +const LEVEL_COLORS: Partial string>> & + Record string> = { fatal: red, error: red, warning: yellow, @@ -121,8 +123,7 @@ const LEVEL_COLORS: Record string> = { * Color text based on issue level (case-insensitive) */ export function levelColor(text: string, level: string | undefined): string { - const normalizedLevel = level?.toLowerCase() as IssueLevel; - const colorFn = LEVEL_COLORS[normalizedLevel]; + const colorFn = LEVEL_COLORS[level?.toLowerCase() ?? ""]; return colorFn ? colorFn(text) : text; } diff --git a/packages/cli/src/lib/formatters/event-outcomes.ts b/packages/cli/src/lib/formatters/event-outcomes.ts index cfcbd3782..869c165a1 100644 --- a/packages/cli/src/lib/formatters/event-outcomes.ts +++ b/packages/cli/src/lib/formatters/event-outcomes.ts @@ -35,7 +35,9 @@ function shareRatio(events: number, total: number): number { return total === 0 ? 0 : events / total; } -type Buckets = ListOrganizationEventsDroppedResponse["droppedEvents"]; +type Bucket = ListOrganizationEventsDroppedResponse["droppedEvents"][number]; + +type Buckets = Array & Partial>>; function sumCounts(buckets: Buckets): number { return buckets.reduce((sum, bucket) => sum + bucket.count, 0); diff --git a/packages/cli/src/lib/formatters/explore-timeseries.ts b/packages/cli/src/lib/formatters/explore-timeseries.ts index 7e16bf877..7cca6ca0b 100644 --- a/packages/cli/src/lib/formatters/explore-timeseries.ts +++ b/packages/cli/src/lib/formatters/explore-timeseries.ts @@ -142,7 +142,7 @@ export function formatExploreTimeSeriesHuman( ): string { const scope = data.project ? `${data.org}/${data.project}` : data.org; const details = [`Querying ${text(data.dataset)} in ${text(scope)}`]; - if (data.meta?.start !== undefined && data.meta.end !== undefined) { + if (data.meta) { details.push( `Range (UTC): ${formatUtcTimestamp(data.meta.start)} to ${formatUtcTimestamp(data.meta.end)}`, ); diff --git a/packages/cli/src/lib/formatters/feedback.ts b/packages/cli/src/lib/formatters/feedback.ts index 9d1a7d090..72d171308 100644 --- a/packages/cli/src/lib/formatters/feedback.ts +++ b/packages/cli/src/lib/formatters/feedback.ts @@ -289,7 +289,7 @@ function formatFeedbackOverview(data: FeedbackViewResult): string { if (feedback.project) { rows.push([ "Project", - `${escapeFeedbackInline(feedback.project.name ?? feedback.project.slug)} (${feedbackCodeSpan(feedback.project.slug)})`, + `${escapeFeedbackInline(feedback.project.name)} (${feedbackCodeSpan(feedback.project.slug)})`, ]); } if (feedback.assignedTo?.name) { diff --git a/packages/cli/src/lib/formatters/human.ts b/packages/cli/src/lib/formatters/human.ts index d9a396c84..692807ddb 100644 --- a/packages/cli/src/lib/formatters/human.ts +++ b/packages/cli/src/lib/formatters/human.ts @@ -65,7 +65,8 @@ const FIXABILITY_TAGS: Record[0]> = // Status Formatting -const STATUS_ICONS: Record = { +const STATUS_ICONS: Partial> & + Record = { resolved: colorTag("green", "✓"), resolvedInNextRelease: colorTag("green", "✓"), unresolved: colorTag("yellow", "●"), @@ -73,7 +74,8 @@ const STATUS_ICONS: Record = { muted: colorTag("muted", "−"), }; -const STATUS_LABELS: Record = { +const STATUS_LABELS: Partial> & + Record = { resolved: `${colorTag("green", "✓")} Resolved`, resolvedInNextRelease: `${colorTag("green", "✓")} Resolved in Next Release`, unresolved: `${colorTag("yellow", "●")} Unresolved`, @@ -204,16 +206,14 @@ function formatFeaturesMarkdown(features: string[] | undefined): string { * Get status icon for an issue status */ export function formatStatusIcon(status: string | undefined): string { - return STATUS_ICONS[status as IssueStatus] ?? colorTag("yellow", "●"); + return STATUS_ICONS[status ?? ""] ?? colorTag("yellow", "●"); } /** * Get full status label for an issue status */ export function formatStatusLabel(status: string | undefined): string { - return ( - STATUS_LABELS[status as IssueStatus] ?? `${colorTag("yellow", "●")} Unknown` - ); + return STATUS_LABELS[status ?? ""] ?? `${colorTag("yellow", "●")} Unknown`; } // Issue Formatting @@ -819,7 +819,7 @@ function releaseVersion( export function formatIssueDetails(issue: SentryIssue): string { const lines: string[] = []; - lines.push(`## ${issue.shortId}: ${text(issue.title ?? "")}`); + lines.push(`## ${issue.shortId}: ${text(issue.title)}`); lines.push(""); // Key-value details as a table @@ -858,7 +858,7 @@ export function formatIssueDetails(issue: SentryIssue): string { if (issue.project) { kvRows.push([ "Project", - `${text(issue.project.name ?? "(unknown)")} (${inlineCode(issue.project.slug ?? "")})`, + `${text(issue.project.name)} (${inlineCode(issue.project.slug)})`, ]); } @@ -1127,7 +1127,7 @@ function formatSpanSimple(span: TraceSpan, opts: FormatSpanOptions): void { line += ` ${plainSafeMuted(`(${prettyMs(durationMs)})`)}`; } - line += ` ${plainSafeMuted(span.span_id ?? "")}`; + line += ` ${plainSafeMuted(span.span_id)}`; lines.push(line); @@ -2422,7 +2422,7 @@ export function formatUpgradeResult(data: UpgradeResult): string { default: { // Exhaustive check — all action types should be handled above const _: never = data.action; - lines.push(ACTION_DESCRIPTIONS[_ as UpgradeResult["action"]] ?? "Done"); + lines.push("Done"); } } diff --git a/packages/cli/src/lib/formatters/local.ts b/packages/cli/src/lib/formatters/local.ts index 0e0831e6c..8b55d9720 100644 --- a/packages/cli/src/lib/formatters/local.ts +++ b/packages/cli/src/lib/formatters/local.ts @@ -470,7 +470,7 @@ export type LogEntry = { level?: string; body?: string; timestamp?: number; - attributes?: Record; + attributes?: Record; }; /** @@ -515,12 +515,11 @@ export function formatSingleLog(logEntry: LogEntry, source: string): string { ([k, v]) => isUserLogAttribute(k) && v !== null && - v !== undefined && v.value !== null && v.value !== undefined, ) .sort(([a], [b]) => a.localeCompare(b)) - .map(([k, v]) => muted(`[${sanitize(k)}=${sanitize(String(v.value))}]`)); + .map(([k, v]) => muted(`[${sanitize(k)}=${sanitize(String(v?.value))}]`)); if (attrs.length > 0) { msg += ` ${attrs.join(" ")}`; } @@ -570,7 +569,7 @@ export type StreamedSpan = { * `Record` compatible with the semantic display pipeline. */ function flattenSpanAttributes( - attrs: Record | undefined, + attrs: Record | undefined, ): Record { if (!attrs) { return {}; @@ -919,7 +918,7 @@ function formatLogJson( ) .map(([k, v]) => [ stripBidi(k), - typeof v.value === "string" ? stripBidi(v.value) : v.value, + typeof v?.value === "string" ? stripBidi(v.value) : v?.value, ]), ) : undefined, diff --git a/packages/cli/src/lib/formatters/markdown.ts b/packages/cli/src/lib/formatters/markdown.ts index e68fda4e4..183c742ce 100644 --- a/packages/cli/src/lib/formatters/markdown.ts +++ b/packages/cli/src/lib/formatters/markdown.ts @@ -270,10 +270,10 @@ function renderOneInline(token: Token): string { case "link": { const link = token as Tokens.Link; let linkText = renderInline(link.tokens); - let href = link.href ?? ""; + let href = link.href; // GFM autolinks absorb backslash-escapes literally (\_astro → \_astro). // Detect autolinks via link.raw (starts with URL, not "[") and strip artifacts. - const raw = link.raw ?? ""; + const raw = link.raw; if (raw.startsWith("http://") || raw.startsWith("https://")) { const stripEscapes = (s: string) => s.replace(/\\([_*`[\]<>\\])/g, "$1"); @@ -297,7 +297,7 @@ function renderOneInline(token: Token): string { } return (token as Tokens.Text).text; case "html": { - const raw = (token as Tokens.HTML).raw ?? (token as Tokens.HTML).text; + const raw = (token as Tokens.HTML).raw; return renderHtmlToken(raw); } default: @@ -324,9 +324,7 @@ function renderInline(tokens: Token[]): string { // Check for color tag open: , , etc. if (token.type === "html") { - const raw = ( - (token as Tokens.HTML).raw ?? (token as Tokens.HTML).text - ).trim(); + const raw = (token as Tokens.HTML).raw.trim(); const openMatch = RE_OPEN_TAG.exec(raw); if (openMatch) { const tagName = (openMatch[1] ?? "").toLowerCase(); @@ -340,9 +338,8 @@ function renderInline(tokens: Token[]): string { const t = tokens[i] as Token; if ( t.type === "html" && - ((t as Tokens.HTML).raw ?? (t as Tokens.HTML).text) - .trim() - .toLowerCase() === closeTag.toLowerCase() + (t as Tokens.HTML).raw.trim().toLowerCase() === + closeTag.toLowerCase() ) { i += 1; // consume close tag break; @@ -461,7 +458,7 @@ function renderList(list: Tokens.List, depth = 0): string { if (!item) { continue; } - const start = Number(list.start ?? 1); + const start = Number(list.start); const bullet = list.ordered ? `${start + i}.` : "•"; const body = item.tokens .map((t) => { @@ -472,7 +469,7 @@ function renderList(list: Tokens.List, depth = 0): string { return renderInline((t as Tokens.Text).tokens ?? []); } if ("tokens" in t && (t as Tokens.Generic).tokens) { - return renderInline(((t as Tokens.Generic).tokens as Token[]) ?? []); + return renderInline((t as Tokens.Generic).tokens as Token[]); } return (t as { raw?: string }).raw ?? ""; }) @@ -531,10 +528,10 @@ export function renderMarkdown(md: string): string { // Parse and render to get structural formatting (headings, tables, lists), // then strip ANSI codes. This produces human-readable output with aligned // tables and proper heading emphasis, without ANSI escape sequences. - const tokens = marked.lexer(md ?? ""); + const tokens = marked.lexer(md); return stripAnsi(renderBlocks(tokens)).trimEnd(); } - const tokens = marked.lexer(md ?? ""); + const tokens = marked.lexer(md); return renderBlocks(tokens).trimEnd(); } @@ -551,7 +548,7 @@ export function renderMarkdown(md: string): string { * @returns Styled string (TTY) or plain text (non-TTY / plain mode) */ export function renderInlineMarkdown(md: string): string { - const tokens = marked.lexer(md ?? ""); + const tokens = marked.lexer(md); const rendered = renderInline(tokens.flatMap(flattenInline)); return isPlainOutput() ? stripAnsi(rendered) : rendered; } diff --git a/packages/cli/src/lib/formatters/replay.ts b/packages/cli/src/lib/formatters/replay.ts index 773b08511..c2911c0ec 100644 --- a/packages/cli/src/lib/formatters/replay.ts +++ b/packages/cli/src/lib/formatters/replay.ts @@ -593,7 +593,7 @@ export function formatReplayDetails(data: ReplayViewData): string { /** Build a contextual hint pointing the user to a related trace or issue. */ export function replayHint(data: ReplayViewData): string | undefined { - const traceId = data.replay.trace_ids?.[0]; + const traceId = data.replay.trace_ids[0]; if (traceId) { return `Related trace: ${sentry`trace view ${data.org}/${traceId}`}`; } diff --git a/packages/cli/src/lib/formatters/seer.ts b/packages/cli/src/lib/formatters/seer.ts index 5b44fbee4..b7f410231 100644 --- a/packages/cli/src/lib/formatters/seer.ts +++ b/packages/cli/src/lib/formatters/seer.ts @@ -154,7 +154,7 @@ export type IssueExplainData = { function buildRootCauseMarkdown(cause: RootCause, index: number): string { const lines: string[] = []; - lines.push(`### Cause #${index}: ${text(cause.description ?? "")}`); + lines.push(`### Cause #${index}: ${text(cause.description)}`); lines.push(""); if (cause.relevant_repos && cause.relevant_repos.length > 0) { @@ -360,7 +360,7 @@ export function formatSolution(solution: SolutionArtifact): string { lines.push("## Solution"); lines.push(""); - lines.push(`**Summary:** ${text(solution.data.one_line_summary ?? "")}`); + lines.push(`**Summary:** ${text(solution.data.one_line_summary)}`); lines.push(""); if (solution.data.steps.length > 0) { diff --git a/packages/cli/src/lib/formatters/sql.ts b/packages/cli/src/lib/formatters/sql.ts index 2b73157da..3e190487c 100644 --- a/packages/cli/src/lib/formatters/sql.ts +++ b/packages/cli/src/lib/formatters/sql.ts @@ -52,7 +52,7 @@ function colorizeToken(token: Token): string { } // Token content is another token (shouldn't happen per spec but handle gracefully) - if (typeof token.content === "object" && token.content !== null) { + if (typeof token.content === "object") { return colorizeToken(token.content); } diff --git a/packages/cli/src/lib/formatters/trace.ts b/packages/cli/src/lib/formatters/trace.ts index 91e2e9ff2..44cef3096 100644 --- a/packages/cli/src/lib/formatters/trace.ts +++ b/packages/cli/src/lib/formatters/trace.ts @@ -425,7 +425,7 @@ export function findSpanById( depth: number, ancestors: TraceSpan[], ): FoundSpan | null { - if (span.span_id?.toLowerCase() === spanId) { + if (span.span_id.toLowerCase() === spanId) { return { span, depth, ancestors }; } for (const child of span.children ?? []) { @@ -752,7 +752,7 @@ function appendAttributeRows( const shown = attrs.slice(0, MAX_DISPLAY_ATTRS); for (const attr of shown) { - if (attr.value !== undefined && attr.value !== null && attr.value !== "") { + if (attr.value !== "") { kvRows.push([attr.name, tableCell(String(attr.value))]); } } diff --git a/packages/cli/src/lib/games/snake-terminal.ts b/packages/cli/src/lib/games/snake-terminal.ts index a68f6dfab..0fc85bb9f 100644 --- a/packages/cli/src/lib/games/snake-terminal.ts +++ b/packages/cli/src/lib/games/snake-terminal.ts @@ -204,8 +204,8 @@ export function playSnake( { input, output }: SnakeTerminal, { color, onGameOver }: SnakeOptions, ): Promise { - const columns = () => output.columns ?? DEFAULT_COLUMNS; - const rows = () => output.rows ?? DEFAULT_ROWS; + const columns = () => output.columns || DEFAULT_COLUMNS; + const rows = () => output.rows || DEFAULT_ROWS; const boardSize = () => snakeBoardSize(columns(), rows()); const fits = () => snakeFrameFits(state, columns(), rows()); const start = boardSize(); diff --git a/packages/cli/src/lib/ghcr.ts b/packages/cli/src/lib/ghcr.ts index 0b00adeb7..8e7158a6a 100644 --- a/packages/cli/src/lib/ghcr.ts +++ b/packages/cli/src/lib/ghcr.ts @@ -81,7 +81,7 @@ function rethrowExternalAbort( externalSignal?: AbortSignal, ): void { if (externalSignal?.aborted) { - throw externalSignal?.reason; + throw externalSignal.reason; } } diff --git a/packages/cli/src/lib/help.ts b/packages/cli/src/lib/help.ts index a79754dc8..d42a1c15e 100644 --- a/packages/cli/src/lib/help.ts +++ b/packages/cli/src/lib/help.ts @@ -326,7 +326,7 @@ export function printCustomHelp(options: CustomHelpOptions = {}): string { // Skip banner for non-TTY to avoid wasting tokens in agent loops if (process.stdout.isTTY) { - const cols = process.stdout.columns ?? 80; + const cols = process.stdout.columns || 80; // Prefer a real kitty/sixel image on capable terminals; otherwise fall back // to the block-art banner sized to the terminal width (returns "" only when // the terminal is too narrow for even the compact mark). diff --git a/packages/cli/src/lib/interactive-login.ts b/packages/cli/src/lib/interactive-login.ts index acc378773..9f5ddd243 100644 --- a/packages/cli/src/lib/interactive-login.ts +++ b/packages/cli/src/lib/interactive-login.ts @@ -243,7 +243,7 @@ export async function runInteractiveLogin( userCode, verificationUriComplete, browserOpened, - process.stdin.isTTY ?? false, + process.stdin.isTTY, ); for (const line of displayLines) { log.log(line); diff --git a/packages/cli/src/lib/introspect.ts b/packages/cli/src/lib/introspect.ts index 10a8f9f57..ead6439eb 100644 --- a/packages/cli/src/lib/introspect.ts +++ b/packages/cli/src/lib/introspect.ts @@ -228,12 +228,8 @@ export function getPositionalString(params?: PositionalParams): string { .join(" "); } - if (params.kind === "array") { - const placeholder = params.parameter.placeholder ?? "args"; - return `<${placeholder}...>`; - } - - return ""; + const placeholder = params.parameter.placeholder ?? "args"; + return `<${placeholder}...>`; } /** @@ -262,18 +258,14 @@ export function extractPositionals( })); } - if (params.kind === "array") { - return [ - { - placeholder: params.parameter.placeholder ?? "args", - brief: params.parameter.brief ?? "", - optional: false, - variadic: true, - }, - ]; - } - - return []; + return [ + { + placeholder: params.parameter.placeholder ?? "args", + brief: params.parameter.brief ?? "", + optional: false, + variadic: true, + }, + ]; } /** diff --git a/packages/cli/src/lib/list-command.ts b/packages/cli/src/lib/list-command.ts index fc9a5c113..4fa834621 100644 --- a/packages/cli/src/lib/list-command.ts +++ b/packages/cli/src/lib/list-command.ts @@ -437,7 +437,7 @@ function getSubcommandsForRoute(routeName: string): Set { byRoute = new Map(); for (const entry of routes.getAllEntries()) { const target = entry.target as unknown as Record; - if (typeof target?.getAllEntries === "function") { + if (typeof target.getAllEntries === "function") { byRoute.set( entry.name.original, collectChildNames( diff --git a/packages/cli/src/lib/region.ts b/packages/cli/src/lib/region.ts index bc0c5cd4e..84e92b772 100644 --- a/packages/cli/src/lib/region.ts +++ b/packages/cli/src/lib/region.ts @@ -167,7 +167,9 @@ async function resolveOrgRegionUncached( const responseIdentity = rawResponse ? getResponseCredentialIdentity(rawResponse) : undefined; - const rawRegionUrl = response.data?.links?.regionUrl; + // Sentry before 22.9 sends no `links`. + const links = response.data?.links as { regionUrl?: string } | undefined; + const rawRegionUrl = links?.regionUrl; const regionUrl = getResolvedRegionUrl( rawRegionUrl, responseOrigin, diff --git a/packages/cli/src/lib/release-notes.ts b/packages/cli/src/lib/release-notes.ts index 28cd6deb7..338df0db1 100644 --- a/packages/cli/src/lib/release-notes.ts +++ b/packages/cli/src/lib/release-notes.ts @@ -135,7 +135,7 @@ function normalizeHeading(text: string): string { * @returns Array of sections with category and markdown content */ export function extractSections(body: string): ChangeSection[] { - if (!body?.trim()) { + if (!body.trim()) { return []; } diff --git a/packages/cli/src/lib/replay-search.ts b/packages/cli/src/lib/replay-search.ts index 15fd9c8c8..05a14651a 100644 --- a/packages/cli/src/lib/replay-search.ts +++ b/packages/cli/src/lib/replay-search.ts @@ -127,7 +127,7 @@ const DERIVED_REPLAY_FIELDS: Record = { count_screens: { root: "count_urls", resolve: (replay) => replay.count_urls }, count_traces: { root: "trace_ids", - resolve: (replay) => replay.trace_ids?.length, + resolve: (replay) => replay.trace_ids.length, }, device: { root: "device", resolve: (replay) => replay.device?.name }, error_id: { diff --git a/packages/cli/src/lib/resolve-target.ts b/packages/cli/src/lib/resolve-target.ts index bedaa0fcb..4d66ce460 100644 --- a/packages/cli/src/lib/resolve-target.ts +++ b/packages/cli/src/lib/resolve-target.ts @@ -862,7 +862,7 @@ async function findSimilarProjectsAcrossOrgs( }); nameMatchedSlugs = matchedNames .map((n) => nameToSlug.get(n)) - .filter((s): s is string => s !== null && s !== undefined); + .filter((s): s is string => s !== undefined); } // Merge slug matches and name matches, preferring slug matches. diff --git a/packages/cli/src/lib/response-cache-store.ts b/packages/cli/src/lib/response-cache-store.ts index e1ab800b0..b4aa74bcd 100644 --- a/packages/cli/src/lib/response-cache-store.ts +++ b/packages/cli/src/lib/response-cache-store.ts @@ -189,7 +189,7 @@ function fromStored(stored: StoredEntry): ParsedEntry { function legacyExpiresAt(legacy: LegacyEntry): number { return ( legacy.expiresAt ?? - legacy.createdAt + FALLBACK_TTL_MS[classifyUrl(legacy.url ?? "")] + legacy.createdAt + FALLBACK_TTL_MS[classifyUrl(legacy.url)] ); } @@ -211,6 +211,7 @@ function fromLegacy(legacy: LegacyEntry): ParsedEntry { } function isStored(parsed: StoredEntry | LegacyEntry): parsed is StoredEntry { + // oxlint-disable-next-line typescript/no-unnecessary-condition -- a newer CLI may have written another version return "v" in parsed && parsed.v === 2; } diff --git a/packages/cli/src/lib/scan/concurrent.ts b/packages/cli/src/lib/scan/concurrent.ts index 47dbc00ad..f0cb1f36d 100644 --- a/packages/cli/src/lib/scan/concurrent.ts +++ b/packages/cli/src/lib/scan/concurrent.ts @@ -76,6 +76,7 @@ export async function mapFilesConcurrent( return; } const out = await fn(item); + // oxlint-disable-next-line typescript/no-unnecessary-condition -- another task can set earlyExit while fn is awaited if (state.earlyExit || out === null) { return; } @@ -134,7 +135,7 @@ export async function* mapFilesConcurrentStream( }); }; - let producerDone = false; + let producerDone = false as boolean; let producerError: unknown = null; const tasks: Promise[] = []; @@ -151,6 +152,7 @@ export async function* mapFilesConcurrentStream( return; } const out = await fn(item); + // oxlint-disable-next-line typescript/no-unnecessary-condition -- another task can set earlyExit while fn is awaited if (state.earlyExit || out === null || out.length === 0) { return; } @@ -171,7 +173,7 @@ export async function* mapFilesConcurrentStream( })(); try { - while (true) { + for (;;) { if (queue.length > 0) { // Drain everything already queued before we yield control, // so fast consumers don't spin one microtask per result. diff --git a/packages/cli/src/lib/scan/grep.ts b/packages/cli/src/lib/scan/grep.ts index a86da7eb0..6c953d9dd 100644 --- a/packages/cli/src/lib/scan/grep.ts +++ b/packages/cli/src/lib/scan/grep.ts @@ -360,7 +360,7 @@ async function* grepViaWorkers( // fires before the consumer is waiting, so the consumer picks it // up on the next loop iteration instead of missing the wakeup. let pendingNotify: (() => void) | null = null; - let notifyPending = false; + let notifyPending = false as boolean; const wakeConsumer = () => { if (pendingNotify) { const fn = pendingNotify; @@ -371,8 +371,8 @@ async function* grepViaWorkers( } }; - let earlyExit = false; - let walkerDone = false; + let earlyExit = false as boolean; + let walkerDone = false as boolean; let inflightCount = 0; // Track dispatch outcomes so the consumer's `finally` can detect diff --git a/packages/cli/src/lib/scan/walker.ts b/packages/cli/src/lib/scan/walker.ts index cc943c364..640cc840f 100644 --- a/packages/cli/src/lib/scan/walker.ts +++ b/packages/cli/src/lib/scan/walker.ts @@ -427,7 +427,7 @@ async function* walkParallel(ctx: WalkContext): AsyncGenerator { // worker lifecycle (cancelled, abort, idle-wait, error path, wake coordination) is inherently branchy const runWorker = async (): Promise => { - while (true) { + for (;;) { // Outer try catches: // - AbortError from `checkAborted` (crucially including the // first iteration when the signal was pre-fired); @@ -507,7 +507,7 @@ async function* walkParallel(ctx: WalkContext): AsyncGenerator { }); try { - while (true) { + for (;;) { if (pending.length > 0) { while (pending.length > 0) { yield pending.shift() as WalkEntry; diff --git a/packages/cli/src/lib/select-ui/ink-ui.ts b/packages/cli/src/lib/select-ui/ink-ui.ts index 8ecd2ac4b..e84ec984c 100644 --- a/packages/cli/src/lib/select-ui/ink-ui.ts +++ b/packages/cli/src/lib/select-ui/ink-ui.ts @@ -147,7 +147,7 @@ export async function selectWithFilter( const app = await loadInkApp(); const freshStdin = openFreshTtyForInk(); const stdin = freshStdin ?? process.stdin; - const wasRaw = stdin.isRaw ?? false; + const wasRaw = stdin.isRaw; let instance: InkInstance | undefined; let resolveSelection!: (value: string | null) => void; const selection = new Promise((resolve) => { @@ -176,7 +176,7 @@ export async function selectWithFilter( await instance?.waitUntilExit(); } finally { try { - stdin.setRawMode?.(wasRaw); + stdin.setRawMode(wasRaw); } finally { if (freshStdin) { try { diff --git a/packages/cli/src/lib/sentryclirc-import.ts b/packages/cli/src/lib/sentryclirc-import.ts index 88f738e96..d5e5610fb 100644 --- a/packages/cli/src/lib/sentryclirc-import.ts +++ b/packages/cli/src/lib/sentryclirc-import.ts @@ -696,7 +696,7 @@ export async function executeImport( /** Parse a stored import record from JSON. Returns null on parse failure. */ function parseImportRecord(raw: string): ImportRecord | null { try { - const parsed = JSON.parse(raw) as ImportRecord; + const parsed = JSON.parse(raw) as ImportRecord | null; if (!Array.isArray(parsed?.sources)) { log.debug("Import record has invalid sources field"); return null; diff --git a/packages/cli/src/lib/sixel.ts b/packages/cli/src/lib/sixel.ts index 8c964d0ce..47d7c3b02 100644 --- a/packages/cli/src/lib/sixel.ts +++ b/packages/cli/src/lib/sixel.ts @@ -503,7 +503,7 @@ export function canRenderKitty(): boolean { * session, mirroring the fit check {@link sixelFits} does for the banner. */ export function terminalPixelWidth( - columns: number = process.stdout.columns ?? 80, + columns: number = process.stdout.columns || 80, ): number | undefined { const caps = detectSixelCaps(); if ( @@ -522,7 +522,7 @@ export function terminalPixelWidth( * guessing, because a guessed row height corrupts the dashboard grid. */ export function terminalPixelHeight( - rows: number = process.stdout.rows ?? 24, + rows: number = process.stdout.rows || 24, ): number | undefined { const caps = detectSixelCaps(); if ( @@ -541,7 +541,7 @@ export function terminalPixelHeight( * affects sharpness, never layout. */ export function tmuxKittyPlacement( - columns: number = process.stdout.columns ?? 80, + columns: number = process.stdout.columns || 80, ): TmuxKittyPlacement | undefined { if (!detectSixelCaps().tmux) { return; @@ -587,7 +587,7 @@ function sixelBanner(): string | undefined { * caller falls back to the block-art banner. */ export function graphicsBanner( - columns: number = process.stdout.columns ?? 80, + columns: number = process.stdout.columns || 80, ): string | undefined { // Re-evaluate the cheap, I/O-free gates on every call. detectSixelCaps caches // the probe result, so this ensures a later opt-out (NO_COLOR, diff --git a/packages/cli/src/lib/snapshots/archive.ts b/packages/cli/src/lib/snapshots/archive.ts index 01fd1671e..7bab6287c 100644 --- a/packages/cli/src/lib/snapshots/archive.ts +++ b/packages/cli/src/lib/snapshots/archive.ts @@ -56,7 +56,7 @@ export async function extractZipStream( mkdirSync(root, { recursive: true }); let written = 0; - let failure: Error | null = null; + let failure = null as Error | null; let completed = false; const writes: Promise[] = []; const openStreams: ReturnType[] = []; diff --git a/packages/cli/src/lib/telemetry.ts b/packages/cli/src/lib/telemetry.ts index c82e56f65..3bd50058f 100644 --- a/packages/cli/src/lib/telemetry.ts +++ b/packages/cli/src/lib/telemetry.ts @@ -1123,7 +1123,7 @@ export function withTracingSpan( { name, op, attributes, onlyIfParent: true }, async (span) => { // Track if callback sets status, so we don't override it - let statusWasSet = false; + let statusWasSet = false as boolean; const originalSetStatus = span.setStatus.bind(span); span.setStatus = (...args) => { statusWasSet = true; diff --git a/packages/cli/src/lib/telemetry/credential-redaction.ts b/packages/cli/src/lib/telemetry/credential-redaction.ts index 63aefe36c..59e9ee223 100644 --- a/packages/cli/src/lib/telemetry/credential-redaction.ts +++ b/packages/cli/src/lib/telemetry/credential-redaction.ts @@ -7,7 +7,7 @@ import { redactCredentialText } from "../credential-redaction.js"; function redactJson(value: T): T { let serialized: string | undefined; try { - serialized = JSON.stringify(value); + serialized = JSON.stringify(value) as string | undefined; } catch { // This is the SDK's envelope serialization fallback for cycles and BigInt. serialized = JSON.stringify(normalize(value)); diff --git a/packages/cli/src/lib/upgrade.ts b/packages/cli/src/lib/upgrade.ts index 2f110912c..d57f5389f 100644 --- a/packages/cli/src/lib/upgrade.ts +++ b/packages/cli/src/lib/upgrade.ts @@ -486,7 +486,7 @@ export async function fetchLatestFromGitHubWithSource( let response = resolved.response; const visitedPages = new Set([getGitHubLatestReleaseUrl(resolved.source)]); const versions: string[] = []; - while (true) { + for (;;) { const data = await parseUpgradeJson( response, signal, diff --git a/packages/cli/src/lib/walk-up.ts b/packages/cli/src/lib/walk-up.ts index d28054f7c..2516ff2d3 100644 --- a/packages/cli/src/lib/walk-up.ts +++ b/packages/cli/src/lib/walk-up.ts @@ -26,7 +26,7 @@ export async function* walkUpFrom(startDir: string): AsyncGenerator { const seen = new Set(); let current = resolve(startDir); - while (true) { + for (;;) { let real: string; try { real = await realpath(current); diff --git a/packages/cli/src/output-schemas/dashboard.ts b/packages/cli/src/output-schemas/dashboard.ts index 94d975627..736a9052b 100644 --- a/packages/cli/src/output-schemas/dashboard.ts +++ b/packages/cli/src/output-schemas/dashboard.ts @@ -31,7 +31,7 @@ export { DashboardRevisionSchema } from "../types/dashboard.js"; /** Schema for dashboard list items (lightweight, from GET /dashboards/) */ export const DashboardListItemSchema = looseObject({ id: string(), - title: string(), + title: optional(string()), dateCreated: optional(string()), createdBy: optional( object({ diff --git a/packages/cli/src/types/seer.ts b/packages/cli/src/types/seer.ts index a706dd945..22c65c9af 100644 --- a/packages/cli/src/types/seer.ts +++ b/packages/cli/src/types/seer.ts @@ -297,7 +297,7 @@ function searchContainersForRootCauses( /** Agent root cause artifact data from the explorer endpoint */ type AgentRootCauseData = { - one_line_description: string; + one_line_description?: string; five_whys?: string[]; reproduction_steps?: string[]; relevant_repo?: string | null; @@ -322,7 +322,7 @@ function searchBlocksForAgentRootCause( const agentData = artifact.data as AgentRootCauseData; const cause: RootCause = { id: 0, - description: agentData.one_line_description, + description: agentData.one_line_description ?? "", relevant_repos: agentData.relevant_repo ? [agentData.relevant_repo] : undefined, diff --git a/packages/cli/test/commands/api.test.ts b/packages/cli/test/commands/api.test.ts index 3e09f46e3..06376454d 100644 --- a/packages/cli/test/commands/api.test.ts +++ b/packages/cli/test/commands/api.test.ts @@ -1786,21 +1786,15 @@ describe("dataToQueryParams", () => { }); test("throws on null", () => { - expect(() => - dataToQueryParams(null as unknown as Record), - ).toThrow(ValidationError); + expect(() => dataToQueryParams(null)).toThrow(ValidationError); }); test("throws on boolean", () => { - expect(() => - dataToQueryParams(true as unknown as Record), - ).toThrow(ValidationError); + expect(() => dataToQueryParams(true)).toThrow(ValidationError); }); test("throws on number", () => { - expect(() => - dataToQueryParams(42 as unknown as Record), - ).toThrow(ValidationError); + expect(() => dataToQueryParams(42)).toThrow(ValidationError); }); }); diff --git a/packages/cli/test/commands/dashboard/list.test.ts b/packages/cli/test/commands/dashboard/list.test.ts index 75b2b4528..3a860d1bd 100644 --- a/packages/cli/test/commands/dashboard/list.test.ts +++ b/packages/cli/test/commands/dashboard/list.test.ts @@ -547,10 +547,7 @@ describe("dashboard list command", () => { test("handles dashboards with undefined title in human output", async () => { resolveOrgSpy.mockResolvedValue("test-org"); listDashboardsPaginatedSpy.mockResolvedValue({ - data: [ - { id: "1", title: undefined as unknown as string, widgetDisplay: [] }, - DASHBOARD_B, - ], + data: [{ id: "1", title: undefined, widgetDisplay: [] }, DASHBOARD_B], nextCursor: undefined, }); @@ -566,9 +563,7 @@ describe("dashboard list command", () => { test("handles dashboards with undefined title in JSON output", async () => { resolveOrgSpy.mockResolvedValue("test-org"); listDashboardsPaginatedSpy.mockResolvedValue({ - data: [ - { id: "1", title: undefined as unknown as string, widgetDisplay: [] }, - ], + data: [{ id: "1", title: undefined, widgetDisplay: [] }], nextCursor: undefined, }); @@ -584,10 +579,7 @@ describe("dashboard list command", () => { test("glob filter does not crash on dashboards with undefined title", async () => { resolveOrgSpy.mockResolvedValue("test-org"); listDashboardsPaginatedSpy.mockResolvedValue({ - data: [ - { id: "1", title: undefined as unknown as string, widgetDisplay: [] }, - DASHBOARD_B, - ], + data: [{ id: "1", title: undefined, widgetDisplay: [] }, DASHBOARD_B], nextCursor: undefined, }); diff --git a/packages/cli/test/commands/event/view.test.ts b/packages/cli/test/commands/event/view.test.ts index efc1ee6a3..9b76ec29f 100644 --- a/packages/cli/test/commands/event/view.test.ts +++ b/packages/cli/test/commands/event/view.test.ts @@ -1004,9 +1004,9 @@ describe("resolveOrgAllTarget", () => { const result = await resolveOrgAllTarget("acme", "abc123", "/tmp"); expect(result).not.toBeNull(); - expect(result?.org).toBe("acme"); - expect(result?.project).toBe("frontend"); - expect(result?.prefetchedEvent?.eventID).toBe("abc123"); + expect(result.org).toBe("acme"); + expect(result.project).toBe("frontend"); + expect(result.prefetchedEvent?.eventID).toBe("abc123"); }); test("throws ResolutionError when event not found in explicit org", async () => { diff --git a/packages/cli/test/commands/issue/explain.func.test.ts b/packages/cli/test/commands/issue/explain.func.test.ts index 64ea364f5..8afdbfd64 100644 --- a/packages/cli/test/commands/issue/explain.func.test.ts +++ b/packages/cli/test/commands/issue/explain.func.test.ts @@ -50,7 +50,7 @@ function sampleState(cause: RootCause): AutofixState { } function createMockContext() { - const stdoutWrite = vi.fn(() => true); + const stdoutWrite = vi.fn((_chunk: string) => true); return { context: { stdout: { write: stdoutWrite }, diff --git a/packages/cli/test/commands/local/run.test.ts b/packages/cli/test/commands/local/run.test.ts index 98a2ec0fa..f23bc07d8 100644 --- a/packages/cli/test/commands/local/run.test.ts +++ b/packages/cli/test/commands/local/run.test.ts @@ -44,10 +44,8 @@ vi.mock("node:child_process", async (importOriginal) => { options: Parameters[2], ) => { spawnCapture.args = args; - spawnCapture.env = (options as { env?: NodeJS.ProcessEnv })?.env; - spawnCapture.stdio = ( - options as { stdio?: typeof spawnCapture.stdio } - )?.stdio; + spawnCapture.env = options.env; + spawnCapture.stdio = options.stdio; return actual.spawn(cmd, args as string[], options); }, }; diff --git a/packages/cli/test/commands/log/list.test.ts b/packages/cli/test/commands/log/list.test.ts index 693948881..7cdc01e23 100644 --- a/packages/cli/test/commands/log/list.test.ts +++ b/packages/cli/test/commands/log/list.test.ts @@ -199,6 +199,7 @@ function createMockContext() { stdout: { write: stdoutWrite }, stderr: { write: stderrWrite }, cwd: "/tmp", + process: {}, }, stdoutWrite, stderrWrite, diff --git a/packages/cli/test/commands/project/list.test.ts b/packages/cli/test/commands/project/list.test.ts index d0f603515..c0923849d 100644 --- a/packages/cli/test/commands/project/list.test.ts +++ b/packages/cli/test/commands/project/list.test.ts @@ -1525,7 +1525,7 @@ describe("handleAutoDetect", () => { expect(result.items).toHaveLength(2); expect(result.hasMore).toBe(true); expect(result.jsonExtra).toBeDefined(); - expect((result.jsonExtra as Record)?.hint).toBeString(); + expect((result.jsonExtra as Record).hint).toBeString(); }); test("respects --platform flag", async () => { @@ -1609,7 +1609,7 @@ describe("handleAutoDetect", () => { expect(result.hasMore).toBe(true); expect(result.items).toHaveLength(2); expect(result.jsonExtra).toBeDefined(); - const jsonHint = (result.jsonExtra as Record)?.hint; + const jsonHint = (result.jsonExtra as Record).hint; expect(jsonHint).toContain("test-org/"); expect(jsonHint).toContain("--json"); }); @@ -1629,7 +1629,7 @@ describe("handleAutoDetect", () => { }); expect(result.hasMore).toBe(true); - const jsonHint = (result.jsonExtra as Record)?.hint; + const jsonHint = (result.jsonExtra as Record).hint; expect(jsonHint).toBe("sentry project list 'test-org/web-*' --json"); }); diff --git a/packages/cli/test/commands/sourcemap/upload.test.ts b/packages/cli/test/commands/sourcemap/upload.test.ts index 19ba74f34..7fbcbef49 100644 --- a/packages/cli/test/commands/sourcemap/upload.test.ts +++ b/packages/cli/test/commands/sourcemap/upload.test.ts @@ -550,8 +550,8 @@ describe("sourcemap upload command — --allow-empty behavior", () => { const callArgs = uploadSpy.mock.calls[0]?.[0]; expect(callArgs?.files).toHaveLength(2); const urls = callArgs?.files.map((f) => f.url); - expect(urls?.some((u) => u?.includes("app.ts"))).toBe(true); - expect(urls?.some((u) => u?.includes("other.js"))).toBe(false); + expect(urls?.some((u) => u.includes("app.ts"))).toBe(true); + expect(urls?.some((u) => u.includes("other.js"))).toBe(false); } finally { uploadSpy.mockRestore(); } @@ -583,8 +583,8 @@ describe("sourcemap upload command — --allow-empty behavior", () => { // Only app.js pair should be uploaded (2 files: .js + .map) expect(callArgs?.files).toHaveLength(2); const urls = callArgs?.files.map((f) => f.url); - expect(urls?.some((u) => u?.includes("app.js"))).toBe(true); - expect(urls?.some((u) => u?.includes("vendor"))).toBe(false); + expect(urls?.some((u) => u.includes("app.js"))).toBe(true); + expect(urls?.some((u) => u.includes("vendor"))).toBe(false); } finally { uploadSpy.mockRestore(); } @@ -616,8 +616,8 @@ describe("sourcemap upload command — --allow-empty behavior", () => { const callArgs = uploadSpy.mock.calls[0]?.[0]; expect(callArgs?.files).toHaveLength(2); const urls = callArgs?.files.map((f) => f.url); - expect(urls?.some((u) => u?.includes("app.js"))).toBe(true); - expect(urls?.some((u) => u?.includes("vendor"))).toBe(false); + expect(urls?.some((u) => u.includes("app.js"))).toBe(true); + expect(urls?.some((u) => u.includes("vendor"))).toBe(false); } finally { uploadSpy.mockRestore(); } @@ -645,9 +645,7 @@ describe("sourcemap upload command — --allow-empty behavior", () => { .mockResolvedValue(undefined); try { await func.call(makeContext(), {}, target); - return (uploadSpy.mock.calls[0]?.[0]?.files ?? []).map( - (f) => f.url ?? "", - ); + return (uploadSpy.mock.calls[0]?.[0]?.files ?? []).map((f) => f.url); } finally { uploadSpy.mockRestore(); } @@ -786,7 +784,7 @@ describe("sourcemap upload command — --allow-empty behavior", () => { // Common prefix "build/output/" stripped: "~/main.js", "~/vendor.js" expect(urls).toContain("~/main.js"); expect(urls).toContain("~/vendor.js"); - expect(urls?.some((u) => u?.includes("build"))).toBe(false); + expect(urls?.some((u) => u.includes("build"))).toBe(false); } finally { uploadSpy.mockRestore(); } @@ -839,8 +837,8 @@ describe("sourcemap upload command — --allow-empty behavior", () => { const callArgs = uploadSpy.mock.calls[0]?.[0]; // Should have paired concat.js with correct.js.map (last directive) const urls = callArgs?.files.map((f) => f.url); - expect(urls?.some((u) => u?.includes("correct.js.map"))).toBe(true); - expect(urls?.some((u) => u?.includes("wrong.js.map"))).toBe(false); + expect(urls?.some((u) => u.includes("correct.js.map"))).toBe(true); + expect(urls?.some((u) => u.includes("wrong.js.map"))).toBe(false); } finally { uploadSpy.mockRestore(); } diff --git a/packages/cli/test/lib/api/chunk-upload.test.ts b/packages/cli/test/lib/api/chunk-upload.test.ts index 0ed9f21f0..0ec80e7d8 100644 --- a/packages/cli/test/lib/api/chunk-upload.test.ts +++ b/packages/cli/test/lib/api/chunk-upload.test.ts @@ -191,7 +191,11 @@ describe("assemble requests", () => { respondWith({ state: "bogus", missingChunks: [] }); await expect( - assembleArtifactBundle("my-org", { checksum: "abc", chunks: [] }), + assembleArtifactBundle("my-org", { + checksum: "abc", + chunks: [], + projects: [], + }), ).rejects.toThrow("Unexpected response format"); }); }); diff --git a/packages/cli/test/lib/api/infrastructure.test.ts b/packages/cli/test/lib/api/infrastructure.test.ts index 5e25b98ed..3002683ce 100644 --- a/packages/cli/test/lib/api/infrastructure.test.ts +++ b/packages/cli/test/lib/api/infrastructure.test.ts @@ -755,13 +755,13 @@ describe("throwApiError", () => { } expect(captured).toBeDefined(); - expect(captured?.status).toBe(401); - expect(captured?.detail).toContain("over its member limit"); - expect(captured?.detail).toContain("billing/seat-limit"); + expect(captured.status).toBe(401); + expect(captured.detail).toContain("over its member limit"); + expect(captured.detail).toContain("billing/seat-limit"); // The fix must NOT give the misleading re-auth advice for this case. - expect(captured?.detail).not.toContain("sentry auth login"); - expect(captured?.detail).not.toContain("session has expired"); - expect(captured?.detail).not.toContain("SENTRY_AUTH_TOKEN"); + expect(captured.detail).not.toContain("sentry auth login"); + expect(captured.detail).not.toContain("session has expired"); + expect(captured.detail).not.toContain("SENTRY_AUTH_TOKEN"); }); describe("with OAuth token (no env var)", () => { diff --git a/packages/cli/test/lib/auth-hint.test.ts b/packages/cli/test/lib/auth-hint.test.ts index e2d7b60c8..6ac4391e9 100644 --- a/packages/cli/test/lib/auth-hint.test.ts +++ b/packages/cli/test/lib/auth-hint.test.ts @@ -80,11 +80,10 @@ function captureStderr() { /** Number of calls whose first argument contained the env-hint body. */ hintCalls: () => stderrSpy.mock.calls.filter((call) => - String(call[0] ?? "").includes("SENTRY_FORCE_ENV_TOKEN=1"), + String(call[0]).includes("SENTRY_FORCE_ENV_TOKEN=1"), ).length, /** Flattened first-arg text across all calls (for substring assertions). */ - text: () => - stderrSpy.mock.calls.map((call) => String(call[0] ?? "")).join(""), + text: () => stderrSpy.mock.calls.map((call) => String(call[0])).join(""), restore: () => stderrSpy.mockRestore(), }; } diff --git a/packages/cli/test/lib/completions.property.test.ts b/packages/cli/test/lib/completions.property.test.ts index 2a07832f9..268d3462c 100644 --- a/packages/cli/test/lib/completions.property.test.ts +++ b/packages/cli/test/lib/completions.property.test.ts @@ -33,12 +33,15 @@ import { generateZshCompletion, } from "../../src/lib/completions.js"; import { + type CommandCompletions, extractCommandCompletions, extractRouteGroups, type RouteMap, } from "../../src/lib/introspect.js"; import { DEFAULT_NUM_RUNS } from "../model-based/helpers.js"; +const generatedCommands: CommandCompletions = generatedTargets.commands; + // -- Arbitraries -- /** Generate valid binary names (lowercase alphanumeric + hyphens) */ @@ -276,7 +279,7 @@ describe("proposeCompletions: Stricli integration", () => { describe("property: flag names", () => { test("hidden flags are excluded", () => { - for (const command of Object.values(generatedTargets.commands)) { + for (const command of Object.values(generatedCommands)) { // The global --log-level is hidden; the parser still accepts it expect(command.flagNames ?? {}).not.toHaveProperty("--log-level"); } @@ -544,7 +547,7 @@ describe("complete.ts: generated completion targets", () => { }); test("project create completes name:platform specs", () => { - expect(generatedTargets.commands["project create"]?.positionals).toEqual([ + expect(generatedCommands["project create"]?.positionals).toEqual([ PROJECT_SPEC_TARGET, ]); }); diff --git a/packages/cli/test/lib/db/open-fallback.test.ts b/packages/cli/test/lib/db/open-fallback.test.ts index 6781335ab..3f2613c78 100644 --- a/packages/cli/test/lib/db/open-fallback.test.ts +++ b/packages/cli/test/lib/db/open-fallback.test.ts @@ -37,7 +37,7 @@ afterEach(() => { /** Capture everything written to stderr, where the logger prints warnings. */ function captureStderr(): () => string { const spy = vi.spyOn(process.stderr, "write").mockImplementation(() => true); - return () => spy.mock.calls.map((call) => String(call[0] ?? "")).join(""); + return () => spy.mock.calls.map((call) => String(call[0])).join(""); } /** Write a metadata key and read it back through `getDatabase()`. */ diff --git a/packages/cli/test/lib/delta-upgrade.test.ts b/packages/cli/test/lib/delta-upgrade.test.ts index 77b31e15b..165a46f2b 100644 --- a/packages/cli/test/lib/delta-upgrade.test.ts +++ b/packages/cli/test/lib/delta-upgrade.test.ts @@ -45,9 +45,6 @@ import type { OciManifest } from "../../src/lib/ghcr.js"; import { useTestConfigDir } from "../helpers.js"; const LEGACY_UPGRADE_SOURCE = UPGRADE_SOURCES[1]; -if (!LEGACY_UPGRADE_SOURCE) { - throw new Error("Legacy upgrade source is not configured"); -} // --------------------------------------------------------------------------- // Test helpers (file-scoped) diff --git a/packages/cli/test/lib/dsn/env-file.test.ts b/packages/cli/test/lib/dsn/env-file.test.ts index d7460ea50..da6afd530 100644 --- a/packages/cli/test/lib/dsn/env-file.test.ts +++ b/packages/cli/test/lib/dsn/env-file.test.ts @@ -313,7 +313,7 @@ describe("integration: file-based detection", () => { // Invalid DSN should be parsed but createDetectedDsn may return null // depending on DSN validation // For this test, we just verify it doesn't crash - expect(result === null || result?.raw === "not-a-valid-dsn").toBe(true); + expect(result === null || result.raw === "not-a-valid-dsn").toBe(true); }); test("respects ENV_FILES priority order", async () => { diff --git a/packages/cli/test/lib/envelope/event-builder.test.ts b/packages/cli/test/lib/envelope/event-builder.test.ts index 8943bc7db..1f4b1e853 100644 --- a/packages/cli/test/lib/envelope/event-builder.test.ts +++ b/packages/cli/test/lib/envelope/event-builder.test.ts @@ -185,12 +185,12 @@ describe("buildEventFromFlags", () => { test("--no-environ omits process.env from extra", async () => { const event = await buildEventFromFlags(flags({ "no-environ": true })); - expect((event.extra as Record)?.environ).toBeUndefined(); + expect(event.extra?.environ).toBeUndefined(); }); test("environ included when --no-environ not set", async () => { const event = await buildEventFromFlags(flags({ "no-environ": false })); - expect((event.extra as Record)?.environ).toBeDefined(); + expect(event.extra?.environ).toBeDefined(); }); test("--user routes known fields correctly", async () => { diff --git a/packages/cli/test/lib/formatters/markdown.test.ts b/packages/cli/test/lib/formatters/markdown.test.ts index e10c47ace..f1ff3a45f 100644 --- a/packages/cli/test/lib/formatters/markdown.test.ts +++ b/packages/cli/test/lib/formatters/markdown.test.ts @@ -44,7 +44,7 @@ function withEnv( const savedEnv: Record = {}; const savedTTY = process.stdout.isTTY; - for (const [key, val] of Object.entries(vars)) { + for (const [key, val] of Object.entries(vars)) { savedEnv[key] = process.env[key]; if (val === undefined) { delete process.env[key]; diff --git a/packages/cli/test/lib/formatters/trace.test.ts b/packages/cli/test/lib/formatters/trace.test.ts index 5c91261d5..c0a3e6871 100644 --- a/packages/cli/test/lib/formatters/trace.test.ts +++ b/packages/cli/test/lib/formatters/trace.test.ts @@ -603,14 +603,6 @@ describe("findSpanById", () => { const result = findSpanById(spans, "0000000000000000"); expect(result).toBeNull(); }); - - test("handles span with undefined span_id gracefully", () => { - const spans = [ - { start_timestamp: 1000, children: [] } as unknown as TraceSpan, - ]; - const result = findSpanById(spans, "a1b2c3d4e5f67890"); - expect(result).toBeNull(); - }); }); // --------------------------------------------------------------------------- diff --git a/packages/cli/test/lib/git-commit-log.test.ts b/packages/cli/test/lib/git-commit-log.test.ts index 19ba8699a..65aaa8d38 100644 --- a/packages/cli/test/lib/git-commit-log.test.ts +++ b/packages/cli/test/lib/git-commit-log.test.ts @@ -1,9 +1,12 @@ import { afterEach, describe, expect, test, vi } from "vitest"; // Mock node:child_process so getCommitLog never shells out to a real git. -const execFileSyncMock = vi.fn(() => ""); +const execFileSyncMock = vi.fn( + (_file: string, _args: string[], _options?: unknown) => "", +); vi.mock("node:child_process", () => ({ - execFileSync: (...args: unknown[]) => execFileSyncMock(...args), + execFileSync: (file: string, args: string[], options?: unknown) => + execFileSyncMock(file, args, options), })); import { getCommitLog } from "../../src/lib/git.js"; diff --git a/packages/cli/test/lib/id-arguments.test.ts b/packages/cli/test/lib/id-arguments.test.ts index 346886942..a6b5335ec 100644 --- a/packages/cli/test/lib/id-arguments.test.ts +++ b/packages/cli/test/lib/id-arguments.test.ts @@ -172,7 +172,7 @@ describe.each(KINDS)("%s IDs", (_name, kind, id, other) => { const label = kind.label.charAt(0).toLowerCase() + kind.label.slice(1); const text = args.at(-1)?.split("/").at(-1) ?? ""; expect(() => parse(kind, args)).toThrow( - `Not a ${label}: "${text}". To search, try \`${kind.search?.command()} --query '${text}'\`.`, + `Not a ${label}: "${text}". To search, try \`${kind.search.command()} --query '${text}'\`.`, ); // Unvalidated, it stays raw for the command to recover, then validate expect(parse(kind, args, { validate: false }).ids).toEqual([text]); diff --git a/packages/cli/test/lib/logger.test.ts b/packages/cli/test/lib/logger.test.ts index 25f35bc3a..457855ea1 100644 --- a/packages/cli/test/lib/logger.test.ts +++ b/packages/cli/test/lib/logger.test.ts @@ -207,7 +207,7 @@ describe("printJsonLine", () => { .mockImplementation(() => true); try { expect(loggerModule.printJsonLine).toBeTypeOf("function"); - loggerModule.printJsonLine?.('{"schema_version":1,"type":"error"}'); + loggerModule.printJsonLine('{"schema_version":1,"type":"error"}'); expect(stdout).toHaveBeenCalledWith( '{"schema_version":1,"type":"error"}\n', ); diff --git a/packages/cli/test/lib/parse-bool.property.test.ts b/packages/cli/test/lib/parse-bool.property.test.ts index 7e28041cd..c1c59df51 100644 --- a/packages/cli/test/lib/parse-bool.property.test.ts +++ b/packages/cli/test/lib/parse-bool.property.test.ts @@ -140,9 +140,7 @@ describe("property: parseBoolValue", () => { property(string(), (input) => { // Should never throw, always returns boolean | null const result = parseBoolValue(input); - expect(result === true || result === false || result === null).toBe( - true, - ); + expect([true, false, null]).toContain(result); }), { numRuns: DEFAULT_NUM_RUNS }, ); diff --git a/packages/cli/test/lib/resolve-target-picker.test.ts b/packages/cli/test/lib/resolve-target-picker.test.ts index d27d17653..889b15214 100644 --- a/packages/cli/test/lib/resolve-target-picker.test.ts +++ b/packages/cli/test/lib/resolve-target-picker.test.ts @@ -68,7 +68,7 @@ beforeAll(async () => { }); afterAll(() => { - server?.stop(); + server.stop(); }); beforeEach(() => { diff --git a/packages/cli/test/lib/sentry-client.response-body.test.ts b/packages/cli/test/lib/sentry-client.response-body.test.ts index 703ec0b34..33eb3a71b 100644 --- a/packages/cli/test/lib/sentry-client.response-body.test.ts +++ b/packages/cli/test/lib/sentry-client.response-body.test.ts @@ -326,7 +326,7 @@ describe("SDK response body recovery", () => { stream.enqueue(new TextEncoder().encode("[")); init?.signal?.addEventListener( "abort", - () => stream.error(init?.signal?.reason), + () => stream.error(init.signal?.reason), { once: true }, ); }, diff --git a/packages/cli/test/lib/sentry-client.test.ts b/packages/cli/test/lib/sentry-client.test.ts index 48d4a8fd6..bb8cc76d6 100644 --- a/packages/cli/test/lib/sentry-client.test.ts +++ b/packages/cli/test/lib/sentry-client.test.ts @@ -756,7 +756,7 @@ describe("API request tracing", () => { ); const span = getActiveSpan(); activeSpanOp = span - ? spanToJSON(span).attributes?.[SEMANTIC_ATTRIBUTE_SENTRY_OP] + ? spanToJSON(span).attributes[SEMANTIC_ATTRIBUTE_SENTRY_OP] : undefined; return jsonResponse({ ok: true }); }); diff --git a/packages/cli/test/lib/telemetry-credentials.test.ts b/packages/cli/test/lib/telemetry-credentials.test.ts index 21d4082aa..f308c5d2f 100644 --- a/packages/cli/test/lib/telemetry-credentials.test.ts +++ b/packages/cli/test/lib/telemetry-credentials.test.ts @@ -217,7 +217,7 @@ describe("telemetry credential boundaries", () => { const redacted = redactTelemetryEnvelope(envelope); expect(JSON.stringify(redacted)).not.toContain("SYNTHETIC"); expect(JSON.stringify(redacted)).toContain("[Circular ~]"); - expect(redacted[1][1]?.[1]).toBe(bytes); + expect(redacted[1][1][1]).toBe(bytes); expect(data.token).toBe(token); expect(data.circular).toBe(data); }); diff --git a/packages/cli/test/lib/telemetry/offline-store.test.ts b/packages/cli/test/lib/telemetry/offline-store.test.ts index ca181a15f..04f9bc9f5 100644 --- a/packages/cli/test/lib/telemetry/offline-store.test.ts +++ b/packages/cli/test/lib/telemetry/offline-store.test.ts @@ -87,7 +87,7 @@ describe.each(["node", "wasm"] as const)( expect(claimed?.[0]).toEqual(envelope[0]); expect(claimed?.[1][0]).toEqual(envelope[1][0]); - expect(claimed?.[1][1]?.[0]).toEqual(envelope[1][1]?.[0]); + expect(claimed?.[1][1]?.[0]).toEqual(envelope[1][1][0]); expect(Buffer.from(claimed?.[1][1]?.[1] as Uint8Array)).toEqual( Buffer.from(bytes), ); diff --git a/packages/cli/test/lib/version-check.test.ts b/packages/cli/test/lib/version-check.test.ts index 23eb681a0..586d699d1 100644 --- a/packages/cli/test/lib/version-check.test.ts +++ b/packages/cli/test/lib/version-check.test.ts @@ -36,7 +36,7 @@ import { mockFetch, useTestConfigDir } from "../helpers.js"; * must simulate a TTY first. Restores the previous value on cleanup. */ function withStderrTTY(value: boolean): () => void { - const original = process.stderr.isTTY; + const original = (process.stderr as { isTTY?: boolean }).isTTY; (process.stderr as { isTTY?: boolean }).isTTY = value; return () => { if (original === undefined) { diff --git a/packages/cli/vitest.config.ts b/packages/cli/vitest.config.ts index 2792dbf14..717cf30fc 100644 --- a/packages/cli/vitest.config.ts +++ b/packages/cli/vitest.config.ts @@ -18,7 +18,7 @@ function requireJsToTsPlugin(): Plugin { if (!(id.endsWith(".ts") && code.includes("require("))) { return; } - let changed = false; + let changed = false as boolean; const transformed = code.replace( /require\(["'](\.[\w/.]+)\.js["']\)/g, (match, relPath) => { From f0f513cba5786117be345655aab41c395910d738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josh=20Goldberg=20=E2=9C=A8?= Date: Fri, 13 Nov 2026 09:43:00 -0500 Subject: [PATCH 3/4] ref(lint): Fix no-unnecessary-condition in cli code from main Co-Authored-By: Claude Opus 5.5 --- packages/cli/script/text-import-plugin.ts | 2 +- packages/cli/src/commands/local/receiver-ingest.ts | 2 +- packages/cli/src/lib/formatters/seer.ts | 2 +- packages/cli/src/lib/select-ui/terminal.ts | 6 +++--- packages/cli/src/lib/sourcemap/debug-id.ts | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/cli/script/text-import-plugin.ts b/packages/cli/script/text-import-plugin.ts index fcb13bb95..9bf2c226f 100644 --- a/packages/cli/script/text-import-plugin.ts +++ b/packages/cli/script/text-import-plugin.ts @@ -27,7 +27,7 @@ export const textImportPlugin: Plugin = { })); build.onResolve({ filter: ANY_FILTER }, (args) => { - if (args.with?.type === "text") { + if (args.with.type === "text") { return { path: resolvePath(args.resolveDir, args.path), namespace: TEXT_IMPORT_NS, diff --git a/packages/cli/src/commands/local/receiver-ingest.ts b/packages/cli/src/commands/local/receiver-ingest.ts index 0faabe45c..43802ea5c 100644 --- a/packages/cli/src/commands/local/receiver-ingest.ts +++ b/packages/cli/src/commands/local/receiver-ingest.ts @@ -30,7 +30,7 @@ export async function readReceiverBody( const chunks: Uint8Array[] = []; let size = 0; try { - while (true) { + for (;;) { const { done, value } = await reader.read(); if (done) return Buffer.concat(chunks, size); size += value.byteLength; diff --git a/packages/cli/src/lib/formatters/seer.ts b/packages/cli/src/lib/formatters/seer.ts index bf7daec6e..552fa5191 100644 --- a/packages/cli/src/lib/formatters/seer.ts +++ b/packages/cli/src/lib/formatters/seer.ts @@ -154,7 +154,7 @@ export type IssueExplainData = { function buildRootCauseMarkdown(rootCause: RootCause, index: number): string { const lines: string[] = []; - lines.push(`### Cause #${index}: ${text(rootCause.description ?? "")}`); + lines.push(`### Cause #${index}: ${text(rootCause.description)}`); lines.push(""); if (rootCause.cause) { diff --git a/packages/cli/src/lib/select-ui/terminal.ts b/packages/cli/src/lib/select-ui/terminal.ts index a966532eb..174f2369c 100644 --- a/packages/cli/src/lib/select-ui/terminal.ts +++ b/packages/cli/src/lib/select-ui/terminal.ts @@ -67,7 +67,7 @@ export async function selectWithFilter( ): Promise { const freshStdin = openFreshTty(); const stdin = freshStdin ?? process.stdin; - const wasRaw = stdin.isRaw ?? false; + const wasRaw = stdin.isRaw; let picker: MountedPicker | undefined; let resolveSelection!: (value: string | null) => void; let rejectSelection!: (error: unknown) => void; @@ -80,7 +80,7 @@ export async function selectWithFilter( // Surface terminal read failures instead of waiting forever for a key. stdin.once("error", rejectSelection); try { - stdin.setRawMode?.(true); + stdin.setRawMode(true); stdin.resume(); picker = mountSelectPrompt(createSelectPrompt(opts, resolveSelection), { input: stdin, @@ -95,7 +95,7 @@ export async function selectWithFilter( picker?.close(); } finally { try { - stdin.setRawMode?.(wasRaw); + stdin.setRawMode(wasRaw); } finally { stdin.pause(); freshStdin?.destroy(); diff --git a/packages/cli/src/lib/sourcemap/debug-id.ts b/packages/cli/src/lib/sourcemap/debug-id.ts index c2ec98824..ea8f25eb3 100644 --- a/packages/cli/src/lib/sourcemap/debug-id.ts +++ b/packages/cli/src/lib/sourcemap/debug-id.ts @@ -339,7 +339,7 @@ export async function injectDebugId( type SourcemapJson = { mappings?: string; sources?: (string | null)[]; - sections?: IndexMapSection[]; + sections?: (IndexMapSection | null)[]; debug_id?: string; debugId?: string; }; @@ -347,7 +347,7 @@ type SourcemapJson = { /** A section of an ECMA-426 index map, which Turbopack emits. */ type IndexMapSection = { offset?: { line?: unknown }; - map?: SourcemapJson; + map?: SourcemapJson | null; }; /** @@ -389,7 +389,7 @@ function insertGeneratedLine(map: SourcemapJson, line: number): void { let spanning: { map: SourcemapJson; start: number } | undefined; for (const section of map.sections) { const start = section?.offset?.line; - if (typeof start !== "number") { + if (!section || typeof start !== "number") { continue; } if (start >= line) { From 5f7cf1b4878b92bc767a8d239c5b3c8a809fa01d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josh=20Goldberg=20=E2=9C=A8?= Date: Fri, 13 Nov 2026 12:01:14 -0500 Subject: [PATCH 4/4] fix(cli): Keep the metric alert query filter safe for null rule names Co-Authored-By: Claude Opus 5.5 --- .../cli/src/commands/alert/metrics/list.ts | 4 ++- .../test/commands/alert/metrics/list.test.ts | 28 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/packages/cli/src/commands/alert/metrics/list.ts b/packages/cli/src/commands/alert/metrics/list.ts index b380a9f5d..418d3d675 100644 --- a/packages/cli/src/commands/alert/metrics/list.ts +++ b/packages/cli/src/commands/alert/metrics/list.ts @@ -339,7 +339,9 @@ async function handleResolvedOrgs( ); const filteredRows = flags.query ? allRows.filter((row) => - row.rule.name.toLowerCase().includes(flags.query?.toLowerCase() ?? ""), + ((row.rule.name as string | null) ?? "") + .toLowerCase() + .includes(flags.query?.toLowerCase() ?? ""), ) : allRows; diff --git a/packages/cli/test/commands/alert/metrics/list.test.ts b/packages/cli/test/commands/alert/metrics/list.test.ts index 7aee9f680..f189c86f9 100644 --- a/packages/cli/test/commands/alert/metrics/list.test.ts +++ b/packages/cli/test/commands/alert/metrics/list.test.ts @@ -203,6 +203,34 @@ describe("alert metrics list pagination", () => { expect(parsed.hasMore).toBe(true); }); + test("query filter skips rules with a null name", async () => { + globalThis.fetch = mockFetch(async (input, init) => { + const req = new Request(input, init); + if (req.url.includes("/organizations/test-org/detectors/")) { + return new Response( + JSON.stringify([ + { ...detector({ id: "1", name: "" }), name: null }, + detector({ id: "2", name: "Metric Rule Alpha" }), + ]), + { status: 200, headers: { "Content-Type": "application/json" } }, + ); + } + return new Response(JSON.stringify({ detail: "Not found" }), { + status: 404, + }); + }); + + const { context, stdout } = createContext(); + await func.call( + context, + { web: false, fresh: false, limit: 10, json: true, query: "alpha" }, + "test-org/", + ); + + const parsed = JSON.parse(stdout.output); + expect(parsed.data.map((rule: { id: string }) => rule.id)).toEqual(["2"]); + }); + test("--web with explicit org opens browser without fetching rules", async () => { globalThis.fetch = mockFetch(async () => { throw new Error("fetch should not be called for explicit --web");