diff --git a/pkgs/by-name/mi/mistral-vibe/package.nix b/pkgs/by-name/mi/mistral-vibe/package.nix
index 5883d3eba806..bbe3726b7a42 100644
--- a/pkgs/by-name/mi/mistral-vibe/package.nix
+++ b/pkgs/by-name/mi/mistral-vibe/package.nix
@@ -12,14 +12,14 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "mistral-vibe";
-  version = "2.1.0";
+  version = "2.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mistralai";
     repo = "mistral-vibe";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Xeb16Ravk60DXAjRs1OcCl8axCRwTf9yqXWnva9VQro=";
+    hash = "sha256-q79/xP+kaovkch5wXzXumQb9l4wSspXg2cl7mD0Q2f8=";
   };
 
   build-system = with python3Packages; [
@@ -32,9 +32,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     "agent-client-protocol"
     "gitpython"
     "mistralai"
-    "pydantic"
     "pydantic-settings"
-    "watchfiles"
     "zstandard"
   ];
   dependencies = with python3Packages; [
@@ -43,6 +41,7 @@ python3Packages.buildPythonApplication (finalAttrs: {
     cryptography
     gitpython
     giturlparse
+    google-auth
     httpx
     keyring
     mcp
@@ -54,12 +53,13 @@ python3Packages.buildPythonApplication (finalAttrs: {
     pyperclip
     python-dotenv
     pyyaml
+    requests
     rich
     textual
     textual-speedups
     tomli-w
     tree-sitter
-    tree-sitter-grammars.tree-sitter-bash
+    tree-sitter-bash
     watchfiles
     zstandard
   ];
diff --git a/pkgs/development/python-modules/tree-sitter-bash/default.nix b/pkgs/development/python-modules/tree-sitter-bash/default.nix
new file mode 100644
index 000000000000..0d10f9a7bc47
--- /dev/null
+++ b/pkgs/development/python-modules/tree-sitter-bash/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  tree-sitter,
+  pytestCheckHook,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "tree-sitter-bash";
+  version = "0.25.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "tree-sitter";
+    repo = "tree-sitter-bash";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ONQ1Ljk3aRWjElSWD2crCFZraZoRj3b3/VELz1789GE=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  optional-dependencies = {
+    core = [
+      tree-sitter
+    ];
+  };
+
+  pythonImportsCheck = [ "tree_sitter_bash" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    tree-sitter
+  ];
+
+  meta = {
+    description = "Bash grammar for tree-sitter";
+    homepage = "https://github.com/tree-sitter/tree-sitter-bash";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5d294524ca5e..2674d468bcf1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19353,6 +19353,8 @@ self: super: with self; {
 
   tree-sitter = callPackage ../development/python-modules/tree-sitter { };
 
+  tree-sitter-bash = callPackage ../development/python-modules/tree-sitter-bash { };
+
   tree-sitter-c-sharp = callPackage ../development/python-modules/tree-sitter-c-sharp { };
 
   tree-sitter-embedded-template =