integration: batch-merge V1 PRs #12 #13 #14 #15 #16 (conflicts resolved) - #17
Closed
ranxianglei wants to merge 11 commits into
Closed
integration: batch-merge V1 PRs #12 #13 #14 #15 #16 (conflicts resolved)#17ranxianglei wants to merge 11 commits into
ranxianglei wants to merge 11 commits into
Conversation
Owner
Author
|
Closing as superseded. This was a batch-integration branch for the five 5258MF V1 PRs (#12–#16) with their inter-PR conflicts pre-resolved. The maintainer instead merged #12/#14/#15/#16 individually, and #13's conflicts were resolved directly on its own branch (all five are now in |
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.
What
Batch integration of the five open 5258MF V1 PRs onto current
master, with their two inter-PR conflicts pre-resolved so the whole set lands in one mergeable unit.Includes (merge order used):
Conflicts resolved
packages/billion-context-opencode/src/messages-v1.ts(fix(v1): preserve truncated tool result bodies #13 vs feat(v1): prefer reported usage for nudge calculations #15): kept the richerstate.metadatatype ({ interrupted?: boolean; output?: unknown; [key: string]: unknown }); fix(v1): preserve truncated tool result bodies #13'sapplyToolBodyreadsmetadata.interrupted/metadata.outputagainst it cleanly.packages/billion-context-opencode/tests/messages.test.ts(fix(v1): normalize ref tag placement #12 vs fix(v1): preserve truncated tool result bodies #13): both test sets are independent additions at the same anchor → kept the union (4 tests from fix(v1): normalize ref tag placement #12 + 4 tests from fix(v1): preserve truncated tool result bodies #13).trimEndhelper (both fix(v1): normalize ref tag placement #12 and fix(v1): preserve truncated tool result bodies #13 independently added the identical one-line helper).Verification (on this branch)
npm run typecheck— pass (both workspaces)npm test— 50/50 passnpm run build— pass (676 KB bundle)node smoke.mjs— ALL TESTS PASSEDScope / notes
@bili/core+ smoke/devlog. Does not touch V2 (packages/v2/v2) — V2 PRs Add OpenCode V2 adapter (v2/) on acp-kernel #4 and fix(v2): register tools with the opencode2 API shape #8 are orthogonal and remain open/blocked.compressin its rules while the plugin registersbili_compress— left unchanged; to be addressed separately.