Skip to content

Merge upstream main 98beed1a22 into coder-only - #172

Merged
henrychu04 merged 69 commits into
coder-onlyfrom
t3code/sync-upstream-98beed1
Oct 10, 2026
Merged

henrychu04 merged 69 commits into
coder-onlyfrom
t3code/sync-upstream-98beed1

Conversation

@henrychu04

Copy link
Copy Markdown
Owner

Brings coder-only up to upstream/main 98beed1 (65 commits; origin/main was mirrored to the same commit first).

Coder adaptations

  • AgentScope (upstream fix(server): agents run in their own systemd scopes so an OOM kill spares the server pingdotgg/t3code#17662) is carried and provided in makeCoderRuntimeLayer. Agents and terminals in the workspace get upstream's oom_score_adj raise, plus systemd scopes when a user manager exists.
  • Claude CLI transport: ClaudeAgentSdk/ClaudeCli now pass executableArgs before the CLI's own arguments, as the SDK does. Upstream's AgentScope wraps Claude as /bin/sh … claude, and the transport used to reject that option, so every Claude turn failed after the merge. This was caught in the live smoke; a test now launches the CLI through agentScopeCommand.
  • MR watcher freshness (pre-existing): an earlier sync dropped allowStale from PullRequestRef along with cross-environment routing. Upstream's watcher also relies on allowStale: false to read past the held stale-while-revalidate detail, so every wake lagged one 2-minute poll. This PR restores upstream's field, service handling, reactor line, and test. Verified live: a passing pipeline now wakes the thread on the next poll.
  • GitManager keeps the GitLab refs/merge-requests fetch and adds upstream's fetch-by-name fallback. Upstream's Azure test now runs on GitLab URLs.
  • pullRequests.reportState joins CoderWsRpcGroup for wire parity; its caller, upstream's cross-environment routing, isn't carried.
  • Ported: right-panel tab drag reorder, maximize kept per thread, inline MR action confirmations, the MR search caret fix, the cap-aligned branch label, and the "Version" settings search row. All use GitLab wording.
  • Not carried: GitCafe, .icns project icons (no project favicons), the Claude organization id (it only keys usage accounts), update-track settings, and desktop/mobile changes.
  • Restores two PullRequestService state-announcement tests lost in an earlier sync. ThreadStatusIndicators and settingsSearch tests are adapted to GitLab-only hosts and no update track.

Checks

  • typecheck: gateway, helper, server, web, plus contracts, shared, client-runtime, coder-cli, provider-* and source-control-*.
  • pnpm test:coder has two known failures:
    • storageCleanup "aggregates expired artifacts": the known macOS /private/var TMPDIR issue; it passes with a realpath TMPDIR.
    • ProjectionRecovery "selects unfinished recovery work without reading settled thread histories": fails identically on a clean upstream/main checkout (Node 24.12). It's an upstream bug, left unfixed.
  • pnpm knip:check and pnpm build pass.
  • Live smoke (real Coder workspace, fake claude, smoke-only fake glab):
    • Claude turn through AgentScope.
    • Terminal through AgentScope (oom_score_adj = 800).
    • Tab drag reorder and maximize persistence.
    • Settings search finds Version.
    • MR list, search caret, detail checks running → passed, inline "Confirm auto-merge?" and "Confirm merge?", merge.
    • link_pull_request + watch_pull_request over the bridge: thread row and wake on pass.
    • PDF preview rendered in full headless Chrome's built-in viewer.

🤖 Generated with Claude Code

12ya and others added 30 commits October 9, 2026 23:59
…eyboards (pingdotgg#17492)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g#17702)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…end (pingdotgg#17384)

Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-authored-by: maria <maria@kuuro.net>
Co-authored-by: Mostafa Ben <bmostafa0123@gmail.com>
…ares the server (pingdotgg#17662)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…7695)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
flamboh and others added 29 commits October 10, 2026 02:24
… the PR (pingdotgg#17729)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…editor is a Windows command shim (pingdotgg#17749)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…utput (pingdotgg#17376)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… again (pingdotgg#17379)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…its thread (pingdotgg#17327)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…a check is still going (pingdotgg#17344)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Brings in 65 upstream commits. Coder adaptations:
- AgentScope is carried and provided in the helper runtime; agents and
  terminals get upstream's OOM isolation inside the workspace.
- GitManager keeps the GitLab merge-request ref fetch and adds upstream's
  fetch-by-name fallback; its test runs on GitLab URLs.
- pullRequests.reportState joins the helper RPC group for wire parity.
- Right panel tab reordering, persisted maximize, inline MR action
  confirmations, and the PR search caret fix are ported with GitLab wording.
- GitCafe, .icns project icons, the Claude organization id for usage
  accounts, update-track settings, and desktop/mobile changes are not
  carried.
- Restores two PullRequestService state-announcement tests lost in an
  earlier sync.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Upstream's agent scope wraps the Claude CLI by putting /bin/sh in front of
it and the CLI in executableArgs. The CLI transport rejected that option,
so every Claude turn failed to start after the sync.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The fork dropped allowStale with upstream's cross-environment routing, but
the merge-request watcher also uses allowStale: false to read past the
held stale-while-revalidate detail. Without it every wake lagged one
two-minute poll. Restore upstream's field, service handling, and test.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@henrychu04
henrychu04 merged commit 8ee1c89 into coder-only Oct 10, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.