Repository navigation
Merge upstream/main bb7783e295 into coder-only (sync stage 1) - #253
Merged
Merged
Conversation
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…23819) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…3832) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#23900) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#23852) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com> Co-authored-by: Yordis Prieto <yordis.prieto@gmail.com>
…24229) Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com> Co-authored-by: Yordis Prieto <yordis.prieto@gmail.com>
…hrough history (pingdotgg#24235) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…build output (pingdotgg#23965) Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com> Co-authored-by: Theo Browne <me@t3.gg> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Victor Vogel <satsdev@only21mil.xyz> Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Yash Singh <saiansh2525@gmail.com> Co-authored-by: Joseph Vidal <135430578+josephv123@users.noreply.github.com> Co-authored-by: Theo Browne <me@theo.li> Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com> Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: fixfon <12512757+fixfon@users.noreply.github.com> Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com> Co-authored-by: Yukun Shan <92423096+nateEc@users.noreply.github.com> Co-authored-by: Akshar Patel <123344143+AksharP5@users.noreply.github.com> Co-authored-by: Ben Davis <45952064+bmdavis419@users.noreply.github.com>
…otgg#23922) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… for a scroll (pingdotgg#23923) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#23924) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#22585) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#22628) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
… other services (pingdotgg#23975) Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
…ingdotgg#23974) Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
pingdotgg#24284) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#24295) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…n the timeline (pingdotgg#24299) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Labeled same-repo PRs deploy stage pr-<n> behind the relay-preview environment reviewer gate. Unlabel or close tears the stage down, and a nightly job retries failed teardowns. Runtime-created managed endpoint tunnels and CNAMEs are swept by a PreviewTunnelSweep resource. Known gaps, tracked as follow-ups: an interrupted preview deploy can leave runtime tunnels behind; repo-level relay secrets still bypass the environment gate until moved. 🤖 Generated with [Claude Code](https://claude.com/claude-code)
…ingdotgg#24172) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#23895) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ver (pingdotgg#23814) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…he version mismatch instead of reconnecting forever (pingdotgg#23647) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#23789) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#24329) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Theo Browne <me@theo.li> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…24206) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#24339) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#24348) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#24287) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…e search (pingdotgg#24343) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Stage 1 of the eb1510d → 8176b58 sync: 48 upstream commits up to the Cmd+K indexed message search (pingdotgg#24343), stopping before the forge-definitions refactor (pingdotgg#23992–pingdotgg#24288), which follows as its own stage. Upstream brought, among others: indexed thread message search with ranked palette results (pingdotgg#24343, migration 069), merge request list filters that search the host (pingdotgg#23922–pingdotgg#23924, new pullRequests.filterOptions RPC), instant upload tiles for pasted images (pingdotgg#23832), Stop clearing commands the server already finished (pingdotgg#23814), fork /compact of inherited history (pingdotgg#24172), coalesced streaming text updates (pingdotgg#24267), periodic merge request discovery paused without foreground clients (pingdotgg#23852), stale CLI service recovery (pingdotgg#23541), and terminal clipboard and timeline perf work. Conflict resolution: - Deleted surfaces stay deleted: mobile, desktop, relay preview stages and workflows, Muse usage history, resource telemetry, DatabaseMaintenance, migrate-dev-db, check-changed, platform/serverLogger/pullRequest contract tests, and upstream's manual repro fixtures and seed scripts. - config.ts, server.ts, builtInDrivers.ts, platform.ts, vite.config.ts, knip.jsonc, pnpm-lock.yaml: ours; upstream changed only cut regions (OTLP resource attributes, Muse usage, desktop SSH version mismatch, mobile lint). - rpc.ts, PullRequestService.ts, ws.ts: take filterOptions without the omitted cross-environment routing; CoderWsRpcGroup serves it. - settingsSearch.ts: upstream's settingsForThisPlatform, keeping the Coder rule that desktop-only rows never render. - CommandPalette.tsx: upstream's message-search footer notice without the file manager action; copy-reference search terms keep MR wording. - ComposerAttachmentStrip.tsx, ChatComposer.tsx: upstream's preparing-image tiles replayed into the fork's tile without SnapShot. - Sidebar.logic.ts, threads.ts, threads-sync.test.ts, shared package.json, thread-sidebar.md: both sides, with workspace and merge request wording. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#24218 meters every git subprocess through observability/Metrics.ts, which the fork does not carry (no telemetry export). VcsProcess keeps upstream's Effect.fn spawn shape without the metric operation set, exit tap, or withMetrics wrapper; the metric tests in GitVcsDriver.test.ts are not carried. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#23852 pauses ThreadPullRequestService's minute-by-minute merge request sweep unless BackgroundPolicy.shouldRunOpportunisticWork. The fork's always-allow stub gains that field as true: the workspace server runs only while the gateway holds its helper. coderServer.ts provides the policy to the runtime dependencies as upstream's layerBackground does, and the new idle-sweep test mocks the policy without upstream's hasDemand query. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- threads-sync.test.ts: the new pending-work repair tests (pingdotgg#23814) load older history over the helper's historyPage RPC instead of an environment HTTP client. - PullRequestService.test.ts: the filter-options test (pingdotgg#23924) passes a branded SourceControlProviderKind, as the fork's project helper requires. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#24343's thread search explains a pull request match as "PR #N title". The hint is user-facing, so it follows the merge request wording seam; the search haystack keeps upstream's spelling. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Only upstream's DatabaseMaintenance and migrate-dev-db call rebuildMessageSearch, and the fork carries neither. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Since 772f618 the expected result carries the fork's stdoutInvalidUtf8 field, and the plain exitCode: 0 no longer matches ExecuteGitResult's branded ExitCode, so pnpm typecheck:server failed on coder-only. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
GitLabCli is unchanged upstream, so its carried fixes are checked against bb7783e. sync.md names this range's repro fixtures and notes that test:coder outlasts a foreground command. 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
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.
Stage 1 of the eb1510d → 8176b58 upstream sync: merges
upstream/mainthrough bb7783e (48 commits, up to Cmd+K indexed message search pingdotgg#24343). The forge-definitions refactor (pingdotgg#23992–pingdotgg#24288) and later commits follow as stage 2.Upstream brought
pullRequests.filterOptionsRPC, served inCoderWsRpcGroup)Cut or adapted (each marked
Coder:and listed indocs/internals/coder-only.md)VcsProcess; their tests not carriedBackgroundPolicy.shouldRunOpportunisticWorkis always true (the workspace server only runs while the gateway holds its helper);coderServer.tsprovides the policy as upstream'slayerBackgrounddoesPre-existing fixes found while verifying
pnpm typecheck:serverfailed oncoder-onlysince 772f618 (GitVcsDriverCore.test.tsplain exit code vs. brandedExitCode)readBody,coderWs.tsWorkspaceEntries, aChatMarkdowntestthreadRef)Verification
pnpm test:coderexit 0 (TMPDIR under /private/tmp for ClaudeSkills plugin-order test fails on macOS (/var symlink) #235)AGENTS.mdtypechecks,pnpm knip:check,pnpm build,vp fmt --checkover changed filesorchestration.searchThreadsandpullRequests.filterOptionsanswer; signed asset/upload smoke SMOKE OK🤖 Generated with Claude Code