sync: merge usnavy13/main (4 commits, storage_session_id contract alignment)#6
Merged
Conversation
docs: Add Star History section to README.md
Updated the API responses and models to replace all instances of session_id with storage_session_id for consistency. This change includes updates to the upload, list, and batch file operations, as well as adjustments in the corresponding tests and documentation to reflect the new naming convention.
…support Updated the upload_files_batch and list_files functions to include support for resource kind and version parameters. The upload logic now marks files as agent files based on the kind provided. Additionally, the RequestFile and FileRef models have been updated to accept resource_id, kind, and version fields, with corresponding tests added to validate these changes.
fix: Align API contract with LibreChat client (storage_session_id, kind, resource fields)
fix: Align API contract with LibreChat client (storage_session_id, kind, resource fields)
Merged
5 tasks
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
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
Sync
On-Behalf-AI/LibreCodeInterpreter:mainwith upstreamusnavy13/LibreCodeInterpreter:main(4 commits behind before this PR). Brings in the contract alignment with LibreChat dev (post-2026-05-12) so the code-interpreter stops 422-ing on every /exec call from LibreChat dev.Notable upstream changes pulled
170194fMerge PR fix: Align API contract with LibreChat client (storage_session_id, kind, resource fields) usnavy13/LibreCodeInterpreter#109 —fix-contract-gaps: the bulk of the contract alignment.7567f3efeat: Enhance file upload and listing with resource kind and version support — addskind/id/versionform fields on /upload, makes them queryable onGET /files/{session_id}.16bb6b6refactor: Renamesession_idtostorage_session_idacross API and models — the big rename. Adds thestorage_session_idalias onFileRef,RequestFile, andPTCFileInput. Replaces our locally-WIPAliasChoicespatch with a more thorough refactor.c34a123Merge PR fix: Align API contract with LibreChat client (storage_session_id, kind, resource fields) usnavy13/LibreCodeInterpreter#110 — promotes dev to main on usnavy13, includes the test suite alignment (505 unit + 239 integration + 86 functional, per fix: Align API contract with LibreChat client (storage_session_id, kind, resource fields) usnavy13/LibreCodeInterpreter#110's body).Conflicts
None.
git merge upstream/mainran clean — main local (which hadn't touchedsrc/api/files.py/src/models/exec.pysince 2026-05-08) absorbed the 4 upstream commits as a pure merge.Stats
ed5e339Context — superseded local WIP
We had started writing our own compat patch on
fix/librechat-dev-2026-05-12-compat(4 commits, 13 integration tests) before realizing PR usnavy13#110 had been merged upstream 30 min earlier covering the same ground (plusPTCFileInput,FileRef, and theGET /filesquery params — wider scope than what we'd written). That local branch is abandoned in favour of this sync. See SECURITY-OPERATIONS.md (entry to add) for the timeline.Test plan
git merge upstream/mainclean, no conflicts.gitleaks.toml, CI nightly schedule history): all 3 custom commits still present in historyOn-Behalf-AI/main→feat/agent-skills-runtime(conflicts expected on the same files we touched in the abandoned WIP branch)🤖 Generated with Claude Code
via Happy