Repository navigation
Merge upstream/main 8760d063e9 into coder-only - #302
Merged
Merged
Conversation
…ingdotgg#28409) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#28446) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ery (pingdotgg#14519) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: SAPHID <saphid@users.noreply.github.com>
…ingdotgg#15000) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ingdotgg#21527) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#21913) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ntents (pingdotgg#22302) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…#23230) Co-authored-by: maria-rcks <maria@kuuro.net>
…gdotgg#23414) Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <maria@kuuro.net>
… runs on (pingdotgg#24833) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
… on (pingdotgg#24898) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…sts (pingdotgg#25836) Co-authored-by: maria-rcks <maria@kuuro.net>
… Working shelf (pingdotgg#26195) Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ingdotgg#26247) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…26666) Co-authored-by: maria-rcks <maria@kuuro.net>
…gg#27032) Co-authored-by: maria-rcks <maria@kuuro.net>
…dotgg#27268) Co-authored-by: maria-rcks <maria@kuuro.net>
…dotgg#27310) Co-authored-by: maria-rcks <maria@kuuro.net>
…g#27803) Co-authored-by: maria-rcks <maria@kuuro.net>
…7925) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
pingdotgg#28104) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ledgement (pingdotgg#16419) Co-authored-by: Codex (gpt-6.1-sol) <noreply@openai.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…#28027) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…gdotgg#28474) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…8593) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#28605) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Brings 172 upstream commits (15fe283..8760d06): child approvals in parent threads (pingdotgg#28516), run-once scheduled tasks (pingdotgg#28104), the Claude stop hang fix (pingdotgg#16419), the Codex write-failure fix (pingdotgg#27924), GitLab fixes (pingdotgg#27511, pingdotgg#21543), PR clone URLs on the PR's host (pingdotgg#15000), bulk MR link and unlink tools (pingdotgg#27994, pingdotgg#27925), Changes totals after remote polls (pingdotgg#28600), repository lookups that skip git for folders without a repository (pingdotgg#27980), generic ACP fixes Kilo Code uses (pingdotgg#25564, pingdotgg#27927, pingdotgg#22608), and many web fixes. Merged with merge.directoryRenames=false. scripts/sync-resolve-deleted.mjs removed the 201 modify/delete conflicts under cut paths and the upstream files added under them (mobile's markdownDetails, desktop compile cache). Cut, with the paths added to DELETED_PATHS: - pingdotgg#27433 CLI compile cache (cliCompileCache.ts): only the uncarried bin.ts uses it. - pingdotgg#14519 staleWhileRevalidate.ts: only the cut launcher and remote open targets use it; ws.ts keeps none of the late remote-target discovery. - pingdotgg#28566 startup profiling scripts: they preload into upstream's dev runner and CLI, neither carried. Its Sqlite.setup span merges in. - pingdotgg#28572 desktop server bytecode cache scripts. Also cut: pingdotgg#23177 (OTLP), pingdotgg#28027 (preview_open), pingdotgg#28593 (release notes), pingdotgg#28105 (T3 Connect HTTP/2 fallback, cloud/), desktop and mobile commits, Copilot's lost-session restart (pingdotgg#26651: adapter flavor and its test), Cursor/OpenCode/Antigravity/Muse/fx fixes, and the fallback model row, search item, and effort picker (pingdotgg#27376, pingdotgg#27593; fallback is cut). Conflicts: - ws.ts, ws.test.ts: every upstream hunk is editor or remote-target discovery, which the helper does not serve; kept ours. - state/shell.ts: kept the fork's every-workspace-remote atom; upstream's shell.test.ts tests the primary-environment factory the fork replaces, so it stays uncarried. - ExpandedImageDialog.browser.test.tsx: carried for pingdotgg#27519 without the SnapShot accessibility case. - RepositoryIdentityResolver.test.ts: the fork's mocked cases get a folder-reporting FileSystem for pingdotgg#27980, plus upstream's new case. - VcsStatusBroadcaster.test.ts: upstream's two tests for pingdotgg#28600 and the explicit-refresh test go into the fork's file. - AcpRegistryAdapterV2.test.ts, provider-acp-registry adapter.ts: ours (Copilot only). - pullRequests tools.ts, t3ToolSummary.ts, settings text, ChatComposer, ThreadDetailsPrRow: upstream's text with the merge request wording. - ScheduledTasksSettings.tsx: upstream's Once mode without webhook parts. - ProjectDefaultsSettings.tsx: upstream's mixed-default logic without the fallback row. - docs/user: the fork's pages with upstream's resume, context meter, and subagent approval text; README, knip.jsonc, package.json kept ours. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Upstream's applyShellEnvironment (pingdotgg#28556) applies the desktop host's discovered environment and takes its patch type from the uncarried resource telemetry contracts. Drop it and its test case. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
modelSelection.ts and ProjectDefaultsSettings.tsx call resolveProjectDefaultProviderModelSelection again, and the VS Code theme import (pingdotgg#25375) parses JSONC with jsonc-parser 3.3.1, upstream's version. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Upstream moved ChatGptSharingControl into the docked picker's list footer; subscription plans are out of scope, so the footer is not carried. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The bulk provider update scope gate (pingdotgg#23183) is open under the always-grant scopes, preview.focusUrl forwarding needs a desktop page, and the fallback model search target and Antigravity alias cases cover uncarried surfaces. ProjectSettingsPanel's test imports act again. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The helper carries upstream's run-once schedules (pingdotgg#28104), so it reports the new oneTimeSchedules capability as upstream's server does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The bulk link and unlink tool presentations, the proactive panels row, the MR Code resize handle, and the one-time schedule notice. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
List the new cuts in the seams doc (fallback model search and effort picker, the desktop shell environment helper, the docked ChatGPT footer, and the test cases dropped for cut surfaces), note why upstream's web shell.test.ts stays uncarried, and recheck the GitLabCli fixes against 8760d06. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Upstream's test covers the primary-environment factory that the fork's every-workspace-remote shell atom replaces, so later syncs drop it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The settings search cases drop the fallback model item, and pingdotgg#25511's draft model case runs on Claude instances, since OpenCode is never offered. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
ChatHeader's test stubs the Coder workspace latency badge, the linked status test expects merge request labels, and the stack menu test drops the GitHub CLI refusal case. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
henrychu04
added a commit
that referenced
this pull request
Nov 1, 2026
Fix the Fable review findings for #302
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.
Merges upstream
pingdotgg/t3codemainat8760d063e9(172 commits from15fe283272) intocoder-only. The merge commit holds only the merge itself; each adaptation after it is its own commit.What upstream brings
oneTimeSchedules)Cut
cloud/), and desktop and mobile commitsbin.tsuses it)staleWhileRevalidate.tsand the late remote-open-target discovery inws.tsSqlite.setupspan is carried)applyShellEnvironmentNew cut paths are added to
DELETED_PATHSinscripts/sync-resolve-deleted.mjs.Restored or adapted
resolveProjectDefaultProviderModelSelectionandjsonc-parser3.3.1 are restored, because carried web code imports them again.RepositoryIdentityResolver.test.ts's mocked cases now read a folder-reporting FileSystem (perf(server): projects without a repository stop spawning git on every lookup pingdotgg/t3code#27980).VcsStatusBroadcaster.test.tsgets upstream's fix(server): refresh Changes totals after remote polls pingdotgg/t3code#28600 tests, plus the explicit-refresh test that an older fork adaptation had dropped.SYNC_BASEis now8760d063e9, and the GitLabCli fixes are rechecked against8760d063e9.Verification
pnpm test:coder: exit 0. The first runs found the test adaptations above. One gateway free-port test failed once because another process held the port; it passed twice when rerun alone, and the full suite then passed.AGENTS.md,pnpm knip:check,node scripts/seams-check.mjs 8760d063e9, the unused-locals check,pnpm build, andvp fmt --checkover the changed files: all pass.Open
upstreamissues: #275 and #229 are unchanged. Their upstream fixes are not in this range. pingdotgg#28516 lets you answer a child approval in the parent, but the parent's "Open approval" link still opens the task in the parent's workspace.🤖 Generated with Claude Code