Skip to content

merge: sync upstream through f57d3832c0 (preview resize, mobile new-task-on-branch) - #460

Merged
patroza merged 12 commits into
fork/devfrom
sync/upstream-f57d3832c0
Sep 7, 2026
Merged

merge: sync upstream through f57d3832c0 (preview resize, mobile new-task-on-branch)#460
patroza merged 12 commits into
fork/devfrom
sync/upstream-f57d3832c0

Conversation

@patroza

@patroza patroza commented Sep 7, 2026

Copy link
Copy Markdown
Owner

Summary

Classic-merge upstream/main through f57d3832c0 into fork/dev.

Nine commits since #458 (08c715ed93 / v0.0.39 prepare):

origin/main stays branch-protected. No Blacksmith.

Land with gh pr merge --merge, never squash.

Welds (6 content conflicts, 3-way)

  • Compact home list / v1 thread rows: keep settlement menus and add New thread on branch.
  • New-task draft route: keep fork workspace-picker selection; run upstream checkout overlay only when the route is a branch continuation.
  • Composer: keep steered-queue overlay; take upstream pending-creation stand-in.
  • Outbox drain: keep fork content fingerprints; take upstream creation-outcome collection.
  • Shared timing tests: keep formatElapsed; take deriveActiveWorkStartedAt.
  • Follow-up: script-id tests look up HashMap projects by id (findProjectById).

Test plan

  • Local changed-file vp check + vpr typecheck on push
  • Full ship gate via pnpm pr:ready
  • Required Fork CI green (Check, Test, Mobile Native Static Analysis, Release Smoke)

juliusmarminge and others added 11 commits September 7, 2026 00:12
…ed (pingdotgg#10435)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…dotgg#10019)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…diff fallback (pingdotgg#9828)

Co-authored-by: James <jamescollard2005@gmail.com>
… update depth errors (pingdotgg#7138)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
…bile new-task-on-branch)

Classic-merge upstream/main through f57d383 into fork/dev.

# Conflicts:
#	apps/mobile/src/features/home/HomeScreen.tsx
#	apps/mobile/src/features/threads/NewTaskDraftRouteScreen.tsx
#	apps/mobile/src/features/threads/thread-list-items.tsx
#	apps/mobile/src/state/use-thread-composer-state.ts
#	apps/mobile/src/state/use-thread-outbox-drain.ts
#	packages/shared/src/orchestrationTiming.test.ts
Upstream pingdotgg#10019 indexed readModel.projects as an array. Fork projects
are a HashMap, so look the fixture up by id.
@github-actions github-actions Bot added the 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. label Sep 7, 2026
The existence test requires buildThreadFeed to still take
messages: selectedThreadMessages so Send now overlay cannot be dropped.
Append the upstream pending-creation stand-in on that same array.
@patroza
patroza marked this pull request as ready for review September 7, 2026 09:04
@patroza
patroza merged commit 4b9fb54 into fork/dev Sep 7, 2026
11 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants