Skip to content

chore: sync main into v1 (7.83.0–7.83.1, flags v4) - #1175

Merged
eli-r-ph merged 7 commits into
v1from
eli/v1-sync-main-7.83
Nov 4, 2026
Merged

eli-r-ph merged 7 commits into
v1from
eli/v1-sync-main-7.83

Conversation

@eli-r-ph

@eli-r-ph eli-r-ph commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

💡 Motivation and Context

main shipped 7.83.0 and 7.83.1 after #1174, so 8.0 would keep reading the /flags?v=2 response (#1031) and miss the MCP 2.x context fix (#1166). #1031 is the largest main change since the last sync, so it gets its own PR. Stacked on #1174.

Changes

💚 How did you test it?

📝 Checklist

  • All commits are signed (see Commit signing)
  • I reviewed the submitted code.
  • I added tests to verify the changes.
  • I updated the docs if needed.
  • No breaking change or entry added to the changelog.

If releasing new changes

  • Ran sampo add to generate a changeset file

🤖 Agent context

Autonomy: Human-driven (agent-assisted)

🤖 Generated with Claude Code

@eli-r-ph eli-r-ph self-assigned this Nov 4, 2026
@eli-r-ph
eli-r-ph marked this pull request as ready for review November 4, 2026 01:23
@eli-r-ph
eli-r-ph requested a review from a team as a code owner November 4, 2026 01:23

@turnipdabeets turnipdabeets left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Picks match upstream. In #1031 the only differences are v1's sdk-compliance workflow (harness 1.26.0, which is newer than main's 1.23.0) and flags_response_v4 added to v1's capability list. The parity-test fix is correct: v1 reads self.before_send when the event is sent and adds flag properties inside _enqueue, so reading in before_send compares the real events. Nothing on main up to 7.83.1 was skipped.

Base automatically changed from eli/v1-sync-main-7.82 to v1 November 4, 2026 20:50
andehen and others added 7 commits November 4, 2026 12:50
(cherry picked from commit 43c7545)
(cherry picked from commit 314fad0)
…astmcp (#1166)

* test(mcp): share the dual-major structured content reader

* test(mcp): read structured content without the fastmcp camelcase shim

* fix(mcp): inject context into mcp 2.x tool objects

* ci: run the mcp 2.x suite without fastmcp

(cherry picked from commit 0c12ca1)
(cherry picked from commit 9f5d458)
(cherry picked from commit 06e5611)
v1 passes flag properties to _enqueue separately and layers them while
building the event, so a stubbed _enqueue never saw them. Reading the
built event in before_send compares v1's real output with 7.82.1.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
@eli-r-ph
eli-r-ph force-pushed the eli/v1-sync-main-7.83 branch from 19ef105 to 9f25ef9 Compare November 4, 2026 20:50
@eli-r-ph
eli-r-ph merged commit 0b637fc into v1 Nov 4, 2026
42 checks passed
@eli-r-ph
eli-r-ph deleted the eli/v1-sync-main-7.83 branch November 4, 2026 21:01
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