Merge master into feat/dynamic-model-catalog (fixes #156 conflict) - #157
Merged
CodeWithJuber merged 1 commit intoSep 23, 2026
Merged
Conversation
Resolve the CHANGELOG conflict: keep this branch's Unreleased notes above master's new 1.1.2 section. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SE3k2ZJHjLTtLvfF8kCWW1
CodeWithJuber
marked this pull request as ready for review
September 23, 2026 18:31
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.
Merges
master(v1.1.2) intofeat/dynamic-model-catalogso #156 is mergeable again.Conflict
Only
CHANGELOG.mdconflicted. I kept #156's[Unreleased]notes (Added / Security / Changed) and placed master's new[1.1.2] - 2026-09-22section below them. Every other file merged cleanly.Verification (on the merge result)
npm test: 1426 tests, 1423 pass, 0 fail, 3 skippednpx biome check: 0 errors, 14 warnings (the same count feat(models): tiers name a family, resolved to the newest live model #156 reports)npm run typecheck: 0 errorsnode src/cli.js docs check: passesMerging this adds the merge commit to #156's head branch. It is a fast-forward of
feat/dynamic-model-catalog.🤖 Generated with Claude Code
https://claude.ai/code/session_01SE3k2ZJHjLTtLvfF8kCWW1
Generated by Claude Code