coder · matifali · Nov 24, 2025 · Nov 19, 2025 · Nov 19, 2025 · Nov 21, 2025
@@ -9,6 +9,7 @@ IST = "IST"
 MacOS = "macOS"
 AKS = "AKS"
 O_WRONLY = "O_WRONLY"
+AIBridge = "AI Bridge"
 
 [default.extend-words]
 AKS = "AKS"

diff --git a/cli/testdata/coder_server_--help.golden b/cli/testdata/coder_server_--help.golden
@@ -80,7 +80,7 @@ OPTIONS:
           Periodically check for new releases of Coder and inform the owner. The
           check is performed once per day.
 
-AIBRIDGE OPTIONS: 
+AI BRIDGE OPTIONS: 
       --aibridge-anthropic-base-url string, $CODER_AIBRIDGE_ANTHROPIC_BASE_URL (default: https://api.anthropic.com/)
           The base URL of the Anthropic API.
 
@@ -114,9 +114,9 @@ AIBRIDGE OPTIONS:
           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 AIBridge requests
-          (requires the "oauth2" and "mcp-server-http" experiments to be
-          enabled).
+          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.

diff --git a/cli/testdata/server-config.yaml.golden b/cli/testdata/server-config.yaml.golden
@@ -747,8 +747,8 @@ aibridge:
   # https://docs.claude.com/en/docs/claude-code/settings#environment-variables.
   # (default: global.anthropic.claude-haiku-4-5-20251001-v1:0, type: string)
   bedrock_small_fast_model: global.anthropic.claude-haiku-4-5-20251001-v1:0
-  # Whether to inject Coder's MCP tools into intercepted AIBridge requests (requires
-  # the "oauth2" and "mcp-server-http" experiments to be enabled).
+  # Whether to inject Coder's MCP tools into intercepted AI Bridge requests
+  # (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

diff --git a/coderd/apidoc/docs.go b/coderd/apidoc/docs.go
diff --git a/coderd/apidoc/swagger.json b/coderd/apidoc/swagger.json
diff --git a/coderd/database/dbauthz/dbauthz.go b/coderd/database/dbauthz/dbauthz.go
@@ -596,12 +596,12 @@ var (
 	// See aibridged package.
 	subjectAibridged = rbac.Subject{
 		Type:         rbac.SubjectAibridged,
-		FriendlyName: "AIBridge Daemon",
+		FriendlyName: "AI Bridge Daemon",
 		ID:           uuid.Nil.String(),
 		Roles: rbac.Roles([]rbac.Role{
 			{
 				Identifier:  rbac.RoleIdentifier{Name: "aibridged"},
-				DisplayName: "AIBridge Daemon",
+				DisplayName: "AI Bridge Daemon",
 				Site: rbac.Permissions(map[string][]policy.Action{
 					rbac.ResourceUser.Type: {
 						policy.ActionRead,         // Required to validate API key owner is active.

diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/aibridge.sql b/coderd/database/queries/aibridge.sql
@@ -209,7 +209,7 @@ ORDER BY
 	id ASC;
 
 -- name: ListAIBridgeInterceptionsTelemetrySummaries :many
--- Finds all unique AIBridge interception telemetry summaries combinations
+-- Finds all unique AI Bridge interception telemetry summaries combinations
 -- (provider, model, client) in the given timeframe for telemetry reporting.
 SELECT
     DISTINCT ON (provider, model, client)

@@ -81,7 +81,7 @@ func ConnectionLogConverter() *sqltypes.VariableConverter {
 func AIBridgeInterceptionConverter() *sqltypes.VariableConverter {
 	matcher := sqltypes.NewVariableConverter().RegisterMatcher(
 		resourceIDMatcher(),
-		// AIBridge interceptions are not tied to any organization.
+		// AI Bridge interceptions are not tied to any organization.
 		sqltypes.StringVarMatcher("''", []string{"input", "object", "org_owner"}),
 		sqltypes.StringVarMatcher("initiator_id :: text", []string{"input", "object", "owner"}),
 	)

diff --git a/coderd/telemetry/telemetry.go b/coderd/telemetry/telemetry.go
@@ -751,7 +751,7 @@ func (r *remoteReporter) createSnapshot() (*Snapshot, error) {
 	eg.Go(func() error {
 		summaries, err := r.generateAIBridgeInterceptionsSummaries(ctx)
 		if err != nil {
-			return xerrors.Errorf("generate AIBridge interceptions telemetry summaries: %w", err)
+			return xerrors.Errorf("generate AI Bridge interceptions telemetry summaries: %w", err)
 		}
 		snapshot.AIBridgeInterceptionsSummaries = summaries
 		return nil
@@ -785,7 +785,7 @@ func (r *remoteReporter) generateAIBridgeInterceptionsSummaries(ctx context.Cont
 		return nil, nil
 	}
 	if err != nil {
-		return nil, xerrors.Errorf("insert AIBridge interceptions telemetry lock (period_ending_at=%q): %w", endedAtBefore, err)
+		return nil, xerrors.Errorf("insert AI Bridge interceptions telemetry lock (period_ending_at=%q): %w", endedAtBefore, err)
 	}
 
 	// List the summary categories that need to be calculated.
@@ -794,7 +794,7 @@ func (r *remoteReporter) generateAIBridgeInterceptionsSummaries(ctx context.Cont
 		EndedAtBefore: endedAtBefore, // exclusive
 	})
 	if err != nil {
-		return nil, xerrors.Errorf("list AIBridge interceptions telemetry summaries (startedAtAfter=%q, endedAtBefore=%q): %w", endedAtAfter, endedAtBefore, err)
+		return nil, xerrors.Errorf("list AI Bridge interceptions telemetry summaries (startedAtAfter=%q, endedAtBefore=%q): %w", endedAtAfter, endedAtBefore, err)
 	}
 
 	// Calculate and convert the summaries for all categories.
@@ -813,7 +813,7 @@ func (r *remoteReporter) generateAIBridgeInterceptionsSummaries(ctx context.Cont
 				EndedAtBefore: endedAtBefore,
 			})
 			if err != nil {
-				return xerrors.Errorf("calculate AIBridge interceptions telemetry summary (provider=%q, model=%q, client=%q, startedAtAfter=%q, endedAtBefore=%q): %w", category.Provider, category.Model, category.Client, endedAtAfter, endedAtBefore, err)
+				return xerrors.Errorf("calculate AI Bridge interceptions telemetry summary (provider=%q, model=%q, client=%q, startedAtAfter=%q, endedAtBefore=%q): %w", category.Provider, category.Model, category.Client, endedAtAfter, endedAtBefore, err)
 			}
 
 			// Double check that at least one interception was found in the

diff --git a/codersdk/aibridge.go b/codersdk/aibridge.go
@@ -65,7 +65,7 @@ type AIBridgeListInterceptionsResponse struct {
 // @typescript-ignore AIBridgeListInterceptionsFilter
 type AIBridgeListInterceptionsFilter struct {
 	// Limit defaults to 100, max is 1000.
-	// Offset based pagination is not supported for AIBridge interceptions. Use
+	// Offset based pagination is not supported for AI Bridge interceptions. Use
 	// cursor pagination instead with after_id.
 	Pagination Pagination `json:"pagination,omitempty"`
 
@@ -112,7 +112,7 @@ func (f AIBridgeListInterceptionsFilter) asRequestOption() RequestOption {
 	}
 }
 
-// AIBridgeListInterceptions returns AIBridge interceptions with the given
+// AIBridgeListInterceptions returns AI Bridge interceptions with the given
 // filter.
 func (c *Client) AIBridgeListInterceptions(ctx context.Context, filter AIBridgeListInterceptionsFilter) (AIBridgeListInterceptionsResponse, error) {
 	res, err := c.Request(ctx, http.MethodGet, "/api/v2/aibridge/interceptions", nil, filter.asRequestOption(), filter.Pagination.asRequestOption(), filter.Pagination.asRequestOption())

diff --git a/codersdk/deployment.go b/codersdk/deployment.go
@@ -1174,7 +1174,7 @@ func (c *DeploymentValues) Options() serpent.OptionSet {
 			YAML:   "inbox",
 		}
 		deploymentGroupAIBridge = serpent.Group{
-			Name: "AIBridge",
+			Name: "AI Bridge",
 			YAML: "aibridge",
 		}
 	)
@@ -3238,9 +3238,9 @@ Write out the current server config as YAML to stdout.`,
 			YAML:        "hideAITasks",
 		},
 
-		// AIBridge Options
+		// AI Bridge Options
 		{
-			Name:        "AIBridge Enabled",
+			Name:        "AI Bridge Enabled",
 			Description: "Whether to start an in-memory aibridged instance.",
 			Flag:        "aibridge-enabled",
 			Env:         "CODER_AIBRIDGE_ENABLED",
@@ -3250,7 +3250,7 @@ Write out the current server config as YAML to stdout.`,
 			YAML:        "enabled",
 		},
 		{
-			Name:        "AIBridge OpenAI Base URL",
+			Name:        "AI Bridge OpenAI Base URL",
 			Description: "The base URL of the OpenAI API.",
 			Flag:        "aibridge-openai-base-url",
 			Env:         "CODER_AIBRIDGE_OPENAI_BASE_URL",
@@ -3260,7 +3260,7 @@ Write out the current server config as YAML to stdout.`,
 			YAML:        "openai_base_url",
 		},
 		{
-			Name:        "AIBridge OpenAI Key",
+			Name:        "AI Bridge OpenAI Key",
 			Description: "The key to authenticate against the OpenAI API.",
 			Flag:        "aibridge-openai-key",
 			Env:         "CODER_AIBRIDGE_OPENAI_KEY",
@@ -3270,7 +3270,7 @@ Write out the current server config as YAML to stdout.`,
 			YAML:        "openai_key",
 		},
 		{
-			Name:        "AIBridge Anthropic Base URL",
+			Name:        "AI Bridge Anthropic Base URL",
 			Description: "The base URL of the Anthropic API.",
 			Flag:        "aibridge-anthropic-base-url",
 			Env:         "CODER_AIBRIDGE_ANTHROPIC_BASE_URL",
@@ -3280,7 +3280,7 @@ Write out the current server config as YAML to stdout.`,
 			YAML:        "anthropic_base_url",
 		},
 		{
-			Name:        "AIBridge Anthropic Key",
+			Name:        "AI Bridge Anthropic Key",
 			Description: "The key to authenticate against the Anthropic API.",
 			Flag:        "aibridge-anthropic-key",
 			Env:         "CODER_AIBRIDGE_ANTHROPIC_KEY",
@@ -3290,7 +3290,7 @@ Write out the current server config as YAML to stdout.`,
 			YAML:        "anthropic_key",
 		},
 		{
-			Name:        "AIBridge Bedrock Region",
+			Name:        "AI Bridge Bedrock Region",
 			Description: "The AWS Bedrock API region.",
 			Flag:        "aibridge-bedrock-region",
 			Env:         "CODER_AIBRIDGE_BEDROCK_REGION",
@@ -3300,7 +3300,7 @@ Write out the current server config as YAML to stdout.`,
 			YAML:        "bedrock_region",
 		},
 		{
-			Name:        "AIBridge Bedrock Access Key",
+			Name:        "AI Bridge Bedrock Access Key",
 			Description: "The access key to authenticate against the AWS Bedrock API.",
 			Flag:        "aibridge-bedrock-access-key",
 			Env:         "CODER_AIBRIDGE_BEDROCK_ACCESS_KEY",
@@ -3310,7 +3310,7 @@ Write out the current server config as YAML to stdout.`,
 			YAML:        "bedrock_access_key",
 		},
 		{
-			Name:        "AIBridge Bedrock Access Key Secret",
+			Name:        "AI Bridge Bedrock Access Key Secret",
 			Description: "The access key secret to use with the access key to authenticate against the AWS Bedrock API.",
 			Flag:        "aibridge-bedrock-access-key-secret",
 			Env:         "CODER_AIBRIDGE_BEDROCK_ACCESS_KEY_SECRET",
@@ -3320,7 +3320,7 @@ Write out the current server config as YAML to stdout.`,
 			YAML:        "bedrock_access_key_secret",
 		},
 		{
-			Name:        "AIBridge Bedrock Model",
+			Name:        "AI Bridge Bedrock Model",
 			Description: "The model to use when making requests to the AWS Bedrock API.",
 			Flag:        "aibridge-bedrock-model",
 			Env:         "CODER_AIBRIDGE_BEDROCK_MODEL",
@@ -3330,7 +3330,7 @@ Write out the current server config as YAML to stdout.`,
 			YAML:        "bedrock_model",
 		},
 		{
-			Name:        "AIBridge Bedrock Small Fast Model",
+			Name:        "AI Bridge Bedrock Small Fast Model",
 			Description: "The small fast model to use when making requests to the AWS Bedrock API. Claude Code uses Haiku-class models to perform background tasks. See https://docs.claude.com/en/docs/claude-code/settings#environment-variables.",
 			Flag:        "aibridge-bedrock-small-fastmodel",
 			Env:         "CODER_AIBRIDGE_BEDROCK_SMALL_FAST_MODEL",
@@ -3340,8 +3340,8 @@ Write out the current server config as YAML to stdout.`,
 			YAML:        "bedrock_small_fast_model",
 		},
 		{
-			Name:        "AIBridge Inject Coder MCP tools",
-			Description: "Whether to inject Coder's MCP tools into intercepted AIBridge requests (requires the \"oauth2\" and \"mcp-server-http\" experiments to be enabled).",
+			Name:        "AI Bridge Inject Coder MCP tools",
+			Description: "Whether to inject Coder's MCP tools into intercepted AI Bridge requests (requires the \"oauth2\" and \"mcp-server-http\" experiments to be enabled).",
 			Flag:        "aibridge-inject-coder-mcp-tools",
 			Env:         "CODER_AIBRIDGE_INJECT_CODER_MCP_TOOLS",
 			Value:       &c.AI.BridgeConfig.InjectCoderMCPTools,
@@ -3350,7 +3350,7 @@ Write out the current server config as YAML to stdout.`,
 			YAML:        "inject_coder_mcp_tools",
 		},
 		{
-			Name:        "AIBridge Data Retention Duration",
+			Name:        "AI Bridge Data Retention Duration",
 			Description: "Length of time to retain data such as interceptions and all related records (token, prompt, tool use).",
 			Flag:        "aibridge-retention",
 			Env:         "CODER_AIBRIDGE_RETENTION",

diff --git a/docs/manifest.json b/docs/manifest.json
@@ -1216,17 +1216,17 @@
 					"children": [
 						{
 							"title": "aibridge",
-							"description": "Manage AIBridge.",
+							"description": "Manage AI Bridge.",
 							"path": "reference/cli/aibridge.md"
 						},
 						{
 							"title": "aibridge interceptions",
-							"description": "Manage AIBridge interceptions.",
+							"description": "Manage AI Bridge interceptions.",
 							"path": "reference/cli/aibridge_interceptions.md"
 						},
 						{
 							"title": "aibridge interceptions list",
-							"description": "List AIBridge interceptions as JSON.",
+							"description": "List AI Bridge interceptions as JSON.",
 							"path": "reference/cli/aibridge_interceptions_list.md"
 						},
 						{

diff --git a/docs/reference/api/aibridge.md b/docs/reference/api/aibridge.md
diff --git a/docs/reference/cli/aibridge.md b/docs/reference/cli/aibridge.md
diff --git a/docs/reference/cli/aibridge_interceptions.md b/docs/reference/cli/aibridge_interceptions.md
diff --git a/docs/reference/cli/aibridge_interceptions_list.md b/docs/reference/cli/aibridge_interceptions_list.md
diff --git a/docs/reference/cli/index.md b/docs/reference/cli/index.md
diff --git a/docs/reference/cli/server.md b/docs/reference/cli/server.md