Skip to content

trunk-merge/pr-124242/59a7639d-a89f-4e68-b3f4-4a7b9bee162a - #124261

Closed
trunk-io[bot] wants to merge 184 commits into
masterfrom
trunk-merge/pr-124242/59a7639d-a89f-4e68-b3f4-4a7b9bee162a
Closed

trunk-io[bot] wants to merge 184 commits into
masterfrom
trunk-merge/pr-124242/59a7639d-a89f-4e68-b3f4-4a7b9bee162a

Conversation

@trunk-io

@trunk-io trunk-io Bot commented Oct 27, 2026

Copy link
Copy Markdown
Trunk Merge Pull Request Banner

This pull request was created and is being managed by Trunk Merge.

This pull request is based on the master branch at SHA a9bd34eb85f250b6177985a66954feffacc67b93.

See more details about each PR in the batch here:

When CI completes, this pull request will be closed automatically.

Pull Requests Being Tested

This pull request is testing a batch with the changes from pull requests 124242, 123868, and 100947 - batching documentation.

Dependencies

This pull request depends on the changes from pull requests 124184, 123419, 124218, 124125, 122639, 123708, 122978, 124226, 121966, 123512, 121720, 123456, 124023, 123983, 124039, 124042, 124157, 123897, 123927, 124204, 124198, 123698, 123963, 124028, 122437, 124241, 123938, 123999, and 123250.

dmarchuk and others added 30 commits October 21, 2026 23:31
Include and exclude on a custom column cell used the column's label as the
filter key. Once a column was renamed, that key named no attribute, so
exclude removed no rows and include returned no logs.

customColumnFilterTarget now reads the key and type from the column
expression: the attributes. and resource_attributes. shorthands, the
"Add as column" lookup expression, and a bare service_name column. Other
HogQL keeps the label, as before. The popover's add/remove column toggle
still keys on the label.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
4 updated
Run: 42023344-91b7-4f07-b684-5ae8fad7ec9d

Co-authored-by: lricoy <2034367+lricoy@users.noreply.github.com>
Staff tier sets, pin toggles, admin recomputes, suspension tier drops, the daily sweep, and the backfill now each write an email_sending_tier_changed row on the Team scope, with before/after values and the decision reason. Staff changes carry the acting user; the sweep and the backfill carry a Trigger naming the job. The rows are staff-only, like suspension rows, so the acting staff user does not reach the org activity log or customer destinations.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Staff tier saves now record reason staff_set, so every row says how the tier
moved. The describer reads it to say "set" for a staff save and "moved" for
a computed change, and drops the reason for staff saves. A held sweep decision
is asserted to write no row.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The sweep task now passes its own trigger instead of the service guessing
it from a missing user. Staff paths reuse the team they already load and
resolve the acting user once, only when a row is written.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2 updated
Run: 84cd4ff0-f6b0-4106-a717-ebb59d363e55

Co-authored-by: lricoy <2034367+lricoy@users.noreply.github.com>
# Conflicts:
#	products/aeo/mcp/tools.yaml
#	products/web_analytics/frontend/contentAutopilot/ContentAutopilot.stories.tsx
#	services/mcp/src/tools/generated/aeo.ts
# Conflicts:
#	products/aeo/mcp/tools.yaml
#	products/web_analytics/frontend/contentAutopilot/ContentAutopilot.stories.tsx
#	services/mcp/src/tools/generated/aeo.ts
trunk-io Bot added 28 commits October 27, 2026 17:22
@trunk-io trunk-io Bot closed this Oct 27, 2026
@trunk-io
trunk-io Bot deleted the trunk-merge/pr-124242/59a7639d-a89f-4e68-b3f4-4a7b9bee162a branch October 27, 2026 17:30
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.