Skip to content
This repository was archived by the owner on Aug 6, 2026. It is now read-only.

trunk-merge/pr-3447/2071603f-9a8c-49a9-8705-a944ee89f7e8 - #3630

Closed
trunk-io[bot] wants to merge 17 commits into
mainfrom
trunk-merge/pr-3447/2071603f-9a8c-49a9-8705-a944ee89f7e8
Closed

trunk-merge/pr-3447/2071603f-9a8c-49a9-8705-a944ee89f7e8#3630
trunk-io[bot] wants to merge 17 commits into
mainfrom
trunk-merge/pr-3447/2071603f-9a8c-49a9-8705-a944ee89f7e8

Conversation

@trunk-io

@trunk-io trunk-io Bot commented Jul 21, 2026

Copy link
Copy Markdown
Trunk Merge Pull Request Banner

This pull request was created and is being managed by Trunk Merge.

This pull request is based on the main branch at SHA 97f151ad053f22a5915e88780ffca44124f52942.

See more details here.

When CI completes, this pull request will be closed automatically.

Pull Requests Being Tested

This pull request is testing the changes from pull request 3447.

Dependencies

This pull request depends on the changes from pull request 3626.

gantoine and others added 17 commits July 14, 2026 15:34
Bring up apps/web as a cloud-tasks-only browser host: the same @posthog/ui
shell and @posthog/core services as desktop, over web platform adapters
(WebCrypto refresh-token cipher, popup PKCE OAuth, localStorage per-device
stores, in-browser host-router slice via unstable_localLink, posthog-js
analytics/flags, fflate skill bundler, @pierre/diffs worker). Vendor + route
code-splitting, a hermetic Playwright happy-path e2e, and mprocs procs.

Depends on (merge first): async token cipher, host-capabilities seam, and
the shared SKILL.md serializer. Red until those land; rebase then.

Generated-By: PostHog Code
Task-Id: 77d13a30-444d-4045-9d80-5e2a9f2e68ae
Resolve conflicts in apps/web/vite.config.ts (keep web-host refactor,
carry over main's git alias into posthogSrcAliases) and mprocs.yaml
(adopt main's layer-grouping model, slot in the new web/web-playwright/
desktop-playwright procs).

Generated-By: PostHog Code
Task-Id: d5bcaf27-c54b-45d5-920d-cc4f65c9e9fb
The popup used a fixed window name ("posthog-code-oauth"), so a second
tab starting sign-in before the first finished could reuse and navigate
away the first tab's popup. The first flow's callback then never fired,
and the shared BroadcastChannel only carried the second flow's state, so
the first tab waited until the five-minute timeout.

Name each popup uniquely per flow (suffixing the per-flow OAuth state) so
concurrent sign-ins open independent windows. State-based callback
routing over the shared channel already delivers each callback to its own
flow.

Generated-By: PostHog Code
Task-Id: d5bcaf27-c54b-45d5-920d-cc4f65c9e9fb
CI's `pnpm install --frozen-lockfile` failed on this branch: the merge of
main left pnpm-lock.yaml inconsistent with apps/web/package.json.

- apps/web recorded zod specifier `^4.4.3`, but main's override
  (`zod@^4.0.0: 4.4.3`) pins it to `4.4.3`; align it like apps/code and
  packages/ui already do.
- Restore the missing webpack@5.105.0(esbuild@0.27.2) and
  terser-webpack-plugin@5.3.16 snapshot entries (pulled in by apps/web's
  @tanstack/router-plugin) that the merge dropped, which otherwise broke
  the lockfile with ERR_PNPM_LOCKFILE_MISSING_DEPENDENCY.

Surgical edits only, so no unrelated transitive version drift.

Generated-By: PostHog Code
Task-Id: d5bcaf27-c54b-45d5-920d-cc4f65c9e9fb
Resolve conflict in apps/web/src/web-container.ts: keep the web-host
container bindings and fold in main's taskThreadCoreModule (import +
container.load, grouped with canvasCoreModule). Also drop the web LLM
gateway host's invalidatePlanCacheUrl binding and its now-removed
getGatewayInvalidatePlanCacheUrl import, matching main's trimmed
LlmGatewayEndpoints interface (mirrors apps/code's binding).

Generated-By: PostHog Code
Task-Id: d5bcaf27-c54b-45d5-920d-cc4f65c9e9fb
7 updated
Run: 01703e08-05db-400a-b7d3-dd7ba8b8e6be

Co-authored-by: gantoine <3247106+gantoine@users.noreply.github.com>
Add a rename action to the custom sandbox image list so users can update
an image's display name without deleting and rebuilding it. Wired through
a new updateSandboxCustomImage API client method that PATCHes the
existing custom-image detail endpoint, plus an updateMutation hook and a
rename AlertDialog mirroring the existing delete confirmation flow.

The rename handler swallows the mutation rejection (onError shows the
toast), the Enter key respects the pending guard, and the update mutation
invalidates the detail cache rather than overwriting it with the PATCH
response, so a partial response cannot drop cached fields.
# Conflicts:
#	apps/code/snapshots.yml
#	apps/web/package.json
#	apps/web/src/web-container.ts
#	apps/web/src/web-trpc.ts
#	pnpm-lock.yaml
The per-task worktree/branch name chip took up sidebar space without earning it. Remove the WorktreeChip and its data wiring.

Generated-By: PostHog Code
Task-Id: b4f4207f-df3f-4db7-b815-b5194fc8efe3
@github-actions

Copy link
Copy Markdown

React Doctor found no issues in the changed files. 🎉

Reviewed by React Doctor for commit 6b06224.

@trunk-io trunk-io Bot closed this Jul 21, 2026
@trunk-io
trunk-io Bot deleted the trunk-merge/pr-3447/2071603f-9a8c-49a9-8705-a944ee89f7e8 branch July 21, 2026 14:12
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants