Skip to content

merge upstream/main into the fork (2026-11-17) - #89

Merged
maschwenk merged 2391 commits into
mainfrom
sync/upstream-2026-11-17
Nov 18, 2026
Merged

maschwenk merged 2391 commits into
mainfrom
sync/upstream-2026-11-17

Conversation

@maschwenk

Copy link
Copy Markdown
Owner

we were 2,388 upstream commits behind (last sync was nov 8, upstream 920ffcdd04), so this merges upstream/main (5842231421) into the fork and keeps every fork feature except the few upstream now does itself. same as last time it's a plain two parent merge, fork main 3c7ea93ffa first, so the next sync is just git merge upstream/main again

98 files conflicted: server 36, web 21, desktop 12, mobile 9, contracts 8, github source control 5, plus the lockfile, ci.yml, readme and docs

the db thing (third time)

my live db records the fork's ScheduledTaskEndConditions as 81. upstream took 81 to 98, and its new startup check refuses a db whose history would skip migrations, so without this the merged build wouldn't boot on my db

  • moved ours to 099_ScheduledTaskEndConditions, still a no op when the columns exist
  • reconcileForkMigration also drops the fork record at 81 while it's the latest, so upstream's 81 to 98 run, then 99
  • the test covers all three fork db states (59, 68, 81)
  • the settle decision log table is created outside migrations, so it doesn't collide

proof on copies of my real db (VACUUM INTO from a read only connection, copies deleted after):

  • all 19 migrations ran in 12.6s. quick_check ok, 0 foreign key violations, every table's row count unchanged apart from the migration ledger and 3 search index rows that 081's backfill rebuilds. every scheduled task kept its end time and run cap. a second run is a no op
  • booted the merged server on a fresh copy with scheduled tasks paused, restart continuation off, no secrets and a fake HOME, so it couldn't reach my agents, the relay or github. it was up in 42s, recovery completed, and t3 thread list for each of the 11 projects returned exactly the same thread ids as my running app
  • the test failures i still see locally also fail on plain upstream on this mac (macos tmp path symlinks, npm prefix, ssh, login shell)

fork features

kept as is, or reapplied on upstream's rewrites: preview and computer use (goal steps, extension ui, popups, the shared cursor), the auto-settle rules and decision log, pr watch wakes, scheduled task end conditions, claude reset credits through the hub (now inside upstream's per provider hub table), ghost text prompt suggestions, kokoro and elevenlabs read aloud, on device parakeet, pairing and direct push, fork badges and the floating preview

dropped bc upstream covers it now

changed to fit upstream's rules

not carried over

before installing

  • the migrated db can't go back to the old build, so quit and cp -c statev2.sqlite* first
  • upstream behavior i'll notice: keep awake on by default, success toasts gone, one time scheduled tasks deleted after they run, undeclared tool args now error
  • the phone app needs a native rebuild

juliusmarminge and others added 30 commits November 15, 2026 15:49
…dotgg#37395)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#37083)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…nator's busy lock (pingdotgg#37470)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#37478)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…s raw links (pingdotgg#37498)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#37495)

Co-authored-by: yzn-h <63852512+yzn-h@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… a quoted term (pingdotgg#37499)

Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…nning turn (pingdotgg#37507)

Co-authored-by: claude-opus-5.5 <me+ai@stefanmirea.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#37516)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
StiensWout and others added 21 commits November 17, 2026 01:43
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ore fails (pingdotgg#38035)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…art (pingdotgg#38043)

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…it saves (pingdotgg#38031)

Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ad spans (pingdotgg#38083)

Co-authored-by: Martin Bergo <14320143+mInrOz@users.noreply.github.com>
)

Co-authored-by: Cursor <cursoragent@cursor.com>
…8091)

Co-authored-by: Martin Bergo <14320143+mInrOz@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#38114)

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…numbers (pingdotgg#38116)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Merges upstream 5842231 (2,388 commits since the Nov 8 sync, 920ffcd)
into fork main 3c7ea93. 98 files conflicted; every fork feature is kept
or reapplied on upstream's rewrites, except where upstream now does the same:

- fork #88 (merge queue drops a watched PR) is replaced by upstream pingdotgg#24141
- fork #56 (git 2.56 broken gitfile) matches upstream pingdotgg#33423
- fork #21 text-only snapshots now ride upstream's pixelsRequired flag

Database: the fork's ScheduledTaskEndConditions moves from 81 to 99 and
reconcileForkMigration also drops a fork record at 81, so upstream's 81-98
run on databases that recorded the fork there. Proven on a copy of the live
database: all 19 migrations ran in 12.6 s, row counts unchanged, quick_check
ok, no foreign key violations, a second run is a no-op.

Also adapts fork code to upstream rules found by typecheck and tests:
computer tools are hidden from outside MCP clients (upstream pingdotgg#32764), the
Claude reset-credit hub read moves into upstream's per-provider table, and
the fork's T3 browser steering in Claude's prompt follows browser access.
@maschwenk maschwenk added the coder-task-generated Created from a coding task label Nov 17, 2026
@github-actions github-actions Bot added vouch:trusted Author is trusted by repo permissions or the VOUCHED list. size:XXL labels Nov 17, 2026
@github-actions

github-actions Bot commented Nov 17, 2026 •

Copy link
Copy Markdown

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider Metric Main baseline This PR Impact PR ceiling
Codex Total thread wire 5.0 KiB 5.0 KiB 0 B (0.0%) 6.8 KiB ✅
Codex Thread snapshot wire 3.8 KiB 3.8 KiB 0 B (0.0%) 4.9 KiB ✅
Codex Live turn WebSocket wire 1.2 KiB 1.2 KiB 0 B (0.0%) 2.0 KiB ✅
Codex Live turn WebSocket decoded 21.5 KiB 21.5 KiB 0 B (0.0%) 24.4 KiB ✅
Codex Live turn messages 1 1 0 (0.0%) 8 ✅
Claude Total thread wire 5.0 KiB 5.0 KiB 0 B (0.0%) 6.8 KiB ✅
Claude Thread snapshot wire 3.8 KiB 3.8 KiB 0 B (0.0%) 4.9 KiB ✅
Claude Live turn WebSocket wire 1.2 KiB 1.2 KiB 0 B (0.0%) 2.0 KiB ✅
Claude Live turn WebSocket decoded 21.9 KiB 21.9 KiB +1 B (+0.0%) 24.4 KiB ✅
Claude Live turn messages 1 1 0 (0.0%) 8 ✅

Baseline: be63a23 · PR result: 5d7f8b6 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

  • Codex decoded thread snapshot: 108.5 KiB
  • Claude decoded thread snapshot: 108.8 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

@maschwenk maschwenk added the agent-context-increase Accepts growth in the agent context budget label Nov 17, 2026
Brings in #91 (prompt suggestions) and #92 (snooze and top-of-active
shortcuts). Conflicts and upstream API drift resolved:

- ProviderSessionManager: #91's withPromptSuggestion helper on upstream's
  nativeEvent rename
- TextGeneration.suggestNextPrompt: pass the projectId argument upstream added
  to generate (null, like the other caller-resolved operations)
- OpenCode driver: suggestNextPrompt picks the runtime with resolve, as its
  neighbours do now
- suggestNextPrompt stubs in three upstream test fixtures
- Sidebar: keep upstream's stable attemptSnooze and register it for the
  snooze shortcut
@maschwenk
maschwenk marked this pull request as ready for review November 18, 2026 03:02
@maschwenk
maschwenk merged commit 3463c17 into main Nov 18, 2026
39 of 40 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

agent-context-increase Accepts growth in the agent context budget coder-task-generated Created from a coding task size:XXL vouch:trusted Author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.