Skip to content

[Promote] Fix develop CI contract drift (#283) - #284

Open
lopugit wants to merge 9 commits into
mainfrom
promote/pr-283-fix-temporary-profile-contract--to-main
Open

[Promote] Fix develop CI contract drift (#283)#284
lopugit wants to merge 9 commits into
mainfrom
promote/pr-283-fix-temporary-profile-contract--to-main

Conversation

@lopugit

@lopugit lopugit commented Aug 17, 2026

Copy link
Copy Markdown
Owner

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

Source
Source PR #283 — Fix develop CI contract drift
Author @lopugit
Merged into develop 2026-08-17T06:50:58Z
Merge commit fcaf557650cacae87cfd7a884c8fd6cd6e3da32a
Head branch codex/fix-temporary-profile-contract

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 develop CI contract drift #283 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.

@github-actions
chore(ci): reserve AI promotion resolution for #283 [skip ci]
b469fcf 
Thingtime-Promotion-Reservation: v1
Thingtime-Promotion-Source-PR: 283
Thingtime-Promotion-Base-Ref: main
Thingtime-Promotion-Base-SHA: bbc868a
Thingtime-Promotion-Branch: promote/pr-283-fix-temporary-profile-contract--to-main
Thingtime-Promotion-Source-Start-SHA: e36c169
Thingtime-Promotion-Source-End-SHA: fcaf557
Thingtime-Promotion-Source-Lineage: verified
Thingtime-Promotion-Plan-Hash: 91f1c18e4fcddfa5395796805be4820540502d8a98eca21f4fd4efaf506cf596
@github-actions
Promote source PR #283 onto main
0b967e0 
Thingtime-Promotion-Source-PR: 283

Thingtime-Promotion-Base-Ref: main

Thingtime-Promotion-Base-SHA: bbc868a

Thingtime-Promotion-Branch: promote/pr-283-fix-temporary-profile-contract--to-main

Thingtime-Promotion-Source-Tip-SHA: fcaf557

Thingtime-Promotion-Source-Start-SHA: e36c169

Thingtime-Promotion-Source-End-SHA: fcaf557

Thingtime-Promotion-Source-Lineage: verified

Thingtime-Promotion-Plan-Hash: 91f1c18e4fcddfa5395796805be4820540502d8a98eca21f4fd4efaf506cf596

Thingtime-Promotion-Patch-ID: 131a6f29de1aaf05539dc02ec8c441e9bb5cfc21

Resolved by the promotion worker: https://github.com/lopugit/thingtime/actions/runs/32003653394
@github-actions
chore: refresh graphify outputs after promotion resolution
41e54b4 
graphify extract with semantic claude-cli backend; unchanged content reused the tracked cache

Thingtime-Promotion-Plan-Hash: 91f1c18e4fcddfa5395796805be4820540502d8a98eca21f4fd4efaf506cf596

Refreshed by the promotion conflict worker: https://github.com/lopugit/thingtime/actions/runs/32003653394
@github-actions github-actions Bot added the promotion Automated develop to main promotion PR label Aug 17, 2026
@github-actions

github-actions Bot commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

🤖 Protected promotion replay completed without an AI edit.

Source PR: #283 · plan: 91f1c18e4fcddfa5395796805be4820540502d8a98eca21f4fd4efaf506cf596 · workflow run

Base: main at bbc868a0149d0d89edcbc76ab86f6aa602ad319d

Reservation: b469fcfc287d2b99eeb11e58fca05001ab0bf584 · verified head: 41e54b4156369d1f20e2f4df08cb9fff89727d1e

The reconstructed synthetic patch replayed cleanly; no model-edited path remained.

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

  • remix/app/api/utils/auth/users.profile.test.ts
  • remix/scripts/vercel-config.test.mjs

No model round ran. Graphify refresh: true (semantic: claude-cli).

@vercel

vercel Bot commented Aug 17, 2026 •
edited
Loading

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 20, 2026 6:00pm

Request Review

@github-actions github-actions Bot mentioned this pull request Aug 17, 2026
Merged
@github-actions

github-actions Bot commented Aug 17, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

⚠️ The resolver stopped in a later safety, verification, or publication step. No residual conflicted paths were confirmed; see the workflow run.

@github-actions

github-actions Bot commented Aug 17, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

🤝 Merged main into promote/pr-283-fix-temporary-profile-contract--to-main — conflicts auto-resolved by the resolve-pr-conflicts workflow.

No AI resolution was needed by merge time; the branch was updated with a plain merge commit.

graphify-out/ was reset wholesale to the main side (repo rule: one side, never mixed — the graph merge driver is unavailable in CI).
Then re-ran graphify on the merged code WITH LLM semantic extraction (graphify extract, claude-cli backend) and committed the result — content new to this merge is semantically indexed; unchanged content came from the tracked cache.

Please review the merge commit before relying on it.

@github-actions
Merge branch 'main' into promote/pr-283-fix-temporary-profile-contrac…
94ff8d4 
…t--to-main

# Conflicts:
#	graphify-out/GRAPH_REPORT.md
#	graphify-out/graph.json
#	graphify-out/manifest.json
@github-actions
chore: refresh graphify outputs after conflict merge
a7fb40e 
`graphify extract` with LLM semantic extraction (graphify 0.9.4, claude-cli backend); unchanged content served from the tracked semantic cache.

Refreshed by the resolve-pr-conflicts workflow: https://github.com/lopugit/thingtime/actions/runs/32010685995
@github-actions

github-actions Bot commented Aug 17, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

🤝 Merged main into promote/pr-283-fix-temporary-profile-contract--to-main — conflicts auto-resolved by the resolve-pr-conflicts workflow.

No AI resolution was needed by merge time; the branch was updated with a plain merge commit.

graphify-out/ was reset wholesale to the main side (repo rule: one side, never mixed — the graph merge driver is unavailable in CI).
Then re-ran graphify on the merged code WITH LLM semantic extraction (graphify extract, claude-cli backend) and committed the result — content new to this merge is semantically indexed; unchanged content came from the tracked cache.

Please review the merge commit before relying on it.

@github-actions
Merge branch 'main' into promote/pr-283-fix-temporary-profile-contrac…
ac397fb 
…t--to-main

# Conflicts:
#	graphify-out/GRAPH_REPORT.md
#	graphify-out/graph.json
#	graphify-out/manifest.json
@github-actions
chore: refresh graphify outputs after conflict merge
5b33633 
`graphify extract` with LLM semantic extraction (graphify 0.9.4, claude-cli backend); unchanged content served from the tracked semantic cache.

Refreshed by the resolve-pr-conflicts workflow: https://github.com/lopugit/thingtime/actions/runs/32012497753
lopugit added a commit that referenced this pull request Aug 18, 2026
@lopugit
all: merge PR #284 — [Promote] Fix develop CI contract drift (#283)
2f02856
lopugit added a commit that referenced this pull request Aug 18, 2026
@lopugit
all: merge PR #284 — [Promote] Fix develop CI contract drift (#283)
25fc5ac
github-actions Bot added a commit that referenced this pull request Aug 18, 2026
@github-actions
all: merge PR #284 — [Promote] Fix develop CI contract drift (#283)
46d2732
github-actions Bot added a commit that referenced this pull request Aug 19, 2026
@github-actions
all: merge PR #284 — [Promote] Fix develop CI contract drift (#283)
1feb49c
@github-actions

github-actions Bot commented Aug 20, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

🤝 Merged main into promote/pr-283-fix-temporary-profile-contract--to-main — conflicts auto-resolved by the resolve-pr-conflicts workflow.

No AI resolution was needed by merge time; the branch was updated with a plain merge commit.

graphify-out/ was reset wholesale to the main side (repo rule: one side, never mixed — the graph merge driver is unavailable in CI).
Then re-ran graphify on the merged code WITH LLM semantic extraction (graphify extract, claude-cli backend) and committed the result — content new to this merge is semantically indexed; unchanged content came from the tracked cache.

Please review the merge commit before relying on it.

@github-actions
Merge branch 'main' into promote/pr-283-fix-temporary-profile-contrac…
b9897d0 
…t--to-main

# Conflicts:
#	graphify-out/GRAPH_REPORT.md
#	graphify-out/graph.json
#	graphify-out/manifest.json
@github-actions
chore: refresh graphify outputs after conflict merge
e56c7fa 
`graphify extract` with LLM semantic extraction (graphify 0.9.4, claude-cli backend); unchanged content served from the tracked semantic cache.

Refreshed by the resolve-pr-conflicts workflow: https://github.com/lopugit/thingtime/actions/runs/32398054036
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

promotion Automated develop to main promotion PR

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@lopugit