fix(site): display error message when template file access fails

Previously, when users without update permissions on a template tried to view template files, the UI would show an infinite loader. This was confusing because the backend correctly returned a 404 error with the message "Resource not found or you do not have access to this resource", but the frontend didn't handle this error case. This change updates the TemplateFilesPage component to: - Check for query errors when fetching template files - Display the ErrorAlert component with the backend error message - Provide clear feedback to users about permission issues Fixes #20708 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-12 12:38:08 +00:00
494 changed files with 8549 additions and 24138 deletions
@@ -191,7 +191,7 @@ jobs:

      # Check for any typos
      - name: Check for typos
-        uses: crate-ci/typos@626c4bedb751ce0b7f03262ca97ddda9a076ae1c # v1.39.2
+        uses: crate-ci/typos@07d900b8fa1097806b8adb6391b0d3e0ac2fdea7 # v1.39.0
        with:
          config: .github/workflows/typos.toml

@@ -756,14 +756,6 @@ jobs:
          path: ./site/test-results/**/*.webm
          retention-days: 7

-      - name: Upload debug log
-        if: always() && github.actor != 'dependabot[bot]' && runner.os == 'Linux' && !github.event.pull_request.head.repo.fork
-        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
-        with:
-          name: coderd-debug-logs${{ matrix.variant.premium && '-premium' || ''  }}
-          path: ./site/e2e/test-results/debug.log
-          retention-days: 7
-
      - name: Upload pprof dumps
        if: always() && github.actor != 'dependabot[bot]' && runner.os == 'Linux' && !github.event.pull_request.head.repo.fork
        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
@@ -1,205 +0,0 @@
-# This workflow checks if a PR requires documentation updates.
-# It creates a Coder Task that uses AI to analyze the PR changes,
-# search existing docs, and comment with recommendations.
-#
-# Triggered by: Adding the "doc-check" label to a PR, or manual dispatch.
-
-name: AI Documentation Check
-
-on:
-  pull_request:
-    types:
-      - labeled
-  workflow_dispatch:
-    inputs:
-      pr_url:
-        description: "Pull Request URL to check"
-        required: true
-        type: string
-      template_preset:
-        description: "Template preset to use"
-        required: false
-        default: ""
-        type: string
-
-jobs:
-  doc-check:
-    name: Analyze PR for Documentation Updates Needed
-    runs-on: ubuntu-latest
-    if: |
-      (github.event.label.name == 'doc-check' || github.event_name == 'workflow_dispatch') &&
-      (github.event.pull_request.draft == false || github.event_name == 'workflow_dispatch')
-    timeout-minutes: 30
-    env:
-      CODER_URL: ${{ secrets.DOC_CHECK_CODER_URL }}
-      CODER_SESSION_TOKEN: ${{ secrets.DOC_CHECK_CODER_SESSION_TOKEN }}
-    permissions:
-      contents: read
-      pull-requests: write
-      actions: write
-
-    steps:
-      - name: Determine PR Context
-        id: determine-context
-        env:
-          GITHUB_ACTOR: ${{ github.actor }}
-          GITHUB_EVENT_NAME: ${{ github.event_name }}
-          GITHUB_EVENT_PR_HTML_URL: ${{ github.event.pull_request.html_url }}
-          GITHUB_EVENT_PR_NUMBER: ${{ github.event.pull_request.number }}
-          GITHUB_EVENT_SENDER_ID: ${{ github.event.sender.id }}
-          GITHUB_EVENT_SENDER_LOGIN: ${{ github.event.sender.login }}
-          INPUTS_PR_URL: ${{ inputs.pr_url }}
-          INPUTS_TEMPLATE_PRESET: ${{ inputs.template_preset || '' }}
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          echo "Using template preset: ${INPUTS_TEMPLATE_PRESET}"
-          echo "template_preset=${INPUTS_TEMPLATE_PRESET}" >> "${GITHUB_OUTPUT}"
-
-          # For workflow_dispatch, use the provided PR URL
-          if [[ "${GITHUB_EVENT_NAME}" == "workflow_dispatch" ]]; then
-            if ! GITHUB_USER_ID=$(gh api "users/${GITHUB_ACTOR}" --jq '.id'); then
-              echo "::error::Failed to get GitHub user ID for actor ${GITHUB_ACTOR}"
-              exit 1
-            fi
-            echo "Using workflow_dispatch actor: ${GITHUB_ACTOR} (ID: ${GITHUB_USER_ID})"
-            echo "github_user_id=${GITHUB_USER_ID}" >> "${GITHUB_OUTPUT}"
-            echo "github_username=${GITHUB_ACTOR}" >> "${GITHUB_OUTPUT}"
-
-            echo "Using PR URL: ${INPUTS_PR_URL}"
-            # Convert /pull/ to /issues/ for create-task-action compatibility
-            ISSUE_URL="${INPUTS_PR_URL/\/pull\//\/issues\/}"
-            echo "pr_url=${ISSUE_URL}" >> "${GITHUB_OUTPUT}"
-
-            # Extract PR number from URL for later use
-            PR_NUMBER=$(echo "${INPUTS_PR_URL}" | grep -oP '(?<=pull/)\d+')
-            echo "pr_number=${PR_NUMBER}" >> "${GITHUB_OUTPUT}"
-
-          elif [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then
-            GITHUB_USER_ID=${GITHUB_EVENT_SENDER_ID}
-            echo "Using label adder: ${GITHUB_EVENT_SENDER_LOGIN} (ID: ${GITHUB_USER_ID})"
-            echo "github_user_id=${GITHUB_USER_ID}" >> "${GITHUB_OUTPUT}"
-            echo "github_username=${GITHUB_EVENT_SENDER_LOGIN}" >> "${GITHUB_OUTPUT}"
-
-            echo "Using PR URL: ${GITHUB_EVENT_PR_HTML_URL}"
-            # Convert /pull/ to /issues/ for create-task-action compatibility
-            ISSUE_URL="${GITHUB_EVENT_PR_HTML_URL/\/pull\//\/issues\/}"
-            echo "pr_url=${ISSUE_URL}" >> "${GITHUB_OUTPUT}"
-            echo "pr_number=${GITHUB_EVENT_PR_NUMBER}" >> "${GITHUB_OUTPUT}"
-
-          else
-            echo "::error::Unsupported event type: ${GITHUB_EVENT_NAME}"
-            exit 1
-          fi
-
-      - name: Extract changed files and build prompt
-        id: extract-context
-        env:
-          PR_URL: ${{ steps.determine-context.outputs.pr_url }}
-          PR_NUMBER: ${{ steps.determine-context.outputs.pr_number }}
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          echo "Analyzing PR #${PR_NUMBER}"
-
-          # Build task prompt - using unquoted heredoc so variables expand
-          TASK_PROMPT=$(cat <<EOF
-          Review PR #${PR_NUMBER} and determine if documentation needs updating or creating.
-
-          PR URL: ${PR_URL}
-
-          WORKFLOW:
-            1. Setup (repo is pre-cloned at ~/coder)
-               cd ~/coder
-               git fetch origin pull/${PR_NUMBER}/head:pr-${PR_NUMBER}
-               git checkout pr-${PR_NUMBER}
-
-            2. Get PR info
-               Use GitHub MCP tools to get PR title, body, and diff
-               Or use: git diff main...pr-${PR_NUMBER}
-
-            3. Understand Changes
-               Read the diff and identify what changed
-               Ask: Is this user-facing? Does it change behavior? Is it a new feature?
-
-            4. Search for Related Docs
-               cat ~/coder/docs/manifest.json | jq '.routes[] | {title, path}' | head -50
-               grep -ri "relevant_term" ~/coder/docs/ --include="*.md"
-
-            5. Decide
-               NEEDS DOCS if: New feature, API change, CLI change, behavior change, user-visible
-               NO DOCS if: Internal refactor, test-only, already documented, non-user-facing, dependency updates
-               FIRST check: Did this PR already update docs? If yes and complete, say "No Changes Needed"
-
-            6. Comment on the PR using this format
-
-          COMMENT FORMAT:
-          ## 📚 Documentation Check
-
-          ### ✅ Updates Needed
-          - **[docs/path/file.md](github_link)** - Brief what needs changing
-
-          ### 📝 New Docs Needed
-          - **docs/suggested/location.md** - What should be documented
-
-          ### ✨ No Changes Needed
-          [Reason: Documents already updated in PR | Internal changes only | Test-only | No user-facing impact]
-
-          ---
-          *This comment was generated by an AI Agent through [Coder Tasks](https://coder.com/docs/ai-coder/tasks)*
-
-          DOCS STRUCTURE:
-            Read ~/coder/docs/manifest.json for the complete documentation structure.
-            Common areas include: reference/, admin/, user-guides/, ai-coder/, install/, tutorials/
-            But check manifest.json - it has everything.
-
-          EOF
-          )
-
-          # Output the prompt
-          {
-            echo "task_prompt<<EOFOUTPUT"
-            echo "${TASK_PROMPT}"
-            echo "EOFOUTPUT"
-          } >> "${GITHUB_OUTPUT}"
-
-      - name: Checkout create-task-action
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          fetch-depth: 1
-          path: ./.github/actions/create-task-action
-          persist-credentials: false
-          ref: main
-          repository: coder/create-task-action
-
-      - name: Create Coder Task for Documentation Check
-        id: create_task
-        uses: ./.github/actions/create-task-action
-        with:
-          coder-url: ${{ secrets.DOC_CHECK_CODER_URL }}
-          coder-token: ${{ secrets.DOC_CHECK_CODER_SESSION_TOKEN }}
-          coder-organization: "default"
-          coder-template-name: coder
-          coder-template-preset: ${{ steps.determine-context.outputs.template_preset }}
-          coder-task-name-prefix: doc-check
-          coder-task-prompt: ${{ steps.extract-context.outputs.task_prompt }}
-          github-user-id: ${{ steps.determine-context.outputs.github_user_id }}
-          github-token: ${{ github.token }}
-          github-issue-url: ${{ steps.determine-context.outputs.pr_url }}
-          comment-on-issue: true
-
-      - name: Write outputs
-        env:
-          TASK_CREATED: ${{ steps.create_task.outputs.task-created }}
-          TASK_NAME: ${{ steps.create_task.outputs.task-name }}
-          TASK_URL: ${{ steps.create_task.outputs.task-url }}
-          PR_URL: ${{ steps.determine-context.outputs.pr_url }}
-        run: |
-          {
-            echo "## Documentation Check Task"
-            echo ""
-            echo "**PR:** ${PR_URL}"
-            echo "**Task created:** ${TASK_CREATED}"
-            echo "**Task name:** ${TASK_NAME}"
-            echo "**Task URL:** ${TASK_URL}"
-            echo ""
-            echo "The Coder task is analyzing the PR changes and will comment with documentation recommendations."
-          } >> "${GITHUB_STEP_SUMMARY}"
@@ -785,7 +785,7 @@ jobs:

      - name: Send repository-dispatch event
        if: ${{ !inputs.dry_run }}
-        uses: peter-evans/repository-dispatch@28959ce8df70de7be546dd1250a005dd32156697 # v4.0.1
+        uses: peter-evans/repository-dispatch@5fc4efd1a4797ddb68ffd0714a238564e4cc0e6f # v4.0.0
        with:
          token: ${{ secrets.CDRCI_GITHUB_TOKEN }}
          repository: coder/packages
@@ -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@014f16e7ab1402f30e7c3329d33797e7948572db # v3.29.5
+        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
        with:
          sarif_file: results.sarif
@@ -40,7 +40,7 @@ jobs:
        uses: ./.github/actions/setup-go

      - name: Initialize CodeQL
-        uses: github/codeql-action/init@014f16e7ab1402f30e7c3329d33797e7948572db # v3.29.5
+        uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
        with:
          languages: go, javascript

@@ -50,7 +50,7 @@ jobs:
          rm Makefile

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@014f16e7ab1402f30e7c3329d33797e7948572db # v3.29.5
+        uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5

      - name: Send Slack notification on failure
        if: ${{ failure() }}
@@ -154,7 +154,7 @@ jobs:
          severity: "CRITICAL,HIGH"

      - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@014f16e7ab1402f30e7c3329d33797e7948572db # v3.29.5
+        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v3.29.5
        with:
          sarif_file: trivy-results.sarif
          category: "Trivy"
@@ -9,7 +9,6 @@ IST = "IST"
 MacOS = "macOS"
 AKS = "AKS"
 O_WRONLY = "O_WRONLY"
-AIBridge = "AI Bridge"

 [default.extend-words]
 AKS = "AKS"
@@ -27,5 +27,3 @@ coderd/schedule/autostop.go @deansheather @DanielleMaywood
 # well as guidance from revenue.
 coderd/usage/ @deansheather @spikecurtis
 enterprise/coderd/usage/ @deansheather @spikecurtis
-
-.github/ 	@jdomeracki-coder
@@ -642,7 +642,6 @@ AIBRIDGED_MOCKS := \
 GEN_FILES := \
 	tailnet/proto/tailnet.pb.go \
 	agent/proto/agent.pb.go \
-	agent/agentsocket/proto/agentsocket.pb.go \
 	provisionersdk/proto/provisioner.pb.go \
 	provisionerd/proto/provisionerd.pb.go \
 	vpn/vpn.pb.go \
@@ -697,7 +696,6 @@ gen/mark-fresh:
 		agent/proto/agent.pb.go \
 		provisionersdk/proto/provisioner.pb.go \
 		provisionerd/proto/provisionerd.pb.go \
-		agent/agentsocket/proto/agentsocket.pb.go \
 		vpn/vpn.pb.go \
 		enterprise/aibridged/proto/aibridged.pb.go \
 		coderd/database/dump.sql \
@@ -802,14 +800,6 @@ agent/proto/agent.pb.go: agent/proto/agent.proto
 		--go-drpc_opt=paths=source_relative \
 		./agent/proto/agent.proto

-agent/agentsocket/proto/agentsocket.pb.go: agent/agentsocket/proto/agentsocket.proto
-	protoc \
-		--go_out=. \
-		--go_opt=paths=source_relative \
-		--go-drpc_out=. \
-		--go-drpc_opt=paths=source_relative \
-		./agent/agentsocket/proto/agentsocket.proto
-
 provisionersdk/proto/provisioner.pb.go: provisionersdk/proto/provisioner.proto
 	protoc \
 		--go_out=. \
@@ -8,7 +8,6 @@ import (
 	"fmt"
 	"hash/fnv"
 	"io"
-	"maps"
 	"net"
 	"net/http"
 	"net/netip"
@@ -71,21 +70,16 @@ const (
 )

 type Options struct {
-	Filesystem             afero.Fs
-	LogDir                 string
-	TempDir                string
-	ScriptDataDir          string
-	Client                 Client
-	ReconnectingPTYTimeout time.Duration
-	EnvironmentVariables   map[string]string
-	Logger                 slog.Logger
-	// IgnorePorts tells the api handler which ports to ignore when
-	// listing all listening ports. This is helpful to hide ports that
-	// are used by the agent, that the user does not care about.
-	IgnorePorts map[int]string
-	// ListeningPortsGetter is used to get the list of listening ports. Only
-	// tests should set this. If unset, a default that queries the OS will be used.
-	ListeningPortsGetter         ListeningPortsGetter
+	Filesystem                   afero.Fs
+	LogDir                       string
+	TempDir                      string
+	ScriptDataDir                string
+	Client                       Client
+	ReconnectingPTYTimeout       time.Duration
+	EnvironmentVariables         map[string]string
+	Logger                       slog.Logger
+	IgnorePorts                  map[int]string
+	PortCacheDuration            time.Duration
 	SSHMaxTimeout                time.Duration
 	TailnetListenPort            uint16
 	Subsystems                   []codersdk.AgentSubsystem
@@ -143,7 +137,9 @@ func New(options Options) Agent {
 	if options.ServiceBannerRefreshInterval == 0 {
 		options.ServiceBannerRefreshInterval = 2 * time.Minute
 	}
-
+	if options.PortCacheDuration == 0 {
+		options.PortCacheDuration = 1 * time.Second
+	}
 	if options.Clock == nil {
 		options.Clock = quartz.NewReal()
 	}
@@ -157,38 +153,30 @@ func New(options Options) Agent {
 		options.Execer = agentexec.DefaultExecer
 	}

-	if options.ListeningPortsGetter == nil {
-		options.ListeningPortsGetter = &osListeningPortsGetter{
-			cacheDuration: 1 * time.Second,
-		}
-	}
-
 	hardCtx, hardCancel := context.WithCancel(context.Background())
 	gracefulCtx, gracefulCancel := context.WithCancel(hardCtx)
 	a := &agent{
-		clock:                   options.Clock,
-		tailnetListenPort:       options.TailnetListenPort,
-		reconnectingPTYTimeout:  options.ReconnectingPTYTimeout,
-		logger:                  options.Logger,
-		gracefulCtx:             gracefulCtx,
-		gracefulCancel:          gracefulCancel,
-		hardCtx:                 hardCtx,
-		hardCancel:              hardCancel,
-		coordDisconnected:       make(chan struct{}),
-		environmentVariables:    options.EnvironmentVariables,
-		client:                  options.Client,
-		filesystem:              options.Filesystem,
-		logDir:                  options.LogDir,
-		tempDir:                 options.TempDir,
-		scriptDataDir:           options.ScriptDataDir,
-		lifecycleUpdate:         make(chan struct{}, 1),
-		lifecycleReported:       make(chan codersdk.WorkspaceAgentLifecycle, 1),
-		lifecycleStates:         []agentsdk.PostLifecycleRequest{{State: codersdk.WorkspaceAgentLifecycleCreated}},
-		reportConnectionsUpdate: make(chan struct{}, 1),
-		listeningPortsHandler: listeningPortsHandler{
-			getter:      options.ListeningPortsGetter,
-			ignorePorts: maps.Clone(options.IgnorePorts),
-		},
+		clock:                              options.Clock,
+		tailnetListenPort:                  options.TailnetListenPort,
+		reconnectingPTYTimeout:             options.ReconnectingPTYTimeout,
+		logger:                             options.Logger,
+		gracefulCtx:                        gracefulCtx,
+		gracefulCancel:                     gracefulCancel,
+		hardCtx:                            hardCtx,
+		hardCancel:                         hardCancel,
+		coordDisconnected:                  make(chan struct{}),
+		environmentVariables:               options.EnvironmentVariables,
+		client:                             options.Client,
+		filesystem:                         options.Filesystem,
+		logDir:                             options.LogDir,
+		tempDir:                            options.TempDir,
+		scriptDataDir:                      options.ScriptDataDir,
+		lifecycleUpdate:                    make(chan struct{}, 1),
+		lifecycleReported:                  make(chan codersdk.WorkspaceAgentLifecycle, 1),
+		lifecycleStates:                    []agentsdk.PostLifecycleRequest{{State: codersdk.WorkspaceAgentLifecycleCreated}},
+		reportConnectionsUpdate:            make(chan struct{}, 1),
+		ignorePorts:                        options.IgnorePorts,
+		portCacheDuration:                  options.PortCacheDuration,
 		reportMetadataInterval:             options.ReportMetadataInterval,
 		announcementBannersRefreshInterval: options.ServiceBannerRefreshInterval,
 		sshMaxTimeout:                      options.SSHMaxTimeout,
@@ -214,16 +202,20 @@ func New(options Options) Agent {
 }

 type agent struct {
-	clock                 quartz.Clock
-	logger                slog.Logger
-	client                Client
-	tailnetListenPort     uint16
-	filesystem            afero.Fs
-	logDir                string
-	tempDir               string
-	scriptDataDir         string
-	listeningPortsHandler listeningPortsHandler
-	subsystems            []codersdk.AgentSubsystem
+	clock             quartz.Clock
+	logger            slog.Logger
+	client            Client
+	tailnetListenPort uint16
+	filesystem        afero.Fs
+	logDir            string
+	tempDir           string
+	scriptDataDir     string
+	// ignorePorts tells the api handler which ports to ignore when
+	// listing all listening ports. This is helpful to hide ports that
+	// are used by the agent, that the user does not care about.
+	ignorePorts       map[int]string
+	portCacheDuration time.Duration
+	subsystems        []codersdk.AgentSubsystem

 	reconnectingPTYTimeout time.Duration
 	reconnectingPTYServer  *reconnectingpty.Server
@@ -1,968 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.30.0
-// 	protoc        v4.23.4
-// source: agent/agentsocket/proto/agentsocket.proto
-
-package proto
-
-import (
-	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
-	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
-	reflect "reflect"
-	sync "sync"
-)
-
-const (
-	// Verify that this generated code is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
-	// Verify that runtime/protoimpl is sufficiently up-to-date.
-	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
-)
-
-type PingRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *PingRequest) Reset() {
-	*x = PingRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PingRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PingRequest) ProtoMessage() {}
-
-func (x *PingRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[0]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PingRequest.ProtoReflect.Descriptor instead.
-func (*PingRequest) Descriptor() ([]byte, []int) {
-	return file_agent_agentsocket_proto_agentsocket_proto_rawDescGZIP(), []int{0}
-}
-
-type PingResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *PingResponse) Reset() {
-	*x = PingResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PingResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PingResponse) ProtoMessage() {}
-
-func (x *PingResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[1]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use PingResponse.ProtoReflect.Descriptor instead.
-func (*PingResponse) Descriptor() ([]byte, []int) {
-	return file_agent_agentsocket_proto_agentsocket_proto_rawDescGZIP(), []int{1}
-}
-
-type SyncStartRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Unit string `protobuf:"bytes,1,opt,name=unit,proto3" json:"unit,omitempty"`
-}
-
-func (x *SyncStartRequest) Reset() {
-	*x = SyncStartRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SyncStartRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SyncStartRequest) ProtoMessage() {}
-
-func (x *SyncStartRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[2]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SyncStartRequest.ProtoReflect.Descriptor instead.
-func (*SyncStartRequest) Descriptor() ([]byte, []int) {
-	return file_agent_agentsocket_proto_agentsocket_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *SyncStartRequest) GetUnit() string {
-	if x != nil {
-		return x.Unit
-	}
-	return ""
-}
-
-type SyncStartResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *SyncStartResponse) Reset() {
-	*x = SyncStartResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[3]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SyncStartResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SyncStartResponse) ProtoMessage() {}
-
-func (x *SyncStartResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[3]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SyncStartResponse.ProtoReflect.Descriptor instead.
-func (*SyncStartResponse) Descriptor() ([]byte, []int) {
-	return file_agent_agentsocket_proto_agentsocket_proto_rawDescGZIP(), []int{3}
-}
-
-type SyncWantRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Unit      string `protobuf:"bytes,1,opt,name=unit,proto3" json:"unit,omitempty"`
-	DependsOn string `protobuf:"bytes,2,opt,name=depends_on,json=dependsOn,proto3" json:"depends_on,omitempty"`
-}
-
-func (x *SyncWantRequest) Reset() {
-	*x = SyncWantRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[4]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SyncWantRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SyncWantRequest) ProtoMessage() {}
-
-func (x *SyncWantRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[4]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SyncWantRequest.ProtoReflect.Descriptor instead.
-func (*SyncWantRequest) Descriptor() ([]byte, []int) {
-	return file_agent_agentsocket_proto_agentsocket_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *SyncWantRequest) GetUnit() string {
-	if x != nil {
-		return x.Unit
-	}
-	return ""
-}
-
-func (x *SyncWantRequest) GetDependsOn() string {
-	if x != nil {
-		return x.DependsOn
-	}
-	return ""
-}
-
-type SyncWantResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *SyncWantResponse) Reset() {
-	*x = SyncWantResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SyncWantResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SyncWantResponse) ProtoMessage() {}
-
-func (x *SyncWantResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SyncWantResponse.ProtoReflect.Descriptor instead.
-func (*SyncWantResponse) Descriptor() ([]byte, []int) {
-	return file_agent_agentsocket_proto_agentsocket_proto_rawDescGZIP(), []int{5}
-}
-
-type SyncCompleteRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Unit string `protobuf:"bytes,1,opt,name=unit,proto3" json:"unit,omitempty"`
-}
-
-func (x *SyncCompleteRequest) Reset() {
-	*x = SyncCompleteRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[6]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SyncCompleteRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SyncCompleteRequest) ProtoMessage() {}
-
-func (x *SyncCompleteRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[6]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SyncCompleteRequest.ProtoReflect.Descriptor instead.
-func (*SyncCompleteRequest) Descriptor() ([]byte, []int) {
-	return file_agent_agentsocket_proto_agentsocket_proto_rawDescGZIP(), []int{6}
-}
-
-func (x *SyncCompleteRequest) GetUnit() string {
-	if x != nil {
-		return x.Unit
-	}
-	return ""
-}
-
-type SyncCompleteResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *SyncCompleteResponse) Reset() {
-	*x = SyncCompleteResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[7]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SyncCompleteResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SyncCompleteResponse) ProtoMessage() {}
-
-func (x *SyncCompleteResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[7]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SyncCompleteResponse.ProtoReflect.Descriptor instead.
-func (*SyncCompleteResponse) Descriptor() ([]byte, []int) {
-	return file_agent_agentsocket_proto_agentsocket_proto_rawDescGZIP(), []int{7}
-}
-
-type SyncReadyRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Unit string `protobuf:"bytes,1,opt,name=unit,proto3" json:"unit,omitempty"`
-}
-
-func (x *SyncReadyRequest) Reset() {
-	*x = SyncReadyRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[8]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SyncReadyRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SyncReadyRequest) ProtoMessage() {}
-
-func (x *SyncReadyRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[8]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SyncReadyRequest.ProtoReflect.Descriptor instead.
-func (*SyncReadyRequest) Descriptor() ([]byte, []int) {
-	return file_agent_agentsocket_proto_agentsocket_proto_rawDescGZIP(), []int{8}
-}
-
-func (x *SyncReadyRequest) GetUnit() string {
-	if x != nil {
-		return x.Unit
-	}
-	return ""
-}
-
-type SyncReadyResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Ready bool `protobuf:"varint,1,opt,name=ready,proto3" json:"ready,omitempty"`
-}
-
-func (x *SyncReadyResponse) Reset() {
-	*x = SyncReadyResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SyncReadyResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SyncReadyResponse) ProtoMessage() {}
-
-func (x *SyncReadyResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[9]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SyncReadyResponse.ProtoReflect.Descriptor instead.
-func (*SyncReadyResponse) Descriptor() ([]byte, []int) {
-	return file_agent_agentsocket_proto_agentsocket_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *SyncReadyResponse) GetReady() bool {
-	if x != nil {
-		return x.Ready
-	}
-	return false
-}
-
-type SyncStatusRequest struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Unit string `protobuf:"bytes,1,opt,name=unit,proto3" json:"unit,omitempty"`
-}
-
-func (x *SyncStatusRequest) Reset() {
-	*x = SyncStatusRequest{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[10]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SyncStatusRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SyncStatusRequest) ProtoMessage() {}
-
-func (x *SyncStatusRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[10]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SyncStatusRequest.ProtoReflect.Descriptor instead.
-func (*SyncStatusRequest) Descriptor() ([]byte, []int) {
-	return file_agent_agentsocket_proto_agentsocket_proto_rawDescGZIP(), []int{10}
-}
-
-func (x *SyncStatusRequest) GetUnit() string {
-	if x != nil {
-		return x.Unit
-	}
-	return ""
-}
-
-type DependencyInfo struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Unit           string `protobuf:"bytes,1,opt,name=unit,proto3" json:"unit,omitempty"`
-	DependsOn      string `protobuf:"bytes,2,opt,name=depends_on,json=dependsOn,proto3" json:"depends_on,omitempty"`
-	RequiredStatus string `protobuf:"bytes,3,opt,name=required_status,json=requiredStatus,proto3" json:"required_status,omitempty"`
-	CurrentStatus  string `protobuf:"bytes,4,opt,name=current_status,json=currentStatus,proto3" json:"current_status,omitempty"`
-	IsSatisfied    bool   `protobuf:"varint,5,opt,name=is_satisfied,json=isSatisfied,proto3" json:"is_satisfied,omitempty"`
-}
-
-func (x *DependencyInfo) Reset() {
-	*x = DependencyInfo{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[11]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *DependencyInfo) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*DependencyInfo) ProtoMessage() {}
-
-func (x *DependencyInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[11]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use DependencyInfo.ProtoReflect.Descriptor instead.
-func (*DependencyInfo) Descriptor() ([]byte, []int) {
-	return file_agent_agentsocket_proto_agentsocket_proto_rawDescGZIP(), []int{11}
-}
-
-func (x *DependencyInfo) GetUnit() string {
-	if x != nil {
-		return x.Unit
-	}
-	return ""
-}
-
-func (x *DependencyInfo) GetDependsOn() string {
-	if x != nil {
-		return x.DependsOn
-	}
-	return ""
-}
-
-func (x *DependencyInfo) GetRequiredStatus() string {
-	if x != nil {
-		return x.RequiredStatus
-	}
-	return ""
-}
-
-func (x *DependencyInfo) GetCurrentStatus() string {
-	if x != nil {
-		return x.CurrentStatus
-	}
-	return ""
-}
-
-func (x *DependencyInfo) GetIsSatisfied() bool {
-	if x != nil {
-		return x.IsSatisfied
-	}
-	return false
-}
-
-type SyncStatusResponse struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Status       string            `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"`
-	IsReady      bool              `protobuf:"varint,2,opt,name=is_ready,json=isReady,proto3" json:"is_ready,omitempty"`
-	Dependencies []*DependencyInfo `protobuf:"bytes,3,rep,name=dependencies,proto3" json:"dependencies,omitempty"`
-}
-
-func (x *SyncStatusResponse) Reset() {
-	*x = SyncStatusResponse{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[12]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *SyncStatusResponse) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*SyncStatusResponse) ProtoMessage() {}
-
-func (x *SyncStatusResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_agent_agentsocket_proto_agentsocket_proto_msgTypes[12]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use SyncStatusResponse.ProtoReflect.Descriptor instead.
-func (*SyncStatusResponse) Descriptor() ([]byte, []int) {
-	return file_agent_agentsocket_proto_agentsocket_proto_rawDescGZIP(), []int{12}
-}
-
-func (x *SyncStatusResponse) GetStatus() string {
-	if x != nil {
-		return x.Status
-	}
-	return ""
-}
-
-func (x *SyncStatusResponse) GetIsReady() bool {
-	if x != nil {
-		return x.IsReady
-	}
-	return false
-}
-
-func (x *SyncStatusResponse) GetDependencies() []*DependencyInfo {
-	if x != nil {
-		return x.Dependencies
-	}
-	return nil
-}
-
-var File_agent_agentsocket_proto_agentsocket_proto protoreflect.FileDescriptor
-
-var file_agent_agentsocket_proto_agentsocket_proto_rawDesc = []byte{
-	0x0a, 0x29, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x6f, 0x63,
-	0x6b, 0x65, 0x74, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73,
-	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x14, 0x63, 0x6f, 0x64,
-	0x65, 0x72, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x76,
-	0x31, 0x22, 0x0d, 0x0a, 0x0b, 0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x22, 0x0e, 0x0a, 0x0c, 0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x22, 0x26, 0x0a, 0x10, 0x53, 0x79, 0x6e, 0x63, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x71,
-	0x75, 0x65, 0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x6e, 0x69, 0x74, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x04, 0x75, 0x6e, 0x69, 0x74, 0x22, 0x13, 0x0a, 0x11, 0x53, 0x79, 0x6e, 0x63,
-	0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x44, 0x0a,
-	0x0f, 0x53, 0x79, 0x6e, 0x63, 0x57, 0x61, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
-	0x12, 0x12, 0x0a, 0x04, 0x75, 0x6e, 0x69, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x75, 0x6e, 0x69, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x73, 0x5f,
-	0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64,
-	0x73, 0x4f, 0x6e, 0x22, 0x12, 0x0a, 0x10, 0x53, 0x79, 0x6e, 0x63, 0x57, 0x61, 0x6e, 0x74, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x29, 0x0a, 0x13, 0x53, 0x79, 0x6e, 0x63, 0x43,
-	0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12,
-	0x0a, 0x04, 0x75, 0x6e, 0x69, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x6e,
-	0x69, 0x74, 0x22, 0x16, 0x0a, 0x14, 0x53, 0x79, 0x6e, 0x63, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65,
-	0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0x0a, 0x10, 0x53, 0x79,
-	0x6e, 0x63, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x12,
-	0x0a, 0x04, 0x75, 0x6e, 0x69, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x6e,
-	0x69, 0x74, 0x22, 0x29, 0x0a, 0x11, 0x53, 0x79, 0x6e, 0x63, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52,
-	0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x72, 0x65, 0x61, 0x64, 0x79, 0x22, 0x27, 0x0a,
-	0x11, 0x53, 0x79, 0x6e, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65,
-	0x73, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x6e, 0x69, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x04, 0x75, 0x6e, 0x69, 0x74, 0x22, 0xb6, 0x01, 0x0a, 0x0e, 0x44, 0x65, 0x70, 0x65, 0x6e,
-	0x64, 0x65, 0x6e, 0x63, 0x79, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x6e, 0x69,
-	0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x75, 0x6e, 0x69, 0x74, 0x12, 0x1d, 0x0a,
-	0x0a, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x73, 0x5f, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x09, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x73, 0x4f, 0x6e, 0x12, 0x27, 0x0a, 0x0f,
-	0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x72, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x64, 0x53,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x63, 0x75, 0x72, 0x72, 0x65, 0x6e, 0x74,
-	0x5f, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63,
-	0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x21, 0x0a, 0x0c,
-	0x69, 0x73, 0x5f, 0x73, 0x61, 0x74, 0x69, 0x73, 0x66, 0x69, 0x65, 0x64, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x53, 0x61, 0x74, 0x69, 0x73, 0x66, 0x69, 0x65, 0x64, 0x22,
-	0x91, 0x01, 0x0a, 0x12, 0x53, 0x79, 0x6e, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x19,
-	0x0a, 0x08, 0x69, 0x73, 0x5f, 0x72, 0x65, 0x61, 0x64, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
-	0x52, 0x07, 0x69, 0x73, 0x52, 0x65, 0x61, 0x64, 0x79, 0x12, 0x48, 0x0a, 0x0c, 0x64, 0x65, 0x70,
-	0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63, 0x69, 0x65, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32,
-	0x24, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x6f, 0x63,
-	0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x44, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63,
-	0x79, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0c, 0x64, 0x65, 0x70, 0x65, 0x6e, 0x64, 0x65, 0x6e, 0x63,
-	0x69, 0x65, 0x73, 0x32, 0xbb, 0x04, 0x0a, 0x0b, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x53, 0x6f, 0x63,
-	0x6b, 0x65, 0x74, 0x12, 0x4d, 0x0a, 0x04, 0x50, 0x69, 0x6e, 0x67, 0x12, 0x21, 0x2e, 0x63, 0x6f,
-	0x64, 0x65, 0x72, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e,
-	0x76, 0x31, 0x2e, 0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x22,
-	0x2e, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x6f, 0x63, 0x6b,
-	0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x5c, 0x0a, 0x09, 0x53, 0x79, 0x6e, 0x63, 0x53, 0x74, 0x61, 0x72, 0x74, 0x12,
-	0x26, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x6f, 0x63,
-	0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x53, 0x74, 0x61, 0x72, 0x74,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2e,
-	0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x53,
-	0x79, 0x6e, 0x63, 0x53, 0x74, 0x61, 0x72, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x59, 0x0a, 0x08, 0x53, 0x79, 0x6e, 0x63, 0x57, 0x61, 0x6e, 0x74, 0x12, 0x25, 0x2e, 0x63,
-	0x6f, 0x64, 0x65, 0x72, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74,
-	0x2e, 0x76, 0x31, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x57, 0x61, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75,
-	0x65, 0x73, 0x74, 0x1a, 0x26, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2e, 0x61, 0x67, 0x65, 0x6e,
-	0x74, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x57,
-	0x61, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x65, 0x0a, 0x0c, 0x53,
-	0x79, 0x6e, 0x63, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x12, 0x29, 0x2e, 0x63, 0x6f,
-	0x64, 0x65, 0x72, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e,
-	0x76, 0x31, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52,
-	0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2a, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2e, 0x61,
-	0x67, 0x65, 0x6e, 0x74, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x79,
-	0x6e, 0x63, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e,
-	0x73, 0x65, 0x12, 0x5c, 0x0a, 0x09, 0x53, 0x79, 0x6e, 0x63, 0x52, 0x65, 0x61, 0x64, 0x79, 0x12,
-	0x26, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x6f, 0x63,
-	0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x52, 0x65, 0x61, 0x64, 0x79,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x27, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2e,
-	0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x53,
-	0x79, 0x6e, 0x63, 0x52, 0x65, 0x61, 0x64, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65,
-	0x12, 0x5f, 0x0a, 0x0a, 0x53, 0x79, 0x6e, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x27,
-	0x2e, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x6f, 0x63, 0x6b,
-	0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x53, 0x79, 0x6e, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x28, 0x2e, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2e,
-	0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x2e, 0x76, 0x31, 0x2e, 0x53,
-	0x79, 0x6e, 0x63, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73,
-	0x65, 0x42, 0x33, 0x5a, 0x31, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
-	0x63, 0x6f, 0x64, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x64, 0x65, 0x72, 0x2f, 0x76, 0x32, 0x2f, 0x61,
-	0x67, 0x65, 0x6e, 0x74, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x6f, 0x63, 0x6b, 0x65, 0x74,
-	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_agent_agentsocket_proto_agentsocket_proto_rawDescOnce sync.Once
-	file_agent_agentsocket_proto_agentsocket_proto_rawDescData = file_agent_agentsocket_proto_agentsocket_proto_rawDesc
-)
-
-func file_agent_agentsocket_proto_agentsocket_proto_rawDescGZIP() []byte {
-	file_agent_agentsocket_proto_agentsocket_proto_rawDescOnce.Do(func() {
-		file_agent_agentsocket_proto_agentsocket_proto_rawDescData = protoimpl.X.CompressGZIP(file_agent_agentsocket_proto_agentsocket_proto_rawDescData)
-	})
-	return file_agent_agentsocket_proto_agentsocket_proto_rawDescData
-}
-
-var file_agent_agentsocket_proto_agentsocket_proto_msgTypes = make([]protoimpl.MessageInfo, 13)
-var file_agent_agentsocket_proto_agentsocket_proto_goTypes = []interface{}{
-	(*PingRequest)(nil),          // 0: coder.agentsocket.v1.PingRequest
-	(*PingResponse)(nil),         // 1: coder.agentsocket.v1.PingResponse
-	(*SyncStartRequest)(nil),     // 2: coder.agentsocket.v1.SyncStartRequest
-	(*SyncStartResponse)(nil),    // 3: coder.agentsocket.v1.SyncStartResponse
-	(*SyncWantRequest)(nil),      // 4: coder.agentsocket.v1.SyncWantRequest
-	(*SyncWantResponse)(nil),     // 5: coder.agentsocket.v1.SyncWantResponse
-	(*SyncCompleteRequest)(nil),  // 6: coder.agentsocket.v1.SyncCompleteRequest
-	(*SyncCompleteResponse)(nil), // 7: coder.agentsocket.v1.SyncCompleteResponse
-	(*SyncReadyRequest)(nil),     // 8: coder.agentsocket.v1.SyncReadyRequest
-	(*SyncReadyResponse)(nil),    // 9: coder.agentsocket.v1.SyncReadyResponse
-	(*SyncStatusRequest)(nil),    // 10: coder.agentsocket.v1.SyncStatusRequest
-	(*DependencyInfo)(nil),       // 11: coder.agentsocket.v1.DependencyInfo
-	(*SyncStatusResponse)(nil),   // 12: coder.agentsocket.v1.SyncStatusResponse
-}
-var file_agent_agentsocket_proto_agentsocket_proto_depIdxs = []int32{
-	11, // 0: coder.agentsocket.v1.SyncStatusResponse.dependencies:type_name -> coder.agentsocket.v1.DependencyInfo
-	0,  // 1: coder.agentsocket.v1.AgentSocket.Ping:input_type -> coder.agentsocket.v1.PingRequest
-	2,  // 2: coder.agentsocket.v1.AgentSocket.SyncStart:input_type -> coder.agentsocket.v1.SyncStartRequest
-	4,  // 3: coder.agentsocket.v1.AgentSocket.SyncWant:input_type -> coder.agentsocket.v1.SyncWantRequest
-	6,  // 4: coder.agentsocket.v1.AgentSocket.SyncComplete:input_type -> coder.agentsocket.v1.SyncCompleteRequest
-	8,  // 5: coder.agentsocket.v1.AgentSocket.SyncReady:input_type -> coder.agentsocket.v1.SyncReadyRequest
-	10, // 6: coder.agentsocket.v1.AgentSocket.SyncStatus:input_type -> coder.agentsocket.v1.SyncStatusRequest
-	1,  // 7: coder.agentsocket.v1.AgentSocket.Ping:output_type -> coder.agentsocket.v1.PingResponse
-	3,  // 8: coder.agentsocket.v1.AgentSocket.SyncStart:output_type -> coder.agentsocket.v1.SyncStartResponse
-	5,  // 9: coder.agentsocket.v1.AgentSocket.SyncWant:output_type -> coder.agentsocket.v1.SyncWantResponse
-	7,  // 10: coder.agentsocket.v1.AgentSocket.SyncComplete:output_type -> coder.agentsocket.v1.SyncCompleteResponse
-	9,  // 11: coder.agentsocket.v1.AgentSocket.SyncReady:output_type -> coder.agentsocket.v1.SyncReadyResponse
-	12, // 12: coder.agentsocket.v1.AgentSocket.SyncStatus:output_type -> coder.agentsocket.v1.SyncStatusResponse
-	7,  // [7:13] is the sub-list for method output_type
-	1,  // [1:7] is the sub-list for method input_type
-	1,  // [1:1] is the sub-list for extension type_name
-	1,  // [1:1] is the sub-list for extension extendee
-	0,  // [0:1] is the sub-list for field type_name
-}
-
-func init() { file_agent_agentsocket_proto_agentsocket_proto_init() }
-func file_agent_agentsocket_proto_agentsocket_proto_init() {
-	if File_agent_agentsocket_proto_agentsocket_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_agent_agentsocket_proto_agentsocket_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PingRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_agent_agentsocket_proto_agentsocket_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PingResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_agent_agentsocket_proto_agentsocket_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncStartRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_agent_agentsocket_proto_agentsocket_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncStartResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_agent_agentsocket_proto_agentsocket_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncWantRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_agent_agentsocket_proto_agentsocket_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncWantResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_agent_agentsocket_proto_agentsocket_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncCompleteRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_agent_agentsocket_proto_agentsocket_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncCompleteResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_agent_agentsocket_proto_agentsocket_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncReadyRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_agent_agentsocket_proto_agentsocket_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncReadyResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_agent_agentsocket_proto_agentsocket_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncStatusRequest); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_agent_agentsocket_proto_agentsocket_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*DependencyInfo); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_agent_agentsocket_proto_agentsocket_proto_msgTypes[12].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*SyncStatusResponse); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_agent_agentsocket_proto_agentsocket_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   13,
-			NumExtensions: 0,
-			NumServices:   1,
-		},
-		GoTypes:           file_agent_agentsocket_proto_agentsocket_proto_goTypes,
-		DependencyIndexes: file_agent_agentsocket_proto_agentsocket_proto_depIdxs,
-		MessageInfos:      file_agent_agentsocket_proto_agentsocket_proto_msgTypes,
-	}.Build()
-	File_agent_agentsocket_proto_agentsocket_proto = out.File
-	file_agent_agentsocket_proto_agentsocket_proto_rawDesc = nil
-	file_agent_agentsocket_proto_agentsocket_proto_goTypes = nil
-	file_agent_agentsocket_proto_agentsocket_proto_depIdxs = nil
-}
@@ -1,69 +0,0 @@
-syntax = "proto3";
-option go_package = "github.com/coder/coder/v2/agent/agentsocket/proto";
-
-package coder.agentsocket.v1;
-
-message PingRequest {}
-
-message PingResponse {}
-
-message SyncStartRequest {
-  string unit = 1;
-}
-
-message SyncStartResponse {}
-
-message SyncWantRequest {
-  string unit = 1;
-  string depends_on = 2;
-}
-
-message SyncWantResponse {}
-
-message SyncCompleteRequest {
-  string unit = 1;
-}
-
-message SyncCompleteResponse {}
-
-message SyncReadyRequest {
-  string unit = 1;
-}
-
-message SyncReadyResponse {
-  bool ready = 1;
-}
-
-message SyncStatusRequest {
-  string unit = 1;
-}
-
-message DependencyInfo {
-  string unit = 1;
-  string depends_on = 2;
-  string required_status = 3;
-  string current_status = 4;
-  bool is_satisfied = 5;
-}
-
-message SyncStatusResponse {
-  string status = 1;
-  bool is_ready = 2;
-  repeated DependencyInfo dependencies = 3;
-}
-
-// AgentSocket provides direct access to the agent over local IPC.
-service AgentSocket {
-  // Ping the agent to check if it is alive.
-  rpc Ping(PingRequest) returns (PingResponse);
-  // Report the start of a unit.
-  rpc SyncStart(SyncStartRequest) returns (SyncStartResponse);
-  // Declare a dependency between units.
-  rpc SyncWant(SyncWantRequest) returns (SyncWantResponse);
-  // Report the completion of a unit.
-  rpc SyncComplete(SyncCompleteRequest) returns (SyncCompleteResponse);
-  // Request whether a unit is ready to be started. That is, all dependencies are satisfied.
-  rpc SyncReady(SyncReadyRequest) returns (SyncReadyResponse);
-  // Get the status of a unit and list its dependencies.
-  rpc SyncStatus(SyncStatusRequest) returns (SyncStatusResponse);
-}
@@ -1,311 +0,0 @@
-// Code generated by protoc-gen-go-drpc. DO NOT EDIT.
-// protoc-gen-go-drpc version: v0.0.34
-// source: agent/agentsocket/proto/agentsocket.proto
-
-package proto
-
-import (
-	context "context"
-	errors "errors"
-	protojson "google.golang.org/protobuf/encoding/protojson"
-	proto "google.golang.org/protobuf/proto"
-	drpc "storj.io/drpc"
-	drpcerr "storj.io/drpc/drpcerr"
-)
-
-type drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto struct{}
-
-func (drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto) Marshal(msg drpc.Message) ([]byte, error) {
-	return proto.Marshal(msg.(proto.Message))
-}
-
-func (drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto) MarshalAppend(buf []byte, msg drpc.Message) ([]byte, error) {
-	return proto.MarshalOptions{}.MarshalAppend(buf, msg.(proto.Message))
-}
-
-func (drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto) Unmarshal(buf []byte, msg drpc.Message) error {
-	return proto.Unmarshal(buf, msg.(proto.Message))
-}
-
-func (drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto) JSONMarshal(msg drpc.Message) ([]byte, error) {
-	return protojson.Marshal(msg.(proto.Message))
-}
-
-func (drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto) JSONUnmarshal(buf []byte, msg drpc.Message) error {
-	return protojson.Unmarshal(buf, msg.(proto.Message))
-}
-
-type DRPCAgentSocketClient interface {
-	DRPCConn() drpc.Conn
-
-	Ping(ctx context.Context, in *PingRequest) (*PingResponse, error)
-	SyncStart(ctx context.Context, in *SyncStartRequest) (*SyncStartResponse, error)
-	SyncWant(ctx context.Context, in *SyncWantRequest) (*SyncWantResponse, error)
-	SyncComplete(ctx context.Context, in *SyncCompleteRequest) (*SyncCompleteResponse, error)
-	SyncReady(ctx context.Context, in *SyncReadyRequest) (*SyncReadyResponse, error)
-	SyncStatus(ctx context.Context, in *SyncStatusRequest) (*SyncStatusResponse, error)
-}
-
-type drpcAgentSocketClient struct {
-	cc drpc.Conn
-}
-
-func NewDRPCAgentSocketClient(cc drpc.Conn) DRPCAgentSocketClient {
-	return &drpcAgentSocketClient{cc}
-}
-
-func (c *drpcAgentSocketClient) DRPCConn() drpc.Conn { return c.cc }
-
-func (c *drpcAgentSocketClient) Ping(ctx context.Context, in *PingRequest) (*PingResponse, error) {
-	out := new(PingResponse)
-	err := c.cc.Invoke(ctx, "/coder.agentsocket.v1.AgentSocket/Ping", drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto{}, in, out)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *drpcAgentSocketClient) SyncStart(ctx context.Context, in *SyncStartRequest) (*SyncStartResponse, error) {
-	out := new(SyncStartResponse)
-	err := c.cc.Invoke(ctx, "/coder.agentsocket.v1.AgentSocket/SyncStart", drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto{}, in, out)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *drpcAgentSocketClient) SyncWant(ctx context.Context, in *SyncWantRequest) (*SyncWantResponse, error) {
-	out := new(SyncWantResponse)
-	err := c.cc.Invoke(ctx, "/coder.agentsocket.v1.AgentSocket/SyncWant", drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto{}, in, out)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *drpcAgentSocketClient) SyncComplete(ctx context.Context, in *SyncCompleteRequest) (*SyncCompleteResponse, error) {
-	out := new(SyncCompleteResponse)
-	err := c.cc.Invoke(ctx, "/coder.agentsocket.v1.AgentSocket/SyncComplete", drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto{}, in, out)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *drpcAgentSocketClient) SyncReady(ctx context.Context, in *SyncReadyRequest) (*SyncReadyResponse, error) {
-	out := new(SyncReadyResponse)
-	err := c.cc.Invoke(ctx, "/coder.agentsocket.v1.AgentSocket/SyncReady", drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto{}, in, out)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *drpcAgentSocketClient) SyncStatus(ctx context.Context, in *SyncStatusRequest) (*SyncStatusResponse, error) {
-	out := new(SyncStatusResponse)
-	err := c.cc.Invoke(ctx, "/coder.agentsocket.v1.AgentSocket/SyncStatus", drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto{}, in, out)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-type DRPCAgentSocketServer interface {
-	Ping(context.Context, *PingRequest) (*PingResponse, error)
-	SyncStart(context.Context, *SyncStartRequest) (*SyncStartResponse, error)
-	SyncWant(context.Context, *SyncWantRequest) (*SyncWantResponse, error)
-	SyncComplete(context.Context, *SyncCompleteRequest) (*SyncCompleteResponse, error)
-	SyncReady(context.Context, *SyncReadyRequest) (*SyncReadyResponse, error)
-	SyncStatus(context.Context, *SyncStatusRequest) (*SyncStatusResponse, error)
-}
-
-type DRPCAgentSocketUnimplementedServer struct{}
-
-func (s *DRPCAgentSocketUnimplementedServer) Ping(context.Context, *PingRequest) (*PingResponse, error) {
-	return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented)
-}
-
-func (s *DRPCAgentSocketUnimplementedServer) SyncStart(context.Context, *SyncStartRequest) (*SyncStartResponse, error) {
-	return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented)
-}
-
-func (s *DRPCAgentSocketUnimplementedServer) SyncWant(context.Context, *SyncWantRequest) (*SyncWantResponse, error) {
-	return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented)
-}
-
-func (s *DRPCAgentSocketUnimplementedServer) SyncComplete(context.Context, *SyncCompleteRequest) (*SyncCompleteResponse, error) {
-	return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented)
-}
-
-func (s *DRPCAgentSocketUnimplementedServer) SyncReady(context.Context, *SyncReadyRequest) (*SyncReadyResponse, error) {
-	return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented)
-}
-
-func (s *DRPCAgentSocketUnimplementedServer) SyncStatus(context.Context, *SyncStatusRequest) (*SyncStatusResponse, error) {
-	return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented)
-}
-
-type DRPCAgentSocketDescription struct{}
-
-func (DRPCAgentSocketDescription) NumMethods() int { return 6 }
-
-func (DRPCAgentSocketDescription) Method(n int) (string, drpc.Encoding, drpc.Receiver, interface{}, bool) {
-	switch n {
-	case 0:
-		return "/coder.agentsocket.v1.AgentSocket/Ping", drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto{},
-			func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) {
-				return srv.(DRPCAgentSocketServer).
-					Ping(
-						ctx,
-						in1.(*PingRequest),
-					)
-			}, DRPCAgentSocketServer.Ping, true
-	case 1:
-		return "/coder.agentsocket.v1.AgentSocket/SyncStart", drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto{},
-			func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) {
-				return srv.(DRPCAgentSocketServer).
-					SyncStart(
-						ctx,
-						in1.(*SyncStartRequest),
-					)
-			}, DRPCAgentSocketServer.SyncStart, true
-	case 2:
-		return "/coder.agentsocket.v1.AgentSocket/SyncWant", drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto{},
-			func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) {
-				return srv.(DRPCAgentSocketServer).
-					SyncWant(
-						ctx,
-						in1.(*SyncWantRequest),
-					)
-			}, DRPCAgentSocketServer.SyncWant, true
-	case 3:
-		return "/coder.agentsocket.v1.AgentSocket/SyncComplete", drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto{},
-			func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) {
-				return srv.(DRPCAgentSocketServer).
-					SyncComplete(
-						ctx,
-						in1.(*SyncCompleteRequest),
-					)
-			}, DRPCAgentSocketServer.SyncComplete, true
-	case 4:
-		return "/coder.agentsocket.v1.AgentSocket/SyncReady", drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto{},
-			func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) {
-				return srv.(DRPCAgentSocketServer).
-					SyncReady(
-						ctx,
-						in1.(*SyncReadyRequest),
-					)
-			}, DRPCAgentSocketServer.SyncReady, true
-	case 5:
-		return "/coder.agentsocket.v1.AgentSocket/SyncStatus", drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto{},
-			func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) {
-				return srv.(DRPCAgentSocketServer).
-					SyncStatus(
-						ctx,
-						in1.(*SyncStatusRequest),
-					)
-			}, DRPCAgentSocketServer.SyncStatus, true
-	default:
-		return "", nil, nil, nil, false
-	}
-}
-
-func DRPCRegisterAgentSocket(mux drpc.Mux, impl DRPCAgentSocketServer) error {
-	return mux.Register(impl, DRPCAgentSocketDescription{})
-}
-
-type DRPCAgentSocket_PingStream interface {
-	drpc.Stream
-	SendAndClose(*PingResponse) error
-}
-
-type drpcAgentSocket_PingStream struct {
-	drpc.Stream
-}
-
-func (x *drpcAgentSocket_PingStream) SendAndClose(m *PingResponse) error {
-	if err := x.MsgSend(m, drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto{}); err != nil {
-		return err
-	}
-	return x.CloseSend()
-}
-
-type DRPCAgentSocket_SyncStartStream interface {
-	drpc.Stream
-	SendAndClose(*SyncStartResponse) error
-}
-
-type drpcAgentSocket_SyncStartStream struct {
-	drpc.Stream
-}
-
-func (x *drpcAgentSocket_SyncStartStream) SendAndClose(m *SyncStartResponse) error {
-	if err := x.MsgSend(m, drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto{}); err != nil {
-		return err
-	}
-	return x.CloseSend()
-}
-
-type DRPCAgentSocket_SyncWantStream interface {
-	drpc.Stream
-	SendAndClose(*SyncWantResponse) error
-}
-
-type drpcAgentSocket_SyncWantStream struct {
-	drpc.Stream
-}
-
-func (x *drpcAgentSocket_SyncWantStream) SendAndClose(m *SyncWantResponse) error {
-	if err := x.MsgSend(m, drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto{}); err != nil {
-		return err
-	}
-	return x.CloseSend()
-}
-
-type DRPCAgentSocket_SyncCompleteStream interface {
-	drpc.Stream
-	SendAndClose(*SyncCompleteResponse) error
-}
-
-type drpcAgentSocket_SyncCompleteStream struct {
-	drpc.Stream
-}
-
-func (x *drpcAgentSocket_SyncCompleteStream) SendAndClose(m *SyncCompleteResponse) error {
-	if err := x.MsgSend(m, drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto{}); err != nil {
-		return err
-	}
-	return x.CloseSend()
-}
-
-type DRPCAgentSocket_SyncReadyStream interface {
-	drpc.Stream
-	SendAndClose(*SyncReadyResponse) error
-}
-
-type drpcAgentSocket_SyncReadyStream struct {
-	drpc.Stream
-}
-
-func (x *drpcAgentSocket_SyncReadyStream) SendAndClose(m *SyncReadyResponse) error {
-	if err := x.MsgSend(m, drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto{}); err != nil {
-		return err
-	}
-	return x.CloseSend()
-}
-
-type DRPCAgentSocket_SyncStatusStream interface {
-	drpc.Stream
-	SendAndClose(*SyncStatusResponse) error
-}
-
-type drpcAgentSocket_SyncStatusStream struct {
-	drpc.Stream
-}
-
-func (x *drpcAgentSocket_SyncStatusStream) SendAndClose(m *SyncStatusResponse) error {
-	if err := x.MsgSend(m, drpcEncoding_File_agent_agentsocket_proto_agentsocket_proto{}); err != nil {
-		return err
-	}
-	return x.CloseSend()
-}
@@ -1,17 +0,0 @@
-package proto
-
-import "github.com/coder/coder/v2/apiversion"
-
-// Version history:
-//
-// API v1.0:
-//   - Initial release
-//   - Ping
-//   - Sync operations: SyncStart, SyncWant, SyncComplete, SyncWait, SyncStatus
-
-const (
-	CurrentMajor = 1
-	CurrentMinor = 0
-)
-
-var CurrentVersion = apiversion.New(CurrentMajor, CurrentMinor)
@@ -1,185 +0,0 @@
-package agentsocket
-
-import (
-	"context"
-	"errors"
-	"net"
-	"sync"
-
-	"golang.org/x/xerrors"
-
-	"github.com/hashicorp/yamux"
-	"storj.io/drpc/drpcmux"
-	"storj.io/drpc/drpcserver"
-
-	"cdr.dev/slog"
-	"github.com/coder/coder/v2/agent/agentsocket/proto"
-	"github.com/coder/coder/v2/agent/unit"
-	"github.com/coder/coder/v2/codersdk/drpcsdk"
-)
-
-// Server provides access to the DRPCAgentSocketService via a Unix domain socket.
-// Do not invoke Server{} directly. Use NewServer() instead.
-type Server struct {
-	logger     slog.Logger
-	path       string
-	drpcServer *drpcserver.Server
-	service    *DRPCAgentSocketService
-
-	mu       sync.Mutex
-	listener net.Listener
-	ctx      context.Context
-	cancel   context.CancelFunc
-	wg       sync.WaitGroup
-}
-
-func NewServer(path string, logger slog.Logger) (*Server, error) {
-	logger = logger.Named("agentsocket-server")
-	server := &Server{
-		logger: logger,
-		path:   path,
-		service: &DRPCAgentSocketService{
-			logger:      logger,
-			unitManager: unit.NewManager(),
-		},
-	}
-
-	mux := drpcmux.New()
-	err := proto.DRPCRegisterAgentSocket(mux, server.service)
-	if err != nil {
-		return nil, xerrors.Errorf("failed to register drpc service: %w", err)
-	}
-
-	server.drpcServer = drpcserver.NewWithOptions(mux, drpcserver.Options{
-		Manager: drpcsdk.DefaultDRPCOptions(nil),
-		Log: func(err error) {
-			if errors.Is(err, context.Canceled) ||
-				errors.Is(err, context.DeadlineExceeded) {
-				return
-			}
-			logger.Debug(context.Background(), "drpc server error", slog.Error(err))
-		},
-	})
-
-	if server.path == "" {
-		var err error
-		server.path, err = getDefaultSocketPath()
-		if err != nil {
-			return nil, xerrors.Errorf("get default socket path: %w", err)
-		}
-	}
-
-	listener, err := createSocket(server.path)
-	if err != nil {
-		return nil, xerrors.Errorf("create socket: %w", err)
-	}
-
-	server.listener = listener
-
-	// This context is canceled by server.Close().
-	// canceling it will close all connections.
-	server.ctx, server.cancel = context.WithCancel(context.Background())
-
-	server.logger.Info(server.ctx, "agent socket server started", slog.F("path", server.path))
-
-	server.wg.Add(1)
-	go func() {
-		defer server.wg.Done()
-		server.acceptConnections()
-	}()
-
-	return server, nil
-}
-
-func (s *Server) Close() error {
-	s.mu.Lock()
-
-	if s.listener == nil {
-		s.mu.Unlock()
-		return nil
-	}
-
-	s.logger.Info(s.ctx, "stopping agent socket server")
-
-	s.cancel()
-
-	if err := s.listener.Close(); err != nil {
-		s.logger.Warn(s.ctx, "error closing socket listener", slog.Error(err))
-	}
-
-	s.listener = nil
-
-	s.mu.Unlock()
-
-	// Wait for all connections to finish
-	s.wg.Wait()
-
-	if err := cleanupSocket(s.path); err != nil {
-		s.logger.Warn(s.ctx, "error cleaning up socket file", slog.Error(err))
-	}
-
-	s.logger.Info(s.ctx, "agent socket server stopped")
-
-	return nil
-}
-
-func (s *Server) acceptConnections() {
-	// In an edge case, Close() might race with acceptConnections() and set s.listener to nil.
-	// Therefore, we grab a copy of the listener under a lock. We might still get a nil listener,
-	// but then we know close has already run and we can return early.
-	s.mu.Lock()
-	listener := s.listener
-	s.mu.Unlock()
-	if listener == nil {
-		return
-	}
-
-	for {
-		select {
-		case <-s.ctx.Done():
-			return
-		default:
-		}
-
-		conn, err := listener.Accept()
-		if err != nil {
-			s.logger.Warn(s.ctx, "error accepting connection", slog.Error(err))
-			continue
-		}
-
-		s.mu.Lock()
-		if s.listener == nil {
-			s.mu.Unlock()
-			_ = conn.Close()
-			return
-		}
-		s.wg.Add(1)
-		s.mu.Unlock()
-
-		go func() {
-			defer s.wg.Done()
-			s.handleConnection(conn)
-		}()
-	}
-}
-
-func (s *Server) handleConnection(conn net.Conn) {
-	defer conn.Close()
-
-	s.logger.Debug(s.ctx, "new connection accepted", slog.F("remote_addr", conn.RemoteAddr()))
-
-	config := yamux.DefaultConfig()
-	config.LogOutput = nil
-	config.Logger = slog.Stdlib(s.ctx, s.logger.Named("agentsocket-yamux"), slog.LevelInfo)
-	session, err := yamux.Server(conn, config)
-	if err != nil {
-		s.logger.Warn(s.ctx, "failed to create yamux session", slog.Error(err))
-		return
-	}
-	defer session.Close()
-
-	err = s.drpcServer.Serve(s.ctx, session)
-	if err != nil {
-		s.logger.Debug(s.ctx, "drpc server finished", slog.Error(err))
-	}
-}
@@ -1,52 +0,0 @@
-package agentsocket_test
-
-import (
-	"path/filepath"
-	"runtime"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"cdr.dev/slog"
-	"github.com/coder/coder/v2/agent/agentsocket"
-)
-
-func TestServer(t *testing.T) {
-	t.Parallel()
-
-	if runtime.GOOS == "windows" {
-		t.Skip("agentsocket is not supported on Windows")
-	}
-
-	t.Run("StartStop", func(t *testing.T) {
-		t.Parallel()
-
-		socketPath := filepath.Join(t.TempDir(), "test.sock")
-		logger := slog.Make().Leveled(slog.LevelDebug)
-		server, err := agentsocket.NewServer(socketPath, logger)
-		require.NoError(t, err)
-		require.NoError(t, server.Close())
-	})
-
-	t.Run("AlreadyStarted", func(t *testing.T) {
-		t.Parallel()
-
-		socketPath := filepath.Join(t.TempDir(), "test.sock")
-		logger := slog.Make().Leveled(slog.LevelDebug)
-		server1, err := agentsocket.NewServer(socketPath, logger)
-		require.NoError(t, err)
-		defer server1.Close()
-		_, err = agentsocket.NewServer(socketPath, logger)
-		require.ErrorContains(t, err, "create socket")
-	})
-
-	t.Run("AutoSocketPath", func(t *testing.T) {
-		t.Parallel()
-
-		socketPath := filepath.Join(t.TempDir(), "test.sock")
-		logger := slog.Make().Leveled(slog.LevelDebug)
-		server, err := agentsocket.NewServer(socketPath, logger)
-		require.NoError(t, err)
-		require.NoError(t, server.Close())
-	})
-}
@@ -1,142 +0,0 @@
-package agentsocket
-
-import (
-	"context"
-	"errors"
-
-	"golang.org/x/xerrors"
-
-	"cdr.dev/slog"
-	"github.com/coder/coder/v2/agent/agentsocket/proto"
-	"github.com/coder/coder/v2/agent/unit"
-)
-
-var _ proto.DRPCAgentSocketServer = (*DRPCAgentSocketService)(nil)
-
-var ErrUnitManagerNotAvailable = xerrors.New("unit manager not available")
-
-type DRPCAgentSocketService struct {
-	unitManager *unit.Manager
-	logger      slog.Logger
-}
-
-func (*DRPCAgentSocketService) Ping(_ context.Context, _ *proto.PingRequest) (*proto.PingResponse, error) {
-	return &proto.PingResponse{}, nil
-}
-
-func (s *DRPCAgentSocketService) SyncStart(_ context.Context, req *proto.SyncStartRequest) (*proto.SyncStartResponse, error) {
-	if s.unitManager == nil {
-		return nil, xerrors.Errorf("SyncStart: %w", ErrUnitManagerNotAvailable)
-	}
-
-	unitID := unit.ID(req.Unit)
-
-	if err := s.unitManager.Register(unitID); err != nil {
-		if !errors.Is(err, unit.ErrUnitAlreadyRegistered) {
-			return nil, xerrors.Errorf("SyncStart: %w", err)
-		}
-	}
-
-	isReady, err := s.unitManager.IsReady(unitID)
-	if err != nil {
-		return nil, xerrors.Errorf("cannot check readiness: %w", err)
-	}
-	if !isReady {
-		return nil, xerrors.Errorf("cannot start unit %q: unit not ready", req.Unit)
-	}
-
-	err = s.unitManager.UpdateStatus(unitID, unit.StatusStarted)
-	if err != nil {
-		return nil, xerrors.Errorf("cannot start unit %q: %w", req.Unit, err)
-	}
-
-	return &proto.SyncStartResponse{}, nil
-}
-
-func (s *DRPCAgentSocketService) SyncWant(_ context.Context, req *proto.SyncWantRequest) (*proto.SyncWantResponse, error) {
-	if s.unitManager == nil {
-		return nil, xerrors.Errorf("cannot add dependency: %w", ErrUnitManagerNotAvailable)
-	}
-
-	unitID := unit.ID(req.Unit)
-	dependsOnID := unit.ID(req.DependsOn)
-
-	if err := s.unitManager.Register(unitID); err != nil && !errors.Is(err, unit.ErrUnitAlreadyRegistered) {
-		return nil, xerrors.Errorf("cannot add dependency: %w", err)
-	}
-
-	if err := s.unitManager.AddDependency(unitID, dependsOnID, unit.StatusComplete); err != nil {
-		return nil, xerrors.Errorf("cannot add dependency: %w", err)
-	}
-
-	return &proto.SyncWantResponse{}, nil
-}
-
-func (s *DRPCAgentSocketService) SyncComplete(_ context.Context, req *proto.SyncCompleteRequest) (*proto.SyncCompleteResponse, error) {
-	if s.unitManager == nil {
-		return nil, xerrors.Errorf("cannot complete unit: %w", ErrUnitManagerNotAvailable)
-	}
-
-	unitID := unit.ID(req.Unit)
-
-	if err := s.unitManager.UpdateStatus(unitID, unit.StatusComplete); err != nil {
-		return nil, xerrors.Errorf("cannot complete unit %q: %w", req.Unit, err)
-	}
-
-	return &proto.SyncCompleteResponse{}, nil
-}
-
-func (s *DRPCAgentSocketService) SyncReady(_ context.Context, req *proto.SyncReadyRequest) (*proto.SyncReadyResponse, error) {
-	if s.unitManager == nil {
-		return nil, xerrors.Errorf("cannot check readiness: %w", ErrUnitManagerNotAvailable)
-	}
-
-	unitID := unit.ID(req.Unit)
-	isReady, err := s.unitManager.IsReady(unitID)
-	if err != nil {
-		return nil, xerrors.Errorf("cannot check readiness: %w", err)
-	}
-
-	return &proto.SyncReadyResponse{
-		Ready: isReady,
-	}, nil
-}
-
-func (s *DRPCAgentSocketService) SyncStatus(_ context.Context, req *proto.SyncStatusRequest) (*proto.SyncStatusResponse, error) {
-	if s.unitManager == nil {
-		return nil, xerrors.Errorf("cannot get status for unit %q: %w", req.Unit, ErrUnitManagerNotAvailable)
-	}
-
-	unitID := unit.ID(req.Unit)
-
-	isReady, err := s.unitManager.IsReady(unitID)
-	if err != nil {
-		return nil, xerrors.Errorf("cannot check readiness: %w", err)
-	}
-
-	dependencies, err := s.unitManager.GetAllDependencies(unitID)
-	if err != nil {
-		return nil, xerrors.Errorf("failed to get dependencies: %w", err)
-	}
-
-	var depInfos []*proto.DependencyInfo
-	for _, dep := range dependencies {
-		depInfos = append(depInfos, &proto.DependencyInfo{
-			Unit:           string(dep.Unit),
-			DependsOn:      string(dep.DependsOn),
-			RequiredStatus: string(dep.RequiredStatus),
-			CurrentStatus:  string(dep.CurrentStatus),
-			IsSatisfied:    dep.IsSatisfied,
-		})
-	}
-
-	u, err := s.unitManager.Unit(unitID)
-	if err != nil {
-		return nil, xerrors.Errorf("cannot get status for unit %q: %w", req.Unit, err)
-	}
-	return &proto.SyncStatusResponse{
-		Status:       string(u.Status()),
-		IsReady:      isReady,
-		Dependencies: depInfos,
-	}, nil
-}
@@ -1,470 +0,0 @@
-package agentsocket_test
-
-import (
-	"context"
-	"crypto/sha256"
-	"encoding/hex"
-	"fmt"
-	"net"
-	"os"
-	"path/filepath"
-	"runtime"
-	"testing"
-
-	"github.com/hashicorp/yamux"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"cdr.dev/slog"
-	"github.com/coder/coder/v2/agent/agentsocket"
-	"github.com/coder/coder/v2/agent/agentsocket/proto"
-	"github.com/coder/coder/v2/agent/unit"
-	"github.com/coder/coder/v2/codersdk/drpcsdk"
-)
-
-// tempDirUnixSocket returns a temporary directory that can safely hold unix
-// sockets (probably).
-//
-// During tests on darwin we hit the max path length limit for unix sockets
-// pretty easily in the default location, so this function uses /tmp instead to
-// get shorter paths. To keep paths short, we use a hash of the test name
-// instead of the full test name.
-func tempDirUnixSocket(t *testing.T) string {
-	t.Helper()
-	if runtime.GOOS == "darwin" {
-		// Use a short hash of the test name to keep the path under 104 chars
-		hash := sha256.Sum256([]byte(t.Name()))
-		hashStr := hex.EncodeToString(hash[:])[:8] // Use first 8 chars of hash
-		dir, err := os.MkdirTemp("/tmp", fmt.Sprintf("c-%s-", hashStr))
-		require.NoError(t, err, "create temp dir for unix socket test")
-		t.Cleanup(func() {
-			err := os.RemoveAll(dir)
-			assert.NoError(t, err, "remove temp dir", dir)
-		})
-		return dir
-	}
-	return t.TempDir()
-}
-
-// newSocketClient creates a DRPC client connected to the Unix socket at the given path.
-func newSocketClient(t *testing.T, socketPath string) proto.DRPCAgentSocketClient {
-	t.Helper()
-
-	conn, err := net.Dial("unix", socketPath)
-	require.NoError(t, err)
-
-	config := yamux.DefaultConfig()
-	config.Logger = nil
-	session, err := yamux.Client(conn, config)
-	require.NoError(t, err)
-
-	client := proto.NewDRPCAgentSocketClient(drpcsdk.MultiplexedConn(session))
-
-	t.Cleanup(func() {
-		_ = session.Close()
-		_ = conn.Close()
-	})
-	return client
-}
-
-func TestDRPCAgentSocketService(t *testing.T) {
-	t.Parallel()
-
-	if runtime.GOOS == "windows" {
-		t.Skip("agentsocket is not supported on Windows")
-	}
-
-	t.Run("Ping", func(t *testing.T) {
-		t.Parallel()
-
-		socketPath := filepath.Join(tempDirUnixSocket(t), "test.sock")
-
-		server, err := agentsocket.NewServer(
-			socketPath,
-			slog.Make().Leveled(slog.LevelDebug),
-		)
-		require.NoError(t, err)
-		defer server.Close()
-
-		client := newSocketClient(t, socketPath)
-
-		_, err = client.Ping(context.Background(), &proto.PingRequest{})
-		require.NoError(t, err)
-	})
-
-	t.Run("SyncStart", func(t *testing.T) {
-		t.Parallel()
-
-		t.Run("NewUnit", func(t *testing.T) {
-			t.Parallel()
-			socketPath := filepath.Join(tempDirUnixSocket(t), "test.sock")
-
-			server, err := agentsocket.NewServer(
-				socketPath,
-				slog.Make().Leveled(slog.LevelDebug),
-			)
-			require.NoError(t, err)
-			defer server.Close()
-
-			client := newSocketClient(t, socketPath)
-
-			_, err = client.SyncStart(context.Background(), &proto.SyncStartRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-
-			status, err := client.SyncStatus(context.Background(), &proto.SyncStatusRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-			require.Equal(t, "started", status.Status)
-		})
-
-		t.Run("UnitAlreadyStarted", func(t *testing.T) {
-			t.Parallel()
-
-			socketPath := filepath.Join(tempDirUnixSocket(t), "test.sock")
-
-			server, err := agentsocket.NewServer(
-				socketPath,
-				slog.Make().Leveled(slog.LevelDebug),
-			)
-			require.NoError(t, err)
-			defer server.Close()
-
-			client := newSocketClient(t, socketPath)
-
-			// First Start
-			_, err = client.SyncStart(context.Background(), &proto.SyncStartRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-			status, err := client.SyncStatus(context.Background(), &proto.SyncStatusRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-			require.Equal(t, "started", status.Status)
-
-			// Second Start
-			_, err = client.SyncStart(context.Background(), &proto.SyncStartRequest{
-				Unit: "test-unit",
-			})
-			require.ErrorContains(t, err, unit.ErrSameStatusAlreadySet.Error())
-
-			status, err = client.SyncStatus(context.Background(), &proto.SyncStatusRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-			require.Equal(t, "started", status.Status)
-		})
-
-		t.Run("UnitAlreadyCompleted", func(t *testing.T) {
-			t.Parallel()
-
-			socketPath := filepath.Join(tempDirUnixSocket(t), "test.sock")
-
-			server, err := agentsocket.NewServer(
-				socketPath,
-				slog.Make().Leveled(slog.LevelDebug),
-			)
-			require.NoError(t, err)
-			defer server.Close()
-
-			client := newSocketClient(t, socketPath)
-
-			// First start
-			_, err = client.SyncStart(context.Background(), &proto.SyncStartRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-
-			status, err := client.SyncStatus(context.Background(), &proto.SyncStatusRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-			require.Equal(t, "started", status.Status)
-
-			// Complete the unit
-			_, err = client.SyncComplete(context.Background(), &proto.SyncCompleteRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-
-			status, err = client.SyncStatus(context.Background(), &proto.SyncStatusRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-			require.Equal(t, "completed", status.Status)
-
-			// Second start
-			_, err = client.SyncStart(context.Background(), &proto.SyncStartRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-
-			status, err = client.SyncStatus(context.Background(), &proto.SyncStatusRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-			require.Equal(t, "started", status.Status)
-		})
-
-		t.Run("UnitNotReady", func(t *testing.T) {
-			t.Parallel()
-
-			socketPath := filepath.Join(tempDirUnixSocket(t), "test.sock")
-
-			server, err := agentsocket.NewServer(
-				socketPath,
-				slog.Make().Leveled(slog.LevelDebug),
-			)
-			require.NoError(t, err)
-			defer server.Close()
-
-			client := newSocketClient(t, socketPath)
-
-			_, err = client.SyncWant(context.Background(), &proto.SyncWantRequest{
-				Unit:      "test-unit",
-				DependsOn: "dependency-unit",
-			})
-			require.NoError(t, err)
-
-			_, err = client.SyncStart(context.Background(), &proto.SyncStartRequest{
-				Unit: "test-unit",
-			})
-			require.ErrorContains(t, err, "unit not ready")
-
-			status, err := client.SyncStatus(context.Background(), &proto.SyncStatusRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-			require.Equal(t, string(unit.StatusPending), status.Status)
-			require.False(t, status.IsReady)
-		})
-	})
-
-	t.Run("SyncWant", func(t *testing.T) {
-		t.Parallel()
-
-		t.Run("NewUnits", func(t *testing.T) {
-			t.Parallel()
-
-			socketPath := filepath.Join(tempDirUnixSocket(t), "test.sock")
-
-			server, err := agentsocket.NewServer(
-				socketPath,
-				slog.Make().Leveled(slog.LevelDebug),
-			)
-			require.NoError(t, err)
-			defer server.Close()
-
-			client := newSocketClient(t, socketPath)
-
-			// If dependency units are not registered, they are registered automatically
-			_, err = client.SyncWant(context.Background(), &proto.SyncWantRequest{
-				Unit:      "test-unit",
-				DependsOn: "dependency-unit",
-			})
-			require.NoError(t, err)
-
-			status, err := client.SyncStatus(context.Background(), &proto.SyncStatusRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-			require.Len(t, status.Dependencies, 1)
-			require.Equal(t, "dependency-unit", status.Dependencies[0].DependsOn)
-			require.Equal(t, "completed", status.Dependencies[0].RequiredStatus)
-		})
-
-		t.Run("DependencyAlreadyRegistered", func(t *testing.T) {
-			t.Parallel()
-
-			socketPath := filepath.Join(tempDirUnixSocket(t), "test.sock")
-
-			server, err := agentsocket.NewServer(
-				socketPath,
-				slog.Make().Leveled(slog.LevelDebug),
-			)
-			require.NoError(t, err)
-			defer server.Close()
-
-			client := newSocketClient(t, socketPath)
-
-			// Start the dependency unit
-			_, err = client.SyncStart(context.Background(), &proto.SyncStartRequest{
-				Unit: "dependency-unit",
-			})
-			require.NoError(t, err)
-
-			status, err := client.SyncStatus(context.Background(), &proto.SyncStatusRequest{
-				Unit: "dependency-unit",
-			})
-			require.NoError(t, err)
-			require.Equal(t, "started", status.Status)
-
-			// Add the dependency after the dependency unit has already started
-			_, err = client.SyncWant(context.Background(), &proto.SyncWantRequest{
-				Unit:      "test-unit",
-				DependsOn: "dependency-unit",
-			})
-
-			// Dependencies can be added even if the dependency unit has already started
-			require.NoError(t, err)
-
-			// The dependency is now reflected in the test unit's status
-			status, err = client.SyncStatus(context.Background(), &proto.SyncStatusRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-			require.Equal(t, "dependency-unit", status.Dependencies[0].DependsOn)
-			require.Equal(t, "completed", status.Dependencies[0].RequiredStatus)
-		})
-
-		t.Run("DependencyAddedAfterDependentStarted", func(t *testing.T) {
-			t.Parallel()
-
-			socketPath := filepath.Join(tempDirUnixSocket(t), "test.sock")
-
-			server, err := agentsocket.NewServer(
-				socketPath,
-				slog.Make().Leveled(slog.LevelDebug),
-			)
-			require.NoError(t, err)
-			defer server.Close()
-
-			client := newSocketClient(t, socketPath)
-
-			// Start the dependent unit
-			_, err = client.SyncStart(context.Background(), &proto.SyncStartRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-
-			status, err := client.SyncStatus(context.Background(), &proto.SyncStatusRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-			require.Equal(t, "started", status.Status)
-
-			// Add the dependency after the dependency unit has already started
-			_, err = client.SyncWant(context.Background(), &proto.SyncWantRequest{
-				Unit:      "test-unit",
-				DependsOn: "dependency-unit",
-			})
-
-			// Dependencies can be added even if the dependent unit has already started.
-			// The dependency applies the next time a unit is started. The current status is not updated.
-			// This is to allow flexible dependency management. It does mean that users of this API should
-			// take care to add dependencies before they start their dependent units.
-			require.NoError(t, err)
-
-			// The dependency is now reflected in the test unit's status
-			status, err = client.SyncStatus(context.Background(), &proto.SyncStatusRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-			require.Equal(t, "dependency-unit", status.Dependencies[0].DependsOn)
-			require.Equal(t, "completed", status.Dependencies[0].RequiredStatus)
-		})
-	})
-
-	t.Run("SyncReady", func(t *testing.T) {
-		t.Parallel()
-
-		t.Run("UnregisteredUnit", func(t *testing.T) {
-			t.Parallel()
-
-			socketPath := filepath.Join(tempDirUnixSocket(t), "test.sock")
-
-			server, err := agentsocket.NewServer(
-				socketPath,
-				slog.Make().Leveled(slog.LevelDebug),
-			)
-			require.NoError(t, err)
-			defer server.Close()
-
-			client := newSocketClient(t, socketPath)
-
-			response, err := client.SyncReady(context.Background(), &proto.SyncReadyRequest{
-				Unit: "unregistered-unit",
-			})
-			require.NoError(t, err)
-			require.False(t, response.Ready)
-		})
-
-		t.Run("UnitNotReady", func(t *testing.T) {
-			t.Parallel()
-
-			socketPath := filepath.Join(tempDirUnixSocket(t), "test.sock")
-
-			server, err := agentsocket.NewServer(
-				socketPath,
-				slog.Make().Leveled(slog.LevelDebug),
-			)
-			require.NoError(t, err)
-			defer server.Close()
-
-			client := newSocketClient(t, socketPath)
-
-			// Register a unit with an unsatisfied dependency
-			_, err = client.SyncWant(context.Background(), &proto.SyncWantRequest{
-				Unit:      "test-unit",
-				DependsOn: "dependency-unit",
-			})
-			require.NoError(t, err)
-
-			// Check readiness - should be false because dependency is not satisfied
-			response, err := client.SyncReady(context.Background(), &proto.SyncReadyRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-			require.False(t, response.Ready)
-		})
-
-		t.Run("UnitReady", func(t *testing.T) {
-			t.Parallel()
-
-			socketPath := filepath.Join(tempDirUnixSocket(t), "test.sock")
-
-			server, err := agentsocket.NewServer(
-				socketPath,
-				slog.Make().Leveled(slog.LevelDebug),
-			)
-			require.NoError(t, err)
-			defer server.Close()
-
-			client := newSocketClient(t, socketPath)
-
-			// Register a unit with no dependencies - should be ready immediately
-			_, err = client.SyncStart(context.Background(), &proto.SyncStartRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-
-			// Check readiness - should be true
-			_, err = client.SyncReady(context.Background(), &proto.SyncReadyRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-
-			// Also test a unit with satisfied dependencies
-			_, err = client.SyncWant(context.Background(), &proto.SyncWantRequest{
-				Unit:      "dependent-unit",
-				DependsOn: "test-unit",
-			})
-			require.NoError(t, err)
-
-			// Complete the dependency
-			_, err = client.SyncComplete(context.Background(), &proto.SyncCompleteRequest{
-				Unit: "test-unit",
-			})
-			require.NoError(t, err)
-
-			// Now dependent-unit should be ready
-			_, err = client.SyncReady(context.Background(), &proto.SyncReadyRequest{
-				Unit: "dependent-unit",
-			})
-			require.NoError(t, err)
-		})
-	})
-}
@@ -1,83 +0,0 @@
-//go:build !windows
-
-package agentsocket
-
-import (
-	"crypto/rand"
-	"encoding/hex"
-	"net"
-	"os"
-	"path/filepath"
-	"time"
-
-	"golang.org/x/xerrors"
-)
-
-// createSocket creates a Unix domain socket listener
-func createSocket(path string) (net.Listener, error) {
-	if !isSocketAvailable(path) {
-		return nil, xerrors.Errorf("socket path %s is not available", path)
-	}
-
-	if err := os.Remove(path); err != nil && !os.IsNotExist(err) {
-		return nil, xerrors.Errorf("remove existing socket: %w", err)
-	}
-
-	// Create parent directory if it doesn't exist
-	parentDir := filepath.Dir(path)
-	if err := os.MkdirAll(parentDir, 0o700); err != nil {
-		return nil, xerrors.Errorf("create socket directory: %w", err)
-	}
-
-	listener, err := net.Listen("unix", path)
-	if err != nil {
-		return nil, xerrors.Errorf("listen on unix socket: %w", err)
-	}
-
-	if err := os.Chmod(path, 0o600); err != nil {
-		_ = listener.Close()
-		return nil, xerrors.Errorf("set socket permissions: %w", err)
-	}
-	return listener, nil
-}
-
-// getDefaultSocketPath returns the default socket path for Unix-like systems
-func getDefaultSocketPath() (string, error) {
-	randomBytes := make([]byte, 4)
-	if _, err := rand.Read(randomBytes); err != nil {
-		return "", xerrors.Errorf("generate random socket name: %w", err)
-	}
-	randomSuffix := hex.EncodeToString(randomBytes)
-
-	// Try XDG_RUNTIME_DIR first
-	if runtimeDir := os.Getenv("XDG_RUNTIME_DIR"); runtimeDir != "" {
-		return filepath.Join(runtimeDir, "coder-agent-"+randomSuffix+".sock"), nil
-	}
-
-	return filepath.Join("/tmp", "coder-agent-"+randomSuffix+".sock"), nil
-}
-
-// CleanupSocket removes the socket file
-func cleanupSocket(path string) error {
-	return os.Remove(path)
-}
-
-// isSocketAvailable checks if a socket path is available for use
-func isSocketAvailable(path string) bool {
-	// Check if file exists
-	if _, err := os.Stat(path); os.IsNotExist(err) {
-		return true
-	}
-
-	// Try to connect to see if it's actually listening
-	dialer := net.Dialer{Timeout: 10 * time.Second}
-	conn, err := dialer.Dial("unix", path)
-	if err != nil {
-		// If we can't connect, the socket is not in use
-		// Socket is available for use
-		return true
-	}
-	_ = conn.Close()
-	// Socket is in use
-	return false
-}
@@ -1,27 +0,0 @@
-//go:build windows
-
-package agentsocket
-
-import (
-	"net"
-
-	"golang.org/x/xerrors"
-)
-
-// createSocket returns an error indicating that agentsocket is not supported on Windows.
-// This feature is unix-only in its current experimental state.
-func createSocket(_ string) (net.Listener, error) {
-	return nil, xerrors.New("agentsocket is not supported on Windows")
-}
-
-// getDefaultSocketPath returns an error indicating that agentsocket is not supported on Windows.
-// This feature is unix-only in its current experimental state.
-func getDefaultSocketPath() (string, error) {
-	return "", xerrors.New("agentsocket is not supported on Windows")
-}
-
-// cleanupSocket is a no-op on Windows since agentsocket is not supported.
-func cleanupSocket(_ string) error {
-	// No-op since agentsocket is not supported on Windows
-	return nil
-}
@@ -2,31 +2,41 @@ package agent

 import (
 	"net/http"
+	"sync"
+	"time"

 	"github.com/go-chi/chi/v5"
 	"github.com/google/uuid"

 	"github.com/coder/coder/v2/coderd/httpapi"
-	"github.com/coder/coder/v2/coderd/httpmw/loggermw"
-	"github.com/coder/coder/v2/coderd/tracing"
 	"github.com/coder/coder/v2/codersdk"
-	"github.com/coder/coder/v2/codersdk/workspacesdk"
-	"github.com/coder/coder/v2/httpmw"
 )

 func (a *agent) apiHandler() http.Handler {
 	r := chi.NewRouter()
-	r.Use(
-		httpmw.Recover(a.logger),
-		tracing.StatusWriterMiddleware,
-		loggermw.Logger(a.logger),
-	)
 	r.Get("/", func(rw http.ResponseWriter, r *http.Request) {
 		httpapi.Write(r.Context(), rw, http.StatusOK, codersdk.Response{
 			Message: "Hello from the agent!",
 		})
 	})

+	// Make a copy to ensure the map is not modified after the handler is
+	// created.
+	cpy := make(map[int]string)
+	for k, b := range a.ignorePorts {
+		cpy[k] = b
+	}
+
+	cacheDuration := 1 * time.Second
+	if a.portCacheDuration > 0 {
+		cacheDuration = a.portCacheDuration
+	}
+
+	lp := &listeningPortsHandler{
+		ignorePorts:   cpy,
+		cacheDuration: cacheDuration,
+	}
+
 	if a.devcontainers {
 		r.Mount("/api/v0/containers", a.containerAPI.Routes())
 	} else if manifest := a.manifest.Load(); manifest != nil && manifest.ParentID != uuid.Nil {
@@ -47,7 +57,7 @@ func (a *agent) apiHandler() http.Handler {

 	promHandler := PrometheusMetricsHandler(a.prometheusRegistry, a.logger)

-	r.Get("/api/v0/listening-ports", a.listeningPortsHandler.handler)
+	r.Get("/api/v0/listening-ports", lp.handler)
 	r.Get("/api/v0/netcheck", a.HandleNetcheck)
 	r.Post("/api/v0/list-directory", a.HandleLS)
 	r.Get("/api/v0/read-file", a.HandleReadFile)
@@ -62,21 +72,22 @@ func (a *agent) apiHandler() http.Handler {
 	return r
 }

-type ListeningPortsGetter interface {
-	GetListeningPorts() ([]codersdk.WorkspaceAgentListeningPort, error)
-}
-
 type listeningPortsHandler struct {
-	// In production code, this is set to an osListeningPortsGetter, but it can be overridden for
-	// testing.
-	getter      ListeningPortsGetter
-	ignorePorts map[int]string
+	ignorePorts   map[int]string
+	cacheDuration time.Duration
+
+	//nolint: unused  // used on some but not all platforms
+	mut sync.Mutex
+	//nolint: unused  // used on some but not all platforms
+	ports []codersdk.WorkspaceAgentListeningPort
+	//nolint: unused  // used on some but not all platforms
+	mtime time.Time
 }

 // handler returns a list of listening ports. This is tested by coderd's
 // TestWorkspaceAgentListeningPorts test.
 func (lp *listeningPortsHandler) handler(rw http.ResponseWriter, r *http.Request) {
-	ports, err := lp.getter.GetListeningPorts()
+	ports, err := lp.getListeningPorts()
 	if err != nil {
 		httpapi.Write(r.Context(), rw, http.StatusInternalServerError, codersdk.Response{
 			Message: "Could not scan for listening ports.",
@@ -85,20 +96,7 @@ func (lp *listeningPortsHandler) handler(rw http.ResponseWriter, r *http.Request
 		return
 	}

-	filteredPorts := make([]codersdk.WorkspaceAgentListeningPort, 0, len(ports))
-	for _, port := range ports {
-		if port.Port < workspacesdk.AgentMinimumListeningPort {
-			continue
-		}
-
-		// Ignore ports that we've been told to ignore.
-		if _, ok := lp.ignorePorts[int(port.Port)]; ok {
-			continue
-		}
-		filteredPorts = append(filteredPorts, port)
-	}
-
 	httpapi.Write(r.Context(), rw, http.StatusOK, codersdk.WorkspaceAgentListeningPortsResponse{
-		Ports: filteredPorts,
+		Ports: ports,
 	})
 }
@@ -3,23 +3,16 @@
 package agent

 import (
-	"sync"
 	"time"

 	"github.com/cakturk/go-netstat/netstat"
 	"golang.org/x/xerrors"

 	"github.com/coder/coder/v2/codersdk"
+	"github.com/coder/coder/v2/codersdk/workspacesdk"
 )

-type osListeningPortsGetter struct {
-	cacheDuration time.Duration
-	mut           sync.Mutex
-	ports         []codersdk.WorkspaceAgentListeningPort
-	mtime         time.Time
-}
-
-func (lp *osListeningPortsGetter) GetListeningPorts() ([]codersdk.WorkspaceAgentListeningPort, error) {
+func (lp *listeningPortsHandler) getListeningPorts() ([]codersdk.WorkspaceAgentListeningPort, error) {
 	lp.mut.Lock()
 	defer lp.mut.Unlock()

@@ -40,7 +33,12 @@ func (lp *osListeningPortsGetter) GetListeningPorts() ([]codersdk.WorkspaceAgent
 	seen := make(map[uint16]struct{}, len(tabs))
 	ports := []codersdk.WorkspaceAgentListeningPort{}
 	for _, tab := range tabs {
-		if tab.LocalAddr == nil {
+		if tab.LocalAddr == nil || tab.LocalAddr.Port < workspacesdk.AgentMinimumListeningPort {
+			continue
+		}
+
+		// Ignore ports that we've been told to ignore.
+		if _, ok := lp.ignorePorts[int(tab.LocalAddr.Port)]; ok {
 			continue
 		}

@@ -1,45 +0,0 @@
-//go:build linux || (windows && amd64)
-
-package agent
-
-import (
-	"net"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-)
-
-func TestOSListeningPortsGetter(t *testing.T) {
-	t.Parallel()
-
-	uut := &osListeningPortsGetter{
-		cacheDuration: 1 * time.Hour,
-	}
-
-	l, err := net.Listen("tcp", "localhost:0")
-	require.NoError(t, err)
-	defer l.Close()
-
-	ports, err := uut.GetListeningPorts()
-	require.NoError(t, err)
-	found := false
-	for _, port := range ports {
-		// #nosec G115 - Safe conversion as TCP port numbers are within uint16 range (0-65535)
-		if port.Port == uint16(l.Addr().(*net.TCPAddr).Port) {
-			found = true
-			break
-		}
-	}
-	require.True(t, found)
-
-	// check that we cache the ports
-	err = l.Close()
-	require.NoError(t, err)
-	portsNew, err := uut.GetListeningPorts()
-	require.NoError(t, err)
-	require.Equal(t, ports, portsNew)
-
-	// note that it's unsafe to try to assert that a port does not exist in the response
-	// because the OS may reallocate the port very quickly.
-}
@@ -2,17 +2,9 @@

 package agent

-import (
-	"time"
+import "github.com/coder/coder/v2/codersdk"

-	"github.com/coder/coder/v2/codersdk"
-)
-
-type osListeningPortsGetter struct {
-	cacheDuration time.Duration
-}
-
-func (*osListeningPortsGetter) GetListeningPorts() ([]codersdk.WorkspaceAgentListeningPort, error) {
+func (*listeningPortsHandler) getListeningPorts() ([]codersdk.WorkspaceAgentListeningPort, error) {
 	// Can't scan for ports on non-linux or non-windows_amd64 systems at the
 	// moment. The UI will not show any "no ports found" message to the user, so
 	// the user won't suspect a thing.
@@ -58,7 +58,7 @@ func (g *Graph[EdgeType, VertexType]) AddEdge(from, to VertexType, edge EdgeType
 	toID := g.getOrCreateVertexID(to)

 	if g.canReach(to, from) {
-		return xerrors.Errorf("adding edge (%v -> %v): %w", from, to, ErrCycleDetected)
+		return xerrors.Errorf("adding edge (%v -> %v) would create a cycle", from, to)
 	}

 	g.gonumGraph.SetEdge(simple.Edge{F: simple.Node(fromID), T: simple.Node(toID)})
@@ -148,7 +148,8 @@ func TestGraph(t *testing.T) {
 			graph := &testGraph{}
 			unit1 := &testGraphVertex{Name: "unit1"}
 			err := graph.AddEdge(unit1, unit1, testEdgeCompleted)
-			require.ErrorIs(t, err, unit.ErrCycleDetected)
+			require.Error(t, err)
+			require.ErrorContains(t, err, fmt.Sprintf("adding edge (%v -> %v) would create a cycle", unit1, unit1))

 			return graph
 		},
@@ -159,7 +160,8 @@ func TestGraph(t *testing.T) {
 			err := graph.AddEdge(unit1, unit2, testEdgeCompleted)
 			require.NoError(t, err)
 			err = graph.AddEdge(unit2, unit1, testEdgeStarted)
-			require.ErrorIs(t, err, unit.ErrCycleDetected)
+			require.Error(t, err)
+			require.ErrorContains(t, err, fmt.Sprintf("adding edge (%v -> %v) would create a cycle", unit2, unit1))

 			return graph
 		},
@@ -339,7 +341,7 @@ func TestGraphThreadSafety(t *testing.T) {
 		// Verify all attempts correctly returned cycle error
 		for i, err := range cycleErrors {
 			require.Error(t, err, "goroutine %d should have detected cycle", i)
-			require.ErrorIs(t, err, unit.ErrCycleDetected)
+			require.Contains(t, err.Error(), "would create a cycle")
 		}

 		// Verify graph remains valid (original chain intact)
@@ -1,280 +0,0 @@
-package unit
-
-import (
-	"errors"
-	"sync"
-
-	"golang.org/x/xerrors"
-
-	"github.com/coder/coder/v2/coderd/util/slice"
-)
-
-var (
-	ErrUnitIDRequired           = xerrors.New("unit name is required")
-	ErrUnitNotFound             = xerrors.New("unit not found")
-	ErrUnitAlreadyRegistered    = xerrors.New("unit already registered")
-	ErrCannotUpdateOtherUnit    = xerrors.New("cannot update other unit's status")
-	ErrDependenciesNotSatisfied = xerrors.New("unit dependencies not satisfied")
-	ErrSameStatusAlreadySet     = xerrors.New("same status already set")
-	ErrCycleDetected            = xerrors.New("cycle detected")
-	ErrFailedToAddDependency    = xerrors.New("failed to add dependency")
-)
-
-// Status represents the status of a unit.
-type Status string
-
-// Status constants for dependency tracking.
-const (
-	StatusNotRegistered Status = ""
-	StatusPending       Status = "pending"
-	StatusStarted       Status = "started"
-	StatusComplete      Status = "completed"
-)
-
-// ID provides a type narrowed representation of the unique identifier of a unit.
-type ID string
-
-// Unit represents a point-in-time snapshot of a vertex in the dependency graph.
-// Units may depend on other units, or be depended on by other units. The unit struct
-// is not aware of updates made to the dependency graph after it is initialized and should
-// not be cached.
-type Unit struct {
-	id     ID
-	status Status
-	// ready is true if all dependencies are satisfied.
-	// It does not have an accessor method on Unit, because a unit cannot know whether it is ready.
-	// Only the Manager can calculate whether a unit is ready based on knowledge of the dependency graph.
-	// To discourage use of an outdated readiness value, only the Manager should set and return this field.
-	ready bool
-}
-
-func (u Unit) ID() ID {
-	return u.id
-}
-
-func (u Unit) Status() Status {
-	return u.status
-}
-
-// Dependency represents a dependency relationship between units.
-type Dependency struct {
-	Unit           ID
-	DependsOn      ID
-	RequiredStatus Status
-	CurrentStatus  Status
-	IsSatisfied    bool
-}
-
-// Manager provides reactive dependency tracking over a Graph.
-// It manages Unit registration, dependency relationships, and status updates
-// with automatic recalculation of readiness when dependencies are satisfied.
-type Manager struct {
-	mu sync.RWMutex
-
-	// The underlying graph that stores dependency relationships
-	graph *Graph[Status, ID]
-
-	// Store vertex instances for each unit to ensure consistent references
-	units map[ID]Unit
-}
-
-// NewManager creates a new Manager instance.
-func NewManager() *Manager {
-	return &Manager{
-		graph: &Graph[Status, ID]{},
-		units: make(map[ID]Unit),
-	}
-}
-
-// Register adds a unit to the manager if it is not already registered.
-// If a Unit is already registered (per the ID field), it is not updated.
-func (m *Manager) Register(id ID) error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	if id == "" {
-		return xerrors.Errorf("registering unit %q: %w", id, ErrUnitIDRequired)
-	}
-
-	if m.registered(id) {
-		return xerrors.Errorf("registering unit %q: %w", id, ErrUnitAlreadyRegistered)
-	}
-
-	m.units[id] = Unit{
-		id:     id,
-		status: StatusPending,
-		ready:  true,
-	}
-
-	return nil
-}
-
-// registered checks if a unit is registered in the manager.
-func (m *Manager) registered(id ID) bool {
-	return m.units[id].status != StatusNotRegistered
-}
-
-// Unit fetches a unit from the manager. If the unit does not exist,
-// it returns the Unit zero-value as a placeholder unit, because
-// units may depend on other units that have not yet been created.
-func (m *Manager) Unit(id ID) (Unit, error) {
-	if id == "" {
-		return Unit{}, xerrors.Errorf("unit ID cannot be empty: %w", ErrUnitIDRequired)
-	}
-
-	m.mu.RLock()
-	defer m.mu.RUnlock()
-
-	return m.units[id], nil
-}
-
-func (m *Manager) IsReady(id ID) (bool, error) {
-	if id == "" {
-		return false, xerrors.Errorf("unit ID cannot be empty: %w", ErrUnitIDRequired)
-	}
-
-	m.mu.RLock()
-	defer m.mu.RUnlock()
-
-	if !m.registered(id) {
-		return false, nil
-	}
-
-	return m.units[id].ready, nil
-}
-
-// AddDependency adds a dependency relationship between units.
-// The unit depends on the dependsOn unit reaching the requiredStatus.
-func (m *Manager) AddDependency(unit ID, dependsOn ID, requiredStatus Status) error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	switch {
-	case unit == "":
-		return xerrors.Errorf("dependent name cannot be empty: %w", ErrUnitIDRequired)
-	case dependsOn == "":
-		return xerrors.Errorf("dependency name cannot be empty: %w", ErrUnitIDRequired)
-	case !m.registered(unit):
-		return xerrors.Errorf("dependent unit %q must be registered first: %w", unit, ErrUnitNotFound)
-	}
-
-	// Add the dependency edge to the graph
-	// The edge goes from unit to dependsOn, representing the dependency
-	err := m.graph.AddEdge(unit, dependsOn, requiredStatus)
-	if err != nil {
-		return xerrors.Errorf("adding edge for unit %q: %w", unit, errors.Join(ErrFailedToAddDependency, err))
-	}
-
-	// Recalculate readiness for the unit since it now has a new dependency
-	m.recalculateReadinessUnsafe(unit)
-
-	return nil
-}
-
-// UpdateStatus updates a unit's status and recalculates readiness for affected dependents.
-func (m *Manager) UpdateStatus(unit ID, newStatus Status) error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	switch {
-	case unit == "":
-		return xerrors.Errorf("updating status for unit %q: %w", unit, ErrUnitIDRequired)
-	case !m.registered(unit):
-		return xerrors.Errorf("unit %q must be registered first: %w", unit, ErrUnitNotFound)
-	}
-
-	u := m.units[unit]
-	if u.status == newStatus {
-		return xerrors.Errorf("checking status for unit %q: %w", unit, ErrSameStatusAlreadySet)
-	}
-
-	u.status = newStatus
-	m.units[unit] = u
-
-	// Get all units that depend on this one (reverse adjacent vertices)
-	dependents := m.graph.GetReverseAdjacentVertices(unit)
-
-	// Recalculate readiness for all dependents
-	for _, dependent := range dependents {
-		m.recalculateReadinessUnsafe(dependent.From)
-	}
-
-	return nil
-}
-
-// recalculateReadinessUnsafe recalculates the readiness state for a unit.
-// This method assumes the caller holds the write lock.
-func (m *Manager) recalculateReadinessUnsafe(unit ID) {
-	u := m.units[unit]
-	dependencies := m.graph.GetForwardAdjacentVertices(unit)
-
-	allSatisfied := true
-	for _, dependency := range dependencies {
-		requiredStatus := dependency.Edge
-		dependsOnUnit := m.units[dependency.To]
-		if dependsOnUnit.status != requiredStatus {
-			allSatisfied = false
-			break
-		}
-	}
-
-	u.ready = allSatisfied
-	m.units[unit] = u
-}
-
-// GetGraph returns the underlying graph for visualization and debugging.
-// This should be used carefully as it exposes the internal graph structure.
-func (m *Manager) GetGraph() *Graph[Status, ID] {
-	return m.graph
-}
-
-// GetAllDependencies returns all dependencies for a unit, both satisfied and unsatisfied.
-func (m *Manager) GetAllDependencies(unit ID) ([]Dependency, error) {
-	m.mu.RLock()
-	defer m.mu.RUnlock()
-
-	if unit == "" {
-		return nil, xerrors.Errorf("unit ID cannot be empty: %w", ErrUnitIDRequired)
-	}
-
-	if !m.registered(unit) {
-		return nil, xerrors.Errorf("checking registration for unit %q: %w", unit, ErrUnitNotFound)
-	}
-
-	dependencies := m.graph.GetForwardAdjacentVertices(unit)
-
-	var allDependencies []Dependency
-
-	for _, dependency := range dependencies {
-		dependsOnUnit := m.units[dependency.To]
-		requiredStatus := dependency.Edge
-		allDependencies = append(allDependencies, Dependency{
-			Unit:           unit,
-			DependsOn:      dependency.To,
-			RequiredStatus: requiredStatus,
-			CurrentStatus:  dependsOnUnit.status,
-			IsSatisfied:    dependsOnUnit.status == requiredStatus,
-		})
-	}
-
-	return allDependencies, nil
-}
-
-// GetUnmetDependencies returns a list of unsatisfied dependencies for a unit.
-func (m *Manager) GetUnmetDependencies(unit ID) ([]Dependency, error) {
-	allDependencies, err := m.GetAllDependencies(unit)
-	if err != nil {
-		return nil, err
-	}
-
-	var unmetDependencies []Dependency = slice.Filter(allDependencies, func(dependency Dependency) bool {
-		return !dependency.IsSatisfied
-	})
-
-	return unmetDependencies, nil
-}
-
-// ExportDOT exports the dependency graph to DOT format for visualization.
-func (m *Manager) ExportDOT(name string) (string, error) {
-	return m.graph.ToDOT(name)
-}
@@ -1,743 +0,0 @@
-package unit_test
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/coder/coder/v2/agent/unit"
-)
-
-const (
-	unitA unit.ID = "serviceA"
-	unitB unit.ID = "serviceB"
-	unitC unit.ID = "serviceC"
-	unitD unit.ID = "serviceD"
-)
-
-func TestManager_UnitValidation(t *testing.T) {
-	t.Parallel()
-
-	t.Run("Empty Unit Name", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		err := manager.Register("")
-		require.ErrorIs(t, err, unit.ErrUnitIDRequired)
-		err = manager.AddDependency("", unitA, unit.StatusStarted)
-		require.ErrorIs(t, err, unit.ErrUnitIDRequired)
-		err = manager.AddDependency(unitA, "", unit.StatusStarted)
-		require.ErrorIs(t, err, unit.ErrUnitIDRequired)
-		dependencies, err := manager.GetAllDependencies("")
-		require.ErrorIs(t, err, unit.ErrUnitIDRequired)
-		require.Len(t, dependencies, 0)
-		unmetDependencies, err := manager.GetUnmetDependencies("")
-		require.ErrorIs(t, err, unit.ErrUnitIDRequired)
-		require.Len(t, unmetDependencies, 0)
-		err = manager.UpdateStatus("", unit.StatusStarted)
-		require.ErrorIs(t, err, unit.ErrUnitIDRequired)
-		isReady, err := manager.IsReady("")
-		require.ErrorIs(t, err, unit.ErrUnitIDRequired)
-		require.False(t, isReady)
-		u, err := manager.Unit("")
-		require.ErrorIs(t, err, unit.ErrUnitIDRequired)
-		assert.Equal(t, unit.Unit{}, u)
-	})
-}
-
-func TestManager_Register(t *testing.T) {
-	t.Parallel()
-
-	t.Run("RegisterNewUnit", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// Given: a unit is registered
-		err := manager.Register(unitA)
-		require.NoError(t, err)
-
-		// Then: the unit should be ready (no dependencies)
-		u, err := manager.Unit(unitA)
-		require.NoError(t, err)
-		assert.Equal(t, unitA, u.ID())
-		assert.Equal(t, unit.StatusPending, u.Status())
-		isReady, err := manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.True(t, isReady)
-	})
-
-	t.Run("RegisterDuplicateUnit", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// Given: a unit is registered
-		err := manager.Register(unitA)
-		require.NoError(t, err)
-
-		// Newly registered units have StatusPending. We update the unit status to StatusStarted,
-		// so we can later assert that it is not overwritten back to StatusPending by the second
-		// register call
-		manager.UpdateStatus(unitA, unit.StatusStarted)
-
-		// When: the unit is registered again
-		err = manager.Register(unitA)
-
-		// Then: a descriptive error should be returned
-		require.ErrorIs(t, err, unit.ErrUnitAlreadyRegistered)
-
-		// Then: the unit status should not be overwritten
-		u, err := manager.Unit(unitA)
-		require.NoError(t, err)
-		assert.Equal(t, unit.StatusStarted, u.Status())
-		isReady, err := manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.True(t, isReady)
-	})
-
-	t.Run("RegisterMultipleUnits", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// Given: multiple units are registered
-		unitIDs := []unit.ID{unitA, unitB, unitC}
-		for _, unit := range unitIDs {
-			err := manager.Register(unit)
-			require.NoError(t, err)
-		}
-
-		// Then: all units should be ready initially
-		for _, unitID := range unitIDs {
-			u, err := manager.Unit(unitID)
-			require.NoError(t, err)
-			assert.Equal(t, unit.StatusPending, u.Status())
-			isReady, err := manager.IsReady(unitID)
-			require.NoError(t, err)
-			assert.True(t, isReady)
-		}
-	})
-}
-
-func TestManager_AddDependency(t *testing.T) {
-	t.Parallel()
-
-	t.Run("AddDependencyBetweenRegisteredUnits", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// Given: units A and B are registered
-		err := manager.Register(unitA)
-		require.NoError(t, err)
-		err = manager.Register(unitB)
-		require.NoError(t, err)
-
-		// Given: Unit A depends on Unit B being unit.StatusStarted
-		err = manager.AddDependency(unitA, unitB, unit.StatusStarted)
-		require.NoError(t, err)
-
-		// Then: Unit A should not be ready (depends on B)
-		u, err := manager.Unit(unitA)
-		require.NoError(t, err)
-		assert.Equal(t, unit.StatusPending, u.Status())
-		isReady, err := manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.False(t, isReady)
-
-		// Then: Unit B should still be ready (no dependencies)
-		u, err = manager.Unit(unitB)
-		require.NoError(t, err)
-		assert.Equal(t, unit.StatusPending, u.Status())
-		isReady, err = manager.IsReady(unitB)
-		require.NoError(t, err)
-		assert.True(t, isReady)
-
-		// When: Unit B is started
-		err = manager.UpdateStatus(unitB, unit.StatusStarted)
-		require.NoError(t, err)
-
-		// Then: Unit A should be ready, because its dependency is now in the desired state.
-		isReady, err = manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.True(t, isReady)
-
-		// When: Unit B is stopped
-		err = manager.UpdateStatus(unitB, unit.StatusPending)
-		require.NoError(t, err)
-
-		// Then: Unit A should no longer be ready, because its dependency is not in the desired state.
-		isReady, err = manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.False(t, isReady)
-	})
-
-	t.Run("AddDependencyByAnUnregisteredDependentUnit", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// Given Unit B is registered
-		err := manager.Register(unitB)
-		require.NoError(t, err)
-
-		// Given Unit A depends on Unit B being started
-		err = manager.AddDependency(unitA, unitB, unit.StatusStarted)
-
-		// Then: a descriptive error communicates that the dependency cannot be added
-		// because the dependent unit must be registered first.
-		require.ErrorIs(t, err, unit.ErrUnitNotFound)
-	})
-
-	t.Run("AddDependencyOnAnUnregisteredUnit", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// Given unit A is registered
-		err := manager.Register(unitA)
-		require.NoError(t, err)
-
-		// Given Unit B is not yet registered
-		// And Unit A depends on Unit B being started
-		err = manager.AddDependency(unitA, unitB, unit.StatusStarted)
-		require.NoError(t, err)
-
-		// Then: The dependency should be visible in Unit A's status
-		dependencies, err := manager.GetAllDependencies(unitA)
-		require.NoError(t, err)
-		require.Len(t, dependencies, 1)
-		assert.Equal(t, unitB, dependencies[0].DependsOn)
-		assert.Equal(t, unit.StatusStarted, dependencies[0].RequiredStatus)
-		assert.False(t, dependencies[0].IsSatisfied)
-
-		u, err := manager.Unit(unitB)
-		require.NoError(t, err)
-		assert.Equal(t, unit.StatusNotRegistered, u.Status())
-
-		// Then: Unit A should not be ready, because it depends on Unit B
-		isReady, err := manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.False(t, isReady)
-
-		// When: Unit B is registered
-		err = manager.Register(unitB)
-		require.NoError(t, err)
-
-		// Then: Unit A should still not be ready.
-		// Unit B is not registered, but it has not been started as required by the dependency.
-		isReady, err = manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.False(t, isReady)
-
-		// When: Unit B is started
-		err = manager.UpdateStatus(unitB, unit.StatusStarted)
-		require.NoError(t, err)
-
-		// Then: Unit A should be ready, because its dependency is now in the desired state.
-		isReady, err = manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.True(t, isReady)
-	})
-
-	t.Run("AddDependencyCreatesACyclicDependency", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// Register units
-		err := manager.Register(unitA)
-		require.NoError(t, err)
-		err = manager.Register(unitB)
-		require.NoError(t, err)
-		err = manager.Register(unitC)
-		require.NoError(t, err)
-		err = manager.Register(unitD)
-		require.NoError(t, err)
-
-		// A depends on B
-		err = manager.AddDependency(unitA, unitB, unit.StatusStarted)
-		require.NoError(t, err)
-		// B depends on C
-		err = manager.AddDependency(unitB, unitC, unit.StatusStarted)
-		require.NoError(t, err)
-
-		// C depends on D
-		err = manager.AddDependency(unitC, unitD, unit.StatusStarted)
-		require.NoError(t, err)
-
-		// Try to make D depend on A (creates indirect cycle)
-		err = manager.AddDependency(unitD, unitA, unit.StatusStarted)
-		require.ErrorIs(t, err, unit.ErrCycleDetected)
-	})
-
-	t.Run("UpdatingADependency", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// Given units A and B are registered
-		err := manager.Register(unitA)
-		require.NoError(t, err)
-		err = manager.Register(unitB)
-		require.NoError(t, err)
-
-		// Given Unit A depends on Unit B being unit.StatusStarted
-		err = manager.AddDependency(unitA, unitB, unit.StatusStarted)
-		require.NoError(t, err)
-
-		// When: The dependency is updated to unit.StatusComplete
-		err = manager.AddDependency(unitA, unitB, unit.StatusComplete)
-		require.NoError(t, err)
-
-		// Then: Unit A should only have one dependency, and it should be unit.StatusComplete
-		dependencies, err := manager.GetAllDependencies(unitA)
-		require.NoError(t, err)
-		require.Len(t, dependencies, 1)
-		assert.Equal(t, unit.StatusComplete, dependencies[0].RequiredStatus)
-	})
-}
-
-func TestManager_UpdateStatus(t *testing.T) {
-	t.Parallel()
-
-	t.Run("UpdateStatusTriggersReadinessRecalculation", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// Given units A and B are registered
-		err := manager.Register(unitA)
-		require.NoError(t, err)
-		err = manager.Register(unitB)
-		require.NoError(t, err)
-
-		// Given Unit A depends on Unit B being unit.StatusStarted
-		err = manager.AddDependency(unitA, unitB, unit.StatusStarted)
-		require.NoError(t, err)
-
-		// Then: Unit A should not be ready (depends on B)
-		u, err := manager.Unit(unitA)
-		require.NoError(t, err)
-		assert.Equal(t, unit.StatusPending, u.Status())
-		isReady, err := manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.False(t, isReady)
-
-		// When: Unit B is started
-		err = manager.UpdateStatus(unitB, unit.StatusStarted)
-		require.NoError(t, err)
-
-		// Then: Unit A should be ready, because its dependency is now in the desired state.
-		u, err = manager.Unit(unitA)
-		require.NoError(t, err)
-		assert.Equal(t, unit.StatusPending, u.Status())
-		isReady, err = manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.True(t, isReady)
-	})
-
-	t.Run("UpdateStatusWithUnregisteredUnit", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// Given Unit A is not registered
-		// When: Unit A is updated to unit.StatusStarted
-		err := manager.UpdateStatus(unitA, unit.StatusStarted)
-
-		// Then: a descriptive error communicates that the unit must be registered first.
-		require.ErrorIs(t, err, unit.ErrUnitNotFound)
-	})
-
-	t.Run("LinearChainDependencies", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// Given units A, B, and C are registered
-		err := manager.Register(unitA)
-		require.NoError(t, err)
-		err = manager.Register(unitB)
-		require.NoError(t, err)
-		err = manager.Register(unitC)
-		require.NoError(t, err)
-
-		// Create chain: A depends on B being "started", B depends on C being "completed"
-		err = manager.AddDependency(unitA, unitB, unit.StatusStarted)
-		require.NoError(t, err)
-		err = manager.AddDependency(unitB, unitC, unit.StatusComplete)
-		require.NoError(t, err)
-
-		// Then: only Unit C should be ready (no dependencies)
-		u, err := manager.Unit(unitC)
-		require.NoError(t, err)
-		assert.Equal(t, unit.StatusPending, u.Status())
-		isReady, err := manager.IsReady(unitC)
-		require.NoError(t, err)
-		assert.True(t, isReady)
-
-		u, err = manager.Unit(unitB)
-		require.NoError(t, err)
-		assert.Equal(t, unit.StatusPending, u.Status())
-		isReady, err = manager.IsReady(unitB)
-		require.NoError(t, err)
-		assert.False(t, isReady)
-
-		u, err = manager.Unit(unitA)
-		require.NoError(t, err)
-		assert.Equal(t, unit.StatusPending, u.Status())
-		isReady, err = manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.False(t, isReady)
-
-		// When: Unit C is completed
-		err = manager.UpdateStatus(unitC, unit.StatusComplete)
-		require.NoError(t, err)
-
-		// Then: Unit B should be ready, because its dependency is now in the desired state.
-		u, err = manager.Unit(unitB)
-		require.NoError(t, err)
-		assert.Equal(t, unit.StatusPending, u.Status())
-		isReady, err = manager.IsReady(unitB)
-		require.NoError(t, err)
-		assert.True(t, isReady)
-
-		u, err = manager.Unit(unitA)
-		require.NoError(t, err)
-		assert.Equal(t, unit.StatusPending, u.Status())
-		isReady, err = manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.False(t, isReady)
-
-		u, err = manager.Unit(unitB)
-		require.NoError(t, err)
-		assert.Equal(t, unit.StatusPending, u.Status())
-		isReady, err = manager.IsReady(unitB)
-		require.NoError(t, err)
-		assert.True(t, isReady)
-
-		// When: Unit B is started
-		err = manager.UpdateStatus(unitB, unit.StatusStarted)
-		require.NoError(t, err)
-
-		// Then: Unit A should be ready, because its dependency is now in the desired state.
-		u, err = manager.Unit(unitA)
-		require.NoError(t, err)
-		assert.Equal(t, unit.StatusPending, u.Status())
-		isReady, err = manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.True(t, isReady)
-	})
-}
-
-func TestManager_GetUnmetDependencies(t *testing.T) {
-	t.Parallel()
-
-	t.Run("GetUnmetDependenciesForUnitWithNoDependencies", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// Given: Unit A is registered
-		err := manager.Register(unitA)
-		require.NoError(t, err)
-
-		// Given: Unit A has no dependencies
-		// Then: Unit A should have no unmet dependencies
-		unmet, err := manager.GetUnmetDependencies(unitA)
-		require.NoError(t, err)
-		assert.Empty(t, unmet)
-	})
-
-	t.Run("GetUnmetDependenciesForUnitWithUnsatisfiedDependencies", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-		err := manager.Register(unitA)
-		require.NoError(t, err)
-		err = manager.Register(unitB)
-		require.NoError(t, err)
-
-		// Given: Unit A depends on Unit B being unit.StatusStarted
-		err = manager.AddDependency(unitA, unitB, unit.StatusStarted)
-		require.NoError(t, err)
-
-		unmet, err := manager.GetUnmetDependencies(unitA)
-		require.NoError(t, err)
-		require.Len(t, unmet, 1)
-
-		assert.Equal(t, unitA, unmet[0].Unit)
-		assert.Equal(t, unitB, unmet[0].DependsOn)
-		assert.Equal(t, unit.StatusStarted, unmet[0].RequiredStatus)
-		assert.False(t, unmet[0].IsSatisfied)
-	})
-
-	t.Run("GetUnmetDependenciesForUnitWithSatisfiedDependencies", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// Given: Unit A and Unit B are registered
-		err := manager.Register(unitA)
-		require.NoError(t, err)
-		err = manager.Register(unitB)
-		require.NoError(t, err)
-
-		// Given: Unit A depends on Unit B being unit.StatusStarted
-		err = manager.AddDependency(unitA, unitB, unit.StatusStarted)
-		require.NoError(t, err)
-
-		// When: Unit B is started
-		err = manager.UpdateStatus(unitB, unit.StatusStarted)
-		require.NoError(t, err)
-
-		// Then: Unit A should have no unmet dependencies
-		unmet, err := manager.GetUnmetDependencies(unitA)
-		require.NoError(t, err)
-		assert.Empty(t, unmet)
-	})
-
-	t.Run("GetUnmetDependenciesForUnregisteredUnit", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// When: Unit A is requested
-		unmet, err := manager.GetUnmetDependencies(unitA)
-
-		// Then: a descriptive error communicates that the unit must be registered first.
-		require.ErrorIs(t, err, unit.ErrUnitNotFound)
-		assert.Nil(t, unmet)
-	})
-}
-
-func TestManager_MultipleDependencies(t *testing.T) {
-	t.Parallel()
-
-	t.Run("UnitWithMultipleDependencies", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// Register all units
-		units := []unit.ID{unitA, unitB, unitC, unitD}
-		for _, unit := range units {
-			err := manager.Register(unit)
-			require.NoError(t, err)
-		}
-
-		// A depends on B being unit.StatusStarted AND C being "started"
-		err := manager.AddDependency(unitA, unitB, unit.StatusStarted)
-		require.NoError(t, err)
-		err = manager.AddDependency(unitA, unitC, unit.StatusStarted)
-		require.NoError(t, err)
-
-		// A should not be ready (depends on both B and C)
-		isReady, err := manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.False(t, isReady)
-
-		// Update B to unit.StatusStarted - A should still not be ready (needs C too)
-		err = manager.UpdateStatus(unitB, unit.StatusStarted)
-		require.NoError(t, err)
-
-		isReady, err = manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.False(t, isReady)
-
-		// Update C to "started" - A should now be ready
-		err = manager.UpdateStatus(unitC, unit.StatusStarted)
-		require.NoError(t, err)
-
-		isReady, err = manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.True(t, isReady)
-	})
-
-	t.Run("ComplexDependencyChain", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// Register all units
-		units := []unit.ID{unitA, unitB, unitC, unitD}
-		for _, unit := range units {
-			err := manager.Register(unit)
-			require.NoError(t, err)
-		}
-
-		// Create complex dependency graph:
-		// A depends on B being unit.StatusStarted AND C being "started"
-		err := manager.AddDependency(unitA, unitB, unit.StatusStarted)
-		require.NoError(t, err)
-		err = manager.AddDependency(unitA, unitC, unit.StatusStarted)
-		require.NoError(t, err)
-		// B depends on D being "completed"
-		err = manager.AddDependency(unitB, unitD, unit.StatusComplete)
-		require.NoError(t, err)
-		// C depends on D being "completed"
-		err = manager.AddDependency(unitC, unitD, unit.StatusComplete)
-		require.NoError(t, err)
-
-		// Initially only D is ready
-		isReady, err := manager.IsReady(unitD)
-		require.NoError(t, err)
-		assert.True(t, isReady)
-		isReady, err = manager.IsReady(unitB)
-		require.NoError(t, err)
-		assert.False(t, isReady)
-		isReady, err = manager.IsReady(unitC)
-		require.NoError(t, err)
-		assert.False(t, isReady)
-		isReady, err = manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.False(t, isReady)
-
-		// Update D to "completed" - B and C should become ready
-		err = manager.UpdateStatus(unitD, unit.StatusComplete)
-		require.NoError(t, err)
-
-		isReady, err = manager.IsReady(unitB)
-		require.NoError(t, err)
-		assert.True(t, isReady)
-		isReady, err = manager.IsReady(unitC)
-		require.NoError(t, err)
-		assert.True(t, isReady)
-		isReady, err = manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.False(t, isReady)
-
-		// Update B to unit.StatusStarted - A should still not be ready (needs C)
-		err = manager.UpdateStatus(unitB, unit.StatusStarted)
-		require.NoError(t, err)
-
-		isReady, err = manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.False(t, isReady)
-
-		// Update C to "started" - A should now be ready
-		err = manager.UpdateStatus(unitC, unit.StatusStarted)
-		require.NoError(t, err)
-
-		isReady, err = manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.True(t, isReady)
-	})
-
-	t.Run("DifferentStatusTypes", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// Register units
-		err := manager.Register(unitA)
-		require.NoError(t, err)
-		err = manager.Register(unitB)
-		require.NoError(t, err)
-		err = manager.Register(unitC)
-		require.NoError(t, err)
-
-		// Given: Unit A depends on Unit B being unit.StatusStarted
-		err = manager.AddDependency(unitA, unitB, unit.StatusStarted)
-		require.NoError(t, err)
-		// Given: Unit A depends on Unit C being "completed"
-		err = manager.AddDependency(unitA, unitC, unit.StatusComplete)
-		require.NoError(t, err)
-
-		// When: Unit B is started
-		err = manager.UpdateStatus(unitB, unit.StatusStarted)
-		require.NoError(t, err)
-
-		// Then: Unit A should not be ready, because only one of its dependencies is in the desired state.
-		// It still requires Unit C to be completed.
-		isReady, err := manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.False(t, isReady)
-
-		// When: Unit C is completed
-		err = manager.UpdateStatus(unitC, unit.StatusComplete)
-		require.NoError(t, err)
-
-		// Then: Unit A should be ready, because both of its dependencies are in the desired state.
-		isReady, err = manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.True(t, isReady)
-	})
-}
-
-func TestManager_IsReady(t *testing.T) {
-	t.Parallel()
-
-	t.Run("IsReadyWithUnregisteredUnit", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// Given: a unit is not registered
-		u, err := manager.Unit(unitA)
-		require.NoError(t, err)
-		assert.Equal(t, unit.StatusNotRegistered, u.Status())
-		// Then: the unit is not ready
-		isReady, err := manager.IsReady(unitA)
-		require.NoError(t, err)
-		assert.False(t, isReady)
-	})
-}
-
-func TestManager_ToDOT(t *testing.T) {
-	t.Parallel()
-
-	t.Run("ExportSimpleGraph", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// Register units
-		err := manager.Register(unitA)
-		require.NoError(t, err)
-		err = manager.Register(unitB)
-		require.NoError(t, err)
-
-		// Add dependency
-		err = manager.AddDependency(unitA, unitB, unit.StatusStarted)
-		require.NoError(t, err)
-
-		dot, err := manager.ExportDOT("test")
-		require.NoError(t, err)
-		assert.NotEmpty(t, dot)
-		assert.Contains(t, dot, "digraph")
-	})
-
-	t.Run("ExportComplexGraph", func(t *testing.T) {
-		t.Parallel()
-
-		manager := unit.NewManager()
-
-		// Register all units
-		units := []unit.ID{unitA, unitB, unitC, unitD}
-		for _, unit := range units {
-			err := manager.Register(unit)
-			require.NoError(t, err)
-		}
-
-		// Create complex dependency graph
-		// A depends on B and C, B depends on D, C depends on D
-		err := manager.AddDependency(unitA, unitB, unit.StatusStarted)
-		require.NoError(t, err)
-		err = manager.AddDependency(unitA, unitC, unit.StatusStarted)
-		require.NoError(t, err)
-		err = manager.AddDependency(unitB, unitD, unit.StatusComplete)
-		require.NoError(t, err)
-		err = manager.AddDependency(unitC, unitD, unit.StatusComplete)
-		require.NoError(t, err)
-
-		dot, err := manager.ExportDOT("complex")
-		require.NoError(t, err)
-		assert.NotEmpty(t, dot)
-		assert.Contains(t, dot, "digraph")
-	})
-}
@@ -28,9 +28,7 @@ import (
 )

 // New creates a CLI instance with a configuration pointed to a
-// temporary testing directory. The invocation is set up to use a
-// global config directory for the given testing.TB, and keyring
-// usage disabled.
+// temporary testing directory.
 func New(t testing.TB, args ...string) (*serpent.Invocation, config.Root) {
 	var root cli.RootCmd

@@ -61,15 +59,6 @@ func NewWithCommand(
 	t testing.TB, cmd *serpent.Command, args ...string,
 ) (*serpent.Invocation, config.Root) {
 	configDir := config.Root(t.TempDir())
-	// Keyring usage is disabled here when --global-config is set because many existing
-	// tests expect the session token to be stored on disk and is not properly instrumented
-	// for parallel testing against the actual operating system keyring.
-	invArgs := append([]string{"--global-config", string(configDir)}, args...)
-	return setupInvocation(t, cmd, invArgs...), configDir
-}
-
-func setupInvocation(t testing.TB, cmd *serpent.Command, args ...string,
-) *serpent.Invocation {
 	// I really would like to fail test on error logs, but realistically, turning on by default
 	// in all our CLI tests is going to create a lot of flaky noise.
 	logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true}).
@@ -77,21 +66,16 @@ func setupInvocation(t testing.TB, cmd *serpent.Command, args ...string,
 		Named("cli")
 	i := &serpent.Invocation{
 		Command: cmd,
-		Args:    args,
+		Args:    append([]string{"--global-config", string(configDir)}, args...),
 		Stdin:   io.LimitReader(nil, 0),
 		Stdout:  (&logWriter{prefix: "stdout", log: logger}),
 		Stderr:  (&logWriter{prefix: "stderr", log: logger}),
 		Logger:  logger,
 	}
 	t.Logf("invoking command: %s %s", cmd.Name(), strings.Join(i.Args, " "))
-	return i
-}

-func NewWithDefaultKeyringCommand(t testing.TB, cmd *serpent.Command, args ...string,
-) (*serpent.Invocation, config.Root) {
-	configDir := config.Root(t.TempDir())
-	invArgs := append([]string{"--global-config", string(configDir)}, args...)
-	return setupInvocation(t, cmd, invArgs...), configDir
+	// These can be overridden by the test.
+	return i, configDir
 }

 // SetupConfig applies the URL and SessionToken of the client to the config.
@@ -577,57 +577,53 @@ func prepWorkspaceBuild(inv *serpent.Invocation, client *codersdk.Client, args p
 		return nil, xerrors.Errorf("template version git auth: %w", err)
 	}

-	// Only perform dry-run for workspace creation and updates
-	// Skip for start and restart to avoid unnecessary delays
-	if args.Action == WorkspaceCreate || args.Action == WorkspaceUpdate {
-		// Run a dry-run with the given parameters to check correctness
-		dryRun, err := client.CreateTemplateVersionDryRun(inv.Context(), templateVersion.ID, codersdk.CreateTemplateVersionDryRunRequest{
-			WorkspaceName:       args.NewWorkspaceName,
-			RichParameterValues: buildParameters,
-		})
-		if err != nil {
-			return nil, xerrors.Errorf("begin workspace dry-run: %w", err)
-		}
+	// Run a dry-run with the given parameters to check correctness
+	dryRun, err := client.CreateTemplateVersionDryRun(inv.Context(), templateVersion.ID, codersdk.CreateTemplateVersionDryRunRequest{
+		WorkspaceName:       args.NewWorkspaceName,
+		RichParameterValues: buildParameters,
+	})
+	if err != nil {
+		return nil, xerrors.Errorf("begin workspace dry-run: %w", err)
+	}

-		matchedProvisioners, err := client.TemplateVersionDryRunMatchedProvisioners(inv.Context(), templateVersion.ID, dryRun.ID)
-		if err != nil {
-			return nil, xerrors.Errorf("get matched provisioners: %w", err)
-		}
-		cliutil.WarnMatchedProvisioners(inv.Stdout, &matchedProvisioners, dryRun)
-		_, _ = fmt.Fprintln(inv.Stdout, "Planning workspace...")
-		err = cliui.ProvisionerJob(inv.Context(), inv.Stdout, cliui.ProvisionerJobOptions{
-			Fetch: func() (codersdk.ProvisionerJob, error) {
-				return client.TemplateVersionDryRun(inv.Context(), templateVersion.ID, dryRun.ID)
-			},
-			Cancel: func() error {
-				return client.CancelTemplateVersionDryRun(inv.Context(), templateVersion.ID, dryRun.ID)
-			},
-			Logs: func() (<-chan codersdk.ProvisionerJobLog, io.Closer, error) {
-				return client.TemplateVersionDryRunLogsAfter(inv.Context(), templateVersion.ID, dryRun.ID, 0)
-			},
-			// Don't show log output for the dry-run unless there's an error.
-			Silent: true,
-		})
-		if err != nil {
-			// TODO (Dean): reprompt for parameter values if we deem it to
-			// be a validation error
-			return nil, xerrors.Errorf("dry-run workspace: %w", err)
-		}
+	matchedProvisioners, err := client.TemplateVersionDryRunMatchedProvisioners(inv.Context(), templateVersion.ID, dryRun.ID)
+	if err != nil {
+		return nil, xerrors.Errorf("get matched provisioners: %w", err)
+	}
+	cliutil.WarnMatchedProvisioners(inv.Stdout, &matchedProvisioners, dryRun)
+	_, _ = fmt.Fprintln(inv.Stdout, "Planning workspace...")
+	err = cliui.ProvisionerJob(inv.Context(), inv.Stdout, cliui.ProvisionerJobOptions{
+		Fetch: func() (codersdk.ProvisionerJob, error) {
+			return client.TemplateVersionDryRun(inv.Context(), templateVersion.ID, dryRun.ID)
+		},
+		Cancel: func() error {
+			return client.CancelTemplateVersionDryRun(inv.Context(), templateVersion.ID, dryRun.ID)
+		},
+		Logs: func() (<-chan codersdk.ProvisionerJobLog, io.Closer, error) {
+			return client.TemplateVersionDryRunLogsAfter(inv.Context(), templateVersion.ID, dryRun.ID, 0)
+		},
+		// Don't show log output for the dry-run unless there's an error.
+		Silent: true,
+	})
+	if err != nil {
+		// TODO (Dean): reprompt for parameter values if we deem it to
+		// be a validation error
+		return nil, xerrors.Errorf("dry-run workspace: %w", err)
+	}

-		resources, err := client.TemplateVersionDryRunResources(inv.Context(), templateVersion.ID, dryRun.ID)
-		if err != nil {
-			return nil, xerrors.Errorf("get workspace dry-run resources: %w", err)
-		}
+	resources, err := client.TemplateVersionDryRunResources(inv.Context(), templateVersion.ID, dryRun.ID)
+	if err != nil {
+		return nil, xerrors.Errorf("get workspace dry-run resources: %w", err)
+	}

-		err = cliui.WorkspaceResources(inv.Stdout, resources, cliui.WorkspaceResourcesOptions{
-			WorkspaceName: args.NewWorkspaceName,
-			// Since agents haven't connected yet, hiding this makes more sense.
-			HideAgentState: true,
-			Title:          "Workspace Preview",
-		})
-		if err != nil {
-			return nil, xerrors.Errorf("get resources: %w", err)
-		}
+	err = cliui.WorkspaceResources(inv.Stdout, resources, cliui.WorkspaceResourcesOptions{
+		WorkspaceName: args.NewWorkspaceName,
+		// Since agents haven't connected yet, hiding this makes more sense.
+		HideAgentState: true,
+		Title:          "Workspace Preview",
+	})
+	if err != nil {
+		return nil, xerrors.Errorf("get resources: %w", err)
 	}

 	return buildParameters, nil
@@ -64,9 +64,7 @@ func (r *RootCmd) scaletestCmd() *serpent.Command {
 			r.scaletestWorkspaceTraffic(),
 			r.scaletestAutostart(),
 			r.scaletestNotifications(),
-			r.scaletestTaskStatus(),
 			r.scaletestSMTP(),
-			r.scaletestPrebuilds(),
 		},
 	}

@@ -142,15 +142,6 @@ func (r *RootCmd) scaletestNotifications() *serpent.Command {
 				triggerTimes[id] = make(chan time.Time, 1)
 			}

-			smtpHTTPTransport := &http.Transport{
-				MaxConnsPerHost:     512,
-				MaxIdleConnsPerHost: 512,
-				IdleConnTimeout:     60 * time.Second,
-			}
-			smtpHTTPClient := &http.Client{
-				Transport: smtpHTTPTransport,
-			}
-
 			configs := make([]notifications.Config, 0, userCount)
 			for range templateAdminCount {
 				config := notifications.Config{
@@ -166,7 +157,6 @@ func (r *RootCmd) scaletestNotifications() *serpent.Command {
 					Metrics:                  metrics,
 					SMTPApiURL:               smtpAPIURL,
 					SMTPRequestTimeout:       smtpRequestTimeout,
-					SMTPHttpClient:           smtpHTTPClient,
 				}
 				if err := config.Validate(); err != nil {
 					return xerrors.Errorf("validate config: %w", err)
@@ -1,297 +0,0 @@
-//go:build !slim
-
-package cli
-
-import (
-	"fmt"
-	"net/http"
-	"os/signal"
-	"strconv"
-	"sync"
-	"time"
-
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"golang.org/x/xerrors"
-
-	"github.com/coder/coder/v2/codersdk"
-	"github.com/coder/coder/v2/scaletest/harness"
-	"github.com/coder/coder/v2/scaletest/prebuilds"
-	"github.com/coder/quartz"
-	"github.com/coder/serpent"
-)
-
-func (r *RootCmd) scaletestPrebuilds() *serpent.Command {
-	var (
-		numTemplates              int64
-		numPresets                int64
-		numPresetPrebuilds        int64
-		templateVersionJobTimeout time.Duration
-		prebuildWorkspaceTimeout  time.Duration
-		noCleanup                 bool
-
-		tracingFlags    = &scaletestTracingFlags{}
-		timeoutStrategy = &timeoutFlags{}
-		cleanupStrategy = newScaletestCleanupStrategy()
-		output          = &scaletestOutputFlags{}
-		prometheusFlags = &scaletestPrometheusFlags{}
-	)
-
-	cmd := &serpent.Command{
-		Use:   "prebuilds",
-		Short: "Creates prebuild workspaces on the Coder server.",
-		Handler: func(inv *serpent.Invocation) error {
-			ctx := inv.Context()
-			client, err := r.InitClient(inv)
-			if err != nil {
-				return err
-			}
-
-			notifyCtx, stop := signal.NotifyContext(ctx, StopSignals...)
-			defer stop()
-			ctx = notifyCtx
-
-			me, err := requireAdmin(ctx, client)
-			if err != nil {
-				return err
-			}
-
-			client.HTTPClient = &http.Client{
-				Transport: &codersdk.HeaderTransport{
-					Transport: http.DefaultTransport,
-					Header: map[string][]string{
-						codersdk.BypassRatelimitHeader: {"true"},
-					},
-				},
-			}
-
-			if numTemplates <= 0 {
-				return xerrors.Errorf("--num-templates must be greater than 0")
-			}
-			if numPresets <= 0 {
-				return xerrors.Errorf("--num-presets must be greater than 0")
-			}
-			if numPresetPrebuilds <= 0 {
-				return xerrors.Errorf("--num-preset-prebuilds must be greater than 0")
-			}
-
-			outputs, err := output.parse()
-			if err != nil {
-				return xerrors.Errorf("parse output flags: %w", err)
-			}
-
-			tracerProvider, closeTracing, tracingEnabled, err := tracingFlags.provider(ctx)
-			if err != nil {
-				return xerrors.Errorf("create tracer provider: %w", err)
-			}
-			defer func() {
-				_, _ = fmt.Fprintln(inv.Stderr, "\nUploading traces...")
-				if err := closeTracing(ctx); err != nil {
-					_, _ = fmt.Fprintf(inv.Stderr, "\nError uploading traces: %+v\n", err)
-				}
-				_, _ = fmt.Fprintf(inv.Stderr, "Waiting %s for prometheus metrics to be scraped\n", prometheusFlags.Wait)
-				<-time.After(prometheusFlags.Wait)
-			}()
-			tracer := tracerProvider.Tracer(scaletestTracerName)
-
-			reg := prometheus.NewRegistry()
-			metrics := prebuilds.NewMetrics(reg)
-
-			logger := inv.Logger
-			prometheusSrvClose := ServeHandler(ctx, logger, promhttp.HandlerFor(reg, promhttp.HandlerOpts{}), prometheusFlags.Address, "prometheus")
-			defer prometheusSrvClose()
-
-			err = client.PutPrebuildsSettings(ctx, codersdk.PrebuildsSettings{
-				ReconciliationPaused: true,
-			})
-			if err != nil {
-				return xerrors.Errorf("pause prebuilds: %w", err)
-			}
-
-			setupBarrier := new(sync.WaitGroup)
-			setupBarrier.Add(int(numTemplates))
-			creationBarrier := new(sync.WaitGroup)
-			creationBarrier.Add(int(numTemplates))
-			deletionSetupBarrier := new(sync.WaitGroup)
-			deletionSetupBarrier.Add(1)
-			deletionBarrier := new(sync.WaitGroup)
-			deletionBarrier.Add(int(numTemplates))
-
-			th := harness.NewTestHarness(timeoutStrategy.wrapStrategy(harness.ConcurrentExecutionStrategy{}), cleanupStrategy.toStrategy())
-
-			for i := range numTemplates {
-				id := strconv.Itoa(int(i))
-				cfg := prebuilds.Config{
-					OrganizationID:            me.OrganizationIDs[0],
-					NumPresets:                int(numPresets),
-					NumPresetPrebuilds:        int(numPresetPrebuilds),
-					TemplateVersionJobTimeout: templateVersionJobTimeout,
-					PrebuildWorkspaceTimeout:  prebuildWorkspaceTimeout,
-					Metrics:                   metrics,
-					SetupBarrier:              setupBarrier,
-					CreationBarrier:           creationBarrier,
-					DeletionSetupBarrier:      deletionSetupBarrier,
-					DeletionBarrier:           deletionBarrier,
-					Clock:                     quartz.NewReal(),
-				}
-				err := cfg.Validate()
-				if err != nil {
-					return xerrors.Errorf("validate config: %w", err)
-				}
-
-				var runner harness.Runnable = prebuilds.NewRunner(client, cfg)
-				if tracingEnabled {
-					runner = &runnableTraceWrapper{
-						tracer:   tracer,
-						spanName: fmt.Sprintf("prebuilds/%s", id),
-						runner:   runner,
-					}
-				}
-
-				th.AddRun("prebuilds", id, runner)
-			}
-
-			_, _ = fmt.Fprintf(inv.Stderr, "Creating %d templates with %d presets and %d prebuilds per preset...\n",
-				numTemplates, numPresets, numPresetPrebuilds)
-			_, _ = fmt.Fprintf(inv.Stderr, "Total expected prebuilds: %d\n", numTemplates*numPresets*numPresetPrebuilds)
-
-			testCtx, testCancel := timeoutStrategy.toContext(ctx)
-			defer testCancel()
-
-			runErrCh := make(chan error, 1)
-			go func() {
-				runErrCh <- th.Run(testCtx)
-			}()
-
-			_, _ = fmt.Fprintln(inv.Stderr, "Waiting for all templates to be created...")
-			setupBarrier.Wait()
-			_, _ = fmt.Fprintln(inv.Stderr, "All templates created")
-
-			err = client.PutPrebuildsSettings(ctx, codersdk.PrebuildsSettings{
-				ReconciliationPaused: false,
-			})
-			if err != nil {
-				return xerrors.Errorf("resume prebuilds: %w", err)
-			}
-
-			_, _ = fmt.Fprintln(inv.Stderr, "Waiting for all prebuilds to be created...")
-			creationBarrier.Wait()
-			_, _ = fmt.Fprintln(inv.Stderr, "All prebuilds created")
-
-			err = client.PutPrebuildsSettings(ctx, codersdk.PrebuildsSettings{
-				ReconciliationPaused: true,
-			})
-			if err != nil {
-				return xerrors.Errorf("pause prebuilds before deletion: %w", err)
-			}
-
-			_, _ = fmt.Fprintln(inv.Stderr, "Prebuilds paused, signaling runners to prepare for deletion")
-			deletionSetupBarrier.Done()
-
-			_, _ = fmt.Fprintln(inv.Stderr, "Waiting for all templates to be updated with 0 prebuilds...")
-			deletionBarrier.Wait()
-			_, _ = fmt.Fprintln(inv.Stderr, "All templates updated")
-
-			err = client.PutPrebuildsSettings(ctx, codersdk.PrebuildsSettings{
-				ReconciliationPaused: false,
-			})
-			if err != nil {
-				return xerrors.Errorf("resume prebuilds for deletion: %w", err)
-			}
-
-			_, _ = fmt.Fprintln(inv.Stderr, "Waiting for all prebuilds to be deleted...")
-			err = <-runErrCh
-			if err != nil {
-				return xerrors.Errorf("run test harness (harness failure, not a test failure): %w", err)
-			}
-
-			// If the command was interrupted, skip cleanup & stats
-			if notifyCtx.Err() != nil {
-				return notifyCtx.Err()
-			}
-
-			res := th.Results()
-			for _, o := range outputs {
-				err = o.write(res, inv.Stdout)
-				if err != nil {
-					return xerrors.Errorf("write output %q to %q: %w", o.format, o.path, err)
-				}
-			}
-
-			if !noCleanup {
-				_, _ = fmt.Fprintln(inv.Stderr, "\nStarting cleanup (deleting templates)...")
-
-				cleanupCtx, cleanupCancel := cleanupStrategy.toContext(ctx)
-				defer cleanupCancel()
-
-				err = th.Cleanup(cleanupCtx)
-				if err != nil {
-					return xerrors.Errorf("cleanup tests: %w", err)
-				}
-
-				// If the cleanup was interrupted, skip stats
-				if notifyCtx.Err() != nil {
-					return notifyCtx.Err()
-				}
-			}
-
-			if res.TotalFail > 0 {
-				return xerrors.New("prebuild creation test failed, see above for more details")
-			}
-
-			return nil
-		},
-	}
-
-	cmd.Options = serpent.OptionSet{
-		{
-			Flag:        "num-templates",
-			Env:         "CODER_SCALETEST_PREBUILDS_NUM_TEMPLATES",
-			Default:     "1",
-			Description: "Number of templates to create for the test.",
-			Value:       serpent.Int64Of(&numTemplates),
-		},
-		{
-			Flag:        "num-presets",
-			Env:         "CODER_SCALETEST_PREBUILDS_NUM_PRESETS",
-			Default:     "1",
-			Description: "Number of presets per template.",
-			Value:       serpent.Int64Of(&numPresets),
-		},
-		{
-			Flag:        "num-preset-prebuilds",
-			Env:         "CODER_SCALETEST_PREBUILDS_NUM_PRESET_PREBUILDS",
-			Default:     "1",
-			Description: "Number of prebuilds per preset.",
-			Value:       serpent.Int64Of(&numPresetPrebuilds),
-		},
-		{
-			Flag:        "template-version-job-timeout",
-			Env:         "CODER_SCALETEST_PREBUILDS_TEMPLATE_VERSION_JOB_TIMEOUT",
-			Default:     "5m",
-			Description: "Timeout for template version provisioning jobs.",
-			Value:       serpent.DurationOf(&templateVersionJobTimeout),
-		},
-		{
-			Flag:        "prebuild-workspace-timeout",
-			Env:         "CODER_SCALETEST_PREBUILDS_WORKSPACE_TIMEOUT",
-			Default:     "10m",
-			Description: "Timeout for all prebuild workspaces to be created/deleted.",
-			Value:       serpent.DurationOf(&prebuildWorkspaceTimeout),
-		},
-		{
-			Flag:        "skip-cleanup",
-			Env:         "CODER_SCALETEST_PREBUILDS_SKIP_CLEANUP",
-			Description: "Skip cleanup (deletion test) and leave resources intact.",
-			Value:       serpent.BoolOf(&noCleanup),
-		},
-	}
-
-	tracingFlags.attach(&cmd.Options)
-	timeoutStrategy.attach(&cmd.Options)
-	cleanupStrategy.attach(&cmd.Options)
-	output.attach(&cmd.Options)
-	prometheusFlags.attach(&cmd.Options)
-
-	return cmd
-}
@@ -1,275 +0,0 @@
-//go:build !slim
-
-package cli
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"sync"
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/prometheus/client_golang/prometheus"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"golang.org/x/xerrors"
-
-	"cdr.dev/slog"
-	"cdr.dev/slog/sloggers/sloghuman"
-	"github.com/coder/serpent"
-
-	"github.com/coder/coder/v2/codersdk"
-	"github.com/coder/coder/v2/scaletest/harness"
-	"github.com/coder/coder/v2/scaletest/taskstatus"
-)
-
-const (
-	taskStatusTestName = "task-status"
-)
-
-func (r *RootCmd) scaletestTaskStatus() *serpent.Command {
-	var (
-		count                int64
-		template             string
-		workspaceNamePrefix  string
-		appSlug              string
-		reportStatusPeriod   time.Duration
-		reportStatusDuration time.Duration
-		baselineDuration     time.Duration
-		tracingFlags         = &scaletestTracingFlags{}
-		prometheusFlags      = &scaletestPrometheusFlags{}
-		timeoutStrategy      = &timeoutFlags{}
-		cleanupStrategy      = newScaletestCleanupStrategy()
-		output               = &scaletestOutputFlags{}
-	)
-	orgContext := NewOrganizationContext()
-
-	cmd := &serpent.Command{
-		Use:   "task-status",
-		Short: "Generates load on the Coder server by simulating task status reporting",
-		Long: `This test creates external workspaces and simulates AI agents reporting task status.
-After all runners connect, it waits for the baseline duration before triggering status reporting.`,
-		Handler: func(inv *serpent.Invocation) error {
-			ctx := inv.Context()
-
-			outputs, err := output.parse()
-			if err != nil {
-				return xerrors.Errorf("could not parse --output flags: %w", err)
-			}
-
-			client, err := r.InitClient(inv)
-			if err != nil {
-				return err
-			}
-
-			org, err := orgContext.Selected(inv, client)
-			if err != nil {
-				return err
-			}
-
-			_, err = requireAdmin(ctx, client)
-			if err != nil {
-				return err
-			}
-
-			// Disable rate limits for this test
-			client.HTTPClient = &http.Client{
-				Transport: &codersdk.HeaderTransport{
-					Transport: http.DefaultTransport,
-					Header: map[string][]string{
-						codersdk.BypassRatelimitHeader: {"true"},
-					},
-				},
-			}
-
-			// Find the template
-			tpl, err := parseTemplate(ctx, client, []uuid.UUID{org.ID}, template)
-			if err != nil {
-				return xerrors.Errorf("parse template %q: %w", template, err)
-			}
-			templateID := tpl.ID
-
-			reg := prometheus.NewRegistry()
-			metrics := taskstatus.NewMetrics(reg)
-
-			logger := slog.Make(sloghuman.Sink(inv.Stdout)).Leveled(slog.LevelDebug)
-			prometheusSrvClose := ServeHandler(ctx, logger, promhttp.HandlerFor(reg, promhttp.HandlerOpts{}), prometheusFlags.Address, "prometheus")
-			defer prometheusSrvClose()
-
-			tracerProvider, closeTracing, tracingEnabled, err := tracingFlags.provider(ctx)
-			if err != nil {
-				return xerrors.Errorf("create tracer provider: %w", err)
-			}
-			defer func() {
-				// Allow time for traces to flush even if command context is
-				// canceled. This is a no-op if tracing is not enabled.
-				_, _ = fmt.Fprintln(inv.Stderr, "\nUploading traces...")
-				if err := closeTracing(ctx); err != nil {
-					_, _ = fmt.Fprintf(inv.Stderr, "\nError uploading traces: %+v\n", err)
-				}
-				// Wait for prometheus metrics to be scraped
-				_, _ = fmt.Fprintf(inv.Stderr, "Waiting %s for prometheus metrics to be scraped\n", prometheusFlags.Wait)
-				<-time.After(prometheusFlags.Wait)
-			}()
-			tracer := tracerProvider.Tracer(scaletestTracerName)
-
-			// Setup shared resources for coordination
-			connectedWaitGroup := &sync.WaitGroup{}
-			connectedWaitGroup.Add(int(count))
-			startReporting := make(chan struct{})
-
-			// Create the test harness
-			th := harness.NewTestHarness(
-				timeoutStrategy.wrapStrategy(harness.ConcurrentExecutionStrategy{}),
-				cleanupStrategy.toStrategy(),
-			)
-
-			// Create runners
-			for i := range count {
-				workspaceName := fmt.Sprintf("%s-%d", workspaceNamePrefix, i)
-				cfg := taskstatus.Config{
-					TemplateID:           templateID,
-					WorkspaceName:        workspaceName,
-					AppSlug:              appSlug,
-					ConnectedWaitGroup:   connectedWaitGroup,
-					StartReporting:       startReporting,
-					ReportStatusPeriod:   reportStatusPeriod,
-					ReportStatusDuration: reportStatusDuration,
-					Metrics:              metrics,
-					MetricLabelValues:    []string{},
-				}
-
-				if err := cfg.Validate(); err != nil {
-					return xerrors.Errorf("validate config for runner %d: %w", i, err)
-				}
-
-				var runner harness.Runnable = taskstatus.NewRunner(client, cfg)
-				if tracingEnabled {
-					runner = &runnableTraceWrapper{
-						tracer:   tracer,
-						spanName: fmt.Sprintf("%s/%d", taskStatusTestName, i),
-						runner:   runner,
-					}
-				}
-				th.AddRun(taskStatusTestName, workspaceName, runner)
-			}
-
-			// Start the test in a separate goroutine so we can coordinate timing
-			testCtx, testCancel := timeoutStrategy.toContext(ctx)
-			defer testCancel()
-			testDone := make(chan error)
-			go func() {
-				testDone <- th.Run(testCtx)
-			}()
-
-			// Wait for all runners to connect
-			logger.Info(ctx, "waiting for all runners to connect")
-			waitCtx, waitCancel := context.WithTimeout(ctx, 5*time.Minute)
-			defer waitCancel()
-
-			connectDone := make(chan struct{})
-			go func() {
-				connectedWaitGroup.Wait()
-				close(connectDone)
-			}()
-
-			select {
-			case <-waitCtx.Done():
-				return xerrors.Errorf("timeout waiting for runners to connect")
-			case <-connectDone:
-				logger.Info(ctx, "all runners connected")
-			}
-
-			// Wait for baseline duration
-			logger.Info(ctx, "waiting for baseline duration", slog.F("duration", baselineDuration))
-			select {
-			case <-ctx.Done():
-				return ctx.Err()
-			case <-time.After(baselineDuration):
-			}
-
-			// Trigger all runners to start reporting
-			logger.Info(ctx, "triggering runners to start reporting task status")
-			close(startReporting)
-
-			// Wait for the test to complete
-			err = <-testDone
-			if err != nil {
-				return xerrors.Errorf("run test harness: %w", err)
-			}
-
-			res := th.Results()
-			for _, o := range outputs {
-				err = o.write(res, inv.Stdout)
-				if err != nil {
-					return xerrors.Errorf("write output %q to %q: %w", o.format, o.path, err)
-				}
-			}
-
-			cleanupCtx, cleanupCancel := cleanupStrategy.toContext(ctx)
-			defer cleanupCancel()
-			err = th.Cleanup(cleanupCtx)
-			if err != nil {
-				return xerrors.Errorf("cleanup tests: %w", err)
-			}
-
-			if res.TotalFail > 0 {
-				return xerrors.New("load test failed, see above for more details")
-			}
-
-			return nil
-		},
-	}
-
-	cmd.Options = serpent.OptionSet{
-		{
-			Flag:        "count",
-			Description: "Number of concurrent runners to create.",
-			Default:     "10",
-			Value:       serpent.Int64Of(&count),
-		},
-		{
-			Flag:        "template",
-			Description: "Name or UUID of the template to use for the scale test. The template MUST include a coder_external_agent and a coder_app.",
-			Default:     "scaletest-task-status",
-			Value:       serpent.StringOf(&template),
-		},
-		{
-			Flag:        "workspace-name-prefix",
-			Description: "Prefix for workspace names (will be suffixed with index).",
-			Default:     "scaletest-task-status",
-			Value:       serpent.StringOf(&workspaceNamePrefix),
-		},
-		{
-			Flag:        "app-slug",
-			Description: "Slug of the app designated as the AI Agent.",
-			Default:     "ai-agent",
-			Value:       serpent.StringOf(&appSlug),
-		},
-		{
-			Flag:        "report-status-period",
-			Description: "Time between reporting task statuses.",
-			Default:     "10s",
-			Value:       serpent.DurationOf(&reportStatusPeriod),
-		},
-		{
-			Flag:        "report-status-duration",
-			Description: "Total time to report task statuses after baseline.",
-			Default:     "15m",
-			Value:       serpent.DurationOf(&reportStatusDuration),
-		},
-		{
-			Flag:        "baseline-duration",
-			Description: "Duration to wait after all runners connect before starting to report status.",
-			Default:     "10m",
-			Value:       serpent.DurationOf(&baselineDuration),
-		},
-	}
-	orgContext.AttachOptions(cmd)
-	output.attach(&cmd.Options)
-	tracingFlags.attach(&cmd.Options)
-	prometheusFlags.attach(&cmd.Options)
-	timeoutStrategy.attach(&cmd.Options)
-	cleanupStrategy.attach(&cmd.Options)
-	return cmd
-}
@@ -8,7 +8,7 @@ func (r *RootCmd) tasksCommand() *serpent.Command {
 	cmd := &serpent.Command{
 		Use:     "task",
 		Aliases: []string{"tasks"},
-		Short:   "Manage tasks",
+		Short:   "Experimental task commands.",
 		Handler: func(i *serpent.Invocation) error {
 			return i.Command.HelpHandler(i)
 		},
@@ -28,27 +28,27 @@ func (r *RootCmd) taskCreate() *serpent.Command {

 	cmd := &serpent.Command{
 		Use:   "create [input]",
-		Short: "Create a task",
+		Short: "Create an experimental task",
 		Long: FormatExamples(
 			Example{
 				Description: "Create a task with direct input",
-				Command:     "coder task create \"Add authentication to the user service\"",
+				Command:     "coder exp task create \"Add authentication to the user service\"",
 			},
 			Example{
 				Description: "Create a task with stdin input",
-				Command:     "echo \"Add authentication to the user service\" | coder task create",
+				Command:     "echo \"Add authentication to the user service\" | coder exp task create",
 			},
 			Example{
 				Description: "Create a task with a specific name",
-				Command:     "coder task create --name task1 \"Add authentication to the user service\"",
+				Command:     "coder exp task create --name task1 \"Add authentication to the user service\"",
 			},
 			Example{
 				Description: "Create a task from a specific template / preset",
-				Command:     "coder task create --template backend-dev --preset \"My Preset\" \"Add authentication to the user service\"",
+				Command:     "coder exp task create --template backend-dev --preset \"My Preset\" \"Add authentication to the user service\"",
 			},
 			Example{
 				Description: "Create a task for another user (requires appropriate permissions)",
-				Command:     "coder task create --owner user@example.com \"Add authentication to the user service\"",
+				Command:     "coder exp task create --owner user@example.com \"Add authentication to the user service\"",
 			},
 		),
 		Middleware: serpent.Chain(
@@ -111,7 +111,8 @@ func (r *RootCmd) taskCreate() *serpent.Command {
 			}

 			var (
-				ctx = inv.Context()
+				ctx       = inv.Context()
+				expClient = codersdk.NewExperimentalClient(client)

 				taskInput               string
 				templateVersionID       uuid.UUID
@@ -207,7 +208,7 @@ func (r *RootCmd) taskCreate() *serpent.Command {
 				templateVersionPresetID = preset.ID
 			}

-			task, err := client.CreateTask(ctx, ownerArg, codersdk.CreateTaskRequest{
+			task, err := expClient.CreateTask(ctx, ownerArg, codersdk.CreateTaskRequest{
 				Name:                    taskName,
 				TemplateVersionID:       templateVersionID,
 				TemplateVersionPresetID: templateVersionPresetID,
@@ -69,7 +69,7 @@ func TestTaskCreate(t *testing.T) {
 						ActiveVersionID: templateVersionID,
 					},
 				})
-			case fmt.Sprintf("/api/v2/tasks/%s", username):
+			case fmt.Sprintf("/api/experimental/tasks/%s", username):
 				var req codersdk.CreateTaskRequest
 				if !httpapi.Read(ctx, w, r, &req) {
 					return
@@ -329,7 +329,7 @@ func TestTaskCreate(t *testing.T) {
 				ctx    = testutil.Context(t, testutil.WaitShort)
 				srv    = httptest.NewServer(tt.handler(t, ctx))
 				client = codersdk.New(testutil.MustURL(t, srv.URL))
-				args   = []string{"task", "create"}
+				args   = []string{"exp", "task", "create"}
 				sb     strings.Builder
 				err    error
 			)
@@ -17,19 +17,19 @@ import (
 func (r *RootCmd) taskDelete() *serpent.Command {
 	cmd := &serpent.Command{
 		Use:   "delete <task> [<task> ...]",
-		Short: "Delete tasks",
+		Short: "Delete experimental tasks",
 		Long: FormatExamples(
 			Example{
 				Description: "Delete a single task.",
-				Command:     "$ coder task delete task1",
+				Command:     "$ coder exp task delete task1",
 			},
 			Example{
 				Description: "Delete multiple tasks.",
-				Command:     "$ coder task delete task1 task2 task3",
+				Command:     "$ coder exp task delete task1 task2 task3",
 			},
 			Example{
 				Description: "Delete a task without confirmation.",
-				Command:     "$ coder task delete task4 --yes",
+				Command:     "$ coder exp task delete task4 --yes",
 			},
 		),
 		Middleware: serpent.Chain(
@@ -44,10 +44,11 @@ func (r *RootCmd) taskDelete() *serpent.Command {
 			if err != nil {
 				return err
 			}
+			exp := codersdk.NewExperimentalClient(client)

 			var tasks []codersdk.Task
 			for _, identifier := range inv.Args {
-				task, err := client.TaskByIdentifier(ctx, identifier)
+				task, err := exp.TaskByIdentifier(ctx, identifier)
 				if err != nil {
 					return xerrors.Errorf("resolve task %q: %w", identifier, err)
 				}
@@ -70,7 +71,7 @@ func (r *RootCmd) taskDelete() *serpent.Command {

 			for i, task := range tasks {
 				display := displayList[i]
-				if err := client.DeleteTask(ctx, task.OwnerName, task.ID); err != nil {
+				if err := exp.DeleteTask(ctx, task.OwnerName, task.ID); err != nil {
 					return xerrors.Errorf("delete task %q: %w", display, err)
 				}
 				_, _ = fmt.Fprintln(
@@ -56,7 +56,7 @@ func TestExpTaskDelete(t *testing.T) {
 				taskID := uuid.MustParse(id1)
 				return func(w http.ResponseWriter, r *http.Request) {
 					switch {
-					case r.Method == http.MethodGet && r.URL.Path == "/api/v2/tasks/me/exists":
+					case r.Method == http.MethodGet && r.URL.Path == "/api/experimental/tasks/me/exists":
 						c.nameResolves.Add(1)
 						httpapi.Write(r.Context(), w, http.StatusOK,
 							codersdk.Task{
@@ -64,7 +64,7 @@ func TestExpTaskDelete(t *testing.T) {
 								Name:      "exists",
 								OwnerName: "me",
 							})
-					case r.Method == http.MethodDelete && r.URL.Path == "/api/v2/tasks/me/"+id1:
+					case r.Method == http.MethodDelete && r.URL.Path == "/api/experimental/tasks/me/"+id1:
 						c.deleteCalls.Add(1)
 						w.WriteHeader(http.StatusAccepted)
 					default:
@@ -82,13 +82,13 @@ func TestExpTaskDelete(t *testing.T) {
 			buildHandler: func(c *testCounters) http.HandlerFunc {
 				return func(w http.ResponseWriter, r *http.Request) {
 					switch {
-					case r.Method == http.MethodGet && r.URL.Path == "/api/v2/tasks/me/"+id2:
+					case r.Method == http.MethodGet && r.URL.Path == "/api/experimental/tasks/me/"+id2:
 						httpapi.Write(r.Context(), w, http.StatusOK, codersdk.Task{
 							ID:        uuid.MustParse(id2),
 							OwnerName: "me",
 							Name:      "uuid-task",
 						})
-					case r.Method == http.MethodDelete && r.URL.Path == "/api/v2/tasks/me/"+id2:
+					case r.Method == http.MethodDelete && r.URL.Path == "/api/experimental/tasks/me/"+id2:
 						c.deleteCalls.Add(1)
 						w.WriteHeader(http.StatusAccepted)
 					default:
@@ -104,24 +104,24 @@ func TestExpTaskDelete(t *testing.T) {
 			buildHandler: func(c *testCounters) http.HandlerFunc {
 				return func(w http.ResponseWriter, r *http.Request) {
 					switch {
-					case r.Method == http.MethodGet && r.URL.Path == "/api/v2/tasks/me/first":
+					case r.Method == http.MethodGet && r.URL.Path == "/api/experimental/tasks/me/first":
 						c.nameResolves.Add(1)
 						httpapi.Write(r.Context(), w, http.StatusOK, codersdk.Task{
 							ID:        uuid.MustParse(id3),
 							Name:      "first",
 							OwnerName: "me",
 						})
-					case r.Method == http.MethodGet && r.URL.Path == "/api/v2/tasks/me/"+id4:
+					case r.Method == http.MethodGet && r.URL.Path == "/api/experimental/tasks/me/"+id4:
 						c.nameResolves.Add(1)
 						httpapi.Write(r.Context(), w, http.StatusOK, codersdk.Task{
 							ID:        uuid.MustParse(id4),
 							OwnerName: "me",
 							Name:      "uuid-task-4",
 						})
-					case r.Method == http.MethodDelete && r.URL.Path == "/api/v2/tasks/me/"+id3:
+					case r.Method == http.MethodDelete && r.URL.Path == "/api/experimental/tasks/me/"+id3:
 						c.deleteCalls.Add(1)
 						w.WriteHeader(http.StatusAccepted)
-					case r.Method == http.MethodDelete && r.URL.Path == "/api/v2/tasks/me/"+id4:
+					case r.Method == http.MethodDelete && r.URL.Path == "/api/experimental/tasks/me/"+id4:
 						c.deleteCalls.Add(1)
 						w.WriteHeader(http.StatusAccepted)
 					default:
@@ -140,7 +140,7 @@ func TestExpTaskDelete(t *testing.T) {
 			buildHandler: func(_ *testCounters) http.HandlerFunc {
 				return func(w http.ResponseWriter, r *http.Request) {
 					switch {
-					case r.Method == http.MethodGet && r.URL.Path == "/api/v2/tasks" && r.URL.Query().Get("q") == "owner:\"me\"":
+					case r.Method == http.MethodGet && r.URL.Path == "/api/experimental/tasks" && r.URL.Query().Get("q") == "owner:\"me\"":
 						httpapi.Write(r.Context(), w, http.StatusOK, struct {
 							Tasks []codersdk.Task `json:"tasks"`
 							Count int             `json:"count"`
@@ -163,14 +163,14 @@ func TestExpTaskDelete(t *testing.T) {
 				taskID := uuid.MustParse(id5)
 				return func(w http.ResponseWriter, r *http.Request) {
 					switch {
-					case r.Method == http.MethodGet && r.URL.Path == "/api/v2/tasks/me/bad":
+					case r.Method == http.MethodGet && r.URL.Path == "/api/experimental/tasks/me/bad":
 						c.nameResolves.Add(1)
 						httpapi.Write(r.Context(), w, http.StatusOK, codersdk.Task{
 							ID:        taskID,
 							Name:      "bad",
 							OwnerName: "me",
 						})
-					case r.Method == http.MethodDelete && r.URL.Path == "/api/v2/tasks/me/bad":
+					case r.Method == http.MethodDelete && r.URL.Path == "/api/experimental/tasks/me/bad":
 						httpapi.InternalServerError(w, xerrors.New("boom"))
 					default:
 						httpapi.InternalServerError(w, xerrors.New("unwanted path: "+r.Method+" "+r.URL.Path))
@@ -193,7 +193,7 @@ func TestExpTaskDelete(t *testing.T) {

 			client := codersdk.New(testutil.MustURL(t, srv.URL))

-			args := append([]string{"task", "delete"}, tc.args...)
+			args := append([]string{"exp", "task", "delete"}, tc.args...)
 			inv, root := clitest.New(t, args...)
 			inv = inv.WithContext(ctx)
 			clitest.SetupConfig(t, client, root)
@@ -69,27 +69,27 @@ func (r *RootCmd) taskList() *serpent.Command {

 	cmd := &serpent.Command{
 		Use:   "list",
-		Short: "List tasks",
+		Short: "List experimental tasks",
 		Long: FormatExamples(
 			Example{
 				Description: "List tasks for the current user.",
-				Command:     "coder task list",
+				Command:     "coder exp task list",
 			},
 			Example{
 				Description: "List tasks for a specific user.",
-				Command:     "coder task list --user someone-else",
+				Command:     "coder exp task list --user someone-else",
 			},
 			Example{
 				Description: "List all tasks you can view.",
-				Command:     "coder task list --all",
+				Command:     "coder exp task list --all",
 			},
 			Example{
 				Description: "List all your running tasks.",
-				Command:     "coder task list --status running",
+				Command:     "coder exp task list --status running",
 			},
 			Example{
 				Description: "As above, but only show IDs.",
-				Command:     "coder task list --status running --quiet",
+				Command:     "coder exp task list --status running --quiet",
 			},
 		),
 		Aliases: []string{"ls"},
@@ -135,13 +135,14 @@ func (r *RootCmd) taskList() *serpent.Command {
 			}

 			ctx := inv.Context()
+			exp := codersdk.NewExperimentalClient(client)

 			targetUser := strings.TrimSpace(user)
 			if targetUser == "" && !all {
 				targetUser = codersdk.Me
 			}

-			tasks, err := client.Tasks(ctx, &codersdk.TasksFilter{
+			tasks, err := exp.Tasks(ctx, &codersdk.TasksFilter{
 				Owner:  targetUser,
 				Status: codersdk.TaskStatus(statusFilter),
 			})
@@ -69,7 +69,7 @@ func TestExpTaskList(t *testing.T) {
 		owner := coderdtest.CreateFirstUser(t, client)
 		memberClient, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)

-		inv, root := clitest.New(t, "task", "list")
+		inv, root := clitest.New(t, "exp", "task", "list")
 		clitest.SetupConfig(t, memberClient, root)

 		pty := ptytest.New(t).Attach(inv)
@@ -93,7 +93,7 @@ func TestExpTaskList(t *testing.T) {
 		wantPrompt := "build me a web app"
 		task := makeAITask(t, db, owner.OrganizationID, owner.UserID, memberUser.ID, database.WorkspaceTransitionStart, wantPrompt)

-		inv, root := clitest.New(t, "task", "list", "--column", "id,name,status,initial prompt")
+		inv, root := clitest.New(t, "exp", "task", "list", "--column", "id,name,status,initial prompt")
 		clitest.SetupConfig(t, memberClient, root)

 		pty := ptytest.New(t).Attach(inv)
@@ -122,7 +122,7 @@ func TestExpTaskList(t *testing.T) {
 		pausedTask := makeAITask(t, db, owner.OrganizationID, owner.UserID, memberUser.ID, database.WorkspaceTransitionStop, "stop me please")

 		// Use JSON output to reliably validate filtering.
-		inv, root := clitest.New(t, "task", "list", "--status=paused", "--output=json")
+		inv, root := clitest.New(t, "exp", "task", "list", "--status=paused", "--output=json")
 		clitest.SetupConfig(t, memberClient, root)

 		ctx := testutil.Context(t, testutil.WaitShort)
@@ -153,7 +153,7 @@ func TestExpTaskList(t *testing.T) {
 		_ = makeAITask(t, db, owner.OrganizationID, owner.UserID, memberUser.ID, database.WorkspaceTransitionStart, "other-task")
 		task := makeAITask(t, db, owner.OrganizationID, owner.UserID, owner.UserID, database.WorkspaceTransitionStart, "me-task")

-		inv, root := clitest.New(t, "task", "list", "--user", "me")
+		inv, root := clitest.New(t, "exp", "task", "list", "--user", "me")
 		//nolint:gocritic // Owner client is intended here smoke test the member task not showing up.
 		clitest.SetupConfig(t, client, root)

@@ -180,7 +180,7 @@ func TestExpTaskList(t *testing.T) {
 		task2 := makeAITask(t, db, owner.OrganizationID, owner.UserID, memberUser.ID, database.WorkspaceTransitionStop, "stop me please")

 		// Given: We add the `--quiet` flag
-		inv, root := clitest.New(t, "task", "list", "--quiet")
+		inv, root := clitest.New(t, "exp", "task", "list", "--quiet")
 		clitest.SetupConfig(t, memberClient, root)

 		ctx := testutil.Context(t, testutil.WaitShort)
@@ -224,7 +224,7 @@ func TestExpTaskList_OwnerCanListOthers(t *testing.T) {
 		t.Parallel()

 		// As the owner, list only member A tasks.
-		inv, root := clitest.New(t, "task", "list", "--user", memberAUser.Username, "--output=json")
+		inv, root := clitest.New(t, "exp", "task", "list", "--user", memberAUser.Username, "--output=json")
 		//nolint:gocritic // Owner client is intended here to allow member tasks to be listed.
 		clitest.SetupConfig(t, ownerClient, root)

@@ -252,7 +252,7 @@ func TestExpTaskList_OwnerCanListOthers(t *testing.T) {

 		// As the owner, list all tasks to verify both member tasks are present.
 		// Use JSON output to reliably validate filtering.
-		inv, root := clitest.New(t, "task", "list", "--all", "--output=json")
+		inv, root := clitest.New(t, "exp", "task", "list", "--all", "--output=json")
 		//nolint:gocritic // Owner client is intended here to allow all tasks to be listed.
 		clitest.SetupConfig(t, ownerClient, root)

@@ -28,7 +28,7 @@ func (r *RootCmd) taskLogs() *serpent.Command {
 		Long: FormatExamples(
 			Example{
 				Description: "Show logs for a given task.",
-				Command:     "coder task logs task1",
+				Command:     "coder exp task logs task1",
 			}),
 		Middleware: serpent.Chain(
 			serpent.RequireNArgs(1),
@@ -41,15 +41,16 @@ func (r *RootCmd) taskLogs() *serpent.Command {

 			var (
 				ctx        = inv.Context()
+				exp        = codersdk.NewExperimentalClient(client)
 				identifier = inv.Args[0]
 			)

-			task, err := client.TaskByIdentifier(ctx, identifier)
+			task, err := exp.TaskByIdentifier(ctx, identifier)
 			if err != nil {
 				return xerrors.Errorf("resolve task %q: %w", identifier, err)
 			}

-			logs, err := client.TaskLogs(ctx, codersdk.Me, task.ID)
+			logs, err := exp.TaskLogs(ctx, codersdk.Me, task.ID)
 			if err != nil {
 				return xerrors.Errorf("get task logs: %w", err)
 			}
@@ -46,7 +46,7 @@ func Test_TaskLogs(t *testing.T) {
 		userClient := client // user already has access to their own workspace

 		var stdout strings.Builder
-		inv, root := clitest.New(t, "task", "logs", task.Name, "--output", "json")
+		inv, root := clitest.New(t, "exp", "task", "logs", task.Name, "--output", "json")
 		inv.Stdout = &stdout
 		clitest.SetupConfig(t, userClient, root)

@@ -72,7 +72,7 @@ func Test_TaskLogs(t *testing.T) {
 		userClient := client

 		var stdout strings.Builder
-		inv, root := clitest.New(t, "task", "logs", task.ID.String(), "--output", "json")
+		inv, root := clitest.New(t, "exp", "task", "logs", task.ID.String(), "--output", "json")
 		inv.Stdout = &stdout
 		clitest.SetupConfig(t, userClient, root)

@@ -98,7 +98,7 @@ func Test_TaskLogs(t *testing.T) {
 		userClient := client

 		var stdout strings.Builder
-		inv, root := clitest.New(t, "task", "logs", task.ID.String())
+		inv, root := clitest.New(t, "exp", "task", "logs", task.ID.String())
 		inv.Stdout = &stdout
 		clitest.SetupConfig(t, userClient, root)

@@ -121,7 +121,7 @@ func Test_TaskLogs(t *testing.T) {
 		userClient, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)

 		var stdout strings.Builder
-		inv, root := clitest.New(t, "task", "logs", "doesnotexist")
+		inv, root := clitest.New(t, "exp", "task", "logs", "doesnotexist")
 		inv.Stdout = &stdout
 		clitest.SetupConfig(t, userClient, root)

@@ -139,7 +139,7 @@ func Test_TaskLogs(t *testing.T) {
 		userClient, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)

 		var stdout strings.Builder
-		inv, root := clitest.New(t, "task", "logs", uuid.Nil.String())
+		inv, root := clitest.New(t, "exp", "task", "logs", uuid.Nil.String())
 		inv.Stdout = &stdout
 		clitest.SetupConfig(t, userClient, root)

@@ -155,7 +155,7 @@ func Test_TaskLogs(t *testing.T) {
 		client, task := setupCLITaskTest(ctx, t, fakeAgentAPITaskLogsErr(assert.AnError))
 		userClient := client

-		inv, root := clitest.New(t, "task", "logs", task.ID.String())
+		inv, root := clitest.New(t, "exp", "task", "logs", task.ID.String())
 		clitest.SetupConfig(t, userClient, root)

 		err := inv.WithContext(ctx).Run()
@@ -17,10 +17,10 @@ func (r *RootCmd) taskSend() *serpent.Command {
 		Short: "Send input to a task",
 		Long: FormatExamples(Example{
 			Description: "Send direct input to a task.",
-			Command:     "coder task send task1 \"Please also add unit tests\"",
+			Command:     "coder exp task send task1 \"Please also add unit tests\"",
 		}, Example{
 			Description: "Send input from stdin to a task.",
-			Command:     "echo \"Please also add unit tests\" | coder task send task1 --stdin",
+			Command:     "echo \"Please also add unit tests\" | coder exp task send task1 --stdin",
 		}),
 		Middleware: serpent.RequireRangeArgs(1, 2),
 		Options: serpent.OptionSet{
@@ -39,6 +39,7 @@ func (r *RootCmd) taskSend() *serpent.Command {

 			var (
 				ctx        = inv.Context()
+				exp        = codersdk.NewExperimentalClient(client)
 				identifier = inv.Args[0]

 				taskInput string
@@ -59,12 +60,12 @@ func (r *RootCmd) taskSend() *serpent.Command {
 				taskInput = inv.Args[1]
 			}

-			task, err := client.TaskByIdentifier(ctx, identifier)
+			task, err := exp.TaskByIdentifier(ctx, identifier)
 			if err != nil {
 				return xerrors.Errorf("resolve task: %w", err)
 			}

-			if err = client.TaskSend(ctx, codersdk.Me, task.ID, codersdk.TaskSendRequest{Input: taskInput}); err != nil {
+			if err = exp.TaskSend(ctx, codersdk.Me, task.ID, codersdk.TaskSendRequest{Input: taskInput}); err != nil {
 				return xerrors.Errorf("send input to task: %w", err)
 			}

@@ -30,7 +30,7 @@ func Test_TaskSend(t *testing.T) {
 		userClient := client

 		var stdout strings.Builder
-		inv, root := clitest.New(t, "task", "send", task.Name, "carry on with the task")
+		inv, root := clitest.New(t, "exp", "task", "send", task.Name, "carry on with the task")
 		inv.Stdout = &stdout
 		clitest.SetupConfig(t, userClient, root)

@@ -46,7 +46,7 @@ func Test_TaskSend(t *testing.T) {
 		userClient := client

 		var stdout strings.Builder
-		inv, root := clitest.New(t, "task", "send", task.ID.String(), "carry on with the task")
+		inv, root := clitest.New(t, "exp", "task", "send", task.ID.String(), "carry on with the task")
 		inv.Stdout = &stdout
 		clitest.SetupConfig(t, userClient, root)

@@ -62,7 +62,7 @@ func Test_TaskSend(t *testing.T) {
 		userClient := client

 		var stdout strings.Builder
-		inv, root := clitest.New(t, "task", "send", task.Name, "--stdin")
+		inv, root := clitest.New(t, "exp", "task", "send", task.Name, "--stdin")
 		inv.Stdout = &stdout
 		inv.Stdin = strings.NewReader("carry on with the task")
 		clitest.SetupConfig(t, userClient, root)
@@ -80,7 +80,7 @@ func Test_TaskSend(t *testing.T) {
 		userClient, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)

 		var stdout strings.Builder
-		inv, root := clitest.New(t, "task", "send", "doesnotexist", "some task input")
+		inv, root := clitest.New(t, "exp", "task", "send", "doesnotexist", "some task input")
 		inv.Stdout = &stdout
 		clitest.SetupConfig(t, userClient, root)

@@ -98,7 +98,7 @@ func Test_TaskSend(t *testing.T) {
 		userClient, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)

 		var stdout strings.Builder
-		inv, root := clitest.New(t, "task", "send", uuid.Nil.String(), "some task input")
+		inv, root := clitest.New(t, "exp", "task", "send", uuid.Nil.String(), "some task input")
 		inv.Stdout = &stdout
 		clitest.SetupConfig(t, userClient, root)

@@ -114,7 +114,7 @@ func Test_TaskSend(t *testing.T) {
 		userClient, task := setupCLITaskTest(ctx, t, fakeAgentAPITaskSendErr(t, assert.AnError))

 		var stdout strings.Builder
-		inv, root := clitest.New(t, "task", "send", task.Name, "some task input")
+		inv, root := clitest.New(t, "exp", "task", "send", task.Name, "some task input")
 		inv.Stdout = &stdout
 		clitest.SetupConfig(t, userClient, root)

@@ -47,11 +47,11 @@ func (r *RootCmd) taskStatus() *serpent.Command {
 		Long: FormatExamples(
 			Example{
 				Description: "Show the status of a given task.",
-				Command:     "coder task status task1",
+				Command:     "coder exp task status task1",
 			},
 			Example{
 				Description: "Watch the status of a given task until it completes (idle or stopped).",
-				Command:     "coder task status task1 --watch",
+				Command:     "coder exp task status task1 --watch",
 			},
 		),
 		Use:     "status",
@@ -83,9 +83,10 @@ func (r *RootCmd) taskStatus() *serpent.Command {
 			}

 			ctx := i.Context()
+			exp := codersdk.NewExperimentalClient(client)
 			identifier := i.Args[0]

-			task, err := client.TaskByIdentifier(ctx, identifier)
+			task, err := exp.TaskByIdentifier(ctx, identifier)
 			if err != nil {
 				return err
 			}
@@ -106,7 +107,7 @@ func (r *RootCmd) taskStatus() *serpent.Command {
 			// TODO: implement streaming updates instead of polling
 			lastStatusRow := tsr
 			for range t.C {
-				task, err := client.TaskByID(ctx, task.ID)
+				task, err := exp.TaskByID(ctx, task.ID)
 				if err != nil {
 					return err
 				}
@@ -36,7 +36,7 @@ func Test_TaskStatus(t *testing.T) {
 			hf: func(ctx context.Context, _ time.Time) func(w http.ResponseWriter, r *http.Request) {
 				return func(w http.ResponseWriter, r *http.Request) {
 					switch r.URL.Path {
-					case "/api/v2/tasks/me/doesnotexist":
+					case "/api/experimental/tasks/me/doesnotexist":
 						httpapi.ResourceNotFound(w)
 						return
 					default:
@@ -52,7 +52,7 @@ func Test_TaskStatus(t *testing.T) {
 			hf: func(ctx context.Context, now time.Time) func(w http.ResponseWriter, r *http.Request) {
 				return func(w http.ResponseWriter, r *http.Request) {
 					switch r.URL.Path {
-					case "/api/v2/tasks/me/exists":
+					case "/api/experimental/tasks/me/exists":
 						httpapi.Write(ctx, w, http.StatusOK, codersdk.Task{
 							ID:              uuid.MustParse("11111111-1111-1111-1111-111111111111"),
 							WorkspaceStatus: codersdk.WorkspaceStatusRunning,
@@ -88,7 +88,7 @@ func Test_TaskStatus(t *testing.T) {
 				var calls atomic.Int64
 				return func(w http.ResponseWriter, r *http.Request) {
 					switch r.URL.Path {
-					case "/api/v2/tasks/me/exists":
+					case "/api/experimental/tasks/me/exists":
 						httpapi.Write(ctx, w, http.StatusOK, codersdk.Task{
 							ID:              uuid.MustParse("11111111-1111-1111-1111-111111111111"),
 							Name:            "exists",
@@ -103,7 +103,7 @@ func Test_TaskStatus(t *testing.T) {
 							Status:                  codersdk.TaskStatusPending,
 						})
 						return
-					case "/api/v2/tasks/me/11111111-1111-1111-1111-111111111111":
+					case "/api/experimental/tasks/me/11111111-1111-1111-1111-111111111111":
 						defer calls.Add(1)
 						switch calls.Load() {
 						case 0:
@@ -189,7 +189,6 @@ func Test_TaskStatus(t *testing.T) {
  "owner_id": "00000000-0000-0000-0000-000000000000",
  "owner_name": "me",
  "name": "exists",
-  "display_name": "Task exists",
  "template_id": "00000000-0000-0000-0000-000000000000",
  "template_version_id": "00000000-0000-0000-0000-000000000000",
  "template_name": "",
@@ -219,12 +218,11 @@ func Test_TaskStatus(t *testing.T) {
 				ts := time.Date(2025, 8, 26, 12, 34, 56, 0, time.UTC)
 				return func(w http.ResponseWriter, r *http.Request) {
 					switch r.URL.Path {
-					case "/api/v2/tasks/me/exists":
+					case "/api/experimental/tasks/me/exists":
 						httpapi.Write(ctx, w, http.StatusOK, codersdk.Task{
-							ID:          uuid.MustParse("11111111-1111-1111-1111-111111111111"),
-							Name:        "exists",
-							DisplayName: "Task exists",
-							OwnerName:   "me",
+							ID:        uuid.MustParse("11111111-1111-1111-1111-111111111111"),
+							Name:      "exists",
+							OwnerName: "me",
 							WorkspaceAgentHealth: &codersdk.WorkspaceAgentHealth{
 								Healthy: true,
 							},
@@ -256,7 +254,7 @@ func Test_TaskStatus(t *testing.T) {
 				srv    = httptest.NewServer(http.HandlerFunc(tc.hf(ctx, now)))
 				client = codersdk.New(testutil.MustURL(t, srv.URL))
 				sb     = strings.Builder{}
-				args   = []string{"task", "status", "--watch-interval", testutil.IntervalFast.String()}
+				args   = []string{"exp", "task", "status", "--watch-interval", testutil.IntervalFast.String()}
 			)

 			t.Cleanup(srv.Close)
@@ -60,14 +60,14 @@ func Test_Tasks(t *testing.T) {
 	}{
 		{
 			name:    "create task",
-			cmdArgs: []string{"task", "create", "test task input for " + t.Name(), "--name", taskName, "--template", taskTpl.Name},
+			cmdArgs: []string{"exp", "task", "create", "test task input for " + t.Name(), "--name", taskName, "--template", taskTpl.Name},
 			assertFn: func(stdout string, userClient *codersdk.Client) {
 				require.Contains(t, stdout, taskName, "task name should be in output")
 			},
 		},
 		{
 			name:    "list tasks after create",
-			cmdArgs: []string{"task", "list", "--output", "json"},
+			cmdArgs: []string{"exp", "task", "list", "--output", "json"},
 			assertFn: func(stdout string, userClient *codersdk.Client) {
 				var tasks []codersdk.Task
 				err := json.NewDecoder(strings.NewReader(stdout)).Decode(&tasks)
@@ -88,7 +88,7 @@ func Test_Tasks(t *testing.T) {
 		},
 		{
 			name:    "get task status after create",
-			cmdArgs: []string{"task", "status", taskName, "--output", "json"},
+			cmdArgs: []string{"exp", "task", "status", taskName, "--output", "json"},
 			assertFn: func(stdout string, userClient *codersdk.Client) {
 				var task codersdk.Task
 				require.NoError(t, json.NewDecoder(strings.NewReader(stdout)).Decode(&task), "should unmarshal task status")
@@ -98,12 +98,12 @@ func Test_Tasks(t *testing.T) {
 		},
 		{
 			name:    "send task message",
-			cmdArgs: []string{"task", "send", taskName, "hello"},
+			cmdArgs: []string{"exp", "task", "send", taskName, "hello"},
 			// Assertions for this happen in the fake agent API handler.
 		},
 		{
 			name:    "read task logs",
-			cmdArgs: []string{"task", "logs", taskName, "--output", "json"},
+			cmdArgs: []string{"exp", "task", "logs", taskName, "--output", "json"},
 			assertFn: func(stdout string, userClient *codersdk.Client) {
 				var logs []codersdk.TaskLogEntry
 				require.NoError(t, json.NewDecoder(strings.NewReader(stdout)).Decode(&logs), "should unmarshal task logs")
@@ -118,11 +118,12 @@ func Test_Tasks(t *testing.T) {
 		},
 		{
 			name:    "delete task",
-			cmdArgs: []string{"task", "delete", taskName, "--yes"},
+			cmdArgs: []string{"exp", "task", "delete", taskName, "--yes"},
 			assertFn: func(stdout string, userClient *codersdk.Client) {
 				// The task should eventually no longer show up in the list of tasks
 				testutil.Eventually(ctx, t, func(ctx context.Context) bool {
-					tasks, err := userClient.Tasks(ctx, &codersdk.TasksFilter{})
+					expClient := codersdk.NewExperimentalClient(userClient)
+					tasks, err := expClient.Tasks(ctx, &codersdk.TasksFilter{})
 					if !assert.NoError(t, err) {
 						return false
 					}
@@ -247,7 +248,8 @@ func setupCLITaskTest(ctx context.Context, t *testing.T, agentAPIHandlers map[st
 	template := createAITaskTemplate(t, client, owner.OrganizationID, withSidebarURL(fakeAPI.URL()), withAgentToken(authToken))

 	wantPrompt := "test prompt"
-	task, err := userClient.CreateTask(ctx, codersdk.Me, codersdk.CreateTaskRequest{
+	exp := codersdk.NewExperimentalClient(userClient)
+	task, err := exp.CreateTask(ctx, codersdk.Me, codersdk.CreateTaskRequest{
 		TemplateVersionID: template.ActiveVersionID,
 		Input:             wantPrompt,
 		Name:              "test-task",
@@ -2,85 +2,62 @@ package cli_test

 import (
 	"bytes"
-	"crypto/rand"
-	"encoding/binary"
-	"fmt"
 	"net/url"
 	"os"
 	"path"
 	"runtime"
 	"testing"
-	"time"

 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

 	"github.com/coder/coder/v2/cli"
 	"github.com/coder/coder/v2/cli/clitest"
-	"github.com/coder/coder/v2/cli/config"
-	"github.com/coder/coder/v2/cli/sessionstore"
 	"github.com/coder/coder/v2/coderd/coderdtest"
 	"github.com/coder/coder/v2/pty/ptytest"
-	"github.com/coder/serpent"
 )

-// keyringTestServiceName generates a unique service name for keyring tests
-// using the test name and a nanosecond timestamp to prevent collisions.
-func keyringTestServiceName(t *testing.T) string {
-	t.Helper()
-	var n uint32
-	err := binary.Read(rand.Reader, binary.BigEndian, &n)
-	if err != nil {
-		t.Fatal(err)
+// mockKeyring is a mock sessionstore.Backend implementation.
+type mockKeyring struct {
+	credentials map[string]string // service name -> credential
+}
+
+const mockServiceName = "mock-service-name"
+
+func newMockKeyring() *mockKeyring {
+	return &mockKeyring{credentials: make(map[string]string)}
+}
+
+func (m *mockKeyring) Read(_ *url.URL) (string, error) {
+	cred, ok := m.credentials[mockServiceName]
+	if !ok {
+		return "", os.ErrNotExist
 	}
-	return fmt.Sprintf("%s_%v_%d", t.Name(), time.Now().UnixNano(), n)
+	return cred, nil
 }

-type keyringTestEnv struct {
-	serviceName string
-	keyring     sessionstore.Keyring
-	inv         *serpent.Invocation
-	cfg         config.Root
-	clientURL   *url.URL
+func (m *mockKeyring) Write(_ *url.URL, token string) error {
+	m.credentials[mockServiceName] = token
+	return nil
 }

-func setupKeyringTestEnv(t *testing.T, clientURL string, args ...string) keyringTestEnv {
-	t.Helper()
-
-	var root cli.RootCmd
-
-	cmd, err := root.Command(root.AGPL())
-	require.NoError(t, err)
-
-	serviceName := keyringTestServiceName(t)
-	root.WithKeyringServiceName(serviceName)
-	root.UseKeyringWithGlobalConfig()
-
-	inv, cfg := clitest.NewWithDefaultKeyringCommand(t, cmd, args...)
-
-	parsedURL, err := url.Parse(clientURL)
-	require.NoError(t, err)
-
-	backend := sessionstore.NewKeyringWithService(serviceName)
-	t.Cleanup(func() {
-		_ = backend.Delete(parsedURL)
-	})
-
-	return keyringTestEnv{serviceName, backend, inv, cfg, parsedURL}
+func (m *mockKeyring) Delete(_ *url.URL) error {
+	_, ok := m.credentials[mockServiceName]
+	if !ok {
+		return os.ErrNotExist
+	}
+	delete(m.credentials, mockServiceName)
+	return nil
 }

 func TestUseKeyring(t *testing.T) {
-	// Verify that the --use-keyring flag default opts into using a keyring backend
-	// for storing session tokens instead of plain text files.
+	// Verify that the --use-keyring flag opts into using a keyring backend for
+	// storing session tokens instead of plain text files.
 	t.Parallel()

 	t.Run("Login", func(t *testing.T) {
 		t.Parallel()

-		if runtime.GOOS != "windows" && runtime.GOOS != "darwin" {
-			t.Skip("keyring is not supported on this OS")
-		}
-
 		// Create a test server
 		client := coderdtest.New(t, nil)
 		coderdtest.CreateFirstUser(t, client)
@@ -88,16 +65,25 @@ func TestUseKeyring(t *testing.T) {
 		// Create a pty for interactive prompts
 		pty := ptytest.New(t)

-		// Create CLI invocation which defaults to using the keyring
-		env := setupKeyringTestEnv(t, client.URL.String(),
+		// Create CLI invocation with --use-keyring flag
+		inv, cfg := clitest.New(t,
 			"login",
 			"--force-tty",
+			"--use-keyring",
 			"--no-open",
-			client.URL.String())
-		inv := env.inv
+			client.URL.String(),
+		)
 		inv.Stdin = pty.Input()
 		inv.Stdout = pty.Output()

+		// Inject the mock backend before running the command
+		var root cli.RootCmd
+		cmd, err := root.Command(root.AGPL())
+		require.NoError(t, err)
+		mockBackend := newMockKeyring()
+		root.WithSessionStorageBackend(mockBackend)
+		inv.Command = cmd
+
 		// Run login in background
 		doneChan := make(chan struct{})
 		go func() {
@@ -113,23 +99,19 @@ func TestUseKeyring(t *testing.T) {
 		<-doneChan

 		// Verify that session file was NOT created (using keyring instead)
-		sessionFile := path.Join(string(env.cfg), "session")
-		_, err := os.Stat(sessionFile)
+		sessionFile := path.Join(string(cfg), "session")
+		_, err = os.Stat(sessionFile)
 		require.True(t, os.IsNotExist(err), "session file should not exist when using keyring")

-		// Verify that the credential IS stored in OS keyring
-		cred, err := env.keyring.Read(env.clientURL)
-		require.NoError(t, err, "credential should be stored in OS keyring")
+		// Verify that the credential IS stored in mock keyring
+		cred, err := mockBackend.Read(nil)
+		require.NoError(t, err, "credential should be stored in mock keyring")
 		require.Equal(t, client.SessionToken(), cred, "stored token should match login token")
 	})

 	t.Run("Logout", func(t *testing.T) {
 		t.Parallel()

-		if runtime.GOOS != "windows" && runtime.GOOS != "darwin" {
-			t.Skip("keyring is not supported on this OS")
-		}
-
 		// Create a test server
 		client := coderdtest.New(t, nil)
 		coderdtest.CreateFirstUser(t, client)
@@ -137,17 +119,25 @@ func TestUseKeyring(t *testing.T) {
 		// Create a pty for interactive prompts
 		pty := ptytest.New(t)

-		// First, login with the keyring (default)
-		env := setupKeyringTestEnv(t, client.URL.String(),
+		// First, login with --use-keyring
+		loginInv, cfg := clitest.New(t,
 			"login",
 			"--force-tty",
+			"--use-keyring",
 			"--no-open",
 			client.URL.String(),
 		)
-		loginInv := env.inv
 		loginInv.Stdin = pty.Input()
 		loginInv.Stdout = pty.Output()

+		// Inject the mock backend
+		var loginRoot cli.RootCmd
+		loginCmd, err := loginRoot.Command(loginRoot.AGPL())
+		require.NoError(t, err)
+		mockBackend := newMockKeyring()
+		loginRoot.WithSessionStorageBackend(mockBackend)
+		loginInv.Command = loginCmd
+
 		doneChan := make(chan struct{})
 		go func() {
 			defer close(doneChan)
@@ -160,23 +150,25 @@ func TestUseKeyring(t *testing.T) {
 		pty.ExpectMatch("Welcome to Coder")
 		<-doneChan

-		// Verify credential exists in OS keyring
-		cred, err := env.keyring.Read(env.clientURL)
+		// Verify credential exists in mock keyring
+		cred, err := mockBackend.Read(nil)
 		require.NoError(t, err, "read credential should succeed before logout")
-		require.NotEmpty(t, cred, "credential should exist before logout")
+		require.NotEmpty(t, cred, "credential should exist after logout")

-		// Now logout using the same keyring service name
+		// Now run logout with --use-keyring
+		logoutInv, _ := clitest.New(t,
+			"logout",
+			"--use-keyring",
+			"--yes",
+			"--global-config", string(cfg),
+		)
+
+		// Inject the same mock backend
 		var logoutRoot cli.RootCmd
 		logoutCmd, err := logoutRoot.Command(logoutRoot.AGPL())
 		require.NoError(t, err)
-		logoutRoot.WithKeyringServiceName(env.serviceName)
-		logoutRoot.UseKeyringWithGlobalConfig()
-
-		logoutInv, _ := clitest.NewWithDefaultKeyringCommand(t, logoutCmd,
-			"logout",
-			"--yes",
-			"--global-config", string(env.cfg),
-		)
+		logoutRoot.WithSessionStorageBackend(mockBackend)
+		logoutInv.Command = logoutCmd

 		var logoutOut bytes.Buffer
 		logoutInv.Stdout = &logoutOut
@@ -184,18 +176,14 @@ func TestUseKeyring(t *testing.T) {
 		err = logoutInv.Run()
 		require.NoError(t, err, "logout should succeed")

-		// Verify the credential was deleted from OS keyring
-		_, err = env.keyring.Read(env.clientURL)
+		// Verify the credential was deleted from mock keyring
+		_, err = mockBackend.Read(nil)
 		require.ErrorIs(t, err, os.ErrNotExist, "credential should be deleted from keyring after logout")
 	})

-	t.Run("DefaultFileStorage", func(t *testing.T) {
+	t.Run("OmitFlag", func(t *testing.T) {
 		t.Parallel()

-		if runtime.GOOS != "linux" {
-			t.Skip("file storage is the default for Linux")
-		}
-
 		// Create a test server
 		client := coderdtest.New(t, nil)
 		coderdtest.CreateFirstUser(t, client)
@@ -203,13 +191,13 @@ func TestUseKeyring(t *testing.T) {
 		// Create a pty for interactive prompts
 		pty := ptytest.New(t)

-		env := setupKeyringTestEnv(t, client.URL.String(),
+		// --use-keyring flag omitted (should use file-based storage)
+		inv, cfg := clitest.New(t,
 			"login",
 			"--force-tty",
 			"--no-open",
 			client.URL.String(),
 		)
-		inv := env.inv
 		inv.Stdin = pty.Input()
 		inv.Stdout = pty.Output()

@@ -226,9 +214,9 @@ func TestUseKeyring(t *testing.T) {
 		<-doneChan

 		// Verify that session file WAS created (not using keyring)
-		sessionFile := path.Join(string(env.cfg), "session")
+		sessionFile := path.Join(string(cfg), "session")
 		_, err := os.Stat(sessionFile)
-		require.NoError(t, err, "session file should exist when NOT using --use-keyring on Linux")
+		require.NoError(t, err, "session file should exist when NOT using --use-keyring")

 		// Read and verify the token from file
 		content, err := os.ReadFile(sessionFile)
@@ -246,18 +234,24 @@ func TestUseKeyring(t *testing.T) {
 		// Create a pty for interactive prompts
 		pty := ptytest.New(t)

-		// Login using CODER_USE_KEYRING environment variable set to disable keyring usage,
-		// which should have the same behavior on all platforms.
-		env := setupKeyringTestEnv(t, client.URL.String(),
+		// Login using CODER_USE_KEYRING environment variable instead of flag
+		inv, cfg := clitest.New(t,
 			"login",
 			"--force-tty",
 			"--no-open",
 			client.URL.String(),
 		)
-		inv := env.inv
 		inv.Stdin = pty.Input()
 		inv.Stdout = pty.Output()
-		inv.Environ.Set("CODER_USE_KEYRING", "false")
+		inv.Environ.Set("CODER_USE_KEYRING", "true")
+
+		// Inject the mock backend
+		var root cli.RootCmd
+		cmd, err := root.Command(root.AGPL())
+		require.NoError(t, err)
+		mockBackend := newMockKeyring()
+		root.WithSessionStorageBackend(mockBackend)
+		inv.Command = cmd

 		doneChan := make(chan struct{})
 		go func() {
@@ -271,125 +265,65 @@ func TestUseKeyring(t *testing.T) {
 		pty.ExpectMatch("Welcome to Coder")
 		<-doneChan

-		// Verify that session file WAS created (not using keyring)
-		sessionFile := path.Join(string(env.cfg), "session")
-		_, err := os.Stat(sessionFile)
-		require.NoError(t, err, "session file should exist when CODER_USE_KEYRING set to false")
+		// Verify that session file was NOT created (using keyring via env var)
+		sessionFile := path.Join(string(cfg), "session")
+		_, err = os.Stat(sessionFile)
+		require.True(t, os.IsNotExist(err), "session file should not exist when using keyring via env var")

-		// Read and verify the token from file
-		content, err := os.ReadFile(sessionFile)
-		require.NoError(t, err, "should be able to read session file")
-		require.Equal(t, client.SessionToken(), string(content), "file should contain the session token")
-	})
-
-	t.Run("DisableKeyringWithFlag", func(t *testing.T) {
-		t.Parallel()
-
-		client := coderdtest.New(t, nil)
-		coderdtest.CreateFirstUser(t, client)
-		pty := ptytest.New(t)
-
-		// Login with --use-keyring=false to explicitly disable keyring usage, which
-		// should have the same behavior on all platforms.
-		env := setupKeyringTestEnv(t, client.URL.String(),
-			"login",
-			"--use-keyring=false",
-			"--force-tty",
-			"--no-open",
-			client.URL.String(),
-		)
-		inv := env.inv
-		inv.Stdin = pty.Input()
-		inv.Stdout = pty.Output()
-
-		doneChan := make(chan struct{})
-		go func() {
-			defer close(doneChan)
-			err := inv.Run()
-			assert.NoError(t, err)
-		}()
-
-		pty.ExpectMatch("Paste your token here:")
-		pty.WriteLine(client.SessionToken())
-		pty.ExpectMatch("Welcome to Coder")
-		<-doneChan
-
-		// Verify that session file WAS created (not using keyring)
-		sessionFile := path.Join(string(env.cfg), "session")
-		_, err := os.Stat(sessionFile)
-		require.NoError(t, err, "session file should exist when --use-keyring=false is specified")
-
-		// Read and verify the token from file
-		content, err := os.ReadFile(sessionFile)
-		require.NoError(t, err, "should be able to read session file")
-		require.Equal(t, client.SessionToken(), string(content), "file should contain the session token")
+		// Verify credential is in mock keyring
+		cred, err := mockBackend.Read(nil)
+		require.NoError(t, err, "credential should be stored in keyring when CODER_USE_KEYRING=true")
+		require.NotEmpty(t, cred)
 	})
 }

 func TestUseKeyringUnsupportedOS(t *testing.T) {
-	// Verify that on unsupported operating systems, file-based storage is used
-	// automatically even when --use-keyring is set to true (the default).
+	// Verify that trying to use --use-keyring on an unsupported operating system produces
+	// a helpful error message.
 	t.Parallel()

-	// Only run this on an unsupported OS.
-	if runtime.GOOS == "windows" || runtime.GOOS == "darwin" {
-		t.Skipf("Skipping unsupported OS test on %s where keyring is supported", runtime.GOOS)
+	// Skip on Windows since the keyring is actually supported.
+	if runtime.GOOS == "windows" {
+		t.Skip("Skipping unsupported OS test on Windows where keyring is supported")
 	}

-	t.Run("LoginWithDefaultKeyring", func(t *testing.T) {
+	const expMessage = "keyring storage is not supported on this operating system; remove the --use-keyring flag"
+
+	t.Run("LoginWithUnsupportedKeyring", func(t *testing.T) {
 		t.Parallel()

 		client := coderdtest.New(t, nil)
 		coderdtest.CreateFirstUser(t, client)
-		pty := ptytest.New(t)

-		env := setupKeyringTestEnv(t, client.URL.String(),
+		// Try to login with --use-keyring on an unsupported OS
+		inv, _ := clitest.New(t,
 			"login",
-			"--force-tty",
-			"--no-open",
+			"--use-keyring",
 			client.URL.String(),
 		)
-		inv := env.inv
-		inv.Stdin = pty.Input()
-		inv.Stdout = pty.Output()

-		doneChan := make(chan struct{})
-		go func() {
-			defer close(doneChan)
-			err := inv.Run()
-			assert.NoError(t, err)
-		}()
+		// The error should occur immediately, before any prompts
+		loginErr := inv.Run()

-		pty.ExpectMatch("Paste your token here:")
-		pty.WriteLine(client.SessionToken())
-		pty.ExpectMatch("Welcome to Coder")
-		<-doneChan
-
-		// Verify that session file WAS created (automatic fallback to file storage)
-		sessionFile := path.Join(string(env.cfg), "session")
-		_, err := os.Stat(sessionFile)
-		require.NoError(t, err, "session file should exist due to automatic fallback to file storage")
-
-		content, err := os.ReadFile(sessionFile)
-		require.NoError(t, err, "should be able to read session file")
-		require.Equal(t, client.SessionToken(), string(content), "file should contain the session token")
+		// Verify we got an error about unsupported OS
+		require.Error(t, loginErr)
+		require.Contains(t, loginErr.Error(), expMessage)
 	})

-	t.Run("LogoutWithDefaultKeyring", func(t *testing.T) {
+	t.Run("LogoutWithUnsupportedKeyring", func(t *testing.T) {
 		t.Parallel()

 		client := coderdtest.New(t, nil)
 		coderdtest.CreateFirstUser(t, client)
 		pty := ptytest.New(t)

-		// First login to create a session (will use file storage due to automatic fallback)
-		env := setupKeyringTestEnv(t, client.URL.String(),
+		// First login without keyring to create a session
+		loginInv, cfg := clitest.New(t,
 			"login",
 			"--force-tty",
 			"--no-open",
 			client.URL.String(),
 		)
-		loginInv := env.inv
 		loginInv.Stdin = pty.Input()
 		loginInv.Stdout = pty.Output()

@@ -405,22 +339,17 @@ func TestUseKeyringUnsupportedOS(t *testing.T) {
 		pty.ExpectMatch("Welcome to Coder")
 		<-doneChan

-		// Verify session file exists
-		sessionFile := path.Join(string(env.cfg), "session")
-		_, err := os.Stat(sessionFile)
-		require.NoError(t, err, "session file should exist before logout")
-
-		// Now logout - should succeed and delete the file
-		logoutEnv := setupKeyringTestEnv(t, client.URL.String(),
+		// Now try to logout with --use-keyring on an unsupported OS
+		logoutInv, _ := clitest.New(t,
 			"logout",
+			"--use-keyring",
 			"--yes",
-			"--global-config", string(env.cfg),
+			"--global-config", string(cfg),
 		)

-		err = logoutEnv.inv.Run()
-		require.NoError(t, err, "logout should succeed with automatic file storage fallback")
-
-		_, err = os.Stat(sessionFile)
-		require.True(t, os.IsNotExist(err), "session file should be deleted after logout")
+		err := logoutInv.Run()
+		// Verify we got an error about unsupported OS
+		require.Error(t, err)
+		require.Contains(t, err.Error(), expMessage)
 	})
 }
@@ -154,9 +154,9 @@ func (r *RootCmd) login() *serpent.Command {
 	cmd := &serpent.Command{
 		Use:   "login [<url>]",
 		Short: "Authenticate with Coder deployment",
-		Long: "By default, the session token is stored in the operating system keyring on " +
-			"macOS and Windows and a plain text file on Linux. Use the --use-keyring flag " +
-			"or CODER_USE_KEYRING environment variable to change the storage mechanism.",
+		Long: "By default, the session token is stored in a plain text file. Use the " +
+			"--use-keyring flag or set CODER_USE_KEYRING=true to store the token in " +
+			"the operating system keyring instead.",
 		Middleware: serpent.RequireRangeArgs(0, 1),
 		Handler: func(inv *serpent.Invocation) error {
 			ctx := inv.Context()
@@ -56,7 +56,7 @@ var (
 	// anything.
 	ErrSilent = xerrors.New("silent error")

-	errKeyringNotSupported = xerrors.New("keyring storage is not supported on this operating system; omit --use-keyring to use file-based storage")
+	errKeyringNotSupported = xerrors.New("keyring storage is not supported on this operating system; remove the --use-keyring flag to use file-based storage")
 )

 const (
@@ -104,7 +104,6 @@ func (r *RootCmd) CoreSubcommands() []*serpent.Command {
 		r.resetPassword(),
 		r.sharing(),
 		r.state(),
-		r.tasksCommand(),
 		r.templates(),
 		r.tokens(),
 		r.users(),
@@ -150,6 +149,7 @@ func (r *RootCmd) AGPLExperimental() []*serpent.Command {
 		r.mcpCommand(),
 		r.promptExample(),
 		r.rptyCommand(),
+		r.tasksCommand(),
 		r.boundary(),
 	}
 }
@@ -483,12 +483,10 @@ func (r *RootCmd) Command(subcommands []*serpent.Command) (*serpent.Command, err
 			Flag: varUseKeyring,
 			Env:  envUseKeyring,
 			Description: "Store and retrieve session tokens using the operating system " +
-				"keyring. This flag is ignored and file-based storage is used when " +
-				"--global-config is set or keyring usage is not supported on the current " +
-				"platform. Set to false to force file-based storage on supported platforms.",
-			Default: "true",
-			Value:   serpent.BoolOf(&r.useKeyring),
-			Group:   globalGroup,
+				"keyring. Currently only supported on Windows. By default, tokens are " +
+				"stored in plain text files.",
+			Value: serpent.BoolOf(&r.useKeyring),
+			Group: globalGroup,
 		},
 		{
 			Flag:        "debug-http",
@@ -536,12 +534,10 @@ type RootCmd struct {
 	disableDirect bool
 	debugHTTP     bool

-	disableNetworkTelemetry    bool
-	noVersionCheck             bool
-	noFeatureWarning           bool
-	useKeyring                 bool
-	keyringServiceName         string
-	useKeyringWithGlobalConfig bool
+	disableNetworkTelemetry bool
+	noVersionCheck          bool
+	noFeatureWarning        bool
+	useKeyring              bool
 }

 // InitClient creates and configures a new client with authentication, telemetry,
@@ -722,19 +718,8 @@ func (r *RootCmd) createUnauthenticatedClient(ctx context.Context, serverURL *ur
 // flag.
 func (r *RootCmd) ensureTokenBackend() sessionstore.Backend {
 	if r.tokenBackend == nil {
-		// Checking for the --global-config directory being set is a bit wonky but necessary
-		// to allow extensions that invoke the CLI with this flag (e.g. VS code) to continue
-		// working without modification. In the future we should modify these extensions to
-		// either access the credential in the keyring (like Coder Desktop) or some other
-		// approach that doesn't rely on the session token being stored on disk.
-		assumeExtensionInUse := r.globalConfig != config.DefaultDir() && !r.useKeyringWithGlobalConfig
-		keyringSupported := runtime.GOOS == "windows" || runtime.GOOS == "darwin"
-		if r.useKeyring && !assumeExtensionInUse && keyringSupported {
-			serviceName := sessionstore.DefaultServiceName
-			if r.keyringServiceName != "" {
-				serviceName = r.keyringServiceName
-			}
-			r.tokenBackend = sessionstore.NewKeyringWithService(serviceName)
+		if r.useKeyring {
+			r.tokenBackend = sessionstore.NewKeyring()
 		} else {
 			r.tokenBackend = sessionstore.NewFile(r.createConfig)
 		}
@@ -742,18 +727,8 @@ func (r *RootCmd) ensureTokenBackend() sessionstore.Backend {
 	return r.tokenBackend
 }

-// WithKeyringServiceName sets a custom keyring service name for testing purposes.
-// This allows tests to use isolated keyring storage while still exercising the
-// genuine storage backend selection logic in ensureTokenBackend().
-func (r *RootCmd) WithKeyringServiceName(serviceName string) {
-	r.keyringServiceName = serviceName
-}
-
-// UseKeyringWithGlobalConfig enables the use of the keyring storage backend
-// when the --global-config directory is set. This is only intended as an override
-// for tests, which require specifying the global config directory for test isolation.
-func (r *RootCmd) UseKeyringWithGlobalConfig() {
-	r.useKeyringWithGlobalConfig = true
+func (r *RootCmd) WithSessionStorageBackend(backend sessionstore.Backend) {
+	r.tokenBackend = backend
 }

 type AgentAuth struct {
@@ -1029,7 +1029,7 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
 			defer shutdownConns()

 			// Ensures that old database entries are cleaned up over time!
-			purger := dbpurge.New(ctx, logger.Named("dbpurge"), options.Database, options.DeploymentValues, quartz.NewReal())
+			purger := dbpurge.New(ctx, logger.Named("dbpurge"), options.Database, quartz.NewReal())
 			defer purger.Close()

 			// Updates workspace usage
@@ -1476,7 +1476,6 @@ func newProvisionerDaemon(
 						Listener:      terraformServer,
 						Logger:        provisionerLogger,
 						WorkDirectory: workDir,
-						Experiments:   coderAPI.Experiments,
 					},
 					CachePath: tfDir,
 					Tracer:    tracer,
@@ -2143,33 +2142,21 @@ func startBuiltinPostgres(ctx context.Context, cfg config.Root, logger slog.Logg
 	}
 	stdlibLogger := slog.Stdlib(ctx, logger.Named("postgres"), slog.LevelDebug)

-	// If the port is not defined, an available port will be found dynamically. This has
-	// implications in CI because here is no way to tell Postgres to use an ephemeral
-	// port, so to avoid flaky tests in CI we need to retry EmbeddedPostgres.Start in
-	// case of a race condition where the port we quickly listen on and close in
-	// embeddedPostgresURL() is not free by the time the embedded postgres starts up.
-	// The maximum retry attempts _should_ cover most cases where port conflicts occur
-	// in CI and cause flaky tests.
+	// If the port is not defined, an available port will be found dynamically.
 	maxAttempts := 1
 	_, err = cfg.PostgresPort().Read()
-	// Important: if retryPortDiscovery is changed to not include testing.Testing(),
-	// the retry logic below also needs to be updated to ensure we don't delete an
-	// existing database
 	retryPortDiscovery := errors.Is(err, os.ErrNotExist) && testing.Testing()
 	if retryPortDiscovery {
+		// There is no way to tell Postgres to use an ephemeral port, so in order to avoid
+		// flaky tests in CI we need to retry EmbeddedPostgres.Start in case of a race
+		// condition where the port we quickly listen on and close in embeddedPostgresURL()
+		// is not free by the time the embedded postgres starts up. This maximum_should
+		// cover most cases where port conflicts occur in CI and cause flaky tests.
 		maxAttempts = 3
 	}

 	var startErr error
 	for attempt := 0; attempt < maxAttempts; attempt++ {
-		if retryPortDiscovery && attempt > 0 {
-			// Clean up the data and runtime directories and the port file from the
-			// previous failed attempt to ensure a clean slate for the next attempt.
-			_ = os.RemoveAll(filepath.Join(cfg.PostgresPath(), "data"))
-			_ = os.RemoveAll(filepath.Join(cfg.PostgresPath(), "runtime"))
-			_ = cfg.PostgresPort().Delete()
-		}
-
 		// Ensure a password and port have been generated.
 		connectionURL, err := embeddedPostgresURL(cfg)
 		if err != nil {
@@ -2216,6 +2203,11 @@ func startBuiltinPostgres(ctx context.Context, cfg config.Root, logger slog.Logg
 			slog.F("port", pgPort),
 			slog.Error(startErr),
 		)
+
+		if retryPortDiscovery {
+			// Since a retry is needed, we wipe the port stored here at the beginning of the loop.
+			_ = cfg.PostgresPort().Delete()
+		}
 	}

 	return "", nil, xerrors.Errorf("failed to start built-in PostgreSQL after %d attempts. "+
@@ -46,12 +46,6 @@ var (
 	ErrNotImplemented = xerrors.New("not implemented")
 )

-const (
-	// DefaultServiceName is the service name used in keyrings for storing Coder CLI session
-	// tokens.
-	DefaultServiceName = "coder-v2-credentials"
-)
-
 // keyringProvider represents an operating system keyring. The expectation
 // is these methods operate on the user/login keyring.
 type keyringProvider interface {
@@ -108,9 +102,17 @@ type Keyring struct {
 	serviceName string
 }

+// NewKeyring creates a Keyring with the default service name for production use.
+func NewKeyring() Keyring {
+	return Keyring{
+		provider:    operatingSystemKeyring{},
+		serviceName: defaultServiceName,
+	}
+}
+
 // NewKeyringWithService creates a Keyring Backend that stores credentials under the
-// specified service name. Generally, DefaultServiceName should be provided as the service
-// name except in tests which may need parameterization to avoid conflicting keyring use.
+// specified service name. This is primarily intended for testing to avoid conflicts
+// with production credentials and collisions between tests.
 func NewKeyringWithService(serviceName string) Keyring {
 	return Keyring{
 		provider:    operatingSystemKeyring{},
@@ -1,105 +0,0 @@
-//go:build darwin
-
-package sessionstore
-
-import (
-	"encoding/base64"
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"regexp"
-	"strings"
-)
-
-const (
-	// fixedUsername is the fixed username used for all keychain entries.
-	// Since our interface only uses service names, we use a constant username.
-	fixedUsername = "coder-login-credentials"
-
-	execPathKeychain = "/usr/bin/security"
-	notFoundStr      = "could not be found"
-)
-
-// operatingSystemKeyring implements keyringProvider for macOS.
-// It is largely adapted from the zalando/go-keyring package.
-type operatingSystemKeyring struct{}
-
-func (operatingSystemKeyring) Set(service, credential string) error {
-	// if the added secret has multiple lines or some non ascii,
-	// macOS will hex encode it on return. To avoid getting garbage, we
-	// encode all passwords
-	password := base64.StdEncoding.EncodeToString([]byte(credential))
-
-	cmd := exec.Command(execPathKeychain, "-i")
-	stdIn, err := cmd.StdinPipe()
-	if err != nil {
-		return err
-	}
-
-	if err = cmd.Start(); err != nil {
-		return err
-	}
-
-	command := fmt.Sprintf("add-generic-password -U -s %s -a %s -w %s\n",
-		shellEscape(service),
-		shellEscape(fixedUsername),
-		shellEscape(password))
-	if len(command) > 4096 {
-		return ErrSetDataTooBig
-	}
-
-	if _, err := io.WriteString(stdIn, command); err != nil {
-		return err
-	}
-
-	if err = stdIn.Close(); err != nil {
-		return err
-	}
-
-	return cmd.Wait()
-}
-
-func (operatingSystemKeyring) Get(service string) ([]byte, error) {
-	out, err := exec.Command(
-		execPathKeychain,
-		"find-generic-password",
-		"-s", service,
-		"-wa", fixedUsername).CombinedOutput()
-	if err != nil {
-		if strings.Contains(string(out), notFoundStr) {
-			return nil, os.ErrNotExist
-		}
-		return nil, err
-	}
-
-	trimStr := strings.TrimSpace(string(out))
-	return base64.StdEncoding.DecodeString(trimStr)
-}
-
-func (operatingSystemKeyring) Delete(service string) error {
-	out, err := exec.Command(
-		execPathKeychain,
-		"delete-generic-password",
-		"-s", service,
-		"-a", fixedUsername).CombinedOutput()
-	if strings.Contains(string(out), notFoundStr) {
-		return os.ErrNotExist
-	}
-	return err
-}
-
-// shellEscape returns a shell-escaped version of the string s.
-// This is adapted from github.com/zalando/go-keyring/internal/shellescape.
-func shellEscape(s string) string {
-	if len(s) == 0 {
-		return "''"
-	}
-
-	pattern := regexp.MustCompile(`[^\w@%+=:,./-]`)
-	if pattern.MatchString(s) {
-		return "'" + strings.ReplaceAll(s, "'", "'\"'\"'") + "'"
-	}
-
-	return s
-}
@@ -1,34 +0,0 @@
-//go:build darwin
-
-package sessionstore_test
-
-import (
-	"encoding/base64"
-	"os/exec"
-	"testing"
-)
-
-const (
-	execPathKeychain = "/usr/bin/security"
-	fixedUsername    = "coder-login-credentials"
-)
-
-func readRawKeychainCredential(t *testing.T, service string) []byte {
-	t.Helper()
-
-	out, err := exec.Command(
-		execPathKeychain,
-		"find-generic-password",
-		"-s", service,
-		"-wa", fixedUsername).CombinedOutput()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	dst := make([]byte, base64.StdEncoding.DecodedLen(len(out)))
-	n, err := base64.StdEncoding.Decode(dst, out)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return dst[:n]
-}
@@ -1,7 +1,9 @@
-//go:build !windows && !darwin
+//go:build !windows

 package sessionstore

+const defaultServiceName = "not-implemented"
+
 type operatingSystemKeyring struct{}

 func (operatingSystemKeyring) Set(_, _ string) error {
@@ -1,10 +0,0 @@
-//go:build !windows && !darwin
-
-package sessionstore_test
-
-import "testing"
-
-func readRawKeychainCredential(t *testing.T, _ string) []byte {
-	t.Fatal("not implemented")
-	return nil
-}
@@ -1,7 +1,6 @@
 package sessionstore_test

 import (
-	"encoding/json"
 	"errors"
 	"fmt"
 	"net/url"
@@ -17,11 +16,6 @@ import (
 	"github.com/coder/coder/v2/cli/sessionstore"
 )

-type storedCredentials map[string]struct {
-	CoderURL string `json:"coder_url"`
-	APIToken string `json:"api_token"`
-}
-
 // Generate a test service name for use with the OS keyring. It uses a combination
 // of the test name and a nanosecond timestamp to prevent collisions.
 func keyringTestServiceName(t *testing.T) string {
@@ -32,8 +26,8 @@ func keyringTestServiceName(t *testing.T) string {
 func TestKeyring(t *testing.T) {
 	t.Parallel()

-	if runtime.GOOS != "windows" && runtime.GOOS != "darwin" {
-		t.Skip("linux is not supported yet")
+	if runtime.GOOS != "windows" {
+		t.Skip("linux and darwin are not supported yet")
 	}

 	// This test exercises use of the operating system keyring. As a result,
@@ -205,66 +199,6 @@ func TestKeyring(t *testing.T) {
 		err = backend.Delete(srvURL2)
 		require.NoError(t, err)
 	})
-
-	t.Run("StorageFormat", func(t *testing.T) {
-		t.Parallel()
-		// The storage format must remain consistent to ensure we don't break
-		// compatibility with other Coder related applications that may read
-		// or decode the same credential.
-
-		const testURL1 = "http://127.0.0.1:1337"
-		srv1URL, err := url.Parse(testURL1)
-		require.NoError(t, err)
-
-		const testURL2 = "http://127.0.0.1:1338"
-		srv2URL, err := url.Parse(testURL2)
-		require.NoError(t, err)
-
-		serviceName := keyringTestServiceName(t)
-		backend := sessionstore.NewKeyringWithService(serviceName)
-		t.Cleanup(func() {
-			_ = backend.Delete(srv1URL)
-			_ = backend.Delete(srv2URL)
-		})
-
-		// Write token for server 1
-		const token1 = "token-server-1"
-		err = backend.Write(srv1URL, token1)
-		require.NoError(t, err)
-
-		// Write token for server 2 (should NOT overwrite server 1's token)
-		const token2 = "token-server-2"
-		err = backend.Write(srv2URL, token2)
-		require.NoError(t, err)
-
-		// Verify both credentials are stored in the raw format and can
-		// be extracted through the Backend API.
-		rawCredential := readRawKeychainCredential(t, serviceName)
-
-		storedCreds := make(storedCredentials)
-		err = json.Unmarshal(rawCredential, &storedCreds)
-		require.NoError(t, err, "unmarshalling stored credentials")
-
-		// Both credentials should exist
-		require.Len(t, storedCreds, 2)
-		require.Equal(t, token1, storedCreds[srv1URL.Host].APIToken)
-		require.Equal(t, token2, storedCreds[srv2URL.Host].APIToken)
-
-		// Read individual credentials
-		token, err := backend.Read(srv1URL)
-		require.NoError(t, err)
-		require.Equal(t, token1, token)
-
-		token, err = backend.Read(srv2URL)
-		require.NoError(t, err)
-		require.Equal(t, token2, token)
-
-		// Cleanup
-		err = backend.Delete(srv1URL)
-		require.NoError(t, err)
-		err = backend.Delete(srv2URL)
-		require.NoError(t, err)
-	})
 }

 func TestFile(t *testing.T) {
@@ -10,6 +10,12 @@ import (
 	"github.com/danieljoos/wincred"
 )

+const (
+	// defaultServiceName is the service name used in the Windows Credential Manager
+	// for storing Coder CLI session tokens.
+	defaultServiceName = "coder-v2-credentials"
+)
+
 // operatingSystemKeyring implements keyringProvider and uses Windows Credential Manager.
 // It is largely adapted from the zalando/go-keyring package.
 type operatingSystemKeyring struct{}
@@ -14,16 +14,6 @@ import (
 	"github.com/coder/coder/v2/cli/sessionstore"
 )

-func readRawKeychainCredential(t *testing.T, serviceName string) []byte {
-	t.Helper()
-
-	winCred, err := wincred.GetGenericCredential(serviceName)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return winCred.CredentialBlob
-}
-
 func TestWindowsKeyring_WriteReadDelete(t *testing.T) {
 	t.Parallel()

@@ -48,7 +38,10 @@ func TestWindowsKeyring_WriteReadDelete(t *testing.T) {
 	winCred, err := wincred.GetGenericCredential(serviceName)
 	require.NoError(t, err, "getting windows credential")

-	storedCreds := make(storedCredentials)
+	var storedCreds map[string]struct {
+		CoderURL string `json:"coder_url"`
+		APIToken string `json:"api_token"`
+	}
 	err = json.Unmarshal(winCred.CredentialBlob, &storedCreds)
 	require.NoError(t, err, "unmarshalling stored credentials")

@@ -72,3 +65,63 @@ func TestWindowsKeyring_WriteReadDelete(t *testing.T) {
 	_, err = backend.Read(srvURL)
 	require.ErrorIs(t, err, os.ErrNotExist)
 }
+
+func TestWindowsKeyring_MultipleServers(t *testing.T) {
+	t.Parallel()
+
+	const testURL1 = "http://127.0.0.1:1337"
+	srv1URL, err := url.Parse(testURL1)
+	require.NoError(t, err)
+
+	const testURL2 = "http://127.0.0.1:1338"
+	srv2URL, err := url.Parse(testURL2)
+	require.NoError(t, err)
+
+	serviceName := keyringTestServiceName(t)
+	backend := sessionstore.NewKeyringWithService(serviceName)
+	t.Cleanup(func() {
+		_ = backend.Delete(srv1URL)
+		_ = backend.Delete(srv2URL)
+	})
+
+	// Write token for server 1
+	const token1 = "token-server-1"
+	err = backend.Write(srv1URL, token1)
+	require.NoError(t, err)
+
+	// Write token for server 2 (should NOT overwrite server 1's token)
+	const token2 = "token-server-2"
+	err = backend.Write(srv2URL, token2)
+	require.NoError(t, err)
+
+	// Verify both credentials are stored in Windows Credential Manager
+	winCred, err := wincred.GetGenericCredential(serviceName)
+	require.NoError(t, err, "getting windows credential")
+
+	var storedCreds map[string]struct {
+		CoderURL string `json:"coder_url"`
+		APIToken string `json:"api_token"`
+	}
+	err = json.Unmarshal(winCred.CredentialBlob, &storedCreds)
+	require.NoError(t, err, "unmarshalling stored credentials")
+
+	// Both credentials should exist
+	require.Len(t, storedCreds, 2)
+	require.Equal(t, token1, storedCreds[srv1URL.Host].APIToken)
+	require.Equal(t, token2, storedCreds[srv2URL.Host].APIToken)
+
+	// Read individual credentials
+	token, err := backend.Read(srv1URL)
+	require.NoError(t, err)
+	require.Equal(t, token1, token)
+
+	token, err = backend.Read(srv2URL)
+	require.NoError(t, err)
+	require.Equal(t, token2, token)
+
+	// Cleanup
+	err = backend.Delete(srv1URL)
+	require.NoError(t, err)
+	err = backend.Delete(srv2URL)
+	require.NoError(t, err)
+}
@@ -53,7 +53,6 @@ SUBCOMMANDS:
    stop              Stop a workspace
    support           Commands for troubleshooting issues with a Coder
                      deployment.
-    task              Manage tasks
    templates         Manage templates
    tokens            Manage personal access tokens
    unfavorite        Remove a workspace from your favorites
@@ -109,12 +108,10 @@ variables or flags.
      --url url, $CODER_URL
          URL to a deployment.

-      --use-keyring bool, $CODER_USE_KEYRING (default: true)
+      --use-keyring bool, $CODER_USE_KEYRING
          Store and retrieve session tokens using the operating system keyring.
-          This flag is ignored and file-based storage is used when
-          --global-config is set or keyring usage is not supported on the
-          current platform. Set to false to force file-based storage on
-          supported platforms.
+          Currently only supported on Windows. By default, tokens are stored in
+          plain text files.

  -v, --verbose bool, $CODER_VERBOSE
          Enable verbose output.
@@ -5,9 +5,9 @@ USAGE:

  Authenticate with Coder deployment

-  By default, the session token is stored in the operating system keyring on
-  macOS and Windows and a plain text file on Linux. Use the --use-keyring flag
-  or CODER_USE_KEYRING environment variable to change the storage mechanism.
+  By default, the session token is stored in a plain text file. Use the
+  --use-keyring flag or set CODER_USE_KEYRING=true to store the token in the
+  operating system keyring instead.

 OPTIONS:
      --first-user-email string, $CODER_FIRST_USER_EMAIL
@@ -7,7 +7,7 @@
    "last_seen_at": "====[timestamp]=====",
    "name": "test-daemon",
    "version": "v0.0.0-devel",
-    "api_version": "1.12",
+    "api_version": "1.11",
    "provisioners": [
      "echo"
    ],
@@ -80,7 +80,12 @@ OPTIONS:
          Periodically check for new releases of Coder and inform the owner. The
          check is performed once per day.

-AI BRIDGE OPTIONS: 
+AIBRIDGE OPTIONS: 
+      --aibridge-inject-coder-mcp-tools bool, $CODER_AIBRIDGE_INJECT_CODER_MCP_TOOLS (default: false)
+          Whether to inject Coder's MCP tools into intercepted AI Bridge
+          requests (requires the "oauth2" and "mcp-server-http" experiments to
+          be enabled).
+
      --aibridge-anthropic-base-url string, $CODER_AIBRIDGE_ANTHROPIC_BASE_URL (default: https://api.anthropic.com/)
          The base URL of the Anthropic API.

@@ -106,18 +111,9 @@ AI BRIDGE OPTIONS:
          See
          https://docs.claude.com/en/docs/claude-code/settings#environment-variables.

-      --aibridge-retention duration, $CODER_AIBRIDGE_RETENTION (default: 60d)
-          Length of time to retain data such as interceptions and all related
-          records (token, prompt, tool use).
-
      --aibridge-enabled bool, $CODER_AIBRIDGE_ENABLED (default: false)
          Whether to start an in-memory aibridged instance.

-      --aibridge-inject-coder-mcp-tools bool, $CODER_AIBRIDGE_INJECT_CODER_MCP_TOOLS (default: false)
-          Whether to inject Coder's MCP tools into intercepted AI Bridge
-          requests (requires the "oauth2" and "mcp-server-http" experiments to
-          be enabled).
-
      --aibridge-openai-base-url string, $CODER_AIBRIDGE_OPENAI_BASE_URL (default: https://api.openai.com/v1/)
          The base URL of the OpenAI API.

@@ -1,19 +0,0 @@
-coder v0.0.0-devel
-
-USAGE:
-  coder task
-
-  Manage tasks
-
-  Aliases: tasks
-
-SUBCOMMANDS:
-    create    Create a task
-    delete    Delete tasks
-    list      List tasks
-    logs      Show a task's logs
-    send      Send input to a task
-    status    Show the status of a task.
-
-———
-Run `coder --help` for a list of global options.
@@ -1,51 +0,0 @@
-coder v0.0.0-devel
-
-USAGE:
-  coder task create [flags] [input]
-
-  Create a task
-
-    - Create a task with direct input:
-  
-       $ coder task create "Add authentication to the user service"
-  
-    - Create a task with stdin input:
-  
-       $ echo "Add authentication to the user service" | coder task create
-  
-    - Create a task with a specific name:
-  
-       $ coder task create --name task1 "Add authentication to the user service"
-  
-    - Create a task from a specific template / preset:
-  
-       $ coder task create --template backend-dev --preset "My Preset" "Add
-  authentication to the user service"
-  
-    - Create a task for another user (requires appropriate permissions):
-  
-       $ coder task create --owner user@example.com "Add authentication to the
-  user service"
-
-OPTIONS:
-  -O, --org string, $CODER_ORGANIZATION
-          Select which organization (uuid or name) to use.
-
-      --name string
-          Specify the name of the task. If you do not specify one, a name will
-          be generated for you.
-
-      --owner string (default: me)
-          Specify the owner of the task. Defaults to the current user.
-
-      --preset string, $CODER_TASK_PRESET_NAME (default: none)
-  -q, --quiet bool
-          Only display the created task's ID.
-
-      --stdin bool
-          Reads from stdin for the task input.
-
-      --template string, $CODER_TASK_TEMPLATE_NAME
-      --template-version string, $CODER_TASK_TEMPLATE_VERSION
-———
-Run `coder --help` for a list of global options.
@@ -1,27 +0,0 @@
-coder v0.0.0-devel
-
-USAGE:
-  coder task delete [flags] <task> [<task> ...]
-
-  Delete tasks
-
-  Aliases: rm
-
-    - Delete a single task.:
-  
-       $ $ coder task delete task1
-  
-    - Delete multiple tasks.:
-  
-       $ $ coder task delete task1 task2 task3
-  
-    - Delete a task without confirmation.:
-  
-       $ $ coder task delete task4 --yes
-
-OPTIONS:
-  -y, --yes bool
-          Bypass prompts.
-
-———
-Run `coder --help` for a list of global options.
@@ -1,50 +0,0 @@
-coder v0.0.0-devel
-
-USAGE:
-  coder task list [flags]
-
-  List tasks
-
-  Aliases: ls
-
-    - List tasks for the current user.:
-  
-       $ coder task list
-  
-    - List tasks for a specific user.:
-  
-       $ coder task list --user someone-else
-  
-    - List all tasks you can view.:
-  
-       $ coder task list --all
-  
-    - List all your running tasks.:
-  
-       $ coder task list --status running
-  
-    - As above, but only show IDs.:
-  
-       $ coder task list --status running --quiet
-
-OPTIONS:
-  -a, --all bool (default: false)
-          List tasks for all users you can view.
-
-  -c, --column [id|organization id|owner id|owner name|owner avatar url|name|display name|template id|template version id|template name|template display name|template icon|workspace id|workspace name|workspace status|workspace build number|workspace agent id|workspace agent lifecycle|workspace agent health|workspace app id|initial prompt|status|state|message|created at|updated at|state changed] (default: name,status,state,state changed,message)
-          Columns to display in table output.
-
-  -o, --output table|json (default: table)
-          Output format.
-
-  -q, --quiet bool (default: false)
-          Only display task IDs.
-
-      --status pending|initializing|active|paused|error|unknown
-          Filter by task status.
-
-      --user string
-          List tasks for the specified user (username, "me").
-
-———
-Run `coder --help` for a list of global options.
@@ -1,20 +0,0 @@
-coder v0.0.0-devel
-
-USAGE:
-  coder task logs [flags] <task>
-
-  Show a task's logs
-
-    - Show logs for a given task.:
-  
-       $ coder task logs task1
-
-OPTIONS:
-  -c, --column [id|content|type|time] (default: type,content)
-          Columns to display in table output.
-
-  -o, --output table|json (default: table)
-          Output format.
-
-———
-Run `coder --help` for a list of global options.
@@ -1,21 +0,0 @@
-coder v0.0.0-devel
-
-USAGE:
-  coder task send [flags] <task> [<input> | --stdin]
-
-  Send input to a task
-
-    - Send direct input to a task.:
-  
-       $ coder task send task1 "Please also add unit tests"
-  
-    - Send input from stdin to a task.:
-  
-       $ echo "Please also add unit tests" | coder task send task1 --stdin
-
-OPTIONS:
-      --stdin bool
-          Reads the input from stdin.
-
-———
-Run `coder --help` for a list of global options.
@@ -1,30 +0,0 @@
-coder v0.0.0-devel
-
-USAGE:
-  coder task status [flags]
-
-  Show the status of a task.
-
-  Aliases: stat
-
-    - Show the status of a given task.:
-  
-       $ coder task status task1
-  
-    - Watch the status of a given task until it completes (idle or stopped).:
-  
-       $ coder task status task1 --watch
-
-OPTIONS:
-  -c, --column [id|organization id|owner id|owner name|owner avatar url|name|display name|template id|template version id|template name|template display name|template icon|workspace id|workspace name|workspace status|workspace build number|workspace agent id|workspace agent lifecycle|workspace agent health|workspace app id|initial prompt|status|state|message|created at|updated at|state changed|healthy] (default: state changed,status,healthy,state,message)
-          Columns to display in table output.
-
-  -o, --output table|json (default: table)
-          Output format.
-
-      --watch bool (default: false)
-          Watch the task status output. This will stream updates to the terminal
-          until the underlying workspace is stopped.
-
-———
-Run `coder --help` for a list of global options.
@@ -751,7 +751,3 @@ aibridge:
  # (requires the "oauth2" and "mcp-server-http" experiments to be enabled).
  # (default: false, type: bool)
  inject_coder_mcp_tools: false
-  # Length of time to retain data such as interceptions and all related records
-  # (token, prompt, tool use).
-  # (default: 60d, type: duration)
-  retention: 1440h0m0s
@@ -36,8 +36,6 @@ import (
 	"github.com/coder/quartz"
 )

-const workspaceCacheRefreshInterval = 5 * time.Minute
-
 // API implements the DRPC agent API interface from agent/proto. This struct is
 // instantiated once per agent connection and kept alive for the duration of the
 // session.
@@ -56,8 +54,6 @@ type API struct {
 	*SubAgentAPI
 	*tailnet.DRPCService

-	cachedWorkspaceFields *CachedWorkspaceFields
-
 	mu sync.Mutex
 }

@@ -96,7 +92,7 @@ type Options struct {
 	UpdateAgentMetricsFn func(ctx context.Context, labels prometheusmetrics.AgentMetricLabels, metrics []*agentproto.Stats_Metric)
 }

-func New(opts Options, workspace database.Workspace) *API {
+func New(opts Options) *API {
 	if opts.Clock == nil {
 		opts.Clock = quartz.NewReal()
 	}
@@ -118,13 +114,6 @@ func New(opts Options, workspace database.Workspace) *API {
 		WorkspaceID:              opts.WorkspaceID,
 	}

-	// Don't cache details for prebuilds, though the cached fields will eventually be updated
-	// by the refresh routine once the prebuild workspace is claimed.
-	api.cachedWorkspaceFields = &CachedWorkspaceFields{}
-	if !workspace.IsPrebuild() {
-		api.cachedWorkspaceFields.UpdateValues(workspace)
-	}
-
 	api.AnnouncementBannerAPI = &AnnouncementBannerAPI{
 		appearanceFetcher: opts.AppearanceFetcher,
 	}
@@ -150,7 +139,6 @@ func New(opts Options, workspace database.Workspace) *API {

 	api.StatsAPI = &StatsAPI{
 		AgentFn:                   api.agent,
-		Workspace:                 api.cachedWorkspaceFields,
 		Database:                  opts.Database,
 		Log:                       opts.Log,
 		StatsReporter:             opts.StatsReporter,
@@ -174,11 +162,10 @@ func New(opts Options, workspace database.Workspace) *API {
 	}

 	api.MetadataAPI = &MetadataAPI{
-		AgentFn:   api.agent,
-		Workspace: api.cachedWorkspaceFields,
-		Database:  opts.Database,
-		Pubsub:    opts.Pubsub,
-		Log:       opts.Log,
+		AgentFn:  api.agent,
+		Database: opts.Database,
+		Pubsub:   opts.Pubsub,
+		Log:      opts.Log,
 	}

 	api.LogsAPI = &LogsAPI{
@@ -218,10 +205,6 @@ func New(opts Options, workspace database.Workspace) *API {
 		Database:       opts.Database,
 	}

-	// Start background cache refresh loop to handle workspace changes
-	// like prebuild claims where owner_id and other fields may be modified in the DB.
-	go api.startCacheRefreshLoop(opts.Ctx)
-
 	return api
 }

@@ -271,56 +254,6 @@ func (a *API) agent(ctx context.Context) (database.WorkspaceAgent, error) {
 	return agent, nil
 }

-// refreshCachedWorkspace periodically updates the cached workspace fields.
-// This ensures that changes like prebuild claims (which modify owner_id, name, etc.)
-// are eventually reflected in the cache without requiring agent reconnection.
-func (a *API) refreshCachedWorkspace(ctx context.Context) {
-	ws, err := a.opts.Database.GetWorkspaceByID(ctx, a.opts.WorkspaceID)
-	if err != nil {
-		a.opts.Log.Warn(ctx, "failed to refresh cached workspace fields", slog.Error(err))
-		a.cachedWorkspaceFields.Clear()
-		return
-	}
-
-	if ws.IsPrebuild() {
-		return
-	}
-
-	// If we still have the same values, skip the update and logging calls.
-	if a.cachedWorkspaceFields.identity.Equal(database.WorkspaceIdentityFromWorkspace(ws)) {
-		return
-	}
-	// Update fields that can change during workspace lifecycle (e.g., AutostartSchedule)
-	a.cachedWorkspaceFields.UpdateValues(ws)
-
-	a.opts.Log.Debug(ctx, "refreshed cached workspace fields",
-		slog.F("workspace_id", ws.ID),
-		slog.F("owner_id", ws.OwnerID),
-		slog.F("name", ws.Name))
-}
-
-// startCacheRefreshLoop runs a background goroutine that periodically refreshes
-// the cached workspace fields. This is primarily needed to handle prebuild claims
-// where the owner_id and other fields change while the agent connection persists.
-func (a *API) startCacheRefreshLoop(ctx context.Context) {
-	// Refresh every 5 minutes. This provides a reasonable balance between:
-	// - Keeping cache fresh for prebuild claims and other workspace updates
-	// - Minimizing unnecessary database queries
-	ticker := a.opts.Clock.TickerFunc(ctx, workspaceCacheRefreshInterval, func() error {
-		a.refreshCachedWorkspace(ctx)
-		return nil
-	}, "cache_refresh")
-
-	// We need to wait on the ticker exiting.
-	_ = ticker.Wait()
-
-	a.opts.Log.Debug(ctx, "cache refresh loop exited, invalidating the workspace cache on agent API",
-		slog.F("workspace_id", a.cachedWorkspaceFields.identity.ID),
-		slog.F("owner_id", a.cachedWorkspaceFields.identity.OwnerUsername),
-		slog.F("name", a.cachedWorkspaceFields.identity.Name))
-	a.cachedWorkspaceFields.Clear()
-}
-
 func (a *API) publishWorkspaceUpdate(ctx context.Context, agent *database.WorkspaceAgent, kind wspubsub.WorkspaceEventKind) error {
 	a.opts.PublishWorkspaceUpdateFn(ctx, a.opts.OwnerID, wspubsub.WorkspaceEvent{
 		Kind:        kind,
@@ -1,52 +0,0 @@
-package agentapi
-
-import (
-	"sync"
-
-	"github.com/coder/coder/v2/coderd/database"
-)
-
-// CachedWorkspaceFields contains workspace data that is safe to cache for the
-// duration of an agent connection. These fields are used to reduce database calls
-// in high-frequency operations like stats reporting and metadata updates.
-// Prebuild workspaces should not be cached using this struct within the API struct,
-// however some of these fields for a workspace can be updated live so there is a
-// routine in the API for refreshing the workspace on a timed interval.
-//
-// IMPORTANT: ACL fields (GroupACL, UserACL) are NOT cached because they can be
-// modified in the database and we must use fresh data for authorization checks.
-type CachedWorkspaceFields struct {
-	lock sync.RWMutex
-
-	identity database.WorkspaceIdentity
-}
-
-func (cws *CachedWorkspaceFields) Clear() {
-	cws.lock.Lock()
-	defer cws.lock.Unlock()
-	cws.identity = database.WorkspaceIdentity{}
-}
-
-func (cws *CachedWorkspaceFields) UpdateValues(ws database.Workspace) {
-	cws.lock.Lock()
-	defer cws.lock.Unlock()
-	cws.identity.ID = ws.ID
-	cws.identity.OwnerID = ws.OwnerID
-	cws.identity.OrganizationID = ws.OrganizationID
-	cws.identity.TemplateID = ws.TemplateID
-	cws.identity.Name = ws.Name
-	cws.identity.OwnerUsername = ws.OwnerUsername
-	cws.identity.TemplateName = ws.TemplateName
-	cws.identity.AutostartSchedule = ws.AutostartSchedule
-}
-
-// Returns the Workspace, true, unless the workspace has not been cached (nuked or was a prebuild).
-func (cws *CachedWorkspaceFields) AsWorkspaceIdentity() (database.WorkspaceIdentity, bool) {
-	cws.lock.RLock()
-	defer cws.lock.RUnlock()
-	// Should we be more explicit about all fields being set to be valid?
-	if cws.identity.Equal(database.WorkspaceIdentity{}) {
-		return database.WorkspaceIdentity{}, false
-	}
-	return cws.identity, true
-}
@@ -1,97 +0,0 @@
-package agentapi_test
-
-import (
-	"testing"
-
-	"github.com/google/uuid"
-	"github.com/stretchr/testify/require"
-
-	"github.com/coder/coder/v2/coderd/agentapi"
-	"github.com/coder/coder/v2/coderd/database"
-)
-
-func TestCacheClear(t *testing.T) {
-	t.Parallel()
-
-	var (
-		user = database.User{
-			ID:       uuid.New(),
-			Username: "bill",
-		}
-		template = database.Template{
-			ID:   uuid.New(),
-			Name: "tpl",
-		}
-		workspace = database.Workspace{
-			ID:            uuid.New(),
-			OwnerID:       user.ID,
-			OwnerUsername: user.Username,
-			TemplateID:    template.ID,
-			Name:          "xyz",
-			TemplateName:  template.Name,
-		}
-		workspaceAsCacheFields = agentapi.CachedWorkspaceFields{}
-	)
-
-	workspaceAsCacheFields.UpdateValues(database.Workspace{
-		ID:                workspace.ID,
-		OwnerID:           workspace.OwnerID,
-		OwnerUsername:     workspace.OwnerUsername,
-		TemplateID:        workspace.TemplateID,
-		Name:              workspace.Name,
-		TemplateName:      workspace.TemplateName,
-		AutostartSchedule: workspace.AutostartSchedule,
-	},
-	)
-
-	emptyCws := agentapi.CachedWorkspaceFields{}
-	workspaceAsCacheFields.Clear()
-	wsi, ok := workspaceAsCacheFields.AsWorkspaceIdentity()
-	require.False(t, ok)
-	ecwsi, ok := emptyCws.AsWorkspaceIdentity()
-	require.False(t, ok)
-	require.True(t, ecwsi.Equal(wsi))
-}
-
-func TestCacheUpdate(t *testing.T) {
-	t.Parallel()
-
-	var (
-		user = database.User{
-			ID:       uuid.New(),
-			Username: "bill",
-		}
-		template = database.Template{
-			ID:   uuid.New(),
-			Name: "tpl",
-		}
-		workspace = database.Workspace{
-			ID:            uuid.New(),
-			OwnerID:       user.ID,
-			OwnerUsername: user.Username,
-			TemplateID:    template.ID,
-			Name:          "xyz",
-			TemplateName:  template.Name,
-		}
-		workspaceAsCacheFields = agentapi.CachedWorkspaceFields{}
-	)
-
-	workspaceAsCacheFields.UpdateValues(database.Workspace{
-		ID:                workspace.ID,
-		OwnerID:           workspace.OwnerID,
-		OwnerUsername:     workspace.OwnerUsername,
-		TemplateID:        workspace.TemplateID,
-		Name:              workspace.Name,
-		TemplateName:      workspace.TemplateName,
-		AutostartSchedule: workspace.AutostartSchedule,
-	},
-	)
-
-	cws := agentapi.CachedWorkspaceFields{}
-	cws.UpdateValues(workspace)
-	wsi, ok := workspaceAsCacheFields.AsWorkspaceIdentity()
-	require.True(t, ok)
-	cwsi, ok := cws.AsWorkspaceIdentity()
-	require.True(t, ok)
-	require.True(t, wsi.Equal(cwsi))
-}
@@ -12,17 +12,15 @@ import (
 	"cdr.dev/slog"
 	agentproto "github.com/coder/coder/v2/agent/proto"
 	"github.com/coder/coder/v2/coderd/database"
-	"github.com/coder/coder/v2/coderd/database/dbauthz"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/database/pubsub"
 )

 type MetadataAPI struct {
-	AgentFn   func(context.Context) (database.WorkspaceAgent, error)
-	Workspace *CachedWorkspaceFields
-	Database  database.Store
-	Pubsub    pubsub.Pubsub
-	Log       slog.Logger
+	AgentFn  func(context.Context) (database.WorkspaceAgent, error)
+	Database database.Store
+	Pubsub   pubsub.Pubsub
+	Log      slog.Logger

 	TimeNowFn func() time.Time // defaults to dbtime.Now()
 }
@@ -109,19 +107,7 @@ func (a *MetadataAPI) BatchUpdateMetadata(ctx context.Context, req *agentproto.B
 		)
 	}

-	// Inject RBAC object into context for dbauthz fast path, avoid having to
-	// call GetWorkspaceByAgentID on every metadata update.
-	rbacCtx := ctx
-	if dbws, ok := a.Workspace.AsWorkspaceIdentity(); ok {
-		rbacCtx, err = dbauthz.WithWorkspaceRBAC(ctx, dbws.RBACObject())
-		if err != nil {
-			// Don't error level log here, will exit the function. We want to fall back to GetWorkspaceByAgentID.
-			//nolint:gocritic
-			a.Log.Debug(ctx, "Cached workspace was present but RBAC object was invalid", slog.F("err", err))
-		}
-	}
-
-	err = a.Database.UpdateWorkspaceAgentMetadata(rbacCtx, dbUpdate)
+	err = a.Database.UpdateWorkspaceAgentMetadata(ctx, dbUpdate)
 	if err != nil {
 		return nil, xerrors.Errorf("update workspace agent metadata in database: %w", err)
 	}
@@ -2,14 +2,12 @@ package agentapi_test

 import (
 	"context"
-	"database/sql"
 	"encoding/json"
 	"sync/atomic"
 	"testing"
 	"time"

 	"github.com/google/uuid"
-	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 	"google.golang.org/protobuf/types/known/timestamppb"
@@ -17,14 +15,10 @@ import (
 	agentproto "github.com/coder/coder/v2/agent/proto"
 	"github.com/coder/coder/v2/coderd/agentapi"
 	"github.com/coder/coder/v2/coderd/database"
-	"github.com/coder/coder/v2/coderd/database/dbauthz"
 	"github.com/coder/coder/v2/coderd/database/dbmock"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/database/pubsub"
-	"github.com/coder/coder/v2/coderd/rbac"
-	"github.com/coder/coder/v2/coderd/rbac/policy"
 	"github.com/coder/coder/v2/testutil"
-	"github.com/coder/quartz"
 )

 type fakePublisher struct {
@@ -90,10 +84,9 @@ func TestBatchUpdateMetadata(t *testing.T) {
 			AgentFn: func(context.Context) (database.WorkspaceAgent, error) {
 				return agent, nil
 			},
-			Workspace: &agentapi.CachedWorkspaceFields{},
-			Database:  dbM,
-			Pubsub:    pub,
-			Log:       testutil.Logger(t),
+			Database: dbM,
+			Pubsub:   pub,
+			Log:      testutil.Logger(t),
 			TimeNowFn: func() time.Time {
 				return now
 			},
@@ -176,10 +169,9 @@ func TestBatchUpdateMetadata(t *testing.T) {
 			AgentFn: func(context.Context) (database.WorkspaceAgent, error) {
 				return agent, nil
 			},
-			Workspace: &agentapi.CachedWorkspaceFields{},
-			Database:  dbM,
-			Pubsub:    pub,
-			Log:       testutil.Logger(t),
+			Database: dbM,
+			Pubsub:   pub,
+			Log:      testutil.Logger(t),
 			TimeNowFn: func() time.Time {
 				return now
 			},
@@ -246,10 +238,9 @@ func TestBatchUpdateMetadata(t *testing.T) {
 			AgentFn: func(context.Context) (database.WorkspaceAgent, error) {
 				return agent, nil
 			},
-			Workspace: &agentapi.CachedWorkspaceFields{},
-			Database:  dbM,
-			Pubsub:    pub,
-			Log:       testutil.Logger(t),
+			Database: dbM,
+			Pubsub:   pub,
+			Log:      testutil.Logger(t),
 			TimeNowFn: func() time.Time {
 				return now
 			},
@@ -281,421 +272,4 @@ func TestBatchUpdateMetadata(t *testing.T) {
 			Keys: []string{req.Metadata[0].Key, req.Metadata[1].Key, req.Metadata[2].Key},
 		}, gotEvent)
 	})
-
-	// Test RBAC fast path with valid RBAC object - should NOT call GetWorkspaceByAgentID
-	// This test verifies that when a valid RBAC object is present in context, the dbauthz layer
-	// uses the fast path and skips the GetWorkspaceByAgentID database call.
-	t.Run("WorkspaceCached_SkipsDBCall", func(t *testing.T) {
-		t.Parallel()
-
-		var (
-			ctrl = gomock.NewController(t)
-			dbM  = dbmock.NewMockStore(ctrl)
-			pub  = &fakePublisher{}
-			now  = dbtime.Now()
-			// Set up consistent IDs that represent a valid workspace->agent relationship
-			workspaceID = uuid.MustParse("12345678-1234-1234-1234-123456789012")
-			ownerID     = uuid.MustParse("87654321-4321-4321-4321-210987654321")
-			orgID       = uuid.MustParse("11111111-1111-1111-1111-111111111111")
-			agentID     = uuid.MustParse("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa")
-		)
-
-		agent := database.WorkspaceAgent{
-			ID: agentID,
-			// In a real scenario, this agent would belong to a resource in the workspace above
-		}
-
-		req := &agentproto.BatchUpdateMetadataRequest{
-			Metadata: []*agentproto.Metadata{
-				{
-					Key: "test_key",
-					Result: &agentproto.WorkspaceAgentMetadata_Result{
-						CollectedAt: timestamppb.New(now.Add(-time.Second)),
-						Age:         1,
-						Value:       "test_value",
-					},
-				},
-			},
-		}
-
-		// Expect UpdateWorkspaceAgentMetadata to be called
-		dbM.EXPECT().UpdateWorkspaceAgentMetadata(gomock.Any(), database.UpdateWorkspaceAgentMetadataParams{
-			WorkspaceAgentID: agent.ID,
-			Key:              []string{"test_key"},
-			Value:            []string{"test_value"},
-			Error:            []string{""},
-			CollectedAt:      []time.Time{now},
-		}).Return(nil)
-
-		// DO NOT expect GetWorkspaceByAgentID - the fast path should skip this call
-		// If GetWorkspaceByAgentID is called, the test will fail with "unexpected call"
-
-		// dbauthz will call Wrappers() to check for wrapped databases
-		dbM.EXPECT().Wrappers().Return([]string{}).AnyTimes()
-
-		// Set up dbauthz to test the actual authorization layer
-		auth := rbac.NewStrictCachingAuthorizer(prometheus.NewRegistry())
-		accessControlStore := &atomic.Pointer[dbauthz.AccessControlStore]{}
-		var acs dbauthz.AccessControlStore = dbauthz.AGPLTemplateAccessControlStore{}
-		accessControlStore.Store(&acs)
-
-		api := &agentapi.MetadataAPI{
-			AgentFn: func(_ context.Context) (database.WorkspaceAgent, error) {
-				return agent, nil
-			},
-			Workspace: &agentapi.CachedWorkspaceFields{},
-			Database:  dbauthz.New(dbM, auth, testutil.Logger(t), accessControlStore),
-			Pubsub:    pub,
-			Log:       testutil.Logger(t),
-			TimeNowFn: func() time.Time {
-				return now
-			},
-		}
-
-		api.Workspace.UpdateValues(database.Workspace{
-			ID:             workspaceID,
-			OwnerID:        ownerID,
-			OrganizationID: orgID,
-		})
-
-		// Create context with system actor so authorization passes
-		ctx := dbauthz.AsSystemRestricted(context.Background())
-		resp, err := api.BatchUpdateMetadata(ctx, req)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-	})
-	// Test RBAC slow path - invalid RBAC object should fall back to GetWorkspaceByAgentID
-	// This test verifies that when the RBAC object has invalid IDs (nil UUIDs), the dbauthz layer
-	// falls back to the slow path and calls GetWorkspaceByAgentID.
-	t.Run("InvalidWorkspaceCached_RequiresDBCall", func(t *testing.T) {
-		t.Parallel()
-
-		var (
-			ctrl        = gomock.NewController(t)
-			dbM         = dbmock.NewMockStore(ctrl)
-			pub         = &fakePublisher{}
-			now         = dbtime.Now()
-			workspaceID = uuid.MustParse("12345678-1234-1234-1234-123456789012")
-			ownerID     = uuid.MustParse("87654321-4321-4321-4321-210987654321")
-			orgID       = uuid.MustParse("11111111-1111-1111-1111-111111111111")
-			agentID     = uuid.MustParse("bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb")
-		)
-
-		agent := database.WorkspaceAgent{
-			ID: agentID,
-		}
-
-		req := &agentproto.BatchUpdateMetadataRequest{
-			Metadata: []*agentproto.Metadata{
-				{
-					Key: "test_key",
-					Result: &agentproto.WorkspaceAgentMetadata_Result{
-						CollectedAt: timestamppb.New(now.Add(-time.Second)),
-						Age:         1,
-						Value:       "test_value",
-					},
-				},
-			},
-		}
-
-		// EXPECT GetWorkspaceByAgentID to be called because the RBAC fast path validation fails
-		dbM.EXPECT().GetWorkspaceByAgentID(gomock.Any(), agentID).Return(database.Workspace{
-			ID:             workspaceID,
-			OwnerID:        ownerID,
-			OrganizationID: orgID,
-		}, nil)
-
-		// Expect UpdateWorkspaceAgentMetadata to be called after authorization
-		dbM.EXPECT().UpdateWorkspaceAgentMetadata(gomock.Any(), database.UpdateWorkspaceAgentMetadataParams{
-			WorkspaceAgentID: agent.ID,
-			Key:              []string{"test_key"},
-			Value:            []string{"test_value"},
-			Error:            []string{""},
-			CollectedAt:      []time.Time{now},
-		}).Return(nil)
-
-		// dbauthz will call Wrappers() to check for wrapped databases
-		dbM.EXPECT().Wrappers().Return([]string{}).AnyTimes()
-
-		// Set up dbauthz to test the actual authorization layer
-		auth := rbac.NewStrictCachingAuthorizer(prometheus.NewRegistry())
-		accessControlStore := &atomic.Pointer[dbauthz.AccessControlStore]{}
-		var acs dbauthz.AccessControlStore = dbauthz.AGPLTemplateAccessControlStore{}
-		accessControlStore.Store(&acs)
-
-		api := &agentapi.MetadataAPI{
-			AgentFn: func(_ context.Context) (database.WorkspaceAgent, error) {
-				return agent, nil
-			},
-
-			Workspace: &agentapi.CachedWorkspaceFields{},
-			Database:  dbauthz.New(dbM, auth, testutil.Logger(t), accessControlStore),
-			Pubsub:    pub,
-			Log:       testutil.Logger(t),
-			TimeNowFn: func() time.Time {
-				return now
-			},
-		}
-
-		// Create an invalid RBAC object with nil UUIDs for owner/org
-		// This will fail dbauthz fast path validation and trigger GetWorkspaceByAgentID
-		api.Workspace.UpdateValues(database.Workspace{
-			ID:             uuid.MustParse("cccccccc-cccc-cccc-cccc-cccccccccccc"),
-			OwnerID:        uuid.Nil, // Invalid: fails dbauthz fast path validation
-			OrganizationID: uuid.Nil, // Invalid: fails dbauthz fast path validation
-		})
-
-		// Create context with system actor so authorization passes
-		ctx := dbauthz.AsSystemRestricted(context.Background())
-		resp, err := api.BatchUpdateMetadata(ctx, req)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-	})
-	// Test RBAC slow path - no RBAC object in context
-	// This test verifies that when no RBAC object is present in context, the dbauthz layer
-	// falls back to the slow path and calls GetWorkspaceByAgentID.
-	t.Run("WorkspaceNotCached_RequiresDBCall", func(t *testing.T) {
-		t.Parallel()
-
-		var (
-			ctrl        = gomock.NewController(t)
-			dbM         = dbmock.NewMockStore(ctrl)
-			pub         = &fakePublisher{}
-			now         = dbtime.Now()
-			workspaceID = uuid.MustParse("12345678-1234-1234-1234-123456789012")
-			ownerID     = uuid.MustParse("87654321-4321-4321-4321-210987654321")
-			orgID       = uuid.MustParse("11111111-1111-1111-1111-111111111111")
-			agentID     = uuid.MustParse("dddddddd-dddd-dddd-dddd-dddddddddddd")
-		)
-
-		agent := database.WorkspaceAgent{
-			ID: agentID,
-		}
-
-		req := &agentproto.BatchUpdateMetadataRequest{
-			Metadata: []*agentproto.Metadata{
-				{
-					Key: "test_key",
-					Result: &agentproto.WorkspaceAgentMetadata_Result{
-						CollectedAt: timestamppb.New(now.Add(-time.Second)),
-						Age:         1,
-						Value:       "test_value",
-					},
-				},
-			},
-		}
-
-		// EXPECT GetWorkspaceByAgentID to be called because no RBAC object is in context
-		dbM.EXPECT().GetWorkspaceByAgentID(gomock.Any(), agentID).Return(database.Workspace{
-			ID:             workspaceID,
-			OwnerID:        ownerID,
-			OrganizationID: orgID,
-		}, nil)
-
-		// Expect UpdateWorkspaceAgentMetadata to be called after authorization
-		dbM.EXPECT().UpdateWorkspaceAgentMetadata(gomock.Any(), database.UpdateWorkspaceAgentMetadataParams{
-			WorkspaceAgentID: agent.ID,
-			Key:              []string{"test_key"},
-			Value:            []string{"test_value"},
-			Error:            []string{""},
-			CollectedAt:      []time.Time{now},
-		}).Return(nil)
-
-		// dbauthz will call Wrappers() to check for wrapped databases
-		dbM.EXPECT().Wrappers().Return([]string{}).AnyTimes()
-
-		// Set up dbauthz to test the actual authorization layer
-		auth := rbac.NewStrictCachingAuthorizer(prometheus.NewRegistry())
-		accessControlStore := &atomic.Pointer[dbauthz.AccessControlStore]{}
-		var acs dbauthz.AccessControlStore = dbauthz.AGPLTemplateAccessControlStore{}
-		accessControlStore.Store(&acs)
-
-		api := &agentapi.MetadataAPI{
-			AgentFn: func(_ context.Context) (database.WorkspaceAgent, error) {
-				return agent, nil
-			},
-			Workspace: &agentapi.CachedWorkspaceFields{},
-			Database:  dbauthz.New(dbM, auth, testutil.Logger(t), accessControlStore),
-			Pubsub:    pub,
-			Log:       testutil.Logger(t),
-			TimeNowFn: func() time.Time {
-				return now
-			},
-		}
-
-		// Create context with system actor so authorization passes
-		ctx := dbauthz.AsSystemRestricted(context.Background())
-		resp, err := api.BatchUpdateMetadata(ctx, req)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-	})
-
-	// Test cache refresh - AutostartSchedule updated
-	// This test verifies that the cache refresh mechanism actually calls GetWorkspaceByID
-	// and updates the cached workspace fields when the workspace is modified (e.g., autostart schedule changes).
-	t.Run("CacheRefreshed_AutostartScheduleUpdated", func(t *testing.T) {
-		t.Parallel()
-
-		var (
-			ctrl       = gomock.NewController(t)
-			dbM        = dbmock.NewMockStore(ctrl)
-			pub        = &fakePublisher{}
-			now        = dbtime.Now()
-			mClock     = quartz.NewMock(t)
-			tickerTrap = mClock.Trap().TickerFunc("cache_refresh")
-
-			workspaceID = uuid.MustParse("12345678-1234-1234-1234-123456789012")
-			ownerID     = uuid.MustParse("87654321-4321-4321-4321-210987654321")
-			orgID       = uuid.MustParse("11111111-1111-1111-1111-111111111111")
-			templateID  = uuid.MustParse("aaaabbbb-cccc-dddd-eeee-ffffffff0000")
-			agentID     = uuid.MustParse("ffffffff-ffff-ffff-ffff-ffffffffffff")
-		)
-
-		agent := database.WorkspaceAgent{
-			ID: agentID,
-		}
-
-		// Initial workspace - has Monday-Friday 9am autostart
-		initialWorkspace := database.Workspace{
-			ID:                workspaceID,
-			OwnerID:           ownerID,
-			OrganizationID:    orgID,
-			TemplateID:        templateID,
-			Name:              "my-workspace",
-			OwnerUsername:     "testuser",
-			TemplateName:      "test-template",
-			AutostartSchedule: sql.NullString{Valid: true, String: "CRON_TZ=UTC 0 9 * * 1-5"},
-		}
-
-		// Updated workspace - user changed autostart to 5pm and renamed workspace
-		updatedWorkspace := database.Workspace{
-			ID:                workspaceID,
-			OwnerID:           ownerID,
-			OrganizationID:    orgID,
-			TemplateID:        templateID,
-			Name:              "my-workspace-renamed", // Changed!
-			OwnerUsername:     "testuser",
-			TemplateName:      "test-template",
-			AutostartSchedule: sql.NullString{Valid: true, String: "CRON_TZ=UTC 0 17 * * 1-5"}, // Changed!
-			DormantAt:         sql.NullTime{},
-		}
-
-		req := &agentproto.BatchUpdateMetadataRequest{
-			Metadata: []*agentproto.Metadata{
-				{
-					Key: "test_key",
-					Result: &agentproto.WorkspaceAgentMetadata_Result{
-						CollectedAt: timestamppb.New(now.Add(-time.Second)),
-						Age:         1,
-						Value:       "test_value",
-					},
-				},
-			},
-		}
-
-		// EXPECT GetWorkspaceByID to be called during cache refresh
-		// This is the key assertion - proves the refresh mechanism is working
-		dbM.EXPECT().GetWorkspaceByID(gomock.Any(), workspaceID).Return(updatedWorkspace, nil)
-
-		// API needs to fetch the agent when calling metadata update
-		dbM.EXPECT().GetWorkspaceAgentByID(gomock.Any(), agentID).Return(agent, nil)
-
-		// After refresh, metadata update should work with updated cache
-		dbM.EXPECT().UpdateWorkspaceAgentMetadata(gomock.Any(), gomock.Any()).DoAndReturn(
-			func(ctx context.Context, params database.UpdateWorkspaceAgentMetadataParams) error {
-				require.Equal(t, agent.ID, params.WorkspaceAgentID)
-				require.Equal(t, []string{"test_key"}, params.Key)
-				require.Equal(t, []string{"test_value"}, params.Value)
-				require.Equal(t, []string{""}, params.Error)
-				require.Len(t, params.CollectedAt, 1)
-				return nil
-			},
-		).AnyTimes()
-
-		// May call GetWorkspaceByAgentID if slow path is used before refresh
-		dbM.EXPECT().GetWorkspaceByAgentID(gomock.Any(), agentID).Return(updatedWorkspace, nil).AnyTimes()
-
-		// dbauthz will call Wrappers()
-		dbM.EXPECT().Wrappers().Return([]string{}).AnyTimes()
-
-		// Set up dbauthz
-		auth := rbac.NewStrictCachingAuthorizer(prometheus.NewRegistry())
-		accessControlStore := &atomic.Pointer[dbauthz.AccessControlStore]{}
-		var acs dbauthz.AccessControlStore = dbauthz.AGPLTemplateAccessControlStore{}
-		accessControlStore.Store(&acs)
-
-		ctx, cancel := context.WithCancel(context.Background())
-		defer cancel()
-
-		// Create roles with workspace permissions
-		userRoles := rbac.Roles([]rbac.Role{
-			{
-				Identifier: rbac.RoleMember(),
-				User: []rbac.Permission{
-					{
-						Negate:       false,
-						ResourceType: rbac.ResourceWorkspace.Type,
-						Action:       policy.WildcardSymbol,
-					},
-				},
-				ByOrgID: map[string]rbac.OrgPermissions{
-					orgID.String(): {
-						Member: []rbac.Permission{
-							{
-								Negate:       false,
-								ResourceType: rbac.ResourceWorkspace.Type,
-								Action:       policy.WildcardSymbol,
-							},
-						},
-					},
-				},
-			},
-		})
-
-		agentScope := rbac.WorkspaceAgentScope(rbac.WorkspaceAgentScopeParams{
-			WorkspaceID: workspaceID,
-			OwnerID:     ownerID,
-			TemplateID:  templateID,
-			VersionID:   uuid.New(),
-		})
-
-		ctxWithActor := dbauthz.As(ctx, rbac.Subject{
-			Type:         rbac.SubjectTypeUser,
-			FriendlyName: "testuser",
-			Email:        "testuser@example.com",
-			ID:           ownerID.String(),
-			Roles:        userRoles,
-			Groups:       []string{orgID.String()},
-			Scope:        agentScope,
-		}.WithCachedASTValue())
-
-		// Create full API with cached workspace fields (initial state)
-		api := agentapi.New(agentapi.Options{
-			Ctx:            ctxWithActor,
-			AgentID:        agentID,
-			WorkspaceID:    workspaceID,
-			OwnerID:        ownerID,
-			OrganizationID: orgID,
-			Database:       dbauthz.New(dbM, auth, testutil.Logger(t), accessControlStore),
-			Log:            testutil.Logger(t),
-			Clock:          mClock,
-			Pubsub:         pub,
-		}, initialWorkspace) // Cache is initialized with 9am schedule and "my-workspace" name
-
-		// Wait for ticker to be set up and release it so it can fire
-		tickerTrap.MustWait(ctx).MustRelease(ctx)
-		tickerTrap.Close()
-
-		// Advance clock to trigger cache refresh and wait for it to complete
-		_, aw := mClock.AdvanceNext()
-		aw.MustWait(ctx)
-
-		// At this point, GetWorkspaceByID should have been called and cache updated
-		// The cache now has the 5pm schedule and "my-workspace-renamed" name
-
-		// Now call metadata update to verify the refreshed cache works
-		resp, err := api.MetadataAPI.BatchUpdateMetadata(ctxWithActor, req)
-		require.NoError(t, err)
-		require.NotNil(t, resp)
-	})
 }
@@ -17,7 +17,6 @@ import (

 type StatsAPI struct {
 	AgentFn                   func(context.Context) (database.WorkspaceAgent, error)
-	Workspace                 *CachedWorkspaceFields
 	Database                  database.Store
 	Log                       slog.Logger
 	StatsReporter             *workspacestats.Reporter
@@ -47,21 +46,14 @@ func (a *StatsAPI) UpdateStats(ctx context.Context, req *agentproto.UpdateStatsR
 	if err != nil {
 		return nil, err
 	}
-
-	// If cache is empty (prebuild or invalid), fall back to DB
-	var ws database.WorkspaceIdentity
-	var ok bool
-	if ws, ok = a.Workspace.AsWorkspaceIdentity(); !ok {
-		w, err := a.Database.GetWorkspaceByAgentID(ctx, workspaceAgent.ID)
-		if err != nil {
-			return nil, xerrors.Errorf("get workspace by agent ID %q: %w", workspaceAgent.ID, err)
-		}
-		ws = database.WorkspaceIdentityFromWorkspace(w)
+	getWorkspaceAgentByIDRow, err := a.Database.GetWorkspaceByAgentID(ctx, workspaceAgent.ID)
+	if err != nil {
+		return nil, xerrors.Errorf("get workspace by agent ID %q: %w", workspaceAgent.ID, err)
 	}
-
+	workspace := getWorkspaceAgentByIDRow
 	a.Log.Debug(ctx, "read stats report",
 		slog.F("interval", a.AgentStatsRefreshInterval),
-		slog.F("workspace_id", ws.ID),
+		slog.F("workspace_id", workspace.ID),
 		slog.F("payload", req),
 	)

@@ -78,8 +70,9 @@ func (a *StatsAPI) UpdateStats(ctx context.Context, req *agentproto.UpdateStatsR
 	err = a.StatsReporter.ReportAgentStats(
 		ctx,
 		a.now(),
-		ws,
+		workspace,
 		workspaceAgent,
+		getWorkspaceAgentByIDRow.TemplateName,
 		req.Stats,
 		false,
 	)
@@ -52,19 +52,8 @@ func TestUpdateStates(t *testing.T) {
 			ID:   uuid.New(),
 			Name: "abc",
 		}
-		workspaceAsCacheFields = agentapi.CachedWorkspaceFields{}
 	)

-	workspaceAsCacheFields.UpdateValues(database.Workspace{
-		ID:                workspace.ID,
-		OwnerID:           workspace.OwnerID,
-		OwnerUsername:     workspace.OwnerUsername,
-		TemplateID:        workspace.TemplateID,
-		Name:              workspace.Name,
-		TemplateName:      workspace.TemplateName,
-		AutostartSchedule: workspace.AutostartSchedule,
-	})
-
 	t.Run("OK", func(t *testing.T) {
 		t.Parallel()

@@ -122,8 +111,7 @@ func TestUpdateStates(t *testing.T) {
 			AgentFn: func(context.Context) (database.WorkspaceAgent, error) {
 				return agent, nil
 			},
-			Workspace: &workspaceAsCacheFields,
-			Database:  dbM,
+			Database: dbM,
 			StatsReporter: workspacestats.NewReporter(workspacestats.ReporterOptions{
 				Database:              dbM,
 				Pubsub:                ps,
@@ -148,6 +136,9 @@ func TestUpdateStates(t *testing.T) {
 		}
 		defer wut.Close()

+		// Workspace gets fetched.
+		dbM.EXPECT().GetWorkspaceByAgentID(gomock.Any(), agent.ID).Return(workspace, nil)
+
 		// We expect an activity bump because ConnectionCount > 0.
 		dbM.EXPECT().ActivityBumpWorkspace(gomock.Any(), database.ActivityBumpWorkspaceParams{
 			WorkspaceID:   workspace.ID,
@@ -232,8 +223,7 @@ func TestUpdateStates(t *testing.T) {
 			AgentFn: func(context.Context) (database.WorkspaceAgent, error) {
 				return agent, nil
 			},
-			Workspace: &workspaceAsCacheFields,
-			Database:  dbM,
+			Database: dbM,
 			StatsReporter: workspacestats.NewReporter(workspacestats.ReporterOptions{
 				Database:              dbM,
 				Pubsub:                ps,
@@ -249,6 +239,9 @@ func TestUpdateStates(t *testing.T) {
 			},
 		}

+		// Workspace gets fetched.
+		dbM.EXPECT().GetWorkspaceByAgentID(gomock.Any(), agent.ID).Return(workspace, nil)
+
 		_, err := api.UpdateStats(context.Background(), req)
 		require.NoError(t, err)
 	})
@@ -267,8 +260,7 @@ func TestUpdateStates(t *testing.T) {
 			AgentFn: func(context.Context) (database.WorkspaceAgent, error) {
 				return agent, nil
 			},
-			Workspace: &workspaceAsCacheFields,
-			Database:  dbM,
+			Database: dbM,
 			StatsReporter: workspacestats.NewReporter(workspacestats.ReporterOptions{
 				Database:              dbM,
 				Pubsub:                ps,
@@ -341,17 +333,11 @@ func TestUpdateStates(t *testing.T) {
 				},
 			}
 		)
-		// need to overwrite the cached fields for this test, but the struct has a lock
-		ws := agentapi.CachedWorkspaceFields{}
-		ws.UpdateValues(workspace)
-		// ws.AutostartSchedule = workspace.AutostartSchedule
-
 		api := agentapi.StatsAPI{
 			AgentFn: func(context.Context) (database.WorkspaceAgent, error) {
 				return agent, nil
 			},
-			Workspace: &ws,
-			Database:  dbM,
+			Database: dbM,
 			StatsReporter: workspacestats.NewReporter(workspacestats.ReporterOptions{
 				Database:              dbM,
 				Pubsub:                ps,
@@ -376,6 +362,9 @@ func TestUpdateStates(t *testing.T) {
 		}
 		defer wut.Close()

+		// Workspace gets fetched.
+		dbM.EXPECT().GetWorkspaceByAgentID(gomock.Any(), agent.ID).Return(workspace, nil)
+
 		// We expect an activity bump because ConnectionCount > 0. However, the
 		// next autostart time will be set on the bump.
 		dbM.EXPECT().ActivityBumpWorkspace(gomock.Any(), database.ActivityBumpWorkspaceParams{
@@ -462,8 +451,7 @@ func TestUpdateStates(t *testing.T) {
 			AgentFn: func(context.Context) (database.WorkspaceAgent, error) {
 				return agent, nil
 			},
-			Workspace: &workspaceAsCacheFields,
-			Database:  dbM,
+			Database: dbM,
 			StatsReporter: workspacestats.NewReporter(workspacestats.ReporterOptions{
 				Database:              dbM,
 				Pubsub:                ps,
@@ -490,6 +478,9 @@ func TestUpdateStates(t *testing.T) {
 			},
 		}

+		// Workspace gets fetched.
+		dbM.EXPECT().GetWorkspaceByAgentID(gomock.Any(), agent.ID).Return(workspace, nil)
+
 		// We expect an activity bump because ConnectionCount > 0.
 		dbM.EXPECT().ActivityBumpWorkspace(gomock.Any(), database.ActivityBumpWorkspaceParams{
 			WorkspaceID:   workspace.ID,
@@ -7,15 +7,12 @@ import (
 	"net/http"
 	"net/url"
 	"slices"
-	"strings"
 	"time"

 	"github.com/google/uuid"
 	"golang.org/x/xerrors"

-	"github.com/coder/coder/v2/coderd/taskname"
-
-	aiagentapi "github.com/coder/agentapi-sdk-go"
+	"cdr.dev/slog"
 	"github.com/coder/coder/v2/coderd/audit"
 	"github.com/coder/coder/v2/coderd/database"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
@@ -25,21 +22,25 @@ import (
 	"github.com/coder/coder/v2/coderd/rbac"
 	"github.com/coder/coder/v2/coderd/rbac/policy"
 	"github.com/coder/coder/v2/coderd/searchquery"
-	"github.com/coder/coder/v2/coderd/util/ptr"
+	"github.com/coder/coder/v2/coderd/taskname"
 	"github.com/coder/coder/v2/coderd/util/slice"
 	"github.com/coder/coder/v2/codersdk"
+
+	aiagentapi "github.com/coder/agentapi-sdk-go"
 )

 // @Summary Create a new AI task
-// @ID create-a-new-ai-task
+// @Description: EXPERIMENTAL: this endpoint is experimental and not guaranteed to be stable.
+// @ID create-task
 // @Security CoderSessionToken
-// @Accept json
-// @Produce json
-// @Tags Tasks
+// @Tags Experimental
 // @Param user path string true "Username, user ID, or 'me' for the authenticated user"
 // @Param request body codersdk.CreateTaskRequest true "Create task request"
 // @Success 201 {object} codersdk.Task
-// @Router /tasks/{user} [post]
+// @Router /api/experimental/tasks/{user} [post]
+//
+// EXPERIMENTAL: This endpoint is experimental and not guaranteed to be stable.
+// This endpoint creates a new task for the given user.
 func (api *API) tasksCreate(rw http.ResponseWriter, r *http.Request) {
 	var (
 		ctx              = r.Context()
@@ -107,25 +108,18 @@ func (api *API) tasksCreate(rw http.ResponseWriter, r *http.Request) {
 		}
 	}

-	taskDisplayName := strings.TrimSpace(req.DisplayName)
-	if taskDisplayName != "" {
-		if len(taskDisplayName) > 64 {
-			httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
-				Message: "Display name must be 64 characters or less.",
-			})
-			return
-		}
-	}
+	if taskName == "" {
+		taskName = taskname.GenerateFallback()

-	// Generate task name and display name if either is not provided
-	if taskName == "" || taskDisplayName == "" {
-		generatedTaskName := taskname.Generate(ctx, api.Logger, req.Input)
+		if anthropicAPIKey := taskname.GetAnthropicAPIKeyFromEnv(); anthropicAPIKey != "" {
+			anthropicModel := taskname.GetAnthropicModelFromEnv()

-		if taskName == "" {
-			taskName = generatedTaskName.Name
-		}
-		if taskDisplayName == "" {
-			taskDisplayName = generatedTaskName.DisplayName
+			generatedName, err := taskname.Generate(ctx, req.Input, taskname.WithAPIKey(anthropicAPIKey), taskname.WithModel(anthropicModel))
+			if err != nil {
+				api.Logger.Error(ctx, "unable to generate task name", slog.Error(err))
+			} else {
+				taskName = generatedName
+			}
 		}
 	}

@@ -218,7 +212,6 @@ func (api *API) tasksCreate(rw http.ResponseWriter, r *http.Request) {
 				OrganizationID:     templateVersion.OrganizationID,
 				OwnerID:            owner.ID,
 				Name:               taskName,
-				DisplayName:        taskDisplayName,
 				WorkspaceID:        uuid.NullUUID{}, // Will be set after workspace creation.
 				TemplateVersionID:  templateVersion.ID,
 				TemplateParameters: []byte("{}"),
@@ -277,21 +270,15 @@ func (api *API) tasksCreate(rw http.ResponseWriter, r *http.Request) {
 func taskFromDBTaskAndWorkspace(dbTask database.Task, ws codersdk.Workspace) codersdk.Task {
 	var taskAgentLifecycle *codersdk.WorkspaceAgentLifecycle
 	var taskAgentHealth *codersdk.WorkspaceAgentHealth
-	var taskAppHealth *codersdk.WorkspaceAppHealth

-	if dbTask.WorkspaceAgentLifecycleState.Valid {
-		taskAgentLifecycle = ptr.Ref(codersdk.WorkspaceAgentLifecycle(dbTask.WorkspaceAgentLifecycleState.WorkspaceAgentLifecycleState))
-	}
-	if dbTask.WorkspaceAppHealth.Valid {
-		taskAppHealth = ptr.Ref(codersdk.WorkspaceAppHealth(dbTask.WorkspaceAppHealth.WorkspaceAppHealth))
-	}
-
-	// If we have an agent ID from the task, find the agent health info
+	// If we have an agent ID from the task, find the agent details in the
+	// workspace.
 	if dbTask.WorkspaceAgentID.Valid {
 	findTaskAgentLoop:
 		for _, resource := range ws.LatestBuild.Resources {
 			for _, agent := range resource.Agents {
 				if agent.ID == dbTask.WorkspaceAgentID.UUID {
+					taskAgentLifecycle = &agent.LifecycleState
 					taskAgentHealth = &agent.Health
 					break findTaskAgentLoop
 				}
@@ -299,7 +286,21 @@ func taskFromDBTaskAndWorkspace(dbTask database.Task, ws codersdk.Workspace) cod
 		}
 	}

-	currentState := deriveTaskCurrentState(dbTask, ws, taskAgentLifecycle, taskAppHealth)
+	// Ignore 'latest app status' if it is older than the latest build and the
+	// latest build is a 'start' transition. This ensures that you don't show a
+	// stale app status from a previous build. For stop transitions, there is
+	// still value in showing the latest app status.
+	var currentState *codersdk.TaskStateEntry
+	if ws.LatestAppStatus != nil {
+		if ws.LatestBuild.Transition != codersdk.WorkspaceTransitionStart || ws.LatestAppStatus.CreatedAt.After(ws.LatestBuild.CreatedAt) {
+			currentState = &codersdk.TaskStateEntry{
+				Timestamp: ws.LatestAppStatus.CreatedAt,
+				State:     codersdk.TaskState(ws.LatestAppStatus.State),
+				Message:   ws.LatestAppStatus.Message,
+				URI:       ws.LatestAppStatus.URI,
+			}
+		}
+	}

 	return codersdk.Task{
 		ID:                      dbTask.ID,
@@ -308,7 +309,6 @@ func taskFromDBTaskAndWorkspace(dbTask database.Task, ws codersdk.Workspace) cod
 		OwnerName:               dbTask.OwnerUsername,
 		OwnerAvatarURL:          dbTask.OwnerAvatarUrl,
 		Name:                    dbTask.Name,
-		DisplayName:             dbTask.DisplayName,
 		TemplateID:              ws.TemplateID,
 		TemplateVersionID:       dbTask.TemplateVersionID,
 		TemplateName:            ws.TemplateName,
@@ -330,81 +330,17 @@ func taskFromDBTaskAndWorkspace(dbTask database.Task, ws codersdk.Workspace) cod
 	}
 }

-// deriveTaskCurrentState determines the current state of a task based on the
-// workspace's latest app status and initialization phase.
-// Returns nil if no valid state can be determined.
-func deriveTaskCurrentState(
-	dbTask database.Task,
-	ws codersdk.Workspace,
-	taskAgentLifecycle *codersdk.WorkspaceAgentLifecycle,
-	taskAppHealth *codersdk.WorkspaceAppHealth,
-) *codersdk.TaskStateEntry {
-	var currentState *codersdk.TaskStateEntry
-
-	// Ignore 'latest app status' if it is older than the latest build and the
-	// latest build is a 'start' transition. This ensures that you don't show a
-	// stale app status from a previous build. For stop transitions, there is
-	// still value in showing the latest app status.
-	if ws.LatestAppStatus != nil {
-		if ws.LatestBuild.Transition != codersdk.WorkspaceTransitionStart || ws.LatestAppStatus.CreatedAt.After(ws.LatestBuild.CreatedAt) {
-			currentState = &codersdk.TaskStateEntry{
-				Timestamp: ws.LatestAppStatus.CreatedAt,
-				State:     codersdk.TaskState(ws.LatestAppStatus.State),
-				Message:   ws.LatestAppStatus.Message,
-				URI:       ws.LatestAppStatus.URI,
-			}
-		}
-	}
-
-	// If no valid agent state was found for the current build and the task is initializing,
-	// provide a descriptive initialization message.
-	if currentState == nil && dbTask.Status == database.TaskStatusInitializing {
-		message := "Initializing workspace"
-
-		switch {
-		case ws.LatestBuild.Status == codersdk.WorkspaceStatusPending ||
-			ws.LatestBuild.Status == codersdk.WorkspaceStatusStarting:
-			message = fmt.Sprintf("Workspace is %s", ws.LatestBuild.Status)
-		case taskAgentLifecycle != nil:
-			switch {
-			case *taskAgentLifecycle == codersdk.WorkspaceAgentLifecycleCreated:
-				message = "Agent is connecting"
-			case *taskAgentLifecycle == codersdk.WorkspaceAgentLifecycleStarting:
-				message = "Agent is starting"
-			case *taskAgentLifecycle == codersdk.WorkspaceAgentLifecycleReady:
-				if taskAppHealth != nil && *taskAppHealth == codersdk.WorkspaceAppHealthInitializing {
-					message = "App is initializing"
-				} else {
-					// In case the workspace app is not initializing,
-					// the overall task status should be updated accordingly
-					message = "Initializing workspace applications"
-				}
-			default:
-				// In case the workspace agent is not initializing,
-				// the overall task status should be updated accordingly
-				message = "Initializing workspace agent"
-			}
-		}
-
-		currentState = &codersdk.TaskStateEntry{
-			Timestamp: ws.LatestBuild.CreatedAt,
-			State:     codersdk.TaskStateWorking,
-			Message:   message,
-			URI:       "",
-		}
-	}
-
-	return currentState
-}
-
 // @Summary List AI tasks
-// @ID list-ai-tasks
+// @Description: EXPERIMENTAL: this endpoint is experimental and not guaranteed to be stable.
+// @ID list-tasks
 // @Security CoderSessionToken
-// @Produce json
-// @Tags Tasks
+// @Tags Experimental
 // @Param q query string false "Search query for filtering tasks. Supports: owner:<username/uuid/me>, organization:<org-name/uuid>, status:<status>"
 // @Success 200 {object} codersdk.TasksListResponse
-// @Router /tasks [get]
+// @Router /api/experimental/tasks [get]
+//
+// EXPERIMENTAL: This endpoint is experimental and not guaranteed to be stable.
+// tasksList is an experimental endpoint to list tasks.
 func (api *API) tasksList(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	apiKey := httpmw.APIKey(r)
@@ -497,15 +433,20 @@ func (api *API) convertTasks(ctx context.Context, requesterID uuid.UUID, dbTasks
 	return result, nil
 }

-// @Summary Get AI task by ID or name
-// @ID get-ai-task-by-id-or-name
+// @Summary Get AI task by ID
+// @Description: EXPERIMENTAL: this endpoint is experimental and not guaranteed to be stable.
+// @ID get-task
 // @Security CoderSessionToken
-// @Produce json
-// @Tags Tasks
+// @Tags Experimental
 // @Param user path string true "Username, user ID, or 'me' for the authenticated user"
-// @Param task path string true "Task ID, or task name"
+// @Param task path string true "Task ID" format(uuid)
 // @Success 200 {object} codersdk.Task
-// @Router /tasks/{user}/{task} [get]
+// @Router /api/experimental/tasks/{user}/{task} [get]
+//
+// EXPERIMENTAL: This endpoint is experimental and not guaranteed to be stable.
+// taskGet is an experimental endpoint to fetch a single AI task by ID
+// (workspace ID). It returns a synthesized task response including
+// prompt and status.
 func (api *API) taskGet(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	apiKey := httpmw.APIKey(r)
@@ -570,14 +511,20 @@ func (api *API) taskGet(rw http.ResponseWriter, r *http.Request) {
 	httpapi.Write(ctx, rw, http.StatusOK, taskResp)
 }

-// @Summary Delete AI task
-// @ID delete-ai-task
+// @Summary Delete AI task by ID
+// @Description: EXPERIMENTAL: this endpoint is experimental and not guaranteed to be stable.
+// @ID delete-task
 // @Security CoderSessionToken
-// @Tags Tasks
+// @Tags Experimental
 // @Param user path string true "Username, user ID, or 'me' for the authenticated user"
-// @Param task path string true "Task ID, or task name"
-// @Success 202
-// @Router /tasks/{user}/{task} [delete]
+// @Param task path string true "Task ID" format(uuid)
+// @Success 202 "Task deletion initiated"
+// @Router /api/experimental/tasks/{user}/{task} [delete]
+//
+// EXPERIMENTAL: This endpoint is experimental and not guaranteed to be stable.
+// taskDelete is an experimental endpoint to delete a task by ID.
+// It creates a delete workspace build and returns 202 Accepted if the build was
+// created.
 func (api *API) taskDelete(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	apiKey := httpmw.APIKey(r)
@@ -638,96 +585,21 @@ func (api *API) taskDelete(rw http.ResponseWriter, r *http.Request) {
 	rw.WriteHeader(http.StatusAccepted)
 }

-// @Summary Update AI task input
-// @ID update-ai-task-input
-// @Security CoderSessionToken
-// @Accept json
-// @Tags Tasks
-// @Param user path string true "Username, user ID, or 'me' for the authenticated user"
-// @Param task path string true "Task ID, or task name"
-// @Param request body codersdk.UpdateTaskInputRequest true "Update task input request"
-// @Success 204
-// @Router /tasks/{user}/{task}/input [patch]
-func (api *API) taskUpdateInput(rw http.ResponseWriter, r *http.Request) {
-	var (
-		ctx              = r.Context()
-		task             = httpmw.TaskParam(r)
-		auditor          = api.Auditor.Load()
-		taskResourceInfo = audit.AdditionalFields{}
-	)
-
-	aReq, commitAudit := audit.InitRequest[database.TaskTable](rw, &audit.RequestParams{
-		Audit:            *auditor,
-		Log:              api.Logger,
-		Request:          r,
-		Action:           database.AuditActionWrite,
-		AdditionalFields: taskResourceInfo,
-	})
-	defer commitAudit()
-	aReq.Old = task.TaskTable()
-	aReq.UpdateOrganizationID(task.OrganizationID)
-
-	var req codersdk.UpdateTaskInputRequest
-	if !httpapi.Read(ctx, rw, r, &req) {
-		return
-	}
-
-	if strings.TrimSpace(req.Input) == "" {
-		httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
-			Message: "Task input is required.",
-		})
-		return
-	}
-
-	var updatedTask database.TaskTable
-	if err := api.Database.InTx(func(tx database.Store) error {
-		task, err := tx.GetTaskByID(ctx, task.ID)
-		if err != nil {
-			return httperror.NewResponseError(http.StatusInternalServerError, codersdk.Response{
-				Message: "Failed to fetch task.",
-				Detail:  err.Error(),
-			})
-		}
-
-		if task.Status != database.TaskStatusPaused {
-			return httperror.NewResponseError(http.StatusConflict, codersdk.Response{
-				Message: "Unable to update task input, task must be paused.",
-				Detail:  "Please stop the task's workspace before updating the input.",
-			})
-		}
-
-		updatedTask, err = tx.UpdateTaskPrompt(ctx, database.UpdateTaskPromptParams{
-			ID:     task.ID,
-			Prompt: req.Input,
-		})
-		if err != nil {
-			return httperror.NewResponseError(http.StatusInternalServerError, codersdk.Response{
-				Message: "Failed to update task input.",
-				Detail:  err.Error(),
-			})
-		}
-
-		return nil
-	}, nil); err != nil {
-		httperror.WriteResponseError(ctx, rw, err)
-		return
-	}
-
-	aReq.New = updatedTask
-
-	httpapi.Write(ctx, rw, http.StatusNoContent, nil)
-}
-
 // @Summary Send input to AI task
-// @ID send-input-to-ai-task
+// @Description: EXPERIMENTAL: this endpoint is experimental and not guaranteed to be stable.
+// @ID send-task-input
 // @Security CoderSessionToken
-// @Accept json
-// @Tags Tasks
+// @Tags Experimental
 // @Param user path string true "Username, user ID, or 'me' for the authenticated user"
-// @Param task path string true "Task ID, or task name"
+// @Param task path string true "Task ID" format(uuid)
 // @Param request body codersdk.TaskSendRequest true "Task input request"
-// @Success 204
-// @Router /tasks/{user}/{task}/send [post]
+// @Success 204 "Input sent successfully"
+// @Router /api/experimental/tasks/{user}/{task}/send [post]
+//
+// EXPERIMENTAL: This endpoint is experimental and not guaranteed to be stable.
+// taskSend submits task input to the task app by dialing the agent
+// directly over the tailnet. We enforce ApplicationConnect RBAC on the
+// workspace and validate the task app health.
 func (api *API) taskSend(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	task := httpmw.TaskParam(r)
@@ -788,14 +660,18 @@ func (api *API) taskSend(rw http.ResponseWriter, r *http.Request) {
 }

 // @Summary Get AI task logs
-// @ID get-ai-task-logs
+// @Description: EXPERIMENTAL: this endpoint is experimental and not guaranteed to be stable.
+// @ID get-task-logs
 // @Security CoderSessionToken
-// @Produce json
-// @Tags Tasks
+// @Tags Experimental
 // @Param user path string true "Username, user ID, or 'me' for the authenticated user"
-// @Param task path string true "Task ID, or task name"
+// @Param task path string true "Task ID" format(uuid)
 // @Success 200 {object} codersdk.TaskLogsResponse
-// @Router /tasks/{user}/{task}/logs [get]
+// @Router /api/experimental/tasks/{user}/{task}/logs [get]
+//
+// EXPERIMENTAL: This endpoint is experimental and not guaranteed to be stable.
+// taskLogs reads task output by dialing the agent directly over the tailnet.
+// We enforce ApplicationConnect RBAC on the workspace and validate the task app health.
 func (api *API) taskLogs(rw http.ResponseWriter, r *http.Request) {
 	ctx := r.Context()
 	task := httpmw.TaskParam(r)
@@ -1,223 +0,0 @@
-package coderd
-
-import (
-	"testing"
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/coder/coder/v2/coderd/database"
-	"github.com/coder/coder/v2/coderd/util/ptr"
-	"github.com/coder/coder/v2/codersdk"
-)
-
-func TestDeriveTaskCurrentState_Unit(t *testing.T) {
-	t.Parallel()
-
-	now := time.Now()
-	tests := []struct {
-		name               string
-		task               database.Task
-		agentLifecycle     *codersdk.WorkspaceAgentLifecycle
-		appHealth          *codersdk.WorkspaceAppHealth
-		latestAppStatus    *codersdk.WorkspaceAppStatus
-		latestBuild        codersdk.WorkspaceBuild
-		expectCurrentState bool
-		expectedTimestamp  time.Time
-		expectedState      codersdk.TaskState
-		expectedMessage    string
-	}{
-		{
-			name: "NoAppStatus",
-			task: database.Task{
-				ID:     uuid.New(),
-				Status: database.TaskStatusActive,
-			},
-			agentLifecycle:  nil,
-			appHealth:       nil,
-			latestAppStatus: nil,
-			latestBuild: codersdk.WorkspaceBuild{
-				Transition: codersdk.WorkspaceTransitionStart,
-				CreatedAt:  now,
-			},
-			expectCurrentState: false,
-		},
-		{
-			name: "BuildStartTransition_AppStatus_NewerThanBuild",
-			task: database.Task{
-				ID:     uuid.New(),
-				Status: database.TaskStatusActive,
-			},
-			agentLifecycle: nil,
-			appHealth:      nil,
-			latestAppStatus: &codersdk.WorkspaceAppStatus{
-				State:     codersdk.WorkspaceAppStatusStateWorking,
-				Message:   "Task is working",
-				CreatedAt: now.Add(1 * time.Minute),
-			},
-			latestBuild: codersdk.WorkspaceBuild{
-				Transition: codersdk.WorkspaceTransitionStart,
-				CreatedAt:  now,
-			},
-			expectCurrentState: true,
-			expectedTimestamp:  now.Add(1 * time.Minute),
-			expectedState:      codersdk.TaskState(codersdk.WorkspaceAppStatusStateWorking),
-			expectedMessage:    "Task is working",
-		},
-		{
-			name: "BuildStartTransition_StaleAppStatus_OlderThanBuild",
-			task: database.Task{
-				ID:     uuid.New(),
-				Status: database.TaskStatusActive,
-			},
-			agentLifecycle: nil,
-			appHealth:      nil,
-			latestAppStatus: &codersdk.WorkspaceAppStatus{
-				State:     codersdk.WorkspaceAppStatusStateComplete,
-				Message:   "Previous task completed",
-				CreatedAt: now.Add(-1 * time.Minute),
-			},
-			latestBuild: codersdk.WorkspaceBuild{
-				Transition: codersdk.WorkspaceTransitionStart,
-				CreatedAt:  now,
-			},
-			expectCurrentState: false,
-		},
-		{
-			name: "BuildStopTransition",
-			task: database.Task{
-				ID:     uuid.New(),
-				Status: database.TaskStatusActive,
-			},
-			agentLifecycle: nil,
-			appHealth:      nil,
-			latestAppStatus: &codersdk.WorkspaceAppStatus{
-				State:     codersdk.WorkspaceAppStatusStateComplete,
-				Message:   "Task completed before stop",
-				CreatedAt: now.Add(-1 * time.Minute),
-			},
-			latestBuild: codersdk.WorkspaceBuild{
-				Transition: codersdk.WorkspaceTransitionStop,
-				CreatedAt:  now,
-			},
-			expectCurrentState: true,
-			expectedTimestamp:  now.Add(-1 * time.Minute),
-			expectedState:      codersdk.TaskState(codersdk.WorkspaceAppStatusStateComplete),
-			expectedMessage:    "Task completed before stop",
-		},
-		{
-			name: "TaskInitializing_WorkspacePending",
-			task: database.Task{
-				ID:     uuid.New(),
-				Status: database.TaskStatusInitializing,
-			},
-			agentLifecycle:  nil,
-			appHealth:       nil,
-			latestAppStatus: nil,
-			latestBuild: codersdk.WorkspaceBuild{
-				Status:    codersdk.WorkspaceStatusPending,
-				CreatedAt: now,
-			},
-			expectCurrentState: true,
-			expectedTimestamp:  now,
-			expectedState:      codersdk.TaskStateWorking,
-			expectedMessage:    "Workspace is pending",
-		},
-		{
-			name: "TaskInitializing_WorkspaceStarting",
-			task: database.Task{
-				ID:     uuid.New(),
-				Status: database.TaskStatusInitializing,
-			},
-			agentLifecycle:  nil,
-			appHealth:       nil,
-			latestAppStatus: nil,
-			latestBuild: codersdk.WorkspaceBuild{
-				Status:    codersdk.WorkspaceStatusStarting,
-				CreatedAt: now,
-			},
-			expectCurrentState: true,
-			expectedTimestamp:  now,
-			expectedState:      codersdk.TaskStateWorking,
-			expectedMessage:    "Workspace is starting",
-		},
-		{
-			name: "TaskInitializing_AgentConnecting",
-			task: database.Task{
-				ID:     uuid.New(),
-				Status: database.TaskStatusInitializing,
-			},
-			agentLifecycle:  ptr.Ref(codersdk.WorkspaceAgentLifecycleCreated),
-			appHealth:       nil,
-			latestAppStatus: nil,
-			latestBuild: codersdk.WorkspaceBuild{
-				Status:    codersdk.WorkspaceStatusRunning,
-				CreatedAt: now,
-			},
-			expectCurrentState: true,
-			expectedTimestamp:  now,
-			expectedState:      codersdk.TaskStateWorking,
-			expectedMessage:    "Agent is connecting",
-		},
-		{
-			name: "TaskInitializing_AgentStarting",
-			task: database.Task{
-				ID:     uuid.New(),
-				Status: database.TaskStatusInitializing,
-			},
-			agentLifecycle:  ptr.Ref(codersdk.WorkspaceAgentLifecycleStarting),
-			appHealth:       nil,
-			latestAppStatus: nil,
-			latestBuild: codersdk.WorkspaceBuild{
-				Status:    codersdk.WorkspaceStatusRunning,
-				CreatedAt: now,
-			},
-			expectCurrentState: true,
-			expectedTimestamp:  now,
-			expectedState:      codersdk.TaskStateWorking,
-			expectedMessage:    "Agent is starting",
-		},
-		{
-			name: "TaskInitializing_AppInitializing",
-			task: database.Task{
-				ID:     uuid.New(),
-				Status: database.TaskStatusInitializing,
-			},
-			agentLifecycle:  ptr.Ref(codersdk.WorkspaceAgentLifecycleReady),
-			appHealth:       ptr.Ref(codersdk.WorkspaceAppHealthInitializing),
-			latestAppStatus: nil,
-			latestBuild: codersdk.WorkspaceBuild{
-				Status:    codersdk.WorkspaceStatusRunning,
-				CreatedAt: now,
-			},
-			expectCurrentState: true,
-			expectedTimestamp:  now,
-			expectedState:      codersdk.TaskStateWorking,
-			expectedMessage:    "App is initializing",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			t.Parallel()
-
-			ws := codersdk.Workspace{
-				LatestBuild:     tt.latestBuild,
-				LatestAppStatus: tt.latestAppStatus,
-			}
-
-			currentState := deriveTaskCurrentState(tt.task, ws, tt.agentLifecycle, tt.appHealth)
-
-			if tt.expectCurrentState {
-				require.NotNil(t, currentState)
-				assert.Equal(t, tt.expectedTimestamp.UTC(), currentState.Timestamp.UTC())
-				assert.Equal(t, tt.expectedState, currentState.State)
-				assert.Equal(t, tt.expectedMessage, currentState.Message)
-			} else {
-				assert.Nil(t, currentState)
-			}
-		})
-	}
-}
@@ -23,7 +23,6 @@ import (
 	"github.com/coder/coder/v2/coderd/database/dbfake"
 	"github.com/coder/coder/v2/coderd/database/dbgen"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
-	"github.com/coder/coder/v2/coderd/httpapi"
 	"github.com/coder/coder/v2/coderd/notifications"
 	"github.com/coder/coder/v2/coderd/notifications/notificationstest"
 	"github.com/coder/coder/v2/coderd/util/slice"
@@ -124,7 +123,8 @@ func TestTasks(t *testing.T) {

 		// Create a task with a specific prompt using the new data model.
 		wantPrompt := "build me a web app"
-		task, err := client.CreateTask(ctx, codersdk.Me, codersdk.CreateTaskRequest{
+		exp := codersdk.NewExperimentalClient(client)
+		task, err := exp.CreateTask(ctx, codersdk.Me, codersdk.CreateTaskRequest{
 			TemplateVersionID: template.ActiveVersionID,
 			Input:             wantPrompt,
 		})
@@ -140,7 +140,7 @@ func TestTasks(t *testing.T) {
 		coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID)

 		// List tasks via experimental API and verify the prompt and status mapping.
-		tasks, err := client.Tasks(ctx, &codersdk.TasksFilter{Owner: codersdk.Me})
+		tasks, err := exp.Tasks(ctx, &codersdk.TasksFilter{Owner: codersdk.Me})
 		require.NoError(t, err)

 		got, ok := slice.Find(tasks, func(t codersdk.Task) bool { return t.ID == task.ID })
@@ -163,9 +163,10 @@ func TestTasks(t *testing.T) {
 			anotherUser, _ = coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
 			template       = createAITemplate(t, client, user)
 			wantPrompt     = "review my code"
+			exp            = codersdk.NewExperimentalClient(client)
 		)

-		task, err := client.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
+		task, err := exp.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
 			TemplateVersionID: template.ActiveVersionID,
 			Input:             wantPrompt,
 		})
@@ -199,7 +200,7 @@ func TestTasks(t *testing.T) {
 		require.NoError(t, err)

 		// Fetch the task by ID via experimental API and verify fields.
-		updated, err := client.TaskByID(ctx, task.ID)
+		updated, err := exp.TaskByID(ctx, task.ID)
 		require.NoError(t, err)

 		assert.Equal(t, task.ID, updated.ID, "task ID should match")
@@ -213,18 +214,19 @@ func TestTasks(t *testing.T) {
 		assert.NotEmpty(t, updated.WorkspaceStatus, "task status should not be empty")

 		// Fetch the task by name and verify the same result
-		byName, err := client.TaskByOwnerAndName(ctx, codersdk.Me, task.Name)
+		byName, err := exp.TaskByOwnerAndName(ctx, codersdk.Me, task.Name)
 		require.NoError(t, err)
 		require.Equal(t, byName, updated)

 		// Another member user should not be able to fetch the task
-		_, err = anotherUser.TaskByID(ctx, task.ID)
+		otherClient := codersdk.NewExperimentalClient(anotherUser)
+		_, err = otherClient.TaskByID(ctx, task.ID)
 		require.Error(t, err, "fetching task should fail by ID for another member user")
 		var sdkErr *codersdk.Error
 		require.ErrorAs(t, err, &sdkErr)
 		require.Equal(t, http.StatusNotFound, sdkErr.StatusCode())
 		// Also test by name
-		_, err = anotherUser.TaskByOwnerAndName(ctx, task.OwnerName, task.Name)
+		_, err = otherClient.TaskByOwnerAndName(ctx, task.OwnerName, task.Name)
 		require.Error(t, err, "fetching task should fail by name for another member user")
 		require.ErrorAs(t, err, &sdkErr)
 		require.Equal(t, http.StatusNotFound, sdkErr.StatusCode())
@@ -233,23 +235,19 @@ func TestTasks(t *testing.T) {
 		coderdtest.MustTransitionWorkspace(t, client, task.WorkspaceID.UUID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionStop)

 		// Verify that the previous status still remains
-		updated, err = client.TaskByID(ctx, task.ID)
+		updated, err = exp.TaskByID(ctx, task.ID)
 		require.NoError(t, err)
 		assert.NotNil(t, updated.CurrentState, "current state should not be nil")
 		assert.Equal(t, "all done", updated.CurrentState.Message)
 		assert.Equal(t, codersdk.TaskStateComplete, updated.CurrentState.State)
-		previousCurrentState := updated.CurrentState

 		// Start the workspace again
 		coderdtest.MustTransitionWorkspace(t, client, task.WorkspaceID.UUID, codersdk.WorkspaceTransitionStop, codersdk.WorkspaceTransitionStart)

-		// Verify that the status from the previous build has been cleared
-		// and replaced by the agent initialization status.
-		updated, err = client.TaskByID(ctx, task.ID)
+		// Verify that the status from the previous build is no longer present
+		updated, err = exp.TaskByID(ctx, task.ID)
 		require.NoError(t, err)
-		assert.NotEqual(t, previousCurrentState, updated.CurrentState)
-		assert.Equal(t, codersdk.TaskStateWorking, updated.CurrentState.State)
-		assert.NotEqual(t, "all done", updated.CurrentState.Message)
+		assert.Nil(t, updated.CurrentState, "current state should be nil")
 	})

 	t.Run("Delete", func(t *testing.T) {
@@ -264,7 +262,8 @@ func TestTasks(t *testing.T) {

 			ctx := testutil.Context(t, testutil.WaitLong)

-			task, err := client.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
+			exp := codersdk.NewExperimentalClient(client)
+			task, err := exp.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
 				TemplateVersionID: template.ActiveVersionID,
 				Input:             "delete me",
 			})
@@ -277,7 +276,7 @@ func TestTasks(t *testing.T) {
 			}
 			coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID)

-			err = client.DeleteTask(ctx, "me", task.ID)
+			err = exp.DeleteTask(ctx, "me", task.ID)
 			require.NoError(t, err, "delete task request should be accepted")

 			// Poll until the workspace is deleted.
@@ -299,7 +298,8 @@ func TestTasks(t *testing.T) {

 			ctx := testutil.Context(t, testutil.WaitShort)

-			err := client.DeleteTask(ctx, "me", uuid.New())
+			exp := codersdk.NewExperimentalClient(client)
+			err := exp.DeleteTask(ctx, "me", uuid.New())

 			var sdkErr *codersdk.Error
 			require.Error(t, err, "expected an error for non-existent task")
@@ -325,7 +325,8 @@ func TestTasks(t *testing.T) {
 			}
 			coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID)

-			err := client.DeleteTask(ctx, "me", ws.ID)
+			exp := codersdk.NewExperimentalClient(client)
+			err := exp.DeleteTask(ctx, "me", ws.ID)

 			var sdkErr *codersdk.Error
 			require.Error(t, err, "expected an error for non-task workspace delete via tasks endpoint")
@@ -344,7 +345,8 @@ func TestTasks(t *testing.T) {

 			ctx := testutil.Context(t, testutil.WaitShort)

-			task, err := client.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
+			exp := codersdk.NewExperimentalClient(client)
+			task, err := exp.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
 				TemplateVersionID: template.ActiveVersionID,
 				Input:             "delete me not",
 			})
@@ -356,9 +358,10 @@ func TestTasks(t *testing.T) {

 			// Another regular org member without elevated permissions.
 			otherClient, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
+			expOther := codersdk.NewExperimentalClient(otherClient)

 			// Attempt to delete the owner's task as a non-owner without permissions.
-			err = otherClient.DeleteTask(ctx, "me", task.ID)
+			err = expOther.DeleteTask(ctx, "me", task.ID)

 			var authErr *codersdk.Error
 			require.Error(t, err, "expected an authorization error when deleting another user's task")
@@ -376,7 +379,8 @@ func TestTasks(t *testing.T) {
 			user := coderdtest.CreateFirstUser(t, client)
 			template := createAITemplate(t, client, user)
 			ctx := testutil.Context(t, testutil.WaitLong)
-			task, err := client.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
+			exp := codersdk.NewExperimentalClient(client)
+			task, err := exp.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
 				TemplateVersionID: template.ActiveVersionID,
 				Input:             "delete me",
 			})
@@ -395,9 +399,9 @@ func TestTasks(t *testing.T) {
 			// Provisionerdserver will attempt delete the related task when deleting a workspace.
 			// This test ensures that we can still handle the case where, for some reason, the
 			// task has not been marked as deleted, but the workspace has.
-			task, err = client.TaskByID(ctx, task.ID)
+			task, err = exp.TaskByID(ctx, task.ID)
 			require.NoError(t, err, "fetching a task should still work if its related workspace is deleted")
-			err = client.DeleteTask(ctx, task.OwnerID.String(), task.ID)
+			err = exp.DeleteTask(ctx, task.OwnerID.String(), task.ID)
 			require.NoError(t, err, "should be possible to delete a task with no workspace")
 		})

@@ -410,7 +414,8 @@ func TestTasks(t *testing.T) {

 			ctx := testutil.Context(t, testutil.WaitLong)

-			task, err := client.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
+			exp := codersdk.NewExperimentalClient(client)
+			task, err := exp.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
 				TemplateVersionID: template.ActiveVersionID,
 				Input:             "delete me",
 			})
@@ -426,7 +431,7 @@ func TestTasks(t *testing.T) {
 			// When; the task workspace is deleted
 			coderdtest.MustTransitionWorkspace(t, client, ws.ID, codersdk.WorkspaceTransitionStart, codersdk.WorkspaceTransitionDelete)
 			// Then: the task associated with the workspace is also deleted
-			_, err = client.TaskByID(ctx, task.ID)
+			_, err = exp.TaskByID(ctx, task.ID)
 			require.Error(t, err, "expected an error fetching the task")
 			var sdkErr *codersdk.Error
 			require.ErrorAs(t, err, &sdkErr, "expected a codersdk.Error")
@@ -485,9 +490,10 @@ func TestTasks(t *testing.T) {
 				userClient, _  = coderdtest.CreateAnotherUser(t, client, owner.OrganizationID)
 				agentAuthToken = uuid.NewString()
 				template       = createAITemplate(t, client, owner, withAgentToken(agentAuthToken), withSidebarURL(srv.URL))
+				exp            = codersdk.NewExperimentalClient(userClient)
 			)

-			task, err := userClient.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
+			task, err := exp.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
 				TemplateVersionID: template.ActiveVersionID,
 				Input:             "send me food",
 			})
@@ -500,7 +506,7 @@ func TestTasks(t *testing.T) {
 			coderdtest.AwaitWorkspaceBuildJobCompleted(t, userClient, ws.LatestBuild.ID)

 			// Fetch the task by ID via experimental API and verify fields.
-			task, err = client.TaskByID(ctx, task.ID)
+			task, err = exp.TaskByID(ctx, task.ID)
 			require.NoError(t, err)
 			require.NotZero(t, task.WorkspaceBuildNumber)
 			require.True(t, task.WorkspaceAgentID.Valid)
@@ -526,7 +532,7 @@ func TestTasks(t *testing.T) {
 			coderdtest.NewWorkspaceAgentWaiter(t, userClient, ws.ID).WaitFor(coderdtest.AgentsReady)

 			// Fetch the task by ID via experimental API and verify fields.
-			task, err = client.TaskByID(ctx, task.ID)
+			task, err = exp.TaskByID(ctx, task.ID)
 			require.NoError(t, err)

 			// Make the sidebar app unhealthy initially.
@@ -536,7 +542,7 @@ func TestTasks(t *testing.T) {
 			})
 			require.NoError(t, err)

-			err = client.TaskSend(ctx, "me", task.ID, codersdk.TaskSendRequest{
+			err = exp.TaskSend(ctx, "me", task.ID, codersdk.TaskSendRequest{
 				Input: "Hello, Agent!",
 			})
 			require.Error(t, err, "wanted error due to unhealthy sidebar app")
@@ -550,7 +556,7 @@ func TestTasks(t *testing.T) {

 			statusResponse = agentapisdk.AgentStatus("bad")

-			err = client.TaskSend(ctx, "me", task.ID, codersdk.TaskSendRequest{
+			err = exp.TaskSend(ctx, "me", task.ID, codersdk.TaskSendRequest{
 				Input: "Hello, Agent!",
 			})
 			require.Error(t, err, "wanted error due to bad status")
@@ -559,7 +565,7 @@ func TestTasks(t *testing.T) {

 			//nolint:tparallel // Not intended to run in parallel.
 			t.Run("SendOK", func(t *testing.T) {
-				err = client.TaskSend(ctx, "me", task.ID, codersdk.TaskSendRequest{
+				err = exp.TaskSend(ctx, "me", task.ID, codersdk.TaskSendRequest{
 					Input: "Hello, Agent!",
 				})
 				require.NoError(t, err, "wanted no error due to healthy sidebar app and stable status")
@@ -567,7 +573,7 @@ func TestTasks(t *testing.T) {

 			//nolint:tparallel // Not intended to run in parallel.
 			t.Run("MissingContent", func(t *testing.T) {
-				err = client.TaskSend(ctx, "me", task.ID, codersdk.TaskSendRequest{
+				err = exp.TaskSend(ctx, "me", task.ID, codersdk.TaskSendRequest{
 					Input: "",
 				})
 				require.Error(t, err, "wanted error due to missing content")
@@ -585,7 +591,8 @@ func TestTasks(t *testing.T) {
 			_ = coderdtest.CreateFirstUser(t, client)
 			ctx := testutil.Context(t, testutil.WaitShort)

-			err := client.TaskSend(ctx, "me", uuid.New(), codersdk.TaskSendRequest{
+			exp := codersdk.NewExperimentalClient(client)
+			err := exp.TaskSend(ctx, "me", uuid.New(), codersdk.TaskSendRequest{
 				Input: "hi",
 			})

@@ -651,9 +658,10 @@ func TestTasks(t *testing.T) {
 			owner          = coderdtest.CreateFirstUser(t, client)
 			agentAuthToken = uuid.NewString()
 			template       = createAITemplate(t, client, owner, withAgentToken(agentAuthToken), withSidebarURL(srv.URL))
+			exp            = codersdk.NewExperimentalClient(client)
 		)

-		task, err := client.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
+		task, err := exp.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
 			TemplateVersionID: template.ActiveVersionID,
 			Input:             "show logs",
 		})
@@ -666,7 +674,7 @@ func TestTasks(t *testing.T) {
 		coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, ws.LatestBuild.ID)

 		// Fetch the task by ID via experimental API and verify fields.
-		task, err = client.TaskByIdentifier(ctx, task.ID.String())
+		task, err = exp.TaskByIdentifier(ctx, task.ID.String())
 		require.NoError(t, err)
 		require.NotZero(t, task.WorkspaceBuildNumber)
 		require.True(t, task.WorkspaceAgentID.Valid)
@@ -692,13 +700,13 @@ func TestTasks(t *testing.T) {
 		coderdtest.NewWorkspaceAgentWaiter(t, client, ws.ID).WaitFor(coderdtest.AgentsReady)

 		// Fetch the task by ID via experimental API and verify fields.
-		task, err = client.TaskByID(ctx, task.ID)
+		task, err = exp.TaskByID(ctx, task.ID)
 		require.NoError(t, err)

 		//nolint:tparallel // Not intended to run in parallel.
 		t.Run("OK", func(t *testing.T) {
 			// Fetch logs.
-			resp, err := client.TaskLogs(ctx, "me", task.ID)
+			resp, err := exp.TaskLogs(ctx, "me", task.ID)
 			require.NoError(t, err)
 			require.Len(t, resp.Logs, 3)
 			assert.Equal(t, 0, resp.Logs[0].ID)
@@ -718,7 +726,7 @@ func TestTasks(t *testing.T) {
 		t.Run("UpstreamError", func(t *testing.T) {
 			shouldReturnError = true
 			t.Cleanup(func() { shouldReturnError = false })
-			_, err := client.TaskLogs(ctx, "me", task.ID)
+			_, err := exp.TaskLogs(ctx, "me", task.ID)

 			var sdkErr *codersdk.Error
 			require.Error(t, err)
@@ -726,205 +734,6 @@ func TestTasks(t *testing.T) {
 			require.Equal(t, http.StatusBadGateway, sdkErr.StatusCode())
 		})
 	})
-
-	t.Run("UpdateInput", func(t *testing.T) {
-		tests := []struct {
-			name               string
-			disableProvisioner bool
-			transition         database.WorkspaceTransition
-			cancelTransition   bool
-			deleteTask         bool
-			taskInput          string
-			wantStatus         codersdk.TaskStatus
-			wantErr            string
-			wantErrStatusCode  int
-		}{
-			{
-				name: "TaskStatusInitializing",
-				// We want to disable the provisioner so that the task
-				// never gets provisioned (ensuring it stays in Initializing).
-				disableProvisioner: true,
-				taskInput:          "Valid prompt",
-				wantStatus:         codersdk.TaskStatusInitializing,
-				wantErr:            "Unable to update",
-				wantErrStatusCode:  http.StatusConflict,
-			},
-			{
-				name:       "TaskStatusPaused",
-				transition: database.WorkspaceTransitionStop,
-				taskInput:  "Valid prompt",
-				wantStatus: codersdk.TaskStatusPaused,
-			},
-			{
-				name:              "TaskStatusError",
-				transition:        database.WorkspaceTransitionStart,
-				cancelTransition:  true,
-				taskInput:         "Valid prompt",
-				wantStatus:        codersdk.TaskStatusError,
-				wantErr:           "Unable to update",
-				wantErrStatusCode: http.StatusConflict,
-			},
-			{
-				name:       "EmptyPrompt",
-				transition: database.WorkspaceTransitionStop,
-				// We want to ensure an empty prompt is rejected.
-				taskInput:         "",
-				wantStatus:        codersdk.TaskStatusPaused,
-				wantErr:           "Task input is required.",
-				wantErrStatusCode: http.StatusBadRequest,
-			},
-			{
-				name:              "TaskDeleted",
-				transition:        database.WorkspaceTransitionStop,
-				deleteTask:        true,
-				taskInput:         "Valid prompt",
-				wantErr:           httpapi.ResourceNotFoundResponse.Message,
-				wantErrStatusCode: http.StatusNotFound,
-			},
-		}
-
-		for _, tt := range tests {
-			t.Run(tt.name, func(t *testing.T) {
-				t.Parallel()
-
-				client, provisioner := coderdtest.NewWithProvisionerCloser(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
-				user := coderdtest.CreateFirstUser(t, client)
-				ctx := testutil.Context(t, testutil.WaitLong)
-
-				template := createAITemplate(t, client, user)
-
-				if tt.disableProvisioner {
-					provisioner.Close()
-				}
-
-				// Given: We create a task
-				task, err := client.CreateTask(ctx, codersdk.Me, codersdk.CreateTaskRequest{
-					TemplateVersionID: template.ActiveVersionID,
-					Input:             "initial prompt",
-				})
-				require.NoError(t, err)
-				require.True(t, task.WorkspaceID.Valid, "task should have a workspace ID")
-
-				if !tt.disableProvisioner {
-					// Given: The Task is running
-					workspace, err := client.Workspace(ctx, task.WorkspaceID.UUID)
-					require.NoError(t, err)
-					coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID)
-
-					// Given: We transition the task's workspace
-					build := coderdtest.CreateWorkspaceBuild(t, client, workspace, tt.transition)
-					if tt.cancelTransition {
-						// Given: We cancel the workspace build
-						err := client.CancelWorkspaceBuild(ctx, build.ID, codersdk.CancelWorkspaceBuildParams{})
-						require.NoError(t, err)
-
-						coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, build.ID)
-
-						// Then: We expect it to be canceled
-						build, err = client.WorkspaceBuild(ctx, build.ID)
-						require.NoError(t, err)
-						require.Equal(t, codersdk.WorkspaceStatusCanceled, build.Status)
-					} else {
-						coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, build.ID)
-					}
-				}
-
-				if tt.deleteTask {
-					err = client.DeleteTask(ctx, codersdk.Me, task.ID)
-					require.NoError(t, err)
-				} else {
-					// Given: Task has expected status
-					task, err = client.TaskByID(ctx, task.ID)
-					require.NoError(t, err)
-					require.Equal(t, tt.wantStatus, task.Status)
-				}
-
-				// When: We attempt to update the task input
-				err = client.UpdateTaskInput(ctx, task.OwnerName, task.ID, codersdk.UpdateTaskInputRequest{
-					Input: tt.taskInput,
-				})
-				if tt.wantErr != "" {
-					require.ErrorContains(t, err, tt.wantErr)
-
-					if tt.wantErrStatusCode != 0 {
-						var apiErr *codersdk.Error
-						require.ErrorAs(t, err, &apiErr)
-						require.Equal(t, tt.wantErrStatusCode, apiErr.StatusCode())
-					}
-
-					if !tt.deleteTask {
-						// Then: We expect the input to **not** be updated
-						task, err = client.TaskByID(ctx, task.ID)
-						require.NoError(t, err)
-						require.NotEqual(t, tt.taskInput, task.InitialPrompt)
-					}
-				} else {
-					require.NoError(t, err)
-
-					if !tt.deleteTask {
-						// Then: We expect the input to be updated
-						task, err = client.TaskByID(ctx, task.ID)
-						require.NoError(t, err)
-						require.Equal(t, tt.taskInput, task.InitialPrompt)
-					}
-				}
-			})
-		}
-
-		t.Run("NonExistentTask", func(t *testing.T) {
-			t.Parallel()
-
-			client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
-			user := coderdtest.CreateFirstUser(t, client)
-			ctx := testutil.Context(t, testutil.WaitShort)
-
-			// Attempt to update prompt for non-existent task
-			err := client.UpdateTaskInput(ctx, user.UserID.String(), uuid.New(), codersdk.UpdateTaskInputRequest{
-				Input: "Should fail",
-			})
-			require.Error(t, err)
-			var apiErr *codersdk.Error
-			require.ErrorAs(t, err, &apiErr)
-			require.Equal(t, http.StatusNotFound, apiErr.StatusCode())
-		})
-
-		t.Run("UnauthorizedUser", func(t *testing.T) {
-			t.Parallel()
-
-			client := coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
-			user := coderdtest.CreateFirstUser(t, client)
-			anotherUser, _ := coderdtest.CreateAnotherUser(t, client, user.OrganizationID)
-			ctx := testutil.Context(t, testutil.WaitLong)
-
-			template := createAITemplate(t, client, user)
-
-			// Create a task as the first user
-			task, err := client.CreateTask(ctx, codersdk.Me, codersdk.CreateTaskRequest{
-				TemplateVersionID: template.ActiveVersionID,
-				Input:             "initial prompt",
-			})
-			require.NoError(t, err)
-			require.True(t, task.WorkspaceID.Valid)
-
-			// Wait for workspace to complete
-			workspace, err := client.Workspace(ctx, task.WorkspaceID.UUID)
-			require.NoError(t, err)
-			coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspace.LatestBuild.ID)
-
-			// Stop the workspace
-			build := coderdtest.CreateWorkspaceBuild(t, client, workspace, database.WorkspaceTransitionStop)
-			coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, build.ID)
-
-			// Attempt to update prompt as another user should fail with 404 Not Found
-			err = anotherUser.UpdateTaskInput(ctx, task.OwnerName, task.ID, codersdk.UpdateTaskInputRequest{
-				Input: "Should fail - unauthorized",
-			})
-			require.Error(t, err)
-			var apiErr *codersdk.Error
-			require.ErrorAs(t, err, &apiErr)
-			require.Equal(t, http.StatusNotFound, apiErr.StatusCode())
-		})
-	})
 }

 func TestTasksCreate(t *testing.T) {
@@ -954,7 +763,9 @@ func TestTasksCreate(t *testing.T) {
 		coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
 		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)

-		task, err := client.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
+		expClient := codersdk.NewExperimentalClient(client)
+
+		task, err := expClient.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
 			TemplateVersionID: template.ActiveVersionID,
 			Input:             taskPrompt,
 		})
@@ -999,8 +810,10 @@ func TestTasksCreate(t *testing.T) {
 		coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
 		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)

+		expClient := codersdk.NewExperimentalClient(client)
+
 		// When: We attempt to create a Task.
-		task, err := client.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
+		task, err := expClient.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
 			TemplateVersionID: template.ActiveVersionID,
 			Input:             taskPrompt,
 		})
@@ -1027,17 +840,14 @@ func TestTasksCreate(t *testing.T) {
 		t.Parallel()

 		tests := []struct {
-			name                      string
-			taskName                  string
-			taskDisplayName           string
-			expectFallbackName        bool
-			expectFallbackDisplayName bool
-			expectError               string
+			name               string
+			taskName           string
+			expectFallbackName bool
+			expectError        string
 		}{
 			{
-				name:                      "ValidName",
-				taskName:                  "a-valid-task-name",
-				expectFallbackDisplayName: true,
+				name:     "ValidName",
+				taskName: "a-valid-task-name",
 			},
 			{
 				name:        "NotValidName",
@@ -1047,37 +857,8 @@ func TestTasksCreate(t *testing.T) {
 			{
 				name:               "NoNameProvided",
 				taskName:           "",
-				taskDisplayName:    "A valid task display name",
 				expectFallbackName: true,
 			},
-			{
-				name:               "ValidDisplayName",
-				taskDisplayName:    "A valid task display name",
-				expectFallbackName: true,
-			},
-			{
-				name:            "NotValidDisplayName",
-				taskDisplayName: "This is a task display name with a length greater than 64 characters.",
-				expectError:     "Display name must be 64 characters or less.",
-			},
-			{
-				name:                      "NoDisplayNameProvided",
-				taskName:                  "a-valid-task-name",
-				taskDisplayName:           "",
-				expectFallbackDisplayName: true,
-			},
-			{
-				name:            "ValidNameAndDisplayName",
-				taskName:        "a-valid-task-name",
-				taskDisplayName: "A valid task display name",
-			},
-			{
-				name:                      "NoNameAndDisplayNameProvided",
-				taskName:                  "",
-				taskDisplayName:           "",
-				expectFallbackName:        true,
-				expectFallbackDisplayName: true,
-			},
 		}

 		for _, tt := range tests {
@@ -1085,10 +866,11 @@ func TestTasksCreate(t *testing.T) {
 				t.Parallel()

 				var (
-					ctx     = testutil.Context(t, testutil.WaitShort)
-					client  = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
-					user    = coderdtest.CreateFirstUser(t, client)
-					version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
+					ctx       = testutil.Context(t, testutil.WaitShort)
+					client    = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerDaemon: true})
+					expClient = codersdk.NewExperimentalClient(client)
+					user      = coderdtest.CreateFirstUser(t, client)
+					version   = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
 						Parse:          echo.ParseComplete,
 						ProvisionApply: echo.ApplyComplete,
 						ProvisionPlan: []*proto.Response{
@@ -1103,11 +885,10 @@ func TestTasksCreate(t *testing.T) {
 				coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)

 				// When: We attempt to create a Task.
-				task, err := client.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
+				task, err := expClient.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
 					TemplateVersionID: template.ActiveVersionID,
 					Input:             "Some prompt",
 					Name:              tt.taskName,
-					DisplayName:       tt.taskDisplayName,
 				})
 				if tt.expectError == "" {
 					require.NoError(t, err)
@@ -1121,17 +902,8 @@ func TestTasksCreate(t *testing.T) {
 					if !tt.expectFallbackName {
 						require.Equal(t, tt.taskName, task.Name)
 					}
-
-					// Then: We expect the correct display name to have been picked.
-					require.NotEmpty(t, task.DisplayName)
-					if !tt.expectFallbackDisplayName {
-						require.Equal(t, tt.taskDisplayName, task.DisplayName)
-					}
 				} else {
-					var apiErr *codersdk.Error
-					require.ErrorAs(t, err, &apiErr)
-					require.Equal(t, http.StatusBadRequest, apiErr.StatusCode())
-					require.Equal(t, apiErr.Message, tt.expectError)
+					require.ErrorContains(t, err, tt.expectError)
 				}
 			})
 		}
@@ -1154,8 +926,10 @@ func TestTasksCreate(t *testing.T) {
 		coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
 		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)

+		expClient := codersdk.NewExperimentalClient(client)
+
 		// When: We attempt to create a Task.
-		_, err := client.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
+		_, err := expClient.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
 			TemplateVersionID: template.ActiveVersionID,
 			Input:             taskPrompt,
 		})
@@ -1184,8 +958,10 @@ func TestTasksCreate(t *testing.T) {
 		coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
 		_ = coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)

+		expClient := codersdk.NewExperimentalClient(client)
+
 		// When: We attempt to create a Task with an invalid template version ID.
-		_, err := client.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
+		_, err := expClient.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
 			TemplateVersionID: uuid.New(),
 			Input:             taskPrompt,
 		})
@@ -1221,7 +997,9 @@ func TestTasksCreate(t *testing.T) {
 		coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
 		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)

-		task, err := client.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
+		expClient := codersdk.NewExperimentalClient(client)
+
+		task, err := expClient.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
 			TemplateVersionID: template.ActiveVersionID,
 			Input:             taskPrompt,
 		})
@@ -1278,7 +1056,9 @@ func TestTasksCreate(t *testing.T) {
 		coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
 		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)

-		task, err := client.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
+		expClient := codersdk.NewExperimentalClient(client)
+
+		task, err := expClient.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
 			TemplateVersionID: template.ActiveVersionID,
 			Input:             taskPrompt,
 			Name:              taskName,
@@ -1312,14 +1092,16 @@ func TestTasksCreate(t *testing.T) {
 		coderdtest.AwaitTemplateVersionJobCompleted(t, client, version.ID)
 		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)

-		task1, err := client.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
+		expClient := codersdk.NewExperimentalClient(client)
+
+		task1, err := expClient.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
 			TemplateVersionID: template.ActiveVersionID,
 			Input:             "First task",
 			Name:              "task-1",
 		})
 		require.NoError(t, err)

-		task2, err := client.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
+		task2, err := expClient.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
 			TemplateVersionID: template.ActiveVersionID,
 			Input:             "Second task",
 			Name:              "task-2",
@@ -1373,9 +1155,11 @@ func TestTasksCreate(t *testing.T) {
 		}, template.ID)
 		coderdtest.AwaitTemplateVersionJobCompleted(t, client, version2.ID)

+		expClient := codersdk.NewExperimentalClient(client)
+
 		// Create a task using version 2 to verify the template_version_id is
 		// stored correctly.
-		task, err := client.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
+		task, err := expClient.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
 			TemplateVersionID: version2.ID,
 			Input:             "Use version 2",
 		})
@@ -96,10 +96,10 @@ const docTemplate = `{
                    "application/json"
                ],
                "tags": [
-                    "AI Bridge"
+                    "AIBridge"
                ],
-                "summary": "List AI Bridge interceptions",
-                "operationId": "list-ai-bridge-interceptions",
+                "summary": "List AIBridge interceptions",
+                "operationId": "list-aibridge-interceptions",
                "parameters": [
                    {
                        "type": "string",
@@ -136,6 +136,233 @@ const docTemplate = `{
                }
            }
        },
+        "/api/experimental/tasks": {
+            "get": {
+                "security": [
+                    {
+                        "CoderSessionToken": []
+                    }
+                ],
+                "tags": [
+                    "Experimental"
+                ],
+                "summary": "List AI tasks",
+                "operationId": "list-tasks",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "Search query for filtering tasks. Supports: owner:\u003cusername/uuid/me\u003e, organization:\u003corg-name/uuid\u003e, status:\u003cstatus\u003e",
+                        "name": "q",
+                        "in": "query"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/codersdk.TasksListResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/api/experimental/tasks/{user}": {
+            "post": {
+                "security": [
+                    {
+                        "CoderSessionToken": []
+                    }
+                ],
+                "tags": [
+                    "Experimental"
+                ],
+                "summary": "Create a new AI task",
+                "operationId": "create-task",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "Username, user ID, or 'me' for the authenticated user",
+                        "name": "user",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "description": "Create task request",
+                        "name": "request",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/codersdk.CreateTaskRequest"
+                        }
+                    }
+                ],
+                "responses": {
+                    "201": {
+                        "description": "Created",
+                        "schema": {
+                            "$ref": "#/definitions/codersdk.Task"
+                        }
+                    }
+                }
+            }
+        },
+        "/api/experimental/tasks/{user}/{task}": {
+            "get": {
+                "security": [
+                    {
+                        "CoderSessionToken": []
+                    }
+                ],
+                "tags": [
+                    "Experimental"
+                ],
+                "summary": "Get AI task by ID",
+                "operationId": "get-task",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "Username, user ID, or 'me' for the authenticated user",
+                        "name": "user",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "format": "uuid",
+                        "description": "Task ID",
+                        "name": "task",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/codersdk.Task"
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "security": [
+                    {
+                        "CoderSessionToken": []
+                    }
+                ],
+                "tags": [
+                    "Experimental"
+                ],
+                "summary": "Delete AI task by ID",
+                "operationId": "delete-task",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "Username, user ID, or 'me' for the authenticated user",
+                        "name": "user",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "format": "uuid",
+                        "description": "Task ID",
+                        "name": "task",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "202": {
+                        "description": "Task deletion initiated"
+                    }
+                }
+            }
+        },
+        "/api/experimental/tasks/{user}/{task}/logs": {
+            "get": {
+                "security": [
+                    {
+                        "CoderSessionToken": []
+                    }
+                ],
+                "tags": [
+                    "Experimental"
+                ],
+                "summary": "Get AI task logs",
+                "operationId": "get-task-logs",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "Username, user ID, or 'me' for the authenticated user",
+                        "name": "user",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "format": "uuid",
+                        "description": "Task ID",
+                        "name": "task",
+                        "in": "path",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/codersdk.TaskLogsResponse"
+                        }
+                    }
+                }
+            }
+        },
+        "/api/experimental/tasks/{user}/{task}/send": {
+            "post": {
+                "security": [
+                    {
+                        "CoderSessionToken": []
+                    }
+                ],
+                "tags": [
+                    "Experimental"
+                ],
+                "summary": "Send input to AI task",
+                "operationId": "send-task-input",
+                "parameters": [
+                    {
+                        "type": "string",
+                        "description": "Username, user ID, or 'me' for the authenticated user",
+                        "name": "user",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "type": "string",
+                        "format": "uuid",
+                        "description": "Task ID",
+                        "name": "task",
+                        "in": "path",
+                        "required": true
+                    },
+                    {
+                        "description": "Task input request",
+                        "name": "request",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/codersdk.TaskSendRequest"
+                        }
+                    }
+                ],
+                "responses": {
+                    "204": {
+                        "description": "Input sent successfully"
+                    }
+                }
+            }
+        },
        "/appearance": {
            "get": {
                "security": [
@@ -5452,294 +5679,6 @@ const docTemplate = `{
                }
            }
        },
-        "/tasks": {
-            "get": {
-                "security": [
-                    {
-                        "CoderSessionToken": []
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Tasks"
-                ],
-                "summary": "List AI tasks",
-                "operationId": "list-ai-tasks",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "Search query for filtering tasks. Supports: owner:\u003cusername/uuid/me\u003e, organization:\u003corg-name/uuid\u003e, status:\u003cstatus\u003e",
-                        "name": "q",
-                        "in": "query"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/codersdk.TasksListResponse"
-                        }
-                    }
-                }
-            }
-        },
-        "/tasks/{user}": {
-            "post": {
-                "security": [
-                    {
-                        "CoderSessionToken": []
-                    }
-                ],
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Tasks"
-                ],
-                "summary": "Create a new AI task",
-                "operationId": "create-a-new-ai-task",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "Username, user ID, or 'me' for the authenticated user",
-                        "name": "user",
-                        "in": "path",
-                        "required": true
-                    },
-                    {
-                        "description": "Create task request",
-                        "name": "request",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/codersdk.CreateTaskRequest"
-                        }
-                    }
-                ],
-                "responses": {
-                    "201": {
-                        "description": "Created",
-                        "schema": {
-                            "$ref": "#/definitions/codersdk.Task"
-                        }
-                    }
-                }
-            }
-        },
-        "/tasks/{user}/{task}": {
-            "get": {
-                "security": [
-                    {
-                        "CoderSessionToken": []
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Tasks"
-                ],
-                "summary": "Get AI task by ID or name",
-                "operationId": "get-ai-task-by-id-or-name",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "Username, user ID, or 'me' for the authenticated user",
-                        "name": "user",
-                        "in": "path",
-                        "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "Task ID, or task name",
-                        "name": "task",
-                        "in": "path",
-                        "required": true
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/codersdk.Task"
-                        }
-                    }
-                }
-            },
-            "delete": {
-                "security": [
-                    {
-                        "CoderSessionToken": []
-                    }
-                ],
-                "tags": [
-                    "Tasks"
-                ],
-                "summary": "Delete AI task",
-                "operationId": "delete-ai-task",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "Username, user ID, or 'me' for the authenticated user",
-                        "name": "user",
-                        "in": "path",
-                        "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "Task ID, or task name",
-                        "name": "task",
-                        "in": "path",
-                        "required": true
-                    }
-                ],
-                "responses": {
-                    "202": {
-                        "description": "Accepted"
-                    }
-                }
-            }
-        },
-        "/tasks/{user}/{task}/input": {
-            "patch": {
-                "security": [
-                    {
-                        "CoderSessionToken": []
-                    }
-                ],
-                "consumes": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Tasks"
-                ],
-                "summary": "Update AI task input",
-                "operationId": "update-ai-task-input",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "Username, user ID, or 'me' for the authenticated user",
-                        "name": "user",
-                        "in": "path",
-                        "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "Task ID, or task name",
-                        "name": "task",
-                        "in": "path",
-                        "required": true
-                    },
-                    {
-                        "description": "Update task input request",
-                        "name": "request",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/codersdk.UpdateTaskInputRequest"
-                        }
-                    }
-                ],
-                "responses": {
-                    "204": {
-                        "description": "No Content"
-                    }
-                }
-            }
-        },
-        "/tasks/{user}/{task}/logs": {
-            "get": {
-                "security": [
-                    {
-                        "CoderSessionToken": []
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Tasks"
-                ],
-                "summary": "Get AI task logs",
-                "operationId": "get-ai-task-logs",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "Username, user ID, or 'me' for the authenticated user",
-                        "name": "user",
-                        "in": "path",
-                        "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "Task ID, or task name",
-                        "name": "task",
-                        "in": "path",
-                        "required": true
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/codersdk.TaskLogsResponse"
-                        }
-                    }
-                }
-            }
-        },
-        "/tasks/{user}/{task}/send": {
-            "post": {
-                "security": [
-                    {
-                        "CoderSessionToken": []
-                    }
-                ],
-                "consumes": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Tasks"
-                ],
-                "summary": "Send input to AI task",
-                "operationId": "send-input-to-ai-task",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "description": "Username, user ID, or 'me' for the authenticated user",
-                        "name": "user",
-                        "in": "path",
-                        "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "Task ID, or task name",
-                        "name": "task",
-                        "in": "path",
-                        "required": true
-                    },
-                    {
-                        "description": "Task input request",
-                        "name": "request",
-                        "in": "body",
-                        "required": true,
-                        "schema": {
-                            "$ref": "#/definitions/codersdk.TaskSendRequest"
-                        }
-                    }
-                ],
-                "responses": {
-                    "204": {
-                        "description": "No Content"
-                    }
-                }
-            }
-        },
        "/templates": {
            "get": {
                "security": [
@@ -6063,41 +6002,6 @@ const docTemplate = `{
                }
            }
        },
-        "/templates/{template}/prebuilds/invalidate": {
-            "post": {
-                "security": [
-                    {
-                        "CoderSessionToken": []
-                    }
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "Enterprise"
-                ],
-                "summary": "Invalidate presets for template",
-                "operationId": "invalidate-presets-for-template",
-                "parameters": [
-                    {
-                        "type": "string",
-                        "format": "uuid",
-                        "description": "Template ID",
-                        "name": "template",
-                        "in": "path",
-                        "required": true
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/codersdk.InvalidatePresetsResponse"
-                        }
-                    }
-                }
-            }
-        },
        "/templates/{template}/versions": {
            "get": {
                "security": [
@@ -11801,9 +11705,6 @@ const docTemplate = `{
                },
                "openai": {
                    "$ref": "#/definitions/codersdk.AIBridgeOpenAIConfig"
-                },
-                "retention": {
-                    "type": "integer"
                }
            }
        },
@@ -13298,9 +13199,6 @@ const docTemplate = `{
        "codersdk.CreateTaskRequest": {
            "type": "object",
            "properties": {
-                "display_name": {
-                    "type": "string"
-                },
                "input": {
                    "type": "string"
                },
@@ -14424,8 +14322,7 @@ const docTemplate = `{
                "web-push",
                "oauth2",
                "mcp-server-http",
-                "workspace-sharing",
-                "terraform-directory-reuse"
+                "workspace-sharing"
            ],
            "x-enum-comments": {
                "ExperimentAutoFillParameters": "This should not be taken out of experiments until we have redesigned the feature.",
@@ -14433,7 +14330,6 @@ const docTemplate = `{
                "ExperimentMCPServerHTTP": "Enables the MCP HTTP server functionality.",
                "ExperimentNotifications": "Sends notifications via SMTP and webhooks following certain events.",
                "ExperimentOAuth2": "Enables OAuth2 provider functionality.",
-                "ExperimentTerraformWorkspace": "Enables reuse of existing terraform directory for builds",
                "ExperimentWebPush": "Enables web push notifications through the browser.",
                "ExperimentWorkspaceSharing": "Enables updating workspace ACLs for sharing with users and groups.",
                "ExperimentWorkspaceUsage": "Enables the new workspace usage tracking."
@@ -14446,8 +14342,7 @@ const docTemplate = `{
                "ExperimentWebPush",
                "ExperimentOAuth2",
                "ExperimentMCPServerHTTP",
-                "ExperimentWorkspaceSharing",
-                "ExperimentTerraformWorkspace"
+                "ExperimentWorkspaceSharing"
            ]
        },
        "codersdk.ExternalAPIKeyScopes": {
@@ -14991,31 +14886,6 @@ const docTemplate = `{
                "InsightsReportIntervalWeek"
            ]
        },
-        "codersdk.InvalidatePresetsResponse": {
-            "type": "object",
-            "properties": {
-                "invalidated": {
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/codersdk.InvalidatedPreset"
-                    }
-                }
-            }
-        },
-        "codersdk.InvalidatedPreset": {
-            "type": "object",
-            "properties": {
-                "preset_name": {
-                    "type": "string"
-                },
-                "template_name": {
-                    "type": "string"
-                },
-                "template_version_name": {
-                    "type": "string"
-                }
-            }
-        },
        "codersdk.IssueReconnectingPTYSignedTokenRequest": {
            "type": "object",
            "required": [
@@ -17900,9 +17770,6 @@ const docTemplate = `{
                "current_state": {
                    "$ref": "#/definitions/codersdk.TaskStateEntry"
                },
-                "display_name": {
-                    "type": "string"
-                },
                "id": {
                    "type": "string",
                    "format": "uuid"
@@ -18268,9 +18135,6 @@ const docTemplate = `{
                },
                "use_classic_parameter_flow": {
                    "type": "boolean"
-                },
-                "use_terraform_workspace_cache": {
-                    "type": "boolean"
                }
            }
        },
@@ -19092,14 +18956,6 @@ const docTemplate = `{
                }
            }
        },
-        "codersdk.UpdateTaskInputRequest": {
-            "type": "object",
-            "properties": {
-                "input": {
-                    "type": "string"
-                }
-            }
-        },
        "codersdk.UpdateTemplateACL": {
            "type": "object",
            "properties": {
@@ -19207,10 +19063,6 @@ const docTemplate = `{
                "use_classic_parameter_flow": {
                    "description": "UseClassicParameterFlow is a flag that switches the default behavior to use the classic\nparameter flow when creating a workspace. This only affects deployments with the experiment\n\"dynamic-parameters\" enabled. This setting will live for a period after the experiment is\nmade the default.\nAn \"opt-out\" is present in case the new feature breaks some existing templates.",
                    "type": "boolean"
-                },
-                "use_terraform_workspace_cache": {
-                    "description": "UseTerraformWorkspaceCache allows optionally specifying whether to use cached\nterraform directories for workspaces created from this template. This field\nonly applies when the correct experiment is enabled. This field is subject to\nbeing removed in the future.",
-                    "type": "boolean"
                }
            }
        },
@@ -73,9 +73,9 @@
 					}
 				],
 				"produces": ["application/json"],
-				"tags": ["AI Bridge"],
-				"summary": "List AI Bridge interceptions",
-				"operationId": "list-ai-bridge-interceptions",
+				"tags": ["AIBridge"],
+				"summary": "List AIBridge interceptions",
+				"operationId": "list-aibridge-interceptions",
 				"parameters": [
 					{
 						"type": "string",
@@ -112,6 +112,221 @@
 				}
 			}
 		},
+		"/api/experimental/tasks": {
+			"get": {
+				"security": [
+					{
+						"CoderSessionToken": []
+					}
+				],
+				"tags": ["Experimental"],
+				"summary": "List AI tasks",
+				"operationId": "list-tasks",
+				"parameters": [
+					{
+						"type": "string",
+						"description": "Search query for filtering tasks. Supports: owner:\u003cusername/uuid/me\u003e, organization:\u003corg-name/uuid\u003e, status:\u003cstatus\u003e",
+						"name": "q",
+						"in": "query"
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "OK",
+						"schema": {
+							"$ref": "#/definitions/codersdk.TasksListResponse"
+						}
+					}
+				}
+			}
+		},
+		"/api/experimental/tasks/{user}": {
+			"post": {
+				"security": [
+					{
+						"CoderSessionToken": []
+					}
+				],
+				"tags": ["Experimental"],
+				"summary": "Create a new AI task",
+				"operationId": "create-task",
+				"parameters": [
+					{
+						"type": "string",
+						"description": "Username, user ID, or 'me' for the authenticated user",
+						"name": "user",
+						"in": "path",
+						"required": true
+					},
+					{
+						"description": "Create task request",
+						"name": "request",
+						"in": "body",
+						"required": true,
+						"schema": {
+							"$ref": "#/definitions/codersdk.CreateTaskRequest"
+						}
+					}
+				],
+				"responses": {
+					"201": {
+						"description": "Created",
+						"schema": {
+							"$ref": "#/definitions/codersdk.Task"
+						}
+					}
+				}
+			}
+		},
+		"/api/experimental/tasks/{user}/{task}": {
+			"get": {
+				"security": [
+					{
+						"CoderSessionToken": []
+					}
+				],
+				"tags": ["Experimental"],
+				"summary": "Get AI task by ID",
+				"operationId": "get-task",
+				"parameters": [
+					{
+						"type": "string",
+						"description": "Username, user ID, or 'me' for the authenticated user",
+						"name": "user",
+						"in": "path",
+						"required": true
+					},
+					{
+						"type": "string",
+						"format": "uuid",
+						"description": "Task ID",
+						"name": "task",
+						"in": "path",
+						"required": true
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "OK",
+						"schema": {
+							"$ref": "#/definitions/codersdk.Task"
+						}
+					}
+				}
+			},
+			"delete": {
+				"security": [
+					{
+						"CoderSessionToken": []
+					}
+				],
+				"tags": ["Experimental"],
+				"summary": "Delete AI task by ID",
+				"operationId": "delete-task",
+				"parameters": [
+					{
+						"type": "string",
+						"description": "Username, user ID, or 'me' for the authenticated user",
+						"name": "user",
+						"in": "path",
+						"required": true
+					},
+					{
+						"type": "string",
+						"format": "uuid",
+						"description": "Task ID",
+						"name": "task",
+						"in": "path",
+						"required": true
+					}
+				],
+				"responses": {
+					"202": {
+						"description": "Task deletion initiated"
+					}
+				}
+			}
+		},
+		"/api/experimental/tasks/{user}/{task}/logs": {
+			"get": {
+				"security": [
+					{
+						"CoderSessionToken": []
+					}
+				],
+				"tags": ["Experimental"],
+				"summary": "Get AI task logs",
+				"operationId": "get-task-logs",
+				"parameters": [
+					{
+						"type": "string",
+						"description": "Username, user ID, or 'me' for the authenticated user",
+						"name": "user",
+						"in": "path",
+						"required": true
+					},
+					{
+						"type": "string",
+						"format": "uuid",
+						"description": "Task ID",
+						"name": "task",
+						"in": "path",
+						"required": true
+					}
+				],
+				"responses": {
+					"200": {
+						"description": "OK",
+						"schema": {
+							"$ref": "#/definitions/codersdk.TaskLogsResponse"
+						}
+					}
+				}
+			}
+		},
+		"/api/experimental/tasks/{user}/{task}/send": {
+			"post": {
+				"security": [
+					{
+						"CoderSessionToken": []
+					}
+				],
+				"tags": ["Experimental"],
+				"summary": "Send input to AI task",
+				"operationId": "send-task-input",
+				"parameters": [
+					{
+						"type": "string",
+						"description": "Username, user ID, or 'me' for the authenticated user",
+						"name": "user",
+						"in": "path",
+						"required": true
+					},
+					{
+						"type": "string",
+						"format": "uuid",
+						"description": "Task ID",
+						"name": "task",
+						"in": "path",
+						"required": true
+					},
+					{
+						"description": "Task input request",
+						"name": "request",
+						"in": "body",
+						"required": true,
+						"schema": {
+							"$ref": "#/definitions/codersdk.TaskSendRequest"
+						}
+					}
+				],
+				"responses": {
+					"204": {
+						"description": "Input sent successfully"
+					}
+				}
+			}
+		},
 		"/appearance": {
 			"get": {
 				"security": [
@@ -4811,266 +5026,6 @@
 				}
 			}
 		},
-		"/tasks": {
-			"get": {
-				"security": [
-					{
-						"CoderSessionToken": []
-					}
-				],
-				"produces": ["application/json"],
-				"tags": ["Tasks"],
-				"summary": "List AI tasks",
-				"operationId": "list-ai-tasks",
-				"parameters": [
-					{
-						"type": "string",
-						"description": "Search query for filtering tasks. Supports: owner:\u003cusername/uuid/me\u003e, organization:\u003corg-name/uuid\u003e, status:\u003cstatus\u003e",
-						"name": "q",
-						"in": "query"
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/codersdk.TasksListResponse"
-						}
-					}
-				}
-			}
-		},
-		"/tasks/{user}": {
-			"post": {
-				"security": [
-					{
-						"CoderSessionToken": []
-					}
-				],
-				"consumes": ["application/json"],
-				"produces": ["application/json"],
-				"tags": ["Tasks"],
-				"summary": "Create a new AI task",
-				"operationId": "create-a-new-ai-task",
-				"parameters": [
-					{
-						"type": "string",
-						"description": "Username, user ID, or 'me' for the authenticated user",
-						"name": "user",
-						"in": "path",
-						"required": true
-					},
-					{
-						"description": "Create task request",
-						"name": "request",
-						"in": "body",
-						"required": true,
-						"schema": {
-							"$ref": "#/definitions/codersdk.CreateTaskRequest"
-						}
-					}
-				],
-				"responses": {
-					"201": {
-						"description": "Created",
-						"schema": {
-							"$ref": "#/definitions/codersdk.Task"
-						}
-					}
-				}
-			}
-		},
-		"/tasks/{user}/{task}": {
-			"get": {
-				"security": [
-					{
-						"CoderSessionToken": []
-					}
-				],
-				"produces": ["application/json"],
-				"tags": ["Tasks"],
-				"summary": "Get AI task by ID or name",
-				"operationId": "get-ai-task-by-id-or-name",
-				"parameters": [
-					{
-						"type": "string",
-						"description": "Username, user ID, or 'me' for the authenticated user",
-						"name": "user",
-						"in": "path",
-						"required": true
-					},
-					{
-						"type": "string",
-						"description": "Task ID, or task name",
-						"name": "task",
-						"in": "path",
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/codersdk.Task"
-						}
-					}
-				}
-			},
-			"delete": {
-				"security": [
-					{
-						"CoderSessionToken": []
-					}
-				],
-				"tags": ["Tasks"],
-				"summary": "Delete AI task",
-				"operationId": "delete-ai-task",
-				"parameters": [
-					{
-						"type": "string",
-						"description": "Username, user ID, or 'me' for the authenticated user",
-						"name": "user",
-						"in": "path",
-						"required": true
-					},
-					{
-						"type": "string",
-						"description": "Task ID, or task name",
-						"name": "task",
-						"in": "path",
-						"required": true
-					}
-				],
-				"responses": {
-					"202": {
-						"description": "Accepted"
-					}
-				}
-			}
-		},
-		"/tasks/{user}/{task}/input": {
-			"patch": {
-				"security": [
-					{
-						"CoderSessionToken": []
-					}
-				],
-				"consumes": ["application/json"],
-				"tags": ["Tasks"],
-				"summary": "Update AI task input",
-				"operationId": "update-ai-task-input",
-				"parameters": [
-					{
-						"type": "string",
-						"description": "Username, user ID, or 'me' for the authenticated user",
-						"name": "user",
-						"in": "path",
-						"required": true
-					},
-					{
-						"type": "string",
-						"description": "Task ID, or task name",
-						"name": "task",
-						"in": "path",
-						"required": true
-					},
-					{
-						"description": "Update task input request",
-						"name": "request",
-						"in": "body",
-						"required": true,
-						"schema": {
-							"$ref": "#/definitions/codersdk.UpdateTaskInputRequest"
-						}
-					}
-				],
-				"responses": {
-					"204": {
-						"description": "No Content"
-					}
-				}
-			}
-		},
-		"/tasks/{user}/{task}/logs": {
-			"get": {
-				"security": [
-					{
-						"CoderSessionToken": []
-					}
-				],
-				"produces": ["application/json"],
-				"tags": ["Tasks"],
-				"summary": "Get AI task logs",
-				"operationId": "get-ai-task-logs",
-				"parameters": [
-					{
-						"type": "string",
-						"description": "Username, user ID, or 'me' for the authenticated user",
-						"name": "user",
-						"in": "path",
-						"required": true
-					},
-					{
-						"type": "string",
-						"description": "Task ID, or task name",
-						"name": "task",
-						"in": "path",
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/codersdk.TaskLogsResponse"
-						}
-					}
-				}
-			}
-		},
-		"/tasks/{user}/{task}/send": {
-			"post": {
-				"security": [
-					{
-						"CoderSessionToken": []
-					}
-				],
-				"consumes": ["application/json"],
-				"tags": ["Tasks"],
-				"summary": "Send input to AI task",
-				"operationId": "send-input-to-ai-task",
-				"parameters": [
-					{
-						"type": "string",
-						"description": "Username, user ID, or 'me' for the authenticated user",
-						"name": "user",
-						"in": "path",
-						"required": true
-					},
-					{
-						"type": "string",
-						"description": "Task ID, or task name",
-						"name": "task",
-						"in": "path",
-						"required": true
-					},
-					{
-						"description": "Task input request",
-						"name": "request",
-						"in": "body",
-						"required": true,
-						"schema": {
-							"$ref": "#/definitions/codersdk.TaskSendRequest"
-						}
-					}
-				],
-				"responses": {
-					"204": {
-						"description": "No Content"
-					}
-				}
-			}
-		},
 		"/templates": {
 			"get": {
 				"security": [
@@ -5354,37 +5309,6 @@
 				}
 			}
 		},
-		"/templates/{template}/prebuilds/invalidate": {
-			"post": {
-				"security": [
-					{
-						"CoderSessionToken": []
-					}
-				],
-				"produces": ["application/json"],
-				"tags": ["Enterprise"],
-				"summary": "Invalidate presets for template",
-				"operationId": "invalidate-presets-for-template",
-				"parameters": [
-					{
-						"type": "string",
-						"format": "uuid",
-						"description": "Template ID",
-						"name": "template",
-						"in": "path",
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/codersdk.InvalidatePresetsResponse"
-						}
-					}
-				}
-			}
-		},
 		"/templates/{template}/versions": {
 			"get": {
 				"security": [
@@ -10477,9 +10401,6 @@
 				},
 				"openai": {
 					"$ref": "#/definitions/codersdk.AIBridgeOpenAIConfig"
-				},
-				"retention": {
-					"type": "integer"
 				}
 			}
 		},
@@ -11928,9 +11849,6 @@
 		"codersdk.CreateTaskRequest": {
 			"type": "object",
 			"properties": {
-				"display_name": {
-					"type": "string"
-				},
 				"input": {
 					"type": "string"
 				},
@@ -13011,8 +12929,7 @@
 				"web-push",
 				"oauth2",
 				"mcp-server-http",
-				"workspace-sharing",
-				"terraform-directory-reuse"
+				"workspace-sharing"
 			],
 			"x-enum-comments": {
 				"ExperimentAutoFillParameters": "This should not be taken out of experiments until we have redesigned the feature.",
@@ -13020,7 +12937,6 @@
 				"ExperimentMCPServerHTTP": "Enables the MCP HTTP server functionality.",
 				"ExperimentNotifications": "Sends notifications via SMTP and webhooks following certain events.",
 				"ExperimentOAuth2": "Enables OAuth2 provider functionality.",
-				"ExperimentTerraformWorkspace": "Enables reuse of existing terraform directory for builds",
 				"ExperimentWebPush": "Enables web push notifications through the browser.",
 				"ExperimentWorkspaceSharing": "Enables updating workspace ACLs for sharing with users and groups.",
 				"ExperimentWorkspaceUsage": "Enables the new workspace usage tracking."
@@ -13033,8 +12949,7 @@
 				"ExperimentWebPush",
 				"ExperimentOAuth2",
 				"ExperimentMCPServerHTTP",
-				"ExperimentWorkspaceSharing",
-				"ExperimentTerraformWorkspace"
+				"ExperimentWorkspaceSharing"
 			]
 		},
 		"codersdk.ExternalAPIKeyScopes": {
@@ -13569,31 +13484,6 @@
 				"InsightsReportIntervalWeek"
 			]
 		},
-		"codersdk.InvalidatePresetsResponse": {
-			"type": "object",
-			"properties": {
-				"invalidated": {
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/codersdk.InvalidatedPreset"
-					}
-				}
-			}
-		},
-		"codersdk.InvalidatedPreset": {
-			"type": "object",
-			"properties": {
-				"preset_name": {
-					"type": "string"
-				},
-				"template_name": {
-					"type": "string"
-				},
-				"template_version_name": {
-					"type": "string"
-				}
-			}
-		},
 		"codersdk.IssueReconnectingPTYSignedTokenRequest": {
 			"type": "object",
 			"required": ["agentID", "url"],
@@ -16368,9 +16258,6 @@
 				"current_state": {
 					"$ref": "#/definitions/codersdk.TaskStateEntry"
 				},
-				"display_name": {
-					"type": "string"
-				},
 				"id": {
 					"type": "string",
 					"format": "uuid"
@@ -16723,9 +16610,6 @@
 				},
 				"use_classic_parameter_flow": {
 					"type": "boolean"
-				},
-				"use_terraform_workspace_cache": {
-					"type": "boolean"
 				}
 			}
 		},
@@ -17503,14 +17387,6 @@
 				}
 			}
 		},
-		"codersdk.UpdateTaskInputRequest": {
-			"type": "object",
-			"properties": {
-				"input": {
-					"type": "string"
-				}
-			}
-		},
 		"codersdk.UpdateTemplateACL": {
 			"type": "object",
 			"properties": {
@@ -17618,10 +17494,6 @@
 				"use_classic_parameter_flow": {
 					"description": "UseClassicParameterFlow is a flag that switches the default behavior to use the classic\nparameter flow when creating a workspace. This only affects deployments with the experiment\n\"dynamic-parameters\" enabled. This setting will live for a period after the experiment is\nmade the default.\nAn \"opt-out\" is present in case the new feature breaks some existing templates.",
 					"type": "boolean"
-				},
-				"use_terraform_workspace_cache": {
-					"description": "UseTerraformWorkspaceCache allows optionally specifying whether to use cached\nterraform directories for workspaces created from this template. This field\nonly applies when the correct experiment is enabled. This field is subject to\nbeing removed in the future.",
-					"type": "boolean"
 				}
 			}
 		},
@@ -1830,7 +1830,8 @@ func TestExecutorTaskWorkspace(t *testing.T) {
 	createTaskWorkspace := func(t *testing.T, client *codersdk.Client, template codersdk.Template, ctx context.Context, input string) codersdk.Workspace {
 		t.Helper()

-		task, err := client.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
+		exp := codersdk.NewExperimentalClient(client)
+		task, err := exp.CreateTask(ctx, "me", codersdk.CreateTaskRequest{
 			TemplateVersionID: template.ActiveVersionID,
 			Input:             input,
 		})
@@ -99,7 +99,6 @@ import (
 	"github.com/coder/coder/v2/coderd/workspacestats"
 	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/coder/v2/codersdk/healthsdk"
-	sharedhttpmw "github.com/coder/coder/v2/httpmw"
 	"github.com/coder/coder/v2/provisionersdk"
 	"github.com/coder/coder/v2/site"
 	"github.com/coder/coder/v2/tailnet"
@@ -611,7 +610,6 @@ func New(options *Options) *API {
 		dbRolluper: options.DatabaseRolluper,
 	}
 	api.WorkspaceAppsProvider = workspaceapps.NewDBTokenProvider(
-		ctx,
 		options.Logger.Named("workspaceapps"),
 		options.AccessURL,
 		options.Authorizer,
@@ -862,7 +860,7 @@ func New(options *Options) *API {
 	prometheusMW := httpmw.Prometheus(options.PrometheusRegistry)

 	r.Use(
-		sharedhttpmw.Recover(api.Logger),
+		httpmw.Recover(api.Logger),
 		httpmw.WithProfilingLabels,
 		tracing.StatusWriterMiddleware,
 		tracing.Middleware(api.TracerProvider),
@@ -1024,9 +1022,6 @@ func New(options *Options) *API {
 			httpmw.ReportCLITelemetry(api.Logger, options.Telemetry),
 		)

-		// NOTE(DanielleMaywood):
-		// Tasks have been promoted to stable, but we have guaranteed a single release transition period
-		// where these routes must remain. These should be removed no earlier than Coder v2.30.0
 		r.Route("/tasks", func(r chi.Router) {
 			r.Use(apiKeyMiddleware)

@@ -1040,7 +1035,6 @@ func New(options *Options) *API {
 					r.Use(httpmw.ExtractTaskParam(options.Database))
 					r.Get("/", api.taskGet)
 					r.Delete("/", api.taskDelete)
-					r.Patch("/input", api.taskUpdateInput)
 					r.Post("/send", api.taskSend)
 					r.Get("/logs", api.taskLogs)
 				})
@@ -1654,25 +1648,6 @@ func New(options *Options) *API {
 		r.Route("/init-script", func(r chi.Router) {
 			r.Get("/{os}/{arch}", api.initScript)
 		})
-		r.Route("/tasks", func(r chi.Router) {
-			r.Use(apiKeyMiddleware)
-
-			r.Get("/", api.tasksList)
-
-			r.Route("/{user}", func(r chi.Router) {
-				r.Use(httpmw.ExtractOrganizationMembersParam(options.Database, api.HTTPAuth.Authorize))
-				r.Post("/", api.tasksCreate)
-
-				r.Route("/{task}", func(r chi.Router) {
-					r.Use(httpmw.ExtractTaskParam(options.Database))
-					r.Get("/", api.taskGet)
-					r.Delete("/", api.taskDelete)
-					r.Patch("/input", api.taskUpdateInput)
-					r.Post("/send", api.taskSend)
-					r.Get("/logs", api.taskLogs)
-				})
-			})
-		})
 	})

 	if options.SwaggerEndpoint {
@@ -2024,7 +1999,6 @@ func (api *API) CreateInMemoryTaggedProvisionerDaemon(dialCtx context.Context, n
 		api.NotificationsEnqueuer,
 		&api.PrebuildsReconciler,
 		api.ProvisionerdServerMetrics,
-		api.Experiments,
 	)
 	if err != nil {
 		return nil, err
@@ -1021,18 +1021,6 @@ func AIBridgeToolUsage(usage database.AIBridgeToolUsage) codersdk.AIBridgeToolUs
 	}
 }

-func InvalidatedPresets(invalidatedPresets []database.UpdatePresetsLastInvalidatedAtRow) []codersdk.InvalidatedPreset {
-	var presets []codersdk.InvalidatedPreset
-	for _, p := range invalidatedPresets {
-		presets = append(presets, codersdk.InvalidatedPreset{
-			TemplateName:        p.TemplateName,
-			TemplateVersionName: p.TemplateVersionName,
-			PresetName:          p.TemplateVersionPresetName,
-		})
-	}
-	return presets
-}
-
 func jsonOrEmptyMap(rawMessage pqtype.NullRawMessage) map[string]any {
 	var m map[string]any
 	if !rawMessage.Valid {
@@ -217,7 +217,7 @@ var (
 					rbac.ResourceTemplate.Type:        {policy.ActionRead, policy.ActionUpdate},
 					// Unsure why provisionerd needs update and read personal
 					rbac.ResourceUser.Type:             {policy.ActionRead, policy.ActionReadPersonal, policy.ActionUpdatePersonal},
-					rbac.ResourceWorkspaceDormant.Type: {policy.ActionDelete, policy.ActionRead, policy.ActionUpdate, policy.ActionWorkspaceStop, policy.ActionCreateAgent},
+					rbac.ResourceWorkspaceDormant.Type: {policy.ActionDelete, policy.ActionRead, policy.ActionUpdate, policy.ActionWorkspaceStop},
 					rbac.ResourceWorkspace.Type:        {policy.ActionDelete, policy.ActionRead, policy.ActionUpdate, policy.ActionWorkspaceStart, policy.ActionWorkspaceStop, policy.ActionCreateAgent},
 					// Provisionerd needs to read, update, and delete tasks associated with workspaces.
 					rbac.ResourceTask.Type:   {policy.ActionRead, policy.ActionUpdate, policy.ActionDelete},
@@ -596,19 +596,19 @@ var (
 	// See aibridged package.
 	subjectAibridged = rbac.Subject{
 		Type:         rbac.SubjectAibridged,
-		FriendlyName: "AI Bridge Daemon",
+		FriendlyName: "AIBridge Daemon",
 		ID:           uuid.Nil.String(),
 		Roles: rbac.Roles([]rbac.Role{
 			{
 				Identifier:  rbac.RoleIdentifier{Name: "aibridged"},
-				DisplayName: "AI Bridge Daemon",
+				DisplayName: "AIBridge Daemon",
 				Site: rbac.Permissions(map[string][]policy.Action{
 					rbac.ResourceUser.Type: {
 						policy.ActionRead,         // Required to validate API key owner is active.
 						policy.ActionReadPersonal, // Required to read users' external auth links. // TODO: this is too broad; reduce scope to just external_auth_links by creating separate resource.
 					},
 					rbac.ResourceApiKey.Type:               {policy.ActionRead}, // Validate API keys.
-					rbac.ResourceAibridgeInterception.Type: {policy.ActionCreate, policy.ActionRead, policy.ActionUpdate, policy.ActionDelete},
+					rbac.ResourceAibridgeInterception.Type: {policy.ActionCreate, policy.ActionRead, policy.ActionUpdate},
 				}),
 				User:    []rbac.Permission{},
 				ByOrgID: map[string]rbac.OrgPermissions{},
@@ -1641,15 +1641,6 @@ func (q *querier) DeleteCustomRole(ctx context.Context, arg database.DeleteCusto
 	return q.db.DeleteCustomRole(ctx, arg)
 }

-func (q *querier) DeleteExpiredAPIKeys(ctx context.Context, arg database.DeleteExpiredAPIKeysParams) (int64, error) {
-	// Requires DELETE across all API keys.
-	if err := q.authorizeContext(ctx, policy.ActionDelete, rbac.ResourceApiKey); err != nil {
-		return 0, err
-	}
-
-	return q.db.DeleteExpiredAPIKeys(ctx, arg)
-}
-
 func (q *querier) DeleteExternalAuthLink(ctx context.Context, arg database.DeleteExternalAuthLinkParams) error {
 	return fetchAndExec(q.log, q.auth, policy.ActionUpdatePersonal, func(ctx context.Context, arg database.DeleteExternalAuthLinkParams) (database.ExternalAuthLink, error) {
 		//nolint:gosimple
@@ -1732,13 +1723,6 @@ func (q *querier) DeleteOAuth2ProviderAppTokensByAppAndUserID(ctx context.Contex
 	return q.db.DeleteOAuth2ProviderAppTokensByAppAndUserID(ctx, arg)
 }

-func (q *querier) DeleteOldAIBridgeRecords(ctx context.Context, beforeTime time.Time) (int32, error) {
-	if err := q.authorizeContext(ctx, policy.ActionDelete, rbac.ResourceAibridgeInterception); err != nil {
-		return -1, err
-	}
-	return q.db.DeleteOldAIBridgeRecords(ctx, beforeTime)
-}
-
 func (q *querier) DeleteOldAuditLogConnectionEvents(ctx context.Context, threshold database.DeleteOldAuditLogConnectionEventsParams) error {
 	// `ResourceSystem` is deprecated, but it doesn't make sense to add
 	// `policy.ActionDelete` to `ResourceAuditLog`, since this is the one and
@@ -2426,11 +2410,11 @@ func (q *querier) GetLatestCryptoKeyByFeature(ctx context.Context, feature datab
 	return q.db.GetLatestCryptoKeyByFeature(ctx, feature)
 }

-func (q *querier) GetLatestWorkspaceAppStatusByAppID(ctx context.Context, appID uuid.UUID) (database.WorkspaceAppStatus, error) {
+func (q *querier) GetLatestWorkspaceAppStatusesByAppID(ctx context.Context, appID uuid.UUID) ([]database.WorkspaceAppStatus, error) {
 	if err := q.authorizeContext(ctx, policy.ActionRead, rbac.ResourceSystem); err != nil {
-		return database.WorkspaceAppStatus{}, err
+		return nil, err
 	}
-	return q.db.GetLatestWorkspaceAppStatusByAppID(ctx, appID)
+	return q.db.GetLatestWorkspaceAppStatusesByAppID(ctx, appID)
 }

 func (q *querier) GetLatestWorkspaceAppStatusesByWorkspaceIDs(ctx context.Context, ids []uuid.UUID) ([]database.WorkspaceAppStatus, error) {
@@ -4988,20 +4972,6 @@ func (q *querier) UpdatePresetPrebuildStatus(ctx context.Context, arg database.U
 	return q.db.UpdatePresetPrebuildStatus(ctx, arg)
 }

-func (q *querier) UpdatePresetsLastInvalidatedAt(ctx context.Context, arg database.UpdatePresetsLastInvalidatedAtParams) ([]database.UpdatePresetsLastInvalidatedAtRow, error) {
-	// Fetch template to check authorization
-	template, err := q.db.GetTemplateByID(ctx, arg.TemplateID)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := q.authorizeContext(ctx, policy.ActionUpdate, template); err != nil {
-		return nil, err
-	}
-
-	return q.db.UpdatePresetsLastInvalidatedAt(ctx, arg)
-}
-
 func (q *querier) UpdateProvisionerDaemonLastSeenAt(ctx context.Context, arg database.UpdateProvisionerDaemonLastSeenAtParams) error {
 	if err := q.authorizeContext(ctx, policy.ActionUpdate, rbac.ResourceProvisionerDaemon); err != nil {
 		return err
@@ -5130,21 +5100,6 @@ func (q *querier) UpdateTailnetPeerStatusByCoordinator(ctx context.Context, arg
 	return q.db.UpdateTailnetPeerStatusByCoordinator(ctx, arg)
 }

-func (q *querier) UpdateTaskPrompt(ctx context.Context, arg database.UpdateTaskPromptParams) (database.TaskTable, error) {
-	// An actor is allowed to update the prompt of a task if they have
-	// permission to update the task (same as UpdateTaskWorkspaceID).
-	task, err := q.db.GetTaskByID(ctx, arg.ID)
-	if err != nil {
-		return database.TaskTable{}, err
-	}
-
-	if err := q.authorizeContext(ctx, policy.ActionUpdate, task.RBACObject()); err != nil {
-		return database.TaskTable{}, err
-	}
-
-	return q.db.UpdateTaskPrompt(ctx, arg)
-}
-
 func (q *querier) UpdateTaskWorkspaceID(ctx context.Context, arg database.UpdateTaskWorkspaceIDParams) (database.TaskTable, error) {
 	// An actor is allowed to update the workspace ID of a task if they are the
 	// owner of the task and workspace or have the appropriate permissions.
@@ -5556,22 +5511,6 @@ func (q *querier) UpdateWorkspaceAgentLogOverflowByID(ctx context.Context, arg d
 }

 func (q *querier) UpdateWorkspaceAgentMetadata(ctx context.Context, arg database.UpdateWorkspaceAgentMetadataParams) error {
-	// Fast path: Check if we have an RBAC object in context.
-	// This is set by the workspace agent RPC handler to avoid the expensive
-	// GetWorkspaceByAgentID query for every metadata update.
-	// NOTE: The cached RBAC object is refreshed every 5 minutes in agentapi/api.go.
-	if rbacObj, ok := WorkspaceRBACFromContext(ctx); ok {
-		// Errors here will result in falling back to the GetWorkspaceAgentByID query, skipping
-		// the cache in case the cached data is stale.
-		if err := q.authorizeContext(ctx, policy.ActionUpdate, rbacObj); err == nil {
-			return q.db.UpdateWorkspaceAgentMetadata(ctx, arg)
-		}
-		q.log.Debug(ctx, "fast path authorization failed, using slow path",
-			slog.F("agent_id", arg.WorkspaceAgentID))
-	}
-
-	// Slow path: Fallback to fetching the workspace for authorization if the RBAC object is not present (or is invalid)
-	// in the request context.
 	workspace, err := q.db.GetWorkspaceByAgentID(ctx, arg.WorkspaceAgentID)
 	if err != nil {
 		return err
@@ -216,14 +216,6 @@ func (s *MethodTestSuite) TestAPIKey() {
 		dbm.EXPECT().DeleteAPIKeyByID(gomock.Any(), key.ID).Return(nil).AnyTimes()
 		check.Args(key.ID).Asserts(key, policy.ActionDelete).Returns()
 	}))
-	s.Run("DeleteExpiredAPIKeys", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
-		args := database.DeleteExpiredAPIKeysParams{
-			Before:     time.Date(2025, 11, 21, 0, 0, 0, 0, time.UTC),
-			LimitCount: 1000,
-		}
-		dbm.EXPECT().DeleteExpiredAPIKeys(gomock.Any(), args).Return(int64(0), nil).AnyTimes()
-		check.Args(args).Asserts(rbac.ResourceApiKey, policy.ActionDelete).Returns(int64(0))
-	}))
 	s.Run("GetAPIKeyByID", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
 		key := testutil.Fake(s.T(), faker, database.APIKey{})
 		dbm.EXPECT().GetAPIKeyByID(gomock.Any(), key.ID).Return(key, nil).AnyTimes()
@@ -1323,13 +1315,6 @@ func (s *MethodTestSuite) TestTemplate() {
 		dbm.EXPECT().UpsertTemplateUsageStats(gomock.Any()).Return(nil).AnyTimes()
 		check.Asserts(rbac.ResourceSystem, policy.ActionUpdate)
 	}))
-	s.Run("UpdatePresetsLastInvalidatedAt", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
-		t1 := testutil.Fake(s.T(), faker, database.Template{})
-		arg := database.UpdatePresetsLastInvalidatedAtParams{LastInvalidatedAt: sql.NullTime{Valid: true, Time: dbtime.Now()}, TemplateID: t1.ID}
-		dbm.EXPECT().GetTemplateByID(gomock.Any(), t1.ID).Return(t1, nil).AnyTimes()
-		dbm.EXPECT().UpdatePresetsLastInvalidatedAt(gomock.Any(), arg).Return([]database.UpdatePresetsLastInvalidatedAtRow{}, nil).AnyTimes()
-		check.Args(arg).Asserts(t1, policy.ActionUpdate)
-	}))
 }

 func (s *MethodTestSuite) TestUser() {
@@ -2457,22 +2442,6 @@ func (s *MethodTestSuite) TestTasks() {

 		check.Args(arg).Asserts(task, policy.ActionUpdate, ws, policy.ActionUpdate).Returns(database.TaskTable{})
 	}))
-	s.Run("UpdateTaskPrompt", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
-		task := testutil.Fake(s.T(), faker, database.Task{})
-		arg := database.UpdateTaskPromptParams{
-			ID:     task.ID,
-			Prompt: "Updated prompt text",
-		}
-
-		// Create a copy of the task with the updated prompt
-		updatedTask := task
-		updatedTask.Prompt = arg.Prompt
-
-		dbm.EXPECT().GetTaskByID(gomock.Any(), task.ID).Return(task, nil).AnyTimes()
-		dbm.EXPECT().UpdateTaskPrompt(gomock.Any(), arg).Return(updatedTask.TaskTable(), nil).AnyTimes()
-
-		check.Args(arg).Asserts(task, policy.ActionUpdate).Returns(updatedTask.TaskTable())
-	}))
 	s.Run("GetTaskByWorkspaceID", s.Mocked(func(dbm *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
 		task := testutil.Fake(s.T(), faker, database.Task{})
 		task.WorkspaceID = uuid.NullUUID{UUID: uuid.New(), Valid: true}
@@ -2864,9 +2833,9 @@ func (s *MethodTestSuite) TestSystemFunctions() {
 		dbm.EXPECT().UpdateUserLinkedID(gomock.Any(), arg).Return(l, nil).AnyTimes()
 		check.Args(arg).Asserts(rbac.ResourceSystem, policy.ActionUpdate).Returns(l)
 	}))
-	s.Run("GetLatestWorkspaceAppStatusByAppID", s.Mocked(func(dbm *dbmock.MockStore, _ *gofakeit.Faker, check *expects) {
+	s.Run("GetLatestWorkspaceAppStatusesByAppID", s.Mocked(func(dbm *dbmock.MockStore, _ *gofakeit.Faker, check *expects) {
 		appID := uuid.New()
-		dbm.EXPECT().GetLatestWorkspaceAppStatusByAppID(gomock.Any(), appID).Return(database.WorkspaceAppStatus{}, nil).AnyTimes()
+		dbm.EXPECT().GetLatestWorkspaceAppStatusesByAppID(gomock.Any(), appID).Return([]database.WorkspaceAppStatus{}, nil).AnyTimes()
 		check.Args(appID).Asserts(rbac.ResourceSystem, policy.ActionRead)
 	}))
 	s.Run("GetLatestWorkspaceAppStatusesByWorkspaceIDs", s.Mocked(func(dbm *dbmock.MockStore, _ *gofakeit.Faker, check *expects) {
@@ -4678,12 +4647,6 @@ func (s *MethodTestSuite) TestAIBridge() {
 		db.EXPECT().UpdateAIBridgeInterceptionEnded(gomock.Any(), params).Return(intc, nil).AnyTimes()
 		check.Args(params).Asserts(intc, policy.ActionUpdate).Returns(intc)
 	}))
-
-	s.Run("DeleteOldAIBridgeRecords", s.Mocked(func(db *dbmock.MockStore, faker *gofakeit.Faker, check *expects) {
-		t := dbtime.Now()
-		db.EXPECT().DeleteOldAIBridgeRecords(gomock.Any(), t).Return(int32(0), nil).AnyTimes()
-		check.Args(t).Asserts(rbac.ResourceAibridgeInterception, policy.ActionDelete)
-	}))
 }

 func (s *MethodTestSuite) TestTelemetry() {
@@ -1,41 +0,0 @@
-package dbauthz
-
-import (
-	"context"
-
-	"github.com/google/uuid"
-	"golang.org/x/xerrors"
-
-	"github.com/coder/coder/v2/coderd/rbac"
-)
-
-func isWorkspaceRBACObjectEmpty(rbacObj rbac.Object) bool {
-	// if any of these are true then the rbac.Object work a workspace is considered empty
-	return rbacObj.Owner == "" || rbacObj.OrgID == "" || rbacObj.Owner == uuid.Nil.String() || rbacObj.OrgID == uuid.Nil.String()
-}
-
-type workspaceRBACContextKey struct{}
-
-// WithWorkspaceRBAC attaches a workspace RBAC object to the context.
-// RBAC fields on this RBAC object should not be used.
-//
-// This is primarily used by the workspace agent RPC handler to cache workspace
-// authorization data for the duration of an agent connection.
-func WithWorkspaceRBAC(ctx context.Context, rbacObj rbac.Object) (context.Context, error) {
-	if rbacObj.Type != rbac.ResourceWorkspace.Type {
-		return ctx, xerrors.New("RBAC Object must be of type Workspace")
-	}
-	if isWorkspaceRBACObjectEmpty(rbacObj) {
-		return ctx, xerrors.Errorf("cannot attach empty RBAC object to context: %+v", rbacObj)
-	}
-	if len(rbacObj.ACLGroupList) != 0 || len(rbacObj.ACLUserList) != 0 {
-		return ctx, xerrors.New("ACL fields for Workspace RBAC object must be nullified, the can be changed during runtime and should not be cached")
-	}
-	return context.WithValue(ctx, workspaceRBACContextKey{}, rbacObj), nil
-}
-
-// WorkspaceRBACFromContext attempts to retrieve the workspace RBAC object from context.
-func WorkspaceRBACFromContext(ctx context.Context) (rbac.Object, bool) {
-	obj, ok := ctx.Value(workspaceRBACContextKey{}).(rbac.Object)
-	return obj, ok
-}
@@ -361,20 +361,12 @@ func (b WorkspaceBuildBuilder) doInTX() WorkspaceResponse {
 			require.Fail(b.t, "task app not configured but workspace is a task workspace")
 		}

-		workspaceAgentID := uuid.NullUUID{}
-		workspaceAppID := uuid.NullUUID{}
-		// Workspace agent and app are only properly set upon job completion
-		if b.jobStatus != database.ProvisionerJobStatusPending && b.jobStatus != database.ProvisionerJobStatusRunning {
-			app := mustWorkspaceAppByWorkspaceAndBuildAndAppID(ownerCtx, b.t, b.db, resp.Workspace.ID, resp.Build.BuildNumber, b.taskAppID)
-			workspaceAgentID = uuid.NullUUID{UUID: app.AgentID, Valid: true}
-			workspaceAppID = uuid.NullUUID{UUID: app.ID, Valid: true}
-		}
-
+		app := mustWorkspaceAppByWorkspaceAndBuildAndAppID(ownerCtx, b.t, b.db, resp.Workspace.ID, resp.Build.BuildNumber, b.taskAppID)
 		_, err = b.db.UpsertTaskWorkspaceApp(ownerCtx, database.UpsertTaskWorkspaceAppParams{
 			TaskID:               task.ID,
 			WorkspaceBuildNumber: resp.Build.BuildNumber,
-			WorkspaceAgentID:     workspaceAgentID,
-			WorkspaceAppID:       workspaceAppID,
+			WorkspaceAgentID:     uuid.NullUUID{UUID: app.AgentID, Valid: true},
+			WorkspaceAppID:       uuid.NullUUID{UUID: app.ID, Valid: true},
 		})
 		require.NoError(b.t, err, "upsert task workspace app")
 		b.logger.Debug(context.Background(), "linked task to workspace build",
@@ -613,7 +605,6 @@ func (t TemplateVersionBuilder) Do() TemplateVersionResponse {
 			IsDefault:           false,
 			Description:         preset.Description,
 			Icon:                preset.Icon,
-			LastInvalidatedAt:   preset.LastInvalidatedAt,
 		})
 		t.logger.Debug(context.Background(), "added preset",
 			slog.F("preset_id", prst.ID),
@@ -631,7 +622,6 @@ func (t TemplateVersionBuilder) Do() TemplateVersionResponse {
 	}

 	payload, err := json.Marshal(provisionerdserver.TemplateVersionImportJob{
-		TemplateID:        t.seed.TemplateID,
 		TemplateVersionID: t.seed.ID,
 	})
 	require.NoError(t.t, err)
@@ -14,8 +14,6 @@ import (
 	"testing"
 	"time"

-	"cdr.dev/slog"
-
 	"github.com/google/uuid"
 	"github.com/sqlc-dev/pqtype"
 	"github.com/stretchr/testify/require"
@@ -177,13 +175,6 @@ func APIKey(t testing.TB, db database.Store, seed database.APIKey, munge ...func
 		}
 	}

-	// It does not make sense for the created_at to be after the expires_at.
-	// So if expires is set, change the default created_at to be 24 hours before.
-	var createdAt time.Time
-	if !seed.ExpiresAt.IsZero() && seed.CreatedAt.IsZero() {
-		createdAt = seed.ExpiresAt.Add(-24 * time.Hour)
-	}
-
 	params := database.InsertAPIKeyParams{
 		ID: takeFirst(seed.ID, id),
 		// 0 defaults to 86400 at the db layer
@@ -193,7 +184,7 @@ func APIKey(t testing.TB, db database.Store, seed database.APIKey, munge ...func
 		UserID:          takeFirst(seed.UserID, uuid.New()),
 		LastUsed:        takeFirst(seed.LastUsed, dbtime.Now()),
 		ExpiresAt:       takeFirst(seed.ExpiresAt, dbtime.Now().Add(time.Hour)),
-		CreatedAt:       takeFirst(seed.CreatedAt, createdAt, dbtime.Now()),
+		CreatedAt:       takeFirst(seed.CreatedAt, dbtime.Now()),
 		UpdatedAt:       takeFirst(seed.UpdatedAt, dbtime.Now()),
 		LoginType:       takeFirst(seed.LoginType, database.LoginTypePassword),
 		Scopes:          takeFirstSlice([]database.APIKeyScope(seed.Scopes), []database.APIKeyScope{database.ApiKeyScopeCoderAll}),
@@ -1437,7 +1428,6 @@ func Preset(t testing.TB, db database.Store, seed database.InsertPresetParams) d
 		IsDefault:           seed.IsDefault,
 		Description:         seed.Description,
 		Icon:                seed.Icon,
-		LastInvalidatedAt:   seed.LastInvalidatedAt,
 	})
 	require.NoError(t, err, "insert preset")
 	return preset
@@ -1584,13 +1574,11 @@ func Task(t testing.TB, db database.Store, orig database.TaskTable) database.Tas
 		parameters = json.RawMessage([]byte("{}"))
 	}

-	taskName := taskname.Generate(genCtx, slog.Make(), orig.Prompt)
 	task, err := db.InsertTask(genCtx, database.InsertTaskParams{
 		ID:                 takeFirst(orig.ID, uuid.New()),
 		OrganizationID:     orig.OrganizationID,
 		OwnerID:            orig.OwnerID,
-		Name:               takeFirst(orig.Name, taskName.Name),
-		DisplayName:        takeFirst(orig.DisplayName, taskName.DisplayName),
+		Name:               takeFirst(orig.Name, taskname.GenerateFallback()),
 		WorkspaceID:        orig.WorkspaceID,
 		TemplateVersionID:  orig.TemplateVersionID,
 		TemplateParameters: parameters,
@@ -312,13 +312,6 @@ func (m queryMetricsStore) DeleteCustomRole(ctx context.Context, arg database.De
 	return r0
 }

-func (m queryMetricsStore) DeleteExpiredAPIKeys(ctx context.Context, arg database.DeleteExpiredAPIKeysParams) (int64, error) {
-	start := time.Now()
-	r0, r1 := m.s.DeleteExpiredAPIKeys(ctx, arg)
-	m.queryLatencies.WithLabelValues("DeleteExpiredAPIKeys").Observe(time.Since(start).Seconds())
-	return r0, r1
-}
-
 func (m queryMetricsStore) DeleteExternalAuthLink(ctx context.Context, arg database.DeleteExternalAuthLinkParams) error {
 	start := time.Now()
 	r0 := m.s.DeleteExternalAuthLink(ctx, arg)
@@ -396,13 +389,6 @@ func (m queryMetricsStore) DeleteOAuth2ProviderAppTokensByAppAndUserID(ctx conte
 	return r0
 }

-func (m queryMetricsStore) DeleteOldAIBridgeRecords(ctx context.Context, beforeTime time.Time) (int32, error) {
-	start := time.Now()
-	r0, r1 := m.s.DeleteOldAIBridgeRecords(ctx, beforeTime)
-	m.queryLatencies.WithLabelValues("DeleteOldAIBridgeRecords").Observe(time.Since(start).Seconds())
-	return r0, r1
-}
-
 func (m queryMetricsStore) DeleteOldAuditLogConnectionEvents(ctx context.Context, threshold database.DeleteOldAuditLogConnectionEventsParams) error {
 	start := time.Now()
 	r0 := m.s.DeleteOldAuditLogConnectionEvents(ctx, threshold)
@@ -1033,10 +1019,10 @@ func (m queryMetricsStore) GetLatestCryptoKeyByFeature(ctx context.Context, feat
 	return r0, r1
 }

-func (m queryMetricsStore) GetLatestWorkspaceAppStatusByAppID(ctx context.Context, appID uuid.UUID) (database.WorkspaceAppStatus, error) {
+func (m queryMetricsStore) GetLatestWorkspaceAppStatusesByAppID(ctx context.Context, appID uuid.UUID) ([]database.WorkspaceAppStatus, error) {
 	start := time.Now()
-	r0, r1 := m.s.GetLatestWorkspaceAppStatusByAppID(ctx, appID)
-	m.queryLatencies.WithLabelValues("GetLatestWorkspaceAppStatusByAppID").Observe(time.Since(start).Seconds())
+	r0, r1 := m.s.GetLatestWorkspaceAppStatusesByAppID(ctx, appID)
+	m.queryLatencies.WithLabelValues("GetLatestWorkspaceAppStatusesByAppID").Observe(time.Since(start).Seconds())
 	return r0, r1
 }

@@ -3084,13 +3070,6 @@ func (m queryMetricsStore) UpdatePresetPrebuildStatus(ctx context.Context, arg d
 	return r0
 }

-func (m queryMetricsStore) UpdatePresetsLastInvalidatedAt(ctx context.Context, arg database.UpdatePresetsLastInvalidatedAtParams) ([]database.UpdatePresetsLastInvalidatedAtRow, error) {
-	start := time.Now()
-	r0, r1 := m.s.UpdatePresetsLastInvalidatedAt(ctx, arg)
-	m.queryLatencies.WithLabelValues("UpdatePresetsLastInvalidatedAt").Observe(time.Since(start).Seconds())
-	return r0, r1
-}
-
 func (m queryMetricsStore) UpdateProvisionerDaemonLastSeenAt(ctx context.Context, arg database.UpdateProvisionerDaemonLastSeenAtParams) error {
 	start := time.Now()
 	r0 := m.s.UpdateProvisionerDaemonLastSeenAt(ctx, arg)
@@ -3154,13 +3133,6 @@ func (m queryMetricsStore) UpdateTailnetPeerStatusByCoordinator(ctx context.Cont
 	return r0
 }

-func (m queryMetricsStore) UpdateTaskPrompt(ctx context.Context, arg database.UpdateTaskPromptParams) (database.TaskTable, error) {
-	start := time.Now()
-	r0, r1 := m.s.UpdateTaskPrompt(ctx, arg)
-	m.queryLatencies.WithLabelValues("UpdateTaskPrompt").Observe(time.Since(start).Seconds())
-	return r0, r1
-}
-
 func (m queryMetricsStore) UpdateTaskWorkspaceID(ctx context.Context, arg database.UpdateTaskWorkspaceIDParams) (database.TaskTable, error) {
 	start := time.Now()
 	r0, r1 := m.s.UpdateTaskWorkspaceID(ctx, arg)
@@ -554,21 +554,6 @@ func (mr *MockStoreMockRecorder) DeleteCustomRole(ctx, arg any) *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteCustomRole", reflect.TypeOf((*MockStore)(nil).DeleteCustomRole), ctx, arg)
 }

-// DeleteExpiredAPIKeys mocks base method.
-func (m *MockStore) DeleteExpiredAPIKeys(ctx context.Context, arg database.DeleteExpiredAPIKeysParams) (int64, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "DeleteExpiredAPIKeys", ctx, arg)
-	ret0, _ := ret[0].(int64)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// DeleteExpiredAPIKeys indicates an expected call of DeleteExpiredAPIKeys.
-func (mr *MockStoreMockRecorder) DeleteExpiredAPIKeys(ctx, arg any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteExpiredAPIKeys", reflect.TypeOf((*MockStore)(nil).DeleteExpiredAPIKeys), ctx, arg)
-}
-
 // DeleteExternalAuthLink mocks base method.
 func (m *MockStore) DeleteExternalAuthLink(ctx context.Context, arg database.DeleteExternalAuthLinkParams) error {
 	m.ctrl.T.Helper()
@@ -724,21 +709,6 @@ func (mr *MockStoreMockRecorder) DeleteOAuth2ProviderAppTokensByAppAndUserID(ctx
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteOAuth2ProviderAppTokensByAppAndUserID", reflect.TypeOf((*MockStore)(nil).DeleteOAuth2ProviderAppTokensByAppAndUserID), ctx, arg)
 }

-// DeleteOldAIBridgeRecords mocks base method.
-func (m *MockStore) DeleteOldAIBridgeRecords(ctx context.Context, beforeTime time.Time) (int32, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "DeleteOldAIBridgeRecords", ctx, beforeTime)
-	ret0, _ := ret[0].(int32)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// DeleteOldAIBridgeRecords indicates an expected call of DeleteOldAIBridgeRecords.
-func (mr *MockStoreMockRecorder) DeleteOldAIBridgeRecords(ctx, beforeTime any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteOldAIBridgeRecords", reflect.TypeOf((*MockStore)(nil).DeleteOldAIBridgeRecords), ctx, beforeTime)
-}
-
 // DeleteOldAuditLogConnectionEvents mocks base method.
 func (m *MockStore) DeleteOldAuditLogConnectionEvents(ctx context.Context, arg database.DeleteOldAuditLogConnectionEventsParams) error {
 	m.ctrl.T.Helper()
@@ -2172,19 +2142,19 @@ func (mr *MockStoreMockRecorder) GetLatestCryptoKeyByFeature(ctx, feature any) *
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLatestCryptoKeyByFeature", reflect.TypeOf((*MockStore)(nil).GetLatestCryptoKeyByFeature), ctx, feature)
 }

-// GetLatestWorkspaceAppStatusByAppID mocks base method.
-func (m *MockStore) GetLatestWorkspaceAppStatusByAppID(ctx context.Context, appID uuid.UUID) (database.WorkspaceAppStatus, error) {
+// GetLatestWorkspaceAppStatusesByAppID mocks base method.
+func (m *MockStore) GetLatestWorkspaceAppStatusesByAppID(ctx context.Context, appID uuid.UUID) ([]database.WorkspaceAppStatus, error) {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "GetLatestWorkspaceAppStatusByAppID", ctx, appID)
-	ret0, _ := ret[0].(database.WorkspaceAppStatus)
+	ret := m.ctrl.Call(m, "GetLatestWorkspaceAppStatusesByAppID", ctx, appID)
+	ret0, _ := ret[0].([]database.WorkspaceAppStatus)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }

-// GetLatestWorkspaceAppStatusByAppID indicates an expected call of GetLatestWorkspaceAppStatusByAppID.
-func (mr *MockStoreMockRecorder) GetLatestWorkspaceAppStatusByAppID(ctx, appID any) *gomock.Call {
+// GetLatestWorkspaceAppStatusesByAppID indicates an expected call of GetLatestWorkspaceAppStatusesByAppID.
+func (mr *MockStoreMockRecorder) GetLatestWorkspaceAppStatusesByAppID(ctx, appID any) *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLatestWorkspaceAppStatusByAppID", reflect.TypeOf((*MockStore)(nil).GetLatestWorkspaceAppStatusByAppID), ctx, appID)
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetLatestWorkspaceAppStatusesByAppID", reflect.TypeOf((*MockStore)(nil).GetLatestWorkspaceAppStatusesByAppID), ctx, appID)
 }

 // GetLatestWorkspaceAppStatusesByWorkspaceIDs mocks base method.
@@ -6628,21 +6598,6 @@ func (mr *MockStoreMockRecorder) UpdatePresetPrebuildStatus(ctx, arg any) *gomoc
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdatePresetPrebuildStatus", reflect.TypeOf((*MockStore)(nil).UpdatePresetPrebuildStatus), ctx, arg)
 }

-// UpdatePresetsLastInvalidatedAt mocks base method.
-func (m *MockStore) UpdatePresetsLastInvalidatedAt(ctx context.Context, arg database.UpdatePresetsLastInvalidatedAtParams) ([]database.UpdatePresetsLastInvalidatedAtRow, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "UpdatePresetsLastInvalidatedAt", ctx, arg)
-	ret0, _ := ret[0].([]database.UpdatePresetsLastInvalidatedAtRow)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// UpdatePresetsLastInvalidatedAt indicates an expected call of UpdatePresetsLastInvalidatedAt.
-func (mr *MockStoreMockRecorder) UpdatePresetsLastInvalidatedAt(ctx, arg any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdatePresetsLastInvalidatedAt", reflect.TypeOf((*MockStore)(nil).UpdatePresetsLastInvalidatedAt), ctx, arg)
-}
-
 // UpdateProvisionerDaemonLastSeenAt mocks base method.
 func (m *MockStore) UpdateProvisionerDaemonLastSeenAt(ctx context.Context, arg database.UpdateProvisionerDaemonLastSeenAtParams) error {
 	m.ctrl.T.Helper()
@@ -6770,21 +6725,6 @@ func (mr *MockStoreMockRecorder) UpdateTailnetPeerStatusByCoordinator(ctx, arg a
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateTailnetPeerStatusByCoordinator", reflect.TypeOf((*MockStore)(nil).UpdateTailnetPeerStatusByCoordinator), ctx, arg)
 }

-// UpdateTaskPrompt mocks base method.
-func (m *MockStore) UpdateTaskPrompt(ctx context.Context, arg database.UpdateTaskPromptParams) (database.TaskTable, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "UpdateTaskPrompt", ctx, arg)
-	ret0, _ := ret[0].(database.TaskTable)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// UpdateTaskPrompt indicates an expected call of UpdateTaskPrompt.
-func (mr *MockStoreMockRecorder) UpdateTaskPrompt(ctx, arg any) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UpdateTaskPrompt", reflect.TypeOf((*MockStore)(nil).UpdateTaskPrompt), ctx, arg)
-}
-
 // UpdateTaskWorkspaceID mocks base method.
 func (m *MockStore) UpdateTaskWorkspaceID(ctx context.Context, arg database.UpdateTaskWorkspaceIDParams) (database.TaskTable, error) {
 	m.ctrl.T.Helper()
@@ -13,7 +13,6 @@ import (
 	"github.com/coder/coder/v2/coderd/database/dbauthz"
 	"github.com/coder/coder/v2/coderd/database/dbtime"
 	"github.com/coder/coder/v2/coderd/pproflabel"
-	"github.com/coder/coder/v2/codersdk"
 	"github.com/coder/quartz"
 )

@@ -37,7 +36,7 @@ const (
 // It is the caller's responsibility to call Close on the returned instance.
 //
 // This is for cleaning up old, unused resources from the database that take up space.
-func New(ctx context.Context, logger slog.Logger, db database.Store, vals *codersdk.DeploymentValues, clk quartz.Clock) io.Closer {
+func New(ctx context.Context, logger slog.Logger, db database.Store, clk quartz.Clock) io.Closer {
 	closed := make(chan struct{})

 	ctx, cancelFunc := context.WithCancel(ctx)
@@ -78,19 +77,6 @@ func New(ctx context.Context, logger slog.Logger, db database.Store, vals *coder
 			if err := tx.ExpirePrebuildsAPIKeys(ctx, dbtime.Time(start)); err != nil {
 				return xerrors.Errorf("failed to expire prebuilds user api keys: %w", err)
 			}
-			expiredAPIKeys, err := tx.DeleteExpiredAPIKeys(ctx, database.DeleteExpiredAPIKeysParams{
-				// Leave expired keys for a week to allow the backend to know the difference
-				// between a 404 and an expired key. This purge code is just to bound the size of
-				// the table to something more reasonable.
-				Before: dbtime.Time(start.Add(time.Hour * 24 * 7 * -1)),
-				// There could be a lot of expired keys here, so set a limit to prevent this
-				// taking too long.
-				// This runs every 10 minutes, so it deletes ~1.5m keys per day at most.
-				LimitCount: 10000,
-			})
-			if err != nil {
-				return xerrors.Errorf("failed to delete expired api keys: %w", err)
-			}
 			deleteOldTelemetryLocksBefore := start.Add(-maxTelemetryHeartbeatAge)
 			if err := tx.DeleteOldTelemetryLocks(ctx, deleteOldTelemetryLocksBefore); err != nil {
 				return xerrors.Errorf("failed to delete old telemetry locks: %w", err)
@@ -104,18 +90,7 @@ func New(ctx context.Context, logger slog.Logger, db database.Store, vals *coder
 				return xerrors.Errorf("failed to delete old audit log connection events: %w", err)
 			}

-			deleteAIBridgeRecordsBefore := start.Add(-vals.AI.BridgeConfig.Retention.Value())
-			// nolint:gocritic // Needs to run as aibridge context.
-			purgedAIBridgeRecords, err := tx.DeleteOldAIBridgeRecords(dbauthz.AsAIBridged(ctx), deleteAIBridgeRecordsBefore)
-			if err != nil {
-				return xerrors.Errorf("failed to delete old aibridge records: %w", err)
-			}
-
-			logger.Debug(ctx, "purged old database entries",
-				slog.F("expired_api_keys", expiredAPIKeys),
-				slog.F("aibridge_records", purgedAIBridgeRecords),
-				slog.F("duration", clk.Since(start)),
-			)
+			logger.Debug(ctx, "purged old database entries", slog.F("duration", clk.Since(start)))

 			return nil
 		}, database.DefaultTXOptions().WithID("db_purge")); err != nil {
@@ -33,7 +33,6 @@ import (
 	"github.com/coder/coder/v2/provisionersdk"
 	"github.com/coder/coder/v2/testutil"
 	"github.com/coder/quartz"
-	"github.com/coder/serpent"
 )

 func TestMain(m *testing.M) {
@@ -52,7 +51,7 @@ func TestPurge(t *testing.T) {
 	done := awaitDoTick(ctx, t, clk)
 	mDB := dbmock.NewMockStore(gomock.NewController(t))
 	mDB.EXPECT().InTx(gomock.Any(), database.DefaultTXOptions().WithID("db_purge")).Return(nil).Times(2)
-	purger := dbpurge.New(context.Background(), testutil.Logger(t), mDB, &codersdk.DeploymentValues{}, clk)
+	purger := dbpurge.New(context.Background(), testutil.Logger(t), mDB, clk)
 	<-done // wait for doTick() to run.
 	require.NoError(t, purger.Close())
 }
@@ -130,7 +129,7 @@ func TestDeleteOldWorkspaceAgentStats(t *testing.T) {
 	})

 	// when
-	closer := dbpurge.New(ctx, logger, db, &codersdk.DeploymentValues{}, clk)
+	closer := dbpurge.New(ctx, logger, db, clk)
 	defer closer.Close()

 	// then
@@ -155,7 +154,7 @@ func TestDeleteOldWorkspaceAgentStats(t *testing.T) {

 	// Start a new purger to immediately trigger delete after rollup.
 	_ = closer.Close()
-	closer = dbpurge.New(ctx, logger, db, &codersdk.DeploymentValues{}, clk)
+	closer = dbpurge.New(ctx, logger, db, clk)
 	defer closer.Close()

 	// then
@@ -246,7 +245,7 @@ func TestDeleteOldWorkspaceAgentLogs(t *testing.T) {
 	// After dbpurge completes, the ticker is reset. Trap this call.

 	done := awaitDoTick(ctx, t, clk)
-	closer := dbpurge.New(ctx, logger, db, &codersdk.DeploymentValues{}, clk)
+	closer := dbpurge.New(ctx, logger, db, clk)
 	defer closer.Close()
 	<-done // doTick() has now run.

@@ -467,7 +466,7 @@ func TestDeleteOldProvisionerDaemons(t *testing.T) {
 	require.NoError(t, err)

 	// when
-	closer := dbpurge.New(ctx, logger, db, &codersdk.DeploymentValues{}, clk)
+	closer := dbpurge.New(ctx, logger, db, clk)
 	defer closer.Close()

 	// then
@@ -571,7 +570,7 @@ func TestDeleteOldAuditLogConnectionEvents(t *testing.T) {

 	// Run the purge
 	done := awaitDoTick(ctx, t, clk)
-	closer := dbpurge.New(ctx, logger, db, &codersdk.DeploymentValues{}, clk)
+	closer := dbpurge.New(ctx, logger, db, clk)
 	defer closer.Close()
 	// Wait for tick
 	testutil.TryReceive(ctx, t, done)
@@ -734,7 +733,7 @@ func TestDeleteOldTelemetryHeartbeats(t *testing.T) {
 	require.NoError(t, err)

 	done := awaitDoTick(ctx, t, clk)
-	closer := dbpurge.New(ctx, logger, db, &codersdk.DeploymentValues{}, clk)
+	closer := dbpurge.New(ctx, logger, db, clk)
 	defer closer.Close()
 	<-done // doTick() has now run.

@@ -758,172 +757,3 @@ func TestDeleteOldTelemetryHeartbeats(t *testing.T) {
 		return totalCount == 2 && oldCount == 0
 	}, testutil.WaitShort, testutil.IntervalFast, "it should delete old telemetry heartbeats")
 }
-
-func TestDeleteOldAIBridgeRecords(t *testing.T) {
-	t.Parallel()
-
-	ctx := testutil.Context(t, testutil.WaitShort)
-
-	clk := quartz.NewMock(t)
-	now := time.Date(2025, 1, 15, 7, 30, 0, 0, time.UTC)
-	retentionPeriod := 30 * 24 * time.Hour                                // 30 days
-	afterThreshold := now.Add(-retentionPeriod).Add(-24 * time.Hour)      // 31 days ago (older than threshold)
-	beforeThreshold := now.Add(-15 * 24 * time.Hour)                      // 15 days ago (newer than threshold)
-	closeBeforeThreshold := now.Add(-retentionPeriod).Add(24 * time.Hour) // 29 days ago
-	clk.Set(now).MustWait(ctx)
-
-	db, _ := dbtestutil.NewDB(t, dbtestutil.WithDumpOnFailure())
-	logger := slogtest.Make(t, &slogtest.Options{IgnoreErrors: true})
-	user := dbgen.User(t, db, database.User{})
-
-	// Create old AI Bridge interception (should be deleted)
-	oldInterception := dbgen.AIBridgeInterception(t, db, database.InsertAIBridgeInterceptionParams{
-		ID:          uuid.New(),
-		APIKeyID:    sql.NullString{},
-		InitiatorID: user.ID,
-		Provider:    "anthropic",
-		Model:       "claude-3-5-sonnet",
-		StartedAt:   afterThreshold,
-	}, &afterThreshold)
-
-	// Create old interception with related records (should all be deleted)
-	oldInterceptionWithRelated := dbgen.AIBridgeInterception(t, db, database.InsertAIBridgeInterceptionParams{
-		ID:          uuid.New(),
-		APIKeyID:    sql.NullString{},
-		InitiatorID: user.ID,
-		Provider:    "openai",
-		Model:       "gpt-4",
-		StartedAt:   afterThreshold,
-	}, &afterThreshold)
-
-	_ = dbgen.AIBridgeTokenUsage(t, db, database.InsertAIBridgeTokenUsageParams{
-		ID:                 uuid.New(),
-		InterceptionID:     oldInterceptionWithRelated.ID,
-		ProviderResponseID: "resp-1",
-		InputTokens:        100,
-		OutputTokens:       50,
-		CreatedAt:          afterThreshold,
-	})
-
-	_ = dbgen.AIBridgeUserPrompt(t, db, database.InsertAIBridgeUserPromptParams{
-		ID:                 uuid.New(),
-		InterceptionID:     oldInterceptionWithRelated.ID,
-		ProviderResponseID: "resp-1",
-		Prompt:             "test prompt",
-		CreatedAt:          afterThreshold,
-	})
-
-	_ = dbgen.AIBridgeToolUsage(t, db, database.InsertAIBridgeToolUsageParams{
-		ID:                 uuid.New(),
-		InterceptionID:     oldInterceptionWithRelated.ID,
-		ProviderResponseID: "resp-1",
-		Tool:               "test-tool",
-		ServerUrl:          sql.NullString{String: "http://test", Valid: true},
-		Input:              "{}",
-		Injected:           true,
-		CreatedAt:          afterThreshold,
-	})
-
-	// Create recent AI Bridge interception (should be kept)
-	recentInterception := dbgen.AIBridgeInterception(t, db, database.InsertAIBridgeInterceptionParams{
-		ID:          uuid.New(),
-		APIKeyID:    sql.NullString{},
-		InitiatorID: user.ID,
-		Provider:    "anthropic",
-		Model:       "claude-3-5-sonnet",
-		StartedAt:   beforeThreshold,
-	}, &beforeThreshold)
-
-	// Create interception close to threshold (should be kept)
-	nearThresholdInterception := dbgen.AIBridgeInterception(t, db, database.InsertAIBridgeInterceptionParams{
-		ID:          uuid.New(),
-		APIKeyID:    sql.NullString{},
-		InitiatorID: user.ID,
-		Provider:    "anthropic",
-		Model:       "claude-3-5-sonnet",
-		StartedAt:   closeBeforeThreshold,
-	}, &closeBeforeThreshold)
-
-	_ = dbgen.AIBridgeTokenUsage(t, db, database.InsertAIBridgeTokenUsageParams{
-		ID:                 uuid.New(),
-		InterceptionID:     nearThresholdInterception.ID,
-		ProviderResponseID: "resp-1",
-		InputTokens:        100,
-		OutputTokens:       50,
-		CreatedAt:          closeBeforeThreshold,
-	})
-
-	_ = dbgen.AIBridgeUserPrompt(t, db, database.InsertAIBridgeUserPromptParams{
-		ID:                 uuid.New(),
-		InterceptionID:     nearThresholdInterception.ID,
-		ProviderResponseID: "resp-1",
-		Prompt:             "test prompt",
-		CreatedAt:          closeBeforeThreshold,
-	})
-
-	_ = dbgen.AIBridgeToolUsage(t, db, database.InsertAIBridgeToolUsageParams{
-		ID:                 uuid.New(),
-		InterceptionID:     nearThresholdInterception.ID,
-		ProviderResponseID: "resp-1",
-		Tool:               "test-tool",
-		ServerUrl:          sql.NullString{String: "http://test", Valid: true},
-		Input:              "{}",
-		Injected:           true,
-		CreatedAt:          closeBeforeThreshold,
-	})
-
-	// Run the purge with configured retention period
-	done := awaitDoTick(ctx, t, clk)
-	closer := dbpurge.New(ctx, logger, db, &codersdk.DeploymentValues{
-		AI: codersdk.AIConfig{
-			BridgeConfig: codersdk.AIBridgeConfig{
-				Retention: serpent.Duration(retentionPeriod),
-			},
-		},
-	}, clk)
-	defer closer.Close()
-	// Wait for tick
-	testutil.TryReceive(ctx, t, done)
-
-	// Verify results by querying all AI Bridge records
-	interceptions, err := db.GetAIBridgeInterceptions(ctx)
-	require.NoError(t, err)
-
-	// Extract interception IDs for comparison
-	interceptionIDs := make([]uuid.UUID, len(interceptions))
-	for i, interception := range interceptions {
-		interceptionIDs[i] = interception.ID
-	}
-
-	require.NotContains(t, interceptionIDs, oldInterception.ID, "old interception should be deleted")
-	require.NotContains(t, interceptionIDs, oldInterceptionWithRelated.ID, "old interception with related records should be deleted")
-
-	// Verify related records were also deleted
-	oldTokenUsages, err := db.GetAIBridgeTokenUsagesByInterceptionID(ctx, oldInterceptionWithRelated.ID)
-	require.NoError(t, err)
-	require.Empty(t, oldTokenUsages, "old token usages should be deleted")
-
-	oldUserPrompts, err := db.GetAIBridgeUserPromptsByInterceptionID(ctx, oldInterceptionWithRelated.ID)
-	require.NoError(t, err)
-	require.Empty(t, oldUserPrompts, "old user prompts should be deleted")
-
-	oldToolUsages, err := db.GetAIBridgeToolUsagesByInterceptionID(ctx, oldInterceptionWithRelated.ID)
-	require.NoError(t, err)
-	require.Empty(t, oldToolUsages, "old tool usages should be deleted")
-
-	require.Contains(t, interceptionIDs, recentInterception.ID, "recent interception should be kept")
-	require.Contains(t, interceptionIDs, nearThresholdInterception.ID, "near threshold interception should be kept")
-
-	// Verify related records were NOT deleted
-	newTokenUsages, err := db.GetAIBridgeTokenUsagesByInterceptionID(ctx, nearThresholdInterception.ID)
-	require.NoError(t, err)
-	require.Len(t, newTokenUsages, 1, "near threshold token usages should not be deleted")
-
-	newUserPrompts, err := db.GetAIBridgeUserPromptsByInterceptionID(ctx, nearThresholdInterception.ID)
-	require.NoError(t, err)
-	require.Len(t, newUserPrompts, 1, "near threshold user prompts should not be deleted")
-
-	newToolUsages, err := db.GetAIBridgeToolUsagesByInterceptionID(ctx, nearThresholdInterception.ID)
-	require.NoError(t, err)
-	require.Len(t, newToolUsages, 1, "near threshold tool usages should not be deleted")
-}
@@ -1826,12 +1826,9 @@ CREATE TABLE tasks (
    template_parameters jsonb DEFAULT '{}'::jsonb NOT NULL,
    prompt text NOT NULL,
    created_at timestamp with time zone NOT NULL,
-    deleted_at timestamp with time zone,
-    display_name character varying(127) DEFAULT ''::character varying NOT NULL
+    deleted_at timestamp with time zone
 );

-COMMENT ON COLUMN tasks.display_name IS 'Display name is a custom, human-friendly task name.';
-
 CREATE VIEW visible_users AS
 SELECT users.id,
    users.username,
@@ -1967,23 +1964,33 @@ CREATE VIEW tasks_with_status AS
    tasks.prompt,
    tasks.created_at,
    tasks.deleted_at,
-    tasks.display_name,
        CASE
-            WHEN (tasks.workspace_id IS NULL) THEN 'pending'::task_status
-            WHEN (build_status.status <> 'active'::task_status) THEN build_status.status
-            WHEN (agent_status.status <> 'active'::task_status) THEN agent_status.status
-            ELSE app_status.status
+            WHEN ((tasks.workspace_id IS NULL) OR (latest_build.job_status IS NULL)) THEN 'pending'::task_status
+            WHEN (latest_build.job_status = 'failed'::provisioner_job_status) THEN 'error'::task_status
+            WHEN ((latest_build.transition = ANY (ARRAY['stop'::workspace_transition, 'delete'::workspace_transition])) AND (latest_build.job_status = 'succeeded'::provisioner_job_status)) THEN 'paused'::task_status
+            WHEN ((latest_build.transition = 'start'::workspace_transition) AND (latest_build.job_status = 'pending'::provisioner_job_status)) THEN 'initializing'::task_status
+            WHEN ((latest_build.transition = 'start'::workspace_transition) AND (latest_build.job_status = ANY (ARRAY['running'::provisioner_job_status, 'succeeded'::provisioner_job_status]))) THEN
+            CASE
+                WHEN agent_status."none" THEN 'initializing'::task_status
+                WHEN agent_status.connecting THEN 'initializing'::task_status
+                WHEN agent_status.connected THEN
+                CASE
+                    WHEN app_status.any_unhealthy THEN 'error'::task_status
+                    WHEN app_status.any_initializing THEN 'initializing'::task_status
+                    WHEN app_status.all_healthy_or_disabled THEN 'active'::task_status
+                    ELSE 'unknown'::task_status
+                END
+                ELSE 'unknown'::task_status
+            END
+            ELSE 'unknown'::task_status
        END AS status,
-    jsonb_build_object('build', jsonb_build_object('transition', latest_build_raw.transition, 'job_status', latest_build_raw.job_status, 'computed', build_status.status), 'agent', jsonb_build_object('lifecycle_state', agent_raw.lifecycle_state, 'computed', agent_status.status), 'app', jsonb_build_object('health', app_raw.health, 'computed', app_status.status)) AS status_debug,
    task_app.workspace_build_number,
    task_app.workspace_agent_id,
    task_app.workspace_app_id,
-    agent_raw.lifecycle_state AS workspace_agent_lifecycle_state,
-    app_raw.health AS workspace_app_health,
    task_owner.owner_username,
    task_owner.owner_name,
    task_owner.owner_avatar_url
-   FROM ((((((((tasks
+   FROM (((((tasks
     CROSS JOIN LATERAL ( SELECT vu.username AS owner_username,
            vu.name AS owner_name,
            vu.avatar_url AS owner_avatar_url
@@ -2001,36 +2008,17 @@ CREATE VIEW tasks_with_status AS
            workspace_build.job_id
           FROM (workspace_builds workspace_build
             JOIN provisioner_jobs provisioner_job ON ((provisioner_job.id = workspace_build.job_id)))
-          WHERE ((workspace_build.workspace_id = tasks.workspace_id) AND (workspace_build.build_number = task_app.workspace_build_number))) latest_build_raw ON (true))
-     LEFT JOIN LATERAL ( SELECT workspace_agent.lifecycle_state
+          WHERE ((workspace_build.workspace_id = tasks.workspace_id) AND (workspace_build.build_number = task_app.workspace_build_number))) latest_build ON (true))
+     CROSS JOIN LATERAL ( SELECT (count(*) = 0) AS "none",
+            bool_or((workspace_agent.lifecycle_state = ANY (ARRAY['created'::workspace_agent_lifecycle_state, 'starting'::workspace_agent_lifecycle_state]))) AS connecting,
+            bool_and((workspace_agent.lifecycle_state = 'ready'::workspace_agent_lifecycle_state)) AS connected
           FROM workspace_agents workspace_agent
-          WHERE (workspace_agent.id = task_app.workspace_agent_id)) agent_raw ON (true))
-     LEFT JOIN LATERAL ( SELECT workspace_app.health
+          WHERE (workspace_agent.id = task_app.workspace_agent_id)) agent_status)
+     CROSS JOIN LATERAL ( SELECT bool_or((workspace_app.health = 'unhealthy'::workspace_app_health)) AS any_unhealthy,
+            bool_or((workspace_app.health = 'initializing'::workspace_app_health)) AS any_initializing,
+            bool_and((workspace_app.health = ANY (ARRAY['healthy'::workspace_app_health, 'disabled'::workspace_app_health]))) AS all_healthy_or_disabled
           FROM workspace_apps workspace_app
-          WHERE (workspace_app.id = task_app.workspace_app_id)) app_raw ON (true))
-     CROSS JOIN LATERAL ( SELECT
-                CASE
-                    WHEN (latest_build_raw.job_status IS NULL) THEN 'pending'::task_status
-                    WHEN (latest_build_raw.job_status = ANY (ARRAY['failed'::provisioner_job_status, 'canceling'::provisioner_job_status, 'canceled'::provisioner_job_status])) THEN 'error'::task_status
-                    WHEN ((latest_build_raw.transition = ANY (ARRAY['stop'::workspace_transition, 'delete'::workspace_transition])) AND (latest_build_raw.job_status = 'succeeded'::provisioner_job_status)) THEN 'paused'::task_status
-                    WHEN ((latest_build_raw.transition = 'start'::workspace_transition) AND (latest_build_raw.job_status = 'pending'::provisioner_job_status)) THEN 'initializing'::task_status
-                    WHEN ((latest_build_raw.transition = 'start'::workspace_transition) AND (latest_build_raw.job_status = ANY (ARRAY['running'::provisioner_job_status, 'succeeded'::provisioner_job_status]))) THEN 'active'::task_status
-                    ELSE 'unknown'::task_status
-                END AS status) build_status)
-     CROSS JOIN LATERAL ( SELECT
-                CASE
-                    WHEN ((agent_raw.lifecycle_state IS NULL) OR (agent_raw.lifecycle_state = ANY (ARRAY['created'::workspace_agent_lifecycle_state, 'starting'::workspace_agent_lifecycle_state]))) THEN 'initializing'::task_status
-                    WHEN (agent_raw.lifecycle_state = ANY (ARRAY['ready'::workspace_agent_lifecycle_state, 'start_timeout'::workspace_agent_lifecycle_state, 'start_error'::workspace_agent_lifecycle_state])) THEN 'active'::task_status
-                    WHEN (agent_raw.lifecycle_state <> ALL (ARRAY['created'::workspace_agent_lifecycle_state, 'starting'::workspace_agent_lifecycle_state, 'ready'::workspace_agent_lifecycle_state, 'start_timeout'::workspace_agent_lifecycle_state, 'start_error'::workspace_agent_lifecycle_state])) THEN 'unknown'::task_status
-                    ELSE 'unknown'::task_status
-                END AS status) agent_status)
-     CROSS JOIN LATERAL ( SELECT
-                CASE
-                    WHEN (app_raw.health = 'initializing'::workspace_app_health) THEN 'initializing'::task_status
-                    WHEN (app_raw.health = 'unhealthy'::workspace_app_health) THEN 'error'::task_status
-                    WHEN (app_raw.health = ANY (ARRAY['healthy'::workspace_app_health, 'disabled'::workspace_app_health])) THEN 'active'::task_status
-                    ELSE 'unknown'::task_status
-                END AS status) app_status)
+          WHERE (workspace_app.id = task_app.workspace_app_id)) app_status)
  WHERE (tasks.deleted_at IS NULL);

 CREATE TABLE telemetry_items (
@@ -2174,8 +2162,7 @@ CREATE TABLE template_version_presets (
    scheduling_timezone text DEFAULT ''::text NOT NULL,
    is_default boolean DEFAULT false NOT NULL,
    description character varying(128) DEFAULT ''::character varying NOT NULL,
-    icon character varying(256) DEFAULT ''::character varying NOT NULL,
-    last_invalidated_at timestamp with time zone
+    icon character varying(256) DEFAULT ''::character varying NOT NULL
 );

 COMMENT ON COLUMN template_version_presets.description IS 'Short text describing the preset (max 128 characters).';
@@ -2299,8 +2286,7 @@ CREATE TABLE templates (
    activity_bump bigint DEFAULT '3600000000000'::bigint NOT NULL,
    max_port_sharing_level app_sharing_level DEFAULT 'owner'::app_sharing_level NOT NULL,
    use_classic_parameter_flow boolean DEFAULT false NOT NULL,
-    cors_behavior cors_behavior DEFAULT 'simple'::cors_behavior NOT NULL,
-    use_terraform_workspace_cache boolean DEFAULT false NOT NULL
+    cors_behavior cors_behavior DEFAULT 'simple'::cors_behavior NOT NULL
 );

 COMMENT ON COLUMN templates.default_ttl IS 'The default duration for autostop for workspaces created from this template.';
@@ -2323,8 +2309,6 @@ COMMENT ON COLUMN templates.deprecated IS 'If set to a non empty string, the tem

 COMMENT ON COLUMN templates.use_classic_parameter_flow IS 'Determines whether to default to the dynamic parameter creation flow for this template or continue using the legacy classic parameter creation flow.This is a template wide setting, the template admin can revert to the classic flow if there are any issues. An escape hatch is required, as workspace creation is a core workflow and cannot break. This column will be removed when the dynamic parameter creation flow is stable.';

-COMMENT ON COLUMN templates.use_terraform_workspace_cache IS 'Determines whether to keep terraform directories cached between runs for workspaces created from this template. When enabled, this can significantly speed up the `terraform init` step at the cost of increased disk usage. This is an opt-in experience, as it prevents modules from being updated, and therefore is a behavioral difference from the default.';
-
 CREATE VIEW template_with_names AS
 SELECT templates.id,
    templates.created_at,
@@ -2356,7 +2340,6 @@ CREATE VIEW template_with_names AS
    templates.max_port_sharing_level,
    templates.use_classic_parameter_flow,
    templates.cors_behavior,
-    templates.use_terraform_workspace_cache,
    COALESCE(visible_users.avatar_url, ''::text) AS created_by_avatar_url,
    COALESCE(visible_users.username, ''::text) AS created_by_username,
    COALESCE(visible_users.name, ''::text) AS created_by_name,
@@ -3437,8 +3420,6 @@ CREATE INDEX workspace_agent_stats_template_id_created_at_user_id_idx ON workspa

 COMMENT ON INDEX workspace_agent_stats_template_id_created_at_user_id_idx IS 'Support index for template insights endpoint to build interval reports faster.';

-CREATE INDEX workspace_agents_auth_instance_id_deleted_idx ON workspace_agents USING btree (auth_instance_id, deleted);
-
 CREATE INDEX workspace_agents_auth_token_idx ON workspace_agents USING btree (auth_token);

 CREATE INDEX workspace_agents_resource_id_idx ON workspace_agents USING btree (resource_id);
@@ -141,19 +141,13 @@ ALTER TYPE api_key_scope ADD VALUE IF NOT EXISTS 'workspace_proxy:read';
 ALTER TYPE api_key_scope ADD VALUE IF NOT EXISTS 'workspace_proxy:update';
 -- End enum extensions

-- Purge old API keys to speed up the migration for large deployments.
-- Note: that problem should be solved in coderd once PR 20863 is released:
-- https://github.com/coder/coder/blob/main/coderd/database/dbpurge/dbpurge.go#L85
-DELETE FROM api_keys WHERE expires_at < NOW() - INTERVAL '7 days';
-
 -- Add new columns without defaults; backfill; then enforce NOT NULL
 ALTER TABLE api_keys ADD COLUMN scopes api_key_scope[];
 ALTER TABLE api_keys ADD COLUMN allow_list text[];

 -- Backfill existing rows for compatibility
-UPDATE api_keys SET
-    scopes = ARRAY[scope::api_key_scope],
-    allow_list = ARRAY['*:*'];
+UPDATE api_keys SET scopes = ARRAY[scope::api_key_scope];
+UPDATE api_keys SET allow_list = ARRAY['*:*'];

 -- Enforce NOT NULL
 ALTER TABLE api_keys ALTER COLUMN scopes SET NOT NULL;
@@ -1,26 +0,0 @@
-DROP VIEW template_with_names;
-- Drop the column
-ALTER TABLE templates DROP COLUMN use_terraform_workspace_cache;
-
-- Update the template_with_names view by recreating it.
-CREATE VIEW template_with_names AS
-SELECT
-	templates.*,
-	COALESCE(visible_users.avatar_url, ''::text) AS created_by_avatar_url,
-	COALESCE(visible_users.username, ''::text) AS created_by_username,
-	COALESCE(visible_users.name, ''::text) AS created_by_name,
-	COALESCE(organizations.name, ''::text) AS organization_name,
-	COALESCE(organizations.display_name, ''::text) AS organization_display_name,
-	COALESCE(organizations.icon, ''::text) AS organization_icon
-FROM
-	templates
-		LEFT JOIN
-	visible_users
-	ON
-		templates.created_by = visible_users.id
-		LEFT JOIN
-	organizations
-	ON templates.organization_id = organizations.id
-;
-
-COMMENT ON VIEW template_with_names IS 'Joins in the display name information such as username, avatar, and organization name.';
@@ -1,33 +0,0 @@
-- Default to `false`. Users will have to manually opt into the terraform workspace cache feature.
-ALTER TABLE templates ADD COLUMN use_terraform_workspace_cache BOOL NOT NULL DEFAULT false;
-
-COMMENT ON COLUMN templates.use_terraform_workspace_cache IS
-	'Determines whether to keep terraform directories cached between runs for workspaces created from this template. '
-		'When enabled, this can significantly speed up the `terraform init` step at the cost of increased disk usage. '
-		'This is an opt-in experience, as it prevents modules from being updated, and therefore is a behavioral difference '
-		'from the default.';
-	;
-
-- Update the template_with_names view by recreating it.
-DROP VIEW template_with_names;
-CREATE VIEW template_with_names AS
-SELECT
-	templates.*,
-   COALESCE(visible_users.avatar_url, ''::text) AS created_by_avatar_url,
-   COALESCE(visible_users.username, ''::text) AS created_by_username,
-   COALESCE(visible_users.name, ''::text) AS created_by_name,
-   COALESCE(organizations.name, ''::text) AS organization_name,
-   COALESCE(organizations.display_name, ''::text) AS organization_display_name,
-   COALESCE(organizations.icon, ''::text) AS organization_icon
-FROM
-	templates
-		LEFT JOIN
-	visible_users
-	ON
-		templates.created_by = visible_users.id
-		LEFT JOIN
-	organizations
-	ON templates.organization_id = organizations.id
-;
-
-COMMENT ON VIEW template_with_names IS 'Joins in the display name information such as username, avatar, and organization name.';
@@ -1,82 +0,0 @@
-- Restore previous view.
-DROP VIEW IF EXISTS tasks_with_status;
-
-CREATE VIEW
-	tasks_with_status
-AS
-	SELECT
-		tasks.*,
-		CASE
-			WHEN tasks.workspace_id IS NULL OR latest_build.job_status IS NULL THEN 'pending'::task_status
-
-			WHEN latest_build.job_status = 'failed' THEN 'error'::task_status
-
-			WHEN latest_build.transition IN ('stop', 'delete')
-				AND latest_build.job_status = 'succeeded' THEN 'paused'::task_status
-
-			WHEN latest_build.transition = 'start'
-				AND latest_build.job_status = 'pending' THEN 'initializing'::task_status
-
-			WHEN latest_build.transition = 'start' AND latest_build.job_status IN ('running', 'succeeded') THEN
-				CASE
-					WHEN agent_status.none THEN 'initializing'::task_status
-					WHEN agent_status.connecting THEN 'initializing'::task_status
-					WHEN agent_status.connected THEN
-						CASE
-							WHEN app_status.any_unhealthy THEN 'error'::task_status
-							WHEN app_status.any_initializing THEN 'initializing'::task_status
-							WHEN app_status.all_healthy_or_disabled THEN 'active'::task_status
-							ELSE 'unknown'::task_status
-						END
-					ELSE 'unknown'::task_status
-				END
-
-			ELSE 'unknown'::task_status
-		END AS status,
-		task_app.*,
-		task_owner.*
-	FROM
-		tasks
-	CROSS JOIN LATERAL (
-		SELECT
-			vu.username AS owner_username,
-			vu.name AS owner_name,
-			vu.avatar_url AS owner_avatar_url
-			FROM visible_users vu
-		WHERE vu.id = tasks.owner_id
-	) task_owner
-	LEFT JOIN LATERAL (
-		SELECT workspace_build_number, workspace_agent_id, workspace_app_id
-		FROM task_workspace_apps task_app
-		WHERE task_id = tasks.id
-		ORDER BY workspace_build_number DESC
-		LIMIT 1
-	) task_app ON TRUE
-	LEFT JOIN LATERAL (
-		SELECT
-			workspace_build.transition,
-			provisioner_job.job_status,
-			workspace_build.job_id
-		FROM workspace_builds workspace_build
-		JOIN provisioner_jobs provisioner_job ON provisioner_job.id = workspace_build.job_id
-		WHERE workspace_build.workspace_id = tasks.workspace_id
-			AND workspace_build.build_number = task_app.workspace_build_number
-	) latest_build ON TRUE
-	CROSS JOIN LATERAL (
-		SELECT
-			COUNT(*) = 0 AS none,
-			bool_or(workspace_agent.lifecycle_state IN ('created', 'starting')) AS connecting,
-			bool_and(workspace_agent.lifecycle_state = 'ready') AS connected
-		FROM workspace_agents workspace_agent
-		WHERE workspace_agent.id = task_app.workspace_agent_id
-	) agent_status
-	CROSS JOIN LATERAL (
-		SELECT
-			bool_or(workspace_app.health = 'unhealthy') AS any_unhealthy,
-			bool_or(workspace_app.health = 'initializing') AS any_initializing,
-			bool_and(workspace_app.health IN ('healthy', 'disabled')) AS all_healthy_or_disabled
-		FROM workspace_apps workspace_app
-		WHERE workspace_app.id = task_app.workspace_app_id
-	) app_status
-	WHERE
-		tasks.deleted_at IS NULL;
--- a/Show More
+++ b/Show More