Skip to content

Commit b821ddd

Browse files
Merge branch 'main' into feat-claude-agentapi
2 parents a8eb4a7 + 2937286 commit b821ddd

File tree

41 files changed

+3076
-387
lines changed

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

+3076
-387
lines changed

.github/typos.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[default.extend-words]
22
muc = "muc" # For Munich location code
3+
tyo = "tyo" # For Tokyo location code
34
Hashi = "Hashi"
45
HashiCorp = "HashiCorp"
56
mavrickrishi = "mavrickrishi" # Username

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- name: Validate formatting
4949
run: bun fmt:ci
5050
- name: Check for typos
51-
uses: crate-ci/typos@v1.35.5
51+
uses: crate-ci/typos@v1.36.2
5252
with:
5353
config: .github/typos.toml
5454
validate-readme-files:
@@ -61,7 +61,7 @@ jobs:
6161
- name: Check out code
6262
uses: actions/checkout@v5
6363
- name: Set up Go
64-
uses: actions/setup-go@v5
64+
uses: actions/setup-go@v6
6565
with:
6666
go-version: "1.23.2"
6767
- name: Validate contributors

.github/workflows/deploy-registry.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@ jobs:
3030
- name: Checkout code
3131
uses: actions/checkout@v5
3232
- name: Authenticate with Google Cloud
33-
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5
33+
uses: google-github-actions/auth@7c6bc770dae815cd3e89ee6cdf493a5fab2cc093
3434
with:
3535
workload_identity_provider: projects/309789351055/locations/global/workloadIdentityPools/github-actions/providers/github
3636
service_account: [email protected]
3737
- name: Set up Google Cloud SDK
38-
uses: google-github-actions/setup-gcloud@26f734c2779b00b7dda794207734c511110a4368
38+
uses: google-github-actions/setup-gcloud@aa5489c8933f4cc7a4f7d45035b3b1440c9c10db
3939
- name: Deploy to dev.registry.coder.com
4040
run: gcloud builds triggers run 29818181-126d-4f8a-a937-f228b27d3d34 --branch main
4141
- name: Deploy to registry.coder.com

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@v5
18-
- uses: actions/setup-go@v5
18+
- uses: actions/setup-go@v6
1919
with:
2020
go-version: stable
2121
- name: golangci-lint

.github/workflows/version-bump.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
9696
- name: Comment on PR - Failure
9797
if: failure() && steps.version-check.outputs.versions_up_to_date == 'false'
98-
uses: actions/github-script@v7
98+
uses: actions/github-script@v8
9999
with:
100100
github-token: ${{ secrets.GITHUB_TOKEN }}
101101
script: |

.icons/akamai.svg

Lines changed: 4 additions & 0 deletions
Loading

.icons/rstudio.svg

Lines changed: 1 addition & 0 deletions
Loading

registry/coder-labs/modules/sourcegraph-amp/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
display_name: Amp CLI
33
icon: ../../../../.icons/sourcegraph-amp.svg
44
description: Sourcegraph's AI coding agent with deep codebase understanding and intelligent code search capabilities
5-
verified: false
5+
verified: true
66
tags: [agent, sourcegraph, amp, ai, tasks]
77
---
88

@@ -13,7 +13,7 @@ Run [Amp CLI](https://ampcode.com/) in your workspace to access Sourcegraph's AI
1313
```tf
1414
module "amp-cli" {
1515
source = "registry.coder.com/coder-labs/sourcegraph-amp/coder"
16-
version = "1.0.2"
16+
version = "1.0.3"
1717
agent_id = coder_agent.example.id
1818
sourcegraph_amp_api_key = var.sourcegraph_amp_api_key
1919
install_sourcegraph_amp = true
@@ -60,7 +60,7 @@ variable "sourcegraph_amp_api_key" {
6060
module "amp-cli" {
6161
count = data.coder_workspace.me.start_count
6262
source = "registry.coder.com/coder-labs/sourcegraph-amp/coder"
63-
version = "1.0.2"
63+
version = "1.0.3"
6464
agent_id = coder_agent.example.id
6565
sourcegraph_amp_api_key = var.sourcegraph_amp_api_key # recommended for authenticated usage
6666
install_sourcegraph_amp = true

registry/coder-labs/templates/tasks-docker/main.tf

Lines changed: 23 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ module "claude-code" {
2424
source = "registry.coder.com/coder/claude-code/coder"
2525
version = "2.0.0"
2626
agent_id = coder_agent.main.id
27-
agent_name = "main"
2827
folder = "/home/coder/projects"
2928
install_claude_code = true
3029
claude_code_version = "latest"
@@ -45,10 +44,9 @@ variable "anthropic_api_key" {
4544
sensitive = true
4645
}
4746
resource "coder_env" "anthropic_api_key" {
48-
agent_id = coder_agent.main.id
49-
agent_name = "main"
50-
name = "CODER_MCP_CLAUDE_API_KEY"
51-
value = var.anthropic_api_key
47+
agent_id = coder_agent.main.id
48+
name = "CODER_MCP_CLAUDE_API_KEY"
49+
value = var.anthropic_api_key
5250
}
5351

5452
# We are using presets to set the prompts, image, and set up instructions
@@ -176,22 +174,19 @@ data "coder_parameter" "preview_port" {
176174

177175
# Other variables for Claude Code
178176
resource "coder_env" "claude_task_prompt" {
179-
agent_id = coder_agent.main.id
180-
agent_name = "main"
181-
name = "CODER_MCP_CLAUDE_TASK_PROMPT"
182-
value = data.coder_parameter.ai_prompt.value
177+
agent_id = coder_agent.main.id
178+
name = "CODER_MCP_CLAUDE_TASK_PROMPT"
179+
value = data.coder_parameter.ai_prompt.value
183180
}
184181
resource "coder_env" "app_status_slug" {
185-
agent_id = coder_agent.main.id
186-
agent_name = "main"
187-
name = "CODER_MCP_APP_STATUS_SLUG"
188-
value = "ccw"
182+
agent_id = coder_agent.main.id
183+
name = "CODER_MCP_APP_STATUS_SLUG"
184+
value = "ccw"
189185
}
190186
resource "coder_env" "claude_system_prompt" {
191-
agent_id = coder_agent.main.id
192-
agent_name = "main"
193-
name = "CODER_MCP_CLAUDE_SYSTEM_PROMPT"
194-
value = data.coder_parameter.system_prompt.value
187+
agent_id = coder_agent.main.id
188+
name = "CODER_MCP_CLAUDE_SYSTEM_PROMPT"
189+
value = data.coder_parameter.system_prompt.value
195190
}
196191

197192
data "coder_provisioner" "me" {}
@@ -301,38 +296,27 @@ module "code-server" {
301296
# This ensures that the latest non-breaking version of the module gets downloaded, you can also pin the module version to prevent breaking changes in production.
302297
version = "~> 1.0"
303298

304-
agent_id = coder_agent.main.id
305-
agent_name = "main"
306-
order = 1
307-
}
308-
309-
module "vscode" {
310-
count = data.coder_workspace.me.start_count
311-
source = "registry.coder.com/coder/vscode-desktop/coder"
312-
version = "1.1.0"
313-
agent_id = coder_agent.main.id
314-
agent_name = "main"
299+
agent_id = coder_agent.main.id
300+
order = 1
315301
}
316302

317303
module "windsurf" {
318-
count = data.coder_workspace.me.start_count
319-
source = "registry.coder.com/coder/windsurf/coder"
320-
version = "1.1.0"
321-
agent_id = coder_agent.main.id
322-
agent_name = "main"
304+
count = data.coder_workspace.me.start_count
305+
source = "registry.coder.com/coder/windsurf/coder"
306+
version = "1.1.0"
307+
agent_id = coder_agent.main.id
323308
}
324309

325310
module "cursor" {
326-
count = data.coder_workspace.me.start_count
327-
source = "registry.coder.com/coder/cursor/coder"
328-
version = "1.2.0"
329-
agent_id = coder_agent.main.id
330-
agent_name = "main"
311+
count = data.coder_workspace.me.start_count
312+
source = "registry.coder.com/coder/cursor/coder"
313+
version = "1.2.0"
314+
agent_id = coder_agent.main.id
331315
}
332316

333317
module "jetbrains" {
334318
count = data.coder_workspace.me.start_count
335-
source = "registry.coder.com/modules/coder/jetbrains/coder"
319+
source = "registry.coder.com/coder/jetbrains/coder"
336320
version = "~> 1.0"
337321
agent_id = coder_agent.main.id
338322
agent_name = "main"
@@ -368,7 +352,6 @@ resource "docker_volume" "home_volume" {
368352

369353
resource "coder_app" "preview" {
370354
agent_id = coder_agent.main.id
371-
agent_name = "main"
372355
slug = "preview"
373356
display_name = "Preview your app"
374357
icon = "${data.coder_workspace.me.access_url}/emojis/1f50e.png"
909 KB
Loading

0 commit comments

Comments
 (0)