Skip to content

integration: batch-merge V1 PRs #12 #13 #14 #15 #16 (conflicts resolved) - #17

Closed
ranxianglei wants to merge 11 commits into
masterfrom
integration/v1-batch
Closed

integration: batch-merge V1 PRs #12 #13 #14 #15 #16 (conflicts resolved)#17
ranxianglei wants to merge 11 commits into
masterfrom
integration/v1-batch

Conversation

@ranxianglei

Copy link
Copy Markdown
Owner

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):

  1. fix: align system prompt with PI rules #14 — align system prompt with PI rules
  2. test: repair root smoke harness #16 — repair root smoke harness
  3. fix(v1): normalize ref tag placement #12 — normalize V1 ref tag placement
  4. feat(v1): prefer reported usage for nudge calculations #15 — prefer reported usage for nudge
  5. fix(v1): preserve truncated tool result bodies #13 — preserve truncated V1 tool result bodies (both conflicts surface here)

Conflicts resolved

Verification (on this branch)

  • npm run typecheck — pass (both workspaces)
  • npm test50/50 pass
  • npm run build — pass (676 KB bundle)
  • node smoke.mjs — ALL TESTS PASSED

Scope / notes

@ranxianglei

Copy link
Copy Markdown
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 master), so this integration branch is no longer needed.

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.

3 participants