Skip to content

Sync staging after v2.1.1 release - #3367

Merged
SpicyMarinara merged 3 commits into
stagingfrom
main
Jul 8, 2026
Merged

Sync staging after v2.1.1 release#3367
SpicyMarinara merged 3 commits into
stagingfrom
main

Conversation

@SpicyMarinara

Copy link
Copy Markdown
Collaborator

Why

The v2.1.1 release PR merged staging into main, but main already contained one prose-guardian settings change that was not present on staging. Syncing it back keeps staging aligned with the released code and makes the staging Docker tag represent the same release surface.

No linked issue; this is release branch hygiene after publishing the main release PR.

What changed

  • Brings packages/server/src/services/generation/prose-guardian-settings.ts from main back to staging.

Validation

Manual verification still needed

  • Manually verify the refreshed staging Docker workflow completes after merge.

abhi-0203 and others added 3 commits July 8, 2026 04:42
…rompt

When multiple rewrite agents are merged, the buildMergedRewritePrompt
function now includes Prose Guardian's settings-based rules (banned,
avoid, prefer) in the merged prompt. Previously, only promptTemplate
was included, which is empty by design for Prose Guardian.

This ensures Prose Guardian continues to enforce its rules when merged
with other rewrite agents like Continuity Checker or Immersive HTML.

Closes #3352
…ettings-rules

fix: preserve Prose Guardian settings-based rules in merged rewrite prompt
@coderabbitai

coderabbitai Bot commented Jul 8, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: dc6a582d-21a1-4a98-993f-a50e303705c5

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch main

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions github-actions Bot added the server label Jul 8, 2026
@SpicyMarinara
SpicyMarinara merged commit dda81d3 into staging Jul 8, 2026
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants