feat: add mcp config for kiro and windsurf modules (#391 )

## Description - Introduces mcp file creation via `coder_script` in kiro and windsurf modules - Add mcp variable to both modules - Add slug and display_name variables to windsurf to match up with other modules - Add tests for testing mcp file creation for both kiro and windsurf  ## Type of Change - [ ] New module - [ ] Bug fix - [X] Feature/enhancement - [ ] Documentation - [ ] Other ## Module Information  **Path:** `registry/coder/modules/kiro` **New version:** `v1.1.0` **Breaking change:** [ ] Yes [X] No **Path:** `registry/coder/modules/windsurf` **New version:** `v1.2.0` **Breaking change:** [ ] Yes [X] No **Path:** `registry/coder/modules/cursor` **New version:** `v1.3.2` **Breaking change:** [ ] Yes [X] No ## Testing & Validation - [X] Tests pass (`bun test`) - [X] Code formatted (`bun run fmt`) - [X] Changes tested locally
feat(claude-code): add subdomain variable and logic (#387 )
2026-06-03 04:58:15 +00:00 · 2025-08-26 20:48:15 -05:00 · 2025-08-26 20:36:27 -05:00 · 2025-08-27 01:57:43 +05:00 · 2025-08-26 08:19:49 -05:00 · 2025-08-25 20:21:56 -05:00
83 changed files with 2900 additions and 626 deletions
@@ -4,3 +4,7 @@ updates:
    directory: "/"
    schedule:
      interval: "weekly"
+    groups:
+      github-actions:
+        patterns:
+          - "*"
@@ -192,8 +192,8 @@ main() {

  # Always run formatter to ensure consistent formatting
  echo "🔧 Running formatter to ensure consistent formatting..."
-  if command -v bun >/dev/null 2>&1; then
-    bun fmt >/dev/null 2>&1 || echo "⚠️  Warning: bun fmt failed, but continuing..."
+  if command -v bun > /dev/null 2>&1; then
+    bun fmt > /dev/null 2>&1 || echo "⚠️  Warning: bun fmt failed, but continuing..."
  else
    echo "⚠️  Warning: bun not found, skipping formatting"
  fi
@@ -2,6 +2,8 @@
 muc = "muc" # For Munich location code
 Hashi = "Hashi"
 HashiCorp = "HashiCorp"
+mavrickrishi = "mavrickrishi" # Username
+mavrick = "mavrick" # Username

 [files]
 extend-exclude = ["registry/coder/templates/aws-devcontainer/architecture.svg"] #False positive
@@ -48,7 +48,7 @@ jobs:
      - name: Validate formatting
        run: bun fmt:ci
      - name: Check for typos
-        uses: crate-ci/typos@v1.35.4
+        uses: crate-ci/typos@v1.35.5
        with:
          config: .github/typos.toml
  validate-readme-files:
@@ -35,7 +35,7 @@ jobs:
          workload_identity_provider: projects/309789351055/locations/global/workloadIdentityPools/github-actions/providers/github
          service_account: registry-v2-github@coder-registry-1.iam.gserviceaccount.com
      - name: Set up Google Cloud SDK
-        uses: google-github-actions/setup-gcloud@cb1e50a9932213ecece00a606661ae9ca44f3397
+        uses: google-github-actions/setup-gcloud@26f734c2779b00b7dda794207734c511110a4368
      - name: Deploy to dev.registry.coder.com
        run: gcloud builds triggers run 29818181-126d-4f8a-a937-f228b27d3d34 --branch main
      - name: Deploy to registry.coder.com
@@ -21,4 +21,4 @@ jobs:
      - name: golangci-lint
        uses: golangci/golangci-lint-action@v8
        with:
-          version: v2.1
+          version: v2.1
@@ -0,0 +1,117 @@
+name: Create Release
+
+on:
+  push:
+    tags:
+      - "release/*/*/v*.*.*"
+
+jobs:
+  create-release:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: read
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+          persist-credentials: false
+
+      - name: Extract tag information
+        id: tag_info
+        run: |
+          TAG=${GITHUB_REF#refs/tags/}
+          echo "tag=$TAG" >> $GITHUB_OUTPUT
+
+          IFS='/' read -ra PARTS <<< "$TAG"
+          NAMESPACE="${PARTS[1]}"
+          MODULE="${PARTS[2]}"
+          VERSION="${PARTS[3]}"
+
+          echo "namespace=$NAMESPACE" >> $GITHUB_OUTPUT
+          echo "module=$MODULE" >> $GITHUB_OUTPUT
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "module_path=registry/$NAMESPACE/modules/$MODULE" >> $GITHUB_OUTPUT
+
+          RELEASE_TITLE="$NAMESPACE/$MODULE $VERSION"
+          echo "release_title=$RELEASE_TITLE" >> $GITHUB_OUTPUT
+
+      - name: Find previous tag
+        id: prev_tag
+        env:
+          NAMESPACE: ${{ steps.tag_info.outputs.namespace }}
+          MODULE: ${{ steps.tag_info.outputs.module }}
+          CURRENT_TAG: ${{ steps.tag_info.outputs.tag }}
+        run: |
+          PREV_TAG=$(git tag -l "release/$NAMESPACE/$MODULE/v*" | sort -V | grep -B1 "$CURRENT_TAG" | head -1)
+
+          if [ -z "$PREV_TAG" ] || [ "$PREV_TAG" = "$CURRENT_TAG" ]; then
+            echo "No previous tag found, using initial commit"
+            PREV_TAG=$(git rev-list --max-parents=0 HEAD)
+          fi
+
+          echo "prev_tag=$PREV_TAG" >> $GITHUB_OUTPUT
+          echo "Previous tag: $PREV_TAG"
+
+      - name: Generate changelog
+        id: changelog
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          MODULE_PATH: ${{ steps.tag_info.outputs.module_path }}
+          PREV_TAG: ${{ steps.prev_tag.outputs.prev_tag }}
+          CURRENT_TAG: ${{ steps.tag_info.outputs.tag }}
+        run: |
+          echo "Generating changelog for $MODULE_PATH between $PREV_TAG and $CURRENT_TAG"
+
+          COMMITS=$(git log --oneline --no-merges "$PREV_TAG..$CURRENT_TAG" -- "$MODULE_PATH")
+
+          if [ -z "$COMMITS" ]; then
+            echo "No commits found for this module"
+            echo "changelog=No changes found for this module." >> $GITHUB_OUTPUT
+            exit 0
+          fi
+
+          if [[ "$PREV_TAG" == release/* ]]; then
+            FULL_CHANGELOG=$(gh api repos/:owner/:repo/releases/generate-notes \
+              --field tag_name="$CURRENT_TAG" \
+              --field previous_tag_name="$PREV_TAG" \
+              --jq '.body')
+          else
+            echo "New module detected, skipping GitHub API"
+            FULL_CHANGELOG=""
+          fi
+
+          MODULE_COMMIT_SHAS=$(git log --format="%H" --no-merges "$PREV_TAG..$CURRENT_TAG" -- "$MODULE_PATH")
+
+          FILTERED_CHANGELOG="## What's Changed\n\n"
+
+          for sha in $MODULE_COMMIT_SHAS; do
+            SHORT_SHA=${sha:0:7}
+            
+            COMMIT_LINES=$(echo "$FULL_CHANGELOG" | grep -E "$SHORT_SHA|$(git log --format='%s' -n 1 $sha)" || true)
+            
+            if [ -n "$COMMIT_LINES" ]; then
+              FILTERED_CHANGELOG="${FILTERED_CHANGELOG}${COMMIT_LINES}\n"
+            else
+              COMMIT_MSG=$(git log --format="%s" -n 1 $sha)
+              AUTHOR=$(gh api repos/:owner/:repo/commits/$sha --jq '.author.login // .commit.author.name')
+              FILTERED_CHANGELOG="${FILTERED_CHANGELOG}* $COMMIT_MSG by @$AUTHOR\n"
+            fi
+          done
+
+          echo "changelog<<EOF" >> $GITHUB_OUTPUT
+          echo -e "$FILTERED_CHANGELOG" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+
+      - name: Create Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          TAG_NAME: ${{ steps.tag_info.outputs.tag }}
+          RELEASE_TITLE: ${{ steps.tag_info.outputs.release_title }}
+          CHANGELOG: ${{ steps.changelog.outputs.changelog }}
+        run: |
+          gh release create "$TAG_NAME" \
+            --title "$RELEASE_TITLE" \
+            --notes "$CHANGELOG"
@@ -163,8 +163,8 @@ linters:
    staticcheck:
      checks:
        - all
-        - SA4006  # Detects redundant assignments
-        - SA4009  # Detects redundant variable declarations
+        - SA4006 # Detects redundant assignments
+        - SA4009 # Detects redundant variable declarations
        - SA1019
  exclusions:
    generated: lax
@@ -0,0 +1,8 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="25" height="25"/>
+<path d="M5.50694 21.1637C5.17323 21.1637 4.89218 21.1064 4.66378 20.9926C4.436 20.8787 4.26333 20.7052 4.1476 20.4763C4.03187 20.2473 3.97247 19.9672 3.97247 19.6382V16.2463C3.97247 15.8281 3.88859 15.5239 3.72265 15.3341C3.55549 15.1449 3.25912 15.0449 2.83418 15.0353C2.70191 15.0353 2.59598 14.9859 2.51577 14.8853C2.43433 14.7859 2.39453 14.6708 2.39453 14.5425C2.39453 14.4033 2.43433 14.2882 2.51577 14.1984C2.5966 14.1087 2.70375 14.0593 2.83418 14.0496C3.25912 14.0394 3.55549 13.94 3.72265 13.7508C3.88981 13.5616 3.97247 13.2622 3.97247 12.8537V9.46177C3.97247 8.96352 4.10474 8.58456 4.36742 8.3261C4.6301 8.06763 5.01035 7.9375 5.50694 7.9375H9.55926C9.71173 7.9375 9.83725 7.98269 9.9389 8.07185C10.0399 8.16162 10.0914 8.27669 10.0914 8.41466C10.0914 8.5448 10.0485 8.65626 9.96278 8.75145C9.87706 8.84664 9.76316 8.89423 9.62049 8.89423H5.8578C5.6441 8.89423 5.48245 8.94906 5.37162 9.05871C5.26018 9.16836 5.20446 9.33766 5.20446 9.5678V12.9754C5.20446 13.2742 5.14323 13.5454 5.02199 13.7894C4.90075 14.034 4.73848 14.2256 4.53581 14.3659C4.33313 14.5051 4.09616 14.575 3.82246 14.575V14.5147C4.09616 14.5147 4.33313 14.5846 4.53581 14.7238C4.73848 14.863 4.90075 15.0552 5.02199 15.3004C5.14323 15.5444 5.20446 15.8155 5.20446 16.1143V19.537C5.20446 19.7671 5.26018 19.9358 5.37162 20.0461C5.48306 20.1569 5.64533 20.2106 5.8578 20.2106H9.62049C9.76194 20.2106 9.87583 20.2582 9.96278 20.3527C10.0497 20.4479 10.0914 20.56 10.0914 20.6895C10.0914 20.8191 10.0412 20.9299 9.9389 21.0251C9.83725 21.1203 9.71112 21.1673 9.55926 21.1673H5.50694V21.1643V21.1637Z" fill="#F8F7F7" stroke="#F8F7F7" stroke-width="0.259057" stroke-miterlimit="10"/>
+<path d="M15.4423 21.1634C15.2898 21.1634 15.1643 21.1158 15.0626 21.0212C14.961 20.926 14.9102 20.8139 14.9102 20.6856C14.9102 20.5573 14.953 20.444 15.0387 20.3488C15.1245 20.2536 15.2384 20.2067 15.381 20.2067H19.1437C19.3574 20.2067 19.5191 20.153 19.6299 20.0422C19.7413 19.9325 19.7971 19.7632 19.7971 19.5331V16.1104C19.7971 15.8116 19.8583 15.5405 19.9795 15.2965C20.1008 15.0519 20.263 14.8603 20.4657 14.7199C20.6684 14.5807 20.9054 14.5108 21.1791 14.5108V14.5711C20.9054 14.5711 20.6684 14.5012 20.4657 14.362C20.263 14.2229 20.1008 14.0307 19.9795 13.7855C19.8583 13.5415 19.7971 13.2703 19.7971 12.9715V9.5639C19.7971 9.33496 19.7413 9.16566 19.6299 9.0548C19.5185 8.94515 19.3562 8.89033 19.1437 8.89033H15.381C15.2396 8.89033 15.1257 8.84273 15.0387 8.74754C14.953 8.65355 14.9102 8.54089 14.9102 8.41076C14.9102 8.27158 14.9604 8.15771 15.0626 8.06795C15.1637 7.97818 15.2898 7.93359 15.4423 7.93359H19.4946C19.9912 7.93359 20.3702 8.06373 20.6341 8.32219C20.898 8.58065 21.029 8.95961 21.029 9.45786V12.8498C21.029 13.2583 21.1129 13.5583 21.2789 13.7469C21.446 13.9361 21.7424 14.0361 22.1673 14.0457C22.2996 14.0554 22.4055 14.1048 22.4858 14.1945C22.5672 14.2843 22.607 14.3994 22.607 14.5385C22.607 14.6687 22.5672 14.7826 22.4858 14.8814C22.4055 14.9808 22.2978 15.0314 22.1673 15.0314C21.7424 15.041 21.4466 15.141 21.2789 15.3302C21.1117 15.5194 21.029 15.823 21.029 16.2424V19.6343C21.029 19.9639 20.9709 20.2422 20.8539 20.4723C20.737 20.7025 20.5655 20.8736 20.3377 20.9887C20.1093 21.1025 19.8283 21.1598 19.4946 21.1598H15.4423V21.1628V21.1634Z" fill="#F8F7F7" stroke="#F8F7F7" stroke-width="0.259057" stroke-miterlimit="10"/>
+<path d="M16.4845 15.8401C17.2224 15.8401 17.8206 15.2515 17.8206 14.5255C17.8206 13.7996 17.2224 13.2109 16.4845 13.2109C15.7467 13.2109 15.1484 13.7996 15.1484 14.5255C15.1484 15.2515 15.7467 15.8401 16.4845 15.8401Z" fill="#F8F7F7" stroke="#F8F7F7" stroke-width="0.259057" stroke-miterlimit="10"/>
+<path d="M9.00014 15.8401C9.73798 15.8401 10.3362 15.2515 10.3362 14.5255C10.3362 13.7996 9.73798 13.2109 9.00014 13.2109C8.2623 13.2109 7.66406 13.7996 7.66406 14.5255C7.66406 15.2515 8.2623 15.8401 9.00014 15.8401Z" fill="#F8F7F7" stroke="#F8F7F7" stroke-width="0.259057" stroke-miterlimit="10"/>
+<path d="M12.0442 4.13327L11.942 6.81971C11.942 6.97033 11.7974 7.04564 11.5084 7.04564C11.2194 7.04564 11.0749 6.97033 11.0749 6.81971C11.0492 6.15036 11.0284 5.63103 11.0112 5.26291C11.0027 4.88637 10.9941 4.61826 10.9855 4.45921C10.9769 4.30016 10.9727 4.20376 10.9727 4.17062V4.12062C10.9727 3.92843 11.1515 3.83203 11.5084 3.83203C11.8654 3.83203 12.0442 3.93264 12.0442 4.13327ZM14.213 4.13327L14.1108 6.81971C14.1108 6.97033 13.9663 7.04564 13.6773 7.04564C13.3883 7.04564 13.2437 6.97033 13.2437 6.81971C13.218 6.15036 13.1972 5.63103 13.1801 5.26291C13.1715 4.88637 13.1629 4.61826 13.1543 4.45921C13.1458 4.30016 13.1415 4.20376 13.1415 4.17062V4.12062C13.1415 3.92843 13.3203 3.83203 13.6773 3.83203C14.0342 3.83203 14.213 3.93264 14.213 4.13327Z" fill="#F8F7F7" stroke="#F8F7F7" stroke-width="0.259057" stroke-miterlimit="10"/>
+</svg>
@@ -0,0 +1,22 @@
+# Ignore symlinks to avoid Prettier errors
+CLAUDE.md
+.github/copilot-instructions.md
+
+# Ignore node_modules and dependencies
+node_modules/
+
+# Ignore Terraform files (formatted by terraform fmt)
+*.tf
+*.hcl
+*.tfvars
+
+# Ignore generated and temporary files
+.terraform/
+*.tfstate
+*.tfstate.backup
+*.tfstate.lock.info
+
+# Ignore other files that shouldn't be formatted
+bun.lock
+go.sum
+go.mod
@@ -4,11 +4,11 @@
    "": {
      "name": "registry",
      "devDependencies": {
-        "@types/bun": "^1.2.18",
-        "bun-types": "^1.2.18",
+        "@types/bun": "^1.2.21",
+        "bun-types": "^1.2.21",
        "dedent": "^1.6.0",
        "gray-matter": "^4.0.3",
-        "marked": "^16.0.0",
+        "marked": "^16.2.0",
        "prettier": "^3.6.2",
        "prettier-plugin-sh": "^0.18.0",
        "prettier-plugin-terraform-formatter": "^1.2.1",
@@ -21,7 +21,7 @@
  "packages": {
    "@reteps/dockerfmt": ["@reteps/dockerfmt@0.3.6", "", {}, "sha512-Tb5wIMvBf/nLejTQ61krK644/CEMB/cpiaIFXqGApfGqO3GwcR3qnI0DbmkFVCl2OyEp8LnLX3EkucoL0+tbFg=="],

-    "@types/bun": ["@types/bun@1.2.18", "", { "dependencies": { "bun-types": "1.2.18" } }, "sha512-Xf6RaWVheyemaThV0kUfaAUvCNokFr+bH8Jxp+tTZfx7dAPA8z9ePnP9S9+Vspzuxxx9JRAXhnyccRj3GyCMdQ=="],
+    "@types/bun": ["@types/bun@1.2.21", "", { "dependencies": { "bun-types": "1.2.21" } }, "sha512-NiDnvEqmbfQ6dmZ3EeUO577s4P5bf4HCTXtI6trMc6f6RzirY5IrF3aIookuSpyslFzrnvv2lmEWv5HyC1X79A=="],

    "@types/node": ["@types/node@24.0.14", "", { "dependencies": { "undici-types": "~7.8.0" } }, "sha512-4zXMWD91vBLGRtHK3YbIoFMia+1nqEz72coM42C5ETjnNCa/heoj7NT1G67iAfOqMmcfhuCZ4uNpyz8EjlAejw=="],

@@ -29,7 +29,7 @@

    "argparse": ["argparse@1.0.10", "", { "dependencies": { "sprintf-js": "~1.0.2" } }, "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg=="],

-    "bun-types": ["bun-types@1.2.18", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-04+Eha5NP7Z0A9YgDAzMk5PHR16ZuLVa83b26kH5+cp1qZW4F6FmAURngE7INf4tKOvCE69vYvDEwoNl1tGiWw=="],
+    "bun-types": ["bun-types@1.2.21", "", { "dependencies": { "@types/node": "*" }, "peerDependencies": { "@types/react": "^19" } }, "sha512-sa2Tj77Ijc/NTLS0/Odjq/qngmEPZfbfnOERi0KRUYhT9R8M4VBioWVmMWE5GrYbKMc+5lVybXygLdibHaqVqw=="],

    "csstype": ["csstype@3.1.3", "", {}, "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="],

@@ -47,7 +47,7 @@

    "kind-of": ["kind-of@6.0.3", "", {}, "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="],

-    "marked": ["marked@16.0.0", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-MUKMXDjsD/eptB7GPzxo4xcnLS6oo7/RHimUMHEDRhUooPwmN9BEpMl7AEOJv3bmso169wHI2wUF9VQgL7zfmA=="],
+    "marked": ["marked@16.2.0", "", { "bin": { "marked": "bin/marked.js" } }, "sha512-LbbTuye+0dWRz2TS9KJ7wsnD4KAtpj0MVkWc90XvBa6AslXsT0hTBVH5k32pcSyHH1fst9XEFJunXHktVy0zlg=="],

    "prettier": ["prettier@3.6.2", "", { "bin": { "prettier": "bin/prettier.cjs" } }, "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ=="],

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"os"
 	"path"
+	"regexp"
 	"slices"
 	"strings"

@@ -12,6 +13,10 @@ import (

 var supportedUserNameSpaceDirectories = append(supportedResourceTypes, ".images")

+// validNameRe validates that names contain only alphanumeric characters and hyphens
+var validNameRe = regexp.MustCompile(`^[a-zA-Z0-9](?:[a-zA-Z0-9-]*[a-zA-Z0-9])?$`)
+
+
 // validateCoderResourceSubdirectory validates that the structure of a module or template within a namespace follows all
 // expected file conventions
 func validateCoderResourceSubdirectory(dirPath string) []error {
@@ -42,6 +47,12 @@ func validateCoderResourceSubdirectory(dirPath string) []error {
 			continue
 		}

+		// Validate module/template name
+		if !validNameRe.MatchString(f.Name()) {
+			errs = append(errs, xerrors.Errorf("%q: name contains invalid characters (only alphanumeric characters and hyphens are allowed)", path.Join(dirPath, f.Name())))
+			continue
+		}
+
 		resourceReadmePath := path.Join(dirPath, f.Name(), "README.md")
 		if _, err := os.Stat(resourceReadmePath); err != nil {
 			if errors.Is(err, os.ErrNotExist) {
@@ -79,6 +90,12 @@ func validateRegistryDirectory() []error {
 			continue
 		}

+		// Validate namespace name
+		if !validNameRe.MatchString(nDir.Name()) {
+			allErrs = append(allErrs, xerrors.Errorf("%q: namespace name contains invalid characters (only alphanumeric characters and hyphens are allowed)", namespacePath))
+			continue
+		}
+
 		contributorReadmePath := path.Join(namespacePath, "README.md")
 		if _, err := os.Stat(contributorReadmePath); err != nil {
 			allErrs = append(allErrs, err)
@@ -1,18 +1,18 @@
 {
  "name": "registry",
  "scripts": {
-    "fmt": "bun x prettier --write **/*.sh **/*.ts **/*.md *.md && terraform fmt -recursive -diff",
-    "fmt:ci": "bun x prettier --check **/*.sh **/*.ts **/*.md *.md && terraform fmt -check -recursive -diff",
+    "fmt": "bun x prettier --write . && terraform fmt -recursive -diff",
+    "fmt:ci": "bun x prettier --check . && terraform fmt -check -recursive -diff",
    "terraform-validate": "./scripts/terraform_validate.sh",
    "test": "./scripts/terraform_test_all.sh",
    "update-version": "./update-version.sh"
  },
  "devDependencies": {
-    "@types/bun": "^1.2.18",
-    "bun-types": "^1.2.18",
+    "@types/bun": "^1.2.21",
+    "bun-types": "^1.2.21",
    "dedent": "^1.6.0",
    "gray-matter": "^4.0.3",
-    "marked": "^16.0.0",
+    "marked": "^16.2.0",
    "prettier": "^3.6.2",
    "prettier-plugin-sh": "^0.18.0",
    "prettier-plugin-terraform-formatter": "^1.2.1"
@@ -1,6 +1,6 @@
 ---
-display_name: "Tmux"
-description: "Tmux for coder agent :)"
+display_name: "tmux"
+description: "tmux with session persistence and plugins"
 icon: "../../../../.icons/tmux.svg"
 verified: false
 tags: ["tmux", "terminal", "persistent"]
@@ -15,7 +15,7 @@ up a default or custom tmux configuration with session save/restore capabilities
 ```tf
 module "tmux" {
  source   = "registry.coder.com/anomaly/tmux/coder"
-  version  = "1.0.0"
+  version  = "1.0.1"
  agent_id = coder_agent.example.id
 }
 ```
@@ -39,7 +39,7 @@ module "tmux" {
 ```tf
 module "tmux" {
  source        = "registry.coder.com/anomaly/tmux/coder"
-  version       = "1.0.0"
+  version       = "1.0.1"
  agent_id      = coder_agent.example.id
  tmux_config   = ""                        # Optional: custom tmux.conf content
  save_interval = 1                         # Optional: save interval in minutes
@@ -78,7 +78,7 @@ This module can provision multiple tmux sessions, each as a separate app in the
 ```tf
 module "tmux" {
  source      = "registry.coder.com/anomaly/tmux/coder"
-  version     = "1.0.0"
+  version     = "1.0.1"
  agent_id    = var.agent_id
  sessions    = ["default", "dev", "anomaly"]
  tmux_config = <<-EOT
@@ -91,11 +91,9 @@ module "tmux" {
 ```

 > [!IMPORTANT]
->
-> - If you provide a custom `tmux_config`, it will completely replace the default configuration. Ensure you include plugin
->   and TPM initialization lines if you want plugin support and session persistence.
-> - The script will attempt to install dependencies using `sudo` where required.
-> - If `git` is not installed, TPM installation will fail.
-> - If you are using custom config, you'll be responsible for setting up persistence and plugins.
-> - The `order`, `group`, and `icon` variables allow you to customize how tmux apps appear in the Coder UI.
-> - In case of session restart or shh reconnection, the tmux session will be automatically restored :)
+> If you provide a custom `tmux_config`, it will completely replace the default configuration. Ensure you include plugin and TPM initialization lines if you want plugin support and session persistence.
+> The script will attempt to install dependencies using `sudo` where required.
+> If `git` is not installed, TPM installation will fail.
+> If you are using custom config, you'll be responsible for setting up persistence and plugins.
+> The `order`, `group`, and `icon` variables allow you to customize how tmux apps appear in the Coder UI.
+> In case of session restart or shh reconnection, the tmux session will be automatically restored :)
@@ -28,7 +28,9 @@ describe("tmux module", async () => {

    // check that the script contains expected lines
    expect(scriptResource.script).toContain("Installing tmux");
-    expect(scriptResource.script).toContain("Installing Tmux Plugin Manager (TPM)");
+    expect(scriptResource.script).toContain(
+      "Installing Tmux Plugin Manager (TPM)",
+    );
    expect(scriptResource.script).toContain("tmux configuration created at");
    expect(scriptResource.script).toContain("✅ tmux setup complete!");
  });
@@ -8,75 +8,75 @@ TMUX_CONFIG="${TMUX_CONFIG}"

 # Function to install tmux
 install_tmux() {
-    printf "Checking for tmux installation\n"
+  printf "Checking for tmux installation\n"

-    if command -v tmux &> /dev/null; then
-        printf "tmux is already installed \n\n"
-        return 0
-    fi
+  if command -v tmux &> /dev/null; then
+    printf "tmux is already installed \n\n"
+    return 0
+  fi

-    printf "Installing tmux \n\n"
+  printf "Installing tmux \n\n"

-    # Detect package manager and install tmux
-    if command -v apt-get &> /dev/null; then
-        sudo apt-get update
-        sudo apt-get install -y tmux
-    elif command -v yum &> /dev/null; then
-        sudo yum install -y tmux
-    elif command -v dnf &> /dev/null; then
-        sudo dnf install -y tmux
-    elif command -v zypper &> /dev/null; then
-        sudo zypper install -y tmux
-    elif command -v apk &> /dev/null; then
-        sudo apk add tmux
-    elif command -v brew &> /dev/null; then
-        brew install tmux
-    else
-        printf "No supported package manager found. Please install tmux manually. \n"
-        exit 1
-    fi
+  # Detect package manager and install tmux
+  if command -v apt-get &> /dev/null; then
+    sudo apt-get update
+    sudo apt-get install -y tmux
+  elif command -v yum &> /dev/null; then
+    sudo yum install -y tmux
+  elif command -v dnf &> /dev/null; then
+    sudo dnf install -y tmux
+  elif command -v zypper &> /dev/null; then
+    sudo zypper install -y tmux
+  elif command -v apk &> /dev/null; then
+    sudo apk add tmux
+  elif command -v brew &> /dev/null; then
+    brew install tmux
+  else
+    printf "No supported package manager found. Please install tmux manually. \n"
+    exit 1
+  fi

-    printf "tmux installed successfully \n"
+  printf "tmux installed successfully \n"
 }

 # Function to install Tmux Plugin Manager (TPM)
 install_tpm() {
-    local tpm_dir="$HOME/.tmux/plugins/tpm"
+  local tpm_dir="$HOME/.tmux/plugins/tpm"

-    if [ -d "$tpm_dir" ]; then
-        printf "TPM is already installed"
-        return 0
-    fi
+  if [ -d "$tpm_dir" ]; then
+    printf "TPM is already installed"
+    return 0
+  fi

-    printf "Installing Tmux Plugin Manager (TPM) \n"
+  printf "Installing Tmux Plugin Manager (TPM) \n"

-    # Create plugins directory
-    mkdir -p "$HOME/.tmux/plugins"
+  # Create plugins directory
+  mkdir -p "$HOME/.tmux/plugins"

-    # Clone TPM repository
-    if command -v git &> /dev/null; then
-        git clone https://github.com/tmux-plugins/tpm "$tpm_dir"
-        printf "TPM installed successfully"
-    else
-        printf "Git is not installed. Please install git to use tmux plugins. \n"
-        exit 1
-    fi
+  # Clone TPM repository
+  if command -v git &> /dev/null; then
+    git clone https://github.com/tmux-plugins/tpm "$tpm_dir"
+    printf "TPM installed successfully"
+  else
+    printf "Git is not installed. Please install git to use tmux plugins. \n"
+    exit 1
+  fi
 }

 # Function to create tmux configuration
 setup_tmux_config() {
-    printf "Setting up tmux configuration \n"
+  printf "Setting up tmux configuration \n"

-    local config_dir="$HOME/.tmux"
-    local config_file="$HOME/.tmux.conf"
+  local config_dir="$HOME/.tmux"
+  local config_file="$HOME/.tmux.conf"

-    mkdir -p "$config_dir"
+  mkdir -p "$config_dir"

-    if [ -n "$TMUX_CONFIG" ]; then
-        printf "$TMUX_CONFIG" > "$config_file"
-        printf "$${BOLD}Custom tmux configuration applied at {$config_file} \n\n"
-    else
-        cat > "$config_file" << EOF
+  if [ -n "$TMUX_CONFIG" ]; then
+    printf "$TMUX_CONFIG" > "$config_file"
+    printf "$${BOLD}Custom tmux configuration applied at {$config_file} \n\n"
+  else
+    cat > "$config_file" << EOF
 # Tmux Configuration File

 # =============================================================================
@@ -106,48 +106,48 @@ bind C-r run-shell "~/.tmux/plugins/tmux-resurrect/scripts/restore.sh"
 # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
 run '~/.tmux/plugins/tpm/tpm'
 EOF
-        printf "tmux configuration created at {$config_file} \n\n"
-    fi
+    printf "tmux configuration created at {$config_file} \n\n"
+  fi
 }

 # Function to install tmux plugins
 install_plugins() {
-    printf "Installing tmux plugins"
+  printf "Installing tmux plugins"

-    # Check if TPM is installed
-    if [ ! -d "$HOME/.tmux/plugins/tpm" ]; then
-        printf "TPM is not installed. Cannot install plugins. \n"
-        return 1
-    fi
+  # Check if TPM is installed
+  if [ ! -d "$HOME/.tmux/plugins/tpm" ]; then
+    printf "TPM is not installed. Cannot install plugins. \n"
+    return 1
+  fi

-    # Install plugins using TPM
-    "$HOME/.tmux/plugins/tpm/bin/install_plugins"
+  # Install plugins using TPM
+  "$HOME/.tmux/plugins/tpm/bin/install_plugins"

-    printf "tmux plugins installed successfully \n"
+  printf "tmux plugins installed successfully \n"
 }

 # Main execution
 main() {
-    printf "$${BOLD} 🛠️Setting up tmux with session persistence! \n\n"
-    printf ""
+  printf "$${BOLD} 🛠️Setting up tmux with session persistence! \n\n"
+  printf ""

-    # Install dependencies
-    install_tmux
-    install_tpm
+  # Install dependencies
+  install_tmux
+  install_tpm

-    # Setup tmux configuration
-    setup_tmux_config
+  # Setup tmux configuration
+  setup_tmux_config

-    # Install plugins
-    install_plugins
+  # Install plugins
+  install_plugins

-    printf "$${BOLD}✅ tmux setup complete! \n\n"
+  printf "$${BOLD}✅ tmux setup complete! \n\n"

-    printf "$${BOLD} Attempting to restore sessions\n"
-    tmux new-session -d \; source-file ~/.tmux.conf \; run-shell '~/.tmux/plugins/tmux-resurrect/scripts/restore.sh'
-    printf "$${BOLD} Sessions restored: -> %s\n" "$(tmux ls)"
+  printf "$${BOLD} Attempting to restore sessions\n"
+  tmux new-session -d \; source-file ~/.tmux.conf \; run-shell '~/.tmux/plugins/tmux-resurrect/scripts/restore.sh'
+  printf "$${BOLD} Sessions restored: -> %s\n" "$(tmux ls)"

 }

 # Run main function
-main
+main
@@ -16,7 +16,7 @@ handle_session() {
  local session_name="$1"

  # Check if the session exists
-  if tmux has-session -t "$session_name" 2>/dev/null; then
+  if tmux has-session -t "$session_name" 2> /dev/null; then
    echo "Session '$session_name' exists, attaching to it..."
    tmux attach-session -t "$session_name"
  else
@@ -0,0 +1,161 @@
+---
+display_name: Auggie CLI
+icon: ../../../../.icons/auggie.svg
+description: Run Auggie CLI in your workspace for AI-powered coding assistance with AgentAPI integration
+verified: true
+tags: [agent, auggie, ai, tasks, augment]
+---
+
+# Auggie CLI
+
+Run Auggie CLI in your workspace to access Augment's AI coding assistant with advanced context understanding and codebase integration. This module integrates with [AgentAPI](https://github.com/coder/agentapi).
+
+```tf
+module "auggie" {
+  source   = "registry.coder.com/coder-labs/auggie/coder"
+  version  = "0.1.0"
+  agent_id = coder_agent.example.id
+  folder   = "/home/coder/project"
+}
+```
+
+## Prerequisites
+
+- **Node.js and npm must be sourced/available before the auggie module installs** - ensure they are installed in your workspace image or via earlier provisioning steps
+- You must add the [Coder Login](https://registry.coder.com/modules/coder/coder-login) module to your template
+- **Augment session token for authentication (required for tasks). [Instructions](https://docs.augmentcode.com/cli/setup-auggie/authentication) to get the session token**
+
+## Examples
+
+### Usage with Tasks and Configuration
+
+```tf
+data "coder_parameter" "ai_prompt" {
+  type        = "string"
+  name        = "AI Prompt"
+  default     = ""
+  description = "Initial task prompt for Auggie CLI"
+  mutable     = true
+}
+
+module "coder-login" {
+  count    = data.coder_workspace.me.start_count
+  source   = "registry.coder.com/coder/coder-login/coder"
+  version  = "1.0.31"
+  agent_id = coder_agent.example.id
+}
+
+module "auggie" {
+  source   = "registry.coder.com/coder-labs/auggie/coder"
+  version  = "0.1.0"
+  agent_id = coder_agent.example.id
+  folder   = "/home/coder/project"
+
+  # Authentication
+  augment_session_token = <<-EOF
+  {"accessToken":"xxxx-yyyy-zzzz-jjjj","tenantURL":"https://d1.api.augmentcode.com/","scopes":["read","write"]}
+EOF  # Required for tasks
+
+  # Version
+   auggie_version = "0.3.0"
+
+  # Task configuration
+  ai_prompt                      = data.coder_parameter.ai_prompt.value
+  continue_previous_conversation = true
+  interaction_mode               = "quiet"
+  auggie_model                   = "gpt5"
+  report_tasks                   = true
+
+  # MCP configuration for additional integrations
+  mcp = <<-EOF
+{
+  "mcpServers": {
+    "filesystem": {
+      "command": "npx",
+      "args": ["-y", "@modelcontextprotocol/server-filesystem", "/home/coder/project"]
+    }
+  }
+}
+EOF
+
+  # Workspace guidelines
+  rules = <<-EOT
+    # Project Guidelines
+
+    ## Code Style
+    - Use TypeScript for all new JavaScript files
+    - Follow consistent naming conventions
+    - Add comprehensive comments for complex logic
+
+    ## Testing
+    - Write unit tests for all new functions
+    - Ensure test coverage above 80%
+
+    ## Documentation
+    - Update README.md for any new features
+    - Document API changes in CHANGELOG.md
+  EOT
+}
+```
+
+### Using Multiple MCP Configuration Files
+
+```tf
+module "auggie" {
+  source   = "registry.coder.com/coder-labs/auggie/coder"
+  version  = "0.1.0"
+  agent_id = coder_agent.example.id
+  folder   = "/home/coder/project"
+
+  # Multiple MCP configuration files
+  mcp_files = [
+    "/path/to/filesystem-mcp.json",
+    "/path/to/database-mcp.json",
+    "/path/to/api-mcp.json"
+  ]
+
+  mcp = <<-EOF
+  {
+  "mcpServers": {
+    "Test MCP": {
+      "command": "uv",
+      "args": [
+        "--directory",
+        "/home/coder/test-mcp",
+        "run",
+        "server.py"
+      ],
+      "timeout": 600
+    }
+  }
+}
+EOF
+}
+```
+
+### Troubleshooting
+
+If you have any issues, please take a look at the log files below.
+
+```bash
+# Installation logs
+cat ~/.auggie-module/install.log
+
+# Startup logs
+cat ~/.auggie-module/agentapi-start.log
+
+# Pre/post install script logs
+cat ~/.auggie-module/pre_install.log
+cat ~/.auggie-module/post_install.log
+```
+
+> [!NOTE]
+> To use tasks with Auggie CLI, create a `coder_parameter` named `"AI Prompt"` and pass its value to the auggie module's `ai_prompt` variable. The `folder` variable is required for the module to function correctly.
+
+## References
+
+- [Auggie CLI Reference](https://docs.augmentcode.com/cli/reference)
+- [Auggie CLI MCP Integration](https://docs.augmentcode.com/cli/integrations#mcp-integrations)
+- [Augment Code Documentation](https://docs.augmentcode.com/)
+- [AgentAPI Documentation](https://github.com/coder/agentapi)
+- [Coder AI Agents Guide](https://coder.com/docs/tutorials/ai-agents)
@@ -0,0 +1,186 @@
+run "test_auggie_basic" {
+  command = plan
+
+  variables {
+    agent_id = "test-agent-123"
+    folder   = "/home/coder/projects"
+  }
+
+  assert {
+    condition     = coder_env.auggie_session_auth.name == "AUGMENT_SESSION_AUTH"
+    error_message = "Auggie session auth environment variable should be set correctly"
+  }
+
+  assert {
+    condition     = var.folder == "/home/coder/projects"
+    error_message = "Folder variable should be set correctly"
+  }
+
+  assert {
+    condition     = var.agent_id == "test-agent-123"
+    error_message = "Agent ID variable should be set correctly"
+  }
+
+  assert {
+    condition     = var.install_auggie == true
+    error_message = "Install auggie should default to true"
+  }
+
+  assert {
+    condition     = var.install_agentapi == true
+    error_message = "Install agentapi should default to true"
+  }
+}
+
+run "test_auggie_with_session_token" {
+  command = plan
+
+  variables {
+    agent_id              = "test-agent-456"
+    folder                = "/home/coder/workspace"
+    augment_session_token = "test-session-token-123"
+  }
+
+  assert {
+    condition     = coder_env.auggie_session_auth.value == "test-session-token-123"
+    error_message = "Auggie session token value should match the input"
+  }
+}
+
+run "test_auggie_with_custom_options" {
+  command = plan
+
+  variables {
+    agent_id                       = "test-agent-789"
+    folder                         = "/home/coder/custom"
+    order                          = 5
+    group                          = "development"
+    icon                           = "/icon/custom.svg"
+    auggie_model                   = "gpt-4"
+    ai_prompt                      = "Help me write better code"
+    interaction_mode               = "compact"
+    continue_previous_conversation = true
+    install_auggie                 = false
+    install_agentapi               = false
+    auggie_version                 = "1.0.0"
+    agentapi_version               = "v0.6.0"
+  }
+
+  assert {
+    condition     = var.order == 5
+    error_message = "Order variable should be set to 5"
+  }
+
+  assert {
+    condition     = var.group == "development"
+    error_message = "Group variable should be set to 'development'"
+  }
+
+  assert {
+    condition     = var.icon == "/icon/custom.svg"
+    error_message = "Icon variable should be set to custom icon"
+  }
+
+  assert {
+    condition     = var.auggie_model == "gpt-4"
+    error_message = "Auggie model variable should be set to 'gpt-4'"
+  }
+
+  assert {
+    condition     = var.ai_prompt == "Help me write better code"
+    error_message = "AI prompt variable should be set correctly"
+  }
+
+  assert {
+    condition     = var.interaction_mode == "compact"
+    error_message = "Interaction mode should be set to 'compact'"
+  }
+
+  assert {
+    condition     = var.continue_previous_conversation == true
+    error_message = "Continue previous conversation should be set to true"
+  }
+
+  assert {
+    condition     = var.auggie_version == "1.0.0"
+    error_message = "Auggie version should be set to '1.0.0'"
+  }
+
+  assert {
+    condition     = var.agentapi_version == "v0.6.0"
+    error_message = "AgentAPI version should be set to 'v0.6.0'"
+  }
+}
+
+run "test_auggie_with_mcp_and_rules" {
+  command = plan
+
+  variables {
+    agent_id = "test-agent-mcp"
+    folder   = "/home/coder/mcp-test"
+    mcp = jsonencode({
+      mcpServers = {
+        test = {
+          command = "test-server"
+          args    = ["--config", "test.json"]
+        }
+      }
+    })
+    mcp_files = [
+      "/path/to/mcp1.json",
+      "/path/to/mcp2.json"
+    ]
+    rules = "# General coding rules\n- Write clean code\n- Add comments"
+  }
+
+  assert {
+    condition     = var.mcp != ""
+    error_message = "MCP configuration should be provided"
+  }
+
+  assert {
+    condition     = length(var.mcp_files) == 2
+    error_message = "Should have 2 MCP files"
+  }
+
+  assert {
+    condition     = var.rules != ""
+    error_message = "Rules should be provided"
+  }
+}
+
+run "test_auggie_with_scripts" {
+  command = plan
+
+  variables {
+    agent_id            = "test-agent-scripts"
+    folder              = "/home/coder/scripts"
+    pre_install_script  = "echo 'Pre-install script'"
+    post_install_script = "echo 'Post-install script'"
+  }
+
+  assert {
+    condition     = var.pre_install_script == "echo 'Pre-install script'"
+    error_message = "Pre-install script should be set correctly"
+  }
+
+  assert {
+    condition     = var.post_install_script == "echo 'Post-install script'"
+    error_message = "Post-install script should be set correctly"
+  }
+}
+
+run "test_auggie_interaction_mode_validation" {
+  command = plan
+
+  variables {
+    agent_id         = "test-agent-validation"
+    folder           = "/home/coder/test"
+    interaction_mode = "print"
+  }
+
+  assert {
+    condition     = contains(["interactive", "print", "quiet", "compact"], var.interaction_mode)
+    error_message = "Interaction mode should be one of the valid options"
+  }
+}
@@ -0,0 +1,348 @@
+import {
+  test,
+  afterEach,
+  describe,
+  setDefaultTimeout,
+  beforeAll,
+  expect,
+} from "bun:test";
+import { execContainer, readFileContainer, runTerraformInit } from "~test";
+import {
+  loadTestFile,
+  writeExecutable,
+  setup as setupUtil,
+  execModuleScript,
+  expectAgentAPIStarted,
+} from "../../../coder/modules/agentapi/test-util";
+import dedent from "dedent";
+
+let cleanupFunctions: (() => Promise<void>)[] = [];
+const registerCleanup = (cleanup: () => Promise<void>) => {
+  cleanupFunctions.push(cleanup);
+};
+afterEach(async () => {
+  const cleanupFnsCopy = cleanupFunctions.slice().reverse();
+  cleanupFunctions = [];
+  for (const cleanup of cleanupFnsCopy) {
+    try {
+      await cleanup();
+    } catch (error) {
+      console.error("Error during cleanup:", error);
+    }
+  }
+});
+
+interface SetupProps {
+  skipAgentAPIMock?: boolean;
+  skipAuggieMock?: boolean;
+  moduleVariables?: Record<string, string>;
+  agentapiMockScript?: string;
+}
+
+const setup = async (props?: SetupProps): Promise<{ id: string }> => {
+  const projectDir = "/home/coder/project";
+  const { id } = await setupUtil({
+    moduleDir: import.meta.dir,
+    moduleVariables: {
+      install_auggie: props?.skipAuggieMock ? "true" : "false",
+      install_agentapi: props?.skipAgentAPIMock ? "true" : "false",
+      folder: projectDir,
+      ...props?.moduleVariables,
+    },
+    registerCleanup,
+    projectDir,
+    skipAgentAPIMock: props?.skipAgentAPIMock,
+    agentapiMockScript: props?.agentapiMockScript,
+  });
+  if (!props?.skipAuggieMock) {
+    await writeExecutable({
+      containerId: id,
+      filePath: "/usr/bin/auggie",
+      content: await loadTestFile(import.meta.dir, "auggie-mock.sh"),
+    });
+  }
+  return { id };
+};
+
+setDefaultTimeout(60 * 1000);
+
+describe("auggie", async () => {
+  beforeAll(async () => {
+    await runTerraformInit(import.meta.dir);
+  });
+
+  test("happy-path", async () => {
+    const { id } = await setup();
+    await execModuleScript(id);
+    await expectAgentAPIStarted(id);
+  });
+
+  test("install-auggie-version", async () => {
+    const version_to_install = "0.3.0";
+    const { id } = await setup({
+      skipAuggieMock: true,
+      moduleVariables: {
+        install_auggie: "true",
+        auggie_version: version_to_install,
+        pre_install_script: dedent`
+          #!/usr/bin/env bash
+          set -euo pipefail
+          
+          # Install Node.js and npm via system package manager
+          if ! command -v node >/dev/null 2>&1; then
+            sudo apt-get update
+            sudo apt-get install -y nodejs npm
+          fi
+          
+          # Configure npm to use user directory (avoids permission issues)
+          mkdir -p "$HOME/.npm-global"
+          npm config set prefix "$HOME/.npm-global"
+          
+          # Persist npm user directory configuration
+          echo 'export PATH="$HOME/.npm-global/bin:$PATH"' >> ~/.bashrc
+          echo "prefix=$HOME/.npm-global" > ~/.npmrc
+        `,
+      },
+    });
+    await execModuleScript(id);
+    const resp = await execContainer(id, [
+      "bash",
+      "-c",
+      `cat /home/coder/.auggie-module/install.log`,
+    ]);
+    expect(resp.stdout).toContain(version_to_install);
+  });
+
+  test("check-latest-auggie-version-works", async () => {
+    const { id } = await setup({
+      skipAuggieMock: true,
+      skipAgentAPIMock: true,
+      moduleVariables: {
+        install_auggie: "true",
+        pre_install_script: dedent`
+          #!/usr/bin/env bash
+          set -euo pipefail
+          
+          # Install Node.js and npm via system package manager
+          if ! command -v node >/dev/null 2>&1; then
+            sudo apt-get update
+            sudo apt-get install -y nodejs npm
+          fi
+          
+          # Configure npm to use user directory (avoids permission issues)
+          mkdir -p "$HOME/.npm-global"
+          npm config set prefix "$HOME/.npm-global"
+          
+          # Persist npm user directory configuration
+          echo 'export PATH="$HOME/.npm-global/bin:$PATH"' >> ~/.bashrc
+          echo "prefix=$HOME/.npm-global" > ~/.npmrc
+        `,
+      },
+    });
+    await execModuleScript(id);
+    await expectAgentAPIStarted(id);
+  });
+
+  test("auggie-session-token", async () => {
+    const sessionToken = "test-session-token-123";
+    const { id } = await setup({
+      moduleVariables: {
+        augment_session_token: sessionToken,
+      },
+    });
+    await execModuleScript(id);
+
+    const envCheck = await execContainer(id, [
+      "bash",
+      "-c",
+      `env | grep AUGMENT_SESSION_AUTH || echo "AUGMENT_SESSION_AUTH not found"`,
+    ]);
+    expect(envCheck.stdout).toContain("AUGMENT_SESSION_AUTH");
+  });
+
+  test("auggie-mcp-config", async () => {
+    const mcpConfig = JSON.stringify({
+      mcpServers: {
+        test: {
+          command: "test-cmd",
+          type: "stdio",
+        },
+      },
+    });
+    const { id } = await setup({
+      moduleVariables: {
+        mcp: mcpConfig,
+      },
+    });
+    await execModuleScript(id);
+
+    const resp = await readFileContainer(
+      id,
+      "/home/coder/.auggie-module/agentapi-start.log",
+    );
+    expect(resp).toContain("--mcp-config");
+  });
+
+  test("auggie-rules", async () => {
+    const rules = "Always use TypeScript for new files";
+    const { id } = await setup({
+      moduleVariables: {
+        install_auggie: "false", // Don't need to install auggie to test rules file creation
+        rules: rules,
+      },
+    });
+    await execModuleScript(id);
+
+    const rulesFile = await readFileContainer(
+      id,
+      "/home/coder/.augment/rules.md",
+    );
+    expect(rulesFile).toContain(rules);
+  });
+
+  test("auggie-ai-task-prompt", async () => {
+    const prompt = "This is a task prompt for Auggie.";
+    const { id } = await setup({
+      moduleVariables: {
+        ai_prompt: prompt,
+      },
+    });
+    await execModuleScript(id);
+
+    const resp = await execContainer(id, [
+      "bash",
+      "-c",
+      `cat /home/coder/.auggie-module/agentapi-start.log`,
+    ]);
+    expect(resp.stdout).toContain(prompt);
+  });
+
+  test("auggie-interaction-mode", async () => {
+    const mode = "compact";
+    const { id } = await setup({
+      moduleVariables: {
+        interaction_mode: mode,
+        ai_prompt: "test prompt",
+      },
+    });
+    await execModuleScript(id);
+
+    const startLog = await execContainer(id, [
+      "bash",
+      "-c",
+      "cat /home/coder/.auggie-module/agentapi-start.log",
+    ]);
+    expect(startLog.stdout).toContain(`--${mode}`);
+  });
+
+  test("auggie-model", async () => {
+    const model = "gpt-4";
+    const { id } = await setup({
+      moduleVariables: {
+        auggie_model: model,
+        ai_prompt: "test prompt",
+      },
+    });
+    await execModuleScript(id);
+
+    const startLog = await execContainer(id, [
+      "bash",
+      "-c",
+      "cat /home/coder/.auggie-module/agentapi-start.log",
+    ]);
+    expect(startLog.stdout).toContain(`--model ${model}`);
+  });
+
+  test("auggie-continue-previous-conversation", async () => {
+    const { id } = await setup({
+      moduleVariables: {
+        continue_previous_conversation: "true",
+        ai_prompt: "test prompt",
+      },
+    });
+    await execModuleScript(id);
+
+    const startLog = await execContainer(id, [
+      "bash",
+      "-c",
+      "cat /home/coder/.auggie-module/agentapi-start.log",
+    ]);
+    expect(startLog.stdout).toContain("--continue");
+  });
+
+  test("pre-post-install-scripts", async () => {
+    const { id } = await setup({
+      moduleVariables: {
+        pre_install_script: "#!/bin/bash\necho 'auggie-pre-install-script'",
+        post_install_script: "#!/bin/bash\necho 'auggie-post-install-script'",
+      },
+    });
+    await execModuleScript(id);
+
+    const preInstallLog = await readFileContainer(
+      id,
+      "/home/coder/.auggie-module/pre_install.log",
+    );
+    expect(preInstallLog).toContain("auggie-pre-install-script");
+
+    const postInstallLog = await readFileContainer(
+      id,
+      "/home/coder/.auggie-module/post_install.log",
+    );
+    expect(postInstallLog).toContain("auggie-post-install-script");
+  });
+
+  test("folder-variable", async () => {
+    const folder = "/home/coder/auggie-test-folder";
+    const { id } = await setup({
+      skipAuggieMock: false,
+      moduleVariables: {
+        folder,
+      },
+    });
+    await execModuleScript(id);
+
+    const resp = await readFileContainer(
+      id,
+      "/home/coder/.auggie-module/agentapi-start.log",
+    );
+    expect(resp).toContain(folder);
+  });
+
+  test("coder-mcp-config-created", async () => {
+    const { id } = await setup({
+      moduleVariables: {
+        install_auggie: "false", // Don't need to install auggie to test MCP config creation
+      },
+    });
+    await execModuleScript(id);
+
+    const mcpConfig = await readFileContainer(
+      id,
+      "/home/coder/.augment/coder_mcp.json",
+    );
+    expect(mcpConfig).toContain("mcpServers");
+    expect(mcpConfig).toContain("coder");
+    expect(mcpConfig).toContain("CODER_MCP_APP_STATUS_SLUG");
+    expect(mcpConfig).toContain("CODER_MCP_AI_AGENTAPI_URL");
+  });
+
+  test("mcp-files-array", async () => {
+    const mcpFiles = ["/path/to/mcp1.json", "/path/to/mcp2.json"];
+    const { id } = await setup({
+      moduleVariables: {
+        mcp_files: JSON.stringify(mcpFiles),
+        ai_prompt: "test prompt",
+      },
+    });
+    await execModuleScript(id);
+
+    const startLog = await execContainer(id, [
+      "bash",
+      "-c",
+      "cat /home/coder/.auggie-module/agentapi-start.log",
+    ]);
+    expect(startLog.stdout).toContain("mcp1.json");
+    expect(startLog.stdout).toContain("mcp2.json");
+  });
+});
@@ -0,0 +1,230 @@
+terraform {
+  required_version = ">= 1.0"
+
+  required_providers {
+    coder = {
+      source  = "coder/coder"
+      version = ">= 2.7"
+    }
+  }
+}
+
+variable "agent_id" {
+  type        = string
+  description = "The ID of a Coder agent."
+}
+
+data "coder_workspace" "me" {}
+
+data "coder_workspace_owner" "me" {}
+
+variable "order" {
+  type        = number
+  description = "The order determines the position of app in the UI presentation. The lowest order is shown first and apps with equal order are sorted by name (ascending order)."
+  default     = null
+}
+
+variable "group" {
+  type        = string
+  description = "The name of a group that this app belongs to."
+  default     = null
+}
+
+variable "icon" {
+  type        = string
+  description = "The icon to use for the app."
+  default     = "/icon/auggie.svg"
+}
+
+variable "folder" {
+  type        = string
+  description = "The folder to run Auggie in."
+}
+
+variable "install_auggie" {
+  type        = bool
+  description = "Whether to install Auggie CLI."
+  default     = true
+}
+
+variable "auggie_version" {
+  type        = string
+  description = "The version of Auggie to install."
+  default     = "" # empty string means the latest available version
+  validation {
+    condition     = var.auggie_version == "" || can(regex("^v?[0-9]+\\.[0-9]+\\.[0-9]+", var.auggie_version))
+    error_message = "auggie_version must be empty (for latest) or a valid semantic version like 'v1.2.3' or '1.2.3'."
+  }
+}
+
+variable "install_agentapi" {
+  type        = bool
+  description = "Whether to install AgentAPI."
+  default     = true
+}
+
+variable "agentapi_version" {
+  type        = string
+  description = "The version of AgentAPI to install."
+  default     = "v0.6.0"
+  validation {
+    condition     = can(regex("^v[0-9]+\\.[0-9]+\\.[0-9]+", var.agentapi_version))
+    error_message = "agentapi_version must be a valid semantic version starting with 'v', like 'v0.3.3'."
+  }
+}
+
+variable "pre_install_script" {
+  type        = string
+  description = "Custom script to run before installing Auggie."
+  default     = null
+}
+
+variable "post_install_script" {
+  type        = string
+  description = "Custom script to run after installing Auggie."
+  default     = null
+}
+
+# ----------------------------------------------
+
+variable "ai_prompt" {
+  type        = string
+  description = "Task prompt for the Auggie CLI"
+  default     = ""
+}
+
+variable "mcp" {
+  type        = string
+  description = "MCP configuration as a JSON string for the auggie cli, check https://docs.augmentcode.com/cli/integrations#mcp-integrations"
+  default     = ""
+}
+
+variable "mcp_files" {
+  type        = list(string)
+  description = "MCP configuration from a JSON file for the auggie cli, check https://docs.augmentcode.com/cli/integrations#mcp-integrations"
+  default     = []
+}
+
+variable "rules" {
+  type        = string
+  description = "Additional rules to append to workspace guidelines (markdown format)"
+  default     = ""
+}
+
+variable "continue_previous_conversation" {
+  type        = bool
+  description = "Whether to resume the previous conversation."
+  default     = false
+}
+
+variable "interaction_mode" {
+  type        = string
+  description = "Interaction mode with the Auggie CLI. Options: interactive, print, quiet, compact. https://docs.augmentcode.com/cli/reference#cli-flags"
+  default     = "interactive"
+  validation {
+    condition     = contains(["interactive", "print", "quiet", "compact"], var.interaction_mode)
+    error_message = "interaction_mode must be one of: interactive, print, quiet, compact."
+  }
+}
+
+variable "augment_session_token" {
+  type        = string
+  description = "Auggie session token for authentication. https://docs.augmentcode.com/cli/setup-auggie/authentication"
+  default     = ""
+}
+
+variable "auggie_model" {
+  type        = string
+  description = "The model to use for Auggie, find available models using auggie --list-models"
+  default     = ""
+}
+
+variable "report_tasks" {
+  type        = bool
+  description = "Whether to enable task reporting to Coder UI via AgentAPI"
+  default     = false
+}
+
+variable "cli_app" {
+  type        = bool
+  description = "Whether to create a CLI app for Auggie"
+  default     = false
+}
+
+variable "web_app_display_name" {
+  type        = string
+  description = "Display name for the web app"
+  default     = "Auggie"
+}
+
+variable "cli_app_display_name" {
+  type        = string
+  description = "Display name for the CLI app"
+  default     = "Auggie CLI"
+}
+
+resource "coder_env" "auggie_session_auth" {
+  agent_id = var.agent_id
+  name     = "AUGMENT_SESSION_AUTH"
+  value    = var.augment_session_token
+}
+
+locals {
+  app_slug        = "auggie"
+  install_script  = file("${path.module}/scripts/install.sh")
+  start_script    = file("${path.module}/scripts/start.sh")
+  module_dir_name = ".auggie-module"
+}
+
+module "agentapi" {
+  source  = "registry.coder.com/coder/agentapi/coder"
+  version = "1.1.1"
+
+  agent_id             = var.agent_id
+  web_app_slug         = local.app_slug
+  web_app_order        = var.order
+  web_app_group        = var.group
+  web_app_icon         = var.icon
+  web_app_display_name = var.web_app_display_name
+  cli_app              = var.cli_app
+  cli_app_slug         = var.cli_app ? "${local.app_slug}-cli" : null
+  cli_app_display_name = var.cli_app ? var.cli_app_display_name : null
+  module_dir_name      = local.module_dir_name
+  install_agentapi     = var.install_agentapi
+  agentapi_version     = var.agentapi_version
+  pre_install_script   = var.pre_install_script
+  post_install_script  = var.post_install_script
+  start_script         = <<-EOT
+     #!/bin/bash
+     set -o errexit
+     set -o pipefail
+
+     echo -n '${base64encode(local.start_script)}' | base64 -d > /tmp/start.sh
+     chmod +x /tmp/start.sh
+     ARG_AUGGIE_START_DIRECTORY='${var.folder}' \
+     ARG_TASK_PROMPT='${base64encode(var.ai_prompt)}' \
+     ARG_MCP_FILES='${jsonencode(var.mcp_files)}' \
+     ARG_AUGGIE_RULES='${base64encode(var.rules)}' \
+     ARG_AUGGIE_CONTINUE_PREVIOUS_CONVERSATION='${var.continue_previous_conversation}' \
+     ARG_AUGGIE_INTERACTION_MODE='${var.interaction_mode}' \
+     ARG_AUGMENT_SESSION_AUTH='${var.augment_session_token}' \
+     ARG_AUGGIE_MODEL='${var.auggie_model}' \
+     ARG_REPORT_TASKS='${var.report_tasks}' \
+     /tmp/start.sh
+   EOT
+
+  install_script = <<-EOT
+    #!/bin/bash
+    set -o errexit
+    set -o pipefail
+
+    echo -n '${base64encode(local.install_script)}' | base64 -d > /tmp/install.sh
+    chmod +x /tmp/install.sh
+    ARG_AUGGIE_INSTALL='${var.install_auggie}' \
+    ARG_AUGGIE_VERSION='${var.auggie_version}' \
+    ARG_MCP_APP_STATUS_SLUG='${local.app_slug}' \
+    ARG_AUGGIE_RULES='${base64encode(var.rules)}' \
+    ARG_MCP_CONFIG='${var.mcp != null ? base64encode(replace(var.mcp, "'", "'\\''")) : ""}' \
+    /tmp/install.sh
+  EOT
+}
@@ -0,0 +1,125 @@
+#!/bin/bash
+set -euo pipefail
+
+source "$HOME"/.bashrc
+
+BOLD='\033[0;1m'
+
+# Function to check if a command exists
+command_exists() {
+  command -v "$1" > /dev/null 2>&1
+}
+
+ARG_AUGGIE_INSTALL=${ARG_AUGGIE_INSTALL:-true}
+ARG_AUGGIE_VERSION=${ARG_AUGGIE_VERSION:-}
+ARG_MCP_APP_STATUS_SLUG=${ARG_MCP_APP_STATUS_SLUG:-}
+ARG_AUGGIE_RULES=$(echo -n "${ARG_AUGGIE_RULES:-}" | base64 -d)
+ARG_MCP_CONFIG=${ARG_MCP_CONFIG:-}
+
+echo "--------------------------------"
+
+printf "install auggie: %s\n" "$ARG_AUGGIE_INSTALL"
+printf "auggie_version: %s\n" "$ARG_AUGGIE_VERSION"
+printf "app_slug: %s\n" "$ARG_MCP_APP_STATUS_SLUG"
+printf "rules: %s\n" "$ARG_AUGGIE_RULES"
+
+echo "--------------------------------"
+
+function check_dependencies() {
+  if ! command_exists node; then
+    printf "Error: Node.js is not installed. Please install Node.js manually or use the pre_install_script to install it.\n"
+    exit 1
+  fi
+
+  if ! command_exists npm; then
+    printf "Error: npm is not installed. Please install npm manually or use the pre_install_script to install it.\n"
+    exit 1
+  fi
+
+  printf "Node.js version: %s\n" "$(node --version)"
+  printf "npm version: %s\n" "$(npm --version)"
+}
+
+function install_auggie() {
+  if [ "${ARG_AUGGIE_INSTALL}" = "true" ]; then
+    check_dependencies
+
+    printf "%s Installing Auggie CLI\n" "${BOLD}"
+
+    NPM_GLOBAL_PREFIX="${HOME}/.npm-global"
+    if [ ! -d "$NPM_GLOBAL_PREFIX" ]; then
+      mkdir -p "$NPM_GLOBAL_PREFIX"
+    fi
+
+    npm config set prefix "$NPM_GLOBAL_PREFIX"
+
+    export PATH="$NPM_GLOBAL_PREFIX/bin:$PATH"
+
+    if [ -n "$ARG_AUGGIE_VERSION" ]; then
+      npm install -g "@augmentcode/auggie@$ARG_AUGGIE_VERSION"
+    else
+      npm install -g "@augmentcode/auggie"
+    fi
+
+    if ! grep -q "export PATH=\"\$HOME/.npm-global/bin:\$PATH\"" "$HOME/.bashrc"; then
+      echo 'export PATH="$HOME/.npm-global/bin:$PATH"' >> "$HOME/.bashrc"
+    fi
+
+    printf "%s Successfully installed Auggie CLI. Version: %s\n" "${BOLD}" "$(auggie --version)"
+  else
+    printf "Skipping Auggie CLI installation (install_auggie=false)\n"
+  fi
+}
+
+function create_coder_mcp() {
+  AUGGIE_CODER_MCP_FILE="$HOME/.augment/coder_mcp.json"
+  CODER_MCP=$(
+    cat << EOF
+{
+  "mcpServers":{
+   "coder": {
+     "args": ["exp", "mcp", "server"],
+     "command": "coder",
+     "env": {
+       "CODER_MCP_APP_STATUS_SLUG": "${ARG_MCP_APP_STATUS_SLUG}",
+       "CODER_MCP_AI_AGENTAPI_URL": "http://localhost:3284",
+       "CODER_AGENT_URL": "${CODER_AGENT_URL:-}",
+       "CODER_AGENT_TOKEN": "${CODER_AGENT_TOKEN:-}"
+     }
+   }
+  }
+}
+EOF
+  )
+  mkdir -p "$(dirname "$AUGGIE_CODER_MCP_FILE")"
+  echo "$CODER_MCP" > "$AUGGIE_CODER_MCP_FILE"
+  printf "Coder MCP config created at: %s\n" "$AUGGIE_CODER_MCP_FILE"
+}
+
+function create_user_mcp() {
+  if [ -n "$ARG_MCP_CONFIG" ]; then
+    USER_MCP_CONFIG_FILE="$HOME/.augment/user_mcp.json"
+    USER_MCP_CONTENT=$(echo -n "$ARG_MCP_CONFIG" | base64 -d)
+    mkdir -p "$(dirname "$USER_MCP_CONFIG_FILE")"
+    echo "$USER_MCP_CONTENT" > "$USER_MCP_CONFIG_FILE"
+    printf "User MCP config created at: %s\n" "$USER_MCP_CONFIG_FILE"
+  else
+    printf "No user MCP config provided, skipping user MCP config creation.\n"
+  fi
+}
+
+function create_rules_file() {
+  AUGGIE_RULES_FILE="$HOME/.augment/rules.md"
+  if [ -n "$ARG_AUGGIE_RULES" ]; then
+    mkdir -p "$(dirname "$AUGGIE_RULES_FILE")"
+    echo -n "$ARG_AUGGIE_RULES" > "$AUGGIE_RULES_FILE"
+    printf "Rules file created at: %s\n" "$AUGGIE_RULES_FILE"
+  else
+    printf "No rules provided, skipping rules file creation.\n"
+  fi
+}
+
+install_auggie
+create_coder_mcp
+create_user_mcp
+create_rules_file
@@ -0,0 +1,103 @@
+#!/bin/bash
+set -euo pipefail
+
+source "$HOME"/.bashrc
+
+command_exists() {
+  command -v "$1" > /dev/null 2>&1
+}
+
+if [ -f "$HOME/.nvm/nvm.sh" ]; then
+  source "$HOME"/.nvm/nvm.sh
+else
+  export PATH="$HOME/.npm-global/bin:$PATH"
+fi
+
+ARG_AUGGIE_START_DIRECTORY=${ARG_AUGGIE_START_DIRECTORY:-"$HOME"}
+ARG_TASK_PROMPT=$(echo -n "${ARG_TASK_PROMPT:-}" | base64 -d)
+ARG_MCP_FILES=${ARG_MCP_FILES:-[]}
+ARG_AUGGIE_RULES=${ARG_AUGGIE_RULES:-}
+ARG_AUGMENT_SESSION_AUTH=${ARG_AUGMENT_SESSION_AUTH:-}
+ARG_AUGGIE_CONTINUE_PREVIOUS_CONVERSATION=${ARG_AUGGIE_CONTINUE_PREVIOUS_CONVERSATION:-false}
+ARG_AUGGIE_INTERACTION_MODE=${ARG_AUGGIE_INTERACTION_MODE:-"interactive"}
+ARG_AUGGIE_MODEL=${ARG_AUGGIE_MODEL:-}
+ARG_REPORT_TASKS=${ARG_REPORT_TASKS:-false}
+
+ARGS=()
+
+echo "--------------------------------"
+
+printf "auggie_start_directory: %s\n" "$ARG_AUGGIE_START_DIRECTORY"
+printf "task_prompt: %s\n" "$ARG_TASK_PROMPT"
+printf "mcp_files: %s\n" "$ARG_MCP_FILES"
+printf "auggie_rules: %s\n" "$ARG_AUGGIE_RULES"
+printf "continue_previous_conversation: %s\n" "$ARG_AUGGIE_CONTINUE_PREVIOUS_CONVERSATION"
+printf "auggie_interaction_mode: %s\n" "$ARG_AUGGIE_INTERACTION_MODE"
+printf "augment_session_auth: %s\n" "$ARG_AUGMENT_SESSION_AUTH"
+printf "auggie_model: %s\n" "$ARG_AUGGIE_MODEL"
+printf "report_tasks: %s\n" "$ARG_REPORT_TASKS"
+
+echo "--------------------------------"
+
+function validate_auggie_installation() {
+  if command_exists auggie; then
+    printf "Auggie is installed\n"
+  else
+    printf "Error: Auggie is not installed. Please enable install_auggie or install it manually\n"
+    exit 1
+  fi
+}
+
+function build_auggie_args() {
+  if [ -n "$ARG_AUGGIE_INTERACTION_MODE" ]; then
+    if [ "$ARG_AUGGIE_INTERACTION_MODE" != "interactive" ]; then
+      ARGS+=(--"$ARG_AUGGIE_INTERACTION_MODE")
+    fi
+  fi
+
+  if [ -n "$ARG_AUGGIE_MODEL" ]; then
+    ARGS+=(--model "$ARG_AUGGIE_MODEL")
+  fi
+
+  if [ -f "$HOME/.augment/user_mcp.json" ]; then
+    ARGS+=(--mcp-config "$HOME/.augment/user_mcp.json")
+  fi
+
+  if [ -n "$ARG_MCP_FILES" ] && [ "$ARG_MCP_FILES" != "[]" ]; then
+    for file in $(echo "$ARG_MCP_FILES" | jq -r '.[]'); do
+      ARGS+=(--mcp-config "$file")
+    done
+  fi
+
+  ARGS+=(--mcp-config "$HOME/.augment/coder_mcp.json")
+
+  if [ -n "$ARG_AUGGIE_RULES" ]; then
+    AUGGIE_RULES_FILE="$HOME/.augment/rules.md"
+    ARGS+=(--rules "$AUGGIE_RULES_FILE")
+  fi
+
+  if [ "$ARG_AUGGIE_CONTINUE_PREVIOUS_CONVERSATION" == "true" ]; then
+    ARGS+=(--continue)
+  fi
+
+  if [ -n "$ARG_TASK_PROMPT" ]; then
+    if [ "$ARG_REPORT_TASKS" == "true" ]; then
+      PROMPT="Every step of the way, report your progress using coder_report_task tool with proper summary and statuses. Your task at hand: $ARG_TASK_PROMPT"
+    else
+      PROMPT="$ARG_TASK_PROMPT"
+    fi
+    ARGS+=(--instruction "$PROMPT")
+  fi
+}
+
+function start_agentapi_server() {
+  mkdir -p "$ARG_AUGGIE_START_DIRECTORY"
+  cd "$ARG_AUGGIE_START_DIRECTORY"
+  ARGS+=(--workspace-root "$ARG_AUGGIE_START_DIRECTORY")
+  printf "Running auggie with args: %s\n" "$(printf '%q ' "${ARGS[@]}")"
+  agentapi server --term-width 67 --term-height 1190 -- auggie "${ARGS[@]}"
+}
+
+validate_auggie_installation
+build_auggie_args
+start_agentapi_server
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+if [[ "$1" == "--version" ]]; then
+  echo "HELLO: $(bash -c env)"
+  echo "auggie version v1.0.0"
+  exit 0
+fi
+
+set -e
+
+while true; do
+  echo "$(date) - auggie-mock"
+  sleep 15
+done
@@ -124,8 +124,8 @@ describe("codex", async () => {
    });
    await execModuleScript(id);
    const resp = await readFileContainer(id, "/home/coder/.codex/config.toml");
-    expect(resp).toContain("sandbox_mode = \"danger-full-access\"");
-    expect(resp).toContain("preferred_auth_method = \"apikey\"");
+    expect(resp).toContain('sandbox_mode = "danger-full-access"');
+    expect(resp).toContain('preferred_auth_method = "apikey"');
    expect(resp).toContain("[custom_section]");
    expect(resp).toContain("[mcp_servers.Coder]");
  });
@@ -221,7 +221,7 @@ describe("codex", async () => {
      debug = true
      logging_level = "verbose"
    `.trim();
-    
+
    const additionalMCP = dedent`
      [mcp_servers.CustomTool]
      command = "/usr/local/bin/custom-tool"
@@ -235,7 +235,7 @@ describe("codex", async () => {
      type = "stdio"
      description = "Database query interface"
    `.trim();
-    
+
    const { id } = await setup({
      moduleVariables: {
        base_config_toml: baseConfig,
@@ -244,14 +244,14 @@ describe("codex", async () => {
    });
    await execModuleScript(id);
    const resp = await readFileContainer(id, "/home/coder/.codex/config.toml");
-    
+
    // Check base config
-    expect(resp).toContain("sandbox_mode = \"read-only\"");
-    expect(resp).toContain("preferred_auth_method = \"chatgpt\"");
-    expect(resp).toContain("custom_setting = \"test-value\"");
+    expect(resp).toContain('sandbox_mode = "read-only"');
+    expect(resp).toContain('preferred_auth_method = "chatgpt"');
+    expect(resp).toContain('custom_setting = "test-value"');
    expect(resp).toContain("[advanced_settings]");
-    expect(resp).toContain("logging_level = \"verbose\"");
-    
+    expect(resp).toContain('logging_level = "verbose"');
+
    // Check MCP servers
    expect(resp).toContain("[mcp_servers.Coder]");
    expect(resp).toContain("[mcp_servers.CustomTool]");
@@ -268,17 +268,17 @@ describe("codex", async () => {
    });
    await execModuleScript(id);
    const resp = await readFileContainer(id, "/home/coder/.codex/config.toml");
-    
+
    // Check default base config
-    expect(resp).toContain("sandbox_mode = \"workspace-write\"");
-    expect(resp).toContain("approval_policy = \"never\"");
+    expect(resp).toContain('sandbox_mode = "workspace-write"');
+    expect(resp).toContain('approval_policy = "never"');
    expect(resp).toContain("[sandbox_workspace_write]");
    expect(resp).toContain("network_access = true");
-    
+
    // Check only Coder MCP server is present
    expect(resp).toContain("[mcp_servers.Coder]");
    expect(resp).toContain("Report ALL tasks and statuses");
-    
+
    // Ensure no additional MCP servers
    const mcpServerCount = (resp.match(/\[mcp_servers\./g) || []).length;
    expect(mcpServerCount).toBe(1);
@@ -328,7 +328,10 @@ describe("codex", async () => {
      },
    });
    await execModuleScript(id_2);
-    const resp_2 = await readFileContainer(id_2, "/home/coder/.codex/AGENTS.md");
+    const resp_2 = await readFileContainer(
+      id_2,
+      "/home/coder/.codex/AGENTS.md",
+    );
    expect(resp_2).toContain(prompt_1);
    const count = (resp_2.match(new RegExp(prompt_1, "g")) || []).length;
    expect(count).toBe(1);
@@ -84,8 +84,8 @@ function install_codex() {
 }

 write_minimal_default_config() {
-    local config_path="$1"
-    cat << EOF > "$config_path"
+  local config_path="$1"
+  cat << EOF > "$config_path"
 # Minimal Default Codex Configuration
 sandbox_mode = "workspace-write"
 approval_policy = "never"
@@ -98,9 +98,9 @@ EOF
 }

 append_mcp_servers_section() {
-    local config_path="$1"
-    
-    cat << EOF >> "$config_path"
+  local config_path="$1"
+
+  cat << EOF >> "$config_path"

 # MCP Servers Configuration
 [mcp_servers.Coder]
@@ -112,32 +112,32 @@ type = "stdio"

 EOF

-    if [ -n "$ARG_ADDITIONAL_MCP_SERVERS" ]; then
-        printf "Adding additional MCP servers\n"
-        echo "$ARG_ADDITIONAL_MCP_SERVERS" >> "$config_path"
-    fi
+  if [ -n "$ARG_ADDITIONAL_MCP_SERVERS" ]; then
+    printf "Adding additional MCP servers\n"
+    echo "$ARG_ADDITIONAL_MCP_SERVERS" >> "$config_path"
+  fi
 }

 function populate_config_toml() {
-    CONFIG_PATH="$HOME/.codex/config.toml"
-    mkdir -p "$(dirname "$CONFIG_PATH")"
-    
-    if [ -n "$ARG_BASE_CONFIG_TOML" ]; then
-        printf "Using provided base configuration\n"
-        echo "$ARG_BASE_CONFIG_TOML" > "$CONFIG_PATH"
-    else
-        printf "Using minimal default configuration\n"
-        write_minimal_default_config "$CONFIG_PATH"
-    fi
-    
-    append_mcp_servers_section "$CONFIG_PATH"
+  CONFIG_PATH="$HOME/.codex/config.toml"
+  mkdir -p "$(dirname "$CONFIG_PATH")"
+
+  if [ -n "$ARG_BASE_CONFIG_TOML" ]; then
+    printf "Using provided base configuration\n"
+    echo "$ARG_BASE_CONFIG_TOML" > "$CONFIG_PATH"
+  else
+    printf "Using minimal default configuration\n"
+    write_minimal_default_config "$CONFIG_PATH"
+  fi
+
+  append_mcp_servers_section "$CONFIG_PATH"
 }

 function add_instruction_prompt_if_exists() {
  if [ -n "${ARG_CODEX_INSTRUCTION_PROMPT:-}" ]; then
    AGENTS_PATH="$HOME/.codex/AGENTS.md"
    printf "Creating AGENTS.md in .codex directory: %s\\n" "${AGENTS_PATH}"
-    
+
    mkdir -p "$HOME/.codex"

    if [ -f "${AGENTS_PATH}" ] && grep -Fq "${ARG_CODEX_INSTRUCTION_PROMPT}" "${AGENTS_PATH}"; then
@@ -146,7 +146,7 @@ function add_instruction_prompt_if_exists() {
      printf "Appending instruction prompt to AGENTS.md in .codex directory\n"
      echo -e "\n${ARG_CODEX_INSTRUCTION_PROMPT}" >> "${AGENTS_PATH}"
    fi
-    
+
    if [ ! -d "${ARG_CODEX_START_DIRECTORY}" ]; then
      printf "Creating start directory '%s'\\n" "${ARG_CODEX_START_DIRECTORY}"
      mkdir -p "${ARG_CODEX_START_DIRECTORY}" || {
@@ -55,8 +55,6 @@ if [ -n "$ARG_CODEX_MODEL" ]; then
  CODEX_ARGS+=("--model" "$ARG_CODEX_MODEL")
 fi

-
-
 if [ -n "$ARG_CODEX_TASK_PROMPT" ]; then
  printf "Running the task prompt %s\n" "$ARG_CODEX_TASK_PROMPT"
  PROMPT="Complete the task at hand in one go. Every step of the way, report your progress using coder_report_task tool with proper summary and statuses. Your task at hand: $ARG_CODEX_TASK_PROMPT"
@@ -65,7 +63,6 @@ else
  printf "No task prompt given.\n"
 fi

-
 # Terminal dimensions optimized for Coder Tasks UI sidebar:
 # - Width 67: fits comfortably in sidebar
 # - Height 1190: adjusted due to Codex terminal height bug
@@ -1,12 +1,22 @@
-import { afterEach, beforeAll, describe, expect, setDefaultTimeout, test } from "bun:test";
+import {
+  afterEach,
+  beforeAll,
+  describe,
+  expect,
+  setDefaultTimeout,
+  test,
+} from "bun:test";
 import { execContainer, runTerraformInit, writeFileContainer } from "~test";
 import {
  execModuleScript,
  expectAgentAPIStarted,
  loadTestFile,
-  setup as setupUtil
+  setup as setupUtil,
+} from "../../../coder/modules/agentapi/test-util";
+import {
+  setupContainer,
+  writeExecutable,
 } from "../../../coder/modules/agentapi/test-util";
-import { setupContainer, writeExecutable } from "../../../coder/modules/agentapi/test-util";

 let cleanupFns: (() => Promise<void>)[] = [];
 const registerCleanup = (fn: () => Promise<void>) => cleanupFns.push(fn);
@@ -72,11 +82,12 @@ describe("cursor-cli", async () => {
  });

  test("agentapi-mcp-json", async () => {
-    const mcpJson = '{"mcpServers": {"test": {"command": "test-cmd", "type": "stdio"}}}';
+    const mcpJson =
+      '{"mcpServers": {"test": {"command": "test-cmd", "type": "stdio"}}}';
    const { id } = await setup({
      moduleVariables: {
        mcp: mcpJson,
-      }
+      },
    });
    const resp = await execModuleScript(id);
    expect(resp.exitCode).toBe(0);
@@ -99,7 +110,7 @@ describe("cursor-cli", async () => {
    const { id } = await setup({
      moduleVariables: {
        rules_files: JSON.stringify({ "typescript.md": rulesContent }),
-      }
+      },
    });
    const resp = await execModuleScript(id);
    expect(resp.exitCode).toBe(0);
@@ -118,7 +129,7 @@ describe("cursor-cli", async () => {
    const { id } = await setup({
      moduleVariables: {
        api_key: apiKey,
-      }
+      },
    });
    const resp = await execModuleScript(id);
    expect(resp.exitCode).toBe(0);
@@ -138,7 +149,7 @@ describe("cursor-cli", async () => {
        model: model,
        force: "true",
        ai_prompt: "test prompt",
-      }
+      },
    });
    const resp = await execModuleScript(id);
    expect(resp.exitCode).toBe(0);
@@ -158,7 +169,7 @@ describe("cursor-cli", async () => {
      moduleVariables: {
        pre_install_script: "#!/bin/bash\necho 'cursor-pre-install-script'",
        post_install_script: "#!/bin/bash\necho 'cursor-post-install-script'",
-      }
+      },
    });
    const resp = await execModuleScript(id);
    expect(resp.exitCode).toBe(0);
@@ -183,7 +194,7 @@ describe("cursor-cli", async () => {
    const { id } = await setup({
      moduleVariables: {
        folder: folder,
-      }
+      },
    });
    const resp = await execModuleScript(id);
    expect(resp.exitCode).toBe(0);
@@ -205,8 +216,5 @@ describe("cursor-cli", async () => {
    expect(resp.exitCode).toBe(0);

    await expectAgentAPIStarted(id);
-  })
-
+  });
 });
-
-
@@ -58,7 +58,7 @@ fi

 if [ -n "$ARG_AI_PROMPT" ]; then
  printf "AI prompt provided\n"
-   ARGS+=("Complete the task at hand in one go. Every step of the way, report your progress using coder_report_task tool with proper summary and statuses. Your task at hand: $ARG_AI_PROMPT")
+  ARGS+=("Complete the task at hand in one go. Every step of the way, report your progress using coder_report_task tool with proper summary and statuses. Your task at hand: $ARG_AI_PROMPT")
 fi

 # Log and run in background, redirecting all output to the log file
@@ -9,6 +9,6 @@ fi
 set -e

 while true; do
-    echo "$(date) - cursor-agent-mock"
-    sleep 15
-done
+  echo "$(date) - cursor-agent-mock"
+  sleep 15
+done
@@ -13,7 +13,7 @@ Run [Gemini CLI](https://github.com/google-gemini/gemini-cli) in your workspace
 ```tf
 module "gemini" {
  source   = "registry.coder.com/coder-labs/gemini/coder"
-  version  = "1.1.0"
+  version  = "2.0.0"
  agent_id = coder_agent.example.id
  folder   = "/home/coder/project"
 }
@@ -30,7 +30,7 @@ module "gemini" {

 ## Prerequisites

- Node.js and npm will be installed automatically if not present
+- **Node.js and npm must be sourced/available before the gemini module installs** - ensure they are installed in your workspace image or via earlier provisioning steps
 - The [Coder Login](https://registry.coder.com/modules/coder/coder-login) module is required

 ## Examples
@@ -46,7 +46,7 @@ variable "gemini_api_key" {

 module "gemini" {
  source         = "registry.coder.com/coder-labs/gemini/coder"
-  version        = "1.1.0"
+  version        = "2.0.0"
  agent_id       = coder_agent.example.id
  gemini_api_key = var.gemini_api_key
  folder         = "/home/coder/project"
@@ -94,7 +94,7 @@ data "coder_parameter" "ai_prompt" {
 module "gemini" {
  count                = data.coder_workspace.me.start_count
  source               = "registry.coder.com/coder-labs/gemini/coder"
-  version              = "1.1.0"
+  version              = "2.0.0"
  agent_id             = coder_agent.example.id
  gemini_api_key       = var.gemini_api_key
  gemini_model         = "gemini-2.5-flash"
@@ -118,7 +118,7 @@ For enterprise users who prefer Google's Vertex AI platform:
 ```tf
 module "gemini" {
  source         = "registry.coder.com/coder-labs/gemini/coder"
-  version        = "1.1.0"
+  version        = "2.0.0"
  agent_id       = coder_agent.example.id
  gemini_api_key = var.gemini_api_key
  folder         = "/home/coder/project"
@@ -107,6 +107,18 @@ describe("gemini", async () => {
    expect(resp.stdout).toContain(version_to_install);
  });

+  test("install-gemini-latest", async () => {
+    const { id } = await setup({
+      skipGeminiMock: true,
+      moduleVariables: {
+        install_gemini: "true",
+        gemini_version: "",
+      },
+    });
+    await execModuleScript(id);
+    await expectAgentAPIStarted(id);
+  });
+
  test("gemini-settings-json", async () => {
    const settings = '{"foo": "bar"}';
    const { id } = await setup({
@@ -115,7 +127,10 @@ describe("gemini", async () => {
      },
    });
    await execModuleScript(id);
-    const resp = await readFileContainer(id, "/home/coder/.gemini/settings.json");
+    const resp = await readFileContainer(
+      id,
+      "/home/coder/.gemini/settings.json",
+    );
    expect(resp).toContain("foo");
    expect(resp).toContain("bar");
  });
@@ -129,7 +144,10 @@ describe("gemini", async () => {
    });
    await execModuleScript(id);

-    const resp = await readFileContainer(id, "/home/coder/.gemini-module/agentapi-start.log");
+    const resp = await readFileContainer(
+      id,
+      "/home/coder/.gemini-module/agentapi-start.log",
+    );
    expect(resp).toContain("Using direct Gemini API with API key");
  });

@@ -141,8 +159,11 @@ describe("gemini", async () => {
      },
    });
    await execModuleScript(id);
-    const resp = await readFileContainer(id, "/home/coder/.gemini-module/install.log");
-    expect(resp).toContain('GOOGLE_GENAI_USE_VERTEXAI=\'true\'');
+    const resp = await readFileContainer(
+      id,
+      "/home/coder/.gemini-module/agentapi-start.log",
+    );
+    expect(resp).toContain("GOOGLE_GENAI_USE_VERTEXAI='true'");
  });

  test("gemini-model", async () => {
@@ -154,7 +175,10 @@ describe("gemini", async () => {
      },
    });
    await execModuleScript(id);
-    const resp = await readFileContainer(id, "/home/coder/.gemini-module/install.log");
+    const resp = await readFileContainer(
+      id,
+      "/home/coder/.gemini-module/agentapi-start.log",
+    );
    expect(resp).toContain(model);
  });

@@ -166,9 +190,15 @@ describe("gemini", async () => {
      },
    });
    await execModuleScript(id);
-    const preInstallLog = await readFileContainer(id, "/home/coder/.gemini-module/pre_install.log");
+    const preInstallLog = await readFileContainer(
+      id,
+      "/home/coder/.gemini-module/pre_install.log",
+    );
    expect(preInstallLog).toContain("pre-install-script");
-    const postInstallLog = await readFileContainer(id, "/home/coder/.gemini-module/post_install.log");
+    const postInstallLog = await readFileContainer(
+      id,
+      "/home/coder/.gemini-module/post_install.log",
+    );
    expect(postInstallLog).toContain("post-install-script");
  });

@@ -181,7 +211,10 @@ describe("gemini", async () => {
      },
    });
    await execModuleScript(id);
-    const resp = await readFileContainer(id, "/home/coder/.gemini-module/install.log");
+    const resp = await readFileContainer(
+      id,
+      "/home/coder/.gemini-module/agentapi-start.log",
+    );
    expect(resp).toContain(folder);
  });

@@ -193,7 +226,10 @@ describe("gemini", async () => {
      },
    });
    await execModuleScript(id);
-    const resp = await readFileContainer(id, "/home/coder/.gemini/settings.json");
+    const resp = await readFileContainer(
+      id,
+      "/home/coder/.gemini/settings.json",
+    );
    expect(resp).toContain("custom");
    expect(resp).toContain("enabled");
  });
@@ -220,14 +256,21 @@ describe("gemini", async () => {
    await execModuleScript(id, {
      GEMINI_TASK_PROMPT: taskPrompt,
    });
-    const resp = await readFileContainer(id, "/home/coder/.gemini-module/agentapi-start.log");
+    const resp = await readFileContainer(
+      id,
+      "/home/coder/.gemini-module/agentapi-start.log",
+    );
    expect(resp).toContain("Running automated task:");
  });

  test("start-without-prompt", async () => {
    const { id } = await setup();
    await execModuleScript(id);
-    const prompt = await execContainer(id, ["ls", "-l", "/home/coder/GEMINI.md"]);
+    const prompt = await execContainer(id, [
+      "ls",
+      "-l",
+      "/home/coder/GEMINI.md",
+    ]);
    expect(prompt.exitCode).not.toBe(0);
    expect(prompt.stderr).toContain("No such file or directory");
  });
@@ -1,9 +1,9 @@
 #!/bin/bash

 BOLD='\033[0;1m'
-
+source "$HOME"/.bashrc
 command_exists() {
-    command -v "$1" >/dev/null 2>&1
+  command -v "$1" > /dev/null 2>&1
 }

 set -o nounset
@@ -21,144 +21,132 @@ echo "--------------------------------"

 set +o nounset

-function install_node() {
-    if ! command_exists npm; then
-      printf "npm not found, checking for Node.js installation...\n"
-      if ! command_exists node; then
-        printf "Node.js not found, installing Node.js via NVM...\n"
-        export NVM_DIR="$HOME/.nvm"
-        if [ ! -d "$NVM_DIR" ]; then
-          mkdir -p "$NVM_DIR"
-          curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
-          [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-        else
-          [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-        fi
+function check_dependencies() {
+  if ! command_exists node; then
+    printf "Error: Node.js is not installed. Please install Node.js manually or use the pre_install_script to install it.\n"
+    exit 1
+  fi

-        nvm install --lts
-        nvm use --lts
-        nvm alias default node
+  if ! command_exists npm; then
+    printf "Error: npm is not installed. Please install npm manually or use the pre_install_script to install it.\n"
+    exit 1
+  fi

-        printf "Node.js installed: %s\n" "$(node --version)"
-        printf "npm installed: %s\n" "$(npm --version)"
-      else
-        printf "Node.js is installed but npm is not available. Please install npm manually.\n"
-        exit 1
-      fi
-    fi
+  printf "Node.js version: %s\n" "$(node --version)"
+  printf "npm version: %s\n" "$(npm --version)"
 }

 function install_gemini() {
  if [ "${ARG_INSTALL}" = "true" ]; then
-    install_node
-
-  if ! command_exists nvm; then
-      printf "which node: %s\n" "$(which node)"
-      printf "which npm: %s\n" "$(which npm)"
-
-      mkdir -p "$HOME"/.npm-global
-      npm config set prefix "$HOME/.npm-global"
-      export PATH="$HOME/.npm-global/bin:$PATH"
-      if ! grep -q "export PATH=$HOME/.npm-global/bin:\$PATH" ~/.bashrc; then
-          echo "export PATH=$HOME/.npm-global/bin:\$PATH" >> ~/.bashrc
-      fi
-    fi
+    check_dependencies

    printf "%s Installing Gemini CLI\n" "${BOLD}"

+    NPM_GLOBAL_PREFIX="${HOME}/.npm-global"
+    if [ ! -d "$NPM_GLOBAL_PREFIX" ]; then
+      mkdir -p "$NPM_GLOBAL_PREFIX"
+    fi
+
+    npm config set prefix "$NPM_GLOBAL_PREFIX"
+
+    export PATH="$NPM_GLOBAL_PREFIX/bin:$PATH"
+
    if [ -n "$ARG_GEMINI_VERSION" ]; then
      npm install -g "@google/gemini-cli@$ARG_GEMINI_VERSION"
    else
      npm install -g "@google/gemini-cli"
    fi
+
+    if ! grep -q "export PATH=\"\$HOME/.npm-global/bin:\$PATH\"" "$HOME/.bashrc"; then
+      echo 'export PATH="$HOME/.npm-global/bin:$PATH"' >> "$HOME/.bashrc"
+    fi
+
    printf "%s Successfully installed Gemini CLI. Version: %s\n" "${BOLD}" "$(gemini --version)"
  fi
 }

 function populate_settings_json() {
-    if [ "${ARG_GEMINI_CONFIG}" != "" ]; then
-      SETTINGS_PATH="$HOME/.gemini/settings.json"
-      mkdir -p "$(dirname "$SETTINGS_PATH")"
-      printf "Custom gemini_config is provided !\n"
-      echo "${ARG_GEMINI_CONFIG}" > "$HOME/.gemini/settings.json"
-    else
-      printf "No custom gemini_config provided, using default settings.json.\n"
-      append_extensions_to_settings_json
-    fi
+  if [ "${ARG_GEMINI_CONFIG}" != "" ]; then
+    SETTINGS_PATH="$HOME/.gemini/settings.json"
+    mkdir -p "$(dirname "$SETTINGS_PATH")"
+    printf "Custom gemini_config is provided !\n"
+    echo "${ARG_GEMINI_CONFIG}" > "$HOME/.gemini/settings.json"
+  else
+    printf "No custom gemini_config provided, using default settings.json.\n"
+    append_extensions_to_settings_json
+  fi
 }

 function append_extensions_to_settings_json() {
-    SETTINGS_PATH="$HOME/.gemini/settings.json"
-    mkdir -p "$(dirname "$SETTINGS_PATH")"
-    printf "[append_extensions_to_settings_json] Starting extension merge process...\n"
-    if [ -z "${BASE_EXTENSIONS:-}" ]; then
-      printf "[append_extensions_to_settings_json] BASE_EXTENSIONS is empty, skipping merge.\n"
-      return
-    fi
-    if [ ! -f "$SETTINGS_PATH" ]; then
-      printf "%s does not exist. Creating with merged mcpServers structure.\n" "$SETTINGS_PATH"
-      ADD_EXT_JSON='{}'
-      if [ -n "${ADDITIONAL_EXTENSIONS:-}" ]; then
-        ADD_EXT_JSON="$ADDITIONAL_EXTENSIONS"
-      fi
-      printf '{"mcpServers":%s}\n' "$(jq -s 'add' <(echo "$BASE_EXTENSIONS") <(echo "$ADD_EXT_JSON"))" > "$SETTINGS_PATH"
-    fi
-
-    TMP_SETTINGS=$(mktemp)
+  SETTINGS_PATH="$HOME/.gemini/settings.json"
+  mkdir -p "$(dirname "$SETTINGS_PATH")"
+  printf "[append_extensions_to_settings_json] Starting extension merge process...\n"
+  if [ -z "${BASE_EXTENSIONS:-}" ]; then
+    printf "[append_extensions_to_settings_json] BASE_EXTENSIONS is empty, skipping merge.\n"
+    return
+  fi
+  if [ ! -f "$SETTINGS_PATH" ]; then
+    printf "%s does not exist. Creating with merged mcpServers structure.\n" "$SETTINGS_PATH"
    ADD_EXT_JSON='{}'
    if [ -n "${ADDITIONAL_EXTENSIONS:-}" ]; then
-      printf "[append_extensions_to_settings_json] ADDITIONAL_EXTENSIONS is set.\n"
      ADD_EXT_JSON="$ADDITIONAL_EXTENSIONS"
-    else
-      printf "[append_extensions_to_settings_json] ADDITIONAL_EXTENSIONS is empty or not set.\n"
    fi
+    printf '{"mcpServers":%s}\n' "$(jq -s 'add' <(echo "$BASE_EXTENSIONS") <(echo "$ADD_EXT_JSON"))" > "$SETTINGS_PATH"
+  fi

-    printf "[append_extensions_to_settings_json] Merging BASE_EXTENSIONS and ADDITIONAL_EXTENSIONS into mcpServers...\n"
-    jq --argjson base "$BASE_EXTENSIONS" --argjson add "$ADD_EXT_JSON" \
-      '.mcpServers = (.mcpServers // {} + $base + $add)' \
-      "$SETTINGS_PATH" > "$TMP_SETTINGS" && mv "$TMP_SETTINGS" "$SETTINGS_PATH"
+  TMP_SETTINGS=$(mktemp)
+  ADD_EXT_JSON='{}'
+  if [ -n "${ADDITIONAL_EXTENSIONS:-}" ]; then
+    printf "[append_extensions_to_settings_json] ADDITIONAL_EXTENSIONS is set.\n"
+    ADD_EXT_JSON="$ADDITIONAL_EXTENSIONS"
+  else
+    printf "[append_extensions_to_settings_json] ADDITIONAL_EXTENSIONS is empty or not set.\n"
+  fi

-    jq '.theme = "Default" | .selectedAuthType = "gemini-api-key"' "$SETTINGS_PATH" > "$TMP_SETTINGS" && mv "$TMP_SETTINGS" "$SETTINGS_PATH"
+  printf "[append_extensions_to_settings_json] Merging BASE_EXTENSIONS and ADDITIONAL_EXTENSIONS into mcpServers...\n"
+  jq --argjson base "$BASE_EXTENSIONS" --argjson add "$ADD_EXT_JSON" \
+    '.mcpServers = (.mcpServers // {} + $base + $add)' \
+    "$SETTINGS_PATH" > "$TMP_SETTINGS" && mv "$TMP_SETTINGS" "$SETTINGS_PATH"

-    printf "[append_extensions_to_settings_json] Merge complete.\n"
+  jq '.theme = "Default" | .selectedAuthType = "gemini-api-key"' "$SETTINGS_PATH" > "$TMP_SETTINGS" && mv "$TMP_SETTINGS" "$SETTINGS_PATH"
+
+  printf "[append_extensions_to_settings_json] Merge complete.\n"
 }

 function add_system_prompt_if_exists() {
-    if [ -n "${GEMINI_SYSTEM_PROMPT:-}" ]; then
-        if [ -d "${GEMINI_START_DIRECTORY}" ]; then
-            printf "Directory '%s' exists. Changing to it.\\n" "${GEMINI_START_DIRECTORY}"
-            cd "${GEMINI_START_DIRECTORY}" || {
-                printf "Error: Could not change to directory '%s'.\\n" "${GEMINI_START_DIRECTORY}"
-                exit 1
-            }
-        else
-            printf "Directory '%s' does not exist. Creating and changing to it.\\n" "${GEMINI_START_DIRECTORY}"
-            mkdir -p "${GEMINI_START_DIRECTORY}" || {
-                printf "Error: Could not create directory '%s'.\\n" "${GEMINI_START_DIRECTORY}"
-                exit 1
-            }
-            cd "${GEMINI_START_DIRECTORY}" || {
-                printf "Error: Could not change to directory '%s'.\\n" "${GEMINI_START_DIRECTORY}"
-                exit 1
-            }
-        fi
-        touch GEMINI.md
-        printf "Setting GEMINI.md\n"
-        echo "${GEMINI_SYSTEM_PROMPT}" > GEMINI.md
+  if [ -n "${GEMINI_SYSTEM_PROMPT:-}" ]; then
+    if [ -d "${GEMINI_START_DIRECTORY}" ]; then
+      printf "Directory '%s' exists. Changing to it.\\n" "${GEMINI_START_DIRECTORY}"
+      cd "${GEMINI_START_DIRECTORY}" || {
+        printf "Error: Could not change to directory '%s'.\\n" "${GEMINI_START_DIRECTORY}"
+        exit 1
+      }
    else
-        printf "GEMINI.md is not set.\n"
+      printf "Directory '%s' does not exist. Creating and changing to it.\\n" "${GEMINI_START_DIRECTORY}"
+      mkdir -p "${GEMINI_START_DIRECTORY}" || {
+        printf "Error: Could not create directory '%s'.\\n" "${GEMINI_START_DIRECTORY}"
+        exit 1
+      }
+      cd "${GEMINI_START_DIRECTORY}" || {
+        printf "Error: Could not change to directory '%s'.\\n" "${GEMINI_START_DIRECTORY}"
+        exit 1
+      }
    fi
+    touch GEMINI.md
+    printf "Setting GEMINI.md\n"
+    echo "${GEMINI_SYSTEM_PROMPT}" > GEMINI.md
+  else
+    printf "GEMINI.md is not set.\n"
+  fi
 }

 function configure_mcp() {
-    export CODER_MCP_APP_STATUS_SLUG="gemini"
-    export CODER_MCP_AI_AGENTAPI_URL="http://localhost:3284"
-    coder exp mcp configure gemini "${GEMINI_START_DIRECTORY}"
+  export CODER_MCP_APP_STATUS_SLUG="gemini"
+  export CODER_MCP_AI_AGENTAPI_URL="http://localhost:3284"
+  coder exp mcp configure gemini "${GEMINI_START_DIRECTORY}"
 }

 install_gemini
-gemini --version
 populate_settings_json
 add_system_prompt_if_exists
 configure_mcp
-
@@ -5,7 +5,7 @@ set -o pipefail
 source "$HOME"/.bashrc

 command_exists() {
-    command -v "$1" >/dev/null 2>&1
+  command -v "$1" > /dev/null 2>&1
 }

 if [ -f "$HOME/.nvm/nvm.sh" ]; then
@@ -20,55 +20,55 @@ MODULE_DIR="$HOME/.gemini-module"
 mkdir -p "$MODULE_DIR"

 if command_exists gemini; then
-    printf "Gemini is installed\n"
+  printf "Gemini is installed\n"
 else
-    printf "Error: Gemini is not installed. Please enable install_gemini or install it manually :)\n"
-    exit 1
+  printf "Error: Gemini is not installed. Please enable install_gemini or install it manually :)\n"
+  exit 1
 fi

 if [ -d "${GEMINI_START_DIRECTORY}" ]; then
-    printf "Directory '%s' exists. Changing to it.\\n" "${GEMINI_START_DIRECTORY}"
-    cd "${GEMINI_START_DIRECTORY}" || {
-        printf "Error: Could not change to directory '%s'.\\n" "${GEMINI_START_DIRECTORY}"
-        exit 1
-    }
+  printf "Directory '%s' exists. Changing to it.\\n" "${GEMINI_START_DIRECTORY}"
+  cd "${GEMINI_START_DIRECTORY}" || {
+    printf "Error: Could not change to directory '%s'.\\n" "${GEMINI_START_DIRECTORY}"
+    exit 1
+  }
 else
-    printf "Directory '%s' does not exist. Creating and changing to it.\\n" "${GEMINI_START_DIRECTORY}"
-    mkdir -p "${GEMINI_START_DIRECTORY}" || {
-        printf "Error: Could not create directory '%s'.\\n" "${GEMINI_START_DIRECTORY}"
-        exit 1
-    }
-    cd "${GEMINI_START_DIRECTORY}" || {
-        printf "Error: Could not change to directory '%s'.\\n" "${GEMINI_START_DIRECTORY}"
-        exit 1
-    }
+  printf "Directory '%s' does not exist. Creating and changing to it.\\n" "${GEMINI_START_DIRECTORY}"
+  mkdir -p "${GEMINI_START_DIRECTORY}" || {
+    printf "Error: Could not create directory '%s'.\\n" "${GEMINI_START_DIRECTORY}"
+    exit 1
+  }
+  cd "${GEMINI_START_DIRECTORY}" || {
+    printf "Error: Could not change to directory '%s'.\\n" "${GEMINI_START_DIRECTORY}"
+    exit 1
+  }
 fi

 if [ -n "$GEMINI_TASK_PROMPT" ]; then
-    printf "Running automated task: %s\n" "$GEMINI_TASK_PROMPT"
-    PROMPT="Every step of the way, report tasks to Coder with proper descriptions and statuses. Your task at hand: $GEMINI_TASK_PROMPT"
-    PROMPT_FILE="$MODULE_DIR/prompt.txt"
-    echo -n "$PROMPT" >"$PROMPT_FILE"
-    GEMINI_ARGS=(--prompt-interactive "$PROMPT")
+  printf "Running automated task: %s\n" "$GEMINI_TASK_PROMPT"
+  PROMPT="Every step of the way, report tasks to Coder with proper descriptions and statuses. Your task at hand: $GEMINI_TASK_PROMPT"
+  PROMPT_FILE="$MODULE_DIR/prompt.txt"
+  echo -n "$PROMPT" > "$PROMPT_FILE"
+  GEMINI_ARGS=(--prompt-interactive "$PROMPT")
 else
-    printf "Starting Gemini CLI in interactive mode.\n"
-    GEMINI_ARGS=()
+  printf "Starting Gemini CLI in interactive mode.\n"
+  GEMINI_ARGS=()
 fi

 if [ -n "$GEMINI_YOLO_MODE" ] && [ "$GEMINI_YOLO_MODE" = "true" ]; then
-    printf "YOLO mode enabled - will auto-approve all tool calls\n"
-    GEMINI_ARGS+=(--yolo)
+  printf "YOLO mode enabled - will auto-approve all tool calls\n"
+  GEMINI_ARGS+=(--yolo)
 fi

 if [ -n "$GEMINI_API_KEY" ] || [ -n "$GOOGLE_API_KEY" ]; then
-    if [ -n "$GOOGLE_GENAI_USE_VERTEXAI" ] && [ "$GOOGLE_GENAI_USE_VERTEXAI" = "true" ]; then
-        printf "Using Vertex AI with API key\n"
-    else
-        printf "Using direct Gemini API with API key\n"
-    fi
+  if [ -n "$GOOGLE_GENAI_USE_VERTEXAI" ] && [ "$GOOGLE_GENAI_USE_VERTEXAI" = "true" ]; then
+    printf "Using Vertex AI with API key\n"
+  else
+    printf "Using direct Gemini API with API key\n"
+  fi
 else
-    printf "No API key provided (neither GEMINI_API_KEY nor GOOGLE_API_KEY)\n"
+  printf "No API key provided (neither GEMINI_API_KEY nor GOOGLE_API_KEY)\n"
 fi

 agentapi server --term-width 67 --term-height 1190 -- \
-    bash -c "$(printf '%q ' gemini "${GEMINI_ARGS[@]}")"
+  bash -c "$(printf '%q ' gemini "${GEMINI_ARGS[@]}")"
@@ -1,19 +1,19 @@
 ---
-display_name: Sourcegraph AMP
+display_name: Amp CLI
 icon: ../../../../.icons/sourcegraph-amp.svg
-description: Run Sourcegraph AMP CLI in your workspace with AgentAPI integration
+description: Sourcegraph's AI coding agent with deep codebase understanding and intelligent code search capabilities
 verified: false
 tags: [agent, sourcegraph, amp, ai, tasks]
 ---

-# Sourcegraph AMP CLI
+# Sourcegraph Amp CLI

-Run [Sourcegraph AMP CLI](https://sourcegraph.com/amp) in your workspace to access Sourcegraph's AI-powered code search and analysis tools, with AgentAPI integration for seamless Coder Tasks support.
+Run [Amp CLI](https://ampcode.com/) in your workspace to access Sourcegraph's AI-powered code search and analysis tools, with AgentAPI integration for seamless Coder Tasks support.

 ```tf
-module "sourcegraph_amp" {
-  source                  = "registry.coder.com/coder-labs/sourcegraph_amp/coder"
-  version                 = "1.0.0"
+module "amp-cli" {
+  source                  = "registry.coder.com/coder-labs/sourcegraph-amp/coder"
+  version                 = "1.0.2"
  agent_id                = coder_agent.example.id
  sourcegraph_amp_api_key = var.sourcegraph_amp_api_key
  install_sourcegraph_amp = true
@@ -31,19 +31,19 @@ module "sourcegraph_amp" {
 ```tf
 data "coder_parameter" "ai_prompt" {
  name        = "AI Prompt"
-  description = "Write an initial prompt for AMP to work on."
+  description = "Write an initial prompt for Amp to work on."
  type        = "string"
  default     = ""
  mutable     = true

 }

-# Set system prompt for Sourcegraph Amp via environment variables
+# Set system prompt for Amp CLI via environment variables
 resource "coder_agent" "main" {
  # ...
  env = {
    SOURCEGRAPH_AMP_SYSTEM_PROMPT = <<-EOT
-      You are an AMP assistant that helps developers debug and write code efficiently.
+      You are an Amp assistant that helps developers debug and write code efficiently.

      Always log task status to Coder.
    EOT
@@ -53,14 +53,14 @@ resource "coder_agent" "main" {

 variable "sourcegraph_amp_api_key" {
  type        = string
-  description = "Sourcegraph AMP API key"
+  description = "Sourcegraph Amp API key. Get one at https://ampcode.com/settings"
  sensitive   = true
 }

-module "sourcegraph_amp" {
+module "amp-cli" {
  count                   = data.coder_workspace.me.start_count
-  source                  = "registry.coder.com/coder-labs/sourcegraph_amp/coder"
-  version                 = "1.0.0"
+  source                  = "registry.coder.com/coder-labs/sourcegraph-amp/coder"
+  version                 = "1.0.2"
  agent_id                = coder_agent.example.id
  sourcegraph_amp_api_key = var.sourcegraph_amp_api_key # recommended for authenticated usage
  install_sourcegraph_amp = true
@@ -69,8 +69,8 @@ module "sourcegraph_amp" {

 ## How it Works

- **Install**: Installs Sourcegraph AMP CLI using npm (installs Node.js via NVM if required)
- **Start**: Launches AMP CLI in the specified directory, wrapped with AgentAPI to enable tasks and AI interactions
+- **Install**: Installs Sourcegraph Amp CLI using npm (installs Node.js via NVM if required)
+- **Start**: Launches Amp CLI in the specified directory, wrapped with AgentAPI to enable tasks and AI interactions
 - **Environment Variables**: Sets `SOURCEGRAPH_AMP_API_KEY` and `SOURCEGRAPH_AMP_START_DIRECTORY` for the CLI execution

 ## Troubleshooting
@@ -80,11 +80,11 @@ module "sourcegraph_amp" {
 - If AgentAPI fails to start, verify that your container has network access and executable permissions for the scripts

 > [!IMPORTANT]
-> For using **Coder Tasks** with Sourcegraph AMP, make sure to pass the `AI Prompt` parameter and set `sourcegraph_amp_api_key`.
+> For using **Coder Tasks** with Amp CLI, make sure to pass the `AI Prompt` parameter and set `sourcegraph_amp_api_key`.
 > This ensures task reporting and status updates work seamlessly.

 ## References

- [Sourcegraph AMP Documentation](https://ampcode.com/manual)
+- [Amp CLI Documentation](https://ampcode.com/manual)
 - [AgentAPI Documentation](https://github.com/coder/agentapi)
 - [Coder AI Agents Guide](https://coder.com/docs/tutorials/ai-agents)
@@ -1,18 +1,18 @@
 FROM ubuntu

 RUN apt-get update \
-	&& apt-get install -y \
-	curl \
-	git \
-	golang \
-	sudo \
-	vim \
-	wget \
-	&& rm -rf /var/lib/apt/lists/*
+ && apt-get install -y \
+  curl \
+  git \
+  golang \
+  sudo \
+  vim \
+  wget \
+ && rm -rf /var/lib/apt/lists/*

 ARG USER=coder
 RUN useradd --groups sudo --no-create-home --shell /bin/bash ${USER} \
-	&& echo "${USER} ALL=(ALL) NOPASSWD:ALL" >/etc/sudoers.d/${USER} \
-	&& chmod 0440 /etc/sudoers.d/${USER}
+ && echo "${USER} ALL=(ALL) NOPASSWD:ALL" >/etc/sudoers.d/${USER} \
+ && chmod 0440 /etc/sudoers.d/${USER}
 USER ${USER}
 WORKDIR /home/${USER}
@@ -164,7 +164,9 @@ describe("agentapi", async () => {
      id,
      "/home/coder/test-agentapi-start.log",
    );
-    expect(agentApiStartLog).toContain("Using AGENTAPI_CHAT_BASE_PATH: /@default/default.foo/apps/agentapi-web/chat");
+    expect(agentApiStartLog).toContain(
+      "Using AGENTAPI_CHAT_BASE_PATH: /@default/default.foo/apps/agentapi-web/chat",
+    );
  });

  test("validate-agentapi-version", async () => {
@@ -186,14 +188,16 @@ describe("agentapi", async () => {
          agentapi_version: "v0.0.1",
          agentapi_subdomain: "false",
        },
-        shouldThrow: "Running with subdomain = false is only supported by agentapi >= v0.3.3.",
+        shouldThrow:
+          "Running with subdomain = false is only supported by agentapi >= v0.3.3.",
      },
      {
        moduleVariables: {
          agentapi_version: "v0.3.2",
          agentapi_subdomain: "false",
        },
-        shouldThrow: "Running with subdomain = false is only supported by agentapi >= v0.3.3.",
+        shouldThrow:
+          "Running with subdomain = false is only supported by agentapi >= v0.3.3.",
      },
      {
        moduleVariables: {
@@ -226,13 +230,17 @@ describe("agentapi", async () => {
          agentapi_version: "arbitrary-string-bypasses-validation",
        },
        shouldThrow: "",
-      }
+      },
    ];
    for (const { moduleVariables, shouldThrow } of cases) {
      if (shouldThrow) {
-        expect(setup({ moduleVariables: moduleVariables as Record<string, string> })).rejects.toThrow(shouldThrow);
+        expect(
+          setup({ moduleVariables: moduleVariables as Record<string, string> }),
+        ).rejects.toThrow(shouldThrow);
      } else {
-        expect(setup({ moduleVariables: moduleVariables as Record<string, string> })).resolves.toBeDefined();
+        expect(
+          setup({ moduleVariables: moduleVariables as Record<string, string> }),
+        ).resolves.toBeDefined();
      }
    }
  });
@@ -11,22 +11,22 @@ agentapi_started=false

 echo "Waiting for agentapi server to start on port $port..."
 for i in $(seq 1 150); do
-    for j in $(seq 1 3); do
-        sleep 0.1
-        if curl -fs -o /dev/null "http://localhost:$port/status"; then
-            echo "agentapi response received ($j/3)"
-        else
-            echo "agentapi server not responding ($i/15)"
-            continue 2
-        fi
-    done
-    agentapi_started=true
-    break
+  for j in $(seq 1 3); do
+    sleep 0.1
+    if curl -fs -o /dev/null "http://localhost:$port/status"; then
+      echo "agentapi response received ($j/3)"
+    else
+      echo "agentapi server not responding ($i/15)"
+      continue 2
+    fi
+  done
+  agentapi_started=true
+  break
 done

 if [ "$agentapi_started" != "true" ]; then
-    echo "Error: agentapi server did not start on port $port after 15 seconds."
-    exit 1
+  echo "Error: agentapi server did not start on port $port after 15 seconds."
+  exit 1
 fi

 echo "agentapi server started on port $port."
@@ -17,76 +17,76 @@ AGENTAPI_CHAT_BASE_PATH="${ARG_AGENTAPI_CHAT_BASE_PATH:-}"
 set +o nounset

 command_exists() {
-    command -v "$1" >/dev/null 2>&1
+  command -v "$1" > /dev/null 2>&1
 }

 module_path="$HOME/${MODULE_DIR_NAME}"
 mkdir -p "$module_path/scripts"

 if [ ! -d "${WORKDIR}" ]; then
-    echo "Warning: The specified folder '${WORKDIR}' does not exist."
-    echo "Creating the folder..."
-    mkdir -p "${WORKDIR}"
-    echo "Folder created successfully."
+  echo "Warning: The specified folder '${WORKDIR}' does not exist."
+  echo "Creating the folder..."
+  mkdir -p "${WORKDIR}"
+  echo "Folder created successfully."
 fi
 if [ -n "${PRE_INSTALL_SCRIPT}" ]; then
-    echo "Running pre-install script..."
-    echo -n "${PRE_INSTALL_SCRIPT}" >"$module_path/pre_install.sh"
-    chmod +x "$module_path/pre_install.sh"
-    "$module_path/pre_install.sh" 2>&1 | tee "$module_path/pre_install.log"
+  echo "Running pre-install script..."
+  echo -n "${PRE_INSTALL_SCRIPT}" > "$module_path/pre_install.sh"
+  chmod +x "$module_path/pre_install.sh"
+  "$module_path/pre_install.sh" 2>&1 | tee "$module_path/pre_install.log"
 fi

 echo "Running install script..."
-echo -n "${INSTALL_SCRIPT}" >"$module_path/install.sh"
+echo -n "${INSTALL_SCRIPT}" > "$module_path/install.sh"
 chmod +x "$module_path/install.sh"
 "$module_path/install.sh" 2>&1 | tee "$module_path/install.log"

 # Install AgentAPI if enabled
 if [ "${INSTALL_AGENTAPI}" = "true" ]; then
-    echo "Installing AgentAPI..."
-    arch=$(uname -m)
-    if [ "$arch" = "x86_64" ]; then
-        binary_name="agentapi-linux-amd64"
-    elif [ "$arch" = "aarch64" ]; then
-        binary_name="agentapi-linux-arm64"
-    else
-        echo "Error: Unsupported architecture: $arch"
-        exit 1
-    fi
-    if [ "${AGENTAPI_VERSION}" = "latest" ]; then
-        # for the latest release the download URL pattern is different than for tagged releases
-        # https://docs.github.com/en/repositories/releasing-projects-on-github/linking-to-releases
-        download_url="https://github.com/coder/agentapi/releases/latest/download/$binary_name"
-    else
-        download_url="https://github.com/coder/agentapi/releases/download/${AGENTAPI_VERSION}/$binary_name"
-    fi
-    curl \
-        --retry 5 \
-        --retry-delay 5 \
-        --fail \
-        --retry-all-errors \
-        -L \
-        -C - \
-        -o agentapi \
-        "$download_url"
-    chmod +x agentapi
-    sudo mv agentapi /usr/local/bin/agentapi
+  echo "Installing AgentAPI..."
+  arch=$(uname -m)
+  if [ "$arch" = "x86_64" ]; then
+    binary_name="agentapi-linux-amd64"
+  elif [ "$arch" = "aarch64" ]; then
+    binary_name="agentapi-linux-arm64"
+  else
+    echo "Error: Unsupported architecture: $arch"
+    exit 1
+  fi
+  if [ "${AGENTAPI_VERSION}" = "latest" ]; then
+    # for the latest release the download URL pattern is different than for tagged releases
+    # https://docs.github.com/en/repositories/releasing-projects-on-github/linking-to-releases
+    download_url="https://github.com/coder/agentapi/releases/latest/download/$binary_name"
+  else
+    download_url="https://github.com/coder/agentapi/releases/download/${AGENTAPI_VERSION}/$binary_name"
+  fi
+  curl \
+    --retry 5 \
+    --retry-delay 5 \
+    --fail \
+    --retry-all-errors \
+    -L \
+    -C - \
+    -o agentapi \
+    "$download_url"
+  chmod +x agentapi
+  sudo mv agentapi /usr/local/bin/agentapi
 fi
 if ! command_exists agentapi; then
-    echo "Error: AgentAPI is not installed. Please enable install_agentapi or install it manually."
-    exit 1
+  echo "Error: AgentAPI is not installed. Please enable install_agentapi or install it manually."
+  exit 1
 fi

-echo -n "${START_SCRIPT}" >"$module_path/scripts/agentapi-start.sh"
-echo -n "${WAIT_FOR_START_SCRIPT}" >"$module_path/scripts/agentapi-wait-for-start.sh"
+echo -n "${START_SCRIPT}" > "$module_path/scripts/agentapi-start.sh"
+echo -n "${WAIT_FOR_START_SCRIPT}" > "$module_path/scripts/agentapi-wait-for-start.sh"
 chmod +x "$module_path/scripts/agentapi-start.sh"
 chmod +x "$module_path/scripts/agentapi-wait-for-start.sh"

 if [ -n "${POST_INSTALL_SCRIPT}" ]; then
-    echo "Running post-install script..."
-    echo -n "${POST_INSTALL_SCRIPT}" >"$module_path/post_install.sh"
-    chmod +x "$module_path/post_install.sh"
-    "$module_path/post_install.sh" 2>&1 | tee "$module_path/post_install.log"
+  echo "Running post-install script..."
+  echo -n "${POST_INSTALL_SCRIPT}" > "$module_path/post_install.sh"
+  chmod +x "$module_path/post_install.sh"
+  "$module_path/post_install.sh" 2>&1 | tee "$module_path/post_install.log"
 fi

 export LANG=en_US.UTF-8
@@ -97,5 +97,5 @@ cd "${WORKDIR}"
 export AGENTAPI_CHAT_BASE_PATH="${AGENTAPI_CHAT_BASE_PATH:-}"
 # Disable host header check since AgentAPI is proxied by Coder (which does its own validation)
 export AGENTAPI_ALLOWED_HOSTS="*"
-nohup "$module_path/scripts/agentapi-start.sh" true "${AGENTAPI_PORT}" &>"$module_path/agentapi-start.log" &
+nohup "$module_path/scripts/agentapi-start.sh" true "${AGENTAPI_PORT}" &> "$module_path/agentapi-start.log" &
 "$module_path/scripts/agentapi-wait-for-start.sh" "${AGENTAPI_PORT}"
@@ -25,14 +25,20 @@ export const setupContainer = async ({
  const coderScript = findResourceInstance(state, "coder_script");
  const id = await runContainer(image ?? "codercom/enterprise-node:latest");
  return {
-    id, coderScript, cleanup: async () => {
-      if (process.env["DEBUG"] === "true" || process.env["DEBUG"] === "1" || process.env["DEBUG"] === "yes") {
+    id,
+    coderScript,
+    cleanup: async () => {
+      if (
+        process.env["DEBUG"] === "true" ||
+        process.env["DEBUG"] === "1" ||
+        process.env["DEBUG"] === "yes"
+      ) {
        console.log(`Not removing container ${id} in debug mode`);
        console.log(`Run "docker rm -f ${id}" to remove it manually.`);
      } else {
        await removeContainer(id);
      }
-    }
+    },
  };
 };

@@ -7,7 +7,10 @@ const portIdx = args.findIndex((arg) => arg === "--port") + 1;
 const port = portIdx ? args[portIdx] : 3284;

 console.log(`starting server on port ${port}`);
-fs.writeFileSync("/home/coder/agentapi-mock.log", `AGENTAPI_ALLOWED_HOSTS: ${process.env.AGENTAPI_ALLOWED_HOSTS}`);
+fs.writeFileSync(
+  "/home/coder/agentapi-mock.log",
+  `AGENTAPI_ALLOWED_HOSTS: ${process.env.AGENTAPI_ALLOWED_HOSTS}`,
+);

 http
  .createServer(function (_request, response) {
@@ -8,15 +8,15 @@ port=${2:-3284}
 module_path="$HOME/.agentapi-module"
 log_file_path="$module_path/agentapi.log"

-echo "using prompt: $use_prompt" >>/home/coder/test-agentapi-start.log
-echo "using port: $port" >>/home/coder/test-agentapi-start.log
+echo "using prompt: $use_prompt" >> /home/coder/test-agentapi-start.log
+echo "using port: $port" >> /home/coder/test-agentapi-start.log

 AGENTAPI_CHAT_BASE_PATH="${AGENTAPI_CHAT_BASE_PATH:-}"
 if [ -n "$AGENTAPI_CHAT_BASE_PATH" ]; then
-    echo "Using AGENTAPI_CHAT_BASE_PATH: $AGENTAPI_CHAT_BASE_PATH" >>/home/coder/test-agentapi-start.log
-    export AGENTAPI_CHAT_BASE_PATH
+  echo "Using AGENTAPI_CHAT_BASE_PATH: $AGENTAPI_CHAT_BASE_PATH" >> /home/coder/test-agentapi-start.log
+  export AGENTAPI_CHAT_BASE_PATH
 fi

 agentapi server --port "$port" --term-width 67 --term-height 1190 -- \
-    bash -c aiagent \
-    >"$log_file_path" 2>&1
+  bash -c aiagent \
+  > "$log_file_path" 2>&1
@@ -13,7 +13,7 @@ Run the [Claude Code](https://docs.anthropic.com/en/docs/agents-and-tools/claude
 ```tf
 module "claude-code" {
  source              = "registry.coder.com/coder/claude-code/coder"
-  version             = "2.1.0"
+  version             = "2.2.0"
  agent_id            = coder_agent.example.id
  folder              = "/home/coder"
  install_claude_code = true
@@ -83,7 +83,7 @@ resource "coder_agent" "main" {
 module "claude-code" {
  count               = data.coder_workspace.me.start_count
  source              = "registry.coder.com/coder/claude-code/coder"
-  version             = "2.1.0"
+  version             = "2.2.0"
  agent_id            = coder_agent.example.id
  folder              = "/home/coder"
  install_claude_code = true
@@ -101,7 +101,7 @@ Run Claude Code as a standalone app in your workspace. This will install Claude
 ```tf
 module "claude-code" {
  source              = "registry.coder.com/coder/claude-code/coder"
-  version             = "2.1.0"
+  version             = "2.2.0"
  agent_id            = coder_agent.example.id
  folder              = "/home/coder"
  install_claude_code = true
@@ -100,7 +100,13 @@ variable "install_agentapi" {
 variable "agentapi_version" {
  type        = string
  description = "The version of AgentAPI to install."
-  default     = "v0.3.0"
+  default     = "v0.3.3"
+}
+
+variable "subdomain" {
+  type        = bool
+  description = "Whether to use a subdomain for the Claude Code app."
+  default     = true
 }

 locals {
@@ -113,6 +119,15 @@ locals {
  agentapi_wait_for_start_script_b64 = base64encode(file("${path.module}/scripts/agentapi-wait-for-start.sh"))
  remove_last_session_id_script_b64  = base64encode(file("${path.module}/scripts/remove-last-session-id.sh"))
  claude_code_app_slug               = "ccw"
+  // Chat base path is only set if not using a subdomain.
+  // NOTE:
+  //   - Initial support for --chat-base-path was added in v0.3.1 but configuration
+  //     via environment variable AGENTAPI_CHAT_BASE_PATH was added in v0.3.3.
+  //   - As CODER_WORKSPACE_AGENT_NAME is a recent addition we use agent ID
+  //     for backward compatibility.
+  agentapi_chat_base_path = var.subdomain ? "" : "/@${data.coder_workspace_owner.me.name}/${data.coder_workspace.me.name}.${var.agent_id}/apps/${local.claude_code_app_slug}/chat"
+  server_base_path        = var.subdomain ? "" : "/@${data.coder_workspace_owner.me.name}/${data.coder_workspace.me.name}.${var.agent_id}/apps/${local.claude_code_app_slug}"
+  healthcheck_url         = "http://localhost:3284${local.server_base_path}/status"
 }

 # Install and Initialize Claude Code
@@ -229,6 +244,9 @@ resource "coder_script" "claude_code" {

    # Disable host header check since AgentAPI is proxied by Coder (which does its own validation)
    export AGENTAPI_ALLOWED_HOSTS="*"
+    
+    # Set chat base path for non-subdomain routing (only set if not using subdomain)
+    export AGENTAPI_CHAT_BASE_PATH="${local.agentapi_chat_base_path}"

    nohup "$module_path/scripts/agentapi-start.sh" use_prompt &> "$module_path/agentapi-start.log" &
    "$module_path/scripts/agentapi-wait-for-start.sh"
@@ -245,9 +263,9 @@ resource "coder_app" "claude_code_web" {
  icon         = var.icon
  order        = var.order
  group        = var.group
-  subdomain    = true
+  subdomain    = var.subdomain
  healthcheck {
-    url       = "http://localhost:3284/status"
+    url       = local.healthcheck_url
    interval  = 3
    threshold = 20
  }
@@ -9,33 +9,33 @@ log_file_path="$module_path/agentapi.log"

 # if the first argument is not empty, start claude with the prompt
 if [ -n "$1" ]; then
-    cp "$module_path/prompt.txt" /tmp/claude-code-prompt
+  cp "$module_path/prompt.txt" /tmp/claude-code-prompt
 else
-    rm -f /tmp/claude-code-prompt
+  rm -f /tmp/claude-code-prompt
 fi

 # if the log file already exists, archive it
 if [ -f "$log_file_path" ]; then
-    mv "$log_file_path" "$log_file_path"".$(date +%s)"
+  mv "$log_file_path" "$log_file_path"".$(date +%s)"
 fi

 # see the remove-last-session-id.sh script for details
 # about why we need it
 # avoid exiting if the script fails
-bash "$scripts_dir/remove-last-session-id.sh" "$(pwd)" 2>/dev/null || true
+bash "$scripts_dir/remove-last-session-id.sh" "$(pwd)" 2> /dev/null || true

 # we'll be manually handling errors from this point on
 set +o errexit

 function start_agentapi() {
-    local continue_flag="$1"
-    local prompt_subshell='"$(cat /tmp/claude-code-prompt)"'
-    
-    # use low width to fit in the tasks UI sidebar. height is adjusted so that width x height ~= 80x1000 characters
-    # visible in the terminal screen by default.
-    agentapi server --term-width 67 --term-height 1190 -- \
-        bash -c "claude $continue_flag --dangerously-skip-permissions $prompt_subshell" \
-        > "$log_file_path" 2>&1
+  local continue_flag="$1"
+  local prompt_subshell='"$(cat /tmp/claude-code-prompt)"'
+
+  # use low width to fit in the tasks UI sidebar. height is adjusted so that width x height ~= 80x1000 characters
+  # visible in the terminal screen by default.
+  agentapi server --term-width 67 --term-height 1190 -- \
+    bash -c "claude $continue_flag --dangerously-skip-permissions $prompt_subshell" \
+    > "$log_file_path" 2>&1
 }

 echo "Starting AgentAPI..."
@@ -47,15 +47,15 @@ exit_code=$?
 echo "First AgentAPI exit code: $exit_code"

 if [ $exit_code -eq 0 ]; then
-    exit 0
+  exit 0
 fi

 # if there was no conversation to continue, claude exited with an error.
 # start claude without the --continue flag.
 if grep -q "No conversation found to continue" "$log_file_path"; then
-    echo "AgentAPI with --continue flag failed, starting claude without it."
-    start_agentapi
-    exit_code=$?
+  echo "AgentAPI with --continue flag failed, starting claude without it."
+  start_agentapi
+  exit_code=$?
 fi

 echo "Second AgentAPI exit code: $exit_code"
@@ -9,22 +9,22 @@ agentapi_started=false

 echo "Waiting for agentapi server to start on port 3284..."
 for i in $(seq 1 150); do
-    for j in $(seq 1 3); do
-        sleep 0.1
-        if curl -fs -o /dev/null "http://localhost:3284/status"; then
-            echo "agentapi response received ($j/3)"
-        else
-            echo "agentapi server not responding ($i/15)"
-            continue 2
-        fi
-    done
-    agentapi_started=true
-    break
+  for j in $(seq 1 3); do
+    sleep 0.1
+    if curl -fs -o /dev/null "http://localhost:3284/status"; then
+      echo "agentapi response received ($j/3)"
+    else
+      echo "agentapi server not responding ($i/15)"
+      continue 2
+    fi
+  done
+  agentapi_started=true
+  break
 done

 if [ "$agentapi_started" != "true" ]; then
-    echo "Error: agentapi server did not start on port 3284 after 15 seconds."
-    exit 1
+  echo "Error: agentapi server did not start on port 3284 after 15 seconds."
+  exit 1
 fi

 echo "agentapi server started on port 3284."
@@ -20,7 +20,10 @@ if (
  process.exit(1);
 }

-fs.writeFileSync("/home/coder/agentapi-mock.log", `AGENTAPI_ALLOWED_HOSTS: ${process.env.AGENTAPI_ALLOWED_HOSTS}`);
+fs.writeFileSync(
+  "/home/coder/agentapi-mock.log",
+  `AGENTAPI_ALLOWED_HOSTS: ${process.env.AGENTAPI_ALLOWED_HOSTS}`,
+);

 console.log(`starting server on port ${port}`);

@@ -16,7 +16,7 @@ Uses the [Coder Remote VS Code Extension](https://github.com/coder/vscode-coder)
 module "cursor" {
  count    = data.coder_workspace.me.start_count
  source   = "registry.coder.com/coder/cursor/coder"
-  version  = "1.3.1"
+  version  = "1.3.2"
  agent_id = coder_agent.example.id
 }
 ```
@@ -29,7 +29,7 @@ module "cursor" {
 module "cursor" {
  count    = data.coder_workspace.me.start_count
  source   = "registry.coder.com/coder/cursor/coder"
-  version  = "1.3.1"
+  version  = "1.3.2"
  agent_id = coder_agent.example.id
  folder   = "/home/coder/project"
 }
@@ -45,7 +45,7 @@ The following example configures Cursor to use the GitHub MCP server with authen
 module "cursor" {
  count    = data.coder_workspace.me.start_count
  source   = "registry.coder.com/coder/cursor/coder"
-  version  = "1.3.1"
+  version  = "1.3.2"
  agent_id = coder_agent.example.id
  folder   = "/home/coder/project"
  mcp = jsonencode({
@@ -94,12 +94,18 @@ describe("cursor", async () => {
  it("writes ~/.cursor/mcp.json when mcp provided", async () => {
    const id = await runContainer("alpine");
    try {
-      const mcp = JSON.stringify({ servers: { demo: { url: "http://localhost:1234" } } });
+      const mcp = JSON.stringify({
+        servers: { demo: { url: "http://localhost:1234" } },
+      });
      const state = await runTerraformApply(import.meta.dir, {
        agent_id: "foo",
        mcp,
      });
-      const script = findResourceInstance(state, "coder_script", "cursor_mcp").script;
+      const script = findResourceInstance(
+        state,
+        "coder_script",
+        "cursor_mcp",
+      ).script;
      const resp = await execContainer(id, ["sh", "-c", script]);
      if (resp.exitCode !== 0) {
        console.log(resp.stdout);
@@ -98,6 +98,7 @@ resource "coder_script" "cursor_mcp" {
    set -eu
    mkdir -p "$HOME/.cursor"
    echo -n "${local.mcp_b64}" | base64 -d > "$HOME/.cursor/mcp.json"
+    chmod 600 "$HOME/.cursor/mcp.json"
  EOT
 }

@@ -7,55 +7,55 @@
 cd "$CODER_SCRIPT_DATA_DIR"

 # If @devcontainers/cli is already installed, we can skip
-if command -v devcontainer >/dev/null 2>&1; then
-    echo "🥳 @devcontainers/cli is already installed into $(which devcontainer)!"
-    exit 0
+if command -v devcontainer > /dev/null 2>&1; then
+  echo "🥳 @devcontainers/cli is already installed into $(which devcontainer)!"
+  exit 0
 fi

 # Check if docker is installed
-if ! command -v docker >/dev/null 2>&1; then
-    echo "WARNING: Docker was not found but is required to use @devcontainers/cli, please make sure it is available."
+if ! command -v docker > /dev/null 2>&1; then
+  echo "WARNING: Docker was not found but is required to use @devcontainers/cli, please make sure it is available."
 fi

 # Determine the package manager to use: npm, pnpm, or yarn
-if command -v yarn >/dev/null 2>&1; then
-    PACKAGE_MANAGER="yarn"
-elif command -v npm >/dev/null 2>&1; then
-    PACKAGE_MANAGER="npm"
-elif command -v pnpm >/dev/null 2>&1; then
-    PACKAGE_MANAGER="pnpm"
+if command -v yarn > /dev/null 2>&1; then
+  PACKAGE_MANAGER="yarn"
+elif command -v npm > /dev/null 2>&1; then
+  PACKAGE_MANAGER="npm"
+elif command -v pnpm > /dev/null 2>&1; then
+  PACKAGE_MANAGER="pnpm"
 else
-    echo "ERROR: No supported package manager (npm, pnpm, yarn) is installed. Please install one first." 1>&2
-    exit 1
+  echo "ERROR: No supported package manager (npm, pnpm, yarn) is installed. Please install one first." 1>&2
+  exit 1
 fi

 install() {
-    echo "Installing @devcontainers/cli using $PACKAGE_MANAGER..."
-    if [ "$PACKAGE_MANAGER" = "npm" ]; then
-        npm install -g @devcontainers/cli
-    elif [ "$PACKAGE_MANAGER" = "pnpm" ]; then
-        # Check if PNPM_HOME is set, if not, set it to the script's bin directory
-        # pnpm needs this to be set to install binaries
-        # coder agent ensures this part is part of the PATH
-        # so that the devcontainer command is available
-        if [ -z "$PNPM_HOME" ]; then
-            PNPM_HOME="$CODER_SCRIPT_BIN_DIR"
-            export PNPM_HOME
-        fi
-        pnpm add -g @devcontainers/cli
-    elif [ "$PACKAGE_MANAGER" = "yarn" ]; then
-        yarn global add @devcontainers/cli --prefix "$(dirname "$CODER_SCRIPT_BIN_DIR")"
+  echo "Installing @devcontainers/cli using $PACKAGE_MANAGER..."
+  if [ "$PACKAGE_MANAGER" = "npm" ]; then
+    npm install -g @devcontainers/cli
+  elif [ "$PACKAGE_MANAGER" = "pnpm" ]; then
+    # Check if PNPM_HOME is set, if not, set it to the script's bin directory
+    # pnpm needs this to be set to install binaries
+    # coder agent ensures this part is part of the PATH
+    # so that the devcontainer command is available
+    if [ -z "$PNPM_HOME" ]; then
+      PNPM_HOME="$CODER_SCRIPT_BIN_DIR"
+      export PNPM_HOME
    fi
+    pnpm add -g @devcontainers/cli
+  elif [ "$PACKAGE_MANAGER" = "yarn" ]; then
+    yarn global add @devcontainers/cli --prefix "$(dirname "$CODER_SCRIPT_BIN_DIR")"
+  fi
 }

 if ! install; then
-    echo "Failed to install @devcontainers/cli" >&2
-    exit 1
+  echo "Failed to install @devcontainers/cli" >&2
+  exit 1
 fi

-if ! command -v devcontainer >/dev/null 2>&1; then
-    echo "Installation completed but 'devcontainer' command not found in PATH" >&2
-    exit 1
+if ! command -v devcontainer > /dev/null 2>&1; then
+  echo "Installation completed but 'devcontainer' command not found in PATH" >&2
+  exit 1
 fi

 echo "🥳 @devcontainers/cli has been installed into $(which devcontainer)!"
@@ -7,7 +7,7 @@ BOLD='\033[[0;1m'
 printf "$${BOLD}Installing filebrowser \n\n"

 # Check if filebrowser is installed
-if ! command -v filebrowser &>/dev/null; then
+if ! command -v filebrowser &> /dev/null; then
  curl -fsSL https://raw.githubusercontent.com/filebrowser/get/master/get.sh | bash
 fi

@@ -34,6 +34,6 @@ printf "👷 Starting filebrowser in background... \n\n"

 printf "📂 Serving $${ROOT_DIR} at http://localhost:${PORT} \n\n"

-filebrowser >>${LOG_PATH} 2>&1 &
+filebrowser >> ${LOG_PATH} 2>&1 &

 printf "📝 Logs at ${LOG_PATH} \n\n"
@@ -134,6 +134,7 @@ describe("goose", async () => {
      console.log(resp.stderr);
    }
    expect(resp.exitCode).toBe(0);
+    await expectAgentAPIStarted(id);
  });

  test("config", async () => {
@@ -266,6 +267,8 @@ describe("goose", async () => {
    await execModuleScript(id);

    const agentapiMockOutput = await readFileContainer(id, agentapiStartLog);
-    expect(agentapiMockOutput).toContain("AGENTAPI_CHAT_BASE_PATH=/@default/default.foo/apps/goose/chat");
+    expect(agentapiMockOutput).toContain(
+      "AGENTAPI_CHAT_BASE_PATH=/@default/default.foo/apps/goose/chat",
+    );
  });
 });
@@ -2,7 +2,7 @@

 # Function to check if a command exists
 command_exists() {
-    command -v "$1" >/dev/null 2>&1
+  command -v "$1" > /dev/null 2>&1
 }

 set -o nounset
@@ -18,40 +18,40 @@ echo "--------------------------------"
 set +o nounset

 if [ "${ARG_INSTALL}" = "true" ]; then
-    echo "Installing Goose..."
-    parsed_version="${ARG_GOOSE_VERSION}"
-    if [ "${ARG_GOOSE_VERSION}" = "stable" ]; then
-        parsed_version=""
-    fi
-    curl -fsSL https://github.com/block/goose/releases/download/stable/download_cli.sh | GOOSE_VERSION="${parsed_version}" CONFIGURE=false bash
-    echo "Goose installed"
+  echo "Installing Goose..."
+  parsed_version="${ARG_GOOSE_VERSION}"
+  if [ "${ARG_GOOSE_VERSION}" = "stable" ]; then
+    parsed_version=""
+  fi
+  curl -fsSL https://github.com/block/goose/releases/download/stable/download_cli.sh | GOOSE_VERSION="${parsed_version}" CONFIGURE=false bash
+  echo "Goose installed"
 else
-    echo "Skipping Goose installation"
+  echo "Skipping Goose installation"
 fi

 if [ "${ARG_GOOSE_CONFIG}" != "" ]; then
-    echo "Configuring Goose..."
-    mkdir -p "$HOME/.config/goose"
-    echo "GOOSE_PROVIDER: $ARG_PROVIDER" >"$HOME/.config/goose/config.yaml"
-    echo "GOOSE_MODEL: $ARG_MODEL" >>"$HOME/.config/goose/config.yaml"
-    echo "$ARG_GOOSE_CONFIG" >>"$HOME/.config/goose/config.yaml"
+  echo "Configuring Goose..."
+  mkdir -p "$HOME/.config/goose"
+  echo "GOOSE_PROVIDER: $ARG_PROVIDER" > "$HOME/.config/goose/config.yaml"
+  echo "GOOSE_MODEL: $ARG_MODEL" >> "$HOME/.config/goose/config.yaml"
+  echo "$ARG_GOOSE_CONFIG" >> "$HOME/.config/goose/config.yaml"
 else
-    echo "Skipping Goose configuration"
+  echo "Skipping Goose configuration"
 fi

 if [ "${GOOSE_SYSTEM_PROMPT}" != "" ]; then
-    echo "Setting Goose system prompt..."
-    mkdir -p "$HOME/.config/goose"
-    echo "$GOOSE_SYSTEM_PROMPT" >"$HOME/.config/goose/.goosehints"
+  echo "Setting Goose system prompt..."
+  mkdir -p "$HOME/.config/goose"
+  echo "$GOOSE_SYSTEM_PROMPT" > "$HOME/.config/goose/.goosehints"
 else
-    echo "Goose system prompt not set. use the GOOSE_SYSTEM_PROMPT environment variable to set it."
+  echo "Goose system prompt not set. use the GOOSE_SYSTEM_PROMPT environment variable to set it."
 fi

 if command_exists goose; then
-    GOOSE_CMD=goose
+  GOOSE_CMD=goose
 elif [ -f "$HOME/.local/bin/goose" ]; then
-    GOOSE_CMD="$HOME/.local/bin/goose"
+  GOOSE_CMD="$HOME/.local/bin/goose"
 else
-    echo "Error: Goose is not installed. Please enable install_goose or install it manually."
-    exit 1
+  echo "Error: Goose is not installed. Please enable install_goose or install it manually."
+  exit 1
 fi
@@ -4,16 +4,16 @@ set -o errexit
 set -o pipefail

 command_exists() {
-    command -v "$1" >/dev/null 2>&1
+  command -v "$1" > /dev/null 2>&1
 }

 if command_exists goose; then
-    GOOSE_CMD=goose
+  GOOSE_CMD=goose
 elif [ -f "$HOME/.local/bin/goose" ]; then
-    GOOSE_CMD="$HOME/.local/bin/goose"
+  GOOSE_CMD="$HOME/.local/bin/goose"
 else
-    echo "Error: Goose is not installed. Please enable install_goose or install it manually."
-    exit 1
+  echo "Error: Goose is not installed. Please enable install_goose or install it manually."
+  exit 1
 fi

 # this must be kept up to date with main.tf
@@ -21,15 +21,15 @@ MODULE_DIR="$HOME/.goose-module"
 mkdir -p "$MODULE_DIR"

 if [ ! -z "$GOOSE_TASK_PROMPT" ]; then
-    echo "Starting with a prompt"
-    PROMPT="Review your goosehints. Every step of the way, report tasks to Coder with proper descriptions and statuses. Your task at hand: $GOOSE_TASK_PROMPT"
-    PROMPT_FILE="$MODULE_DIR/prompt.txt"
-    echo -n "$PROMPT" >"$PROMPT_FILE"
-    GOOSE_ARGS=(run --interactive --instructions "$PROMPT_FILE")
+  echo "Starting with a prompt"
+  PROMPT="Review your goosehints. Every step of the way, report tasks to Coder with proper descriptions and statuses. Your task at hand: $GOOSE_TASK_PROMPT"
+  PROMPT_FILE="$MODULE_DIR/prompt.txt"
+  echo -n "$PROMPT" > "$PROMPT_FILE"
+  GOOSE_ARGS=(run --interactive --instructions "$PROMPT_FILE")
 else
-    echo "Starting without a prompt"
-    GOOSE_ARGS=()
+  echo "Starting without a prompt"
+  GOOSE_ARGS=()
 fi

 agentapi server --term-width 67 --term-height 1190 -- \
-    bash -c "$(printf '%q ' "$GOOSE_CMD" "${GOOSE_ARGS[@]}")"
+  bash -c "$(printf '%q ' "$GOOSE_CMD" "${GOOSE_ARGS[@]}")"
@@ -3,7 +3,9 @@
 const http = require("http");
 const args = process.argv.slice(2);
 console.log(args);
-console.log(`AGENTAPI_CHAT_BASE_PATH=${process.env["AGENTAPI_CHAT_BASE_PATH"]}`);
+console.log(
+  `AGENTAPI_CHAT_BASE_PATH=${process.env["AGENTAPI_CHAT_BASE_PATH"]}`,
+);
 const port = 3284;

 console.log(`starting server on port ${port}`);
@@ -3,6 +3,6 @@
 set -e

 while true; do
-    echo "$(date) - goose-mock"
-    sleep 15
+  echo "$(date) - goose-mock"
+  sleep 15
 done
@@ -97,4 +97,4 @@ describe("jetbrains-fleet", async () => {
    expect(coder_app?.instances.length).toBe(1);
    expect(coder_app?.instances[0].attributes.group).toBe("JetBrains IDEs");
  });
-}); 
+});
@@ -16,7 +16,32 @@ A module that adds JupyterLab in your Coder template.
 module "jupyterlab" {
  count    = data.coder_workspace.me.start_count
  source   = "registry.coder.com/coder/jupyterlab/coder"
-  version  = "1.1.1"
+  version  = "1.2.0"
  agent_id = coder_agent.example.id
 }
 ```
+
+## Configuration
+
+JupyterLab is automatically configured to work with Coder's iframe embedding. For advanced configuration, you can use the `config` parameter to provide additional JupyterLab server settings according to the [JupyterLab configuration documentation](https://jupyter-server.readthedocs.io/en/latest/users/configuration.html).
+
+```tf
+module "jupyterlab" {
+  count    = data.coder_workspace.me.start_count
+  source   = "registry.coder.com/coder/jupyterlab/coder"
+  version  = "1.2.0"
+  agent_id = coder_agent.example.id
+  config = {
+    ServerApp = {
+      # Required for Coder Tasks iFrame embedding - do not remove
+      tornado_settings = {
+        headers = {
+          "Content-Security-Policy" = "frame-ancestors 'self' ${data.coder_workspace.me.access_url}"
+        }
+      }
+      # Your additional configuration here
+      root_dir = "/workspace/notebooks"
+    }
+  }
+}
+```
@@ -3,6 +3,8 @@ import {
  execContainer,
  executeScriptInContainer,
  findResourceInstance,
+  readFileContainer,
+  removeContainer,
  runContainer,
  runTerraformApply,
  runTerraformInit,
@@ -104,4 +106,64 @@ describe("jupyterlab", async () => {
  //   const output = await executeScriptInContainerWithPip(state, "alpine");
  //   ...
  // });
+
+  it("writes ~/.jupyter/jupyter_server_config.json when config provided", async () => {
+    const id = await runContainer("alpine");
+    try {
+      const config = {
+        ServerApp: {
+          port: 8888,
+          token: "test-token",
+          password: "",
+          allow_origin: "*",
+        },
+      };
+      const configJson = JSON.stringify(config);
+      const state = await runTerraformApply(import.meta.dir, {
+        agent_id: "foo",
+        config: configJson,
+      });
+      const script = findResourceInstance(
+        state,
+        "coder_script",
+        "jupyterlab_config",
+      ).script;
+      const resp = await execContainer(id, ["sh", "-c", script]);
+      if (resp.exitCode !== 0) {
+        console.log(resp.stdout);
+        console.log(resp.stderr);
+      }
+      expect(resp.exitCode).toBe(0);
+      const content = await readFileContainer(
+        id,
+        "/root/.jupyter/jupyter_server_config.json",
+      );
+      // Parse both JSON strings and compare objects to avoid key ordering issues
+      const actualConfig = JSON.parse(content);
+      expect(actualConfig).toEqual(config);
+    } finally {
+      await removeContainer(id);
+    }
+  });
+
+  it("creates config script with CSP fallback when config is empty", async () => {
+    const state = await runTerraformApply(import.meta.dir, {
+      agent_id: "foo",
+      config: "{}",
+    });
+    const configScripts = state.resources.filter(
+      (res) => res.type === "coder_script" && res.name === "jupyterlab_config",
+    );
+    expect(configScripts.length).toBe(1);
+  });
+
+  it("creates config script with CSP fallback when config is not provided", async () => {
+    const state = await runTerraformApply(import.meta.dir, {
+      agent_id: "foo",
+    });
+    const configScripts = state.resources.filter(
+      (res) => res.type === "coder_script" && res.name === "jupyterlab_config",
+    );
+    expect(configScripts.length).toBe(1);
+  });
 });
@@ -12,6 +12,23 @@ terraform {
 data "coder_workspace" "me" {}
 data "coder_workspace_owner" "me" {}

+locals {
+  # Fallback config with CSP for Coder iframe embedding when user config is empty
+  csp_fallback_config = {
+    ServerApp = {
+      tornado_settings = {
+        headers = {
+          "Content-Security-Policy" = "frame-ancestors 'self' ${data.coder_workspace.me.access_url}"
+        }
+      }
+    }
+  }
+
+  # Use user config if provided, otherwise fallback to CSP config
+  config_json = var.config == "{}" ? jsonencode(local.csp_fallback_config) : var.config
+  config_b64  = base64encode(local.config_json)
+}
+
 # Add required variables for your modules and remove any unneeded variables
 variable "agent_id" {
  type        = string
@@ -57,6 +74,26 @@ variable "group" {
  default     = null
 }

+variable "config" {
+  type        = string
+  description = "A JSON string of JupyterLab server configuration settings. When set, writes ~/.jupyter/jupyter_server_config.json."
+  default     = "{}"
+}
+
+resource "coder_script" "jupyterlab_config" {
+  agent_id           = var.agent_id
+  display_name       = "JupyterLab Config"
+  icon               = "/icon/jupyter.svg"
+  run_on_start       = true
+  start_blocks_login = false
+  script             = <<-EOT
+    #!/bin/sh
+    set -eu
+    mkdir -p "$HOME/.jupyter"
+    echo -n "${local.config_b64}" | base64 -d > "$HOME/.jupyter/jupyter_server_config.json"
+  EOT
+}
+
 resource "coder_script" "jupyterlab" {
  agent_id     = var.agent_id
  display_name = "jupyterlab"
@@ -79,4 +116,9 @@ resource "coder_app" "jupyterlab" {
  share        = var.share
  order        = var.order
  group        = var.group
+  healthcheck {
+    url       = "http://localhost:${var.port}/api"
+    interval  = 5
+    threshold = 6
+  }
 }
@@ -3,13 +3,13 @@ INSTALLER=""
 check_available_installer() {
  # check if pipx is installed
  echo "Checking for a supported installer"
-  if command -v pipx >/dev/null 2>&1; then
+  if command -v pipx > /dev/null 2>&1; then
    echo "pipx is installed"
    INSTALLER="pipx"
    return
  fi
  # check if uv is installed
-  if command -v uv >/dev/null 2>&1; then
+  if command -v uv > /dev/null 2>&1; then
    echo "uv is installed"
    INSTALLER="uv"
    return
@@ -26,21 +26,21 @@ fi
 BOLD='\033[0;1m'

 # check if jupyterlab is installed
-if ! command -v jupyter-lab >/dev/null 2>&1; then
+if ! command -v jupyter-lab > /dev/null 2>&1; then
  # install jupyterlab
  check_available_installer
  printf "$${BOLD}Installing jupyterlab!\n"
  case $INSTALLER in
-  uv)
-    uv pip install -q jupyterlab &&
-      printf "%s\n" "🥳 jupyterlab has been installed"
-    JUPYTER="$HOME/.venv/bin/jupyter-lab"
-    ;;
-  pipx)
-    pipx install jupyterlab &&
-      printf "%s\n" "🥳 jupyterlab has been installed"
-    JUPYTER="$HOME/.local/bin/jupyter-lab"
-    ;;
+    uv)
+      uv pip install -q jupyterlab \
+        && printf "%s\n" "🥳 jupyterlab has been installed"
+      JUPYTER="$HOME/.venv/bin/jupyter-lab"
+      ;;
+    pipx)
+      pipx install jupyterlab \
+        && printf "%s\n" "🥳 jupyterlab has been installed"
+      JUPYTER="$HOME/.local/bin/jupyter-lab"
+      ;;
  esac
 else
  printf "%s\n\n" "🥳 jupyterlab is already installed"
@@ -55,4 +55,4 @@ $JUPYTER --no-browser \
  --ServerApp.port="${PORT}" \
  --ServerApp.token='' \
  --ServerApp.password='' \
-  >"${LOG_PATH}" 2>&1 &
+  > "${LOG_PATH}" 2>&1 &
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
  <head>
    <title>Path-Sharing Bounce Page</title>
@@ -6,40 +6,64 @@
      :root {
        color-scheme: light dark;
        --dark: #121212;
-        --header-bg: rgba(127,127,127,0.2);
+        --header-bg: rgba(127, 127, 127, 0.2);
        --light: white;
-        --rule-color: light-dark(rgba(0,0,0,0.8), rgba(255,255,255,0.8));
+        --rule-color: light-dark(rgba(0, 0, 0, 0.8), rgba(255, 255, 255, 0.8));
        background-color: light-dark(var(--light), var(--dark));
        color: light-dark(var(--dark), var(--light));
      }
-      body, h1, p {
+      body,
+      h1,
+      p {
        box-sizing: border-box;
-        margin:0; padding:0;
+        margin: 0;
+        padding: 0;
      }
-      body{
-        font-family:Inter, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+      body {
+        font-family:
+          Inter,
+          system-ui,
+          -apple-system,
+          BlinkMacSystemFont,
+          "Segoe UI",
+          Roboto,
+          Oxygen,
+          Ubuntu,
+          Cantarell,
+          "Open Sans",
+          "Helvetica Neue",
+          sans-serif;
      }
-      h1{
+      h1 {
        width: 100%;
        padding: 1rem;
        letter-spacing: -1.5pt;
-        padding-bottom:10px;
+        padding-bottom: 10px;
        border-bottom: 1px solid var(--rule-color);
        background-color: var(--header-bg);
      }
      p {
-        padding: 1rem; letter-spacing: -0.5pt;}
-      a.indent { display:inline-block; padding-top:0.5rem; padding-left: 2rem; font-size:0.8rem }
-      </style>
+        padding: 1rem;
+        letter-spacing: -0.5pt;
+      }
+      a.indent {
+        display: inline-block;
+        padding-top: 0.5rem;
+        padding-left: 2rem;
+        font-size: 0.8rem;
+      }
+    </style>
    <meta charset="UTF-8" />
  </head>
  <body>
    <h1>Path-Sharing Bounce Page</h1>
    <p>
-      This application is being served via path sharing.
-      If you are not redirected, <span id="help">check the
-      Javascript console in your browser's developer tools
-      for more information.</span>
+      This application is being served via path sharing. If you are not
+      redirected,
+      <span id="help"
+        >check the Javascript console in your browser's developer tools for more
+        information.</span
+      >
    </p>
  </body>
  <script language="javascript">
@@ -58,24 +82,30 @@
    //      This apparently doesn't tolerate a leading `/` so we use a
    //      function to tidy that up.
    function trimFirstCharIf(str, char) {
-       return str.charAt(0) === char ? str.slice(1) : str;
+      return str.charAt(0) === char ? str.slice(1) : str;
    }
    function trimLastCharIf(str, char) {
-       return str.endsWith("/") ? str.slice(0,str.length-1) : str;
+      return str.endsWith("/") ? str.slice(0, str.length - 1) : str;
    }
    const newloc = new URL(window.location);
-    const h = document.getElementById("help")
+    const h = document.getElementById("help");

    // Building the websockify path must happen before we append the filename to newloc.pathname
-    newloc.searchParams.append("path",
-      trimLastCharIf(trimFirstCharIf(newloc.pathname,"/"),"/")+"/websockify");
-    newloc.searchParams.append("encrypted", newloc.protocol==="https:"? true : false);
+    newloc.searchParams.append(
+      "path",
+      trimLastCharIf(trimFirstCharIf(newloc.pathname, "/"), "/") +
+        "/websockify",
+    );
+    newloc.searchParams.append(
+      "encrypted",
+      newloc.protocol === "https:" ? true : false,
+    );

-    newloc.pathname += "vnc.html"
+    newloc.pathname += "vnc.html";
    console.log(newloc);

    h.innerHTML = `click <a id="link" href="${newloc.toString()}">here</a> to go to the application.
-    <br/><br/>The rewritten URL is:<br/><a id="link" class="indent" href="${newloc.toString()}">${newloc.toString()}</a>`
+    <br/><br/>The rewritten URL is:<br/><a id="link" class="indent" href="${newloc.toString()}">${newloc.toString()}</a>`;
    window.location = newloc.href;
  </script>
 </html>
@@ -3,7 +3,10 @@
 # Exit on error, undefined variables, and pipe failures
 set -euo pipefail

-error() { printf "💀 ERROR: %s\n" "$@"; exit 1; }
+error() {
+  printf "💀 ERROR: %s\n" "$@"
+  exit 1
+}

 # Function to check if vncserver is already installed
 check_installed() {
@@ -248,30 +251,30 @@ get_http_dir() {
  echo $httpd_directory
 }

-fix_server_index_file(){
-    local fname=$${FUNCNAME[0]}  # gets current function name
-    if [[ $# -ne 1 ]]; then
-        error "$fname requires exactly 1 parameter:\n\tpath to KasmVNC httpd_directory"
-    fi
-    local httpdir="$1"
-    if [[ ! -d "$httpdir" ]]; then
-      error "$fname: $httpdir is not a directory"
-    fi
-    pushd "$httpdir" > /dev/null
+fix_server_index_file() {
+  local fname=$${FUNCNAME[0]} # gets current function name
+  if [[ $# -ne 1 ]]; then
+    error "$fname requires exactly 1 parameter:\n\tpath to KasmVNC httpd_directory"
+  fi
+  local httpdir="$1"
+  if [[ ! -d "$httpdir" ]]; then
+    error "$fname: $httpdir is not a directory"
+  fi
+  pushd "$httpdir" > /dev/null

-    cat <<'EOH' > /tmp/path_vnc.html
+  cat << 'EOH' > /tmp/path_vnc.html
 ${PATH_VNC_HTML}
 EOH
-    $SUDO mv /tmp/path_vnc.html .
-    # check for the switcheroo
-    if [[ -f "index.html" && -L "vnc.html" ]]; then
-      $SUDO mv $httpdir/index.html $httpdir/vnc.html
-    fi
-    $SUDO ln -s -f path_vnc.html index.html
-    popd > /dev/null
+  $SUDO mv /tmp/path_vnc.html .
+  # check for the switcheroo
+  if [[ -f "index.html" && -L "vnc.html" ]]; then
+    $SUDO mv $httpdir/index.html $httpdir/vnc.html
+  fi
+  $SUDO ln -s -f path_vnc.html index.html
+  popd > /dev/null
 }

-patch_kasm_http_files(){
+patch_kasm_http_files() {
  homedir=$(get_http_dir)
  fix_server_index_file "$homedir"
 }
@@ -292,7 +295,7 @@ set -e

 if [[ $RETVAL -ne 0 ]]; then
  echo "ERROR: Failed to start KasmVNC server. Return code: $RETVAL"
-    if [[ -f "$VNC_LOG" ]]; then
+  if [[ -f "$VNC_LOG" ]]; then
    echo "Full logs:"
    cat "$VNC_LOG"
  else
@@ -18,7 +18,7 @@ Uses the [Coder Remote VS Code Extension](https://github.com/coder/vscode-coder)
 module "kiro" {
  count    = data.coder_workspace.me.start_count
  source   = "registry.coder.com/coder/kiro/coder"
-  version  = "1.0.0"
+  version  = "1.1.0"
  agent_id = coder_agent.example.id
 }
 ```
@@ -31,21 +31,39 @@ module "kiro" {
 module "kiro" {
  count    = data.coder_workspace.me.start_count
  source   = "registry.coder.com/coder/kiro/coder"
-  version  = "1.0.0"
+  version  = "1.1.0"
  agent_id = coder_agent.example.id
  folder   = "/home/coder/project"
 }
 ```

-### Open with custom display name and order
+### Configure MCP servers for Kiro
+
+Provide a JSON-encoded string via the `mcp` input. When set, the module writes the value to `~/.kiro/settings/mcp.json` using a `coder_script` on workspace start.
+
+The following example configures Kiro to use the GitHub MCP server with authentication facilitated by the [`coder_external_auth`](https://coder.com/docs/admin/external-auth#configure-a-github-oauth-app) resource.

 ```tf
 module "kiro" {
-  count        = data.coder_workspace.me.start_count
-  source       = "registry.coder.com/coder/kiro/coder"
-  version      = "1.0.0"
-  agent_id     = coder_agent.example.id
-  display_name = "Kiro AI IDE"
-  order        = 1
+  count    = data.coder_workspace.me.start_count
+  source   = "registry.coder.com/coder/kiro/coder"
+  version  = "1.1.0"
+  agent_id = coder_agent.example.id
+  folder   = "/home/coder/project"
+  mcp = jsonencode({
+    mcpServers = {
+      "github" : {
+        "url" : "https://api.githubcopilot.com/mcp/",
+        "headers" : {
+          "Authorization" : "Bearer ${data.coder_external_auth.github.access_token}",
+        },
+        "type" : "http"
+      }
+    }
+  })
+}
+
+data "coder_external_auth" "github" {
+  id = "github"
 }
 ```
@@ -3,6 +3,11 @@ import {
  runTerraformApply,
  runTerraformInit,
  testRequiredVariables,
+  runContainer,
+  execContainer,
+  removeContainer,
+  findResourceInstance,
+  readFileContainer,
 } from "~test";

 describe("kiro", async () => {
@@ -56,7 +61,7 @@ describe("kiro", async () => {
      slug: "kiro-ai",
      display_name: "Kiro AI IDE",
    });
-    
+
    const coder_app = state.resources.find(
      (res) => res.type === "coder_app" && res.name === "kiro",
    );
@@ -70,7 +75,7 @@ describe("kiro", async () => {
      agent_id: "foo",
      order: "5",
    });
-    
+
    const coder_app = state.resources.find(
      (res) => res.type === "coder_app" && res.name === "kiro",
    );
@@ -83,11 +88,33 @@ describe("kiro", async () => {
      agent_id: "foo",
      group: "AI IDEs",
    });
-    
+
    const coder_app = state.resources.find(
      (res) => res.type === "coder_app" && res.name === "kiro",
    );

    expect(coder_app?.instances[0].attributes.group).toBe("AI IDEs");
  });
+
+  it("writes ~/.kiro/settings/mcp.json when mcp provided", async () => {
+    const id = await runContainer("alpine");
+    try {
+      const mcp = JSON.stringify({ servers: { demo: { url: "http://localhost:1234" } } });
+      const state = await runTerraformApply(import.meta.dir, {
+        agent_id: "foo",
+        mcp,
+      });
+      const script = findResourceInstance(state, "coder_script", "kiro_mcp").script;
+      const resp = await execContainer(id, ["sh", "-c", script]);
+      if (resp.exitCode !== 0) {
+        console.log(resp.stdout);
+        console.log(resp.stderr);
+      }
+      expect(resp.exitCode).toBe(0);
+      const content = await readFileContainer(id, "/root/.kiro/settings/mcp.json");
+      expect(content).toBe(mcp);
+    } finally {
+      await removeContainer(id);
+    }
+  });
 });
@@ -50,9 +50,19 @@ variable "display_name" {
  default     = "Kiro IDE"
 }

+variable "mcp" {
+  type        = string
+  description = "JSON-encoded string to configure MCP servers for Kiro. When set, writes ~/.kiro/settings/mcp.json."
+  default     = ""
+}
+
 data "coder_workspace" "me" {}
 data "coder_workspace_owner" "me" {}

+locals {
+  mcp_b64 = var.mcp != "" ? base64encode(var.mcp) : ""
+}
+
 resource "coder_app" "kiro" {
  agent_id     = var.agent_id
  external     = true
@@ -75,6 +85,22 @@ resource "coder_app" "kiro" {
  ])
 }

+resource "coder_script" "kiro_mcp" {
+  count              = var.mcp != "" ? 1 : 0
+  agent_id           = var.agent_id
+  display_name       = "Kiro MCP"
+  icon               = "/icon/kiro.svg"
+  run_on_start       = true
+  start_blocks_login = false
+  script             = <<-EOT
+    #!/bin/sh
+    set -eu
+    mkdir -p "$HOME/.kiro/settings"
+    echo -n "${local.mcp_b64}" | base64 -d > "$HOME/.kiro/settings/mcp.json"
+    chmod 600 "$HOME/.kiro/settings/mcp.json"
+  EOT
+}
+
 output "kiro_url" {
  value       = coder_app.kiro.url
  description = "Kiro IDE URL."
@@ -9,11 +9,11 @@ CODER_OIDC_ACCESS_TOKEN=${CODER_OIDC_ACCESS_TOKEN}
 fetch() {
  dest="$1"
  url="$2"
-  if command -v curl >/dev/null 2>&1; then
+  if command -v curl > /dev/null 2>&1; then
    curl -sSL --fail "$${url}" -o "$${dest}"
-  elif command -v wget >/dev/null 2>&1; then
+  elif command -v wget > /dev/null 2>&1; then
    wget -O "$${dest}" "$${url}"
-  elif command -v busybox >/dev/null 2>&1; then
+  elif command -v busybox > /dev/null 2>&1; then
    busybox wget -O "$${dest}" "$${url}"
  else
    printf "curl, wget, or busybox is not installed. Please install curl or wget in your image.\n"
@@ -22,9 +22,9 @@ fetch() {
 }

 unzip_safe() {
-  if command -v unzip >/dev/null 2>&1; then
+  if command -v unzip > /dev/null 2>&1; then
    command unzip "$@"
-  elif command -v busybox >/dev/null 2>&1; then
+  elif command -v busybox > /dev/null 2>&1; then
    busybox unzip "$@"
  else
    printf "unzip or busybox is not installed. Please install unzip in your image.\n"
@@ -56,7 +56,7 @@ install() {

  # Check if the vault CLI is installed and has the correct version
  installation_needed=1
-  if command -v vault >/dev/null 2>&1; then
+  if command -v vault > /dev/null 2>&1; then
    CURRENT_VERSION=$(vault version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
    if [ "$${CURRENT_VERSION}" = "$${VAULT_CLI_VERSION}" ]; then
      printf "Vault version %s is already installed and up-to-date.\n\n" "$${CURRENT_VERSION}"
@@ -81,7 +81,7 @@ install() {
      return 1
    fi
    rm vault.zip
-    if sudo mv vault /usr/local/bin/vault 2>/dev/null; then
+    if sudo mv vault /usr/local/bin/vault 2> /dev/null; then
      printf "Vault installed successfully!\n\n"
    else
      mkdir -p ~/.local/bin
@@ -14,7 +14,7 @@ const defaultVariables = {
  coder_app_slug: "vscode",
  coder_app_display_name: "VS Code Desktop",
  protocol: "vscode",
-}
+};

 describe("vscode-desktop-core", async () => {
  await runTerraformInit(import.meta.dir);
@@ -40,7 +40,7 @@ describe("vscode-desktop-core", async () => {
    const state = await runTerraformApply(import.meta.dir, {
      folder: "/foo/bar",

-      ...defaultVariables
+      ...defaultVariables,
    });

    expect(state.outputs.ide_uri.value).toBe(
@@ -86,7 +86,7 @@ describe("vscode-desktop-core", async () => {
  it("expect order to be set", async () => {
    const state = await runTerraformApply(import.meta.dir, {
      coder_app_order: "22",
-      ...defaultVariables
+      ...defaultVariables,
    });

    const coder_app = state.resources.find(
@@ -68,7 +68,7 @@ esac
 # Detect the platform
 if [ -n "${PLATFORM}" ]; then
  DETECTED_PLATFORM="${PLATFORM}"
-elif [ -f /etc/alpine-release ] || grep -qi 'ID=alpine' /etc/os-release 2>/dev/null || command -v apk > /dev/null 2>&1; then
+elif [ -f /etc/alpine-release ] || grep -qi 'ID=alpine' /etc/os-release 2> /dev/null || command -v apk > /dev/null 2>&1; then
  DETECTED_PLATFORM="alpine"
 elif [ "$(uname -s)" = "Darwin" ]; then
  DETECTED_PLATFORM="darwin"
@@ -16,7 +16,7 @@ Uses the [Coder Remote VS Code Extension](https://github.com/coder/vscode-coder)
 module "windsurf" {
  count    = data.coder_workspace.me.start_count
  source   = "registry.coder.com/coder/windsurf/coder"
-  version  = "1.1.1"
+  version  = "1.2.0"
  agent_id = coder_agent.example.id
 }
 ```
@@ -29,8 +29,39 @@ module "windsurf" {
 module "windsurf" {
  count    = data.coder_workspace.me.start_count
  source   = "registry.coder.com/coder/windsurf/coder"
-  version  = "1.1.1"
+  version  = "1.2.0"
  agent_id = coder_agent.example.id
  folder   = "/home/coder/project"
 }
 ```
+
+### Configure MCP servers for Windsurf
+
+Provide a JSON-encoded string via the `mcp` input. When set, the module writes the value to `~/.codeium/windsurf/mcp_config.json` using a `coder_script` on workspace start.
+
+The following example configures Windsurf to use the GitHub MCP server with authentication facilitated by the [`coder_external_auth`](https://coder.com/docs/admin/external-auth#configure-a-github-oauth-app) resource.
+
+```tf
+module "windsurf" {
+  count    = data.coder_workspace.me.start_count
+  source   = "registry.coder.com/coder/windsurf/coder"
+  version  = "1.2.0"
+  agent_id = coder_agent.example.id
+  folder   = "/home/coder/project"
+  mcp = jsonencode({
+    mcpServers = {
+      "github" : {
+        "url" : "https://api.githubcopilot.com/mcp/",
+        "headers" : {
+          "Authorization" : "Bearer ${data.coder_external_auth.github.access_token}",
+        },
+        "type" : "http"
+      }
+    }
+  })
+}
+
+data "coder_external_auth" "github" {
+  id = "github"
+}
+```
@@ -3,6 +3,11 @@ import {
  runTerraformApply,
  runTerraformInit,
  testRequiredVariables,
+  runContainer,
+  execContainer,
+  removeContainer,
+  findResourceInstance,
+  readFileContainer,
 } from "~test";

 describe("windsurf", async () => {
@@ -85,4 +90,26 @@ describe("windsurf", async () => {
    expect(coder_app?.instances.length).toBe(1);
    expect(coder_app?.instances[0].attributes.order).toBe(22);
  });
+
+  it("writes ~/.codeium/windsurf/mcp_config.json when mcp provided", async () => {
+    const id = await runContainer("alpine");
+    try {
+      const mcp = JSON.stringify({ servers: { demo: { url: "http://localhost:1234" } } });
+      const state = await runTerraformApply(import.meta.dir, {
+        agent_id: "foo",
+        mcp,
+      });
+      const script = findResourceInstance(state, "coder_script", "windsurf_mcp").script;
+      const resp = await execContainer(id, ["sh", "-c", script]);
+      if (resp.exitCode !== 0) {
+        console.log(resp.stdout);
+        console.log(resp.stderr);
+      }
+      expect(resp.exitCode).toBe(0);
+      const content = await readFileContainer(id, "/root/.codeium/windsurf/mcp_config.json");
+      expect(content).toBe(mcp);
+    } finally {
+      await removeContainer(id);
+    }
+  });
 });
@@ -38,15 +38,37 @@ variable "group" {
  default     = null
 }

+variable "slug" {
+  type        = string
+  description = "The slug of the app."
+  default     = "windsurf"
+}
+
+variable "display_name" {
+  type        = string
+  description = "The display name of the app."
+  default     = "Windsurf Editor"
+}
+
+variable "mcp" {
+  type        = string
+  description = "JSON-encoded string to configure MCP servers for Windsurf. When set, writes ~/.codeium/windsurf/mcp_config.json."
+  default     = ""
+}
+
 data "coder_workspace" "me" {}
 data "coder_workspace_owner" "me" {}

+locals {
+  mcp_b64 = var.mcp != "" ? base64encode(var.mcp) : ""
+}
+
 resource "coder_app" "windsurf" {
  agent_id     = var.agent_id
  external     = true
  icon         = "/icon/windsurf.svg"
-  slug         = "windsurf"
-  display_name = "Windsurf Editor"
+  slug         = var.slug
+  display_name = var.display_name
  order        = var.order
  group        = var.group
  url = join("", [
@@ -63,6 +85,22 @@ resource "coder_app" "windsurf" {
  ])
 }

+resource "coder_script" "windsurf_mcp" {
+  count              = var.mcp != "" ? 1 : 0
+  agent_id           = var.agent_id
+  display_name       = "Windsurf MCP"
+  icon               = "/icon/windsurf.svg"
+  run_on_start       = true
+  start_blocks_login = false
+  script             = <<-EOT
+    #!/bin/sh
+    set -eu
+    mkdir -p "$HOME/.codeium/windsurf"
+    echo -n "${local.mcp_b64}" | base64 -d > "$HOME/.codeium/windsurf/mcp_config.json"
+    chmod 600 "$HOME/.codeium/windsurf/mcp_config.json"
+  EOT
+}
+
 output "windsurf_url" {
  value       = coder_app.windsurf.url
  description = "Windsurf Editor URL."
@@ -0,0 +1,21 @@
+---
+display_name: "Rishi Mondal"
+bio: "Breaking code, fixing bugs, and occasionally making it work! Always caffeinated, always committing"
+avatar: "./.images/avatar.jpeg"
+github: "MAVRICK-1"
+linkedin: "https://www.linkedin.com/in/rishi-mondal-5238b2282/" # Optional
+website: "https://mavrick-portfolio.vercel.app/" # Optional
+support_email: "mavrickrishi@gmail.com" # Optional
+status: "community"
+---
+
+# Rishi Mondal
+
+I'm Rishi Mondal, a passionate developer from Chinsurah Hooghly, West Bengal, India.
+I'm a maintainer at CNCF KubeStellar, GSoC contributor at UCSC OSPO, and a Docker Captain.
+When I'm not breaking code and fixing bugs, you'll find me contributing to open-source projects,
+participating in LFX CNCF programs, and helping the developer community grow.
+
+## Modules
+
+- **aws-ami-snapshot**: Create and manage AMI snapshots for Coder workspaces with restore capabilities
@@ -0,0 +1,173 @@
+---
+display_name: AWS AMI Snapshot
+description: Create and manage AMI snapshots for Coder workspaces with restore capabilities
+icon: ../../../../.icons/aws.svg
+verified: false
+tags: [aws, snapshot, ami, backup, persistence]
+---
+
+# AWS AMI Snapshot Module
+
+This module provides AMI-based snapshot functionality for Coder workspaces running on AWS EC2 instances. It enables users to create snapshots when workspaces are stopped and restore from previous snapshots when starting workspaces.
+
+```tf
+module "ami_snapshot" {
+  source  = "registry.coder.com/mavrickrishi/aws-ami-snapshot/coder"
+  version = "1.0.0"
+
+  instance_id    = aws_instance.workspace.id
+  default_ami_id = data.aws_ami.ubuntu.id
+  template_name  = "aws-linux"
+}
+```
+
+## Features
+
+- **Automatic Snapshots**: Create AMI snapshots when workspaces are stopped
+- **User Control**: Enable/disable snapshot functionality per workspace
+- **Custom Labels**: Add custom labels to snapshots for easy identification
+- **Snapshot Selection**: Choose from available snapshots when starting workspaces
+- **Automatic Cleanup**: Optional Data Lifecycle Manager integration for automated cleanup
+- **Workspace Isolation**: Snapshots are tagged and filtered by workspace and owner
+
+## Parameters
+
+The module exposes the following parameters to workspace users:
+
+- `enable_snapshots`: Enable/disable AMI snapshot creation (default: true)
+- `snapshot_label`: Custom label for the snapshot (optional)
+- `use_previous_snapshot`: Select a previous snapshot to restore from (default: none)
+
+## Usage
+
+### Basic Usage
+
+```hcl
+module "ami_snapshot" {
+  source = "registry.coder.com/modules/aws-ami-snapshot"
+
+  instance_id     = aws_instance.workspace.id
+  default_ami_id  = data.aws_ami.ubuntu.id
+  template_name   = "aws-linux"
+}
+
+resource "aws_instance" "workspace" {
+  ami           = module.ami_snapshot.ami_id
+  instance_type = "t3.micro"
+
+  # Prevent Terraform from recreating instance when AMI changes
+  lifecycle {
+    ignore_changes = [ami]
+  }
+}
+```
+
+### With Optional Cleanup
+
+```hcl
+module "ami_snapshot" {
+  source = "registry.coder.com/modules/aws-ami-snapshot"
+
+  instance_id               = aws_instance.workspace.id
+  default_ami_id           = data.aws_ami.ubuntu.id
+  template_name            = "aws-linux"
+  enable_dlm_cleanup       = true
+  dlm_role_arn            = aws_iam_role.dlm_lifecycle_role.arn
+  snapshot_retention_count = 5
+
+  tags = {
+    Environment = "development"
+    Project     = "my-project"
+  }
+}
+```
+
+### IAM Role for DLM (Optional)
+
+If using automatic cleanup, create an IAM role for Data Lifecycle Manager:
+
+```hcl
+resource "aws_iam_role" "dlm_lifecycle_role" {
+  name = "dlm-lifecycle-role"
+
+  assume_role_policy = jsonencode({
+    Version = "2012-10-17"
+    Statement = [
+      {
+        Action = "sts:AssumeRole"
+        Effect = "Allow"
+        Principal = {
+          Service = "dlm.amazonaws.com"
+        }
+      }
+    ]
+  })
+}
+
+resource "aws_iam_role_policy_attachment" "dlm_lifecycle" {
+  role       = aws_iam_role.dlm_lifecycle_role.name
+  policy_arn = "arn:aws:iam::aws:policy/service-role/AWSDataLifecycleManagerServiceRole"
+}
+```
+
+## Required IAM Permissions
+
+Users need the following IAM permissions for full functionality:
+
+```json
+{
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Effect": "Allow",
+      "Action": [
+        "ec2:CreateImage",
+        "ec2:DescribeImages",
+        "ec2:DescribeInstances",
+        "ec2:CreateTags",
+        "ec2:DescribeTags"
+      ],
+      "Resource": "*"
+    },
+    {
+      "Effect": "Allow",
+      "Action": [
+        "dlm:CreateLifecyclePolicy",
+        "dlm:GetLifecyclePolicy",
+        "dlm:UpdateLifecyclePolicy",
+        "dlm:DeleteLifecyclePolicy"
+      ],
+      "Resource": "*",
+      "Condition": {
+        "StringEquals": {
+          "dlm:Target": "INSTANCE"
+        }
+      }
+    }
+  ]
+}
+```
+
+## How It Works
+
+1. **Snapshot Creation**: When a workspace transitions to "stop", an AMI snapshot is automatically created (if enabled)
+2. **Tagging**: Snapshots are tagged with workspace name, owner, template, and custom labels
+3. **Snapshot Retrieval**: Available snapshots are retrieved and presented as options for workspace start
+4. **AMI Selection**: The module outputs the appropriate AMI ID (default or selected snapshot)
+5. **Cleanup**: Optional DLM policies can automatically clean up old snapshots
+
+## Considerations
+
+- **Cost**: AMI snapshots incur storage costs. Use cleanup policies to manage costs
+- **Time**: AMI creation takes time; workspace stop operations may take longer
+- **Permissions**: Ensure proper IAM permissions for AMI creation and management
+- **Region**: Snapshots are region-specific and cannot be used across regions
+- **Lifecycle**: Use `ignore_changes = [ami]` on EC2 instances to prevent conflicts
+
+## Examples
+
+See the updated AWS templates that use this module:
+
+- [`coder/templates/aws-linux`](https://registry.coder.com/templates/aws-linux)
+- [`coder/templates/aws-windows`](https://registry.coder.com/templates/aws-windows)
+- [`coder/templates/aws-devcontainer`](https://registry.coder.com/templates/aws-devcontainer)
@@ -0,0 +1,65 @@
+import { describe, expect, it } from "bun:test";
+import {
+  runTerraformApply,
+  runTerraformInit,
+  testRequiredVariables,
+} from "~test";
+
+describe("aws-ami-snapshot", async () => {
+  await runTerraformInit(import.meta.dir);
+
+  it("required variables with test mode", async () => {
+    await runTerraformApply(import.meta.dir, {
+      instance_id: "i-1234567890abcdef0",
+      default_ami_id: "ami-12345678",
+      template_name: "test-template",
+      test_mode: true,
+    });
+  });
+
+  it("missing variable: instance_id", async () => {
+    await expect(
+      runTerraformApply(import.meta.dir, {
+        default_ami_id: "ami-12345678",
+        template_name: "test-template",
+        test_mode: true,
+      }),
+    ).rejects.toThrow();
+  });
+
+  it("missing variable: default_ami_id", async () => {
+    await expect(
+      runTerraformApply(import.meta.dir, {
+        instance_id: "i-1234567890abcdef0",
+        template_name: "test-template",
+        test_mode: true,
+      }),
+    ).rejects.toThrow();
+  });
+
+  it("missing variable: template_name", async () => {
+    await expect(
+      runTerraformApply(import.meta.dir, {
+        instance_id: "i-1234567890abcdef0",
+        default_ami_id: "ami-12345678",
+        test_mode: true,
+      }),
+    ).rejects.toThrow();
+  });
+
+  it("supports optional variables", async () => {
+    await runTerraformApply(import.meta.dir, {
+      instance_id: "i-1234567890abcdef0",
+      default_ami_id: "ami-12345678",
+      template_name: "test-template",
+      test_mode: true,
+      enable_dlm_cleanup: true,
+      dlm_role_arn: "arn:aws:iam::123456789012:role/dlm-lifecycle-role",
+      snapshot_retention_count: 5,
+      tags: JSON.stringify({
+        Environment: "test",
+        Project: "coder",
+      }),
+    });
+  });
+});
@@ -0,0 +1,260 @@
+terraform {
+  required_version = ">= 1.0"
+
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 5.0"
+    }
+    coder = {
+      source  = "coder/coder"
+      version = ">= 0.17"
+    }
+  }
+}
+
+# Provider configuration for testing only
+# In production, the provider will be inherited from the calling module
+provider "aws" {
+  region                      = "us-east-1"
+  skip_credentials_validation = true
+  skip_requesting_account_id  = true
+  skip_region_validation      = true
+
+  # Mock credentials for testing
+  access_key = "test"
+  secret_key = "test"
+}
+
+# Variables
+variable "test_mode" {
+  description = "Set to true when running tests to skip AWS API calls"
+  type        = bool
+  default     = false
+}
+
+variable "instance_id" {
+  description = "The EC2 instance ID to create snapshots from"
+  type        = string
+}
+
+variable "default_ami_id" {
+  description = "The default AMI ID to use when not restoring from a snapshot"
+  type        = string
+}
+
+variable "template_name" {
+  description = "The name of the Coder template using this module"
+  type        = string
+}
+
+variable "tags" {
+  description = "Additional tags to apply to snapshots"
+  type        = map(string)
+  default     = {}
+}
+
+variable "enable_dlm_cleanup" {
+  description = "Enable Data Lifecycle Manager for automated snapshot cleanup"
+  type        = bool
+  default     = false
+}
+
+variable "dlm_role_arn" {
+  description = "ARN of the IAM role for DLM (required if enable_dlm_cleanup is true)"
+  type        = string
+  default     = ""
+}
+
+variable "snapshot_retention_count" {
+  description = "Number of snapshots to retain when using DLM cleanup"
+  type        = number
+  default     = 7
+}
+
+# Parameters for snapshot control
+data "coder_parameter" "enable_snapshots" {
+  name         = "enable_snapshots"
+  display_name = "Enable AMI Snapshots"
+  description  = "Create AMI snapshots when workspace is stopped"
+  type         = "bool"
+  default      = "true"
+  mutable      = true
+}
+
+data "coder_parameter" "snapshot_label" {
+  name         = "snapshot_label"
+  display_name = "Snapshot Label"
+  description  = "Custom label for this snapshot (optional)"
+  type         = "string"
+  default      = ""
+  mutable      = true
+}
+
+data "coder_parameter" "use_previous_snapshot" {
+  name         = "use_previous_snapshot"
+  display_name = "Start from Snapshot"
+  description  = "Select a previous snapshot to restore from"
+  type         = "string"
+  default      = "none"
+  mutable      = true
+  option {
+    name        = "Use default AMI"
+    value       = "none"
+    description = "Start with a fresh instance"
+  }
+  dynamic "option" {
+    for_each = local.workspace_snapshot_ids
+    content {
+      name        = var.test_mode ? "Test Snapshot" : "${local.snapshot_info[option.value].name} (${formatdate("YYYY-MM-DD hh:mm", timeadd(local.snapshot_info[option.value].creation_date, "0s"))})"
+      value       = option.value
+      description = var.test_mode ? "Test Description" : local.snapshot_info[option.value].description
+    }
+  }
+}
+
+# Get workspace information
+data "coder_workspace" "me" {}
+data "coder_workspace_owner" "me" {}
+
+# Local values to handle test mode
+locals {
+  workspace_snapshot_ids = var.test_mode ? [] : data.aws_ami_ids.workspace_snapshots[0].ids
+  snapshot_info = var.test_mode ? {} : {
+    for ami_id in local.workspace_snapshot_ids : ami_id => data.aws_ami.snapshot_info[ami_id]
+  }
+}
+
+# Retrieve existing snapshots for this workspace
+data "aws_ami_ids" "workspace_snapshots" {
+  count  = var.test_mode ? 0 : 1
+  owners = ["self"]
+
+  filter {
+    name   = "tag:CoderWorkspace"
+    values = [data.coder_workspace.me.name]
+  }
+
+  filter {
+    name   = "tag:CoderOwner"
+    values = [data.coder_workspace_owner.me.name]
+  }
+
+  filter {
+    name   = "tag:CoderTemplate"
+    values = [var.template_name]
+  }
+
+  filter {
+    name   = "state"
+    values = ["available"]
+  }
+}
+
+# Get detailed information about each snapshot
+data "aws_ami" "snapshot_info" {
+  for_each = toset(local.workspace_snapshot_ids)
+  owners   = ["self"]
+
+  filter {
+    name   = "image-id"
+    values = [each.value]
+  }
+}
+
+# Determine which AMI to use
+locals {
+  use_snapshot = data.coder_parameter.use_previous_snapshot.value != "none"
+  ami_id       = local.use_snapshot ? data.coder_parameter.use_previous_snapshot.value : var.default_ami_id
+}
+
+# Create AMI snapshot when workspace is stopped
+resource "aws_ami_from_instance" "workspace_snapshot" {
+  count                   = data.coder_parameter.enable_snapshots.value && data.coder_workspace.me.transition == "stop" ? 1 : 0
+  name                    = "${data.coder_workspace_owner.me.name}-${data.coder_workspace.me.name}-${formatdate("YYYY-MM-DD-hhmm", timestamp())}"
+  source_instance_id      = var.instance_id
+  snapshot_without_reboot = true
+  deprecation_time        = timeadd(timestamp(), "168h") # 7 days
+
+  tags = merge(var.tags, {
+    Name           = "${data.coder_workspace_owner.me.name}-${data.coder_workspace.me.name}-snapshot"
+    CoderWorkspace = data.coder_workspace.me.name
+    CoderOwner     = data.coder_workspace_owner.me.name
+    CoderTemplate  = var.template_name
+    SnapshotLabel  = data.coder_parameter.snapshot_label.value
+    CreatedAt      = timestamp()
+    SnapshotType   = "workspace"
+    WorkspaceId    = data.coder_workspace.me.id
+  })
+
+  lifecycle {
+    ignore_changes = [
+      deprecation_time
+    ]
+  }
+}
+
+# Optional: Data Lifecycle Manager policy for automated cleanup
+resource "aws_dlm_lifecycle_policy" "workspace_snapshots" {
+  count              = var.enable_dlm_cleanup && !var.test_mode ? 1 : 0
+  description        = "Lifecycle policy for Coder workspace AMI snapshots"
+  execution_role_arn = var.dlm_role_arn
+  state              = "ENABLED"
+
+  policy_details {
+    resource_types = ["INSTANCE"]
+    target_tags = {
+      CoderTemplate = var.template_name
+      SnapshotType  = "workspace"
+    }
+
+    schedule {
+      name = "Coder workspace snapshot cleanup"
+
+      create_rule {
+        interval      = 24
+        interval_unit = "HOURS"
+        times         = ["03:00"]
+      }
+
+      retain_rule {
+        count = var.snapshot_retention_count
+      }
+
+      copy_tags = true
+    }
+  }
+}
+
+# Outputs
+output "ami_id" {
+  description = "The AMI ID to use for the workspace instance (either default or selected snapshot)"
+  value       = local.ami_id
+}
+
+output "is_using_snapshot" {
+  description = "Whether the workspace is using a snapshot AMI"
+  value       = local.use_snapshot
+}
+
+output "snapshot_ami_id" {
+  description = "The AMI ID of the created snapshot (if any)"
+  value       = data.coder_parameter.enable_snapshots.value && data.coder_workspace.me.transition == "stop" ? aws_ami_from_instance.workspace_snapshot[0].id : null
+}
+
+output "available_snapshots" {
+  description = "List of available snapshot AMI IDs for this workspace"
+  value       = local.workspace_snapshot_ids
+}
+
+output "snapshot_info" {
+  description = "Detailed information about available snapshots"
+  value = var.test_mode ? {} : {
+    for ami_id in local.workspace_snapshot_ids : ami_id => {
+      name         = local.snapshot_info[ami_id].name
+      description  = local.snapshot_info[ami_id].description
+      created_date = local.snapshot_info[ami_id].creation_date
+      tags         = local.snapshot_info[ami_id].tags
+    }
+  }
+}