diff --git a/Cargo.lock b/Cargo.lock
index 9a8894a..105aee6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2989,10 +2989,14 @@ dependencies = [
  "temp_testdir",
  "tracing",
  "tracing-test",
+ "tree-sitter-go",
+ "tree-sitter-java",
  "tree-sitter-javascript",
+ "tree-sitter-lua",
  "tree-sitter-python",
  "tree-sitter-rust",
  "tree-sitter-tags",
+ "tree-sitter-typescript",
  "walkdir",
 ]
 
@@ -3652,6 +3656,26 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "tree-sitter-go"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ad6d11f19441b961af2fda7f12f5d0dac325f6d6de83836a1d3750018cc5114"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
+[[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"
@@ -3662,6 +3686,16 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-lua"
+version = "0.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0968cf4962ead1d26da28921dde1fd97407e7bbcf2f959cd20cf04ba2daa9421"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "tree-sitter-python"
 version = "0.20.2"
@@ -3694,6 +3728,16 @@ dependencies = [
  "tree-sitter",
 ]
 
+[[package]]
+name = "tree-sitter-typescript"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "079c695c32d39ad089101c66393aeaca30e967fba3486a91f573d2f0e12d290a"
+dependencies = [
+ "cc",
+ "tree-sitter",
+]
+
 [[package]]
 name = "try-lock"
 version = "0.2.4"
diff --git a/crates/tabby-scheduler/Cargo.toml b/crates/tabby-scheduler/Cargo.toml
index a1f3d3b..efbb274 100644
--- a/crates/tabby-scheduler/Cargo.toml
+++ b/crates/tabby-scheduler/Cargo.toml
@@ -21,6 +21,10 @@ serde-jsonlines = { workspace = true }
 file-rotate = "0.7.5"
 tree-sitter-python = "0.20.2"
 tree-sitter-rust = "0.20.3"
+tree-sitter-go = "0.20.0"
+tree-sitter-java = "0.20.0"
+tree-sitter-typescript = "0.20.2"
+tree-sitter-lua = "0.0.19"
 
 [dev-dependencies]
 temp_testdir = "0.2"
diff --git a/crates/tabby-scheduler/src/dataset.rs b/crates/tabby-scheduler/src/dataset.rs
index c20ada9..e467f16 100644
--- a/crates/tabby-scheduler/src/dataset.rs
+++ b/crates/tabby-scheduler/src/dataset.rs
@@ -193,7 +193,8 @@ lazy_static! {
             ("haskell", vec!["hs"]),
             ("html", vec!["html"]),
             ("java", vec!["java"]),
-            ("javascript", vec!["js"]),
+            ("javascript", vec!["js", "mjs"]),
+            ("jsx", vec!["jsx"]),
             ("julia", vec!["jl"]),
             ("lua", vec!["lua"]),
             ("makefile", vec!["Makefile"]),
@@ -207,7 +208,7 @@ lazy_static! {
             ("sql", vec!["sql"]),
             ("scala", vec!["scala"]),
             ("shellscript", vec!["sh", "bash", "command", "zsh"]),
-            ("typescript", vec!["ts"]),
+            ("typescript", vec!["ts", "mts"]),
             ("tsx", vec!["tsx"]),
             ("tex", vec!["tex"]),
             ("vb", vec!["vb"]),
@@ -247,6 +248,83 @@ lazy_static! {
                     .unwrap(),
                 ),
             ),
+            (
+                "javascript",
+                TagsConfigurationSync(
+                    TagsConfiguration::new(
+                        tree_sitter_javascript::language(),
+                        tree_sitter_javascript::TAGGING_QUERY,
+                        "",
+                    )
+                    .unwrap(),
+                ),
+            ),
+            (
+                "jsx",
+                TagsConfigurationSync(
+                    TagsConfiguration::new(
+                        tree_sitter_javascript::language(),
+                        tree_sitter_javascript::TAGGING_QUERY,
+                        "",
+                    )
+                    .unwrap(),
+                ),
+            ),
+            (
+                "typescript",
+                TagsConfigurationSync(
+                    TagsConfiguration::new(
+                        tree_sitter_typescript::language_typescript(),
+                        tree_sitter_typescript::TAGGING_QUERY,
+                        "",
+                    )
+                    .unwrap(),
+                ),
+            ),
+            (
+                "tsx",
+                TagsConfigurationSync(
+                    TagsConfiguration::new(
+                        tree_sitter_typescript::language_tsx(),
+                        tree_sitter_typescript::TAGGING_QUERY,
+                        "",
+                    )
+                    .unwrap(),
+                ),
+            ),
+            (
+                "java",
+                TagsConfigurationSync(
+                    TagsConfiguration::new(
+                        tree_sitter_java::language(),
+                        tree_sitter_java::TAGGING_QUERY,
+                        "",
+                    )
+                    .unwrap(),
+                ),
+            ),
+            (
+                "go",
+                TagsConfigurationSync(
+                    TagsConfiguration::new(
+                        tree_sitter_go::language(),
+                        tree_sitter_go::TAGGING_QUERY,
+                        "",
+                    )
+                    .unwrap(),
+                ),
+            ),
+            (
+                "lua",
+                TagsConfigurationSync(
+                    TagsConfiguration::new(
+                        tree_sitter_lua::language(),
+                        tree_sitter_lua::TAGS_QUERY,
+                        "",
+                    )
+                    .unwrap(),
+                ),
+            ),
         ])
     };
 }