fix(deps): update all non-major dependencies

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Update sister project link in README.md (#1621 )
2026-03-18 19:17:25 +00:00 · 2026-03-18 17:56:38 +00:00 · 2026-02-26 19:05:48 +00:00 · 2026-02-25 13:52:00 +00:00 · 2026-02-24 09:32:52 +00:00 · 2026-02-20 10:47:51 +00:00
63 changed files with 5494 additions and 2503 deletions
--- a/.github/workflows/build_container.yaml
+++ b/.github/workflows/build_container.yaml
@@ -14,7 +14,7 @@ on:
      - "**.md"

 env:
-  GO_VERSION: "~1.23"
+  GO_VERSION: "~1.24"
  IMAGE_NAME: "k8sgpt"
  REGISTRY_IMAGE: ghcr.io/k8sgpt-ai/k8sgpt

@@ -36,7 +36,7 @@ jobs:

    steps:
      - name: Check out code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5

      - name: Extract branch name
        id: extract_branch
@@ -68,7 +68,7 @@ jobs:

    steps:
      - name: Check out code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5

      - name: Docker meta
        id: meta
@@ -83,7 +83,7 @@ jobs:
            type=raw,value=dev-${{ env.DATETIME }}

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3
        with:
          registry: ghcr.io
          username: ${{ github.actor }}
@@ -93,10 +93,10 @@ jobs:
        uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3

      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3

      - name: Build and push multi-arch image
-        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
        with:
          context: .
          file: ./container/Dockerfile
--- a/.github/workflows/golangci_lint.yaml
+++ b/.github/workflows/golangci_lint.yaml
@@ -9,10 +9,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out code into the Go module directory
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5

      - name: golangci-lint
        uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8
        with:
-          version: v2.1.0
+          version: v2.11.3
          only-new-issues: true
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -23,7 +23,7 @@ jobs:
    # Release-please creates a PR that tracks all changes
    steps:
      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
     
      - uses: google-github-actions/release-please-action@e4dc86ba9405554aeba3c6bb2d169500e7d3b4ee # v4.1.1
        id: release
@@ -55,17 +55,17 @@ jobs:
          docker-images: true
          swap-storage: true
      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
        with:
          fetch-depth: 0
      - name: Set up Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
+        uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
        with:
-          go-version: '1.22'
+          go-version: '~1.26.0'
      - name: Download Syft
-        uses: anchore/sbom-action/download-syft@55dc4ee22412511ee8c3142cbea40418e6cec693 # v0.17.8
+        uses: anchore/sbom-action/download-syft@57aae528053a48a3f6235f2d9461b05fbcb7366d # v0.23.1
      - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@9c156ee8a17a598857849441385a2041ef570552 # v6
+        uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6
        with:
          # either 'goreleaser' (default) or 'goreleaser-pro'
          distribution: goreleaser
@@ -91,23 +91,23 @@ jobs:
      IMAGE_NAME: k8sgpt
    steps:
      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5
        with:
          submodules: recursive

      - name: Set up Docker Buildx
        id: buildx
-        uses: docker/setup-buildx-action@b5ca514318bd6ebac0fb2aedd5d36ec1b5c232a2 # v3
+        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3
        with:
          registry: "ghcr.io"
          username: ${{ github.actor }}
          password: ${{ secrets.K8SGPT_BOT_SECRET }}

      - name: Build Docker Image
-        uses: docker/build-push-action@14487ce63c7a62a4a324b0bfb37086795e31c6c1 # v6
+        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6
        with:
          context: .
          file: ./container/Dockerfile
@@ -121,14 +121,14 @@ jobs:
          cache-to: type=gha,scope=${{ github.ref_name }}-${{ env.IMAGE_TAG }}

      - name: Generate SBOM
-        uses: anchore/sbom-action@55dc4ee22412511ee8c3142cbea40418e6cec693 # v0.17.8
+        uses: anchore/sbom-action@57aae528053a48a3f6235f2d9461b05fbcb7366d # v0.23.1
        with:
          image: ${{ env.IMAGE_TAG }}
          artifact-name: sbom-${{ env.IMAGE_NAME }}
          output-file: ./sbom-${{ env.IMAGE_NAME }}.spdx.json

      - name: Attach SBOM to release
-        uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2
+        uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2
        with:
          tag_name: ${{ needs.release-please.outputs.tag_name }}
          files: ./sbom-${{ env.IMAGE_NAME }}.spdx.json
--- a/.github/workflows/semantic_pr.yaml
+++ b/.github/workflows/semantic_pr.yaml
@@ -16,7 +16,7 @@ jobs:
      pull-requests: read # Needed for reading prs
    steps:
      - name: Validate Pull Request
-        uses: amannn/action-semantic-pull-request@0723387faaf9b38adef4775cd42cfd5155ed6017 # v5.5.3
+        uses: amannn/action-semantic-pull-request@48f256284bd46cdaab1048c3721360e808335d50 # v6.1.1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -9,22 +9,22 @@ on:
      - main

 env:
-  GO_VERSION: "~1.22"
+  GO_VERSION: "~1.24"

 jobs:
  build:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5

      - name: Set up Go
-        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5
+        uses: actions/setup-go@40f1582b2485089dde7abd97c1529aa768e1baff # v5
        with:
          go-version: ${{ env.GO_VERSION }}

      - name: Run test
        run: go test ./... -coverprofile=coverage.txt
      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d # v5
+        uses: codecov/codecov-action@18283e04ce6e62d37312384ff67231eb8fd56d24 # v5
        env:
          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1 +1 @@
-{".":"0.4.17"}
+{".":"0.4.30"}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,172 @@
 # Changelog

+## [0.4.30](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.29...v0.4.30) (2026-02-20)
+
+
+### Bug Fixes
+
+* validate namespace before running custom analyzers ([#1617](https://github.com/k8sgpt-ai/k8sgpt/issues/1617)) ([458aa9d](https://github.com/k8sgpt-ai/k8sgpt/commit/458aa9debac7590eb0855ffd12141b702e999a36))
+
+## [0.4.29](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.28...v0.4.29) (2026-02-20)
+
+
+### Features
+
+* **serve:** add short flag and env var for metrics port ([#1616](https://github.com/k8sgpt-ai/k8sgpt/issues/1616)) ([4f63e97](https://github.com/k8sgpt-ai/k8sgpt/commit/4f63e9737c6a2306686bd3b6f37e81f210665949))
+
+
+### Bug Fixes
+
+* **deps:** update k8s.io/utils digest to b8788ab ([#1572](https://github.com/k8sgpt-ai/k8sgpt/issues/1572)) ([a56e478](https://github.com/k8sgpt-ai/k8sgpt/commit/a56e4788c3361a64df17175f163f33422a8fe606))
+* use proper JSON marshaling for customrest prompt to handle special characters ([#1615](https://github.com/k8sgpt-ai/k8sgpt/issues/1615)) ([99911fb](https://github.com/k8sgpt-ai/k8sgpt/commit/99911fbb3ac8c950fd7ee1b3210f8a9c2a6b0ad7)), closes [#1556](https://github.com/k8sgpt-ai/k8sgpt/issues/1556)
+
+
+### Refactoring
+
+* improve MCP server handlers with better error handling and pagination ([#1613](https://github.com/k8sgpt-ai/k8sgpt/issues/1613)) ([abc4647](https://github.com/k8sgpt-ai/k8sgpt/commit/abc46474e372bcd27201f1a64372c04269acee13))
+
+## [0.4.28](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.27...v0.4.28) (2026-02-15)
+
+
+### Features
+
+* add Groq as LLM provider ([#1600](https://github.com/k8sgpt-ai/k8sgpt/issues/1600)) ([867bce1](https://github.com/k8sgpt-ai/k8sgpt/commit/867bce1907f5dd3387128b72c694e98091d55554))
+* multiple security fixes. Prometheus: v0.302.1 → v0.306.0 ([#1597](https://github.com/k8sgpt-ai/k8sgpt/issues/1597)) ([f5fb2a7](https://github.com/k8sgpt-ai/k8sgpt/commit/f5fb2a7e12e14fad8107940aeead5e60b064add1))
+
+
+### Bug Fixes
+
+* align CI Go versions with go.mod to ensure consistency ([#1611](https://github.com/k8sgpt-ai/k8sgpt/issues/1611)) ([1f2ff98](https://github.com/k8sgpt-ai/k8sgpt/commit/1f2ff988342b8ef2aa3e3263eb845c0ee09fe24c))
+* **deps:** update module gopkg.in/yaml.v2 to v3 ([#1550](https://github.com/k8sgpt-ai/k8sgpt/issues/1550)) ([7fe3bdb](https://github.com/k8sgpt-ai/k8sgpt/commit/7fe3bdbd952bc9a1975121de5f21ad31dc1f691d))
+* use MaxCompletionTokens instead of deprecated MaxTokens for OpenAI ([#1604](https://github.com/k8sgpt-ai/k8sgpt/issues/1604)) ([c80b2e2](https://github.com/k8sgpt-ai/k8sgpt/commit/c80b2e2c346845336593ce515fe90fd501b1d0a7))
+
+
+### Other
+
+* **deps:** update actions/checkout digest to 93cb6ef ([#1592](https://github.com/k8sgpt-ai/k8sgpt/issues/1592)) ([40ffcbe](https://github.com/k8sgpt-ai/k8sgpt/commit/40ffcbec6b65e3a99e40be5f414a3f2c087bffbb))
+* **deps:** update actions/setup-go digest to 40f1582 ([#1593](https://github.com/k8sgpt-ai/k8sgpt/issues/1593)) ([a303ffa](https://github.com/k8sgpt-ai/k8sgpt/commit/a303ffa21c7ede3dd9391185bc91fb3b4e8276b6))
+* util tests ([#1594](https://github.com/k8sgpt-ai/k8sgpt/issues/1594)) ([21369c5](https://github.com/k8sgpt-ai/k8sgpt/commit/21369c5c0917fd2b6ae4173378b2e257e2b1de7b))
+
+## [0.4.27](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.26...v0.4.27) (2025-12-18)
+
+
+### Features
+
+* mcp v2 ([#1589](https://github.com/k8sgpt-ai/k8sgpt/issues/1589)) ([5480051](https://github.com/k8sgpt-ai/k8sgpt/commit/5480051230ce83b89c0382abd7992c7ecc4a85b8))
+
+## [0.4.26](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.25...v0.4.26) (2025-10-16)
+
+
+### Other
+
+* missing filter arg on serve ([#1583](https://github.com/k8sgpt-ai/k8sgpt/issues/1583)) ([f1d2e30](https://github.com/k8sgpt-ai/k8sgpt/commit/f1d2e306f32eb1e01a2788174084be29a7fa1282))
+
+## [0.4.25](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.24...v0.4.25) (2025-09-03)
+
+
+### Features
+
+* fix to broken inference ([#1575](https://github.com/k8sgpt-ai/k8sgpt/issues/1575)) ([291e42d](https://github.com/k8sgpt-ai/k8sgpt/commit/291e42dc4b81ffb0672c21fbb325ddebc5d531a3))
+
+## [0.4.24](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.23...v0.4.24) (2025-08-18)
+
+
+### Features
+
+* add ClusterServiceVersion, Subscription, InstallPlan, OperatorGroup, and CatalogSource analyzers ([#1564](https://github.com/k8sgpt-ai/k8sgpt/issues/1564)) ([0cf4cae](https://github.com/k8sgpt-ai/k8sgpt/commit/0cf4cae07e32a0025246abcf2d1a5a91f82d093a))
+* reintroduced inference code ([#1548](https://github.com/k8sgpt-ai/k8sgpt/issues/1548)) ([7e33276](https://github.com/k8sgpt-ai/k8sgpt/commit/7e332761d89d953989b4f33509208dd4db4d4b91))
+* update helm charts with mcp support and fix Google ADA issue  ([#1568](https://github.com/k8sgpt-ai/k8sgpt/issues/1568)) ([5334589](https://github.com/k8sgpt-ai/k8sgpt/commit/53345895deec4c74cac00ee3fd5e230f6a92cf4a))
+
+
+### Bug Fixes
+
+* migrated to more actively maintained mcp golang lib and added AI explain  ([#1557](https://github.com/k8sgpt-ai/k8sgpt/issues/1557)) ([c47ae59](https://github.com/k8sgpt-ai/k8sgpt/commit/c47ae595fb9fc5bf22afef3bc6764b3e87e4553d))
+
+
+### Other
+
+* **deps:** update actions/checkout action to v5 ([#1562](https://github.com/k8sgpt-ai/k8sgpt/issues/1562)) ([e385e77](https://github.com/k8sgpt-ai/k8sgpt/commit/e385e77da93a65fe52a152bf1f8f1415552698d5))
+* **deps:** update amannn/action-semantic-pull-request action to v6 ([#1565](https://github.com/k8sgpt-ai/k8sgpt/issues/1565)) ([c5c9135](https://github.com/k8sgpt-ai/k8sgpt/commit/c5c9135900ec6f95b63dac47df751269e7420e87))
+* **deps:** update docker/login-action digest to 184bdaa ([#1559](https://github.com/k8sgpt-ai/k8sgpt/issues/1559)) ([0239b2f](https://github.com/k8sgpt-ai/k8sgpt/commit/0239b2fe6e7105bbcf3256c559c30ec7065b25f3))
+* **deps:** update goreleaser/goreleaser-action digest to e435ccd ([#1569](https://github.com/k8sgpt-ai/k8sgpt/issues/1569)) ([5e86f49](https://github.com/k8sgpt-ai/k8sgpt/commit/5e86f4925c4209b0eb2959227229c2994cfc5b6f))
+
+## [0.4.23](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.22...v0.4.23) (2025-08-08)
+
+
+### Features
+
+* add ClusterCatalog and ClusterExtension analyzers ([#1555](https://github.com/k8sgpt-ai/k8sgpt/issues/1555)) ([a821814](https://github.com/k8sgpt-ai/k8sgpt/commit/a821814125e25c062ff2faebf9df1b880414c22c))
+* oci genai chat models ([#1337](https://github.com/k8sgpt-ai/k8sgpt/issues/1337)) ([290a4be](https://github.com/k8sgpt-ai/k8sgpt/commit/290a4be210fbb508214070c31218138781d96142))
+
+
+### Bug Fixes
+
+* **deps:** update module gopkg.in/yaml.v2 to v3 ([#1537](https://github.com/k8sgpt-ai/k8sgpt/issues/1537)) ([50d5d78](https://github.com/k8sgpt-ai/k8sgpt/commit/50d5d78c06e42d75a2448989528e5e6be12ea825))
+* **deps:** update module helm.sh/helm/v3 to v3.17.4 [security] ([#1541](https://github.com/k8sgpt-ai/k8sgpt/issues/1541)) ([5b42249](https://github.com/k8sgpt-ai/k8sgpt/commit/5b4224951e7348e9d78292dadc9b9786957117f1))
+
+## [0.4.22](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.21...v0.4.22) (2025-07-18)
+
+
+### Features
+
+* add APAC region Claude models support for Amazon Bedrock ([#1543](https://github.com/k8sgpt-ai/k8sgpt/issues/1543)) ([1819e6f](https://github.com/k8sgpt-ai/k8sgpt/commit/1819e6f410d078fce2bda8bbdb22054dfb4fc092))
+* add streamable-http support for MCP server ([#1546](https://github.com/k8sgpt-ai/k8sgpt/issues/1546)) ([3a1187a](https://github.com/k8sgpt-ai/k8sgpt/commit/3a1187ad5a190713b9216cf6d9d52d54cdb3e4da))
+
+## [0.4.21](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.20...v0.4.21) (2025-06-27)
+
+
+### Features
+
+* add latest and legacy stable models ([#1539](https://github.com/k8sgpt-ai/k8sgpt/issues/1539)) ([00c0799](https://github.com/k8sgpt-ai/k8sgpt/commit/00c07999e2290e70a6ecb95b255b4924f55ecd5f))
+* support for claude4 && model names listed ([#1540](https://github.com/k8sgpt-ai/k8sgpt/issues/1540)) ([8002d94](https://github.com/k8sgpt-ai/k8sgpt/commit/8002d943453aac8c3675d7072b25dfdc3aec1c1d))
+
+
+### Bug Fixes
+
+* **deps:** update module gopkg.in/yaml.v2 to v3 ([#1511](https://github.com/k8sgpt-ai/k8sgpt/issues/1511)) ([08f2855](https://github.com/k8sgpt-ai/k8sgpt/commit/08f2855a4d7e61f3422cb68b0966272a85f617a5))
+
+
+### Other
+
+* **deps:** update docker/setup-buildx-action digest to e468171 ([#1527](https://github.com/k8sgpt-ai/k8sgpt/issues/1527)) ([0c917fc](https://github.com/k8sgpt-ai/k8sgpt/commit/0c917fc60115ef0dc775e858a55964382b20c5e1))
+
+## [0.4.20](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.19...v0.4.20) (2025-06-20)
+
+
+### Features
+
+* added cache purge ([#1532](https://github.com/k8sgpt-ai/k8sgpt/issues/1532)) ([74fbde0](https://github.com/k8sgpt-ai/k8sgpt/commit/74fbde00537e627c408b317ff9098227be11e2ad))
+
+
+### Other
+
+* model name ([#1535](https://github.com/k8sgpt-ai/k8sgpt/issues/1535)) ([0f700f0](https://github.com/k8sgpt-ai/k8sgpt/commit/0f700f0cd39bf5881d6c05240b842f4df7a6c016))
+
+## [0.4.19](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.18...v0.4.19) (2025-06-20)
+
+
+### Features
+
+* fixed haiku ([#1530](https://github.com/k8sgpt-ai/k8sgpt/issues/1530)) ([5636515](https://github.com/k8sgpt-ai/k8sgpt/commit/5636515db98b529689a214af5066d50b5e42d3a1))
+
+## [0.4.18](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.17...v0.4.18) (2025-06-20)
+
+
+### Bug Fixes
+
+* **deps:** update k8s.io/utils digest to 4c0f3b2 ([#1523](https://github.com/k8sgpt-ai/k8sgpt/issues/1523)) ([7d4cb26](https://github.com/k8sgpt-ai/k8sgpt/commit/7d4cb267130f60088350213482795f37594cb0bc))
+* **deps:** update module gopkg.in/yaml.v2 to v3 ([#1509](https://github.com/k8sgpt-ai/k8sgpt/issues/1509)) ([d7cb19a](https://github.com/k8sgpt-ai/k8sgpt/commit/d7cb19ad29c92eaba552ba723945c937fc3c42da))
+
+
+### Other
+
+* **deps:** update codecov/codecov-action digest to 18283e0 ([#1513](https://github.com/k8sgpt-ai/k8sgpt/issues/1513)) ([42654e7](https://github.com/k8sgpt-ai/k8sgpt/commit/42654e7f55d7a9e9be5b664adaaa8979106e7298))
+* **deps:** update docker/build-push-action digest to 1dc7386 ([#1512](https://github.com/k8sgpt-ai/k8sgpt/issues/1512)) ([dfcc5dc](https://github.com/k8sgpt-ai/k8sgpt/commit/dfcc5dc5a15a3d59a7f6317944784e3ecd86fb50))
+* **deps:** update docker/build-push-action digest to 2634353 ([#1517](https://github.com/k8sgpt-ai/k8sgpt/issues/1517)) ([7dfe8be](https://github.com/k8sgpt-ai/k8sgpt/commit/7dfe8bef0face65f607475a6620923fdfed57961))
+* **deps:** update softprops/action-gh-release digest to 72f2c25 ([#1526](https://github.com/k8sgpt-ai/k8sgpt/issues/1526)) ([5947876](https://github.com/k8sgpt-ai/k8sgpt/commit/5947876e4942729eea883937faf5e2b47d1f16ec))
+* **deps:** update softprops/action-gh-release digest to d5382d3 ([#1525](https://github.com/k8sgpt-ai/k8sgpt/issues/1525)) ([6b9f346](https://github.com/k8sgpt-ai/k8sgpt/commit/6b9f346bf668ed3517b23b99000611ea14afafe2))
+* model access ([#1529](https://github.com/k8sgpt-ai/k8sgpt/issues/1529)) ([be4fb1c](https://github.com/k8sgpt-ai/k8sgpt/commit/be4fb1cc034d9c3843cf3e9912a26e05bd54c146))
+
 ## [0.4.17](https://github.com/k8sgpt-ai/k8sgpt/compare/v0.4.16...v0.4.17) (2025-05-14)


--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 We're happy that you want to contribute to this project. Please read the sections to make the process as smooth as possible.

 ## Requirements
- Golang `1.23`
+- Golang `1.24+`
 - An OpenAI API key
  * OpenAI API keys can be obtained from [OpenAI](https://platform.openai.com/account/api-keys)
  * You can set the API key for k8sgpt using `./k8sgpt auth key`
--- a/MCP.md
+++ b/MCP.md
@@ -0,0 +1,482 @@
+# K8sGPT Model Context Protocol (MCP) Server
+
+K8sGPT provides a Model Context Protocol (MCP) server that exposes Kubernetes cluster operations as standardized tools, resources, and prompts for AI assistants like Claude, ChatGPT, and other MCP-compatible clients.
+
+## Table of Contents
+
+- [What is MCP?](#what-is-mcp)
+- [Quick Start](#quick-start)
+- [Server Modes](#server-modes)
+- [Available Tools](#available-tools)
+- [Available Resources](#available-resources)
+- [Available Prompts](#available-prompts)
+- [Usage Examples](#usage-examples)
+- [Integration with AI Assistants](#integration-with-ai-assistants)
+- [HTTP API Reference](#http-api-reference)
+
+## What is MCP?
+
+The Model Context Protocol (MCP) is an open standard that enables AI assistants to securely connect to external data sources and tools. K8sGPT's MCP server exposes Kubernetes operations through this standardized interface, allowing AI assistants to:
+
+- Analyze cluster health and issues
+- Query Kubernetes resources
+- Access pod logs and events
+- Get troubleshooting guidance
+- Manage analyzer filters
+
+## Quick Start
+
+### Start the MCP Server
+
+**Stdio mode (for local AI assistants):**
+```bash
+k8sgpt serve --mcp
+```
+
+**HTTP mode (for network access):**
+```bash
+k8sgpt serve --mcp --mcp-http --mcp-port 8089
+```
+
+### Test with curl
+
+```bash
+curl -X POST http://localhost:8089/mcp \
+  -H "Content-Type: application/json" \
+  -d '{
+    "jsonrpc": "2.0",
+    "id": 1,
+    "method": "tools/list"
+  }'
+```
+
+## Server Modes
+
+### Stdio Mode (Default)
+
+Used by local AI assistants like Claude Desktop:
+
+```bash
+k8sgpt serve --mcp
+```
+
+Configure in your MCP client (e.g., Claude Desktop's `claude_desktop_config.json`):
+
+```json
+{
+  "mcpServers": {
+    "k8sgpt": {
+      "command": "k8sgpt",
+      "args": ["serve", "--mcp"]
+    }
+  }
+}
+```
+
+### HTTP Mode
+
+Used for network access and webhooks:
+
+```bash
+k8sgpt serve --mcp --mcp-http --mcp-port 8089
+```
+
+The server runs in stateless mode, so no session management is required. Each request is independent.
+
+## Available Tools
+
+The MCP server exposes 12 tools for Kubernetes operations:
+
+### Cluster Analysis
+
+**analyze**
+- Analyze Kubernetes resources for issues and problems
+- Parameters:
+  - `namespace` (optional): Namespace to analyze
+  - `explain` (optional): Get AI explanations for issues
+  - `filters` (optional): Comma-separated list of analyzers to use
+
+**cluster-info**
+- Get Kubernetes cluster information and version
+
+### Resource Management
+
+**list-resources**
+- List Kubernetes resources of a specific type
+- Parameters:
+  - `resourceType` (required): Type of resource (pods, deployments, services, nodes, jobs, cronjobs, statefulsets, daemonsets, replicasets, configmaps, secrets, ingresses, pvcs, pvs)
+  - `namespace` (optional): Namespace to query
+  - `labelSelector` (optional): Label selector for filtering
+
+**get-resource**
+- Get detailed information about a specific Kubernetes resource
+- Parameters:
+  - `resourceType` (required): Type of resource
+  - `name` (required): Resource name
+  - `namespace` (optional): Namespace
+
+**list-namespaces**
+- List all namespaces in the cluster
+
+### Debugging and Troubleshooting
+
+**get-logs**
+- Get logs from a pod container
+- Parameters:
+  - `podName` (required): Name of the pod
+  - `namespace` (optional): Namespace
+  - `container` (optional): Container name
+  - `tail` (optional): Number of lines to show
+  - `previous` (optional): Show logs from previous container instance
+  - `sinceSeconds` (optional): Show logs from last N seconds
+
+**list-events**
+- List Kubernetes events for debugging
+- Parameters:
+  - `namespace` (optional): Namespace to query
+  - `involvedObjectName` (optional): Filter by object name
+  - `involvedObjectKind` (optional): Filter by object kind
+
+### Analyzer Management
+
+**list-filters**
+- List all available and active analyzers/filters
+
+**add-filters**
+- Add filters to enable specific analyzers
+- Parameters:
+  - `filters` (required): Comma-separated list of analyzer names
+
+**remove-filters**
+- Remove filters to disable specific analyzers
+- Parameters:
+  - `filters` (required): Comma-separated list of analyzer names
+
+### Integrations
+
+**list-integrations**
+- List available integrations (Prometheus, AWS, Keda, Kyverno, etc.)
+
+### Configuration
+
+**config**
+- Configure K8sGPT settings including custom analyzers and cache
+
+## Available Resources
+
+Resources provide read-only access to cluster information:
+
+**cluster-info**
+- URI: `cluster-info`
+- Get information about the Kubernetes cluster
+
+**namespaces**
+- URI: `namespaces`
+- List all namespaces in the cluster
+
+**active-filters**
+- URI: `active-filters`
+- Get currently active analyzers/filters
+
+## Available Prompts
+
+Prompts provide guided troubleshooting workflows:
+
+**troubleshoot-pod**
+- Interactive pod debugging workflow
+- Arguments:
+  - `podName` (required): Name of the pod to troubleshoot
+  - `namespace` (required): Namespace of the pod
+
+**troubleshoot-deployment**
+- Interactive deployment debugging workflow
+- Arguments:
+  - `deploymentName` (required): Name of the deployment
+  - `namespace` (required): Namespace of the deployment
+
+**troubleshoot-cluster**
+- General cluster troubleshooting workflow
+
+## Usage Examples
+
+### Example 1: Analyze a Namespace
+
+```bash
+curl -X POST http://localhost:8089/mcp \
+  -H "Content-Type: application/json" \
+  -d '{
+    "jsonrpc": "2.0",
+    "id": 1,
+    "method": "tools/call",
+    "params": {
+      "name": "analyze",
+      "arguments": {
+        "namespace": "production",
+        "explain": "true"
+      }
+    }
+  }'
+```
+
+### Example 2: List Pods
+
+```bash
+curl -X POST http://localhost:8089/mcp \
+  -H "Content-Type: application/json" \
+  -d '{
+    "jsonrpc": "2.0",
+    "id": 2,
+    "method": "tools/call",
+    "params": {
+      "name": "list-resources",
+      "arguments": {
+        "resourceType": "pods",
+        "namespace": "default"
+      }
+    }
+  }'
+```
+
+### Example 3: Get Pod Logs
+
+```bash
+curl -X POST http://localhost:8089/mcp \
+  -H "Content-Type: application/json" \
+  -d '{
+    "jsonrpc": "2.0",
+    "id": 3,
+    "method": "tools/call",
+    "params": {
+      "name": "get-logs",
+      "arguments": {
+        "podName": "nginx-abc123",
+        "namespace": "default",
+        "tail": "100"
+      }
+    }
+  }'
+```
+
+### Example 4: Access a Resource
+
+```bash
+curl -X POST http://localhost:8089/mcp \
+  -H "Content-Type: application/json" \
+  -d '{
+    "jsonrpc": "2.0",
+    "id": 4,
+    "method": "resources/read",
+    "params": {
+      "uri": "namespaces"
+    }
+  }'
+```
+
+### Example 5: Get a Troubleshooting Prompt
+
+```bash
+curl -X POST http://localhost:8089/mcp \
+  -H "Content-Type: application/json" \
+  -d '{
+    "jsonrpc": "2.0",
+    "id": 5,
+    "method": "prompts/get",
+    "params": {
+      "name": "troubleshoot-pod",
+      "arguments": {
+        "podName": "nginx-abc123",
+        "namespace": "default"
+      }
+    }
+  }'
+```
+
+## Integration with AI Assistants
+
+### Claude Desktop
+
+Add to `claude_desktop_config.json`:
+
+```json
+{
+  "mcpServers": {
+    "k8sgpt": {
+      "command": "k8sgpt",
+      "args": ["serve", "--mcp"]
+    }
+  }
+}
+```
+
+Restart Claude Desktop and you'll see k8sgpt tools available in the tool selector.
+
+### Custom MCP Clients
+
+Any MCP-compatible client can connect to the k8sgpt server. For HTTP-based clients:
+
+1. Start the server: `k8sgpt serve --mcp --mcp-http --mcp-port 8089`
+2. Connect to: `http://localhost:8089/mcp`
+3. Use standard MCP protocol methods: `tools/list`, `tools/call`, `resources/read`, `prompts/get`
+
+## HTTP API Reference
+
+### Endpoint
+
+```
+POST http://localhost:8089/mcp
+Content-Type: application/json
+```
+
+### Request Format
+
+All requests follow the JSON-RPC 2.0 format:
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 1,
+  "method": "method_name",
+  "params": {
+    ...
+  }
+}
+```
+
+### Discovery Methods
+
+**List Tools**
+```json
+{"jsonrpc": "2.0", "id": 1, "method": "tools/list"}
+```
+
+**List Resources**
+```json
+{"jsonrpc": "2.0", "id": 2, "method": "resources/list"}
+```
+
+**List Prompts**
+```json
+{"jsonrpc": "2.0", "id": 3, "method": "prompts/list"}
+```
+
+### Tool Invocation
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 4,
+  "method": "tools/call",
+  "params": {
+    "name": "tool_name",
+    "arguments": {
+      "arg1": "value1",
+      "arg2": "value2"
+    }
+  }
+}
+```
+
+### Resource Access
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 5,
+  "method": "resources/read",
+  "params": {
+    "uri": "resource_uri"
+  }
+}
+```
+
+### Prompt Access
+
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 6,
+  "method": "prompts/get",
+  "params": {
+    "name": "prompt_name",
+    "arguments": {
+      "arg1": "value1"
+    }
+  }
+}
+```
+
+### Response Format
+
+Successful responses:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 1,
+  "result": {
+    ...
+  }
+}
+```
+
+Error responses:
+```json
+{
+  "jsonrpc": "2.0",
+  "id": 1,
+  "error": {
+    "code": -32600,
+    "message": "Error description"
+  }
+}
+```
+
+## Advanced Configuration
+
+### Custom Port
+
+```bash
+k8sgpt serve --mcp --mcp-http --mcp-port 9000
+```
+
+### With Specific Backend
+
+```bash
+k8sgpt serve --mcp --backend openai
+```
+
+### With Kubeconfig
+
+```bash
+k8sgpt serve --mcp --kubeconfig ~/.kube/config
+```
+
+## Troubleshooting
+
+### Connection Issues
+
+Verify the server is running:
+```bash
+curl http://localhost:8089/mcp
+```
+
+### Permission Issues
+
+Ensure your kubeconfig has appropriate cluster access:
+```bash
+kubectl cluster-info
+```
+
+### Tool Errors
+
+List available tools to verify names:
+```bash
+curl -X POST http://localhost:8089/mcp \
+  -H "Content-Type: application/json" \
+  -d '{"jsonrpc": "2.0", "id": 1, "method": "tools/list"}'
+```
+
+## Learn More
+
+- [MCP Specification](https://modelcontextprotocol.io/)
+- [K8sGPT Documentation](https://docs.k8sgpt.ai/)
+- [MCP Go Library](https://github.com/mark3labs/mcp-go)
--- a/6
+++ b/6
@@ -85,6 +85,12 @@ docker-build:
 	@echo "===========> Building docker image"
 	docker buildx build --build-arg=VERSION="$$(git describe --tags --abbrev=0)" --build-arg=COMMIT="$$(git rev-parse --short HEAD)" --build-arg DATE="$$(date +%FT%TZ)" --platform="linux/amd64,linux/arm64" -t ${IMG} -f container/Dockerfile . --push

+## docker-build-local: Build docker image for local testing
+.PHONY: docker-build-local
+docker-build-local:
+	@echo "===========> Building docker image for local testing"
+	docker build --build-arg=VERSION="$$(git describe --tags --abbrev=0)" --build-arg=COMMIT="$$(git rev-parse --short HEAD)" --build-arg DATE="$$(date +%FT%TZ)" -t k8sgpt:local -f container/Dockerfile .
+
 ## fmt: Run go fmt against code.
 .PHONY: fmt
 fmt:
--- a/README.md
+++ b/README.md
@@ -21,6 +21,10 @@ It has SRE experience codified into its analyzers and helps to pull out the most

 _Out of the box integration with OpenAI, Azure, Cohere, Amazon Bedrock, Google Gemini and local models._

+
+> **Sister project:** Check out [sympozium](https://github.com/AlexsJones/sympozium/) for managing agents in Kubernetes.
+
+
 <a href="https://www.producthunt.com/posts/k8sgpt?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-k8sgpt" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=389489&theme=light" alt="K8sGPT - K8sGPT&#0032;gives&#0032;Kubernetes&#0032;Superpowers&#0032;to&#0032;everyone | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a> <a href="https://hellogithub.com/repository/9dfe44c18dfb4d6fa0181baf8b2cf2e1" target="_blank"><img src="https://abroad.hellogithub.com/v1/widgets/recommend.svg?rid=9dfe44c18dfb4d6fa0181baf8b2cf2e1&claim_uid=gqG4wmzkMrP0eFy" alt="Featured｜HelloGitHub" style="width: 250px; height: 54px;" width="250" height="54" /></a>


@@ -34,6 +38,7 @@ _Out of the box integration with OpenAI, Azure, Cohere, Amazon Bedrock, Google G
 - [Examples](#examples)
 - [LLM AI Backends](#llm-ai-backends)
 - [Key Features](#key-features)
+- [Model Context Protocol (MCP)](#model-context-protocol-mcp)
 - [Documentation](#documentation)
 - [Contributing](#contributing)
 - [Community](#community)
@@ -62,7 +67,7 @@ brew install k8sgpt
  <!---x-release-please-start-version-->

  ```
-  sudo rpm -ivh https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.17/k8sgpt_386.rpm
+  sudo rpm -ivh https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.30/k8sgpt_386.rpm
  ```
  <!---x-release-please-end-->

@@ -70,7 +75,7 @@ brew install k8sgpt

  <!---x-release-please-start-version-->
  ```
-  sudo rpm -ivh https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.17/k8sgpt_amd64.rpm
+  sudo rpm -ivh https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.30/k8sgpt_amd64.rpm
  ```
  <!---x-release-please-end-->
 </details>
@@ -83,7 +88,7 @@ brew install k8sgpt
  <!---x-release-please-start-version-->

 ```
-curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.17/k8sgpt_386.deb
+curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.30/k8sgpt_386.deb
 sudo dpkg -i k8sgpt_386.deb
 ```

@@ -94,7 +99,7 @@ sudo dpkg -i k8sgpt_386.deb
  <!---x-release-please-start-version-->

 ```
-curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.17/k8sgpt_amd64.deb
+curl -LO https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.30/k8sgpt_amd64.deb
 sudo dpkg -i k8sgpt_amd64.deb
 ```

@@ -109,7 +114,7 @@ sudo dpkg -i k8sgpt_amd64.deb

  <!---x-release-please-start-version-->
  ```
-  wget https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.17/k8sgpt_386.apk
+  wget https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.30/k8sgpt_386.apk
  apk add --allow-untrusted k8sgpt_386.apk
  ```
  <!---x-release-please-end-->
@@ -118,7 +123,7 @@ sudo dpkg -i k8sgpt_amd64.deb

  <!---x-release-please-start-version-->
  ```
-  wget https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.17/k8sgpt_amd64.apk
+  wget https://github.com/k8sgpt-ai/k8sgpt/releases/download/v0.4.30/k8sgpt_amd64.apk
  apk add --allow-untrusted k8sgpt_amd64.apk
  ```
  <!---x-release-please-end-->
@@ -197,7 +202,7 @@ K8sGPT can be integrated with Claude Desktop to provide AI-powered Kubernetes cl
   - The MCP server will be automatically detected

 3. Configure Claude Desktop with the following JSON:
-   
+
  ```json
  {
    "mcpServers": {
@@ -270,6 +275,14 @@ you will be able to write your own analyzers.
 - [x] logAnalyzer
 - [x] storageAnalyzer
 - [x] securityAnalyzer
+- [x] CatalogSource
+- [x] ClusterCatalog
+- [x] ClusterExtension
+- [x] ClusterService
+- [x] ClusterServiceVersion
+- [x] OperatorGroup
+- [x] InstallPlan
+- [x] Subscription

 ## Examples

@@ -391,6 +404,26 @@ _Serve mode_
 k8sgpt serve
 ```

+_Serve mode with MCP (Model Context Protocol)_
+
+```
+# Enable MCP server on default port 8089
+k8sgpt serve --mcp --mcp-http
+
+# Enable MCP server on custom port
+k8sgpt serve --mcp --mcp-http --mcp-port 8089
+
+# Full serve mode with MCP
+k8sgpt serve --mcp --mcp-http --port 8080 --metrics-port 8081 --mcp-port 8089
+```
+
+The MCP server enables integration with tools like Claude Desktop and other MCP-compatible clients. It runs on port 8089 by default and provides:
+- Kubernetes cluster analysis via MCP protocol
+- Resource information and health status
+- AI-powered issue explanations and recommendations
+
+For Helm chart deployment with MCP support, see the `charts/k8sgpt/values-mcp-example.yaml` file.
+
 _Analysis with serve mode_

 ```
@@ -671,7 +704,30 @@ k8sgpt custom-analyzer remove --names "my-custom-analyzer,my-custom-analyzer-2"
 ```

 </details>
+## Model Context Protocol (MCP)

+K8sGPT provides a Model Context Protocol server that exposes Kubernetes operations as standardized tools for AI assistants like Claude, ChatGPT, and other MCP-compatible clients.
+
+**Start the MCP server:**
+
+Stdio mode (for local AI assistants):
+```bash
+k8sgpt serve --mcp
+```
+
+HTTP mode (for network access):
+```bash
+k8sgpt serve --mcp --mcp-http --mcp-port 8089
+```
+
+**Features:**
+- 12 tools for cluster analysis, resource management, and debugging
+- 3 resources for cluster information access
+- 3 interactive troubleshooting prompts
+- Stateless HTTP mode for one-off invocations
+- Full integration with Claude Desktop and other MCP clients
+
+**Learn more:** See [MCP.md](MCP.md) for complete documentation, usage examples, and integration guides.
 ## Documentation

 Find our official documentation available [here](https://docs.k8sgpt.ai)
--- a/SUPPORTED_MODELS.md
+++ b/SUPPORTED_MODELS.md
@@ -0,0 +1,83 @@
+# Supported AI Providers and Models in K8sGPT
+
+K8sGPT supports a variety of AI/LLM providers (backends). Some providers have a fixed set of supported models, while others allow you to specify any model supported by the provider.
+
+---
+
+## Providers and Supported Models
+
+### OpenAI
+- **Model:** User-configurable (any model supported by OpenAI, e.g., `gpt-3.5-turbo`, `gpt-4`, etc.)
+
+### Azure OpenAI
+- **Model:** User-configurable (any model deployed in your Azure OpenAI resource)
+
+### LocalAI
+- **Model:** User-configurable (default: `llama3`)
+
+### Ollama
+- **Model:** User-configurable (default: `llama3`, others can be specified)
+
+### NoOpAI
+- **Model:** N/A (no real model, used for testing)
+
+### Cohere
+- **Model:** User-configurable (any model supported by Cohere)
+
+### Amazon Bedrock
+- **Supported Models:**
+  - anthropic.claude-sonnet-4-20250514-v1:0
+  - us.anthropic.claude-sonnet-4-20250514-v1:0
+  - eu.anthropic.claude-sonnet-4-20250514-v1:0
+  - apac.anthropic.claude-sonnet-4-20250514-v1:0
+  - us.anthropic.claude-3-7-sonnet-20250219-v1:0
+  - eu.anthropic.claude-3-7-sonnet-20250219-v1:0
+  - apac.anthropic.claude-3-7-sonnet-20250219-v1:0
+  - anthropic.claude-3-5-sonnet-20240620-v1:0
+  - us.anthropic.claude-3-5-sonnet-20241022-v2:0
+  - anthropic.claude-v2
+  - anthropic.claude-v1
+  - anthropic.claude-instant-v1
+  - ai21.j2-ultra-v1
+  - ai21.j2-jumbo-instruct
+  - amazon.titan-text-express-v1
+  - amazon.nova-pro-v1:0
+  - eu.amazon.nova-pro-v1:0
+  - us.amazon.nova-pro-v1:0
+  - amazon.nova-lite-v1:0
+  - eu.amazon.nova-lite-v1:0
+  - us.amazon.nova-lite-v1:0
+  - anthropic.claude-3-haiku-20240307-v1:0
+
+> **Note:**
+> If you use an AWS Bedrock inference profile ARN (e.g., `arn:aws:bedrock:us-east-1:<account>:application-inference-profile/<id>`) as the model, you must still provide a valid modelId (e.g., `anthropic.claude-3-sonnet-20240229-v1:0`). K8sGPT will automatically set the required `X-Amzn-Bedrock-Inference-Profile-ARN` header for you when making requests to Bedrock.
+
+### Amazon SageMaker
+- **Model:** User-configurable (any model deployed in your SageMaker endpoint)
+
+### Google GenAI
+- **Model:** User-configurable (any model supported by Google GenAI, e.g., `gemini-pro`)
+
+### Huggingface
+- **Model:** User-configurable (any model supported by Huggingface Inference API)
+
+### Google VertexAI
+- **Supported Models:**
+  - gemini-1.0-pro-001
+
+### OCI GenAI
+- **Model:** User-configurable (any model supported by OCI GenAI)
+
+### Custom REST
+- **Model:** User-configurable (any model your custom REST endpoint supports)
+
+### IBM Watsonx
+- **Supported Models:**
+  - ibm/granite-13b-chat-v2
+
+### Groq
+- **Model:** User-configurable (any model supported by Groq, e.g., `llama-3.3-70b-versatile`, `mixtral-8x7b-32768`)
+
+---
+
+For more details on configuring each provider and model, refer to the official K8sGPT documentation and the provider's own documentation. 
--- a/charts/k8sgpt/Chart.yaml
+++ b/charts/k8sgpt/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: v0.3.0 #x-release-please-version
+appVersion: v0.4.23 #x-release-please-version
 description: A Helm chart for K8SGPT
 name: k8sgpt
 type: application
--- a/charts/k8sgpt/templates/deployment.yaml
+++ b/charts/k8sgpt/templates/deployment.yaml
@@ -32,7 +32,13 @@ spec:
        image: {{ .Values.deployment.image.repository }}:{{ .Values.deployment.image.tag | default .Chart.AppVersion }}
        ports:
        - containerPort: 8080
-        args: ["serve"]
+        {{- if .Values.deployment.mcp.enabled }}
+        - containerPort: {{ .Values.deployment.mcp.port | int }}
+        {{- end }}
+        args: ["serve"
+        {{- if .Values.deployment.mcp.enabled }}, "--mcp", "-v","--mcp-http", "--mcp-port", {{ .Values.deployment.mcp.port | quote }}
+        {{- end }}
+        ]
        {{- if .Values.deployment.resources }}
        resources:
        {{- toYaml .Values.deployment.resources | nindent 10 }}
--- a/charts/k8sgpt/templates/service.yaml
+++ b/charts/k8sgpt/templates/service.yaml
@@ -19,4 +19,9 @@ spec:
    - name: metrics
      port: 8081
      targetPort: 8081
+    {{- if .Values.deployment.mcp.enabled }}
+    - name: mcp
+      port: {{ .Values.deployment.mcp.port | int }}
+      targetPort: {{ .Values.deployment.mcp.port | int }}
+    {{- end }}
  type: {{ .Values.service.type }}
--- a/charts/k8sgpt/values-mcp-example.yaml
+++ b/charts/k8sgpt/values-mcp-example.yaml
@@ -0,0 +1,39 @@
+# Example values file to enable MCP (Model Context Protocol) service
+# Copy this file and modify as needed, then use: helm install -f values-mcp-example.yaml
+
+deployment:
+  # Enable MCP server
+  mcp:
+    enabled: true
+    port: "8089"  # Port for MCP server (default: 8089)
+    http: true    # Enable HTTP mode for MCP server
+  
+  # Other deployment settings remain the same
+  image:
+    repository: ghcr.io/k8sgpt-ai/k8sgpt
+    tag: "" # defaults to Chart.appVersion if unspecified
+  imagePullPolicy: Always
+  env:
+    model: "gpt-3.5-turbo"
+    backend: "openai"
+  resources:
+    limits:
+      cpu: "1"
+      memory: "512Mi"
+    requests:
+      cpu: "0.2"
+      memory: "156Mi"
+
+# Service configuration
+service:
+  type: ClusterIP
+  annotations: {}
+
+# Secret configuration for AI backend
+secret:
+  secretKey: "" # base64 encoded OpenAI token
+
+# ServiceMonitor for Prometheus metrics
+serviceMonitor:
+  enabled: false
+  additionalLabels: {}
--- a/charts/k8sgpt/values.yaml
+++ b/charts/k8sgpt/values.yaml
@@ -7,6 +7,11 @@ deployment:
  env:
    model: "gpt-3.5-turbo"
    backend: "openai" # one of: [ openai | llama ]
+  # MCP (Model Context Protocol) server configuration
+  mcp:
+    enabled: false # Enable MCP server
+    port: "8089" # Port for MCP server
+    http: true # Enable HTTP mode for MCP server
  resources:
    limits:
      cpu: "1"
--- a/cmd/cache/purge.go
+++ b/cmd/cache/purge.go
@@ -23,23 +23,51 @@ import (
 	"github.com/spf13/cobra"
 )

+var all bool
+
 var purgeCmd = &cobra.Command{
 	Use:   "purge [object name]",
 	Short: "Purge a remote cache",
-	Long:  "This command allows you to delete/purge one object from the cache",
+	Long:  "This command allows you to delete/purge one object from the cache or all objects with --all flag.",
 	Run: func(cmd *cobra.Command, args []string) {
-		if len(args) == 0 {
-			color.Red("Error: Please provide a value for object name. Run k8sgpt cache purge --help")
-			os.Exit(1)
-		}
-		objectKey := args[0]
-		fmt.Println(color.YellowString("Purging a remote cache."))
 		c, err := cache.GetCacheConfiguration()
 		if err != nil {
 			color.Red("Error: %v", err)
 			os.Exit(1)
 		}

+		if all {
+			fmt.Println(color.YellowString("Purging all objects from the remote cache."))
+			names, err := c.List()
+			if err != nil {
+				color.Red("Error listing cache objects: %v", err)
+				os.Exit(1)
+			}
+			if len(names) == 0 {
+				fmt.Println(color.GreenString("No objects to delete."))
+				return
+			}
+			var failed []string
+			for _, obj := range names {
+				err := c.Remove(obj.Name)
+				if err != nil {
+					failed = append(failed, obj.Name)
+				}
+			}
+			if len(failed) > 0 {
+				color.Red("Failed to delete: %v", failed)
+				os.Exit(1)
+			}
+			fmt.Println(color.GreenString("All objects deleted."))
+			return
+		}
+
+		if len(args) == 0 {
+			color.Red("Error: Please provide a value for object name or use --all. Run k8sgpt cache purge --help")
+			os.Exit(1)
+		}
+		objectKey := args[0]
+		fmt.Println(color.YellowString("Purging a remote cache."))
 		err = c.Remove(objectKey)
 		if err != nil {
 			color.Red("Error: %v", err)
@@ -50,5 +78,6 @@ var purgeCmd = &cobra.Command{
 }

 func init() {
+	purgeCmd.Flags().BoolVar(&all, "all", false, "Purge all objects in the cache")
 	CacheCmd.AddCommand(purgeCmd)
 }
--- a/cmd/serve/serve.go
+++ b/cmd/serve/serve.go
@@ -41,6 +41,8 @@ var (
 	enableMCP   bool
 	mcpPort     string
 	mcpHTTP     bool
+	// filters can be injected into the server (repeatable flag)
+	filters     []string
 )

 var ServeCmd = &cobra.Command{
@@ -201,6 +203,11 @@ var ServeCmd = &cobra.Command{
 			}()
 		}

+		// Allow metrics port to be overridden by environment variable
+		if envMetricsPort := os.Getenv("K8SGPT_METRICS_PORT"); envMetricsPort != "" && !cmd.Flags().Changed("metrics-port") {
+			metricsPort = envMetricsPort
+		}
+
 		server := k8sgptserver.Config{
 			Backend:     aiProvider.Name,
 			Port:        port,
@@ -208,6 +215,7 @@ var ServeCmd = &cobra.Command{
 			EnableHttp:  enableHttp,
 			Token:       aiProvider.Password,
 			Logger:      logger,
+			Filters:     filters,
 		}
 		go func() {
 			if err := server.ServeMetrics(); err != nil {
@@ -231,10 +239,12 @@ var ServeCmd = &cobra.Command{
 func init() {
 	// add flag for backend
 	ServeCmd.Flags().StringVarP(&port, "port", "p", "8080", "Port to run the server on")
-	ServeCmd.Flags().StringVarP(&metricsPort, "metrics-port", "", "8081", "Port to run the metrics-server on")
+	ServeCmd.Flags().StringVarP(&metricsPort, "metrics-port", "m", "8081", "Port to run the metrics-server on (env: K8SGPT_METRICS_PORT)")
 	ServeCmd.Flags().StringVarP(&backend, "backend", "b", "openai", "Backend AI provider")
 	ServeCmd.Flags().BoolVarP(&enableHttp, "http", "", false, "Enable REST/http using gppc-gateway")
 	ServeCmd.Flags().BoolVarP(&enableMCP, "mcp", "", false, "Enable Mission Control Protocol server")
 	ServeCmd.Flags().StringVarP(&mcpPort, "mcp-port", "", "8089", "Port to run the MCP server on")
 	ServeCmd.Flags().BoolVarP(&mcpHTTP, "mcp-http", "", false, "Enable HTTP mode for MCP server")
+	// allow injecting filters into the running server (repeatable)
+	ServeCmd.Flags().StringSliceVar(&filters, "filter", []string{}, "Filter to apply (can be specified multiple times)")
 }
--- a/container/Dockerfile
+++ b/container/Dockerfile
@@ -9,7 +9,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.

-FROM golang:1.23-alpine3.19 AS builder
+FROM golang:1.24-alpine3.23 AS builder

 ENV CGO_ENABLED=0
 ARG VERSION
--- a/go.mod
+++ b/go.mod
@@ -1,301 +1,293 @@
 module github.com/k8sgpt-ai/k8sgpt

-go 1.23.3
+go 1.25.0
+
+toolchain go1.26.1

 require (
 	github.com/fatih/color v1.18.0
 	github.com/kedacore/keda/v2 v2.16.0
-	github.com/magiconair/properties v1.8.9
-	github.com/mittwald/go-helm-client v0.12.14
-	github.com/ollama/ollama v0.5.1
-	github.com/sashabaranov/go-openai v1.36.0
-	github.com/schollz/progressbar/v3 v3.17.1
-	github.com/spf13/cobra v1.8.1
-	github.com/spf13/viper v1.19.0
-	github.com/stretchr/testify v1.10.0
-	golang.org/x/term v0.30.0
-	helm.sh/helm/v3 v3.17.3
-	k8s.io/api v0.32.2
-	k8s.io/apimachinery v0.32.2
-	k8s.io/client-go v0.32.2
-	k8s.io/kubectl v0.32.2 // indirect
-
+	github.com/magiconair/properties v1.8.10
+	github.com/mittwald/go-helm-client v0.12.19
+	github.com/ollama/ollama v0.18.1
+	github.com/sashabaranov/go-openai v1.41.2
+	github.com/schollz/progressbar/v3 v3.19.0
+	github.com/spf13/cobra v1.10.2
+	github.com/spf13/viper v1.21.0
+	github.com/stretchr/testify v1.11.1
+	golang.org/x/term v0.41.0
+	helm.sh/helm/v3 v3.19.0
+	k8s.io/api v0.35.2
+	k8s.io/apimachinery v0.35.2
+	k8s.io/client-go v0.35.2
+	k8s.io/kubectl v0.34.0 // indirect
 )

 require github.com/adrg/xdg v0.5.3

 require (
-	buf.build/gen/go/interplex-ai/schemas/grpc/go v1.5.1-20241117203254-a91193b62179.1
-	buf.build/gen/go/interplex-ai/schemas/protocolbuffers/go v1.35.2-20241117203254-a91193b62179.1
-	buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc-ecosystem/gateway/v2 v2.24.0-20241118152629-1379a5a1889d.1
-	buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc/go v1.5.1-20241118152629-1379a5a1889d.1
-	buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go v1.35.2-20241118152629-1379a5a1889d.1
-	cloud.google.com/go/storage v1.48.0
-	cloud.google.com/go/vertexai v0.13.2
-	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.1
-	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.5.0
-	github.com/IBM/watsonx-go v1.0.1
-	github.com/agiledragon/gomonkey/v2 v2.13.0
-	github.com/aws/aws-sdk-go v1.55.7
-	github.com/aws/aws-sdk-go-v2 v1.36.3
-	github.com/aws/aws-sdk-go-v2/config v1.29.14
-	github.com/aws/aws-sdk-go-v2/service/bedrock v1.33.0
-	github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.30.0
-	github.com/cohere-ai/cohere-go/v2 v2.12.2
+	buf.build/gen/go/interplex-ai/schemas/grpc/go v1.6.1-20241117203254-a91193b62179.1
+	buf.build/gen/go/interplex-ai/schemas/protocolbuffers/go v1.36.11-20241117203254-a91193b62179.1
+	buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc-ecosystem/gateway/v2 v2.28.0-20241118152629-1379a5a1889d.1
+	buf.build/gen/go/k8sgpt-ai/k8sgpt/grpc/go v1.6.1-20241118152629-1379a5a1889d.1
+	buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go v1.36.11-20241118152629-1379a5a1889d.1
+	cloud.google.com/go/storage v1.61.3
+	cloud.google.com/go/vertexai v0.17.0
+	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1
+	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.4
+	github.com/IBM/watsonx-go v1.0.2
+	github.com/agiledragon/gomonkey/v2 v2.14.0
+	github.com/aws/aws-sdk-go v1.55.8
+	github.com/aws/aws-sdk-go-v2 v1.41.4
+	github.com/aws/aws-sdk-go-v2/config v1.32.12
+	github.com/aws/aws-sdk-go-v2/service/bedrock v1.57.0
+	github.com/aws/aws-sdk-go-v2/service/bedrockruntime v1.50.2
+	github.com/aws/smithy-go v1.24.2
+	github.com/cohere-ai/cohere-go/v2 v2.16.2
 	github.com/go-logr/zapr v1.3.0
-	github.com/google/generative-ai-go v0.19.0
-	github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1
+	github.com/google/generative-ai-go v0.20.1
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0
 	github.com/hupe1980/go-huggingface v0.0.15
 	github.com/kyverno/policy-reporter-kyverno-plugin v1.6.4
-	github.com/metoro-io/mcp-golang v0.11.0
+	github.com/mark3labs/mcp-go v0.45.0
 	github.com/olekukonko/tablewriter v0.0.5
-	github.com/oracle/oci-go-sdk/v65 v65.79.0
-	github.com/prometheus/prometheus v0.302.1
-	github.com/pterm/pterm v0.12.80
-	google.golang.org/api v0.218.0
+	github.com/oracle/oci-go-sdk/v65 v65.109.2
+	github.com/prometheus/prometheus v0.310.0
+	github.com/pterm/pterm v0.12.83
+	google.golang.org/api v0.272.0
 	gopkg.in/yaml.v2 v2.4.0
-	sigs.k8s.io/controller-runtime v0.19.3
-	sigs.k8s.io/gateway-api v1.2.1
+	sigs.k8s.io/controller-runtime v0.23.3
+	sigs.k8s.io/gateway-api v1.5.1
 )

 require (
 	atomicgo.dev/cursor v0.2.0 // indirect
 	atomicgo.dev/keyboard v0.2.9 // indirect
 	atomicgo.dev/schedule v0.1.0 // indirect
-	cel.dev/expr v0.19.0 // indirect
-	cloud.google.com/go v0.116.0 // indirect
+	cel.dev/expr v0.25.1 // indirect
+	cloud.google.com/go v0.123.0 // indirect
 	cloud.google.com/go/ai v0.8.0 // indirect
-	cloud.google.com/go/aiplatform v1.69.0 // indirect
-	cloud.google.com/go/auth v0.14.0 // indirect
-	cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
-	cloud.google.com/go/compute/metadata v0.6.0 // indirect
-	cloud.google.com/go/iam v1.2.2 // indirect
-	cloud.google.com/go/longrunning v0.6.2 // indirect
-	cloud.google.com/go/monitoring v1.21.2 // indirect
+	cloud.google.com/go/aiplatform v1.120.0 // indirect
+	cloud.google.com/go/auth v0.18.2 // indirect
+	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
+	cloud.google.com/go/compute/metadata v0.9.0 // indirect
+	cloud.google.com/go/iam v1.5.3 // indirect
+	cloud.google.com/go/longrunning v0.8.0 // indirect
+	cloud.google.com/go/monitoring v1.24.3 // indirect
 	dario.cat/mergo v1.0.1 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
-	github.com/AzureAD/microsoft-authentication-library-for-go v1.3.2 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.25.0 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
-	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.48.1 // indirect
-	github.com/Microsoft/hcsshim v0.12.4 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
+	github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.30.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.55.0 // indirect
+	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.55.0 // indirect
 	github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.10 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.67 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 // indirect
-	github.com/aws/smithy-go v1.22.2 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.7 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.19.12 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.20 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.20 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.20 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.20 // indirect
+	github.com/aws/aws-sdk-go-v2/service/signin v1.0.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.30.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.17 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.41.9 // indirect
 	github.com/bahlo/generic-list-go v0.2.0 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/buger/jsonparser v1.1.1 // indirect
-	github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
-	github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
-	github.com/containerd/console v1.0.4 // indirect
-	github.com/containerd/continuity v0.4.3 // indirect
-	github.com/containerd/errdefs v0.3.0 // indirect
+	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
+	github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 // indirect
+	github.com/containerd/console v1.0.5 // indirect
+	github.com/containerd/errdefs v1.0.0 // indirect
 	github.com/containerd/log v0.1.0 // indirect
 	github.com/containerd/platforms v0.2.1 // indirect
 	github.com/creack/pty v1.1.21 // indirect
-	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
-	github.com/envoyproxy/go-control-plane v0.13.1 // indirect
-	github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
-	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
-	github.com/expr-lang/expr v1.17.2 // indirect
+	github.com/envoyproxy/go-control-plane/envoy v1.36.0 // indirect
+	github.com/envoyproxy/protoc-gen-validate v1.3.0 // indirect
+	github.com/evanphx/json-patch/v5 v5.9.11 // indirect
+	github.com/expr-lang/expr v1.17.7 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
-	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
+	github.com/fxamacker/cbor/v2 v2.9.0 // indirect
+	github.com/go-jose/go-jose/v4 v4.1.3 // indirect
+	github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
+	github.com/go-openapi/swag/conv v0.25.4 // indirect
+	github.com/go-openapi/swag/fileutils v0.25.4 // indirect
+	github.com/go-openapi/swag/jsonname v0.25.4 // indirect
+	github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
+	github.com/go-openapi/swag/loading v0.25.4 // indirect
+	github.com/go-openapi/swag/mangling v0.25.4 // indirect
+	github.com/go-openapi/swag/netutils v0.25.4 // indirect
+	github.com/go-openapi/swag/stringutils v0.25.4 // indirect
+	github.com/go-openapi/swag/typeutils v0.25.4 // indirect
+	github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
+	github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
 	github.com/gofrs/flock v0.12.1 // indirect
-	github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
-	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
+	github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
+	github.com/google/gnostic-models v0.7.0 // indirect
 	github.com/google/s2a-go v0.1.9 // indirect
-	github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
-	github.com/googleapis/gax-go/v2 v2.14.1 // indirect
-	github.com/gookit/color v1.5.4 // indirect
-	github.com/gorilla/websocket v1.5.1 // indirect
-	github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
-	github.com/invopop/jsonschema v0.12.0 // indirect
+	github.com/googleapis/enterprise-certificate-proxy v0.3.14 // indirect
+	github.com/googleapis/gax-go/v2 v2.18.0 // indirect
+	github.com/gookit/color v1.6.0 // indirect
+	github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
+	github.com/grafana/regexp v0.0.0-20250905093917-f7b3be9d1853 // indirect
+	github.com/invopop/jsonschema v0.13.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/kylelemons/godebug v1.1.0 // indirect
 	github.com/lithammer/fuzzysearch v1.1.8 // indirect
-	github.com/moby/sys/mountinfo v0.7.1 // indirect
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
 	github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
 	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
-	github.com/prometheus/sigv4 v0.1.1 // indirect
-	github.com/sagikazarmark/locafero v0.6.0 // indirect
-	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+	github.com/prometheus/client_golang/exp v0.0.0-20260108101519-fb0838f53562 // indirect
+	github.com/prometheus/otlptranslator v1.0.0 // indirect
+	github.com/prometheus/sigv4 v0.4.1 // indirect
+	github.com/sagikazarmark/locafero v0.11.0 // indirect
+	github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
 	github.com/segmentio/fasthash v1.0.3 // indirect
 	github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
 	github.com/sony/gobreaker v0.5.0 // indirect
-	github.com/sourcegraph/conc v0.3.0 // indirect
+	github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
+	github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
-	github.com/tidwall/gjson v1.18.0 // indirect
-	github.com/tidwall/match v1.1.1 // indirect
-	github.com/tidwall/pretty v1.2.1 // indirect
-	github.com/tidwall/sjson v1.2.5 // indirect
 	github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	go.opencensus.io v0.24.0 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/detectors/gcp v1.32.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
-	go.opentelemetry.io/otel/metric v1.34.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
-	go.opentelemetry.io/otel/sdk/metric v1.32.0 // indirect
+	github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
+	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
+	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
+	go.opentelemetry.io/contrib/detectors/gcp v1.39.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
+	go.opentelemetry.io/otel/metric v1.40.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.40.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
+	go.yaml.in/yaml/v2 v2.4.3 // indirect
+	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
-	google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
-	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
+	google.golang.org/genai v1.50.0 // indirect
+	google.golang.org/genproto v0.0.0-20260217215200-42d3e9bedb6d // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260311181403-84a4fc48630c // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	knative.dev/pkg v0.0.0-20241026180704-25f6002b00f3 // indirect
+	oras.land/oras-go/v2 v2.6.0 // indirect
+	sigs.k8s.io/randfill v1.0.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
 )

 require (
-	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
-	github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
+	github.com/BurntSushi/toml v1.5.0 // indirect
 	github.com/MakeNowJust/heredoc v1.0.0 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver/v3 v3.3.0 // indirect
+	github.com/Masterminds/semver/v3 v3.4.0 // indirect
 	github.com/Masterminds/sprig/v3 v3.3.0 // indirect
 	github.com/Masterminds/squirrel v1.5.4 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/chai2010/gettext-go v1.0.3 // indirect
-	github.com/containerd/containerd v1.7.24 // indirect
-	github.com/cyphar/filepath-securejoin v0.3.6 // indirect
+	github.com/containerd/containerd v1.7.29 // indirect
+	github.com/cyphar/filepath-securejoin v0.4.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/docker/cli v26.1.4+incompatible // indirect
-	github.com/docker/distribution v2.8.3+incompatible // indirect
-	github.com/docker/docker v27.4.1+incompatible // indirect
-	github.com/docker/docker-credential-helpers v0.8.2 // indirect
-	github.com/docker/go-connections v0.5.0 // indirect
-	github.com/docker/go-metrics v0.0.1 // indirect
-	github.com/emicklei/go-restful/v3 v3.12.1 // indirect
-	github.com/evanphx/json-patch v5.9.0+incompatible // indirect
+	github.com/emicklei/go-restful/v3 v3.13.0 // indirect
+	github.com/evanphx/json-patch v5.9.11+incompatible // indirect
 	github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
-	github.com/fsnotify/fsnotify v1.8.0 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/go-errors/errors v1.5.1 // indirect
 	github.com/go-gorp/gorp/v3 v3.1.0 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-openapi/jsonpointer v0.21.0 // indirect
-	github.com/go-openapi/jsonreference v0.21.0 // indirect
-	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/go-openapi/jsonpointer v0.22.4 // indirect
+	github.com/go-openapi/jsonreference v0.21.4 // indirect
+	github.com/go-openapi/swag v0.25.4 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/btree v1.1.2 // indirect
-	github.com/google/gnostic v0.7.0
-	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
+	github.com/google/btree v1.1.3 // indirect
+	github.com/google/gnostic v0.7.1
+	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/gosuri/uitable v0.0.4 // indirect
 	github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/huandu/xstrings v1.5.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmoiron/sqlx v1.4.0 // indirect
-	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.17.11 // indirect
+	github.com/klauspost/compress v1.18.3 // indirect
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
 	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
 	github.com/lib/pq v1.10.9 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
-	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mailru/easyjson v0.9.1 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/mattn/go-runewidth v0.0.20 // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/moby/locker v1.0.1 // indirect
 	github.com/moby/spdystream v0.5.0 // indirect
-	github.com/moby/term v0.5.0 // indirect
+	github.com/moby/term v0.5.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
 	github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
+	github.com/opencontainers/image-spec v1.1.1 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/prometheus/client_golang v1.21.0-rc.0
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.62.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/prometheus/client_golang v1.23.2
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.67.5 // indirect
+	github.com/prometheus/procfs v0.16.1 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/rubenv/sql-migrate v1.7.1 // indirect
+	github.com/rubenv/sql-migrate v1.8.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/spf13/afero v1.11.0 // indirect
-	github.com/spf13/cast v1.7.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/sirupsen/logrus v1.9.4 // indirect
+	github.com/spf13/afero v1.15.0 // indirect
+	github.com/spf13/cast v1.10.0 // indirect
+	github.com/spf13/pflag v1.0.10 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
-	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
-	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	github.com/xlab/treeprint v1.2.0 // indirect
-	go.opentelemetry.io/otel v1.34.0 // indirect
-	go.opentelemetry.io/otel/trace v1.34.0 // indirect
+	go.opentelemetry.io/otel v1.40.0 // indirect
+	go.opentelemetry.io/otel/trace v1.40.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.27.0
-	golang.org/x/crypto v0.36.0 // indirect
-	golang.org/x/exp v0.0.0-20240823005443-9b4947da3948 // indirect
-	golang.org/x/net v0.38.0
-	golang.org/x/oauth2 v0.25.0 // indirect
-	golang.org/x/sync v0.12.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
-	golang.org/x/text v0.23.0 // indirect
-	golang.org/x/time v0.9.0 // indirect
-	google.golang.org/grpc v1.70.0
-	google.golang.org/protobuf v1.36.4 // indirect
+	go.uber.org/zap v1.27.1
+	golang.org/x/crypto v0.49.0 // indirect
+	golang.org/x/net v0.52.0
+	golang.org/x/oauth2 v0.36.0 // indirect
+	golang.org/x/sync v0.20.0 // indirect
+	golang.org/x/sys v0.42.0 // indirect
+	golang.org/x/text v0.35.0 // indirect
+	golang.org/x/time v0.15.0 // indirect
+	google.golang.org/grpc v1.79.3
+	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
-	k8s.io/apiextensions-apiserver v0.32.2
-	k8s.io/apiserver v0.32.2 // indirect
-	k8s.io/cli-runtime v0.32.2 // indirect
-	k8s.io/component-base v0.32.2 // indirect
+	k8s.io/apiextensions-apiserver v0.35.2
+	k8s.io/apiserver v0.35.2 // indirect
+	k8s.io/cli-runtime v0.34.0 // indirect
+	k8s.io/component-base v0.35.2 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
-	k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
-	oras.land/oras-go v1.2.5 // indirect
-	sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
-	sigs.k8s.io/kustomize/api v0.18.0 // indirect
-	sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
-	sigs.k8s.io/yaml v1.4.0 // indirect
+	k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
+	k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
+	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
+	sigs.k8s.io/kustomize/api v0.20.1 // indirect
+	sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
+	sigs.k8s.io/yaml v1.6.0 // indirect
 )

 // v1.2.0 is taken from github.com/open-policy-agent/opa v0.42.0
 // v1.2.0 incompatible with github.com/docker/docker v23.0.0-rc.1+incompatible
 //replace oras.land/oras-go => oras.land/oras-go v1.2.4
-replace github.com/docker/docker => github.com/docker/docker v28.0.4+incompatible
+replace github.com/docker/docker => github.com/docker/docker v28.5.2+incompatible

-replace dario.cat/mergo => github.com/imdario/mergo v1.0.1
+replace dario.cat/mergo => github.com/imdario/mergo v1.0.2
--- a/go.sum
+++ b/go.sum
--- a/pkg/ai/amazonbedrock.go
+++ b/pkg/ai/amazonbedrock.go
@@ -14,6 +14,8 @@ import (
 	awsconfig "github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/service/bedrock"
 	"github.com/aws/aws-sdk-go-v2/service/bedrockruntime"
+	"github.com/aws/smithy-go/middleware"
+	smithyhttp "github.com/aws/smithy-go/transport/http"
 )

 const amazonbedrockAIClientName = "amazonbedrock"
@@ -58,6 +60,55 @@ var BEDROCKER_SUPPORTED_REGION = []string{
 }

 var defaultModels = []bedrock_support.BedrockModel{
+
+	{
+		Name:       "anthropic.claude-sonnet-4-20250514-v1:0",
+		Completion: &bedrock_support.CohereMessagesCompletion{},
+		Response:   &bedrock_support.CohereMessagesResponse{},
+		Config: bedrock_support.BedrockModelConfig{
+			// sensible defaults
+			MaxTokens:   100,
+			Temperature: 0.5,
+			TopP:        0.9,
+			ModelName:   "anthropic.claude-sonnet-4-20250514-v1:0",
+		},
+	},
+	{
+		Name:       "us.anthropic.claude-sonnet-4-20250514-v1:0",
+		Completion: &bedrock_support.CohereMessagesCompletion{},
+		Response:   &bedrock_support.CohereMessagesResponse{},
+		Config: bedrock_support.BedrockModelConfig{
+			// sensible defaults
+			MaxTokens:   100,
+			Temperature: 0.5,
+			TopP:        0.9,
+			ModelName:   "us.anthropic.claude-sonnet-4-20250514-v1:0",
+		},
+	},
+	{
+		Name:       "eu.anthropic.claude-sonnet-4-20250514-v1:0",
+		Completion: &bedrock_support.CohereMessagesCompletion{},
+		Response:   &bedrock_support.CohereMessagesResponse{},
+		Config: bedrock_support.BedrockModelConfig{
+			// sensible defaults
+			MaxTokens:   100,
+			Temperature: 0.5,
+			TopP:        0.9,
+			ModelName:   "eu.anthropic.claude-sonnet-4-20250514-v1:0",
+		},
+	},
+	{
+		Name:       "apac.anthropic.claude-sonnet-4-20250514-v1:0",
+		Completion: &bedrock_support.CohereMessagesCompletion{},
+		Response:   &bedrock_support.CohereMessagesResponse{},
+		Config: bedrock_support.BedrockModelConfig{
+			// sensible defaults
+			MaxTokens:   100,
+			Temperature: 0.5,
+			TopP:        0.9,
+			ModelName:   "apac.anthropic.claude-sonnet-4-20250514-v1:0",
+		},
+	},
 	{
 		Name:       "us.anthropic.claude-3-7-sonnet-20250219-v1:0",
 		Completion: &bedrock_support.CohereMessagesCompletion{},
@@ -82,6 +133,18 @@ var defaultModels = []bedrock_support.BedrockModel{
 			ModelName:   "eu.anthropic.claude-3-7-sonnet-20250219-v1:0",
 		},
 	},
+	{
+		Name:       "apac.anthropic.claude-3-7-sonnet-20250219-v1:0",
+		Completion: &bedrock_support.CohereMessagesCompletion{},
+		Response:   &bedrock_support.CohereMessagesResponse{},
+		Config: bedrock_support.BedrockModelConfig{
+			// sensible defaults
+			MaxTokens:   100,
+			Temperature: 0.5,
+			TopP:        0.9,
+			ModelName:   "apac.anthropic.claude-3-7-sonnet-20250219-v1:0",
+		},
+	},
 	{
 		Name:       "anthropic.claude-3-5-sonnet-20240620-v1:0",
 		Completion: &bedrock_support.CohereMessagesCompletion{},
@@ -255,13 +318,14 @@ var defaultModels = []bedrock_support.BedrockModel{
 	},
 	{
 		Name:       "anthropic.claude-3-haiku-20240307-v1:0",
-		Completion: &bedrock_support.CohereCompletion{},
-		Response:   &bedrock_support.CohereResponse{},
+		Completion: &bedrock_support.CohereMessagesCompletion{},
+		Response:   &bedrock_support.CohereMessagesResponse{},
 		Config: bedrock_support.BedrockModelConfig{
 			// sensible defaults
 			MaxTokens:   100,
 			Temperature: 0.5,
 			TopP:        0.9,
+			ModelName:   "anthropic.claude-3-haiku-20240307-v1:0",
 		},
 	},
 }
@@ -311,7 +375,6 @@ func (a *AmazonBedRockClient) getModelFromString(model string) (*bedrock_support

 	// Trim spaces from the model name
 	model = strings.TrimSpace(model)
-	modelLower := strings.ToLower(model)

 	// Try to find an exact match first
 	for i := range a.models {
@@ -322,26 +385,27 @@ func (a *AmazonBedRockClient) getModelFromString(model string) (*bedrock_support
 		}
 	}

-	// If no exact match, try partial match
-	for i := range a.models {
-		modelNameLower := strings.ToLower(a.models[i].Name)
-		modelConfigNameLower := strings.ToLower(a.models[i].Config.ModelName)
-
-		// Check if the input string contains the model name or vice versa
-		if strings.Contains(modelNameLower, modelLower) || strings.Contains(modelLower, modelNameLower) ||
-			strings.Contains(modelConfigNameLower, modelLower) || strings.Contains(modelLower, modelConfigNameLower) {
-			// Create a copy to avoid returning a pointer to a loop variable
-			modelCopy := a.models[i]
-			// for partial match, set the model name to the input string if it is a valid ARN
-			if validateModelArn(modelLower) {
-				modelCopy.Config.ModelName = modelLower
-			}
-
-			return &modelCopy, nil
-		}
+	supportedModels := make([]string, len(a.models))
+	for i, m := range a.models {
+		supportedModels[i] = m.Name
 	}

-	return nil, fmt.Errorf("model '%s' not found in supported models", model)
+	supportedRegions := BEDROCKER_SUPPORTED_REGION
+
+	// Pretty-print supported models and regions
+	modelList := ""
+	for _, m := range supportedModels {
+		modelList += "  - " + m + "\n"
+	}
+	regionList := ""
+	for _, r := range supportedRegions {
+		regionList += "  - " + r + "\n"
+	}
+
+	return nil, fmt.Errorf(
+		"model '%s' not found in supported models.\n\nSupported models:\n%sSupported regions:\n%s",
+		model, modelList, regionList,
+	)
 }

 // Configure configures the AmazonBedRockClient with the provided configuration.
@@ -378,6 +442,9 @@ func (a *AmazonBedRockClient) Configure(config IAIConfig) error {
 			awsconfig.WithRegion(region),
 		)
 		if err != nil {
+			if strings.Contains(err.Error(), "InvalidAccessKeyId") || strings.Contains(err.Error(), "SignatureDoesNotMatch") || strings.Contains(err.Error(), "NoCredentialProviders") {
+				return fmt.Errorf("AWS credentials are invalid or missing. Please check your AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables or AWS config. Details: %v", err)
+			}
 			return fmt.Errorf("failed to load AWS config for region %s: %w", region, err)
 		}

@@ -391,31 +458,30 @@ func (a *AmazonBedRockClient) Configure(config IAIConfig) error {
 		// Get the inference profile details
 		profile, err := a.getInferenceProfile(context.Background(), modelInput)
 		if err != nil {
-			// Instead of using a fallback model, throw an error
 			return fmt.Errorf("failed to get inference profile: %v", err)
-		} else {
-			// Extract the model ID from the inference profile
-			modelID, err := a.extractModelFromInferenceProfile(profile)
-			if err != nil {
-				return fmt.Errorf("failed to extract model ID from inference profile: %v", err)
-			}
-
-			// Find the model configuration for the extracted model ID
-			foundModel, err := a.getModelFromString(modelID)
-			if err != nil {
-				// Instead of using a fallback model, throw an error
-				return fmt.Errorf("failed to find model configuration for %s: %v", modelID, err)
-			}
-			a.model = foundModel
-
-			// Use the inference profile ARN as the model ID for API calls
-			a.model.Config.ModelName = modelInput
 		}
+		// Extract the model ID from the inference profile
+		modelID, err := a.extractModelFromInferenceProfile(profile)
+		if err != nil {
+			return fmt.Errorf("failed to extract model ID from inference profile: %v", err)
+		}
+		// Find the model configuration for the extracted model ID
+		foundModel, err := a.getModelFromString(modelID)
+		if err != nil {
+			// Instead of failing, use a generic config for completion/response
+			// But still warn user
+			return fmt.Errorf("failed to find model configuration for %s: %v", modelID, err)
+		}
+		// Use the found model config for completion/response, but set ModelName to the profile ARN
+		a.model = foundModel
+		a.model.Config.ModelName = modelInput
+		// Mark that we're using an inference profile
+		// (could add a field if needed)
 	} else {
 		// Regular model ID provided
 		foundModel, err := a.getModelFromString(modelInput)
 		if err != nil {
-			return err
+			return fmt.Errorf("model '%s' is not supported: %v", modelInput, err)
 		}
 		a.model = foundModel
 		a.model.Config.ModelName = foundModel.Config.ModelName
@@ -490,6 +556,22 @@ func (a *AmazonBedRockClient) GetCompletion(ctx context.Context, prompt string)
 	a.model.Config.Temperature = a.temperature
 	a.model.Config.TopP = a.topP

+	supportedModels := make([]string, len(a.models))
+	for i, m := range a.models {
+		supportedModels[i] = m.Name
+	}
+
+	// Allow valid inference profile ARNs as supported models
+	if !bedrock_support.IsModelSupported(a.model.Config.ModelName, supportedModels) && !validateInferenceProfileArn(a.model.Config.ModelName) {
+		return "", fmt.Errorf("model '%s' is not supported.\nSupported models:\n%s", a.model.Config.ModelName, func() string {
+			s := ""
+			for _, m := range supportedModels {
+				s += "  - " + m + "\n"
+			}
+			return s
+		}())
+	}
+
 	body, err := a.model.Completion.GetCompletion(ctx, prompt, a.model.Config)
 	if err != nil {
 		return "", err
@@ -503,9 +585,34 @@ func (a *AmazonBedRockClient) GetCompletion(ctx context.Context, prompt string)
 		Accept:      aws.String("application/json"),
 	}

+	// Detect if the model name is an inference profile ARN and set the header if so
+	var optFns []func(*bedrockruntime.Options)
+	if validateInferenceProfileArn(a.model.Config.ModelName) {
+		inferenceProfileArn := a.model.Config.ModelName
+		optFns = append(optFns, func(options *bedrockruntime.Options) {
+			options.APIOptions = append(options.APIOptions, func(stack *middleware.Stack) error {
+				return stack.Initialize.Add(middleware.InitializeMiddlewareFunc("InferenceProfileHeader", func(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) (out middleware.InitializeOutput, metadata middleware.Metadata, err error) {
+					req, ok := in.Parameters.(*smithyhttp.Request)
+					if ok {
+						req.Header.Set("X-Amzn-Bedrock-Inference-Profile-ARN", inferenceProfileArn)
+					}
+					return next.HandleInitialize(ctx, in)
+				}), middleware.Before)
+			})
+		})
+	}
+
 	// Invoke the model
-	resp, err := a.client.InvokeModel(ctx, params)
+	var resp *bedrockruntime.InvokeModelOutput
+	if len(optFns) > 0 {
+		resp, err = a.client.InvokeModel(ctx, params, optFns...)
+	} else {
+		resp, err = a.client.InvokeModel(ctx, params)
+	}
 	if err != nil {
+		if strings.Contains(err.Error(), "InvalidAccessKeyId") || strings.Contains(err.Error(), "SignatureDoesNotMatch") || strings.Contains(err.Error(), "NoCredentialProviders") {
+			return "", fmt.Errorf("AWS credentials are invalid or missing. Please check your AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables or AWS config. Details: %v", err)
+		}
 		return "", err
 	}

--- a/pkg/ai/amazonbedrock_test.go
+++ b/pkg/ai/amazonbedrock_test.go
@@ -47,57 +47,54 @@ var testModels = []bedrock_support.BedrockModel{
 func TestBedrockModelConfig(t *testing.T) {
 	client := &AmazonBedRockClient{models: testModels}

-	foundModel, err := client.getModelFromString("arn:aws:bedrock:us-east-1:*:inference-policy/anthropic.claude-3-5-sonnet-20240620-v1:0")
-	assert.Nil(t, err, "Error should be nil")
-	assert.Equal(t, foundModel.Config.MaxTokens, 100)
-	assert.Equal(t, foundModel.Config.Temperature, float32(0.5))
-	assert.Equal(t, foundModel.Config.TopP, float32(0.9))
-	assert.Equal(t, foundModel.Config.ModelName, "arn:aws:bedrock:us-east-1:*:inference-policy/anthropic.claude-3-5-sonnet-20240620-v1:0")
+	// Should return error for ARN input (no exact match)
+	_, err := client.getModelFromString("arn:aws:bedrock:us-east-1:*:inference-policy/anthropic.claude-3-5-sonnet-20240620-v1:0")
+	assert.NotNil(t, err, "Should return error for ARN input")
 }

 func TestBedrockInvalidModel(t *testing.T) {
 	client := &AmazonBedRockClient{models: testModels}

-	foundModel, err := client.getModelFromString("arn:aws:s3:us-east-1:*:inference-policy/anthropic.claude-3-5-sonnet-20240620-v1:0")
-	assert.Nil(t, err, "Error should be nil")
-	assert.Equal(t, foundModel.Config.MaxTokens, 100)
+	// Should return error for invalid model name
+	_, err := client.getModelFromString("arn:aws:s3:us-east-1:*:inference-policy/anthropic.claude-3-5-sonnet-20240620-v1:0")
+	assert.NotNil(t, err, "Should return error for invalid model name")
 }

 func TestBedrockInferenceProfileARN(t *testing.T) {
 	// Create a mock client with test models
 	client := &AmazonBedRockClient{models: testModels}
-	
+
 	// Test with a valid inference profile ARN
 	inferenceProfileARN := "arn:aws:bedrock:us-east-1:123456789012:inference-profile/my-profile"
 	config := AIProvider{
 		Model:          inferenceProfileARN,
 		ProviderRegion: "us-east-1",
 	}
-	
+
 	// This will fail in a real environment without mocks, but we're just testing the validation logic
 	err := client.Configure(&config)
 	// We expect an error since we can't actually call AWS in tests
 	assert.NotNil(t, err, "Error should not be nil without AWS mocks")
-	
+
 	// Test with a valid application inference profile ARN
 	appInferenceProfileARN := "arn:aws:bedrock:us-east-1:123456789012:application-inference-profile/my-profile"
 	config = AIProvider{
 		Model:          appInferenceProfileARN,
 		ProviderRegion: "us-east-1",
 	}
-	
+
 	// This will fail in a real environment without mocks, but we're just testing the validation logic
 	err = client.Configure(&config)
 	// We expect an error since we can't actually call AWS in tests
 	assert.NotNil(t, err, "Error should not be nil without AWS mocks")
-	
+
 	// Test with an invalid inference profile ARN format
 	invalidARN := "arn:aws:bedrock:us-east-1:123456789012:invalid-resource/my-profile"
 	config = AIProvider{
 		Model:          invalidARN,
 		ProviderRegion: "us-east-1",
 	}
-	
+
 	err = client.Configure(&config)
 	assert.NotNil(t, err, "Error should not be nil for invalid inference profile ARN format")
 }
@@ -146,7 +143,7 @@ func TestGetModelFromString(t *testing.T) {
 			name:      "partial model name match",
 			model:     "claude-3-5-sonnet",
 			wantModel: "anthropic.claude-3-5-sonnet-20240620-v1:0",
-			wantErr:   false,
+			wantErr:   true,
 		},
 		{
 			name:      "model name with different version",
--- a/pkg/ai/bedrock_support/completions.go
+++ b/pkg/ai/bedrock_support/completions.go
@@ -7,24 +7,6 @@ import (
 	"strings"
 )

-var SUPPPORTED_BEDROCK_MODELS = []string{
-	"anthropic.claude-3-5-sonnet-20240620-v1:0",
-	"us.anthropic.claude-3-5-sonnet-20241022-v2:0",
-	"anthropic.claude-v2",
-	"anthropic.claude-v1",
-	"anthropic.claude-instant-v1",
-	"ai21.j2-ultra-v1",
-	"ai21.j2-jumbo-instruct",
-	"amazon.titan-text-express-v1",
-	"amazon.nova-pro-v1:0",
-	"eu.amazon.nova-pro-v1:0",
-	"us.amazon.nova-pro-v1:0",
-	"amazon.nova-lite-v1:0",
-	"eu.amazon.nova-lite-v1:0",
-	"us.amazon.nova-lite-v1:0",
-	"anthropic.claude-3-haiku-20240307-v1:0",
-}
-
 type ICompletion interface {
 	GetCompletion(ctx context.Context, prompt string, modelConfig BedrockModelConfig) ([]byte, error)
 }
@@ -94,18 +76,20 @@ type AmazonCompletion struct {
 	completion ICompletion
 }

-func isModelSupported(modelName string) bool {
-	for _, supportedModel := range SUPPPORTED_BEDROCK_MODELS {
-		if strings.Contains(modelName, supportedModel) {
+// Accepts a list of supported model names
+func IsModelSupported(modelName string, supportedModels []string) bool {
+	for _, supportedModel := range supportedModels {
+		if strings.EqualFold(modelName, supportedModel) {
 			return true
 		}
 	}
 	return false
 }

+// Note: The caller should check model support before calling GetCompletion.
 func (a *AmazonCompletion) GetCompletion(ctx context.Context, prompt string, modelConfig BedrockModelConfig) ([]byte, error) {
-	if !isModelSupported(modelConfig.ModelName) {
-		return nil, fmt.Errorf("model %s is not supported", modelConfig.ModelName)
+	if a == nil || modelConfig.ModelName == "" {
+		return nil, fmt.Errorf("no model name provided to Bedrock completion")
 	}
 	if strings.Contains(modelConfig.ModelName, "nova") {
 		return a.GetNovaCompletion(ctx, prompt, modelConfig)
@@ -128,7 +112,6 @@ func (a *AmazonCompletion) GetDefaultCompletion(ctx context.Context, prompt stri
 		return []byte{}, err
 	}
 	return body, nil
-
 }

 func (a *AmazonCompletion) GetNovaCompletion(ctx context.Context, prompt string, modelConfig BedrockModelConfig) ([]byte, error) {
--- a/pkg/ai/bedrock_support/completions_test.go
+++ b/pkg/ai/bedrock_support/completions_test.go
@@ -158,21 +158,6 @@ func TestAmazonCompletion_GetCompletion_Default(t *testing.T) {
 	assert.Equal(t, 0.7, textConfig["topP"])
 }

-func TestAmazonCompletion_GetCompletion_UnsupportedModel(t *testing.T) {
-	completion := &AmazonCompletion{}
-	modelConfig := BedrockModelConfig{
-		MaxTokens:   200,
-		Temperature: 0.5,
-		TopP:        0.7,
-		ModelName:   "unsupported-model",
-	}
-	prompt := "Test prompt"
-
-	_, err := completion.GetCompletion(context.Background(), prompt, modelConfig)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "model unsupported-model is not supported")
-}
-
 func TestAmazonCompletion_GetCompletion_Inference_Profile(t *testing.T) {
 	completion := &AmazonCompletion{}
 	modelConfig := BedrockModelConfig{
@@ -187,7 +172,11 @@ func TestAmazonCompletion_GetCompletion_Inference_Profile(t *testing.T) {
 	assert.NoError(t, err)
 }

-func Test_isModelSupported(t *testing.T) {
-	assert.True(t, isModelSupported("anthropic.claude-v2"))
-	assert.False(t, isModelSupported("unsupported-model"))
+func TestIsModelSupported(t *testing.T) {
+	supported := []string{
+		"anthropic.claude-v2",
+		"anthropic.claude-v1",
+	}
+	assert.True(t, IsModelSupported("anthropic.claude-v2", supported))
+	assert.False(t, IsModelSupported("unsupported-model", supported))
 }
--- a/pkg/ai/googlevertexai.go
+++ b/pkg/ai/googlevertexai.go
@@ -61,10 +61,22 @@ var VERTEXAI_SUPPORTED_REGION = []string{
 }

 const (
-	ModelGeminiProV1 = "gemini-1.0-pro-001"
+	ModelGeminiProV1       = "gemini-1.0-pro-001"    // Retired Model
+	ModelGeminiProV2_5     = "gemini-2.5-pro"        // Latest Stable Model
+	ModelGeminiFlashV2_5   = "gemini-2.5-flash"      // Latest Stable Model
+	ModelGeminiFlashV2     = "gemini-2.0-flash"      // Latest Stable Model
+	ModelGeminiFlashLiteV2 = "gemini-2.0-flash-lite" // Latest Stable Model
+	ModelGeminiProV1_5     = "gemini-1.5-pro-002*"   // Legacy Stable Model
+	ModelGeminiFlashV1_5   = "gemini-1.5-flash-002*" // Legacy Stable Model
 )

 var VERTEXAI_MODELS = []string{
+	ModelGeminiProV2_5,
+	ModelGeminiFlashV2_5,
+	ModelGeminiFlashV2,
+	ModelGeminiFlashLiteV2,
+	ModelGeminiProV1_5,
+	ModelGeminiFlashV1_5,
 	ModelGeminiProV1,
 }

--- a/pkg/ai/groq.go
+++ b/pkg/ai/groq.go
@@ -0,0 +1,102 @@
+/*
+Copyright 2023 The K8sGPT Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package ai
+
+import (
+	"context"
+	"errors"
+	"net/http"
+	"net/url"
+
+	"github.com/sashabaranov/go-openai"
+)
+
+const groqAIClientName = "groq"
+
+// Default Groq API endpoint (OpenAI-compatible)
+const groqAPIBaseURL = "https://api.groq.com/openai/v1"
+
+type GroqClient struct {
+	nopCloser
+
+	client      *openai.Client
+	model       string
+	temperature float32
+	topP        float32
+}
+
+func (c *GroqClient) Configure(config IAIConfig) error {
+	token := config.GetPassword()
+	defaultConfig := openai.DefaultConfig(token)
+	proxyEndpoint := config.GetProxyEndpoint()
+
+	baseURL := config.GetBaseURL()
+	if baseURL != "" {
+		defaultConfig.BaseURL = baseURL
+	} else {
+		defaultConfig.BaseURL = groqAPIBaseURL
+	}
+
+	transport := &http.Transport{}
+	if proxyEndpoint != "" {
+		proxyUrl, err := url.Parse(proxyEndpoint)
+		if err != nil {
+			return err
+		}
+		transport.Proxy = http.ProxyURL(proxyUrl)
+	}
+
+	customHeaders := config.GetCustomHeaders()
+	defaultConfig.HTTPClient = &http.Client{
+		Transport: &OpenAIHeaderTransport{
+			Origin:  transport,
+			Headers: customHeaders,
+		},
+	}
+
+	client := openai.NewClientWithConfig(defaultConfig)
+	if client == nil {
+		return errors.New("error creating Groq client")
+	}
+	c.client = client
+	c.model = config.GetModel()
+	c.temperature = config.GetTemperature()
+	c.topP = config.GetTopP()
+	return nil
+}
+
+func (c *GroqClient) GetCompletion(ctx context.Context, prompt string) (string, error) {
+	resp, err := c.client.CreateChatCompletion(ctx, openai.ChatCompletionRequest{
+		Model: c.model,
+		Messages: []openai.ChatCompletionMessage{
+			{
+				Role:    "user",
+				Content: prompt,
+			},
+		},
+		Temperature:      c.temperature,
+		MaxTokens:        maxToken,
+		PresencePenalty:  presencePenalty,
+		FrequencyPenalty: frequencyPenalty,
+		TopP:             c.topP,
+	})
+	if err != nil {
+		return "", err
+	}
+	return resp.Choices[0].Message.Content, nil
+}
+
+func (c *GroqClient) GetName() string {
+	return groqAIClientName
+}
--- a/pkg/ai/iai.go
+++ b/pkg/ai/iai.go
@@ -34,6 +34,7 @@ var (
 		&OCIGenAIClient{},
 		&CustomRestClient{},
 		&IBMWatsonxAIClient{},
+		&GroqClient{},
 	}
 	Backends = []string{
 		openAIClientName,
@@ -50,6 +51,7 @@ var (
 		ociClientName,
 		CustomRestClientName,
 		ibmWatsonxAIClientName,
+		groqAIClientName,
 	}
 )

--- a/pkg/ai/ocigenai.go
+++ b/pkg/ai/ocigenai.go
@@ -16,21 +16,32 @@ package ai
 import (
 	"context"
 	"errors"
+	"fmt"
 	"github.com/oracle/oci-go-sdk/v65/common"
+	"github.com/oracle/oci-go-sdk/v65/generativeai"
 	"github.com/oracle/oci-go-sdk/v65/generativeaiinference"
-	"strings"
+	"reflect"
 )

 const ociClientName = "oci"

+type ociModelVendor string
+
+const (
+	vendorCohere = "cohere"
+	vendorMeta   = "meta"
+)
+
 type OCIGenAIClient struct {
 	nopCloser

 	client        *generativeaiinference.GenerativeAiInferenceClient
-	model         string
+	model         *generativeai.Model
+	modelID       string
 	compartmentId string
 	temperature   float32
 	topP          float32
+	topK          int32
 	maxTokens     int
 }

@@ -40,9 +51,10 @@ func (c *OCIGenAIClient) GetName() string {

 func (c *OCIGenAIClient) Configure(config IAIConfig) error {
 	config.GetEndpointName()
-	c.model = config.GetModel()
+	c.modelID = config.GetModel()
 	c.temperature = config.GetTemperature()
 	c.topP = config.GetTopP()
+	c.topK = config.GetTopK()
 	c.maxTokens = config.GetMaxTokens()
 	c.compartmentId = config.GetCompartmentId()
 	provider := common.DefaultConfigProvider()
@@ -51,47 +63,123 @@ func (c *OCIGenAIClient) Configure(config IAIConfig) error {
 		return err
 	}
 	c.client = &client
+	model, err := c.getModel(provider)
+	if err != nil {
+		return err
+	}
+	c.model = model
 	return nil
 }

 func (c *OCIGenAIClient) GetCompletion(ctx context.Context, prompt string) (string, error) {
-	generateTextRequest := c.newGenerateTextRequest(prompt)
-	generateTextResponse, err := c.client.GenerateText(ctx, generateTextRequest)
+	request := c.newChatRequest(prompt)
+	response, err := c.client.Chat(ctx, request)
 	if err != nil {
 		return "", err
 	}
-	return extractGeneratedText(generateTextResponse.InferenceResponse)
+	if err != nil {
+		return "", err
+	}
+	return extractGeneratedText(response.ChatResponse)
 }

-func (c *OCIGenAIClient) newGenerateTextRequest(prompt string) generativeaiinference.GenerateTextRequest {
-	temperatureF64 := float64(c.temperature)
-	topPF64 := float64(c.topP)
-	return generativeaiinference.GenerateTextRequest{
-		GenerateTextDetails: generativeaiinference.GenerateTextDetails{
+func (c *OCIGenAIClient) newChatRequest(prompt string) generativeaiinference.ChatRequest {
+	return generativeaiinference.ChatRequest{
+		ChatDetails: generativeaiinference.ChatDetails{
 			CompartmentId: &c.compartmentId,
-			ServingMode: generativeaiinference.OnDemandServingMode{
-				ModelId: &c.model,
-			},
-			InferenceRequest: generativeaiinference.CohereLlmInferenceRequest{
-				Prompt:      &prompt,
-				MaxTokens:   &c.maxTokens,
-				Temperature: &temperatureF64,
-				TopP:        &topPF64,
-			},
+			ServingMode:   c.getServingMode(),
+			ChatRequest:   c.getChatModelRequest(prompt),
 		},
 	}
 }

-func extractGeneratedText(llmInferenceResponse generativeaiinference.LlmInferenceResponse) (string, error) {
-	response, ok := llmInferenceResponse.(generativeaiinference.CohereLlmInferenceResponse)
-	if !ok {
-		return "", errors.New("failed to extract generated text from backed response")
+func (c *OCIGenAIClient) getChatModelRequest(prompt string) generativeaiinference.BaseChatRequest {
+	temperatureF64 := float64(c.temperature)
+	topPF64 := float64(c.topP)
+	topK := int(c.topK)
+
+	switch c.getVendor() {
+	case vendorMeta:
+		messages := []generativeaiinference.Message{
+			generativeaiinference.UserMessage{
+				Content: []generativeaiinference.ChatContent{
+					generativeaiinference.TextContent{
+						Text: &prompt,
+					},
+				},
+			},
+		}
+		// 0 is invalid for Meta vendor type, instead use -1 to disable topK sampling.
+		if topK == 0 {
+			topK = -1
+		}
+		return generativeaiinference.GenericChatRequest{
+			Messages:    messages,
+			TopK:        &topK,
+			TopP:        &topPF64,
+			Temperature: &temperatureF64,
+			MaxTokens:   &c.maxTokens,
+		}
+	default: // Default to cohere
+		return generativeaiinference.CohereChatRequest{
+			Message:     &prompt,
+			MaxTokens:   &c.maxTokens,
+			Temperature: &temperatureF64,
+			TopK:        &topK,
+			TopP:        &topPF64,
+		}
+
 	}
-	sb := strings.Builder{}
-	for _, text := range response.GeneratedTexts {
-		if text.Text != nil {
-			sb.WriteString(*text.Text)
+}
+
+func extractGeneratedText(llmInferenceResponse generativeaiinference.BaseChatResponse) (string, error) {
+	switch response := llmInferenceResponse.(type) {
+	case generativeaiinference.GenericChatResponse:
+		if len(response.Choices) > 0 && len(response.Choices[0].Message.GetContent()) > 0 {
+			if content, ok := response.Choices[0].Message.GetContent()[0].(generativeaiinference.TextContent); ok {
+				return *content.Text, nil
+			}
+		}
+		return "", errors.New("no text found in oci response")
+	case generativeaiinference.CohereChatResponse:
+		return *response.Text, nil
+	default:
+		return "", fmt.Errorf("unknown oci response type: %s", reflect.TypeOf(llmInferenceResponse).Name())
+	}
+}
+
+func (c *OCIGenAIClient) getServingMode() generativeaiinference.ServingMode {
+	if c.isBaseModel() {
+		return generativeaiinference.OnDemandServingMode{
+			ModelId: &c.modelID,
 		}
 	}
-	return sb.String(), nil
+	return generativeaiinference.DedicatedServingMode{
+		EndpointId: &c.modelID,
+	}
+}
+
+func (c *OCIGenAIClient) getModel(provider common.ConfigurationProvider) (*generativeai.Model, error) {
+	client, err := generativeai.NewGenerativeAiClientWithConfigurationProvider(provider)
+	if err != nil {
+		return nil, err
+	}
+	response, err := client.GetModel(context.Background(), generativeai.GetModelRequest{
+		ModelId: &c.modelID,
+	})
+	if err != nil {
+		return nil, err
+	}
+	return &response.Model, nil
+}
+
+func (c *OCIGenAIClient) isBaseModel() bool {
+	return c.model != nil && c.model.Type == generativeai.ModelTypeBase
+}
+
+func (c *OCIGenAIClient) getVendor() ociModelVendor {
+	if c.model == nil || c.model.Vendor == nil {
+		return ""
+	}
+	return ociModelVendor(*c.model.Vendor)
 }
--- a/pkg/ai/openai.go
+++ b/pkg/ai/openai.go
@@ -95,7 +95,7 @@ func (c *OpenAIClient) GetCompletion(ctx context.Context, prompt string) (string
 			},
 		},
 		Temperature:      c.temperature,
-		MaxTokens:        maxToken,
+		MaxCompletionTokens: maxToken,
 		PresencePenalty:  presencePenalty,
 		FrequencyPenalty: frequencyPenalty,
 		TopP:             c.topP,
--- a/pkg/analysis/analysis.go
+++ b/pkg/analysis/analysis.go
@@ -16,6 +16,7 @@ package analysis
 import (
 	"context"
 	"encoding/base64"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"reflect"
@@ -34,6 +35,7 @@ import (
 	"github.com/k8sgpt-ai/k8sgpt/pkg/util"
 	"github.com/schollz/progressbar/v3"
 	"github.com/spf13/viper"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

 type Analysis struct {
@@ -226,6 +228,15 @@ func (a *Analysis) CustomAnalyzersAreAvailable() bool {
 }

 func (a *Analysis) RunCustomAnalysis() {
+	// Validate namespace if specified, consistent with built-in filter behavior
+	if a.Namespace != "" && a.Client != nil {
+		_, err := a.Client.Client.CoreV1().Namespaces().Get(a.Context, a.Namespace, metav1.GetOptions{})
+		if err != nil {
+			a.Errors = append(a.Errors, fmt.Sprintf("namespace %q not found: %s", a.Namespace, err))
+			return
+		}
+	}
+
 	var customAnalyzers []custom.CustomAnalyzer
 	if err := viper.UnmarshalKey("custom_analyzers", &customAnalyzers); err != nil {
 		a.Errors = append(a.Errors, err.Error())
@@ -526,7 +537,22 @@ func (a *Analysis) getAIResultForSanitizedFailures(texts []string, promptTmpl st
 	// Process template.
 	prompt := fmt.Sprintf(strings.TrimSpace(promptTmpl), a.Language, inputKey)
 	if a.AIClient.GetName() == ai.CustomRestClientName {
-		prompt = fmt.Sprintf(ai.PromptMap["raw"], a.Language, inputKey, prompt)
+		// Use proper JSON marshaling to handle special characters in error messages
+		// This fixes issues with quotes, newlines, and other special chars in inputKey
+		customRestPrompt := struct {
+			Language string `json:"language"`
+			Message  string `json:"message"`
+			Prompt   string `json:"prompt"`
+		}{
+			Language: a.Language,
+			Message:  inputKey,
+			Prompt:   prompt,
+		}
+		promptBytes, err := json.Marshal(customRestPrompt)
+		if err != nil {
+			return "", fmt.Errorf("failed to marshal customrest prompt: %w", err)
+		}
+		prompt = string(promptBytes)
 	}
 	response, err := a.AIClient.GetCompletion(a.Context, prompt)
 	if err != nil {
--- a/pkg/analyzer/analyzer.go
+++ b/pkg/analyzer/analyzer.go
@@ -57,6 +57,13 @@ var additionalAnalyzerMap = map[string]common.IAnalyzer{
 	"HTTPRoute":               HTTPRouteAnalyzer{},
 	"Storage":                 StorageAnalyzer{},
 	"Security":                SecurityAnalyzer{},
+	"ClusterCatalog":          ClusterCatalogAnalyzer{},
+	"ClusterExtension":        ClusterExtensionAnalyzer{},
+	"ClusterServiceVersion":   ClusterServiceVersionAnalyzer{},
+	"Subscription":            SubscriptionAnalyzer{},
+	"InstallPlan":             InstallPlanAnalyzer{},
+	"CatalogSource":           CatalogSourceAnalyzer{},
+	"OperatorGroup":           OperatorGroupAnalyzer{},
 }

 func ListFilters() ([]string, []string, []string) {
--- a/pkg/analyzer/catalogsource.go
+++ b/pkg/analyzer/catalogsource.go
@@ -0,0 +1,53 @@
+package analyzer
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+type CatalogSourceAnalyzer struct{}
+
+var catSrcGVR = schema.GroupVersionResource{
+	Group:    "operators.coreos.com",
+	Version:  "v1alpha1",
+	Resource: "catalogsources",
+}
+
+func (CatalogSourceAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
+	kind := "CatalogSource"
+	if a.Client.GetDynamicClient() == nil {
+		return nil, fmt.Errorf("dynamic client is nil in %s analyzer", kind)
+	}
+
+	list, err := a.Client.GetDynamicClient().
+		Resource(catSrcGVR).Namespace(metav1.NamespaceAll).
+		List(a.Context, metav1.ListOptions{})
+	if err != nil {
+		return nil, err
+	}
+
+	var results []common.Result
+	for _, item := range list.Items {
+		ns, name := item.GetNamespace(), item.GetName()
+
+		state, _, _ := unstructured.NestedString(item.Object, "status", "connectionState", "lastObservedState")
+		addr, _, _ := unstructured.NestedString(item.Object, "status", "connectionState", "address")
+
+		// Only report if state is present and not READY
+		if state != "" && strings.ToUpper(state) != "READY" {
+			results = append(results, common.Result{
+				Kind: kind,
+				Name: ns + "/" + name,
+				Error: []common.Failure{{
+					Text: fmt.Sprintf("connectionState=%s (address=%s)", state, addr),
+				}},
+			})
+		}
+	}
+	return results, nil
+}
--- a/pkg/analyzer/catalogsource_test.go
+++ b/pkg/analyzer/catalogsource_test.go
@@ -0,0 +1,107 @@
+package analyzer
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
+	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+)
+
+func TestCatalogSourceAnalyzer_UnhealthyState_ReturnsResult(t *testing.T) {
+	cs := &unstructured.Unstructured{
+		Object: map[string]any{
+			"apiVersion": "operators.coreos.com/v1alpha1",
+			"kind":       "CatalogSource",
+			"metadata": map[string]any{
+				"name":      "broken-operators-external",
+				"namespace": "openshift-marketplace",
+			},
+			"status": map[string]any{
+				"connectionState": map[string]any{
+					"lastObservedState": "TRANSIENT_FAILURE",
+					"address":           "not-a-real-host.invalid:50051",
+				},
+			},
+		},
+	}
+
+	listKinds := map[schema.GroupVersionResource]string{
+		{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "catalogsources"}: "CatalogSourceList",
+	}
+	scheme := runtime.NewScheme()
+	dc := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(scheme, listKinds, cs)
+
+	a := common.Analyzer{
+		Context: context.TODO(),
+		Client:  &kubernetes.Client{DynamicClient: dc},
+	}
+
+	res, err := (CatalogSourceAnalyzer{}).Analyze(a)
+	if err != nil {
+		t.Fatalf("Analyze error: %v", err)
+	}
+	if len(res) != 1 {
+		t.Fatalf("expected 1 result, got %d", len(res))
+	}
+	if res[0].Kind != "CatalogSource" || !strings.Contains(res[0].Name, "openshift-marketplace/broken-operators-external") {
+		t.Fatalf("unexpected result: %#v", res[0])
+	}
+	if len(res[0].Error) == 0 || !strings.Contains(res[0].Error[0].Text, "TRANSIENT_FAILURE") {
+		t.Fatalf("expected TRANSIENT_FAILURE in message, got %#v", res[0].Error)
+	}
+}
+
+func TestCatalogSourceAnalyzer_HealthyOrNoState_Ignored(t *testing.T) {
+	// One READY (healthy), one with no status at all: both should be ignored.
+	ready := &unstructured.Unstructured{
+		Object: map[string]any{
+			"apiVersion": "operators.coreos.com/v1alpha1",
+			"kind":       "CatalogSource",
+			"metadata": map[string]any{
+				"name":      "ready-operators",
+				"namespace": "openshift-marketplace",
+			},
+			"status": map[string]any{
+				"connectionState": map[string]any{
+					"lastObservedState": "READY",
+					"address":           "somewhere",
+				},
+			},
+		},
+	}
+	nostate := &unstructured.Unstructured{
+		Object: map[string]any{
+			"apiVersion": "operators.coreos.com/v1alpha1",
+			"kind":       "CatalogSource",
+			"metadata": map[string]any{
+				"name":      "no-status-operators",
+				"namespace": "openshift-marketplace",
+			},
+		},
+	}
+
+	listKinds := map[schema.GroupVersionResource]string{
+		{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "catalogsources"}: "CatalogSourceList",
+	}
+	scheme := runtime.NewScheme()
+	dc := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(scheme, listKinds, ready, nostate)
+
+	a := common.Analyzer{
+		Context: context.TODO(),
+		Client:  &kubernetes.Client{DynamicClient: dc},
+	}
+
+	res, err := (CatalogSourceAnalyzer{}).Analyze(a)
+	if err != nil {
+		t.Fatalf("Analyze error: %v", err)
+	}
+	if len(res) != 0 {
+		t.Fatalf("expected 0 results (healthy/nostate ignored), got %d", len(res))
+	}
+}
--- a/pkg/analyzer/clustercatalog.go
+++ b/pkg/analyzer/clustercatalog.go
@@ -0,0 +1,161 @@
+/*
+Copyright 2023 The K8sGPT Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package analyzer
+
+import (
+	"fmt"
+	"regexp"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
+	"github.com/k8sgpt-ai/k8sgpt/pkg/util"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+type ClusterCatalogAnalyzer struct{}
+
+func (ClusterCatalogAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
+
+	kind := "ClusterCatalog"
+
+	AnalyzerErrorsMetric.DeletePartialMatch(map[string]string{
+		"analyzer_name": kind,
+	})
+
+	var clusterCatalogGVR = schema.GroupVersionResource{
+		Group:    "olm.operatorframework.io",
+		Version:  "v1",
+		Resource: "clustercatalogs",
+	}
+	if a.Client == nil {
+		return nil, fmt.Errorf("client is nil in ClusterCatalogAnalyzer")
+	}
+	if a.Client.GetDynamicClient() == nil {
+		return nil, fmt.Errorf("dynamic client is nil in ClusterCatalogAnalyzer")
+	}
+
+	list, err := a.Client.GetDynamicClient().Resource(clusterCatalogGVR).Namespace("").List(a.Context, metav1.ListOptions{})
+	if err != nil {
+		return nil, err
+	}
+
+	var preAnalysis = map[string]common.PreAnalysis{}
+
+	for _, item := range list.Items {
+		var failures []common.Failure
+		catalog, err := ConvertToClusterCatalog(&item)
+		if err != nil {
+			continue
+		}
+		fmt.Printf("ClusterCatalog: %s | Source: %s\n", catalog.Name, catalog.Spec.Source.Image.Ref)
+		failures, err = ValidateClusterCatalog(failures, catalog)
+		if err != nil {
+			continue
+		}
+
+		if len(failures) > 0 {
+			preAnalysis[catalog.Name] = common.PreAnalysis{
+				Catalog:        *catalog,
+				FailureDetails: failures,
+			}
+			AnalyzerErrorsMetric.WithLabelValues(kind, catalog.Name, "").Set(float64(len(failures)))
+		}
+	}
+
+	for key, value := range preAnalysis {
+		var currentAnalysis = common.Result{
+			Kind:  kind,
+			Name:  key,
+			Error: value.FailureDetails,
+		}
+
+		parent, found := util.GetParent(a.Client, value.Node.ObjectMeta)
+		if found {
+			currentAnalysis.ParentObject = parent
+		}
+		a.Results = append(a.Results, currentAnalysis)
+	}
+
+	return a.Results, err
+}
+
+func ConvertToClusterCatalog(u *unstructured.Unstructured) (*common.ClusterCatalog, error) {
+	var cc common.ClusterCatalog
+	err := runtime.DefaultUnstructuredConverter.FromUnstructured(u.Object, &cc)
+	if err != nil {
+		return nil, fmt.Errorf("failed to convert to ClusterCatalog: %w", err)
+	}
+	return &cc, nil
+}
+
+func addCatalogConditionFailure(failures []common.Failure, catalogName string, catalogCondition metav1.Condition) []common.Failure {
+	failures = append(failures, common.Failure{
+		Text: fmt.Sprintf("OLMv1 ClusterCatalog: %s has condition of type %s, reason %s: %s", catalogName, catalogCondition.Type, catalogCondition.Reason, catalogCondition.Message),
+		Sensitive: []common.Sensitive{
+			{
+				Unmasked: catalogName,
+				Masked:   util.MaskString(catalogName),
+			},
+		},
+	})
+	return failures
+}
+
+func addCatalogFailure(failures []common.Failure, catalogName string, err error) []common.Failure {
+	failures = append(failures, common.Failure{
+		Text: fmt.Sprintf("%s has error: %s", catalogName, err.Error()),
+		Sensitive: []common.Sensitive{
+			{
+				Unmasked: catalogName,
+				Masked:   util.MaskString(catalogName),
+			},
+		},
+	})
+	return failures
+}
+
+func ValidateClusterCatalog(failures []common.Failure, catalog *common.ClusterCatalog) ([]common.Failure, error) {
+	if !isValidImageRef(catalog.Spec.Source.Image.Ref) {
+		failures = addCatalogFailure(failures, catalog.Name, fmt.Errorf("invalid image ref format in spec.source.image.ref: %s", catalog.Spec.Source.Image.Ref))
+	}
+
+	// Check status.resolvedSource.image.ref ends with @sha256:...
+	if catalog.Status.ResolvedSource != nil {
+		if catalog.Status.ResolvedSource.Image.Ref == "" {
+			failures = addCatalogFailure(failures, catalog.Name, fmt.Errorf("missing status.resolvedSource.image.ref"))
+		}
+		if !regexp.MustCompile(`@sha256:[a-f0-9]{64}$`).MatchString(catalog.Status.ResolvedSource.Image.Ref) {
+			failures = addCatalogFailure(failures, catalog.Name, fmt.Errorf("status.resolvedSource.image.ref must end with @sha256:<digest>"))
+		}
+	}
+
+	for _, condition := range catalog.Status.Conditions {
+		if condition.Status != "True" && condition.Type == "Serving" {
+			failures = addCatalogConditionFailure(failures, catalog.Name, condition)
+		}
+		if condition.Type == "Progressing" && condition.Reason != "Succeeded" {
+			failures = addCatalogConditionFailure(failures, catalog.Name, condition)
+		}
+	}
+
+	return failures, nil
+}
+
+// isValidImageRef does a simple regex check to validate image refs
+func isValidImageRef(ref string) bool {
+	pattern := `^([a-zA-Z0-9\-\.]+(?::[0-9]+)?/)?([a-z0-9]+(?:[._\-\/][a-z0-9]+)*)(:[\w][\w.-]{0,127})?(?:@sha256:[a-f0-9]{64})?$`
+	return regexp.MustCompile(pattern).MatchString(ref)
+}
--- a/pkg/analyzer/clustercatalog_test.go
+++ b/pkg/analyzer/clustercatalog_test.go
@@ -0,0 +1,182 @@
+/*
+Copyright 2023 The K8sGPT Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package analyzer
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
+	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
+	"github.com/stretchr/testify/require"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+	"k8s.io/client-go/kubernetes/fake"
+)
+
+func TestClusterCatalogAnalyzer(t *testing.T) {
+	gvr := schema.GroupVersionResource{
+		Group:    "olm.operatorframework.io",
+		Version:  "v1",
+		Resource: "clustercatalogs",
+	}
+
+	scheme := runtime.NewScheme()
+
+	dynamicClient := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(
+		scheme,
+		map[schema.GroupVersionResource]string{
+			gvr: "ClusterCatalogList",
+		},
+		&unstructured.Unstructured{
+			Object: map[string]interface{}{
+				"apiVersion": "olm.operatorframework.io/v1",
+				"kind":       "ClusterCatalog",
+				"metadata": map[string]interface{}{
+					"name": "Valid ClusterCatalog",
+				},
+				"spec": map[string]interface{}{
+					"availabilityMode": "Available",
+					"source": map[string]interface{}{
+						"type": "Image",
+						"image": map[string]interface{}{
+							"ref":                 "registry.redhat.io/redhat/community-operator-index:v4.19",
+							"pollIntervalMinutes": float64(10),
+						},
+					},
+				},
+				"status": map[string]interface{}{
+					"conditions": []interface{}{
+						map[string]interface{}{
+							"type":   "Progressing",
+							"status": "True",
+							"reason": "Succeeded",
+						},
+						map[string]interface{}{
+							"type":   "Serving",
+							"status": "True",
+							"reason": "Available",
+						},
+					},
+				},
+			},
+		},
+		&unstructured.Unstructured{
+			Object: map[string]interface{}{
+				"apiVersion": "olm.operatorframework.io/v1",
+				"kind":       "ClusterCatalog",
+				"metadata": map[string]interface{}{
+					"name": "Invalid availabilityMode",
+				},
+				"spec": map[string]interface{}{
+					"availabilityMode": "test",
+					"source": map[string]interface{}{
+						"type": "Image",
+						"image": map[string]interface{}{
+							"ref":                 "registry.redhat.io/redhat/community-operator-index:v4.19",
+							"pollIntervalMinutes": float64(10),
+						},
+					},
+				},
+				"status": map[string]interface{}{
+					"conditions": []interface{}{
+						map[string]interface{}{
+							"type":   "Progressing",
+							"status": "True",
+							"reason": "Retrying",
+						},
+					},
+				},
+			},
+		},
+		&unstructured.Unstructured{
+			Object: map[string]interface{}{
+				"apiVersion": "olm.operatorframework.io/v1",
+				"kind":       "ClusterCatalog",
+				"metadata": map[string]interface{}{
+					"name": "Invalid pollIntervalMinutes",
+				},
+				"spec": map[string]interface{}{
+					"availabilityMode": "Available",
+					"source": map[string]interface{}{
+						"type": "Image",
+						"image": map[string]interface{}{
+							"ref":                 "registry.redhat.io/redhat/community-operator-index:v4.19",
+							"pollIntervalMinutes": float64(0),
+						},
+					},
+				},
+				"status": map[string]interface{}{
+					"conditions": []interface{}{
+						map[string]interface{}{
+							"type":   "Progressing",
+							"status": "True",
+							"reason": "Retrying",
+						},
+					},
+				},
+			},
+		},
+		&unstructured.Unstructured{
+			Object: map[string]interface{}{
+				"apiVersion": "olm.operatorframework.io/v1",
+				"kind":       "ClusterCatalog",
+				"metadata": map[string]interface{}{
+					"name": "Invalid image reference",
+				},
+				"spec": map[string]interface{}{
+					"availabilityMode": "Available",
+					"source": map[string]interface{}{
+						"type": "Image",
+						"image": map[string]interface{}{
+							"ref":                 "quay.io/test/community-operator-index:v4.19",
+							"pollIntervalMinutes": float64(10),
+						},
+					},
+				},
+				"status": map[string]interface{}{
+					"conditions": []interface{}{
+						map[string]interface{}{
+							"type":   "Progressing",
+							"status": "True",
+							"reason": "Retrying",
+						},
+					},
+				},
+			},
+		},
+	)
+	config := common.Analyzer{
+		Client: &kubernetes.Client{
+			Client:        fake.NewSimpleClientset(),
+			DynamicClient: dynamicClient,
+		},
+		Context:   context.Background(),
+		Namespace: "test",
+	}
+
+	ccAnalyzer := ClusterCatalogAnalyzer{}
+	results, err := ccAnalyzer.Analyze(config)
+	for _, res := range results {
+		fmt.Printf("Result: %s | Failures: %d\n", res.Name, len(res.Error))
+		for _, err := range res.Error {
+			fmt.Printf("  - %s\n", err)
+		}
+	}
+	require.NoError(t, err)
+	require.Equal(t, 3, len(results))
+}
--- a/pkg/analyzer/clusterextension.go
+++ b/pkg/analyzer/clusterextension.go
@@ -0,0 +1,148 @@
+/*
+Copyright 2023 The K8sGPT Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package analyzer
+
+import (
+	"fmt"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
+	"github.com/k8sgpt-ai/k8sgpt/pkg/util"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+type ClusterExtensionAnalyzer struct{}
+
+func (ClusterExtensionAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
+
+	kind := "ClusterExtension"
+
+	AnalyzerErrorsMetric.DeletePartialMatch(map[string]string{
+		"analyzer_name": kind,
+	})
+
+	var clusterExtensionGVR = schema.GroupVersionResource{
+		Group:    "olm.operatorframework.io",
+		Version:  "v1",
+		Resource: "clusterextensions",
+	}
+	if a.Client == nil {
+		return nil, fmt.Errorf("client is nil in ClusterExtensionAnalyzer")
+	}
+	if a.Client.GetDynamicClient() == nil {
+		return nil, fmt.Errorf("dynamic client is nil in ClusterExtensionAnalyzer")
+	}
+
+	list, err := a.Client.GetDynamicClient().Resource(clusterExtensionGVR).Namespace("").List(a.Context, metav1.ListOptions{})
+	if err != nil {
+		return nil, err
+	}
+
+	var preAnalysis = map[string]common.PreAnalysis{}
+
+	for _, item := range list.Items {
+		var failures []common.Failure
+		extension, err := ConvertToClusterExtension(&item)
+		if err != nil {
+			continue
+		}
+		fmt.Printf("ClusterExtension: %s | Source: %s\n", extension.Name, extension.Spec.Source.Catalog.PackageName)
+		failures, err = ValidateClusterExtension(failures, extension)
+		if err != nil {
+			continue
+		}
+
+		if len(failures) > 0 {
+			preAnalysis[extension.Name] = common.PreAnalysis{
+				Extension:      *extension,
+				FailureDetails: failures,
+			}
+			AnalyzerErrorsMetric.WithLabelValues(kind, extension.Name, "").Set(float64(len(failures)))
+		}
+	}
+
+	for key, value := range preAnalysis {
+		var currentAnalysis = common.Result{
+			Kind:  kind,
+			Name:  key,
+			Error: value.FailureDetails,
+		}
+
+		parent, found := util.GetParent(a.Client, value.Node.ObjectMeta)
+		if found {
+			currentAnalysis.ParentObject = parent
+		}
+		a.Results = append(a.Results, currentAnalysis)
+	}
+
+	return a.Results, err
+}
+
+func ConvertToClusterExtension(u *unstructured.Unstructured) (*common.ClusterExtension, error) {
+	var ce common.ClusterExtension
+	err := runtime.DefaultUnstructuredConverter.FromUnstructured(u.Object, &ce)
+	if err != nil {
+		return nil, fmt.Errorf("failed to convert to ClusterExtension: %w", err)
+	}
+	return &ce, nil
+}
+
+func addExtensionConditionFailure(failures []common.Failure, extensionName string, extensionCondition metav1.Condition) []common.Failure {
+	failures = append(failures, common.Failure{
+		Text: fmt.Sprintf("OLMv1 ClusterExtension: %s has condition of type %s, reason %s: %s", extensionName, extensionCondition.Type, extensionCondition.Reason, extensionCondition.Message),
+		Sensitive: []common.Sensitive{
+			{
+				Unmasked: extensionName,
+				Masked:   util.MaskString(extensionName),
+			},
+		},
+	})
+	return failures
+}
+
+func addExtensionFailure(failures []common.Failure, extensionName string, err error) []common.Failure {
+	failures = append(failures, common.Failure{
+		Text: fmt.Sprintf("%s has error: %s", extensionName, err.Error()),
+		Sensitive: []common.Sensitive{
+			{
+				Unmasked: extensionName,
+				Masked:   util.MaskString(extensionName),
+			},
+		},
+	})
+	return failures
+}
+
+func ValidateClusterExtension(failures []common.Failure, extension *common.ClusterExtension) ([]common.Failure, error) {
+	if extension.Spec.Source.Catalog != nil && extension.Spec.Source.Catalog.UpgradeConstraintPolicy != "CatalogProvided" && extension.Spec.Source.Catalog.UpgradeConstraintPolicy != "SelfCertified" {
+		failures = addExtensionFailure(failures, extension.Name, fmt.Errorf("invalid or missing extension.Spec.Source.Catalog.UpgradeConstraintPolicy (expecting 'SelfCertified' or 'CatalogProvided')"))
+	}
+
+	if extension.Spec.Source.SourceType != "Catalog" {
+		failures = addExtensionFailure(failures, extension.Name, fmt.Errorf("invalid or missing spec.source.sourceType (expecting 'Catalog')"))
+	}
+
+	for _, condition := range extension.Status.Conditions {
+		if condition.Status != "True" && condition.Type == "Installed" {
+			failures = addExtensionConditionFailure(failures, extension.Name, condition)
+		}
+		if condition.Type == "Progressing" && condition.Reason != "Succeeded" {
+			failures = addExtensionConditionFailure(failures, extension.Name, condition)
+		}
+	}
+
+	return failures, nil
+}
--- a/pkg/analyzer/clusterextension_test.go
+++ b/pkg/analyzer/clusterextension_test.go
@@ -0,0 +1,179 @@
+/*
+Copyright 2023 The K8sGPT Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package analyzer
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
+	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
+	"github.com/stretchr/testify/require"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+	"k8s.io/client-go/kubernetes/fake"
+)
+
+func TestClusterExtensionAnalyzer(t *testing.T) {
+	gvr := schema.GroupVersionResource{
+		Group:    "olm.operatorframework.io",
+		Version:  "v1",
+		Resource: "clusterextensions",
+	}
+
+	scheme := runtime.NewScheme()
+
+	dynamicClient := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(
+		scheme,
+		map[schema.GroupVersionResource]string{
+			gvr: "ClusterExtensionList",
+		},
+		&unstructured.Unstructured{
+			Object: map[string]interface{}{
+				"apiVersion": "olm.operatorframework.io/v1",
+				"kind":       "ClusterExtension",
+				"metadata": map[string]interface{}{
+					"name": "Valid SelfCertified ClusterExtension",
+				},
+				"spec": map[string]interface{}{
+					"source": map[string]interface{}{
+						"sourceType": "Catalog",
+						"catalog": map[string]interface{}{
+							"upgradeConstraintPolicy": "SelfCertified",
+						},
+					},
+				},
+				"status": map[string]interface{}{
+					"conditions": []interface{}{
+						map[string]interface{}{
+							"type":   "Installed",
+							"status": "True",
+							"reason": "Succeeded",
+						},
+					},
+				},
+			},
+		},
+		&unstructured.Unstructured{
+			Object: map[string]interface{}{
+				"apiVersion": "olm.operatorframework.io/v1",
+				"kind":       "ClusterExtension",
+				"metadata": map[string]interface{}{
+					"name": "Valid CatalogProvided ClusterExtension",
+				},
+				"spec": map[string]interface{}{
+					"source": map[string]interface{}{
+						"sourceType": "Catalog",
+						"catalog": map[string]interface{}{
+							"upgradeConstraintPolicy": "CatalogProvided",
+						},
+					},
+				},
+				"status": map[string]interface{}{
+					"conditions": []interface{}{
+						map[string]interface{}{
+							"type":   "Installed",
+							"status": "True",
+							"reason": "Succeeded",
+						},
+					},
+				},
+			},
+		},
+		&unstructured.Unstructured{
+			Object: map[string]interface{}{
+				"apiVersion": "olm.operatorframework.io/v1",
+				"kind":       "ClusterExtension",
+				"metadata": map[string]interface{}{
+					"name": "Invalid UpgradeConstraintPolicy",
+				},
+				"spec": map[string]interface{}{
+					"source": map[string]interface{}{
+						"sourceType": "Catalog",
+						"catalog": map[string]interface{}{
+							"upgradeConstraintPolicy": "InvalidPolicy",
+						},
+					},
+				},
+				"status": map[string]interface{}{
+					"conditions": []interface{}{
+						map[string]interface{}{
+							"type":   "Progressing",
+							"status": "True",
+							"reason": "Retrying",
+						},
+						map[string]interface{}{
+							"type":   "Installed",
+							"status": "False",
+							"reason": "Failed",
+						},
+					},
+				},
+			},
+		},
+		&unstructured.Unstructured{
+			Object: map[string]interface{}{
+				"apiVersion": "olm.operatorframework.io/v1",
+				"kind":       "ClusterExtension",
+				"metadata": map[string]interface{}{
+					"name": "Invalid SourceType",
+				},
+				"spec": map[string]interface{}{
+					"source": map[string]interface{}{
+						"sourceType": "Git",
+						"catalog": map[string]interface{}{
+							"upgradeConstraintPolicy": "CatalogProvided",
+						},
+					},
+				},
+				"status": map[string]interface{}{
+					"conditions": []interface{}{
+						map[string]interface{}{
+							"type":   "Progressing",
+							"status": "True",
+							"reason": "Retrying",
+						},
+						map[string]interface{}{
+							"type":   "Installed",
+							"status": "False",
+							"reason": "Failed",
+						},
+					},
+				},
+			},
+		},
+	)
+	config := common.Analyzer{
+		Client: &kubernetes.Client{
+			Client:        fake.NewSimpleClientset(),
+			DynamicClient: dynamicClient,
+		},
+		Context:   context.Background(),
+		Namespace: "test",
+	}
+
+	ceAnalyzer := ClusterExtensionAnalyzer{}
+	results, err := ceAnalyzer.Analyze(config)
+	for _, res := range results {
+		fmt.Printf("Result: %s | Failures: %d\n", res.Name, len(res.Error))
+		for _, err := range res.Error {
+			fmt.Printf("  - %s\n", err)
+		}
+	}
+	require.NoError(t, err)
+	require.Equal(t, 2, len(results))
+}
--- a/pkg/analyzer/clusterserviceversion.go
+++ b/pkg/analyzer/clusterserviceversion.go
@@ -0,0 +1,82 @@
+package analyzer
+
+import (
+	"fmt"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+type ClusterServiceVersionAnalyzer struct{}
+
+var csvGVR = schema.GroupVersionResource{
+	Group: "operators.coreos.com", Version: "v1alpha1", Resource: "clusterserviceversions",
+}
+
+func (ClusterServiceVersionAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
+	kind := "ClusterServiceVersion"
+
+	if a.Client.GetDynamicClient() == nil {
+		return nil, fmt.Errorf("dynamic client is nil in %s analyzer", kind)
+	}
+
+	list, err := a.Client.GetDynamicClient().
+		Resource(csvGVR).Namespace(metav1.NamespaceAll).
+		List(a.Context, metav1.ListOptions{})
+	if err != nil {
+		return nil, err
+	}
+
+	var results []common.Result
+	for _, item := range list.Items {
+		ns := item.GetNamespace()
+		name := item.GetName()
+		phase, _, _ := unstructured.NestedString(item.Object, "status", "phase")
+
+		var failures []common.Failure
+		if phase != "" && phase != "Succeeded" {
+			// Superfície de condições para contexto
+			if conds, _, _ := unstructured.NestedSlice(item.Object, "status", "conditions"); len(conds) > 0 {
+				if msg := pickWorstCondition(conds); msg != "" {
+					failures = append(failures, common.Failure{Text: fmt.Sprintf("phase=%q: %s", phase, msg)})
+				}
+			} else {
+				failures = append(failures, common.Failure{Text: fmt.Sprintf("phase=%q (see status.conditions)", phase)})
+			}
+		}
+
+		if len(failures) > 0 {
+			results = append(results, common.Result{
+				Kind:  kind,
+				Name:  ns + "/" + name,
+				Error: failures,
+			})
+		}
+	}
+	return results, nil
+}
+
+// reaproveitamos o heurístico já usado em outros pontos
+func pickWorstCondition(conds []interface{}) string {
+	for _, c := range conds {
+		m, ok := c.(map[string]any)
+		if !ok {
+			continue
+		}
+		if s, _ := m["status"].(string); s == "True" {
+			continue
+		}
+		r, _ := m["reason"].(string)
+		msg, _ := m["message"].(string)
+		if r == "" && msg == "" {
+			continue
+		}
+		if r != "" && msg != "" {
+			return r + ": " + msg
+		}
+		return r + msg
+	}
+	return ""
+}
--- a/pkg/analyzer/clusterserviceversion_test.go
+++ b/pkg/analyzer/clusterserviceversion_test.go
@@ -0,0 +1,78 @@
+package analyzer
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
+	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+)
+
+func TestClusterServiceVersionAnalyzer(t *testing.T) {
+	ok := &unstructured.Unstructured{
+		Object: map[string]any{
+			"apiVersion": "operators.coreos.com/v1alpha1",
+			"kind":       "ClusterServiceVersion",
+			"metadata": map[string]any{
+				"name":      "ok",
+				"namespace": "ns1",
+			},
+			"status": map[string]any{"phase": "Succeeded"},
+		},
+	}
+
+	bad := &unstructured.Unstructured{
+		Object: map[string]any{
+			"apiVersion": "operators.coreos.com/v1alpha1",
+			"kind":       "ClusterServiceVersion",
+			"metadata": map[string]any{
+				"name":      "bad",
+				"namespace": "ns1",
+			},
+			"status": map[string]any{
+				"phase": "Failed",
+				// IMPORTANT: conditions must be []interface{}, not []map[string]any
+				"conditions": []interface{}{
+					map[string]any{
+						"status":  "False",
+						"reason":  "ErrorResolving",
+						"message": "missing dep",
+					},
+				},
+			},
+		},
+	}
+
+	listKinds := map[schema.GroupVersionResource]string{
+		{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "clusterserviceversions"}: "ClusterServiceVersionList",
+	}
+
+	// Use a non-nil scheme with dynamicfake
+	scheme := runtime.NewScheme()
+	dc := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(scheme, listKinds, ok, bad)
+
+	a := common.Analyzer{
+		Context: context.TODO(),
+		Client:  &kubernetes.Client{DynamicClient: dc},
+	}
+
+	res, err := (ClusterServiceVersionAnalyzer{}).Analyze(a)
+	if err != nil {
+		t.Fatalf("Analyze error: %v", err)
+	}
+
+	if len(res) != 1 {
+		t.Fatalf("expected 1 result, got %d", len(res))
+	}
+	if res[0].Kind != "ClusterServiceVersion" || !strings.Contains(res[0].Name, "ns1/bad") {
+		t.Fatalf("unexpected result: %#v", res[0])
+	}
+	if len(res[0].Error) == 0 || !strings.Contains(res[0].Error[0].Text, "missing dep") {
+		t.Fatalf("expected 'missing dep' in failure, got %#v", res[0].Error)
+	}
+}
--- a/pkg/analyzer/installplan_test.go
+++ b/pkg/analyzer/installplan_test.go
@@ -0,0 +1,75 @@
+package analyzer
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
+	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+)
+
+func TestInstallPlanAnalyzer(t *testing.T) {
+	ok := &unstructured.Unstructured{
+		Object: map[string]any{
+			"apiVersion": "operators.coreos.com/v1alpha1",
+			"kind":       "InstallPlan",
+			"metadata": map[string]any{
+				"name":      "ip-ok",
+				"namespace": "ns1",
+			},
+			"status": map[string]any{"phase": "Complete"},
+		},
+	}
+
+	bad := &unstructured.Unstructured{
+		Object: map[string]any{
+			"apiVersion": "operators.coreos.com/v1alpha1",
+			"kind":       "InstallPlan",
+			"metadata": map[string]any{
+				"name":      "ip-bad",
+				"namespace": "ns1",
+			},
+			"status": map[string]any{
+				"phase": "Failed",
+				"conditions": []interface{}{
+					map[string]any{
+						"reason":  "ExecutionError",
+						"message": "something went wrong",
+					},
+				},
+			},
+		},
+	}
+
+	listKinds := map[schema.GroupVersionResource]string{
+		{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "installplans"}: "InstallPlanList",
+	}
+
+	scheme := runtime.NewScheme()
+	dc := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(scheme, listKinds, ok, bad)
+
+	a := common.Analyzer{
+		Context: context.TODO(),
+		Client:  &kubernetes.Client{DynamicClient: dc},
+	}
+
+	res, err := (InstallPlanAnalyzer{}).Analyze(a)
+	if err != nil {
+		t.Fatalf("Analyze error: %v", err)
+	}
+
+	if len(res) != 1 {
+		t.Fatalf("expected 1 result, got %d", len(res))
+	}
+	if res[0].Kind != "InstallPlan" || !strings.Contains(res[0].Name, "ns1/ip-bad") {
+		t.Fatalf("unexpected result: %#v", res[0])
+	}
+	if len(res[0].Error) == 0 || !strings.Contains(res[0].Error[0].Text, "ExecutionError") {
+		t.Fatalf("expected 'ExecutionError' in failure, got %#v", res[0].Error)
+	}
+}
--- a/pkg/analyzer/instalplan.go
+++ b/pkg/analyzer/instalplan.go
@@ -0,0 +1,72 @@
+package analyzer
+
+import (
+	"fmt"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+type InstallPlanAnalyzer struct{}
+
+var ipGVR = schema.GroupVersionResource{
+	Group: "operators.coreos.com", Version: "v1alpha1", Resource: "installplans",
+}
+
+func (InstallPlanAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
+	kind := "InstallPlan"
+	if a.Client.GetDynamicClient() == nil {
+		return nil, fmt.Errorf("dynamic client is nil in %s analyzer", kind)
+	}
+
+	list, err := a.Client.GetDynamicClient().
+		Resource(ipGVR).Namespace(metav1.NamespaceAll).
+		List(a.Context, metav1.ListOptions{})
+	if err != nil {
+		return nil, err
+	}
+
+	var results []common.Result
+	for _, item := range list.Items {
+		ns, name := item.GetNamespace(), item.GetName()
+		phase, _, _ := unstructured.NestedString(item.Object, "status", "phase")
+
+		var failures []common.Failure
+		if phase != "" && phase != "Complete" {
+			reason := firstCondStr(&item, "reason")
+			msg := firstCondStr(&item, "message")
+			switch {
+			case reason != "" && msg != "":
+				failures = append(failures, common.Failure{Text: fmt.Sprintf("phase=%q: %s: %s", phase, reason, msg)})
+			case reason != "" || msg != "":
+				failures = append(failures, common.Failure{Text: fmt.Sprintf("phase=%q: %s%s", phase, reason, msg)})
+			default:
+				failures = append(failures, common.Failure{Text: fmt.Sprintf("phase=%q (approval/manual? check status.conditions)", phase)})
+			}
+		}
+
+		if len(failures) > 0 {
+			results = append(results, common.Result{
+				Kind:  kind,
+				Name:  ns + "/" + name,
+				Error: failures,
+			})
+		}
+	}
+	return results, nil
+}
+
+func firstCondStr(u *unstructured.Unstructured, field string) string {
+	conds, _, _ := unstructured.NestedSlice(u.Object, "status", "conditions")
+	if len(conds) == 0 {
+		return ""
+	}
+	m, _ := conds[0].(map[string]any)
+	if m == nil {
+		return ""
+	}
+	v, _ := m[field].(string)
+	return v
+}
--- a/pkg/analyzer/node.go
+++ b/pkg/analyzer/node.go
@@ -46,15 +46,17 @@ func (NodeAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
 			// https://kubernetes.io/docs/concepts/architecture/nodes/#condition
 			switch nodeCondition.Type {
 			case v1.NodeReady:
-				if nodeCondition.Status == v1.ConditionTrue {
-					break
+				if nodeCondition.Status != v1.ConditionTrue {
+					failures = addNodeConditionFailure(failures, node.Name, nodeCondition)
 				}
-				failures = addNodeConditionFailure(failures, node.Name, nodeCondition)
 			// k3s `EtcdIsVoter`` should not be reported as an error
 			case v1.NodeConditionType("EtcdIsVoter"):
 				break
 			default:
-				if nodeCondition.Status != v1.ConditionFalse {
+				// For other conditions:
+				// - Report True or Unknown status as failures (for standard conditions)
+				// - Report any unknown condition type as a failure
+				if nodeCondition.Status == v1.ConditionTrue || nodeCondition.Status == v1.ConditionUnknown || !isKnownNodeConditionType(nodeCondition.Type) {
 					failures = addNodeConditionFailure(failures, node.Name, nodeCondition)
 				}
 			}
@@ -99,3 +101,17 @@ func addNodeConditionFailure(failures []common.Failure, nodeName string, nodeCon
 	})
 	return failures
 }
+
+// isKnownNodeConditionType checks if the condition type is a standard Kubernetes node condition
+func isKnownNodeConditionType(conditionType v1.NodeConditionType) bool {
+	switch conditionType {
+	case v1.NodeReady,
+		v1.NodeMemoryPressure,
+		v1.NodeDiskPressure,
+		v1.NodePIDPressure,
+		v1.NodeNetworkUnavailable:
+		return true
+	default:
+		return false
+	}
+}
--- a/pkg/analyzer/operatorgroup.go
+++ b/pkg/analyzer/operatorgroup.go
@@ -0,0 +1,46 @@
+package analyzer
+
+import (
+	"fmt"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+type OperatorGroupAnalyzer struct{}
+
+var ogGVR = schema.GroupVersionResource{
+	Group: "operators.coreos.com", Version: "v1", Resource: "operatorgroups",
+}
+
+func (OperatorGroupAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
+	kind := "OperatorGroup"
+	if a.Client.GetDynamicClient() == nil {
+		return nil, fmt.Errorf("dynamic client is nil in %s analyzer", kind)
+	}
+
+	list, err := a.Client.GetDynamicClient().
+		Resource(ogGVR).Namespace(metav1.NamespaceAll).
+		List(a.Context, metav1.ListOptions{})
+	if err != nil {
+		return nil, err
+	}
+
+	countByNS := map[string]int{}
+	for _, it := range list.Items {
+		countByNS[it.GetNamespace()]++
+	}
+
+	var results []common.Result
+	for ns, n := range countByNS {
+		if n > 1 {
+			results = append(results, common.Result{
+				Kind:  kind,
+				Name:  ns,
+				Error: []common.Failure{{Text: fmt.Sprintf("%d OperatorGroups in namespace; this can break CSV resolution", n)}},
+			})
+		}
+	}
+	return results, nil
+}
--- a/pkg/analyzer/operatorgroup_test.go
+++ b/pkg/analyzer/operatorgroup_test.go
@@ -0,0 +1,70 @@
+package analyzer
+
+import (
+	"context"
+	"testing"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
+	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+)
+
+func TestOperatorGroupAnalyzer(t *testing.T) {
+	og1 := &unstructured.Unstructured{
+		Object: map[string]any{
+			"apiVersion": "operators.coreos.com/v1",
+			"kind":       "OperatorGroup",
+			"metadata": map[string]any{
+				"name":      "og-1",
+				"namespace": "ns-a",
+			},
+		},
+	}
+	og2 := &unstructured.Unstructured{
+		Object: map[string]any{
+			"apiVersion": "operators.coreos.com/v1",
+			"kind":       "OperatorGroup",
+			"metadata": map[string]any{
+				"name":      "og-2",
+				"namespace": "ns-a",
+			},
+		},
+	}
+	og3 := &unstructured.Unstructured{
+		Object: map[string]any{
+			"apiVersion": "operators.coreos.com/v1",
+			"kind":       "OperatorGroup",
+			"metadata": map[string]any{
+				"name":      "og-3",
+				"namespace": "ns-b",
+			},
+		},
+	}
+
+	listKinds := map[schema.GroupVersionResource]string{
+		{Group: "operators.coreos.com", Version: "v1", Resource: "operatorgroups"}: "OperatorGroupList",
+	}
+
+	scheme := runtime.NewScheme()
+	dc := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(scheme, listKinds, og1, og2, og3)
+
+	a := common.Analyzer{
+		Context: context.TODO(),
+		Client:  &kubernetes.Client{DynamicClient: dc},
+	}
+
+	res, err := (OperatorGroupAnalyzer{}).Analyze(a)
+	if err != nil {
+		t.Fatalf("Analyze error: %v", err)
+	}
+
+	if len(res) != 1 {
+		t.Fatalf("expected 1 result for ns-a overlap, got %d", len(res))
+	}
+	if res[0].Kind != "OperatorGroup" || res[0].Name != "ns-a" {
+		t.Fatalf("unexpected result: %#v", res[0])
+	}
+}
--- a/pkg/analyzer/subscription.go
+++ b/pkg/analyzer/subscription.go
@@ -0,0 +1,55 @@
+package analyzer
+
+import (
+	"fmt"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+type SubscriptionAnalyzer struct{}
+
+var subGVR = schema.GroupVersionResource{
+	Group: "operators.coreos.com", Version: "v1alpha1", Resource: "subscriptions",
+}
+
+func (SubscriptionAnalyzer) Analyze(a common.Analyzer) ([]common.Result, error) {
+	kind := "Subscription"
+	if a.Client.GetDynamicClient() == nil {
+		return nil, fmt.Errorf("dynamic client is nil in %s analyzer", kind)
+	}
+
+	list, err := a.Client.GetDynamicClient().
+		Resource(subGVR).Namespace(metav1.NamespaceAll).
+		List(a.Context, metav1.ListOptions{})
+	if err != nil {
+		return nil, err
+	}
+
+	var results []common.Result
+	for _, item := range list.Items {
+		ns, name := item.GetNamespace(), item.GetName()
+		state, _, _ := unstructured.NestedString(item.Object, "status", "state")
+		conds, _, _ := unstructured.NestedSlice(item.Object, "status", "conditions")
+
+		var failures []common.Failure
+		if state == "" || state == "UpgradePending" || state == "UpgradeAvailable" {
+			msg := "subscription not at latest"
+			if c := pickWorstCondition(conds); c != "" {
+				msg += "; " + c
+			}
+			failures = append(failures, common.Failure{Text: fmt.Sprintf("state=%q: %s", state, msg)})
+		}
+
+		if len(failures) > 0 {
+			results = append(results, common.Result{
+				Kind:  kind,
+				Name:  ns + "/" + name,
+				Error: failures,
+			})
+		}
+	}
+	return results, nil
+}
--- a/pkg/analyzer/subscription_test.go
+++ b/pkg/analyzer/subscription_test.go
@@ -0,0 +1,78 @@
+package analyzer
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/common"
+	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
+	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	dynamicfake "k8s.io/client-go/dynamic/fake"
+)
+
+func TestSubscriptionAnalyzer(t *testing.T) {
+	ok := &unstructured.Unstructured{
+		Object: map[string]any{
+			"apiVersion": "operators.coreos.com/v1alpha1",
+			"kind":       "Subscription",
+			"metadata": map[string]any{
+				"name":      "ok-sub",
+				"namespace": "ns1",
+			},
+			"status": map[string]any{
+				"state": "AtLatestKnown",
+			},
+		},
+	}
+
+	bad := &unstructured.Unstructured{
+		Object: map[string]any{
+			"apiVersion": "operators.coreos.com/v1alpha1",
+			"kind":       "Subscription",
+			"metadata": map[string]any{
+				"name":      "upgrade-sub",
+				"namespace": "ns1",
+			},
+			"status": map[string]any{
+				"state": "UpgradeAvailable",
+				"conditions": []interface{}{
+					map[string]any{
+						"status":  "False",
+						"reason":  "CatalogSourcesUnhealthy",
+						"message": "not reachable",
+					},
+				},
+			},
+		},
+	}
+
+	listKinds := map[schema.GroupVersionResource]string{
+		{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "subscriptions"}: "SubscriptionList",
+	}
+
+	scheme := runtime.NewScheme()
+	dc := dynamicfake.NewSimpleDynamicClientWithCustomListKinds(scheme, listKinds, ok, bad)
+
+	a := common.Analyzer{
+		Context: context.TODO(),
+		Client:  &kubernetes.Client{DynamicClient: dc},
+	}
+
+	res, err := (SubscriptionAnalyzer{}).Analyze(a)
+	if err != nil {
+		t.Fatalf("Analyze error: %v", err)
+	}
+
+	if len(res) != 1 {
+		t.Fatalf("expected 1 result, got %d", len(res))
+	}
+	if res[0].Kind != "Subscription" || !strings.Contains(res[0].Name, "ns1/upgrade-sub") {
+		t.Fatalf("unexpected result: %#v", res[0])
+	}
+	if len(res[0].Error) == 0 || !strings.Contains(res[0].Error[0].Text, "CatalogSourcesUnhealthy") {
+		t.Fatalf("expected 'CatalogSourcesUnhealthy' in failure, got %#v", res[0].Error)
+	}
+}
--- a/pkg/cache/cache_test.go
+++ b/pkg/cache/cache_test.go
@@ -0,0 +1,60 @@
+package cache
+
+import (
+    "os"
+    "testing"
+
+    "github.com/spf13/viper"
+    "github.com/stretchr/testify/require"
+)
+
+func TestNewReturnsExpectedCache(t *testing.T) {
+    require.IsType(t, &FileBasedCache{}, New("file"))
+    require.IsType(t, &AzureCache{}, New("azure"))
+    require.IsType(t, &GCSCache{}, New("gcs"))
+    require.IsType(t, &S3Cache{}, New("s3"))
+    require.IsType(t, &InterplexCache{}, New("interplex"))
+    // default fallback
+    require.IsType(t, &FileBasedCache{}, New("unknown"))
+}
+
+func TestNewCacheProvider_InterplexAndInvalid(t *testing.T) {
+    // valid: interplex
+    cp, err := NewCacheProvider("interplex", "", "", "localhost:1", "", "", "", false)
+    require.NoError(t, err)
+    require.Equal(t, "interplex", cp.CurrentCacheType)
+    require.Equal(t, "localhost:1", cp.Interplex.ConnectionString)
+
+    // invalid type
+    _, err = NewCacheProvider("not-a-type", "", "", "", "", "", "", false)
+    require.Error(t, err)
+}
+
+func TestAddRemoveRemoteCacheAndGet(t *testing.T) {
+    // isolate viper with temp config file
+    tmpFile, err := os.CreateTemp("", "k8sgpt-cache-config-*.yaml")
+    require.NoError(t, err)
+    defer func() {
+        _ = os.Remove(tmpFile.Name())
+    }()
+    viper.Reset()
+    viper.SetConfigFile(tmpFile.Name())
+
+    // add interplex remote cache
+    cp := CacheProvider{}
+    cp.CurrentCacheType = "interplex"
+    cp.Interplex.ConnectionString = "localhost:1"
+    require.NoError(t, AddRemoteCache(cp))
+
+    // read back via GetCacheConfiguration
+    c, err := GetCacheConfiguration()
+    require.NoError(t, err)
+    require.IsType(t, &InterplexCache{}, c)
+
+    // remove remote cache
+    require.NoError(t, RemoveRemoteCache())
+    // now default should be file-based
+    c2, err := GetCacheConfiguration()
+    require.NoError(t, err)
+    require.IsType(t, &FileBasedCache{}, c2)
+}
--- a/pkg/cache/file_based_test.go
+++ b/pkg/cache/file_based_test.go
@@ -0,0 +1,77 @@
+package cache
+
+import (
+    "os"
+    "path/filepath"
+    "testing"
+
+    "github.com/adrg/xdg"
+    "github.com/stretchr/testify/require"
+)
+
+// withTempCacheHome sets XDG_CACHE_HOME to a temp dir for test isolation.
+func withTempCacheHome(t *testing.T) func() {
+    t.Helper()
+    tmp, err := os.MkdirTemp("", "k8sgpt-cache-test-*")
+    require.NoError(t, err)
+    old := os.Getenv("XDG_CACHE_HOME")
+    require.NoError(t, os.Setenv("XDG_CACHE_HOME", tmp))
+    return func() {
+        _ = os.Setenv("XDG_CACHE_HOME", old)
+        _ = os.RemoveAll(tmp)
+    }
+}
+
+func TestFileBasedCache_BasicOps(t *testing.T) {
+    cleanup := withTempCacheHome(t)
+    defer cleanup()
+
+    c := &FileBasedCache{}
+    // Configure should be a no-op
+    require.NoError(t, c.Configure(CacheProvider{}))
+    require.Equal(t, "file", c.GetName())
+    require.False(t, c.IsCacheDisabled())
+    c.DisableCache()
+    require.True(t, c.IsCacheDisabled())
+
+    key := "testkey"
+    data := "hello"
+
+    // Store
+    require.NoError(t, c.Store(key, data))
+
+    // Exists
+    require.True(t, c.Exists(key))
+
+    // Load
+    got, err := c.Load(key)
+    require.NoError(t, err)
+    require.Equal(t, data, got)
+
+    // List should include our key file
+    items, err := c.List()
+    require.NoError(t, err)
+    // ensure at least one item and that one matches our key
+    found := false
+    for _, it := range items {
+        if it.Name == key {
+            found = true
+            break
+        }
+    }
+    require.True(t, found)
+
+    // Remove
+    require.NoError(t, c.Remove(key))
+    require.False(t, c.Exists(key))
+}
+
+func TestFileBasedCache_PathShape(t *testing.T) {
+    cleanup := withTempCacheHome(t)
+    defer cleanup()
+    // Verify xdg.CacheFile path shape (directory and filename)
+    p, err := xdg.CacheFile(filepath.Join("k8sgpt", "abc"))
+    require.NoError(t, err)
+    require.Equal(t, "abc", filepath.Base(p))
+    require.Contains(t, p, "k8sgpt")
+}
--- a/pkg/cache/interplex_based_test.go
+++ b/pkg/cache/interplex_based_test.go
@@ -18,18 +18,31 @@ func TestInterplexCache(t *testing.T) {
 	}

 	// Mock GRPC server setup
+	errChan := make(chan error, 1)
 	go func() {
 		lis, err := net.Listen("tcp", ":50051")
 		if err != nil {
-			t.Fatalf("failed to listen: %v", err)
+			errChan <- err
+			return
 		}
 		s := grpc.NewServer()
 		rpc.RegisterCacheServiceServer(s, &mockCacheService{})
 		if err := s.Serve(lis); err != nil {
-			t.Fatalf("failed to serve: %v", err)
+			errChan <- err
+			return
 		}
 	}()

+	// Check if server startup failed
+	select {
+	case err := <-errChan:
+		if err != nil {
+			t.Fatalf("failed to start mock server: %v", err)
+		}
+	default:
+		// Server started successfully
+	}
+
 	t.Run("TestStore", func(t *testing.T) {
 		err := cache.Store("key1", "value1")
 		if err != nil {
--- a/pkg/cache/s3_based.go
+++ b/pkg/cache/s3_based.go
@@ -3,8 +3,9 @@ package cache
 import (
 	"bytes"
 	"crypto/tls"
-	"log"
+	"errors"
 	"net/http"
+	"strings"

 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/session"
@@ -27,16 +28,19 @@ type S3CacheConfiguration struct {

 func (s *S3Cache) Configure(cacheInfo CacheProvider) error {
 	if cacheInfo.S3.BucketName == "" {
-		log.Fatal("Bucket name not configured")
+		return errors.New("bucket name not configured")
 	}
 	s.bucketName = cacheInfo.S3.BucketName

-	sess := session.Must(session.NewSessionWithOptions(session.Options{
+	sess, err := session.NewSessionWithOptions(session.Options{
 		SharedConfigState: session.SharedConfigEnable,
 		Config: aws.Config{
 			Region: aws.String(cacheInfo.S3.Region),
 		},
-	}))
+	})
+	if err != nil {
+		return errors.New("failed to create AWS session; please check your AWS credentials and configuration: " + err.Error())
+	}
 	if cacheInfo.S3.Endpoint != "" {
 		sess.Config.Endpoint = &cacheInfo.S3.Endpoint
 		sess.Config.S3ForcePathStyle = aws.Bool(true)
@@ -50,10 +54,14 @@ func (s *S3Cache) Configure(cacheInfo CacheProvider) error {
 	s3Client := s3.New(sess)

 	// Check if the bucket exists, if not create it
-	_, err := s3Client.HeadBucket(&s3.HeadBucketInput{
+	_, err = s3Client.HeadBucket(&s3.HeadBucketInput{
 		Bucket: aws.String(cacheInfo.S3.BucketName),
 	})
 	if err != nil {
+		// Check for AWS credentials error
+		if strings.Contains(err.Error(), "InvalidAccessKeyId") || strings.Contains(err.Error(), "SignatureDoesNotMatch") || strings.Contains(err.Error(), "NoCredentialProviders") {
+			return errors.New("aws credentials are invalid or missing; please check your AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables or AWS config")
+		}
 		_, err = s3Client.CreateBucket(&s3.CreateBucketInput{
 			Bucket: aws.String(cacheInfo.S3.BucketName),
 		})
--- a/pkg/common/types.go
+++ b/pkg/common/types.go
@@ -28,6 +28,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	networkv1 "k8s.io/api/networking/v1"
 	policyv1 "k8s.io/api/policy/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	gtwapi "sigs.k8s.io/gateway-api/apis/v1"
 )

@@ -68,6 +69,8 @@ type PreAnalysis struct {
 	ScaledObject               keda.ScaledObject
 	KyvernoPolicyReport        kyverno.PolicyReport
 	KyvernoClusterPolicyReport kyverno.ClusterPolicyReport
+	Catalog                    ClusterCatalog
+	Extension                  ClusterExtension
 }

 type Result struct {
@@ -93,3 +96,117 @@ type Sensitive struct {
 	Unmasked string
 	Masked   string
 }
+
+type (
+	SourceType                  string
+	AvailabilityMode            string
+	UpgradeConstraintPolicy     string
+	CRDUpgradeSafetyEnforcement string
+)
+
+type ClusterCatalog struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata"`
+	Spec              ClusterCatalogSpec   `json:"spec"`
+	Status            ClusterCatalogStatus `json:"status,omitempty"`
+}
+type ClusterCatalogList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata"`
+	Items           []ClusterCatalog `json:"items"`
+}
+
+type ClusterCatalogSpec struct {
+	Source CatalogSource `json:"source"`
+
+	Priority int32 `json:"priority"`
+
+	AvailabilityMode AvailabilityMode `json:"availabilityMode,omitempty"`
+}
+
+type ClusterCatalogStatus struct {
+	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
+
+	ResolvedSource *ResolvedCatalogSource `json:"resolvedSource,omitempty"`
+
+	URLs         *ClusterCatalogURLs `json:"urls,omitempty"`
+	LastUnpacked *metav1.Time        `json:"lastUnpacked,omitempty"`
+}
+
+type ClusterCatalogURLs struct {
+	Base string `json:"base"`
+}
+type CatalogSource struct {
+	Type  SourceType   `json:"type"`
+	Image *ImageSource `json:"image,omitempty"`
+}
+type ResolvedCatalogSource struct {
+	Type  SourceType           `json:"type"`
+	Image *ResolvedImageSource `json:"image"`
+}
+type ResolvedImageSource struct {
+	Ref string `json:"ref"`
+}
+
+type ImageSource struct {
+	Ref                 string `json:"ref"`
+	PollIntervalMinutes *int   `json:"pollIntervalMinutes,omitempty"`
+}
+
+type ClusterExtension struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+	Spec              ClusterExtensionSpec   `json:"spec,omitempty"`
+	Status            ClusterExtensionStatus `json:"status,omitempty"`
+}
+
+type ClusterExtensionSpec struct {
+	Namespace      string                         `json:"namespace"`
+	ServiceAccount ServiceAccountReference        `json:"serviceAccount"`
+	Source         SourceConfig                   `json:"source"`
+	Install        *ClusterExtensionInstallConfig `json:"install,omitempty"`
+}
+
+type ClusterExtensionInstallConfig struct {
+	Preflight *PreflightConfig `json:"preflight,omitempty"`
+}
+
+type PreflightConfig struct {
+	CRDUpgradeSafety *CRDUpgradeSafetyPreflightConfig `json:"crdUpgradeSafety"`
+}
+
+type CRDUpgradeSafetyPreflightConfig struct {
+	Enforcement CRDUpgradeSafetyEnforcement `json:"enforcement"`
+}
+
+type ServiceAccountReference struct {
+	Name string `json:"name"`
+}
+
+type SourceConfig struct {
+	SourceType string         `json:"sourceType"`
+	Catalog    *CatalogFilter `json:"catalog,omitempty"`
+}
+
+type CatalogFilter struct {
+	PackageName             string                  `json:"packageName"`
+	Version                 string                  `json:"version,omitempty"`
+	Channels                []string                `json:"channels,omitempty"`
+	Selector                *metav1.LabelSelector   `json:"selector,omitempty"`
+	UpgradeConstraintPolicy UpgradeConstraintPolicy `json:"upgradeConstraintPolicy,omitempty"`
+}
+
+type ClusterExtensionStatus struct {
+	Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
+
+	Install *ClusterExtensionInstallStatus `json:"install,omitempty"`
+}
+
+type ClusterExtensionInstallStatus struct {
+	Bundle BundleMetadata `json:"bundle"`
+}
+
+type BundleMetadata struct {
+	Name    string `json:"name"`
+	Version string `json:"version"`
+}
--- a/pkg/custom/client_test.go
+++ b/pkg/custom/client_test.go
@@ -0,0 +1,41 @@
+package custom
+
+import (
+    "context"
+    "testing"
+
+    schemav1 "buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go/schema/v1"
+    "github.com/stretchr/testify/require"
+    "google.golang.org/grpc"
+)
+
+// mockAnalyzerClient implements rpc.CustomAnalyzerServiceClient for testing
+type mockAnalyzerClient struct{
+    resp *schemav1.RunResponse
+    err error
+}
+
+func (m *mockAnalyzerClient) Run(ctx context.Context, in *schemav1.RunRequest, opts ...grpc.CallOption) (*schemav1.RunResponse, error) {
+    return m.resp, m.err
+}
+
+func TestClientRunMapsResponse(t *testing.T) {
+    // prepare fake response
+    resp := &schemav1.RunResponse{
+        Result: &schemav1.Result{
+            Name:         "AnalyzerA",
+            Kind:         "Pod",
+            Details:      "details",
+            ParentObject: "Deployment/foo",
+        },
+    }
+    cli := &Client{analyzerClient: &mockAnalyzerClient{resp: resp}}
+
+    got, err := cli.Run()
+    require.NoError(t, err)
+    require.Equal(t, "AnalyzerA", got.Name)
+    require.Equal(t, "Pod", got.Kind)
+    require.Equal(t, "details", got.Details)
+    require.Equal(t, "Deployment/foo", got.ParentObject)
+    require.Len(t, got.Error, 0)
+}
--- a/pkg/kubernetes/kubernetes.go
+++ b/pkg/kubernetes/kubernetes.go
@@ -14,6 +14,7 @@ limitations under the License.
 package kubernetes

 import (
+	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/oidc"
 	"k8s.io/client-go/rest"
@@ -33,6 +34,10 @@ func (c *Client) GetCtrlClient() ctrl.Client {
 	return c.CtrlClient
 }

+func (c *Client) GetDynamicClient() dynamic.Interface {
+	return c.DynamicClient
+}
+
 func NewClient(kubecontext string, kubeconfig string) (*Client, error) {
 	var config *rest.Config
 	config, err := rest.InClusterConfig()
@@ -69,10 +74,16 @@ func NewClient(kubecontext string, kubeconfig string) (*Client, error) {
 		return nil, err
 	}

+	dynamicClient, err := dynamic.NewForConfig(config)
+	if err != nil {
+		return nil, err
+	}
+
 	return &Client{
 		Client:        clientSet,
 		CtrlClient:    ctrlClient,
 		Config:        config,
 		ServerVersion: serverVersion,
+		DynamicClient: dynamicClient,
 	}, nil
 }
--- a/pkg/kubernetes/types.go
+++ b/pkg/kubernetes/types.go
@@ -4,6 +4,7 @@ import (
 	openapi_v2 "github.com/google/gnostic/openapiv2"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/version"
+	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime/pkg/client"
@@ -14,6 +15,7 @@ type Client struct {
 	CtrlClient    ctrl.Client
 	Config        *rest.Config
 	ServerVersion *version.Info
+	DynamicClient dynamic.Interface
 }

 type K8sApiReference struct {
--- a/pkg/server/client_example/main.go
+++ b/pkg/server/client_example/main.go
@@ -40,12 +40,20 @@ type AnalyzeRequest struct {
 	WithStats       bool     `json:"withStats,omitempty"`
 }

-// AnalyzeResponse represents the output of the analyze tool
-type AnalyzeResponse struct {
-	Content []struct {
-		Text string `json:"text"`
-		Type string `json:"type"`
-	} `json:"content"`
+// JSONRPCResponse represents the JSON-RPC response format
+type JSONRPCResponse struct {
+	JSONRPC string `json:"jsonrpc"`
+	ID      int    `json:"id"`
+	Result  struct {
+		Content []struct {
+			Text string `json:"text"`
+			Type string `json:"type"`
+		} `json:"content"`
+	} `json:"result,omitempty"`
+	Error *struct {
+		Code    int    `json:"code"`
+		Message string `json:"message"`
+	} `json:"error,omitempty"`
 }

 func main() {
@@ -65,23 +73,89 @@ func main() {
 		MaxConcurrency: 10,
 	}

-	// Convert request to JSON
-	reqJSON, err := json.Marshal(req)
-	if err != nil {
-		log.Fatalf("Failed to marshal request: %v", err)
-	}
+	// Note: req is now used directly in the JSON-RPC request

 	// Create HTTP client with timeout
 	client := &http.Client{
 		Timeout: 5 * time.Minute,
 	}

-	// Send request to MCP server
-	resp, err := client.Post(
-		fmt.Sprintf("http://localhost:%s/mcp/analyze", *serverPort),
+	// First, initialize the session
+	initRequest := map[string]interface{}{
+		"jsonrpc": "2.0",
+		"id":      1,
+		"method":  "initialize",
+		"params": map[string]interface{}{
+			"protocolVersion": "2025-03-26",
+			"capabilities": map[string]interface{}{
+				"tools":     map[string]interface{}{},
+				"resources": map[string]interface{}{},
+				"prompts":   map[string]interface{}{},
+			},
+			"clientInfo": map[string]interface{}{
+				"name":    "k8sgpt-client",
+				"version": "1.0.0",
+			},
+		},
+	}
+
+	initData, err := json.Marshal(initRequest)
+	if err != nil {
+		log.Fatalf("Failed to marshal init request: %v", err)
+	}
+
+	// Send initialization request
+	initResp, err := client.Post(
+		fmt.Sprintf("http://localhost:%s/mcp", *serverPort),
 		"application/json",
-		bytes.NewBuffer(reqJSON),
+		bytes.NewBuffer(initData),
 	)
+	if err != nil {
+		log.Fatalf("Failed to send init request: %v", err)
+	}
+	defer func() {
+		if err := initResp.Body.Close(); err != nil {
+			log.Printf("Error closing init response body: %v", err)
+		}
+	}()
+
+	// Extract session ID from response headers
+	sessionID := initResp.Header.Get("Mcp-Session-Id")
+	if sessionID == "" {
+		log.Println("Warning: No session ID received from server")
+	}
+
+	// Create JSON-RPC request for analyze
+	jsonRPCRequest := map[string]interface{}{
+		"jsonrpc": "2.0",
+		"id":      2,
+		"method":  "tools/call",
+		"params": map[string]interface{}{
+			"name":      "analyze",
+			"arguments": req,
+		},
+	}
+
+	// Convert to JSON
+	jsonRPCData, err := json.Marshal(jsonRPCRequest)
+	if err != nil {
+		log.Fatalf("Failed to marshal JSON-RPC request: %v", err)
+	}
+
+	// Create request with session ID if available
+	httpReq, err := http.NewRequest("POST", fmt.Sprintf("http://localhost:%s/mcp", *serverPort), bytes.NewBuffer(jsonRPCData))
+	if err != nil {
+		log.Fatalf("Failed to create request: %v", err)
+	}
+
+	httpReq.Header.Set("Content-Type", "application/json")
+	httpReq.Header.Set("Accept", "application/json,text/event-stream")
+	if sessionID != "" {
+		httpReq.Header.Set("Mcp-Session-Id", sessionID)
+	}
+
+	// Send request to MCP server
+	resp, err := client.Do(httpReq)
 	if err != nil {
 		log.Fatalf("Failed to send request: %v", err)
 	}
@@ -99,15 +173,17 @@ func main() {
 	fmt.Printf("Raw response: %s\n", string(body))

 	// Parse response
-	var analyzeResp AnalyzeResponse
-	if err := json.Unmarshal(body, &analyzeResp); err != nil {
+	var jsonRPCResp JSONRPCResponse
+	if err := json.Unmarshal(body, &jsonRPCResp); err != nil {
 		log.Fatalf("Failed to decode response: %v", err)
 	}

 	// Print results
 	fmt.Println("Analysis Results:")
-	if len(analyzeResp.Content) > 0 {
-		fmt.Println(analyzeResp.Content[0].Text)
+	if jsonRPCResp.Error != nil {
+		fmt.Printf("Error: %s (code: %d)\n", jsonRPCResp.Error.Message, jsonRPCResp.Error.Code)
+	} else if len(jsonRPCResp.Result.Content) > 0 {
+		fmt.Println(jsonRPCResp.Result.Content[0].Text)
 	} else {
 		fmt.Println("No results returned")
 	}
--- a/pkg/server/mcp.go
+++ b/pkg/server/mcp.go
@@ -17,89 +17,327 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"net/http"
+	"regexp"

 	schemav1 "buf.build/gen/go/k8sgpt-ai/k8sgpt/protocolbuffers/go/schema/v1"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/ai"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/analysis"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
 	"github.com/k8sgpt-ai/k8sgpt/pkg/server/config"
-	mcp_golang "github.com/metoro-io/mcp-golang"
-	"github.com/metoro-io/mcp-golang/transport/stdio"
+	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/mark3labs/mcp-go/server"
 	"github.com/spf13/viper"
 	"go.uber.org/zap"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )

-// MCPServer represents an MCP server for k8sgpt
-type MCPServer struct {
-	server     *mcp_golang.Server
-	port       string
-	aiProvider *ai.AIProvider
-	useHTTP    bool
-	logger     *zap.Logger
+// K8sGptMCPServer represents an MCP server for k8sgpt
+type K8sGptMCPServer struct {
+	server      *server.MCPServer
+	port        string
+	aiProvider  *ai.AIProvider
+	useHTTP     bool
+	logger      *zap.Logger
+	httpServer  *server.StreamableHTTPServer
+	stdioServer *server.StdioServer
 }

-// NewMCPServer creates a new MCP server
-func NewMCPServer(port string, aiProvider *ai.AIProvider, useHTTP bool, logger *zap.Logger) (*MCPServer, error) {
-	// Create MCP server with stdio transport
-	transport := stdio.NewStdioServerTransport()
+func NewMCPServer(port string, aiProvider *ai.AIProvider, useHTTP bool, logger *zap.Logger) (*K8sGptMCPServer, error) {
+	opts := []server.ServerOption{
+		server.WithToolCapabilities(true),
+		server.WithResourceCapabilities(true, false),
+		server.WithPromptCapabilities(false),
+	}

-	server := mcp_golang.NewServer(transport)
-
-	return &MCPServer{
-		server:     server,
+	// Create the MCP server
+	mcpServer := server.NewMCPServer("k8sgpt", "1.0.0", opts...)
+	var k8sGptMCPServer = &K8sGptMCPServer{
+		server:     mcpServer,
 		port:       port,
 		aiProvider: aiProvider,
 		useHTTP:    useHTTP,
 		logger:     logger,
-	}, nil
+	}
+
+	// Register tools and resources immediately
+	if err := k8sGptMCPServer.registerToolsAndResources(); err != nil {
+		return nil, fmt.Errorf("failed to register tools and resources: %v", err)
+	}
+
+	if useHTTP {
+		// Create HTTP server with streamable transport
+		httpOpts := []server.StreamableHTTPOption{
+			server.WithLogger(&zapLoggerAdapter{logger: logger}),
+			// Enable stateless mode for one-off tool invocations without session management
+			server.WithStateLess(true),
+		}
+
+		httpServer := server.NewStreamableHTTPServer(mcpServer, httpOpts...)
+
+		// Launch the HTTP server directly
+		go func() {
+			logger.Info("Starting MCP HTTP server", zap.String("port", port))
+			if err := httpServer.Start(":" + port); err != nil {
+				logger.Fatal("MCP HTTP server failed", zap.Error(err))
+			}
+		}()
+
+		return &K8sGptMCPServer{
+			server:     mcpServer,
+			port:       port,
+			aiProvider: aiProvider,
+			useHTTP:    useHTTP,
+			logger:     logger,
+			httpServer: httpServer,
+		}, nil
+	} else {
+		// Create stdio server
+		stdioServer := server.NewStdioServer(mcpServer)
+
+		return &K8sGptMCPServer{
+			server:      mcpServer,
+			port:        port,
+			aiProvider:  aiProvider,
+			useHTTP:     useHTTP,
+			logger:      logger,
+			stdioServer: stdioServer,
+		}, nil
+	}
 }

 // Start starts the MCP server
-func (s *MCPServer) Start() error {
+func (s *K8sGptMCPServer) Start() error {
 	if s.server == nil {
 		return fmt.Errorf("server not initialized")
 	}
-
-	// Register analyze tool
-	if err := s.server.RegisterTool("analyze", "Analyze Kubernetes resources", s.handleAnalyze); err != nil {
-		return fmt.Errorf("failed to register analyze tool: %v", err)
+	// Register prompts
+	if err := s.registerPrompts(); err != nil {
+		return fmt.Errorf("failed to register prompts: %v", err)
 	}
-
-	// Register cluster info tool
-	if err := s.server.RegisterTool("cluster-info", "Get Kubernetes cluster information", s.handleClusterInfo); err != nil {
-		return fmt.Errorf("failed to register cluster-info tool: %v", err)
-	}
-
-	// Register config tool
-	if err := s.server.RegisterTool("config", "Configure K8sGPT settings", s.handleConfig); err != nil {
-		return fmt.Errorf("failed to register config tool: %v", err)
-	}
-
 	// Register resources
 	if err := s.registerResources(); err != nil {
 		return fmt.Errorf("failed to register resources: %v", err)
 	}

-	// Register prompts
-	if err := s.registerPrompts(); err != nil {
-		return fmt.Errorf("failed to register prompts: %v", err)
-	}
-
+	// Start the server based on transport type
 	if s.useHTTP {
-		// Start HTTP server
-		go func() {
-			http.HandleFunc("/mcp/analyze", s.handleAnalyzeHTTP)
-			http.HandleFunc("/mcp", s.handleSSE)
-			s.logger.Info("Starting MCP server on port", zap.String("port", s.port))
-			if err := http.ListenAndServe(fmt.Sprintf(":%s", s.port), nil); err != nil {
-				s.logger.Error("Error starting HTTP server", zap.Error(err))
-			}
-		}()
+		// HTTP server is already running in a goroutine
+		return nil
+	} else {
+		// Start stdio server (this will block)
+		return server.ServeStdio(s.server)
 	}
+}

-	// Start the server
-	return s.server.Serve()
+func (s *K8sGptMCPServer) registerToolsAndResources() error {
+	// Register analyze tool with proper JSON schema
+	analyzeTool := mcp.NewTool("analyze",
+		mcp.WithDescription("Analyze Kubernetes resources for issues and problems"),
+		mcp.WithString("namespace",
+			mcp.Description("Kubernetes namespace to analyze (empty for all namespaces)"),
+		),
+		mcp.WithString("backend",
+			mcp.Description("AI backend to use for analysis (e.g., openai, azure, localai)"),
+		),
+		mcp.WithBoolean("explain",
+			mcp.Description("Provide detailed explanations for issues"),
+		),
+		mcp.WithArray("filters",
+			mcp.Description("Provide filters to narrow down the analysis (e.g. ['Pods', 'Deployments'])"),
+			// without below line MCP server fails with Google Agent Development Kit (ADK), interestingly works fine with mcpinspector
+			mcp.WithStringItems(),
+		),
+	)
+	s.server.AddTool(analyzeTool, s.handleAnalyze)
+
+	// Register cluster info tool (no parameters needed)
+	clusterInfoTool := mcp.NewTool("cluster-info",
+		mcp.WithDescription("Get Kubernetes cluster information and version"),
+	)
+	s.server.AddTool(clusterInfoTool, s.handleClusterInfo)
+
+	// Register config tool with proper JSON schema
+	configTool := mcp.NewTool("config",
+		mcp.WithDescription("Configure K8sGPT settings including custom analyzers and cache"),
+		mcp.WithObject("customAnalyzers",
+			mcp.Description("Custom analyzer configurations"),
+			mcp.Properties(map[string]any{
+				"name": map[string]any{
+					"type":        "string",
+					"description": "Name of the custom analyzer",
+				},
+				"connection": map[string]any{
+					"type": "object",
+					"properties": map[string]any{
+						"url": map[string]any{
+							"type":        "string",
+							"description": "URL of the custom analyzer service",
+						},
+						"port": map[string]any{
+							"type":        "integer",
+							"description": "Port of the custom analyzer service",
+						},
+					},
+				},
+			}),
+		),
+		mcp.WithObject("cache",
+			mcp.Description("Cache configuration"),
+			mcp.Properties(map[string]any{
+				"type": map[string]any{
+					"type":        "string",
+					"description": "Cache type (s3, azure, gcs)",
+					"enum":        []string{"s3", "azure", "gcs"},
+				},
+				"bucketName": map[string]any{
+					"type":        "string",
+					"description": "Bucket name for S3/GCS cache",
+				},
+				"region": map[string]any{
+					"type":        "string",
+					"description": "Region for S3/GCS cache",
+				},
+				"endpoint": map[string]any{
+					"type":        "string",
+					"description": "Custom endpoint for S3 cache",
+				},
+				"insecure": map[string]any{
+					"type":        "boolean",
+					"description": "Use insecure connection for cache",
+				},
+				"storageAccount": map[string]any{
+					"type":        "string",
+					"description": "Storage account for Azure cache",
+				},
+				"containerName": map[string]any{
+					"type":        "string",
+					"description": "Container name for Azure cache",
+				},
+				"projectId": map[string]any{
+					"type":        "string",
+					"description": "Project ID for GCS cache",
+				},
+			}),
+		),
+	)
+	s.server.AddTool(configTool, s.handleConfig)
+
+	// Register resource listing tools
+	listResourcesTool := mcp.NewTool("list-resources",
+		mcp.WithDescription("List Kubernetes resources of a specific type (pods, deployments, services, nodes, etc.)"),
+		mcp.WithString("resourceType",
+			mcp.Required(),
+			mcp.Description("Type of resource to list (e.g., pods, deployments, services, nodes, jobs, etc.)"),
+		),
+		mcp.WithString("namespace",
+			mcp.Description("Namespace to list resources from (empty for all or cluster-scoped resources)"),
+		),
+		mcp.WithString("labelSelector",
+			mcp.Description("Label selector to filter resources (e.g., 'app=myapp')"),
+		),
+	)
+	s.server.AddTool(listResourcesTool, s.handleListResources)
+
+	// Register get resource tool
+	getResourceTool := mcp.NewTool("get-resource",
+		mcp.WithDescription("Get detailed information about a specific Kubernetes resource"),
+		mcp.WithString("resourceType",
+			mcp.Required(),
+			mcp.Description("Type of resource (e.g., pod, deployment, service)"),
+		),
+		mcp.WithString("name",
+			mcp.Required(),
+			mcp.Description("Name of the resource"),
+		),
+		mcp.WithString("namespace",
+			mcp.Description("Namespace of the resource (required for namespaced resources)"),
+		),
+	)
+	s.server.AddTool(getResourceTool, s.handleGetResource)
+
+	// Register list namespaces tool
+	listNamespacesTool := mcp.NewTool("list-namespaces",
+		mcp.WithDescription("List all namespaces in the cluster"),
+	)
+	s.server.AddTool(listNamespacesTool, s.handleListNamespaces)
+
+	// Register list events tool
+	listEventsTool := mcp.NewTool("list-events",
+		mcp.WithDescription("List Kubernetes events for debugging and troubleshooting"),
+		mcp.WithString("namespace",
+			mcp.Description("Namespace to list events from (empty for all namespaces)"),
+		),
+		mcp.WithString("involvedObjectName",
+			mcp.Description("Filter events by involved object name (e.g., pod name)"),
+		),
+		mcp.WithString("involvedObjectKind",
+			mcp.Description("Filter events by involved object kind (e.g., Pod, Deployment)"),
+		),
+		mcp.WithNumber("limit",
+			mcp.Description("Maximum number of events to return (default: 100)"),
+		),
+	)
+	s.server.AddTool(listEventsTool, s.handleListEvents)
+
+	// Register get logs tool
+	getLogsTool := mcp.NewTool("get-logs",
+		mcp.WithDescription("Get logs from a pod container"),
+		mcp.WithString("podName",
+			mcp.Required(),
+			mcp.Description("Name of the pod"),
+		),
+		mcp.WithString("namespace",
+			mcp.Required(),
+			mcp.Description("Namespace of the pod"),
+		),
+		mcp.WithString("container",
+			mcp.Description("Container name (if pod has multiple containers)"),
+		),
+		mcp.WithBoolean("previous",
+			mcp.Description("Get logs from previous terminated container"),
+		),
+		mcp.WithNumber("tailLines",
+			mcp.Description("Number of lines from the end of logs (default: 100)"),
+		),
+		mcp.WithNumber("sinceSeconds",
+			mcp.Description("Return logs newer than this many seconds"),
+		),
+	)
+	s.server.AddTool(getLogsTool, s.handleGetLogs)
+
+	// Register filter management tools
+	listFiltersTool := mcp.NewTool("list-filters",
+		mcp.WithDescription("List all available and active analyzers/filters in k8sgpt"),
+	)
+	s.server.AddTool(listFiltersTool, s.handleListFilters)
+
+	addFiltersTool := mcp.NewTool("add-filters",
+		mcp.WithDescription("Add filters to enable specific analyzers"),
+		mcp.WithArray("filters",
+			mcp.Required(),
+			mcp.Description("List of filter names to add (e.g., ['Pod', 'Service', 'Deployment'])"),
+			mcp.WithStringItems(),
+		),
+	)
+	s.server.AddTool(addFiltersTool, s.handleAddFilters)
+
+	removeFiltersTool := mcp.NewTool("remove-filters",
+		mcp.WithDescription("Remove filters to disable specific analyzers"),
+		mcp.WithArray("filters",
+			mcp.Required(),
+			mcp.Description("List of filter names to remove"),
+			mcp.WithStringItems(),
+		),
+	)
+	s.server.AddTool(removeFiltersTool, s.handleRemoveFilters)
+
+	// Register integration management tools
+	listIntegrationsTool := mcp.NewTool("list-integrations",
+		mcp.WithDescription("List available integrations (Prometheus, AWS, Keda, Kyverno, etc.)"),
+	)
+	s.server.AddTool(listIntegrationsTool, s.handleListIntegrations)
+
+	return nil
 }

 // AnalyzeRequest represents the input parameters for the analyze tool
@@ -116,6 +354,7 @@ type AnalyzeRequest struct {
 	InteractiveMode bool     `json:"interactiveMode,omitempty"`
 	CustomHeaders   []string `json:"customHeaders,omitempty"`
 	WithStats       bool     `json:"withStats,omitempty"`
+	Anonymize       bool     `json:"anonymize,omitempty"`
 }

 // AnalyzeResponse represents the output of the analyze tool
@@ -163,62 +402,74 @@ type ConfigResponse struct {
 }

 // handleAnalyze handles the analyze tool
-func (s *MCPServer) handleAnalyze(ctx context.Context, request *AnalyzeRequest) (*mcp_golang.ToolResponse, error) {
-	// Get stored configuration
-	var configAI ai.AIConfiguration
-	if err := viper.UnmarshalKey("ai", &configAI); err != nil {
-		return mcp_golang.NewToolResponse(mcp_golang.NewTextContent(fmt.Sprintf("Failed to load AI configuration: %v", err))), nil
+func (s *K8sGptMCPServer) handleAnalyze(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+
+	var req AnalyzeRequest
+	if err := request.BindArguments(&req); err != nil {
+		return mcp.NewToolResultErrorf("Failed to parse request arguments: %v", err), nil
 	}
-	// Use stored configuration if not specified in request
-	if request.Backend == "" {
-		if configAI.DefaultProvider != "" {
-			request.Backend = configAI.DefaultProvider
-		} else if len(configAI.Providers) > 0 {
-			request.Backend = configAI.Providers[0].Name
+
+	if req.Backend == "" {
+		if s.aiProvider.Name != "" {
+			req.Backend = s.aiProvider.Name
 		} else {
-			request.Backend = "openai" // fallback default
+			req.Backend = "openai" // fallback default
 		}
 	}

-	request.Explain = true
 	// Get stored filters if not specified
-	if len(request.Filters) == 0 {
-		request.Filters = viper.GetStringSlice("active_filters")
+	if len(req.Filters) == 0 {
+		req.Filters = viper.GetStringSlice("active_filters")
 	}

 	// Validate MaxConcurrency to prevent excessive memory allocation
-	request.MaxConcurrency = validateMaxConcurrency(request.MaxConcurrency)
+	req.MaxConcurrency = validateMaxConcurrency(req.MaxConcurrency)

 	// Create a new analysis with the request parameters
 	analysis, err := analysis.NewAnalysis(
-		request.Backend,
-		request.Language,
-		request.Filters,
-		request.Namespace,
-		request.LabelSelector,
-		request.NoCache,
-		request.Explain,
-		request.MaxConcurrency,
-		request.WithDoc,
-		request.InteractiveMode,
-		request.CustomHeaders,
-		request.WithStats,
+		req.Backend,
+		req.Language,
+		req.Filters,
+		req.Namespace,
+		req.LabelSelector,
+		req.NoCache,
+		req.Explain,
+		req.MaxConcurrency,
+		req.WithDoc,
+		req.InteractiveMode,
+		req.CustomHeaders,
+		req.WithStats,
 	)
 	if err != nil {
-		return mcp_golang.NewToolResponse(mcp_golang.NewTextContent(fmt.Sprintf("Failed to create analysis: %v", err))), nil
+		return mcp.NewToolResultErrorf("Failed to create analysis: %v", err), nil
 	}
 	defer analysis.Close()

 	// Run the analysis
 	analysis.RunAnalysis()
+	if req.Explain {

-	// Get the output
-	output, err := analysis.PrintOutput("json")
-	if err != nil {
-		return mcp_golang.NewToolResponse(mcp_golang.NewTextContent(fmt.Sprintf("Failed to print output: %v", err))), nil
+		var output string
+		err := analysis.GetAIResults(output, req.Anonymize)
+		if err != nil {
+			return mcp.NewToolResultErrorf("Failed to get results from AI: %v", err), nil
+		}
+
+		// Convert results to JSON string using PrintOutput
+		outputBytes, err := analysis.PrintOutput("text")
+		if err != nil {
+			return mcp.NewToolResultErrorf("Failed to convert results to string: %v", err), nil
+		}
+		plainText := stripANSI(string(outputBytes))
+		return mcp.NewToolResultText(plainText), nil
+	} else {
+		// Get the output
+		output, err := analysis.PrintOutput("json")
+		if err != nil {
+			return mcp.NewToolResultErrorf("Failed to print output: %v", err), nil
+		}
+		return mcp.NewToolResultText(string(output)), nil
 	}
-
-	return mcp_golang.NewToolResponse(mcp_golang.NewTextContent(string(output))), nil
 }

 // validateMaxConcurrency validates and bounds the MaxConcurrency parameter
@@ -233,25 +484,31 @@ func validateMaxConcurrency(maxConcurrency int) int {
 }

 // handleClusterInfo handles the cluster-info tool
-func (s *MCPServer) handleClusterInfo(ctx context.Context, request *ClusterInfoRequest) (*mcp_golang.ToolResponse, error) {
+func (s *K8sGptMCPServer) handleClusterInfo(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 	// Create a new Kubernetes client
 	client, err := kubernetes.NewClient("", "")
 	if err != nil {
-		return mcp_golang.NewToolResponse(mcp_golang.NewTextContent(fmt.Sprintf("failed to create Kubernetes client: %v", err))), nil
+		return mcp.NewToolResultErrorf("failed to create Kubernetes client: %v", err), nil
 	}

 	// Get cluster info from the client
 	version, err := client.Client.Discovery().ServerVersion()
 	if err != nil {
-		return mcp_golang.NewToolResponse(mcp_golang.NewTextContent(fmt.Sprintf("failed to get cluster version: %v", err))), nil
+		return mcp.NewToolResultErrorf("failed to get cluster version: %v", err), nil
 	}

 	info := fmt.Sprintf("Kubernetes %s", version.GitVersion)
-	return mcp_golang.NewToolResponse(mcp_golang.NewTextContent(info)), nil
+	return mcp.NewToolResultText(info), nil
 }

 // handleConfig handles the config tool
-func (s *MCPServer) handleConfig(ctx context.Context, request *ConfigRequest) (*mcp_golang.ToolResponse, error) {
+func (s *K8sGptMCPServer) handleConfig(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	// Parse request arguments
+	var req ConfigRequest
+	if err := request.BindArguments(&req); err != nil {
+		return mcp.NewToolResultErrorf("Failed to parse request arguments: %v", err), nil
+	}
+
 	// Create a new config handler
 	handler := &config.Handler{}

@@ -261,8 +518,8 @@ func (s *MCPServer) handleConfig(ctx context.Context, request *ConfigRequest) (*
 	}

 	// Add custom analyzers if present
-	if len(request.CustomAnalyzers) > 0 {
-		for _, ca := range request.CustomAnalyzers {
+	if len(req.CustomAnalyzers) > 0 {
+		for _, ca := range req.CustomAnalyzers {
 			addConfigReq.CustomAnalyzers = append(addConfigReq.CustomAnalyzers, &schemav1.CustomAnalyzer{
 				Name: ca.Name,
 				Connection: &schemav1.Connection{
@@ -274,31 +531,31 @@ func (s *MCPServer) handleConfig(ctx context.Context, request *ConfigRequest) (*
 	}

 	// Add cache configuration if present
-	if request.Cache.Type != "" {
+	if req.Cache.Type != "" {
 		cacheConfig := &schemav1.Cache{}
-		switch request.Cache.Type {
+		switch req.Cache.Type {
 		case "s3":
 			cacheConfig.CacheType = &schemav1.Cache_S3Cache{
 				S3Cache: &schemav1.S3Cache{
-					BucketName: request.Cache.BucketName,
-					Region:     request.Cache.Region,
-					Endpoint:   request.Cache.Endpoint,
-					Insecure:   request.Cache.Insecure,
+					BucketName: req.Cache.BucketName,
+					Region:     req.Cache.Region,
+					Endpoint:   req.Cache.Endpoint,
+					Insecure:   req.Cache.Insecure,
 				},
 			}
 		case "azure":
 			cacheConfig.CacheType = &schemav1.Cache_AzureCache{
 				AzureCache: &schemav1.AzureCache{
-					StorageAccount: request.Cache.StorageAccount,
-					ContainerName:  request.Cache.ContainerName,
+					StorageAccount: req.Cache.StorageAccount,
+					ContainerName:  req.Cache.ContainerName,
 				},
 			}
 		case "gcs":
 			cacheConfig.CacheType = &schemav1.Cache_GcsCache{
 				GcsCache: &schemav1.GCSCache{
-					BucketName: request.Cache.BucketName,
-					Region:     request.Cache.Region,
-					ProjectId:  request.Cache.ProjectId,
+					BucketName: req.Cache.BucketName,
+					Region:     req.Cache.Region,
+					ProjectId:  req.Cache.ProjectId,
 				},
 			}
 		}
@@ -307,27 +564,61 @@ func (s *MCPServer) handleConfig(ctx context.Context, request *ConfigRequest) (*

 	// Apply the configuration using the shared function
 	if err := handler.ApplyConfig(ctx, addConfigReq); err != nil {
-		return mcp_golang.NewToolResponse(mcp_golang.NewTextContent(fmt.Sprintf("Failed to add config: %v", err))), nil
+		return mcp.NewToolResultErrorf("Failed to add config: %v", err), nil
 	}

-	return mcp_golang.NewToolResponse(mcp_golang.NewTextContent("Successfully added configuration")), nil
+	return mcp.NewToolResultText("Successfully added configuration"), nil
 }

 // registerPrompts registers the prompts for the MCP server
-func (s *MCPServer) registerPrompts() error {
-	// Register any prompts needed for the MCP server
+func (s *K8sGptMCPServer) registerPrompts() error {
+	// Register troubleshooting prompts
+	podTroubleshootPrompt := mcp.NewPrompt("troubleshoot-pod",
+		mcp.WithPromptDescription("Guide for troubleshooting pod issues in Kubernetes"),
+		mcp.WithArgument("podName"),
+		mcp.WithArgument("namespace"),
+	)
+	s.server.AddPrompt(podTroubleshootPrompt, s.getTroubleshootPodPrompt)
+
+	deploymentTroubleshootPrompt := mcp.NewPrompt("troubleshoot-deployment",
+		mcp.WithPromptDescription("Guide for troubleshooting deployment issues in Kubernetes"),
+		mcp.WithArgument("deploymentName"),
+		mcp.WithArgument("namespace"),
+	)
+	s.server.AddPrompt(deploymentTroubleshootPrompt, s.getTroubleshootDeploymentPrompt)
+
+	generalTroubleshootPrompt := mcp.NewPrompt("troubleshoot-cluster",
+		mcp.WithPromptDescription("General guide for troubleshooting Kubernetes cluster issues"),
+	)
+	s.server.AddPrompt(generalTroubleshootPrompt, s.getTroubleshootClusterPrompt)
+
 	return nil
 }

 // registerResources registers the resources for the MCP server
-func (s *MCPServer) registerResources() error {
-	if err := s.server.RegisterResource("cluster-info", "Get cluster information", "Get information about the Kubernetes cluster", "text", s.getClusterInfo); err != nil {
-		return fmt.Errorf("failed to register cluster-info resource: %v", err)
-	}
+func (s *K8sGptMCPServer) registerResources() error {
+	clusterInfoResource := mcp.NewResource("cluster-info", "cluster-info",
+		mcp.WithResourceDescription("Get information about the Kubernetes cluster"),
+		mcp.WithMIMEType("application/json"),
+	)
+	s.server.AddResource(clusterInfoResource, s.getClusterInfo)
+
+	namespacesResource := mcp.NewResource("namespaces", "namespaces",
+		mcp.WithResourceDescription("List all namespaces in the cluster"),
+		mcp.WithMIMEType("application/json"),
+	)
+	s.server.AddResource(namespacesResource, s.getNamespacesResource)
+
+	activeFiltersResource := mcp.NewResource("active-filters", "active-filters",
+		mcp.WithResourceDescription("Get currently active analyzers/filters"),
+		mcp.WithMIMEType("application/json"),
+	)
+	s.server.AddResource(activeFiltersResource, s.getActiveFiltersResource)
+
 	return nil
 }

-func (s *MCPServer) getClusterInfo(ctx context.Context) (interface{}, error) {
+func (s *K8sGptMCPServer) getClusterInfo(ctx context.Context, request mcp.ReadResourceRequest) ([]mcp.ResourceContents, error) {
 	// Create a new Kubernetes client
 	client, err := kubernetes.NewClient("", "")
 	if err != nil {
@@ -340,77 +631,116 @@ func (s *MCPServer) getClusterInfo(ctx context.Context) (interface{}, error) {
 		return nil, fmt.Errorf("failed to get cluster version: %v", err)
 	}

-	return map[string]string{
+	data, err := json.Marshal(map[string]string{
 		"version":    version.String(),
 		"platform":   version.Platform,
 		"gitVersion": version.GitVersion,
+	})
+	if err != nil {
+		return []mcp.ResourceContents{
+			&mcp.TextResourceContents{
+				URI:      "cluster-info",
+				MIMEType: "text/plain",
+				Text:     "Failed to marshal cluster info",
+			},
+		}, nil
+	}
+
+	return []mcp.ResourceContents{
+		&mcp.TextResourceContents{
+			URI:      "cluster-info",
+			MIMEType: "application/json",
+			Text:     string(data),
+		},
 	}, nil
 }

-// handleSSE handles Server-Sent Events for MCP
-func (s *MCPServer) handleSSE(w http.ResponseWriter, r *http.Request) {
-	// Set headers for SSE
-	w.Header().Set("Content-Type", "text/event-stream")
-	w.Header().Set("Cache-Control", "no-cache")
-	w.Header().Set("Connection", "keep-alive")
-	w.Header().Set("Access-Control-Allow-Origin", "*")
-
-	// Create a channel to receive messages
-	msgChan := make(chan string)
-	defer close(msgChan)
-
-	// Start a goroutine to handle the stdio transport
-	go func() {
-		// TODO: Implement message handling between HTTP and stdio transport
-		// This would require implementing a custom transport that bridges HTTP and stdio
-
-	}()
-
-	// Send messages to the client
-	for msg := range msgChan {
-		if _, err := fmt.Fprintf(w, "data: %s\n\n", msg); err != nil {
-			s.logger.Error("Failed to write SSE message", zap.Error(err))
-			return
-		}
-		w.(http.Flusher).Flush()
+func (s *K8sGptMCPServer) getNamespacesResource(ctx context.Context, request mcp.ReadResourceRequest) ([]mcp.ResourceContents, error) {
+	client, err := kubernetes.NewClient("", "")
+	if err != nil {
+		return nil, fmt.Errorf("failed to create Kubernetes client: %v", err)
 	}
+
+	namespaces, err := client.Client.CoreV1().Namespaces().List(ctx, metav1.ListOptions{})
+	if err != nil {
+		return nil, fmt.Errorf("failed to list namespaces: %v", err)
+	}
+
+	// Extract just the namespace names
+	names := make([]string, 0, len(namespaces.Items))
+	for _, ns := range namespaces.Items {
+		names = append(names, ns.Name)
+	}
+
+	data, err := json.Marshal(map[string]interface{}{
+		"count":      len(names),
+		"namespaces": names,
+	})
+	if err != nil {
+		return []mcp.ResourceContents{
+			&mcp.TextResourceContents{
+				URI:      "namespaces",
+				MIMEType: "text/plain",
+				Text:     "Failed to marshal namespaces",
+			},
+		}, nil
+	}
+
+	return []mcp.ResourceContents{
+		&mcp.TextResourceContents{
+			URI:      "namespaces",
+			MIMEType: "application/json",
+			Text:     string(data),
+		},
+	}, nil
 }

-// handleAnalyzeHTTP handles HTTP requests for the analyze endpoint
-func (s *MCPServer) handleAnalyzeHTTP(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodPost {
-		http.Error(w, "Method not allowed", http.StatusMethodNotAllowed)
-		return
-	}
+func (s *K8sGptMCPServer) getActiveFiltersResource(ctx context.Context, request mcp.ReadResourceRequest) ([]mcp.ResourceContents, error) {
+	activeFilters := viper.GetStringSlice("active_filters")

-	// Parse the request body
-	var req AnalyzeRequest
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		http.Error(w, fmt.Sprintf("Failed to decode request: %v", err), http.StatusBadRequest)
-		return
-	}
-
-	// Validate MaxConcurrency to prevent excessive memory allocation
-	req.MaxConcurrency = validateMaxConcurrency(req.MaxConcurrency)
-
-	// Call the analyze handler
-	resp, err := s.handleAnalyze(r.Context(), &req)
+	data, err := json.Marshal(map[string]interface{}{
+		"activeFilters": activeFilters,
+		"count":         len(activeFilters),
+	})
 	if err != nil {
-		http.Error(w, fmt.Sprintf("Failed to analyze: %v", err), http.StatusInternalServerError)
-		return
+		return []mcp.ResourceContents{
+			&mcp.TextResourceContents{
+				URI:      "active-filters",
+				MIMEType: "text/plain",
+				Text:     "Failed to marshal active filters",
+			},
+		}, nil
 	}

-	// Set response headers
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(http.StatusOK)
-
-	// Write the response
-	if err := json.NewEncoder(w).Encode(resp); err != nil {
-		s.logger.Error("Failed to encode response", zap.Error(err))
-	}
+	return []mcp.ResourceContents{
+		&mcp.TextResourceContents{
+			URI:      "active-filters",
+			MIMEType: "application/json",
+			Text:     string(data),
+		},
+	}, nil
 }

 // Close closes the MCP server and releases resources
-func (s *MCPServer) Close() error {
+func (s *K8sGptMCPServer) Close() error {
 	return nil
 }
+
+// zapLoggerAdapter adapts zap.Logger to the interface expected by mark3labs/mcp-go
+type zapLoggerAdapter struct {
+	logger *zap.Logger
+}
+
+func (z *zapLoggerAdapter) Infof(format string, v ...any) {
+	z.logger.Info(fmt.Sprintf(format, v...))
+}
+
+func (z *zapLoggerAdapter) Errorf(format string, v ...any) {
+	z.logger.Error(fmt.Sprintf(format, v...))
+}
+
+// stripANSI removes ANSI escape sequences from a string
+func stripANSI(input string) string {
+	re := regexp.MustCompile(`\x1b\[[0-9;]*m`)
+	return re.ReplaceAllString(input, "")
+}
--- a/pkg/server/mcp_handlers.go
+++ b/pkg/server/mcp_handlers.go
@@ -0,0 +1,570 @@
+/*
+Copyright 2024 The K8sGPT Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package server
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"strings"
+
+	"github.com/k8sgpt-ai/k8sgpt/pkg/analyzer"
+	"github.com/k8sgpt-ai/k8sgpt/pkg/integration"
+	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
+	"github.com/mark3labs/mcp-go/mcp"
+	"github.com/spf13/viper"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+const (
+	// DefaultListLimit is the default maximum number of resources to return
+	DefaultListLimit = 100
+	// MaxListLimit is the maximum allowed limit for list operations
+	MaxListLimit = 1000
+)
+
+// resourceLister defines a function that lists Kubernetes resources
+type resourceLister func(ctx context.Context, client *kubernetes.Client, namespace string, opts metav1.ListOptions) (interface{}, error)
+
+// resourceGetter defines a function that gets a single Kubernetes resource
+type resourceGetter func(ctx context.Context, client *kubernetes.Client, namespace, name string) (interface{}, error)
+
+// resourceRegistry maps resource types to their list and get functions
+var resourceRegistry = map[string]struct {
+	list resourceLister
+	get  resourceGetter
+}{
+	"pod": {
+		list: func(ctx context.Context, client *kubernetes.Client, namespace string, opts metav1.ListOptions) (interface{}, error) {
+			return client.Client.CoreV1().Pods(namespace).List(ctx, opts)
+		},
+		get: func(ctx context.Context, client *kubernetes.Client, namespace, name string) (interface{}, error) {
+			return client.Client.CoreV1().Pods(namespace).Get(ctx, name, metav1.GetOptions{})
+		},
+	},
+	"deployment": {
+		list: func(ctx context.Context, client *kubernetes.Client, namespace string, opts metav1.ListOptions) (interface{}, error) {
+			return client.Client.AppsV1().Deployments(namespace).List(ctx, opts)
+		},
+		get: func(ctx context.Context, client *kubernetes.Client, namespace, name string) (interface{}, error) {
+			return client.Client.AppsV1().Deployments(namespace).Get(ctx, name, metav1.GetOptions{})
+		},
+	},
+	"service": {
+		list: func(ctx context.Context, client *kubernetes.Client, namespace string, opts metav1.ListOptions) (interface{}, error) {
+			return client.Client.CoreV1().Services(namespace).List(ctx, opts)
+		},
+		get: func(ctx context.Context, client *kubernetes.Client, namespace, name string) (interface{}, error) {
+			return client.Client.CoreV1().Services(namespace).Get(ctx, name, metav1.GetOptions{})
+		},
+	},
+	"node": {
+		list: func(ctx context.Context, client *kubernetes.Client, namespace string, opts metav1.ListOptions) (interface{}, error) {
+			return client.Client.CoreV1().Nodes().List(ctx, opts)
+		},
+		get: func(ctx context.Context, client *kubernetes.Client, namespace, name string) (interface{}, error) {
+			return client.Client.CoreV1().Nodes().Get(ctx, name, metav1.GetOptions{})
+		},
+	},
+	"job": {
+		list: func(ctx context.Context, client *kubernetes.Client, namespace string, opts metav1.ListOptions) (interface{}, error) {
+			return client.Client.BatchV1().Jobs(namespace).List(ctx, opts)
+		},
+		get: func(ctx context.Context, client *kubernetes.Client, namespace, name string) (interface{}, error) {
+			return client.Client.BatchV1().Jobs(namespace).Get(ctx, name, metav1.GetOptions{})
+		},
+	},
+	"cronjob": {
+		list: func(ctx context.Context, client *kubernetes.Client, namespace string, opts metav1.ListOptions) (interface{}, error) {
+			return client.Client.BatchV1().CronJobs(namespace).List(ctx, opts)
+		},
+		get: func(ctx context.Context, client *kubernetes.Client, namespace, name string) (interface{}, error) {
+			return client.Client.BatchV1().CronJobs(namespace).Get(ctx, name, metav1.GetOptions{})
+		},
+	},
+	"statefulset": {
+		list: func(ctx context.Context, client *kubernetes.Client, namespace string, opts metav1.ListOptions) (interface{}, error) {
+			return client.Client.AppsV1().StatefulSets(namespace).List(ctx, opts)
+		},
+		get: func(ctx context.Context, client *kubernetes.Client, namespace, name string) (interface{}, error) {
+			return client.Client.AppsV1().StatefulSets(namespace).Get(ctx, name, metav1.GetOptions{})
+		},
+	},
+	"daemonset": {
+		list: func(ctx context.Context, client *kubernetes.Client, namespace string, opts metav1.ListOptions) (interface{}, error) {
+			return client.Client.AppsV1().DaemonSets(namespace).List(ctx, opts)
+		},
+		get: func(ctx context.Context, client *kubernetes.Client, namespace, name string) (interface{}, error) {
+			return client.Client.AppsV1().DaemonSets(namespace).Get(ctx, name, metav1.GetOptions{})
+		},
+	},
+	"replicaset": {
+		list: func(ctx context.Context, client *kubernetes.Client, namespace string, opts metav1.ListOptions) (interface{}, error) {
+			return client.Client.AppsV1().ReplicaSets(namespace).List(ctx, opts)
+		},
+		get: func(ctx context.Context, client *kubernetes.Client, namespace, name string) (interface{}, error) {
+			return client.Client.AppsV1().ReplicaSets(namespace).Get(ctx, name, metav1.GetOptions{})
+		},
+	},
+	"configmap": {
+		list: func(ctx context.Context, client *kubernetes.Client, namespace string, opts metav1.ListOptions) (interface{}, error) {
+			return client.Client.CoreV1().ConfigMaps(namespace).List(ctx, opts)
+		},
+		get: func(ctx context.Context, client *kubernetes.Client, namespace, name string) (interface{}, error) {
+			return client.Client.CoreV1().ConfigMaps(namespace).Get(ctx, name, metav1.GetOptions{})
+		},
+	},
+	"secret": {
+		list: func(ctx context.Context, client *kubernetes.Client, namespace string, opts metav1.ListOptions) (interface{}, error) {
+			return client.Client.CoreV1().Secrets(namespace).List(ctx, opts)
+		},
+		get: func(ctx context.Context, client *kubernetes.Client, namespace, name string) (interface{}, error) {
+			return client.Client.CoreV1().Secrets(namespace).Get(ctx, name, metav1.GetOptions{})
+		},
+	},
+	"ingress": {
+		list: func(ctx context.Context, client *kubernetes.Client, namespace string, opts metav1.ListOptions) (interface{}, error) {
+			return client.Client.NetworkingV1().Ingresses(namespace).List(ctx, opts)
+		},
+		get: func(ctx context.Context, client *kubernetes.Client, namespace, name string) (interface{}, error) {
+			return client.Client.NetworkingV1().Ingresses(namespace).Get(ctx, name, metav1.GetOptions{})
+		},
+	},
+	"persistentvolumeclaim": {
+		list: func(ctx context.Context, client *kubernetes.Client, namespace string, opts metav1.ListOptions) (interface{}, error) {
+			return client.Client.CoreV1().PersistentVolumeClaims(namespace).List(ctx, opts)
+		},
+		get: func(ctx context.Context, client *kubernetes.Client, namespace, name string) (interface{}, error) {
+			return client.Client.CoreV1().PersistentVolumeClaims(namespace).Get(ctx, name, metav1.GetOptions{})
+		},
+	},
+	"persistentvolume": {
+		list: func(ctx context.Context, client *kubernetes.Client, namespace string, opts metav1.ListOptions) (interface{}, error) {
+			return client.Client.CoreV1().PersistentVolumes().List(ctx, opts)
+		},
+		get: func(ctx context.Context, client *kubernetes.Client, namespace, name string) (interface{}, error) {
+			return client.Client.CoreV1().PersistentVolumes().Get(ctx, name, metav1.GetOptions{})
+		},
+	},
+}
+
+// Resource type aliases for convenience
+var resourceTypeAliases = map[string]string{
+	"pods":                      "pod",
+	"deployments":               "deployment",
+	"services":                  "service",
+	"svc":                       "service",
+	"nodes":                     "node",
+	"jobs":                      "job",
+	"cronjobs":                  "cronjob",
+	"statefulsets":              "statefulset",
+	"sts":                       "statefulset",
+	"daemonsets":                "daemonset",
+	"ds":                        "daemonset",
+	"replicasets":               "replicaset",
+	"rs":                        "replicaset",
+	"configmaps":                "configmap",
+	"cm":                        "configmap",
+	"secrets":                   "secret",
+	"ingresses":                 "ingress",
+	"ing":                       "ingress",
+	"persistentvolumeclaims":    "persistentvolumeclaim",
+	"pvc":                       "persistentvolumeclaim",
+	"persistentvolumes":         "persistentvolume",
+	"pv":                        "persistentvolume",
+}
+
+// normalizeResourceType converts resource type variants to canonical form
+func normalizeResourceType(resourceType string) (string, error) {
+	normalized := strings.ToLower(resourceType)
+	
+	// Check if it's an alias
+	if canonical, ok := resourceTypeAliases[normalized]; ok {
+		normalized = canonical
+	}
+	
+	// Check if it's a known resource type
+	if _, ok := resourceRegistry[normalized]; !ok {
+		return "", fmt.Errorf("unsupported resource type: %s", resourceType)
+	}
+	
+	return normalized, nil
+}
+
+// marshalJSON marshals data to JSON with proper error handling
+func marshalJSON(data interface{}) (string, error) {
+	jsonData, err := json.MarshalIndent(data, "", "  ")
+	if err != nil {
+		return "", fmt.Errorf("failed to marshal JSON: %w", err)
+	}
+	return string(jsonData), nil
+}
+
+// handleListResources lists Kubernetes resources of a specific type
+func (s *K8sGptMCPServer) handleListResources(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	var req struct {
+		ResourceType  string `json:"resourceType"`
+		Namespace     string `json:"namespace,omitempty"`
+		LabelSelector string `json:"labelSelector,omitempty"`
+		Limit         int64  `json:"limit,omitempty"`
+	}
+	if err := request.BindArguments(&req); err != nil {
+		return mcp.NewToolResultErrorf("Failed to parse request arguments: %v", err), nil
+	}
+
+	if req.ResourceType == "" {
+		return mcp.NewToolResultErrorf("resourceType is required"), nil
+	}
+
+	// Normalize and validate resource type
+	resourceType, err := normalizeResourceType(req.ResourceType)
+	if err != nil {
+		supportedTypes := make([]string, 0, len(resourceRegistry))
+		for key := range resourceRegistry {
+			supportedTypes = append(supportedTypes, key)
+		}
+		return mcp.NewToolResultErrorf("%v. Supported types: %v", err, supportedTypes), nil
+	}
+
+	// Set default and validate limit
+	if req.Limit == 0 {
+		req.Limit = DefaultListLimit
+	} else if req.Limit > MaxListLimit {
+		req.Limit = MaxListLimit
+	}
+
+	client, err := kubernetes.NewClient("", "")
+	if err != nil {
+		return mcp.NewToolResultErrorf("Failed to create Kubernetes client: %v", err), nil
+	}
+
+	listOptions := metav1.ListOptions{
+		LabelSelector: req.LabelSelector,
+		Limit:         req.Limit,
+	}
+
+	// Get the list function from registry
+	listFunc := resourceRegistry[resourceType].list
+	result, err := listFunc(ctx, client, req.Namespace, listOptions)
+	if err != nil {
+		return mcp.NewToolResultErrorf("Failed to list %s: %v", resourceType, err), nil
+	}
+
+	// Extract items from the result (all list types have an Items field)
+	resultJSON, err := marshalJSON(result)
+	if err != nil {
+		return mcp.NewToolResultErrorf("Failed to serialize result: %v", err), nil
+	}
+
+	return mcp.NewToolResultText(resultJSON), nil
+}
+
+// handleGetResource gets detailed information about a specific resource
+func (s *K8sGptMCPServer) handleGetResource(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	var req struct {
+		ResourceType string `json:"resourceType"`
+		Name         string `json:"name"`
+		Namespace    string `json:"namespace,omitempty"`
+	}
+	if err := request.BindArguments(&req); err != nil {
+		return mcp.NewToolResultErrorf("Failed to parse request arguments: %v", err), nil
+	}
+
+	if req.ResourceType == "" {
+		return mcp.NewToolResultErrorf("resourceType is required"), nil
+	}
+	if req.Name == "" {
+		return mcp.NewToolResultErrorf("name is required"), nil
+	}
+
+	// Normalize and validate resource type
+	resourceType, err := normalizeResourceType(req.ResourceType)
+	if err != nil {
+		return mcp.NewToolResultErrorf("%v", err), nil
+	}
+
+	client, err := kubernetes.NewClient("", "")
+	if err != nil {
+		return mcp.NewToolResultErrorf("Failed to create Kubernetes client: %v", err), nil
+	}
+
+	// Get the get function from registry
+	getFunc := resourceRegistry[resourceType].get
+	result, err := getFunc(ctx, client, req.Namespace, req.Name)
+	if err != nil {
+		return mcp.NewToolResultErrorf("Failed to get %s '%s': %v", resourceType, req.Name, err), nil
+	}
+
+	resultJSON, err := marshalJSON(result)
+	if err != nil {
+		return mcp.NewToolResultErrorf("Failed to serialize result: %v", err), nil
+	}
+
+	return mcp.NewToolResultText(resultJSON), nil
+}
+
+// handleListNamespaces lists all namespaces in the cluster
+func (s *K8sGptMCPServer) handleListNamespaces(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	client, err := kubernetes.NewClient("", "")
+	if err != nil {
+		return mcp.NewToolResultErrorf("Failed to create Kubernetes client: %v", err), nil
+	}
+
+	namespaces, err := client.Client.CoreV1().Namespaces().List(ctx, metav1.ListOptions{})
+	if err != nil {
+		return mcp.NewToolResultErrorf("Failed to list namespaces: %v", err), nil
+	}
+
+	resultJSON, err := marshalJSON(namespaces.Items)
+	if err != nil {
+		return mcp.NewToolResultErrorf("Failed to serialize result: %v", err), nil
+	}
+
+	return mcp.NewToolResultText(resultJSON), nil
+}
+
+// handleListEvents lists Kubernetes events
+func (s *K8sGptMCPServer) handleListEvents(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	var req struct {
+		Namespace          string `json:"namespace,omitempty"`
+		InvolvedObjectName string `json:"involvedObjectName,omitempty"`
+		InvolvedObjectKind string `json:"involvedObjectKind,omitempty"`
+		Limit              int64  `json:"limit,omitempty"`
+	}
+	if err := request.BindArguments(&req); err != nil {
+		return mcp.NewToolResultErrorf("Failed to parse request arguments: %v", err), nil
+	}
+
+	if req.Limit == 0 {
+		req.Limit = DefaultListLimit
+	} else if req.Limit > MaxListLimit {
+		req.Limit = MaxListLimit
+	}
+
+	client, err := kubernetes.NewClient("", "")
+	if err != nil {
+		return mcp.NewToolResultErrorf("Failed to create Kubernetes client: %v", err), nil
+	}
+
+	listOptions := metav1.ListOptions{
+		Limit: req.Limit,
+	}
+
+	events, err := client.Client.CoreV1().Events(req.Namespace).List(ctx, listOptions)
+	if err != nil {
+		return mcp.NewToolResultErrorf("Failed to list events: %v", err), nil
+	}
+
+	// Filter events if needed
+	filteredEvents := []corev1.Event{}
+	for _, event := range events.Items {
+		if req.InvolvedObjectName != "" && event.InvolvedObject.Name != req.InvolvedObjectName {
+			continue
+		}
+		if req.InvolvedObjectKind != "" && event.InvolvedObject.Kind != req.InvolvedObjectKind {
+			continue
+		}
+		filteredEvents = append(filteredEvents, event)
+	}
+
+	resultJSON, err := marshalJSON(filteredEvents)
+	if err != nil {
+		return mcp.NewToolResultErrorf("Failed to serialize result: %v", err), nil
+	}
+
+	return mcp.NewToolResultText(resultJSON), nil
+}
+
+// handleGetLogs retrieves logs from a pod container
+func (s *K8sGptMCPServer) handleGetLogs(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	var req struct {
+		PodName      string `json:"podName"`
+		Namespace    string `json:"namespace"`
+		Container    string `json:"container,omitempty"`
+		Previous     bool   `json:"previous,omitempty"`
+		TailLines    int64  `json:"tailLines,omitempty"`
+		SinceSeconds int64  `json:"sinceSeconds,omitempty"`
+	}
+	if err := request.BindArguments(&req); err != nil {
+		return mcp.NewToolResultErrorf("Failed to parse request arguments: %v", err), nil
+	}
+
+	if req.PodName == "" {
+		return mcp.NewToolResultErrorf("podName is required"), nil
+	}
+	if req.Namespace == "" {
+		return mcp.NewToolResultErrorf("namespace is required"), nil
+	}
+
+	if req.TailLines == 0 {
+		req.TailLines = 100
+	}
+
+	client, err := kubernetes.NewClient("", "")
+	if err != nil {
+		return mcp.NewToolResultErrorf("Failed to create Kubernetes client: %v", err), nil
+	}
+
+	podLogOpts := &corev1.PodLogOptions{
+		Container: req.Container,
+		Previous:  req.Previous,
+		TailLines: &req.TailLines,
+	}
+
+	if req.SinceSeconds > 0 {
+		podLogOpts.SinceSeconds = &req.SinceSeconds
+	}
+
+	logRequest := client.Client.CoreV1().Pods(req.Namespace).GetLogs(req.PodName, podLogOpts)
+	logStream, err := logRequest.Stream(ctx)
+	if err != nil {
+		return mcp.NewToolResultErrorf("Failed to get logs: %v", err), nil
+	}
+	defer func() {
+		_ = logStream.Close()
+	}()
+
+	logs, err := io.ReadAll(logStream)
+	if err != nil {
+		return mcp.NewToolResultErrorf("Failed to read logs: %v", err), nil
+	}
+
+	return mcp.NewToolResultText(string(logs)), nil
+}
+
+// handleListFilters lists available and active filters
+func (s *K8sGptMCPServer) handleListFilters(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	coreFilters, additionalFilters, integrationFilters := analyzer.ListFilters()
+	active := viper.GetStringSlice("active_filters")
+
+	result := map[string]interface{}{
+		"coreFilters":        coreFilters,
+		"additionalFilters":  additionalFilters,
+		"integrationFilters": integrationFilters,
+		"activeFilters":      active,
+	}
+
+	resultJSON, err := marshalJSON(result)
+	if err != nil {
+		return mcp.NewToolResultErrorf("Failed to serialize result: %v", err), nil
+	}
+
+	return mcp.NewToolResultText(resultJSON), nil
+}
+
+// handleAddFilters adds filters to enable specific analyzers
+func (s *K8sGptMCPServer) handleAddFilters(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	var req struct {
+		Filters []string `json:"filters"`
+	}
+	if err := request.BindArguments(&req); err != nil {
+		return mcp.NewToolResultErrorf("Failed to parse request arguments: %v", err), nil
+	}
+
+	if len(req.Filters) == 0 {
+		return mcp.NewToolResultErrorf("filters array is required and cannot be empty"), nil
+	}
+
+	activeFilters := viper.GetStringSlice("active_filters")
+	addedFilters := []string{}
+	
+	for _, filter := range req.Filters {
+		if !contains(activeFilters, filter) {
+			activeFilters = append(activeFilters, filter)
+			addedFilters = append(addedFilters, filter)
+		}
+	}
+
+	viper.Set("active_filters", activeFilters)
+	if err := viper.WriteConfig(); err != nil {
+		return mcp.NewToolResultErrorf("Failed to save configuration: %v", err), nil
+	}
+
+	if len(addedFilters) == 0 {
+		return mcp.NewToolResultText("All specified filters were already active"), nil
+	}
+
+	return mcp.NewToolResultText(fmt.Sprintf("Successfully added filters: %v", addedFilters)), nil
+}
+
+// handleRemoveFilters removes filters to disable specific analyzers
+func (s *K8sGptMCPServer) handleRemoveFilters(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	var req struct {
+		Filters []string `json:"filters"`
+	}
+	if err := request.BindArguments(&req); err != nil {
+		return mcp.NewToolResultErrorf("Failed to parse request arguments: %v", err), nil
+	}
+
+	if len(req.Filters) == 0 {
+		return mcp.NewToolResultErrorf("filters array is required and cannot be empty"), nil
+	}
+
+	activeFilters := viper.GetStringSlice("active_filters")
+	newFilters := []string{}
+	removedFilters := []string{}
+	
+	for _, filter := range activeFilters {
+		if !contains(req.Filters, filter) {
+			newFilters = append(newFilters, filter)
+		} else {
+			removedFilters = append(removedFilters, filter)
+		}
+	}
+
+	viper.Set("active_filters", newFilters)
+	if err := viper.WriteConfig(); err != nil {
+		return mcp.NewToolResultErrorf("Failed to save configuration: %v", err), nil
+	}
+
+	if len(removedFilters) == 0 {
+		return mcp.NewToolResultText("None of the specified filters were active"), nil
+	}
+
+	return mcp.NewToolResultText(fmt.Sprintf("Successfully removed filters: %v", removedFilters)), nil
+}
+
+// handleListIntegrations lists available integrations
+func (s *K8sGptMCPServer) handleListIntegrations(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) {
+	integrationProvider := integration.NewIntegration()
+	integrations := integrationProvider.List()
+
+	result := []map[string]interface{}{}
+	for _, integ := range integrations {
+		active, _ := integrationProvider.IsActivate(integ)
+		result = append(result, map[string]interface{}{
+			"name":   integ,
+			"active": active,
+		})
+	}
+
+	resultJSON, err := marshalJSON(result)
+	if err != nil {
+		return mcp.NewToolResultErrorf("Failed to serialize result: %v", err), nil
+	}
+
+	return mcp.NewToolResultText(resultJSON), nil
+}
+
+// contains checks if a string slice contains a specific string
+func contains(slice []string, item string) bool {
+	for _, s := range slice {
+		if s == item {
+			return true
+		}
+	}
+	return false
+}
--- a/pkg/server/mcp_prompts.go
+++ b/pkg/server/mcp_prompts.go
@@ -0,0 +1,170 @@
+/*
+Copyright 2024 The K8sGPT Authors.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package server
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/mark3labs/mcp-go/mcp"
+)
+
+// getTroubleshootPodPrompt returns a prompt for pod troubleshooting
+func (s *K8sGptMCPServer) getTroubleshootPodPrompt(ctx context.Context, request mcp.GetPromptRequest) (*mcp.GetPromptResult, error) {
+	podName := ""
+	namespace := ""
+	if request.Params.Arguments != nil {
+		podName = request.Params.Arguments["podName"]
+		namespace = request.Params.Arguments["namespace"]
+	}
+
+	promptText := fmt.Sprintf(`You are troubleshooting a Kubernetes pod issue.
+
+Pod: %s
+Namespace: %s
+
+Troubleshooting steps:
+1. Use 'get-resource' tool to get pod details and check status, conditions, and events
+2. Use 'list-events' tool with the pod name to see recent events
+3. Use 'get-logs' tool to check container logs for errors
+4. Check if the pod has multiple containers and inspect each
+5. If the pod is in CrashLoopBackOff, use 'get-logs' with previous=true
+6. Use 'analyze' tool with filters=['Pod'] to get AI-powered analysis
+7. Check related resources like ConfigMaps, Secrets, and PVCs
+
+Common issues to check:
+- Image pull errors (check imagePullSecrets)
+- Resource limits (CPU/memory)
+- Liveness/readiness probe failures
+- Volume mount issues
+- Environment variable problems
+- Network connectivity issues`, podName, namespace)
+
+	return &mcp.GetPromptResult{
+		Description: "Pod troubleshooting guide",
+		Messages: []mcp.PromptMessage{
+			{
+				Role: "user",
+				Content: mcp.TextContent{
+					Type: "text",
+					Text: promptText,
+				},
+			},
+		},
+	}, nil
+}
+
+// getTroubleshootDeploymentPrompt returns a prompt for deployment troubleshooting
+func (s *K8sGptMCPServer) getTroubleshootDeploymentPrompt(ctx context.Context, request mcp.GetPromptRequest) (*mcp.GetPromptResult, error) {
+	deploymentName := ""
+	namespace := ""
+	if request.Params.Arguments != nil {
+		deploymentName = request.Params.Arguments["deploymentName"]
+		namespace = request.Params.Arguments["namespace"]
+	}
+
+	promptText := fmt.Sprintf(`You are troubleshooting a Kubernetes deployment issue.
+
+Deployment: %s
+Namespace: %s
+
+Troubleshooting steps:
+1. Use 'get-resource' tool to get deployment details and check replica status
+2. Use 'list-resources' with resourceType='replicasets' to check ReplicaSets
+3. Use 'list-resources' with resourceType='pods' and labelSelector to find deployment pods
+4. Use 'list-events' tool to see deployment-related events
+5. Use 'analyze' tool with filters=['Deployment','Pod'] for comprehensive analysis
+6. Check pod status and logs for individual pod issues
+7. Verify image availability and pull secrets
+8. Check resource quotas and limits
+
+Common deployment issues:
+- Insufficient resources in the cluster
+- Image pull failures
+- Invalid configuration (ConfigMaps/Secrets)
+- Failed rolling updates
+- Readiness probe failures preventing rollout
+- PVC binding issues
+- Node selector/affinity constraints`, deploymentName, namespace)
+
+	return &mcp.GetPromptResult{
+		Description: "Deployment troubleshooting guide",
+		Messages: []mcp.PromptMessage{
+			{
+				Role: "user",
+				Content: mcp.TextContent{
+					Type: "text",
+					Text: promptText,
+				},
+			},
+		},
+	}, nil
+}
+
+// getTroubleshootClusterPrompt returns a prompt for general cluster troubleshooting
+func (s *K8sGptMCPServer) getTroubleshootClusterPrompt(ctx context.Context, request mcp.GetPromptRequest) (*mcp.GetPromptResult, error) {
+	promptText := `You are performing a general Kubernetes cluster health check and troubleshooting.
+
+Recommended troubleshooting workflow:
+
+1. CLUSTER OVERVIEW:
+   - Use 'cluster-info' to get cluster version
+   - Use 'list-namespaces' to see all namespaces
+   - Use 'list-resources' with resourceType='nodes' to check node health
+
+2. RESOURCE ANALYSIS:
+   - Use 'analyze' tool with explain=true for comprehensive AI-powered analysis
+   - Start with core resources: filters=['Pod','Deployment','Service']
+   - Add more filters as needed: ['Node','PersistentVolumeClaim','Job','CronJob']
+
+3. EVENT INSPECTION:
+   - Use 'list-events' to see recent cluster events
+   - Filter by namespace for focused troubleshooting
+   - Look for Warning and Error events
+
+4. SPECIFIC RESOURCE INVESTIGATION:
+   - Use 'list-resources' to find problematic resources
+   - Use 'get-resource' for detailed inspection
+   - Use 'get-logs' to examine container logs
+
+5. CONFIGURATION CHECK:
+   - Use 'list-filters' to see available analyzers
+   - Use 'list-integrations' to check integrations (Prometheus, AWS, etc.)
+   - Use 'config' tool to modify settings if needed
+
+Common cluster-wide issues:
+- Node pressure (CPU, memory, disk)
+- Network policies blocking traffic
+- Storage provisioning problems
+- RBAC permission issues
+- Certificate expiration
+- Control plane component failures
+- Resource quota exhaustion
+- DNS resolution problems
+
+Use the available tools systematically to narrow down the issue.`
+
+	return &mcp.GetPromptResult{
+		Description: "General cluster troubleshooting guide",
+		Messages: []mcp.PromptMessage{
+			{
+				Role: "user",
+				Content: mcp.TextContent{
+					Type: "text",
+					Text: promptText,
+				},
+			},
+		},
+	}, nil
+}
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -54,6 +54,8 @@ type Config struct {
 	AnalyzeHandler *analyze.Handler
 	QueryHandler   *query.Handler
 	Logger         *zap.Logger
+	// Filters can be injected into the server to limit analysis to specific analyzers
+	Filters        []string
 	metricsServer  *http.Server
 	listener       net.Listener
 	EnableHttp     bool
--- a/pkg/server/server_test.go
+++ b/pkg/server/server_test.go
@@ -1,11 +1,15 @@
 package server

 import (
+	"bytes"
 	"context"
+	"io"
 	"net"
+	"net/http"
 	"testing"
 	"time"

+	"github.com/k8sgpt-ai/k8sgpt/pkg/ai"
 	"github.com/stretchr/testify/assert"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
@@ -14,7 +18,12 @@ import (

 func TestServe(t *testing.T) {
 	logger, _ := zap.NewDevelopment()
-	defer logger.Sync()
+	defer func() {
+		err := logger.Sync()
+		if err != nil {
+			t.Logf("logger.Sync() error: %v", err)
+		}
+	}()

 	s := &Config{
 		Port:       "50059",
@@ -34,7 +43,11 @@ func TestServe(t *testing.T) {

 	conn, err := grpc.Dial("localhost:50059", grpc.WithInsecure())
 	assert.NoError(t, err, "Should be able to dial the server")
-	defer conn.Close()
+	defer func() {
+		if err := conn.Close(); err != nil {
+			t.Logf("failed to close connection: %v", err)
+		}
+	}()

 	// Test a simple gRPC reflection request
 	cli := grpc_reflection_v1alpha.NewServerReflectionClient(conn)
@@ -49,12 +62,278 @@ func TestServe(t *testing.T) {
 	assert.NoError(t, err, "Shutdown should not return an error")
 }

+// TestMCPServerCreation tests the creation of an MCP server
+func TestMCPServerCreation(t *testing.T) {
+	logger, _ := zap.NewDevelopment()
+	defer func() {
+		err := logger.Sync()
+		if err != nil {
+			t.Logf("logger.Sync() error: %v", err)
+		}
+	}()
+
+	aiProvider := &ai.AIProvider{
+		Name:     "test-provider",
+		Password: "test-password",
+		Model:    "test-model",
+	}
+
+	// Test HTTP mode
+	mcpServer, err := NewMCPServer("8088", aiProvider, true, logger)
+	assert.NoError(t, err, "Should be able to create MCP server with HTTP transport")
+	assert.NotNil(t, mcpServer, "MCP server should not be nil")
+	assert.True(t, mcpServer.useHTTP, "MCP server should be in HTTP mode")
+	assert.Equal(t, "8088", mcpServer.port, "Port should be set correctly")
+
+	// Test stdio mode
+	mcpServerStdio, err := NewMCPServer("8088", aiProvider, false, logger)
+	assert.NoError(t, err, "Should be able to create MCP server with stdio transport")
+	assert.NotNil(t, mcpServerStdio, "MCP server should not be nil")
+	assert.False(t, mcpServerStdio.useHTTP, "MCP server should be in stdio mode")
+}
+
+// TestMCPServerBasicHTTP tests basic HTTP connectivity to the MCP server
+func TestMCPServerBasicHTTP(t *testing.T) {
+	logger, _ := zap.NewDevelopment()
+	defer func() {
+		err := logger.Sync()
+		if err != nil {
+			t.Logf("logger.Sync() error: %v", err)
+		}
+	}()
+
+	aiProvider := &ai.AIProvider{
+		Name:     "test-provider",
+		Password: "test-password",
+		Model:    "test-model",
+	}
+
+	mcpServer, err := NewMCPServer("8091", aiProvider, true, logger)
+	assert.NoError(t, err, "Should be able to create MCP server")
+
+	// For HTTP mode, the server is already started in NewMCPServer
+	// No need to call Start() as it's already running in a goroutine
+
+	// Wait for the server to start
+	err = waitForPort("localhost:8091", 10*time.Second)
+	if err != nil {
+		t.Skipf("MCP server did not start within timeout: %v", err)
+	}
+
+	// First, initialize the session
+	initRequest := `{
+		"jsonrpc": "2.0",
+		"id": 1,
+		"method": "initialize",
+		"params": {
+			"protocolVersion": "2025-03-26",
+			"capabilities": {
+				"tools": {},
+				"resources": {},
+				"prompts": {}
+			},
+			"clientInfo": {
+				"name": "test-client",
+				"version": "1.0.0"
+			}
+		}
+	}`
+
+	initResp, err := http.Post("http://localhost:8091/mcp", "application/json", bytes.NewBufferString(initRequest))
+	if err != nil {
+		t.Logf("Initialize request failed: %v", err)
+		return
+	}
+	defer func() {
+		if err := initResp.Body.Close(); err != nil {
+			t.Logf("Error closing init response body: %v", err)
+		}
+	}()
+
+	// Read initialization response
+	initBody, err := io.ReadAll(initResp.Body)
+	if err != nil {
+		t.Logf("Failed to read init response body: %v", err)
+	} else {
+		t.Logf("Init response status: %d, body: %s", initResp.StatusCode, string(initBody))
+	}
+
+	// Extract session ID from response headers if present
+	sessionID := initResp.Header.Get("Mcp-Session-Id")
+	if sessionID == "" {
+		t.Logf("No session ID in response headers")
+	}
+
+	// Now test tools/list with session ID if available
+	headers := map[string]string{
+		"Content-Type": "application/json",
+		"Accept":       "application/json,text/event-stream",
+	}
+	if sessionID != "" {
+		headers["Mcp-Session-Id"] = sessionID
+	}
+
+	req, err := http.NewRequest("POST", "http://localhost:8091/mcp", bytes.NewBufferString(`{"jsonrpc":"2.0","id":2,"method":"tools/list","params":{}}`))
+	if err != nil {
+		t.Logf("Failed to create request: %v", err)
+		return
+	}
+
+	for key, value := range headers {
+		req.Header.Set(key, value)
+	}
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		t.Logf("MCP endpoint test skipped (server might not be fully ready): %v", err)
+		return
+	}
+	defer func() {
+		err := resp.Body.Close()
+		if err != nil {
+			t.Logf("resp.Body.Close() error: %v", err)
+		}
+	}()
+
+	// Read response body for debugging
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		t.Logf("Failed to read response body: %v", err)
+	} else {
+		t.Logf("Response status: %d, body: %s", resp.StatusCode, string(body))
+	}
+
+	// Accept both 200 and 404 as valid responses (404 means endpoint not implemented)
+	if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusNotFound {
+		t.Errorf("MCP endpoint returned unexpected status: %d", resp.StatusCode)
+	}
+
+	// Cleanup
+	err = mcpServer.Close()
+	assert.NoError(t, err, "MCP server should close without error")
+}
+
+// TestMCPServerToolCall tests calling a specific tool (analyze) through the MCP server
+func TestMCPServerToolCall(t *testing.T) {
+	logger, _ := zap.NewDevelopment()
+	defer func() {
+		err := logger.Sync()
+		if err != nil {
+			t.Logf("logger.Sync() error: %v", err)
+		}
+	}()
+
+	aiProvider := &ai.AIProvider{
+		Name:     "test-provider",
+		Password: "test-password",
+		Model:    "test-model",
+	}
+
+	mcpServer, err := NewMCPServer("8090", aiProvider, true, logger)
+	assert.NoError(t, err, "Should be able to create MCP server")
+
+	// For HTTP mode, the server is already started in NewMCPServer
+	// No need to call Start() as it's already running in a goroutine
+
+	// Wait for the server to start
+	err = waitForPort("localhost:8090", 10*time.Second)
+	if err != nil {
+		t.Skipf("MCP server did not start within timeout: %v", err)
+	}
+
+	// First, initialize the session
+	initRequest := `{
+		"jsonrpc": "2.0",
+		"id": 1,
+		"method": "initialize",
+		"params": {
+			"protocolVersion": "2025-03-26",
+			"capabilities": {
+				"tools": {},
+				"resources": {},
+				"prompts": {}
+			},
+			"clientInfo": {
+				"name": "test-client",
+				"version": "1.0.0"
+			}
+		}
+	}`
+
+	initResp, err := http.Post("http://localhost:8090/mcp", "application/json", bytes.NewBufferString(initRequest))
+	if err != nil {
+		t.Logf("Initialize request failed: %v", err)
+		return
+	}
+	defer func() {
+		if err := initResp.Body.Close(); err != nil {
+			t.Logf("Error closing init response body: %v", err)
+		}
+	}()
+
+	// Extract session ID from response headers if present
+	sessionID := initResp.Header.Get("Mcp-Session-Id")
+
+	// Test calling the analyze tool with proper JSON-RPC format
+	analyzeRequest := `{
+		"jsonrpc": "2.0",
+		"id": 2,
+		"method": "tools/call",
+		"params": {
+			"name": "analyze",
+			"arguments": {
+				"namespace": "default",
+				"backend": "openai",
+				"language": "english",
+				"explain": true,
+				"maxConcurrency": 10
+			}
+		}
+	}`
+
+	// Create request with session ID if available
+	req, err := http.NewRequest("POST", "http://localhost:8090/mcp", bytes.NewBufferString(analyzeRequest))
+	if err != nil {
+		t.Logf("Failed to create request: %v", err)
+		return
+	}
+
+	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set("Accept", "application/json,text/event-stream")
+	if sessionID != "" {
+		req.Header.Set("Mcp-Session-Id", sessionID)
+	}
+
+	client := &http.Client{}
+	resp, err := client.Do(req)
+	if err != nil {
+		t.Logf("Analyze tool call test skipped (server might not be fully ready): %v", err)
+		return
+	}
+	defer func() {
+		err := resp.Body.Close()
+		if err != nil {
+			t.Logf("resp.Body.Close() error: %v", err)
+		}
+	}()
+
+	// Accept both 200 and 404 as valid responses
+	if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusNotFound {
+		t.Errorf("Analyze tool call returned unexpected status: %d", resp.StatusCode)
+	}
+
+	// Cleanup
+	err = mcpServer.Close()
+	assert.NoError(t, err, "MCP server should close without error")
+}
+
 func waitForPort(address string, timeout time.Duration) error {
 	start := time.Now()
 	for {
 		conn, err := net.Dial("tcp", address)
 		if err == nil {
-			conn.Close()
+			_ = conn.Close()
 			return nil
 		}
 		if time.Since(start) > timeout {
--- a/pkg/util/util_test.go
+++ b/pkg/util/util_test.go
@@ -14,6 +14,8 @@ limitations under the License.
 package util

 import (
+	"encoding/base64"
+	"fmt"
 	"testing"

 	"github.com/k8sgpt-ai/k8sgpt/pkg/kubernetes"
@@ -23,6 +25,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	networkingv1 "k8s.io/api/networking/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/kubernetes/fake"
 )

@@ -503,3 +506,74 @@ func TestLabelsIncludeAny(t *testing.T) {
 		})
 	}
 }
+
+func TestMaskString(t *testing.T) {
+	input := "mysecret"
+	masked := MaskString(input)
+	// decode base64 to compare properties
+	decoded, err := base64.StdEncoding.DecodeString(masked)
+	require.NoError(t, err)
+	require.Len(t, decoded, len(input))
+	// ensure it is not equal to input
+	require.NotEqual(t, input, string(decoded))
+	// ensure all runes are from anonymizePattern
+	allowed := make(map[rune]struct{})
+	for _, r := range anonymizePattern {
+		allowed[r] = struct{}{}
+	}
+	for _, r := range string(decoded) {
+		_, ok := allowed[r]
+		require.True(t, ok, "unexpected rune: %q", r)
+	}
+}
+
+func TestNewHeaders(t *testing.T) {
+	input := []string{
+		"X-Test: foo",
+		"X-Test: bar",
+		"Content-Type: application/json",
+		"InvalidHeader", // should be ignored
+	}
+	hs := NewHeaders(input)
+	// flatten to a map for easier assertions
+	got := map[string][]string{}
+	for _, h := range hs {
+		for k, v := range h {
+			got[k] = append(got[k], v...)
+		}
+	}
+	// expected values
+	require.Contains(t, got, "X-Test")
+	require.Contains(t, got, "Content-Type")
+	// order of values is not guaranteed
+	require.ElementsMatch(t, []string{"foo", "bar"}, got["X-Test"])
+	require.ElementsMatch(t, []string{"application/json"}, got["Content-Type"])
+}
+
+func TestLabelStrToSelector(t *testing.T) {
+	// empty case returns nil
+	require.Nil(t, LabelStrToSelector(""))
+
+	sel := LabelStrToSelector("key=value,foo=bar")
+	require.NotNil(t, sel)
+
+	// matches exact set
+	m := map[string]string{"key": "value", "foo": "bar"}
+	require.True(t, sel.Matches(labels.Set(m)))
+
+	// does not match different values
+	m2 := map[string]string{"key": "other", "foo": "bar"}
+	require.False(t, sel.Matches(labels.Set(m2)))
+}
+
+func TestCaptureOutput(t *testing.T) {
+	out := CaptureOutput(func() {
+		fmt.Print("hello world")
+	})
+	require.Equal(t, "hello world", out)
+}
+
+func TestContains(t *testing.T) {
+	require.True(t, Contains("abcdef", "bcd"))
+	require.False(t, Contains("abcdef", "xyz"))
+}