Promote main -> release (conflict-resolved) - #5414
Conversation
…eature (tinyhumansai#5049) (tinyhumansai#5061) Co-authored-by: Steven Enamakel <31011319+senamakel@users.noreply.github.com>
…nscript (ChatThreadView) (tinyhumansai#5097)
…ansai#5091) Co-authored-by: Cursor <cursoragent@cursor.com>
…ai#4786) Co-authored-by: Sami Rusani <14844597+samrusani@users.noreply.github.com>
…inyhumansai#4772) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: binyangzhu000-sudo <224954946+binyangzhu000-sudo@users.noreply.github.com> Co-authored-by: Steven Enamakel <enamakel@tinyhumans.ai>
…nsai#5103) Co-authored-by: Sami Rusani <14844597+samrusani@users.noreply.github.com>
…ting/http-server gates (tinyhumansai#5048) (tinyhumansai#5068)
…4929) (tinyhumansai#4998) Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Steven Enamakel <31011319+senamakel@users.noreply.github.com> Co-authored-by: Cyrus Gray <144336577+graycyrus@users.noreply.github.com> Co-authored-by: oxoxDev <164490987+oxoxDev@users.noreply.github.com> Co-authored-by: YellowSnnowmann <167776381+YellowSnnowmann@users.noreply.github.com> Co-authored-by: Steven Enamakel <enamakel@tinyhumans.ai> Co-authored-by: CodeGhost21 <164498022+CodeGhost21@users.noreply.github.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Co-authored-by: sanil-23 <sanil@tinyhumans.ai> Co-authored-by: M3gA-Mind <elvin@mahadao.com> Co-authored-by: oxoxDev <oxoxdev@users.noreply.github.com>
Co-authored-by: Sami Rusani <14844597+samrusani@users.noreply.github.com> Co-authored-by: Steven Enamakel <enamakel@tinyhumans.ai>
…roval prompt (tinyhumansai#5094) Co-authored-by: Steven Enamakel <enamakel@tinyhumans.ai>
…d profiling optimizations (tinyhumansai#5107)
…completes epic tinyhumansai#4795 (tinyhumansai#5029) Co-authored-by: Steven Enamakel <enamakel@tinyhumans.ai>
…ers instead of bouncing sign-in (tinyhumansai#5166) (tinyhumansai#5336)
…mansai#5364) Co-authored-by: Medulla <medulla@tinyhumans.ai>
tinyhumansai#5167) (tinyhumansai#5340) Co-authored-by: Medulla <medulla@tinyhumans.ai> Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
…umansai#5365) Co-authored-by: Medulla <medulla@tinyhumans.ai>
…ansai#5366) Co-authored-by: Medulla <medulla@tinyhumans.ai>
…transcript soak (tinyhumansai#5396) Co-authored-by: Medulla <medulla@tinyhumans.ai>
…ssor (tinyhumansai#5405) Co-authored-by: Medulla <medulla@tinyhumans.ai>
…nyhumansai#5401) Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
…ers (tinyhumansai#5367) Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…local-agent relay handler (tinyhumansai#5399) (tinyhumansai#5407)
Co-authored-by: Medulla <medulla@tinyhumans.ai>
release carried no unique code. Its 7 commits ahead of main are four `chore(release)` version bumps, two single-parent squashes of earlier promotes, and `42cdf77e7` (appimage userns sysctl) — whose two scripts are byte-identical to main's, which also carries the follow-up `11d744abe` (D-Bus session bus for the startup smoke). The 83 merge conflicts were structural fallout from tinyhumansai#5328, which collapsed src/openhuman/ from 124 flat domain dirs into 31 gate-aligned families. release predates that reorg, so moved files collided as add/add and file-location rather than as real disagreements. Resolution: take main's tree wholesale, delete the 11 pre-kernelization paths main no longer has, take main's submodule pins, and keep release's version (0.63.9 > main's 0.63.6 — a release must never go backwards). Verified: `git diff upstream/main` is exactly the six version-bearing files, one line each.
|
Too many files changed for review (2547 files, 100 file limit). |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 3d0d28af05
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
| // success — `loadFlows()` clears `error`, which would otherwise wipe | ||
| // the failure banner set in the `catch` below. | ||
| await runFlow(flow.id); | ||
| const result = await runFlowDetached(flow.id); |
There was a problem hiding this comment.
Pass declared inputs before starting a run
When a saved flow declares required graph.inputs, this call starts flows_run_detached with no inputs object. The new server path validates declared inputs synchronously before it returns a run id, and the API comment says both UI Run controls must collect those values first, so parameterized flows now fail from the list Run button (and the canvas Run button has the same omission) instead of prompting the user and starting. Please collect the required values and pass them as the third argument before calling runFlowDetached.
Useful? React with 👍 / 👎.
Brings
releasetomain's tree. Only the six version-bearing files differ, held at 0.63.9 so the release does not go backwards.Verification
Every hunk is
0.63.6→0.63.9and nothing else. Both lockfiles changed only their own package entry ([[package]] openhumanand[[package]] OpenHuman) —main's dependency resolution is untouched. All nine submodule pins matchmainexactly.releasecarried no unique codeChecked three ways rather than assumed:
Path-level. Both trees dumped with blob hashes and compared. Outside
src/openhuman/— the only area the kernelization reorganized — there are zero paths that exist inreleasebut not inmain. Everyrelease-only path lies inside the kernelized tree.Commit-level. All 7
release-only commits accounted for: fourchore(release)version bumps (touching only the six version files), two single-parent squashes of earlier promotes, and one real code commit.That one real code commit.
42cdf77e7(fix(appimage): unblock release smoke by relaxing the userns sysctl (#5251)) touches two scripts, and both are byte-identical inmain:releasemainscripts/release/test-strip-appimage-rpaths.shfefb7c1b7cfecfc99f978fe91039c4c5a912e994fefb7c1b7cfecfc99f978fe91039c4c5a912e994scripts/release/validate-appimage-runtime.sh40ea9b15926d7a917016e78e4be0882fb61dfeb840ea9b15926d7a917016e78e4be0882fb61dfeb8maincarries it as9750b8077and has since gone further with11d744abe(fix(appimage): give the release startup smoke a D-Bus session bus (#5255)).Nothing is dropped by taking
main's tree.Why there were 83 conflicts
Structural fallout from #5328, not real divergence. That PR collapsed
src/openhuman/from 124 flat domain directories into 31 gate-aligned families.releasepredates the reorg, so every moved file collided as add/add or file-location rather than as a disagreement about content — 63 content, 11 add/add, 4 modify/delete, 3 file-location, 2 submodule.Resolution: take
main's tree wholesale, delete the 11 pre-kernelization pathsmainno longer has (4 ×agent_registry/agents/flow_memory_agent/*, 3 ×medulla_chat/*,memory_store/content/tags.rs,thread_goals/mod.rs,todos/ops.rs,todos/README.md— all insidesrc/openhuman/, none outside), takemain's submodule pins, and restorerelease's version in the six manifests.This divergence is not a one-off. The repository allows squash merges only (
allow_merge_commit: false,allow_rebase_merge: false,allow_squash_merge: true).A squashed promote PR produces a single-parent commit on
release. It copiesmain's content but never recordsmainas an ancestor. Both prior promotes show this —a40fbb79d(#5242) and8ea875c13(#5256) each have exactly one parent — which is why the merge-base ofmainandreleaseis still frozen at2219d4207, and whymainreads as 184 commits ahead even thoughreleasehas all of its earlier content.So every promote rebuilds the full divergence from scratch: 184 commits and 83 conflicts this cycle, more next.
This PR's head is a genuine two-parent merge (
eab45dd6a+e29bfc66f), but squashing it on merge will discard the second parent and leave the merge-base frozen again.What stops it recurring: enable merge commits for the
releasebranch, or promote by fast-forward/push rather than through a squashed PR. Either records the ancestry so the next promote is a no-op instead of a re-resolution. Your call.