Skip to content

Commit 47ebca7

Browse files
DevelopmentCatsDevelopmentCats
authored
Merge branch 'main' into cat/antigravity-protocol
2 parents 280df80 + 6d41bfa commit 47ebca7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+184
-153
lines changed

‎.github/workflows/typos.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ IST = "IST"
99
MacOS = "macOS"
1010
AKS = "AKS"
1111
O_WRONLY = "O_WRONLY"
12+
AIBridge = "AI Bridge"
1213

1314
[default.extend-words]
1415
AKS = "AKS"

‎cli/exp_scaletest_notifications.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,15 @@ func (r *RootCmd) scaletestNotifications() *serpent.Command {
142142
triggerTimes[id] = make(chan time.Time, 1)
143143
}
144144

145+
smtpHTTPTransport := &http.Transport{
146+
MaxConnsPerHost: 512,
147+
MaxIdleConnsPerHost: 512,
148+
IdleConnTimeout: 60 * time.Second,
149+
}
150+
smtpHTTPClient := &http.Client{
151+
Transport: smtpHTTPTransport,
152+
}
153+
145154
configs := make([]notifications.Config, 0, userCount)
146155
for range templateAdminCount {
147156
config := notifications.Config{
@@ -157,6 +166,7 @@ func (r *RootCmd) scaletestNotifications() *serpent.Command {
157166
Metrics: metrics,
158167
SMTPApiURL: smtpAPIURL,
159168
SMTPRequestTimeout: smtpRequestTimeout,
169+
SMTPHttpClient: smtpHTTPClient,
160170
}
161171
if err := config.Validate(); err != nil {
162172
return xerrors.Errorf("validate config: %w", err)

‎cli/testdata/coder_server_--help.golden‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ OPTIONS:
8080
Periodically check for new releases of Coder and inform the owner. The
8181
check is performed once per day.
8282

83-
AIBRIDGE OPTIONS:
83+
AI BRIDGE OPTIONS:
8484
--aibridge-anthropic-base-url string, $CODER_AIBRIDGE_ANTHROPIC_BASE_URL (default: https://api.anthropic.com/)
8585
The base URL of the Anthropic API.
8686

@@ -106,17 +106,17 @@ AIBRIDGE OPTIONS:
106106
See
107107
https://docs.claude.com/en/docs/claude-code/settings#environment-variables.
108108

109-
--aibridge-retention duration, $CODER_AIBRIDGE_RETENTION (default: 1440h)
109+
--aibridge-retention duration, $CODER_AIBRIDGE_RETENTION (default: 60d)
110110
Length of time to retain data such as interceptions and all related
111111
records (token, prompt, tool use).
112112

113113
--aibridge-enabled bool, $CODER_AIBRIDGE_ENABLED (default: false)
114114
Whether to start an in-memory aibridged instance.
115115

116116
--aibridge-inject-coder-mcp-tools bool, $CODER_AIBRIDGE_INJECT_CODER_MCP_TOOLS (default: false)
117-
Whether to inject Coder's MCP tools into intercepted AIBridge requests
118-
(requires the "oauth2" and "mcp-server-http" experiments to be
119-
enabled).
117+
Whether to inject Coder's MCP tools into intercepted AI Bridge
118+
requests (requires the "oauth2" and "mcp-server-http" experiments to
119+
be enabled).
120120

121121
--aibridge-openai-base-url string, $CODER_AIBRIDGE_OPENAI_BASE_URL (default: https://api.openai.com/v1/)
122122
The base URL of the OpenAI API.

‎cli/testdata/server-config.yaml.golden‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -747,11 +747,11 @@ aibridge:
747747
# https://docs.claude.com/en/docs/claude-code/settings#environment-variables.
748748
# (default: global.anthropic.claude-haiku-4-5-20251001-v1:0, type: string)
749749
bedrock_small_fast_model: global.anthropic.claude-haiku-4-5-20251001-v1:0
750-
# Whether to inject Coder's MCP tools into intercepted AIBridge requests (requires
751-
# the "oauth2" and "mcp-server-http" experiments to be enabled).
750+
# Whether to inject Coder's MCP tools into intercepted AI Bridge requests
751+
# (requires the "oauth2" and "mcp-server-http" experiments to be enabled).
752752
# (default: false, type: bool)
753753
inject_coder_mcp_tools: false
754754
# Length of time to retain data such as interceptions and all related records
755755
# (token, prompt, tool use).
756-
# (default: 1440h, type: duration)
756+
# (default: 60d, type: duration)
757757
retention: 1440h0m0s

‎coderd/apidoc/docs.go‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbauthz/dbauthz.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,12 +596,12 @@ var (
596596
// See aibridged package.
597597
subjectAibridged = rbac.Subject{
598598
Type: rbac.SubjectAibridged,
599-
FriendlyName: "AIBridge Daemon",
599+
FriendlyName: "AI Bridge Daemon",
600600
ID: uuid.Nil.String(),
601601
Roles: rbac.Roles([]rbac.Role{
602602
{
603603
Identifier: rbac.RoleIdentifier{Name: "aibridged"},
604-
DisplayName: "AIBridge Daemon",
604+
DisplayName: "AI Bridge Daemon",
605605
Site: rbac.Permissions(map[string][]policy.Action{
606606
rbac.ResourceUser.Type: {
607607
policy.ActionRead, // Required to validate API key owner is active.

‎coderd/database/querier.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries.sql.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/queries/aibridge.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ ORDER BY
209209
id ASC;
210210

211211
-- name: ListAIBridgeInterceptionsTelemetrySummaries :many
212-
-- Finds all unique AIBridge interception telemetry summaries combinations
212+
-- Finds all unique AI Bridge interception telemetry summaries combinations
213213
-- (provider, model, client) in the given timeframe for telemetry reporting.
214214
SELECT
215215
DISTINCT ON (provider, model, client)

0 commit comments

Comments
 (0)