Skip to content

Commit b66fe1e

Browse files
Merge branch 'main' into feat-amp-version
2 parents 3aba955 + 90873e8 commit b66fe1e

File tree

22 files changed

+367
-50
lines changed

22 files changed

+367
-50
lines changed

.github/workflows/ci.yaml

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,24 @@ jobs:
1313
steps:
1414
- name: Check out code
1515
uses: actions/checkout@v5
16+
- name: Detect changed files
17+
uses: dorny/paths-filter@v3
18+
id: filter
19+
with:
20+
list-files: shell
21+
filters: |
22+
shared:
23+
- 'test/**'
24+
- 'package.json'
25+
- 'bun.lock'
26+
- 'bunfig.toml'
27+
- 'tsconfig.json'
28+
- '.github/workflows/ci.yaml'
29+
- 'scripts/ts_test_auto.sh'
30+
modules:
31+
- 'registry/**/modules/**'
32+
all:
33+
- '**'
1634
- name: Set up Terraform
1735
uses: coder/coder/.github/actions/setup-tf@main
1836
- name: Set up Bun
@@ -27,7 +45,11 @@ jobs:
2745
- name: Install dependencies
2846
run: bun install
2947
- name: Run TypeScript tests
30-
run: bun test
48+
env:
49+
ALL_CHANGED_FILES: ${{ steps.filter.outputs.all_files }}
50+
SHARED_CHANGED: ${{ steps.filter.outputs.shared }}
51+
MODULE_CHANGED_FILES: ${{ steps.filter.outputs.modules_files }}
52+
run: ./scripts/ts_test_auto.sh
3153
- name: Run Terraform tests
3254
run: ./scripts/terraform_test_all.sh
3355
- name: Run Terraform Validate
@@ -50,7 +72,7 @@ jobs:
5072
- name: Validate formatting
5173
run: bun fmt:ci
5274
- name: Check for typos
53-
uses: crate-ci/typos@v1.37.2
75+
uses: crate-ci/typos@v1.38.1
5476
with:
5577
config: .github/typos.toml
5678
validate-readme-files:

registry/coder-labs/modules/auggie/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Run Auggie CLI in your workspace to access Augment's AI coding assistant with ad
1313
```tf
1414
module "auggie" {
1515
source = "registry.coder.com/coder-labs/auggie/coder"
16-
version = "0.2.0"
16+
version = "0.2.1"
1717
agent_id = coder_agent.example.id
1818
folder = "/home/coder/project"
1919
}
@@ -47,7 +47,7 @@ module "coder-login" {
4747
4848
module "auggie" {
4949
source = "registry.coder.com/coder-labs/auggie/coder"
50-
version = "0.2.0"
50+
version = "0.2.1"
5151
agent_id = coder_agent.example.id
5252
folder = "/home/coder/project"
5353
@@ -103,7 +103,7 @@ EOF
103103
```tf
104104
module "auggie" {
105105
source = "registry.coder.com/coder-labs/auggie/coder"
106-
version = "0.2.0"
106+
version = "0.2.1"
107107
agent_id = coder_agent.example.id
108108
folder = "/home/coder/project"
109109

registry/coder-labs/modules/auggie/main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,15 @@ locals {
174174
install_script = file("${path.module}/scripts/install.sh")
175175
start_script = file("${path.module}/scripts/start.sh")
176176
module_dir_name = ".auggie-module"
177+
folder = trimsuffix(var.folder, "/")
177178
}
178179

179180
module "agentapi" {
180181
source = "registry.coder.com/coder/agentapi/coder"
181182
version = "1.2.0"
182183

183184
agent_id = var.agent_id
185+
folder = local.folder
184186
web_app_slug = local.app_slug
185187
web_app_order = var.order
186188
web_app_group = var.group

registry/coder-labs/modules/codex/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Run Codex CLI in your workspace to access OpenAI's models through the Codex inte
1313
```tf
1414
module "codex" {
1515
source = "registry.coder.com/coder-labs/codex/coder"
16-
version = "2.1.0"
16+
version = "2.1.1"
1717
agent_id = coder_agent.example.id
1818
openai_api_key = var.openai_api_key
1919
folder = "/home/coder/project"
@@ -33,7 +33,7 @@ module "codex" {
3333
module "codex" {
3434
count = data.coder_workspace.me.start_count
3535
source = "registry.coder.com/coder-labs/codex/coder"
36-
version = "2.1.0"
36+
version = "2.1.1"
3737
agent_id = coder_agent.example.id
3838
openai_api_key = "..."
3939
folder = "/home/coder/project"
@@ -60,7 +60,7 @@ module "coder-login" {
6060
6161
module "codex" {
6262
source = "registry.coder.com/coder-labs/codex/coder"
63-
version = "2.1.0"
63+
version = "2.1.1"
6464
agent_id = coder_agent.example.id
6565
openai_api_key = "..."
6666
ai_prompt = data.coder_parameter.ai_prompt.value
@@ -106,7 +106,7 @@ For custom Codex configuration, use `base_config_toml` and/or `additional_mcp_se
106106
```tf
107107
module "codex" {
108108
source = "registry.coder.com/coder-labs/codex/coder"
109-
version = "2.1.0"
109+
version = "2.1.1"
110110
# ... other variables ...
111111
112112
# Override default configuration

registry/coder-labs/modules/codex/main.tf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ module "agentapi" {
131131
version = "1.2.0"
132132

133133
agent_id = var.agent_id
134+
folder = var.folder
134135
web_app_slug = local.app_slug
135136
web_app_order = var.order
136137
web_app_group = var.group

registry/coder-labs/modules/cursor-cli/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Run the Cursor Agent CLI in your workspace for interactive coding assistance and
1313
```tf
1414
module "cursor_cli" {
1515
source = "registry.coder.com/coder-labs/cursor-cli/coder"
16-
version = "0.2.0"
16+
version = "0.2.1"
1717
agent_id = coder_agent.example.id
1818
folder = "/home/coder/project"
1919
}
@@ -42,7 +42,7 @@ module "coder-login" {
4242
4343
module "cursor_cli" {
4444
source = "registry.coder.com/coder-labs/cursor-cli/coder"
45-
version = "0.2.0"
45+
version = "0.2.1"
4646
agent_id = coder_agent.example.id
4747
folder = "/home/coder/project"
4848

registry/coder-labs/modules/cursor-cli/main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ locals {
113113
install_script = file("${path.module}/scripts/install.sh")
114114
start_script = file("${path.module}/scripts/start.sh")
115115
module_dir_name = ".cursor-cli-module"
116+
folder = trimsuffix(var.folder, "/")
116117
}
117118

118119
# Expose status slug and API key to the agent environment
@@ -134,6 +135,7 @@ module "agentapi" {
134135
version = "1.2.0"
135136

136137
agent_id = var.agent_id
138+
folder = local.folder
137139
web_app_slug = local.app_slug
138140
web_app_order = var.order
139141
web_app_group = var.group

registry/coder-labs/modules/gemini/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Run [Gemini CLI](https://github.com/google-gemini/gemini-cli) in your workspace
1313
```tf
1414
module "gemini" {
1515
source = "registry.coder.com/coder-labs/gemini/coder"
16-
version = "2.1.0"
16+
version = "2.1.1"
1717
agent_id = coder_agent.example.id
1818
folder = "/home/coder/project"
1919
}
@@ -46,7 +46,7 @@ variable "gemini_api_key" {
4646
4747
module "gemini" {
4848
source = "registry.coder.com/coder-labs/gemini/coder"
49-
version = "2.1.0"
49+
version = "2.1.1"
5050
agent_id = coder_agent.example.id
5151
gemini_api_key = var.gemini_api_key
5252
folder = "/home/coder/project"
@@ -94,7 +94,7 @@ data "coder_parameter" "ai_prompt" {
9494
module "gemini" {
9595
count = data.coder_workspace.me.start_count
9696
source = "registry.coder.com/coder-labs/gemini/coder"
97-
version = "2.1.0"
97+
version = "2.1.1"
9898
agent_id = coder_agent.example.id
9999
gemini_api_key = var.gemini_api_key
100100
gemini_model = "gemini-2.5-flash"
@@ -118,7 +118,7 @@ For enterprise users who prefer Google's Vertex AI platform:
118118
```tf
119119
module "gemini" {
120120
source = "registry.coder.com/coder-labs/gemini/coder"
121-
version = "2.1.0"
121+
version = "2.1.1"
122122
agent_id = coder_agent.example.id
123123
gemini_api_key = var.gemini_api_key
124124
folder = "/home/coder/project"

registry/coder-labs/modules/gemini/main.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,13 +172,15 @@ EOT
172172
install_script = file("${path.module}/scripts/install.sh")
173173
start_script = file("${path.module}/scripts/start.sh")
174174
module_dir_name = ".gemini-module"
175+
folder = trimsuffix(var.folder, "/")
175176
}
176177

177178
module "agentapi" {
178179
source = "registry.coder.com/coder/agentapi/coder"
179180
version = "1.2.0"
180181

181182
agent_id = var.agent_id
183+
folder = local.folder
182184
web_app_slug = local.app_slug
183185
web_app_order = var.order
184186
web_app_group = var.group

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,12 @@ Run [Amp CLI](https://ampcode.com/) in your workspace to access Sourcegraph's AI
1212

1313
```tf
1414
module "amp-cli" {
15-
source = "registry.coder.com/coder-labs/sourcegraph-amp/coder"
16-
version = "2.0.0"
17-
agent_id = coder_agent.example.id
18-
amp_api_key = "xxxx-xxxx-xxxx"
19-
workdir = "/home/coder/project"
15+
source = "registry.coder.com/coder-labs/sourcegraph-amp/coder"
16+
version = "2.0.0"
17+
agent_id = coder_agent.example.id
18+
sourcegraph_amp_api_key = var.sourcegraph_amp_api_key
19+
install_sourcegraph_amp = true
20+
agentapi_version = "latest"
2021
}
2122
```
2223

0 commit comments

Comments
 (0)