@ksw8954/git-ai-commit 1.0.5 → 1.0.7

package/src/commands/tag.ts

@@ -67,6 +67,70 @@ export class TagCommand {
       return;
     }
 
+    // Check if tag already exists locally
+    const localTagExists = await GitService.tagExists(trimmedName);
+    let remoteTagExists = false;
+    let wasTagReplaced = false;
+
+    if (localTagExists) {
+      console.log(`⚠️  Tag ${trimmedName} already exists locally.`);
+      const shouldDelete = await this.confirmTagDelete(trimmedName);
+
+      if (!shouldDelete) {
+        console.log('Tag creation cancelled by user.');
+        await LogService.append({
+          command: 'tag',
+          args: { name: trimmedName, ...options, apiKey: options.apiKey ? '***' : undefined },
+          status: 'cancelled',
+          details: 'user declined to replace existing tag'
+        });
+        return;
+      }
+
+      // Check if tag exists on remote
+      remoteTagExists = await GitService.remoteTagExists(trimmedName);
+
+      if (remoteTagExists) {
+        console.log(`⚠️  Tag ${trimmedName} also exists on remote.`);
+        const shouldDeleteRemote = await this.confirmRemoteTagDelete(trimmedName);
+
+        if (shouldDeleteRemote) {
+          console.log(`Deleting remote tag ${trimmedName}...`);
+          const remoteDeleted = await GitService.deleteRemoteTag(trimmedName);
+          if (!remoteDeleted) {
+            console.error('❌ Failed to delete remote tag');
+            await LogService.append({
+              command: 'tag',
+              args: { name: trimmedName, ...options, apiKey: options.apiKey ? '***' : undefined },
+              status: 'failure',
+              details: 'remote tag deletion failed'
+            });
+            process.exit(1);
+            return;
+          }
+          console.log(`✅ Remote tag ${trimmedName} deleted`);
+          remoteTagExists = false;
+        }
+      }
+
+      // Delete local tag
+      console.log(`Deleting local tag ${trimmedName}...`);
+      const localDeleted = await GitService.deleteLocalTag(trimmedName);
+      if (!localDeleted) {
+        console.error('❌ Failed to delete local tag');
+        await LogService.append({
+          command: 'tag',
+          args: { name: trimmedName, ...options, apiKey: options.apiKey ? '***' : undefined },
+          status: 'failure',
+          details: 'local tag deletion failed'
+        });
+        process.exit(1);
+        return;
+      }
+      console.log(`✅ Local tag ${trimmedName} deleted`);
+      wasTagReplaced = true;
+    }
+
     let tagMessage = options.message?.trim();
 
     if (!tagMessage) {
@@ -168,20 +232,55 @@ export class TagCommand {
     const shouldPush = await this.confirmTagPush(trimmedName);
 
     if (shouldPush) {
-      console.log(`Pushing tag ${trimmedName} to remote...`);
-      const pushSuccess = await GitService.pushTag(trimmedName);
+      // If tag was replaced or remote tag still exists, use force push
+      const needsForcePush = wasTagReplaced || remoteTagExists;
+
+      if (needsForcePush) {
+        console.log(`⚠️  Tag ${trimmedName} exists on remote. Force push is required.`);
+        const shouldForcePush = await this.confirmForcePush(trimmedName);
+
+        if (!shouldForcePush) {
+          console.log('Tag push cancelled by user.');
+          await LogService.append({
+            command: 'tag',
+            args: { name: trimmedName, ...options, apiKey: options.apiKey ? '***' : undefined },
+            status: 'cancelled',
+            details: 'user declined force push'
+          });
+          return;
+        }
 
-      if (pushSuccess) {
-        console.log(`✅ Tag ${trimmedName} pushed successfully!`);
+        console.log(`Force pushing tag ${trimmedName} to remote...`);
+        const pushSuccess = await GitService.forcePushTag(trimmedName);
+
+        if (pushSuccess) {
+          console.log(`✅ Tag ${trimmedName} force pushed successfully!`);
+        } else {
+          console.error('❌ Failed to force push tag to remote');
+          await LogService.append({
+            command: 'tag',
+            args: { name: trimmedName, ...options, apiKey: options.apiKey ? '***' : undefined },
+            status: 'failure',
+            details: 'tag force push failed'
+          });
+          process.exit(1);
+        }
       } else {
-        console.error('❌ Failed to push tag to remote');
-        await LogService.append({
-          command: 'tag',
-          args: { name: trimmedName, ...options, apiKey: options.apiKey ? '***' : undefined },
-          status: 'failure',
-          details: 'tag push failed'
-        });
-        process.exit(1);
+        console.log(`Pushing tag ${trimmedName} to remote...`);
+        const pushSuccess = await GitService.pushTag(trimmedName);
+
+        if (pushSuccess) {
+          console.log(`✅ Tag ${trimmedName} pushed successfully!`);
+        } else {
+          console.error('❌ Failed to push tag to remote');
+          await LogService.append({
+            command: 'tag',
+            args: { name: trimmedName, ...options, apiKey: options.apiKey ? '***' : undefined },
+            status: 'failure',
+            details: 'tag push failed'
+          });
+          process.exit(1);
+        }
       }
     }
 
@@ -224,6 +323,54 @@ export class TagCommand {
     return normalized === 'y' || normalized === 'yes';
   }
 
+  private async confirmTagDelete(tagName: string): Promise<boolean> {
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+
+    const answer: string = await new Promise(resolve => {
+      rl.question(`Delete existing tag ${tagName} and create a new one? (y/n): `, resolve);
+    });
+
+    rl.close();
+
+    const normalized = answer.trim().toLowerCase();
+    return normalized === 'y' || normalized === 'yes';
+  }
+
+  private async confirmRemoteTagDelete(tagName: string): Promise<boolean> {
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+
+    const answer: string = await new Promise(resolve => {
+      rl.question(`Also delete remote tag ${tagName}? (y/n): `, resolve);
+    });
+
+    rl.close();
+
+    const normalized = answer.trim().toLowerCase();
+    return normalized === 'y' || normalized === 'yes';
+  }
+
+  private async confirmForcePush(tagName: string): Promise<boolean> {
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+
+    const answer: string = await new Promise(resolve => {
+      rl.question(`Force push tag ${tagName} to remote? (y/n): `, resolve);
+    });
+
+    rl.close();
+
+    const normalized = answer.trim().toLowerCase();
+    return normalized === 'y' || normalized === 'yes';
+  }
+
   getCommand(): Command {
     return this.program;
   }

package/src/prompts/commit.ts

@@ -46,7 +46,9 @@ ${customInstructions}
 ## CRITICAL: Commit Message Output Rules
 - DO NOT include any memory bank status indicators like "[Memory Bank: Active]" or "[Memory Bank: Missing]"
 - DO NOT include any task-specific formatting or artifacts from other rules
+- DO NOT use any Markdown styling (no **bold**, __underline__, \`code\`, links, or emojis) in the commit header, body, or footer
 - ONLY Generate a clean conventional commit message as specified below
+- Output exactly ONE conventional commit message. Choose a single primary type; never return multiple headers or multiple type prefixes.
 
 ${gitContext}
 
@@ -92,7 +94,7 @@ ${footerGuidelines}
 
 ## Analysis Instructions
 When analyzing staged changes:
-1. Determine Primary Type based on the nature of changes
+1. Determine a single Primary Type based on the dominant nature of the changes (if multiple types apply, pick the most impactful one and stick to it)
 2. Identify Scope from modified directories or modules
 3. Craft Description focusing on the most significant change
 4. Determine if there are Breaking Changes