Skip to content

chore(sync): merge Yarden-zamir/t3code main - #34

Merged
TomCohenDev merged 201 commits into
mainfrom
fork-sync/2026-11-14-1813
Nov 14, 2026
Merged

chore(sync): merge Yarden-zamir/t3code main#34
TomCohenDev merged 201 commits into
mainfrom
fork-sync/2026-11-14-1813

Conversation

@TomCohenDev

@TomCohenDev TomCohenDev commented Nov 14, 2026

Copy link
Copy Markdown
Owner

The daily Fork Sync (run 43625277360) stopped on a merge conflict in apps/mobile/src/features/threads/ThreadFeed.tsx.

Upstream wrapped the "thread unavailable" placeholder in a View with the content side insets. The fork passes a continue-thread-elsewhere action to the same placeholder. The resolution keeps upstream's wrapper and Tom's ContinueElsewhereButton inside it. No other file conflicted.

The machine map stays deleted, following Yarden (fb5f04e). The portal at map.tomcohen.dev is no longer built from this repo, and machines now join with kitshn join <code> --server <address>.

Checked locally: vp i, vp run typecheck (41/41), and the fork tests changed since the merge base: 12 files and 205 tests, plus the 3 apps/web unit test files. Fork CI runs the browser test.

Closes #33

Done by Claude Opus 5.5 in Claude Code (Fork repair agent).

🤖 Generated with Claude Code

davisonio and others added 30 commits November 14, 2026 00:38
@davisonio @maria-rcks @juliusmarminge
fix(server): npm provider updates only offer versions npm will install (
d2bdd58 
pingdotgg#24062)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@StiensWout @juliusmarminge
fix(web): recovered queued edits keep their mentions and context (pin…
5e06246 
…gdotgg#36578)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@only21mil @maria-rcks @juliusmarminge
perf(acp): long ACP threads reopen without per-chunk history copies (p…
35d01dc 
…ingdotgg#23724)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@StiensWout @juliusmarminge
fix(source-control): preserve .git in Azure DevOps repository names (p…
4d5d5f8 
…ingdotgg#36576)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@razzeee @maria-rcks @juliusmarminge
fix(server): interrupted checkpoints no longer leak temporary packs (p…
4652544 
…ingdotgg#23715)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@ThomasVuNguyen @juliusmarminge
fix(client-runtime): grouped projects no longer take one folder's nam…
306914f 
…e as their label (pingdotgg#35614)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
fix(pi): resumed threads run in the worktree after a handoff (pingdot…
bebaf3e 
…gg#36586)
@only21mil @maria-rcks @juliusmarminge
fix(server): honor the configured push remote on tracked branches (pi…
d0a494f 
…ngdotgg#24047)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@AatmanAJ Aatman Jain @juliusmarminge
fix(web): Esc closes the theme editor, not Settings (pingdotgg#25130)
000d82d 
Co-authored-by: Aatman Jain <lives@MacBook-Pro.local>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@MinitJain
fix(server): file changes with an empty list keep their file name (pi…
c0b140b 
…ngdotgg#30290)
@f4llenz @juliusmarminge
fix(web): re-picking the current model in Settings keeps its traits (p…
b4c1bd1 
…ingdotgg#35612)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@Zacharon @juliusmarminge
fix(web): browser tests no longer pick a port Windows has reserved (p…
2b6145b 
…ingdotgg#24007)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@StiensWout @juliusmarminge
fix(server): find files in newline-named nested worktrees (pingdotgg#…
e4688f7 
…36588)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@StiensWout @juliusmarminge
fix(web): recreated folders no longer show deleted files (pingdotgg#3…
28f1786 
…6590)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@jason5545 @juliusmarminge
fix(web): manual compaction counts history beyond the loaded page (pi…
3b18dc2 
…ngdotgg#25445)

Co-authored-by: jason chien <3936511+jason5545@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@nateEc @maria-rcks @juliusmarminge
fix(web): horizontal table scrolling preserves timeline follow (pingd…
2fa77fb 
…otgg#24045)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@maria-rcks @sgaabdu4 @juliusmarminge
fix(server): setup scripts complete with shell line editors (pingdotg…
83a276d 
…g#25472)

Co-authored-by: Abid A Gafoor <40262245+sgaabdu4@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@Zacharon @juliusmarminge
fix(shared): one-letter link schemes no longer become file links on W…
a61291e 
…indows (pingdotgg#24006)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@StiensWout @juliusmarminge
fix(usage): distinct email-less hub accounts no longer collapse (ping…
4192234 
…dotgg#36561)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
fix(pi): async pi-subagents workflow, chain and parallel members show…
75c544a 
… as subagents (pingdotgg#36599)
@BilalIrfanContact @maria-rcks @juliusmarminge
fix(web): new browser tabs open at your default zoom and appearance (p…
651accb 
…ingdotgg#25874)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@Yash-Singh1
feat(server): resume stopped provider threads natively (pingdotgg#36526)
9e19b7f
@StiensWout @juliusmarminge
fix(web): preserve saved notebook traceback frame boundaries (pingdot…
4574c60 
…gg#36602)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@StiensWout @juliusmarminge
fix(web): preserve literal entities in EPUB CDATA (pingdotgg#36595)
d6244ac 
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@StiensWout @juliusmarminge
fix(web): changed root files with a leading space open in the diff pa…
953ce60 
…nel (pingdotgg#36606)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@StiensWout @juliusmarminge
fix(server): thread reads wait for pending background work (pingdotgg…
43ba62b 
…#36610)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@StiensWout @juliusmarminge
fix(server): partial import retries no longer certify missing messages (
91fa913 
pingdotgg#36604)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
fix(server): background subagents stop running when their Claude sess…
4b99420 
…ion is released (pingdotgg#36569)
@StiensWout @juliusmarminge
fix(server): open colon-number project folders correctly in VS Code (p…
b37c959 
…ingdotgg#36613)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@saphid @github-actions
@maria-rcks @juliusmarminge
fix(mobile): the open button no longer covers inline page headings (p…
4121b30 
…ingdotgg#25858)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: SAPHID <saphid@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
torztomasz and others added 28 commits November 14, 2026 07:41
@torztomasz @juliusmarminge
fix(mobile): stop showing "cannot control this task" while permission…
1e9f93a 
…s load or after a network blip (pingdotgg#28708)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@flamboh @maria-rcks @juliusmarminge
fix(web): use optimistic updates for settings across environments (pi…
ee4ef06 
…ngdotgg#28945)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@saphid @github-actions @juliusmarminge
fix(web): Push on the default branch no longer offers a feature branc…
170c1f7 
…h the server rejects (pingdotgg#29845)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@saphid @maria-rcks @juliusmarminge
fix(web): long preview annotation comments are no longer dropped from…
154c501 
… the message (pingdotgg#29834)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@saphid @juliusmarminge
fix(mobile): long pull request searches on iOS no longer fail the list (
554c893 
pingdotgg#29850)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@Lucenx9 @maria-rcks @juliusmarminge
fix(shared): atomic saves handle long filenames (pingdotgg#33250)
043d712 
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@Yarden-zamir
test(server): worktree tests follow upstream's lock probe and cancel …
e915057 
…cleanup
@saphid @maria-rcks @juliusmarminge
fix(server): message search no longer finds rolled-back turns or canc…
48afc47 
…elled queued messages (pingdotgg#29874)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@geezoria @geezoria1337 @juliusmarminge
fix(web): OpenDocument slide previews no longer print speaker notes (p…
776698a 
…ingdotgg#33294)

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@saphid @juliusmarminge
fix(mobile): cancelled PR checks count as failing in the checks summa…
0d585f7 
…ry (pingdotgg#29809)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@saphid @github-actions @juliusmarminge
fix(mobile): .markdown, .mdown and .mkd files open with a Markdown pr…
2eb8829 
…eview (pingdotgg#29822)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@Yarden-zamir
test(web): arrow links mock answers upstream's live refresh
6829393
@saphid @juliusmarminge
fix(web,mobile): pull request project filter lists pinned projects fi…
49eb9c8 
…rst (pingdotgg#29871)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@juliusmarminge
fix(server): Claude Fable 5.2 is offered only from Claude Code 2.1.321 (
be2a287 
pingdotgg#36805)
@Yarden-zamir
Merge pull request pingdotgg#555 from Yarden-zamir/fork-sync/2026-11-…
6d68333 
…14-1440

chore(sync): merge pingdotgg/t3code main
@saphid @juliusmarminge
fix(mobile): scheduled tasks due within the hour no longer read "Next…
7b26203 
… run in 60 minutes" (pingdotgg#29756)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@t3dotgg @claude
test(server): title change test ignores a probe pending at browser cl…
cfd825c 
…ose (pingdotgg#36818)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
@saphid @maria-rcks @juliusmarminge
fix(server): agents can read documents a guest attaches (pingdotgg#29760
d109866 
)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@thelogicmatrix @juliusmarminge
fix(web): opening a very large folder no longer freezes the Files pan…
f05cd35 
…el (pingdotgg#29996)

Co-authored-by: Nathan Wong <20381195+thelogicmatrix@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@saphid @maria-rcks @juliusmarminge
fix(gitlab): a fork's same-named branch no longer hides the branch's …
abac683 
…own merge request (pingdotgg#29791)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@danjdewhurst @maria-rcks @juliusmarminge
fix(editors): Open in Zed no longer finds the ZFS event daemon (pingd…
b779d40 
…otgg#33461)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@only21mil @juliusmarminge
fix(server): preview hover and drag fail within their timeout, not up…
77b38f9 
… to 3x later (pingdotgg#33550)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@DavidMendesOS @juliusmarminge
fix(server): skills from CLAUDE_CODE_PLUGIN_DIRS plugins show in the …
5a15495 
…composer (pingdotgg#33341)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
@Yarden-zamir
chore(sync): merge pingdotgg/t3code main
17871c7 
# Conflicts:
#	apps/mobile/src/features/threads/thread-list-v2-items.tsx
#	apps/web/src/components/ThreadTerminalDrawer.tsx
#	apps/web/src/components/sidebar/SidebarThreadRow.tsx
@Yarden-zamir
test(server): guest share fork test provides DocumentText
d79ace1
@Yarden-zamir
Merge pull request pingdotgg#556 from Yarden-zamir/fork-sync/2026-11-…
eb91727 
…14-1638

chore(sync): merge pingdotgg/t3code main
@TomCohenDev
chore(sync): merge Yarden-zamir/t3code main
36a52f5 
# Conflicts:
#	apps/mobile/src/features/threads/ThreadFeed.tsx
@TomCohenDev @claude
style(mobile): format merged ThreadFeed placeholder
80bb9ba 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@TomCohenDev
TomCohenDev merged commit 5b54b1f into main Nov 14, 2026
21 checks passed
@TomCohenDev TomCohenDev mentioned this pull request Nov 14, 2026
Closed
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.

Fork sync: upstream merge failed