From a96b379903605fa13d05f5175bb8465b56bdf016 Mon Sep 17 00:00:00 2001 From: Henry Chu Date: Sun, 1 Nov 2026 07:56:21 -0500 Subject: [PATCH 1/2] Restore upstream's passive-observer VcsStatusBroadcaster test Fork commit e32f90cc04 renamed upstream's "releases remote demand while passive observers remain" (#15666) and dropped its includeRemote: false subscriber and remoteStatusCalls assertion without a seam. Take upstream's block again. Co-Authored-By: Claude Opus 5.5 --- apps/server/src/vcs/VcsStatusBroadcaster.test.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/apps/server/src/vcs/VcsStatusBroadcaster.test.ts b/apps/server/src/vcs/VcsStatusBroadcaster.test.ts index 0293211c42a64..e1a9069d51774 100644 --- a/apps/server/src/vcs/VcsStatusBroadcaster.test.ts +++ b/apps/server/src/vcs/VcsStatusBroadcaster.test.ts @@ -1025,7 +1025,7 @@ describe("VcsStatusBroadcaster", () => { }).pipe(Effect.provide(layerTestFor(state)), Effect.scoped); }); - it.effect("stops the remote poller after the last stream subscriber disconnects", () => { + it.effect("releases remote demand while passive observers remain", () => { const state = { currentLocalStatus: baseLocalStatus, currentRemoteStatus: baseRemoteStatus, @@ -1086,6 +1086,16 @@ describe("VcsStatusBroadcaster", () => { const secondSnapshot = yield* Deferred.make(); const firstScope = yield* Scope.make(); const secondScope = yield* Scope.make(); + const passiveSnapshot = yield* Deferred.make(); + yield* Stream.runForEach( + broadcaster.streamStatus({ cwd: "/repo", includeRemote: false }), + (event) => + event._tag === "snapshot" + ? Deferred.succeed(passiveSnapshot, event).pipe(Effect.ignore) + : Effect.void, + ).pipe(Effect.forkScoped); + yield* Deferred.await(passiveSnapshot); + assert.equal(state.remoteStatusCalls, 0); yield* Stream.runForEach(broadcaster.streamStatus({ cwd: "/repo" }), (event) => event._tag === "snapshot" ? Deferred.succeed(firstSnapshot, event).pipe(Effect.ignore) From 959d05f57cc7fe00b1cfc1332af804052ab3b146 Mon Sep 17 00:00:00 2001 From: Henry Chu Date: Sun, 1 Nov 2026 07:56:21 -0500 Subject: [PATCH 2/2] List this sync's test adaptations and the agent-credit cut in the seams doc Also name Kilo Code in the two Coder: comments that list the offered provider instances. Co-Authored-By: Claude Opus 5.5 --- apps/web/src/modelSelection.ts | 2 +- apps/web/src/providerInstances.ts | 2 +- docs/internals/coder-only.md | 9 +++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/apps/web/src/modelSelection.ts b/apps/web/src/modelSelection.ts index c80d9cac45402..1a7fd46b09f5e 100644 --- a/apps/web/src/modelSelection.ts +++ b/apps/web/src/modelSelection.ts @@ -31,7 +31,7 @@ import { import { ModelEsque } from "./components/chat/providerIconUtils"; import { type ProviderInstanceEntry, - // Coder: pickers and fallbacks only offer Codex, Claude, and Pi instances. + // Coder: pickers and fallbacks only offer Codex, Claude, Pi, and Kilo Code instances. deriveCoderProviderInstanceEntries, NO_PROVIDER_MODEL_SELECTION, resolveDefaultProviderModelSelection, diff --git a/apps/web/src/providerInstances.ts b/apps/web/src/providerInstances.ts index 4b0b4ae434f7c..c72919b9535b0 100644 --- a/apps/web/src/providerInstances.ts +++ b/apps/web/src/providerInstances.ts @@ -83,7 +83,7 @@ export function deriveProviderInstanceEntries( /** Instance ids repeat across environments; lookups must stay scoped. */ /** - * Coder: new selections are limited to Codex, Claude, and Pi instances, built-in or added in + * Coder: new selections are limited to Codex, Claude, Pi, and Kilo Code instances, built-in or added in * Settings → Providers. Keep the broader projection above for decoding historical upstream * data, but do not surface other providers in interactive pickers. */ diff --git a/docs/internals/coder-only.md b/docs/internals/coder-only.md index fb372b47a2828..a6a8779910a8b 100644 --- a/docs/internals/coder-only.md +++ b/docs/internals/coder-only.md @@ -943,7 +943,9 @@ checks that every name here still exists and that every modified upstream file i section has only the Linked environments switch (no guest links or Simlock row); About has no mobile app row, privacy link, or update track switch. - Search carries `sourceControlHostSearchItems` but not `SOURCE_CONTROL_HOST_LABELS`; the MR link - target row lives on Diffs with GitLab search terms. + target row lives on Diffs with GitLab search terms. Agent-credit removal applies only to GitHub + merges, so `ProjectDefaultsSettings.tsx` has no `removeAgentCreditsOnMerge` row and search has + no "Remove agent credits when merging" item. - Appearance's **Add theme** is `ThemeImportDialog` without the remote catalog or desktop picker. - Each workspace row carries `EnvironmentIconMenu`; the helper reports no `platform.machine`. `environmentTransportLabel` names every workspace "Coder workspace", so @@ -1064,7 +1066,10 @@ checks that every name here still exists and that every modified upstream file i the GitLab-only registry, `ProjectSettingsPanel` keeps `projects.getConfig` pending and drops the fallback-model search target, `ExpandedImageDialog` drops the SnapShot accessibility case, and `ProviderSettingsForm`, `ProviderModelPicker.composition`, and `ReopenClosedViewShortcut` drop - secret-source, provider, and preview cases. The fork-only `hooks/useThreadActionMenu.test.tsx` + secret-source, provider, and preview cases, `ChatHeader` mocks `CoderWorkspaceLatency`, and + `PullRequestStackMenu` drops the GitHub CLI refusal case. `modelSelection.test.ts` runs + upstream's OpenCode instance cases on Claude instances and drops the Antigravity alias case + (#27859). The fork-only `hooks/useThreadActionMenu.test.tsx` keeps upstream's deleted hook test. ## Cut surfaces