diff --git a/java/src/main/kotlin/cc/unitmesh/idea/context/JavaCodeModifier.kt b/java/src/main/kotlin/cc/unitmesh/idea/context/JavaCodeModifier.kt
index 6dc85c0e90..bf788e10b8 100644
--- a/java/src/main/kotlin/cc/unitmesh/idea/context/JavaCodeModifier.kt
+++ b/java/src/main/kotlin/cc/unitmesh/idea/context/JavaCodeModifier.kt
@@ -37,7 +37,8 @@ open class JavaCodeModifier : CodeModifier {
             return false
         }
 
-        val isFullCode = trimCode.startsWith("import") && trimCode.contains("class ")
+        val isClassStarted = trimCode.startsWith("import") || trimCode.startsWith("package")
+        val isFullCode = isClassStarted && trimCode.contains("class ")
         // check is sourceFile has class
         val classes = runReadAction { lookupFile(project, sourceFile).classes }
 
diff --git a/src/222/main/resources/META-INF/autodev-core.xml b/src/222/main/resources/META-INF/autodev-core.xml
index 816dd10a83..d39195927a 100644
--- a/src/222/main/resources/META-INF/autodev-core.xml
+++ b/src/222/main/resources/META-INF/autodev-core.xml
@@ -28,7 +28,6 @@
                              bundle="messages.AutoDevBundle" key="settings.autodev.coder"/>
 
         <applicationService serviceImplementation="cc.unitmesh.devti.settings.AutoDevSettingsState"/>
-        <applicationService serviceImplementation="cc.unitmesh.devti.statusbar.AutoDevStatusService"/>
 
         <statusBarWidgetFactory id="AIAssistant" implementation="cc.unitmesh.devti.statusbar.AutoDevStatusBarWidgetFactory"/>
 
diff --git a/src/233/main/resources/META-INF/autodev-core.xml b/src/233/main/resources/META-INF/autodev-core.xml
index b397c0d695..d1c85abadf 100644
--- a/src/233/main/resources/META-INF/autodev-core.xml
+++ b/src/233/main/resources/META-INF/autodev-core.xml
@@ -28,7 +28,6 @@
                              bundle="messages.AutoDevBundle" key="settings.autodev.coder"/>
 
         <applicationService serviceImplementation="cc.unitmesh.devti.settings.AutoDevSettingsState"/>
-        <applicationService serviceImplementation="cc.unitmesh.devti.statusbar.AutoDevStatusService"/>
 
         <statusBarWidgetFactory id="AIAssistant" implementation="cc.unitmesh.devti.statusbar.AutoDevStatusBarWidgetFactory"/>
 
diff --git a/src/main/kotlin/cc/unitmesh/devti/statusbar/AutoDevStatusService.kt b/src/main/kotlin/cc/unitmesh/devti/statusbar/AutoDevStatusService.kt
index aa44271ccc..1e2698e588 100644
--- a/src/main/kotlin/cc/unitmesh/devti/statusbar/AutoDevStatusService.kt
+++ b/src/main/kotlin/cc/unitmesh/devti/statusbar/AutoDevStatusService.kt
@@ -2,10 +2,12 @@ package cc.unitmesh.devti.statusbar
 
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.components.Service
 import com.intellij.openapi.project.ProjectManager
 import com.intellij.openapi.util.Pair
 import io.opentelemetry.api.internal.GuardedBy
 
+@Service
 class AutoDevStatusService : AutoDevStatusListener, Disposable {
     private val lock = Any()