fix(model): restore session_id in _SDK_ONLY_PARAMS dropped by merge - #1020
Merged
Conversation
Commit 9acccf4 (#1013) added session_id to Model._SDK_ONLY_PARAMS so it never leaks into build_run_payload / build_run_url output, but the merge of branch 'test' into development (dc8c4c2) resolved that hunk in favor of the older frozenset, dropping the entry while keeping the feature's tests and comments. Restore it to fix test_session_id_excluded_from_build_run_payload on main and development.
hadi-aix
approved these changes
Jul 31, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
"session_id"inModel._SDK_ONLY_PARAMS, which was accidentally dropped by a merge-conflict resolution, breakingpre-commit run --all-filesonmain(1 unit test failure).Root cause
9acccf46, ENG-3473) addedsession_idtoModel._SDK_ONLY_PARAMSso it is emitted only as thex-session-idheader and never leaks intobuild_run_payload/build_run_urloutput.testintodevelopment(dc8c4c2f) resolved the frozenset conflict in favor of the older one-linetest-branch version, silently dropping thesession_identry while keeping the feature's tests and comments. A mechanical re-run of that merge confirms this was the only hunk resolved against the dev side — no other regressions.mainvia Merge to production 20260730 #1016.Impact is limited to direct
build_run_payload(...)/build_run_url(...)calls: therun()path still stripssession_idvia_RUN_CONTROL_KEYS.Same fix, same commit cherry-picked:
developmentalready has it (9cba90d3),testPR opened separately.Test plan
tests/unit/v2/test_model.py::TestModelSessionHeader::test_session_id_excluded_from_build_run_payloadpasses (was failing)🤖 Generated with Claude Code