Skip to content

[Promote][csp #1] fix(csp): allow the private S3 bucket origin in connect-src (uploads died on CSP-serving domains) (#322) - #324

Merged
lopugit merged 3 commits into
mainfrom
promote/pr-322-csp-allow-s3-uploads--to-main
Aug 20, 2026
Merged

[Promote][csp #1] fix(csp): allow the private S3 bucket origin in connect-src (uploads died on CSP-serving domains) (#322)#324
lopugit merged 3 commits into
mainfrom
promote/pr-322-csp-allow-s3-uploads--to-main

Conversation

@lopugit

@lopugit lopugit commented Aug 19, 2026

Copy link
Copy Markdown
Owner

Automated promotion of #322 from develop to main, opened by the Promote features to main workflow for release review.

Source

Source PR #322 — fix(csp): allow the private S3 bucket origin in connect-src (uploads died on CSP-serving domains)
Author @lopugit
Merged into develop 2026-08-19T06:11:22Z
Merge commit c73565d43be071df457899dff4dd87581c81a329
Head branch claude/csp-allow-s3-uploads

How to review

  • This PR re-applies the source PR's exact changes onto main
    (git cherry-pick -x; each commit message references the original SHA).
  • Merge it normally to release the change to main
    the Sync main into develop workflow keeps develop aligned afterwards.
  • Close it (without merging) to keep the change out of main;
    the workflow never recreates a closed promotion (reopen it to change your mind).
  • Prefer shipping everything at once? Merge the standing omnibus
    Promote develop to main PR instead — this PR's diff then becomes
    empty and the workflow closes it automatically.

Automatic conflict-resolution review

  • The exact source patch conflicted with main, so the trusted AI
    promotion resolver produced this branch automatically instead of leaving manual commands.
  • Its write scope was limited to non-Graphify paths already changed by the source PR;
    Graphify output was handled as derived data, and unresolved conflict markers were rejected.
  • A github-actions[bot] comment on source PR fix(csp): allow the private S3 bucket origin in connect-src (uploads died on CSP-serving domains) #322 attests the exact
    base, source endpoints, reservation commit, final head, plan hash, and resolver run.
  • Please review the resolved diff before merging; no manual branch repair is required.

🤖 Generated by the promote-features-to-main workflow.

Thingtime-Promotion-Reservation: v1
Thingtime-Promotion-Source-PR: 322
Thingtime-Promotion-Base-Ref: main
Thingtime-Promotion-Base-SHA: 440c30d
Thingtime-Promotion-Branch: promote/pr-322-csp-allow-s3-uploads--to-main
Thingtime-Promotion-Source-Start-SHA: dfca890
Thingtime-Promotion-Source-End-SHA: c73565d
Thingtime-Promotion-Source-Lineage: verified
Thingtime-Promotion-Plan-Hash: 8cc9adfd69e3162cf56abae635a546219281ef65db7fcd93f8caa0d340682f64
Thingtime-Promotion-Source-PR: 322

Thingtime-Promotion-Base-Ref: main

Thingtime-Promotion-Base-SHA: 440c30d

Thingtime-Promotion-Branch: promote/pr-322-csp-allow-s3-uploads--to-main

Thingtime-Promotion-Source-Tip-SHA: c73565d

Thingtime-Promotion-Source-Start-SHA: dfca890

Thingtime-Promotion-Source-End-SHA: c73565d

Thingtime-Promotion-Source-Lineage: verified

Thingtime-Promotion-Plan-Hash: 8cc9adfd69e3162cf56abae635a546219281ef65db7fcd93f8caa0d340682f64

Thingtime-Promotion-Patch-ID: 6794355390a1e7988f5dbd1024e5104817f044ac

Resolved by the promotion worker: https://github.com/lopugit/thingtime/actions/runs/32222553788
graphify extract with semantic claude-cli backend; unchanged content reused the tracked cache

Thingtime-Promotion-Plan-Hash: 8cc9adfd69e3162cf56abae635a546219281ef65db7fcd93f8caa0d340682f64

Refreshed by the promotion conflict worker: https://github.com/lopugit/thingtime/actions/runs/32222553788
@vercel

vercel Bot commented Aug 19, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
thingtime Ready Ready Preview Aug 19, 2026 6:26am

Request Review

@github-actions github-actions Bot added promotion Automated develop → main promotion PR ai-conflict-resolved Promotion conflict resolved by the isolated AI worker review-ai-resolution Review the AI-resolved promotion conflict paths labels Aug 19, 2026
@github-actions

Copy link
Copy Markdown
Contributor

🤖 Automatic promotion conflict resolution completed.

Source PR: #322 · plan: 8cc9adfd69e3162cf56abae635a546219281ef65db7fcd93f8caa0d340682f64 · workflow run

Base: main at 440c30d738a0da37cd21d3f65aa057489f58f41d

Reservation: febdd96caad6d5d191d5672b9320da06cddb25e8 · verified head: af38cca7aa168e5a890d977bc29bf926019444df

Please manually review the paths the isolated AI resolved:

  • remix/CHANGELOG.md

Delete-shaped conflicts were resolved deterministically toward the source patch (no model involved — a deletion has no merged text to arbitrate):

  • remix/scripts/csp.mjs

Model waterfall: --model claude-opus-5 --fallback-model claude-fable-5,default · Graphify refresh: true (semantic: claude-cli).

@lopugit
lopugit merged commit 0747e13 into main Aug 20, 2026
27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ai-conflict-resolved Promotion conflict resolved by the isolated AI worker promotion Automated develop → main promotion PR review-ai-resolution Review the AI-resolved promotion conflict paths

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant