Skip to content

chore: merge main into v3 - #1185

Merged
HugoRCD merged 15 commits into
v3from
chore/sync-main-into-v3-2.37
Nov 21, 2026
Merged

HugoRCD merged 15 commits into
v3from
chore/sync-main-into-v3-2.37

Conversation

@HugoRCD

@HugoRCD HugoRCD commented Nov 21, 2026 •

Copy link
Copy Markdown
Member

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

Brings the 14 commits on main that v3 doesn't have into v3: the @evlog/signals 0.3 work (#1170, #1171, #1173, #1174, #1177), evlog logs --ask (#1172), OTLP partialSuccess (#1162), the shutdown flush for drain pipelines (#1165), log.discard() and emit: 'onError' (#1176), three Evi changes (#1167, #1180, #1183) and two repo-guidance commits (#1164, #1175). Like #1163, this lands by fast-forwarding v3 to this branch's head, not by a squash, so main stays an ancestor of v3.

To check that after the fast-forward:

git fetch origin && git merge-base --is-ancestor origin/main origin/v3 && echo synced

To try the one combination neither branch had, --ask on Vercel logs, install this PR's CLI with the two packages --ask loads from beside it, then run it in a Vercel-linked project:

pnpm add -D https://pkg.pr.new/@evlog/cli@1185 https://pkg.pr.new/@evlog/signals@1185 'ai@^7.0.130'
pnpm evlog logs --source vercel --ask 'The customer tried to pay but did not end up with a confirmed order' --dry-run

How the conflicts were resolved

  • Peer ranges: @evlog/signals takes main's ai >=7.0.130 and keeps evlog ^3.0.0-beta.0. @evlog/cli keeps v3's evlog peer (main never changed it) and adds main's optional peers, with the signals range widened so it accepts v3's own 1.0.0-beta.0, which >=0.2.0 alone rejects:

    +    "@evlog/signals": ">=0.2.0 || >=1.0.0-beta.0",
    +    "ai": ">=7.0.130 <8.0.0",
         "evlog": "^2.31.0 || >=3.0.0-beta.0"
  • evlog logs (feat(cli): rank logs by a question with evlog logs --ask #1172 against v3's Vercel source, sessions view and --expect): both sets of features are kept. The --ask step now runs on the Vercel read as well as on files and URLs, and --ask is refused on the sessions view as it already was on stats. Exit codes go through v3's isUsageError, with LOGS_ASK_UNSUPPORTED added to the usage set, which gives main's exit codes. --json carries coverage and notes, then sessions, stats, estimate, answers or events. The CLI docs page and the analyze-logs skill describe both.

  • nitro-v3 plugin: keeps v3's request-logger resolver and main's close hook that flushes pending drains.

  • OTLP: main's partialSuccess readers go on top of v3's compact OTLP defaults.

  • Small ones: the fastify test imports are merged, and Evi's set-vercel-env keeps v3's comment, which also mentions the logs tool.

apps/docs/content/7.reference/9.migrate-v3.md is unchanged, and .changeset/v3-removal-warnings.md stays deleted. #1145's three changesets stay, because 2.37.0 (#1157) isn't on npm yet; the first sync after it ships should delete them, and the same goes for this sync's otlp-partial-success, drain-shutdown-flush and quiet-units-discard if beta releases consume them first. The lockfile is regenerated from v3's copy and only adds the CLI's two new dev dependencies.

packages/cli/test/logs.vercel.test.ts gets one test for the new combination, --ask --dry-run on --source vercel and the refusal on the sessions view. With the ask call removed from the Vercel path it failed (1 failed, 42 passed); with it, 43 passed.

Bundle-size budget

No raise this time. Output of pnpm --filter evlog run size:budget at this branch's head:

| axiom | 33710 | 13702 | 13750 | -733 (-5.1%) | 8051 |
| basic | 27065 | 11137 | 11300 | -768 (-6.5%) | 8051 |
| create-logger | 31724 | 12646 | 12700 | -604 (-4.6%) | 8051 |
| hono | 39767 | 15517 | 15550 | -520 (-3.2%) | 8051 |
| unpacked tarball | | 911840 | 952000 | +3392 (+0.4%) | |

create-logger and hono are within 60 bytes of their budgets now, so the next sync may need a raise.

Not run: e2e (it runs on the push to v3) and the Evi evals. Evi's changes here come from main, where they already merged.

ELI5

Several changes landed on the 2.x branch, so this copies them into the 3.0 branch. Where both branches changed the same evlog logs command, it keeps both sets of features, and one new combination (asking a question about Vercel logs) gets a test.

HugoRCD and others added 15 commits November 20, 2026 18:14
…and reply in the asker's language (#1167)

Co-authored-by: linear-code[bot] <222613912+linear-code[bot]@users.noreply.github.com>
Co-authored-by: evlogai[bot] <313167257+evlogai[bot]@users.noreply.github.com>
Co-authored-by: Hugo Richard <hrichard206@gmail.com>
…v3-2.37

Amp-Thread-ID: https://ampcode.com/threads/T-01a1fb0e-3558-77b8-88e4-7c86b981cf59

# Conflicts:
#	apps/docs/content/3.cli/10.logs.md
#	apps/evi/agent/tools/set-vercel-env.ts
#	packages/cli/package.json
#	packages/cli/src/commands/logs.ts
#	packages/cli/src/lib/errors.ts
#	packages/cli/src/lib/logs/render.ts
#	packages/evlog/src/adapters/otlp.ts
#	packages/evlog/src/nitro-v3/plugin.ts
#	packages/evlog/test/frameworks/fastify.test.ts
#	packages/signals/package.json
#	skills/analyze-logs/SKILL.md
@vercel

vercel Bot commented Nov 21, 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 21, 2026 9:36am UTC
evlog-docs Ready Ready Preview, v0 Nov 21, 2026 9:36am UTC
evlog-render-lab Ready Ready Preview Nov 21, 2026 9:36am UTC
evlog-telemetry Ready Ready Preview Nov 21, 2026 9:36am UTC
1 Skipped Deployment
Project Deployment Actions Updated
just-use-evlog Ignored Ignored Nov 21, 2026 9:36am UTC

Request Review

@coderabbitai

coderabbitai Bot commented Nov 21, 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: c6091ec8-122f-4d41-8eec-35a881b8f365

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

Copy link
Copy Markdown
Contributor

Thank you for following the naming conventions! 🙏

@github-actions

Copy link
Copy Markdown
Contributor

Risk score: Very high (4/4)

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

  • On merge: ships @evlog/cli (minor), evlog (minor) and @evlog/signals (minor) in the next release; deploys Evi, the telemetry dashboard and the docs and sites
  • Evi agent: Access: changes who Evi trusts or which credentials it holds: connections/linear.ts, lib/maintainer-auth.ts, lib/trust.ts; External writes: changes how Evi writes to GitHub, Linear or Slac…
  • Telemetry dashboard: Access: changes dashboard login, sessions or MCP access: utils/allowed-tools.ts
  • evlog adapters: Delivery: changes what an adapter sends to its provider, and how: adapters/otlp-response.ts, adapters/otlp.ts; Compatibility: a changeset declares a minor bump (new public behavior)
  • evlog core: Performance: changes the per-event hot path: src/logger.ts, src/pipeline.ts; Delivery: changes how events are batched, retried or sent to drains: src/pipeline.ts, shared/http.ts; Compatib…
  • @evlog/cli: Compatibility: changes peer dependency ranges or engines: cli/package.json; Compatibility: a changeset declares a minor bump (new public behavior); Behavior: changes shipped source: comma…
  • @evlog/signals: Spend: changes how often signals call the model: src/budget.ts, src/evaluate.ts; Compatibility: changes peer dependency ranges or engines: signals/package.json; Compatibility: a chang…
  • 122 files changed (3876 lines), 27 of them tests
Area Level Why
Evi agent Very high Access: changes who Evi trusts or which credentials it holds: connections/linear.ts, lib/maintainer-auth.ts, lib/trust.ts; External writes: changes how Evi writes to GitHub, Linear or Slack: channels…
Telemetry dashboard Very high Access: changes dashboard login, sessions or MCP access: utils/allowed-tools.ts
evlog adapters High Delivery: changes what an adapter sends to its provider, and how: adapters/otlp-response.ts, adapters/otlp.ts; Compatibility: a changeset declares a minor bump (new public behavior); Tests only: adap…
evlog core High Performance: changes the per-event hot path: src/logger.ts, src/pipeline.ts; Delivery: changes how events are batched, retried or sent to drains: src/pipeline.ts, shared/http.ts; Compatibility: a cha…
@evlog/cli High Compatibility: changes peer dependency ranges or engines: cli/package.json; Compatibility: a changeset declares a minor bump (new public behavior); Behavior: changes shipped source: commands/logs.ts,…
@evlog/signals High Spend: changes how often signals call the model: src/budget.ts, src/evaluate.ts; Compatibility: changes peer dependency ranges or engines: signals/package.json; Compatibility: a changeset declares a…
evlog integrations Typical Compatibility: a changeset declares a minor bump (new public behavior); Behavior: changes a framework integration: effect/withLogger.ts, fastify/index.ts, nestjs/index.ts and 2 more; Tests only: effe…
Other Typical Also touches CI and release, Dependencies, Docs and sites and Examples and repository

@pkg-pr-new

pkg-pr-new Bot commented Nov 21, 2026

Copy link
Copy Markdown
@evlog/cli

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

@evlog/eve

npm i https://pkg.pr.new/@evlog/eve@1185

evlog

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

@evlog/nuxthub

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

@evlog/signals

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

@evlog/telemetry

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

commit: 987f43a

@HugoRCD
HugoRCD merged commit 987f43a into v3 Nov 21, 2026
30 checks passed
@HugoRCD
HugoRCD deployed to npm-publish November 21, 2026 09:54 — with GitHub Actions Active
@HugoRCD
HugoRCD deleted the chore/sync-main-into-v3-2.37 branch November 21, 2026 09:54

This branch was successfully deployed

5 active deployments
npm-publish — 987f43a7 Deployed Nov 21, 2026 by HugoRCD via release #1037
Preview – evlog-docs — 987f43a7 Deployed Nov 21, 2026 by vercel[bot]
Preview – evi — 987f43a7 Deployed Nov 21, 2026 by vercel[bot]
Preview – evlog-telemetry — 987f43a7 Deployed Nov 21, 2026 by vercel[bot]
Preview – evlog-render-lab — 987f43a7 Deployed Nov 21, 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.

2 participants