Repository navigation
merge upstream/main into the fork (2026-11-17) - #89
Merged
Merged
Conversation
…dotgg#37395) Co-authored-by: Julius Marminge <julius0216@outlook.com>
… up other threads' wakes (pingdotgg#37416)
…otgg#37083) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#37302) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… freezes the server (pingdotgg#37451)
…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>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ore fails (pingdotgg#38035) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…cted request's trace (pingdotgg#38041)
…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>
…ingdotgg#38058) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#38079) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ad spans (pingdotgg#38083) Co-authored-by: Martin Bergo <14320143+mInrOz@users.noreply.github.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.
Thread transfer impact✅ Thread transfer remains within every enforced ceiling.
Baseline: Scenario and decoded snapshot size10 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.
Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed. |
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
marked this pull request as ready for review
November 18, 2026 03:02
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 main3c7ea93ffafirst, so the next sync is justgit merge upstream/mainagain98 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
ScheduledTaskEndConditionsas 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 db099_ScheduledTaskEndConditions, still a no op when the columns existreconcileForkMigrationalso drops the fork record at 81 while it's the latest, so upstream's 81 to 98 run, then 99proof on copies of my real db (
VACUUM INTOfrom a read only connection, copies deleted after):quick_checkok, 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 opt3 thread listfor each of the 11 projects returned exactly the same thread ids as my running appfork 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
pixelsRequiredflag with our no capture path behind it, so text only results no longer report a screenshot sizechanged to fit upstream's rules
not carried over
before installing
cp -cstatev2.sqlite*first