diff --git a/eslint.config.mjs b/eslint.config.mjs
index cf6fa2f1dfb82..a4532e657b522 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -282,6 +282,11 @@ export default ts.config(
 			],
 
 			// TypeScript rules
+
+			// @typescript-eslint/await-thenable is disabled because Promise.allSettled/all with mixed thenable/non-thenable arrays
+			// is a valid pattern used throughout the codebase for handling mixed sync/async operations safely.
+			// The new stricter rule would require unnecessary complexity to separate sync/async values before Promise aggregation.
+			'@typescript-eslint/await-thenable': 'off',
 			'@typescript-eslint/consistent-type-assertions': [
 				'error',
 				{ assertionStyle: 'as', objectLiteralTypeAssertions: 'allow-as-parameter' },
diff --git a/src/plus/ai/aiProviderService.ts b/src/plus/ai/aiProviderService.ts
index 3ff30b0865772..3dbded6eabda1 100644
--- a/src/plus/ai/aiProviderService.ts
+++ b/src/plus/ai/aiProviderService.ts
@@ -1708,7 +1708,6 @@ export class AIProviderService implements Disposable {
 				setLogScopeExit(
 					scope,
 					`model: ${model.provider.id}/${model.id}`,
-					// eslint-disable-next-line @typescript-eslint/no-base-to-string
 					`failed: ${String(ex)} (${String(ex.original)})`,
 				);
 
@@ -1718,7 +1717,6 @@ export class AIProviderService implements Disposable {
 						...telementry.data,
 						duration: Date.now() - start,
 						failed: true,
-						// eslint-disable-next-line @typescript-eslint/no-base-to-string
 						'failed.error': String(ex),
 						'failed.error.detail': String(ex.original),
 					},
diff --git a/tests/docker/run-unit-tests.sh b/tests/docker/run-unit-tests.sh
index 642698950de40..3b174b35ada07 100755
--- a/tests/docker/run-unit-tests.sh
+++ b/tests/docker/run-unit-tests.sh
@@ -1,6 +1,7 @@
 (
   set -e
   pnpm run pretty:check
+  pnpm run lint
   pnpm run test
 );
 EXIT_CODE=$?;