diff --git a/out/cli.cjs b/out/cli.cjs
index 1870592..a7aa0a2 100755
--- a/out/cli.cjs
+++ b/out/cli.cjs
@@ -67277,8 +67277,8 @@ var MLXEngine = class {
 var DeepseekEngine = class extends OpenAiEngine {
   constructor(config7) {
     super({
-      ...config7,
-      baseURL: "https://api.deepseek.com/v1"
+      baseURL: "https://api.deepseek.com/v1",
+      ...config7
     });
     // Identical method from OpenAiEngine, re-implemented here
     this.generateCommitMessage = async (messages) => {
@@ -69561,7 +69561,13 @@ Z2(
   {
     version: package_default.version,
     name: "opencommit",
-    commands: [configCommand, hookCommand, commitlintConfigCommand, setupCommand, modelsCommand],
+    commands: [
+      configCommand,
+      hookCommand,
+      commitlintConfigCommand,
+      setupCommand,
+      modelsCommand
+    ],
     flags: {
       fgm: {
         type: Boolean,
@@ -69585,23 +69591,23 @@ Z2(
     help: { description: package_default.description }
   },
   async ({ flags }) => {
+    if (await isHookCalled()) {
+      await prepareCommitMessageHook();
+      return;
+    }
     await runMigrations();
     await checkIsLatestVersion();
-    if (await isHookCalled()) {
-      prepareCommitMessageHook();
-    } else {
-      if (isFirstRun()) {
-        const setupComplete = await runSetup();
-        if (!setupComplete) {
-          process.exit(1);
-        }
-      }
-      const hasApiKey = await promptForMissingApiKey();
-      if (!hasApiKey) {
+    if (isFirstRun()) {
+      const setupComplete = await runSetup();
+      if (!setupComplete) {
         process.exit(1);
       }
-      commit(extraArgs, flags.context, false, flags.fgm, flags.yes);
     }
+    const hasApiKey = await promptForMissingApiKey();
+    if (!hasApiKey) {
+      process.exit(1);
+    }
+    commit(extraArgs, flags.context, false, flags.fgm, flags.yes);
   },
   extraArgs
 );
diff --git a/out/github-action.cjs b/out/github-action.cjs
index 1888061..82704af 100644
--- a/out/github-action.cjs
+++ b/out/github-action.cjs
@@ -88062,8 +88062,8 @@ var MLXEngine = class {
 var DeepseekEngine = class extends OpenAiEngine {
   constructor(config6) {
     super({
-      ...config6,
-      baseURL: "https://api.deepseek.com/v1"
+      baseURL: "https://api.deepseek.com/v1",
+      ...config6
     });
     // Identical method from OpenAiEngine, re-implemented here
     this.generateCommitMessage = async (messages) => {
diff --git a/src/cli.ts b/src/cli.ts
index f9b6e17..db308f2 100755
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -24,7 +24,13 @@ cli(
   {
     version: packageJSON.version,
     name: 'opencommit',
-    commands: [configCommand, hookCommand, commitlintConfigCommand, setupCommand, modelsCommand],
+    commands: [
+      configCommand,
+      hookCommand,
+      commitlintConfigCommand,
+      setupCommand,
+      modelsCommand
+    ],
     flags: {
       fgm: {
         type: Boolean,
@@ -48,28 +54,29 @@ cli(
     help: { description: packageJSON.description }
   },
   async ({ flags }) => {
+    if (await isHookCalled()) {
+      await prepareCommitMessageHook();
+      return;
+    }
+
     await runMigrations();
     await checkIsLatestVersion();
 
-    if (await isHookCalled()) {
-      prepareCommitMessageHook();
-    } else {
-      // Check for first run and trigger setup wizard
-      if (isFirstRun()) {
-        const setupComplete = await runSetup();
-        if (!setupComplete) {
-          process.exit(1);
-        }
-      }
-
-      // Check for missing API key and prompt if needed
-      const hasApiKey = await promptForMissingApiKey();
-      if (!hasApiKey) {
+    // Check for first run and trigger setup wizard
+    if (isFirstRun()) {
+      const setupComplete = await runSetup();
+      if (!setupComplete) {
         process.exit(1);
       }
-
-      commit(extraArgs, flags.context, false, flags.fgm, flags.yes);
     }
+
+    // Check for missing API key and prompt if needed
+    const hasApiKey = await promptForMissingApiKey();
+    if (!hasApiKey) {
+      process.exit(1);
+    }
+
+    commit(extraArgs, flags.context, false, flags.fgm, flags.yes);
   },
   extraArgs
 );