fix: address copilot review feedback on testutil.Eventually usage

- Wrap testutil.Eventually return with require.True in Await* helpers
  (coderdtest.go) so tests fail immediately on timeout instead of
  returning zero-value structs.
- Replace testutil.Context(t, ...) inside polling loops with
  context.WithTimeout(ctx, ...) to avoid unbounded t.Cleanup
  accumulation (integration.go, workspaceproxy_test.go).
- Wrap testutil.Eventually return with require.True where variables
  populated inside the condition are used unconditionally afterward
  (workspaceagents_test.go, notifications_test.go).

.agents/skills/deep-review/SKILL.md

@@ -111,8 +111,8 @@ Tier 2 file filters:
 
 - **Modernization Reviewer**: one instance per language present in the diff. Filter by extension:
   - Go: `*.go` — reference `.claude/docs/GO.md` before reviewing.
-  - TypeScript: `*.ts` `*.tsx`: reference `.agents/skills/deep-review/references/typescript.md` before reviewing.
-  - React: `*.tsx` `*.jsx`: reference `.agents/skills/deep-review/references/react.md` before reviewing.
+  - TypeScript: `*.ts` `*.tsx`
+  - React: `*.tsx` `*.jsx`
 
   `.tsx` files match both TypeScript and React filters. Spawn both instances when the diff contains `.tsx` changes — TS covers language-level patterns; React covers component and hooks patterns. Before spawning, verify each instance's filter produces a non-empty diff. Skip instances whose filtered diff is empty.
 
@@ -155,11 +155,9 @@ File scope: {filter from step 2}.
 Output file: {REVIEW_DIR}/{role-name}.md
 ```
 
-For Modernization Reviewer instances, add the language reference after the methodology line:
+For the Modernization Reviewer (Go), add after the methodology line:
 
-- **Go:** `Read .claude/docs/GO.md as your Go language reference before reviewing.`
-- **TypeScript:** `Read .agents/skills/deep-review/references/typescript.md as your TypeScript language reference before reviewing.`
-- **React:** `Read .agents/skills/deep-review/references/react.md as your React language reference before reviewing.`
+> Read `.claude/docs/GO.md` as your Go language reference before reviewing.
 
 For re-reviews, append to both Tier 1 and Tier 2 prompts:
 

.agents/skills/deep-review/references/react.md

@@ -1,305 +0,0 @@
-# Modern React (18–19.2) + Compiler 1.0 — Reference
-
-Reference for writing idiomatic React. Covers what changed, what it replaced, and what to reach for. Includes React Compiler patterns — what the compiler handles automatically, what it changes semantically, and how to verify its behavior empirically. Scope: client-side SPA patterns only. Server Components, `use server`, and `use client` directives are framework-specific and omitted. Check the project's React version and compiler config before reaching for newer APIs.
-
-## How modern React thinks differently
-
-**Concurrent rendering** (18): React can now pause, interrupt, and resume renders. This is the foundation everything else builds on. Most existing code "just works," but components that produce side effects during render (mutations, subscriptions, network calls in the render body) are unsafe and will misbehave. Concurrent features are opt-in — they only activate when you use a concurrent API like `startTransition` or `useDeferredValue`.
-
-**Urgent vs. non-urgent updates** (18): The `startTransition` / `useTransition` API introduces a formal split between updates that must feel immediate (typing, clicking) and updates that can be interrupted (filtering a large list, navigating to a new screen). Non-urgent updates yield to urgent ones mid-render. Use this instead of `setTimeout` or manual debounce when you want the UI to stay responsive during expensive re-renders.
-
-**Actions** (19): Async functions passed to `startTransition` are called "Actions." They automatically manage pending state, error handling, and optimistic updates as a unit. The `useActionState` hook and `<form action={fn}>` prop are built on this. The pattern replaces the hand-rolled `isPending/setIsPending` + `try/catch` + `setError` boilerplate that was previously necessary for every data mutation.
-
-**Automatic batching** (18): State updates are now batched everywhere — inside `setTimeout`, `Promise.then`, native event handlers, etc. Previously batching only happened inside React-managed event handlers. If you genuinely need a synchronous flush, use `flushSync`.
-
-**Automatic memoization** (Compiler 1.0): React Compiler is a build-time Babel plugin that automatically inserts memoization into components and hooks. It replaces manual `useMemo`, `useCallback`, and `React.memo` — including conditional memoization and memoization after early returns, which manual APIs cannot express. The compiler only processes components and hooks, not standalone functions. It understands data flow and mutability through its own HIR (High-level Intermediate Representation), so it can memoize more granularly than a human would. Projects adopt it incrementally — typically via path-based Babel overrides or the `"use memo"` directive. Components that violate the Rules of React are silently skipped (no build error), so the automated lint tools that check compiler compatibility matter.
-
-## Replace these patterns
-
-The left column reflects patterns common before React 18/19. Write the right column instead. The "Since" column tells you the minimum React version required.
-
-| Old pattern                                                       | Modern replacement                                                             | Since |
-| ----------------------------------------------------------------- | ------------------------------------------------------------------------------ | ----- |
-| `ReactDOM.render(<App />, el)`                                    | `createRoot(el).render(<App />)`                                               | 18    |
-| `ReactDOM.hydrate(<App />, el)`                                   | `hydrateRoot(el, <App />)`                                                     | 18    |
-| `ReactDOM.unmountComponentAtNode(el)`                             | `root.unmount()`                                                               | 18    |
-| `ReactDOM.findDOMNode(this)`                                      | DOM ref: `const ref = useRef(); ref.current`                                   | 18    |
-| `<Context.Provider value={v}>`                                    | `<Context value={v}>`                                                          | 19    |
-| `React.forwardRef((props, ref) => ...)`                           | `function Comp({ ref, ...props }) { ... }` (ref as a regular prop)             | 19    |
-| String ref `ref="input"` in class components                      | Callback ref or `createRef()`                                                  | 19    |
-| `Heading.propTypes = { ... }`                                     | TypeScript / ES6 type annotations                                              | 19    |
-| `Component.defaultProps = { ... }` on function components         | ES6 default parameters `({ text = 'Hi' })`                                     | 19    |
-| Legacy Context: `contextTypes` + `getChildContext`                | `React.createContext()` + `contextType`                                        | 19    |
-| `import { act } from 'react-dom/test-utils'`                      | `import { act } from 'react'`                                                  | 19    |
-| `import ShallowRenderer from 'react-test-renderer/shallow'`       | `import ShallowRenderer from 'react-shallow-renderer'`                         | 19    |
-| Manual `isPending` state around async calls                       | `const [isPending, startTransition] = useTransition()`                         | 18    |
-| Manual optimistic state + revert logic                            | `useOptimistic(currentValue)`                                                  | 19    |
-| `useEffect` to subscribe to external stores                       | `useSyncExternalStore(subscribe, getSnapshot)`                                 | 18    |
-| Hand-rolled unique ID (counter, random, index)                    | `useId()` — SSR-safe, hydration-safe                                           | 18    |
-| `useEffect` to inject `<title>` or `<meta>` / `react-helmet`      | Render `<title>`, `<meta>`, `<link>` directly in components; React hoists them | 19    |
-| `ReactDOM.useFormState(action, initial)` (Canary name)            | `useActionState(action, initial)`                                              | 19    |
-| `useReducer<React.Reducer<State, Action>>(reducer)`               | `useReducer(reducer)` — infers from the reducer function                       | 19    |
-| `<div ref={current => (instance = current)} />` (implicit return) | `<div ref={current => { instance = current }} />` (explicit block body)        | 19    |
-| `useRef<T>()` with no argument                                    | `useRef<T>(undefined)` or `useRef<T \| null>(null)` — argument is now required | 19    |
-| `MutableRefObject<T>` type annotation                             | `RefObject<T>` — all refs are mutable now; `MutableRefObject` is deprecated    | 19    |
-| `React.createFactory('button')`                                   | `<button />` JSX                                                               | 19    |
-| `useMemo(() => expr, [deps])` in compiled components              | `const val = expr;` — compiler memoizes automatically                          | C 1.0 |
-| `useCallback(fn, [deps])` in compiled components                  | `const fn = () => { ... };` — compiler memoizes automatically                  | C 1.0 |
-| `React.memo(Component)` in compiled components                    | Plain component — compiler skips re-render when props are unchanged            | C 1.0 |
-| `eslint-plugin-react-compiler` (standalone)                       | `eslint-plugin-react-hooks@latest` (compiler rules merged into recommended)    | C 1.0 |
-| `useRef` + `useLayoutEffect` for stable callbacks                 | `useEffectEvent(fn)` — compiler handles both, but `useEffectEvent` is clearer  | 19.2  |
-
-## New capabilities
-
-These enable things that weren't practical before. Reach for them in the described situations.
-
-| What                                                                 | Since   | When to use it                                                                                                                                                                                                                                                                                                                                                                                                                                                              |
-| -------------------------------------------------------------------- | ------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `useTransition()` / `startTransition()`                              | 18      | Mark a state update as non-urgent so React can interrupt it to handle clicks or keystrokes. The `isPending` boolean lets you show a loading indicator without blocking the UI.                                                                                                                                                                                                                                                                                              |
-| `useDeferredValue(value, initialValue?)`                             | 18 / 19 | Defer re-rendering a slow subtree: pass the deferred value as a prop, wrap the expensive child in `memo`. Unlike debounce, uses no fixed timeout — renders as soon as the browser is idle. The `initialValue` arg (19) avoids a flash on first render.                                                                                                                                                                                                                      |
-| `useId()`                                                            | 18      | Generate a stable, SSR-consistent ID for accessibility attributes (`htmlFor`, `aria-describedby`). Do not use for list keys.                                                                                                                                                                                                                                                                                                                                                |
-| `useSyncExternalStore(subscribe, getSnapshot, getServerSnapshot?)`   | 18      | Subscribe to external (non-React) state stores safely under concurrent rendering. Preferred over `useEffect`-based subscriptions in libraries.                                                                                                                                                                                                                                                                                                                              |
-| `useActionState(action, initialState)`                               | 19      | Manage an async mutation: returns `[state, wrappedAction, isPending]`. Handles pending, result, and error state as a unit. Replaces the manual `isPending` + `try/catch` + `setError` pattern.                                                                                                                                                                                                                                                                              |
-| `useOptimistic(currentValue)`                                        | 19      | Show a speculative value while an async Action is in flight. Returns `[optimisticValue, setOptimistic]`. React automatically reverts to `currentValue` when the transition settles.                                                                                                                                                                                                                                                                                         |
-| `use(promiseOrContext)`                                              | 19      | Read a promise or Context value inside a component or custom hook. Unlike hooks, `use` can be called conditionally (after early returns). Promises must come from a cache — do not create them during render.                                                                                                                                                                                                                                                               |
-| `useFormStatus()` (from `react-dom`)                                 | 19      | Read `{ pending, data, method, action }` of the nearest parent `<form>` Action. Works across component boundaries without prop drilling — useful for submit buttons inside design-system components.                                                                                                                                                                                                                                                                        |
-| `useEffectEvent(fn)`                                                 | 19.2    | Extract a non-reactive callback from an effect. The function sees the latest props/state without being listed in deps, and is never stale. Replaces the `useRef`-and-mutate-in-layout-effect workaround for stable event-like callbacks. The compiler has built-in knowledge of this hook and correctly prunes its return value from effect dependency arrays. Both `useEffectEvent` and the old ref workaround compile cleanly; `useEffectEvent` is preferred for clarity. |
-| `<Activity>`                                                         | 19.2    | Hide part of the UI while preserving its state and DOM. React deprioritizes updates to hidden content. Use via framework APIs for route prerendering or tab preservation — not a direct replacement for CSS `visibility`.                                                                                                                                                                                                                                                   |
-| `captureOwnerStack()`                                                | 19.1    | Dev-only API that returns a string showing which components are responsible for rendering the current component (owner stack, not call stack). Useful for custom error overlays. Returns `null` in production.                                                                                                                                                                                                                                                              |
-| `<form action={fn}>`                                                 | 19      | Pass an async function as a form's `action` prop. React handles submission, pending state, and automatic form reset on success. Works with `useActionState` and `useFormStatus`.                                                                                                                                                                                                                                                                                            |
-| Ref cleanup function                                                 | 19      | Return a cleanup function from a ref callback: `ref={el => { ...; return () => cleanup(); }}`. React calls it on unmount. Replaces the pattern of checking `el === null` in the callback.                                                                                                                                                                                                                                                                                   |
-| `<link rel="stylesheet" precedence="default">`                       | 19      | Declare a stylesheet next to the component that needs it. React deduplicates and inserts it in the correct order before revealing Suspense content.                                                                                                                                                                                                                                                                                                                         |
-| `preinit`, `preload`, `prefetchDNS`, `preconnect` (from `react-dom`) | 19      | Imperatively hint the browser to load resources early. Call from render or event handlers. React deduplicates hints across the component tree.                                                                                                                                                                                                                                                                                                                              |
-| React Compiler (`babel-plugin-react-compiler`)                       | C 1.0   | Build-time automatic memoization for components and hooks. Install, add to Babel/Vite pipeline. Projects typically start with path-based overrides to compile a subset of files.                                                                                                                                                                                                                                                                                            |
-| `"use memo"` directive                                               | C 1.0   | Opt a single function into compilation when using `compilationMode: 'annotation'`. Place at the start of the function body. Module-level `"use memo"` at the top of a file compiles all functions in that file.                                                                                                                                                                                                                                                             |
-| `"use no memo"` directive                                            | C 1.0   | Temporary escape hatch — skip compilation for a specific component or hook that causes a runtime regression. Not a permanent solution. Place at the start of the function body.                                                                                                                                                                                                                                                                                             |
-| Compiler-powered ESLint rules                                        | C 1.0   | Rules for purity, refs, set-state-in-render, immutability, etc. now ship in `eslint-plugin-react-hooks` recommended preset. Surface Rules-of-React violations even without the compiler installed. Note: some projects use Biome instead — check project lint config.                                                                                                                                                                                                       |
-
-## Key APIs
-
-### `useTransition` and `startTransition` (18)
-
-`useTransition` returns `[isPending, startTransition]`. Wrap any state update that is not directly tied to the user's current gesture inside `startTransition`. React will render the old UI while computing the new one, and `isPending` is `true` during that window.
-
-In React 19, `startTransition` can accept an async function (an "Action"). React sets `isPending` to `true` for the entire duration of the async work, not just during the synchronous part.
-
-```tsx
-// 18: synchronous transition
-const [isPending, startTransition] = useTransition();
-startTransition(() => setQuery(input));
-
-// 19: async Action — isPending stays true until the await settles
-startTransition(async () => {
-	const err = await updateName(name);
-	if (err) setError(err);
-});
-```
-
-Use `startTransition` (the module-level export) when you cannot use the hook (outside a component, in a router callback, etc.).
-
-### `useDeferredValue` (18 / 19)
-
-Creates a "lagging" copy of a value. Pass it to a memoized, expensive component so that React can render the stale UI while computing the updated one.
-
-```tsx
-// 19: initialValue shows '' on first render; avoids loading flash
-const deferred = useDeferredValue(searchQuery, "");
-return <Results query={deferred} />; // Results wrapped in memo
-```
-
-`deferred !== searchQuery` while the deferred render is in progress — use this to show a "stale" indicator.
-
-### `useActionState` (19)
-
-Replaces the `useState` + `isPending` + `try/catch` + `setError` boilerplate for any async operation that can be retried or submitted as a form.
-
-```tsx
-const [error, submitAction, isPending] = useActionState(
-	async (prevState, formData) => {
-		const err = await updateName(formData.get("name"));
-		if (err) return err; // returned value becomes next state
-		redirect("/profile");
-		return null;
-	},
-	null, // initialState
-);
-
-// Use submitAction as the form's action prop or call it directly
-<form action={submitAction}>
-	<input name="name" />
-	<button disabled={isPending}>Save</button>
-	{error && <p>{error}</p>}
-</form>;
-```
-
-### `useOptimistic` (19)
-
-Shows a speculative value immediately while an async Action is in progress. React automatically reverts to the server-confirmed value when the Action resolves or rejects.
-
-```tsx
-const [optimisticName, setOptimisticName] = useOptimistic(currentName);
-
-const submit = async (formData) => {
-	const newName = formData.get("name");
-	setOptimisticName(newName); // shows immediately
-	await updateName(newName); // reverts if this throws
-};
-```
-
-### `use()` (19)
-
-Unlike hooks, `use` can appear after conditional statements. Two primary uses:
-
-**Reading a promise** (must be stable — from a cache, not created inline):
-
-```tsx
-function Comments({ commentsPromise }) {
-	const comments = use(commentsPromise); // suspends until resolved
-	return comments.map((c) => <p key={c.id}>{c.text}</p>);
-}
-```
-
-**Reading context after an early return** (hooks cannot appear after `return`):
-
-```tsx
-function Heading({ children }) {
-	if (!children) return null;
-	const theme = use(ThemeContext); // valid here; hooks would not be
-	return <h1 style={{ color: theme.color }}>{children}</h1>;
-}
-```
-
-### `useSyncExternalStore` (18)
-
-The correct way for libraries (and app code) to subscribe to non-React state. Prevents tearing under concurrent rendering.
-
-```tsx
-const value = useSyncExternalStore(
-	store.subscribe, // called when store changes
-	store.getSnapshot, // returns current value (must be stable reference if unchanged)
-	store.getServerSnapshot, // optional: for SSR
-);
-```
-
-## Verifying compiler behavior
-
-The compiler is a black box unless you inspect its output. When reviewing code in compiled paths, run the compiler on the specific code to see what it actually does. Do not guess — verify.
-
-**Run the compiler on a code snippet:**
-
-```sh
-cd site && node -e "
-const {transformSync} = require('@babel/core');
-const code = \`<paste component here>\`;
-const diagnostics = [];
-const result = transformSync(code, {
-  plugins: [
-    ['@babel/plugin-syntax-typescript', {isTSX: true}],
-    ['babel-plugin-react-compiler', {
-      logger: {
-        logEvent(_, event) {
-          if (event.kind === 'CompileError' || event.kind === 'CompileSkip') {
-            diagnostics.push(event.detail?.toString?.()?.substring(0, 200));
-          }
-        },
-      },
-    }],
-  ],
-  filename: 'test.tsx',
-});
-console.log('Compiled:', result.code.includes('_c('));
-if (diagnostics.length) console.log('Diagnostics:', diagnostics);
-console.log(result.code);
-"
-```
-
-**Reading compiled output:**
-
-- `const $ = _c(N)` — allocates N memoization cache slots.
-- `if ($[n] !== dep)` — cache invalidation guard. Re-computes when `dep` changes (referential equality).
-- `if ($[n] === Symbol.for("react.memo_cache_sentinel"))` — one-time initialization. Runs once on first render, cached forever after. This is how the compiler handles expressions with no reactive dependencies.
-- `_temp` functions — pure callbacks the compiler hoisted out of the component body.
-
-**Check all compiled files at once:**
-
-```sh
-cd site && pnpm run lint:compiler
-```
-
-This runs the compiler on every file in the compiled paths and reports CompileError / CompileSkip diagnostics. Zero diagnostics means all functions compiled cleanly.
-
-**What the compiler catches vs. what it does not:**
-
-The compiler emits `CompileError` for mutations of props, state, or hook arguments during render, and for `ref.current` access during render. The project's lint pipeline catches these automatically — do not flag them in review.
-
-The compiler does **not** flag impure function calls during render (`Math.random()`, `Date.now()`, `new Date()`). Instead it silently memoizes them with a sentinel guard, freezing the value after first render. This changes semantics without any diagnostic. Verify suspicious calls by running the compiler and checking for sentinel guards in the output.
-
-## Pitfalls
-
-Things that are easy to get wrong even when you know the modern API exists. Check your output against these.
-
-**Effects run twice in development with StrictMode.** React 18 intentionally mounts → unmounts → remounts every component in dev to surface effects that are not resilient to remounting. This is not a bug. If an effect breaks on the second mount, it is missing a cleanup function. Write `return () => cleanup()` from every effect that sets up a subscription, timer, or external resource.
-
-**Concurrent rendering can call render multiple times.** The render function (component body) may be called more than once before React commits to the DOM. Side effects (mutations, subscriptions, logging) in the render body will run multiple times. Move them into `useEffect` or event handlers.
-
-**Do not create promises during render and pass them to `use()`.** A new promise is created every render, causing an infinite suspend-retry loop. Create the promise outside the component (module level), or use a caching library (SWR, React Query, `cache()` from React) to stabilize it.
-
-**`useOptimistic` reverts automatically — do not fight it.** The optimistic value is a presentation layer only. When the Action settles, React replaces it with the real `currentValue` you passed in. Do not try to sync optimistic state back to your real state; let React handle the revert.
-
-**`flushSync` opts out of automatic batching.** If third-party code or a browser API (e.g. `ResizeObserver`) calls `setState` and you need synchronous DOM flushing, wrap with `flushSync(() => setState(...))`. This is a last resort; prefer letting React batch.
-
-**`forwardRef` still works in React 19 but will be deprecated.** Function components accept `ref` as a plain prop now. New code should use the prop directly. Existing `forwardRef` wrappers continue to work without changes; migrate when convenient.
-
-**`<Activity>` does not unmount.** Content inside a hidden `<Activity>` boundary stays mounted. Effects keep running. Use it for preserving scroll position or form state, not for preventing expensive mounts — use lazy loading for that.
-
-**TypeScript: implicit returns from ref callbacks are now type errors.** In React 19, returning anything other than a cleanup function (or nothing) from a ref callback is rejected by the TypeScript types. The most common case is arrow-function refs that implicitly return the DOM node:
-
-```tsx
-// Error in React 19 types:
-<div ref={el => (instance = el)} />
-
-// Fix — use a block body:
-<div ref={el => { instance = el; }} />
-```
-
-**TypeScript: `useRef` now requires an argument.** `useRef<T>()` with no argument is a type error. Pass `undefined` for mutable refs or `null` for DOM refs you initialize on mount: `useRef<T>(undefined)` / `useRef<HTMLDivElement | null>(null)`.
-
-**`useId` output format changed across versions.** React 18 produced `:r0:`. React 19.1 changed it to `«r0»`. React 19.2 changed it again to `_r0`. Do not parse or depend on the specific format — treat it as an opaque string.
-
-**`useFormStatus` reads the nearest parent `<form>` with a function `action`.** It does not reflect native HTML form submissions — only React Actions. A submit button that is a sibling of `<form>` (rather than a descendant) will not see the form's status.
-
-**Context as a provider (`<Context>`) requires React 19; `<Context.Provider>` still works.** Do not use `<Context>` shorthand in a codebase that needs to support React 18. The two forms can coexist during migration.
-
-**Compiler freezes impure expressions silently.** `Math.random()`, `Date.now()`, `new Date()`, and `window.innerWidth` in a component body all compile without diagnostics. The compiler wraps them in a sentinel guard (`Symbol.for("react.memo_cache_sentinel")`) that runs the expression once and caches the result forever. The value never updates on re-render. Fix: move to a `useState` initializer (`useState(() => Math.random())`), `useEffect`, or event handler.
-
-**Component granularity affects compiler optimization.** When one pattern in a component causes a `CompileError` (e.g., a necessary `ref.current` read during render), the compiler skips the **entire** component. If the rest of the component would benefit from compilation, extract the non-compilable pattern into a small child component. This keeps the parent compiled.
-
-**The compiler only memoizes components and hooks.** Standalone utility functions (even expensive ones called during render) are not compiled. If a utility function is truly expensive, it still needs its own caching strategy outside of React (e.g., a module-level cache, `WeakMap`, etc.).
-
-**Changing memoization can shift `useEffect` firing.** A value that was unstable before compilation may become stable after, causing an effect that depended on it to fire less often. Conversely, future compiler changes may alter memoization granularity. Effects that use memoized values as dependencies should be resilient to these changes — they should be true synchronization effects, not "run this when X changes" hacks.
-
-## Behavioral changes that affect code
-
-- **Automatic batching** (18): State updates in `setTimeout`, `Promise.then`, `addEventListener` callbacks, etc. are now batched into a single re-render. Previously only React synthetic event handlers were batched. Code that relied on unbatched updates (reading DOM synchronously after each `setState`) must use `flushSync`.
-
-- **StrictMode double-invoke** (18): In development, every component is mounted → unmounted → remounted with the previous state. Every effect runs cleanup → setup twice on initial mount. `useMemo` and `useCallback` also double-invoke their functions. Production behavior is unchanged. If a test or component breaks under this, the component had a latent cleanup bug.
-
-- **StrictMode ref double-invoke** (19): In development, ref callbacks are also invoked twice on mount (attach → detach → attach). Return a cleanup function from the ref callback to handle detach correctly.
-
-- **StrictMode memoization reuse** (19): During the second pass of double-rendering, `useMemo` and `useCallback` now reuse the cached result from the first pass instead of calling the function again. Components that are already StrictMode-compatible should not notice a difference.
-
-- **Suspense fallback commits immediately** (19): When a component suspends, React now commits the nearest `<Suspense>` fallback without waiting for sibling trees to finish rendering. After the fallback is shown, React "pre-warms" suspended siblings in the background. This makes fallbacks appear faster but changes the order of rendering work.
-
-- **Error re-throwing removed** (19): Errors that are not caught by an Error Boundary are now reported to `window.reportError` (not re-thrown). Errors caught by an Error Boundary go to `console.error` once. If your production monitoring relied on the re-thrown error, add handlers to `createRoot`: `createRoot(el, { onUncaughtError, onCaughtError })`.
-
-- **Transitions in `popstate` are synchronous** (19): Browser back/forward navigation triggers synchronous transition flushing. This ensures the URL and UI update together atomically during history navigation.
-
-- **`useEffect` from discrete events flushes synchronously** (18): Effects triggered by a click or keydown (discrete events) are now flushed synchronously before the browser paints, consistent with `useLayoutEffect` for those cases.
-
-- **Hydration mismatches treated as errors** (18 / improved in 19): Text content mismatches between server HTML and client render revert to client rendering up to the nearest `<Suspense>` boundary. React 19 logs a single diff instead of multiple warnings, making mismatches much easier to diagnose.
-
-- **New JSX transform required** (19): The automatic JSX runtime introduced in 2020 (`react/jsx-runtime`) is now mandatory. The classic transform (which required `import React from 'react'` in every file) is no longer supported. Most toolchains have already shipped the new transform; check your Babel or TypeScript config if you see warnings.
-
-- **UMD builds removed** (19): React no longer ships UMD bundles. Load via npm and a bundler, or use an ESM CDN (`import React from "https://esm.sh/react@19"`).
-
-- **React Compiler automatic memoization** (Compiler 1.0): Build-time Babel plugin that inserts memoization into components and hooks. Components that follow the Rules of React are automatically memoized; components that violate them are silently skipped (no build error, no runtime change). The compiler can memoize conditionally and after early returns — things impossible with manual `useMemo`/`useCallback`. Works with React 17+ via `react-compiler-runtime`; best with React 19+. Projects adopt incrementally via path-based Babel overrides, `compilationMode: 'annotation'`, or the `"use memo"` / `"use no memo"` directives. Check the project's Vite/Babel config to know which paths are compiled. Compiled components show a "Memo ✨" badge in React DevTools.

.agents/skills/deep-review/references/typescript.md

@@ -1,199 +0,0 @@
-# Modern TypeScript (5.0–6.0 RC) — Reference
-
-Reference for writing idiomatic TypeScript. Covers what changed, what it replaced, and what to reach for. Respect the project's minimum TypeScript version: don't emit features from a version newer than what the project targets. Check `package.json` and `tsconfig.json` before writing code.
-
-## How modern TypeScript thinks differently
-
-The 5.x era resolves years of module system ambiguity and cleans house on legacy options. Three themes dominate:
-
-**Module semantics are explicit.** `--verbatimModuleSyntax` (5.0) makes import/export intent visible in source: type imports must carry `type`, value imports stay. Combined with `--module preserve` or `--moduleResolution bundler`, the compiler now accurately models what bundlers and modern runtimes actually do. `import defer` (5.9) extends the model to deferred evaluation.
-
-**Resource lifetimes are first-class.** `using` and `await using` (5.2) provide deterministic cleanup without `try/finally`. Any object implementing `Symbol.dispose` participates. `DisposableStack` handles ad-hoc multi-resource cleanup in functions where creating a full class is overkill.
-
-**Inference is smarter about what it knows.** Inferred type predicates (5.5) let `.filter(x => x !== undefined)` produce `T[]` instead of `(T | undefined)[]` automatically. `NoInfer<T>` (5.4) gives library authors precise control over which parameters drive inference. Narrowing now survives closures after last assignment, constant indexed accesses, and `switch (true)` patterns.
-
-**TypeScript 6.0 is a transition release toward 7.0** (the Go-native port). It turns years of soft deprecations into errors and changes several defaults. Most impactful: `types` defaults to `[]` (must list `@types` packages explicitly), `rootDir` defaults to `.`, `strict` defaults to `true`, `module` defaults to `esnext`. Projects relying on implicit behavior need explicit config. Check the deprecations section before upgrading.
-
-## Replace these patterns
-
-The left column reflects patterns still common before TypeScript 5.x. Write the right column instead. The "Since" column tells you the minimum TypeScript version required.
-
-| Old pattern                                                                                                      | Modern replacement                                                                                                           | Since                            |
-| ---------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- | -------------------------------- | ------ |
-| `--experimentalDecorators` + legacy decorator signatures                                                         | Standard decorators (TC39): `function dec(target, context: ClassMethodDecoratorContext)` — no flag needed                    | 5.0                              |
-| Requiring callers to add `as const` at call sites                                                                | `<const T extends HasNames>(arg: T)` — `const` modifier on type parameter                                                    | 5.0                              |
-| `--importsNotUsedAsValues` + `--preserveValueImports`                                                            | `--verbatimModuleSyntax`                                                                                                     | 5.0                              |
-| `import { Foo } from "..."` when `Foo` is only used as a type                                                    | `import { type Foo } from "..."` or `import type { Foo } from "..."`                                                         | 5.0                              |
-| `"extends": "@tsconfig/strictest/tsconfig.json"` chain                                                           | `"extends": ["@tsconfig/strictest/tsconfig.json", "./tsconfig.base.json"]` (array form)                                      | 5.0                              |
-| `try { ... } finally { resource.close(); resource.delete(); }`                                                   | `using resource = acquireResource()` — calls `[Symbol.dispose]()` automatically                                              | 5.2                              |
-| `try { ... } finally { await resource.close() }`                                                                 | `await using resource = acquireAsyncResource()`                                                                              | 5.2                              |
-| Ad-hoc cleanup with multiple `try/finally` blocks                                                                | `using cleanup = new DisposableStack(); cleanup.defer(() => ...)`                                                            | 5.2                              |
-| `import data from "./data.json" assert { type: "json" }`                                                         | `import data from "./data.json" with { type: "json" }`                                                                       | 5.3                              |
-| `.filter(Boolean)` or `.filter(x => !!x)` to remove nulls                                                        | `.filter(x => x !== undefined)` or `.filter(x => x !== null)` (infers type predicate)                                        | 5.5                              |
-| Extra phantom type param to block inference bleed: `<C extends string, D extends C>`                             | `NoInfer<C>` on the parameter you don't want to drive inference                                                              | 5.4                              |
-| `/** @typedef {import("./types").Foo} Foo */` in JS files                                                        | `/** @import { Foo } from "./types" */` (JSDoc `@import` tag)                                                                | 5.5                              |
-| `myArray.reverse()` mutating in place                                                                            | `myArray.toReversed()` (returns new array)                                                                                   | 5.2                              |
-| `myArray.sort(cmp)` mutating in place                                                                            | `myArray.toSorted(cmp)` (returns new array)                                                                                  | 5.2                              |
-| `const copy = [...arr]; copy[i] = v`                                                                             | `arr.with(i, v)` (returns new array)                                                                                         | 5.2                              |
-| Manual `has`/`get`/`set` pattern on `Map`                                                                        | `map.getOrInsert(key, defaultValue)` or `getOrInsertComputed(key, fn)`                                                       | 6.0 RC                           |
-| `new RegExp(str.replace(/[.\*+?^${}()                                                                            | [\]\\]/g, '\\$&'))`                                                                                                          | `new RegExp(RegExp.escape(str))` | 6.0 RC |
-| `--moduleResolution node` (node10)                                                                               | `--moduleResolution nodenext` (Node.js) or `--moduleResolution bundler` (bundlers/Bun)                                       | 6.0 RC                           |
-| `"baseUrl": "./src"` + `"@app/*": ["app/*"]` in paths                                                            | Remove `baseUrl`; use `"@app/*": ["./src/app/*"]` in paths directly                                                          | 6.0 RC                           |
-| `module Foo { export const x = 1; }`                                                                             | `namespace Foo { export const x = 1; }`                                                                                      | 6.0 RC                           |
-| `export * from "..."` when all re-exported members are types                                                     | `export type * from "..."` (or `export type * as ns from "..."`)                                                             | 5.0                              |
-| `function f(): undefined { return undefined; }` — explicit return required in `: undefined`-returning function   | Remove the `return` entirely; `undefined`-returning functions no longer require any return statement                         | 5.1                              |
-| Manual type predicate annotation on a simple arrow: `(x: T \| undefined): x is T => x !== undefined`             | Remove the annotation; TypeScript infers `x is T` from `!== null/undefined` and `instanceof` checks automatically            | 5.5                              |
-| `const val = obj[key]; if (typeof val === "string") { use(val); }` — extract to const to narrow indexed access   | `if (typeof obj[key] === "string") { obj[key].toUpperCase(); }` directly — both `obj` and `key` must be effectively constant | 5.5                              |
-| Copy narrowed `let`/param to a `const`, or restructure code to escape stale closure narrowing after reassignment | Remove the copy; narrowing survives into closures created after the last assignment to the variable                          | 5.4                              |
-| `(arr as string[]).filter(...)` or restructure to avoid "not callable" errors on `string[] \| number[]`          | Call `.filter`, `.find`, `.some`, `.every`, `.reduce` directly on union-of-array types                                       | 5.2                              |
-| `if`/`else` chain used to work around lack of narrowing inside a `switch (true)` body                            | `switch (true)` — each `case` condition now narrows the tested variable in its clause                                        | 5.3                              |
-
-## New capabilities
-
-These enable things that weren't practical before. Reach for them in the described situations.
-
-| What                                            | Since  | When to use it                                                                                                                                                                                                                                |
-| ----------------------------------------------- | ------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `using` / `await using` declarations            | 5.2    | Any resource needing deterministic cleanup (file handles, DB connections, locks, event listeners). Object must implement `Symbol.dispose` / `Symbol.asyncDispose`.                                                                            |
-| `DisposableStack` / `AsyncDisposableStack`      | 5.2    | Ad-hoc multi-resource cleanup without creating a class. Call `.defer(fn)` right after acquiring each resource. Stack disposes in LIFO order.                                                                                                  |
-| `const` modifier on type parameters             | 5.0    | Force `const`-like (literal/readonly tuple) inference at call sites without requiring callers to write `as const`. Constraint must use `readonly` arrays.                                                                                     |
-| Decorator metadata (`Symbol.metadata`)          | 5.2    | Attach and read per-class metadata from decorators via `context.metadata`. Retrieved as `MyClass[Symbol.metadata]`. Requires `Symbol.metadata ??= Symbol(...)` polyfill.                                                                      |
-| `NoInfer<T>` utility type                       | 5.4    | Prevent a parameter from contributing inference candidates for `T`. Use when one argument should be the "source of truth" and others should only be checked against it.                                                                       |
-| Inferred type predicates                        | 5.5    | Filter callbacks that test for `!== null` or `instanceof` now automatically produce a type predicate. `Array.prototype.filter` then narrows the result array type.                                                                            |
-| `--isolatedDeclarations`                        | 5.5    | Require explicit return types on exported declarations. Unlocks parallel declaration emit by external tooling (esbuild, oxc, etc.) without needing a full type-checker pass.                                                                  |
-| `${configDir}` in tsconfig paths                | 5.5    | Anchor `typeRoots`, `paths`, `outDir`, etc. in a shared base tsconfig to the _consuming_ project's directory, not the shared file's location.                                                                                                 |
-| Always-truthy/nullish check errors              | 5.6    | Catches regex literals in `if`, arrow functions as comparators, `?? 100` on non-nullable left side, misplaced parentheses. No API to call; existing bugs now surface as errors.                                                               |
-| Iterator helper methods (`IteratorObject`)      | 5.6    | Built-in iterators from `Map`, `Set`, generators, etc. now have `.map()`, `.filter()`, `.take()`, `.drop()`, `.flatMap()`, `.toArray()`, `.reduce()`, etc. Use `Iterator.from(iterable)` to wrap any iterable.                                |
-| `--noUncheckedSideEffectImports`                | 5.6    | Error when a side-effect import (`import "..."`) resolves to nothing. Catches typos in polyfill or CSS imports.                                                                                                                               |
-| `--noCheck`                                     | 5.6    | Skip type checking entirely during emit. Useful for separating "fast emit" from "thorough check" pipeline stages, especially with `--isolatedDeclarations`.                                                                                   |
-| `--rewriteRelativeImportExtensions`             | 5.7    | Rewrite `.ts`→`.js`, `.tsx`→`.jsx`, `.mts`→`.mjs`, `.cts`→`.cjs` in relative imports during emit. Required when writing `.ts` imports for Node.js strip-types mode and still needing `.js` output for library distribution.                   |
-| `--erasableSyntaxOnly`                          | 5.8    | Error on constructs that can't be type-stripped by Node.js `--experimental-strip-types`: `enum`, `namespace` with code, parameter properties, `import =` aliases.                                                                             |
-| `require()` of ESM under `--module nodenext`    | 5.8    | Node.js 22+ allows CJS to `require()` ESM files (no top-level `await`). TypeScript now allows this under `nodenext` without error.                                                                                                            |
-| `import defer * as ns from "..."`               | 5.9    | Defer module _evaluation_ (not loading) until first property access. Module is loaded and verified at import time; side-effects are delayed. Only works with `--module preserve` or `esnext`.                                                 |
-| `Set` algebra methods                           | 5.5    | Non-mutating: `union`, `intersection`, `difference`, `symmetricDifference` → new `Set`. Predicate: `isSubsetOf`, `isSupersetOf`, `isDisjointFrom` → `boolean`. Requires `esnext` or `es2025` lib.                                             |
-| `Object.groupBy` / `Map.groupBy`                | 5.4    | Group an iterable into buckets by key function. Return type has all keys as optional (not every key is guaranteed present). Requires `esnext` or `es2024`+ lib.                                                                               |
-| `Temporal` API types                            | 6.0 RC | `Temporal.Now`, `Temporal.Instant`, `Temporal.PlainDate`, etc. Available under `esnext` or `esnext.temporal` lib. Usable in runtimes that already ship it (V8 118+, SpiderMonkey, etc.).                                                      |
-| `@satisfies` in JSDoc                           | 5.0    | Validates that a JS expression satisfies a type without widening it — the TS `satisfies` operator for `.js` files. Write `/** @satisfies {MyType} */` above the declaration or inline on a parenthesized expression.                          |
-| `@overload` in JSDoc                            | 5.0    | Declare multiple call signatures for a JS function. Each JSDoc comment tagged `@overload` is treated as a distinct overload; the final JSDoc comment (without `@overload`) describes the implementation signature.                            |
-| Getter/setter with completely unrelated types   | 5.1    | `get style(): CSSStyleDeclaration` and `set style(v: string)` can now have fully unrelated types, provided both have explicit type annotations. Previously the getter type was required to be a subtype of the setter type.                   |
-| `instanceof` narrowing via `Symbol.hasInstance` | 5.3    | When a class defines `static [Symbol.hasInstance](val: unknown): val is T`, the `instanceof` operator now narrows to the predicate type `T`, not the class type itself. Useful when the runtime check and the structural type differ.         |
-| Regex literal syntax checking                   | 5.5    | TypeScript validates regex literal syntax: malformed groups, nonexistent backreferences, named capture mismatches, and features not available at the current `--target`. No API needed; existing latent bugs surface as errors automatically. |
-| `--build` continues past intermediate errors    | 5.6    | `tsc --build` no longer stops at the first failing project. All projects are built and errors reported together. Use `--stopOnBuildErrors` to restore the old stop-on-first-error behavior. Useful for monorepos during upgrades.             |
-| `--module node18`                               | 5.8    | Stable `--module` flag for Node.js 18 semantics: disallows `require()` of ESM (unlike `nodenext`) and still allows import assertions. Use when pinned to Node 18 and not ready for `nodenext` behavior changes.                               |
-| `--module node20`                               | 5.9    | Stable `--module` flag for Node.js 20 semantics: permits `require()` of ESM, rejects import assertions. Implies `--target es2023` (unlike `nodenext`, which floats to `esnext`).                                                              |
-
-## Key APIs
-
-### `Disposable` / `AsyncDisposable` / stacks (5.2)
-
-Global types provided by TypeScript's lib (requires `esnext.disposable` or `esnext` in `lib`):
-
-- `Disposable` — `{ [Symbol.dispose](): void }`
-- `AsyncDisposable` — `{ [Symbol.asyncDispose](): PromiseLike<void> }`
-- `DisposableStack` — `defer(fn)`, `use(resource)`, `adopt(value, disposeFn)`, `move()`. Is itself `Disposable`.
-- `AsyncDisposableStack` — async equivalent. Is itself `AsyncDisposable`.
-- `SuppressedError` — thrown when both the scope body and a `[Symbol.dispose]` throw. `.error` holds the dispose-phase error; `.suppressed` holds the original error.
-
-Polyfill the symbols in older runtimes:
-
-```ts
-Symbol.dispose ??= Symbol("Symbol.dispose");
-Symbol.asyncDispose ??= Symbol("Symbol.asyncDispose");
-```
-
-### Decorator context types (5.0)
-
-Each decorator kind receives a typed context object as its second parameter:
-
-- `ClassDecoratorContext`
-- `ClassMethodDecoratorContext`
-- `ClassGetterDecoratorContext`
-- `ClassSetterDecoratorContext`
-- `ClassFieldDecoratorContext`
-- `ClassAccessorDecoratorContext`
-
-All context objects have `.name`, `.kind`, `.static`, `.private`, and `.metadata`. Method/getter/setter/accessor contexts also have `.addInitializer(fn)` for running code at construction time.
-
-### `IteratorObject` (5.6)
-
-`IteratorObject<T, TReturn, TNext>` is the new type for built-in iterable iterators. Key methods: `map`, `filter`, `take`, `drop`, `flatMap`, `forEach`, `reduce`, `some`, `every`, `find`, `toArray`. Not the same as the pre-existing structural `Iterator<T>` protocol.
-
-- Generators produce `Generator<T>` which extends `IteratorObject`.
-- `Map.prototype.entries()` returns `MapIterator<[K, V]>`, `Set.prototype.values()` returns `SetIterator<T>`, etc.
-- `Iterator.from(iterable)` converts any `Iterable` to an `IteratorObject`.
-- `AsyncIteratorObject` exists for async parity.
-- `--strictBuiltinIteratorReturn` (new `--strict`-mode flag in 5.6) makes the return type of `BuiltinIteratorReturn` be `undefined` instead of `any`, catching unchecked `done` access.
-
-### Array copying methods (5.2)
-
-Declared on `Array`, `ReadonlyArray`, and all `TypedArray` types. Use these instead of the mutating variants when you need to preserve the original:
-
-| Mutating                           | Non-mutating copy                     |
-| ---------------------------------- | ------------------------------------- |
-| `arr.sort(cmp)`                    | `arr.toSorted(cmp)`                   |
-| `arr.reverse()`                    | `arr.toReversed()`                    |
-| `arr.splice(start, del, ...items)` | `arr.toSpliced(start, del, ...items)` |
-| `arr[i] = v`                       | `arr.with(i, v)`                      |
-
-## Pitfalls
-
-Things easy to get wrong even when you know the modern API exists. Check your output against these.
-
-**tsconfig defaults changed hard in 6.0.** `types: []` means no `@types/*` packages load implicitly. If you see floods of "cannot find name 'process'" or "cannot find module 'fs'" after upgrading to 6.0, add `"types": ["node"]` (or whatever you need) to `compilerOptions`. `rootDir: "."` means a project with source in `src/` will emit to `dist/src/` instead of `dist/` — add `"rootDir": "./src"` explicitly. `strict: true` by default means projects with loose code see new errors.
-
-**`using` requires a runtime polyfill on older runtimes.** `Symbol.dispose` and `Symbol.asyncDispose` don't exist before Node.js 18.x / Chrome 120. Add the two-line polyfill at your entry point. `DisposableStack` and `AsyncDisposableStack` need a more substantial polyfill (e.g. from `@microsoft/using-polyfill`).
-
-**`using` disposes in LIFO order.** Resources declared later in a scope are disposed first. Declare in the order you want reversed cleanup (acquisition order). `DisposableStack.defer` also runs in LIFO order.
-
-**Inferred type predicates have if-and-only-if semantics.** `x => !!x` does NOT infer `x is NonNullable<T>` because `0`, `""`, and `false` are falsy but not absent. TypeScript correctly refuses the predicate. Use `x => x !== undefined` or `x => x !== null` for precise null/undefined filters. If a predicate isn't being inferred, the false branch is probably ambiguous.
-
-**`--verbatimModuleSyntax` breaks CJS `require` emit.** Under this flag ESM `import`/`export` is emitted verbatim. You cannot produce `require()` calls from standard `import` syntax. For CJS output you must use `import foo = require("foo")` and `export = { ... }` syntax explicitly.
-
-**`NoInfer<T>` doesn't prevent `T` from being resolved, only from being contributed at that position.** Other parameters can still infer `T`. It means "don't use me as an inference candidate", not "block `T` from being resolved".
-
-**`--isolatedDeclarations` requires explicit return types on all exports.** Exported arrow functions, function declarations, and class methods all need annotations if their return type isn't trivially inferrable from a literal or type assertion. Editor quick-fixes can add them automatically.
-
-**Standard decorators are incompatible with `--experimentalDecorators`.** Different type signatures, metadata model, and emit. A decorator written for one will not work with the other. `--emitDecoratorMetadata` is not supported with standard decorators. Don't mix the two systems in one project.
-
-**`import defer` does not downlevel.** TypeScript does not transform `import defer` to polyfill-compatible code. The module is still _loaded_ eagerly (must exist); only _evaluation_ is deferred. Only use it under `--module preserve` or `esnext` with a runtime or bundler that supports it.
-
-**`--erasableSyntaxOnly` prohibits parameter properties.** `constructor(public x: number)` is not allowed. Expand to an explicit field declaration plus assignment in the constructor body.
-
-**Closure narrowing is invalidated if the variable is assigned anywhere in a nested function.** TypeScript cannot know when a nested function will run, so any assignment to a `let`/param inside a nested function — even a no-op like `value = value` — invalidates narrowing for all closures in the outer scope. Only the outer "no further assignments after this point" pattern is safe.
-
-**Constant indexed access narrowing requires both `obj` and `key` to be unmodified between the check and the use.** If either is a `let` that could be reassigned, TypeScript will not narrow `obj[key]`. Extract the value to a `const` in that case.
-
-**`switch (true)` narrowing does not carry across fall-through cases.** In a `switch (true)`, each `case` condition narrows independently. A variable narrowed in `case typeof x === "string":` that falls through to the next case will have its narrowing widened by the next condition, not accumulated from the previous one.
-
-**`const` type parameter modifier falls back when constraint is mutable.** `<const T extends string[]>(args: T)` falls back to `string[]` because `readonly ["a", "b"]` isn't assignable to `string[]`. Use `<const T extends readonly string[]>` for arrays.
-
-**`assert` import syntax errors under `--module nodenext` since 5.8.** Any remaining `import x from "..." assert { ... }` must be updated to `import x from "..." with { ... }`.
-
-**`Array.prototype.filter(x => x !== null)` now narrows to non-null (5.5).** This is almost always correct, but if you intentionally needed the nullable type downstream, add an explicit annotation: `const items: (T | null)[] = arr.filter(x => x !== null)`.
-
-## Behavioral changes that affect code
-
-- **All enums are union enums** (5.0): Every enum member gets its own literal type. Out-of-domain literal assignment to an enum type now errors. Cross-enum assignment between enums with identical names but differing values now errors.
-- **Relational operators no longer allow implicit string/number coercions** (5.0): `ns > 4` where `ns: number | string` is a type error. Use `+ns > 4` to explicitly coerce.
-- **`--module`/`--moduleResolution` must agree on node flavor** (5.2): Mixing `--module nodenext` with `--moduleResolution bundler` is an error. Use `--module nodenext` alone or `--module esnext --moduleResolution bundler`.
-- **Deprecations from 5.0 become hard errors in 5.5**: `--importsNotUsedAsValues`, `--preserveValueImports`, `--target ES3`, `--out`, and several others are fully removed in 5.5. They can no longer be specified, even with `"ignoreDeprecations": "5.0"`. Migrate to `--verbatimModuleSyntax` for the import flags.
-- **Type-only imports conflicting with local values** (5.4): Under `--isolatedModules`, `import { Foo } from "..."` where a local `let Foo` also exists now errors. Use `import type { Foo }` or `import { type Foo }`.
-- **Reference directives no longer synthesized or preserved in declaration emit** (5.5): `/// <reference types="node" />` TypeScript used to add automatically is no longer emitted. User-written directives are dropped unless they carry `preserve="true"`. Update library `tsconfig.json` if you relied on this.
-- **`.mts` files never emit CJS; `.cts` files never emit ESM** (5.6): Regardless of `--module` setting. Previously the extension was ignored in some modes.
-- **JSON imports under `--module nodenext` require `with { type: "json" }`** (5.7): `import data from "./config.json"` without the attribute is now a type error.
-- **`TypedArray`s are now generic** (5.7): `Uint8Array` is `Uint8Array<TArrayBuffer extends ArrayBufferLike = ArrayBufferLike>`. Code passing `Buffer` (from `@types/node`) to typed-array parameters may see new errors. Update `@types/node` to a version that matches.
-- **`import assert { ... }` is an error under `--module nodenext`** (5.8): Node.js 22 dropped support for the old syntax. Use `with { ... }`.
-- **`types` defaults to `[]` in 6.0**: All implicit `@types/*` loading stops. Add an explicit `"types": ["node"]` or the array will remain empty. Using `"types": ["*"]` restores the 5.x behavior.
-- **`rootDir` defaults to `.` (the tsconfig directory) in 6.0**: Previously inferred from the common ancestor of all source files. Projects with `"include": ["./src"]` and no explicit `rootDir` will now emit into `dist/src/` instead of `dist/`. Add `"rootDir": "./src"` to fix.
-- **`strict` defaults to `true` in 6.0**: Projects that were implicitly not strict will see new errors. Set `"strict": false` explicitly if you're not ready to fix them.
-- **`--baseUrl` deprecated in 6.0** and no longer acts as a module resolution root. Add explicit prefixes to your `paths` entries instead.
-- **`--moduleResolution node` (node10) deprecated in 6.0**: Removed in 7.0. Migrate to `nodenext` or `bundler`.
-- **`amd`, `umd`, `systemjs`, `none` module targets deprecated in 6.0**: Removed in 7.0. Migrate to a bundler.
-- **`--outFile` removed in 6.0**: Use a bundler (esbuild, Rollup, Webpack, etc.).
-- **`module Foo { }` syntax removed in 6.0**: Rename all such declarations to `namespace Foo { }`.
-- **`--esModuleInterop false` and `--allowSyntheticDefaultImports false` removed in 6.0**: Safe interop is now always on. Default imports from CJS modules (`import express from "express"`) are always valid.
-- **Explicit `typeRoots` disables upward `node_modules/@types` fallback** (5.1): When `typeRoots` is specified and a lookup fails in those directories, TypeScript no longer walks parent directories for `@types`. If you relied on the fallback, add `"./node_modules/@types"` explicitly to your `typeRoots` array.
-- **`super.` on instance field properties is a type error** (5.3): Calling `super.foo()` where `foo` is a class field (arrow function assigned in the constructor) rather than a prototype method now errors. Instance fields don't exist on the prototype; `super.field` is `undefined` at runtime.
-- **`--build` always emits `.tsbuildinfo`** (5.6): Previously only written when `--incremental` or `--composite` was set. Now written unconditionally in any `--build` invocation. Update `.gitignore` or CI artifact management if needed.
-- **`.mts`/`.cts` extensions and `package.json` `"type"` respected in all module modes** (5.6): Format-specific extensions and the `"type"` field inside `node_modules` are now honored regardless of `--module` setting (except `amd`, `umd`, `system`). A `.mts` file will never emit CJS output even under `--module commonjs`.
-- **Granular return expression checking** (5.8): Each branch of a conditional expression (`cond ? a : b`) directly inside a `return` statement is now checked individually against the declared return type. Previously an `any`-typed branch could silently suppress type errors in the other branch.

.github/actions/install-syft/action.yaml

@@ -5,6 +5,6 @@ runs:
   using: "composite"
   steps:
     - name: Install syft
-      uses: anchore/sbom-action/download-syft@e22c389904149dbc22b58101806040fa8d37a610 # v0.24.0
+      uses: anchore/sbom-action/download-syft@f325610c9f50a54015d37c8d16cb3b0e2c8f4de0 # v0.18.0
       with:
-        syft-version: "v1.26.1"
+        syft-version: "v1.20.0"

.github/actions/setup-go/action.yaml

@@ -4,7 +4,7 @@ description: |
 inputs:
   version:
     description: "The Go version to use."
-    default: "1.25.8"
+    default: "1.25.7"
   use-cache:
     description: "Whether to use the cache."
     default: "true"

.github/dependabot.yaml

@@ -82,6 +82,9 @@ updates:
       mui:
         patterns:
           - "@mui*"
+      radix:
+        patterns:
+          - "@radix-ui/*"
       react:
         patterns:
           - "react"

.github/workflows/ci.yaml

@@ -35,7 +35,7 @@ jobs:
       tailnet-integration: ${{ steps.filter.outputs.tailnet-integration }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -157,7 +157,7 @@ jobs:
     runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -181,7 +181,7 @@ jobs:
           echo "LINT_CACHE_DIR=$dir" >> "$GITHUB_ENV"
 
       - name: golangci-lint cache
-        uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
           path: |
             ${{ env.LINT_CACHE_DIR }}
@@ -204,7 +204,7 @@ jobs:
 
       # Needed for helm chart linting
       - name: Install helm
-        uses: azure/setup-helm@dda3372f752e03dde6b3237bc9431cdc2f7a02a2 # v5.0.0
+        uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
         with:
           version: v3.9.2
         continue-on-error: true
@@ -247,7 +247,7 @@ jobs:
     runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -272,7 +272,7 @@ jobs:
     if: ${{ !cancelled() }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -327,7 +327,7 @@ jobs:
     timeout-minutes: 20
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -379,7 +379,7 @@ jobs:
           - windows-2022
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -575,7 +575,7 @@ jobs:
     timeout-minutes: 25
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -637,7 +637,7 @@ jobs:
     timeout-minutes: 25
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -709,7 +709,7 @@ jobs:
     timeout-minutes: 20
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -736,7 +736,7 @@ jobs:
     timeout-minutes: 20
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -769,7 +769,7 @@ jobs:
     name: ${{ matrix.variant.name }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -849,7 +849,7 @@ jobs:
     if: needs.changes.outputs.site == 'true' || needs.changes.outputs.ci == 'true'
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -870,7 +870,7 @@ jobs:
       # the check to pass. This is desired in PRs, but not in mainline.
       - name: Publish to Chromatic (non-mainline)
         if: github.ref != 'refs/heads/main' && github.repository_owner == 'coder'
-        uses: chromaui/action@f191a0224b10e1a38b2091cefb7b7a2337009116 # v16.0.0
+        uses: chromaui/action@07791f8243f4cb2698bf4d00426baf4b2d1cb7e0 # v13.3.5
         env:
           NODE_OPTIONS: "--max_old_space_size=4096"
           STORYBOOK: true
@@ -902,7 +902,7 @@ jobs:
       # infinitely "in progress" in mainline unless we re-review each build.
       - name: Publish to Chromatic (mainline)
         if: github.ref == 'refs/heads/main' && github.repository_owner == 'coder'
-        uses: chromaui/action@f191a0224b10e1a38b2091cefb7b7a2337009116 # v16.0.0
+        uses: chromaui/action@07791f8243f4cb2698bf4d00426baf4b2d1cb7e0 # v13.3.5
         env:
           NODE_OPTIONS: "--max_old_space_size=4096"
           STORYBOOK: true
@@ -930,7 +930,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -1005,7 +1005,7 @@ jobs:
     if: always()
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -1043,7 +1043,7 @@ jobs:
     runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -1097,7 +1097,7 @@ jobs:
       IMAGE: ghcr.io/coder/coder-preview:${{ steps.build-docker.outputs.tag }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -1316,50 +1316,122 @@ jobs:
               "${IMAGE}"
           done
 
-      - name: Resolve Docker image digests for attestation
-        id: docker_digests
-        if: github.ref == 'refs/heads/main'
-        continue-on-error: true
-        env:
-          IMAGE_BASE: ghcr.io/coder/coder-preview
-          BUILD_TAG: ${{ steps.build-docker.outputs.tag }}
-        run: |
-          set -euxo pipefail
-          main_digest=$(docker buildx imagetools inspect --raw "${IMAGE_BASE}:main" | sha256sum | awk '{print "sha256:"$1}')
-          echo "main_digest=${main_digest}" >> "$GITHUB_OUTPUT"
-          latest_digest=$(docker buildx imagetools inspect --raw "${IMAGE_BASE}:latest" | sha256sum | awk '{print "sha256:"$1}')
-          echo "latest_digest=${latest_digest}" >> "$GITHUB_OUTPUT"
-          version_digest=$(docker buildx imagetools inspect --raw "${IMAGE_BASE}:${BUILD_TAG}" | sha256sum | awk '{print "sha256:"$1}')
-          echo "version_digest=${version_digest}" >> "$GITHUB_OUTPUT"
-
+      # GitHub attestation provides SLSA provenance for the Docker images, establishing a verifiable
+      # record that these images were built in GitHub Actions with specific inputs and environment.
+      # This complements our existing cosign attestations which focus on SBOMs.
+      #
+      # We attest each tag separately to ensure all tags have proper provenance records.
+      # TODO: Consider refactoring these steps to use a matrix strategy or composite action to reduce duplication
+      # while maintaining the required functionality for each tag.
       - name: GitHub Attestation for Docker image
         id: attest_main
-        if: github.ref == 'refs/heads/main' && steps.docker_digests.outputs.main_digest != ''
+        if: github.ref == 'refs/heads/main'
         continue-on-error: true
         uses: actions/attest@59d89421af93a897026c735860bf21b6eb4f7b26 # v4.1.0
         with:
-          subject-name: ghcr.io/coder/coder-preview
-          subject-digest: ${{ steps.docker_digests.outputs.main_digest }}
+          subject-name: "ghcr.io/coder/coder-preview:main"
+          predicate-type: "https://slsa.dev/provenance/v1"
+          predicate: |
+            {
+              "buildType": "https://github.com/actions/runner-images/",
+              "builder": {
+                "id": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+              },
+              "invocation": {
+                "configSource": {
+                  "uri": "git+https://github.com/${{ github.repository }}@${{ github.ref }}",
+                  "digest": {
+                    "sha1": "${{ github.sha }}"
+                  },
+                  "entryPoint": ".github/workflows/ci.yaml"
+                },
+                "environment": {
+                  "github_workflow": "${{ github.workflow }}",
+                  "github_run_id": "${{ github.run_id }}"
+                }
+              },
+              "metadata": {
+                "buildInvocationID": "${{ github.run_id }}",
+                "completeness": {
+                  "environment": true,
+                  "materials": true
+                }
+              }
+            }
           push-to-registry: true
 
       - name: GitHub Attestation for Docker image (latest tag)
         id: attest_latest
-        if: github.ref == 'refs/heads/main' && steps.docker_digests.outputs.latest_digest != ''
+        if: github.ref == 'refs/heads/main'
         continue-on-error: true
         uses: actions/attest@59d89421af93a897026c735860bf21b6eb4f7b26 # v4.1.0
         with:
-          subject-name: ghcr.io/coder/coder-preview
-          subject-digest: ${{ steps.docker_digests.outputs.latest_digest }}
+          subject-name: "ghcr.io/coder/coder-preview:latest"
+          predicate-type: "https://slsa.dev/provenance/v1"
+          predicate: |
+            {
+              "buildType": "https://github.com/actions/runner-images/",
+              "builder": {
+                "id": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+              },
+              "invocation": {
+                "configSource": {
+                  "uri": "git+https://github.com/${{ github.repository }}@${{ github.ref }}",
+                  "digest": {
+                    "sha1": "${{ github.sha }}"
+                  },
+                  "entryPoint": ".github/workflows/ci.yaml"
+                },
+                "environment": {
+                  "github_workflow": "${{ github.workflow }}",
+                  "github_run_id": "${{ github.run_id }}"
+                }
+              },
+              "metadata": {
+                "buildInvocationID": "${{ github.run_id }}",
+                "completeness": {
+                  "environment": true,
+                  "materials": true
+                }
+              }
+            }
           push-to-registry: true
 
       - name: GitHub Attestation for version-specific Docker image
         id: attest_version
-        if: github.ref == 'refs/heads/main' && steps.docker_digests.outputs.version_digest != ''
+        if: github.ref == 'refs/heads/main'
         continue-on-error: true
         uses: actions/attest@59d89421af93a897026c735860bf21b6eb4f7b26 # v4.1.0
         with:
-          subject-name: ghcr.io/coder/coder-preview
-          subject-digest: ${{ steps.docker_digests.outputs.version_digest }}
+          subject-name: "ghcr.io/coder/coder-preview:${{ steps.build-docker.outputs.tag }}"
+          predicate-type: "https://slsa.dev/provenance/v1"
+          predicate: |
+            {
+              "buildType": "https://github.com/actions/runner-images/",
+              "builder": {
+                "id": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+              },
+              "invocation": {
+                "configSource": {
+                  "uri": "git+https://github.com/${{ github.repository }}@${{ github.ref }}",
+                  "digest": {
+                    "sha1": "${{ github.sha }}"
+                  },
+                  "entryPoint": ".github/workflows/ci.yaml"
+                },
+                "environment": {
+                  "github_workflow": "${{ github.workflow }}",
+                  "github_run_id": "${{ github.run_id }}"
+                }
+              },
+              "metadata": {
+                "buildInvocationID": "${{ github.run_id }}",
+                "completeness": {
+                  "environment": true,
+                  "materials": true
+                }
+              }
+            }
           push-to-registry: true
 
       # Report attestation failures but don't fail the workflow
@@ -1479,7 +1551,7 @@ jobs:
     if: needs.changes.outputs.db == 'true' || needs.changes.outputs.ci == 'true' || github.ref == 'refs/heads/main'
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 

.github/workflows/dependabot.yaml

@@ -23,7 +23,7 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@ffa630c65fa7e0ecfa0625b5ceda64399aea1b36 # v3.0.0
+        uses: dependabot/fetch-metadata@21025c705c08248db411dc16f3619e6b5f9ea21a # v2.5.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 

.github/workflows/deploy.yaml

@@ -36,7 +36,7 @@ jobs:
       verdict: ${{ steps.check.outputs.verdict }} # DEPLOY or NOOP
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -65,7 +65,7 @@ jobs:
       packages: write # to retag image as dogfood
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -95,7 +95,7 @@ jobs:
           AWS_DOGFOOD_DEPLOY_REGION: ${{ vars.AWS_DOGFOOD_DEPLOY_REGION }}
 
       - name: Set up Flux CLI
-        uses: fluxcd/flux2/action@871be9b40d53627786d3a3835a3ddba1e3234bd2 # v2.8.3
+        uses: fluxcd/flux2/action@8454b02a32e48d775b9f563cb51fdcb1787b5b93 # v2.7.5
         with:
           # Keep this and the github action up to date with the version of flux installed in dogfood cluster
           version: "2.8.2"
@@ -142,7 +142,7 @@ jobs:
     needs: deploy
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 

.github/workflows/doc-check.yaml

@@ -240,7 +240,6 @@ jobs:
       - name: Create Coder Task for Documentation Check
         if: steps.check-secrets.outputs.skip != 'true'
         id: create_task
-        continue-on-error: true
         uses: ./.github/actions/create-task-action
         with:
           coder-url: ${{ secrets.DOC_CHECK_CODER_URL }}
@@ -255,21 +254,8 @@ jobs:
           github-issue-url: ${{ steps.determine-context.outputs.pr_url }}
           comment-on-issue: false
 
-      - name: Handle Task Creation Failure
-        if: steps.check-secrets.outputs.skip != 'true' && steps.create_task.outcome != 'success'
-        run: |
-          {
-            echo "## Documentation Check Task"
-            echo ""
-            echo "⚠️ The external Coder task service was unavailable, so this"
-            echo "advisory documentation check did not run."
-            echo ""
-            echo "Maintainers can rerun the workflow or trigger it manually"
-            echo "after the service recovers."
-          } >> "${GITHUB_STEP_SUMMARY}"
-
       - name: Write Task Info
-        if: steps.check-secrets.outputs.skip != 'true' && steps.create_task.outcome == 'success'
+        if: steps.check-secrets.outputs.skip != 'true'
         env:
           TASK_CREATED: ${{ steps.create_task.outputs.task-created }}
           TASK_NAME: ${{ steps.create_task.outputs.task-name }}
@@ -287,7 +273,7 @@ jobs:
           } >> "${GITHUB_STEP_SUMMARY}"
 
       - name: Wait for Task Completion
-        if: steps.check-secrets.outputs.skip != 'true' && steps.create_task.outcome == 'success'
+        if: steps.check-secrets.outputs.skip != 'true'
         id: wait_task
         env:
           TASK_NAME: ${{ steps.create_task.outputs.task-name }}
@@ -377,7 +363,7 @@ jobs:
           fi
 
       - name: Fetch Task Logs
-        if: always() && steps.check-secrets.outputs.skip != 'true' && steps.create_task.outcome == 'success'
+        if: always() && steps.check-secrets.outputs.skip != 'true'
         env:
           TASK_NAME: ${{ steps.create_task.outputs.task-name }}
         run: |
@@ -390,7 +376,7 @@ jobs:
           echo "::endgroup::"
 
       - name: Cleanup Task
-        if: always() && steps.check-secrets.outputs.skip != 'true' && steps.create_task.outcome == 'success'
+        if: always() && steps.check-secrets.outputs.skip != 'true'
         env:
           TASK_NAME: ${{ steps.create_task.outputs.task-name }}
         run: |
@@ -404,7 +390,6 @@ jobs:
       - name: Write Final Summary
         if: always() && steps.check-secrets.outputs.skip != 'true'
         env:
-          CREATE_TASK_OUTCOME: ${{ steps.create_task.outcome }}
           TASK_NAME: ${{ steps.create_task.outputs.task-name }}
           TASK_MESSAGE: ${{ steps.wait_task.outputs.task_message }}
           RESULT_URI: ${{ steps.wait_task.outputs.result_uri }}
@@ -415,15 +400,10 @@ jobs:
             echo "---"
             echo "### Result"
             echo ""
-            if [[ "${CREATE_TASK_OUTCOME}" == "success" ]]; then
-              echo "**Status:** ${TASK_MESSAGE:-Task completed}"
-              if [[ -n "${RESULT_URI}" ]]; then
-                echo "**Comment:** ${RESULT_URI}"
-              fi
-              echo ""
-              echo "Task \`${TASK_NAME}\` has been cleaned up."
-            else
-              echo "**Status:** Skipped because the external Coder task"
-              echo "service was unavailable."
+            echo "**Status:** ${TASK_MESSAGE:-Task completed}"
+            if [[ -n "${RESULT_URI}" ]]; then
+              echo "**Comment:** ${RESULT_URI}"
             fi
+            echo ""
+            echo "Task \`${TASK_NAME}\` has been cleaned up."
           } >> "${GITHUB_STEP_SUMMARY}"

.github/workflows/docker-base.yaml

@@ -38,7 +38,7 @@ jobs:
     if: github.repository_owner == 'coder'
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 

.github/workflows/dogfood.yaml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-4' || 'ubuntu-latest' }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -125,7 +125,7 @@ jobs:
       id-token: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 

.github/workflows/linear-release.yaml

@@ -4,20 +4,23 @@ on:
   push:
     branches:
       - main
-      - "release/2.[0-9]+"
+  # This event reads the workflow from the default branch (main), not the
+  # release branch. No cherry-pick needed.
+  # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#release
+  release:
+    types: [published]
 
 permissions:
   contents: read
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
-  # Queue rather than cancel so back-to-back pushes to main don't cancel the first sync.
-  cancel-in-progress: false
+  cancel-in-progress: true
 
 jobs:
-  sync-main:
-    name: Sync issues to next Linear release
-    if: github.event_name == 'push' && github.ref_name == 'main'
+  sync:
+    name: Sync issues to Linear release
+    if: github.event_name == 'push'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -25,86 +28,38 @@ jobs:
           fetch-depth: 0
           persist-credentials: false
 
-      - name: Detect next release version
-        id: version
-        # Find the highest release/2.X branch (exact pattern, no suffixes
-        # like release/2.31_hotfix) and derive the next minor version for
-        # the release currently in development on main.
-        run: |
-          LATEST_MINOR=$(git branch -r | grep -E '^\s*origin/release/2\.[0-9]+$' | \
-            sed 's/.*release\/2\.//' | sort -n | tail -1)
-          if [ -z "$LATEST_MINOR" ]; then
-            echo "No release branch found, skipping sync."
-            echo "skip=true" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-          NEXT="2.$((LATEST_MINOR + 1))"
-          echo "version=$NEXT" >> "$GITHUB_OUTPUT"
-          echo "skip=false" >> "$GITHUB_OUTPUT"
-          echo "Detected next release: $NEXT"
-
       - name: Sync issues
         id: sync
-        if: steps.version.outputs.skip != 'true'
-        uses: linear/linear-release-action@755d50b5adb7dd42b976ee9334952745d62ceb2d # v0.6.0
+        uses: linear/linear-release-action@5cbaabc187ceb63eee9d446e62e68e5c29a03ae8 # v0.5.0
         with:
           access_key: ${{ secrets.LINEAR_ACCESS_KEY }}
           command: sync
-          version: ${{ steps.version.outputs.version }}
-          name: ${{ steps.version.outputs.version }}
-          timeout: 300
 
-  sync-release-branch:
-    name: Sync backports to Linear release
-    if: github.event_name == 'push' && startsWith(github.ref_name, 'release/')
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
-        with:
-          fetch-depth: 0
-          persist-credentials: false
+      - name: Print release URL
+        if: steps.sync.outputs.release-url
+        run: echo "Synced to $RELEASE_URL"
+        env:
+          RELEASE_URL: ${{ steps.sync.outputs.release-url }}
 
-      - name: Extract release version
-        id: version
-        # The trigger only allows exact release/2.X branch names.
-        run: |
-          echo "version=${GITHUB_REF_NAME#release/}" >> "$GITHUB_OUTPUT"
-
-      - name: Sync issues
-        id: sync
-        uses: linear/linear-release-action@755d50b5adb7dd42b976ee9334952745d62ceb2d # v0.6.0
-        with:
-          access_key: ${{ secrets.LINEAR_ACCESS_KEY }}
-          command: sync
-          version: ${{ steps.version.outputs.version }}
-          name: ${{ steps.version.outputs.version }}
-          timeout: 300
-
-  code-freeze:
-    name: Move Linear release to Code Freeze
-    needs: sync-release-branch
-    if: >
-      github.event_name == 'push' &&
-      startsWith(github.ref_name, 'release/') &&
-      github.event.created == true
+  complete:
+    name: Complete Linear release
+    if: github.event_name == 'release'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
 
-      - name: Extract release version
-        id: version
-        run: |
-          echo "version=${GITHUB_REF_NAME#release/}" >> "$GITHUB_OUTPUT"
-
-      - name: Move to Code Freeze
-        id: update
-        uses: linear/linear-release-action@755d50b5adb7dd42b976ee9334952745d62ceb2d # v0.6.0
+      - name: Complete release
+        id: complete
+        uses: linear/linear-release-action@5cbaabc187ceb63eee9d446e62e68e5c29a03ae8 # v0
         with:
           access_key: ${{ secrets.LINEAR_ACCESS_KEY }}
-          command: update
-          stage: Code Freeze
-          version: ${{ steps.version.outputs.version }}
-          timeout: 300
+          command: complete
+          version: ${{ github.event.release.tag_name }}
 
+      - name: Print release URL
+        if: steps.complete.outputs.release-url
+        run: echo "Completed $RELEASE_URL"
+        env:
+          RELEASE_URL: ${{ steps.complete.outputs.release-url }}

.github/workflows/nightly-gauntlet.yaml

@@ -28,7 +28,7 @@ jobs:
           - windows-2022
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 

.github/workflows/pr-auto-assign.yaml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 

.github/workflows/pr-cleanup.yaml

@@ -19,7 +19,7 @@ jobs:
       packages: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 

.github/workflows/pr-deploy.yaml

@@ -39,7 +39,7 @@ jobs:
       PR_OPEN: ${{ steps.check_pr.outputs.pr_open }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -76,7 +76,7 @@ jobs:
     runs-on: "ubuntu-latest"
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -184,7 +184,7 @@ jobs:
       pull-requests: write # needed for commenting on PRs
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -228,7 +228,7 @@ jobs:
       CODER_IMAGE_TAG: ${{ needs.get_info.outputs.CODER_IMAGE_TAG }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -288,7 +288,7 @@ jobs:
       PR_HOSTNAME: "pr${{ needs.get_info.outputs.PR_NUMBER }}.${{ secrets.PR_DEPLOYMENTS_DOMAIN }}"
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 

.github/workflows/release-validation.yaml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 

.github/workflows/release.yaml

@@ -9,7 +9,6 @@ on:
         options:
           - mainline
           - stable
-          - rc
       release_notes:
         description: Release notes for the publishing the release. This is required to create a release.
       dry_run:
@@ -81,7 +80,7 @@ jobs:
       version: ${{ steps.version.outputs.version }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -120,19 +119,9 @@ jobs:
             exit 1
           fi
 
-          # Derive the release branch from the version tag.
-          # Standard: 2.10.2 -> release/2.10
-          # RC:       2.32.0-rc.0 -> release/2.32-rc.0
+          # 2.10.2 -> release/2.10
           version="$(./scripts/version.sh)"
-          if [[ "$version" == *-rc.* ]]; then
-            # Extract major.minor and rc suffix from e.g. 2.32.0-rc.0
-            base_version="${version%%-rc.*}"   # 2.32.0
-            major_minor="${base_version%.*}"   # 2.32
-            rc_suffix="${version##*-rc.}"      # 0
-            release_branch="release/${major_minor}-rc.${rc_suffix}"
-          else
-            release_branch=release/${version%.*}
-          fi
+          release_branch=release/${version%.*}
           branch_contains_tag=$(git branch --remotes --contains "${GITHUB_REF}" --list "*/${release_branch}" --format='%(refname)')
           if [[ -z "${branch_contains_tag}" ]]; then
             echo "Ref tag must exist in a branch named ${release_branch} when creating a release, did you use scripts/release.sh?"
@@ -313,7 +302,6 @@ jobs:
 
       # This uses OIDC authentication, so no auth variables are required.
       - name: Build base Docker image via depot.dev
-        id: build_base_image
         if: steps.image-base-tag.outputs.tag != ''
         uses: depot/build-push-action@5f3b3c2e5a00f0093de47f657aeaefcedff27d18 # v1.17.0
         with:
@@ -361,14 +349,48 @@ jobs:
         env:
           IMAGE_TAG: ${{ steps.image-base-tag.outputs.tag }}
 
+      # GitHub attestation provides SLSA provenance for Docker images, establishing a verifiable
+      # record that these images were built in GitHub Actions with specific inputs and environment.
+      # This complements our existing cosign attestations (which focus on SBOMs) by adding
+      # GitHub-specific build provenance to enhance our supply chain security.
+      #
+      # TODO: Consider refactoring these attestation steps to use a matrix strategy or composite action
+      # to reduce duplication while maintaining the required functionality for each distinct image tag.
       - name: GitHub Attestation for Base Docker image
         id: attest_base
-        if: ${{ !inputs.dry_run && steps.build_base_image.outputs.digest != '' }}
+        if: ${{ !inputs.dry_run && steps.image-base-tag.outputs.tag != '' }}
         continue-on-error: true
         uses: actions/attest@59d89421af93a897026c735860bf21b6eb4f7b26 # v4.1.0
         with:
-          subject-name: ghcr.io/coder/coder-base
-          subject-digest: ${{ steps.build_base_image.outputs.digest }}
+          subject-name: ${{ steps.image-base-tag.outputs.tag }}
+          predicate-type: "https://slsa.dev/provenance/v1"
+          predicate: |
+            {
+              "buildType": "https://github.com/actions/runner-images/",
+              "builder": {
+                "id": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+              },
+              "invocation": {
+                "configSource": {
+                  "uri": "git+https://github.com/${{ github.repository }}@${{ github.ref }}",
+                  "digest": {
+                    "sha1": "${{ github.sha }}"
+                  },
+                  "entryPoint": ".github/workflows/release.yaml"
+                },
+                "environment": {
+                  "github_workflow": "${{ github.workflow }}",
+                  "github_run_id": "${{ github.run_id }}"
+                }
+              },
+              "metadata": {
+                "buildInvocationID": "${{ github.run_id }}",
+                "completeness": {
+                  "environment": true,
+                  "materials": true
+                }
+              }
+            }
           push-to-registry: true
 
       - name: Build Linux Docker images
@@ -391,6 +413,7 @@ jobs:
           # being pushed so will automatically push them.
           make push/build/coder_"$version"_linux.tag
 
+          # Save multiarch image tag for attestation
           multiarch_image="$(./scripts/image_tag.sh)"
           echo "multiarch_image=${multiarch_image}" >> "$GITHUB_OUTPUT"
 
@@ -401,14 +424,12 @@ jobs:
           # version in the repo, also create a multi-arch image as ":latest" and
           # push it
           if [[ "$(git tag | grep '^v' | grep -vE '(rc|dev|-|\+|\/)' | sort -r --version-sort | head -n1)" == "v$(./scripts/version.sh)" ]]; then
-            latest_target="$(./scripts/image_tag.sh --version latest)"
             # shellcheck disable=SC2046
             ./scripts/build_docker_multiarch.sh \
               --push \
-              --target "${latest_target}" \
+              --target "$(./scripts/image_tag.sh --version latest)" \
               $(cat build/coder_"$version"_linux_{amd64,arm64,armv7}.tag)
             echo "created_latest_tag=true" >> "$GITHUB_OUTPUT"
-            echo "latest_target=${latest_target}" >> "$GITHUB_OUTPUT"
           else
             echo "created_latest_tag=false" >> "$GITHUB_OUTPUT"
           fi
@@ -429,6 +450,7 @@ jobs:
           echo "Generating SBOM for multi-arch image: ${MULTIARCH_IMAGE}"
           syft "${MULTIARCH_IMAGE}" -o spdx-json > "coder_${VERSION}_sbom.spdx.json"
 
+          # Attest SBOM to multi-arch image
           echo "Attesting SBOM to multi-arch image: ${MULTIARCH_IMAGE}"
           cosign clean --force=true "${MULTIARCH_IMAGE}"
           cosign attest --type spdxjson \
@@ -450,42 +472,85 @@ jobs:
               "${latest_tag}"
           fi
 
-      - name: Resolve Docker image digests for attestation
-        id: docker_digests
-        if: ${{ !inputs.dry_run }}
-        continue-on-error: true
-        env:
-          MULTIARCH_IMAGE: ${{ steps.build_docker.outputs.multiarch_image }}
-          LATEST_TARGET: ${{ steps.build_docker.outputs.latest_target }}
-        run: |
-          set -euxo pipefail
-          if [[ -n "${MULTIARCH_IMAGE}" ]]; then
-            multiarch_digest=$(docker buildx imagetools inspect --raw "${MULTIARCH_IMAGE}" | sha256sum | awk '{print "sha256:"$1}')
-            echo "multiarch_digest=${multiarch_digest}" >> "$GITHUB_OUTPUT"
-          fi
-          if [[ -n "${LATEST_TARGET}" ]]; then
-            latest_digest=$(docker buildx imagetools inspect --raw "${LATEST_TARGET}" | sha256sum | awk '{print "sha256:"$1}')
-            echo "latest_digest=${latest_digest}" >> "$GITHUB_OUTPUT"
-          fi
-
       - name: GitHub Attestation for Docker image
         id: attest_main
-        if: ${{ !inputs.dry_run && steps.docker_digests.outputs.multiarch_digest != '' }}
+        if: ${{ !inputs.dry_run }}
         continue-on-error: true
         uses: actions/attest@59d89421af93a897026c735860bf21b6eb4f7b26 # v4.1.0
         with:
-          subject-name: ghcr.io/coder/coder
-          subject-digest: ${{ steps.docker_digests.outputs.multiarch_digest }}
+          subject-name: ${{ steps.build_docker.outputs.multiarch_image }}
+          predicate-type: "https://slsa.dev/provenance/v1"
+          predicate: |
+            {
+              "buildType": "https://github.com/actions/runner-images/",
+              "builder": {
+                "id": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+              },
+              "invocation": {
+                "configSource": {
+                  "uri": "git+https://github.com/${{ github.repository }}@${{ github.ref }}",
+                  "digest": {
+                    "sha1": "${{ github.sha }}"
+                  },
+                  "entryPoint": ".github/workflows/release.yaml"
+                },
+                "environment": {
+                  "github_workflow": "${{ github.workflow }}",
+                  "github_run_id": "${{ github.run_id }}"
+                }
+              },
+              "metadata": {
+                "buildInvocationID": "${{ github.run_id }}",
+                "completeness": {
+                  "environment": true,
+                  "materials": true
+                }
+              }
+            }
           push-to-registry: true
 
+      # Get the latest tag name for attestation
+      - name: Get latest tag name
+        id: latest_tag
+        if: ${{ !inputs.dry_run && steps.build_docker.outputs.created_latest_tag == 'true' }}
+        run: echo "tag=$(./scripts/image_tag.sh --version latest)" >> "$GITHUB_OUTPUT"
+
+      # If this is the highest version according to semver, also attest the "latest" tag
       - name: GitHub Attestation for "latest" Docker image
         id: attest_latest
-        if: ${{ !inputs.dry_run && steps.docker_digests.outputs.latest_digest != '' }}
+        if: ${{ !inputs.dry_run && steps.build_docker.outputs.created_latest_tag == 'true' }}
         continue-on-error: true
         uses: actions/attest@59d89421af93a897026c735860bf21b6eb4f7b26 # v4.1.0
         with:
-          subject-name: ghcr.io/coder/coder
-          subject-digest: ${{ steps.docker_digests.outputs.latest_digest }}
+          subject-name: ${{ steps.latest_tag.outputs.tag }}
+          predicate-type: "https://slsa.dev/provenance/v1"
+          predicate: |
+            {
+              "buildType": "https://github.com/actions/runner-images/",
+              "builder": {
+                "id": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+              },
+              "invocation": {
+                "configSource": {
+                  "uri": "git+https://github.com/${{ github.repository }}@${{ github.ref }}",
+                  "digest": {
+                    "sha1": "${{ github.sha }}"
+                  },
+                  "entryPoint": ".github/workflows/release.yaml"
+                },
+                "environment": {
+                  "github_workflow": "${{ github.workflow }}",
+                  "github_run_id": "${{ github.run_id }}"
+                }
+              },
+              "metadata": {
+                "buildInvocationID": "${{ github.run_id }}",
+                "completeness": {
+                  "environment": true,
+                  "materials": true
+                }
+              }
+            }
           push-to-registry: true
 
       # Report attestation failures but don't fail the workflow
@@ -542,9 +607,6 @@ jobs:
           if [[ $CODER_RELEASE_CHANNEL == "stable" ]]; then
             publish_args+=(--stable)
           fi
-          if [[ $CODER_RELEASE_CHANNEL == "rc" ]]; then
-            publish_args+=(--rc)
-          fi
           if [[ $CODER_DRY_RUN == *t* ]]; then
             publish_args+=(--dry-run)
           fi
@@ -577,35 +639,6 @@ jobs:
           VERSION: ${{ steps.version.outputs.version }}
           CREATED_LATEST_TAG: ${{ steps.build_docker.outputs.created_latest_tag }}
 
-      # Mark the Linear release as shipped.
-      - name: Extract Linear release version
-        if: ${{ !inputs.dry_run }}
-        id: linear_version
-        run: |
-          # Skip RC releases — they must not complete the Linear release.
-          if [[ "$VERSION" == *-rc* ]]; then
-            echo "RC release (${VERSION}), skipping Linear release completion."
-            echo "skip=true" >> "$GITHUB_OUTPUT"
-            exit 0
-          fi
-          # Strip patch to get the Linear release version (e.g. 2.32.0 -> 2.32).
-          linear_version=$(echo "$VERSION" | cut -d. -f1,2)
-          echo "version=$linear_version" >> "$GITHUB_OUTPUT"
-          echo "skip=false" >> "$GITHUB_OUTPUT"
-          echo "Completing Linear release ${linear_version}"
-        env:
-          VERSION: ${{ steps.version.outputs.version }}
-
-      - name: Complete Linear release
-        if: ${{ !inputs.dry_run && steps.linear_version.outputs.skip != 'true' }}
-        continue-on-error: true
-        uses: linear/linear-release-action@755d50b5adb7dd42b976ee9334952745d62ceb2d # v0.6.0
-        with:
-          access_key: ${{ secrets.LINEAR_ACCESS_KEY }}
-          command: complete
-          version: ${{ steps.linear_version.outputs.version }}
-          timeout: 300
-
       - name: Authenticate to Google Cloud
         uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093 # v3.0.0
         with:
@@ -657,7 +690,7 @@ jobs:
           retention-days: 7
 
       - name: Send repository-dispatch event
-        if: ${{ !inputs.dry_run && inputs.release_channel != 'rc' }}
+        if: ${{ !inputs.dry_run }}
         uses: peter-evans/repository-dispatch@28959ce8df70de7be546dd1250a005dd32156697 # v4.0.1
         with:
           token: ${{ secrets.CDRCI_GITHUB_TOKEN }}
@@ -673,7 +706,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -745,11 +778,11 @@ jobs:
     name: Publish to winget-pkgs
     runs-on: windows-latest
     needs: release
-    if: ${{ !inputs.dry_run && inputs.release_channel != 'rc' }}
+    if: ${{ !inputs.dry_run }}
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 

.github/workflows/scorecard.yml

@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -47,6 +47,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v3.29.5
+        uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v3.29.5
         with:
           sarif_file: results.sarif

.github/workflows/security.yaml

@@ -27,7 +27,7 @@ jobs:
     runs-on: ${{ github.repository_owner == 'coder' && 'depot-ubuntu-22.04-8' || 'ubuntu-latest' }}
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -40,7 +40,7 @@ jobs:
         uses: ./.github/actions/setup-go
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v3.29.5
+        uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v3.29.5
         with:
           languages: go, javascript
 
@@ -50,7 +50,7 @@ jobs:
           rm Makefile
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v3.29.5
+        uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v3.29.5
 
       - name: Send Slack notification on failure
         if: ${{ failure() }}

.github/workflows/stale.yaml

@@ -18,7 +18,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -96,7 +96,7 @@ jobs:
       contents: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -120,12 +120,12 @@ jobs:
       actions: write
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
       - name: Delete PR Cleanup workflow runs
-        uses: Mattraks/delete-workflow-runs@b3018382ca039b53d238908238bd35d1fb14f8ee # v2.1.0
+        uses: Mattraks/delete-workflow-runs@5bf9a1dac5c4d041c029f0a8370ddf0c5cb5aeb7 # v2.1.0
         with:
           token: ${{ github.token }}
           repository: ${{ github.repository }}
@@ -134,7 +134,7 @@ jobs:
           delete_workflow_pattern: pr-cleanup.yaml
 
       - name: Delete PR Deploy workflow skipped runs
-        uses: Mattraks/delete-workflow-runs@b3018382ca039b53d238908238bd35d1fb14f8ee # v2.1.0
+        uses: Mattraks/delete-workflow-runs@5bf9a1dac5c4d041c029f0a8370ddf0c5cb5aeb7 # v2.1.0
         with:
           token: ${{ github.token }}
           repository: ${{ github.repository }}

.github/workflows/weekly-docs.yaml

@@ -21,7 +21,7 @@ jobs:
       pull-requests: write # required to post PR review comments by the action
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@fe104658747b27e96e4f7e80cd0a94068e53901d # v2.16.1
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
         with:
           egress-policy: audit
 
@@ -46,16 +46,8 @@ jobs:
             echo "    replacement: \"https://github.com/coder/coder/tree/${HEAD_SHA}/\""
           } >> .github/.linkspector.yml
 
-      # TODO: Remove this workaround once action-linkspector sets
-      # package-manager-cache: false in its internal setup-node step.
-      # See: https://github.com/UmbrellaDocs/action-linkspector/issues/54
-      - name: Enable corepack and create pnpm store
-        run: |
-          corepack enable pnpm
-          mkdir -p "$(pnpm store path --silent)"
-
       - name: Check Markdown links
-        uses: umbrelladocs/action-linkspector@37c85bcde51b30bf929936502bac6bfb7e8f0a4d # v1.4.1
+        uses: umbrelladocs/action-linkspector@652f85bc57bb1e7d4327260decc10aa68f7694c3 # v1.4.0
         id: markdown-link-check
         # checks all markdown files from /docs including all subfolders
         with:

.gitignore

@@ -54,7 +54,6 @@ site/stats/
 *.tfstate.backup
 *.tfplan
 *.lock.hcl
-!provisioner/terraform/testdata/resources/.terraform.lock.hcl
 .terraform/
 !coderd/testdata/parameters/modules/.terraform/
 !provisioner/terraform/testdata/modules-source-caching/.terraform/

AGENTS.md

@@ -110,9 +110,6 @@ app, err := api.Database.GetOAuth2ProviderAppByClientID(ctx, clientID)
 - For experimental or unstable API paths, skip public doc generation with
   `// @x-apidocgen {"skip": true}` after the `@Router` annotation. This
   keeps them out of the published API reference until they stabilize.
-- Experimental chat endpoints in `coderd/exp_chats.go` omit swagger
-  annotations entirely. Do not add `@Summary`, `@Router`, or other
-  swagger comments to handlers in that file.
 
 ### Database Query Naming
 

Makefile

@@ -988,7 +988,6 @@ coderd/httpmw/loggermw/loggermock/loggermock.go: coderd/httpmw/loggermw/logger.g
 
 codersdk/workspacesdk/agentconnmock/agentconnmock.go: codersdk/workspacesdk/agentconn.go
 	go generate ./codersdk/workspacesdk/agentconnmock/
-	./scripts/format_go_file.sh "$@"
 	touch "$@"
 
 $(AIBRIDGED_MOCKS): enterprise/aibridged/client.go enterprise/aibridged/pool.go
@@ -1261,21 +1260,11 @@ provisioner/terraform/testdata/.gen-golden: $(wildcard provisioner/terraform/tes
 	touch "$@"
 
 provisioner/terraform/testdata/version:
-	@tf_match=true; \
-	if [[ "$$(cat provisioner/terraform/testdata/version.txt)" != \
-	       "$$(terraform version -json | jq -r '.terraform_version')" ]]; then \
-		tf_match=false; \
-	fi; \
-	if ! $$tf_match || \
-	   ! ./provisioner/terraform/testdata/generate.sh --check; then \
-		./provisioner/terraform/testdata/generate.sh; \
+	if [[ "$(shell cat provisioner/terraform/testdata/version.txt)" != "$(shell terraform version -json | jq -r '.terraform_version')" ]]; then
+		./provisioner/terraform/testdata/generate.sh
 	fi
 .PHONY: provisioner/terraform/testdata/version
 
-update-terraform-testdata:
-	./provisioner/terraform/testdata/generate.sh --upgrade
-.PHONY: update-terraform-testdata
-
 # Set the retry flags if TEST_RETRIES is set
 ifdef TEST_RETRIES
 GOTESTSUM_RETRY_FLAGS := --rerun-fails=$(TEST_RETRIES)

agent/agent.go

@@ -38,7 +38,6 @@ import (
 	"cdr.dev/slog/v3"
 	"github.com/coder/clistat"
 	"github.com/coder/coder/v2/agent/agentcontainers"
-	"github.com/coder/coder/v2/agent/agentcontextconfig"
 	"github.com/coder/coder/v2/agent/agentexec"
 	"github.com/coder/coder/v2/agent/agentfiles"
 	"github.com/coder/coder/v2/agent/agentgit"
@@ -51,7 +50,6 @@ import (
 	"github.com/coder/coder/v2/agent/proto/resourcesmonitor"
 	"github.com/coder/coder/v2/agent/reconnectingpty"
 	"github.com/coder/coder/v2/agent/x/agentdesktop"
-	"github.com/coder/coder/v2/agent/x/agentmcp"
 	"github.com/coder/coder/v2/buildinfo"
 	"github.com/coder/coder/v2/cli/gitauth"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
@@ -309,13 +307,10 @@ type agent struct {
 	containerAPI        *agentcontainers.API
 	gitAPIOptions       []agentgit.Option
 
-	filesAPI         *agentfiles.API
-	gitAPI           *agentgit.API
-	processAPI       *agentproc.API
-	desktopAPI       *agentdesktop.API
-	mcpManager       *agentmcp.Manager
-	mcpAPI           *agentmcp.API
-	contextConfigAPI *agentcontextconfig.API
+	filesAPI   *agentfiles.API
+	gitAPI     *agentgit.API
+	processAPI *agentproc.API
+	desktopAPI *agentdesktop.API
 
 	socketServerEnabled bool
 	socketPath          string
@@ -398,17 +393,9 @@ func (a *agent) init() {
 	gitOpts := append([]agentgit.Option{agentgit.WithClock(a.clock)}, a.gitAPIOptions...)
 	a.gitAPI = agentgit.NewAPI(a.logger.Named("git"), pathStore, gitOpts...)
 	desktop := agentdesktop.NewPortableDesktop(
-		a.logger.Named("desktop"), a.execer, a.scriptRunner.ScriptBinDir(), nil,
+		a.logger.Named("desktop"), a.execer, a.scriptRunner.ScriptBinDir(),
 	)
 	a.desktopAPI = agentdesktop.NewAPI(a.logger.Named("desktop"), desktop, a.clock)
-	a.mcpManager = agentmcp.NewManager(a.logger.Named("mcp"))
-	a.mcpAPI = agentmcp.NewAPI(a.logger.Named("mcp"), a.mcpManager)
-	a.contextConfigAPI = agentcontextconfig.NewAPI(func() string {
-		if m := a.manifest.Load(); m != nil {
-			return m.Directory
-		}
-		return ""
-	})
 	a.reconnectingPTYServer = reconnectingpty.NewServer(
 		a.logger.Named("reconnecting-pty"),
 		a.sshServer,
@@ -1361,14 +1348,6 @@ func (a *agent) handleManifest(manifestOK *checkpoint) func(ctx context.Context,
 				}
 				a.metrics.startupScriptSeconds.WithLabelValues(label).Set(dur)
 				a.scriptRunner.StartCron()
-
-				// Connect to workspace MCP servers after the
-				// lifecycle transition to avoid delaying Ready.
-				// This runs inside the tracked goroutine so it
-				// is properly awaited on shutdown.
-				if mcpErr := a.mcpManager.Connect(a.gracefulCtx, a.contextConfigAPI.MCPConfigFiles()); mcpErr != nil {
-					a.logger.Warn(ctx, "failed to connect to workspace MCP servers", slog.Error(mcpErr))
-				}
 			})
 			if err != nil {
 				return xerrors.Errorf("track conn goroutine: %w", err)
@@ -2091,10 +2070,6 @@ func (a *agent) Close() error {
 		a.logger.Error(a.hardCtx, "desktop API close", slog.Error(err))
 	}
 
-	if err := a.mcpManager.Close(); err != nil {
-		a.logger.Error(a.hardCtx, "mcp manager close", slog.Error(err))
-	}
-
 	if a.boundaryLogProxy != nil {
 		err = a.boundaryLogProxy.Close()
 		if err != nil {

agent/agent_internal_test.go

@@ -1,8 +1,6 @@
 package agent
 
 import (
-	"path/filepath"
-	"runtime"
 	"testing"
 
 	"github.com/google/uuid"
@@ -10,22 +8,10 @@ import (
 
 	"cdr.dev/slog/v3"
 	"cdr.dev/slog/v3/sloggers/slogtest"
-	"github.com/coder/coder/v2/agent/agentcontextconfig"
 	"github.com/coder/coder/v2/agent/proto"
-	agentsdk "github.com/coder/coder/v2/codersdk/agentsdk"
 	"github.com/coder/coder/v2/testutil"
 )
 
-// platformAbsPath constructs an absolute path that is valid
-// on the current platform. On Windows, paths must include a
-// drive letter to be considered absolute.
-func platformAbsPath(parts ...string) string {
-	if runtime.GOOS == "windows" {
-		return `C:\` + filepath.Join(parts...)
-	}
-	return "/" + filepath.Join(parts...)
-}
-
 // TestReportConnectionEmpty tests that reportConnection() doesn't choke if given an empty IP string, which is what we
 // send if we cannot get the remote address.
 func TestReportConnectionEmpty(t *testing.T) {
@@ -56,41 +42,3 @@ func TestReportConnectionEmpty(t *testing.T) {
 	require.Equal(t, proto.Connection_DISCONNECT, req1.GetConnection().GetAction())
 	require.Equal(t, "because", req1.GetConnection().GetReason())
 }
-
-func TestContextConfigAPI_InitOnce(t *testing.T) {
-	// Not parallel: uses t.Setenv to clear env vars.
-
-	// Clear env vars so defaults are used and the test is
-	// hermetic regardless of the surrounding environment.
-	t.Setenv(agentcontextconfig.EnvInstructionsDirs, "")
-	t.Setenv(agentcontextconfig.EnvInstructionsFile, "")
-	t.Setenv(agentcontextconfig.EnvSkillsDirs, "")
-	t.Setenv(agentcontextconfig.EnvSkillMetaFile, "")
-	t.Setenv(agentcontextconfig.EnvMCPConfigFiles, "")
-
-	// After the fix, contextConfigAPI is set once in init() and
-	// never reassigned. Config() evaluates lazily via the
-	// manifest, so there is no concurrent write to race with.
-	dir1 := platformAbsPath("dir1")
-	dir2 := platformAbsPath("dir2")
-
-	a := &agent{}
-	a.manifest.Store(&agentsdk.Manifest{Directory: dir1})
-	a.contextConfigAPI = agentcontextconfig.NewAPI(func() string {
-		if m := a.manifest.Load(); m != nil {
-			return m.Directory
-		}
-		return ""
-	})
-
-	mcpFiles1 := a.contextConfigAPI.MCPConfigFiles()
-	require.NotEmpty(t, mcpFiles1)
-	require.Contains(t, mcpFiles1[0], dir1)
-
-	// Simulate manifest update on reconnection -- no field
-	// reassignment needed, the lazy closure picks it up.
-	a.manifest.Store(&agentsdk.Manifest{Directory: dir2})
-	mcpFiles2 := a.contextConfigAPI.MCPConfigFiles()
-	require.NotEmpty(t, mcpFiles2)
-	require.Contains(t, mcpFiles2[0], dir2)
-}

agent/agent_test.go

@@ -152,7 +152,7 @@ func TestAgent_Stats_SSH(t *testing.T) {
 			// We are looking for four different stats to be reported. They might not all
 			// arrive at the same time, so we loop until we've seen them all.
 			var connectionCountSeen, rxBytesSeen, txBytesSeen, sessionCountSSHSeen bool
-			require.Eventuallyf(t, func() bool {
+			testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 				var ok bool
 				s, ok = <-stats
 				if !ok {
@@ -171,10 +171,7 @@ func TestAgent_Stats_SSH(t *testing.T) {
 					sessionCountSSHSeen = true
 				}
 				return connectionCountSeen && rxBytesSeen && txBytesSeen && sessionCountSSHSeen
-			}, testutil.WaitLong, testutil.IntervalFast,
-				"never saw all stats: %+v, saw connectionCount: %t, rxBytes: %t, txBytes: %t, sessionCountSsh: %t",
-				s, connectionCountSeen, rxBytesSeen, txBytesSeen, sessionCountSSHSeen,
-			)
+			}, testutil.IntervalFast, "never saw all stats: %+v, saw connectionCount: %t, rxBytes: %t, txBytes: %t, sessionCountSsh: %t", s, connectionCountSeen, rxBytesSeen, txBytesSeen, sessionCountSSHSeen)
 			_, err = stdin.Write([]byte("exit 0\n"))
 			require.NoError(t, err, "writing exit to stdin")
 			_ = stdin.Close()
@@ -208,7 +205,7 @@ func TestAgent_Stats_ReconnectingPTY(t *testing.T) {
 	// We are looking for four different stats to be reported. They might not all
 	// arrive at the same time, so we loop until we've seen them all.
 	var connectionCountSeen, rxBytesSeen, txBytesSeen, sessionCountReconnectingPTYSeen bool
-	require.Eventuallyf(t, func() bool {
+	testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 		var ok bool
 		s, ok = <-stats
 		if !ok {
@@ -227,10 +224,7 @@ func TestAgent_Stats_ReconnectingPTY(t *testing.T) {
 			sessionCountReconnectingPTYSeen = true
 		}
 		return connectionCountSeen && rxBytesSeen && txBytesSeen && sessionCountReconnectingPTYSeen
-	}, testutil.WaitLong, testutil.IntervalFast,
-		"never saw all stats: %+v, saw connectionCount: %t, rxBytes: %t, txBytes: %t, sessionCountReconnectingPTY: %t",
-		s, connectionCountSeen, rxBytesSeen, txBytesSeen, sessionCountReconnectingPTYSeen,
-	)
+	}, testutil.IntervalFast, "never saw all stats: %+v, saw connectionCount: %t, rxBytes: %t, txBytes: %t, sessionCountReconnectingPTY: %t", s, connectionCountSeen, rxBytesSeen, txBytesSeen, sessionCountReconnectingPTYSeen)
 }
 
 func TestAgent_Stats_Magic(t *testing.T) {
@@ -280,7 +274,7 @@ func TestAgent_Stats_Magic(t *testing.T) {
 		require.NoError(t, err)
 		err = session.Shell()
 		require.NoError(t, err)
-		require.Eventuallyf(t, func() bool {
+		testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 			s, ok := <-stats
 			t.Logf("got stats: ok=%t, ConnectionCount=%d, RxBytes=%d, TxBytes=%d, SessionCountVSCode=%d, ConnectionMedianLatencyMS=%f",
 				ok, s.ConnectionCount, s.RxBytes, s.TxBytes, s.SessionCountVscode, s.ConnectionMedianLatencyMs)
@@ -291,9 +285,7 @@ func TestAgent_Stats_Magic(t *testing.T) {
 				// Ensure that connection latency is being counted!
 				// If it isn't, it's set to -1.
 				s.ConnectionMedianLatencyMs >= 0
-		}, testutil.WaitLong, testutil.IntervalFast,
-			"never saw stats",
-		)
+		}, testutil.IntervalFast, "never saw stats")
 
 		_, err = stdin.Write([]byte("exit 0\n"))
 		require.NoError(t, err, "writing exit to stdin")
@@ -350,29 +342,25 @@ func TestAgent_Stats_Magic(t *testing.T) {
 			_ = tunneledConn.Close()
 		})
 
-		require.Eventuallyf(t, func() bool {
+		testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 			s, ok := <-stats
 			t.Logf("got stats with conn open: ok=%t, ConnectionCount=%d, SessionCountJetBrains=%d",
 				ok, s.ConnectionCount, s.SessionCountJetbrains)
 			return ok && s.SessionCountJetbrains == 1
-		}, testutil.WaitLong, testutil.IntervalFast,
-			"never saw stats with conn open",
-		)
+		}, testutil.IntervalFast, "never saw stats with conn open")
 
 		// Kill the server and connection after checking for the echo.
 		requireEcho(t, tunneledConn)
 		_ = echoServerCmd.Process.Kill()
 		_ = tunneledConn.Close()
 
-		require.Eventuallyf(t, func() bool {
+		testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 			s, ok := <-stats
 			t.Logf("got stats after disconnect %t, %d",
 				ok, s.SessionCountJetbrains)
 			return ok &&
 				s.SessionCountJetbrains == 0
-		}, testutil.WaitLong, testutil.IntervalFast,
-			"never saw stats after conn closes",
-		)
+		}, testutil.IntervalFast, "never saw stats after conn closes")
 
 		assertConnectionReport(t, agentClient, proto.Connection_JETBRAINS, 0, "")
 	})
@@ -1387,21 +1375,23 @@ func TestAgent_Metadata(t *testing.T) {
 		})
 
 		var gotMd map[string]agentsdk.Metadata
-		require.Eventually(t, func() bool {
+		tCtx := testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 			gotMd = client.GetMetadata()
 			return len(gotMd) == 2
-		}, testutil.WaitShort, testutil.IntervalFast/2)
+		}, testutil.IntervalFast/2)
 
 		collectedAt1 := gotMd["greeting1"].CollectedAt
 		collectedAt2 := gotMd["greeting2"].CollectedAt
 
-		require.Eventually(t, func() bool {
+		tCtx = testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 			gotMd = client.GetMetadata()
 			if len(gotMd) != 2 {
 				panic("unexpected number of metadata")
 			}
 			return !gotMd["greeting2"].CollectedAt.Equal(collectedAt2)
-		}, testutil.WaitShort, testutil.IntervalFast/2)
+		}, testutil.IntervalFast/2)
 
 		require.Equal(t, gotMd["greeting1"].CollectedAt, collectedAt1, "metadata should not be collected again")
 	})
@@ -1423,18 +1413,20 @@ func TestAgent_Metadata(t *testing.T) {
 		})
 
 		var gotMd map[string]agentsdk.Metadata
-		require.Eventually(t, func() bool {
+		tCtx := testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 			gotMd = client.GetMetadata()
 			return len(gotMd) == 1
-		}, testutil.WaitShort, testutil.IntervalFast/2)
+		}, testutil.IntervalFast/2)
 
 		collectedAt1 := gotMd["greeting"].CollectedAt
 		require.Equal(t, "hello", strings.TrimSpace(gotMd["greeting"].Value))
 
-		if !assert.Eventually(t, func() bool {
+		tCtx = testutil.Context(t, testutil.WaitShort)
+		if !testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 			gotMd = client.GetMetadata()
 			return gotMd["greeting"].CollectedAt.After(collectedAt1)
-		}, testutil.WaitShort, testutil.IntervalFast/2) {
+		}, testutil.IntervalFast/2) {
 			t.Fatalf("expected metadata to be collected again")
 		}
 	})
@@ -1475,9 +1467,10 @@ func TestAgentMetadata_Timing(t *testing.T) {
 		opts.ReportMetadataInterval = intervalUnit
 	})
 
-	require.Eventually(t, func() bool {
+	tCtx := testutil.Context(t, testutil.WaitShort)
+	testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 		return len(client.GetMetadata()) == 2
-	}, testutil.WaitShort, testutil.IntervalMedium)
+	}, testutil.IntervalMedium)
 
 	for start := time.Now(); time.Since(start) < testutil.WaitMedium; time.Sleep(testutil.IntervalMedium) {
 		md := client.GetMetadata()
@@ -1536,10 +1529,11 @@ func TestAgent_Lifecycle(t *testing.T) {
 		}
 
 		var got []codersdk.WorkspaceAgentLifecycle
-		assert.Eventually(t, func() bool {
+		tCtx := testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 			got = client.GetLifecycleStates()
 			return slices.Contains(got, want[len(want)-1])
-		}, testutil.WaitShort, testutil.IntervalMedium)
+		}, testutil.IntervalMedium)
 
 		require.Equal(t, want, got[:len(want)])
 	})
@@ -1561,10 +1555,11 @@ func TestAgent_Lifecycle(t *testing.T) {
 		}
 
 		var got []codersdk.WorkspaceAgentLifecycle
-		assert.Eventually(t, func() bool {
+		tCtx := testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 			got = client.GetLifecycleStates()
 			return slices.Contains(got, want[len(want)-1])
-		}, testutil.WaitShort, testutil.IntervalMedium)
+		}, testutil.IntervalMedium)
 
 		require.Equal(t, want, got[:len(want)])
 	})
@@ -1586,10 +1581,11 @@ func TestAgent_Lifecycle(t *testing.T) {
 		}
 
 		var got []codersdk.WorkspaceAgentLifecycle
-		assert.Eventually(t, func() bool {
+		ctx := testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 			got = client.GetLifecycleStates()
 			return len(got) > 0 && got[len(got)-1] == want[len(want)-1]
-		}, testutil.WaitShort, testutil.IntervalMedium)
+		}, testutil.IntervalMedium)
 
 		require.Equal(t, want, got)
 	})
@@ -1605,9 +1601,10 @@ func TestAgent_Lifecycle(t *testing.T) {
 			}},
 		}, 0)
 
-		assert.Eventually(t, func() bool {
+		ctx := testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 			return slices.Contains(client.GetLifecycleStates(), codersdk.WorkspaceAgentLifecycleReady)
-		}, testutil.WaitShort, testutil.IntervalMedium)
+		}, testutil.IntervalMedium)
 
 		// Start close asynchronously so that we an inspect the state.
 		done := make(chan struct{})
@@ -1627,11 +1624,11 @@ func TestAgent_Lifecycle(t *testing.T) {
 		}
 
 		var got []codersdk.WorkspaceAgentLifecycle
-		assert.Eventually(t, func() bool {
+		ctx = testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 			got = client.GetLifecycleStates()
 			return slices.Contains(got, want[len(want)-1])
-		}, testutil.WaitShort, testutil.IntervalMedium)
-
+		}, testutil.IntervalMedium)
 		require.Equal(t, want, got[:len(want)])
 	})
 
@@ -1646,9 +1643,10 @@ func TestAgent_Lifecycle(t *testing.T) {
 			}},
 		}, 0)
 
-		assert.Eventually(t, func() bool {
+		ctx := testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 			return slices.Contains(client.GetLifecycleStates(), codersdk.WorkspaceAgentLifecycleReady)
-		}, testutil.WaitShort, testutil.IntervalMedium)
+		}, testutil.IntervalMedium)
 
 		// Start close asynchronously so that we an inspect the state.
 		done := make(chan struct{})
@@ -1669,10 +1667,11 @@ func TestAgent_Lifecycle(t *testing.T) {
 		}
 
 		var got []codersdk.WorkspaceAgentLifecycle
-		assert.Eventually(t, func() bool {
+		ctx = testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 			got = client.GetLifecycleStates()
 			return slices.Contains(got, want[len(want)-1])
-		}, testutil.WaitShort, testutil.IntervalMedium)
+		}, testutil.IntervalMedium)
 
 		require.Equal(t, want, got[:len(want)])
 	})
@@ -1688,9 +1687,10 @@ func TestAgent_Lifecycle(t *testing.T) {
 			}},
 		}, 0)
 
-		assert.Eventually(t, func() bool {
+		ctx := testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 			return slices.Contains(client.GetLifecycleStates(), codersdk.WorkspaceAgentLifecycleReady)
-		}, testutil.WaitShort, testutil.IntervalMedium)
+		}, testutil.IntervalMedium)
 
 		// Start close asynchronously so that we an inspect the state.
 		done := make(chan struct{})
@@ -1711,10 +1711,11 @@ func TestAgent_Lifecycle(t *testing.T) {
 		}
 
 		var got []codersdk.WorkspaceAgentLifecycle
-		assert.Eventually(t, func() bool {
+		ctx = testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 			got = client.GetLifecycleStates()
 			return slices.Contains(got, want[len(want)-1])
-		}, testutil.WaitShort, testutil.IntervalMedium)
+		}, testutil.IntervalMedium)
 
 		require.Equal(t, want, got[:len(want)])
 	})
@@ -1759,7 +1760,8 @@ func TestAgent_Lifecycle(t *testing.T) {
 		// agent.Close() loads the shutdown script from the agent metadata.
 		// The metadata is populated just before execution of the startup script, so it's mandatory to wait
 		// until the startup starts.
-		require.Eventually(t, func() bool {
+		tCtx := testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 			outputPath := filepath.Join(os.TempDir(), "coder-startup-script.log")
 			content, err := afero.ReadFile(fs, outputPath)
 			if err != nil {
@@ -1767,7 +1769,7 @@ func TestAgent_Lifecycle(t *testing.T) {
 				return false
 			}
 			return len(content) > 0 // something is in the startup log file
-		}, testutil.WaitShort, testutil.IntervalMedium)
+		}, testutil.IntervalMedium)
 
 		// In order to avoid shutting down the agent before it is fully started and triggering
 		// errors, we'll wait until the agent is fully up. It's a bit hokey, but among the last things the agent starts
@@ -2026,11 +2028,10 @@ func TestAgent_ReconnectingPTYContainer(t *testing.T) {
 		require.NoError(t, err, "Could not stop container")
 	}()
 	// Wait for container to start
-	require.Eventually(t, func() bool {
+	testutil.Eventually(testutil.Context(t, testutil.WaitShort), t, func(ctx context.Context) bool {
 		ct, ok := pool.ContainerByName(ct.Container.Name)
 		return ok && ct.Container.State.Running
-	}, testutil.WaitShort, testutil.IntervalSlow, "Container did not start in time")
-
+	}, testutil.IntervalSlow, "Container did not start in time")
 	// nolint: dogsled
 	conn, _, _, _, _ := setupAgent(t, agentsdk.Manifest{}, 0, func(_ *agenttest.Client, o *agent.Options) {
 		o.Devcontainers = true
@@ -2259,7 +2260,8 @@ func TestAgent_DevcontainerAutostart(t *testing.T) {
 	t.Logf("Waiting for container with label: devcontainer.local_folder=%s", tempWorkspaceFolder)
 
 	var container docker.APIContainers
-	require.Eventually(t, func() bool {
+	tCtx := testutil.Context(t, testutil.WaitSuperLong)
+	testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 		containers, err := pool.Client.ListContainers(docker.ListContainersOptions{All: true})
 		if err != nil {
 			t.Logf("Error listing containers: %v", err)
@@ -2278,7 +2280,7 @@ func TestAgent_DevcontainerAutostart(t *testing.T) {
 		}
 
 		return false
-	}, testutil.WaitSuperLong, testutil.IntervalMedium, "no container with workspace folder label found")
+	}, testutil.IntervalMedium, "no container with workspace folder label found")
 	defer func() {
 		// We can't rely on pool here because the container is not
 		// managed by it (it is managed by @devcontainer/cli).
@@ -2958,7 +2960,7 @@ func TestAgent_UpdatedDERP(t *testing.T) {
 	require.NoError(t, err)
 	t.Log("pushed DERPMap update to agent")
 
-	require.Eventually(t, func() bool {
+	testutil.Eventually(testutil.Context(t, testutil.WaitShort), t, func(ctx context.Context) bool {
 		conn := uut.TailnetConn()
 		if conn == nil {
 			return false
@@ -2967,7 +2969,7 @@ func TestAgent_UpdatedDERP(t *testing.T) {
 		preferredDERP := conn.Node().PreferredDERP
 		t.Logf("agent Conn DERPMap with regionIDs %v, PreferredDERP %d", regionIDs, preferredDERP)
 		return len(regionIDs) == 1 && regionIDs[0] == 2 && preferredDERP == 2
-	}, testutil.WaitLong, testutil.IntervalFast)
+	}, testutil.IntervalFast)
 	t.Log("agent got the new DERPMap")
 
 	// Connect from a second client and make sure it uses the new DERP map.
@@ -3007,7 +3009,7 @@ func TestAgent_Speedtest(t *testing.T) {
 
 func TestAgent_Reconnect(t *testing.T) {
 	t.Parallel()
-	ctx := testutil.Context(t, testutil.WaitLong)
+	ctx := testutil.Context(t, testutil.WaitShort)
 	logger := testutil.Logger(t)
 	// After the agent is disconnected from a coordinator, it's supposed
 	// to reconnect!
@@ -3020,8 +3022,7 @@ func TestAgent_Reconnect(t *testing.T) {
 		logger,
 		agentID,
 		agentsdk.Manifest{
-			DERPMap:   derpMap,
-			Directory: "/test/workspace",
+			DERPMap: derpMap,
 		},
 		statsCh,
 		fCoordinator,
@@ -3034,19 +3035,13 @@ func TestAgent_Reconnect(t *testing.T) {
 	})
 	defer closer.Close()
 
-	// Each iteration forces the agent to reconnect by closing
-	// the current coordinate call while the tracked HTTP server
-	// goroutine (from connection 1's createTailnet) is still
-	// alive, widening the race window.
-	const reconnections = 5
-	for i := range reconnections {
-		call := testutil.RequireReceive(ctx, t, fCoordinator.CoordinateCalls)
-		require.Equal(t, i+1, client.GetNumRefreshTokenCalls())
-		close(call.Resps) // hang up — triggers reconnect
-	}
-	// Verify final reconnect succeeds.
+	call1 := testutil.RequireReceive(ctx, t, fCoordinator.CoordinateCalls)
+	require.Equal(t, client.GetNumRefreshTokenCalls(), 1)
+	close(call1.Resps) // hang up
+	// expect reconnect
 	testutil.RequireReceive(ctx, t, fCoordinator.CoordinateCalls)
-	require.Equal(t, reconnections+1, client.GetNumRefreshTokenCalls())
+	// Check that the agent refreshes the token when it reconnects.
+	require.Equal(t, client.GetNumRefreshTokenCalls(), 2)
 	closer.Close()
 }
 
@@ -3083,9 +3078,9 @@ func TestAgent_ReconnectNoLifecycleReemit(t *testing.T) {
 	defer closer.Close()
 
 	// Wait for the agent to reach Ready state.
-	require.Eventually(t, func() bool {
+	testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 		return slices.Contains(client.GetLifecycleStates(), codersdk.WorkspaceAgentLifecycleReady)
-	}, testutil.WaitShort, testutil.IntervalFast)
+	}, testutil.IntervalFast)
 
 	statesBefore := slices.Clone(client.GetLifecycleStates())
 
@@ -3134,10 +3129,10 @@ func TestAgent_WriteVSCodeConfigs(t *testing.T) {
 	home, err := os.UserHomeDir()
 	require.NoError(t, err)
 	name := filepath.Join(home, ".vscode-server", "data", "Machine", "settings.json")
-	require.Eventually(t, func() bool {
+	testutil.Eventually(testutil.Context(t, testutil.WaitShort), t, func(ctx context.Context) bool {
 		_, err := filesystem.Stat(name)
 		return err == nil
-	}, testutil.WaitShort, testutil.IntervalFast)
+	}, testutil.IntervalFast)
 }
 
 func TestAgent_DebugServer(t *testing.T) {
@@ -3720,7 +3715,7 @@ func TestAgent_Metrics_SSH(t *testing.T) {
 	}
 
 	var actual []*promgo.MetricFamily
-	assert.Eventually(t, func() bool {
+	testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 		actual, err = registry.Gather()
 		if err != nil {
 			return false
@@ -3730,7 +3725,7 @@ func TestAgent_Metrics_SSH(t *testing.T) {
 			count += len(m.GetMetric())
 		}
 		return count == len(expected)
-	}, testutil.WaitLong, testutil.IntervalFast)
+	}, testutil.IntervalFast)
 
 	i := 0
 	for _, mf := range actual {
@@ -3793,10 +3788,11 @@ func assertConnectionReport(t testing.TB, agentClient *agenttest.Client, connect
 	t.Helper()
 
 	var reports []*proto.ReportConnectionRequest
-	if !assert.Eventually(t, func() bool {
+	tCtx := testutil.Context(t, testutil.WaitMedium)
+	if !testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 		reports = agentClient.GetConnectionReports()
 		return len(reports) >= 2
-	}, testutil.WaitMedium, testutil.IntervalFast, "waiting for 2 connection reports or more; got %d", len(reports)) {
+	}, testutil.IntervalFast, "waiting for 2 connection reports or more; got %d", len(reports)) {
 		return
 	}
 

agent/agentcontainers/api_test.go

@@ -3937,12 +3937,12 @@ func TestAPI(t *testing.T) {
 			Op:   fsnotify.Write,
 		})
 
-		require.Eventuallyf(t, func() bool {
+		testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 			err = api.RefreshContainers(ctx)
 			require.NoError(t, err)
 
 			return len(fakeSAC.agents) == 1
-		}, testutil.WaitShort, testutil.IntervalFast, "subagent should be created after config change")
+		}, testutil.IntervalFast, "subagent should be created after config change")
 
 		t.Log("Phase 2: Cont, waiting for sub agent to exit")
 		exitSubAgentOnce.Do(func() {
@@ -3977,12 +3977,12 @@ func TestAPI(t *testing.T) {
 			Op:   fsnotify.Write,
 		})
 
-		require.Eventuallyf(t, func() bool {
+		testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 			err = api.RefreshContainers(ctx)
 			require.NoError(t, err)
 
 			return len(fakeSAC.agents) == 0
-		}, testutil.WaitShort, testutil.IntervalFast, "subagent should be deleted after config change")
+		}, testutil.IntervalFast, "subagent should be deleted after config change")
 
 		req = httptest.NewRequest(http.MethodGet, "/", nil).WithContext(ctx)
 		rec = httptest.NewRecorder()
@@ -4544,7 +4544,8 @@ func TestDevcontainerDiscovery(t *testing.T) {
 			tickerTrap.Close()
 
 			// Wait until all projects have been discovered
-			require.Eventuallyf(t, func() bool {
+			ctx = testutil.Context(t, testutil.WaitShort)
+			testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 				req := httptest.NewRequest(http.MethodGet, "/", nil).WithContext(ctx)
 				rec := httptest.NewRecorder()
 				r.ServeHTTP(rec, req)
@@ -4554,7 +4555,7 @@ func TestDevcontainerDiscovery(t *testing.T) {
 				require.NoError(t, err)
 
 				return len(got.Devcontainers) >= len(tt.expected)
-			}, testutil.WaitShort, testutil.IntervalFast, "dev containers never found")
+			}, testutil.IntervalFast, "dev containers never found")
 
 			// Now projects have been discovered, we'll allow the updater loop
 			// to set the appropriate status for these containers.
@@ -4736,7 +4737,6 @@ func TestDevcontainerDiscovery(t *testing.T) {
 				t.Parallel()
 
 				var (
-					ctx    = testutil.Context(t, testutil.WaitShort)
 					logger = testutil.Logger(t)
 					mClock = quartz.NewMock(t)
 
@@ -4772,7 +4772,8 @@ func TestDevcontainerDiscovery(t *testing.T) {
 
 				// Given: We allow the discover routing to progress
 				var got codersdk.WorkspaceAgentListContainersResponse
-				require.Eventuallyf(t, func() bool {
+				ctx := testutil.Context(t, testutil.WaitShort)
+				testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 					req := httptest.NewRequest(http.MethodGet, "/", nil).WithContext(ctx)
 					rec := httptest.NewRecorder()
 					r.ServeHTTP(rec, req)
@@ -4786,7 +4787,7 @@ func TestDevcontainerDiscovery(t *testing.T) {
 					upCalledMu.Unlock()
 
 					return len(got.Devcontainers) >= tt.expectDevcontainerCount && upCalledCount >= tt.expectUpCalledCount
-				}, testutil.WaitShort, testutil.IntervalFast, "dev containers never found")
+				}, testutil.IntervalFast, "dev containers never found")
 
 				// Close the API. We expect this not to fail because we should have finished
 				// at this point.
@@ -4812,7 +4813,6 @@ func TestDevcontainerDiscovery(t *testing.T) {
 		t.Run("Disabled", func(t *testing.T) {
 			t.Parallel()
 			var (
-				ctx    = testutil.Context(t, testutil.WaitShort)
 				logger = testutil.Logger(t)
 				mClock = quartz.NewMock(t)
 				mDCCLI = acmock.NewMockDevcontainerCLI(gomock.NewController(t))
@@ -4863,7 +4863,8 @@ func TestDevcontainerDiscovery(t *testing.T) {
 			r.Mount("/", api.Routes())
 
 			// When: All expected dev containers have been found.
-			require.Eventuallyf(t, func() bool {
+			ctx := testutil.Context(t, testutil.WaitShort)
+			testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 				req := httptest.NewRequest(http.MethodGet, "/", nil).WithContext(ctx)
 				rec := httptest.NewRecorder()
 				r.ServeHTTP(rec, req)
@@ -4873,7 +4874,7 @@ func TestDevcontainerDiscovery(t *testing.T) {
 				require.NoError(t, err)
 
 				return len(got.Devcontainers) >= 1
-			}, testutil.WaitShort, testutil.IntervalFast, "dev containers never found")
+			}, testutil.IntervalFast, "dev containers never found")
 
 			// Then: We expect the mock infra to not fail.
 		})

agent/agentcontainers/containers_dockercli_test.go

@@ -1,6 +1,7 @@
 package agentcontainers_test
 
 import (
+	"context"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -49,10 +50,11 @@ func TestIntegrationDockerCLI(t *testing.T) {
 	})
 
 	// Wait for container to start.
-	require.Eventually(t, func() bool {
+	ctx := testutil.Context(t, testutil.WaitShort)
+	testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 		ct, ok := pool.ContainerByName(ct.Container.Name)
 		return ok && ct.Container.State.Running
-	}, testutil.WaitShort, testutil.IntervalSlow, "Container did not start in time")
+	}, testutil.IntervalSlow, "Container did not start in time")
 
 	dcli := agentcontainers.NewDockerCLI(agentexec.DefaultExecer)
 	containerName := strings.TrimPrefix(ct.Container.Name, "/")
@@ -159,10 +161,10 @@ func TestIntegrationDockerCLIStop(t *testing.T) {
 	})
 
 	// Given: The container is running
-	require.Eventually(t, func() bool {
+	testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 		ct, ok := pool.ContainerByName(ct.Container.Name)
 		return ok && ct.Container.State.Running
-	}, testutil.WaitShort, testutil.IntervalSlow, "Container did not start in time")
+	}, testutil.IntervalSlow, "Container did not start in time")
 
 	dcli := agentcontainers.NewDockerCLI(agentexec.DefaultExecer)
 	containerName := strings.TrimPrefix(ct.Container.Name, "/")
@@ -207,10 +209,10 @@ func TestIntegrationDockerCLIRemove(t *testing.T) {
 	containerName := strings.TrimPrefix(ct.Container.Name, "/")
 
 	// Wait for the container to exit.
-	require.Eventually(t, func() bool {
+	testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 		ct, ok := pool.ContainerByName(ct.Container.Name)
 		return ok && !ct.Container.State.Running
-	}, testutil.WaitShort, testutil.IntervalSlow, "Container did not stop in time")
+	}, testutil.IntervalSlow, "Container did not stop in time")
 
 	dcli := agentcontainers.NewDockerCLI(agentexec.DefaultExecer)
 

agent/agentcontainers/containers_internal_test.go

@@ -159,6 +159,7 @@ func TestConvertDockerVolume(t *testing.T) {
 func TestConvertDockerInspect(t *testing.T) {
 	t.Parallel()
 
+	//nolint:paralleltest // variable recapture no longer required
 	for _, tt := range []struct {
 		name        string
 		expect      []codersdk.WorkspaceAgentContainer
@@ -387,6 +388,7 @@ func TestConvertDockerInspect(t *testing.T) {
 			},
 		},
 	} {
+		// nolint:paralleltest // variable recapture no longer required
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
 			bs, err := os.ReadFile(filepath.Join("testdata", tt.name, "docker_inspect.json"))

agent/agentcontainers/containers_test.go

@@ -73,13 +73,14 @@ func TestIntegrationDocker(t *testing.T) {
 		t.Logf("Purged container %q", ct.Container.Name)
 	})
 	// Wait for container to start
-	require.Eventually(t, func() bool {
+	ctx := testutil.Context(t, testutil.WaitShort)
+	testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 		ct, ok := pool.ContainerByName(ct.Container.Name)
 		return ok && ct.Container.State.Running
-	}, testutil.WaitShort, testutil.IntervalSlow, "Container did not start in time")
+	}, testutil.IntervalSlow, "Container did not start in time")
 
 	dcl := agentcontainers.NewDockerCLI(agentexec.DefaultExecer)
-	ctx := testutil.Context(t, testutil.WaitShort)
+	ctx = testutil.Context(t, testutil.WaitShort)
 	actual, err := dcl.List(ctx)
 	require.NoError(t, err, "Could not list containers")
 	require.Empty(t, actual.Warnings, "Expected no warnings")
@@ -166,6 +167,7 @@ func TestDockerEnvInfoer(t *testing.T) {
 
 	pool, err := dockertest.NewPool("")
 	require.NoError(t, err, "Could not connect to docker")
+	// nolint:paralleltest // variable recapture no longer required
 	for idx, tt := range []struct {
 		image             string
 		labels            map[string]string
@@ -222,6 +224,7 @@ func TestDockerEnvInfoer(t *testing.T) {
 			expectedUserShell: "/bin/bash",
 		},
 	} {
+		//nolint:paralleltest // variable recapture no longer required
 		t.Run(fmt.Sprintf("#%d", idx), func(t *testing.T) {
 			// Start a container with the given image
 			// and environment variables

agent/agentcontextconfig/api.go

@@ -1,313 +0,0 @@
-package agentcontextconfig
-
-import (
-	"cmp"
-	"io"
-	"net/http"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-
-	"github.com/go-chi/chi/v5"
-
-	"github.com/coder/coder/v2/coderd/httpapi"
-	"github.com/coder/coder/v2/codersdk"
-	"github.com/coder/coder/v2/codersdk/workspacesdk"
-)
-
-// Env var names for context configuration. Prefixed with EXP_
-// to indicate these are experimental and may change.
-const (
-	EnvInstructionsDirs = "CODER_AGENT_EXP_INSTRUCTIONS_DIRS"
-	EnvInstructionsFile = "CODER_AGENT_EXP_INSTRUCTIONS_FILE"
-	EnvSkillsDirs       = "CODER_AGENT_EXP_SKILLS_DIRS"
-	EnvSkillMetaFile    = "CODER_AGENT_EXP_SKILL_META_FILE"
-	EnvMCPConfigFiles   = "CODER_AGENT_EXP_MCP_CONFIG_FILES"
-)
-
-const (
-	maxInstructionFileBytes = 64 * 1024
-	maxSkillMetaBytes       = 64 * 1024
-)
-
-// markdownCommentPattern strips HTML comments from instruction
-// file content for security (prevents hidden prompt injection).
-var markdownCommentPattern = regexp.MustCompile(`<!--[\s\S]*?-->`)
-
-// invisibleRunePattern strips invisible Unicode characters that
-// could be used for prompt injection.
-//
-//nolint:gocritic // Non-ASCII char ranges are intentional for invisible Unicode stripping.
-var invisibleRunePattern = regexp.MustCompile(
-	"[\u00ad\u034f\u061c\u070f" +
-		"\u115f\u1160\u17b4\u17b5" +
-		"\u180b-\u180f" +
-		"\u200b\u200d\u200e\u200f" +
-		"\u202a-\u202e" +
-		"\u2060-\u206f" +
-		"\u3164" +
-		"\ufe00-\ufe0f" +
-		"\ufeff" +
-		"\uffa0" +
-		"\ufff0-\ufff8]",
-)
-
-// skillNamePattern validates kebab-case skill names.
-var skillNamePattern = regexp.MustCompile(
-	`^[a-z0-9]+(-[a-z0-9]+)*$`,
-)
-
-// Default values for agent-internal configuration. These are
-// used when the corresponding env vars are unset.
-const (
-	DefaultInstructionsDir  = "~/.coder"
-	DefaultInstructionsFile = "AGENTS.md"
-	DefaultSkillsDir        = ".agents/skills"
-	DefaultSkillMetaFile    = "SKILL.md"
-	DefaultMCPConfigFile    = ".mcp.json"
-)
-
-// API exposes the resolved context configuration through the
-// agent's HTTP API.
-type API struct {
-	workingDir func() string
-}
-
-// NewAPI accepts a closure that returns the working directory.
-// The directory is evaluated lazily on each call to Config(),
-// so the caller can update it after construction.
-func NewAPI(workingDir func() string) *API {
-	if workingDir == nil {
-		workingDir = func() string { return "" }
-	}
-	return &API{workingDir: workingDir}
-}
-
-// Config reads env vars, resolves paths, reads instruction files,
-// and discovers skills. Returns the HTTP response and the resolved
-// MCP config file paths (used only agent-internally). Exported
-// for use by tests.
-func Config(workingDir string) (workspacesdk.ContextConfigResponse, []string) {
-	// TrimSpace all env vars before cmp.Or so that a
-	// whitespace-only value falls through to the default
-	// consistently. ResolvePaths also trims each comma-
-	// separated entry, but without pre-trimming here a
-	// bare " " would bypass cmp.Or and produce nil.
-	instructionsDir := cmp.Or(strings.TrimSpace(os.Getenv(EnvInstructionsDirs)), DefaultInstructionsDir)
-	instructionsFile := cmp.Or(strings.TrimSpace(os.Getenv(EnvInstructionsFile)), DefaultInstructionsFile)
-	skillsDir := cmp.Or(strings.TrimSpace(os.Getenv(EnvSkillsDirs)), DefaultSkillsDir)
-	skillMetaFile := cmp.Or(strings.TrimSpace(os.Getenv(EnvSkillMetaFile)), DefaultSkillMetaFile)
-	mcpConfigFile := cmp.Or(strings.TrimSpace(os.Getenv(EnvMCPConfigFiles)), DefaultMCPConfigFile)
-
-	resolvedInstructionsDirs := ResolvePaths(instructionsDir, workingDir)
-	resolvedSkillsDirs := ResolvePaths(skillsDir, workingDir)
-
-	// Read instruction files from each configured directory.
-	parts := readInstructionFiles(resolvedInstructionsDirs, instructionsFile)
-
-	// Also check the working directory for the instruction file,
-	// unless it was already covered by InstructionsDirs.
-	if workingDir != "" {
-		seenDirs := make(map[string]struct{}, len(resolvedInstructionsDirs))
-		for _, d := range resolvedInstructionsDirs {
-			seenDirs[d] = struct{}{}
-		}
-		if _, ok := seenDirs[workingDir]; !ok {
-			if entry, found := readInstructionFileFromDir(workingDir, instructionsFile); found {
-				parts = append(parts, entry)
-			}
-		}
-	}
-
-	// Discover skills from each configured skills directory.
-	skillParts := discoverSkills(resolvedSkillsDirs, skillMetaFile)
-	parts = append(parts, skillParts...)
-
-	// Guarantee non-nil slice to signal agent support.
-	if parts == nil {
-		parts = []codersdk.ChatMessagePart{}
-	}
-
-	return workspacesdk.ContextConfigResponse{
-		Parts: parts,
-	}, ResolvePaths(mcpConfigFile, workingDir)
-}
-
-// MCPConfigFiles returns the resolved MCP configuration file
-// paths for the agent's MCP manager.
-func (api *API) MCPConfigFiles() []string {
-	_, mcpFiles := Config(api.workingDir())
-	return mcpFiles
-}
-
-// Routes returns the HTTP handler for the context config
-// endpoint.
-func (api *API) Routes() http.Handler {
-	r := chi.NewRouter()
-	r.Get("/", api.handleGet)
-	return r
-}
-
-func (api *API) handleGet(rw http.ResponseWriter, r *http.Request) {
-	response, _ := Config(api.workingDir())
-	httpapi.Write(r.Context(), rw, http.StatusOK, response)
-}
-
-// readInstructionFiles reads instruction files from each given
-// directory. Missing directories are silently skipped. Duplicate
-// directories are deduplicated.
-func readInstructionFiles(dirs []string, fileName string) []codersdk.ChatMessagePart {
-	var parts []codersdk.ChatMessagePart
-	seen := make(map[string]struct{}, len(dirs))
-	for _, dir := range dirs {
-		if _, ok := seen[dir]; ok {
-			continue
-		}
-		seen[dir] = struct{}{}
-		if part, found := readInstructionFileFromDir(dir, fileName); found {
-			parts = append(parts, part)
-		}
-	}
-	return parts
-}
-
-// readInstructionFileFromDir scans a directory for a file matching
-// fileName (case-insensitive) and reads its contents.
-func readInstructionFileFromDir(dir, fileName string) (codersdk.ChatMessagePart, bool) {
-	dirEntries, err := os.ReadDir(dir)
-	if err != nil {
-		return codersdk.ChatMessagePart{}, false
-	}
-
-	for _, e := range dirEntries {
-		if e.IsDir() {
-			continue
-		}
-		if strings.EqualFold(strings.TrimSpace(e.Name()), fileName) {
-			filePath := filepath.Join(dir, e.Name())
-			content, truncated, ok := readAndSanitizeFile(filePath, maxInstructionFileBytes)
-			if !ok {
-				return codersdk.ChatMessagePart{}, false
-			}
-			if content == "" {
-				return codersdk.ChatMessagePart{}, false
-			}
-			return codersdk.ChatMessagePart{
-				Type:                 codersdk.ChatMessagePartTypeContextFile,
-				ContextFilePath:      filePath,
-				ContextFileContent:   content,
-				ContextFileTruncated: truncated,
-			}, true
-		}
-	}
-	return codersdk.ChatMessagePart{}, false
-}
-
-// readAndSanitizeFile reads the file at path, capping the read
-// at maxBytes to avoid unbounded memory allocation. It sanitizes
-// the content (strips HTML comments and invisible Unicode) and
-// returns the result. Returns false if the file cannot be read.
-func readAndSanitizeFile(path string, maxBytes int64) (content string, truncated bool, ok bool) {
-	f, err := os.Open(path)
-	if err != nil {
-		return "", false, false
-	}
-	defer f.Close()
-
-	// Read at most maxBytes+1 to detect truncation without
-	// allocating the entire file into memory.
-	raw, err := io.ReadAll(io.LimitReader(f, maxBytes+1))
-	if err != nil {
-		return "", false, false
-	}
-
-	truncated = int64(len(raw)) > maxBytes
-	if truncated {
-		raw = raw[:maxBytes]
-	}
-
-	s := sanitizeInstructionMarkdown(string(raw))
-	if s == "" {
-		return "", truncated, true
-	}
-	return s, truncated, true
-}
-
-// sanitizeInstructionMarkdown strips HTML comments, invisible
-// Unicode characters, and CRLF line endings from instruction
-// file content.
-func sanitizeInstructionMarkdown(content string) string {
-	content = strings.ReplaceAll(content, "\r\n", "\n")
-	content = strings.ReplaceAll(content, "\r", "\n")
-	content = markdownCommentPattern.ReplaceAllString(content, "")
-	content = invisibleRunePattern.ReplaceAllString(content, "")
-	return strings.TrimSpace(content)
-}
-
-// discoverSkills walks the given skills directories and returns
-// metadata for every valid skill it finds. Body and supporting
-// file lists are NOT included; chatd fetches those on demand
-// via read_skill. Missing directories or individual errors are
-// silently skipped.
-func discoverSkills(skillsDirs []string, metaFile string) []codersdk.ChatMessagePart {
-	seen := make(map[string]struct{})
-	var parts []codersdk.ChatMessagePart
-
-	for _, skillsDir := range skillsDirs {
-		entries, err := os.ReadDir(skillsDir)
-		if err != nil {
-			continue
-		}
-
-		for _, entry := range entries {
-			if !entry.IsDir() {
-				continue
-			}
-
-			metaPath := filepath.Join(skillsDir, entry.Name(), metaFile)
-			f, err := os.Open(metaPath)
-			if err != nil {
-				continue
-			}
-			raw, err := io.ReadAll(io.LimitReader(f, maxSkillMetaBytes+1))
-			_ = f.Close()
-			if err != nil {
-				continue
-			}
-			if int64(len(raw)) > maxSkillMetaBytes {
-				raw = raw[:maxSkillMetaBytes]
-			}
-
-			name, description, _, err := workspacesdk.ParseSkillFrontmatter(string(raw))
-			if err != nil {
-				continue
-			}
-
-			// The directory name must match the declared name.
-			if name != entry.Name() {
-				continue
-			}
-			if !skillNamePattern.MatchString(name) {
-				continue
-			}
-
-			// First occurrence wins across directories.
-			if _, ok := seen[name]; ok {
-				continue
-			}
-			seen[name] = struct{}{}
-
-			skillDir := filepath.Join(skillsDir, entry.Name())
-			parts = append(parts, codersdk.ChatMessagePart{
-				Type:                     codersdk.ChatMessagePartTypeSkill,
-				SkillName:                name,
-				SkillDescription:         description,
-				SkillDir:                 skillDir,
-				ContextFileSkillMetaFile: metaFile,
-			})
-		}
-	}
-
-	return parts
-}

agent/agentcontextconfig/api_test.go

@@ -1,439 +0,0 @@
-package agentcontextconfig_test
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/coder/coder/v2/agent/agentcontextconfig"
-	"github.com/coder/coder/v2/codersdk"
-)
-
-// filterParts returns only the parts matching the given type.
-func filterParts(parts []codersdk.ChatMessagePart, t codersdk.ChatMessagePartType) []codersdk.ChatMessagePart {
-	var out []codersdk.ChatMessagePart
-	for _, p := range parts {
-		if p.Type == t {
-			out = append(out, p)
-		}
-	}
-	return out
-}
-
-func TestConfig(t *testing.T) {
-	t.Run("Defaults", func(t *testing.T) {
-		fakeHome := t.TempDir()
-		t.Setenv("HOME", fakeHome)
-		t.Setenv("USERPROFILE", fakeHome)
-
-		// Clear all env vars so defaults are used.
-		t.Setenv(agentcontextconfig.EnvInstructionsDirs, "")
-		t.Setenv(agentcontextconfig.EnvInstructionsFile, "")
-		t.Setenv(agentcontextconfig.EnvSkillsDirs, "")
-		t.Setenv(agentcontextconfig.EnvSkillMetaFile, "")
-		t.Setenv(agentcontextconfig.EnvMCPConfigFiles, "")
-
-		workDir := platformAbsPath("work")
-		cfg, mcpFiles := agentcontextconfig.Config(workDir)
-
-		// Parts is always non-nil.
-		require.NotNil(t, cfg.Parts)
-		// Default MCP config file is ".mcp.json" (relative),
-		// resolved against the working directory.
-		require.Equal(t, []string{filepath.Join(workDir, ".mcp.json")}, mcpFiles)
-	})
-
-	t.Run("CustomEnvVars", func(t *testing.T) {
-		fakeHome := t.TempDir()
-		t.Setenv("HOME", fakeHome)
-		t.Setenv("USERPROFILE", fakeHome)
-
-		optInstructions := t.TempDir()
-		optSkills := t.TempDir()
-		optMCP := platformAbsPath("opt", "mcp.json")
-
-		t.Setenv(agentcontextconfig.EnvInstructionsDirs, optInstructions)
-		t.Setenv(agentcontextconfig.EnvInstructionsFile, "CUSTOM.md")
-		t.Setenv(agentcontextconfig.EnvSkillsDirs, optSkills)
-		t.Setenv(agentcontextconfig.EnvSkillMetaFile, "META.yaml")
-		t.Setenv(agentcontextconfig.EnvMCPConfigFiles, optMCP)
-
-		// Create files matching the custom names so we can
-		// verify the env vars actually change lookup behavior.
-		require.NoError(t, os.WriteFile(filepath.Join(optInstructions, "CUSTOM.md"), []byte("custom instructions"), 0o600))
-		skillDir := filepath.Join(optSkills, "my-skill")
-		require.NoError(t, os.MkdirAll(skillDir, 0o755))
-		require.NoError(t, os.WriteFile(
-			filepath.Join(skillDir, "META.yaml"),
-			[]byte("---\nname: my-skill\ndescription: custom meta\n---\n"),
-			0o600,
-		))
-
-		workDir := platformAbsPath("work")
-		cfg, mcpFiles := agentcontextconfig.Config(workDir)
-
-		require.Equal(t, []string{optMCP}, mcpFiles)
-		ctxFiles := filterParts(cfg.Parts, codersdk.ChatMessagePartTypeContextFile)
-		require.Len(t, ctxFiles, 1)
-		require.Equal(t, "custom instructions", ctxFiles[0].ContextFileContent)
-		skillParts := filterParts(cfg.Parts, codersdk.ChatMessagePartTypeSkill)
-		require.Len(t, skillParts, 1)
-		require.Equal(t, "my-skill", skillParts[0].SkillName)
-		require.Equal(t, "META.yaml", skillParts[0].ContextFileSkillMetaFile)
-	})
-
-	t.Run("WhitespaceInFileNames", func(t *testing.T) {
-		fakeHome := t.TempDir()
-		t.Setenv("HOME", fakeHome)
-		t.Setenv("USERPROFILE", fakeHome)
-		t.Setenv(agentcontextconfig.EnvInstructionsDirs, fakeHome)
-		t.Setenv(agentcontextconfig.EnvInstructionsFile, "  CLAUDE.md  ")
-		t.Setenv(agentcontextconfig.EnvSkillsDirs, "")
-		t.Setenv(agentcontextconfig.EnvSkillMetaFile, "")
-		t.Setenv(agentcontextconfig.EnvMCPConfigFiles, "")
-
-		workDir := t.TempDir()
-		// Create a file matching the trimmed name.
-		require.NoError(t, os.WriteFile(filepath.Join(fakeHome, "CLAUDE.md"), []byte("hello"), 0o600))
-
-		cfg, _ := agentcontextconfig.Config(workDir)
-
-		ctxFiles := filterParts(cfg.Parts, codersdk.ChatMessagePartTypeContextFile)
-		require.Len(t, ctxFiles, 1)
-		require.Equal(t, "hello", ctxFiles[0].ContextFileContent)
-	})
-
-	t.Run("CommaSeparatedDirs", func(t *testing.T) {
-		fakeHome := t.TempDir()
-		t.Setenv("HOME", fakeHome)
-		t.Setenv("USERPROFILE", fakeHome)
-
-		a := t.TempDir()
-		b := t.TempDir()
-
-		t.Setenv(agentcontextconfig.EnvInstructionsDirs, a+","+b)
-		t.Setenv(agentcontextconfig.EnvInstructionsFile, "")
-		t.Setenv(agentcontextconfig.EnvSkillsDirs, "")
-		t.Setenv(agentcontextconfig.EnvSkillMetaFile, "")
-		t.Setenv(agentcontextconfig.EnvMCPConfigFiles, "")
-
-		// Put instruction files in both dirs.
-		require.NoError(t, os.WriteFile(filepath.Join(a, "AGENTS.md"), []byte("from a"), 0o600))
-		require.NoError(t, os.WriteFile(filepath.Join(b, "AGENTS.md"), []byte("from b"), 0o600))
-
-		workDir := t.TempDir()
-		cfg, _ := agentcontextconfig.Config(workDir)
-
-		ctxFiles := filterParts(cfg.Parts, codersdk.ChatMessagePartTypeContextFile)
-		require.Len(t, ctxFiles, 2)
-		require.Equal(t, "from a", ctxFiles[0].ContextFileContent)
-		require.Equal(t, "from b", ctxFiles[1].ContextFileContent)
-	})
-
-	t.Run("ReadsInstructionFiles", func(t *testing.T) {
-		t.Setenv(agentcontextconfig.EnvInstructionsDirs, "")
-		t.Setenv(agentcontextconfig.EnvInstructionsFile, "")
-		t.Setenv(agentcontextconfig.EnvSkillsDirs, "")
-		t.Setenv(agentcontextconfig.EnvSkillMetaFile, "")
-		t.Setenv(agentcontextconfig.EnvMCPConfigFiles, "")
-
-		workDir := t.TempDir()
-		fakeHome := t.TempDir()
-		t.Setenv("HOME", fakeHome)
-		t.Setenv("USERPROFILE", fakeHome)
-
-		// Create ~/.coder/AGENTS.md
-		coderDir := filepath.Join(fakeHome, ".coder")
-		require.NoError(t, os.MkdirAll(coderDir, 0o755))
-		require.NoError(t, os.WriteFile(
-			filepath.Join(coderDir, "AGENTS.md"),
-			[]byte("home instructions"),
-			0o600,
-		))
-
-		cfg, _ := agentcontextconfig.Config(workDir)
-
-		ctxFiles := filterParts(cfg.Parts, codersdk.ChatMessagePartTypeContextFile)
-		require.NotNil(t, cfg.Parts)
-		require.Len(t, ctxFiles, 1)
-		require.Equal(t, "home instructions", ctxFiles[0].ContextFileContent)
-		require.Equal(t, filepath.Join(coderDir, "AGENTS.md"), ctxFiles[0].ContextFilePath)
-		require.False(t, ctxFiles[0].ContextFileTruncated)
-	})
-
-	t.Run("ReadsWorkingDirInstructionFile", func(t *testing.T) {
-		fakeHome := t.TempDir()
-		t.Setenv("HOME", fakeHome)
-		t.Setenv("USERPROFILE", fakeHome)
-		t.Setenv(agentcontextconfig.EnvInstructionsDirs, "")
-		t.Setenv(agentcontextconfig.EnvInstructionsFile, "")
-		t.Setenv(agentcontextconfig.EnvSkillsDirs, "")
-		t.Setenv(agentcontextconfig.EnvSkillMetaFile, "")
-		t.Setenv(agentcontextconfig.EnvMCPConfigFiles, "")
-
-		workDir := t.TempDir()
-
-		// Create AGENTS.md in the working directory.
-		require.NoError(t, os.WriteFile(
-			filepath.Join(workDir, "AGENTS.md"),
-			[]byte("project instructions"),
-			0o600,
-		))
-
-		cfg, _ := agentcontextconfig.Config(workDir)
-
-		// Should find the working dir file (not in instruction dirs).
-		ctxFiles := filterParts(cfg.Parts, codersdk.ChatMessagePartTypeContextFile)
-		require.NotNil(t, cfg.Parts)
-		require.Len(t, ctxFiles, 1)
-		require.Equal(t, "project instructions", ctxFiles[0].ContextFileContent)
-		require.Equal(t, filepath.Join(workDir, "AGENTS.md"), ctxFiles[0].ContextFilePath)
-	})
-
-	t.Run("TruncatesLargeInstructionFile", func(t *testing.T) {
-		fakeHome := t.TempDir()
-		t.Setenv("HOME", fakeHome)
-		t.Setenv("USERPROFILE", fakeHome)
-		t.Setenv(agentcontextconfig.EnvInstructionsDirs, "")
-		t.Setenv(agentcontextconfig.EnvInstructionsFile, "")
-		t.Setenv(agentcontextconfig.EnvSkillsDirs, "")
-		t.Setenv(agentcontextconfig.EnvSkillMetaFile, "")
-		t.Setenv(agentcontextconfig.EnvMCPConfigFiles, "")
-
-		workDir := t.TempDir()
-		largeContent := strings.Repeat("a", 64*1024+100)
-		require.NoError(t, os.WriteFile(filepath.Join(workDir, "AGENTS.md"), []byte(largeContent), 0o600))
-
-		cfg, _ := agentcontextconfig.Config(workDir)
-
-		ctxFiles := filterParts(cfg.Parts, codersdk.ChatMessagePartTypeContextFile)
-		require.Len(t, ctxFiles, 1)
-		require.True(t, ctxFiles[0].ContextFileTruncated)
-		require.Len(t, ctxFiles[0].ContextFileContent, 64*1024)
-	})
-
-	t.Run("SanitizesHTMLComments", func(t *testing.T) {
-		fakeHome := t.TempDir()
-		t.Setenv("HOME", fakeHome)
-		t.Setenv("USERPROFILE", fakeHome)
-		t.Setenv(agentcontextconfig.EnvInstructionsDirs, "")
-		t.Setenv(agentcontextconfig.EnvInstructionsFile, "")
-		t.Setenv(agentcontextconfig.EnvSkillsDirs, "")
-		t.Setenv(agentcontextconfig.EnvSkillMetaFile, "")
-		t.Setenv(agentcontextconfig.EnvMCPConfigFiles, "")
-
-		workDir := t.TempDir()
-		require.NoError(t, os.WriteFile(
-			filepath.Join(workDir, "AGENTS.md"),
-			[]byte("visible\n<!-- hidden -->content"),
-			0o600,
-		))
-
-		cfg, _ := agentcontextconfig.Config(workDir)
-
-		ctxFiles := filterParts(cfg.Parts, codersdk.ChatMessagePartTypeContextFile)
-		require.Len(t, ctxFiles, 1)
-		require.Equal(t, "visible\ncontent", ctxFiles[0].ContextFileContent)
-	})
-
-	t.Run("SanitizesInvisibleUnicode", func(t *testing.T) {
-		fakeHome := t.TempDir()
-		t.Setenv("HOME", fakeHome)
-		t.Setenv("USERPROFILE", fakeHome)
-		t.Setenv(agentcontextconfig.EnvInstructionsDirs, "")
-		t.Setenv(agentcontextconfig.EnvInstructionsFile, "")
-		t.Setenv(agentcontextconfig.EnvSkillsDirs, "")
-		t.Setenv(agentcontextconfig.EnvSkillMetaFile, "")
-		t.Setenv(agentcontextconfig.EnvMCPConfigFiles, "")
-
-		workDir := t.TempDir()
-		// U+200B (zero-width space) should be stripped.
-		require.NoError(t, os.WriteFile(
-			filepath.Join(workDir, "AGENTS.md"),
-			[]byte("before\u200bafter"),
-			0o600,
-		))
-
-		cfg, _ := agentcontextconfig.Config(workDir)
-
-		ctxFiles := filterParts(cfg.Parts, codersdk.ChatMessagePartTypeContextFile)
-		require.Len(t, ctxFiles, 1)
-		require.Equal(t, "beforeafter", ctxFiles[0].ContextFileContent)
-	})
-
-	t.Run("NormalizesCRLF", func(t *testing.T) {
-		fakeHome := t.TempDir()
-		t.Setenv("HOME", fakeHome)
-		t.Setenv("USERPROFILE", fakeHome)
-		t.Setenv(agentcontextconfig.EnvInstructionsDirs, "")
-		t.Setenv(agentcontextconfig.EnvInstructionsFile, "")
-		t.Setenv(agentcontextconfig.EnvSkillsDirs, "")
-		t.Setenv(agentcontextconfig.EnvSkillMetaFile, "")
-		t.Setenv(agentcontextconfig.EnvMCPConfigFiles, "")
-
-		workDir := t.TempDir()
-		require.NoError(t, os.WriteFile(
-			filepath.Join(workDir, "AGENTS.md"),
-			[]byte("line1\r\nline2\rline3"),
-			0o600,
-		))
-
-		cfg, _ := agentcontextconfig.Config(workDir)
-
-		ctxFiles := filterParts(cfg.Parts, codersdk.ChatMessagePartTypeContextFile)
-		require.Len(t, ctxFiles, 1)
-		require.Equal(t, "line1\nline2\nline3", ctxFiles[0].ContextFileContent)
-	})
-
-	t.Run("DiscoversSkills", func(t *testing.T) {
-		fakeHome := t.TempDir()
-		t.Setenv("HOME", fakeHome)
-		t.Setenv("USERPROFILE", fakeHome)
-		t.Setenv(agentcontextconfig.EnvInstructionsDirs, fakeHome)
-		t.Setenv(agentcontextconfig.EnvInstructionsFile, "")
-		t.Setenv(agentcontextconfig.EnvSkillMetaFile, "")
-		t.Setenv(agentcontextconfig.EnvMCPConfigFiles, "")
-
-		workDir := t.TempDir()
-		skillsDir := filepath.Join(workDir, ".agents", "skills")
-		t.Setenv(agentcontextconfig.EnvSkillsDirs, skillsDir)
-
-		// Create a valid skill.
-		skillDir := filepath.Join(skillsDir, "my-skill")
-		require.NoError(t, os.MkdirAll(skillDir, 0o755))
-		require.NoError(t, os.WriteFile(
-			filepath.Join(skillDir, "SKILL.md"),
-			[]byte("---\nname: my-skill\ndescription: A test skill\n---\nSkill body"),
-			0o600,
-		))
-
-		cfg, _ := agentcontextconfig.Config(workDir)
-
-		skillParts := filterParts(cfg.Parts, codersdk.ChatMessagePartTypeSkill)
-		require.Len(t, skillParts, 1)
-		require.Equal(t, "my-skill", skillParts[0].SkillName)
-		require.Equal(t, "A test skill", skillParts[0].SkillDescription)
-		require.Equal(t, skillDir, skillParts[0].SkillDir)
-		require.Equal(t, "SKILL.md", skillParts[0].ContextFileSkillMetaFile)
-	})
-
-	t.Run("SkipsMissingDirs", func(t *testing.T) {
-		fakeHome := t.TempDir()
-		t.Setenv("HOME", fakeHome)
-		t.Setenv("USERPROFILE", fakeHome)
-
-		nonExistent := filepath.Join(t.TempDir(), "does-not-exist")
-		t.Setenv(agentcontextconfig.EnvInstructionsDirs, nonExistent)
-		t.Setenv(agentcontextconfig.EnvInstructionsFile, "")
-		t.Setenv(agentcontextconfig.EnvSkillsDirs, nonExistent)
-		t.Setenv(agentcontextconfig.EnvSkillMetaFile, "")
-		t.Setenv(agentcontextconfig.EnvMCPConfigFiles, "")
-
-		workDir := t.TempDir()
-		cfg, _ := agentcontextconfig.Config(workDir)
-
-		// Non-nil empty slice (signals agent supports new format).
-		require.NotNil(t, cfg.Parts)
-		require.Empty(t, cfg.Parts)
-	})
-
-	t.Run("MCPConfigFilesResolvedSeparately", func(t *testing.T) {
-		fakeHome := t.TempDir()
-		t.Setenv("HOME", fakeHome)
-		t.Setenv("USERPROFILE", fakeHome)
-		t.Setenv(agentcontextconfig.EnvInstructionsDirs, fakeHome)
-		t.Setenv(agentcontextconfig.EnvInstructionsFile, "")
-		t.Setenv(agentcontextconfig.EnvSkillsDirs, "")
-		t.Setenv(agentcontextconfig.EnvSkillMetaFile, "")
-
-		optMCP := platformAbsPath("opt", "custom.json")
-		t.Setenv(agentcontextconfig.EnvMCPConfigFiles, optMCP)
-
-		workDir := t.TempDir()
-		_, mcpFiles := agentcontextconfig.Config(workDir)
-
-		require.Equal(t, []string{optMCP}, mcpFiles)
-	})
-
-	t.Run("SkillNameMustMatchDir", func(t *testing.T) {
-		fakeHome := t.TempDir()
-		t.Setenv("HOME", fakeHome)
-		t.Setenv("USERPROFILE", fakeHome)
-		t.Setenv(agentcontextconfig.EnvInstructionsDirs, fakeHome)
-		t.Setenv(agentcontextconfig.EnvInstructionsFile, "")
-		t.Setenv(agentcontextconfig.EnvSkillMetaFile, "")
-		t.Setenv(agentcontextconfig.EnvMCPConfigFiles, "")
-
-		workDir := t.TempDir()
-		skillsDir := filepath.Join(workDir, "skills")
-		t.Setenv(agentcontextconfig.EnvSkillsDirs, skillsDir)
-
-		// Skill name in frontmatter doesn't match directory name.
-		skillDir := filepath.Join(skillsDir, "wrong-dir-name")
-		require.NoError(t, os.MkdirAll(skillDir, 0o755))
-		require.NoError(t, os.WriteFile(
-			filepath.Join(skillDir, "SKILL.md"),
-			[]byte("---\nname: actual-name\ndescription: mismatch\n---\n"),
-			0o600,
-		))
-
-		cfg, _ := agentcontextconfig.Config(workDir)
-		skillParts := filterParts(cfg.Parts, codersdk.ChatMessagePartTypeSkill)
-		require.Empty(t, skillParts)
-	})
-
-	t.Run("DuplicateSkillsFirstWins", func(t *testing.T) {
-		fakeHome := t.TempDir()
-		t.Setenv("HOME", fakeHome)
-		t.Setenv("USERPROFILE", fakeHome)
-		t.Setenv(agentcontextconfig.EnvInstructionsDirs, fakeHome)
-		t.Setenv(agentcontextconfig.EnvInstructionsFile, "")
-		t.Setenv(agentcontextconfig.EnvSkillMetaFile, "")
-		t.Setenv(agentcontextconfig.EnvMCPConfigFiles, "")
-
-		workDir := t.TempDir()
-		skillsDir1 := filepath.Join(workDir, "skills1")
-		skillsDir2 := filepath.Join(workDir, "skills2")
-		t.Setenv(agentcontextconfig.EnvSkillsDirs, skillsDir1+","+skillsDir2)
-
-		// Same skill name in both directories.
-		for _, dir := range []string{skillsDir1, skillsDir2} {
-			skillDir := filepath.Join(dir, "dup-skill")
-			require.NoError(t, os.MkdirAll(skillDir, 0o755))
-			require.NoError(t, os.WriteFile(
-				filepath.Join(skillDir, "SKILL.md"),
-				[]byte("---\nname: dup-skill\ndescription: from "+filepath.Base(dir)+"\n---\n"),
-				0o600,
-			))
-		}
-
-		cfg, _ := agentcontextconfig.Config(workDir)
-		skillParts := filterParts(cfg.Parts, codersdk.ChatMessagePartTypeSkill)
-		require.Len(t, skillParts, 1)
-		require.Equal(t, "from skills1", skillParts[0].SkillDescription)
-	})
-}
-
-func TestNewAPI_LazyDirectory(t *testing.T) {
-	t.Setenv(agentcontextconfig.EnvInstructionsDirs, "")
-	t.Setenv(agentcontextconfig.EnvInstructionsFile, "")
-	t.Setenv(agentcontextconfig.EnvSkillsDirs, "")
-	t.Setenv(agentcontextconfig.EnvSkillMetaFile, "")
-	t.Setenv(agentcontextconfig.EnvMCPConfigFiles, "")
-
-	dir := ""
-	api := agentcontextconfig.NewAPI(func() string { return dir })
-
-	// Before directory is set, MCP paths resolve to nothing.
-	mcpFiles := api.MCPConfigFiles()
-	require.Empty(t, mcpFiles)
-
-	// After setting the directory, MCPConfigFiles() picks it up.
-	dir = platformAbsPath("work")
-	mcpFiles = api.MCPConfigFiles()
-	require.NotEmpty(t, mcpFiles)
-	require.Equal(t, []string{filepath.Join(dir, ".mcp.json")}, mcpFiles)
-}

agent/agentcontextconfig/resolve.go

@@ -1,55 +0,0 @@
-package agentcontextconfig
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-)
-
-// ResolvePath resolves a single path that may be absolute,
-// home-relative (~/ or ~), or relative to the given base
-// directory. Returns an absolute path. Empty input returns empty.
-func ResolvePath(raw, baseDir string) string {
-	raw = strings.TrimSpace(raw)
-	if raw == "" {
-		return ""
-	}
-	switch {
-	case raw == "~":
-		home, err := os.UserHomeDir()
-		if err != nil {
-			return ""
-		}
-		return home
-	case strings.HasPrefix(raw, "~/"):
-		home, err := os.UserHomeDir()
-		if err != nil {
-			return ""
-		}
-		return filepath.Join(home, raw[2:])
-	case filepath.IsAbs(raw):
-		return raw
-	default:
-		if baseDir == "" {
-			return ""
-		}
-		return filepath.Join(baseDir, raw)
-	}
-}
-
-// ResolvePaths splits a comma-separated list of paths and
-// resolves each entry independently. Empty entries and entries
-// that resolve to empty strings are skipped.
-func ResolvePaths(raw, baseDir string) []string {
-	if strings.TrimSpace(raw) == "" {
-		return nil
-	}
-	parts := strings.Split(raw, ",")
-	out := make([]string, 0, len(parts))
-	for _, p := range parts {
-		if resolved := ResolvePath(p, baseDir); resolved != "" {
-			out = append(out, resolved)
-		}
-	}
-	return out
-}

agent/agentcontextconfig/resolve_test.go

@@ -1,152 +0,0 @@
-package agentcontextconfig_test
-
-import (
-	"path/filepath"
-	"runtime"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/coder/coder/v2/agent/agentcontextconfig"
-)
-
-// platformAbsPath constructs an absolute path that is valid
-// on the current platform. On Windows paths must include a
-// drive letter to be considered absolute.
-func platformAbsPath(parts ...string) string {
-	if runtime.GOOS == "windows" {
-		return `C:\` + filepath.Join(parts...)
-	}
-	return "/" + filepath.Join(parts...)
-}
-
-func TestResolvePath(t *testing.T) { //nolint:tparallel // subtests using t.Setenv cannot be parallel
-	t.Run("EmptyInput", func(t *testing.T) {
-		t.Parallel()
-		require.Equal(t, "", agentcontextconfig.ResolvePath("", platformAbsPath("base")))
-	})
-
-	t.Run("WhitespaceOnly", func(t *testing.T) {
-		t.Parallel()
-		require.Equal(t, "", agentcontextconfig.ResolvePath("   ", platformAbsPath("base")))
-	})
-
-	// Tests that use t.Setenv cannot be parallel.
-	t.Run("TildeAlone", func(t *testing.T) {
-		fakeHome := t.TempDir()
-		t.Setenv("HOME", fakeHome)
-		t.Setenv("USERPROFILE", fakeHome)
-		got := agentcontextconfig.ResolvePath("~", platformAbsPath("base"))
-		require.Equal(t, fakeHome, got)
-	})
-
-	t.Run("TildeSlashPath", func(t *testing.T) {
-		fakeHome := t.TempDir()
-		t.Setenv("HOME", fakeHome)
-		t.Setenv("USERPROFILE", fakeHome)
-		got := agentcontextconfig.ResolvePath("~/docs/readme", platformAbsPath("base"))
-		require.Equal(t, filepath.Join(fakeHome, "docs", "readme"), got)
-	})
-
-	t.Run("AbsolutePath", func(t *testing.T) {
-		t.Parallel()
-		p := platformAbsPath("etc", "coder")
-		got := agentcontextconfig.ResolvePath(p, platformAbsPath("base"))
-		require.Equal(t, p, got)
-	})
-
-	t.Run("RelativePath", func(t *testing.T) {
-		t.Parallel()
-		base := platformAbsPath("work")
-		got := agentcontextconfig.ResolvePath("foo/bar", base)
-		require.Equal(t, filepath.Join(base, "foo", "bar"), got)
-	})
-
-	t.Run("RelativePathWithWhitespace", func(t *testing.T) {
-		t.Parallel()
-		base := platformAbsPath("work")
-		got := agentcontextconfig.ResolvePath("  foo/bar  ", base)
-		require.Equal(t, filepath.Join(base, "foo", "bar"), got)
-	})
-
-	t.Run("RelativePathWithEmptyBaseDir", func(t *testing.T) {
-		t.Parallel()
-		got := agentcontextconfig.ResolvePath(".agents/skills", "")
-		require.Equal(t, "", got)
-	})
-}
-
-func TestResolvePath_HomeUnset(t *testing.T) {
-	// Cannot be parallel — modifies HOME env var.
-	t.Setenv("HOME", "")
-	// Also clear USERPROFILE for Windows compatibility.
-	t.Setenv("USERPROFILE", "")
-
-	require.Equal(t, "", agentcontextconfig.ResolvePath("~", platformAbsPath("base")))
-	require.Equal(t, "", agentcontextconfig.ResolvePath("~/docs", platformAbsPath("base")))
-}
-
-func TestResolvePaths(t *testing.T) { //nolint:tparallel // subtests using t.Setenv cannot be parallel
-	t.Run("EmptyString", func(t *testing.T) {
-		t.Parallel()
-		require.Nil(t, agentcontextconfig.ResolvePaths("", platformAbsPath("base")))
-	})
-
-	t.Run("WhitespaceOnly", func(t *testing.T) {
-		t.Parallel()
-		require.Nil(t, agentcontextconfig.ResolvePaths("   ", platformAbsPath("base")))
-	})
-
-	t.Run("SingleEntry", func(t *testing.T) {
-		t.Parallel()
-		p := platformAbsPath("abs", "path")
-		got := agentcontextconfig.ResolvePaths(p, platformAbsPath("base"))
-		require.Equal(t, []string{p}, got)
-	})
-
-	// Tests that use t.Setenv cannot be parallel.
-	t.Run("MultipleEntries", func(t *testing.T) {
-		fakeHome := t.TempDir()
-		t.Setenv("HOME", fakeHome)
-		t.Setenv("USERPROFILE", fakeHome)
-		b := platformAbsPath("b")
-		base := platformAbsPath("base")
-		got := agentcontextconfig.ResolvePaths("~/a,"+b+",rel", base)
-		require.Equal(t, []string{
-			filepath.Join(fakeHome, "a"),
-			b,
-			filepath.Join(base, "rel"),
-		}, got)
-	})
-
-	t.Run("TrimsWhitespace", func(t *testing.T) {
-		t.Parallel()
-		a := platformAbsPath("a")
-		b := platformAbsPath("b")
-		got := agentcontextconfig.ResolvePaths("  "+a+" , "+b+"  ", platformAbsPath("base"))
-		require.Equal(t, []string{a, b}, got)
-	})
-
-	t.Run("SkipsEmptyEntries", func(t *testing.T) {
-		t.Parallel()
-		a := platformAbsPath("a")
-		b := platformAbsPath("b")
-		got := agentcontextconfig.ResolvePaths(a+",,"+b+",", platformAbsPath("base"))
-		require.Equal(t, []string{a, b}, got)
-	})
-
-	t.Run("TrailingComma", func(t *testing.T) {
-		t.Parallel()
-		p := platformAbsPath("only")
-		got := agentcontextconfig.ResolvePaths(p+",", platformAbsPath("base"))
-		require.Equal(t, []string{p}, got)
-	})
-
-	t.Run("RelativePathSkippedWhenBaseDirEmpty", func(t *testing.T) {
-		fakeHome := t.TempDir()
-		t.Setenv("HOME", fakeHome)
-		t.Setenv("USERPROFILE", fakeHome)
-		got := agentcontextconfig.ResolvePaths("~/.coder,.agents/skills", "")
-		require.Equal(t, []string{filepath.Join(fakeHome, ".coder")}, got)
-	})
-}

agent/agentproc/process.go

@@ -148,11 +148,6 @@ func (m *manager) start(req workspacesdk.StartProcessRequest, chatID string) (*p
 	for k, v := range req.Env {
 		cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", k, v))
 	}
-	// Propagate the chat ID so child processes (e.g.
-	// GIT_ASKPASS) can send it back to the server.
-	if chatID != "" {
-		cmd.Env = append(cmd.Env, fmt.Sprintf("CODER_CHAT_ID=%s", chatID))
-	}
 
 	if err := cmd.Start(); err != nil {
 		cancel()

agent/agentssh/x11_test.go

@@ -211,7 +211,7 @@ func TestServer_X11_EvictionLRU(t *testing.T) {
 		require.NoError(t, err)
 		stderr, err := sess.StderrPipe()
 		require.NoError(t, err)
-		require.NoError(t, sess.Start("sh"))
+		require.NoError(t, sess.Shell())
 
 		// The SSH server lazily starts the session. We need to write a command
 		// and read back to ensure the X11 forwarding is started.

agent/api.go

@@ -31,8 +31,6 @@ func (a *agent) apiHandler() http.Handler {
 	r.Mount("/api/v0/git", a.gitAPI.Routes())
 	r.Mount("/api/v0/processes", a.processAPI.Routes())
 	r.Mount("/api/v0/desktop", a.desktopAPI.Routes())
-	r.Mount("/api/v0/mcp", a.mcpAPI.Routes())
-	r.Mount("/api/v0/context-config", a.contextConfigAPI.Routes())
 
 	if a.devcontainers {
 		r.Mount("/api/v0/containers", a.containerAPI.Routes())

agent/boundary_logs_test.go

@@ -96,9 +96,10 @@ func TestBoundaryLogs_EndToEnd(t *testing.T) {
 	}
 	sendBoundaryLogsRequest(t, conn, req)
 
-	require.Eventually(t, func() bool {
+	tCtx := testutil.Context(t, testutil.WaitShort)
+	testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 		return len(sink.Entries()) >= 1
-	}, testutil.WaitShort, testutil.IntervalFast)
+	}, testutil.IntervalFast)
 
 	entries := sink.Entries()
 	require.Len(t, entries, 1)
@@ -130,9 +131,10 @@ func TestBoundaryLogs_EndToEnd(t *testing.T) {
 	}
 	sendBoundaryLogsRequest(t, conn, req2)
 
-	require.Eventually(t, func() bool {
+	tCtx = testutil.Context(t, testutil.WaitShort)
+	testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 		return len(sink.Entries()) >= 2
-	}, testutil.WaitShort, testutil.IntervalFast)
+	}, testutil.IntervalFast)
 
 	entries = sink.Entries()
 	entry = entries[1]

agent/boundarylogproxy/proxy_test.go

@@ -161,10 +161,11 @@ func TestServer_ReceiveAndForwardLogs(t *testing.T) {
 	sendLogs(t, conn, req)
 
 	// Wait for the reporter to receive the log.
-	require.Eventually(t, func() bool {
+	tCtx := testutil.Context(t, testutil.WaitShort)
+	testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 		logs := reporter.getLogs()
 		return len(logs) == 1
-	}, testutil.WaitShort, testutil.IntervalFast)
+	}, testutil.IntervalFast)
 
 	logs := reporter.getLogs()
 	require.Len(t, logs, 1)
@@ -220,10 +221,11 @@ func TestServer_MultipleMessages(t *testing.T) {
 		sendLogs(t, conn, req)
 	}
 
-	require.Eventually(t, func() bool {
+	tCtx := testutil.Context(t, testutil.WaitShort)
+	testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 		logs := reporter.getLogs()
 		return len(logs) == 5
-	}, testutil.WaitShort, testutil.IntervalFast)
+	}, testutil.IntervalFast)
 
 	cancel()
 	<-forwarderDone
@@ -281,10 +283,11 @@ func TestServer_MultipleConnections(t *testing.T) {
 	}
 	wg.Wait()
 
-	require.Eventually(t, func() bool {
+	tCtx := testutil.Context(t, testutil.WaitShort)
+	testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 		logs := reporter.getLogs()
 		return len(logs) == numConns
-	}, testutil.WaitShort, testutil.IntervalFast)
+	}, testutil.IntervalFast)
 
 	cancel()
 	<-forwarderDone
@@ -390,10 +393,11 @@ func TestServer_ForwarderContinuesAfterError(t *testing.T) {
 	sendLogs(t, conn, req2)
 
 	// Only the second message should be recorded.
-	require.Eventually(t, func() bool {
+	tCtx := testutil.Context(t, testutil.WaitShort)
+	testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 		logs := reporter.getLogs()
 		return len(logs) == 1
-	}, testutil.WaitShort, testutil.IntervalFast)
+	}, testutil.IntervalFast)
 
 	logs := reporter.getLogs()
 	require.Len(t, logs, 1)
@@ -482,10 +486,11 @@ func TestServer_InvalidProtobuf(t *testing.T) {
 	}
 	sendLogs(t, conn, req)
 
-	require.Eventually(t, func() bool {
+	tCtx := testutil.Context(t, testutil.WaitShort)
+	testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 		logs := reporter.getLogs()
 		return len(logs) == 1
-	}, testutil.WaitShort, testutil.IntervalFast)
+	}, testutil.IntervalFast)
 
 	cancel()
 	<-forwarderDone
@@ -524,10 +529,11 @@ func TestServer_InvalidHeader(t *testing.T) {
 
 		// The server closes the connection on invalid header, so the next
 		// write should fail with a broken pipe error.
-		require.Eventually(t, func() bool {
+		tCtx := testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 			_, err := conn.Write([]byte{0x00})
 			return err != nil
-		}, testutil.WaitShort, testutil.IntervalFast, name)
+		}, testutil.IntervalFast, name)
 	}
 
 	// TagV1 with length exceeding MaxMessageSizeV1.
@@ -583,10 +589,11 @@ func TestServer_AllowRequest(t *testing.T) {
 	}
 	sendLogs(t, conn, req)
 
-	require.Eventually(t, func() bool {
+	tCtx := testutil.Context(t, testutil.WaitShort)
+	testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 		logs := reporter.getLogs()
 		return len(logs) == 1
-	}, testutil.WaitShort, testutil.IntervalFast)
+	}, testutil.IntervalFast)
 
 	logs := reporter.getLogs()
 	require.Len(t, logs, 1)
@@ -642,9 +649,10 @@ func TestServer_TagV1BackwardsCompatibility(t *testing.T) {
 	}
 	sendLogsV1(t, conn, v1Req)
 
-	require.Eventually(t, func() bool {
+	tCtx := testutil.Context(t, testutil.WaitShort)
+	testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 		return len(reporter.getLogs()) == 1
-	}, testutil.WaitShort, testutil.IntervalFast)
+	}, testutil.IntervalFast)
 
 	// Now send a TagV2 message on the same connection to verify both
 	// tag versions work interleaved.
@@ -664,9 +672,10 @@ func TestServer_TagV1BackwardsCompatibility(t *testing.T) {
 	}
 	sendLogs(t, conn, v2Req)
 
-	require.Eventually(t, func() bool {
+	tCtx = testutil.Context(t, testutil.WaitShort)
+	testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 		return len(reporter.getLogs()) == 2
-	}, testutil.WaitShort, testutil.IntervalFast)
+	}, testutil.IntervalFast)
 
 	logs := reporter.getLogs()
 	require.Equal(t, "https://example.com/v1", logs[0].Logs[0].GetHttpRequest().Url)
@@ -719,9 +728,10 @@ func TestServer_Metrics(t *testing.T) {
 			sendLogs(t, conn, makeReq(1))
 		}
 
-		require.Eventually(t, func() bool {
+		tCtx := testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 			return getCounterVecValue(t, reg, "agent_boundary_log_proxy_batches_dropped_total", "buffer_full") >= 1
-		}, testutil.WaitShort, testutil.IntervalFast)
+		}, testutil.IntervalFast)
 		require.GreaterOrEqual(t,
 			getCounterVecValue(t, reg, "agent_boundary_log_proxy_logs_dropped_total", "buffer_full"),
 			float64(1))
@@ -774,18 +784,20 @@ func TestServer_Metrics(t *testing.T) {
 
 		// The metric is incremented after ReportBoundaryLogs returns, so we
 		// need to poll briefly.
-		require.Eventually(t, func() bool {
+		tCtx := testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 			return getCounterVecValue(t, reg, "agent_boundary_log_proxy_batches_dropped_total", "forward_failed") >= 1
-		}, testutil.WaitShort, testutil.IntervalFast)
+		}, testutil.IntervalFast)
 		require.Equal(t, float64(2),
 			getCounterVecValue(t, reg, "agent_boundary_log_proxy_logs_dropped_total", "forward_failed"))
 
 		// Phase 2: forward succeeds.
 		sendLogs(t, conn, makeReq(1))
 
-		require.Eventually(t, func() bool {
+		tCtx = testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 			return len(reporter.getLogs()) >= 1
-		}, testutil.WaitShort, testutil.IntervalFast)
+		}, testutil.IntervalFast)
 		require.Equal(t, float64(1),
 			getCounterValue(t, reg, "agent_boundary_log_proxy_batches_forwarded_total"))
 
@@ -798,9 +810,10 @@ func TestServer_Metrics(t *testing.T) {
 
 		// Status is handled immediately by the reader goroutine, not by the
 		// forwarder, so poll metrics directly.
-		require.Eventually(t, func() bool {
+		tCtx = testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 			return getCounterVecValue(t, reg, "agent_boundary_log_proxy_logs_dropped_total", "boundary_channel_full") >= 5
-		}, testutil.WaitShort, testutil.IntervalFast)
+		}, testutil.IntervalFast)
 		require.Equal(t, float64(5),
 			getCounterVecValue(t, reg, "agent_boundary_log_proxy_logs_dropped_total", "boundary_channel_full"))
 		require.Equal(t, float64(3),

agent/filefinder/engine_test.go

@@ -76,7 +76,8 @@ func TestEngine_IndexPicksUpNewFile(t *testing.T) {
 	require.NoError(t, eng.AddRoot(ctx, dir))
 	createFile(t, dir, "newfile_unique.txt", "world")
 
-	require.Eventually(t, func() bool {
+	tCtx := testutil.Context(t, testutil.WaitShort)
+	testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 		results, sErr := eng.Search(ctx, "newfile_unique", filefinder.DefaultSearchOptions())
 		if sErr != nil {
 			return false
@@ -87,7 +88,7 @@ func TestEngine_IndexPicksUpNewFile(t *testing.T) {
 			}
 		}
 		return false
-	}, testutil.WaitShort, testutil.IntervalFast, "expected newfile_unique.txt to appear via watcher")
+	}, testutil.IntervalFast, "expected newfile_unique.txt to appear via watcher")
 }
 
 func TestEngine_IndexRemovesDeletedFile(t *testing.T) {
@@ -105,7 +106,8 @@ func TestEngine_IndexRemovesDeletedFile(t *testing.T) {
 
 	require.NoError(t, os.Remove(filepath.Join(dir, "deleteme_unique.txt")))
 
-	require.Eventually(t, func() bool {
+	tCtx := testutil.Context(t, testutil.WaitShort)
+	testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 		results, sErr := eng.Search(ctx, "deleteme_unique", filefinder.DefaultSearchOptions())
 		if sErr != nil {
 			return false
@@ -116,7 +118,7 @@ func TestEngine_IndexRemovesDeletedFile(t *testing.T) {
 			}
 		}
 		return true
-	}, testutil.WaitShort, testutil.IntervalFast, "expected deleteme_unique.txt to disappear after removal")
+	}, testutil.IntervalFast, "expected deleteme_unique.txt to disappear after removal")
 }
 
 func TestEngine_MultipleRoots(t *testing.T) {

agent/immortalstreams/backedpipe/backed_pipe_test.go

@@ -420,7 +420,7 @@ func TestBackedPipe_ReadBlocksWhenDisconnected(t *testing.T) {
 	testutil.TryReceive(testCtx, t, readStarted)
 
 	// Ensure the read is actually blocked by verifying it hasn't completed
-	require.Eventually(t, func() bool {
+	testutil.Eventually(testCtx, t, func(ctx context.Context) bool {
 		select {
 		case <-readDone:
 			t.Fatal("Read should be blocked when disconnected")
@@ -429,7 +429,7 @@ func TestBackedPipe_ReadBlocksWhenDisconnected(t *testing.T) {
 			// Good, still blocked
 			return true
 		}
-	}, testutil.WaitShort, testutil.IntervalMedium)
+	}, testutil.IntervalMedium)
 
 	// Close should unblock the read
 	bp.Close()
@@ -468,9 +468,9 @@ func TestBackedPipe_Reconnection(t *testing.T) {
 	testutil.RequireReceive(testCtx, t, signalChan)
 
 	// Wait for reconnection to complete
-	require.Eventually(t, func() bool {
+	testutil.Eventually(testCtx, t, func(ctx context.Context) bool {
 		return bp.Connected()
-	}, testutil.WaitShort, testutil.IntervalFast, "pipe should reconnect")
+	}, testutil.IntervalFast, "pipe should reconnect")
 
 	replayedData := conn2.ReadString()
 	require.Equal(t, "***trigger failure ", replayedData, "Should replay exactly the data written after sequence 17")
@@ -646,9 +646,9 @@ func TestBackedPipe_StateTransitionsAndGenerationTracking(t *testing.T) {
 	testutil.RequireReceive(testutil.Context(t, testutil.WaitShort), t, signalChan)
 
 	// Wait for reconnection to complete
-	require.Eventually(t, func() bool {
+	testutil.Eventually(testutil.Context(t, testutil.WaitShort), t, func(ctx context.Context) bool {
 		return bp.Connected()
-	}, testutil.WaitShort, testutil.IntervalFast, "should reconnect")
+	}, testutil.IntervalFast, "should reconnect")
 	require.Equal(t, 2, reconnector.GetCallCount())
 
 	// Force another reconnection
@@ -707,9 +707,9 @@ func TestBackedPipe_GenerationFiltering(t *testing.T) {
 	wg.Wait()
 
 	// Wait for reconnection to complete
-	require.Eventually(t, func() bool {
+	testutil.Eventually(testutil.Context(t, testutil.WaitShort), t, func(ctx context.Context) bool {
 		return bp.Connected()
-	}, testutil.WaitShort, testutil.IntervalFast, "should reconnect once")
+	}, testutil.IntervalFast, "should reconnect once")
 
 	// Should have only reconnected once despite multiple errors
 	require.Equal(t, 2, reconnector.GetCallCount()) // Initial connect + 1 reconnect
@@ -840,9 +840,9 @@ func TestBackedPipe_SingleReconnectionOnMultipleErrors(t *testing.T) {
 	testutil.RequireReceive(testCtx, t, signalChan)
 
 	// Wait for reconnection to complete
-	require.Eventually(t, func() bool {
+	testutil.Eventually(testCtx, t, func(ctx context.Context) bool {
 		return bp.Connected()
-	}, testutil.WaitShort, testutil.IntervalFast, "should reconnect after write error")
+	}, testutil.IntervalFast, "should reconnect after write error")
 
 	// Verify that only one reconnection occurred
 	require.Equal(t, 2, reconnector.GetCallCount(), "should have exactly 2 calls: initial connect + 1 reconnection")

agent/immortalstreams/backedpipe/backed_reader_test.go

@@ -493,7 +493,7 @@ func TestBackedReader_CloseWhileBlockedOnUnderlyingReader(t *testing.T) {
 
 	// Verify read is blocked by checking that it hasn't completed
 	// and ensuring we have adequate time for it to reach the blocking state
-	require.Eventually(t, func() bool {
+	testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 		select {
 		case <-readDone:
 			t.Fatal("Read should be blocked on underlying reader")
@@ -502,7 +502,7 @@ func TestBackedReader_CloseWhileBlockedOnUnderlyingReader(t *testing.T) {
 			// Good, still blocked
 			return true
 		}
-	}, testutil.WaitShort, testutil.IntervalMedium)
+	}, testutil.IntervalMedium)
 
 	// Start Close() in a goroutine since it will block until the underlying read completes
 	closeDone := make(chan error, 1)

agent/immortalstreams/backedpipe/backed_writer_test.go

@@ -2,6 +2,7 @@ package backedpipe_test
 
 import (
 	"bytes"
+	"context"
 	"os"
 	"sync"
 	"testing"
@@ -646,8 +647,8 @@ func TestBackedWriter_ConcurrentWriteAndClose(t *testing.T) {
 	// Ensure the write is actually blocked by repeatedly checking that:
 	// 1. The write hasn't completed yet
 	// 2. The writer is still not connected
-	// We use require.Eventually to give it a fair chance to reach the blocking state
-	require.Eventually(t, func() bool {
+	// We use testutil.Eventually to give it a fair chance to reach the blocking state
+	testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 		select {
 		case <-writeComplete:
 			t.Fatal("Write should be blocked when no writer is connected")
@@ -656,7 +657,7 @@ func TestBackedWriter_ConcurrentWriteAndClose(t *testing.T) {
 			// Write is still blocked, which is what we want
 			return !bw.Connected()
 		}
-	}, testutil.WaitShort, testutil.IntervalMedium)
+	}, testutil.IntervalMedium)
 
 	// Close the writer while the write is blocked waiting for connection
 	closeErr := bw.Close()

agent/x/agentdesktop/api.go

@@ -1,17 +1,12 @@
 package agentdesktop
 
 import (
-	"context"
 	"encoding/json"
-	"errors"
-	"io"
 	"net/http"
 	"strconv"
-	"sync"
 	"time"
 
 	"github.com/go-chi/chi/v5"
-	"github.com/google/uuid"
 
 	"cdr.dev/slog/v3"
 	"github.com/coder/coder/v2/agent/agentssh"
@@ -52,9 +47,6 @@ type API struct {
 	logger  slog.Logger
 	desktop Desktop
 	clock   quartz.Clock
-
-	closeMu sync.Mutex
-	closed  bool
 }
 
 // NewAPI creates a new desktop streaming API.
@@ -74,10 +66,6 @@ func (a *API) Routes() http.Handler {
 	r := chi.NewRouter()
 	r.Get("/vnc", a.handleDesktopVNC)
 	r.Post("/action", a.handleAction)
-	r.Route("/recording", func(r chi.Router) {
-		r.Post("/start", a.handleRecordingStart)
-		r.Post("/stop", a.handleRecordingStop)
-	})
 	return r
 }
 
@@ -128,9 +116,6 @@ func (a *API) handleAction(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	handlerStart := a.clock.Now()
 
-	// Update last desktop action timestamp for idle recording monitor.
-	a.desktop.RecordActivity()
-
 	// Ensure the desktop is running and grab native dimensions.
 	cfg, err := a.desktop.Start(ctx)
 	if err != nil {
@@ -495,150 +480,9 @@ func (a *API) handleAction(rw http.ResponseWriter, r *http.Request) {
 
 // Close shuts down the desktop session if one is running.
 func (a *API) Close() error {
-	a.closeMu.Lock()
-	if a.closed {
-		a.closeMu.Unlock()
-		return nil
-	}
-	a.closed = true
-	a.closeMu.Unlock()
-
 	return a.desktop.Close()
 }
 
-// decodeRecordingRequest decodes and validates a recording request
-// from the HTTP body, returning the recording ID. Returns false if
-// the request was invalid and an error response was already written.
-func (*API) decodeRecordingRequest(rw http.ResponseWriter, r *http.Request) (string, bool) {
-	ctx := r.Context()
-	var req struct {
-		RecordingID string `json:"recording_id"`
-	}
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
-			Message: "Failed to decode request body.",
-			Detail:  err.Error(),
-		})
-		return "", false
-	}
-	if req.RecordingID == "" {
-		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
-			Message: "Missing recording_id.",
-		})
-		return "", false
-	}
-	if _, err := uuid.Parse(req.RecordingID); err != nil {
-		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
-			Message: "Invalid recording_id format.",
-			Detail:  "recording_id must be a valid UUID.",
-		})
-		return "", false
-	}
-	return req.RecordingID, true
-}
-
-func (a *API) handleRecordingStart(rw http.ResponseWriter, r *http.Request) {
-	ctx := r.Context()
-	recordingID, ok := a.decodeRecordingRequest(rw, r)
-	if !ok {
-		return
-	}
-
-	a.closeMu.Lock()
-	if a.closed {
-		a.closeMu.Unlock()
-		httpapi.Write(ctx, rw, http.StatusServiceUnavailable, codersdk.Response{
-			Message: "Desktop API is shutting down.",
-		})
-		return
-	}
-	a.closeMu.Unlock()
-
-	if err := a.desktop.StartRecording(ctx, recordingID); err != nil {
-		if errors.Is(err, ErrDesktopClosed) {
-			httpapi.Write(ctx, rw, http.StatusServiceUnavailable, codersdk.Response{
-				Message: "Desktop API is shutting down.",
-			})
-			return
-		}
-		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
-			Message: "Failed to start recording.",
-			Detail:  err.Error(),
-		})
-		return
-	}
-
-	httpapi.Write(ctx, rw, http.StatusOK, codersdk.Response{
-		Message: "Recording started.",
-	})
-}
-
-func (a *API) handleRecordingStop(rw http.ResponseWriter, r *http.Request) {
-	ctx := r.Context()
-
-	recordingID, ok := a.decodeRecordingRequest(rw, r)
-	if !ok {
-		return
-	}
-
-	a.closeMu.Lock()
-	if a.closed {
-		a.closeMu.Unlock()
-		httpapi.Write(ctx, rw, http.StatusServiceUnavailable, codersdk.Response{
-			Message: "Desktop API is shutting down.",
-		})
-		return
-	}
-	a.closeMu.Unlock()
-
-	// Stop recording (idempotent).
-	// Use a context detached from the HTTP request so that if the
-	// connection drops, the recording process can still shut down
-	// gracefully. WithoutCancel preserves request-scoped values.
-	stopCtx, stopCancel := context.WithTimeout(context.WithoutCancel(r.Context()), 30*time.Second)
-	defer stopCancel()
-	artifact, err := a.desktop.StopRecording(stopCtx, recordingID)
-	if err != nil {
-		if errors.Is(err, ErrUnknownRecording) {
-			httpapi.Write(ctx, rw, http.StatusNotFound, codersdk.Response{
-				Message: "Recording not found.",
-				Detail:  err.Error(),
-			})
-			return
-		}
-		if errors.Is(err, ErrRecordingCorrupted) {
-			httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
-				Message: "Recording is corrupted.",
-				Detail:  err.Error(),
-			})
-			return
-		}
-		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
-			Message: "Failed to stop recording.",
-			Detail:  err.Error(),
-		})
-		return
-	}
-	defer artifact.Reader.Close()
-
-	if artifact.Size > workspacesdk.MaxRecordingSize {
-		a.logger.Warn(ctx, "recording file exceeds maximum size",
-			slog.F("recording_id", recordingID),
-			slog.F("size", artifact.Size),
-			slog.F("max_size", workspacesdk.MaxRecordingSize),
-		)
-		httpapi.Write(ctx, rw, http.StatusRequestEntityTooLarge, codersdk.Response{
-			Message: "Recording file exceeds maximum allowed size.",
-		})
-		return
-	}
-
-	rw.Header().Set("Content-Type", "video/mp4")
-	rw.Header().Set("Content-Length", strconv.FormatInt(artifact.Size, 10))
-	rw.WriteHeader(http.StatusOK)
-	_, _ = io.Copy(rw, artifact.Reader)
-}
-
 // coordFromAction extracts the coordinate pair from a DesktopAction,
 // returning an error if the coordinate field is missing.
 func coordFromAction(action DesktopAction) (x, y int, err error) {

agent/x/agentdesktop/api_test.go

@@ -4,17 +4,12 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"fmt"
 	"net"
 	"net/http"
 	"net/http/httptest"
-	"os"
-	"slices"
-	"sync"
 	"testing"
 	"time"
 
-	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/xerrors"
@@ -26,16 +21,6 @@ import (
 	"github.com/coder/quartz"
 )
 
-// Test recording UUIDs used across tests.
-const (
-	testRecIDDefault         = "870e1f02-8118-4300-a37e-4adb0117baf3"
-	testRecIDStartIdempotent = "250a2ffb-a5e5-4c94-9754-4d6a4ab7ba20"
-	testRecIDStopIdempotent  = "38f8a378-f98f-4758-a4ae-950b44cf989a"
-	testRecIDConcurrentA     = "8dc173eb-23c6-4601-a485-b6dfb2a42c3a"
-	testRecIDConcurrentB     = "fea490d4-70f0-4798-a181-29d65ce25ae1"
-	testRecIDRestart         = "75173a0d-b018-4e2e-a771-defa3fc6af69"
-)
-
 // Ensure fakeDesktop satisfies the Desktop interface at compile time.
 var _ agentdesktop.Desktop = (*fakeDesktop)(nil)
 
@@ -58,14 +43,6 @@ type fakeDesktop struct {
 	lastTyped   string
 	lastKeyDown string
 	lastKeyUp   string
-
-	// Recording tracking (guarded by recMu).
-	recMu         sync.Mutex
-	recordings    map[string]string // ID → file path
-	stopCalls     []string          // recording IDs passed to StopRecording
-	recStopCh     chan string       // optional: signaled when StopRecording is called
-	startCount    int               // incremented on each new recording start
-	activityCount int               // incremented by RecordActivity
 }
 
 func (f *fakeDesktop) Start(context.Context) (agentdesktop.DisplayConfig, error) {
@@ -130,140 +107,11 @@ func (f *fakeDesktop) CursorPosition(context.Context) (x int, y int, err error)
 	return f.cursorPos[0], f.cursorPos[1], nil
 }
 
-func (f *fakeDesktop) StartRecording(_ context.Context, recordingID string) error {
-	f.recMu.Lock()
-	defer f.recMu.Unlock()
-	if f.recordings == nil {
-		f.recordings = make(map[string]string)
-	}
-	if path, ok := f.recordings[recordingID]; ok {
-		// Check if already stopped (file still exists but stop was
-		// called). For the fake, a stopped recording means its ID
-		// appears in stopCalls. In that case, remove the old file
-		// and start fresh.
-		stopped := slices.Contains(f.stopCalls, recordingID)
-		if !stopped {
-			// Active recording - no-op.
-			return nil
-		}
-		// Completed recording - discard old file, start fresh.
-		_ = os.Remove(path)
-		delete(f.recordings, recordingID)
-	}
-	f.startCount++
-	tmpFile, err := os.CreateTemp("", "fake-recording-*.mp4")
-	if err != nil {
-		return err
-	}
-	_, _ = tmpFile.Write([]byte(fmt.Sprintf("fake-mp4-data-%s-%d", recordingID, f.startCount)))
-	_ = tmpFile.Close()
-	f.recordings[recordingID] = tmpFile.Name()
-	return nil
-}
-
-func (f *fakeDesktop) StopRecording(_ context.Context, recordingID string) (*agentdesktop.RecordingArtifact, error) {
-	f.recMu.Lock()
-	defer f.recMu.Unlock()
-	if f.recordings == nil {
-		return nil, agentdesktop.ErrUnknownRecording
-	}
-	path, ok := f.recordings[recordingID]
-	if !ok {
-		return nil, agentdesktop.ErrUnknownRecording
-	}
-	f.stopCalls = append(f.stopCalls, recordingID)
-	if f.recStopCh != nil {
-		select {
-		case f.recStopCh <- recordingID:
-		default:
-		}
-	}
-	file, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	info, err := file.Stat()
-	if err != nil {
-		_ = file.Close()
-		return nil, err
-	}
-	return &agentdesktop.RecordingArtifact{
-		Reader: file,
-		Size:   info.Size(),
-	}, nil
-}
-
-func (f *fakeDesktop) RecordActivity() {
-	f.recMu.Lock()
-	f.activityCount++
-	f.recMu.Unlock()
-}
-
 func (f *fakeDesktop) Close() error {
 	f.closed = true
-	f.recMu.Lock()
-	defer f.recMu.Unlock()
-	for _, path := range f.recordings {
-		_ = os.Remove(path)
-	}
 	return nil
 }
 
-// failStartRecordingDesktop wraps fakeDesktop and overrides
-// StartRecording to always return an error.
-type failStartRecordingDesktop struct {
-	fakeDesktop
-	startRecordingErr error
-}
-
-func (f *failStartRecordingDesktop) StartRecording(_ context.Context, _ string) error {
-	return f.startRecordingErr
-}
-
-// corruptedStopDesktop wraps fakeDesktop and overrides
-// StopRecording to always return ErrRecordingCorrupted.
-type corruptedStopDesktop struct {
-	fakeDesktop
-}
-
-func (*corruptedStopDesktop) StopRecording(_ context.Context, _ string) (*agentdesktop.RecordingArtifact, error) {
-	return nil, agentdesktop.ErrRecordingCorrupted
-}
-
-// oversizedFakeDesktop wraps fakeDesktop and expands recording files
-// beyond MaxRecordingSize when StopRecording is called.
-type oversizedFakeDesktop struct {
-	fakeDesktop
-}
-
-func (f *oversizedFakeDesktop) StopRecording(ctx context.Context, recordingID string) (*agentdesktop.RecordingArtifact, error) {
-	artifact, err := f.fakeDesktop.StopRecording(ctx, recordingID)
-	if err != nil {
-		return nil, err
-	}
-	// Close the original reader since we're going to re-open after truncation.
-	artifact.Reader.Close()
-
-	// Look up the path from the fakeDesktop recordings.
-	f.fakeDesktop.recMu.Lock()
-	path := f.fakeDesktop.recordings[recordingID]
-	f.fakeDesktop.recMu.Unlock()
-
-	// Expand the file to exceed the maximum recording size.
-	if err := os.Truncate(path, workspacesdk.MaxRecordingSize+1); err != nil {
-		return nil, err
-	}
-	// Re-open the truncated file.
-	file, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	return &agentdesktop.RecordingArtifact{
-		Reader: file,
-		Size:   workspacesdk.MaxRecordingSize + 1,
-	}, nil
-}
-
 func TestHandleDesktopVNC_StartError(t *testing.T) {
 	t.Parallel()
 
@@ -286,37 +134,6 @@ func TestHandleDesktopVNC_StartError(t *testing.T) {
 	assert.Equal(t, "Failed to start desktop session.", resp.Message)
 }
 
-func TestHandleAction_CallsRecordActivity(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	fake := &fakeDesktop{
-		startCfg: agentdesktop.DisplayConfig{Width: 1920, Height: 1080},
-	}
-	api := agentdesktop.NewAPI(logger, fake, nil)
-	defer api.Close()
-
-	body := agentdesktop.DesktopAction{
-		Action:     "left_click",
-		Coordinate: &[2]int{100, 200},
-	}
-	b, err := json.Marshal(body)
-	require.NoError(t, err)
-
-	rr := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodPost, "/action", bytes.NewReader(b))
-	req.Header.Set("Content-Type", "application/json")
-
-	handler := api.Routes()
-	handler.ServeHTTP(rr, req)
-	require.Equal(t, http.StatusOK, rr.Code)
-
-	fake.recMu.Lock()
-	count := fake.activityCount
-	fake.recMu.Unlock()
-	assert.Equal(t, 1, count, "handleAction should call RecordActivity exactly once")
-}
-
 func TestHandleAction_Screenshot(t *testing.T) {
 	t.Parallel()
 
@@ -757,481 +574,3 @@ func TestHandleAction_CursorPositionReturnsDeclaredCoordinates(t *testing.T) {
 	// Native (960,540) in 1920x1080 should map to declared space in 1280x720.
 	assert.Equal(t, "x=640,y=360", resp.Output)
 }
-
-func TestRecordingStartStop(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	fake := &fakeDesktop{
-		startCfg: agentdesktop.DisplayConfig{Width: 1920, Height: 1080},
-	}
-	api := agentdesktop.NewAPI(logger, fake, nil)
-	defer api.Close()
-
-	handler := api.Routes()
-
-	// Start recording.
-	startBody, err := json.Marshal(map[string]string{"recording_id": testRecIDDefault})
-	require.NoError(t, err)
-	rr := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodPost, "/recording/start", bytes.NewReader(startBody))
-	handler.ServeHTTP(rr, req)
-	require.Equal(t, http.StatusOK, rr.Code)
-
-	// Stop recording.
-	stopBody, err := json.Marshal(map[string]string{"recording_id": testRecIDDefault})
-	require.NoError(t, err)
-	rr = httptest.NewRecorder()
-	req = httptest.NewRequest(http.MethodPost, "/recording/stop", bytes.NewReader(stopBody))
-	handler.ServeHTTP(rr, req)
-	require.Equal(t, http.StatusOK, rr.Code)
-	assert.Equal(t, "video/mp4", rr.Header().Get("Content-Type"))
-	assert.Equal(t, []byte("fake-mp4-data-"+testRecIDDefault+"-1"), rr.Body.Bytes())
-}
-
-func TestRecordingStartFails(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	fake := &failStartRecordingDesktop{
-		fakeDesktop: fakeDesktop{
-			startCfg: agentdesktop.DisplayConfig{Width: 1920, Height: 1080},
-		},
-		startRecordingErr: xerrors.New("start recording error"),
-	}
-	api := agentdesktop.NewAPI(logger, fake, nil)
-	defer api.Close()
-
-	handler := api.Routes()
-
-	body, err := json.Marshal(map[string]string{"recording_id": uuid.New().String()})
-	require.NoError(t, err)
-	rr := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodPost, "/recording/start", bytes.NewReader(body))
-	handler.ServeHTTP(rr, req)
-
-	assert.Equal(t, http.StatusInternalServerError, rr.Code)
-
-	var resp codersdk.Response
-	err = json.NewDecoder(rr.Body).Decode(&resp)
-	require.NoError(t, err)
-	assert.Equal(t, "Failed to start recording.", resp.Message)
-}
-
-func TestRecordingStartIdempotent(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	fake := &fakeDesktop{
-		startCfg: agentdesktop.DisplayConfig{Width: 1920, Height: 1080},
-	}
-	api := agentdesktop.NewAPI(logger, fake, nil)
-	defer api.Close()
-
-	handler := api.Routes()
-
-	// Start same recording twice - both should succeed.
-	for range 2 {
-		body, err := json.Marshal(map[string]string{"recording_id": testRecIDStartIdempotent})
-		require.NoError(t, err)
-		rr := httptest.NewRecorder()
-		req := httptest.NewRequest(http.MethodPost, "/recording/start", bytes.NewReader(body))
-		handler.ServeHTTP(rr, req)
-		require.Equal(t, http.StatusOK, rr.Code)
-	}
-
-	// Stop once, verify normal response.
-	stopBody, err := json.Marshal(map[string]string{"recording_id": testRecIDStartIdempotent})
-	require.NoError(t, err)
-	rr := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodPost, "/recording/stop", bytes.NewReader(stopBody))
-	handler.ServeHTTP(rr, req)
-	require.Equal(t, http.StatusOK, rr.Code)
-	assert.Equal(t, "video/mp4", rr.Header().Get("Content-Type"))
-	assert.Equal(t, []byte("fake-mp4-data-"+testRecIDStartIdempotent+"-1"), rr.Body.Bytes())
-}
-
-func TestRecordingStopIdempotent(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	fake := &fakeDesktop{
-		startCfg: agentdesktop.DisplayConfig{Width: 1920, Height: 1080},
-	}
-	api := agentdesktop.NewAPI(logger, fake, nil)
-	defer api.Close()
-
-	handler := api.Routes()
-
-	// Start recording.
-	startBody, err := json.Marshal(map[string]string{"recording_id": testRecIDStopIdempotent})
-	require.NoError(t, err)
-	rr := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodPost, "/recording/start", bytes.NewReader(startBody))
-	handler.ServeHTTP(rr, req)
-	require.Equal(t, http.StatusOK, rr.Code)
-
-	// Stop twice - both should succeed with identical data.
-	var bodies [2][]byte
-	for i := range 2 {
-		body, err := json.Marshal(map[string]string{"recording_id": testRecIDStopIdempotent})
-		require.NoError(t, err)
-		recorder := httptest.NewRecorder()
-		request := httptest.NewRequest(http.MethodPost, "/recording/stop", bytes.NewReader(body))
-		handler.ServeHTTP(recorder, request)
-		require.Equal(t, http.StatusOK, recorder.Code)
-		assert.Equal(t, "video/mp4", recorder.Header().Get("Content-Type"))
-		bodies[i] = recorder.Body.Bytes()
-	}
-	assert.Equal(t, bodies[0], bodies[1])
-}
-
-func TestRecordingStopInvalidIDFormat(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	fake := &fakeDesktop{
-		startCfg: agentdesktop.DisplayConfig{Width: 1920, Height: 1080},
-	}
-	api := agentdesktop.NewAPI(logger, fake, nil)
-	defer api.Close()
-
-	handler := api.Routes()
-
-	body, err := json.Marshal(map[string]string{"recording_id": "not-a-uuid"})
-	require.NoError(t, err)
-	rr := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodPost, "/recording/stop", bytes.NewReader(body))
-	handler.ServeHTTP(rr, req)
-	assert.Equal(t, http.StatusBadRequest, rr.Code)
-}
-
-func TestRecordingStopUnknownRecording(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	fake := &fakeDesktop{
-		startCfg: agentdesktop.DisplayConfig{Width: 1920, Height: 1080},
-	}
-	api := agentdesktop.NewAPI(logger, fake, nil)
-	defer api.Close()
-
-	handler := api.Routes()
-
-	// Send a valid UUID that was never started - should reach
-	// StopRecording, get ErrUnknownRecording, and return 404.
-	body, err := json.Marshal(map[string]string{"recording_id": uuid.New().String()})
-	require.NoError(t, err)
-	rr := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodPost, "/recording/stop", bytes.NewReader(body))
-	handler.ServeHTTP(rr, req)
-	assert.Equal(t, http.StatusNotFound, rr.Code)
-
-	var resp codersdk.Response
-	err = json.NewDecoder(rr.Body).Decode(&resp)
-	require.NoError(t, err)
-	assert.Equal(t, "Recording not found.", resp.Message)
-}
-
-func TestRecordingStopOversizedFile(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	fake := &oversizedFakeDesktop{
-		fakeDesktop: fakeDesktop{
-			startCfg: agentdesktop.DisplayConfig{Width: 1920, Height: 1080},
-		},
-	}
-	api := agentdesktop.NewAPI(logger, fake, nil)
-	defer api.Close()
-
-	handler := api.Routes()
-
-	// Start recording.
-	recID := uuid.New().String()
-	startBody, err := json.Marshal(map[string]string{"recording_id": recID})
-	require.NoError(t, err)
-	rr := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodPost, "/recording/start", bytes.NewReader(startBody))
-	handler.ServeHTTP(rr, req)
-	require.Equal(t, http.StatusOK, rr.Code)
-
-	// Stop recording - file exceeds max size, expect 413.
-	stopBody, err := json.Marshal(map[string]string{"recording_id": recID})
-	require.NoError(t, err)
-	rr = httptest.NewRecorder()
-	req = httptest.NewRequest(http.MethodPost, "/recording/stop", bytes.NewReader(stopBody))
-	handler.ServeHTTP(rr, req)
-	assert.Equal(t, http.StatusRequestEntityTooLarge, rr.Code)
-
-	var resp codersdk.Response
-	err = json.NewDecoder(rr.Body).Decode(&resp)
-	require.NoError(t, err)
-	assert.Equal(t, "Recording file exceeds maximum allowed size.", resp.Message)
-}
-
-func TestRecordingMultipleSimultaneous(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	fake := &fakeDesktop{
-		startCfg: agentdesktop.DisplayConfig{Width: 1920, Height: 1080},
-	}
-	api := agentdesktop.NewAPI(logger, fake, nil)
-	defer api.Close()
-
-	handler := api.Routes()
-
-	// Start two recordings with different IDs.
-	for _, id := range []string{testRecIDConcurrentA, testRecIDConcurrentB} {
-		body, err := json.Marshal(map[string]string{"recording_id": id})
-		require.NoError(t, err)
-		rr := httptest.NewRecorder()
-		req := httptest.NewRequest(http.MethodPost, "/recording/start", bytes.NewReader(body))
-		handler.ServeHTTP(rr, req)
-		require.Equal(t, http.StatusOK, rr.Code)
-	}
-
-	// Stop both and verify each returns its own data.
-	expected := map[string][]byte{
-		testRecIDConcurrentA: []byte("fake-mp4-data-" + testRecIDConcurrentA + "-1"),
-		testRecIDConcurrentB: []byte("fake-mp4-data-" + testRecIDConcurrentB + "-2"),
-	}
-	for _, id := range []string{testRecIDConcurrentA, testRecIDConcurrentB} {
-		body, err := json.Marshal(map[string]string{"recording_id": id})
-		require.NoError(t, err)
-		rr := httptest.NewRecorder()
-		req := httptest.NewRequest(http.MethodPost, "/recording/stop", bytes.NewReader(body))
-		handler.ServeHTTP(rr, req)
-		require.Equal(t, http.StatusOK, rr.Code)
-		assert.Equal(t, "video/mp4", rr.Header().Get("Content-Type"))
-		assert.Equal(t, expected[id], rr.Body.Bytes())
-	}
-}
-
-func TestRecordingStartMalformedBody(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	fake := &fakeDesktop{
-		startCfg: agentdesktop.DisplayConfig{Width: 1920, Height: 1080},
-	}
-	api := agentdesktop.NewAPI(logger, fake, nil)
-	defer api.Close()
-
-	handler := api.Routes()
-
-	rr := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodPost, "/recording/start", bytes.NewReader([]byte("not json")))
-	handler.ServeHTTP(rr, req)
-	assert.Equal(t, http.StatusBadRequest, rr.Code)
-}
-
-func TestRecordingStartEmptyID(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	fake := &fakeDesktop{
-		startCfg: agentdesktop.DisplayConfig{Width: 1920, Height: 1080},
-	}
-	api := agentdesktop.NewAPI(logger, fake, nil)
-	defer api.Close()
-
-	handler := api.Routes()
-
-	body, err := json.Marshal(map[string]string{"recording_id": ""})
-	require.NoError(t, err)
-	rr := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodPost, "/recording/start", bytes.NewReader(body))
-	handler.ServeHTTP(rr, req)
-	assert.Equal(t, http.StatusBadRequest, rr.Code)
-}
-
-func TestRecordingStopEmptyID(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	fake := &fakeDesktop{
-		startCfg: agentdesktop.DisplayConfig{Width: 1920, Height: 1080},
-	}
-	api := agentdesktop.NewAPI(logger, fake, nil)
-	defer api.Close()
-
-	handler := api.Routes()
-
-	body, err := json.Marshal(map[string]string{"recording_id": ""})
-	require.NoError(t, err)
-	rr := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodPost, "/recording/stop", bytes.NewReader(body))
-	handler.ServeHTTP(rr, req)
-	assert.Equal(t, http.StatusBadRequest, rr.Code)
-}
-
-func TestRecordingStopMalformedBody(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	fake := &fakeDesktop{
-		startCfg: agentdesktop.DisplayConfig{Width: 1920, Height: 1080},
-	}
-	api := agentdesktop.NewAPI(logger, fake, nil)
-	defer api.Close()
-
-	handler := api.Routes()
-
-	rr := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodPost, "/recording/stop", bytes.NewReader([]byte("not json")))
-	handler.ServeHTTP(rr, req)
-	assert.Equal(t, http.StatusBadRequest, rr.Code)
-}
-
-func TestRecordingStartAfterCompleted(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	fake := &fakeDesktop{
-		startCfg: agentdesktop.DisplayConfig{Width: 1920, Height: 1080},
-	}
-	api := agentdesktop.NewAPI(logger, fake, nil)
-	defer api.Close()
-
-	handler := api.Routes()
-
-	// Step 1: Start recording.
-	startBody, err := json.Marshal(map[string]string{"recording_id": testRecIDRestart})
-	require.NoError(t, err)
-	rr := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodPost, "/recording/start", bytes.NewReader(startBody))
-	handler.ServeHTTP(rr, req)
-	require.Equal(t, http.StatusOK, rr.Code)
-
-	// Step 2: Stop recording (gets first MP4 data).
-	stopBody, err := json.Marshal(map[string]string{"recording_id": testRecIDRestart})
-	require.NoError(t, err)
-	rr = httptest.NewRecorder()
-	req = httptest.NewRequest(http.MethodPost, "/recording/stop", bytes.NewReader(stopBody))
-	handler.ServeHTTP(rr, req)
-	require.Equal(t, http.StatusOK, rr.Code)
-	assert.Equal(t, "video/mp4", rr.Header().Get("Content-Type"))
-	firstData := rr.Body.Bytes()
-	require.NotEmpty(t, firstData)
-
-	// Step 3: Start again with the same ID - should succeed
-	// (old file discarded, new recording started).
-	rr = httptest.NewRecorder()
-	req = httptest.NewRequest(http.MethodPost, "/recording/start", bytes.NewReader(startBody))
-	handler.ServeHTTP(rr, req)
-	require.Equal(t, http.StatusOK, rr.Code)
-
-	// Step 4: Stop again - should return NEW MP4 data.
-	rr = httptest.NewRecorder()
-	req = httptest.NewRequest(http.MethodPost, "/recording/stop", bytes.NewReader(stopBody))
-	handler.ServeHTTP(rr, req)
-	require.Equal(t, http.StatusOK, rr.Code)
-	assert.Equal(t, "video/mp4", rr.Header().Get("Content-Type"))
-	secondData := rr.Body.Bytes()
-	require.NotEmpty(t, secondData)
-
-	// The two recordings should have different data because the
-	// fake increments a counter on each fresh start.
-	assert.NotEqual(t, firstData, secondData,
-		"restarted recording should produce different data")
-}
-
-func TestRecordingStartAfterClose(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	fake := &fakeDesktop{
-		startCfg: agentdesktop.DisplayConfig{Width: 1920, Height: 1080},
-	}
-	api := agentdesktop.NewAPI(logger, fake, nil)
-
-	handler := api.Routes()
-
-	// Close the API before sending the request.
-	api.Close()
-
-	body, err := json.Marshal(map[string]string{"recording_id": uuid.New().String()})
-	require.NoError(t, err)
-	rr := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodPost, "/recording/start", bytes.NewReader(body))
-	handler.ServeHTTP(rr, req)
-
-	assert.Equal(t, http.StatusServiceUnavailable, rr.Code)
-
-	var resp codersdk.Response
-	err = json.NewDecoder(rr.Body).Decode(&resp)
-	require.NoError(t, err)
-	assert.Equal(t, "Desktop API is shutting down.", resp.Message)
-}
-
-func TestRecordingStartDesktopClosed(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	// StartRecording returns ErrDesktopClosed to simulate a race
-	// where the desktop is closed between the API-level check and
-	// the desktop-level StartRecording call.
-	fake := &failStartRecordingDesktop{
-		fakeDesktop: fakeDesktop{
-			startCfg: agentdesktop.DisplayConfig{Width: 1920, Height: 1080},
-		},
-		startRecordingErr: agentdesktop.ErrDesktopClosed,
-	}
-	api := agentdesktop.NewAPI(logger, fake, nil)
-	defer api.Close()
-
-	handler := api.Routes()
-
-	body, err := json.Marshal(map[string]string{"recording_id": uuid.New().String()})
-	require.NoError(t, err)
-	rr := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodPost, "/recording/start", bytes.NewReader(body))
-	handler.ServeHTTP(rr, req)
-
-	assert.Equal(t, http.StatusServiceUnavailable, rr.Code)
-
-	var resp codersdk.Response
-	err = json.NewDecoder(rr.Body).Decode(&resp)
-	require.NoError(t, err)
-	assert.Equal(t, "Desktop API is shutting down.", resp.Message)
-}
-
-func TestRecordingStopCorrupted(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	fake := &corruptedStopDesktop{
-		fakeDesktop: fakeDesktop{
-			startCfg: agentdesktop.DisplayConfig{Width: 1920, Height: 1080},
-		},
-	}
-	api := agentdesktop.NewAPI(logger, fake, nil)
-	defer api.Close()
-
-	handler := api.Routes()
-
-	// Start a recording so the stop has something to find.
-	recID := uuid.New().String()
-	startBody, err := json.Marshal(map[string]string{"recording_id": recID})
-	require.NoError(t, err)
-	rr := httptest.NewRecorder()
-	req := httptest.NewRequest(http.MethodPost, "/recording/start", bytes.NewReader(startBody))
-	handler.ServeHTTP(rr, req)
-	require.Equal(t, http.StatusOK, rr.Code)
-
-	// Stop returns ErrRecordingCorrupted.
-	stopBody, err := json.Marshal(map[string]string{"recording_id": recID})
-	require.NoError(t, err)
-	rr = httptest.NewRecorder()
-	req = httptest.NewRequest(http.MethodPost, "/recording/stop", bytes.NewReader(stopBody))
-	handler.ServeHTTP(rr, req)
-
-	assert.Equal(t, http.StatusInternalServerError, rr.Code)
-
-	var respStop codersdk.Response
-	err = json.NewDecoder(rr.Body).Decode(&respStop)
-	require.NoError(t, err)
-	assert.Equal(t, "Recording is corrupted.", respStop.Message)
-}

agent/x/agentdesktop/desktop.go

@@ -2,10 +2,7 @@ package agentdesktop
 
 import (
 	"context"
-	"io"
 	"net"
-
-	"golang.org/x/xerrors"
 )
 
 // Desktop abstracts a virtual desktop session running inside a workspace.
@@ -61,52 +58,10 @@ type Desktop interface {
 	// CursorPosition returns the current cursor coordinates.
 	CursorPosition(ctx context.Context) (x, y int, err error)
 
-	// RecordActivity marks the desktop as having received user
-	// interaction, resetting the idle-recording timer.
-	RecordActivity()
-
-	// StartRecording begins recording the desktop to an MP4 file
-	// using the caller-provided recording ID. Safe to call
-	// repeatedly - active recordings continue unchanged, stopped
-	// recordings are discarded and restarted. Concurrent recordings
-	// are supported.
-	StartRecording(ctx context.Context, recordingID string) error
-
-	// StopRecording finalizes the recording identified by the given
-	// ID. Idempotent - safe to call on an already-stopped recording.
-	// Returns a RecordingArtifact that the caller can stream. The
-	// caller must close the artifact when done. Returns an error if
-	// the recording ID is unknown.
-	StopRecording(ctx context.Context, recordingID string) (*RecordingArtifact, error)
-
 	// Close shuts down the desktop session and cleans up resources.
 	Close() error
 }
 
-// ErrUnknownRecording is returned by StopRecording when the
-// recording ID is not recognized.
-var ErrUnknownRecording = xerrors.New("unknown recording ID")
-
-// ErrDesktopClosed is returned when an operation is attempted on a
-// closed desktop session.
-var ErrDesktopClosed = xerrors.New("desktop closed")
-
-// ErrRecordingCorrupted is returned by StopRecording when the
-// recording process was force-killed and the artifact is likely
-// incomplete or corrupt.
-var ErrRecordingCorrupted = xerrors.New("recording corrupted: process was force-killed")
-
-// RecordingArtifact is a finalized recording returned by StopRecording.
-// The caller streams the artifact and must call Close when done. The
-// artifact remains valid even if the same recording ID is restarted
-// or the desktop is closed while the caller is reading.
-type RecordingArtifact struct {
-	// Reader is the MP4 content. Callers must close it when done.
-	Reader io.ReadCloser
-	// Size is the byte length of the MP4 content.
-	Size int64
-}
-
 // DisplayConfig describes a running desktop session.
 type DisplayConfig struct {
 	Width   int // native width in pixels

agent/x/agentdesktop/portabledesktop.go

@@ -3,7 +3,6 @@ package agentdesktop
 import (
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"net"
 	"os"
@@ -12,7 +11,6 @@ import (
 	"runtime"
 	"strconv"
 	"sync"
-	"sync/atomic"
 	"time"
 
 	"golang.org/x/xerrors"
@@ -20,7 +18,6 @@ import (
 	"cdr.dev/slog/v3"
 	"github.com/coder/coder/v2/agent/agentexec"
 	"github.com/coder/coder/v2/codersdk/workspacesdk"
-	"github.com/coder/quartz"
 )
 
 // portableDesktopOutput is the JSON output from
@@ -52,65 +49,32 @@ type screenshotOutput struct {
 	Data string `json:"data"`
 }
 
-// recordingProcess tracks a single desktop recording subprocess.
-type recordingProcess struct {
-	cmd        *exec.Cmd
-	filePath   string
-	stopped    bool
-	killed     bool          // true when the process was SIGKILLed
-	done       chan struct{} // closed when cmd.Wait() returns
-	waitErr    error         // set before done is closed
-	stopOnce   sync.Once
-	idleCancel context.CancelFunc // cancels the per-recording idle goroutine
-	idleDone   chan struct{}      // closed when idle goroutine exits
-}
-
-// maxConcurrentRecordings is the maximum number of active (non-stopped)
-// recordings allowed at once. This prevents resource exhaustion.
-const maxConcurrentRecordings = 5
-
-// idleTimeout is the duration of desktop inactivity after which all
-// active recordings are automatically stopped.
-const idleTimeout = 10 * time.Minute
-
 // portableDesktop implements Desktop by shelling out to the
 // portabledesktop CLI via agentexec.Execer.
 type portableDesktop struct {
 	logger       slog.Logger
 	execer       agentexec.Execer
 	scriptBinDir string // coder script bin directory
-	clock        quartz.Clock
 
-	mu                  sync.Mutex
-	session             *desktopSession // nil until started
-	binPath             string          // resolved path to binary, cached
-	closed              bool
-	recordings          map[string]*recordingProcess // guarded by mu
-	lastDesktopActionAt atomic.Int64
+	mu      sync.Mutex
+	session *desktopSession // nil until started
+	binPath string          // resolved path to binary, cached
+	closed  bool
 }
 
 // NewPortableDesktop creates a Desktop backed by the portabledesktop
 // CLI binary, using execer to spawn child processes. scriptBinDir is
-// the coder script bin directory checked for the binary. If clk is
-// nil, a real clock is used.
+// the coder script bin directory checked for the binary.
 func NewPortableDesktop(
 	logger slog.Logger,
 	execer agentexec.Execer,
 	scriptBinDir string,
-	clk quartz.Clock,
 ) Desktop {
-	if clk == nil {
-		clk = quartz.NewReal()
-	}
-	pd := &portableDesktop{
+	return &portableDesktop{
 		logger:       logger,
 		execer:       execer,
 		scriptBinDir: scriptBinDir,
-		clock:        clk,
-		recordings:   make(map[string]*recordingProcess),
 	}
-	pd.lastDesktopActionAt.Store(clk.Now().UnixNano())
-	return pd
 }
 
 // Start launches the desktop session (idempotent).
@@ -119,7 +83,7 @@ func (p *portableDesktop) Start(ctx context.Context) (DisplayConfig, error) {
 	defer p.mu.Unlock()
 
 	if p.closed {
-		return DisplayConfig{}, ErrDesktopClosed
+		return DisplayConfig{}, xerrors.New("desktop is closed")
 	}
 
 	if err := p.ensureBinary(ctx); err != nil {
@@ -349,328 +313,23 @@ func (p *portableDesktop) CursorPosition(ctx context.Context) (x int, y int, err
 	return result.X, result.Y, nil
 }
 
-// StartRecording begins recording the desktop to an MP4 file.
-// Three-state idempotency: active recordings are no-ops,
-// completed recordings are discarded and restarted.
-func (p *portableDesktop) StartRecording(ctx context.Context, recordingID string) error {
-	// Ensure the desktop session is running before acquiring the
-	// recording lock. Start is independently locked and idempotent.
-	if _, err := p.Start(ctx); err != nil {
-		return xerrors.Errorf("ensure desktop session: %w", err)
-	}
-
-	p.mu.Lock()
-	defer p.mu.Unlock()
-
-	if p.closed {
-		return ErrDesktopClosed
-	}
-
-	// Three-state idempotency:
-	// - Active recording → no-op, continue recording.
-	// - Completed recording → discard old file, start fresh.
-	// - Unknown ID → fall through to start a new recording.
-	if rec, ok := p.recordings[recordingID]; ok {
-		if !rec.stopped {
-			select {
-			case <-rec.done:
-				// Process exited unexpectedly; treat as completed
-				// so we fall through to discard the old file and
-				// restart.
-			default:
-				// Active recording - no-op, continue recording.
-				return nil
-			}
-		}
-		// Completed recording - discard old file, start fresh.
-		if err := os.Remove(rec.filePath); err != nil && !os.IsNotExist(err) {
-			p.logger.Warn(ctx, "failed to remove old recording file",
-				slog.F("recording_id", recordingID),
-				slog.F("file_path", rec.filePath),
-				slog.Error(err),
-			)
-		}
-		delete(p.recordings, recordingID)
-	}
-
-	// Check concurrent recording limit.
-	if p.lockedActiveRecordingCount() >= maxConcurrentRecordings {
-		return xerrors.Errorf("too many concurrent recordings (max %d)", maxConcurrentRecordings)
-	}
-
-	// GC sweep: remove stopped recordings with stale files.
-	p.lockedCleanStaleRecordings(ctx)
-
-	if err := p.ensureBinary(ctx); err != nil {
-		return xerrors.Errorf("ensure portabledesktop binary: %w", err)
-	}
-
-	filePath := filepath.Join(os.TempDir(), "coder-recording-"+recordingID+".mp4")
-
-	// Use a background context so the process outlives the HTTP
-	// request that triggered it.
-	procCtx, procCancel := context.WithCancel(context.Background())
-
-	//nolint:gosec // portabledesktop is a trusted binary resolved via ensureBinary.
-	cmd := p.execer.CommandContext(procCtx, p.binPath, "record",
-		// The following options are used to speed up the recording when the desktop is idle.
-		// They were taken out of an example in the portabledesktop repo.
-		// There's likely room for improvement to optimize the values.
-		"--idle-speedup", "20",
-		"--idle-min-duration", "0.35",
-		"--idle-noise-tolerance", "-38dB",
-		filePath)
-
-	if err := cmd.Start(); err != nil {
-		procCancel()
-		return xerrors.Errorf("start recording process: %w", err)
-	}
-
-	rec := &recordingProcess{
-		cmd:      cmd,
-		filePath: filePath,
-		done:     make(chan struct{}),
-	}
-	go func() {
-		rec.waitErr = cmd.Wait()
-		close(rec.done)
-		// avoid a context resource leak by canceling the context
-		procCancel()
-	}()
-
-	p.recordings[recordingID] = rec
-
-	p.logger.Info(ctx, "started desktop recording",
-		slog.F("recording_id", recordingID),
-		slog.F("file_path", filePath),
-		slog.F("pid", cmd.Process.Pid),
-	)
-
-	// Record activity so a recording started on an already-idle
-	// desktop does not stop immediately.
-	p.lastDesktopActionAt.Store(p.clock.Now().UnixNano())
-
-	// Spawn a per-recording idle goroutine.
-	idleCtx, idleCancel := context.WithCancel(context.Background())
-	rec.idleCancel = idleCancel
-	rec.idleDone = make(chan struct{})
-	go func() {
-		defer close(rec.idleDone)
-		p.monitorRecordingIdle(idleCtx, rec)
-	}()
-
-	return nil
-}
-
-// StopRecording finalizes the recording. Idempotent - safe to call
-// on an already-stopped recording. Returns a RecordingArtifact
-// that the caller can stream. The caller must close the Reader
-// on the returned artifact to avoid leaking file descriptors.
-func (p *portableDesktop) StopRecording(ctx context.Context, recordingID string) (*RecordingArtifact, error) {
-	p.mu.Lock()
-	rec, ok := p.recordings[recordingID]
-	if !ok {
-		p.mu.Unlock()
-		return nil, ErrUnknownRecording
-	}
-
-	p.lockedStopRecordingProcess(ctx, rec, false)
-	killed := rec.killed
-	p.mu.Unlock()
-
-	p.logger.Info(ctx, "stopped desktop recording",
-		slog.F("recording_id", recordingID),
-		slog.F("file_path", rec.filePath),
-	)
-
-	if killed {
-		return nil, ErrRecordingCorrupted
-	}
-
-	// Open the file and return an artifact. Each call opens a fresh
-	// file descriptor so the caller is insulated from restarts and
-	// desktop close.
-	f, err := os.Open(rec.filePath)
-	if err != nil {
-		return nil, xerrors.Errorf("open recording artifact: %w", err)
-	}
-	info, err := f.Stat()
-	if err != nil {
-		_ = f.Close()
-		return nil, xerrors.Errorf("stat recording artifact: %w", err)
-	}
-	return &RecordingArtifact{
-		Reader: f,
-		Size:   info.Size(),
-	}, nil
-}
-
-// lockedStopRecordingProcess stops a single recording via stopOnce.
-// It sends SIGINT, waits up to 15 seconds for graceful exit, then
-// SIGKILLs. When force is true the process is SIGKILLed immediately
-// without attempting a graceful shutdown. Must be called while p.mu
-// is held; the lock is held for the full duration so that no
-// concurrent StopRecording caller can read rec.stopped = true
-// before the process has finished writing the MP4 file.
-//
-//nolint:revive // force flag keeps shared stopOnce/cleanup logic in one place.
-func (p *portableDesktop) lockedStopRecordingProcess(ctx context.Context, rec *recordingProcess, force bool) {
-	rec.stopOnce.Do(func() {
-		if force {
-			_ = rec.cmd.Process.Kill()
-			rec.killed = true
-		} else {
-			_ = interruptRecordingProcess(rec.cmd.Process)
-			timer := p.clock.NewTimer(15*time.Second, "agentdesktop", "stop_timeout")
-			defer timer.Stop()
-			select {
-			case <-rec.done:
-			case <-ctx.Done():
-				_ = rec.cmd.Process.Kill()
-				rec.killed = true
-			case <-timer.C:
-				_ = rec.cmd.Process.Kill()
-				rec.killed = true
-			}
-		}
-		rec.stopped = true
-		if rec.idleCancel != nil {
-			rec.idleCancel()
-		}
-	})
-	// NOTE: We intentionally do not wait on rec.done here.
-	// If goleak is added to this package's tests, this may
-	// need revisiting to avoid flakes.
-}
-
-// lockedActiveRecordingCount returns the number of recordings that
-// are still actively running. Must be called while p.mu is held.
-// The max concurrency is low (maxConcurrentRecordings = 5), so a
-// full scan is cheap and avoids maintaining a separate counter.
-func (p *portableDesktop) lockedActiveRecordingCount() int {
-	active := 0
-	for _, rec := range p.recordings {
-		if rec.stopped {
-			continue
-		}
-		select {
-		case <-rec.done:
-		default:
-			active++
-		}
-	}
-	return active
-}
-
-// lockedCleanStaleRecordings removes stopped recordings whose temp
-// files are older than one hour. Must be called while p.mu is held.
-func (p *portableDesktop) lockedCleanStaleRecordings(ctx context.Context) {
-	for id, rec := range p.recordings {
-		if !rec.stopped {
-			continue
-		}
-		info, err := os.Stat(rec.filePath)
-		if err != nil {
-			// File already removed or inaccessible; drop entry.
-			delete(p.recordings, id)
-			continue
-		}
-		if p.clock.Since(info.ModTime()) > time.Hour {
-			if err := os.Remove(rec.filePath); err != nil && !os.IsNotExist(err) {
-				p.logger.Warn(ctx, "failed to remove stale recording file",
-					slog.F("recording_id", id),
-					slog.F("file_path", rec.filePath),
-					slog.Error(err),
-				)
-			}
-			delete(p.recordings, id)
-		}
-	}
-}
-
 // Close shuts down the desktop session and cleans up resources.
 func (p *portableDesktop) Close() error {
 	p.mu.Lock()
+	defer p.mu.Unlock()
+
 	p.closed = true
-
-	// Force-kill all active recordings. The stopOnce inside
-	// lockedStopRecordingProcess makes this safe for
-	// already-stopped recordings.
-	for _, rec := range p.recordings {
-		p.lockedStopRecordingProcess(context.Background(), rec, true)
-	}
-
-	// Snapshot recording file paths and idle goroutine channels
-	// for cleanup, then clear the map.
-	type recEntry struct {
-		id       string
-		filePath string
-		idleDone chan struct{}
-	}
-	var allRecs []recEntry
-	for id, rec := range p.recordings {
-		allRecs = append(allRecs, recEntry{id: id, filePath: rec.filePath, idleDone: rec.idleDone})
-		delete(p.recordings, id)
-	}
-	session := p.session
-	p.session = nil
-	p.mu.Unlock()
-
-	// Wait for all per-recording idle goroutines to exit.
-	for _, entry := range allRecs {
-		if entry.idleDone != nil {
-			<-entry.idleDone
-		}
-	}
-
-	// Remove all recording files and wait for the session to
-	// exit with a timeout so a slow filesystem or hung process
-	// cannot block agent shutdown indefinitely.
-	cleanupDone := make(chan struct{})
-	go func() {
-		defer close(cleanupDone)
-		for _, entry := range allRecs {
-			if err := os.Remove(entry.filePath); err != nil && !os.IsNotExist(err) {
-				p.logger.Warn(context.Background(), "failed to remove recording file on close",
-					slog.F("recording_id", entry.id),
-					slog.F("file_path", entry.filePath),
-					slog.Error(err),
-				)
-			}
-		}
-		if session != nil {
-			session.cancel()
-			if err := session.cmd.Process.Kill(); err != nil {
-				p.logger.Warn(context.Background(), "failed to kill portabledesktop process",
-					slog.Error(err),
-				)
-			}
-			if err := session.cmd.Wait(); err != nil {
-				var exitErr *exec.ExitError
-				if !errors.As(err, &exitErr) {
-					p.logger.Warn(context.Background(), "portabledesktop process exited with error",
-						slog.Error(err),
-					)
-				}
-			}
-		}
-	}()
-	timer := p.clock.NewTimer(15*time.Second, "agentdesktop", "close_cleanup_timeout")
-	defer timer.Stop()
-	select {
-	case <-cleanupDone:
-	case <-timer.C:
-		p.logger.Warn(context.Background(), "timed out waiting for close cleanup")
+	if p.session != nil {
+		p.session.cancel()
+		// Xvnc is a child process — killing it cleans up the X
+		// session.
+		_ = p.session.cmd.Process.Kill()
+		_ = p.session.cmd.Wait()
+		p.session = nil
 	}
 	return nil
 }
 
-// RecordActivity marks the desktop as having received user
-// interaction, resetting the idle-recording timer.
-func (p *portableDesktop) RecordActivity() {
-	p.lastDesktopActionAt.Store(p.clock.Now().UnixNano())
-}
-
 // runCmd executes a portabledesktop subcommand and returns combined
 // output. The caller must have previously called ensureBinary.
 func (p *portableDesktop) runCmd(ctx context.Context, args ...string) (string, error) {
@@ -738,31 +397,3 @@ func (p *portableDesktop) ensureBinary(ctx context.Context) error {
 
 	return xerrors.New("portabledesktop binary not found in PATH or script bin directory")
 }
-
-// monitorRecordingIdle watches for desktop inactivity and stops the
-// given recording when the idle timeout is reached.
-func (p *portableDesktop) monitorRecordingIdle(ctx context.Context, rec *recordingProcess) {
-	timer := p.clock.NewTimer(idleTimeout, "agentdesktop", "recording_idle")
-	defer timer.Stop()
-
-	for {
-		select {
-		case <-timer.C:
-			lastNano := p.lastDesktopActionAt.Load()
-			lastAction := time.Unix(0, lastNano)
-			elapsed := p.clock.Since(lastAction)
-			if elapsed >= idleTimeout {
-				p.mu.Lock()
-				p.lockedStopRecordingProcess(context.Background(), rec, false)
-				p.mu.Unlock()
-				return
-			}
-			// Activity happened; reset with remaining budget.
-			timer.Reset(idleTimeout-elapsed, "agentdesktop", "recording_idle")
-		case <-rec.done:
-			return
-		case <-ctx.Done():
-			return
-		}
-	}
-}

agent/x/agentdesktop/portabledesktop_internal_test.go

@@ -9,17 +9,13 @@ import (
 	"strings"
 	"sync"
 	"testing"
-	"time"
 
-	"github.com/google/uuid"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"cdr.dev/slog/v3/sloggers/slogtest"
 	"github.com/coder/coder/v2/agent/agentexec"
 	"github.com/coder/coder/v2/pty"
-	"github.com/coder/coder/v2/testutil"
-	"github.com/coder/quartz"
 )
 
 // recordedExecer implements agentexec.Execer by recording every
@@ -90,7 +86,6 @@ func TestPortableDesktop_Start_ParsesOutput(t *testing.T) {
 		execer:       rec,
 		scriptBinDir: t.TempDir(),
 		binPath:      "portabledesktop", // pre-set so ensureBinary is a no-op
-		clock:        quartz.NewReal(),
 	}
 
 	ctx := t.Context()
@@ -122,7 +117,6 @@ func TestPortableDesktop_Start_Idempotent(t *testing.T) {
 		execer:       rec,
 		scriptBinDir: t.TempDir(),
 		binPath:      "portabledesktop",
-		clock:        quartz.NewReal(),
 	}
 
 	ctx := t.Context()
@@ -165,7 +159,6 @@ func TestPortableDesktop_Screenshot(t *testing.T) {
 		execer:       rec,
 		scriptBinDir: t.TempDir(),
 		binPath:      "portabledesktop",
-		clock:        quartz.NewReal(),
 	}
 
 	ctx := t.Context()
@@ -191,7 +184,6 @@ func TestPortableDesktop_Screenshot_WithTargetDimensions(t *testing.T) {
 		execer:       rec,
 		scriptBinDir: t.TempDir(),
 		binPath:      "portabledesktop",
-		clock:        quartz.NewReal(),
 	}
 
 	ctx := t.Context()
@@ -290,7 +282,6 @@ func TestPortableDesktop_MouseMethods(t *testing.T) {
 				execer:       rec,
 				scriptBinDir: t.TempDir(),
 				binPath:      "portabledesktop",
-				clock:        quartz.NewReal(),
 			}
 
 			err := tt.invoke(t.Context(), pd)
@@ -298,6 +289,7 @@ func TestPortableDesktop_MouseMethods(t *testing.T) {
 
 			cmds := rec.allCommands()
 			require.NotEmpty(t, cmds, "expected at least one command")
+
 			// Find at least one recorded command that contains
 			// all expected argument substrings.
 			found := false
@@ -375,7 +367,6 @@ func TestPortableDesktop_KeyboardMethods(t *testing.T) {
 				execer:       rec,
 				scriptBinDir: t.TempDir(),
 				binPath:      "portabledesktop",
-				clock:        quartz.NewReal(),
 			}
 
 			err := tt.invoke(t.Context(), pd)
@@ -432,7 +423,6 @@ func TestPortableDesktop_Close(t *testing.T) {
 		execer:       rec,
 		scriptBinDir: t.TempDir(),
 		binPath:      "portabledesktop",
-		clock:        quartz.NewReal(),
 	}
 
 	ctx := t.Context()
@@ -455,7 +445,7 @@ func TestPortableDesktop_Close(t *testing.T) {
 	// Subsequent Start must fail.
 	_, err = pd.Start(ctx)
 	require.Error(t, err)
-	assert.Contains(t, err.Error(), "desktop closed")
+	assert.Contains(t, err.Error(), "desktop is closed")
 }
 
 // --- ensureBinary tests ---
@@ -549,410 +539,7 @@ func TestEnsureBinary_NotFound(t *testing.T) {
 	assert.Contains(t, err.Error(), "not found")
 }
 
-func TestPortableDesktop_StartRecording(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	rec := &recordedExecer{
-		scripts: map[string]string{
-			"record": `trap 'exit 0' INT; sleep 120 & wait`,
-			"up":     `printf '{"vncPort":5901,"geometry":"1920x1080"}\n' && sleep 120`,
-		},
-	}
-
-	clk := quartz.NewReal()
-	pd := &portableDesktop{
-		logger:       logger,
-		execer:       rec,
-		scriptBinDir: t.TempDir(),
-		clock:        clk,
-		binPath:      "portabledesktop",
-		recordings:   make(map[string]*recordingProcess),
-	}
-	pd.lastDesktopActionAt.Store(clk.Now().UnixNano())
-
-	ctx := t.Context()
-	recID := uuid.New().String()
-	err := pd.StartRecording(ctx, recID)
-	require.NoError(t, err)
-
-	cmds := rec.allCommands()
-	require.NotEmpty(t, cmds)
-	// Find the record command (not the up command).
-	found := false
-	for _, cmd := range cmds {
-		joined := strings.Join(cmd, " ")
-		if strings.Contains(joined, "record") && strings.Contains(joined, "coder-recording-"+recID) {
-			found = true
-			break
-		}
-	}
-	assert.True(t, found, "expected a record command with the recording ID")
-
-	require.NoError(t, pd.Close())
-}
-
-func TestPortableDesktop_StartRecording_ConcurrentLimit(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	rec := &recordedExecer{
-		scripts: map[string]string{
-			"record": `trap 'exit 0' INT; sleep 120 & wait`,
-			"up":     `printf '{"vncPort":5901,"geometry":"1920x1080"}\n' && sleep 120`,
-		},
-	}
-
-	clk := quartz.NewReal()
-	pd := &portableDesktop{
-		logger:       logger,
-		execer:       rec,
-		scriptBinDir: t.TempDir(),
-		clock:        clk,
-		binPath:      "portabledesktop",
-		recordings:   make(map[string]*recordingProcess),
-	}
-	pd.lastDesktopActionAt.Store(clk.Now().UnixNano())
-
-	ctx := t.Context()
-
-	for i := range maxConcurrentRecordings {
-		err := pd.StartRecording(ctx, uuid.New().String())
-		require.NoError(t, err, "recording %d should succeed", i)
-	}
-
-	err := pd.StartRecording(ctx, uuid.New().String())
-	require.Error(t, err)
-	assert.Contains(t, err.Error(), "too many concurrent recordings")
-
-	require.NoError(t, pd.Close())
-}
-
-func TestPortableDesktop_StopRecording_ReturnsArtifact(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	rec := &recordedExecer{
-		scripts: map[string]string{
-			"record": `trap 'exit 0' INT; sleep 120 & wait`,
-			"up":     `printf '{"vncPort":5901,"geometry":"1920x1080"}\n' && sleep 120`,
-		},
-	}
-
-	clk := quartz.NewReal()
-	pd := &portableDesktop{
-		logger:       logger,
-		execer:       rec,
-		scriptBinDir: t.TempDir(),
-		clock:        clk,
-		binPath:      "portabledesktop",
-		recordings:   make(map[string]*recordingProcess),
-	}
-	pd.lastDesktopActionAt.Store(clk.Now().UnixNano())
-
-	ctx := t.Context()
-	recID := uuid.New().String()
-	err := pd.StartRecording(ctx, recID)
-	require.NoError(t, err)
-
-	// Write a dummy MP4 file at the expected path so StopRecording
-	// can open it as an artifact.
-	filePath := filepath.Join(os.TempDir(), "coder-recording-"+recID+".mp4")
-	require.NoError(t, os.WriteFile(filePath, []byte("fake-mp4-data"), 0o600))
-	t.Cleanup(func() { _ = os.Remove(filePath) })
-
-	artifact, err := pd.StopRecording(ctx, recID)
-	require.NoError(t, err)
-	defer artifact.Reader.Close()
-	assert.Equal(t, int64(len("fake-mp4-data")), artifact.Size)
-
-	require.NoError(t, pd.Close())
-}
-
-func TestPortableDesktop_StopRecording_UnknownID(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	rec := &recordedExecer{
-		scripts: map[string]string{
-			"record": `trap 'exit 0' INT; sleep 120 & wait`,
-		},
-	}
-
-	clk := quartz.NewReal()
-	pd := &portableDesktop{
-		logger:       logger,
-		execer:       rec,
-		scriptBinDir: t.TempDir(),
-		clock:        clk,
-		binPath:      "portabledesktop",
-		recordings:   make(map[string]*recordingProcess),
-	}
-	pd.lastDesktopActionAt.Store(clk.Now().UnixNano())
-
-	ctx := t.Context()
-	_, err := pd.StopRecording(ctx, uuid.New().String())
-	require.ErrorIs(t, err, ErrUnknownRecording)
-
-	require.NoError(t, pd.Close())
-}
-
 // Ensure that portableDesktop satisfies the Desktop interface at
 // compile time. This uses the unexported type so it lives in the
 // internal test package.
 var _ Desktop = (*portableDesktop)(nil)
-
-func TestPortableDesktop_IdleTimeout_StopsRecordings(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	rec := &recordedExecer{
-		scripts: map[string]string{
-			"record": `trap 'exit 0' INT; sleep 120 & wait`,
-			"up":     `printf '{"vncPort":5901,"geometry":"1920x1080"}\n' && sleep 120`,
-		},
-	}
-
-	clk := quartz.NewMock(t)
-	pd := &portableDesktop{
-		logger:       logger,
-		execer:       rec,
-		scriptBinDir: t.TempDir(),
-		clock:        clk,
-		binPath:      "portabledesktop",
-		recordings:   make(map[string]*recordingProcess),
-	}
-	pd.lastDesktopActionAt.Store(clk.Now().UnixNano())
-
-	ctx := t.Context()
-	recID := uuid.New().String()
-
-	// Install the trap before StartRecording so it is guaranteed
-	// to catch the idle monitor's NewTimer call regardless of
-	// goroutine scheduling.
-	trap := clk.Trap().NewTimer("agentdesktop", "recording_idle")
-
-	err := pd.StartRecording(ctx, recID)
-	require.NoError(t, err)
-
-	// Verify recording is active.
-	pd.mu.Lock()
-	require.False(t, pd.recordings[recID].stopped)
-	pd.mu.Unlock()
-
-	// Wait for the idle monitor timer to be created and release
-	// it so the monitor enters its select loop.
-	trap.MustWait(ctx).MustRelease(ctx)
-	trap.Close()
-
-	// The stop-all path calls lockedStopRecordingProcess which
-	// creates a per-recording 15s stop_timeout timer.
-	stopTrap := clk.Trap().NewTimer("agentdesktop", "stop_timeout")
-
-	// Advance past idle timeout to trigger the stop-all.
-	clk.Advance(idleTimeout)
-
-	// Wait for the stop timer to be created, then release it.
-	stopTrap.MustWait(ctx).MustRelease(ctx)
-	stopTrap.Close()
-
-	// The recording process should now be stopped.
-	require.Eventually(t, func() bool {
-		pd.mu.Lock()
-		defer pd.mu.Unlock()
-		rec, ok := pd.recordings[recID]
-		return ok && rec.stopped
-	}, testutil.WaitShort, testutil.IntervalFast)
-
-	require.NoError(t, pd.Close())
-}
-
-func TestPortableDesktop_IdleTimeout_ActivityResetsTimer(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	rec := &recordedExecer{
-		scripts: map[string]string{
-			"record": `trap 'exit 0' INT; sleep 120 & wait`,
-			"up":     `printf '{"vncPort":5901,"geometry":"1920x1080"}\n' && sleep 120`,
-		},
-	}
-
-	clk := quartz.NewMock(t)
-	pd := &portableDesktop{
-		logger:       logger,
-		execer:       rec,
-		scriptBinDir: t.TempDir(),
-		clock:        clk,
-		binPath:      "portabledesktop",
-		recordings:   make(map[string]*recordingProcess),
-	}
-	pd.lastDesktopActionAt.Store(clk.Now().UnixNano())
-
-	ctx := t.Context()
-	recID := uuid.New().String()
-
-	// Install the trap before StartRecording so it is guaranteed
-	// to catch the idle monitor's NewTimer call regardless of
-	// goroutine scheduling.
-	trap := clk.Trap().NewTimer("agentdesktop", "recording_idle")
-
-	err := pd.StartRecording(ctx, recID)
-	require.NoError(t, err)
-
-	// Wait for the idle monitor timer to be created.
-	trap.MustWait(ctx).MustRelease(ctx)
-	trap.Close()
-
-	// Advance most of the way but not past the timeout.
-	clk.Advance(idleTimeout - time.Minute)
-
-	// Record activity to reset the timer.
-	pd.RecordActivity()
-
-	// Trap the Reset call that the idle monitor makes when it
-	// sees recent activity.
-	resetTrap := clk.Trap().TimerReset("agentdesktop", "recording_idle")
-
-	// Advance past the original idle timeout deadline. The
-	// monitor should see the recent activity and reset instead
-	// of stopping.
-	clk.Advance(time.Minute)
-
-	resetTrap.MustWait(ctx).MustRelease(ctx)
-	resetTrap.Close()
-
-	// Recording should still be active because activity was
-	// recorded.
-	pd.mu.Lock()
-	require.False(t, pd.recordings[recID].stopped)
-	pd.mu.Unlock()
-
-	require.NoError(t, pd.Close())
-}
-
-func TestPortableDesktop_IdleTimeout_MultipleRecordings(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	rec := &recordedExecer{
-		scripts: map[string]string{
-			"record": `trap 'exit 0' INT; sleep 120 & wait`,
-			"up":     `printf '{"vncPort":5901,"geometry":"1920x1080"}\n' && sleep 120`,
-		},
-	}
-
-	clk := quartz.NewMock(t)
-	pd := &portableDesktop{
-		logger:       logger,
-		execer:       rec,
-		scriptBinDir: t.TempDir(),
-		clock:        clk,
-		binPath:      "portabledesktop",
-		recordings:   make(map[string]*recordingProcess),
-	}
-	pd.lastDesktopActionAt.Store(clk.Now().UnixNano())
-
-	ctx := t.Context()
-	recID1 := uuid.New().String()
-	recID2 := uuid.New().String()
-
-	// Trap idle timer creation for both recordings.
-	trap := clk.Trap().NewTimer("agentdesktop", "recording_idle")
-
-	err := pd.StartRecording(ctx, recID1)
-	require.NoError(t, err)
-
-	// Wait for first recording's idle timer.
-	trap.MustWait(ctx).MustRelease(ctx)
-
-	err = pd.StartRecording(ctx, recID2)
-	require.NoError(t, err)
-
-	// Wait for second recording's idle timer.
-	trap.MustWait(ctx).MustRelease(ctx)
-	trap.Close()
-
-	// Trap the stop timers that will be created when idle fires.
-	stopTrap := clk.Trap().NewTimer("agentdesktop", "stop_timeout")
-
-	// Advance past idle timeout.
-	clk.Advance(idleTimeout)
-
-	// Wait for both stop timers.
-	stopTrap.MustWait(ctx).MustRelease(ctx)
-	stopTrap.MustWait(ctx).MustRelease(ctx)
-	stopTrap.Close()
-
-	// Both recordings should be stopped.
-	require.Eventually(t, func() bool {
-		pd.mu.Lock()
-		defer pd.mu.Unlock()
-		r1, ok1 := pd.recordings[recID1]
-		r2, ok2 := pd.recordings[recID2]
-		return ok1 && r1.stopped && ok2 && r2.stopped
-	}, testutil.WaitShort, testutil.IntervalFast)
-
-	require.NoError(t, pd.Close())
-}
-
-func TestPortableDesktop_StartRecording_ReturnsErrDesktopClosed(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	rec := &recordedExecer{
-		scripts: map[string]string{
-			"up": `printf '{"vncPort":5901,"geometry":"1920x1080"}\n' && sleep 120`,
-		},
-	}
-
-	clk := quartz.NewReal()
-	pd := &portableDesktop{
-		logger:       logger,
-		execer:       rec,
-		scriptBinDir: t.TempDir(),
-		clock:        clk,
-		binPath:      "portabledesktop",
-		recordings:   make(map[string]*recordingProcess),
-	}
-	pd.lastDesktopActionAt.Store(clk.Now().UnixNano())
-
-	// Start and close the desktop so it's in the closed state.
-	ctx := t.Context()
-	_, err := pd.Start(ctx)
-	require.NoError(t, err)
-	require.NoError(t, pd.Close())
-
-	// StartRecording should now return ErrDesktopClosed.
-	err = pd.StartRecording(ctx, uuid.New().String())
-	require.ErrorIs(t, err, ErrDesktopClosed)
-}
-
-func TestPortableDesktop_Start_ReturnsErrDesktopClosed(t *testing.T) {
-	t.Parallel()
-
-	logger := slogtest.Make(t, nil)
-	rec := &recordedExecer{
-		scripts: map[string]string{
-			"up": `printf '{"vncPort":5901,"geometry":"1920x1080"}\n' && sleep 120`,
-		},
-	}
-
-	pd := &portableDesktop{
-		logger:       logger,
-		execer:       rec,
-		scriptBinDir: t.TempDir(),
-		clock:        quartz.NewReal(),
-		binPath:      "portabledesktop",
-		recordings:   make(map[string]*recordingProcess),
-	}
-	pd.lastDesktopActionAt.Store(pd.clock.Now().UnixNano())
-
-	ctx := t.Context()
-	_, err := pd.Start(ctx)
-	require.NoError(t, err)
-	require.NoError(t, pd.Close())
-
-	_, err = pd.Start(ctx)
-	require.ErrorIs(t, err, ErrDesktopClosed)
-}

agent/x/agentdesktop/portabledesktop_stop_other.go

@@ -1,12 +0,0 @@
-//go:build !windows
-
-package agentdesktop
-
-import "os"
-
-// interruptRecordingProcess sends a SIGINT to the recording process
-// for graceful shutdown. On Unix, os.Interrupt is delivered as
-// SIGINT which lets the recorder finalize the MP4 container.
-func interruptRecordingProcess(p *os.Process) error {
-	return p.Signal(os.Interrupt)
-}

agent/x/agentdesktop/portabledesktop_stop_windows.go

@@ -1,10 +0,0 @@
-package agentdesktop
-
-import "os"
-
-// interruptRecordingProcess kills the recording process directly
-// because os.Process.Signal(os.Interrupt) is not supported on
-// Windows and returns an error without delivering a signal.
-func interruptRecordingProcess(p *os.Process) error {
-	return p.Kill()
-}

agent/x/agentmcp/api.go

@@ -1,88 +0,0 @@
-package agentmcp
-
-import (
-	"errors"
-	"net/http"
-
-	"github.com/go-chi/chi/v5"
-
-	"cdr.dev/slog/v3"
-	"github.com/coder/coder/v2/coderd/httpapi"
-	"github.com/coder/coder/v2/codersdk"
-	"github.com/coder/coder/v2/codersdk/workspacesdk"
-)
-
-// API exposes MCP tool discovery and call proxying through the
-// agent.
-type API struct {
-	logger  slog.Logger
-	manager *Manager
-}
-
-// NewAPI creates a new MCP API handler backed by the given
-// manager.
-func NewAPI(logger slog.Logger, manager *Manager) *API {
-	return &API{
-		logger:  logger,
-		manager: manager,
-	}
-}
-
-// Routes returns the HTTP handler for MCP-related routes.
-func (api *API) Routes() http.Handler {
-	r := chi.NewRouter()
-	r.Get("/tools", api.handleListTools)
-	r.Post("/call-tool", api.handleCallTool)
-	return r
-}
-
-// handleListTools returns the cached MCP tool definitions,
-// optionally refreshing them first if ?refresh=true is set.
-func (api *API) handleListTools(rw http.ResponseWriter, r *http.Request) {
-	ctx := r.Context()
-
-	// Allow callers to force a tool re-scan before listing.
-	if r.URL.Query().Get("refresh") == "true" {
-		if err := api.manager.RefreshTools(ctx); err != nil {
-			api.logger.Warn(ctx, "failed to refresh MCP tools", slog.Error(err))
-		}
-	}
-
-	tools := api.manager.Tools()
-	// Ensure non-nil so JSON serialization returns [] not null.
-	if tools == nil {
-		tools = []workspacesdk.MCPToolInfo{}
-	}
-
-	httpapi.Write(ctx, rw, http.StatusOK, workspacesdk.ListMCPToolsResponse{
-		Tools: tools,
-	})
-}
-
-// handleCallTool proxies a tool invocation to the appropriate
-// MCP server based on the tool name prefix.
-func (api *API) handleCallTool(rw http.ResponseWriter, r *http.Request) {
-	ctx := r.Context()
-
-	var req workspacesdk.CallMCPToolRequest
-	if !httpapi.Read(ctx, rw, r, &req) {
-		return
-	}
-
-	resp, err := api.manager.CallTool(ctx, req)
-	if err != nil {
-		status := http.StatusBadGateway
-		if errors.Is(err, ErrInvalidToolName) {
-			status = http.StatusBadRequest
-		} else if errors.Is(err, ErrUnknownServer) {
-			status = http.StatusNotFound
-		}
-		httpapi.Write(ctx, rw, status, codersdk.Response{
-			Message: "MCP tool call failed.",
-			Detail:  err.Error(),
-		})
-		return
-	}
-
-	httpapi.Write(ctx, rw, http.StatusOK, resp)
-}

agent/x/agentmcp/config.go

@@ -1,115 +0,0 @@
-package agentmcp
-
-import (
-	"encoding/json"
-	"os"
-	"slices"
-	"strings"
-
-	"golang.org/x/xerrors"
-)
-
-// ServerConfig describes a single MCP server parsed from a .mcp.json file.
-type ServerConfig struct {
-	Name      string            `json:"name"`
-	Transport string            `json:"type"`
-	Command   string            `json:"command"`
-	Args      []string          `json:"args"`
-	Env       map[string]string `json:"env"`
-	URL       string            `json:"url"`
-	Headers   map[string]string `json:"headers"`
-}
-
-// mcpConfigFile mirrors the on-disk .mcp.json schema.
-type mcpConfigFile struct {
-	MCPServers map[string]json.RawMessage `json:"mcpServers"`
-}
-
-// mcpServerEntry is a single server block inside mcpServers.
-type mcpServerEntry struct {
-	Command string            `json:"command"`
-	Args    []string          `json:"args"`
-	Env     map[string]string `json:"env"`
-	Type    string            `json:"type"`
-	URL     string            `json:"url"`
-	Headers map[string]string `json:"headers"`
-}
-
-// ParseConfig reads a .mcp.json file at path and returns the declared
-// MCP servers sorted by name. It returns an empty slice when the
-// mcpServers key is missing or empty.
-func ParseConfig(path string) ([]ServerConfig, error) {
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return nil, xerrors.Errorf("read mcp config %q: %w", path, err)
-	}
-
-	var cfg mcpConfigFile
-	if err := json.Unmarshal(data, &cfg); err != nil {
-		return nil, xerrors.Errorf("parse mcp config %q: %w", path, err)
-	}
-
-	if len(cfg.MCPServers) == 0 {
-		return []ServerConfig{}, nil
-	}
-
-	servers := make([]ServerConfig, 0, len(cfg.MCPServers))
-	for name, raw := range cfg.MCPServers {
-		var entry mcpServerEntry
-		if err := json.Unmarshal(raw, &entry); err != nil {
-			return nil, xerrors.Errorf("parse server %q in %q: %w", name, path, err)
-		}
-
-		if strings.Contains(name, ToolNameSep) || strings.HasPrefix(name, "_") || strings.HasSuffix(name, "_") {
-			return nil, xerrors.Errorf("server name %q in %q contains reserved separator %q or leading/trailing underscore", name, path, ToolNameSep)
-		}
-
-		transport := inferTransport(entry)
-
-		if transport == "" {
-			return nil, xerrors.Errorf("server %q in %q has no command or url", name, path)
-		}
-
-		resolveEnvVars(entry.Env)
-
-		servers = append(servers, ServerConfig{
-			Name:      name,
-			Transport: transport,
-			Command:   entry.Command,
-			Args:      entry.Args,
-			Env:       entry.Env,
-			URL:       entry.URL,
-			Headers:   entry.Headers,
-		})
-	}
-
-	slices.SortFunc(servers, func(a, b ServerConfig) int {
-		return strings.Compare(a.Name, b.Name)
-	})
-
-	return servers, nil
-}
-
-// inferTransport determines the transport type for a server entry.
-// An explicit "type" field takes priority; otherwise the presence
-// of "command" implies stdio and "url" implies http.
-func inferTransport(e mcpServerEntry) string {
-	if e.Type != "" {
-		return e.Type
-	}
-	if e.Command != "" {
-		return "stdio"
-	}
-	if e.URL != "" {
-		return "http"
-	}
-	return ""
-}
-
-// resolveEnvVars expands ${VAR} references in env map values
-// using the current process environment.
-func resolveEnvVars(env map[string]string) {
-	for k, v := range env {
-		env[k] = os.Expand(v, os.Getenv)
-	}
-}

agent/x/agentmcp/config_test.go

@@ -1,254 +0,0 @@
-package agentmcp_test
-
-import (
-	"encoding/json"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/coder/coder/v2/agent/x/agentmcp"
-)
-
-func TestParseConfig(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		name        string
-		content     string
-		expected    []agentmcp.ServerConfig
-		expectError bool
-	}{
-		{
-			name: "StdioServer",
-			content: mustJSON(t, map[string]any{
-				"mcpServers": map[string]any{
-					"my-server": map[string]any{
-						"command": "npx",
-						"args":    []string{"-y", "@example/mcp-server"},
-						"env":     map[string]string{"FOO": "bar"},
-					},
-				},
-			}),
-			expected: []agentmcp.ServerConfig{
-				{
-					Name:      "my-server",
-					Transport: "stdio",
-					Command:   "npx",
-					Args:      []string{"-y", "@example/mcp-server"},
-					Env:       map[string]string{"FOO": "bar"},
-				},
-			},
-		},
-		{
-			name: "HTTPServer",
-			content: mustJSON(t, map[string]any{
-				"mcpServers": map[string]any{
-					"remote": map[string]any{
-						"url":     "https://example.com/mcp",
-						"headers": map[string]string{"Authorization": "Bearer tok"},
-					},
-				},
-			}),
-			expected: []agentmcp.ServerConfig{
-				{
-					Name:      "remote",
-					Transport: "http",
-					URL:       "https://example.com/mcp",
-					Headers:   map[string]string{"Authorization": "Bearer tok"},
-				},
-			},
-		},
-		{
-			name: "SSEServer",
-			content: mustJSON(t, map[string]any{
-				"mcpServers": map[string]any{
-					"events": map[string]any{
-						"type": "sse",
-						"url":  "https://example.com/sse",
-					},
-				},
-			}),
-			expected: []agentmcp.ServerConfig{
-				{
-					Name:      "events",
-					Transport: "sse",
-					URL:       "https://example.com/sse",
-				},
-			},
-		},
-		{
-			name: "ExplicitTypeOverridesInference",
-			content: mustJSON(t, map[string]any{
-				"mcpServers": map[string]any{
-					"hybrid": map[string]any{
-						"command": "some-binary",
-						"type":    "http",
-					},
-				},
-			}),
-			expected: []agentmcp.ServerConfig{
-				{
-					Name:      "hybrid",
-					Transport: "http",
-					Command:   "some-binary",
-				},
-			},
-		},
-		{
-			name: "EnvVarPassthrough",
-			content: mustJSON(t, map[string]any{
-				"mcpServers": map[string]any{
-					"srv": map[string]any{
-						"command": "run",
-						"env":     map[string]string{"PLAIN": "literal-value"},
-					},
-				},
-			}),
-			expected: []agentmcp.ServerConfig{
-				{
-					Name:      "srv",
-					Transport: "stdio",
-					Command:   "run",
-					Env:       map[string]string{"PLAIN": "literal-value"},
-				},
-			},
-		},
-		{
-			name: "EmptyMCPServers",
-			content: mustJSON(t, map[string]any{
-				"mcpServers": map[string]any{},
-			}),
-			expected: []agentmcp.ServerConfig{},
-		},
-		{
-			name:        "MalformedJSON",
-			content:     `{not valid json`,
-			expectError: true,
-		},
-		{
-			name: "ServerNameContainsSeparator",
-			content: mustJSON(t, map[string]any{
-				"mcpServers": map[string]any{
-					"bad__name": map[string]any{"command": "run"},
-				},
-			}),
-			expectError: true,
-		},
-		{
-			name: "ServerNameTrailingUnderscore",
-			content: mustJSON(t, map[string]any{
-				"mcpServers": map[string]any{
-					"server_": map[string]any{"command": "run"},
-				},
-			}),
-			expectError: true,
-		},
-		{
-			name: "ServerNameLeadingUnderscore",
-			content: mustJSON(t, map[string]any{
-				"mcpServers": map[string]any{
-					"_server": map[string]any{"command": "run"},
-				},
-			}),
-			expectError: true,
-		},
-		{
-			name: "EmptyTransport", content: mustJSON(t, map[string]any{
-				"mcpServers": map[string]any{
-					"empty": map[string]any{},
-				},
-			}),
-			expectError: true,
-		},
-		{
-			name: "MissingMCPServersKey",
-			content: mustJSON(t, map[string]any{
-				"servers": map[string]any{},
-			}),
-			expected: []agentmcp.ServerConfig{},
-		},
-		{
-			name: "MultipleServersSortedByName",
-			content: mustJSON(t, map[string]any{
-				"mcpServers": map[string]any{
-					"zeta":  map[string]any{"command": "z"},
-					"alpha": map[string]any{"command": "a"},
-					"mu":    map[string]any{"command": "m"},
-				},
-			}),
-			expected: []agentmcp.ServerConfig{
-				{Name: "alpha", Transport: "stdio", Command: "a"},
-				{Name: "mu", Transport: "stdio", Command: "m"},
-				{Name: "zeta", Transport: "stdio", Command: "z"},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-
-			dir := t.TempDir()
-			path := filepath.Join(dir, ".mcp.json")
-			err := os.WriteFile(path, []byte(tt.content), 0o600)
-			require.NoError(t, err)
-
-			got, err := agentmcp.ParseConfig(path)
-			if tt.expectError {
-				require.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-			require.Equal(t, tt.expected, got)
-		})
-	}
-}
-
-// TestParseConfig_EnvVarInterpolation verifies that ${VAR} references
-// in env values are resolved from the process environment. This test
-// cannot be parallel because t.Setenv is incompatible with t.Parallel.
-func TestParseConfig_EnvVarInterpolation(t *testing.T) {
-	t.Setenv("TEST_MCP_TOKEN", "secret123")
-
-	content := mustJSON(t, map[string]any{
-		"mcpServers": map[string]any{
-			"srv": map[string]any{
-				"command": "run",
-				"env":     map[string]string{"TOKEN": "${TEST_MCP_TOKEN}"},
-			},
-		},
-	})
-
-	dir := t.TempDir()
-	path := filepath.Join(dir, ".mcp.json")
-	err := os.WriteFile(path, []byte(content), 0o600)
-	require.NoError(t, err)
-
-	got, err := agentmcp.ParseConfig(path)
-	require.NoError(t, err)
-	require.Equal(t, []agentmcp.ServerConfig{
-		{
-			Name:      "srv",
-			Transport: "stdio",
-			Command:   "run",
-			Env:       map[string]string{"TOKEN": "secret123"},
-		},
-	}, got)
-}
-
-func TestParseConfig_FileNotFound(t *testing.T) {
-	t.Parallel()
-
-	_, err := agentmcp.ParseConfig(filepath.Join(t.TempDir(), "nonexistent.json"))
-	require.Error(t, err)
-}
-
-// mustJSON marshals v to a JSON string, failing the test on error.
-func mustJSON(t *testing.T, v any) string {
-	t.Helper()
-	data, err := json.Marshal(v)
-	require.NoError(t, err)
-	return string(data)
-}

agent/x/agentmcp/manager.go

@@ -1,474 +0,0 @@
-package agentmcp
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io/fs"
-	"os"
-	"slices"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/mark3labs/mcp-go/client"
-	"github.com/mark3labs/mcp-go/client/transport"
-	"github.com/mark3labs/mcp-go/mcp"
-	"golang.org/x/sync/errgroup"
-	"golang.org/x/xerrors"
-
-	"cdr.dev/slog/v3"
-	"github.com/coder/coder/v2/buildinfo"
-	"github.com/coder/coder/v2/codersdk/workspacesdk"
-)
-
-// ToolNameSep separates the server name from the original tool name
-// in prefixed tool names. Double underscore avoids collisions with
-// tool names that may contain single underscores.
-const ToolNameSep = "__"
-
-// connectTimeout bounds how long we wait for a single MCP server
-// to start its transport and complete initialization.
-const connectTimeout = 30 * time.Second
-
-// toolCallTimeout bounds how long a single tool invocation may
-// take before being canceled.
-const toolCallTimeout = 60 * time.Second
-
-var (
-	// ErrInvalidToolName is returned when the tool name format
-	// is not "server__tool".
-	ErrInvalidToolName = xerrors.New("invalid tool name format")
-	// ErrUnknownServer is returned when no MCP server matches
-	// the prefix in the tool name.
-	ErrUnknownServer = xerrors.New("unknown MCP server")
-)
-
-// Manager manages connections to MCP servers discovered from a
-// workspace's .mcp.json file. It caches the aggregated tool list
-// and proxies tool calls to the appropriate server.
-type Manager struct {
-	mu      sync.RWMutex
-	logger  slog.Logger
-	closed  bool
-	servers map[string]*serverEntry // keyed by server name
-	tools   []workspacesdk.MCPToolInfo
-}
-
-// serverEntry pairs a server config with its connected client.
-type serverEntry struct {
-	config ServerConfig
-	client *client.Client
-}
-
-// NewManager creates a new MCP client manager.
-func NewManager(logger slog.Logger) *Manager {
-	return &Manager{
-		logger:  logger,
-		servers: make(map[string]*serverEntry),
-	}
-}
-
-// Connect reads MCP config files at the given absolute paths and
-// connects to all configured servers. Failed servers are logged
-// and skipped. Missing config files are silently skipped.
-func (m *Manager) Connect(ctx context.Context, mcpConfigFiles []string) error {
-	var allConfigs []ServerConfig
-	for _, configPath := range mcpConfigFiles {
-		configs, err := ParseConfig(configPath)
-		if err != nil {
-			if errors.Is(err, fs.ErrNotExist) {
-				continue
-			}
-			m.logger.Warn(ctx, "failed to parse MCP config",
-				slog.F("path", configPath),
-				slog.Error(err),
-			)
-			continue
-		}
-		allConfigs = append(allConfigs, configs...)
-	}
-
-	// Deduplicate by server name; first occurrence wins.
-	seen := make(map[string]struct{})
-	deduped := make([]ServerConfig, 0, len(allConfigs))
-	for _, cfg := range allConfigs {
-		if _, ok := seen[cfg.Name]; ok {
-			continue
-		}
-		seen[cfg.Name] = struct{}{}
-		deduped = append(deduped, cfg)
-	}
-	allConfigs = deduped
-
-	if len(allConfigs) == 0 {
-		return nil
-	}
-
-	// Connect to servers in parallel without holding the
-	// lock, since each connectServer call may block on
-	// network I/O for up to connectTimeout.
-	type connectedServer struct {
-		name   string
-		config ServerConfig
-		client *client.Client
-	}
-	var (
-		mu        sync.Mutex
-		connected []connectedServer
-	)
-	var eg errgroup.Group
-	for _, cfg := range allConfigs {
-		eg.Go(func() error {
-			c, err := m.connectServer(ctx, cfg)
-			if err != nil {
-				m.logger.Warn(ctx, "skipping MCP server",
-					slog.F("server", cfg.Name),
-					slog.F("transport", cfg.Transport),
-					slog.Error(err),
-				)
-				return nil // Don't fail the group.
-			}
-			mu.Lock()
-			connected = append(connected, connectedServer{
-				name: cfg.Name, config: cfg, client: c,
-			})
-			mu.Unlock()
-			return nil
-		})
-	}
-	_ = eg.Wait()
-
-	m.mu.Lock()
-	if m.closed {
-		m.mu.Unlock()
-		// Close the freshly-connected clients since we're
-		// shutting down.
-		for _, cs := range connected {
-			_ = cs.client.Close()
-		}
-		return xerrors.New("manager closed")
-	}
-
-	// Close previous connections to avoid leaking child
-	// processes on agent reconnect.
-	for _, entry := range m.servers {
-		_ = entry.client.Close()
-	}
-	m.servers = make(map[string]*serverEntry, len(connected))
-
-	for _, cs := range connected {
-		m.servers[cs.name] = &serverEntry{
-			config: cs.config,
-			client: cs.client,
-		}
-	}
-	m.mu.Unlock()
-
-	// Refresh tools outside the lock to avoid blocking
-	// concurrent reads during network I/O.
-	if err := m.RefreshTools(ctx); err != nil {
-		m.logger.Warn(ctx, "failed to refresh MCP tools after connect", slog.Error(err))
-	}
-	return nil
-}
-
-// connectServer establishes a connection to a single MCP server
-// and returns the connected client. It does not modify any Manager
-// state.
-func (*Manager) connectServer(ctx context.Context, cfg ServerConfig) (*client.Client, error) {
-	tr, err := createTransport(cfg)
-	if err != nil {
-		return nil, xerrors.Errorf("create transport for %q: %w", cfg.Name, err)
-	}
-
-	c := client.NewClient(tr)
-
-	connectCtx, cancel := context.WithTimeout(ctx, connectTimeout)
-	defer cancel()
-
-	// Use the parent ctx (not connectCtx) so the subprocess outlives
-	// the connect/initialize handshake. connectCtx bounds only the
-	// Initialize call below. The subprocess is cleaned up when the
-	// Manager is closed or ctx is canceled.
-	if err := c.Start(ctx); err != nil {
-		_ = c.Close()
-		return nil, xerrors.Errorf("start %q: %w", cfg.Name, err)
-	}
-
-	_, err = c.Initialize(connectCtx, mcp.InitializeRequest{
-		Params: mcp.InitializeParams{
-			ProtocolVersion: mcp.LATEST_PROTOCOL_VERSION,
-			ClientInfo: mcp.Implementation{
-				Name:    "coder-agent",
-				Version: buildinfo.Version(),
-			},
-		},
-	})
-	if err != nil {
-		_ = c.Close()
-		return nil, xerrors.Errorf("initialize %q: %w", cfg.Name, err)
-	}
-
-	return c, nil
-}
-
-// createTransport builds the mcp-go transport for a server config.
-func createTransport(cfg ServerConfig) (transport.Interface, error) {
-	switch cfg.Transport {
-	case "stdio":
-		return transport.NewStdio(
-			cfg.Command,
-			buildEnv(cfg.Env),
-			cfg.Args...,
-		), nil
-	case "http", "":
-		return transport.NewStreamableHTTP(
-			cfg.URL,
-			transport.WithHTTPHeaders(cfg.Headers),
-		)
-	case "sse":
-		return transport.NewSSE(
-			cfg.URL,
-			transport.WithHeaders(cfg.Headers),
-		)
-	default:
-		return nil, xerrors.Errorf("unsupported transport %q", cfg.Transport)
-	}
-}
-
-// buildEnv merges the current process environment with explicit
-// overrides, returning the result as KEY=VALUE strings suitable
-// for the stdio transport.
-func buildEnv(explicit map[string]string) []string {
-	env := os.Environ()
-	if len(explicit) == 0 {
-		return env
-	}
-
-	// Index existing env so explicit keys can override in-place.
-	existing := make(map[string]int, len(env))
-	for i, kv := range env {
-		if k, _, ok := strings.Cut(kv, "="); ok {
-			existing[k] = i
-		}
-	}
-
-	for k, v := range explicit {
-		entry := k + "=" + v
-		if idx, ok := existing[k]; ok {
-			env[idx] = entry
-		} else {
-			env = append(env, entry)
-		}
-	}
-	return env
-}
-
-// Tools returns the cached tool list. Thread-safe.
-func (m *Manager) Tools() []workspacesdk.MCPToolInfo {
-	m.mu.RLock()
-	defer m.mu.RUnlock()
-
-	return slices.Clone(m.tools)
-}
-
-// CallTool proxies a tool call to the appropriate MCP server.
-func (m *Manager) CallTool(ctx context.Context, req workspacesdk.CallMCPToolRequest) (workspacesdk.CallMCPToolResponse, error) {
-	serverName, originalName, err := splitToolName(req.ToolName)
-	if err != nil {
-		return workspacesdk.CallMCPToolResponse{}, err
-	}
-
-	m.mu.RLock()
-	entry, ok := m.servers[serverName]
-	m.mu.RUnlock()
-
-	if !ok {
-		return workspacesdk.CallMCPToolResponse{}, xerrors.Errorf("%w: %q", ErrUnknownServer, serverName)
-	}
-
-	callCtx, cancel := context.WithTimeout(ctx, toolCallTimeout)
-	defer cancel()
-
-	result, err := entry.client.CallTool(callCtx, mcp.CallToolRequest{
-		Params: mcp.CallToolParams{
-			Name:      originalName,
-			Arguments: req.Arguments,
-		},
-	})
-	if err != nil {
-		return workspacesdk.CallMCPToolResponse{}, xerrors.Errorf("call tool %q on %q: %w", originalName, serverName, err)
-	}
-
-	return convertResult(result), nil
-}
-
-// splitToolName extracts the server name and original tool name
-// from a prefixed tool name like "server__tool".
-func splitToolName(prefixed string) (serverName, toolName string, err error) {
-	server, tool, ok := strings.Cut(prefixed, ToolNameSep)
-	if !ok || server == "" || tool == "" {
-		return "", "", xerrors.Errorf("%w: expected format \"server%stool\", got %q", ErrInvalidToolName, ToolNameSep, prefixed)
-	}
-	return server, tool, nil
-}
-
-// convertResult translates an MCP CallToolResult into a
-// workspacesdk.CallMCPToolResponse. It iterates over content
-// items and maps each recognized type.
-func convertResult(result *mcp.CallToolResult) workspacesdk.CallMCPToolResponse {
-	if result == nil {
-		return workspacesdk.CallMCPToolResponse{}
-	}
-
-	var content []workspacesdk.MCPToolContent
-	for _, item := range result.Content {
-		switch c := item.(type) {
-		case mcp.TextContent:
-			content = append(content, workspacesdk.MCPToolContent{
-				Type: "text",
-				Text: c.Text,
-			})
-		case mcp.ImageContent:
-			content = append(content, workspacesdk.MCPToolContent{
-				Type:      "image",
-				Data:      c.Data,
-				MediaType: c.MIMEType,
-			})
-		case mcp.AudioContent:
-			content = append(content, workspacesdk.MCPToolContent{
-				Type:      "audio",
-				Data:      c.Data,
-				MediaType: c.MIMEType,
-			})
-		case mcp.EmbeddedResource:
-			content = append(content, workspacesdk.MCPToolContent{
-				Type: "resource",
-				Text: fmt.Sprintf("[embedded resource: %T]", c.Resource),
-			})
-		case mcp.ResourceLink:
-			content = append(content, workspacesdk.MCPToolContent{
-				Type: "resource",
-				Text: fmt.Sprintf("[resource link: %s]", c.URI),
-			})
-		default:
-			content = append(content, workspacesdk.MCPToolContent{
-				Type: "text",
-				Text: fmt.Sprintf("[unsupported content type: %T]", item),
-			})
-		}
-	}
-
-	return workspacesdk.CallMCPToolResponse{
-		Content: content,
-		IsError: result.IsError,
-	}
-}
-
-// RefreshTools re-fetches tool lists from all connected servers
-// in parallel and rebuilds the cache. On partial failure, tools
-// from servers that responded successfully are merged with the
-// existing cached tools for servers that failed, so a single
-// dead server doesn't block updates from healthy ones.
-func (m *Manager) RefreshTools(ctx context.Context) error {
-	// Snapshot servers under read lock.
-	m.mu.RLock()
-	servers := make(map[string]*serverEntry, len(m.servers))
-	for k, v := range m.servers {
-		servers[k] = v
-	}
-	m.mu.RUnlock()
-
-	// Fetch tool lists in parallel without holding any lock.
-	type serverTools struct {
-		name  string
-		tools []workspacesdk.MCPToolInfo
-	}
-	var (
-		mu      sync.Mutex
-		results []serverTools
-		failed  []string
-		errs    []error
-	)
-	var eg errgroup.Group
-	for name, entry := range servers {
-		eg.Go(func() error {
-			listCtx, cancel := context.WithTimeout(ctx, connectTimeout)
-			result, err := entry.client.ListTools(listCtx, mcp.ListToolsRequest{})
-			cancel()
-			if err != nil {
-				m.logger.Warn(ctx, "failed to list tools from MCP server",
-					slog.F("server", name),
-					slog.Error(err),
-				)
-				mu.Lock()
-				errs = append(errs, xerrors.Errorf("list tools from %q: %w", name, err))
-				failed = append(failed, name)
-				mu.Unlock()
-				return nil
-			}
-			var tools []workspacesdk.MCPToolInfo
-			for _, tool := range result.Tools {
-				tools = append(tools, workspacesdk.MCPToolInfo{
-					ServerName:  name,
-					Name:        name + ToolNameSep + tool.Name,
-					Description: tool.Description,
-					Schema:      tool.InputSchema.Properties,
-					Required:    tool.InputSchema.Required,
-				})
-			}
-			mu.Lock()
-			results = append(results, serverTools{name: name, tools: tools})
-			mu.Unlock()
-			return nil
-		})
-	}
-	_ = eg.Wait()
-
-	// Build the new tool list. For servers that failed, preserve
-	// their tools from the existing cache so a single dead server
-	// doesn't remove healthy tools.
-	var merged []workspacesdk.MCPToolInfo
-	for _, st := range results {
-		merged = append(merged, st.tools...)
-	}
-	if len(failed) > 0 {
-		failedSet := make(map[string]struct{}, len(failed))
-		for _, f := range failed {
-			failedSet[f] = struct{}{}
-		}
-		m.mu.RLock()
-		for _, t := range m.tools {
-			if _, ok := failedSet[t.ServerName]; ok {
-				merged = append(merged, t)
-			}
-		}
-		m.mu.RUnlock()
-	}
-	slices.SortFunc(merged, func(a, b workspacesdk.MCPToolInfo) int {
-		return strings.Compare(a.Name, b.Name)
-	})
-
-	m.mu.Lock()
-	m.tools = merged
-	m.mu.Unlock()
-
-	return errors.Join(errs...)
-}
-
-// Close terminates all MCP server connections and child
-// processes.
-func (m *Manager) Close() error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	m.closed = true
-	var errs []error
-	for _, entry := range m.servers {
-		errs = append(errs, entry.client.Close())
-	}
-	m.servers = make(map[string]*serverEntry)
-	m.tools = nil
-	return errors.Join(errs...)
-}

agent/x/agentmcp/manager_internal_test.go

@@ -1,316 +0,0 @@
-package agentmcp
-
-import (
-	"bufio"
-	"context"
-	"encoding/json"
-	"fmt"
-	"os"
-	"testing"
-
-	"github.com/mark3labs/mcp-go/mcp"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/coder/coder/v2/codersdk/workspacesdk"
-	"github.com/coder/coder/v2/testutil"
-)
-
-func TestSplitToolName(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		name       string
-		input      string
-		wantServer string
-		wantTool   string
-		wantErr    bool
-	}{
-		{
-			name:       "Valid",
-			input:      "server__tool",
-			wantServer: "server",
-			wantTool:   "tool",
-		},
-		{
-			name:       "ValidWithUnderscoresInTool",
-			input:      "server__my_tool",
-			wantServer: "server",
-			wantTool:   "my_tool",
-		},
-		{
-			name:    "MissingSeparator",
-			input:   "servertool",
-			wantErr: true,
-		},
-		{
-			name:    "EmptyServer",
-			input:   "__tool",
-			wantErr: true,
-		},
-		{
-			name:    "EmptyTool",
-			input:   "server__",
-			wantErr: true,
-		},
-		{
-			name:    "JustSeparator",
-			input:   "__",
-			wantErr: true,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-
-			server, tool, err := splitToolName(tt.input)
-			if tt.wantErr {
-				require.Error(t, err)
-				assert.ErrorIs(t, err, ErrInvalidToolName)
-				return
-			}
-			require.NoError(t, err)
-			assert.Equal(t, tt.wantServer, server)
-			assert.Equal(t, tt.wantTool, tool)
-		})
-	}
-}
-
-func TestConvertResult(t *testing.T) {
-	t.Parallel()
-
-	tests := []struct {
-		name string
-		// input is a pointer so we can test nil.
-		input *mcp.CallToolResult
-		want  workspacesdk.CallMCPToolResponse
-	}{
-		{
-			name:  "NilInput",
-			input: nil,
-			want:  workspacesdk.CallMCPToolResponse{},
-		},
-		{
-			name: "TextContent",
-			input: &mcp.CallToolResult{
-				Content: []mcp.Content{
-					mcp.TextContent{Type: "text", Text: "hello"},
-				},
-			},
-			want: workspacesdk.CallMCPToolResponse{
-				Content: []workspacesdk.MCPToolContent{
-					{Type: "text", Text: "hello"},
-				},
-			},
-		},
-		{
-			name: "ImageContent",
-			input: &mcp.CallToolResult{
-				Content: []mcp.Content{
-					mcp.ImageContent{
-						Type:     "image",
-						Data:     "base64data",
-						MIMEType: "image/png",
-					},
-				},
-			},
-			want: workspacesdk.CallMCPToolResponse{
-				Content: []workspacesdk.MCPToolContent{
-					{Type: "image", Data: "base64data", MediaType: "image/png"},
-				},
-			},
-		},
-		{
-			name: "AudioContent",
-			input: &mcp.CallToolResult{
-				Content: []mcp.Content{
-					mcp.AudioContent{
-						Type:     "audio",
-						Data:     "base64audio",
-						MIMEType: "audio/mp3",
-					},
-				},
-			},
-			want: workspacesdk.CallMCPToolResponse{
-				Content: []workspacesdk.MCPToolContent{
-					{Type: "audio", Data: "base64audio", MediaType: "audio/mp3"},
-				},
-			},
-		},
-		{
-			name: "IsErrorPropagation",
-			input: &mcp.CallToolResult{
-				Content: []mcp.Content{
-					mcp.TextContent{Type: "text", Text: "fail"},
-				},
-				IsError: true,
-			},
-			want: workspacesdk.CallMCPToolResponse{
-				Content: []workspacesdk.MCPToolContent{
-					{Type: "text", Text: "fail"},
-				},
-				IsError: true,
-			},
-		},
-		{
-			name: "MultipleContentItems",
-			input: &mcp.CallToolResult{
-				Content: []mcp.Content{
-					mcp.TextContent{Type: "text", Text: "caption"},
-					mcp.ImageContent{
-						Type:     "image",
-						Data:     "imgdata",
-						MIMEType: "image/jpeg",
-					},
-				},
-			},
-			want: workspacesdk.CallMCPToolResponse{
-				Content: []workspacesdk.MCPToolContent{
-					{Type: "text", Text: "caption"},
-					{Type: "image", Data: "imgdata", MediaType: "image/jpeg"},
-				},
-			},
-		},
-		{
-			name: "ResourceLink",
-			input: &mcp.CallToolResult{
-				Content: []mcp.Content{
-					mcp.ResourceLink{
-						Type: "resource_link",
-						URI:  "file:///tmp/test.txt",
-					},
-				},
-			},
-			want: workspacesdk.CallMCPToolResponse{
-				Content: []workspacesdk.MCPToolContent{
-					{Type: "resource", Text: "[resource link: file:///tmp/test.txt]"},
-				},
-			},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-
-			got := convertResult(tt.input)
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
-
-// TestConnectServer_StdioProcessSurvivesConnect verifies that a stdio MCP
-// server subprocess remains alive after connectServer returns. This is a
-// regression test for a bug where the subprocess was tied to a short-lived
-// connectCtx and killed as soon as the context was canceled.
-func TestConnectServer_StdioProcessSurvivesConnect(t *testing.T) {
-	t.Parallel()
-
-	if os.Getenv("TEST_MCP_FAKE_SERVER") == "1" {
-		// Child process: act as a minimal MCP server over stdio.
-		runFakeMCPServer()
-		return
-	}
-
-	// Get the path to the test binary so we can re-exec ourselves
-	// as a fake MCP server subprocess.
-	testBin, err := os.Executable()
-	require.NoError(t, err)
-
-	cfg := ServerConfig{
-		Name:      "fake",
-		Transport: "stdio",
-		Command:   testBin,
-		Args:      []string{"-test.run=^TestConnectServer_StdioProcessSurvivesConnect$"},
-		Env:       map[string]string{"TEST_MCP_FAKE_SERVER": "1"},
-	}
-
-	ctx := testutil.Context(t, testutil.WaitLong)
-	m := &Manager{}
-	client, err := m.connectServer(ctx, cfg)
-	require.NoError(t, err, "connectServer should succeed")
-	t.Cleanup(func() { _ = client.Close() })
-
-	// At this point connectServer has returned and its internal
-	// connectCtx has been canceled. The subprocess must still be
-	// alive. Verify by listing tools (requires a live server).
-	listCtx, listCancel := context.WithTimeout(ctx, testutil.WaitShort)
-	defer listCancel()
-	result, err := client.ListTools(listCtx, mcp.ListToolsRequest{})
-	require.NoError(t, err, "ListTools should succeed — server must be alive after connect")
-	require.Len(t, result.Tools, 1)
-	assert.Equal(t, "echo", result.Tools[0].Name)
-}
-
-// runFakeMCPServer implements a minimal JSON-RPC / MCP server over
-// stdin/stdout, just enough for initialize + tools/list.
-func runFakeMCPServer() {
-	scanner := bufio.NewScanner(os.Stdin)
-	for scanner.Scan() {
-		line := scanner.Bytes()
-
-		var req struct {
-			JSONRPC string          `json:"jsonrpc"`
-			ID      json.RawMessage `json:"id"`
-			Method  string          `json:"method"`
-		}
-		if err := json.Unmarshal(line, &req); err != nil {
-			continue
-		}
-
-		var resp any
-		switch req.Method {
-		case "initialize":
-			resp = map[string]any{
-				"jsonrpc": "2.0",
-				"id":      req.ID,
-				"result": map[string]any{
-					"protocolVersion": "2025-03-26",
-					"capabilities": map[string]any{
-						"tools": map[string]any{},
-					},
-					"serverInfo": map[string]any{
-						"name":    "fake-server",
-						"version": "0.0.1",
-					},
-				},
-			}
-		case "notifications/initialized":
-			// No response needed for notifications.
-			continue
-		case "tools/list":
-			resp = map[string]any{
-				"jsonrpc": "2.0",
-				"id":      req.ID,
-				"result": map[string]any{
-					"tools": []map[string]any{
-						{
-							"name":        "echo",
-							"description": "echoes input",
-							"inputSchema": map[string]any{
-								"type":       "object",
-								"properties": map[string]any{},
-							},
-						},
-					},
-				},
-			}
-		default:
-			resp = map[string]any{
-				"jsonrpc": "2.0",
-				"id":      req.ID,
-				"error": map[string]any{
-					"code":    -32601,
-					"message": "method not found",
-				},
-			}
-		}
-
-		out, err := json.Marshal(resp)
-		if err != nil {
-			continue
-		}
-		_, _ = fmt.Fprintf(os.Stdout, "%s\n", out)
-	}
-}

biome.jsonc

@@ -3,13 +3,11 @@
 		"enabled": true,
 		"clientKind": "git",
 		"useIgnoreFile": true,
-		"defaultBranch": "main"
+		"defaultBranch": "main",
 	},
 	"files": {
-		// static/*.html are Go templates with {{ }} directives that
-		// Biome's HTML parser does not support.
-		"includes": ["**", "!**/pnpm-lock.yaml", "!**/static/*.html"],
-		"ignoreUnknown": true
+		"includes": ["**", "!**/pnpm-lock.yaml"],
+		"ignoreUnknown": true,
 	},
 	"linter": {
 		"rules": {
@@ -17,7 +15,7 @@
 				"noSvgWithoutTitle": "off",
 				"useButtonType": "off",
 				"useSemanticElements": "off",
-				"noStaticElementInteractions": "off"
+				"noStaticElementInteractions": "off",
 			},
 			"correctness": {
 				"noUnusedImports": "warn",
@@ -26,9 +24,9 @@
 				"noUnusedVariables": {
 					"level": "warn",
 					"options": {
-						"ignoreRestSiblings": true
-					}
-				}
+						"ignoreRestSiblings": true,
+					},
+				},
 			},
 			"style": {
 				"noNonNullAssertion": "off",
@@ -49,7 +47,7 @@
 						"paths": {
 							"react": {
 								"message": "React 19 no longer requires forwardRef. Use ref as a prop instead.",
-								"importNames": ["forwardRef"]
+								"importNames": ["forwardRef"],
 							},
 							// "@mui/material/Alert": "Use components/Alert/Alert instead.",
 							// "@mui/material/AlertTitle": "Use components/Alert/Alert instead.",
@@ -117,10 +115,10 @@
 							"@emotion/styled": "Use Tailwind CSS instead.",
 							// "@emotion/cache": "Use Tailwind CSS instead.",
 							// "components/Stack/Stack": "Use Tailwind flex utilities instead (e.g., <div className='flex flex-col gap-4'>).",
-							"lodash": "Use lodash/<name> instead."
-						}
-					}
-				}
+							"lodash": "Use lodash/<name> instead.",
+						},
+					},
+				},
 			},
 			"suspicious": {
 				"noArrayIndexKey": "off",
@@ -131,21 +129,14 @@
 				"noConsole": {
 					"level": "error",
 					"options": {
-						"allow": ["error", "info", "warn"]
-					}
-				}
+						"allow": ["error", "info", "warn"],
+					},
+				},
 			},
 			"complexity": {
-				"noImportantStyles": "off" // TODO: check and fix !important styles
-			}
-		}
+				"noImportantStyles": "off", // TODO: check and fix !important styles
+			},
+		},
 	},
-	"css": {
-		"parser": {
-			// Biome 2.3+ requires opt-in for @apply and other
-			// Tailwind directives.
-			"tailwindDirectives": true
-		}
-	},
-	"$schema": "./node_modules/@biomejs/biome/configuration_schema.json"
+	"$schema": "./node_modules/@biomejs/biome/configuration_schema.json",
 }

cli/agent.go

@@ -17,7 +17,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/google/uuid"
 	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/xerrors"
 	"gopkg.in/natefinch/lumberjack.v2"
@@ -273,14 +272,11 @@ func workspaceAgent() *serpent.Command {
 				logger.Info(ctx, "agent devcontainer detection not enabled")
 			}
 
-			reinitCtx, reinitCancel := context.WithCancel(ctx)
-			defer reinitCancel()
-			reinitEvents := agentsdk.WaitForReinitLoop(reinitCtx, logger, client)
+			reinitEvents := agentsdk.WaitForReinitLoop(ctx, logger, client)
 
 			var (
-				lastOwnerID uuid.UUID
-				lastErr     error
-				mustExit    bool
+				lastErr  error
+				mustExit bool
 			)
 			for {
 				prometheusRegistry := prometheus.NewRegistry()
@@ -347,32 +343,9 @@ func workspaceAgent() *serpent.Command {
 				case <-ctx.Done():
 					logger.Info(ctx, "agent shutting down", slog.Error(context.Cause(ctx)))
 					mustExit = true
-				case event, ok := <-reinitEvents:
-					switch {
-					case !ok:
-						// Channel closed — the reinit loop exited
-						// (terminal 409 or context expired). Keep
-						// running the current agent until the parent
-						// context is canceled.
-						logger.Info(ctx, "reinit channel closed, running without reinit capability")
-						reinitEvents = nil
-						<-ctx.Done()
-						mustExit = true
-					case event.OwnerID != uuid.Nil && event.OwnerID == lastOwnerID:
-						// Duplicate reinit for same owner — already
-						// reinitialized. Cancel the reinit loop
-						// goroutine and keep the current agent.
-						logger.Info(ctx, "skipping redundant reinit, owner unchanged",
-							slog.F("owner_id", event.OwnerID))
-						reinitCancel()
-						reinitEvents = nil
-						<-ctx.Done()
-						mustExit = true
-					default:
-						lastOwnerID = event.OwnerID
-						logger.Info(ctx, "agent received instruction to reinitialize",
-							slog.F("workspace_id", event.WorkspaceID), slog.F("reason", event.Reason))
-					}
+				case event := <-reinitEvents:
+					logger.Info(ctx, "agent received instruction to reinitialize",
+						slog.F("workspace_id", event.WorkspaceID), slog.F("reason", event.Reason))
 				}
 
 				lastErr = agnt.Close()

cli/agent_test.go

@@ -1,6 +1,7 @@
 package cli_test
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"os"
@@ -51,13 +52,14 @@ func TestWorkspaceAgent(t *testing.T) {
 
 		coderdtest.AwaitWorkspaceAgents(t, client, r.Workspace.ID)
 
-		require.Eventually(t, func() bool {
+		ctx := testutil.Context(t, testutil.WaitLong)
+		testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 			info, err := os.Stat(filepath.Join(logDir, "coder-agent.log"))
 			if err != nil {
 				return false
 			}
 			return info.Size() > 0
-		}, testutil.WaitLong, testutil.IntervalMedium)
+		}, testutil.IntervalMedium)
 	})
 
 	t.Run("PostStartup", func(t *testing.T) {
@@ -216,7 +218,7 @@ func TestWorkspaceAgent(t *testing.T) {
 
 		// Verify the servers are not listening by checking the log for disabled
 		// messages.
-		require.Eventually(t, func() bool {
+		testutil.Eventually(testutil.Context(t, testutil.WaitShort), t, func(ctx context.Context) bool {
 			logContent, err := os.ReadFile(filepath.Join(logDir, "coder-agent.log"))
 			if err != nil {
 				return false
@@ -225,7 +227,7 @@ func TestWorkspaceAgent(t *testing.T) {
 			return strings.Contains(logStr, "pprof address is empty, disabling pprof server") &&
 				strings.Contains(logStr, "prometheus address is empty, disabling prometheus server") &&
 				strings.Contains(logStr, "debug address is empty, disabling debug server")
-		}, testutil.WaitLong, testutil.IntervalMedium)
+		}, testutil.IntervalMedium)
 	})
 }
 

cli/clilog/clilog.go

@@ -104,7 +104,7 @@ func (b *Builder) Build(inv *serpent.Invocation) (log slog.Logger, closeLog func
 
 	addSinkIfProvided := func(sinkFn func(io.Writer) slog.Sink, loc string) error {
 		switch loc {
-		case "", "/dev/null":
+		case "":
 		case "/dev/stdout":
 			sinks = append(sinks, sinkFn(inv.Stdout))
 

cli/clitest/clitest.go

@@ -173,10 +173,7 @@ func Start(t *testing.T, inv *serpent.Invocation) {
 	StartWithAssert(t, inv, nil)
 }
 
-// StartWithAssert starts the given invocation and calls assertCallback
-// with the resulting error when the invocation completes. If assertCallback
-// is nil, expected shutdown errors are silently tolerated.
-func StartWithAssert(t *testing.T, inv *serpent.Invocation, assertCallback func(t *testing.T, err error)) {
+func StartWithAssert(t *testing.T, inv *serpent.Invocation, assertCallback func(t *testing.T, err error)) { //nolint:revive
 	t.Helper()
 
 	closeCh := make(chan struct{})

cli/cliui/select.go

@@ -173,6 +173,7 @@ func (selectModel) Init() tea.Cmd {
 	return nil
 }
 
+//nolint:revive // The linter complains about modifying 'm' but this is typical practice for bubbletea
 func (m selectModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var cmd tea.Cmd
 
@@ -462,6 +463,7 @@ func (multiSelectModel) Init() tea.Cmd {
 	return nil
 }
 
+//nolint:revive // For same reason as previous Update definition
 func (m multiSelectModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var cmd tea.Cmd
 

cli/exp_rpty_test.go

@@ -1,6 +1,7 @@
 package cli_test
 
 import (
+	"context"
 	"runtime"
 	"testing"
 
@@ -104,10 +105,10 @@ func TestExpRpty(t *testing.T) {
 		})
 		require.NoError(t, err, "Could not start container")
 		// Wait for container to start
-		require.Eventually(t, func() bool {
+		testutil.Eventually(testutil.Context(t, testutil.WaitShort), t, func(ctx context.Context) bool {
 			ct, ok := pool.ContainerByName(ct.Container.Name)
 			return ok && ct.Container.State.Running
-		}, testutil.WaitShort, testutil.IntervalSlow, "Container did not start in time")
+		}, testutil.IntervalSlow, "Container did not start in time")
 		t.Cleanup(func() {
 			err := pool.Purge(ct)
 			require.NoError(t, err, "Could not stop container")

cli/exp_scaletest.go

@@ -1401,9 +1401,6 @@ func (r *RootCmd) scaletestWorkspaceTraffic() *serpent.Command {
 				// Setup our workspace agent connection.
 				config := workspacetraffic.Config{
 					AgentID:       agent.ID,
-					WorkspaceID:   ws.ID,
-					WorkspaceName: ws.Name,
-					AgentName:     agent.Name,
 					BytesPerTick:  bytesPerTick,
 					Duration:      strategy.timeout,
 					TickInterval:  tickInterval,

cli/resetpassword_test.go

@@ -49,10 +49,11 @@ func TestResetPassword(t *testing.T) {
 		assert.NoError(t, err)
 	}()
 	var rawURL string
-	require.Eventually(t, func() bool {
+	tCtx := testutil.Context(t, testutil.WaitLong)
+	testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 		rawURL, err = cfg.URL().Read()
 		return err == nil && rawURL != ""
-	}, testutil.WaitLong, testutil.IntervalFast)
+	}, testutil.IntervalFast)
 	accessURL, err := url.Parse(rawURL)
 	require.NoError(t, err)
 	client := codersdk.New(accessURL)

cli/root.go

@@ -1414,6 +1414,7 @@ func tailLineStyle() pretty.Style {
 	return pretty.Style{pretty.Nop}
 }
 
+//nolint:unused
 func SlimUnsupported(w io.Writer, cmd string) {
 	_, _ = fmt.Fprintf(w, "You are using a 'slim' build of Coder, which does not support the %s subcommand.\n", pretty.Sprint(cliui.DefaultStyles.Code, cmd))
 	_, _ = fmt.Fprintln(w, "")

cli/schedule_test.go

@@ -352,6 +352,8 @@ func TestScheduleOverride(t *testing.T) {
 			require.NoError(t, err, "invalid schedule")
 			ownerClient, _, _, ws := setupTestSchedule(t, sched)
 			now := time.Now()
+			// To avoid the likelihood of time-related flakes, only matching up to the hour.
+			expectedDeadline := now.In(loc).Add(10 * time.Hour).Format("2006-01-02T15:")
 
 			// When: we override the stop schedule
 			inv, root := clitest.New(t,
@@ -362,19 +364,6 @@ func TestScheduleOverride(t *testing.T) {
 			pty := ptytest.New(t).Attach(inv)
 			require.NoError(t, inv.Run())
 
-			// Fetch the workspace to get the actual deadline set by the
-			// server. Computing our own expected deadline from a separately
-			// captured time.Now() is racy: the CLI command calls time.Now()
-			// internally, and with the Asia/Kolkata +05:30 offset the hour
-			// boundary falls at :30 UTC minutes. A small delay between our
-			// time.Now() and the command's is enough to land in different
-			// hours.
-			updated, err := ownerClient.Workspace(context.Background(), ws[0].ID)
-			require.NoError(t, err)
-			require.False(t, updated.LatestBuild.Deadline.IsZero(), "deadline should be set after extend")
-			require.WithinDuration(t, now.Add(10*time.Hour), updated.LatestBuild.Deadline.Time, 5*time.Minute)
-			expectedDeadline := updated.LatestBuild.Deadline.Time.In(loc).Format(time.RFC3339)
-
 			// Then: the updated schedule should be shown
 			pty.ExpectMatch(ws[0].OwnerName + "/" + ws[0].Name)
 			pty.ExpectMatch(sched.Humanize())

cli/server.go

@@ -305,6 +305,7 @@ func enablePrometheus(
 	}
 	options.ProvisionerdServerMetrics = provisionerdserverMetrics
 
+	//nolint:revive
 	return ServeHandler(
 		ctx, logger, promhttp.InstrumentMetricHandler(
 			options.PrometheusRegistry, promhttp.HandlerFor(options.PrometheusRegistry, promhttp.HandlerOpts{}),
@@ -1636,6 +1637,8 @@ var defaultCipherSuites = func() []uint16 {
 // configureServerTLS returns the TLS config used for the Coderd server
 // connections to clients. A logger is passed in to allow printing warning
 // messages that do not block startup.
+//
+//nolint:revive
 func configureServerTLS(ctx context.Context, logger slog.Logger, tlsMinVersion, tlsClientAuth string, tlsCertFiles, tlsKeyFiles []string, tlsClientCAFile string, ciphers []string, allowInsecureCiphers bool) (*tls.Config, error) {
 	tlsConfig := &tls.Config{
 		MinVersion: tls.VersionTLS12,
@@ -2052,6 +2055,7 @@ func getGithubOAuth2ConfigParams(ctx context.Context, db database.Store, vals *c
 	return &params, nil
 }
 
+//nolint:revive // Ignore flag-parameter: parameter 'allowEveryone' seems to be a control flag, avoid control coupling (revive)
 func configureGithubOAuth2(instrument *promoauth.Factory, params *githubOAuth2ConfigParams) (*coderd.GithubOAuth2Config, error) {
 	redirectURL, err := params.accessURL.Parse("/api/v2/users/oauth2/github/callback")
 	if err != nil {
@@ -2327,8 +2331,7 @@ func ConfigureHTTPClient(ctx context.Context, clientCertFile, clientKeyFile stri
 			return ctx, nil, err
 		}
 
-		tlsClientConfig := &tls.Config{
-			MinVersion:   tls.VersionTLS12,
+		tlsClientConfig := &tls.Config{ //nolint:gosec
 			Certificates: certificates,
 			NextProtos:   []string{"h2", "http/1.1"},
 		}

cli/server_test.go

@@ -212,10 +212,10 @@ func TestServer(t *testing.T) {
 		clitest.Start(t, inv.WithContext(ctx))
 
 		//nolint:gocritic // Embedded postgres take a while to fire up.
-		require.Eventually(t, func() bool {
+		testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 			rawURL, err := cfg.URL().Read()
 			return err == nil && rawURL != ""
-		}, superDuperLong, testutil.IntervalFast, "failed to get access URL")
+		}, testutil.IntervalFast, "failed to get access URL")
 	})
 	t.Run("EphemeralDeployment", func(t *testing.T) {
 		t.Parallel()
@@ -1229,7 +1229,8 @@ func TestServer(t *testing.T) {
 		require.NoError(t, err)
 		require.NoError(t, body.Body.Close())
 
-		require.Eventually(t, func() bool {
+		tCtx := testutil.Context(t, testutil.WaitLong)
+		testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 			snap := <-snapshot
 			htmlFirstServedFound := false
 			for _, item := range snap.TelemetryItems {
@@ -1238,7 +1239,7 @@ func TestServer(t *testing.T) {
 				}
 			}
 			return htmlFirstServedFound
-		}, testutil.WaitLong, testutil.IntervalSlow, "no html_first_served telemetry item")
+		}, testutil.IntervalSlow, "no html_first_served telemetry item")
 	})
 	t.Run("Prometheus", func(t *testing.T) {
 		t.Parallel()
@@ -2074,7 +2075,8 @@ func TestServer_Logging_NoParallel(t *testing.T) {
 
 func loggingWaitFile(t *testing.T, fiName string, dur time.Duration) {
 	var lastStat os.FileInfo
-	require.Eventually(t, func() bool {
+	tCtx := testutil.Context(t, dur)
+	testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 		var err error
 		lastStat, err = os.Stat(fiName)
 		if err != nil {
@@ -2084,12 +2086,7 @@ func loggingWaitFile(t *testing.T, fiName string, dur time.Duration) {
 			return false
 		}
 		return lastStat.Size() > 0
-	},
-		dur, //nolint:gocritic
-		testutil.IntervalFast,
-		"file at %s should exist, last stat: %+v",
-		fiName, lastStat,
-	)
+	}, testutil.IntervalFast, "file at %s should exist, last stat: %+v", fiName, lastStat)
 }
 
 func TestServer_Production(t *testing.T) {
@@ -2123,6 +2120,7 @@ func TestServer_TelemetryDisable(t *testing.T) {
 	// Set the default telemetry to true (normally disabled in tests).
 	t.Setenv("CODER_TEST_TELEMETRY_DEFAULT_ENABLE", "true")
 
+	//nolint:paralleltest // No need to reinitialise the variable tt (Go version).
 	for _, tt := range []struct {
 		key  string
 		val  string
@@ -2285,10 +2283,11 @@ func waitAccessURL(t *testing.T, cfg config.Root) *url.URL {
 
 	var err error
 	var rawURL string
-	require.Eventually(t, func() bool {
+	tCtx := testutil.Context(t, testutil.WaitLong)
+	testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 		rawURL, err = cfg.URL().Read()
 		return err == nil && rawURL != ""
-	}, testutil.WaitLong, testutil.IntervalFast, "failed to get access URL")
+	}, testutil.IntervalFast, "failed to get access URL")
 
 	accessURL, err := url.Parse(rawURL)
 	require.NoError(t, err, "failed to parse access URL")

cli/speedtest_test.go

@@ -31,7 +31,7 @@ func TestSpeedtest(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 	defer cancel()
 
-	require.Eventually(t, func() bool {
+	testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 		ws, err := client.Workspace(ctx, workspace.ID)
 		if !assert.NoError(t, err) {
 			return false
@@ -39,7 +39,7 @@ func TestSpeedtest(t *testing.T) {
 		a := ws.LatestBuild.Resources[0].Agents[0]
 		return a.Status == codersdk.WorkspaceAgentConnected &&
 			a.LifecycleState == codersdk.WorkspaceAgentLifecycleReady
-	}, testutil.WaitLong, testutil.IntervalFast, "agent is not ready")
+	}, testutil.IntervalFast, "agent is not ready")
 
 	inv, root := clitest.New(t, "speedtest", workspace.Name)
 	clitest.SetupConfig(t, client, root)
@@ -71,7 +71,7 @@ func TestSpeedtestJson(t *testing.T) {
 	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
 	defer cancel()
 
-	require.Eventually(t, func() bool {
+	testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 		ws, err := client.Workspace(ctx, workspace.ID)
 		if !assert.NoError(t, err) {
 			return false
@@ -79,7 +79,7 @@ func TestSpeedtestJson(t *testing.T) {
 		a := ws.LatestBuild.Resources[0].Agents[0]
 		return a.Status == codersdk.WorkspaceAgentConnected &&
 			a.LifecycleState == codersdk.WorkspaceAgentLifecycleReady
-	}, testutil.WaitLong, testutil.IntervalFast, "agent is not ready")
+	}, testutil.IntervalFast, "agent is not ready")
 
 	inv, root := clitest.New(t, "speedtest", "--output=json", workspace.Name)
 	clitest.SetupConfig(t, client, root)

cli/ssh_internal_test.go

@@ -121,11 +121,14 @@ func TestCloserStack_Context(t *testing.T) {
 	err = uut.push("fc1", fc1)
 	require.NoError(t, err)
 	cancel()
-	require.Eventually(t, func() bool {
+	// Use a fresh context for Eventually since we just canceled
+	// ctx above to trigger the closer stack's context handler.
+	waitCtx := testutil.Context(t, testutil.WaitShort)
+	testutil.Eventually(waitCtx, t, func(_ context.Context) bool {
 		uut.Lock()
 		defer uut.Unlock()
 		return uut.closed
-	}, testutil.WaitShort, testutil.IntervalFast)
+	}, testutil.IntervalFast)
 }
 
 func TestCloserStack_PushAfterClose(t *testing.T) {

cli/ssh_test.go

@@ -180,11 +180,12 @@ func TestSSH(t *testing.T) {
 
 		// Delay until workspace is starting, otherwise the agent may be
 		// booted due to outdated build.
-		require.Eventually(t, func() bool {
+		tCtx := testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 			var err error
 			workspace, err = client.Workspace(ctx, workspace.ID)
 			return err == nil && workspace.LatestBuild.Transition == codersdk.WorkspaceTransitionStart
-		}, testutil.WaitShort, testutil.IntervalFast)
+		}, testutil.IntervalFast)
 
 		// When the agent connects, the workspace was started, and we should
 		// have access to the shell.
@@ -630,13 +631,13 @@ func TestSSH(t *testing.T) {
 		require.NoError(t, err)
 		_ = clientOutput.Close()
 
-		assert.Eventually(t, func() bool {
+		testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 			entries, err := afero.ReadDir(fs, "/net")
 			if err != nil {
 				return false
 			}
 			return len(entries) > 0
-		}, testutil.WaitLong, testutil.IntervalFast)
+		}, testutil.IntervalFast)
 
 		<-cmdDone
 	})
@@ -759,11 +760,12 @@ func TestSSH(t *testing.T) {
 
 		// Delay until workspace is starting, otherwise the agent may be
 		// booted due to outdated build.
-		require.Eventually(t, func() bool {
+		tCtx := testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 			var err error
 			workspace, err = client.Workspace(ctx, workspace.ID)
 			return err == nil && workspace.LatestBuild.Transition == codersdk.WorkspaceTransitionStart
-		}, testutil.WaitShort, testutil.IntervalFast)
+		}, testutil.IntervalFast)
 
 		// When the agent connects, the workspace was started, and we should
 		// have access to the shell.
@@ -852,10 +854,11 @@ func TestSSH(t *testing.T) {
 		fsn.Notify()
 		<-cmdDone
 		fsn.AssertStopped()
-		require.Eventually(t, func() bool {
+		tCtx := testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 			_, err = os.Stat(remoteSock)
 			return xerrors.Is(err, os.ErrNotExist)
-		}, testutil.WaitShort, testutil.IntervalFast)
+		}, testutil.IntervalFast)
 	})
 
 	t.Run("Stdio_BrokenConn", func(t *testing.T) {
@@ -1025,10 +1028,11 @@ func TestSSH(t *testing.T) {
 				// wait for the remote socket to get cleaned up before retrying,
 				// because cleaning up the socket happens asynchronously, and we
 				// might connect to an old listener on the agent side.
-				require.Eventually(t, func() bool {
+				tCtx := testutil.Context(t, testutil.WaitShort)
+				testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 					_, err = os.Stat(remoteSock)
 					return xerrors.Is(err, os.ErrNotExist)
-				}, testutil.WaitShort, testutil.IntervalFast)
+				}, testutil.IntervalFast)
 			}()
 		}
 	})
@@ -1228,7 +1232,7 @@ func TestSSH(t *testing.T) {
 			assert.Error(t, err, "ssh command should fail")
 		})
 
-		require.Eventually(t, func() bool {
+		testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 			req, err := http.NewRequestWithContext(ctx, http.MethodGet, "http://localhost:8222/", nil)
 			if !assert.NoError(t, err) {
 				// true exits the loop.
@@ -1245,7 +1249,7 @@ func TestSSH(t *testing.T) {
 			assert.NoError(t, err)
 			assert.EqualValues(t, "hello world", body)
 			return true
-		}, testutil.WaitLong, testutil.IntervalFast)
+		}, testutil.IntervalFast)
 
 		// And we're done.
 		cancel()
@@ -2056,10 +2060,11 @@ func TestSSH_Container(t *testing.T) {
 		})
 		require.NoError(t, err, "Could not start container")
 		// Wait for container to start
-		require.Eventually(t, func() bool {
+		tCtx := testutil.Context(t, testutil.WaitShort)
+		testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 			ct, ok := pool.ContainerByName(ct.Container.Name)
 			return ok && ct.Container.State.Running
-		}, testutil.WaitShort, testutil.IntervalSlow, "Container did not start in time")
+		}, testutil.IntervalSlow, "Container did not start in time")
 		t.Cleanup(func() {
 			err := pool.Purge(ct)
 			require.NoError(t, err, "Could not stop container")

cli/sync_test.go

@@ -165,37 +165,6 @@ func TestSyncCommands_Golden(t *testing.T) {
 		clitest.TestGoldenFile(t, "TestSyncCommands_Golden/want_success", outBuf.Bytes(), nil)
 	})
 
-	t.Run("want_multiple_deps", func(t *testing.T) {
-		t.Parallel()
-		path, cleanup := setupSocketServer(t)
-		defer cleanup()
-
-		ctx := testutil.Context(t, testutil.WaitShort)
-
-		var outBuf bytes.Buffer
-		inv, _ := clitest.New(t, "exp", "sync", "want", "test-unit", "dep-1", "dep-2", "dep-3", "--socket-path", path)
-		inv.Stdout = &outBuf
-		inv.Stderr = &outBuf
-
-		err := inv.WithContext(ctx).Run()
-		require.NoError(t, err)
-
-		// Verify all dependencies were registered by checking status.
-		outBuf.Reset()
-		inv, _ = clitest.New(t, "exp", "sync", "status", "test-unit", "--socket-path", path, "--output", "json")
-		inv.Stdout = &outBuf
-		inv.Stderr = &outBuf
-
-		err = inv.WithContext(ctx).Run()
-		require.NoError(t, err)
-
-		// The output should mention all three dependencies.
-		output := outBuf.String()
-		require.Contains(t, output, "dep-1")
-		require.Contains(t, output, "dep-2")
-		require.Contains(t, output, "dep-3")
-	})
-
 	t.Run("complete", func(t *testing.T) {
 		t.Parallel()
 		path, cleanup := setupSocketServer(t)

cli/sync_want.go

@@ -11,16 +11,17 @@ import (
 
 func (*RootCmd) syncWant(socketPath *string) *serpent.Command {
 	cmd := &serpent.Command{
-		Use:   "want <unit> <depends-on> [depends-on...]",
-		Short: "Declare that a unit depends on other units completing before it can start",
-		Long:  "Declare that a unit depends on one or more other units completing before it can start. The unit specified first will not start until all subsequent units have signaled that they have completed.",
+		Use:   "want <unit> <depends-on>",
+		Short: "Declare that a unit depends on another unit completing before it can start",
+		Long:  "Declare that a unit depends on another unit completing before it can start. The unit specified first will not start until the second has signaled that it has completed.",
 		Handler: func(i *serpent.Invocation) error {
 			ctx := i.Context()
 
-			if len(i.Args) < 2 {
-				return xerrors.New("at least two arguments are required: unit and one or more depends-on")
+			if len(i.Args) != 2 {
+				return xerrors.New("exactly two arguments are required: unit and depends-on")
 			}
 			dependentUnit := unit.ID(i.Args[0])
+			dependsOn := unit.ID(i.Args[1])
 
 			opts := []agentsocket.Option{}
 			if *socketPath != "" {
@@ -33,10 +34,8 @@ func (*RootCmd) syncWant(socketPath *string) *serpent.Command {
 			}
 			defer client.Close()
 
-			for _, dep := range i.Args[1:] {
-				if err := client.SyncWant(ctx, dependentUnit, unit.ID(dep)); err != nil {
-					return xerrors.Errorf("declare dependency failed: %w", err)
-				}
+			if err := client.SyncWant(ctx, dependentUnit, dependsOn); err != nil {
+				return xerrors.Errorf("declare dependency failed: %w", err)
 			}
 
 			cliui.Info(i.Stdout, "Success")

cli/templateedit_test.go

@@ -828,7 +828,7 @@ func TestTemplateEdit(t *testing.T) {
 			"--require-active-version",
 		}
 		inv, root := clitest.New(t, cmdArgs...)
-		//nolint:gocritic // Using owner client is required for template editing.
+		//nolint
 		clitest.SetupConfig(t, client, root)
 
 		ctx := testutil.Context(t, testutil.WaitLong)
@@ -858,7 +858,7 @@ func TestTemplateEdit(t *testing.T) {
 			"--name", "something-new",
 		}
 		inv, root := clitest.New(t, cmdArgs...)
-		//nolint:gocritic // Using owner client is required for template editing.
+		//nolint
 		clitest.SetupConfig(t, client, root)
 
 		ctx := testutil.Context(t, testutil.WaitLong)

cli/templatepush_test.go

@@ -549,7 +549,8 @@ func TestTemplatePush(t *testing.T) {
 					inv = inv.WithContext(ctx)
 					clitest.Start(t, inv) // Only used for output, disregard exit status.
 
-					require.Eventually(t, func() bool {
+					tCtx := testutil.Context(t, testutil.WaitShort)
+					testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 						jobs, err := store.GetProvisionerJobsCreatedAfter(ctx, time.Time{})
 						if !assert.NoError(t, err) {
 							return false
@@ -558,7 +559,7 @@ func TestTemplatePush(t *testing.T) {
 							return false
 						}
 						return assert.EqualValues(t, wantTags, jobs[0].Tags)
-					}, testutil.WaitShort, testutil.IntervalFast)
+					}, testutil.IntervalFast)
 
 					if tt.expectOutput != "" {
 						pty.ExpectMatchContext(ctx, tt.expectOutput)

cli/testdata/coder_exp_sync_--help.golden

@@ -16,7 +16,7 @@ SUBCOMMANDS:
     ping        Test agent socket connectivity and health
     start       Wait until all unit dependencies are satisfied
     status      Show unit status and dependency state
-    want        Declare that a unit depends on other units completing before it
+    want        Declare that a unit depends on another unit completing before it
                 can start
 
 OPTIONS:

cli/testdata/coder_exp_sync_want_--help.golden

@@ -1,13 +1,13 @@
 coder v0.0.0-devel
 
 USAGE:
-  coder exp sync want <unit> <depends-on> [depends-on...]
+  coder exp sync want <unit> <depends-on>
 
-  Declare that a unit depends on other units completing before it can start
+  Declare that a unit depends on another unit completing before it can start
 
-  Declare that a unit depends on one or more other units completing before it
-  can start. The unit specified first will not start until all subsequent units
-  have signaled that they have completed.
+  Declare that a unit depends on another unit completing before it can start.
+  The unit specified first will not start until the second has signaled that it
+  has completed.
 
 ———
 Run `coder --help` for a list of global options.

cli/testdata/coder_users_list_--output_json.golden

@@ -17,8 +17,7 @@
         "name": "owner",
         "display_name": "Owner"
       }
-    ],
-    "has_ai_seat": false
+    ]
   },
   {
     "id": "==========[second user ID]==========",
@@ -32,7 +31,6 @@
     "organization_ids": [
       "===========[first org ID]==========="
     ],
-    "roles": [],
-    "has_ai_seat": false
+    "roles": []
   }
 ]

cli/testdata/server-config.yaml.golden

@@ -857,18 +857,13 @@ aibridgeproxy:
   # Comma-separated list of AI provider domains for which HTTPS traffic will be
   # decrypted and routed through AI Bridge. Requests to other domains will be
   # tunneled directly without decryption. Supported domains: api.anthropic.com,
-  # api.openai.com, api.individual.githubcopilot.com,
-  # api.business.githubcopilot.com, api.enterprise.githubcopilot.com, chatgpt.com.
-  # (default:
-  # api.anthropic.com,api.openai.com,api.individual.githubcopilot.com,api.business.githubcopilot.com,api.enterprise.githubcopilot.com,chatgpt.com,
+  # api.openai.com, api.individual.githubcopilot.com.
+  # (default: api.anthropic.com,api.openai.com,api.individual.githubcopilot.com,
   # type: string-array)
   domain_allowlist:
     - api.anthropic.com
     - api.openai.com
     - api.individual.githubcopilot.com
-    - api.business.githubcopilot.com
-    - api.enterprise.githubcopilot.com
-    - chatgpt.com
   # URL of an upstream HTTP proxy to chain tunneled (non-allowlisted) requests
   # through. Format: http://[user:pass@]host:port or https://[user:pass@]host:port.
   # (default: <unset>, type: string)

cli/vscodessh_test.go

@@ -6,7 +6,6 @@ import (
 	"testing"
 
 	"github.com/spf13/afero"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/coder/coder/v2/agent/agenttest"
@@ -74,13 +73,13 @@ func TestVSCodeSSH(t *testing.T) {
 	waiter := clitest.StartWithWaiter(t, inv.WithContext(ctx))
 
 	for _, dir := range []string{"/net", "/log"} {
-		assert.Eventually(t, func() bool {
+		testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 			entries, err := afero.ReadDir(fs, dir)
 			if err != nil {
 				return false
 			}
 			return len(entries) > 0
-		}, testutil.WaitLong, testutil.IntervalFast)
+		}, testutil.IntervalFast)
 	}
 	waiter.Cancel()
 

coderd/activitybump_test.go

@@ -142,31 +142,27 @@ func TestWorkspaceActivityBump(t *testing.T) {
 			checks := 0
 
 			// The Deadline bump occurs asynchronously.
-			require.Eventuallyf(t,
-				func() bool {
-					checks++
-					workspace, err = client.Workspace(ctx, workspace.ID)
-					require.NoError(t, err)
+			tCtx := testutil.Context(t, maxTimeDrift)
+			testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
+				checks++
+				workspace, err = client.Workspace(ctx, workspace.ID)
+				require.NoError(t, err)
 
-					hasBumped := !workspace.LatestBuild.Deadline.Time.Equal(firstDeadline)
+				hasBumped := !workspace.LatestBuild.Deadline.Time.Equal(firstDeadline)
 
-					// Always make sure to log this information, even on the last check.
-					// The last check is the most important, as if this loop is acting
-					// slow, the last check could be the cause of the failure.
-					if time.Since(lastChecked) > time.Second || hasBumped {
-						avgCheckTime := time.Since(waitedFor) / time.Duration(checks)
-						t.Logf("deadline detect: bumped=%t since_last_check=%s avg_check_dur=%s checks=%d deadline=%v",
-							hasBumped, time.Since(updatedAfter), avgCheckTime, checks, workspace.LatestBuild.Deadline.Time)
-						lastChecked = time.Now()
-					}
+				// Always make sure to log this information, even on the last check.
+				// The last check is the most important, as if this loop is acting
+				// slow, the last check could be the cause of the failure.
+				if time.Since(lastChecked) > time.Second || hasBumped {
+					avgCheckTime := time.Since(waitedFor) / time.Duration(checks)
+					t.Logf("deadline detect: bumped=%t since_last_check=%s avg_check_dur=%s checks=%d deadline=%v",
+						hasBumped, time.Since(updatedAfter), avgCheckTime, checks, workspace.LatestBuild.Deadline.Time)
+					lastChecked = time.Now()
+				}
 
-					updatedAfter = dbtime.Now()
-					return hasBumped
-				},
-				//nolint: gocritic // maxTimeDrift is a testutil time
-				maxTimeDrift, testutil.IntervalFast,
-				"deadline %v never updated", firstDeadline,
-			)
+				updatedAfter = dbtime.Now()
+				return hasBumped
+			}, testutil.IntervalFast, "deadline %v never updated", firstDeadline)
 
 			// This log line helps establish how long it took for the deadline
 			// to be detected as bumped.

coderd/agentapi/connectionlog.go

@@ -85,7 +85,7 @@ func (a *ConnLogAPI) ReportConnection(ctx context.Context, req *agentproto.Repor
 		AgentName:        a.AgentName,
 		Type:             connectionType,
 		Code:             code,
-		IP:               logIP,
+		Ip:               logIP,
 		ConnectionID: uuid.NullUUID{
 			UUID:  connectionID,
 			Valid: true,

coderd/agentapi/connectionlog_test.go

@@ -101,6 +101,7 @@ func TestConnectionLog(t *testing.T) {
 			reason: "because error says so",
 		},
 	}
+	//nolint:paralleltest // No longer necessary to reinitialise the variable tt.
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Parallel()
@@ -152,7 +153,7 @@ func TestConnectionLog(t *testing.T) {
 					Int32: tt.status,
 					Valid: *tt.action == agentproto.Connection_DISCONNECT,
 				},
-				IP:   expectedIP,
+				Ip:   expectedIP,
 				Type: agentProtoConnectionTypeToConnectionLog(t, *tt.typ),
 				DisconnectReason: sql.NullString{
 					String: tt.reason,

coderd/agentapi/metadata.go

@@ -3,7 +3,6 @@ package agentapi
 import (
 	"context"
 	"fmt"
-	"strings"
 	"time"
 
 	"github.com/google/uuid"
@@ -61,8 +60,6 @@ func (a *MetadataAPI) BatchUpdateMetadata(ctx context.Context, req *agentproto.B
 		}
 	)
 	for _, md := range req.Metadata {
-		md.Result.Value = strings.TrimSpace(md.Result.Value)
-		md.Result.Error = strings.TrimSpace(md.Result.Error)
 		metadataError := md.Result.Error
 
 		allKeysLen += len(md.Key)

coderd/agentapi/metadata_test.go

@@ -57,44 +57,16 @@ func TestBatchUpdateMetadata(t *testing.T) {
 						CollectedAt: timestamppb.New(now.Add(-3 * time.Second)),
 						Age:         3,
 						Value:       "",
-						Error:       "\t uncool error  ",
+						Error:       "uncool value",
 					},
 				},
 			},
 		}
 		batchSize := len(req.Metadata)
-		// This test sends 2 metadata entries (one clean, one with
-		// whitespace padding). With batch size 2 we expect exactly
-		// 1 capacity flush. The matcher verifies that stored values
-		// are trimmed while clean values pass through unchanged.
-		expectedValues := map[string]string{
-			"awesome key": "awesome value",
-			"uncool key":  "",
-		}
-		expectedErrors := map[string]string{
-			"awesome key": "",
-			"uncool key":  "uncool error",
-		}
+		// This test sends 2 metadata entries. With batch size 2, we expect
+		// exactly 1 capacity flush.
 		store.EXPECT().
-			BatchUpdateWorkspaceAgentMetadata(
-				gomock.Any(),
-				gomock.Cond(func(arg database.BatchUpdateWorkspaceAgentMetadataParams) bool {
-					if len(arg.Key) != len(expectedValues) {
-						return false
-					}
-					for i, key := range arg.Key {
-						expVal, ok := expectedValues[key]
-						if !ok || arg.Value[i] != expVal {
-							return false
-						}
-						expErr, ok := expectedErrors[key]
-						if !ok || arg.Error[i] != expErr {
-							return false
-						}
-					}
-					return true
-				}),
-			).
+			BatchUpdateWorkspaceAgentMetadata(gomock.Any(), gomock.Any()).
 			Return(nil).
 			Times(1)
 

coderd/aibridge/aibridge.go

@@ -16,25 +16,6 @@ import (
 // that use per-user LLM credentials but cannot set custom headers.
 const HeaderCoderToken = "X-Coder-AI-Governance-Token" //nolint:gosec // This is a header name, not a credential.
 
-// HeaderCoderRequestID is a header set by aibridgeproxyd on each
-// request forwarded to aibridged for cross-service log correlation.
-const HeaderCoderRequestID = "X-Coder-AI-Governance-Request-Id"
-
-// Copilot provider.
-const (
-	ProviderCopilotBusiness   = "copilot-business"
-	HostCopilotBusiness       = "api.business.githubcopilot.com"
-	ProviderCopilotEnterprise = "copilot-enterprise"
-	HostCopilotEnterprise     = "api.enterprise.githubcopilot.com"
-)
-
-// ChatGPT provider.
-const (
-	ProviderChatGPT = "chatgpt"
-	HostChatGPT     = "chatgpt.com"
-	BaseURLChatGPT  = "https://" + HostChatGPT + "/backend-api/codex"
-)
-
 // IsBYOK reports whether the request is using BYOK mode, determined
 // by the presence of the X-Coder-AI-Governance-Token header.
 func IsBYOK(header http.Header) bool {

coderd/apidoc/docs.go

@@ -84,34 +84,6 @@ const docTemplate = `{
                 }
             }
         },
-        "/aibridge/clients": {
-            "get": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "AI Bridge"
-                ],
-                "summary": "List AI Bridge clients",
-                "operationId": "list-ai-bridge-clients",
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "type": "array",
-                            "items": {
-                                "type": "string"
-                            }
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "CoderSessionToken": []
-                    }
-                ]
-            }
-        },
         "/aibridge/interceptions": {
             "get": {
                 "produces": [
@@ -242,58 +214,6 @@ const docTemplate = `{
                 ]
             }
         },
-        "/aibridge/sessions/{session_id}": {
-            "get": {
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "AI Bridge"
-                ],
-                "summary": "Get AI Bridge session threads",
-                "operationId": "get-ai-bridge-session-threads",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "Session ID (client_session_id or interception UUID)",
-                        "name": "session_id",
-                        "in": "path",
-                        "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "Thread pagination cursor (forward/older)",
-                        "name": "after_id",
-                        "in": "query"
-                    },
-                    {
-                        "type": "string",
-                        "description": "Thread pagination cursor (backward/newer)",
-                        "name": "before_id",
-                        "in": "query"
-                    },
-                    {
-                        "type": "integer",
-                        "description": "Number of threads per page (default 50)",
-                        "name": "limit",
-                        "in": "query"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/codersdk.AIBridgeSessionThreadsResponse"
-                        }
-                    }
-                },
-                "security": [
-                    {
-                        "CoderSessionToken": []
-                    }
-                ]
-            }
-        },
         "/appearance": {
             "get": {
                 "produces": [
@@ -10205,26 +10125,12 @@ const docTemplate = `{
                 ],
                 "summary": "Get workspace agent reinitialization",
                 "operationId": "get-workspace-agent-reinitialization",
-                "parameters": [
-                    {
-                        "type": "boolean",
-                        "description": "Opt in to durable reinit checks",
-                        "name": "wait",
-                        "in": "query"
-                    }
-                ],
                 "responses": {
                     "200": {
                         "description": "OK",
                         "schema": {
                             "$ref": "#/definitions/agentsdk.ReinitializationEvent"
                         }
-                    },
-                    "409": {
-                        "description": "Conflict",
-                        "schema": {
-                            "$ref": "#/definitions/codersdk.Response"
-                        }
                     }
                 },
                 "security": [
@@ -12661,16 +12567,11 @@ const docTemplate = `{
         "agentsdk.ReinitializationEvent": {
             "type": "object",
             "properties": {
-                "owner_id": {
-                    "type": "string",
-                    "format": "uuid"
-                },
                 "reason": {
                     "$ref": "#/definitions/agentsdk.ReinitializationReason"
                 },
-                "workspace_id": {
-                    "type": "string",
-                    "format": "uuid"
+                "workspaceID": {
+                    "type": "string"
                 }
             }
         },
@@ -12774,29 +12675,6 @@ const docTemplate = `{
                 }
             }
         },
-        "codersdk.AIBridgeAgenticAction": {
-            "type": "object",
-            "properties": {
-                "model": {
-                    "type": "string"
-                },
-                "thinking": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/codersdk.AIBridgeModelThought"
-                    }
-                },
-                "token_usage": {
-                    "$ref": "#/definitions/codersdk.AIBridgeSessionThreadsTokenUsage"
-                },
-                "tool_calls": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/codersdk.AIBridgeToolCall"
-                    }
-                }
-            }
-        },
         "codersdk.AIBridgeAnthropicConfig": {
             "type": "object",
             "properties": {
@@ -12913,9 +12791,6 @@ const docTemplate = `{
                 "provider": {
                     "type": "string"
                 },
-                "provider_name": {
-                    "type": "string"
-                },
                 "started_at": {
                     "type": "string",
                     "format": "date-time"
@@ -12968,14 +12843,6 @@ const docTemplate = `{
                 }
             }
         },
-        "codersdk.AIBridgeModelThought": {
-            "type": "object",
-            "properties": {
-                "text": {
-                    "type": "string"
-                }
-            }
-        },
         "codersdk.AIBridgeOpenAIConfig": {
             "type": "object",
             "properties": {
@@ -13075,91 +12942,9 @@ const docTemplate = `{
                 }
             }
         },
-        "codersdk.AIBridgeSessionThreadsResponse": {
-            "type": "object",
-            "properties": {
-                "client": {
-                    "type": "string"
-                },
-                "ended_at": {
-                    "type": "string",
-                    "format": "date-time"
-                },
-                "id": {
-                    "type": "string"
-                },
-                "initiator": {
-                    "$ref": "#/definitions/codersdk.MinimalUser"
-                },
-                "metadata": {
-                    "type": "object",
-                    "additionalProperties": {}
-                },
-                "models": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "page_ended_at": {
-                    "type": "string",
-                    "format": "date-time"
-                },
-                "page_started_at": {
-                    "type": "string",
-                    "format": "date-time"
-                },
-                "providers": {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                },
-                "started_at": {
-                    "type": "string",
-                    "format": "date-time"
-                },
-                "threads": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/codersdk.AIBridgeThread"
-                    }
-                },
-                "token_usage_summary": {
-                    "$ref": "#/definitions/codersdk.AIBridgeSessionThreadsTokenUsage"
-                }
-            }
-        },
-        "codersdk.AIBridgeSessionThreadsTokenUsage": {
-            "type": "object",
-            "properties": {
-                "cache_read_input_tokens": {
-                    "type": "integer"
-                },
-                "cache_write_input_tokens": {
-                    "type": "integer"
-                },
-                "input_tokens": {
-                    "type": "integer"
-                },
-                "metadata": {
-                    "type": "object",
-                    "additionalProperties": {}
-                },
-                "output_tokens": {
-                    "type": "integer"
-                }
-            }
-        },
         "codersdk.AIBridgeSessionTokenUsageSummary": {
             "type": "object",
             "properties": {
-                "cache_read_input_tokens": {
-                    "type": "integer"
-                },
-                "cache_write_input_tokens": {
-                    "type": "integer"
-                },
                 "input_tokens": {
                     "type": "integer"
                 },
@@ -13168,50 +12953,9 @@ const docTemplate = `{
                 }
             }
         },
-        "codersdk.AIBridgeThread": {
-            "type": "object",
-            "properties": {
-                "agentic_actions": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/codersdk.AIBridgeAgenticAction"
-                    }
-                },
-                "ended_at": {
-                    "type": "string",
-                    "format": "date-time"
-                },
-                "id": {
-                    "type": "string",
-                    "format": "uuid"
-                },
-                "model": {
-                    "type": "string"
-                },
-                "prompt": {
-                    "type": "string"
-                },
-                "provider": {
-                    "type": "string"
-                },
-                "started_at": {
-                    "type": "string",
-                    "format": "date-time"
-                },
-                "token_usage": {
-                    "$ref": "#/definitions/codersdk.AIBridgeSessionThreadsTokenUsage"
-                }
-            }
-        },
         "codersdk.AIBridgeTokenUsage": {
             "type": "object",
             "properties": {
-                "cache_read_input_tokens": {
-                    "type": "integer"
-                },
-                "cache_write_input_tokens": {
-                    "type": "integer"
-                },
                 "created_at": {
                     "type": "string",
                     "format": "date-time"
@@ -13239,42 +12983,6 @@ const docTemplate = `{
                 }
             }
         },
-        "codersdk.AIBridgeToolCall": {
-            "type": "object",
-            "properties": {
-                "created_at": {
-                    "type": "string",
-                    "format": "date-time"
-                },
-                "id": {
-                    "type": "string",
-                    "format": "uuid"
-                },
-                "injected": {
-                    "type": "boolean"
-                },
-                "input": {
-                    "type": "string"
-                },
-                "interception_id": {
-                    "type": "string",
-                    "format": "uuid"
-                },
-                "metadata": {
-                    "type": "object",
-                    "additionalProperties": {}
-                },
-                "provider_response_id": {
-                    "type": "string"
-                },
-                "server_url": {
-                    "type": "string"
-                },
-                "tool": {
-                    "type": "string"
-                }
-            }
-        },
         "codersdk.AIBridgeToolUsage": {
             "type": "object",
             "properties": {
@@ -14175,9 +13883,6 @@ const docTemplate = `{
                 },
                 "count": {
                     "type": "integer"
-                },
-                "count_cap": {
-                    "type": "integer"
                 }
             }
         },
@@ -14499,9 +14204,6 @@ const docTemplate = `{
                 },
                 "count": {
                     "type": "integer"
-                },
-                "count_cap": {
-                    "type": "integer"
                 }
             }
         },
@@ -14589,17 +14291,6 @@ const docTemplate = `{
                 }
             }
         },
-        "codersdk.CreateFirstUserOnboardingInfo": {
-            "type": "object",
-            "properties": {
-                "newsletter_marketing": {
-                    "type": "boolean"
-                },
-                "newsletter_releases": {
-                    "type": "boolean"
-                }
-            }
-        },
         "codersdk.CreateFirstUserRequest": {
             "type": "object",
             "required": [
@@ -14614,9 +14305,6 @@ const docTemplate = `{
                 "name": {
                     "type": "string"
                 },
-                "onboarding_info": {
-                    "$ref": "#/definitions/codersdk.CreateFirstUserOnboardingInfo"
-                },
                 "password": {
                     "type": "string"
                 },
@@ -17738,10 +17426,6 @@ const docTemplate = `{
                         "$ref": "#/definitions/codersdk.SlimRole"
                     }
                 },
-                "has_ai_seat": {
-                    "description": "HasAISeat intentionally omits omitempty so the API always includes the\nfield, even when false.",
-                    "type": "boolean"
-                },
                 "is_service_account": {
                     "type": "boolean"
                 },
@@ -20538,10 +20222,6 @@ const docTemplate = `{
                     "type": "string",
                     "format": "email"
                 },
-                "has_ai_seat": {
-                    "description": "HasAISeat intentionally omits omitempty so the API always includes the\nfield, even when false.",
-                    "type": "boolean"
-                },
                 "id": {
                     "type": "string",
                     "format": "uuid"
@@ -21391,10 +21071,6 @@ const docTemplate = `{
                     "type": "string",
                     "format": "email"
                 },
-                "has_ai_seat": {
-                    "description": "HasAISeat intentionally omits omitempty so the API always includes the\nfield, even when false.",
-                    "type": "boolean"
-                },
                 "id": {
                     "type": "string",
                     "format": "uuid"

coderd/apidoc/swagger.json

@@ -65,30 +65,6 @@
 				}
 			}
 		},
-		"/aibridge/clients": {
-			"get": {
-				"produces": ["application/json"],
-				"tags": ["AI Bridge"],
-				"summary": "List AI Bridge clients",
-				"operationId": "list-ai-bridge-clients",
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"type": "array",
-							"items": {
-								"type": "string"
-							}
-						}
-					}
-				},
-				"security": [
-					{
-						"CoderSessionToken": []
-					}
-				]
-			}
-		},
 		"/aibridge/interceptions": {
 			"get": {
 				"produces": ["application/json"],
@@ -207,54 +183,6 @@
 				]
 			}
 		},
-		"/aibridge/sessions/{session_id}": {
-			"get": {
-				"produces": ["application/json"],
-				"tags": ["AI Bridge"],
-				"summary": "Get AI Bridge session threads",
-				"operationId": "get-ai-bridge-session-threads",
-				"parameters": [
-					{
-						"type": "string",
-						"description": "Session ID (client_session_id or interception UUID)",
-						"name": "session_id",
-						"in": "path",
-						"required": true
-					},
-					{
-						"type": "string",
-						"description": "Thread pagination cursor (forward/older)",
-						"name": "after_id",
-						"in": "query"
-					},
-					{
-						"type": "string",
-						"description": "Thread pagination cursor (backward/newer)",
-						"name": "before_id",
-						"in": "query"
-					},
-					{
-						"type": "integer",
-						"description": "Number of threads per page (default 50)",
-						"name": "limit",
-						"in": "query"
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/codersdk.AIBridgeSessionThreadsResponse"
-						}
-					}
-				},
-				"security": [
-					{
-						"CoderSessionToken": []
-					}
-				]
-			}
-		},
 		"/appearance": {
 			"get": {
 				"produces": ["application/json"],
@@ -9038,26 +8966,12 @@
 				"tags": ["Agents"],
 				"summary": "Get workspace agent reinitialization",
 				"operationId": "get-workspace-agent-reinitialization",
-				"parameters": [
-					{
-						"type": "boolean",
-						"description": "Opt in to durable reinit checks",
-						"name": "wait",
-						"in": "query"
-					}
-				],
 				"responses": {
 					"200": {
 						"description": "OK",
 						"schema": {
 							"$ref": "#/definitions/agentsdk.ReinitializationEvent"
 						}
-					},
-					"409": {
-						"description": "Conflict",
-						"schema": {
-							"$ref": "#/definitions/codersdk.Response"
-						}
 					}
 				},
 				"security": [
@@ -11243,16 +11157,11 @@
 		"agentsdk.ReinitializationEvent": {
 			"type": "object",
 			"properties": {
-				"owner_id": {
-					"type": "string",
-					"format": "uuid"
-				},
 				"reason": {
 					"$ref": "#/definitions/agentsdk.ReinitializationReason"
 				},
-				"workspace_id": {
-					"type": "string",
-					"format": "uuid"
+				"workspaceID": {
+					"type": "string"
 				}
 			}
 		},
@@ -11352,29 +11261,6 @@
 				}
 			}
 		},
-		"codersdk.AIBridgeAgenticAction": {
-			"type": "object",
-			"properties": {
-				"model": {
-					"type": "string"
-				},
-				"thinking": {
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/codersdk.AIBridgeModelThought"
-					}
-				},
-				"token_usage": {
-					"$ref": "#/definitions/codersdk.AIBridgeSessionThreadsTokenUsage"
-				},
-				"tool_calls": {
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/codersdk.AIBridgeToolCall"
-					}
-				}
-			}
-		},
 		"codersdk.AIBridgeAnthropicConfig": {
 			"type": "object",
 			"properties": {
@@ -11491,9 +11377,6 @@
 				"provider": {
 					"type": "string"
 				},
-				"provider_name": {
-					"type": "string"
-				},
 				"started_at": {
 					"type": "string",
 					"format": "date-time"
@@ -11546,14 +11429,6 @@
 				}
 			}
 		},
-		"codersdk.AIBridgeModelThought": {
-			"type": "object",
-			"properties": {
-				"text": {
-					"type": "string"
-				}
-			}
-		},
 		"codersdk.AIBridgeOpenAIConfig": {
 			"type": "object",
 			"properties": {
@@ -11653,91 +11528,9 @@
 				}
 			}
 		},
-		"codersdk.AIBridgeSessionThreadsResponse": {
-			"type": "object",
-			"properties": {
-				"client": {
-					"type": "string"
-				},
-				"ended_at": {
-					"type": "string",
-					"format": "date-time"
-				},
-				"id": {
-					"type": "string"
-				},
-				"initiator": {
-					"$ref": "#/definitions/codersdk.MinimalUser"
-				},
-				"metadata": {
-					"type": "object",
-					"additionalProperties": {}
-				},
-				"models": {
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
-				},
-				"page_ended_at": {
-					"type": "string",
-					"format": "date-time"
-				},
-				"page_started_at": {
-					"type": "string",
-					"format": "date-time"
-				},
-				"providers": {
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
-				},
-				"started_at": {
-					"type": "string",
-					"format": "date-time"
-				},
-				"threads": {
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/codersdk.AIBridgeThread"
-					}
-				},
-				"token_usage_summary": {
-					"$ref": "#/definitions/codersdk.AIBridgeSessionThreadsTokenUsage"
-				}
-			}
-		},
-		"codersdk.AIBridgeSessionThreadsTokenUsage": {
-			"type": "object",
-			"properties": {
-				"cache_read_input_tokens": {
-					"type": "integer"
-				},
-				"cache_write_input_tokens": {
-					"type": "integer"
-				},
-				"input_tokens": {
-					"type": "integer"
-				},
-				"metadata": {
-					"type": "object",
-					"additionalProperties": {}
-				},
-				"output_tokens": {
-					"type": "integer"
-				}
-			}
-		},
 		"codersdk.AIBridgeSessionTokenUsageSummary": {
 			"type": "object",
 			"properties": {
-				"cache_read_input_tokens": {
-					"type": "integer"
-				},
-				"cache_write_input_tokens": {
-					"type": "integer"
-				},
 				"input_tokens": {
 					"type": "integer"
 				},
@@ -11746,50 +11539,9 @@
 				}
 			}
 		},
-		"codersdk.AIBridgeThread": {
-			"type": "object",
-			"properties": {
-				"agentic_actions": {
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/codersdk.AIBridgeAgenticAction"
-					}
-				},
-				"ended_at": {
-					"type": "string",
-					"format": "date-time"
-				},
-				"id": {
-					"type": "string",
-					"format": "uuid"
-				},
-				"model": {
-					"type": "string"
-				},
-				"prompt": {
-					"type": "string"
-				},
-				"provider": {
-					"type": "string"
-				},
-				"started_at": {
-					"type": "string",
-					"format": "date-time"
-				},
-				"token_usage": {
-					"$ref": "#/definitions/codersdk.AIBridgeSessionThreadsTokenUsage"
-				}
-			}
-		},
 		"codersdk.AIBridgeTokenUsage": {
 			"type": "object",
 			"properties": {
-				"cache_read_input_tokens": {
-					"type": "integer"
-				},
-				"cache_write_input_tokens": {
-					"type": "integer"
-				},
 				"created_at": {
 					"type": "string",
 					"format": "date-time"
@@ -11817,42 +11569,6 @@
 				}
 			}
 		},
-		"codersdk.AIBridgeToolCall": {
-			"type": "object",
-			"properties": {
-				"created_at": {
-					"type": "string",
-					"format": "date-time"
-				},
-				"id": {
-					"type": "string",
-					"format": "uuid"
-				},
-				"injected": {
-					"type": "boolean"
-				},
-				"input": {
-					"type": "string"
-				},
-				"interception_id": {
-					"type": "string",
-					"format": "uuid"
-				},
-				"metadata": {
-					"type": "object",
-					"additionalProperties": {}
-				},
-				"provider_response_id": {
-					"type": "string"
-				},
-				"server_url": {
-					"type": "string"
-				},
-				"tool": {
-					"type": "string"
-				}
-			}
-		},
 		"codersdk.AIBridgeToolUsage": {
 			"type": "object",
 			"properties": {
@@ -12739,9 +12455,6 @@
 				},
 				"count": {
 					"type": "integer"
-				},
-				"count_cap": {
-					"type": "integer"
 				}
 			}
 		},
@@ -13042,9 +12755,6 @@
 				},
 				"count": {
 					"type": "integer"
-				},
-				"count_cap": {
-					"type": "integer"
 				}
 			}
 		},
@@ -13129,17 +12839,6 @@
 				}
 			}
 		},
-		"codersdk.CreateFirstUserOnboardingInfo": {
-			"type": "object",
-			"properties": {
-				"newsletter_marketing": {
-					"type": "boolean"
-				},
-				"newsletter_releases": {
-					"type": "boolean"
-				}
-			}
-		},
 		"codersdk.CreateFirstUserRequest": {
 			"type": "object",
 			"required": ["email", "password", "username"],
@@ -13150,9 +12849,6 @@
 				"name": {
 					"type": "string"
 				},
-				"onboarding_info": {
-					"$ref": "#/definitions/codersdk.CreateFirstUserOnboardingInfo"
-				},
 				"password": {
 					"type": "string"
 				},
@@ -16155,10 +15851,6 @@
 						"$ref": "#/definitions/codersdk.SlimRole"
 					}
 				},
-				"has_ai_seat": {
-					"description": "HasAISeat intentionally omits omitempty so the API always includes the\nfield, even when false.",
-					"type": "boolean"
-				},
 				"is_service_account": {
 					"type": "boolean"
 				},
@@ -18855,10 +18547,6 @@
 					"type": "string",
 					"format": "email"
 				},
-				"has_ai_seat": {
-					"description": "HasAISeat intentionally omits omitempty so the API always includes the\nfield, even when false.",
-					"type": "boolean"
-				},
 				"id": {
 					"type": "string",
 					"format": "uuid"
@@ -19651,10 +19339,6 @@
 					"type": "string",
 					"format": "email"
 				},
-				"has_ai_seat": {
-					"description": "HasAISeat intentionally omits omitempty so the API always includes the\nfield, even when false.",
-					"type": "boolean"
-				},
 				"id": {
 					"type": "string",
 					"format": "uuid"

coderd/apikey.go

@@ -582,20 +582,5 @@ func (api *API) createAPIKey(ctx context.Context, params apikey.CreateParams) (*
 		Value:    sessionToken,
 		Path:     "/",
 		HttpOnly: true,
-		// MaxAge is set so the browser persists the cookie to disk rather
-		// than keeping it in memory as a session cookie. Standalone PWAs
-		// (display: standalone) run in their own browser process, and
-		// mobile OSes kill that process when the app is swiped away —
-		// deleting in-memory cookies and forcing an unexpected login.
-		//
-		// We use a long static value (1 year) instead of the key's
-		// LifetimeSeconds because the server refreshes the key's
-		// ExpiresAt on activity but does not re-set the cookie. Tying
-		// MaxAge to the key lifetime would cause the cookie to expire
-		// client-side even when the server-side key is still valid.
-		//
-		// Security is not affected: the server validates ExpiresAt on
-		// every request regardless of the cookie's MaxAge.
-		MaxAge: int((365 * 24 * time.Hour).Seconds()),
 	}), &newkey, nil
 }

coderd/apikey_test.go

@@ -394,55 +394,6 @@ func TestSessionExpiry(t *testing.T) {
 	}
 }
 
-// TestSessionCookieMaxAge verifies that the session cookie is a persistent
-// cookie (has MaxAge set) rather than a session cookie. Standalone PWAs
-// run in their own browser process and mobile OSes purge in-memory
-// (session) cookies when that process is killed, so the cookie must be
-// persisted to disk.
-func TestSessionCookieMaxAge(t *testing.T) {
-	t.Parallel()
-
-	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
-	defer cancel()
-
-	client := coderdtest.New(t, nil)
-
-	// Create the first user (password-based login).
-	req := codersdk.CreateFirstUserRequest{
-		Email:    "testuser@coder.com",
-		Username: "testuser",
-		Password: "SomeSecurePassword!",
-	}
-	_, err := client.CreateFirstUser(ctx, req)
-	require.NoError(t, err)
-
-	// Login via the raw HTTP endpoint so we can inspect the Set-Cookie header.
-	loginURL, err := client.URL.Parse("/api/v2/users/login")
-	require.NoError(t, err)
-
-	res, err := client.Request(ctx, http.MethodPost, loginURL.String(), codersdk.LoginWithPasswordRequest{
-		Email:    req.Email,
-		Password: req.Password,
-	})
-	require.NoError(t, err)
-	defer res.Body.Close()
-	require.Equal(t, http.StatusCreated, res.StatusCode)
-
-	oneYear := int((365 * 24 * time.Hour).Seconds())
-	var found bool
-	for _, cookie := range res.Cookies() {
-		if cookie.Name == codersdk.SessionTokenCookie {
-			// MaxAge should be set to a long value so the browser
-			// persists the cookie to disk. The server handles real
-			// expiry via the API key's ExpiresAt field.
-			require.Equal(t, oneYear, cookie.MaxAge,
-				"Session cookie MaxAge should be set to 1 year for disk persistence")
-			found = true
-		}
-	}
-	require.True(t, found, "session cookie should be present in login response")
-}
-
 func TestAPIKey_OK(t *testing.T) {
 	t.Parallel()
 

coderd/audit.go

@@ -26,11 +26,6 @@ import (
 	"github.com/coder/coder/v2/codersdk"
 )
 
-// Limit the count query to avoid a slow sequential scan due to joins
-// on a large table. Set to 0 to disable capping (but also see the note
-// in the SQL query).
-const auditLogCountCap = 2000
-
 // @Summary Get audit logs
 // @ID get-audit-logs
 // @Security CoderSessionToken
@@ -71,7 +66,7 @@ func (api *API) auditLogs(rw http.ResponseWriter, r *http.Request) {
 		countFilter.Username = ""
 	}
 
-	countFilter.CountCap = auditLogCountCap
+	// Use the same filters to count the number of audit logs
 	count, err := api.Database.CountAuditLogs(ctx, countFilter)
 	if dbauthz.IsNotAuthorizedError(err) {
 		httpapi.Forbidden(rw)
@@ -86,7 +81,6 @@ func (api *API) auditLogs(rw http.ResponseWriter, r *http.Request) {
 		httpapi.Write(ctx, rw, http.StatusOK, codersdk.AuditLogResponse{
 			AuditLogs: []codersdk.AuditLog{},
 			Count:     0,
-			CountCap:  auditLogCountCap,
 		})
 		return
 	}
@@ -104,7 +98,6 @@ func (api *API) auditLogs(rw http.ResponseWriter, r *http.Request) {
 	httpapi.Write(ctx, rw, http.StatusOK, codersdk.AuditLogResponse{
 		AuditLogs: api.convertAuditLogs(ctx, dblogs),
 		Count:     count,
-		CountCap:  auditLogCountCap,
 	})
 }
 

coderd/authorize.go

@@ -220,7 +220,7 @@ func (api *API) checkAuthorization(rw http.ResponseWriter, r *http.Request) {
 			Type:        string(v.Object.ResourceType),
 			AnyOrgOwner: v.Object.AnyOrgOwner,
 		}
-		if obj.Owner == codersdk.Me {
+		if obj.Owner == "me" {
 			obj.Owner = auth.ID
 		}
 

coderd/autobuild/lifecycle_executor_test.go

@@ -1819,8 +1819,8 @@ func TestExecutorAutostartSkipsWhenNoProvisionersAvailable(t *testing.T) {
 	p, err = coderdtest.GetProvisionerForTags(db, time.Now(), workspace.OrganizationID, provisionerDaemonTags)
 	require.NoError(t, err, "Error getting provisioner for workspace")
 	// This assertion *may* no longer need to be `Eventually`.
-	require.Eventually(t, func() bool { return p.LastSeenAt.Time.UnixNano() == staleTime.UnixNano() },
-		testutil.WaitMedium, testutil.IntervalFast, "expected provisioner LastSeenAt to be:%+v, saw :%+v", staleTime.UTC(), p.LastSeenAt.Time.UTC())
+	tCtx := testutil.Context(t, testutil.WaitMedium)
+	testutil.Eventually(tCtx, t, func(ctx context.Context) bool { return p.LastSeenAt.Time.UnixNano() == staleTime.UnixNano() }, testutil.IntervalFast, "expected provisioner LastSeenAt to be:%+v, saw :%+v", staleTime.UTC(), p.LastSeenAt.Time.UTC())
 
 	// Ensure the provisioner is gone or stale, relative to the artificial next autostart time, before triggering the autobuild.
 	coderdtest.MustWaitForProvisionersUnavailable(t, db, workspace, provisionerDaemonTags, next)

coderd/client_test.go

@@ -3,8 +3,7 @@ package coderd_test
 import (
 	"context"
 	"net/http"
-
-	"github.com/stretchr/testify/require"
+	"testing"
 
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/testutil"
@@ -12,12 +11,12 @@ import (
 
 // Issue: https://github.com/coder/coder/issues/5249
 // While running tests in parallel, the web server seems to be overloaded and responds with HTTP 502.
-// require.Eventually expects correct HTTP responses.
+// testutil.Eventually expects correct HTTP responses.
 
-func requestWithRetries(ctx context.Context, t require.TestingT, client *codersdk.Client, method, path string, body interface{}, opts ...codersdk.RequestOption) (*http.Response, error) {
+func requestWithRetries(ctx context.Context, t testing.TB, client *codersdk.Client, method, path string, body interface{}, opts ...codersdk.RequestOption) (*http.Response, error) {
 	var resp *http.Response
 	var err error
-	require.Eventually(t, func() bool {
+	testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 		// nolint // only requests which are not passed upstream have a body closed
 		resp, err = client.Request(ctx, method, path, body, opts...)
 		if resp != nil && resp.StatusCode == http.StatusBadGateway {
@@ -27,6 +26,6 @@ func requestWithRetries(ctx context.Context, t require.TestingT, client *codersd
 			return false
 		}
 		return true
-	}, testutil.WaitLong, testutil.IntervalFast)
+	}, testutil.IntervalFast)
 	return resp, err
 }

coderd/coderd.go

@@ -168,7 +168,6 @@ type Options struct {
 	ConnectionLogger               connectionlog.ConnectionLogger
 	AgentConnectionUpdateFrequency time.Duration
 	AgentInactiveDisconnectTimeout time.Duration
-	ChatdInstructionLookupTimeout  time.Duration
 	AWSCertificates                awsidentity.Certificates
 	Authorizer                     rbac.Authorizer
 	AzureCertificates              x509.VerifyOptions
@@ -783,10 +782,9 @@ func New(options *Options) *API {
 			ReplicaID:                      api.ID,
 			SubscribeFn:                    options.ChatSubscribeFn,
 			MaxChatsPerAcquire:             int32(maxChatsPerAcquire), //nolint:gosec // maxChatsPerAcquire is clamped to int32 range above.
-			ProviderAPIKeys:                ChatProviderAPIKeysFromDeploymentValues(options.DeploymentValues),
+			ProviderAPIKeys:                chatProviderAPIKeysFromDeploymentValues(options.DeploymentValues),
 			AgentConn:                      api.agentProvider.AgentConn,
 			AgentInactiveDisconnectTimeout: api.AgentInactiveDisconnectTimeout,
-			InstructionLookupTimeout:       options.ChatdInstructionLookupTimeout,
 			CreateWorkspace:                api.chatCreateWorkspace,
 			StartWorkspace:                 api.chatStartWorkspace,
 			Pubsub:                         options.Pubsub,
@@ -1157,7 +1155,6 @@ func New(options *Options) *API {
 				apiKeyMiddleware,
 				httpmw.RequireExperimentWithDevBypass(api.Experiments, codersdk.ExperimentAgents),
 			)
-			r.Get("/by-workspace", api.chatsByWorkspace)
 			r.Get("/", api.listChats)
 			r.Post("/", api.postChats)
 			r.Get("/models", api.listChatModels)
@@ -1223,13 +1220,6 @@ func New(options *Options) *API {
 					r.Delete("/", api.deleteChatUsageLimitGroupOverride)
 				})
 			})
-			r.Route("/user-provider-configs", func(r chi.Router) {
-				r.Get("/", api.listUserChatProviderConfigs)
-				r.Route("/{providerConfig}", func(r chi.Router) {
-					r.Put("/", api.upsertUserChatProviderKey)
-					r.Delete("/", api.deleteUserChatProviderKey)
-				})
-			})
 			r.Route("/{chat}", func(r chi.Router) {
 				r.Use(httpmw.ExtractChatParam(options.Database))
 				r.Get("/", api.getChat)
@@ -1243,7 +1233,6 @@ func New(options *Options) *API {
 					r.Get("/git", api.watchChatGit)
 				})
 				r.Post("/interrupt", api.interruptChat)
-				r.Post("/title/regenerate", api.regenerateChatTitle)
 				r.Get("/diff", api.getChatDiffContents)
 				r.Route("/queue/{queuedMessage}", func(r chi.Router) {
 					r.Delete("/", api.deleteChatQueuedMessage)

coderd/coderdtest/coderdtest.go

@@ -149,13 +149,12 @@ type Options struct {
 	OneTimePasscodeValidityPeriod time.Duration
 
 	// IncludeProvisionerDaemon when true means to start an in-memory provisionerD
-	IncludeProvisionerDaemon      bool
-	ChatdInstructionLookupTimeout time.Duration
-	ProvisionerDaemonVersion      string
-	ProvisionerDaemonTags         map[string]string
-	MetricsCacheRefreshInterval   time.Duration
-	AgentStatsRefreshInterval     time.Duration
-	DeploymentValues              *codersdk.DeploymentValues
+	IncludeProvisionerDaemon    bool
+	ProvisionerDaemonVersion    string
+	ProvisionerDaemonTags       map[string]string
+	MetricsCacheRefreshInterval time.Duration
+	AgentStatsRefreshInterval   time.Duration
+	DeploymentValues            *codersdk.DeploymentValues
 
 	// Set update check options to enable update check.
 	UpdateCheckOptions *updatecheck.Options
@@ -576,7 +575,6 @@ func NewOptions(t testing.TB, options *Options) (func(http.Handler), context.Can
 			// Force a long disconnection timeout to ensure
 			// agents are not marked as disconnected during slow tests.
 			AgentInactiveDisconnectTimeout: testutil.WaitShort,
-			ChatdInstructionLookupTimeout:  options.ChatdInstructionLookupTimeout,
 			AccessURL:                      accessURL,
 			AppHostname:                    options.AppHostname,
 			AppHostnameRegex:               appHostnameRegex,
@@ -1128,7 +1126,7 @@ func AwaitTemplateVersionJobRunning(t testing.TB, client *codersdk.Client, versi
 
 	t.Logf("waiting for template version %s build job to start", version)
 	var templateVersion codersdk.TemplateVersion
-	require.Eventually(t, func() bool {
+	require.True(t, testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 		var err error
 		templateVersion, err = client.TemplateVersion(ctx, version)
 		if err != nil {
@@ -1144,7 +1142,7 @@ func AwaitTemplateVersionJobRunning(t testing.TB, client *codersdk.Client, versi
 			t.FailNow()
 			return false
 		}
-	}, testutil.WaitShort, testutil.IntervalFast, "make sure you set `IncludeProvisionerDaemon`!")
+	}, testutil.IntervalFast, "make sure you set `IncludeProvisionerDaemon`!"))
 	t.Logf("template version %s job has started", version)
 	return templateVersion
 }
@@ -1159,12 +1157,12 @@ func AwaitTemplateVersionJobCompleted(t testing.TB, client *codersdk.Client, ver
 
 	t.Logf("waiting for template version %s build job to complete", version)
 	var templateVersion codersdk.TemplateVersion
-	require.Eventually(t, func() bool {
+	require.True(t, testutil.Eventually(ctx, t, func(ctx context.Context) bool {
 		var err error
 		templateVersion, err = client.TemplateVersion(ctx, version)
 		t.Logf("template version job status: %s", templateVersion.Job.Status)
 		return assert.NoError(t, err) && templateVersion.Job.CompletedAt != nil
-	}, testutil.WaitLong, testutil.IntervalFast, "make sure you set `IncludeProvisionerDaemon`!")
+	}, testutil.IntervalFast, "make sure you set `IncludeProvisionerDaemon`!"))
 	t.Logf("template version %s job has completed", version)
 	return templateVersion
 }
@@ -1173,12 +1171,10 @@ func AwaitTemplateVersionJobCompleted(t testing.TB, client *codersdk.Client, ver
 func AwaitWorkspaceBuildJobCompleted(t testing.TB, client *codersdk.Client, build uuid.UUID) codersdk.WorkspaceBuild {
 	t.Helper()
 
-	ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
-	defer cancel()
-
 	t.Logf("waiting for workspace build job %s", build)
 	var workspaceBuild codersdk.WorkspaceBuild
-	require.Eventually(t, func() bool {
+	tCtx := testutil.Context(t, testutil.WaitMedium)
+	require.True(t, testutil.Eventually(tCtx, t, func(ctx context.Context) bool {
 		var err error
 		workspaceBuild, err = client.WorkspaceBuild(ctx, build)
 		if err != nil {
@@ -1190,7 +1186,7 @@ func AwaitWorkspaceBuildJobCompleted(t testing.TB, client *codersdk.Client, buil
 			return false
 		}
 		return true
-	}, testutil.WaitMedium, testutil.IntervalFast)
+	}, testutil.IntervalFast))
 	t.Logf("got workspace build job %s (status: %s)", build, workspaceBuild.Job.Status)
 	return workspaceBuild
 }

coderd/connectionlog/connectionlog.go

@@ -90,8 +90,8 @@ func (m *FakeConnectionLogger) Contains(t testing.TB, expected database.UpsertCo
 			t.Logf("connection log %d: expected Code %d, got %d", idx+1, expected.Code.Int32, cl.Code.Int32)
 			continue
 		}
-		if expected.IP.Valid && cl.IP.IPNet.String() != expected.IP.IPNet.String() {
-			t.Logf("connection log %d: expected IP %s, got %s", idx+1, expected.IP.IPNet, cl.IP.IPNet)
+		if expected.Ip.Valid && cl.Ip.IPNet.String() != expected.Ip.IPNet.String() {
+			t.Logf("connection log %d: expected IP %s, got %s", idx+1, expected.Ip.IPNet, cl.Ip.IPNet)
 			continue
 		}
 		if expected.UserAgent.Valid && cl.UserAgent.String != expected.UserAgent.String {