Skip to content

Promote develop to main - #188

Merged
lopugit merged 411 commits into
mainfrom
develop
Aug 17, 2026
Merged

Promote develop to main#188
lopugit merged 411 commits into
mainfrom
develop

Conversation

@lopugit

@lopugit lopugit commented Aug 8, 2026

Copy link
Copy Markdown
Owner

Standing promotion PR opened by the Promote develop to main workflow. Its head is develop, so every new push or merge to develop shows up here on its own. Merge it whenever main should catch up — the workflow opens the next one after the following push to develop. The Sync main into develop workflow levels develop with main again after each promotion.

📋 What this promotion carries

38 pull requests merged into develop (411 commits) will land in main when this PR merges — newest first:

PR Title Author Source branch Merged (UTC)
#169 Profile links + editable posts: drawer footer split, All settings, full-composer post editing lopugit claude/profile-post-editing-629153 2026-08-17
#285 Sync main into develop lopugit main 2026-08-17
#283 Fix develop CI contract drift lopugit codex/fix-temporary-profile-contract 2026-08-17
#282 Sync main into develop lopugit main 2026-08-17
#281 Sync main into develop lopugit main 2026-08-17
#274 Fix Vercel status in custom environments lopugit codex/fix-dev-status-custom-environment 2026-08-17
#201 Add private S3 post attachments with tier accounting lopugit codex/s3-post-attachments 2026-08-17
#270 Sync main into develop lopugit main 2026-08-17
#154 /things: unified Drive-style Things page — folders, views, previews, bulk ops, sharing lopugit claude/unified-things-page-796e34 2026-08-16
#247 fix(ai): use Thingtime preferred model across app runtimes lopugit codex/use-ai-preferred-model-everywhere 2026-08-12
#100 security: rate-limit + input-cap public service-account provisioning (TODO #7 A3) lopugit claude/service-account-provisioning-hardening 2026-08-12
#238 Fix iOS Vercel preview destination picker lopugit codex/ios-preview-destinations 2026-08-12
#233 Fix develop preview wildcard DNS verification lopugit codex/fix-develop-preview-dns-gate 2026-08-12
#220 feat: add CI provider control plane and Vercel runners lopugit codex/ci-execution-provider-routing 2026-08-11
#235 Sync main into develop lopugit main 2026-08-10
#229 ci: keep develop Web CI required contexts reportable lopugit codex/web-ci-required-context-develop 2026-08-10
#230 Sync main into develop lopugit main 2026-08-10
#223 ci: make typecheck ratchet warning-only lopugit codex/typecheck-ratchet-warning-develop 2026-08-10
#218 ci: wire protected promotion review flow lopugit codex/pr213-promotion-listener-docs 2026-08-10
#221 Sync main into develop lopugit main 2026-08-09
#215 fix(settings): make Admin AI model selection immediately current lopugit codex/admin-model-all-ai-actions 2026-08-09
#211 ci: centralize Actions and add CI control dashboard lopugit codex/ci-control-plane-dashboard 2026-08-09
#209 Sync main into develop lopugit main 2026-08-09
#208 ci: only auto-rebase genuine PR stacks lopugit codex/rebase-only-real-stacks 2026-08-09
#207 ci: distinguish empty promotion cherry-picks safely lopugit codex/fix-promoter-empty-pick-detection 2026-08-09
#206 ci: keep feature promotion running across historical Git failures lopugit codex/harden-feature-promoter 2026-08-09
#190 ci: per-feature develop → main promotion PRs with stacks, alongside the omnibus PR lopugit claude/github-action-pr-promotion-c65173 2026-08-09
#172 Followers + friends, notifications + settings, public post view stats, multi-emoji reaction fix lopugit claude/followers-friends-notifications-views-4fcfcf 2026-08-09
#199 ci: fix resolver pseudo-stack ownership and jq overflow lopugit codex/fix-conflict-resolver-topology 2026-08-09
#174 💬 Thingtime Messenger: Slack-style Spaces + FB-style Chats, one toggle lopugit claude/thingtime-messenger-platform-c9c2b5 2026-08-09
#193 ci: keep develop un-flattened — promotion PR self-applies no-ai-rebase lopugit claude/promotion-pr-no-ai-rebase-a7c3f1 2026-08-09
#198 Sync main into develop lopugit main 2026-08-09
#196 Sync main into develop lopugit main 2026-08-08
#194 ci: conflict detector waits out mergeability + comments when standing aside lopugit claude/resolver-detect-wait-comments 2026-08-08
#192 ci: live changelog + delta comments on the standing develop → main promotion PR lopugit claude/auto-promote-pr-changelog-69311f 2026-08-08
#184 docs: all PRs target develop, not main (AI_ALL.md publishing rule) lopugit claude/retarget-prs-develop-7ad8cf 2026-08-08
#181 docs: record develop Vercel domain lopugit codex/vercel-develop-domain 2026-08-07
#167 Rate-limit public registration (auth.register) lopugit claude/register-rate-limit-94afae 2026-08-07
Direct commits on `develop` without a merged PR (7)
  • 7a3d36d7 Merge main into develop (AI-resolved conflicts)
  • 1c852d81 chore: redeploy develop with refreshed Vercel env
  • e181c4f0 Merge remote-tracking branch 'origin/main' into develop
  • d946aa71 Merge remote-tracking branch 'origin/main' into develop
  • a1565e76 Add workflow: standing develop → main promotion PR
  • 0c397c3a Endpoint config: screen-share-safe secret inputs + fields mode
  • e1d59dfd refactor: unify the two drifted ThingtimeTypes interfaces (TODO item 15 follow-up)

Auto-maintained by the Promote develop to main workflow — refreshed from develop @ 23e4559f (2026-08-17). Delta comments below track when entries enter or leave the promotion window.

@vercel

vercel Bot commented Aug 8, 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 17, 2026 8:37am
thingtime (develop) Ready Ready Preview Aug 17, 2026 8:37am

Request Review

@github-actions github-actions Bot added ai-rebase-in-progress AI stack rebase currently owns this PR branch and removed ai-rebase-in-progress AI stack rebase currently owns this PR branch labels Aug 8, 2026
@github-actions

github-actions Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

⚠️ The AI PR/stack rebase workflow did not complete. The workflow stopped before it attempted its force-with-lease push.

The PR changed refs or resolver ownership, so no pause was added; the current state remains eligible for automatic re-detection.

@github-actions

github-actions Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

🧬 Rebased develop onto main with the AI PR/stack rebase workflow.

  • Previous head: 972c5eec6ac9da63fdc67928d78be5ee2330ad45
  • Rewritten head: 4d2defc3f4d77c1edc0ffc690b6f2f51686fcb49
  • graphify: refreshed and committed (semantic mode: none)
  • Direct stacked children dispatched: 42

The branch was published once with an exact force-with-lease. Please review the rewritten commits before relying on them.

@github-actions

github-actions Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

📋 Promotion changelog initialized — this promotion currently carries 7 PRs (11 commits):

The PR description now holds the full changelog and refreshes on every push to develop; future comments only report what was added or removed.

Comment thread .github/scripts/promotion-pr-changelog.mjs Fixed
@lopugit lopugit added the no-ai-rebase Opt this PR's head branch out of AI history rewriting; the merge resolver owns its conflicts label Aug 8, 2026
@github-actions

github-actions Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

📋 Promotion changelog updated — now carrying 8 PRs (14 commits).

Added:

The full changelog lives in the PR description.

@github-actions

github-actions Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

🤖 Auto-resolve running — the conflict resolver started working on this PR at 05:59 UTC.

Expected to finish around 06:07 UTC (most resolutions still land in 3-8 minutes; the hosted-runner ceiling is 360). On success a merge commit resolving the conflicts is pushed to this branch and a result comment follows — no manual action is needed meanwhile.

Live status

@github-actions

github-actions Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

🤝 Merged main into develop — conflicts auto-resolved by the resolve-pr-conflicts workflow.

Conflicted files:

  • graphify-out/GRAPH_REPORT.md
  • graphify-out/graph.json
  • graphify-out/manifest.json
  • remix/CHANGELOG.md

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

github-actions Bot commented Aug 8, 2026

Copy link
Copy Markdown
Contributor

📋 Promotion changelog updated — now carrying 9 PRs (16 commits).

Added:

The full changelog lives in the PR description.

@github-actions

github-actions Bot commented Aug 9, 2026

Copy link
Copy Markdown
Contributor

🤝 Merged main into develop — conflicts auto-resolved by the resolve-pr-conflicts workflow.

Conflicted files:

  • graphify-out/GRAPH_REPORT.md
  • graphify-out/cache/semantic/0a58119cb7f4133195b58ab81888113558387c85cad07f93c8e52b6a20b05069.json
  • graphify-out/cache/semantic/4f8753517e1db8c4fe1a96215b0be22a93a852e97737c21673d90ef1f7821108.json
  • graphify-out/cache/semantic/99d79e0785815eedacb33fe2b474358fbb0be794b0867d6b25ca98fd6d9b8c77.json
  • graphify-out/cache/semantic/ac6889b28337c39265bd7b69cf27ed24fcbea17a63f24653703f91e6bd68c0c5.json
  • graphify-out/graph.json
  • graphify-out/manifest.json
  • remix/CHANGELOG.md

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

github-actions Bot commented Aug 9, 2026

Copy link
Copy Markdown
Contributor

📋 Promotion changelog updated — now carrying 10 PRs (18 commits).

Added:

The full changelog lives in the PR description.

@github-actions

github-actions Bot commented Aug 9, 2026

Copy link
Copy Markdown
Contributor

📋 Promotion changelog updated — now carrying 11 PRs (20 commits).

Added:

The full changelog lives in the PR description.

@gitguardian

gitguardian Bot commented Aug 9, 2026

Copy link
Copy Markdown

⚠️ GitGuardian has uncovered 2 secrets following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secrets in your pull request
GitGuardian id GitGuardian status Secret Commit Filename
35907519 Triggered MongoDB Credentials f3683d3 remix/app/api/utils/errors/adminDiagnostic.test.ts View secret
35909515 Triggered Generic Password 65fcdd1 remix/app/api/utils/errors/adminDiagnostic.test.ts View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secrets safely. Learn here the best practices.
  3. Revoke and rotate these secrets.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

@github-actions

github-actions Bot commented Aug 9, 2026

Copy link
Copy Markdown
Contributor

📋 Promotion changelog updated — now carrying 12 PRs (27 commits).

Added:

The full changelog lives in the PR description.

lopugit and others added 2 commits August 17, 2026 16:08
`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/31999796921
@github-actions

Copy link
Copy Markdown
Contributor

🤝 Merged main into develop — conflicts auto-resolved by the resolve-pr-conflicts workflow.

Conflicted files:

  • VERCEL_DEPLOYMENTS.md
  • graphify-out/GRAPH_REPORT.md
  • graphify-out/cache/semantic/46eda2eb84cd34f600e5e40081bd65ef9a3fa6d01f7b3ed3380251b2acfa6cfb.json
  • graphify-out/graph.json
  • graphify-out/manifest.json
  • remix/package.json
  • remix/vercel.json

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

Copy link
Copy Markdown
Contributor

📋 Promotion changelog updated — now carrying 35 PRs (343 commits).

Added:

The full changelog lives in the PR description.

lopugit and others added 9 commits August 17, 2026 16:15
…y-profile-contract

# Conflicts:
#	graphify-out/GRAPH_REPORT.md
#	graphify-out/manifest.json
# Conflicts:
#	graphify-out/GRAPH_REPORT.md
#	graphify-out/graph.json
#	graphify-out/manifest.json
`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/32000709060
@github-actions

Copy link
Copy Markdown
Contributor

📋 Promotion changelog updated — now carrying 36 PRs (352 commits).

Added:

The full changelog lives in the PR description.

# Conflicts:
#	graphify-out/GRAPH_REPORT.md
#	graphify-out/graph.json
#	graphify-out/manifest.json
`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/32003388374
@github-actions

github-actions Bot commented Aug 17, 2026

Copy link
Copy Markdown
Contributor

🤝 Merged main into develop — conflicts auto-resolved by the resolve-pr-conflicts workflow.

Conflicted files:

  • graphify-out/GRAPH_REPORT.md
  • graphify-out/cache/semantic/8b6db52ccd13dfcb269f743f8dace4c14941b18be5765f6d8690700416fd8a9a.json
  • graphify-out/cache/semantic/8be894f31ddca5485296d5826b8b5e70aa13c85c16c8e711f7d5e47aa20539cd.json
  • graphify-out/cache/semantic/e22056684b94654f2037143b00a0e5fb21cb25a236fbc9f051f81bcdefdd1c98.json
  • graphify-out/graph.json
  • graphify-out/manifest.json
  • remix/CHANGELOG.md
  • remix/scripts/workflow-caller-contract.mjs

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 Bot and others added 2 commits August 17, 2026 07:53
Conflicted paths: graphify-out/GRAPH_REPORT.md, graphify-out/cache/semantic/8b6db52ccd13dfcb269f743f8dace4c14941b18be5765f6d8690700416fd8a9a.json, graphify-out/cache/semantic/8be894f31ddca5485296d5826b8b5e70aa13c85c16c8e711f7d5e47aa20539cd.json, graphify-out/cache/semantic/e22056684b94654f2037143b00a0e5fb21cb25a236fbc9f051f81bcdefdd1c98.json, graphify-out/graph.json, graphify-out/manifest.json, remix/CHANGELOG.md, remix/scripts/workflow-caller-contract.mjs

Resolved by the resolve-pr-conflicts workflow: https://github.com/lopugit/thingtime/actions/runs/32007282661

Co-Authored-By: Claude <noreply@anthropic.com>
`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/32007282661
@github-actions

Copy link
Copy Markdown
Contributor

📋 Promotion changelog updated — now carrying 37 PRs (354 commits).

Added:

The full changelog lives in the PR description.

github-actions Bot and others added 3 commits August 17, 2026 08:05
# Conflicts:
#	graphify-out/GRAPH_REPORT.md
#	graphify-out/cache/semantic/1bf59c49afae19114fb4d0993249bbc091b4454e8a790ec97586ecf346808e15.json
#	graphify-out/cache/semantic/a0f10b45212c2643c917726af62add4389f99df5abdfa36a7782077bd1fa562c.json
#	graphify-out/cache/semantic/d0f51cc65cf08dd511bf1cd83993eaa907408717049b0e4519506b47f11e71ac.json
#	graphify-out/cache/semantic/e22056684b94654f2037143b00a0e5fb21cb25a236fbc9f051f81bcdefdd1c98.json
#	graphify-out/graph.json
#	graphify-out/manifest.json
`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/32008362494
Profile links + editable posts: drawer footer split, All settings, full-composer post editing
@github-actions

Copy link
Copy Markdown
Contributor

📋 Promotion changelog updated — now carrying 38 PRs (411 commits).

Added:

The full changelog lives in the PR description.

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

Labels

no-ai-rebase Opt this PR's head branch out of AI history rewriting; the merge resolver owns its conflicts promotion Automated develop to main promotion PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants