diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
index 30c4de1ead4b..b0f8fef5b084 100644
--- a/cli/CHANGELOG.md
+++ b/cli/CHANGELOG.md
@@ -3,6 +3,10 @@
 
 _Released 7/30/2025 (PENDING)_
 
+**Features:**
+
+- Adds ability for cy.task function to have type-safety [#32075](https://github.com/cypress-io/cypress/pull/32075).
+
 **Bugfixes:**
 
 - Fixed missing support for setting an absolute path for `component.indexHtmlFile` in `@cypress/webpack-dev-server`. Fixes [#31819](https://github.com/cypress-io/cypress/issues/31819).
diff --git a/cli/types/cypress.d.ts b/cli/types/cypress.d.ts
index 65f51f96722e..184a0c431958 100644
--- a/cli/types/cypress.d.ts
+++ b/cli/types/cypress.d.ts
@@ -3,6 +3,20 @@
 /// <reference path="./cypress-eventemitter.d.ts" />
 /// <reference path="./cypress-type-helpers.d.ts" />
 
+type HasNoType<X> =
+  (<T>() => T extends X ? 1 : 2) extends
+  (() => 1) ? true : false;
+
+type CypressConfig_Data = typeof import('../../../cypress.config');
+type AllTasks_CJS = CypressConfig_Data['CypressTasks'];
+type AllTasks_ESM = CypressConfig_Data['default']['CypressTasks'];
+
+type AllTasks = HasNoType<AllTasks_CJS> extends true ? AllTasks_ESM : AllTasks_CJS;
+type TaskEventNames = keyof AllTasks & string;
+
+type MyParameter<T extends TaskEventNames> = Parameters<AllTasks[T]>[0];
+type MyReturnType<T extends TaskEventNames> = Awaited<ReturnType<AllTasks[T]>>;
+
 declare namespace Cypress {
   type FileContents = string | any[] | object
   type HistoryDirection = 'back' | 'forward'
@@ -2164,7 +2178,23 @@ declare namespace Cypress {
      *
      * @see https://on.cypress.io/api/task
      */
-    task<S = unknown>(event: string, arg?: any, options?: Partial<Loggable & Timeoutable>): Chainable<S>
+    task<T extends TaskEventNames>(
+      event: T,
+      ...myArgs: HasNoType<AllTasks> extends true ?
+        [
+          arg?: any,
+          options?: Partial<Loggable & Timeoutable>
+        ] : Parameters<AllTasks[T]>['length'] extends 0 ?
+          [
+            arg?: undefined,
+            options?: Partial<Loggable & Timeoutable>
+          ] : [
+            arg: MyParameter<T>,
+            options?: Partial<Loggable & Timeoutable>
+          ]
+    ): Chainable<
+      HasNoType<AllTasks> extends true ? unknown : MyReturnType<T>
+    >
 
     /**
      * Enables you to work with the subject yielded from the previous command.