Skip to content

chore: merge main into v3 - #1120

Merged
HugoRCD merged 30 commits into
v3from
chore/sync-main-into-v3-1101
Nov 17, 2026
Merged

HugoRCD merged 30 commits into
v3from
chore/sync-main-into-v3-1101

Conversation

@HugoRCD

@HugoRCD HugoRCD commented Nov 17, 2026 •

Copy link
Copy Markdown
Member

Written by an AI agent on behalf of @HugoRCD. @HugoRCD has not reviewed it yet.

Brings the 23 commits on main since #1088 into v3, including the three CLI changes the 1.0 contract needs: #1085 (logs bounded memory), #1075 (map records each entry point's event shape) and #1101 (the launcher refuses an unsupported Node or evlog). Like #1086 and #1088, this should land by fast-forwarding v3 to this branch's head, not by a squash.

Conflicts and how they were resolved

File Resolution
packages/evlog/src/nitro-v3/plugin.ts Both sides kept. main's #1098 defers the emit until a streamed body ends (h3.onDispose), and v3 passes the recorded error into emitWithTailSampling. The error is now recorded once before _evlogEmitting is set and passed to the deferred emit.
packages/evlog/src/nuxt/module.ts main's client: false (#1099) on v3's layout: Nitro v3 is ../nitro/plugin, v2 is ../nitro/v2/plugin. The axiom.token deprecation from main is dropped, because v3 already removed the option.
packages/evlog/package.json v3's devDependencies (NestJS 12, OTel, logtape, loglayer) plus main's @nuxt/test-utils ^4.4.0. main's other bumps merged cleanly. Peer ranges stay v3's capped ones from EVL-703.
renovate.json v3's description, which also covers adding a new major to a peer range.
apps/docs/content/3.cli/0.overview.md #1105's "Experimental" on --debug plus #1101's --no-header.
pnpm-lock.yaml Regenerated from main's lockfile. Starting from v3's lockfile instead left vite 8.3.6 and 8.3.8 side by side, which failed examples/tanstack-start typecheck with TS2321.

Fixes the merge needed

These broke only once both branches met:

origin/v3 was merged in again as it moved (#1109, #1114, #1112, #1115, #1119, #1116). Only #1116 conflicted, in size-budget.json, and it is resolved as above.

Checks

On the merged tree:

  • pnpm run typecheck, pnpm run lint and pnpm run test all exit 0.
  • @evlog/cli: 905 tests passed. evlog: 2,668 tests passed, including test/build/size-budget.test.ts.

For the reviewer

  • .changeset/restore-peer-floors.md (fix(deps): restore peer dependency floors #1094) describes main's uncapped ranges (>=11.2.8 for NestJS, >=4.13.17 for Hono). v3 keeps its capped ones, so beta.3's changelog would print the wrong range. I left it as is, because it's main's changeset and ships in 2.x anyway. It's one more for the EVL-604 list of 2.x changesets to delete before changeset pre exit, or it can be reworded here.
  • Redaction: the merge touched nothing in it beyond fix(core): keep UUID digit groups out of the creditCard built-in #1042, which merged without conflict, so I didn't rerun bench/core/redact.bench.ts.
  • Peer warning: pnpm install warns about @tiptap peers in apps/docs. It comes from main's dependency updates and doesn't affect published packages.

ELI5

The 2.x branch got 23 changes since it was last copied into the 3.0 branch, and this copies them over. Where both branches changed the same lines, this keeps both changes. A few things that only broke once the two met, like the CLI's version check, are fixed here too.

HugoRCD and others added 24 commits November 16, 2026 22:31
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Hugo Richard <hrichard206@gmail.com>
…auditDiff (#1060)

Signed-off-by: Бат-Орших <34618353+orshih6@users.noreply.github.com>
Co-authored-by: Hugo Richard <hrichard206@gmail.com>
Co-authored-by: Hugo Richard <hrichard206@gmail.com>
… a requester's token (#1097)

Co-authored-by: evlogai[bot] <313167257+evlogai[bot]@users.noreply.github.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Hugo <HugoRCD@users.noreply.github.com>
Co-authored-by: evlogai[bot] <313167257+evlogai[bot]@users.noreply.github.com>
Co-authored-by: evlogai[bot] <313167257+evlogai[bot]@users.noreply.github.com>
Co-authored-by: evlogai[bot] <313167257+evlogai[bot]@users.noreply.github.com>
@vercel

vercel Bot commented Nov 17, 2026 •

Copy link
Copy Markdown
Contributor

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated
evi Ready Ready Preview Nov 17, 2026 7:23pm UTC
evlog-telemetry Ready Ready Preview Nov 17, 2026 7:23pm UTC
3 Skipped Deployments
Project Deployment Actions Updated
evlog-docs Ignored Ignored Preview Nov 17, 2026 7:23pm UTC
evlog-render-lab Ignored Ignored Preview Nov 17, 2026 7:23pm UTC
just-use-evlog Ignored Ignored Preview Nov 17, 2026 7:23pm UTC

Request Review

@coderabbitai

coderabbitai Bot commented Nov 17, 2026 •

Copy link
Copy Markdown
Contributor

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

Run configuration

  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: defaults
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: cfa7b781-43dc-4520-9cf5-f4c0d0f4b9ee

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • Trigger review
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

Share

@github-actions

github-actions Bot commented Nov 17, 2026 •

Copy link
Copy Markdown
Contributor

Risk score: Very high (4/4)

Assessed at cb0d1f2 from the changed files and the title, by scripts/risk-score. A new push replaces this score.

  • On merge: ships @evlog/cli (minor) and evlog (minor) in the next release; deploys Evi, the telemetry dashboard and the docs and sites; changes CI workflows
  • Evi agent: Access: changes who Evi trusts or which credentials it holds: connections/vercel.ts; External writes: changes how Evi writes to GitHub, Linear or Slack: extensions/github.ts, github/outbou…
  • evlog core: Privacy: touches headers, error serialization, audit or ingest code: src/audit.ts; Privacy: touches redaction: src/redact.ts; Performance: changes the per-event hot path: src/logger.ts, s…
  • 121 files changed (6811 lines), 28 of them tests
Area Level Why
Evi agent Very high Access: changes who Evi trusts or which credentials it holds: connections/vercel.ts; External writes: changes how Evi writes to GitHub, Linear or Slack: extensions/github.ts, github/outbound.ts; Spen…
evlog core High Privacy: touches headers, error serialization, audit or ingest code: src/audit.ts; Privacy: touches redaction: src/redact.ts; Performance: changes the per-event hot path: src/logger.ts, src/redact.ts…
evlog integrations Typical Compatibility: a changeset declares a minor bump (new public behavior); Behavior: changes a framework integration: next/handler.ts, next/instrumentation-create.ts, next/stream.ts and 2 more; Tests on…
@evlog/cli Typical Compatibility: moves runtime dependency ranges: cli/package.json; Compatibility: a changeset declares a minor bump (new public behavior); Behavior: changes shipped source: bin/evlog.mjs, src/cli.ts,…
Telemetry dashboard Typical Deploy: changes dependencies or deploy config: telemetry/package.json
Docs and sites Typical Deploy: changes site server code or deploy config: docs/package.json, just-use-evlog/package.json, lab/package.json; Changes pages, content or published skills: 2.learn/5.sampling.md, 3.cli/0.overvie…
CI and release Typical Release: moves pinned action or tool versions in CI: workflows/autofix.yml, workflows/ci.yml, workflows/dependency-review.yml and 5 more; Release: changes CI steps: workflows/neon-preview-cleanup.yml…
Other Typical Also touches Dependencies, @evlog/signals, @evlog/nuxthub and Examples and repository

@github-actions

Copy link
Copy Markdown
Contributor

Thank you for following the naming conventions! 🙏

@pkg-pr-new

pkg-pr-new Bot commented Nov 17, 2026 •

Copy link
Copy Markdown
@evlog/cli

npm i https://pkg.pr.new/@evlog/cli@1120

evlog

npm i https://pkg.pr.new/evlog@1120

@evlog/nuxthub

npm i https://pkg.pr.new/@evlog/nuxthub@1120

@evlog/signals

npm i https://pkg.pr.new/@evlog/signals@1120

@evlog/telemetry

npm i https://pkg.pr.new/@evlog/telemetry@1120

commit: cb0d1f2

…-1101

# Conflicts:
#	packages/evlog/bench/baseline/size-budget.json

This branch was successfully deployed

6 active deployments
Preview – evlog-docs — cb0d1f27 Deployed Nov 17, 2026 by vercel[bot]
Preview – just-use-evlog — cb0d1f27 Deployed Nov 17, 2026 by vercel[bot]
Preview – evlog-render-lab — cb0d1f27 Deployed Nov 17, 2026 by vercel[bot]
npm-publish — cb0d1f27 Deployed Nov 17, 2026 by HugoRCD via release #974
Preview – evlog-telemetry — cb0d1f27 Deployed Nov 17, 2026 by vercel[bot]
Preview – evi — cb0d1f27 Deployed Nov 17, 2026 by vercel[bot]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants