Merge branch 'main' into vault-jwt-feat

Author: moo-im-a-cow

.github/workflows/ci.yaml

@@ -48,23 +48,8 @@ jobs:
       - name: Format
         run: bun fmt:ci
       - name: typos-action
-        uses: crate-ci/typos@v1.31.1
+        uses: crate-ci/typos@v1.32.0
         with:
           config: .github/typos.toml
       - name: Lint
         run: bun lint
-      # Disable version check until https://github.com/coder/modules/pull/426 is merged.
-      # This will allow us to use separate versioning for each module without failing CI. The backend already supports that.
-      # - name: Check version
-      #   shell: bash
-      #   run: |
-      #     # check for version changes
-      #     ./update-version.sh
-      #     # Check if any changes were made in README.md files
-      #     if [[ -n "$(git status --porcelain -- '**/README.md')" ]]; then
-      #       echo "Version mismatch detected. Please run ./update-version.sh and commit the updated README.md files."
-      #       git diff -- '**/README.md'
-      #       exit 1
-      #     else
-      #       echo "No version mismatch detected. All versions are up to date."
-      #     fi

.github/workflows/deploy-registry.yaml

@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - main
+    tags:
+      - "release/*/v*" # Matches tags like release/module-name/v1.0.0
 
 jobs:
   deploy:
@@ -20,7 +22,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Authenticate to Google Cloud
-        uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 
+        uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 
         with:
           workload_identity_provider: projects/309789351055/locations/global/workloadIdentityPools/github-actions/providers/github
           service_account: [email protected]
@@ -34,4 +36,8 @@ jobs:
       - name: Deploy to dev.registry.coder.com
         run: |
           gcloud builds triggers run 29818181-126d-4f8a-a937-f228b27d3d34 --branch dev
-  
+
+      - name: Deploy to registry.coder.com
+        run: |
+          gcloud builds triggers run 106610ff-41fb-4bd0-90a2-7643583fb9c0 --branch main
+  

.icons/windsurf.svg

@@ -22,7 +22,8 @@ Follow the instructions to ensure that Bun is available globally. Once Bun has b
 
 ## Testing a Module
 
-> **Note:** It is the responsibility of the module author to implement tests for their module. The author must test the module locally before submitting a PR.
+> [!NOTE]
+> It is the responsibility of the module author to implement tests for their module. The author must test the module locally before submitting a PR.
 
 A suite of test-helpers exists to run `terraform apply` on modules with variables, and test script output against containers.
 
@@ -53,23 +54,44 @@ module "example" {
 
 ## Releases
 
-> [!WARNING]
-> When creating a new release, make sure that your new version number is fully accurate. If a version number is incorrect or does not exist, we may end up serving incorrect/old data for our various tools and providers.
+The release process is automated with these steps:
+
+## 1. Create and Merge PR
+
+- Create a PR with your module changes
+- Get your PR reviewed, approved, and merged to `main`
+
+## 2. Prepare Release (Maintainer Task)
+
+After merging to `main`, a maintainer will:
+
+- View all modules and their current versions:
+
+  ```shell
+  ./release.sh --list
+  ```
+
+- Determine the next version number based on changes:
+
+  - **Patch version** (1.2.3 → 1.2.4): Bug fixes
+  - **Minor version** (1.2.3 → 1.3.0): New features, adding inputs, deprecating inputs
+  - **Major version** (1.2.3 → 2.0.0): Breaking changes (removing inputs, changing input types)
 
-Much of our release process is automated. To cut a new release:
+- Create and push an annotated tag:
 
-1. Navigate to [GitHub's Releases page](https://github.com/coder/modules/releases)
-2. Click "Draft a new release"
-3. Click the "Choose a tag" button and type a new release number in the format `v<major>.<minor>.<patch>` (e.g., `v1.18.0`). Then click "Create new tag".
-4. Click the "Generate release notes" button, and clean up the resulting README. Be sure to remove any notes that would not be relevant to end-users (e.g., bumping dependencies).
-5. Once everything looks good, click the "Publish release" button.
+  ```shell
+  # Fetch latest changes
+  git fetch origin
+  
+  # Create and push tag
+  ./release.sh module-name 1.2.3 --push
+  ```
 
-Once the release has been cut, a script will run to check whether there are any modules that will require that the new release number be published to Terraform. If there are any, a new pull request will automatically be generated. Be sure to approve this PR and merge it into the `main` branch.
+  The tag format will be: `release/module-name/v1.2.3`
 
-Following that, our automated processes will handle publishing new data for [`registry.coder.com`](https://github.com/coder/registry.coder.com/):
+## 3. Publishing to Registry
 
-1. Publishing new versions to Coder's [Terraform Registry](https://registry.terraform.io/providers/coder/coder/latest)
-2. Publishing new data to the [Coder Registry](https://registry.coder.com)
+Our automated processes will handle publishing new data to [registry.coder.com](https://registry.coder.com).
 
 > [!NOTE]
-> Some data in `registry.coder.com` is fetched on demand from the Module repo's main branch. This data should be updated almost immediately after a new release, but other changes will take some time to propagate.
+> Some data in registry.coder.com is fetched on demand from the [coder/modules](https://github.com/coder/modules) repo's `main` branch. This data should update almost immediately after a release, while other changes will take some time to propagate.

CONTRIBUTING.md

@@ -14,7 +14,7 @@ Run the [Claude Code](https://docs.anthropic.com/en/docs/agents-and-tools/claude
 ```tf
 module "claude-code" {
   source              = "registry.coder.com/modules/claude-code/coder"
-  version             = "1.1.0"
+  version             = "1.2.1"
   agent_id            = coder_agent.example.id
   folder              = "/home/coder"
   install_claude_code = true
@@ -71,7 +71,7 @@ data "coder_parameter" "ai_prompt" {
 resource "coder_agent" "main" {
   # ...
   env = {
-    CODER_MCP_CLAUDE_API_KEY       = var.anthropic_api_key # or use a coder_parameter 
+    CODER_MCP_CLAUDE_API_KEY       = var.anthropic_api_key # or use a coder_parameter
     CODER_MCP_CLAUDE_TASK_PROMPT   = data.coder_parameter.ai_prompt.value
     CODER_MCP_APP_STATUS_SLUG      = "claude-code"
     CODER_MCP_CLAUDE_SYSTEM_PROMPT = <<-EOT
@@ -102,7 +102,7 @@ Run Claude Code as a standalone app in your workspace. This will install Claude
 ```tf
 module "claude-code" {
   source              = "registry.coder.com/modules/claude-code/coder"
-  version             = "1.1.0"
+  version             = "1.2.1"
   agent_id            = coder_agent.example.id
   folder              = "/home/coder"
   install_claude_code = true

claude-code/README.md

@@ -151,7 +151,7 @@ resource "coder_script" "claude_code" {
       export LC_ALL=en_US.UTF-8
       
       # Create a new tmux session in detached mode
-      tmux new-session -d -s claude-code -c ${var.folder} "claude"
+      tmux new-session -d -s claude-code -c ${var.folder} "claude --dangerously-skip-permissions"
       
       # Send the prompt to the tmux session if needed
       if [ -n "$CODER_MCP_CLAUDE_TASK_PROMPT" ]; then

claude-code/main.tf

@@ -16,7 +16,7 @@ The devcontainers-cli module provides an easy way to install [`@devcontainers/cl
 ```tf
 module "devcontainers-cli" {
   source   = "registry.coder.com/modules/devcontainers-cli/coder"
-  version  = "1.0.1"
+  version  = "1.0.3"
   agent_id = coder_agent.example.id
 }
 ```

devcontainers-cli/README.md

@@ -40,7 +40,21 @@ const executeScriptInContainerWithPackageManager = async (
     ]);
   }
 
-  const resp = await execContainer(id, [shell, "-c", instance.script]);
+  const pathResp = await execContainer(id, [shell, "-c", "echo $PATH"]);
+  const path = pathResp.stdout.trim();
+
+  console.log(path);
+
+  const resp = await execContainer(
+    id,
+    [shell, "-c", instance.script],
+    [
+      "--env",
+      "CODER_SCRIPT_BIN_DIR=/tmp/coder-script-data/bin",
+      "--env",
+      `PATH=${path}:/tmp/coder-script-data/bin`,
+    ],
+  );
   const stdout = resp.stdout.trim().split("\n");
   const stderr = resp.stderr.trim().split("\n");
   return {
@@ -104,7 +118,7 @@ describe("devcontainers-cli", async () => {
       "Installing @devcontainers/cli using yarn...",
     );
     expect(output.stdout[output.stdout.length - 1]).toEqual(
-      "🥳 @devcontainers/cli has been installed into /usr/local/bin/devcontainer!",
+      "🥳 @devcontainers/cli has been installed into /tmp/coder-script-data/bin/devcontainer!",
     );
   }, 15000);
 

devcontainers-cli/main.test.ts

@@ -38,7 +38,7 @@ install() {
     fi
     pnpm add -g @devcontainers/cli
   elif [ "$PACKAGE_MANAGER" = "yarn" ]; then
-    yarn global add @devcontainers/cli
+    yarn global add @devcontainers/cli --prefix "$(dirname "$CODER_SCRIPT_BIN_DIR")"
   fi
 }
 

devcontainers-cli/run.sh

@@ -14,7 +14,7 @@ Run the [Goose](https://block.github.io/goose/) agent in your workspace to gener
 ```tf
 module "goose" {
   source        = "registry.coder.com/modules/goose/coder"
-  version       = "1.0.31"
+  version       = "1.1.0"
   agent_id      = coder_agent.example.id
   folder        = "/home/coder"
   install_goose = true
@@ -72,11 +72,11 @@ resource "coder_agent" "main" {
   env = {
     GOOSE_SYSTEM_PROMPT = <<-EOT
       You are a helpful assistant that can help write code.
-      
+
       Run all long running tasks (e.g. npm run dev) in the background and not in the foreground.
-      
+
       Periodically check in on background tasks.
-      
+
       Notify Coder of the status of the task before and after your steps.
     EOT
     GOOSE_TASK_PROMPT   = data.coder_parameter.ai_prompt.value
@@ -90,7 +90,7 @@ resource "coder_agent" "main" {
 module "goose" {
   count         = data.coder_workspace.me.start_count
   source        = "registry.coder.com/modules/goose/coder"
-  version       = "1.0.31"
+  version       = "1.1.0"
   agent_id      = coder_agent.example.id
   folder        = "/home/coder"
   install_goose = true
@@ -148,7 +148,7 @@ Run Goose as a standalone app in your workspace. This will install Goose and run
 ```tf
 module "goose" {
   source        = "registry.coder.com/modules/goose/coder"
-  version       = "1.0.31"
+  version       = "1.1.0"
   agent_id      = coder_agent.example.id
   folder        = "/home/coder"
   install_goose = true

goose/README.md

@@ -18,7 +18,7 @@ Consult the [JetBrains documentation](https://www.jetbrains.com/help/idea/prereq
 module "jetbrains_gateway" {
   count          = data.coder_workspace.me.start_count
   source         = "registry.coder.com/modules/jetbrains-gateway/coder"
-  version        = "1.0.28"
+  version        = "1.1.0"
   agent_id       = coder_agent.example.id
   folder         = "/home/coder/example"
   jetbrains_ides = ["CL", "GO", "IU", "PY", "WS"]
@@ -36,7 +36,7 @@ module "jetbrains_gateway" {
 module "jetbrains_gateway" {
   count          = data.coder_workspace.me.start_count
   source         = "registry.coder.com/modules/jetbrains-gateway/coder"
-  version        = "1.0.28"
+  version        = "1.1.0"
   agent_id       = coder_agent.example.id
   folder         = "/home/coder/example"
   jetbrains_ides = ["GO", "WS"]
@@ -50,7 +50,7 @@ module "jetbrains_gateway" {
 module "jetbrains_gateway" {
   count          = data.coder_workspace.me.start_count
   source         = "registry.coder.com/modules/jetbrains-gateway/coder"
-  version        = "1.0.28"
+  version        = "1.1.0"
   agent_id       = coder_agent.example.id
   folder         = "/home/coder/example"
   jetbrains_ides = ["IU", "PY"]
@@ -65,7 +65,7 @@ module "jetbrains_gateway" {
 module "jetbrains_gateway" {
   count          = data.coder_workspace.me.start_count
   source         = "registry.coder.com/modules/jetbrains-gateway/coder"
-  version        = "1.0.28"
+  version        = "1.1.0"
   agent_id       = coder_agent.example.id
   folder         = "/home/coder/example"
   jetbrains_ides = ["IU", "PY"]
@@ -90,7 +90,7 @@ module "jetbrains_gateway" {
 module "jetbrains_gateway" {
   count          = data.coder_workspace.me.start_count
   source         = "registry.coder.com/modules/jetbrains-gateway/coder"
-  version        = "1.0.28"
+  version        = "1.1.0"
   agent_id       = coder_agent.example.id
   folder         = "/home/coder/example"
   jetbrains_ides = ["GO", "WS"]
@@ -108,7 +108,7 @@ Due to the highest priority of the `ide_download_link` parameter in the `(jetbra
 module "jetbrains_gateway" {
   count              = data.coder_workspace.me.start_count
   source             = "registry.coder.com/modules/jetbrains-gateway/coder"
-  version            = "1.0.28"
+  version            = "1.1.0"
   agent_id           = coder_agent.example.id
   folder             = "/home/coder/example"
   jetbrains_ides     = ["GO", "WS"]