diff --git a/src/services/agentBrowser/index.ts b/src/services/agentBrowser/index.ts
index d61769dc..6de581d0 100644
--- a/src/services/agentBrowser/index.ts
+++ b/src/services/agentBrowser/index.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unnecessary-condition */
 import { injectable } from 'inversify';
 import { pick } from 'lodash';
 
diff --git a/src/services/agentInstance/index.ts b/src/services/agentInstance/index.ts
index 63a254d9..14894452 100644
--- a/src/services/agentInstance/index.ts
+++ b/src/services/agentInstance/index.ts
@@ -12,7 +12,6 @@ import { createHandlerHooks, createHooksWithPlugins, initializePluginSystem } fr
 import { promptConcatStream, PromptConcatStreamState } from '@services/agentInstance/promptConcat/promptConcat';
 import { AgentPromptDescription } from '@services/agentInstance/promptConcat/promptConcatSchema';
 import { promptConcatHandlerConfigJsonSchema } from '@services/agentInstance/promptConcat/promptConcatSchema/jsonSchema';
-import { container, lazyInject } from '@services/container';
 import { IDatabaseService } from '@services/database/interface';
 import { AgentInstanceEntity, AgentInstanceMessageEntity } from '@services/database/schema/agent';
 import { logger } from '@services/libs/log';
diff --git a/src/services/agentInstance/plugins/promptPlugins.ts b/src/services/agentInstance/plugins/promptPlugins.ts
index 3f9996b5..035dfafe 100644
--- a/src/services/agentInstance/plugins/promptPlugins.ts
+++ b/src/services/agentInstance/plugins/promptPlugins.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/require-await */
 /**
  * Built-in plugins for prompt concatenation
  */
@@ -38,7 +37,7 @@ export const fullReplacementPlugin: PromptConcatPlugin = (hooks) => {
     // Get all messages except the last user message being processed
     // We need to find and exclude only the current user message being processed, not just the last message
     const messagesCopy = cloneDeep(messages);
-    
+
     // Find the last user message (which is the one being processed in this round)
     let lastUserMessageIndex = -1;
     for (let index = messagesCopy.length - 1; index >= 0; index--) {
@@ -47,7 +46,7 @@ export const fullReplacementPlugin: PromptConcatPlugin = (hooks) => {
         break;
       }
     }
-    
+
     // Remove only the last user message if found (this is the current message being processed)
     if (lastUserMessageIndex >= 0) {
       messagesCopy.splice(lastUserMessageIndex, 1);
diff --git a/src/services/agentInstance/plugins/wikiSearchPlugin.ts b/src/services/agentInstance/plugins/wikiSearchPlugin.ts
index 14be0a22..582eada4 100644
--- a/src/services/agentInstance/plugins/wikiSearchPlugin.ts
+++ b/src/services/agentInstance/plugins/wikiSearchPlugin.ts
@@ -228,7 +228,7 @@ export const wikiSearchPlugin: PromptConcatPlugin = (hooks) => {
   hooks.responseComplete.tapAsync('wikiSearchPlugin-handler', async (context, callback) => {
     try {
       const { handlerContext, response, handlerConfig } = context;
-      
+
       // Find this plugin's configuration from handlerConfig
       const wikiSearchPluginConfig = handlerConfig?.plugins?.find(p => p.pluginId === 'wikiSearch');
       const wikiSearchParameter = wikiSearchPluginConfig?.wikiSearchParam as { toolResultDuration?: number } | undefined;
diff --git a/src/services/agentInstance/utilities/isMessageExpiredForAI.ts b/src/services/agentInstance/utilities/isMessageExpiredForAI.ts
index 65550321..37444963 100644
--- a/src/services/agentInstance/utilities/isMessageExpiredForAI.ts
+++ b/src/services/agentInstance/utilities/isMessageExpiredForAI.ts
@@ -1,4 +1,4 @@
-import { AgentInstanceMessage } from "../interface";
+import { AgentInstanceMessage } from '../interface';
 
 /**
  * Check if a message should be displayed with reduced opacity in UI
diff --git a/src/services/auth/index.ts b/src/services/auth/index.ts
index 546ec97e..2640494a 100644
--- a/src/services/auth/index.ts
+++ b/src/services/auth/index.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/require-await */
-
 import { lazyInject } from '@services/container';
 import { IDatabaseService } from '@services/database/interface';
 import { IGitUserInfos } from '@services/git/interface';
diff --git a/src/services/context/index.ts b/src/services/context/index.ts
index 62f60655..0bf8725a 100644
--- a/src/services/context/index.ts
+++ b/src/services/context/index.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/require-await */
 import { isElectronDevelopment } from '@/constants/isElectronDevelopment';
 import { app, net } from 'electron';
 import { injectable } from 'inversify';
diff --git a/src/services/externalAPI/index.ts b/src/services/externalAPI/index.ts
index 3d05d08a..89e13c2e 100644
--- a/src/services/externalAPI/index.ts
+++ b/src/services/externalAPI/index.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/require-await */
 import { injectable } from 'inversify';
 import { cloneDeep, mergeWith } from 'lodash';
 import { nanoid } from 'nanoid';
diff --git a/src/services/menu/index.ts b/src/services/menu/index.ts
index 3bcc223c..582a9cdf 100644
--- a/src/services/menu/index.ts
+++ b/src/services/menu/index.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/require-await */
 import { WikiChannel } from '@/constants/channels';
 import type { IAuthenticationService } from '@services/auth/interface';
 import { lazyInject } from '@services/container';
diff --git a/src/services/native/index.ts b/src/services/native/index.ts
index 63865ba0..bed16145 100644
--- a/src/services/native/index.ts
+++ b/src/services/native/index.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unnecessary-condition */
-/* eslint-disable @typescript-eslint/require-await */
 import { app, dialog, ipcMain, MessageBoxOptions, shell } from 'electron';
 import fs from 'fs-extra';
 import { inject, injectable } from 'inversify';
diff --git a/src/services/notifications/index.ts b/src/services/notifications/index.ts
index 602bfbaf..c83b4d4b 100644
--- a/src/services/notifications/index.ts
+++ b/src/services/notifications/index.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/require-await */
 import { lazyInject } from '@services/container';
 import type { IPreferenceService } from '@services/preferences/interface';
 import serviceIdentifier from '@services/serviceIdentifier';
diff --git a/src/services/preferences/index.ts b/src/services/preferences/index.ts
index 49dc92bd..83cfe4fb 100755
--- a/src/services/preferences/index.ts
+++ b/src/services/preferences/index.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/require-await */
 import { dialog, nativeTheme } from 'electron';
 import { injectable } from 'inversify';
 import { BehaviorSubject } from 'rxjs';
diff --git a/src/services/systemPreferences/index.ts b/src/services/systemPreferences/index.ts
index 08176747..f2b47ff5 100644
--- a/src/services/systemPreferences/index.ts
+++ b/src/services/systemPreferences/index.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/require-await */
 import { app } from 'electron';
 import { injectable } from 'inversify';
 import { BehaviorSubject } from 'rxjs';
diff --git a/src/services/theme/index.ts b/src/services/theme/index.ts
index 77ac7537..87711263 100644
--- a/src/services/theme/index.ts
+++ b/src/services/theme/index.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/require-await */
 import { nativeTheme } from 'electron';
 import { injectable } from 'inversify';
 import { BehaviorSubject } from 'rxjs';
diff --git a/src/services/view/index.ts b/src/services/view/index.ts
index f22c51a7..43d3a307 100644
--- a/src/services/view/index.ts
+++ b/src/services/view/index.ts
@@ -1,6 +1,4 @@
-/* eslint-disable @typescript-eslint/no-unnecessary-condition */
 /* eslint-disable n/no-callback-literal */
-/* eslint-disable @typescript-eslint/require-await */
 
 import { BrowserWindow, ipcMain, WebContentsView, WebPreferences } from 'electron';
 import { injectable } from 'inversify';
diff --git a/src/services/wiki/index.ts b/src/services/wiki/index.ts
index a18abcd6..6a4bfc17 100644
--- a/src/services/wiki/index.ts
+++ b/src/services/wiki/index.ts
@@ -685,7 +685,7 @@ export class Wiki implements IWikiService {
     logger.debug(`Get ${operationType}`, { workspaceID, method: 'wikiOperationInServer' });
     // This will never await if workspaceID isn't exist in user's workspace list. So prefer to check workspace existence before use this method.
     const worker = await this.getWorkerEnsure(workspaceID);
-    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+
     logger.debug(`Get worker ${operationType}`, { workspaceID, hasWorker: worker !== undefined, method: 'wikiOperationInServer', arguments_ });
     // @ts-expect-error A spread argument must either have a tuple type or be passed to a rest parameter.ts(2556)
     const result = await (worker.wikiOperation(operationType, ...arguments_) as unknown as ReturnType<IWorkerWikiOperations[OP]>);
diff --git a/src/services/wiki/plugin/ipcSyncAdaptor/ipc-syncadaptor.ts b/src/services/wiki/plugin/ipcSyncAdaptor/ipc-syncadaptor.ts
index f21ab96b..bf1b1767 100644
--- a/src/services/wiki/plugin/ipcSyncAdaptor/ipc-syncadaptor.ts
+++ b/src/services/wiki/plugin/ipcSyncAdaptor/ipc-syncadaptor.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-unnecessary-condition */
 import type { Logger } from '$:/core/modules/utils/logger.js';
 import type { IWikiServerStatusObject } from '@services/wiki/wikiWorker/ipcServerRoutes';
 import type { WindowMeta, WindowNames } from '@services/windows/WindowProperties';
diff --git a/src/services/windows/index.ts b/src/services/windows/index.ts
index 158680d4..6615209d 100644
--- a/src/services/windows/index.ts
+++ b/src/services/windows/index.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/require-await */
-
 import { app, BrowserWindow, BrowserWindowConstructorOptions } from 'electron';
 import windowStateKeeper, { State as windowStateKeeperState } from 'electron-window-state';
 import { injectable } from 'inversify';
diff --git a/src/services/workspaces/index.ts b/src/services/workspaces/index.ts
index bb8748e3..f734cb79 100644
--- a/src/services/workspaces/index.ts
+++ b/src/services/workspaces/index.ts
@@ -1,5 +1,3 @@
-/* eslint-disable @typescript-eslint/require-await */
-
 import { app } from 'electron';
 import fsExtra from 'fs-extra';
 import { injectable } from 'inversify';