Disallow unsafe returns. (#19767)

eslint.config.js

@@ -201,6 +201,7 @@ export default tseslint.config(
     rules: {
       '@typescript-eslint/no-unsafe-type-assertion': 'error',
       '@typescript-eslint/no-unsafe-assignment': 'error',
+      '@typescript-eslint/no-unsafe-return': 'error',
     },
   },
   {

packages/a2a-server/src/config/settings.ts

@@ -147,7 +147,7 @@ function resolveEnvVarsInObject<T>(obj: T): T {
   }
 
   if (Array.isArray(obj)) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion, @typescript-eslint/no-unsafe-return
     return obj.map((item) => resolveEnvVarsInObject(item)) as unknown as T;
   }
 

packages/cli/src/commands/extensions/utils.ts

@@ -47,6 +47,7 @@ const defaultRequestConfirmation: RequestConfirmationCallback = async (
     message,
     initial: false,
   });
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   return response.confirm;
 };
 

packages/cli/src/config/extensionRegistryClient.ts

@@ -83,6 +83,7 @@ export class ExtensionRegistryClient {
     });
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const results = await fzf.find(query);
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return results.map((r: { item: RegistryExtension }) => r.item);
   }
 

packages/cli/src/config/extensions/extensionEnablement.ts

@@ -179,6 +179,7 @@ export class ExtensionEnablementManager {
   readConfig(): AllExtensionsEnablementConfig {
     try {
       const content = fs.readFileSync(this.configFilePath, 'utf-8');
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
       return JSON.parse(content);
     } catch (error) {
       if (

packages/cli/src/config/extensions/extensionSettings.ts

@@ -156,6 +156,7 @@ export async function promptForSetting(
     name: 'value',
     message: `${setting.name}\n${setting.description}`,
   });
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   return response.value;
 }
 

packages/cli/src/config/extensions/variables.ts

@@ -58,6 +58,7 @@ export function recursivelyHydrateStrings<T>(
   if (Array.isArray(obj)) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     return obj.map((item) =>
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
       recursivelyHydrateStrings(item, values),
     ) as unknown as T;
   }

packages/cli/src/test-utils/mockCommandContext.ts

@@ -121,5 +121,6 @@ export const createMockCommandContext = (
     return output;
   };
 
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   return merge(defaultMocks, overrides);
 };

packages/cli/src/ui/hooks/useAtCompletion.ts

@@ -170,6 +170,7 @@ async function searchResourceCandidates(
   const results = await fzf.find(normalizedPattern, {
     limit: MAX_SUGGESTIONS_TO_SHOW * 3,
   });
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   return results.map(
     (result: { item: ResourceSuggestionCandidate }) => result.item.suggestion,
   );
@@ -193,6 +194,7 @@ async function searchAgentCandidates(
   const results = await fzf.find(normalizedPattern, {
     limit: MAX_SUGGESTIONS_TO_SHOW,
   });
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   return results.map((r: { item: Suggestion }) => r.item);
 }
 

packages/cli/src/ui/utils/TableRenderer.tsx

@@ -193,7 +193,11 @@ export const TableRenderer: React.FC<TableRendererProps> = ({
     const wrappedRows = styledRows.map((row) => wrapAndProcessRow(row));
 
     // Use the TIGHTEST widths that fit the wrapped content + padding
-    const adjustedWidths = actualColumnWidths.map((w) => w + COLUMN_PADDING);
+    const adjustedWidths = actualColumnWidths.map(
+      (w) =>
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+        w + COLUMN_PADDING,
+    );
 
     return { wrappedHeaders, wrappedRows, adjustedWidths };
   }, [styledHeaders, styledRows, terminalWidth]);

packages/cli/src/utils/activityLogger.ts

@@ -472,7 +472,7 @@ export class ActivityLogger extends EventEmitter {
           body,
           pending: true,
         });
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-type-assertion
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-type-assertion, @typescript-eslint/no-unsafe-return
         return (oldEnd as any).apply(this, [chunk, ...etc]);
       };
 

packages/cli/src/utils/envVarResolver.ts

@@ -98,6 +98,7 @@ function resolveEnvVarsInObjectInternal<T>(
     visited.add(obj);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     const result = obj.map((item) =>
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
       resolveEnvVarsInObjectInternal(item, visited, customEnv),
     ) as unknown as T;
     visited.delete(obj);

packages/cli/src/utils/gitUtils.ts

@@ -83,6 +83,7 @@ export const getLatestGitHubRelease = async (
     if (!releaseTag) {
       throw new Error(`Response did not include tag_name field`);
     }
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return releaseTag;
   } catch (_error) {
     debugLogger.debug(

packages/cli/src/utils/jsonoutput.ts

@@ -40,6 +40,7 @@ export function tryParseJSON(input: string): object | null {
 
     if (!Array.isArray(parsed) && Object.keys(parsed).length === 0) return null;
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return parsed;
   } catch (_err) {
     return null;

packages/cli/src/utils/settingsUtils.ts

@@ -374,6 +374,7 @@ export function setPendingSettingValue(
   // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
   const newSettings = JSON.parse(JSON.stringify(pendingSettings));
   setNestedValue(newSettings, path, value);
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   return newSettings;
 }
 

packages/cli/src/zed-integration/fileSystemService.ts

@@ -29,6 +29,7 @@ export class AcpFileSystemService implements FileSystemService {
       sessionId: this.sessionId,
     });
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return response.content;
   }
 

packages/core/src/code_assist/oauth2.ts

@@ -636,6 +636,7 @@ async function fetchCachedCredentials(): Promise<
   for (const keyFile of pathsToTry) {
     try {
       const keyFileString = await fs.readFile(keyFile, 'utf-8');
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
       return JSON.parse(keyFileString);
     } catch (error) {
       // Log specific error for debugging, but continue trying other paths

packages/core/src/config/projectRegistry.ts

@@ -59,6 +59,7 @@ export class ProjectRegistry {
 
     try {
       const content = await fs.promises.readFile(this.registryPath, 'utf8');
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
       return JSON.parse(content);
     } catch (e) {
       debugLogger.debug('Failed to load registry: ', e);

packages/core/src/core/baseLlmClient.ts

@@ -13,21 +13,19 @@ import type {
   GenerateContentConfig,
 } from '@google/genai';
 import type { Config } from '../config/config.js';
-import type { ContentGenerator } from './contentGenerator.js';
+import type { ContentGenerator, AuthType } from './contentGenerator.js';
-import type { AuthType } from './contentGenerator.js';
 import { handleFallback } from '../fallback/handler.js';
 import { getResponseText } from '../utils/partUtils.js';
 import { reportError } from '../utils/errorReporting.js';
 import { getErrorMessage } from '../utils/errors.js';
 import { logMalformedJsonResponse } from '../telemetry/loggers.js';
-import { MalformedJsonResponseEvent } from '../telemetry/types.js';
+import { MalformedJsonResponseEvent, LlmRole } from '../telemetry/types.js';
 import { retryWithBackoff } from '../utils/retry.js';
 import type { ModelConfigKey } from '../services/modelConfigService.js';
 import {
   applyModelSelection,
   createAvailabilityContextProvider,
 } from '../availability/policyHelpers.js';
-import { LlmRole } from '../telemetry/types.js';
 
 const DEFAULT_MAX_ATTEMPTS = 5;
 
@@ -164,6 +162,7 @@ export class BaseLlmClient {
     );
 
     // If we are here, the content is valid (not empty and parsable).
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return JSON.parse(
       this.cleanJsonResponse(getResponseText(result)!.trim(), model),
     );

packages/core/src/core/fakeContentGenerator.ts

@@ -83,6 +83,7 @@ export class FakeContentGenerator implements ContentGenerator {
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     role: LlmRole,
   ): Promise<GenerateContentResponse> {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return Object.setPrototypeOf(
       this.getNextResponse('generateContent', request),
       GenerateContentResponse.prototype,
@@ -116,6 +117,7 @@ export class FakeContentGenerator implements ContentGenerator {
   async embedContent(
     request: EmbedContentParameters,
   ): Promise<EmbedContentResponse> {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return Object.setPrototypeOf(
       this.getNextResponse('embedContent', request),
       EmbedContentResponse.prototype,

packages/core/src/ide/ide-client.ts

@@ -348,6 +348,7 @@ export class IdeClient {
           // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
           const parsedJson = JSON.parse(textPart.text);
           if (parsedJson && typeof parsedJson.content === 'string') {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return parsedJson.content;
           }
           if (parsedJson && parsedJson.content === null) {

packages/core/src/ide/ide-connection-utils.ts

@@ -123,6 +123,7 @@ export async function getConnectionConfigFromFile(
       `gemini-ide-server-${pid}.json`,
     );
     const portFileContents = await fs.promises.readFile(portFile, 'utf8');
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return JSON.parse(portFileContents);
   } catch (_) {
     // For newer extension versions, the file name matches the pattern
@@ -167,6 +168,7 @@ export async function getConnectionConfigFromFile(
   }
   const parsedContents = fileContents.map((content) => {
     try {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
       return JSON.parse(content);
     } catch (e) {
       logger.debug('Failed to parse JSON from config file: ', e);
@@ -196,6 +198,7 @@ export async function getConnectionConfigFromFile(
     if (fileIndex !== -1) {
       logger.debug(`Selected IDE connection file: ${matchingFiles[fileIndex]}`);
     }
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return selected;
   }
 
@@ -213,6 +216,7 @@ export async function getConnectionConfigFromFile(
           `Selected IDE connection file (matched port from env): ${matchingFiles[fileIndex]}`,
         );
       }
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
       return selected;
     }
   }
@@ -225,6 +229,7 @@ export async function getConnectionConfigFromFile(
       `Selected first valid IDE connection file: ${matchingFiles[fileIndex]}`,
     );
   }
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   return selected;
 }
 

packages/core/src/services/chatRecordingService.ts

@@ -419,6 +419,7 @@ export class ChatRecordingService {
   private readConversation(): ConversationRecord {
     try {
       this.cachedLastConvData = fs.readFileSync(this.conversationFile!, 'utf8');
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
       return JSON.parse(this.cachedLastConvData);
     } catch (error) {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion

packages/core/src/utils/filesearch/fileSearch.ts

@@ -149,6 +149,7 @@ class RecursiveFileSearch implements FileSearch {
         filteredCandidates = await this.fzf
           .find(pattern)
           .then((results: Array<FzfResultItem<string>>) =>
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             results.map((entry: FzfResultItem<string>) => entry.item),
           )
           .catch(() => {

packages/core/src/utils/safeJsonStringify.ts

@@ -27,6 +27,7 @@ export function safeJsonStringify(
         }
         seen.add(value);
       }
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
       return value;
     },
     space,
@@ -60,6 +61,7 @@ export function safeJsonStringifyBooleanValuesOnly(obj: any): string {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
     if ((value as Config) !== null && !configSeen) {
       configSeen = true;
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
       return value;
     }
     if (typeof value === 'boolean') {

packages/core/src/utils/stdio.ts

@@ -91,8 +91,10 @@ export function createWorkingStdio() {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       const value = Reflect.get(target, prop, receiver);
       if (typeof value === 'function') {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return value.bind(target);
       }
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
       return value;
     },
   });
@@ -105,8 +107,10 @@ export function createWorkingStdio() {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
       const value = Reflect.get(target, prop, receiver);
       if (typeof value === 'function') {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return value.bind(target);
       }
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-return
       return value;
     },
   });