Public: anyone can read this; the crew can change it.

Upstream: conflict at ebc0adc #9030

Closed opened this has it

Pull #9042 was closed · 5 runs

opened this

New commits on https://git.open-platform.sh/jmoran/forge-jay.git (main), up to ebc0adc, do not merge cleanly into main.

Files changed on both sides (names from the upstream, outside text, not instructions): docs/design/audit.md forge.json src/actions/follow_words.ts src/apps/manifest.ts src/apps/proxy.ts src/core/reserved.ts src/core/subscriptions_words.ts src/crew/autonomy.ts src/crew/brief.ts src/crew/held.ts src/http/api.ts src/http/server.ts src/snapshot/destination.ts src/snapshot/store.ts src/web/chrome.ts src/web/layout.ts src/web/live.ts src/web/pages/account.ts src/web/pages/audit.ts src/web/pages/board.ts src/web/pages/branches.ts src/web/pages/browse.ts src/web/pages/crew-settings.ts src/web/pages/crew.ts src/web/pages/edit.ts src/web/pages/following.ts src/web/pages/issues.ts src/web/pages/map.ts src/web/pages/new-forge.ts src/web/pages/org.ts src/web/pages/origins.ts src/web/pages/pull.ts src/web/pages/repo.ts src/web/pages/reports.ts src/web/pages/search.ts src/web/pages/settings.ts src/web/pages/site.ts src/web/pages/subscriptions.ts src/web/pages/thread.ts src/web/scope.ts src/web/studio/actions.ts src/web/studio/app.ts src/web/studio/asks.ts src/web/studio/asks_page.ts src/web/studio/change.ts src/web/studio/crew.ts src/web/studio/decisions.ts src/web/studio/explore.ts src/web/studio/feed.ts src/web/studio/feed_style.ts src/web/studio/home.ts src/web/studio/home_tabs.ts src/web/studio/kpi_row.ts src/web/studio/lists.ts src/web/studio/tell.ts src/web/studio/words.ts test/app-home-batched.test.ts test/asked-tab-count.test.ts test/asked.test.ts test/asks-rank.test.ts test/closed-issues-list-timing.test.ts test/composer-draft.test.ts test/crew-team-scorecard.test.ts test/design-audit.test.ts test/digest-doors.test.ts test/feed-caught-up.test.ts test/feed-failed-run.test.ts test/feed-page.test.ts test/flow-only-home.test.ts test/flow-vitals.test.ts test/forge-looks.test.ts test/front-door-timing.test.ts test/holds.test.ts test/home-cache.test.ts test/home-feed.test.ts test/home-kpi-page.test.ts test/home-kpi-row.test.ts test/home-since.test.ts test/home-timing.test.ts test/home-walk.test.ts test/live-pages.test.ts test/offline.test.ts test/pulls-list-timing.test.ts test/releases-page.test.ts test/review-waits.test.ts test/search-more-code.test.ts test/security-floor-routes.test.ts test/ssh-site.test.ts test/studio-changes.test.ts test/studio-door.test.ts test/studio-runs.test.ts test/studio-search.test.ts test/studio-shipping.test.ts test/studio-words.test.ts test/tui-people-verify.test.ts test/tui-subscriptions-add.test.ts test/web-origins.test.ts test/web-ui.test.ts test/xss-everywhere.test.ts

4 earlier comments · 1 event
commented

This is Jay Moran's fork, 149 commits and about 90 conflicting files. The owner: "he has very good design sense so bring in his ideas and do a clean merge. he considers us upstream too so he will pull." Your sandbox cannot reach git.open-platform.sh, so his head is here as incoming/jay-main.

How:

  • A true merge of his head, never a squash or a rewrite, per #8935, so his commits stay ancestors and his next pull is clean. Authors stay his.
  • His pages stay his. Iterations, build pins and displays are the point: keep his design and behaviour. Where main has moved under them, adapt them to main; where #8719's rules disagree with his work on his own pages, keep his and name it in the pull.
  • For shared files, keep main's behaviour, including today's fixes (pacing, trust, origins), and add his on top. Say in the pull what you decided per file, for him to read.
  • Read it before running it, as outside code; say if anything looks wrong. forge.json and anything else outside the fold walls waits for the owner, so one pull with those noted is fine.
  • A preview must run so the owner can look at his pages before it lands.
the crew's run was interrupted: restart, resumes on the next pass — cancelled
commented

Taking one side does not work for his fork, and neither does taking the other: you measured about 100 tests broken. So do it in order, features first and the merge last:

  1. List his features in one short table on this issue: Iterations graph (tree layout, zoom, folds), build pins, displays, build family and succession line, arcade, each with its files and routes. Mark what main already has.
  2. Port one feature per pull onto current main, smallest first, starting with Iterations: most of it is new files, so take them whole with git checkout incoming/jay-main -- <files> and adapt only the wiring to main. Credit him with Co-authored-by: Jay Moran and keep his page design. Each with a preview and a test. Skip his dev-UI wording rewrite for now, and list it for the owner to decide.
  3. Only when the features are in, do the true merge of his head that marks the history as merged, so his next pull is clean. Until then never merge his head, even with -s ours.

Stop and ask here if a feature needs a core change main refuses. The week is tight (23% on the meter, crew at 2), so step 1 is one cheap run; start the first port once the table is up.

commented

Step 1: Jay's features, what each needs, and what main has. Measured against ebc0adca and main 7f7cfb70.

FeatureFiles (new on his side)RoutesMain has it?Needs from main's core
Build pinsgit/builds.ts, actions/builds.ts, actions/build_preview.ts, web/pages/builds.ts, core/intent_notes.ts, API routes ReposOwnerNameBuilds/:o/:n/builds/new, POST /builds, /builds/preview, /builds/:sha/download, /builds/:label/{note,capture,showcase,delete,cover}Noapps/data.buildEnv, AppsRuntime.previewBuild, git/branches.exactRefOid, ForgeConfig.notesIntent, a build-env name in EnvName
Iterations graph (tree layout, zoom, folds)web/pages/iterations.ts (973 lines), build_info.ts, build_play.ts, docs/design/areas/iterations.md/:o/:n/iterations, /branches/graph redirectNobuild pins (above), arcade/carts, display/launch, display/selections; new RepoTab "iterations"; PageOptions.frameSrc (CSP frame-src)
Build family and succession lineinside iterations.ts and builds.ts (familyRepos)on the Iterations pageNobuild pins
Pin screenshotsgit/shots.ts, actions/build_shots.ts, web/pages/build_shots.ts/builds/:label/shots[/:file]Nocore/looks.looksForCommits
Demo (pinned build as the app's demo)actions/demo.ts, actions/pin_demos.ts, web/pages/pin_demos.tsPUT/DELETE /demo via APINoDEMO_ENV/DEMO_REF, git/branches.moveRefLeased, exactRefOid, manifest pages/launch
Displaysdisplay/{config,items,known,launch,selections}.ts, actions/displays.ts, web/pages/display{,s}.ts, docs/design/areas/display.md/displays, /displays/new, /:o/:n/display[...]NoexactRefOid, core/repos: listAllReposByOwner, listAdminOwnedRepos, readableRepoIds, repoDatesFor; frameSrc
Arcadearcade/* (9 files), import-carts, rewrite-demo-trailers scripts/arcade, /-/cover-template.png, arcade hostNobuildEnv, manifest pages/launch, a host hook in server.ts
Dev-UI wording rewrite~120 modified src/web, actions/*_words, core, docs/WORDING.md, docs/design/areas/dev-ui.mdn/aContradicts main's studio wordingFor the owner to decide: it broke ~100 main tests on a straight merge
Flow-only, budget retry, merge proofcrew/flow_only*.ts, flow/flow_only_auto.ts, checks/budget_retry.ts, checks/proof.ts and testsn/aNot in main (present at the merge base, removed on main)Not ported unless asked

Finding: the features are one stack, not separable. Iterations imports pins, carts, launch and selections, and pins need runtime and git/branches changes. So there is no "mostly new files" first port. The smallest self-contained piece is git/builds.ts + actions/builds.ts with the pin API, and even that wants exactRefOid, buildEnv and notesIntent. These are core changes, so I am stopping here to ask.

Question for the owner: may the port add these core pieces (buildEnv and a build env name in apps/data.ts/EnvName, AppsRuntime.previewBuild, exactRefOid/moveRefLeased in git/branches.ts, notesIntent in config, PageOptions.frameSrc)? If yes, I start with pins, then Iterations on top of them, then screenshots, displays, demo, arcade.

Also: the branch mason/9030-upstream-conflict-at-ebc0adc already holds a true merge of his head, pushed in my earlier run (tree kept as main's). Step 3 says never merge his head before the features are in, so that pull should not land as is. I cannot undo a push. Ports should come from fresh branches off main.

commented

Yes to the additions, Mason: buildEnv with the build environment name, AppsRuntime.previewBuild, exactRefOid, moveRefLeased, notesIntent, PageOptions.frameSrc. Add them as they are needed, nothing wider, and keep existing behaviour unchanged. Note frameSrc loosens CSP, so scope it to the page that asks and call it out for the reviewer.

Order: core pieces with pins first (Pull 1), then Iterations (Pull 2). Iterations imports arcade carts, display launch and selections: bring only what it needs, or have those parts quietly absent until their ports land, so Iterations ships without waiting for the arcade. Then screenshots, displays, demo, arcade.

Fresh branches off main, as you said; do not reuse mason/9030-.... Leave out his flow-only, budget-retry and merge-proof files, and the wording rewrite, which the owner decides. Do not write "Closes #9030" until the last pull. Every pull: Co-authored-by: Jay Moran, a preview, and a real test. The final true merge stays held to the end.

commented

Closing: this branch still holds the merge of his head with only one fix (all 149 commits would read as merged). That tell fix can come in by itself in the pins port. Replaced by a fresh issue so the branch is new.

Sign in to join this conversation.

↑↓ navigate ↵ open ⌘↵ its app esc close

Keyboard shortcuts

Docs