diff --git a/.github/workflows/cli-build.yml b/.github/workflows/cli-build.yml index f0c6296c0d..b7a50aa042 100644 --- a/.github/workflows/cli-build.yml +++ b/.github/workflows/cli-build.yml @@ -55,7 +55,7 @@ jobs: os: ubuntu-latest steps: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ env.NODE_VERSION_22 }} @@ -264,7 +264,7 @@ jobs: environment: ${{ github.ref == 'refs/heads/main' && 'production' || startsWith(github.ref, 'refs/heads/release/cli/') && 'cli-release' || '' }} steps: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ env.NODE_VERSION_22 }} @@ -344,7 +344,7 @@ jobs: PUBLIC_SENTRY_ENVIRONMENT: ${{ (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/cli/')) && 'production' || 'development' }} steps: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ env.NODE_VERSION_24 }} diff --git a/.github/workflows/deploy-docs-mcp.yml b/.github/workflows/deploy-docs-mcp.yml index cd3ca3a47a..725069128b 100644 --- a/.github/workflows/deploy-docs-mcp.yml +++ b/.github/workflows/deploy-docs-mcp.yml @@ -75,8 +75,8 @@ jobs: with: node-version: "22" - # pnpm/action-setup@v4 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda + # pnpm/action-setup@v6.1.1 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 name: Install pnpm with: run_install: false diff --git a/.github/workflows/deploy-games-api.yml b/.github/workflows/deploy-games-api.yml index feaa2416b9..8464b3e51d 100644 --- a/.github/workflows/deploy-games-api.yml +++ b/.github/workflows/deploy-games-api.yml @@ -74,8 +74,8 @@ jobs: with: node-version: "22" - # pnpm/action-setup@v4 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda + # pnpm/action-setup@v6.1.1 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 name: Install pnpm with: run_install: false diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d27499a2af..5db4c610a1 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -74,8 +74,8 @@ jobs: with: node-version: "22" - # pnpm/action-setup@v4 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda + # pnpm/action-setup@v6.1.1 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 name: Install pnpm with: run_install: false diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 25784c9d1d..673627fd17 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -32,8 +32,8 @@ jobs: # Roach (see packages/mcp-server-evals/roach.json) needs Node 24.14+. node-version: "24" - # pnpm/action-setup@v4 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda + # pnpm/action-setup@v6.1.1 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 name: Install pnpm with: run_install: false diff --git a/.github/workflows/install-scripts.yml b/.github/workflows/install-scripts.yml index 36b4debd2d..5352295187 100644 --- a/.github/workflows/install-scripts.yml +++ b/.github/workflows/install-scripts.yml @@ -119,7 +119,7 @@ jobs: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 with: persist-credentials: false - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: "22.23.4" diff --git a/.github/workflows/local.yml b/.github/workflows/local.yml index c287154ad2..3299833045 100644 --- a/.github/workflows/local.yml +++ b/.github/workflows/local.yml @@ -37,7 +37,7 @@ jobs: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 with: persist-credentials: false - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: "22.23.4" diff --git a/.github/workflows/merge-jobs.yml b/.github/workflows/merge-jobs.yml index 86f6b86009..5156a9191c 100644 --- a/.github/workflows/merge-jobs.yml +++ b/.github/workflows/merge-jobs.yml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v4 - name: Setup pnpm - uses: pnpm/action-setup@v4 + uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - name: Set up Node uses: actions/setup-node@v4 diff --git a/.github/workflows/recover-cloudflare-deployment.yml b/.github/workflows/recover-cloudflare-deployment.yml index 710a9b1e1d..08a63633a6 100644 --- a/.github/workflows/recover-cloudflare-deployment.yml +++ b/.github/workflows/recover-cloudflare-deployment.yml @@ -69,7 +69,7 @@ jobs: with: node-version: "22" - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 with: run_install: false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 86ef245c0f..4cf8b7c764 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,7 +56,7 @@ jobs: with: node-version: "22" - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 name: Install pnpm with: run_install: false diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 84147a204a..3fa07b8452 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -13,7 +13,7 @@ on: - "packages/mcp-cloudflare/**" - "packages/mcp-core/**" - "packages/mcp-server-mocks/**" - - "packages/mcp-server-tsconfig/**" + - "tsconfig.base.json" - "packages/smoke-tests/**" - "package.json" - "pnpm-lock.yaml" @@ -32,8 +32,8 @@ jobs: with: node-version: "22" - # pnpm/action-setup@v4 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda + # pnpm/action-setup@v6.1.1 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 name: Install pnpm with: run_install: false diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 467eed9143..17370816d7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: with: persist-credentials: false fetch-depth: 0 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ env.NODE_VERSION_22 }} @@ -57,7 +57,7 @@ jobs: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 with: persist-credentials: false - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ env.NODE_VERSION_22 }} @@ -71,7 +71,7 @@ jobs: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 with: persist-credentials: false - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ env.NODE_VERSION_22 }} @@ -79,6 +79,9 @@ jobs: - run: pnpm install --frozen-lockfile - run: pnpm run test:ci-projects - run: pnpm run docs:check + # Type-aware lint resolves workspace packages through their built types; + # without them, imports from these packages read as error-typed values. + - run: pnpm --filter '@sentry/mcp-core...' --filter @sentry/logger --if-present run build - run: pnpm run lint - run: pnpm run check:generated - name: Check generated files @@ -100,7 +103,7 @@ jobs: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 with: persist-credentials: false - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ env.NODE_VERSION_22 }} @@ -131,7 +134,7 @@ jobs: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 with: persist-credentials: false - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ env.NODE_VERSION_22 }} @@ -231,7 +234,7 @@ jobs: - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4 with: persist-credentials: false - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 # v6.1.1 - uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4 with: node-version: ${{ env.NODE_VERSION_22 }} diff --git a/.github/workflows/token-cost.yml b/.github/workflows/token-cost.yml index 40217e2998..86a98b29af 100644 --- a/.github/workflows/token-cost.yml +++ b/.github/workflows/token-cost.yml @@ -49,8 +49,8 @@ jobs: with: node-version: "22" - # pnpm/action-setup@v4 - - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda + # pnpm/action-setup@v6.1.1 + - uses: pnpm/action-setup@73e46992e05b19abd31f2f3c20e0e7370d762115 name: Install pnpm with: run_install: false diff --git a/.oxlintrc.json b/.oxlintrc.json index 3fc1c7fdfb..d39013caec 100644 --- a/.oxlintrc.json +++ b/.oxlintrc.json @@ -53,15 +53,66 @@ "typescript/no-unnecessary-type-parameters": "error", "typescript/no-useless-default-assignment": "error", "jsx-a11y/interactive-supports-focus": "off", - "unicorn/prefer-spread": "error" + "unicorn/prefer-spread": "error", + "typescript/no-misused-promises": "error", + "typescript/switch-exhaustiveness-check": [ + "error", + { + "considerDefaultExhaustiveForUnions": true + } + ], + "typescript/only-throw-error": "error", + "typescript/prefer-promise-reject-errors": [ + "error", + { "allowThrowingUnknown": true } + ], + "typescript/no-base-to-string": "error", + "typescript/no-unsafe-enum-comparison": "error" }, "overrides": [ + { + "files": [ + "apps/{docs-mcp,games-api,local}/**/*.{ts,tsx}", + "packages/{codemod-cli3to4,logger,mcp-cloudflare,mcp-core,mcp-server,mcp-server-evals,mcp-server-mocks,mcp-test-client,smoke-tests,toolkit-core}/**/*.{ts,tsx}" + ], + "excludeFiles": [ + "**/*.test.{ts,tsx}", + "**/test/**", + "**/tests/**", + "**/test-utils/**", + "**/test-setup.ts", + "**/test-fixtures/**", + "**/test-fixtures.ts", + "**/*.config.{ts,mts}" + ], + "rules": { + "typescript/no-explicit-any": "error", + "typescript/no-non-null-assertion": "error", + "typescript/no-unnecessary-condition": "error", + "typescript/no-unsafe-assignment": "error", + "typescript/no-unsafe-argument": "error", + "typescript/no-unsafe-call": "error", + "typescript/no-unsafe-member-access": "error", + "typescript/no-unsafe-return": "error" + } + }, { "files": ["**/*.test.{ts,tsx,mjs}", "**/test/**/*.{ts,tsx}"], "rules": { "typescript/unbound-method": "off" } }, + { + "files": ["apps/local/**/*.{ts,tsx,js,mjs,cjs}"], + "plugins": ["react"], + "rules": { + "react/rules-of-hooks": "error", + "react/only-export-components": [ + "warn", + { "allowConstantExport": true } + ] + } + }, { "files": ["packages/mcp-cloudflare/src/client/**/*.tsx"], "rules": { @@ -157,6 +208,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/.pnpmfile.cjs b/.pnpmfile.cjs new file mode 100644 index 0000000000..ea5bc81a3e --- /dev/null +++ b/.pnpmfile.cjs @@ -0,0 +1,32 @@ +// pnpm install hooks. Keep each change narrow and say when it can go. + +// TypeScript 7 has no JavaScript compiler API. These packages import +// `typescript` for its compiler API through an optional peer, which resolves +// to the workspace's TypeScript 7. Give them the TypeScript 6 API instead. +// Remove an entry once the package supports TypeScript 7 or TypeScript 7.1 +// ships its API. +const TYPESCRIPT6_API = "npm:@typescript/typescript6@6.0.2"; +const NEEDS_TYPESCRIPT6_API = new Set([ + // `@sentry/api/source-analysis`, used by CLI command-analysis scripts. + "@sentry/api", +]); + +// Type-aware lint runs on `tsrs-lint` from the `tsrs` package. pnpm installs +// oxlint's optional `oxlint-tsgolint` peer anyway, leaving a second backend +// that nothing runs. Remove this once oxlint drops that peer. +const UNUSED_OXLINT_PEER = "oxlint-tsgolint"; + +function readPackage(pkg) { + if (NEEDS_TYPESCRIPT6_API.has(pkg.name) && pkg.peerDependencies?.typescript) { + delete pkg.peerDependencies.typescript; + delete pkg.peerDependenciesMeta?.typescript; + pkg.dependencies = { ...pkg.dependencies, typescript: TYPESCRIPT6_API }; + } + if (pkg.name === "oxlint" && pkg.peerDependencies?.[UNUSED_OXLINT_PEER]) { + delete pkg.peerDependencies[UNUSED_OXLINT_PEER]; + delete pkg.peerDependenciesMeta?.[UNUSED_OXLINT_PEER]; + } + return pkg; +} + +module.exports = { hooks: { readPackage } }; diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 0ef1e247fd..a61ef79edb 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,4 +1,4 @@ { - "recommendations": ["oxc.oxc-vscode"], + "recommendations": ["oxc.oxc-vscode", "TypeScriptTeam.native-preview"], "unwantedRecommendations": [] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 8daad2ef75..fca4578e6f 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -2,6 +2,8 @@ "editor.defaultFormatter": "oxc.oxc-vscode", "editor.formatOnSave": true, "editor.formatOnSaveMode": "file", + "js/ts.experimental.useTsgo": true, + "js/ts.tsdk.path": "./node_modules/typescript", "editor.codeActionsOnSave": { "source.fixAll.oxc": "explicit" }, diff --git a/AGENTS.md b/AGENTS.md index 70f06568be..96f4a142d4 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -11,7 +11,7 @@ Toolkit contains the Sentry CLI, the Sentry MCP server, and shared code. Product ## Constraints - **MCP tool count**: `EXPOSE_ALL_TOOLS` lists every tool and relies on harness tool search. The gateway surface it falls back to (`TOP_LEVEL_TOOL_NAMES`) targets ≤20, hard limit 25. -- **Quality gate**: `pnpm run tsc && pnpm run lint && pnpm run test` must pass before committing. +- **Quality gate**: `pnpm run typecheck && pnpm run lint && pnpm run test` must pass before committing. - **Dependency direction**: `sentry` (cli) → `@sentry/mcp-core` → `@sentry/toolkit-core`, and `@sentry/mcp-cloudflare` → `@sentry/mcp-core`; never the reverse. mcp-core and toolkit-core never import the CLI. Inject CLI-only capabilities (SQLite cache, local-file DSN detection, file uploads) through interfaces defined in mcp-core or toolkit-core. `pnpm run lint` enforces this; see docs/architecture/overview.md#package-dependency-direction. - **Lint rules**: Write new lint rules for Oxlint: a built-in rule in `.oxlintrc.json`, or a custom rule in `packages/cli/lint-rules/cli-oxlint-plugin.js`. Do not add ast-grep rules. See docs/contributing/coding-guidelines.md#formatting-and-linting. - **Package CI**: Put checks for one workspace package in its `package.json` scripts and `sentryCi`, which `test.yml` runs per project. Do not add a workflow for them. See docs/operations/github-actions.md#package-ci-checks. @@ -115,7 +115,7 @@ pnpm -w run cli --transport stdio "q" # Test MCP tools pnpm -w run cli --transport stdio --access-token=TOKEN "q" # Quality (run before committing) -pnpm run tsc && pnpm run lint && pnpm run test +pnpm run typecheck && pnpm run lint && pnpm run test # Token overhead pnpm run measure-tokens # Check tool definition size diff --git a/apps/cli-docs/package.json b/apps/cli-docs/package.json index 83b7c34e89..1a2380bfa3 100644 --- a/apps/cli-docs/package.json +++ b/apps/cli-docs/package.json @@ -11,7 +11,8 @@ "build": "astro build", "test": "node --test test/*.test.mjs", "preview": "astro preview", - "deploy": "wrangler deploy" + "deploy": "wrangler deploy", + "typecheck": "astro check" }, "dependencies": { "@astrojs/mdx": "^7.0.8", @@ -25,6 +26,8 @@ "shiki": "^3.21.0" }, "devDependencies": { + "@astrojs/check": "^0.9.12", + "typescript": "catalog:astro-check", "wrangler": "catalog:" } } diff --git a/apps/cli-docs/src/components/InstallSelector.astro b/apps/cli-docs/src/components/InstallSelector.astro index 8d9d629914..5dc6625359 100644 --- a/apps/cli-docs/src/components/InstallSelector.astro +++ b/apps/cli-docs/src/components/InstallSelector.astro @@ -23,7 +23,8 @@ async function highlightCommand(cmd: string): Promise { }); // Convert tokens to inline HTML spans (single line command) - return tokens[0] + const [line = []] = tokens; + return line .map(token => { const escaped = token.content .replace(/&/g, '&') @@ -44,6 +45,11 @@ const highlightedOptions = await Promise.all( ); const defaultOption = highlightedOptions[defaultIndex]; +if (!defaultOption) { + throw new Error( + `InstallSelector: defaultIndex ${defaultIndex} is out of range for ${options.length} options`, + ); +} ---
diff --git a/apps/cli-docs/src/components/PackageManagerCode.astro b/apps/cli-docs/src/components/PackageManagerCode.astro index 30d2a47d82..dfe04658e9 100644 --- a/apps/cli-docs/src/components/PackageManagerCode.astro +++ b/apps/cli-docs/src/components/PackageManagerCode.astro @@ -7,7 +7,7 @@ interface Props { } const { npm, pnpm, yarn, bun } = Astro.props; -const id = `pm-${Math.random().toString(36).substr(2, 9)}`; +const id = `pm-${Math.random().toString(36).slice(2, 11)}`; ---
diff --git a/apps/cli-docs/src/content/docs/contributing.md b/apps/cli-docs/src/content/docs/contributing.md index 92a575c594..d615d0205f 100644 --- a/apps/cli-docs/src/content/docs/contributing.md +++ b/apps/cli-docs/src/content/docs/contributing.md @@ -11,7 +11,7 @@ We welcome contributions to the Sentry CLI! This guide will help you get started - [Node.js](https://nodejs.org) (v22.15 or later) -- [pnpm](https://pnpm.io) (v11.8 or later) +- [pnpm](https://pnpm.io) (v12.18 or later) - Git diff --git a/apps/cli-docs/src/starlight-components.d.ts b/apps/cli-docs/src/starlight-components.d.ts new file mode 100644 index 0000000000..85e3f4ca8f --- /dev/null +++ b/apps/cli-docs/src/starlight-components.d.ts @@ -0,0 +1,16 @@ +// Header.astro follows Starlight's own header and imports these components +// through Starlight's virtual modules, so a component override in +// astro.config.mjs still applies. Starlight does not declare these modules +// in its public types. +declare module "virtual:starlight/components/Search" { + const Search: typeof import("@astrojs/starlight/components/Search.astro").default; + export default Search; +} +declare module "virtual:starlight/components/SiteTitle" { + const SiteTitle: typeof import("@astrojs/starlight/components/SiteTitle.astro").default; + export default SiteTitle; +} +declare module "virtual:starlight/components/SocialIcons" { + const SocialIcons: typeof import("@astrojs/starlight/components/SocialIcons.astro").default; + export default SocialIcons; +} diff --git a/apps/cli-docs/tsconfig.json b/apps/cli-docs/tsconfig.json index 0fc51d71b1..2d5137a643 100644 --- a/apps/cli-docs/tsconfig.json +++ b/apps/cli-docs/tsconfig.json @@ -1,6 +1,8 @@ { - "extends": "astro/tsconfigs/strict", + // Astro's runtime options, then the shared checking policy. The root base's + // runtime default `target` would replace Astro's, so restate it here. + "extends": ["astro/tsconfigs/strict", "../../tsconfig.base.json"], "compilerOptions": { - "strictNullChecks": true + "target": "ESNext" } } diff --git a/apps/docs-mcp/package.json b/apps/docs-mcp/package.json index b0f6a6ee4f..8c74dafaf1 100644 --- a/apps/docs-mcp/package.json +++ b/apps/docs-mcp/package.json @@ -22,8 +22,8 @@ "zod": "^4.6.6" }, "devDependencies": { - "@types/node": "^22", - "typescript": "^5.9.3", + "@types/node": "catalog:", + "typescript": "catalog:", "wrangler": "catalog:", "vitest": "catalog:" } diff --git a/apps/docs-mcp/src/__tests__/features-agent.test.ts b/apps/docs-mcp/src/__tests__/features-agent.test.ts index 2d02c7a233..4f7afc6922 100644 --- a/apps/docs-mcp/src/__tests__/features-agent.test.ts +++ b/apps/docs-mcp/src/__tests__/features-agent.test.ts @@ -129,18 +129,18 @@ describe("runFeaturesAgent", () => { await runFeaturesAgent("sk-or-test", ["react"]); - const tools = requests[0].tools as Array<{ + const tools = requests[0]!.tools as Array<{ function: { name: string; parameters: { properties: Record> }; }; }>; const path = tools.find((tool) => tool.function.name === "fetch_doc_page") - ?.function.parameters.properties.path; - expect(path?.minLength).toBeUndefined(); - expect(path?.description).toMatch(/\nconstraints: minimum length 1$/); + ?.function.parameters.properties["path"]; + expect(path?.["minLength"]).toBeUndefined(); + expect(path?.["description"]).toMatch(/\nconstraints: minimum length 1$/); - const results = requests[1].messages.filter( + const results = requests[1]!.messages.filter( (message) => message.role === "tool", ); expect( @@ -171,7 +171,7 @@ describe("runFeaturesAgent", () => { }, ]); // Mastra sent the keys of tool results in sorted order. - expect(results[1].content).toBe( + expect(results[1]!.content).toBe( '{"hits":[{"description":"d","title":"JS","url":"https://docs.sentry.io/platforms/javascript/"}]}', ); }); diff --git a/apps/docs-mcp/src/__tests__/openrouter-stub.ts b/apps/docs-mcp/src/__tests__/openrouter-stub.ts index 7613fc5462..6c6a9c5f91 100644 --- a/apps/docs-mcp/src/__tests__/openrouter-stub.ts +++ b/apps/docs-mcp/src/__tests__/openrouter-stub.ts @@ -39,7 +39,9 @@ export function stubOpenRouter( return Promise.resolve( Response.json( { error: { code: reply.status, message: reply.message } }, - { headers: reply.headers, status: reply.status }, + reply.headers === undefined + ? { status: reply.status } + : { headers: reply.headers, status: reply.status }, ), ); } diff --git a/apps/docs-mcp/src/__tests__/query-agent.test.ts b/apps/docs-mcp/src/__tests__/query-agent.test.ts index f2b545d87a..0fe3d6202b 100644 --- a/apps/docs-mcp/src/__tests__/query-agent.test.ts +++ b/apps/docs-mcp/src/__tests__/query-agent.test.ts @@ -386,6 +386,6 @@ describe("runQueryAgent", () => { "auto", "none", ]); - expect(requests[5].tools).toHaveLength(2); + expect(requests[5]!.tools).toHaveLength(2); }); }); diff --git a/apps/docs-mcp/src/__tests__/tailor-agent.test.ts b/apps/docs-mcp/src/__tests__/tailor-agent.test.ts index d992a8fecb..815e7457df 100644 --- a/apps/docs-mcp/src/__tests__/tailor-agent.test.ts +++ b/apps/docs-mcp/src/__tests__/tailor-agent.test.ts @@ -60,7 +60,7 @@ describe("runTailorAgent", () => { ...Array.from({ length: 9 }, () => "auto"), "none", ]); - expect(requests[9].tools).toHaveLength(2); + expect(requests[9]!.tools).toHaveLength(2); }); test("synthesizes from the tool history when the agent ends without text", async () => { @@ -83,9 +83,9 @@ describe("runTailorAgent", () => { PRIMARY_MODEL, FALLBACK_MODEL, ]); - expect(synthesis[1].tool_choice).toBe("none"); - expect(synthesis[1].tools).toHaveLength(2); - expect(synthesis[1].messages.map((message) => message.role)).toEqual([ + expect(synthesis[1]!.tool_choice).toBe("none"); + expect(synthesis[1]!.tools).toHaveLength(2); + expect(synthesis[1]!.messages.map((message) => message.role)).toEqual([ "system", "assistant", "tool", diff --git a/apps/docs-mcp/src/agent/cache.ts b/apps/docs-mcp/src/agent/cache.ts index 52541f5276..90cc86c7a8 100644 --- a/apps/docs-mcp/src/agent/cache.ts +++ b/apps/docs-mcp/src/agent/cache.ts @@ -14,10 +14,14 @@ const FEATURES_TTL_SECONDS = 3600; const FEATURES_SCOPE = "features"; const QUERY_SCOPE = "query"; +/** + * Project metadata from the request body. The validated input forwards + * omitted fields as `undefined`, and every reader treats that as absent. + */ export interface DocsQueryContext { - frameworks?: string[]; - languages?: string[]; - sentryConfigured?: boolean; + frameworks?: string[] | undefined; + languages?: string[] | undefined; + sentryConfigured?: boolean | undefined; } export interface CachedDocsQuery { @@ -31,9 +35,10 @@ export interface CachedDocsQuery { */ function getCache(): Cache | undefined { try { - return (caches as CacheStorage & { default?: Cache })?.default; + return (caches as CacheStorage & { default?: Cache }).default; } catch { // Cache API is unavailable outside the Worker runtime. + return undefined; } } diff --git a/apps/docs-mcp/src/agent/features-agent.ts b/apps/docs-mcp/src/agent/features-agent.ts index 3facafeb05..45ce82cd29 100644 --- a/apps/docs-mcp/src/agent/features-agent.ts +++ b/apps/docs-mcp/src/agent/features-agent.ts @@ -177,7 +177,7 @@ function escapeControlCharsInStrings(text: string): string { let result = ""; let inString = false; for (let i = 0; i < text.length; i++) { - const char = text[i]; + const char = text.charAt(i); if (char === "\\" && i + 1 < text.length) { result += char + text[++i]; } else { @@ -339,9 +339,9 @@ Return the canonical feature slugs available for this platform.`; }); const output = await parseFeaturesOutput(result.steps); - const inputTokens = result.totalUsage?.inputTokens ?? 0; - const outputTokens = result.totalUsage?.outputTokens ?? 0; - const stepCount = result.steps?.length ?? 0; + const inputTokens = result.totalUsage.inputTokens ?? 0; + const outputTokens = result.totalUsage.outputTokens ?? 0; + const stepCount = result.steps.length; const usedModelId = getUsedModelId(result); span.setAttribute("agent.model", usedModelId); diff --git a/apps/docs-mcp/src/agent/model-fallback.ts b/apps/docs-mcp/src/agent/model-fallback.ts index 0922825240..299e65f210 100644 --- a/apps/docs-mcp/src/agent/model-fallback.ts +++ b/apps/docs-mcp/src/agent/model-fallback.ts @@ -55,12 +55,17 @@ export function createNativeModelFallbacks( typeof fallbackOrOptions === "string" ? { fallbackModelId: fallbackOrOptions } : fallbackOrOptions; + // @openrouter/ai-sdk-provider 1.5.4 types `providerMetadata` with optional + // keys (`id?: string | null | undefined`), which is not a JSONValue under + // exactOptionalPropertyTypes, so its models do not match the LanguageModelV2 + // interface they implement. The runtime values are JSON, so assert the + // interface here. const chatModel = (modelId: string) => - options.parallelToolCalls === undefined + (options.parallelToolCalls === undefined ? openrouter(modelId) : openrouter.chat(modelId, { parallelToolCalls: options.parallelToolCalls, - }); + })) as ChatModel; return createFallbackModel([ chatModel(primaryModelId), @@ -138,11 +143,13 @@ function retryDelayMs(error: unknown, retryCount: number): number | undefined { function wait(ms: number, signal?: AbortSignal): Promise { return new Promise((resolve, reject) => { if (signal?.aborted) { + // oxlint-disable-next-line typescript/prefer-promise-reject-errors -- the platform rejects with the signal's own abort reason, often a DOMException or a caller-chosen value, and callers check it verbatim reject(signal.reason); return; } const onAbort = () => { clearTimeout(timer); + // oxlint-disable-next-line typescript/prefer-promise-reject-errors -- the platform rejects with the signal's own abort reason, often a DOMException or a caller-chosen value, and callers check it verbatim reject(signal?.reason); }; const timer = setTimeout(() => { diff --git a/apps/docs-mcp/src/agent/query-agent.ts b/apps/docs-mcp/src/agent/query-agent.ts index f55f308e9e..e05a23aa23 100644 --- a/apps/docs-mcp/src/agent/query-agent.ts +++ b/apps/docs-mcp/src/agent/query-agent.ts @@ -81,7 +81,7 @@ export function finalizeDocsAnswer( const body = answer.replace(SOURCES_SECTION_RE, "").trim(); const citations = uniqueCanonicalDocsUrls( - [...body.matchAll(MARKDOWN_LINK_URL_RE)].map((match) => match[1]), + [...body.matchAll(MARKDOWN_LINK_URL_RE)].flatMap((match) => match[1] ?? []), ); if (citations.length === 0) { throw new Error("Docs query answer must include an inline citation."); diff --git a/apps/docs-mcp/src/agent/tailor-agent.ts b/apps/docs-mcp/src/agent/tailor-agent.ts index 5e963c0d6a..f53854f861 100644 --- a/apps/docs-mcp/src/agent/tailor-agent.ts +++ b/apps/docs-mcp/src/agent/tailor-agent.ts @@ -211,9 +211,9 @@ Produce the tailored integration guide.`; tools, }); - const inputTokens = result.totalUsage?.inputTokens ?? 0; - const outputTokens = result.totalUsage?.outputTokens ?? 0; - const stepCount = result.steps?.length ?? 0; + const inputTokens = result.totalUsage.inputTokens ?? 0; + const outputTokens = result.totalUsage.outputTokens ?? 0; + const stepCount = result.steps.length; const usedModelId = getUsedModelId(result); span.setAttribute("agent.model", usedModelId); @@ -259,8 +259,8 @@ Produce the tailored integration guide.`; tools, }); - const fbInputTokens = fallback.totalUsage?.inputTokens ?? 0; - const fbOutputTokens = fallback.totalUsage?.outputTokens ?? 0; + const fbInputTokens = fallback.totalUsage.inputTokens ?? 0; + const fbOutputTokens = fallback.totalUsage.outputTokens ?? 0; const fallbackModelId = getUsedModelId(fallback); span.setAttribute("agent.model", fallbackModelId); diff --git a/apps/docs-mcp/src/agent/tools.ts b/apps/docs-mcp/src/agent/tools.ts index 59743a81c8..d4aaaeaeaa 100644 --- a/apps/docs-mcp/src/agent/tools.ts +++ b/apps/docs-mcp/src/agent/tools.ts @@ -107,7 +107,8 @@ function fieldErrors(issues: z.core.$ZodIssue[]): FieldErrors { } function truncateArguments(input: unknown): string { - const text = JSON.stringify(input, null, 2) ?? "undefined"; + const text = + (JSON.stringify(input, null, 2) as string | undefined) ?? "undefined"; return text.length <= 200 ? text : `${text.slice(0, 200)}... (truncated)`; } diff --git a/apps/docs-mcp/src/sentry-docs/doctree.ts b/apps/docs-mcp/src/sentry-docs/doctree.ts index 15b882e657..d67dc7d683 100644 --- a/apps/docs-mcp/src/sentry-docs/doctree.ts +++ b/apps/docs-mcp/src/sentry-docs/doctree.ts @@ -432,11 +432,14 @@ export function searchDocTree( hits.sort( (a, b) => b.score - a.score || a.node.path.localeCompare(b.node.path), ); - return hits.slice(0, limit).map(({ node }) => ({ - description: node.frontmatter?.description, - title: node.frontmatter?.title ?? node.slug ?? node.path, - url: buildDocsUrl(node.path), - })); + return hits.slice(0, limit).map(({ node }) => { + const description = node.frontmatter?.description; + return { + ...(description === undefined ? {} : { description }), + title: node.frontmatter?.title ?? node.slug ?? node.path, + url: buildDocsUrl(node.path), + }; + }); } export function searchPages(query: string, limit = 8): Promise { diff --git a/apps/docs-mcp/src/sentry-docs/fetcher.ts b/apps/docs-mcp/src/sentry-docs/fetcher.ts index ccba0076df..33a8d0b34c 100644 --- a/apps/docs-mcp/src/sentry-docs/fetcher.ts +++ b/apps/docs-mcp/src/sentry-docs/fetcher.ts @@ -36,7 +36,7 @@ function cachedFetch(url: string, ttlSeconds: number): Promise { let cache: Cache | undefined; try { - cache = (caches as CacheStorage & { default?: Cache })?.default; + cache = (caches as CacheStorage & { default?: Cache }).default; } catch { // Cache API not available (local dev / non-CF runtime) } diff --git a/apps/docs-mcp/tsconfig.json b/apps/docs-mcp/tsconfig.json index d349c64f70..80921b5c19 100644 --- a/apps/docs-mcp/tsconfig.json +++ b/apps/docs-mcp/tsconfig.json @@ -1,13 +1,18 @@ { + "extends": "../../tsconfig.base.json", "compilerOptions": { "target": "ESNext", "module": "ESNext", "moduleResolution": "Bundler", - "strict": true, - "skipLibCheck": true, "lib": ["ESNext", "WebWorker"], + "types": ["node"], "jsx": "react-jsx", - "jsxImportSource": "hono/jsx" + "jsxImportSource": "hono/jsx", + // skipLibCheck exception: `@mastra/core` and `@mastra/schema-compat` vendored AI SDK v4/v5 and zod v3 declarations fail TS2694/TS2707/TS2304/TS2846/TS2344/TS2307/TS2724 against zod 4 and current AI SDK majors (still in @mastra/core 1.83.0). Remove when they check cleanly. + // skipLibCheck exception: `@openrouter/ai-sdk-provider` declarations fail TS2416 under exactOptionalPropertyTypes (1.5.4 LanguageModelV2 implementation). Remove when they check cleanly. + // skipLibCheck exception: `@sentry/cloudflare` declarations fail TS2304/TS2307 (ExecutionContext, cloudflare:workers) because this program loads Node types, not @cloudflare/workers-types. Remove when the program loads Workers types or the declarations stop needing them. + // skipLibCheck exception: `wrangler` and `miniflare` declarations fail TS2307/TS2305/TS7016 on packages they bundle but do not ship (worker-config.test.ts imports them). Remove when they check cleanly. + "skipLibCheck": true }, "include": ["src/**/*.ts"], "exclude": ["node_modules", ".wrangler"] diff --git a/apps/games-api/package.json b/apps/games-api/package.json index be6671beef..c0f8bc841c 100644 --- a/apps/games-api/package.json +++ b/apps/games-api/package.json @@ -11,7 +11,7 @@ "test": "vitest run", "test:ci": "vitest run --reporter=default --reporter=junit --outputFile=tests.junit.xml", "test:watch": "vitest", - "tsc": "tsc --noEmit" + "typecheck": "tsc --noEmit && tsc -p tsconfig.node.json --noEmit" }, "dependencies": { "@sentry/cloudflare": "catalog:", @@ -21,7 +21,7 @@ }, "devDependencies": { "@cloudflare/workers-types": "catalog:", - "@sentry/mcp-server-tsconfig": "workspace:*", + "@types/node": "catalog:", "typescript": "catalog:", "vitest": "catalog:", "wrangler": "catalog:" diff --git a/apps/games-api/src/leaderboard.test.ts b/apps/games-api/src/leaderboard.test.ts index 7032343e69..09b62a9838 100644 --- a/apps/games-api/src/leaderboard.test.ts +++ b/apps/games-api/src/leaderboard.test.ts @@ -1,5 +1,13 @@ import * as Sentry from "@sentry/cloudflare"; -import { describe, it, expect, vi, beforeEach, afterEach } from "vitest"; +import { + assert, + describe, + it, + expect, + vi, + beforeEach, + afterEach, +} from "vitest"; import app from "./app"; import type { Env } from "./leaderboard"; @@ -22,6 +30,15 @@ function makeEnv(overrides: Record = {}): Env { }; } +function nthCall( + mockFn: { mock: { calls: Args[] } }, + index = 0, +): Args { + const call = mockFn.mock.calls[index]; + assert(call, `expected mock call #${index + 1}`); + return call; +} + function upstreamBody(rows: Array<[unknown, unknown]>) { return { data: rows.map(([handle, score]) => ({ @@ -103,7 +120,7 @@ describe("games leaderboard route", () => { }); expect(fetchMock).toHaveBeenCalledTimes(1); - const [url, init] = fetchMock.mock.calls[0]; + const [url, init] = nthCall(fetchMock); const parsed = new URL(url as string); expect(parsed.origin + parsed.pathname).toBe( "https://us.sentry.io/api/0/organizations/sentry/events/", @@ -125,7 +142,7 @@ describe("games leaderboard route", () => { }); expect(cachePut).toHaveBeenCalledTimes(1); - const [key, cachedResponse] = cachePut.mock.calls[0]; + const [key, cachedResponse] = nthCall(cachePut); expect(key).toBe(CACHE_URL); expect((cachedResponse as Response).headers.get("Cache-Control")).toBe( "max-age=300", @@ -166,9 +183,9 @@ describe("games leaderboard route", () => { fetchMock.mockResolvedValue(jsonResponse(upstreamBody(rows))); const res = await app.request(PATH, REQ, makeEnv()); - const body = (await res.json()) as { + const body = await res.json<{ entries: Array<{ rank: number; handle: string; score: number }>; - }; + }>(); expect(body.entries).toHaveLength(10); expect(body.entries[0]).toEqual({ rank: 1, @@ -211,7 +228,7 @@ describe("games leaderboard route", () => { expect(res.status).toBe(502); expect(text).not.toContain("secret-upstream-detail"); expect(text).not.toContain(TOKEN); - const reported = vi.mocked(Sentry.captureException).mock.calls[0][0]; + const reported = nthCall(vi.mocked(Sentry.captureException))[0]; expect(String(reported)).toContain("Snake leaderboard upstream failed"); expect(String(reported)).not.toContain(TOKEN); }); @@ -243,8 +260,9 @@ describe("games leaderboard route", () => { it("uses a hashed IP rate limit key", async () => { const limit = vi.fn().mockResolvedValue({ success: false }); await app.request(PATH, REQ, makeEnv({ GAMES_RATE_LIMITER: { limit } })); - expect(limit.mock.calls[0][0].key).toMatch(/^games:ip:[a-f0-9]{16}$/); - expect(limit.mock.calls[0][0].key).not.toContain("192.0.2.1"); + const [{ key }] = nthCall(limit); + expect(key).toMatch(/^games:ip:[a-f0-9]{16}$/); + expect(key).not.toContain("192.0.2.1"); }); it("fails open when the rate limiter throws", async () => { diff --git a/apps/games-api/src/leaderboard.ts b/apps/games-api/src/leaderboard.ts index 7e4ac04e4a..9ab44927cf 100644 --- a/apps/games-api/src/leaderboard.ts +++ b/apps/games-api/src/leaderboard.ts @@ -48,8 +48,11 @@ const UpstreamSchema = z.object({ // Carries only the status: a raw fetch error may hold the upstream URL, // headers or body. class UpstreamError extends Error { - constructor(readonly status?: number) { + readonly status: number | undefined; + + constructor(status?: number) { super(`Snake leaderboard upstream failed (${status ?? "no response"})`); + this.status = status; this.name = "UpstreamError"; } } diff --git a/apps/games-api/tsconfig.json b/apps/games-api/tsconfig.json index 4e0793b59c..754bc3f394 100644 --- a/apps/games-api/tsconfig.json +++ b/apps/games-api/tsconfig.json @@ -1,7 +1,17 @@ { - "extends": "@sentry/mcp-server-tsconfig/tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { - "types": ["@cloudflare/workers-types"] + "lib": ["ES2023", "ES2024.String"], + "allowJs": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "incremental": true, + // The Worker runs with nodejs_compat, and @sentry/cloudflare's + // declarations (via @sentry/server-utils) need Node types. + "types": ["@cloudflare/workers-types", "node"], + // skipLibCheck exception: `@cloudflare/workers-types` and `@types/node` declare the same globals (TS2300 DOMException/Blob, TS2451 console/crypto, TS2502 PerformanceEntry). Remove when both can load in one program without conflicts. + "skipLibCheck": true }, "include": ["src"] } diff --git a/apps/games-api/tsconfig.node.json b/apps/games-api/tsconfig.node.json new file mode 100644 index 0000000000..71e88e7d27 --- /dev/null +++ b/apps/games-api/tsconfig.node.json @@ -0,0 +1,14 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "lib": ["ES2023", "ES2024.String"], + "allowJs": true, + "sourceMap": true, + "declaration": true, + "declarationMap": true, + "incremental": true, + "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo", + "types": ["node"] + }, + "include": ["vitest.config.ts"] +} diff --git a/apps/local/.oxlintrc.json b/apps/local/.oxlintrc.json deleted file mode 100644 index 72cf41a39a..0000000000 --- a/apps/local/.oxlintrc.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "$schema": "./node_modules/oxlint/configuration_schema.json", - "plugins": ["react", "typescript", "oxc"], - "rules": { - "react/rules-of-hooks": "error", - "typescript/return-await": ["error", "always"], - "react/only-export-components": ["warn", { "allowConstantExport": true }] - } -} diff --git a/apps/local/package.json b/apps/local/package.json index 6f27dcc8f3..32e7c20427 100644 --- a/apps/local/package.json +++ b/apps/local/package.json @@ -5,12 +5,12 @@ "type": "module", "scripts": { "dev": "vite", - "build": "tsc -b && vite build", - "lint": "oxlint", + "build": "tsc -b tsconfig.app.json tsconfig.node.json && vite build", + "lint": "pnpm -w exec oxlint --report-unused-disable-directives apps/local", "preview": "vite preview", "test": "pnpm --filter sentry exec node script/ensure-generated.mjs schema grammar && vitest run", "test:integration": "pnpm run test src/App.integration.test.tsx", - "typecheck": "tsc -b", + "typecheck": "pnpm --filter sentry exec node script/ensure-generated.mjs && tsc -b", "sample": "node --experimental-strip-types --import ../../scripts/strip-types-resolve.mjs scripts/replay.ts" }, "engines": { @@ -45,14 +45,16 @@ "valibot": "catalog:" }, "devDependencies": { + "@rolldown/plugin-babel": "^0.3.1", "@testing-library/react": "^16.3.2", + "@types/convert-source-map": "^2.0.3", "@types/node": "^24.13.3", "@types/react": "^19.2.18", "@types/react-dom": "^19.2.4", - "@vitejs/plugin-react": "^6.1.0", + "@vitejs/plugin-react": "^6.3.0", "eventsource": "^4.1.0", "jsdom": "^28.1.0", - "oxlint": "^1.79.0", + "oxlint": "catalog:", "typescript": "catalog:", "vite": "^8.3.3", "vitest": "catalog:" diff --git a/apps/local/scripts/replay.ts b/apps/local/scripts/replay.ts index 95fb198d96..88d8e68959 100644 --- a/apps/local/scripts/replay.ts +++ b/apps/local/scripts/replay.ts @@ -120,7 +120,7 @@ async function main() { throw new Error("Compression must be none, gzip, or br."); if (positionals.length > 1) throw new Error("Supply at most one fixture directory or file."); - const spotlight = process.env.SENTRY_SPOTLIGHT; + const spotlight = process.env["SENTRY_SPOTLIGHT"]; const endpoint = values.endpoint ?? (spotlight && !/^(1|true|yes|on|enabled)$/i.test(spotlight) @@ -128,9 +128,10 @@ async function main() { : "http://localhost:8969/stream"); const target = new URL(endpoint); console.log(`Replaying envelopes to ${target.origin}${target.pathname}`); + const fixtures = values.fixtures ?? positionals[0]; const count = await replayEnvelopes({ endpoint, - fixtures: values.fixtures ?? positionals[0], + ...(fixtures !== undefined && { fixtures }), compression, interval: Number(values.interval), repeat: Number(values.repeat), diff --git a/apps/local/src/App.capture-lifecycle.test.tsx b/apps/local/src/App.capture-lifecycle.test.tsx index b654df824e..618271fd0b 100644 --- a/apps/local/src/App.capture-lifecycle.test.tsx +++ b/apps/local/src/App.capture-lifecycle.test.tsx @@ -37,8 +37,10 @@ class ControllableEventSource extends EventTarget { onopen: ((event: Event) => void) | null = null; onerror: ((event: Event) => void) | null = null; closed = false; - constructor(readonly url: string) { + readonly url: string; + constructor(url: string) { super(); + this.url = url; ControllableEventSource.instances.push(this); } close() { @@ -76,13 +78,11 @@ async function openLatestReceiver() { } async function switchReceiver(streamUrl: string) { - fireEvent.click( - screen.getByRole("button", { name: "Switch receiver", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Switch receiver" })); fireEvent.change(screen.getByLabelText("Receiver endpoint"), { target: { value: streamUrl }, }); - fireEvent.click(screen.getByRole("button", { name: "Connect", exact: true })); + fireEvent.click(screen.getByRole("button", { name: "Connect" })); return await openLatestReceiver(); } @@ -135,24 +135,21 @@ async function sendItems( } function captureAction(name: string): HTMLButtonElement { - let action = screen.queryByRole("button", { name, exact: true }); + let action = screen.queryByRole("button", { name }); if (!action) { fireEvent.click( screen.getAllByRole("button", { name: "Capture actions", - exact: true, })[0]!, ); - action = screen.getByRole("button", { name, exact: true }); + action = screen.getByRole("button", { name }); } return action as HTMLButtonElement; } function openSettings() { - fireEvent.click( - screen.getByRole("button", { name: "Settings", exact: true }), - ); - return screen.getByRole("dialog", { name: "Settings", exact: true }); + fireEvent.click(screen.getByRole("button", { name: "Settings" })); + return screen.getByRole("dialog", { name: "Settings" }); } beforeEach(() => { @@ -262,17 +259,14 @@ test("switching captures clears the old label and deadline before new metadata", const first = await openSource(); await waitFor(() => expect( - screen.getByRole("combobox", { name: "Session", exact: true }) - .textContent, + screen.getByRole("combobox", { name: "Session" }).textContent, ).toContain("Web checkout"), ); await sessionMetadata(first, { state: "retained", expiresAt: EXPIRES_AT }); expect( screen.getByRole("banner", { name: "Capture context" }).textContent, ).toContain("Saved until"); - fireEvent.click( - screen.getByRole("combobox", { name: "Session", exact: true }), - ); + fireEvent.click(screen.getByRole("combobox", { name: "Session" })); fireEvent.click( await screen.findByRole("option", { name: /^Worker jobs ·/ }), ); @@ -330,9 +324,7 @@ test("deletion cancellation sends no HTTP and confirmation mutates only the scop confirmation, ); expect(request).not.toHaveBeenCalled(); - fireEvent.click( - within(confirmation).getByRole("button", { name: "Cancel", exact: true }), - ); + fireEvent.click(within(confirmation).getByRole("button", { name: "Cancel" })); await waitFor(() => expect(screen.queryByRole("dialog")).toBeNull()); expect(request).not.toHaveBeenCalled(); expect(source.closed).toBe(false); @@ -343,7 +335,7 @@ test("deletion cancellation sends no HTTP and confirmation mutates only the scop fireEvent.click( within( screen.getByRole("dialog", { name: "Delete captured events?" }), - ).getByRole("button", { name: "Delete captured events", exact: true }), + ).getByRole("button", { name: "Delete captured events" }), ); await waitFor(() => expect(request).toHaveBeenCalledTimes(1)); const [url, options] = request.mock.calls[0]!; @@ -385,13 +377,12 @@ test("pending deletion disables Reload capture and ignores queued events until c fireEvent.click( within( screen.getByRole("dialog", { name: "Delete captured events?" }), - ).getByRole("button", { name: "Delete captured events", exact: true }), + ).getByRole("button", { name: "Delete captured events" }), ); expect(request).toHaveBeenCalledTimes(1); - const reload = screen.getByRole("button", { + const reload = screen.getByRole("button", { name: "Reload capture", - exact: true, - }) as HTMLButtonElement; + }); expect(reload.disabled).toBe(true); fireEvent.click(reload); expect(ControllableEventSource.instances).toHaveLength(1); @@ -412,12 +403,9 @@ test("pending deletion disables Reload capture and ignores queued events until c "before pending reset", ); expect( - ( - screen.getByRole("button", { - name: "Reload capture", - exact: true, - }) as HTMLButtonElement - ).disabled, + screen.getByRole("button", { + name: "Reload capture", + }).disabled, ).toBe(false); expect(request).toHaveBeenCalledTimes(1); }); @@ -479,9 +467,7 @@ test.each(["capturing", "saved"] as const)( screen.getByRole("heading", { name: "No traces displayed" }), ).not.toBeNull(); expect(screen.getByText(/Clear view only affects this tab/)).not.toBeNull(); - fireEvent.click( - screen.getByRole("button", { name: "Reload capture", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Reload capture" })); const replay = await openSource(); expect(replay).not.toBe(initial); await sendEvent(replay, "saved event without traces", "reload-event"); @@ -519,11 +505,10 @@ test("session command search leaves the active view filter unchanged until Filte fireEvent.click( screen.getAllByRole("button", { name: "Search this session", - exact: true, })[0]!, ); fireEvent.change( - screen.getByRole("combobox", { name: "Search this session", exact: true }), + screen.getByRole("combobox", { name: "Search this session" }), { target: { value: "beta" }, }, @@ -547,9 +532,7 @@ test("session command search leaves the active view filter unchanged until Filte ), ); expect(new URLSearchParams(window.location.search).get("q")).toBe("beta"); - fireEvent.click( - screen.getByRole("button", { name: "Clear filter", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Clear filter" })); await waitFor(() => expect( screen.getAllByRole("button", { name: /^View event:/ }), @@ -604,7 +587,7 @@ test.each(["connecting", "failed"] as const)( ), ); expect( - (screen.getByLabelText("Receiver endpoint") as HTMLInputElement).value, + screen.getByLabelText("Receiver endpoint").value, ).toBe("http://127.0.0.1:8970/stream"); expect(ControllableEventSource.instances).toHaveLength(attempts); }, diff --git a/apps/local/src/App.integration.test.tsx b/apps/local/src/App.integration.test.tsx index 09a2bece52..fec86d1c61 100644 --- a/apps/local/src/App.integration.test.tsx +++ b/apps/local/src/App.integration.test.tsx @@ -200,24 +200,21 @@ async function openLatestReceiver() { } function viewButton(name: string): HTMLButtonElement { - if (!screen.queryByRole("button", { name, exact: true })) { - fireEvent.click( - screen.getByRole("button", { name: "Diagnostics", exact: true }), - ); + if (!screen.queryByRole("button", { name })) { + fireEvent.click(screen.getByRole("button", { name: "Diagnostics" })); } - return screen.getByRole("button", { name, exact: true }) as HTMLButtonElement; + return screen.getByRole("button", { name }); } function captureAction(name: string): HTMLButtonElement { - let button = screen.queryByRole("button", { name, exact: true }); + let button = screen.queryByRole("button", { name }); if (!button) { fireEvent.click( screen.getAllByRole("button", { name: "Capture actions", - exact: true, })[0]!, ); - button = screen.getByRole("button", { name, exact: true }); + button = screen.getByRole("button", { name }); } return button as HTMLButtonElement; } @@ -225,7 +222,7 @@ function captureAction(name: string): HTMLButtonElement { function confirmDeleteCapturedEvents() { fireEvent.click(captureAction("Delete captured events")); fireEvent.click( - screen.getByRole("button", { name: "Delete captured events", exact: true }), + screen.getByRole("button", { name: "Delete captured events" }), ); } @@ -319,7 +316,6 @@ describe("local receiver to viewer integration", () => { await screen.findByLabelText(/^View transaction:/); const trigger = screen.getByRole("button", { name: "Switch receiver", - exact: true, }); fireEvent.click(trigger); const dialog = screen.getByRole("dialog", { name: "Switch receiver" }); @@ -332,9 +328,7 @@ describe("local receiver to viewer integration", () => { "/keep-live", ); fireEvent.click(trigger); - fireEvent.click( - screen.getByRole("button", { name: "Close", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Close" })); await waitFor(() => expect(screen.queryByRole("dialog")).toBeNull()); fireEvent.click(trigger); const overlay = document.querySelector('[data-slot="dialog-overlay"]')!; @@ -367,15 +361,11 @@ describe("local receiver to viewer integration", () => { }), ); }); - fireEvent.click( - screen.getByRole("button", { name: "Switch receiver", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Switch receiver" })); fireEvent.change(screen.getByLabelText("Receiver endpoint"), { target: { value: "http://127.0.0.1:8970/stream" }, }); - fireEvent.click( - screen.getByRole("button", { name: "Connect", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Connect" })); const candidate = ControllableEventSource.instances.at(-1)!; await act(async () => candidate.onerror?.(new Event("error"))); expect(first.closed).toBe(false); @@ -386,11 +376,9 @@ describe("local receiver to viewer integration", () => { screen.getByRole("alert", { name: "Receiver connection error" }) .textContent, ).toContain("Could not connect"); - fireEvent.click( - screen.getByRole("button", { name: "Connect", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Connect" })); const cancelled = ControllableEventSource.instances.at(-1)!; - fireEvent.click(screen.getByRole("button", { name: "Close", exact: true })); + fireEvent.click(screen.getByRole("button", { name: "Close" })); expect(cancelled.closed).toBe(true); await act(async () => cancelled.onopen?.(new Event("open"))); expect(first.closed).toBe(false); @@ -406,7 +394,6 @@ describe("local receiver to viewer integration", () => { await screen.findByText("Connected to local receiver"); const trigger = screen.getByRole("button", { name: "Settings", - exact: true, }); fireEvent.click(trigger); expect(document.body.style.pointerEvents).toBe("none"); @@ -432,9 +419,7 @@ describe("local receiver to viewer integration", () => { expect(automatic.closed).toBe(true); await act(async () => automatic.onopen?.(new Event("open"))); expect(screen.getByLabelText("Receiver endpoint")).not.toBeNull(); - fireEvent.click( - screen.getByRole("button", { name: "Connect", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Connect" })); await openLatestReceiver(); await screen.findByText("Connected to local receiver"); expect(window.localStorage.getItem(STREAM_STORAGE_KEY)).toBe( @@ -445,11 +430,9 @@ describe("local receiver to viewer integration", () => { test("appearance Settings remain available without a connected receiver", () => { vi.stubGlobal("EventSource", ControllableEventSource); renderBareViewer(); - fireEvent.click( - screen.getByRole("button", { name: "Settings", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Settings" })); expect(screen.getByRole("dialog", { name: "Settings" })).not.toBeNull(); - fireEvent.click(screen.getByRole("button", { name: "Dark", exact: true })); + fireEvent.click(screen.getByRole("button", { name: "Dark" })); expect(document.documentElement.classList.contains("dark")).toBe(true); expect( screen.getByText("This receiver does not provide retention settings."), @@ -463,10 +446,8 @@ describe("local receiver to viewer integration", () => { await act(async () => ControllableEventSource.instances.at(-1)?.onopen?.(new Event("open")), ); - fireEvent.click( - await screen.findByRole("button", { name: "Settings", exact: true }), - ); - fireEvent.click(screen.getByRole("button", { name: "Dark", exact: true })); + fireEvent.click(await screen.findByRole("button", { name: "Settings" })); + fireEvent.click(screen.getByRole("button", { name: "Dark" })); await waitFor(() => expect(document.documentElement.classList.contains("dark")).toBe(true), ); @@ -479,26 +460,20 @@ describe("local receiver to viewer integration", () => { await act(async () => ControllableEventSource.instances.at(-1)?.onopen?.(new Event("open")), ); - fireEvent.click( - await screen.findByRole("button", { name: "Settings", exact: true }), - ); + fireEvent.click(await screen.findByRole("button", { name: "Settings" })); expect( - screen - .getByRole("button", { name: "Dark", exact: true }) - .getAttribute("aria-pressed"), + screen.getByRole("button", { name: "Dark" }).getAttribute("aria-pressed"), ).toBe("true"); - fireEvent.click(screen.getByRole("button", { name: "Light", exact: true })); + fireEvent.click(screen.getByRole("button", { name: "Light" })); await waitFor(() => expect(document.documentElement.classList.contains("light")).toBe(true), ); expect(window.localStorage.getItem("theme")).toBe("light"); - fireEvent.click( - screen.getByRole("button", { name: "System", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "System" })); expect(window.localStorage.getItem("theme")).toBe("system"); expect( screen - .getByRole("button", { name: "System", exact: true }) + .getByRole("button", { name: "System" }) .getAttribute("aria-pressed"), ).toBe("true"); expect(document.documentElement.classList.contains("light")).toBe(true); @@ -540,7 +515,7 @@ describe("local receiver to viewer integration", () => { expect(detail.textContent).not.toContain("No additional event details."); const frames = screen.getAllByRole("list", { name: "Stack frames" }); expect(frames[0]?.textContent?.indexOf("submitOrder")).toBeLessThan( - frames[0]!.textContent!.indexOf("runMain"), + frames[0]!.textContent.indexOf("runMain"), ); fireEvent.click(screen.getByRole("tab", { name: "JSON" })); await waitFor(() => @@ -549,7 +524,7 @@ describe("local receiver to viewer integration", () => { ), ); expect( - JSON.parse(screen.getByTestId("highlighted-json").textContent!), + JSON.parse(screen.getByTestId("highlighted-json").textContent), ).toEqual({ ...sdkException, type: "event" }); } finally { cleanup(); @@ -620,9 +595,7 @@ describe("local receiver to viewer integration", () => { await act(async () => ControllableEventSource.instances[0]?.onopen?.(new Event("open")), ); - fireEvent.click( - await screen.findByRole("button", { name: "Settings", exact: true }), - ); + fireEvent.click(await screen.findByRole("button", { name: "Settings" })); expect(document.documentElement.classList.contains("light")).toBe(true); expect(screen.getByText("System appearance: Light")).not.toBeNull(); await changeSystemTheme(true); @@ -630,13 +603,11 @@ describe("local receiver to viewer integration", () => { expect(screen.getByText("System appearance: Dark")).not.toBeNull(); await changeSystemTheme(false); expect(document.documentElement.classList.contains("light")).toBe(true); - fireEvent.click(screen.getByRole("button", { name: "Dark", exact: true })); + fireEvent.click(screen.getByRole("button", { name: "Dark" })); await changeSystemTheme(true); await changeSystemTheme(false); expect(document.documentElement.classList.contains("dark")).toBe(true); - fireEvent.click( - screen.getByRole("button", { name: "System", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "System" })); expect(document.documentElement.classList.contains("light")).toBe(true); expect(ControllableEventSource.instances).toHaveLength(1); expect(ControllableEventSource.instances[0]?.closed).toBe(false); @@ -713,7 +684,7 @@ describe("local receiver to viewer integration", () => { await sendEnvelope(port, "GET /dock"); await screen.findByLabelText(/^View transaction:/); const sidebar = screen.getByLabelText("Workspace navigation"); - expect(sidebar.querySelector('[role="status"]')).toBeNull(); + expect(sidebar.querySelector("output")).toBeNull(); expect(screen.getByLabelText("Capture context").textContent).toContain( "Capturing", ); @@ -750,13 +721,12 @@ describe("local receiver to viewer integration", () => { screen.getByRole("status", { name: "Checking receiver" }), ).not.toBeNull(); expect(screen.queryByText("Advanced connection")).toBeNull(); - const endpoint = screen.getByLabelText( - "Receiver endpoint", - ) as HTMLInputElement; + const endpoint = + screen.getByLabelText("Receiver endpoint"); expect(endpoint.value).toBe("http://localhost:8969/stream"); - const connectButton = screen.getByRole("button", { + const connectButton = screen.getByRole("button", { name: "Connect", - }) as HTMLButtonElement; + }); expect(connectButton.disabled).toBe(false); expect(connectButton.getAttribute("aria-busy")).toBe("false"); expect( @@ -959,15 +929,11 @@ describe("local receiver to viewer integration", () => { await sendEnvelope(second.port, "GET /past-second"); renderViewer(first.port); await screen.findByLabelText(/^View transaction:/); - fireEvent.click( - screen.getByRole("button", { name: "Switch receiver", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Switch receiver" })); fireEvent.change(screen.getByLabelText("Receiver endpoint"), { target: { value: `http://127.0.0.1:${second.port}/stream` }, }); - fireEvent.click( - screen.getByRole("button", { name: "Connect", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Connect" })); await waitFor(() => expect(screen.getByTestId("event-list").textContent).toContain( "/past-second", @@ -976,21 +942,17 @@ describe("local receiver to viewer integration", () => { cleanup(); renderBareViewer(); await screen.findByLabelText(/^View transaction:/); - fireEvent.click( - screen.getByRole("button", { name: "Switch receiver", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Switch receiver" })); const firstLabel = `http://127.0.0.1:${first.port}/stream`; const secondLabel = `http://127.0.0.1:${second.port}/stream`; expect( screen.getByRole("button", { name: `Reconnect to ${secondLabel}`, - exact: true, }), ).not.toBeNull(); fireEvent.click( screen.getByRole("button", { name: `Reconnect to ${firstLabel}`, - exact: true, }), ); await waitFor(() => @@ -1001,24 +963,18 @@ describe("local receiver to viewer integration", () => { expect(screen.getByTestId("event-list").textContent).not.toContain( "/past-second", ); - fireEvent.click( - screen.getByRole("button", { name: "Switch receiver", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Switch receiver" })); fireEvent.click( screen.getByRole("button", { name: `Forget ${secondLabel}`, - exact: true, }), ); expect( screen.queryByRole("button", { name: `Reconnect to ${secondLabel}`, - exact: true, }), ).toBeNull(); - fireEvent.click( - screen.getByRole("button", { name: "Close", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Close" })); expect(screen.getByTestId("event-list").textContent).toContain( "/past-first", ); @@ -1067,9 +1023,7 @@ describe("local receiver to viewer integration", () => { expect( screen.queryByRole("alert", { name: "Receiver connection error" }), ).toBeNull(); - fireEvent.click( - screen.getByRole("button", { name: "Connect", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Connect" })); await openLatestReceiver(); await screen.findByText("Connected to local receiver"); }); @@ -1200,9 +1154,7 @@ describe("local receiver to viewer integration", () => { }); if (failure === "reconnecting") { await act(async () => source.onerror?.(new Event("error"))); - fireEvent.click( - screen.getByRole("button", { name: "Reconnect", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Reconnect" })); } const sidebar = screen.getByRole("complementary", { name: "Workspace navigation", @@ -1220,16 +1172,11 @@ describe("local receiver to viewer integration", () => { screen.getByRole("heading", { name: "No events displayed" }), ).not.toBeNull(); expect( - ( - screen.getByRole("button", { - name: "Reconnect", - exact: true, - }) as HTMLButtonElement - ).disabled, + screen.getByRole("button", { + name: "Reconnect", + }).disabled, ).toBe(false); - fireEvent.click( - screen.getByRole("button", { name: "Reconnect", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Reconnect" })); const reconnected = await openLatestReceiver(); expect(reconnected).not.toBe(source); await act(async () => @@ -1288,34 +1235,24 @@ describe("local receiver to viewer integration", () => { }), ); }); - fireEvent.click( - screen.getByRole("button", { name: "Open errors view", exact: true }), - ); - await screen.findByRole("heading", { name: "Errors", exact: true }); - fireEvent.click(screen.getByRole("tab", { name: "JSON", exact: true })); + fireEvent.click(screen.getByRole("button", { name: "Open errors view" })); + await screen.findByRole("heading", { name: "Errors" }); + fireEvent.click(screen.getByRole("tab", { name: "JSON" })); await act(async () => source.onerror?.(new Event("error"))); await screen.findByText("Connection lost", { exact: true }); - fireEvent.click( - screen.getByRole("button", { name: "Switch receiver", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Switch receiver" })); expect( - (screen.getByLabelText("Receiver endpoint") as HTMLInputElement).value, + screen.getByLabelText("Receiver endpoint").value, ).toBe("http://127.0.0.1:8969/stream"); - fireEvent.click( - screen.getByRole("button", { name: "Connect", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Connect" })); await openLatestReceiver(); await screen.findByText("Connected to local receiver"); - expect( - screen.getByRole("heading", { name: "Errors", exact: true }), - ).not.toBeNull(); + expect(screen.getByRole("heading", { name: "Errors" })).not.toBeNull(); expect(screen.getByTestId("event-detail").textContent).toContain( "kept scoped event", ); expect( - screen - .getByRole("tab", { name: "JSON", exact: true }) - .getAttribute("aria-selected"), + screen.getByRole("tab", { name: "JSON" }).getAttribute("aria-selected"), ).toBe("true"); const reconnected = new URL(requestedStreams.at(-1)!); expect(reconnected.pathname).toBe(new URL(stream).pathname); @@ -1344,13 +1281,11 @@ describe("local receiver to viewer integration", () => { const error = "Could not connect to the default receiver. Start it with the command below or enter another endpoint."; expect(screen.getByText(error)).not.toBeNull(); - fireEvent.click( - screen.getByRole("button", { name: "Switch receiver", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Switch receiver" })); fireEvent.change(screen.getByLabelText("Receiver endpoint"), { target: { value: "http://127.0.0.1:8970/stream" }, }); - fireEvent.click(screen.getByRole("button", { name: "Close", exact: true })); + fireEvent.click(screen.getByRole("button", { name: "Close" })); expect(screen.getByText(error)).not.toBeNull(); expect(screen.getByTestId("event-detail").textContent).toContain( "kept event", @@ -1399,9 +1334,9 @@ describe("local receiver to viewer integration", () => { const source = ControllableEventSource.instances[1]; expect(source).toBeDefined(); - const connectingButton = screen.getByRole("button", { + const connectingButton = screen.getByRole("button", { name: "Connecting to receiver", - }) as HTMLButtonElement; + }); expect(connectingButton.disabled).toBe(true); expect(connectingButton.getAttribute("aria-busy")).toBe("true"); @@ -1415,7 +1350,7 @@ describe("local receiver to viewer integration", () => { .textContent, ).toContain("Connection timed out after 10 seconds"); expect( - (screen.getByRole("button", { name: "Connect" }) as HTMLButtonElement) + screen.getByRole("button", { name: "Connect" }) .disabled, ).toBe(false); } finally { @@ -1771,9 +1706,7 @@ describe("local receiver to viewer integration", () => { ); } renderViewer(receiver.port, "/explorer/events"); - fireEvent.click( - await screen.findByRole("button", { name: "Settings", exact: true }), - ); + fireEvent.click(await screen.findByRole("button", { name: "Settings" })); // Role queries over hundreds of aria-hidden background rows are costly in // jsdom and can starve this real receiver's request timeout on CI workers. const settings = within(screen.getByRole("dialog", { name: "Settings" })); @@ -1790,14 +1723,14 @@ describe("local receiver to viewer integration", () => { ); expect( ( - (await settings.findByRole("button", { + await settings.findByRole("button", { name: "Applying…", - })) as HTMLButtonElement + }) ).disabled, ).toBe(true); // The edited input is already 2000 while the HTTP mutation is pending. expect( - (settings.getByLabelText("Envelope limit") as HTMLInputElement).value, + settings.getByLabelText("Envelope limit").value, ).toBe("2000"); expect(retention.getSettings().maxEnvelopes).toBe(1000); // Await completion, allowing the receiver's five-second request timeout @@ -1860,9 +1793,7 @@ describe("local receiver to viewer integration", () => { }), ); }); - fireEvent.click( - await screen.findByRole("button", { name: "Settings", exact: true }), - ); + fireEvent.click(await screen.findByRole("button", { name: "Settings" })); fireEvent.change(screen.getByLabelText("Envelope limit"), { target: { value: "1" }, }); @@ -1889,13 +1820,13 @@ describe("local receiver to viewer integration", () => { ); await waitFor(() => expect( - (screen.getByLabelText("Envelope limit") as HTMLInputElement).value, + screen.getByLabelText("Envelope limit").value, ).toBe("1000"), ); - fireEvent.click(screen.getByRole("button", { name: "Close", exact: true })); + fireEvent.click(screen.getByRole("button", { name: "Close" })); await waitFor(() => expect(document.activeElement).toBe( - screen.getByRole("button", { name: "Settings", exact: true }), + screen.getByRole("button", { name: "Settings" }), ), ); const clearButton = captureAction("Clear view"); @@ -1932,16 +1863,14 @@ describe("local receiver to viewer integration", () => { ); source?.onerror?.(new Event("error")); }); - fireEvent.click( - await screen.findByRole("button", { name: "Settings", exact: true }), - ); + fireEvent.click(await screen.findByRole("button", { name: "Settings" })); await screen.findByText( "Reconnect to this receiver to change history capacity.", ); expect( screen.queryByRole("button", { name: "Apply envelope limit" }), ).toBeNull(); - fireEvent.click(screen.getByRole("button", { name: "Close", exact: true })); + fireEvent.click(screen.getByRole("button", { name: "Close" })); expect(screen.getByRole("button", { name: /^View event:/ })).not.toBeNull(); }); @@ -1973,9 +1902,7 @@ describe("local receiver to viewer integration", () => { fireEvent.click(screen.getByRole("button", { name: "Reload capture" })); const replay = ControllableEventSource.instances.at(-1)!; expect(replay).not.toBe(source); - fireEvent.click( - screen.getByRole("button", { name: "Settings", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Settings" })); const assertReadOnly = () => { expect( screen.getByText("History capacity is read-only for saved captures."), @@ -2014,9 +1941,7 @@ describe("local receiver to viewer integration", () => { }), ); }); - fireEvent.click( - await screen.findByRole("button", { name: "Settings", exact: true }), - ); + fireEvent.click(await screen.findByRole("button", { name: "Settings" })); fireEvent.change(screen.getByLabelText("Envelope limit"), { target: { value: "1" }, }); @@ -2025,9 +1950,7 @@ describe("local receiver to viewer integration", () => { ); await waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(1)); if (switchReceiver) { - fireEvent.click( - screen.getByRole("button", { name: "Close", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Close" })); fireEvent.click( screen.getByRole("button", { name: "Switch receiver" }), ); @@ -2049,16 +1972,14 @@ describe("local receiver to viewer integration", () => { }); if (switchReceiver) fireEvent.click( - await screen.findByRole("button", { name: "Settings", exact: true }), + await screen.findByRole("button", { name: "Settings" }), ); await waitFor(() => expect( - (screen.getByLabelText("Envelope limit") as HTMLInputElement).value, + screen.getByLabelText("Envelope limit").value, ).toBe("1000"), ); - fireEvent.click( - screen.getByRole("button", { name: "Close", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Close" })); await act(async () => { for (const id of ["one", "two"]) source?.dispatchEvent( @@ -2237,14 +2158,11 @@ describe("local receiver to viewer integration", () => { }); const clearButton = captureAction("Delete captured events"); - await waitFor(() => - expect((clearButton as HTMLButtonElement).disabled).toBe(false), - ); + await waitFor(() => expect(clearButton.disabled).toBe(false)); fireEvent.click(clearButton); fireEvent.click( screen.getByRole("button", { name: "Delete captured events", - exact: true, }), ); await waitFor(() => expect(fetchMock).toHaveBeenCalledTimes(1)); @@ -2404,7 +2322,6 @@ describe("local receiver to viewer integration", () => { fireEvent.click( screen.getByRole("button", { name: "Reload capture", - exact: true, }), ); const replay = await openLatestReceiver(); diff --git a/apps/local/src/App.sessions.integration.test.tsx b/apps/local/src/App.sessions.integration.test.tsx index c4ce523b3f..34985f687c 100644 --- a/apps/local/src/App.sessions.integration.test.tsx +++ b/apps/local/src/App.sessions.integration.test.tsx @@ -124,24 +124,21 @@ function renderViewer() { } async function selectSession(label: string) { if (!screen.queryByRole("listbox")) - fireEvent.click( - screen.getByRole("combobox", { name: "Session", exact: true }), - ); + fireEvent.click(screen.getByRole("combobox", { name: "Session" })); fireEvent.click( await screen.findByRole("option", { name: new RegExp(`^${label} ·`) }), ); } function captureAction(name: string): HTMLButtonElement { - let action = screen.queryByRole("button", { name, exact: true }); + let action = screen.queryByRole("button", { name }); if (!action) { fireEvent.click( screen.getAllByRole("button", { name: "Capture actions", - exact: true, })[0]!, ); - action = screen.getByRole("button", { name, exact: true }); + action = screen.getByRole("button", { name }); } return action as HTMLButtonElement; } @@ -186,12 +183,9 @@ test("hosted viewer switches live sessions without mixing events and replays ret await selectSession("worker"); await screen.findAllByText("/worker-job"); expect(screen.queryByText("/web-request")).toBeNull(); - fireEvent.click( - screen.getByRole("button", { name: "Settings", exact: true }), - ); - const limit = (await screen.findByLabelText( - "Envelope limit", - )) as HTMLInputElement; + fireEvent.click(screen.getByRole("button", { name: "Settings" })); + const limit = + await screen.findByLabelText("Envelope limit"); expect(limit.value).toBe("1000"); fireEvent.change(limit, { target: { value: "2000" } }); fireEvent.click( @@ -207,7 +201,7 @@ test("hosted viewer switches live sessions without mixing events and replays ret daemon.plane.sessionStore.getBuffer(worker.id).read({ all: true }), ).toHaveLength(1); expect(screen.queryByRole("button", { name: "Stop capture" })).toBeNull(); - fireEvent.click(screen.getByRole("button", { name: "Close", exact: true })); + fireEvent.click(screen.getByRole("button", { name: "Close" })); await daemon.ingest(web, "/web-after-switch"); await daemon.ingest(worker, "/worker-after-switch"); await screen.findAllByText("/worker-after-switch"); @@ -225,7 +219,6 @@ test("hosted viewer switches live sessions without mixing events and replays ret ); const search = screen.getByRole("combobox", { name: "Search sessions", - exact: true, }); fireEvent.change(search, { target: { value: "api" } }); await waitFor(() => @@ -235,15 +228,14 @@ test("hosted viewer switches live sessions without mixing events and replays ret await waitFor(() => expect(screen.queryByRole("listbox")).toBeNull()); await waitFor(() => expect(document.activeElement).toBe(picker)); expect( - screen.getByRole("combobox", { name: "Session", exact: true }) - .textContent, + screen.getByRole("combobox", { name: "Session" }).textContent, ).toContain("api"); daemon.plane.sessionStore.close(worker.id); fireEvent.click(screen.getByRole("button", { name: "Refresh sessions" })); fireEvent.click(picker); await screen.findByRole("option", { name: /worker.*Saved/ }); fireEvent.keyDown( - screen.getByRole("combobox", { name: "Search sessions", exact: true }), + screen.getByRole("combobox", { name: "Search sessions" }), { key: "Escape" }, ); await waitFor(() => expect(screen.queryByRole("listbox")).toBeNull()); @@ -319,21 +311,15 @@ test("hosted viewer offers tab-local Clear view while delete and stop stay unava fireEvent.click( screen.getAllByRole("button", { name: "Capture actions", - exact: true, })[0]!, ); expect( screen.queryByRole("button", { name: "Delete captured events", - exact: true, }), ).toBeNull(); - expect( - screen.queryByRole("button", { name: "Stop capture", exact: true }), - ).toBeNull(); - fireEvent.click( - screen.getByRole("button", { name: "Clear view", exact: true }), - ); + expect(screen.queryByRole("button", { name: "Stop capture" })).toBeNull(); + fireEvent.click(screen.getByRole("button", { name: "Clear view" })); await screen.findByRole("heading", { name: "No events displayed" }); expect(requests).not.toHaveBeenCalled(); expect( @@ -355,17 +341,13 @@ test("expired sessions disappear without clearing already displayed telemetry", await daemon.ingest(web, "/retained-in-viewer"); renderSession(web); await screen.findAllByText("/retained-in-viewer"); - fireEvent.click( - screen.getByRole("combobox", { name: "Session", exact: true }), - ); + fireEvent.click(screen.getByRole("combobox", { name: "Session" })); await screen.findByRole("option", { name: /web.*Capturing/ }); await selectSession("web"); daemon.plane.sessionStore.close(web.id); now += SESSION_RETENTION_MS; fireEvent.click(screen.getByRole("button", { name: "Refresh sessions" })); - fireEvent.click( - screen.getByRole("combobox", { name: "Session", exact: true }), - ); + fireEvent.click(screen.getByRole("combobox", { name: "Session" })); await screen.findByText("No sessions available."); expect(screen.getAllByText("/retained-in-viewer").length).toBeGreaterThan( 0, @@ -386,13 +368,10 @@ test("pasting a plain receiver discovers active sessions and waits for newly sta const stream = new URL("/stream", web.streamUrl).toString(); renderSession({ streamUrl: web.streamUrl }); await screen.findAllByText("/plain-web"); - expect( - screen.queryByRole("combobox", { name: "Session", exact: true }), - ).toBeNull(); + expect(screen.queryByRole("combobox", { name: "Session" })).toBeNull(); fireEvent.click( screen.getByRole("button", { name: "Switch receiver", - exact: true, }), ); // The prefilled display address is identical; clear it to make this an explicit edit. @@ -402,25 +381,19 @@ test("pasting a plain receiver discovers active sessions and waits for newly sta fireEvent.change(screen.getByLabelText("Receiver endpoint"), { target: { value: stream }, }); - fireEvent.click( - screen.getByRole("button", { name: "Connect", exact: true }), - ); - await screen.findByRole("combobox", { name: "Session", exact: true }); + fireEvent.click(screen.getByRole("button", { name: "Connect" })); + await screen.findByRole("combobox", { name: "Session" }); await selectSession("worker"); await screen.findAllByText("/plain-worker"); expect(screen.queryByText("/plain-web")).toBeNull(); expect( - screen.getByRole("combobox", { name: "Session", exact: true }) - .textContent, + screen.getByRole("combobox", { name: "Session" }).textContent, ).toContain("worker"); expect(screen.queryByText("Envelope limit")).toBeNull(); - fireEvent.click( - screen.getByRole("button", { name: "Settings", exact: true }), - ); - await screen.findByRole("dialog", { name: "Settings", exact: true }); + fireEvent.click(screen.getByRole("button", { name: "Settings" })); + await screen.findByRole("dialog", { name: "Settings" }); expect( - ((await screen.findByLabelText("Envelope limit")) as HTMLInputElement) - .value, + (await screen.findByLabelText("Envelope limit")).value, ).toBe("500"); expect( screen.getByRole("button", { name: "Apply envelope limit" }), @@ -442,15 +415,13 @@ test("an empty receiver discovers the first session when it starts without recon renderSession({ streamUrl: new URL("/stream", reservation.streamUrl).toString(), }); - await screen.findByRole("combobox", { name: "Session", exact: true }); - fireEvent.click( - screen.getByRole("combobox", { name: "Session", exact: true }), - ); + await screen.findByRole("combobox", { name: "Session" }); + fireEvent.click(screen.getByRole("combobox", { name: "Session" })); await screen.findByText("No sessions available."); const web = await daemon.create("new-run"); await daemon.ingest(web, "/late-start"); fireEvent.keyDown( - screen.getByRole("combobox", { name: "Search sessions", exact: true }), + screen.getByRole("combobox", { name: "Search sessions" }), { key: "Escape" }, ); fireEvent.click(screen.getByRole("button", { name: "Refresh sessions" })); @@ -469,13 +440,11 @@ test("reconnecting a plain receiver after daemon restart never selects a stale d await first.ingest(old, "/before-restart"); renderSession(old); await screen.findAllByText("/before-restart"); - await screen.findByRole("combobox", { name: "Session", exact: true }); - fireEvent.click( - screen.getByRole("combobox", { name: "Session", exact: true }), - ); + await screen.findByRole("combobox", { name: "Session" }); + fireEvent.click(screen.getByRole("combobox", { name: "Session" })); await screen.findByRole("option", { name: /^old-run ·/ }); fireEvent.keyDown( - screen.getByRole("combobox", { name: "Search sessions", exact: true }), + screen.getByRole("combobox", { name: "Search sessions" }), { key: "Escape" }, ); await first.stop(); @@ -486,7 +455,6 @@ test("reconnecting a plain receiver after daemon restart never selects a stale d fireEvent.click( screen.getByRole("button", { name: "Switch receiver", - exact: true, }), ); fireEvent.change(screen.getByLabelText("Receiver endpoint"), { @@ -495,14 +463,11 @@ test("reconnecting a plain receiver after daemon restart never selects a stale d fireEvent.change(screen.getByLabelText("Receiver endpoint"), { target: { value: `http://127.0.0.1:${first.port}/stream` }, }); - fireEvent.click( - screen.getByRole("button", { name: "Connect", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Connect" })); await screen.findAllByText("/after-restart"); expect(screen.queryByText("/before-restart")).toBeNull(); expect( - screen.getByRole("combobox", { name: "Session", exact: true }) - .textContent, + screen.getByRole("combobox", { name: "Session" }).textContent, ).toContain("current-run"); } finally { cleanup(); @@ -540,15 +505,12 @@ test("retrying a failed CLI-selected stream keeps that session instead of discov ); renderSession(worker); await screen.findByRole("alert", { name: "Receiver connection error" }); - fireEvent.click( - screen.getByRole("button", { name: "Connect", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Connect" })); await screen.findAllByText("/retry-worker"); expect(screen.queryByText("/retry-web")).toBeNull(); await waitFor(() => expect( - screen.getByRole("combobox", { name: "Session", exact: true }) - .textContent, + screen.getByRole("combobox", { name: "Session" }).textContent, ).toContain("worker"), ); } finally { @@ -583,8 +545,7 @@ test("a CLI viewer query link discovers both runs and does not override the sele expect(screen.queryByText("/link-web")).toBeNull(); await waitFor(() => expect( - screen.getByRole("combobox", { name: "Session", exact: true }) - .textContent, + screen.getByRole("combobox", { name: "Session" }).textContent, ).toContain("worker"), ); } finally { @@ -606,8 +567,7 @@ test("a session lifecycle refresh immediately replaces a stale Capturing badge w ); await waitFor(() => expect( - screen.getByRole("combobox", { name: "Session", exact: true }) - .textContent, + screen.getByRole("combobox", { name: "Session" }).textContent, ).toContain("Capturing"), ); const response = await fetch( @@ -625,8 +585,7 @@ test("a session lifecycle refresh immediately replaces a stale Capturing badge w ); await waitFor(() => expect( - screen.getByRole("combobox", { name: "Session", exact: true }) - .textContent, + screen.getByRole("combobox", { name: "Session" }).textContent, ).toContain("Saved"), ); } finally { @@ -663,24 +622,18 @@ test("close, archive replay, clear and disconnect keep the viewer lifecycle stab fireEvent.click(captureAction("Clear view")); await screen.findByRole("heading", { name: "No events displayed", - exact: true, }); expect(screen.queryByLabelText("Receiver endpoint")).toBeNull(); expect( screen.getByRole("complementary", { name: "Workspace navigation" }), ).not.toBeNull(); - fireEvent.click( - screen.getByRole("button", { name: "Reload capture", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Reload capture" })); await screen.findAllByText("/archived-web"); fireEvent.click(captureAction("Disconnect viewer")); await screen.findByRole("heading", { name: "Capture a local session", - exact: true, }); - expect( - screen.queryByRole("combobox", { name: "Session", exact: true }), - ).toBeNull(); + expect(screen.queryByRole("combobox", { name: "Session" })).toBeNull(); expect( daemon.plane.sessionStore.getRetention(web.id).getSettings() .retainedEnvelopes, @@ -689,12 +642,9 @@ test("close, archive replay, clear and disconnect keep the viewer lifecycle stab renderViewer(); await screen.findByRole("heading", { name: "Capture a local session", - exact: true, }); expect(screen.queryByText("/archived-web")).toBeNull(); - fireEvent.click( - screen.getByRole("button", { name: "Connect", exact: true }), - ); + fireEvent.click(screen.getByRole("button", { name: "Connect" })); await screen.findAllByText("/archived-web"); await waitFor(() => expect( @@ -724,12 +674,9 @@ test("hosted standalone receiver edits retention without losing saved events", a }); renderSession({ streamUrl }); await screen.findByRole("button", { name: /^View event:/ }); - fireEvent.click( - screen.getByRole("button", { name: "Settings", exact: true }), - ); - const input = (await screen.findByLabelText( - "Envelope limit", - )) as HTMLInputElement; + fireEvent.click(screen.getByRole("button", { name: "Settings" })); + const input = + await screen.findByLabelText("Envelope limit"); fireEvent.change(input, { target: { value: "1000" } }); fireEvent.click( screen.getByRole("button", { name: "Apply envelope limit" }), @@ -771,8 +718,7 @@ test("a new session link in an open tab switches to that run's sessions", async expect(screen.queryByText("/first-run")).toBeNull(); await waitFor(() => expect( - screen.getByRole("combobox", { name: "Session", exact: true }) - .textContent, + screen.getByRole("combobox", { name: "Session" }).textContent, ).toContain("api"), ); expect(screen.queryByText(/Could not refresh sessions/)).toBeNull(); diff --git a/apps/local/src/App.tsx b/apps/local/src/App.tsx index 2fa2d85744..8de4e93df4 100644 --- a/apps/local/src/App.tsx +++ b/apps/local/src/App.tsx @@ -100,7 +100,10 @@ import { } from "@/lib/spotlight.ts"; import { createLocalTelemetryStore } from "@/lib/telemetry-store.ts"; import { buildTraceGroups, traceIdForItem } from "@/lib/trace-model.ts"; -import { workspaceNavigation } from "@/lib/workspace-navigation.ts"; +import { + workspaceNavigation, + workspaceNavigationFor, +} from "@/lib/workspace-navigation.ts"; import { eventListLabel, isErrorEvent, @@ -406,9 +409,7 @@ export default function App() { workspaceView, ); - const activeWorkspace = workspaceNavigation.find( - (entry) => entry.id === workspaceView, - )!; + const activeWorkspace = workspaceNavigationFor(workspaceView); const workspaceItems = activeWorkspace.getItems(telemetry); const hasRetainedItems = items.length > 0 || telemetry.envelopes.length > 0; const retainedItemCount = items.length + telemetry.envelopes.length; @@ -461,9 +462,7 @@ export default function App() { const newItemCount = newItems.length; const markItemsSeen = (view = workspaceView) => { - const viewedItems = workspaceNavigation - .find((entry) => entry.id === view)! - .getItems(telemetry); + const viewedItems = workspaceNavigationFor(view).getItems(telemetry); setLastViewedItemIds((itemIds) => ({ ...itemIds, [view]: viewedItems.at(-1)?.id, @@ -930,7 +929,7 @@ export default function App() { // Undecodable envelopes stay inspectable as raw text. } // Replayed history must keep its receive time, not the time it loaded. - const sentAt = items?.[0]?.envelopeHeader?.sent_at; + const sentAt = items?.[0]?.envelopeHeader?.["sent_at"]; const sentAtMs = typeof sentAt === "string" ? Date.parse(sentAt) : NaN; const receivedAt = envelopeReceivedAt(eventId) ?? @@ -1089,6 +1088,7 @@ export default function App() {

{attachment?.contentType ?? - text(item.itemHeader?.content_type) ?? + text(item.itemHeader?.["content_type"]) ?? "Unknown type"} {byteLength === undefined ? "" : ` · ${byteLength.toLocaleString()} bytes`}

{!expanded ? null : !attachment ? ( -

+ This attachment could not be decoded. Its original payload is available in JSON. -

+ ) : content !== undefined ? ( attachment.contentType.includes("json") ? ( diff --git a/apps/local/src/components/capture-header.tsx b/apps/local/src/components/capture-header.tsx index 400baf9a05..926cded8d2 100644 --- a/apps/local/src/components/capture-header.tsx +++ b/apps/local/src/components/capture-header.tsx @@ -10,9 +10,9 @@ export type CaptureHeaderProps = { streamUrl: string | null; connection: ConnectionState; isClosed: boolean; - expiresAt?: number; - session?: ViewerSession; - latestEventTime?: number; + expiresAt?: number | undefined; + session?: ViewerSession | undefined; + latestEventTime?: number | undefined; sessionPicker?: ReactNode; onReload: () => void; isReloading: boolean; @@ -132,9 +132,7 @@ export function CaptureHeader({ )}
- - {state} - + {state} {currentSession?.cwd ? ( diff --git a/apps/local/src/components/connection-landing.test.tsx b/apps/local/src/components/connection-landing.test.tsx index 4bc414a5cb..68c60bf898 100644 --- a/apps/local/src/components/connection-landing.test.tsx +++ b/apps/local/src/components/connection-landing.test.tsx @@ -36,9 +36,7 @@ test("first run copies a capture command and keeps existing receiver entry secon const existing = screen.getByText("Connect an existing receiver"); fireEvent.click(existing); fireEvent.submit( - screen - .getByRole("button", { name: "Connect", exact: true }) - .closest("form")!, + screen.getByRole("button", { name: "Connect" }).closest("form")!, ); expect(form.onConnect).toHaveBeenCalledOnce(); }); diff --git a/apps/local/src/components/connection-landing.tsx b/apps/local/src/components/connection-landing.tsx index 7eb51a31b2..1d32c373eb 100644 --- a/apps/local/src/components/connection-landing.tsx +++ b/apps/local/src/components/connection-landing.tsx @@ -13,7 +13,7 @@ import { export type ConnectionFormProps = { endpoint: string; - error?: string; + error?: string | undefined; isConnecting: boolean; onConnect: () => void; onEndpointChange: (value: string) => void; @@ -196,7 +196,9 @@ export function ConnectionLanding({ phase, ...form }: ConnectionLandingProps) { type="button" className="w-full" aria-label="Copy local run command" - onClick={() => copyToClipboard(command)} + onClick={() => { + void copyToClipboard(command); + }} > {copied === command ? (