Repository navigation
Merge upstream/main cfafb4bb54 into coder-only - #195
Merged
Merged
Conversation
…ucceeds (pingdotgg#20065) Co-authored-by: Aaron Queen <bompus@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ery child (pingdotgg#20062) Co-authored-by: Aaron Queen <bompus@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#20066) Co-authored-by: Aaron Queen <bompus@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#20070) Co-authored-by: Aaron Queen <bompus@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#20120) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#20147) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dows (pingdotgg#20162) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#20133) Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…arent (pingdotgg#20160) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#15945) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Michel-Liao <107891771+Michel-Liao@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
First of two stages toward upstream cfafb4b: every commit before the comment prune (pingdotgg#19559). Upstream brought the project-icon single chunk (pingdotgg#20147), the wide ignored folder listing shortcut (pingdotgg#20062), a Claude queued-message promotion test (pingdotgg#20065), and mobile, desktop, and repository-tooling changes that stay deleted. Conflicts: - ProjectFavicon.tsx: the fork's metadata-only icon component takes upstream's lazily loaded lucideIconByName chunk in place of lucide-react/dynamic; the fork's test file is kept. - WorkspaceEntries.ts and its test: the fork's bounded listing is kept. It stops at MAX_PROJECT_DIRECTORY_ENTRIES and classifies ignores with one git call, so upstream's shortcut is not carried (documented in the seams). - Mobile files, the @expo/ui patch, and VOUCHED.td stay deleted. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Second of two stages: the comment prune (pingdotgg#19559) and the seven commits after it. Upstream brought: - pingdotgg#19559, which deletes narration and history comments across about 3,100 files (comment-only). - pingdotgg#15945: Codex gets its own 20s auth-probe budget, so a slow but healthy Codex no longer shows as Unavailable. - pingdotgg#20160: pull requests built on the same parent stay in one stack layer. - pingdotgg#20194: running-status banners stay on one line. - "bye npm" (pingdotgg#20148), the Windows CLI triage fix (pingdotgg#20162), and mobile and release-tooling changes, all in surfaces the fork does not carry. Conflicts (192 files, almost all from pingdotgg#19559): - A hunk where upstream only removed or rewrapped comments takes the fork's code with upstream's comment edits applied. - Where upstream pruned a comment that also held a fork `Coder:` note, the note stays as its own comment (ChatView, _chat.tsx, ChatMarkdown, ProviderUpdatesAction, ModelManifest, pullRequestMarkdown, pullRequests, imageCompression, mcpExtensionSource, gitLabChangeRequestTemplate). - Regions the fork deleted (relay, desktop, self-update, browser preview, usage limits, host settings, HTTP snapshots) stay deleted. - CodexProvider.ts takes upstream's CODEX_AUTH_PROBE_TIMEOUT_MS beside the fork's runtime-mode imports. - AGENTS.md, knip.jsonc, the root and web vite configs, docs/user/install.md, and packages/shared/package.json keep the fork's versions. The npm launcher scripts, server CLI files, the no-low-value-comments lint rule, and its config stay out. Coder: marker counts are unchanged in every file upstream touched. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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
6 participants
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.
Syncs upstream 2a7bd16 → cfafb4b (18 commits) in two merge commits. The comment prune (pingdotgg#19559, about 3,100 files) gets its own stage so its conflicts stay separate from code changes.
Stage 1,
ba3582222f(everything before the prune). 5 conflicts.ProjectFaviconnow uses upstream'slucideIconByName.MAX_PROJECT_DIRECTORY_ENTRIESand labels ignored children with onegit check-ignorecall, so the shortcut has nothing to save. This is documented in the seams doc.Stage 2,
cfafb4bb54(the prune plus seven later commits). 192 content conflicts, nearly all from comment-only hunks.Coder:notes inside comments the prune deleted are kept as their own comments. The marker count is unchanged in every file upstream touched.no-low-value-commentslint rule, and the mobile and release-tooling changes all live in surfaces the fork does not carry, so they stay out.Docs. The GitLab seam is now checked against cfafb4b.
sync.mdhas a new rule for comment-only upstream commits.Verification.
pnpm test:coderpasses (exit 0). All typechecks listed in AGENTS.md,pnpm knip:check, andpnpm buildpass. I also ran the section 5 seam checks: no new RPCs, no new ClaudeQuerycalls or options, no contract field changes, and no new permission gates. There was no live Coder smoke test.🤖 Generated with Claude Code