diff --git a/package-lock.json b/package-lock.json
index da6d7429..3aa8dcfb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
       },
       "devDependencies": {
         "@clack/prompts": "^0.11.0",
+        "@commander-js/extra-typings": "^12.1.0",
         "@stylistic/eslint-plugin": "^5.6.1",
         "@types/ejs": "^3.1.5",
         "@types/lodash.kebabcase": "^4.1.9",
@@ -145,6 +146,16 @@
         "sisteransi": "^1.0.5"
       }
     },
+    "node_modules/@commander-js/extra-typings": {
+      "version": "12.1.0",
+      "resolved": "https://registry.npmjs.org/@commander-js/extra-typings/-/extra-typings-12.1.0.tgz",
+      "integrity": "sha512-wf/lwQvWAA0goIghcb91dQYpkLBcyhOhQNqG/VgWhnKzgt+UOMvra7EX/2fv70arm5RW+PUHoQHHDa6/p77Eqg==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "commander": "~12.1.0"
+      }
+    },
     "node_modules/@emnapi/core": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.8.1.tgz",
diff --git a/package.json b/package.json
index a2265eeb..edfa4e6b 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
   },
   "devDependencies": {
     "@clack/prompts": "^0.11.0",
+    "@commander-js/extra-typings": "^12.1.0",
     "@stylistic/eslint-plugin": "^5.6.1",
     "@types/ejs": "^3.1.5",
     "@types/lodash.kebabcase": "^4.1.9",
diff --git a/src/cli/commands/agents/index.ts b/src/cli/commands/agents/index.ts
index 464e0571..0ec769e0 100644
--- a/src/cli/commands/agents/index.ts
+++ b/src/cli/commands/agents/index.ts
@@ -1,4 +1,4 @@
-import { Command } from "commander";
+import { Command } from "@commander-js/extra-typings";
 import type { CLIContext } from "@/cli/types.js";
 import { getAgentsPushCommand } from "./push.js";
 import { getAgentsPullCommand } from "./pull.js";
diff --git a/src/cli/commands/agents/pull.ts b/src/cli/commands/agents/pull.ts
index 4d9a8d07..53013bb3 100644
--- a/src/cli/commands/agents/pull.ts
+++ b/src/cli/commands/agents/pull.ts
@@ -1,5 +1,5 @@
 import { join, dirname } from "node:path";
-import { Command } from "commander";
+import { Command } from "@commander-js/extra-typings";
 import { log } from "@clack/prompts";
 import type { CLIContext } from "@/cli/types.js";
 import { fetchAgents, writeAgents } from "@/core/resources/agent/index.js";
diff --git a/src/cli/commands/agents/push.ts b/src/cli/commands/agents/push.ts
index d4a27183..9fd31e2c 100644
--- a/src/cli/commands/agents/push.ts
+++ b/src/cli/commands/agents/push.ts
@@ -1,4 +1,4 @@
-import { Command } from "commander";
+import { Command } from "@commander-js/extra-typings";
 import { log } from "@clack/prompts";
 import type { CLIContext } from "@/cli/types.js";
 import { pushAgents } from "@/core/resources/agent/index.js";
diff --git a/src/cli/commands/auth/login.ts b/src/cli/commands/auth/login.ts
index 623d1d11..c95600f3 100644
--- a/src/cli/commands/auth/login.ts
+++ b/src/cli/commands/auth/login.ts
@@ -1,4 +1,4 @@
-import { Command } from "commander";
+import { Command } from "@commander-js/extra-typings";
 import type { CLIContext } from "@/cli/types.js";
 import { runCommand } from "@/cli/utils/index.js";
 import { login } from "./login-flow.js";
diff --git a/src/cli/commands/auth/logout.ts b/src/cli/commands/auth/logout.ts
index 1fc2cde8..43a5f9dc 100644
--- a/src/cli/commands/auth/logout.ts
+++ b/src/cli/commands/auth/logout.ts
@@ -1,4 +1,4 @@
-import { Command } from "commander";
+import { Command } from "@commander-js/extra-typings";
 import type { CLIContext } from "@/cli/types.js";
 import { deleteAuth } from "@/core/auth/index.js";
 import { runCommand } from "@/cli/utils/index.js";
diff --git a/src/cli/commands/auth/whoami.ts b/src/cli/commands/auth/whoami.ts
index b45aa69a..4858aeb8 100644
--- a/src/cli/commands/auth/whoami.ts
+++ b/src/cli/commands/auth/whoami.ts
@@ -1,4 +1,4 @@
-import { Command } from "commander";
+import { Command } from "@commander-js/extra-typings";
 import type { CLIContext } from "@/cli/types.js";
 import { readAuth } from "@/core/auth/index.js";
 import { runCommand, theme } from "@/cli/utils/index.js";
diff --git a/src/cli/commands/entities/push.ts b/src/cli/commands/entities/push.ts
index 22077bfe..181c11f3 100644
--- a/src/cli/commands/entities/push.ts
+++ b/src/cli/commands/entities/push.ts
@@ -1,4 +1,4 @@
-import { Command } from "commander";
+import { Command } from "@commander-js/extra-typings";
 import { log } from "@clack/prompts";
 import type { CLIContext } from "@/cli/types.js";
 import { pushEntities } from "@/core/resources/entity/index.js";
diff --git a/src/cli/commands/functions/deploy.ts b/src/cli/commands/functions/deploy.ts
index 718bbe30..932039d7 100644
--- a/src/cli/commands/functions/deploy.ts
+++ b/src/cli/commands/functions/deploy.ts
@@ -1,4 +1,4 @@
-import { Command } from "commander";
+import { Command } from "@commander-js/extra-typings";
 import { log } from "@clack/prompts";
 import type { CLIContext } from "@/cli/types.js";
 import { pushFunctions } from "@/core/resources/function/index.js";
diff --git a/src/cli/commands/project/create.ts b/src/cli/commands/project/create.ts
index 9b83d71d..f1605cda 100644
--- a/src/cli/commands/project/create.ts
+++ b/src/cli/commands/project/create.ts
@@ -1,6 +1,6 @@
 import { resolve, join, basename } from "node:path";
 import { execa } from "execa";
-import { Argument, Command } from "commander";
+import { Argument, Command } from "@commander-js/extra-typings";
 import { log, group, text, select, confirm, isCancel } from "@clack/prompts";
 import type { Option } from "@clack/prompts";
 import kebabCase from "lodash.kebabcase";
@@ -26,6 +26,7 @@ interface CreateOptions {
   template?: string;
   deploy?: boolean;
   skills?: boolean;
+  [key: string]: unknown;
 }
 
 async function getTemplateById(templateId: string): Promise<Template> {
@@ -45,8 +46,8 @@ async function getTemplateById(templateId: string): Promise<Template> {
   return template;
 }
 
-function validateNonInteractiveFlags(command: Command): void {
-  const { path } = command.opts<CreateOptions>();
+function validateNonInteractiveFlags(command: Command<[string | undefined], CreateOptions>): void {
+  const { path } = command.opts();
 
   if (path && !command.args.length) {
     command.error("Non-interactive mode requires all flags: --name, --path");
@@ -255,7 +256,7 @@ async function executeCreate({
   return { outroMessage: "Your project is set up and ready to use" };
 }
 
-export function getCreateCommand(context: CLIContext): Command {
+export function getCreateCommand(context: CLIContext): Command<[string | undefined], CreateOptions> {
   return new Command("create")
     .description("Create a new Base44 project")
     .addArgument(new Argument('name', 'Project name').argOptional())
diff --git a/src/cli/commands/project/dashboard.ts b/src/cli/commands/project/dashboard.ts
index 7174ac9e..a1a4d91f 100644
--- a/src/cli/commands/project/dashboard.ts
+++ b/src/cli/commands/project/dashboard.ts
@@ -1,4 +1,4 @@
-import { Command } from "commander";
+import { Command } from "@commander-js/extra-typings";
 import open from "open";
 import type { CLIContext } from "@/cli/types.js";
 import { runCommand, getDashboardUrl } from "@/cli/utils/index.js";
diff --git a/src/cli/commands/project/deploy.ts b/src/cli/commands/project/deploy.ts
index 93ac3980..c76b351a 100644
--- a/src/cli/commands/project/deploy.ts
+++ b/src/cli/commands/project/deploy.ts
@@ -1,4 +1,4 @@
-import { Command } from "commander";
+import { Command } from "@commander-js/extra-typings";
 import { confirm, isCancel, log } from "@clack/prompts";
 import type { CLIContext } from "@/cli/types.js";
 import {
diff --git a/src/cli/commands/project/link.ts b/src/cli/commands/project/link.ts
index fdad9793..72c60c25 100644
--- a/src/cli/commands/project/link.ts
+++ b/src/cli/commands/project/link.ts
@@ -1,4 +1,4 @@
-import { Command } from "commander";
+import { Command } from "@commander-js/extra-typings";
 import type { Option } from "@clack/prompts";
 import { log, group, text, select, isCancel, cancel } from "@clack/prompts";
 import type { CLIContext } from "@/cli/types.js";
@@ -27,12 +27,13 @@ interface LinkOptions {
   name?: string;
   description?: string;
   projectId?: string;
+  [key: string]: unknown;
 }
 
 type LinkAction = "create" | "choose";
 
-function validateNonInteractiveFlags(command: Command): void {
-  const { create, name, projectId } = command.opts<LinkOptions>();
+function validateNonInteractiveFlags(command: Command<[], LinkOptions>): void {
+  const { create, name, projectId } = command.opts();
 
   if (create && projectId) {
     command.error("--create and --projectId cannot be used together");
@@ -226,7 +227,7 @@ async function link(options: LinkOptions): Promise<RunCommandResult> {
   return { outroMessage: "Project linked" };
 }
 
-export function getLinkCommand(context: CLIContext): Command {
+export function getLinkCommand(context: CLIContext): Command<[], LinkOptions> {
   return new Command("link")
     .description("Link a local project to a Base44 project (create new or link existing)")
     .option("-c, --create", "Create a new project (skip selection prompt)")
diff --git a/src/cli/commands/site/deploy.ts b/src/cli/commands/site/deploy.ts
index b33efa6b..7f158357 100644
--- a/src/cli/commands/site/deploy.ts
+++ b/src/cli/commands/site/deploy.ts
@@ -1,5 +1,5 @@
 import { resolve } from "node:path";
-import { Command } from "commander";
+import { Command } from "@commander-js/extra-typings";
 import { confirm, isCancel } from "@clack/prompts";
 import type { CLIContext } from "@/cli/types.js";
 import { readProjectConfig } from "@/core/project/index.js";
diff --git a/src/cli/program.ts b/src/cli/program.ts
index 77474222..39d710e5 100644
--- a/src/cli/program.ts
+++ b/src/cli/program.ts
@@ -1,4 +1,4 @@
-import { Command } from "commander";
+import { Command } from "@commander-js/extra-typings";
 import type { CLIContext } from "./types.js";
 import { getLoginCommand } from "@/cli/commands/auth/login.js";
 import { getWhoamiCommand } from "@/cli/commands/auth/whoami.js";
diff --git a/src/cli/telemetry/commander-hooks.ts b/src/cli/telemetry/commander-hooks.ts
index 16b18805..a70948eb 100644
--- a/src/cli/telemetry/commander-hooks.ts
+++ b/src/cli/telemetry/commander-hooks.ts
@@ -1,13 +1,13 @@
-import type { Command } from "commander";
+import type { Command, CommandUnknownOpts } from "@commander-js/extra-typings";
 import type { ErrorReporter } from "./error-reporter.js";
 
 /**
  * Get the full command name by traversing parent commands.
  * e.g., "base44 entities push" → "entities push"
  */
-function getFullCommandName(command: Command): string {
+function getFullCommandName(command: CommandUnknownOpts): string {
   const parts: string[] = [];
-  let current: Command | null = command;
+  let current: CommandUnknownOpts | null = command;
 
   while (current) {
     const name = current.name();
@@ -21,7 +21,7 @@ function getFullCommandName(command: Command): string {
   return parts.join(" ");
 }
 
-export function addCommandInfoToErrorReporter(program: Command, errorReporter: ErrorReporter): void {
+export function addCommandInfoToErrorReporter(program: Command<any, any>, errorReporter: ErrorReporter): void {
   program.hook("preAction", (_, actionCommand) => {
     const fullCommandName = getFullCommandName(actionCommand);
 
diff --git a/tests/cli/testkit/CLITestkit.ts b/tests/cli/testkit/CLITestkit.ts
index 8e16cee2..9d51ce3c 100644
--- a/tests/cli/testkit/CLITestkit.ts
+++ b/tests/cli/testkit/CLITestkit.ts
@@ -3,7 +3,7 @@ import { fileURLToPath } from "node:url";
 import { mkdir, writeFile, cp, readFile } from "node:fs/promises";
 import { vi } from "vitest";
 import { dir } from "tmp-promise";
-import type { Command } from "commander";
+import type { Command } from "@commander-js/extra-typings";
 import { CLIResultMatcher } from "./CLIResultMatcher.js";
 import { Base44APIMock } from "./Base44APIMock.js";
 import type { CLIResult } from "./CLIResultMatcher.js";