diff --git a/.github/workflows/rust_lint.yml b/.github/workflows/rust_lint.yml
index bbd2059b64..63ef2e297b 100644
--- a/.github/workflows/rust_lint.yml
+++ b/.github/workflows/rust_lint.yml
@@ -41,9 +41,6 @@ jobs:
         with:
           toolchain: stable
           override: true
-      - name: Install cargo-make
-        run: cargo install --force cargo-make
-        working-directory: frontend
       - run: rustup component add clippy
         working-directory: frontend/rust-lib
       - run: cargo clippy --no-default-features
diff --git a/frontend/app_flowy/packages/flowy_sdk/.gitignore b/frontend/app_flowy/packages/flowy_sdk/.gitignore
index 201588c133..a70bdcd7d3 100644
--- a/frontend/app_flowy/packages/flowy_sdk/.gitignore
+++ b/frontend/app_flowy/packages/flowy_sdk/.gitignore
@@ -78,4 +78,4 @@ build/
 **/*.lib
 **/*.dll
 **/*.so
-lib/**/dart_event.dart
\ No newline at end of file
+# lib/**/dart_event.dart
\ No newline at end of file
diff --git a/shared-lib/flowy-derive/src/proto_buf/util.rs b/shared-lib/flowy-derive/src/proto_buf/util.rs
index f88a1e453a..49a5ee1605 100644
--- a/shared-lib/flowy-derive/src/proto_buf/util.rs
+++ b/shared-lib/flowy-derive/src/proto_buf/util.rs
@@ -1,7 +1,7 @@
 use dashmap::{DashMap, DashSet};
 use flowy_ast::{Ctxt, TyInfo};
 use lazy_static::lazy_static;
-use lib_infra::code_gen::protobuf_file::ProtoCache;
+use lib_infra::code_gen::ProtoCache;
 use std::fs::File;
 use std::io::Read;
 use std::sync::atomic::{AtomicBool, Ordering};
diff --git a/shared-lib/lib-infra/src/code_gen/dart_event/dart_event.rs b/shared-lib/lib-infra/src/code_gen/dart_event/dart_event.rs
index 697fd8b0a1..4f21256661 100644
--- a/shared-lib/lib-infra/src/code_gen/dart_event/dart_event.rs
+++ b/shared-lib/lib-infra/src/code_gen/dart_event/dart_event.rs
@@ -43,7 +43,7 @@ pub fn gen(crate_name: &str) {
 }
 
 const DART_IMPORTED: &str = r#"
-/// Auto gen code from rust ast, do not edit
+/// Auto generate. Do not edit
 part of 'dispatch.dart';
 "#;
 
diff --git a/shared-lib/lib-infra/src/code_gen/mod.rs b/shared-lib/lib-infra/src/code_gen/mod.rs
index 2e8f026fde..c2651bcbcf 100644
--- a/shared-lib/lib-infra/src/code_gen/mod.rs
+++ b/shared-lib/lib-infra/src/code_gen/mod.rs
@@ -9,3 +9,9 @@ mod flowy_toml;
 
 #[cfg(any(feature = "pb_gen", feature = "dart_event"))]
 pub mod util;
+
+#[derive(serde::Serialize, serde::Deserialize)]
+pub struct ProtoCache {
+    pub structs: Vec<String>,
+    pub enums: Vec<String>,
+}
diff --git a/shared-lib/lib-infra/src/code_gen/protobuf_file/proto_gen.rs b/shared-lib/lib-infra/src/code_gen/protobuf_file/proto_gen.rs
index c4aa5170aa..d4ff2f56bb 100644
--- a/shared-lib/lib-infra/src/code_gen/protobuf_file/proto_gen.rs
+++ b/shared-lib/lib-infra/src/code_gen/protobuf_file/proto_gen.rs
@@ -6,6 +6,7 @@ use crate::code_gen::protobuf_file::ast::parse_crate_protobuf;
 use crate::code_gen::protobuf_file::proto_info::ProtobufCrateContext;
 use crate::code_gen::protobuf_file::ProtoFile;
 use crate::code_gen::util::*;
+use crate::code_gen::ProtoCache;
 use std::fs::File;
 use std::path::Path;
 use std::{fs::OpenOptions, io::Write};
@@ -92,12 +93,6 @@ fn write_rust_crate_mod_file(crate_contexts: &[ProtobufCrateContext]) {
     }
 }
 
-#[derive(serde::Serialize, serde::Deserialize)]
-pub struct ProtoCache {
-    pub structs: Vec<String>,
-    pub enums: Vec<String>,
-}
-
 impl ProtoCache {
     fn from_crate_contexts(crate_contexts: &[ProtobufCrateContext]) -> Self {
         let proto_files = crate_contexts