diff --git a/Cargo.lock b/Cargo.lock
index be71472..fed0ccb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2846,7 +2846,9 @@ dependencies = [
  "temp_testdir",
  "tracing",
  "tracing-test",
+ "tree-sitter-java",
  "tree-sitter-javascript",
+ "tree-sitter-python",
  "tree-sitter-tags",
  "walkdir",
 ]
@@ -3493,6 +3495,16 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "tree-sitter-java"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0bf5d3f508cbffcbfe1805834101c0d24297a8b6c2184ad9c595556c46d2420"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "tree-sitter-javascript"
 version = "0.20.0"
@@ -3503,6 +3515,16 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-python"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dda114f58048f5059dcf158aff691dffb8e113e6d2b50d94263fd68711975287"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "tree-sitter-tags"
 version = "0.20.2"
diff --git a/crates/tabby-scheduler/Cargo.toml b/crates/tabby-scheduler/Cargo.toml
index b5b383e..c72adc4 100644
--- a/crates/tabby-scheduler/Cargo.toml
+++ b/crates/tabby-scheduler/Cargo.toml
@@ -19,6 +19,8 @@ lazy_static = { workspace = true }
 serde = { workspace = true }
 serde-jsonlines = { workspace = true }
 file-rotate = "0.7.5"
+tree-sitter-java = "0.20.0"
+tree-sitter-python = "0.20.2"
 
 [dev-dependencies]
 temp_testdir = "0.2"
diff --git a/crates/tabby-scheduler/src/dataset.rs b/crates/tabby-scheduler/src/dataset.rs
index c926dc0..9acccb3 100644
--- a/crates/tabby-scheduler/src/dataset.rs
+++ b/crates/tabby-scheduler/src/dataset.rs
@@ -222,16 +222,40 @@ lazy_static! {
         map
     };
     static ref LANGUAGE_TAGS: HashMap<&'static str, TagsConfigurationSync> = {
-        HashMap::from([(
-            "javascript",
-            TagsConfigurationSync(
-                TagsConfiguration::new(
-                    tree_sitter_javascript::language(),
-                    tree_sitter_javascript::TAGGING_QUERY,
-                    tree_sitter_javascript::LOCALS_QUERY,
-                )
-                .unwrap(),
+        HashMap::from([
+            (
+                "javascript",
+                TagsConfigurationSync(
+                    TagsConfiguration::new(
+                        tree_sitter_javascript::language(),
+                        tree_sitter_javascript::TAGGING_QUERY,
+                        tree_sitter_javascript::LOCALS_QUERY,
+                    )
+                    .unwrap(),
+                ),
             ),
-        )])
+            (
+                "python",
+                TagsConfigurationSync(
+                    TagsConfiguration::new(
+                        tree_sitter_python::language(),
+                        tree_sitter_python::TAGGING_QUERY,
+                        "",
+                    )
+                    .unwrap(),
+                ),
+            ),
+            (
+                "java",
+                TagsConfigurationSync(
+                    TagsConfiguration::new(
+                        tree_sitter_java::language(),
+                        tree_sitter_java::TAGGING_QUERY,
+                        "",
+                    )
+                    .unwrap(),
+                ),
+            ),
+        ])
     };
 }