Skip to content

fix(fork): merge upstream cc97303 into patch/bots - #260

Merged
fireboltdude1357 merged 122 commits into
patch/botsfrom
fix/bots-upstream-cc97303
Nov 12, 2026
Merged

fix(fork): merge upstream cc97303 into patch/bots#260
fireboltdude1357 merged 122 commits into
patch/botsfrom
fix/bots-upstream-cc97303

Conversation

@fireboltdude1357

@fireboltdude1357 fireboltdude1357 commented Nov 12, 2026

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/bots conflicts with upstream cc97303 in apps/server/src/relay/AgentAwarenessRelay.ts.

Upstream pingdotgg#33585 widens the turn-item.updated check with turnItemCanChangeUserWait, and moves message.updated into the list of events that return false. The patch had made plan.updated its own case, which stays relevant while a bot thread's proposed plan is still actionable. I kept upstream's widened check and its placement of message.updated, then the patch's plan.updated case.

On a scratch stack of upstream 7d51718 with all 26 patches and the three fix branches, pnpm install --no-frozen-lockfile, vp run typecheck (41 of 41) and vp test run on the test files the patches touch plus GitManager.test.ts all pass (50 files, 1507 tests). That is upstream cc97303 plus pingdotgg#35697, which fixes a typecheck error between pingdotgg#35672 and pingdotgg#35673 in upstream's own WorkspaceSearchIndex.ts.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 12, 2026 11:35
@juliusmarminge @claude
fix(voice): dictation survives draft changes and Escape in the citati…
1001bc7 
…on box (pingdotgg#32682)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@flamboh @maria-rcks @Yash-Singh1
fix(clients): report title regeneration outcomes (pingdotgg#31418)
1c9ea56 
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
@juliusmarminge
test(server): bind-address Serve refusal test answers serve status (p…
abca547 
…ingdotgg#35568)
@juliusmarminge @claude
fix(web): Grok Bot opens with the setup message filled in (pingdotgg#…
7f6ba5b 
…35565)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge @claude
test(web): split the cloud voice settings flow into independent cases (…
444ea53 
…pingdotgg#35563)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge
fix(desktop): SSH suggestions from known_hosts keep their port (pingd…
63edc30 
…otgg#35556)
@juliusmarminge
fix(mobile): block HTML in a Markdown table cell no longer splits the…
773b3c9 
… row (pingdotgg#35535)
@juliusmarminge
fix(server): terminal history drops the tertiary Device Attributes qu…
bd8ea12 
…ery (pingdotgg#35537)
@flamboh @claude
@maria-rcks @juliusmarminge
fix(web): J and K step the PR guide without clicking into it first (p…
f376f5c 
…ingdotgg#32302)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@saphitv @juliusmarminge
fix(shared): preserve repository paths when switching clone protocols (…
cf82fb8 
…pingdotgg#35322)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@Yash-Singh1
feat(web): resize rows and columns in spreadsheet previews (pingdotgg…
5cff012 
…#35548)
@juliusmarminge
fix(forgejo): renamed repositories keep syncing their pull request li…
e0d0fb3 
…nks (pingdotgg#32629)
@t3dotgg @claude
test(web): OpenRouter voice test fills the model picker instead of ty…
e9a7c07 
…ping each key (pingdotgg#35581)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
@Yash-Singh1
feat(antigravity): support native goals and managed CLI updates (ping…
4099e62 
…dotgg#35409)
@pouyarezvani @claude
@maria-rcks @juliusmarminge @Yash-Singh1
fix(web): the Fix action on a thread details PR row stays inside the …
932cbd4 
…card (pingdotgg#31115)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
@juliusmarminge
fix(mobile): queue sheet's Resume queue continues a usage-limited thr…
49b0cc3 
…ead (pingdotgg#35576)
@juliusmarminge @claude
fix(server): background status fetch no longer breaks a concurrent gi…
3406bd7 
…t pull (pingdotgg#26568)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@t3dotgg @claude
test(web): Mermaid rejection test waits for the viewer chunk to load (p…
d8f3fef 
…ingdotgg#35586)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
@Bil0000 @juliusmarminge
perf(usage): the Usage page shows cost and tokens at once instead of …
7fab4ef 
…after a full scan (pingdotgg#33993)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@Mezzle @claude @juliusmarminge
feat(codex): choose a cyber access program for Daybreak-eligible mode…
359daaf 
…ls (pingdotgg#27928)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@imluckii @juliusmarminge
fix(web): command palette footer hints wrap instead of clipping on na…
977d613 
…rrow viewports (pingdotgg#29288)

Co-authored-by: imluckii <imluckii@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@yordis @juliusmarminge
feat(secrets): check a secret reference before saving it (pingdotgg#3…
ee9e36c 
…1723)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
@dominikzabcik @juliusmarminge
fix(server): the Welcome page offers repositories you only worked on …
d46b90c 
…in worktrees (pingdotgg#33923)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@Yuruzuu @juliusmarminge
fix(web): a branch picked right after opening the picker no longer wa…
1b13310 
…its for its status read (pingdotgg#33877)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@Yuruzuu @juliusmarminge
perf(server): status refresh on a fork's default branch is 2.5x faste…
a1e0e50 
…r (median 7,826 to 3,168 ms) (pingdotgg#33954)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@fjooord @juliusmarminge
fix(server): agents can see a thread's pending background work (pingd…
91712ee 
…otgg#33858)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
fix(ssh): timed-out SSH commands keep the output they already printed (…
d90ac5c 
…pingdotgg#35589)
@Lenoridev @juliusmarminge
fix(server): worktree dev servers no longer clean up real worktrees (p…
18188ba 
…ingdotgg#33902)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@shivamhwp @juliusmarminge
fix(server): server updates retry when a release download fails brief…
47a9988 
…ly (pingdotgg#33896)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@Lenoridev @juliusmarminge
fix(server): dev database seed no longer runs settle scripts in real …
0951791 
…worktrees (pingdotgg#33908)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
voltcrash and others added 29 commits November 12, 2026 14:51
@voltcrash @juliusmarminge
fix(web): restore composer focus when returning to a thread (pingdotg…
0508906 
…g#29179)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@only21mil @maria-rcks @juliusmarminge
fix(server): linked calls fail fast when a peer stalls the MCP handsh…
bd731da 
…ake (pingdotgg#28876)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@StiensWout Grok 4.7 (Grok) @juliusmarminge
fix(web,mobile): keep line breaks in pending question text (pingdotgg…
c6b18c4 
…#33353)

Co-authored-by: Grok 4.7 (Grok) <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@only21mil @maria-rcks @juliusmarminge
fix(mobile): opening a search result clears Home's search on iPhone (p…
ad2d22c 
…ingdotgg#28324)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
fix(desktop): Escape during IME composition no longer cancels a previ…
a6b8f71 
…ew annotation (pingdotgg#35645)
@mkantautas @maria-rcks @juliusmarminge
fix(web): a click no longer lands on the sidebar row that just slid u…
b1c1e07 
…nder it (pingdotgg#23517)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@onlydole @maria-rcks @juliusmarminge
fix(mcp): background wait fails when none of its task IDs exist (ping…
613d1ac 
…dotgg#29773)

Co-authored-by: Taylor Dolezal <117500+onlydole@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@TanJeeSchuan @juliusmarminge
fix(web): the collapsed mobile composer shows Stop while a turn runs (p…
e1d59d1 
…ingdotgg#29959)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
test(web): split the cloud voice cancel flow from the failed-then-sav…
bce2bc0 
…ed setup (pingdotgg#35665)
@t3dotgg @claude
fix(desktop): nightly updates no longer depend on GitHub's tag order (p…
4cc6beb 
…ingdotgg#35599)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@juliusmarminge
fix(web): PDF preview prerenders pages two viewports below the visibl…
ff04519 
…e area (pingdotgg#35666)
@Yuruzuu @juliusmarminge
perf(server): uploading a large document with seven notebooks finishe…
e253b88 
…s 1.8x faster (median 823 ms -> 461 ms) (pingdotgg#33946)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@meutex @maria-rcks
@ElliotDrel @juliusmarminge
Typeset equations that fail only because of an unescaped percent (pin…
c4e74fe 
…gdotgg#29511)

Co-authored-by: meutex <342316034+meutex@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Elliot Drel <elliotdrel@gmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@only21mil @maria-rcks @juliusmarminge
fix(server): wake PR watches when the merge queue drops a pull request (
dbaef80 
pingdotgg#24141)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
fix(web): legacy collapsed project folders stay collapsed after a save (
db470a3 
pingdotgg#35659)
@voltcrash @juliusmarminge
fix(server): explain how to close unclaimed browser tabs (pingdotgg#2…
c60aa1a 
…9205)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@only21mil @juliusmarminge
fix(editors): JetBrains IDEs open file links in the thread's project (p…
9ccc0f8 
…ingdotgg#33558)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@binjamshid @juliusmarminge
fix(mobile): select part of a source file's text on iOS (pingdotgg#33218
e895a56 
)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@shivamhwp PR Batch Tester
@maria-rcks @juliusmarminge
fix(mobile): show loading until existing threads are known (pingdotgg…
bc0befe 
…#28663)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
fix(web): streamed device toolbar starts at the panel size (pingdotgg…
aa37097 
…#35664)
@nateEc @maria-rcks @juliusmarminge
fix(acp): preserve OMP single-choice questions and custom answers (pi…
1e6a251 
…ngdotgg#24012)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
fix(server): workspace search leaves out files Git ignores outside .g…
3de49ba 
…itignore (pingdotgg#35673)
@KenDJohnson @maria-rcks @juliusmarminge
fix(server): worktree setup no longer hangs when the shell is Nushell (…
12a62ed 
…pingdotgg#29461)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@zmievsa @maria-rcks @juliusmarminge
fix(secrets): notify when a delegated agent asks for a secret (pingdo…
6641231 
…tgg#33585)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@only21mil @juliusmarminge
fix(web): Cursor threads keep a stored model the catalog doesn't list (…
a98bc69 
…pingdotgg#24872)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
fix(server): workspace search keeps backslashes in POSIX file names (p…
1e20361 
…ingdotgg#35672)
@johanjohnthomas johan.thomas
@maria-rcks @juliusmarminge
fix(provider): make readiness probe timeouts configurable (pingdotgg#…
de77e61 
…33275)

Co-authored-by: johan.thomas <johan.thomas@inceptionai.ai>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@only21mil @maria-rcks @juliusmarminge
fix(cursor): mcp.json servers using ${workspaceFolder} now start (pin…
cc97303 
…gdotgg#24505)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@fireboltdude1357
Merge commit 'cc973033818e630dec3c5cc14dc924bfbec7277d' into fix/bots…
24da461 
…-upstream-cc97303

# Conflicts:
#	apps/server/src/relay/AgentAwarenessRelay.ts
@fireboltdude1357
fireboltdude1357 merged commit a16f51a into patch/bots Nov 12, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.