Skip to content

Backmerge main into develop (1.16.0) - #897

Merged
philmerrell merged 2 commits into
developfrom
backmerge/main-into-develop-1.16.0
Aug 28, 2026
Merged

Backmerge main into develop (1.16.0)#897
philmerrell merged 2 commits into
developfrom
backmerge/main-into-develop-1.16.0

Conversation

@philmerrell

Copy link
Copy Markdown
Contributor

Reconciles develop with main after the 1.16.0 squash-merge (#896).

Clean auto-merge — no conflicts. Only the 13 release-artifact files change; no feature code is touched, because develop already carried all of it.

  • VERSION 1.16.0, sync-version.sh --check PASS
  • CHANGELOG.md and RELEASE_NOTES.md both lead with 1.16.0 above untouched previous entries
  • git merge-base --is-ancestor origin/main HEAD passes

⚠️ Merge with a MERGE COMMIT, not a squash

The whole point is to make main a genuine ancestor of develop. Squashing recreates the divergence and the release-artifact conflicts come back next release.

(Feature branches into develop squash as usual — the backmerge is the deliberate exception.)

Minor release on knowledge bases, marketplace governance, and fine-tuning.

- Bedrock Managed Knowledge Base migration lands inert behind nine CDK_MANAGED_KB_* flags (all explicitly false in prod). Adds a Bedrock service role, four Lambdas on one image, a report-only reconciler, four alarms, and the sparse KbWorkIndex GSI.
- Marketplace admins can read, test-drive and decline a submission; new terminal 'rejected' listing state.
- Fine-tuning wiring restored (FINE_TUNING_ENABLED was never set on the container); access stays whitelist-only at quota 0. Three billing/format bugs fixed.
- Live RAG, ungated: queries clamp at 10,000 chars, document-status filter fails CLOSED.
- Chat: arrow keys walk the @-mention menu; mentions render as an address.
- RBAC: JWT role mappings accept IdP group names containing spaces.
@philmerrell
philmerrell merged commit 6a7a6c0 into develop Aug 28, 2026
4 checks passed
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.

1 participant