Merge pull request 'chore: group all dependencies in renovate config' (#117) from chore/update-renovate-config into staging

Reviewed-on: #117

.gitea/workflows/build.yml

@@ -2,91 +2,48 @@ name: Docker Build and Push
 
 on:
   push:
-    branches:
-      - main
-      - staging
     tags:
       - 'v*'
-    paths:
-      - '**.go'
-      - 'go.mod'
-      - 'go.sum'
-      - 'Dockerfile'
-      - 'Dockerfile.*'
-      - '.dockerignore'
-      - '.gitea/workflows/build.yml'
 
 jobs:
-  build-and-push-branches:
+  test:
+    name: Run Tests
     runs-on: ubuntu-latest
-    if: github.ref_type == 'branch'
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Set up Go
+        uses: actions/setup-go@v6
+        with:
+          go-version: 'stable'
+          cache: false
+
+      - name: Install dependencies
+        run: go mod download
+
+      - name: Run go vet
+        run: go vet ./...
+
+      - name: Run tests
+        run: go test -v -p 4 ./...
+
+
+  build-and-push:
+    name: Build and Push Docker Image
+    runs-on: ubuntu-latest
+    needs: test
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
 
-      - name: Log in to Docker Hub
+      - name: Log in to Docker Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
-        with:
-          registry: git.fossy.my.id
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Set version variables
-        id: vars
-        run: |
-          if [ "${{ github.ref }}" == "refs/heads/main" ]; then
-            echo "VERSION=dev-main" >> $GITHUB_OUTPUT
-          else
-            echo "VERSION=dev-staging" >> $GITHUB_OUTPUT
-          fi
-          echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
-          echo "COMMIT=${{ github.sha }}" >> $GITHUB_OUTPUT
-
-      - name: Build and push Docker image for main
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: true
-          tags: |
-            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:latest
-          platforms: linux/amd64,linux/arm64
-          build-args: |
-            VERSION=${{ steps.vars.outputs.VERSION }}
-            BUILD_DATE=${{ steps.vars.outputs.BUILD_DATE }}
-            COMMIT=${{ steps.vars.outputs.COMMIT }}
-        if: github.ref == 'refs/heads/main'
-
-      - name: Build and push Docker image for staging
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          push: true
-          tags: |
-            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:staging
-          platforms: linux/amd64,linux/arm64
-          build-args: |
-            VERSION=${{ steps.vars.outputs.VERSION }}
-            BUILD_DATE=${{ steps.vars.outputs.BUILD_DATE }}
-            COMMIT=${{ steps.vars.outputs.COMMIT }}
-        if: github.ref == 'refs/heads/staging'
-
-  build-and-push-tags:
-    runs-on: ubuntu-latest
-    if: github.ref_type == 'tag' && startsWith(github.ref, 'refs/tags/v')
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v6
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
         with:
           registry: git.fossy.my.id
           username: ${{ secrets.DOCKER_USERNAME }}
@@ -103,32 +60,35 @@ jobs:
           if echo "$VERSION" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+(-[a-zA-Z0-9.]+)?$'; then
             MAJOR=$(echo "$VERSION" | cut -d. -f1)
             MINOR=$(echo "$VERSION" | cut -d. -f2)
-            
+            PATCH=$(echo "$VERSION" | cut -d. -f3 | cut -d- -f1)
+          
             echo "MAJOR=$MAJOR" >> $GITHUB_OUTPUT
             echo "MINOR=$MINOR" >> $GITHUB_OUTPUT
-            
+            echo "PATCH=$PATCH" >> $GITHUB_OUTPUT
+          
             if echo "$VERSION" | grep -q '-'; then
+              PRERELEASE_TAG=$(echo "$VERSION" | cut -d- -f2 | cut -d. -f1)
               echo "IS_PRERELEASE=true" >> $GITHUB_OUTPUT
-              echo "ADDITIONAL_TAG=staging" >> $GITHUB_OUTPUT
+              echo "PRERELEASE_TAG=$PRERELEASE_TAG" >> $GITHUB_OUTPUT
             else
               echo "IS_PRERELEASE=false" >> $GITHUB_OUTPUT
-              echo "ADDITIONAL_TAG=latest" >> $GITHUB_OUTPUT
             fi
           else
             echo "Invalid version format: $VERSION"
             exit 1
           fi
 
-      - name: Build and push Docker image for release
+      - name: Build and push Docker image (release)
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           push: true
           tags: |
             git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:v${{ steps.version.outputs.VERSION }}
+            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:release
             git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:v${{ steps.version.outputs.MAJOR }}.${{ steps.version.outputs.MINOR }}
             git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:v${{ steps.version.outputs.MAJOR }}
-            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:${{ steps.version.outputs.ADDITIONAL_TAG }}
+            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:latest
           platforms: linux/amd64,linux/arm64
           build-args: |
             VERSION=${{ steps.version.outputs.VERSION }}
@@ -136,17 +96,17 @@ jobs:
             COMMIT=${{ steps.version.outputs.COMMIT }}
         if: steps.version.outputs.IS_PRERELEASE == 'false'
 
-      - name: Build and push Docker image for pre-release
+      - name: Build and push Docker image (pre-release)
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .
           push: true
           tags: |
             git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:v${{ steps.version.outputs.VERSION }}
-            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:${{ steps.version.outputs.ADDITIONAL_TAG }}
+            git.fossy.my.id/${{ secrets.DOCKER_USERNAME }}/tunnel-please:staging
           platforms: linux/amd64,linux/arm64
           build-args: |
             VERSION=${{ steps.version.outputs.VERSION }}
             BUILD_DATE=${{ steps.version.outputs.BUILD_DATE }}
             COMMIT=${{ steps.version.outputs.COMMIT }}
-        if: steps.version.outputs.IS_PRERELEASE == 'true'
+        if: steps.version.outputs.IS_PRERELEASE == 'true'

.gitea/workflows/sonarqube.yml

@@ -1,7 +1,9 @@
 on:
   push:
-  pull_request:
+    branches:
-    types: [opened, synchronize, reopened]
+      - main
+      - staging
+      - 'feat/**'
 
 name: SonarQube Scan
 jobs:
@@ -10,14 +12,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checking out
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           fetch-depth: 0
 
       - name: Set up Go
         uses: actions/setup-go@v6
         with:
-          go-version: '1.25.5'
+          go-version: 'stable'
           cache: false
 
       - name: Install dependencies
@@ -28,30 +30,18 @@ jobs:
 
       - name: Run tests with coverage
         run: |
-          go test ./... -v -coverprofile=coverage
+          go test ./... -v -p 4 -coverprofile=coverage
 
       - name: Run GolangCI-Lint Analysis
         uses: golangci/golangci-lint-action@v9
         with:
           skip-cache: true
-          version: v2.6
+          version: latest
           args: >
             --issues-exit-code=0
             --output.text.path=stdout
             --output.checkstyle.path=golangci-lint-report.xml
 
-      - name: Set SonarQube project key
-        run: |
-          BRANCH_NAME=${GITHUB_REF#refs/heads/}
-           if [ "$BRANCH_NAME" = "main" ]; then
-            SONAR_PROJECT_KEY="tunnel-please"
-          else
-            BRANCH_KEY=${BRANCH_NAME//\//-}
-            SONAR_PROJECT_KEY="tunnel-please-$BRANCH_KEY"
-          fi
-          echo "SONAR_PROJECT_KEY=tunnel-please-$BRANCH_KEY" >> $GITHUB_ENV
-          echo "Using SonarQube Project Key: $SONAR_PROJECT_KEY"
-
       - name: SonarQube Scan
         uses: SonarSource/sonarqube-scan-action@v7.0.0
         env:
@@ -59,7 +49,7 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONARQUBE_TOKEN }}
         with:
           args: >
-            -Dsonar.projectKey=${{ env.SONAR_PROJECT_KEY }}
+            -Dsonar.projectKey=tunnel-please
             -Dsonar.go.coverage.reportPaths=coverage
             -Dsonar.test.inclusions=**/*_test.go
             -Dsonar.test.exclusions=**/vendor/**

.gitea/workflows/testing.yml

@@ -0,0 +1,36 @@
+name: Tests
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+  issue_comment:
+    types: [created]
+
+jobs:
+  test:
+    name: Run Tests
+    runs-on: ubuntu-latest
+    if: |
+      github.event_name == 'pull_request' ||
+      (github.event_name == 'issue_comment' && 
+       github.event.issue.pull_request != null &&
+       contains(github.event.comment.body, '/retest'))
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Set up Go
+        uses: actions/setup-go@v6
+        with:
+          go-version: 'stable'
+          cache: false
+
+      - name: Install dependencies
+        run: go mod download
+
+      - name: Run go vet
+        run: go vet ./...
+
+      - name: Run tests
+        run: go test -v -p 4 ./...

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.25.6-alpine AS go_builder
+FROM golang:1.26.1-alpine AS go_builder
 
 ARG VERSION=dev
 ARG BUILD_DATE=unknown

go.mod

@@ -1,60 +1,55 @@
 module tunnel_pls
 
-go 1.25.5
+go 1.26.0
 
 require (
+	charm.land/bubbles/v2 v2.0.0
+	charm.land/bubbletea/v2 v2.0.2
+	charm.land/lipgloss/v2 v2.0.1
 	git.fossy.my.id/bagas/tunnel-please-grpc v1.5.0
-	github.com/caddyserver/certmagic v0.25.1
+	github.com/caddyserver/certmagic v0.25.2
-	github.com/charmbracelet/bubbles v0.21.0
+	github.com/charmbracelet/colorprofile v0.4.3
-	github.com/charmbracelet/bubbletea v1.3.10
-	github.com/charmbracelet/lipgloss v1.1.0
 	github.com/joho/godotenv v1.5.1
 	github.com/libdns/cloudflare v0.2.2
-	github.com/muesli/termenv v0.16.0
+	github.com/stretchr/testify v1.11.1
-	github.com/stretchr/testify v1.8.1
+	golang.org/x/crypto v0.48.0
-	golang.org/x/crypto v0.47.0
+	google.golang.org/grpc v1.79.2
-	google.golang.org/grpc v1.78.0
 	google.golang.org/protobuf v1.36.11
 )
 
 require (
 	github.com/atotto/clipboard v0.1.4 // indirect
-	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
+	github.com/caddyserver/zerossl v0.1.5 // indirect
-	github.com/caddyserver/zerossl v0.1.4 // indirect
+	github.com/charmbracelet/ultraviolet v0.0.0-20260205113103-524a6607adb8 // indirect
-	github.com/charmbracelet/colorprofile v0.4.1 // indirect
+	github.com/charmbracelet/x/ansi v0.11.6 // indirect
-	github.com/charmbracelet/x/ansi v0.11.3 // indirect
-	github.com/charmbracelet/x/cellbuf v0.0.14 // indirect
 	github.com/charmbracelet/x/term v0.2.2 // indirect
-	github.com/clipperhouse/displaywidth v0.6.2 // indirect
+	github.com/charmbracelet/x/termios v0.1.1 // indirect
-	github.com/clipperhouse/stringish v0.1.1 // indirect
+	github.com/charmbracelet/x/windows v0.2.2 // indirect
-	github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
+	github.com/clipperhouse/displaywidth v0.11.0 // indirect
+	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
 	github.com/klauspost/cpuid/v2 v2.3.0 // indirect
 	github.com/libdns/libdns v1.1.1 // indirect
 	github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.20 // indirect
-	github.com/mattn/go-localereader v0.0.1 // indirect
+	github.com/mholt/acmez/v3 v3.1.6 // indirect
-	github.com/mattn/go-runewidth v0.0.19 // indirect
+	github.com/miekg/dns v1.1.72 // indirect
-	github.com/mholt/acmez/v3 v3.1.4 // indirect
-	github.com/miekg/dns v1.1.69 // indirect
-	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/sahilm/fuzzy v0.1.1 // indirect
-	github.com/stretchr/objx v0.5.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	github.com/zeebo/blake3 v0.2.4 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.1 // indirect
 	go.uber.org/zap/exp v0.3.0 // indirect
-	golang.org/x/mod v0.31.0 // indirect
+	golang.org/x/mod v0.33.0 // indirect
-	golang.org/x/net v0.48.0 // indirect
+	golang.org/x/net v0.50.0 // indirect
 	golang.org/x/sync v0.19.0 // indirect
-	golang.org/x/sys v0.40.0 // indirect
+	golang.org/x/sys v0.42.0 // indirect
-	golang.org/x/text v0.33.0 // indirect
+	golang.org/x/text v0.34.0 // indirect
-	golang.org/x/tools v0.40.0 // indirect
+	golang.org/x/tools v0.42.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,42 +1,51 @@
+charm.land/bubbles/v2 v2.0.0 h1:tE3eK/pHjmtrDiRdoC9uGNLgpopOd8fjhEe31B/ai5s=
+charm.land/bubbles/v2 v2.0.0/go.mod h1:rCHoleP2XhU8um45NTuOWBPNVHxnkXKTiZqcclL/qOI=
+charm.land/bubbletea/v2 v2.0.1 h1:B8e9zzK7x9JJ+XvHGF4xnYu9Xa0E0y0MyggY6dbaCfQ=
+charm.land/bubbletea/v2 v2.0.1/go.mod h1:3LRff2U4WIYXy7MTxfbAQ+AdfM3D8Xuvz2wbsOD9OHQ=
+charm.land/bubbletea/v2 v2.0.2 h1:4CRtRnuZOdFDTWSff9r8QFt/9+z6Emubz3aDMnf/dx0=
+charm.land/bubbletea/v2 v2.0.2/go.mod h1:3LRff2U4WIYXy7MTxfbAQ+AdfM3D8Xuvz2wbsOD9OHQ=
+charm.land/lipgloss/v2 v2.0.0 h1:sd8N/B3x892oiOjFfBQdXBQp3cAkvjGaU5TvVZC3ivo=
+charm.land/lipgloss/v2 v2.0.0/go.mod h1:w6SnmsBFBmEFBodiEDurGS/sdUY/u1+v72DqUzc6J14=
+charm.land/lipgloss/v2 v2.0.1 h1:6Xzrn49+Py1Um5q/wZG1gWgER2+7dUyZ9XMEufqPSys=
+charm.land/lipgloss/v2 v2.0.1/go.mod h1:KjPle2Qd3YmvP1KL5OMHiHysGcNwq6u83MUjYkFvEkM=
+code.pfad.fr/check v1.1.0 h1:GWvjdzhSEgHvEHe2uJujDcpmZoySKuHQNrZMfzfO0bE=
+code.pfad.fr/check v1.1.0/go.mod h1:NiUH13DtYsb7xp5wll0U4SXx7KhXQVCtRgdC96IPfoM=
 git.fossy.my.id/bagas/tunnel-please-grpc v1.5.0 h1:3xszIhck4wo9CoeRq9vnkar4PhY7kz9QrR30qj2XszA=
 git.fossy.my.id/bagas/tunnel-please-grpc v1.5.0/go.mod h1:Weh6ZujgWmT8XxD3Qba7sJ6r5eyUMB9XSWynqdyOoLo=
 github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
 github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
-github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
+github.com/aymanbagabas/go-udiff v0.4.0 h1:TKnLPh7IbnizJIBKFWa9mKayRUBQ9Kh1BPCk6w2PnYM=
-github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
+github.com/aymanbagabas/go-udiff v0.4.0/go.mod h1:0L9PGwj20lrtmEMeyw4WKJ/TMyDtvAoK9bf2u/mNo3w=
-github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWpi6yML8=
+github.com/caddyserver/certmagic v0.25.2 h1:D7xcS7ggX/WEY54x0czj7ioTkmDWKIgxtIi2OcQclUc=
-github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA=
+github.com/caddyserver/certmagic v0.25.2/go.mod h1:llW/CvsNmza8S6hmsuggsZeiX+uS27dkqY27wDIuBWg=
-github.com/caddyserver/certmagic v0.25.1 h1:4sIKKbOt5pg6+sL7tEwymE1x2bj6CHr80da1CRRIPbY=
+github.com/caddyserver/zerossl v0.1.5 h1:dkvOjBAEEtY6LIGAHei7sw2UgqSD6TrWweXpV7lvEvE=
-github.com/caddyserver/certmagic v0.25.1/go.mod h1:VhyvndxtVton/Fo/wKhRoC46Rbw1fmjvQ3GjHYSQTEY=
+github.com/caddyserver/zerossl v0.1.5/go.mod h1:CxA0acn7oEGO6//4rtrRjYgEoa4MFw/XofZnrYwGqG4=
-github.com/caddyserver/zerossl v0.1.4 h1:CVJOE3MZeFisCERZjkxIcsqIH4fnFdlYWnPYeFtBHRw=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
-github.com/caddyserver/zerossl v0.1.4/go.mod h1:CxA0acn7oEGO6//4rtrRjYgEoa4MFw/XofZnrYwGqG4=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/charmbracelet/bubbles v0.21.0 h1:9TdC97SdRVg/1aaXNVWfFH3nnLAwOXr8Fn6u6mfQdFs=
+github.com/charmbracelet/colorprofile v0.4.2 h1:BdSNuMjRbotnxHSfxy+PCSa4xAmz7szw70ktAtWRYrY=
-github.com/charmbracelet/bubbles v0.21.0/go.mod h1:HF+v6QUR4HkEpz62dx7ym2xc71/KBHg+zKwJtMw+qtg=
+github.com/charmbracelet/colorprofile v0.4.2/go.mod h1:0rTi81QpwDElInthtrQ6Ni7cG0sDtwAd4C4le060fT8=
-github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw=
+github.com/charmbracelet/colorprofile v0.4.3 h1:QPa1IWkYI+AOB+fE+mg/5/4HRMZcaXex9t5KX76i20Q=
-github.com/charmbracelet/bubbletea v1.3.10/go.mod h1:ORQfo0fk8U+po9VaNvnV95UPWA1BitP1E0N6xJPlHr4=
+github.com/charmbracelet/colorprofile v0.4.3/go.mod h1:/zT4BhpD5aGFpqQQqw7a+VtHCzu+zrQtt1zhMt9mR4Q=
-github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco3ej+ngLk1kk=
+github.com/charmbracelet/ultraviolet v0.0.0-20260205113103-524a6607adb8 h1:eyFRbAmexyt43hVfeyBofiGSEmJ7krjLOYt/9CF5NKA=
-github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk=
+github.com/charmbracelet/ultraviolet v0.0.0-20260205113103-524a6607adb8/go.mod h1:SQpCTRNBtzJkwku5ye4S3HEuthAlGy2n9VXZnWkEW98=
-github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
+github.com/charmbracelet/x/ansi v0.11.6 h1:GhV21SiDz/45W9AnV2R61xZMRri5NlLnl6CVF7ihZW8=
-github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
+github.com/charmbracelet/x/ansi v0.11.6/go.mod h1:2JNYLgQUsyqaiLovhU2Rv/pb8r6ydXKS3NIttu3VGZQ=
-github.com/charmbracelet/x/ansi v0.11.3 h1:6DcVaqWI82BBVM/atTyq6yBoRLZFBsnoDoX9GCu2YOI=
+github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f h1:pk6gmGpCE7F3FcjaOEKYriCvpmIN4+6OS/RD0vm4uIA=
-github.com/charmbracelet/x/ansi v0.11.3/go.mod h1:yI7Zslym9tCJcedxz5+WBq+eUGMJT0bM06Fqy1/Y4dI=
+github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f/go.mod h1:IfZAMTHB6XkZSeXUqriemErjAWCCzT0LwjKFYCZyw0I=
-github.com/charmbracelet/x/cellbuf v0.0.14 h1:iUEMryGyFTelKW3THW4+FfPgi4fkmKnnaLOXuc+/Kj4=
-github.com/charmbracelet/x/cellbuf v0.0.14/go.mod h1:P447lJl49ywBbil/KjCk2HexGh4tEY9LH0/1QrZZ9rA=
-github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 h1:payRxjMjKgx2PaCWLZ4p3ro9y97+TVLZNaRZgJwSVDQ=
-github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
 github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
 github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
-github.com/clipperhouse/displaywidth v0.6.2 h1:ZDpTkFfpHOKte4RG5O/BOyf3ysnvFswpyYrV7z2uAKo=
+github.com/charmbracelet/x/termios v0.1.1 h1:o3Q2bT8eqzGnGPOYheoYS8eEleT5ZVNYNy8JawjaNZY=
-github.com/clipperhouse/displaywidth v0.6.2/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o=
+github.com/charmbracelet/x/termios v0.1.1/go.mod h1:rB7fnv1TgOPOyyKRJ9o+AsTU/vK5WHJ2ivHeut/Pcwo=
-github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
+github.com/charmbracelet/x/windows v0.2.2 h1:IofanmuvaxnKHuV04sC0eBy/smG6kIKrWG2/jYn2GuM=
-github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
+github.com/charmbracelet/x/windows v0.2.2/go.mod h1:/8XtdKZzedat74NQFn0NGlGL4soHB0YQZrETF96h75k=
-github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4=
+github.com/clipperhouse/displaywidth v0.11.0 h1:lBc6kY44VFw+TDx4I8opi/EtL9m20WSEFgwIwO+UVM8=
-github.com/clipperhouse/uax29/v2 v2.3.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
+github.com/clipperhouse/displaywidth v0.11.0/go.mod h1:bkrFNkf81G8HyVqmKGxsPufD3JhNl3dSqnGhOoSD/o0=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk=
+github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
+github.com/go-jose/go-jose/v4 v4.1.3 h1:CVLmWDhDVRa6Mi/IgCgaopNosCaHz7zrMeF9MlZRkrs=
-github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
+github.com/go-jose/go-jose/v4 v4.1.3/go.mod h1:x4oUasVrzR7071A4TnHLGSPpNOm2a21K9Kf04k1rs08=
 github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
 github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
@@ -53,42 +62,34 @@ github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzh
 github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/letsencrypt/challtestsrv v1.4.2 h1:0ON3ldMhZyWlfVNYYpFuWRTmZNnyfiL9Hh5YzC3JVwU=
+github.com/letsencrypt/challtestsrv v1.4.2/go.mod h1:GhqMqcSoeGpYd5zX5TgwA6er/1MbWzx/o7yuuVya+Wk=
+github.com/letsencrypt/pebble/v2 v2.10.0 h1:Wq6gYXlsY6ubqI3hhxsTzdyotvfdjFBxuwYqCLCnj/U=
+github.com/letsencrypt/pebble/v2 v2.10.0/go.mod h1:Sk8cmUIPcIdv2nINo+9PB4L+ZBhzY+F9A1a/h/xmWiQ=
 github.com/libdns/cloudflare v0.2.2 h1:XWHv+C1dDcApqazlh08Q6pjytYLgR2a+Y3xrXFu0vsI=
 github.com/libdns/cloudflare v0.2.2/go.mod h1:w9uTmRCDlAoafAsTPnn2nJ0XHK/eaUMh86DUk8BWi60=
 github.com/libdns/libdns v1.1.1 h1:wPrHrXILoSHKWJKGd0EiAVmiJbFShguILTg9leS/P/U=
 github.com/libdns/libdns v1.1.1/go.mod h1:4Bj9+5CQiNMVGf87wjX4CY3HQJypUHRuLvlsfsZqLWQ=
 github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag=
 github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-runewidth v0.0.20 h1:WcT52H91ZUAwy8+HUkdM3THM6gXqXuLJi9O3rjcQQaQ=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-runewidth v0.0.20/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
-github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
+github.com/mholt/acmez/v3 v3.1.6 h1:eGVQNObP0pBN4sxqrXeg7MYqTOWyoiYpQqITVWlrevk=
-github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
+github.com/mholt/acmez/v3 v3.1.6/go.mod h1:5nTPosTGosLxF3+LU4ygbgMRFDhbAVpqMI4+a4aHLBY=
-github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
+github.com/miekg/dns v1.1.72 h1:vhmr+TF2A3tuoGNkLDFK9zi36F2LS+hKTRW0Uf8kbzI=
-github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
+github.com/miekg/dns v1.1.72/go.mod h1:+EuEPhdHOsfk6Wk5TT2CzssZdqkmFhf8r+aVyDEToIs=
-github.com/mholt/acmez/v3 v3.1.4 h1:DyzZe/RnAzT3rpZj/2Ii5xZpiEvvYk3cQEN/RmqxwFQ=
-github.com/mholt/acmez/v3 v3.1.4/go.mod h1:L1wOU06KKvq7tswuMDwKdcHeKpFFgkppZy/y0DFxagQ=
-github.com/miekg/dns v1.1.69 h1:Kb7Y/1Jo+SG+a2GtfoFUfDkG//csdRPwRLkCsxDG9Sc=
-github.com/miekg/dns v1.1.69/go.mod h1:7OyjD9nEba5OkqQ/hB4fy3PIoxafSZJtducccIelz3g=
-github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
-github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
 github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
 github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
-github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
-github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/sahilm/fuzzy v0.1.1 h1:ceu5RHF8DGgoi+/dR5PsECjCDH1BE3Fnmpo7aVXOdRA=
 github.com/sahilm/fuzzy v0.1.1/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
-github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
+github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
 github.com/zeebo/assert v1.1.0 h1:hU1L1vLTHsnO8x8c9KAR5GmM5QscxHg5RNU5z5qbUWY=
@@ -99,16 +100,16 @@ github.com/zeebo/pcg v1.0.1 h1:lyqfGeWiv4ahac6ttHs+I5hwtH/+1mrhlCtVNQM2kHo=
 github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
 go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
-go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8=
+go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
-go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM=
+go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
-go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA=
+go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
-go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI=
+go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
-go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E=
+go.opentelemetry.io/otel/sdk v1.39.0 h1:nMLYcjVsvdui1B/4FRkwjzoRVsMK8uL/cj0OyhKzt18=
-go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg=
+go.opentelemetry.io/otel/sdk v1.39.0/go.mod h1:vDojkC4/jsTJsE+kh+LXYQlbL8CgrEcwmt1ENZszdJE=
-go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM=
+go.opentelemetry.io/otel/sdk/metric v1.39.0 h1:cXMVVFVgsIf2YL6QkRF4Urbr/aMInf+2WKg+sEJTtB8=
-go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA=
+go.opentelemetry.io/otel/sdk/metric v1.39.0/go.mod h1:xq9HEVH7qeX69/JnwEfp6fVq5wosJsY1mt4lLfYdVew=
-go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
+go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
-go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
+go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
@@ -117,36 +118,35 @@ go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
 go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 go.uber.org/zap/exp v0.3.0 h1:6JYzdifzYkGmTdRR59oYH+Ng7k49H9qVpWwNSsGJj3U=
 go.uber.org/zap/exp v0.3.0/go.mod h1:5I384qq7XGxYyByIhHm6jg5CHkGY0nsTfbDLgDDlgJQ=
-golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8=
+golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
-golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A=
+golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
-golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=
+golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
-golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=
+golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
-golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
+golang.org/x/net v0.50.0 h1:ucWh9eiCGyDR3vtzso0WMQinm2Dnt8cFMuQa9K33J60=
-golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
+golang.org/x/net v0.50.0/go.mod h1:UgoSli3F/pBgdJBHCTc+tp3gmrU4XswgGRgtnwWTfyM=
 golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
 golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
-golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
+golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
-golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
-golang.org/x/term v0.39.0 h1:RclSuaJf32jOqZz74CkPA9qFuVTX7vhLlpfj/IGWlqY=
+golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=
-golang.org/x/term v0.39.0/go.mod h1:yxzUCTP/U+FzoxfdKmLaA0RV1WgE0VY7hXBwKtY/4ww=
+golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=
-golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
+golang.org/x/text v0.34.0 h1:oL/Qq0Kdaqxa1KbNeMKwQq0reLCCaFtqu2eNuSeNHbk=
-golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
+golang.org/x/text v0.34.0/go.mod h1:homfLqTYRFyVYemLBFl5GgL/DWEiH5wcsQ5gSh1yziA=
-golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
+golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
-golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
+golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b h1:Mv8VFug0MP9e5vUxfBcE3vUkV6CImK3cMNMIDFjmzxU=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b/go.mod h1:j9x/tPzZkyxcgEFkiKEEGxfvyumM01BEtsW8xzOahRQ=
-google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc=
+google.golang.org/grpc v1.79.2 h1:fRMD94s2tITpyJGtBBn7MkMseNpOZU8ZxgC3MMBaXRU=
-google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U=
+google.golang.org/grpc v1.79.2/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=
 google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
 google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/transport/httphandler.go

@@ -97,7 +97,7 @@ func (hh *httpHandler) Handler(conn net.Conn, isTLS bool) {
 		Type: types.TunnelTypeHTTP,
 	})
 	if err != nil {
-		_ = hh.redirect(conn, http.StatusMovedPermanently, fmt.Sprintf("https://tunnl.live/tunnel-not-found?slug=%s\r\n", slug))
+		_ = hh.redirect(conn, http.StatusMovedPermanently, fmt.Sprintf("https://tunel.live/tunnel-not-found?slug=%s\r\n", slug))
 		return
 	}
 

internal/transport/httphandler_test.go

@@ -290,7 +290,7 @@ func TestHandler(t *testing.T) {
 			isTLS:       true,
 			redirectTLS: false,
 			request:     []byte("GET / HTTP/1.1\r\nHost: test.domain\r\n\r\n"),
-			expected:    []byte("HTTP/1.1 301 Moved Permanently\r\nLocation: https://tunnl.live/tunnel-not-found?slug=test\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"),
+			expected:    []byte("HTTP/1.1 301 Moved Permanently\r\nLocation: https://tunel.live/tunnel-not-found?slug=test\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"),
 			setupMocks: func(msr *MockSessionRegistry) {
 				msr.On("Get", types.SessionKey{
 					Id:   "test",

renovate.json

@@ -11,8 +11,9 @@
         "digest"
       ],
       "automerge": true,
-      "baseBranchPatterns": [
+      "groupName": "all-dependencies",
-        "staging"
+      "matchPackageNames": [
+        "*"
       ]
     }
   ]

session/interaction/coming_soon.go

@@ -3,14 +3,14 @@ package interaction
 import (
 	"strings"
 
-	"github.com/charmbracelet/bubbles/textinput"
+	"charm.land/bubbles/v2/textinput"
-	tea "github.com/charmbracelet/bubbletea"
+	tea "charm.land/bubbletea/v2"
-	"github.com/charmbracelet/lipgloss"
+	"charm.land/lipgloss/v2"
 )
 
-func (m *model) comingSoonUpdate(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
+func (m *model) comingSoonUpdate(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
 	m.showingComingSoon = false
-	return m, tea.Batch(tea.ClearScreen, textinput.Blink)
+	return m, textinput.Blink
 }
 
 func (m *model) comingSoonView() string {

session/interaction/commands.go

@@ -4,10 +4,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/charmbracelet/bubbles/key"
+	"charm.land/bubbles/v2/key"
-	"github.com/charmbracelet/bubbles/textinput"
+	"charm.land/bubbles/v2/textinput"
-	tea "github.com/charmbracelet/bubbletea"
+	tea "charm.land/bubbletea/v2"
-	"github.com/charmbracelet/lipgloss"
+	"charm.land/lipgloss/v2"
 )
 
 func (m *model) handleCommandSelection(item commandItem) (tea.Model, tea.Cmd) {
@@ -17,24 +17,24 @@ func (m *model) handleCommandSelection(item commandItem) (tea.Model, tea.Cmd) {
 		m.editingSlug = true
 		m.slugInput.SetValue(m.interaction.slug.String())
 		m.slugInput.Focus()
-		return m, tea.Batch(tea.ClearScreen, textinput.Blink)
+		return m, textinput.Blink
 	case "tunnel-type":
 		m.showingCommands = false
 		m.showingComingSoon = true
-		return m, tea.Batch(tickCmd(5*time.Second), tea.ClearScreen, textinput.Blink)
+		return m, tickCmd(5 * time.Second)
 	default:
 		m.showingCommands = false
 		return m, nil
 	}
 }
 
-func (m *model) commandsUpdate(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
+func (m *model) commandsUpdate(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
 	var cmd tea.Cmd
 
 	switch {
 	case key.Matches(msg, m.keymap.quit), msg.String() == "esc":
 		m.showingCommands = false
-		return m, tea.Batch(tea.ClearScreen, textinput.Blink)
+		return m, textinput.Blink
 	case msg.String() == "enter":
 		selectedItem := m.commandList.SelectedItem()
 		if selectedItem != nil {

session/interaction/dashboard.go

@@ -4,20 +4,20 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/charmbracelet/bubbles/key"
+	"charm.land/bubbles/v2/key"
-	"github.com/charmbracelet/bubbles/textinput"
+	"charm.land/bubbles/v2/textinput"
-	tea "github.com/charmbracelet/bubbletea"
+	tea "charm.land/bubbletea/v2"
-	"github.com/charmbracelet/lipgloss"
+	"charm.land/lipgloss/v2"
 )
 
-func (m *model) dashboardUpdate(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
+func (m *model) dashboardUpdate(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
 	switch {
 	case key.Matches(msg, m.keymap.quit):
 		m.quitting = true
-		return m, tea.Batch(tea.ClearScreen, textinput.Blink, tea.Quit)
+		return m, tea.Batch(textinput.Blink, tea.Quit)
 	case key.Matches(msg, m.keymap.command):
 		m.showingCommands = true
-		return m, tea.Batch(tea.ClearScreen, textinput.Blink)
+		return m, textinput.Blink
 	}
 	return m, nil
 }

session/interaction/interaction.go

@@ -9,13 +9,12 @@ import (
 	"tunnel_pls/session/slug"
 	"tunnel_pls/types"
 
-	"github.com/charmbracelet/bubbles/help"
+	"charm.land/bubbles/v2/help"
-	"github.com/charmbracelet/bubbles/key"
+	"charm.land/bubbles/v2/key"
-	"github.com/charmbracelet/bubbles/list"
+	"charm.land/bubbles/v2/list"
-	"github.com/charmbracelet/bubbles/textinput"
+	"charm.land/bubbles/v2/textinput"
-	tea "github.com/charmbracelet/bubbletea"
+	tea "charm.land/bubbletea/v2"
-	"github.com/charmbracelet/lipgloss"
+	"github.com/charmbracelet/colorprofile"
-	"github.com/muesli/termenv"
 	"golang.org/x/crypto/ssh"
 )
 
@@ -54,6 +53,8 @@ type interaction struct {
 	cancel          context.CancelFunc
 	mode            types.InteractiveMode
 	programMu       sync.Mutex
+	width           int
+	height          int
 }
 
 func (i *interaction) SetMode(m types.InteractiveMode) {
@@ -72,8 +73,14 @@ func (i *interaction) Send(message string) error {
 	return nil
 }
 func (i *interaction) SetWH(w, h int) {
-	if i.program != nil {
+	i.programMu.Lock()
-		i.program.Send(tea.WindowSizeMsg{
+	i.width = w
+	i.height = h
+	prog := i.program
+	i.programMu.Unlock()
+
+	if prog != nil {
+		prog.Send(tea.WindowSizeMsg{
 			Width:  w,
 			Height: h,
 		})
@@ -120,7 +127,7 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg := msg.(type) {
 	case tickMsg:
 		m.showingComingSoon = false
-		return m, tea.Batch(tea.ClearScreen, textinput.Blink)
+		return m, textinput.Blink
 
 	case tea.WindowSizeMsg:
 		m.width = msg.Width
@@ -129,17 +136,17 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		m.commandList.SetHeight(msg.Height - 4)
 
 		if msg.Width < 80 {
-			m.slugInput.Width = msg.Width - 10
+			m.slugInput.SetWidth(msg.Width - 10)
 		} else {
-			m.slugInput.Width = 50
+			m.slugInput.SetWidth(50)
 		}
 		return m, nil
 
 	case tea.QuitMsg:
 		m.quitting = true
-		return m, tea.Batch(tea.ClearScreen, textinput.Blink, tea.Quit)
+		return m, tea.Batch(textinput.Blink, tea.Quit)
 
-	case tea.KeyMsg:
+	case tea.KeyPressMsg:
 		if m.showingComingSoon {
 			return m.comingSoonUpdate(msg)
 		}
@@ -159,36 +166,43 @@ func (m *model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 func (i *interaction) Redraw() {
-	if i.program != nil {
+	i.programMu.Lock()
-		i.program.Send(tea.ClearScreen())
+	prog := i.program
+	w, h := i.width, i.height
+	i.programMu.Unlock()
+
+	if prog != nil {
+		prog.Send(tea.WindowSizeMsg{Width: w, Height: h})
 	}
 }
 
-func (m *model) View() string {
+func (m *model) View() tea.View {
 	if m.quitting {
-		return ""
+		return tea.NewView("")
 	}
 
 	if m.showingComingSoon {
-		return m.comingSoonView()
+		return tea.NewView(m.comingSoonView())
 	}
 
 	if m.editingSlug {
-		return m.slugView()
+		return tea.NewView(m.slugView())
 	}
 
 	if m.showingCommands {
-		return m.commandsView()
+		return tea.NewView(m.commandsView())
 	}
 
-	return m.dashboardView()
+	v := tea.NewView(m.dashboardView())
+	v.AltScreen = true
+	v.MouseMode = tea.MouseModeCellMotion
+	return v
 }
 
 func (i *interaction) Start() {
 	if i.mode == types.InteractiveModeHEADLESS {
 		return
 	}
-	lipgloss.SetColorProfile(termenv.TrueColor)
 
 	protocol := "http"
 	if i.config.TLSEnabled() {
@@ -216,7 +230,7 @@ func (i *interaction) Start() {
 	ti := textinput.New()
 	ti.Placeholder = "my-custom-slug"
 	ti.CharLimit = 20
-	ti.Width = 50
+	ti.SetWidth(50)
 
 	m := &model{
 		randomizer:  i.randomizer,
@@ -245,19 +259,29 @@ func (i *interaction) Start() {
 	}
 
 	i.programMu.Lock()
-	i.program = tea.NewProgram(
+	w, h := i.width, i.height
-		m,
+	i.programMu.Unlock()
+
+	opts := []tea.ProgramOption{
 		tea.WithInput(i.channel),
 		tea.WithOutput(i.channel),
-		tea.WithAltScreen(),
+		tea.WithColorProfile(colorprofile.TrueColor),
-		tea.WithMouseCellMotion(),
 		tea.WithoutSignals(),
 		tea.WithoutSignalHandler(),
 		tea.WithFPS(30),
-	)
+		tea.WithEnvironment([]string{"TERM=xterm-256color", "COLORTERM=truecolor"}),
+	}
+	if w > 0 && h > 0 {
+		opts = append(opts, tea.WithWindowSize(w, h))
+	}
+
+	prog := tea.NewProgram(m, opts...)
+
+	i.programMu.Lock()
+	i.program = prog
 	i.programMu.Unlock()
 
-	_, err := i.program.Run()
+	_, err := prog.Run()
 	if err != nil {
 		log.Printf("Cannot close tea: %s \n", err)
 	}

session/interaction/interaction_test.go

@@ -9,10 +9,10 @@ import (
 	"time"
 	"tunnel_pls/types"
 
-	"github.com/charmbracelet/bubbles/key"
+	"charm.land/bubbles/v2/key"
-	"github.com/charmbracelet/bubbles/list"
+	"charm.land/bubbles/v2/list"
-	"github.com/charmbracelet/bubbles/textinput"
+	"charm.land/bubbles/v2/textinput"
-	tea "github.com/charmbracelet/bubbletea"
+	tea "charm.land/bubbletea/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"golang.org/x/crypto/ssh"
@@ -459,7 +459,7 @@ func TestInteraction_Start(t *testing.T) {
 			mockInteraction := New(mockRandom, mockConfig, mockSlug, mockForwarder, mockSessionRegistry, "user", mockCloser.Close)
 			mockInteraction.SetMode(tt.mode)
 
-			mockConfig.On("Domain").Return("tunnl.live")
+			mockConfig.On("Domain").Return("tunel.live")
 			mockConfig.On("TLSEnabled").Return(tt.tlsEnabled)
 			mockForwarder.On("TunnelType").Return(tt.tunnelType)
 			mockForwarder.On("ForwardedPort").Return(tt.port)
@@ -525,7 +525,7 @@ func TestModel_Update(t *testing.T) {
 
 			m := &model{
 				randomizer:        mockRandom,
-				domain:            "tunnl.live",
+				domain:            "tunel.live",
 				protocol:          "http",
 				tunnelType:        types.TunnelTypeHTTP,
 				port:              8080,
@@ -622,7 +622,7 @@ func TestModel_View(t *testing.T) {
 
 			m := &model{
 				randomizer:        mockRandom,
-				domain:            "tunnl.live",
+				domain:            "tunel.live",
 				protocol:          "http",
 				tunnelType:        types.TunnelTypeHTTP,
 				port:              8080,
@@ -651,9 +651,9 @@ func TestModel_View(t *testing.T) {
 			view := m.View()
 
 			if tt.expectedEmpty {
-				assert.Empty(t, view)
+				assert.Empty(t, view.Content)
 			} else {
-				assert.NotEmpty(t, view)
+				assert.NotEmpty(t, view.Content)
 			}
 		})
 	}
@@ -694,7 +694,7 @@ func TestInteraction_Integration(t *testing.T) {
 func TestModel_Update_KeyMessages(t *testing.T) {
 	tests := []struct {
 		name              string
-		key               tea.KeyMsg
+		key               tea.KeyPressMsg
 		showingComingSoon bool
 		editingSlug       bool
 		showingCommands   bool
@@ -702,25 +702,25 @@ func TestModel_Update_KeyMessages(t *testing.T) {
 	}{
 		{
 			name:              "key press while showing coming soon",
-			key:               tea.KeyMsg{Type: tea.KeyEnter},
+			key:               tea.KeyPressMsg{Code: tea.KeyEnter},
 			showingComingSoon: true,
 			description:       "should call comingSoonUpdate",
 		},
 		{
 			name:        "key press while editing slug",
-			key:         tea.KeyMsg{Type: tea.KeyEnter},
+			key:         tea.KeyPressMsg{Code: tea.KeyEnter},
 			editingSlug: true,
 			description: "should call slugUpdate",
 		},
 		{
 			name:            "key press while showing commands",
-			key:             tea.KeyMsg{Type: tea.KeyEnter},
+			key:             tea.KeyPressMsg{Code: tea.KeyEnter},
 			showingCommands: true,
 			description:     "should call commandsUpdate",
 		},
 		{
 			name:        "key press in dashboard view",
-			key:         tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'c'}},
+			key:         tea.KeyPressMsg{Code: 'c', Text: "c"},
 			description: "should call dashboardUpdate",
 		},
 	}
@@ -742,7 +742,7 @@ func TestModel_Update_KeyMessages(t *testing.T) {
 
 			m := &model{
 				randomizer:        mockRandom,
-				domain:            "tunnl.live",
+				domain:            "tunel.live",
 				protocol:          "http",
 				tunnelType:        types.TunnelTypeHTTP,
 				port:              8080,
@@ -777,7 +777,7 @@ func TestModel_SlugUpdate(t *testing.T) {
 	tests := []struct {
 		name           string
 		tunnelType     types.TunnelType
-		keyMsg         tea.KeyMsg
+		keyMsg         tea.KeyPressMsg
 		inputValue     string
 		setupMocks     func(*MockSessionRegistry, *MockSlug, *MockRandom)
 		expectedEdit   bool
@@ -787,21 +787,21 @@ func TestModel_SlugUpdate(t *testing.T) {
 		{
 			name:         "escape key cancels editing",
 			tunnelType:   types.TunnelTypeHTTP,
-			keyMsg:       tea.KeyMsg{Type: tea.KeyEsc},
+			keyMsg:       tea.KeyPressMsg{Code: tea.KeyEsc},
 			setupMocks:   func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {},
 			expectedEdit: false,
 		},
 		{
 			name:         "ctrl+c cancels editing",
 			tunnelType:   types.TunnelTypeHTTP,
-			keyMsg:       tea.KeyMsg{Type: tea.KeyCtrlC},
+			keyMsg:       tea.KeyPressMsg{Code: 'c', Mod: tea.ModCtrl},
 			setupMocks:   func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {},
 			expectedEdit: false,
 		},
 		{
 			name:       "enter key saves valid slug",
 			tunnelType: types.TunnelTypeHTTP,
-			keyMsg:     tea.KeyMsg{Type: tea.KeyEnter},
+			keyMsg:     tea.KeyPressMsg{Code: tea.KeyEnter},
 			inputValue: "my-custom-slug",
 			setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {
 				ms.On("String").Return("old-slug")
@@ -816,7 +816,7 @@ func TestModel_SlugUpdate(t *testing.T) {
 		{
 			name:       "enter key with error shows error message",
 			tunnelType: types.TunnelTypeHTTP,
-			keyMsg:     tea.KeyMsg{Type: tea.KeyEnter},
+			keyMsg:     tea.KeyPressMsg{Code: tea.KeyEnter},
 			inputValue: "invalid",
 			setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {
 				ms.On("String").Return("old-slug")
@@ -831,7 +831,7 @@ func TestModel_SlugUpdate(t *testing.T) {
 		{
 			name:       "ctrl+r generates random slug",
 			tunnelType: types.TunnelTypeHTTP,
-			keyMsg:     tea.KeyMsg{Type: tea.KeyCtrlR},
+			keyMsg:     tea.KeyPressMsg{Code: 'r', Mod: tea.ModCtrl},
 			setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {
 				mr.On("String", 20).Return("random-generated-slug", nil)
 			},
@@ -841,7 +841,7 @@ func TestModel_SlugUpdate(t *testing.T) {
 		{
 			name:       "ctrl+r with error does nothing",
 			tunnelType: types.TunnelTypeHTTP,
-			keyMsg:     tea.KeyMsg{Type: tea.KeyCtrlR},
+			keyMsg:     tea.KeyPressMsg{Code: 'r', Mod: tea.ModCtrl},
 			setupMocks: func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {
 				mr.On("String", 20).Return("", assert.AnError)
 			},
@@ -850,14 +850,14 @@ func TestModel_SlugUpdate(t *testing.T) {
 		{
 			name:         "regular key updates input",
 			tunnelType:   types.TunnelTypeHTTP,
-			keyMsg:       tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'a'}},
+			keyMsg:       tea.KeyPressMsg{Code: 'a', Text: "a"},
 			setupMocks:   func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {},
 			expectedEdit: true,
 		},
 		{
 			name:         "tcp tunnel exits editing immediately",
 			tunnelType:   types.TunnelTypeTCP,
-			keyMsg:       tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'a'}},
+			keyMsg:       tea.KeyPressMsg{Code: 'a', Text: "a"},
 			setupMocks:   func(msr *MockSessionRegistry, ms *MockSlug, mr *MockRandom) {},
 			expectedEdit: false,
 		},
@@ -879,7 +879,7 @@ func TestModel_SlugUpdate(t *testing.T) {
 
 			m := &model{
 				randomizer:  mockRandom,
-				domain:      "tunnl.live",
+				domain:      "tunel.live",
 				protocol:    "http",
 				tunnelType:  tt.tunnelType,
 				port:        8080,
@@ -986,7 +986,7 @@ func TestModel_SlugView(t *testing.T) {
 
 			m := &model{
 				randomizer:  mockRandom,
-				domain:      "tunnl.live",
+				domain:      "tunel.live",
 				protocol:    "http",
 				tunnelType:  tt.tunnelType,
 				port:        8080,
@@ -1006,19 +1006,19 @@ func TestModel_SlugView(t *testing.T) {
 func TestModel_ComingSoonUpdate(t *testing.T) {
 	tests := []struct {
 		name   string
-		keyMsg tea.KeyMsg
+		keyMsg tea.KeyPressMsg
 	}{
 		{
 			name:   "any key dismisses coming soon",
-			keyMsg: tea.KeyMsg{Type: tea.KeyEnter},
+			keyMsg: tea.KeyPressMsg{Code: tea.KeyEnter},
 		},
 		{
 			name:   "escape key dismisses",
-			keyMsg: tea.KeyMsg{Type: tea.KeyEsc},
+			keyMsg: tea.KeyPressMsg{Code: tea.KeyEsc},
 		},
 		{
 			name:   "space key dismisses",
-			keyMsg: tea.KeyMsg{Type: tea.KeySpace},
+			keyMsg: tea.KeyPressMsg{Code: tea.KeySpace},
 		},
 	}
 
@@ -1097,7 +1097,7 @@ func TestModel_ComingSoonView(t *testing.T) {
 func TestModel_CommandsUpdate(t *testing.T) {
 	tests := []struct {
 		name             string
-		keyMsg           tea.KeyMsg
+		keyMsg           tea.KeyPressMsg
 		selectedItem     list.Item
 		expectCommands   bool
 		expectEditSlug   bool
@@ -1105,31 +1105,31 @@ func TestModel_CommandsUpdate(t *testing.T) {
 	}{
 		{
 			name:           "escape key closes commands",
-			keyMsg:         tea.KeyMsg{Type: tea.KeyEsc},
+			keyMsg:         tea.KeyPressMsg{Code: tea.KeyEsc},
 			expectCommands: false,
 		},
 		{
 			name:           "q key closes commands",
-			keyMsg:         tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'q'}},
+			keyMsg:         tea.KeyPressMsg{Code: 'q', Text: "q"},
 			expectCommands: false,
 		},
 		{
 			name:           "enter on slug command starts editing",
-			keyMsg:         tea.KeyMsg{Type: tea.KeyEnter},
+			keyMsg:         tea.KeyPressMsg{Code: tea.KeyEnter},
 			selectedItem:   commandItem{name: "slug", desc: "Set custom subdomain"},
 			expectCommands: false,
 			expectEditSlug: true,
 		},
 		{
 			name:             "enter on tunnel-type shows coming soon",
-			keyMsg:           tea.KeyMsg{Type: tea.KeyEnter},
+			keyMsg:           tea.KeyPressMsg{Code: tea.KeyEnter},
 			selectedItem:     commandItem{name: "tunnel-type", desc: "Change tunnel type"},
 			expectCommands:   false,
 			expectComingSoon: true,
 		},
 		{
 			name:           "arrow key navigates list",
-			keyMsg:         tea.KeyMsg{Type: tea.KeyDown},
+			keyMsg:         tea.KeyPressMsg{Code: tea.KeyDown},
 			expectCommands: true,
 		},
 	}
@@ -1261,28 +1261,28 @@ func TestModel_CommandsView(t *testing.T) {
 func TestModel_DashboardUpdate(t *testing.T) {
 	tests := []struct {
 		name           string
-		keyMsg         tea.KeyMsg
+		keyMsg         tea.KeyPressMsg
 		expectQuit     bool
 		expectCommands bool
 	}{
 		{
 			name:       "q key quits",
-			keyMsg:     tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'q'}},
+			keyMsg:     tea.KeyPressMsg{Code: 'q', Text: "q"},
 			expectQuit: true,
 		},
 		{
 			name:       "ctrl+c quits",
-			keyMsg:     tea.KeyMsg{Type: tea.KeyCtrlC},
+			keyMsg:     tea.KeyPressMsg{Code: 'c', Mod: tea.ModCtrl},
 			expectQuit: true,
 		},
 		{
 			name:           "c key opens commands",
-			keyMsg:         tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'c'}},
+			keyMsg:         tea.KeyPressMsg{Code: 'c', Text: "c"},
 			expectCommands: true,
 		},
 		{
 			name:   "other keys do nothing",
-			keyMsg: tea.KeyMsg{Type: tea.KeyRunes, Runes: []rune{'x'}},
+			keyMsg: tea.KeyPressMsg{Code: 'x', Text: "x"},
 		},
 	}
 
@@ -1398,7 +1398,7 @@ func TestModel_DashboardView(t *testing.T) {
 
 			m := &model{
 				randomizer:  mockRandom,
-				domain:      "tunnl.live",
+				domain:      "tunel.live",
 				protocol:    tt.protocol,
 				tunnelType:  tt.tunnelType,
 				port:        tt.port,
@@ -1550,8 +1550,8 @@ func TestBuildURL(t *testing.T) {
 			name:      "http url",
 			protocol:  "http",
 			subdomain: "test",
-			domain:    "tunnl.live",
+			domain:    "tunel.live",
-			expected:  "http://test.tunnl.live",
+			expected:  "http://test.tunel.live",
 		},
 		{
 			name:      "https url",
@@ -1564,8 +1564,8 @@ func TestBuildURL(t *testing.T) {
 			name:      "custom subdomain",
 			protocol:  "http",
 			subdomain: "my-custom-slug",
-			domain:    "tunnl.live",
+			domain:    "tunel.live",
-			expected:  "http://my-custom-slug.tunnl.live",
+			expected:  "http://my-custom-slug.tunel.live",
 		},
 	}
 
@@ -1712,30 +1712,30 @@ func TestModel_GetTunnelURL(t *testing.T) {
 			tunnelType: types.TunnelTypeHTTP,
 			protocol:   "http",
 			slug:       "my-app",
-			domain:     "tunnl.live",
+			domain:     "tunel.live",
-			expected:   "http://my-app.tunnl.live",
+			expected:   "http://my-app.tunel.live",
 		},
 		{
 			name:       "https tunnel",
 			tunnelType: types.TunnelTypeHTTP,
 			protocol:   "https",
 			slug:       "secure-app",
-			domain:     "tunnl.live",
+			domain:     "tunel.live",
-			expected:   "https://secure-app.tunnl.live",
+			expected:   "https://secure-app.tunel.live",
 		},
 		{
 			name:       "tcp tunnel",
 			tunnelType: types.TunnelTypeTCP,
-			domain:     "tunnl.live",
+			domain:     "tunel.live",
 			port:       8080,
-			expected:   "tcp://tunnl.live:8080",
+			expected:   "tcp://tunel.live:8080",
 		},
 		{
 			name:       "tcp tunnel with different port",
 			tunnelType: types.TunnelTypeTCP,
-			domain:     "tunnl.live",
+			domain:     "tunel.live",
 			port:       3306,
-			expected:   "tcp://tunnl.live:3306",
+			expected:   "tcp://tunel.live:3306",
 		},
 	}
 
@@ -1797,28 +1797,28 @@ func TestInteraction_Start_Interactive(t *testing.T) {
 			tlsEnabled: false,
 			tunnelType: types.TunnelTypeHTTP,
 			port:       8080,
-			domain:     "tunnl.live",
+			domain:     "tunel.live",
 		},
 		{
 			name:       "interactive mode with https",
 			tlsEnabled: true,
 			tunnelType: types.TunnelTypeHTTP,
 			port:       8443,
-			domain:     "secure.tunnl.live",
+			domain:     "secure.tunel.live",
 		},
 		{
 			name:       "interactive mode with tcp",
 			tlsEnabled: false,
 			tunnelType: types.TunnelTypeTCP,
 			port:       3306,
-			domain:     "db.tunnl.live",
+			domain:     "db.tunel.live",
 		},
 		{
 			name:       "interactive mode with tcp and tls enabled",
 			tlsEnabled: true,
 			tunnelType: types.TunnelTypeTCP,
 			port:       5432,
-			domain:     "postgres.tunnl.live",
+			domain:     "postgres.tunel.live",
 		},
 	}
 
@@ -1901,7 +1901,7 @@ func TestInteraction_Start_ProtocolSelection(t *testing.T) {
 			mockSessionRegistry := &MockSessionRegistry{}
 			closeFunc := func() error { return nil }
 
-			mockConfig.On("Domain").Return("tunnl.live")
+			mockConfig.On("Domain").Return("tunel.live")
 			mockConfig.On("TLSEnabled").Return(tt.tlsEnabled)
 			mockForwarder.On("TunnelType").Return(types.TunnelTypeHTTP)
 			mockForwarder.On("ForwardedPort").Return(uint16(8080))
@@ -1966,7 +1966,7 @@ func TestInteraction_Stop(t *testing.T) {
 			i := mockInteraction.(*interaction)
 
 			if tt.setupProgram {
-				mockConfig.On("Domain").Return("tunnl.live")
+				mockConfig.On("Domain").Return("tunel.live")
 				mockConfig.On("TLSEnabled").Return(false)
 				mockForwarder.On("TunnelType").Return(types.TunnelTypeHTTP)
 				mockForwarder.On("ForwardedPort").Return(uint16(8080))
@@ -2007,7 +2007,7 @@ func TestInteraction_Start_CommandListSetup(t *testing.T) {
 	mockSessionRegistry := &MockSessionRegistry{}
 	closeFunc := func() error { return nil }
 
-	mockConfig.On("Domain").Return("tunnl.live")
+	mockConfig.On("Domain").Return("tunel.live")
 	mockConfig.On("TLSEnabled").Return(false)
 	mockForwarder.On("TunnelType").Return(types.TunnelTypeHTTP)
 	mockForwarder.On("ForwardedPort").Return(uint16(8080))
@@ -2043,7 +2043,7 @@ func TestInteraction_Start_TextInputSetup(t *testing.T) {
 	mockSessionRegistry := &MockSessionRegistry{}
 	closeFunc := func() error { return nil }
 
-	mockConfig.On("Domain").Return("tunnl.live")
+	mockConfig.On("Domain").Return("tunel.live")
 	mockConfig.On("TLSEnabled").Return(false)
 	mockForwarder.On("TunnelType").Return(types.TunnelTypeHTTP)
 	mockForwarder.On("ForwardedPort").Return(uint16(8080))
@@ -2107,7 +2107,7 @@ func TestInteraction_Start_CleanupOnExit(t *testing.T) {
 				}
 			}
 
-			mockConfig.On("Domain").Return("tunnl.live")
+			mockConfig.On("Domain").Return("tunel.live")
 			mockConfig.On("TLSEnabled").Return(false)
 			mockForwarder.On("TunnelType").Return(types.TunnelTypeHTTP)
 			mockForwarder.On("ForwardedPort").Return(uint16(8080))
@@ -2171,7 +2171,7 @@ func TestInteraction_Start_WithDifferentChannels(t *testing.T) {
 			mockSessionRegistry := &MockSessionRegistry{}
 			closeFunc := func() error { return nil }
 
-			mockConfig.On("Domain").Return("tunnl.live")
+			mockConfig.On("Domain").Return("tunel.live")
 			mockConfig.On("TLSEnabled").Return(false)
 			mockForwarder.On("TunnelType").Return(types.TunnelTypeHTTP)
 			mockForwarder.On("ForwardedPort").Return(uint16(8080))

session/interaction/model.go

@@ -6,11 +6,11 @@ import (
 	"tunnel_pls/internal/random"
 	"tunnel_pls/types"
 
-	"github.com/charmbracelet/bubbles/help"
+	"charm.land/bubbles/v2/help"
-	"github.com/charmbracelet/bubbles/key"
+	"charm.land/bubbles/v2/key"
-	"github.com/charmbracelet/bubbles/list"
+	"charm.land/bubbles/v2/list"
-	"github.com/charmbracelet/bubbles/textinput"
+	"charm.land/bubbles/v2/textinput"
-	tea "github.com/charmbracelet/bubbletea"
+	tea "charm.land/bubbletea/v2"
 )
 
 type commandItem struct {
@@ -77,7 +77,7 @@ type keymap struct {
 type tickMsg time.Time
 
 func (m *model) Init() tea.Cmd {
-	return tea.Batch(textinput.Blink, tea.WindowSize())
+	return tea.Batch(textinput.Blink, tea.RequestWindowSize)
 }
 
 func getResponsiveWidth(screenWidth, padding, minWidth, maxWidth int) int {

session/interaction/slug.go

@@ -5,26 +5,26 @@ import (
 	"strings"
 	"tunnel_pls/types"
 
-	"github.com/charmbracelet/bubbles/key"
+	"charm.land/bubbles/v2/key"
-	"github.com/charmbracelet/bubbles/textinput"
+	"charm.land/bubbles/v2/textinput"
-	tea "github.com/charmbracelet/bubbletea"
+	tea "charm.land/bubbletea/v2"
-	"github.com/charmbracelet/lipgloss"
+	"charm.land/lipgloss/v2"
 )
 
-func (m *model) slugUpdate(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
+func (m *model) slugUpdate(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
 	var cmd tea.Cmd
 
 	if m.tunnelType != types.TunnelTypeHTTP {
 		m.editingSlug = false
 		m.slugError = ""
-		return m, tea.Batch(tea.ClearScreen, textinput.Blink)
+		return m, textinput.Blink
 	}
 
 	switch msg.String() {
 	case "esc", "ctrl+c":
 		m.editingSlug = false
 		m.slugError = ""
-		return m, tea.Batch(tea.ClearScreen, textinput.Blink)
+		return m, textinput.Blink
 	case "enter":
 		inputValue := m.slugInput.Value()
 		if err := m.interaction.sessionRegistry.Update(m.interaction.user, types.SessionKey{
@@ -39,7 +39,7 @@ func (m *model) slugUpdate(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 		}
 		m.editingSlug = false
 		m.slugError = ""
-		return m, tea.Batch(tea.ClearScreen, textinput.Blink)
+		return m, textinput.Blink
 	default:
 		if key.Matches(msg, m.keymap.random) {
 			newSubdomain, err := m.randomizer.String(20)

session/session.go

@@ -232,13 +232,34 @@ func (s *session) handleWindowChange(req *ssh.Request) error {
 	return req.Reply(true, nil)
 }
 
+func (s *session) handlePtyReq(req *ssh.Request) error {
+	var ptyPayload struct {
+		Term   string
+		Width  uint32
+		Height uint32
+		PxW    uint32
+		PxH    uint32
+		Modes  string
+	}
+	if err := ssh.Unmarshal(req.Payload, &ptyPayload); err == nil {
+		if ptyPayload.Width > 0 && ptyPayload.Height > 0 {
+			s.interaction.SetWH(int(ptyPayload.Width), int(ptyPayload.Height))
+		}
+	}
+	return req.Reply(true, nil)
+}
+
 func (s *session) HandleGlobalRequest(GlobalRequest <-chan *ssh.Request) error {
 	for req := range GlobalRequest {
 		switch req.Type {
-		case "shell", "pty-req":
+		case "shell":
 			if err := req.Reply(true, nil); err != nil {
 				return err
 			}
+		case "pty-req":
+			if err := s.handlePtyReq(req); err != nil {
+				return err
+			}
 		case "window-change":
 			if err := s.handleWindowChange(req); err != nil {
 				return err