Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions apps/web/src/components/CommandPalette.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1186,9 +1186,7 @@ function OpenCommandPaletteDialog(props: {

// Coder: continue a discovered workspace's Add project once its environment connects, unless
// the user has left the picker. Reopening Add project clears the pending connection.
const isAddProjectEnvironmentView =
currentView?.groups[0]?.value === "environments" ||
currentView?.groups[0]?.value === ADD_PROJECT_ENTRY_GROUP;
const isAddProjectEnvironmentView = currentView?.groups[0]?.value === ADD_PROJECT_ENTRY_GROUP;
useEffect(() => {
if (pendingAddProjectEnvironmentId === null || !isAddProjectEnvironmentView) return;
const environment = environments.find(
Expand Down
18 changes: 11 additions & 7 deletions docs/internals/coder-only.md
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ listed here is drift to remove rather than fork behavior to keep.
usage-limit panel, Codex feedback upload, local editors (`OpenInPicker`), and the favicon store.
The active workspace stands in for upstream's primary environment, and drafts read their
route workspace's config. The Files surface opens for drafts as on main. `chatCanvasLayout.ts` has no preview obstacles (it accepts upstream's `findBar` and ignores it),
and `ChatCanvas.test.tsx` covers only the details card inset below Find. Pieces upstream
and `chatCanvasLayout.test.ts` and `canvasStore.test.ts` carry no preview cases. Pieces upstream
moved out of `ChatView` carry the same cuts (each marked `Coder:`): `RightPanelSurfaceContent`
renders nothing for browser and device surfaces and names merge requests; `useRightPanelSurfaceClose` closes no preview sessions and asks no agent-browser
confirmation; `useQueuedRunEdit` carries no preview annotations; `useThreadLinkedPullRequest` names merge requests; `useSystemComposerBanners`
Expand Down Expand Up @@ -1053,7 +1053,7 @@ listed here is drift to remove rather than fork behavior to keep.
`canonicalizeGitCafePullRequestUrl` is an identity function, since GitCafe is not carried. Diff output is capped
(`DIFF_MAX_OUTPUT_BYTES`) to fit the gateway's `MAX_RPC_MESSAGE_BYTES` ceiling.
- GitLab fixes for bugs still in upstream's `GitLabCli` (checked against upstream `main`
becf853def):
e9236274a3):
merge requests between projects post to the source project with a numeric
`target_project_id` instead of sending the repository text as `source_project_id`; merge
request URLs reach `glab` as `--repo <url> ... -- <iid>` because older versions read URLs as
Expand Down Expand Up @@ -1196,7 +1196,8 @@ listed here is drift to remove rather than fork behavior to keep.
`coder ssh`. `connection/driver.ts`'s `checkHost` never answers, because the gateway answers
whether or not the workspace does; the silent socket check then ends only on a frame, and the
probe timeout decides. `connectedLeaseEnd` ends a lease only on a disconnect (no better routes
or relay credentials). `connection/registry.ts` starts every registered workspace's supervisor
or relay credentials). Upstream's `connection/supervisor.test.ts` is not carried; its harness
builds the multi-route driver, routes, and relay credentials the fork cuts. `connection/registry.ts` starts every registered workspace's supervisor
desired (upstream starts only enabled ones), since the Coder config owns registration. Its entries
carry no cached unsupported-host rejection, so web `state/server.ts`'s shortcut-keybinding
fallback presents each workspace's connection state as is.
Expand Down Expand Up @@ -1234,7 +1235,11 @@ listed here is drift to remove rather than fork behavior to keep.
`Coder:`).
- **Build tooling.** `scripts/lib/third-party-licenses.ts` never fetches during a build: SPDX
texts are committed under `licenses/spdx`, and only `pnpm licenses:sync` downloads missing
ones. It reads no device tool version pins, because device tools are not carried.
ones. It reads no device tool version pins, because device tools are not carried. Upstream's
CI-only checks are not carried, since the fork has no CI: the built web boot check
(`apps/web/scripts/verify-built-boot.ts`) and the agent context budget test
(`apps/server/src/provider/AgentContextBudget.test.ts` and `agentContextBudget.json`), which
measures MCP tool context the file bridge replaces.
`pnpm-workspace.yaml` sets `supportedArchitectures` (Linux x64 glibc) on every host, because
the helper bundle ships those native modules to the workspace; upstream sets it only on Windows
in `.pnpmfile.cjs`, which is not carried. Its `overrides` pin only the patched packages the
Expand Down Expand Up @@ -1292,9 +1297,8 @@ listed here is drift to remove rather than fork behavior to keep.
upstream's new publish-push, local-remote, display-casing, partial-clone, and missing-parent
clone cases on GitLab remotes with the fork's mocks. `ProviderRegistry.test.ts` runs upstream's
startup settings-change hydration tests without the uncarried Antigravity and OpenCode layers.
`ThreadDetailsPrRows.browser.test.tsx` checks the run context, not the editor picker. `CommandPalette.focus.browser.test.tsx`
mocks `useCoder` and sends `mod+p` with the platform's modifier (upstream's Ctrl+P matches only
off macOS), and `GitLabPullRequestCli.legacy.test.ts` expects the fork's `DIFF_MAX_OUTPUT_BYTES`.
`ThreadDetailsPrRows.browser.test.tsx` checks the run context, not the editor picker. `CommandPalette.browser.test.tsx`
mocks `useCoder`, and `GitLabPullRequestCli.legacy.test.ts` expects the fork's `DIFF_MAX_OUTPUT_BYTES`.
`SourceControlProviderRegistry.test.ts` is upstream's fake-driver file, with its unknown-host
fallback on a GitLab remote and a GitHub URL among the URLs no host claims.
`SourceControlRepositoryService.test.ts` does not carry upstream's two new lookup-detail tests. `DatabaseStorage.test.ts` omits upstream's two `t3 doctor` status tests,
Expand Down
3 changes: 2 additions & 1 deletion docs/internals/sync.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,8 @@ mobile's `microphonePriority.ts` into `packages/shared`) arrives as an added fil
- Relay (`apps/server/src/relay`, `infra`, `packages/ssh`, `packages/tailscale`); telemetry
(`apps/server/src/{telemetry,resourceTelemetry,usage,diagnostics}`, web `components/usage`).
- Upstream repository tooling (`.github`, `.repos`, `oxlint-plugin-t3code`, `docs/operations`,
`apps/server/integration`, `evals`, `.coderabbit.config.ts`).
`apps/server/integration`, `evals`, `.coderabbit.config.ts`) and upstream's CI-only checks
(`AgentContextBudget.test.ts`, `verify-built-boot.ts`).

Re-derive the list, and update the script's data, when the fork cuts or restores a surface:

Expand Down
6 changes: 5 additions & 1 deletion scripts/sync-resolve-deleted.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,12 @@ const DELETED_PATHS = {
".repos/",
".vite-hooks/",
".vscode/",
// Transfer-budget CI harness.
// CI-only checks: the transfer budget harness, the agent context budget test, and the built
// web boot check.
"apps/server/integration/",
"apps/server/src/provider/AgentContextBudget.test.ts",
"apps/server/src/provider/agentContextBudget.json",
"apps/web/scripts/verify-built-boot.ts",
"docs/operations/",
// CodeRabbit's configuration and upstream's MCP tool-use evals.
".coderabbit.config.ts",
Expand Down