Backmerge/main into develop 1.18.0 - #984
Merged
Merged
Conversation
Artifacts become a first-class, shareable user asset; the platform gains a way
to tell users what shipped; and a follow-up typed mid-turn no longer has to
interrupt the turn it was meant to influence.
- Artifact library at /artifacts with live grid previews, rename, delete and an
in-app viewer — zero new tables and zero new indexes
- Artifact sharing with named recipients or the whole tenant, revocable, with a
session-delete cascade; sharing a conversation now shares its artifacts
- "Shared with you" inbox behind CDK_ARTIFACT_SHARE_INBOX_ENABLED (enabled on
production for this release); fan-out rows write unconditionally, so no backfill
- Feature announcements: admin CRUD with a full lifecycle, role targeting,
per-user acks, What's New panel, banner, modal and reach stats
- Mid-turn steering — a follow-up injected at the next tool boundary,
append-only against the cached prefix
- Single-file SPA rebranding via brand.config.ts
- GPT-5.6 Sol/Terra/Luna curated with corrected rates; explicit cache
breakpoints measured 57% more expensive and ship off
- 47 Dependabot alerts and 40 CodeQL findings closed, plus a critical
py/partial-ssrf in the fine-tuning HuggingFace pre-flight
Requires a CDK deploy: new {prefix}-announcements table (no GSIs), its IAM
grants, and bedrock:CallWithBearerToken on the inference-api role. No GSI
operations on any existing table.
…evelop-1.18.0 # Conflicts: # backend/src/apis/app_api/fine_tuning/routes.py # backend/tests/fine_tuning/test_job_guards.py
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
1 participant
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.
Reconciles
mainback intodevelopafter the 1.18.0 squash-merge (#983,12b6eb2d).What it carries
VERSION1.17.0 → 1.18.0 and every manifest + lockfile the sync touchedCHANGELOG.md/RELEASE_NOTES.md/README.mdfor 1.18.0py/partial-ssrffix infine_tuning/routes.py— this one landed on the release branch and has never been ondevelop, so it is real code coming back, not a release artifactConflict resolution
Two conflicts, and neither was the usual release-artifact set:
backend/src/apis/app_api/fine_tuning/routes.py(content)backend/tests/fine_tuning/test_job_guards.py(add/add — the file postdates the last backmerge point, so both sides "added" it)Both resolved in main's favor, which is lossless here:
develophas moved zero commits sincerelease/1.18.0was cut, somainis exactlydevelop's content plus the version bump, the docs, and the SSRF fix.Verified rather than assumed:
git diff origin/mainon the resolved tree is empty — the tree is byte-identical tomainvalidate_huggingface_model_idis present (the fix survived)developwas dropped)sync-version.sh --check→ PASSgit merge-base --is-ancestor origin/main HEAD→ succeeds🤖 Generated with Claude Code