@ksw8954/git-ai-commit 1.1.0 → 1.1.3

package/src/commands/commit.ts

@@ -177,6 +177,7 @@ export class CommitCommand {
           status: "failure",
           details: diffResult.error,
           durationMs: Date.now() - start,
+          model: mergedModel,
         });
         process.exit(1);
       }
@@ -197,6 +198,7 @@ export class CommitCommand {
           status: "failure",
           details: aiResult.error,
           durationMs: Date.now() - start,
+          model: mergedModel,
         });
         process.exit(1);
       }
@@ -214,6 +216,7 @@ export class CommitCommand {
           status: "success",
           details: "message-only output",
           durationMs: Date.now() - start,
+          model: mergedModel,
         });
         return;
       }
@@ -231,6 +234,7 @@ export class CommitCommand {
           status: "cancelled",
           details: "user declined commit",
           durationMs: Date.now() - start,
+          model: mergedModel,
         });
         return;
       }
@@ -264,6 +268,7 @@ export class CommitCommand {
               status: "failure",
               details: "push failed",
               durationMs: Date.now() - start,
+              model: mergedModel,
             });
             process.exit(1);
           }
@@ -276,6 +281,7 @@ export class CommitCommand {
           status: "failure",
           details: "git commit failed",
           durationMs: Date.now() - start,
+          model: mergedModel,
         });
         process.exit(1);
       }
@@ -284,6 +290,7 @@ export class CommitCommand {
         args: safeArgs,
         status: "success",
         durationMs: Date.now() - start,
+        model: mergedModel,
       });
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
@@ -294,6 +301,7 @@ export class CommitCommand {
         status: "failure",
         details: message,
         durationMs: Date.now() - start,
+        model: options.model,
       });
       process.exit(1);
     }

package/src/commands/completion.ts

@@ -129,20 +129,15 @@ complete -F _git_ai_commit git-ai-commit
   private generateZshCompletion(): string {
     return `#compdef git-ai-commit
 # git-ai-commit zsh completion
-# Add to ~/.zshrc:
-#   eval "$(git-ai-commit completion zsh)"
-# Or save to a file in your $fpath (e.g., ~/.zsh/completions/_git-ai-commit)
+# Installation:
+#   mkdir -p ~/.zsh/completions
+#   git-ai-commit completion zsh > ~/.zsh/completions/_git-ai-commit
+#   # Add to ~/.zshrc (before compinit): fpath=(~/.zsh/completions \$fpath)
+#   # Then restart shell or run: autoload -Uz compinit && compinit
 
 _git-ai-commit() {
-    local -a commands
-    commands=(
-        'commit:Generate AI-powered commit message'
-        'config:Manage git-ai-commit configuration'
-        'pr:Generate a pull request title and summary'
-        'tag:Create an annotated git tag with AI-generated notes'
-        'history:Manage git-ai-commit command history'
-        'completion:Generate shell completion scripts'
-    )
+    local curcontext="\$curcontext" state line
+    typeset -A opt_args
 
     _arguments -C \\
         '-v[output the version number]' \\
@@ -150,14 +145,23 @@ _git-ai-commit() {
         '-h[display help]' \\
         '--help[display help]' \\
         '1: :->command' \\
-        '*:: :->args'
+        '*:: :->args' && return
 
     case \$state in
         command)
+            local -a commands
+            commands=(
+                'commit:Generate AI-powered commit message'
+                'config:Manage git-ai-commit configuration'
+                'pr:Generate a pull request title and summary'
+                'tag:Create an annotated git tag with AI-generated notes'
+                'history:Manage git-ai-commit command history'
+                'completion:Generate shell completion scripts'
+            )
             _describe -t commands 'git-ai-commit commands' commands
             ;;
         args)
-            case \$words[1] in
+            case \$line[1] in
                 commit)
                     _arguments \\
                         '-k[OpenAI API key]:key:' \\
@@ -190,13 +194,18 @@ _git-ai-commit() {
                     ;;
                 pr)
                     _arguments \\
-                        '--base[Base branch to diff against]:branch:__git_branch_names' \\
-                        '--compare[Compare branch to describe]:branch:__git_branch_names' \\
+                        '--base[Base branch to diff against]:branch:->branches' \\
+                        '--compare[Compare branch to describe]:branch:->branches' \\
                         '-k[Override API key]:key:' \\
                         '--api-key[Override API key]:key:' \\
                         '-b[Override API base URL]:url:' \\
                         '--base-url[Override API base URL]:url:' \\
                         '--model[Override AI model]:model:'
+                    [[ \$state == branches ]] && {
+                        local -a branches
+                        branches=(\${(f)"\$(git branch --format='%(refname:short)' 2>/dev/null)"})
+                        _describe -t branches 'branches' branches
+                    }
                     ;;
                 tag)
                     _arguments \\
@@ -207,9 +216,14 @@ _git-ai-commit() {
                         '-m[Model to use]:model:' \\
                         '--model[Model to use]:model:' \\
                         '--message[Tag message to use directly]:message:' \\
-                        '-t[Existing tag to diff against]:tag:__git_tags' \\
-                        '--base-tag[Existing tag to diff against]:tag:__git_tags' \\
+                        '-t[Existing tag to diff against]:tag:->tags' \\
+                        '--base-tag[Existing tag to diff against]:tag:->tags' \\
                         '--prompt[Additional AI prompt instructions]:text:'
+                    [[ \$state == tags ]] && {
+                        local -a tags
+                        tags=(\${(f)"\$(git tag 2>/dev/null)"})
+                        _describe -t tags 'tags' tags
+                    }
                     ;;
                 history)
                     _arguments \\
@@ -226,22 +240,6 @@ _git-ai-commit() {
             ;;
     esac
 }
-
-# Helper function to complete git branches
-__git_branch_names() {
-    local -a branches
-    branches=(\${(f)"\$(git branch --format='%(refname:short)' 2>/dev/null)"})
-    _describe -t branches 'branches' branches
-}
-
-# Helper function to complete git tags  
-__git_tags() {
-    local -a tags
-    tags=(\${(f)"\$(git tag 2>/dev/null)"})
-    _describe -t tags 'tags' tags
-}
-
-_git-ai-commit "\$@"
 `;
   }
 

package/src/commands/git.ts

@@ -264,6 +264,26 @@ export class GitService {
     }
   }
 
+  static async getTagMessage(tagName: string): Promise<string | null> {
+    try {
+      // Get the tag object content
+      const { stdout } = await execFileAsync('git', ['tag', '-l', '-n999', tagName]);
+      if (!stdout.trim()) {
+        return null;
+      }
+      // Format: "tagname    message line 1\n            message line 2..."
+      // Remove the tag name prefix and clean up
+      const lines = stdout.split('\n');
+      const firstLine = lines[0] || '';
+      // Remove tag name from first line
+      const messageStart = firstLine.replace(new RegExp(`^${tagName}\\s*`), '');
+      const restLines = lines.slice(1).map(line => line.replace(/^\s{12}/, ''));
+      return [messageStart, ...restLines].join('\n').trim() || null;
+    } catch {
+      return null;
+    }
+  }
+
   static async remoteTagExists(tagName: string): Promise<boolean> {
     try {
       const { stdout } = await execAsync(`git ls-remote --tags origin refs/tags/${tagName}`);

package/src/commands/history.ts

@@ -38,11 +38,12 @@ export class HistoryCommand {
 
   private formatLine(e: any): string {
     const ts = new Date(e.timestamp).toISOString();
-    const args = Object.entries(e.args || {})
-      .filter(([k, v]) => v !== undefined && v !== null && v !== '')
-      .map(([k, v]) => `${k}=${JSON.stringify(v)}`)
-      .join(' ');
-    return `${ts}  ${e.command}  ${e.status}${e.durationMs ? ` (${e.durationMs}ms)` : ''}${args ? `  -- ${args}` : ''}${e.details ? `\n  > ${e.details}` : ''}`;
+    const projectName = e.project?.name || 'unknown';
+    const model = e.model || 'default';
+    const duration = e.durationMs ? ` (${e.durationMs}ms)` : '';
+    const details = e.details ? `\n    > ${e.details}` : '';
+    
+    return `${ts}  [${projectName}]  ${e.command}  ${e.status}${duration}  model=${model}${details}`;
   }
 
   private async handleHistory(options: HistoryOptions) {

package/src/commands/log.ts

@@ -1,9 +1,16 @@
 import { promises as fs } from 'fs';
 import path from 'path';
 import os from 'os';
+import { execSync } from 'child_process';
 
 export type LogStatus = 'success' | 'failure' | 'cancelled';
 
+export interface ProjectInfo {
+  name: string;
+  path: string;
+  gitRemote?: string;
+}
+
 export interface HistoryEntry {
   id: string;
   timestamp: string; // ISO
@@ -12,6 +19,8 @@ export interface HistoryEntry {
   status: LogStatus;
   details?: string;
   durationMs?: number;
+  project?: ProjectInfo;
+  model?: string;
 }
 
 function getStorageDir(): string {
@@ -27,8 +36,25 @@ function genId(): string {
   return `${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
 }
 
+function getProjectInfo(): ProjectInfo {
+  const cwd = process.cwd();
+  const name = path.basename(cwd);
+  
+  let gitRemote: string | undefined;
+  try {
+    gitRemote = execSync('git config --get remote.origin.url', { 
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe']
+    }).trim() || undefined;
+  } catch {
+    // Not a git repo or no remote
+  }
+
+  return { name, path: cwd, gitRemote };
+}
+
 export class LogService {
-  static async append(entry: Omit<HistoryEntry, 'id' | 'timestamp'> & { timestamp?: string; id?: string }): Promise<void> {
+  static async append(entry: Omit<HistoryEntry, 'id' | 'timestamp' | 'project'> & { timestamp?: string; id?: string; model?: string }): Promise<void> {
     const file = getHistoryPath();
     const dir = path.dirname(file);
     await fs.mkdir(dir, { recursive: true });
@@ -40,7 +66,9 @@ export class LogService {
       args: entry.args,
       status: entry.status,
       details: entry.details,
-      durationMs: entry.durationMs
+      durationMs: entry.durationMs,
+      project: getProjectInfo(),
+      model: entry.model
     };
 
     const line = JSON.stringify(finalized) + '\n';

package/src/commands/prCommand.ts

@@ -50,7 +50,8 @@ export class PullRequestCommand {
           command: 'pr',
           args: { ...options, apiKey: options.apiKey ? '***' : undefined },
           status: 'failure',
-          details: err
+          details: err,
+          model: mergedModel
         });
         process.exit(1);
         return;
@@ -77,7 +78,8 @@ export class PullRequestCommand {
           command: 'pr',
           args: { ...options, apiKey: options.apiKey ? '***' : undefined },
           status: 'failure',
-          details: err
+          details: err,
+          model: mergedModel
         });
         process.exit(1);
         return;
@@ -87,7 +89,8 @@ export class PullRequestCommand {
       await LogService.append({
         command: 'pr',
         args: { ...options, apiKey: options.apiKey ? '***' : undefined },
-        status: 'success'
+        status: 'success',
+        model: mergedModel
       });
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
@@ -96,7 +99,8 @@ export class PullRequestCommand {
         command: 'pr',
         args: { ...options, apiKey: options.apiKey ? '***' : undefined },
         status: 'failure',
-        details: message
+        details: message,
+        model: options.model
       });
       process.exit(1);
     }

package/src/commands/tag.ts

@@ -20,18 +20,29 @@ export class TagCommand {
   constructor() {
     this.program = new Command('tag')
       .description('Create an annotated git tag with optional AI-generated notes')
-      .argument('<name>', 'Tag name to create')
+      .argument('[name]', 'Tag name to create (auto-increments patch version if omitted)')
       .option('-k, --api-key <key>', 'OpenAI API key (overrides env var)')
       .option('--base-url <url>', 'Custom API base URL (overrides env var)')
       .option('-m, --model <model>', 'Model to use (overrides env var)')
       .option('--message <message>', 'Tag message to use directly (skips AI generation)')
       .option('-t, --base-tag <tag>', 'Existing tag to diff against when generating notes')
       .option('--prompt <text>', 'Additional instructions to append to the AI prompt for this tag')
-      .action(async (tagName: string, options: TagOptions) => {
+      .action(async (tagName: string | undefined, options: TagOptions) => {
         await this.handleTag(tagName, options);
       });
   }
 
+  private incrementPatchVersion(version: string): string | null {
+    // Match semver patterns: v1.2.3, 1.2.3, v1.2.3-beta, etc.
+    const match = version.match(/^(v?)(\d+)\.(\d+)\.(\d+)(.*)$/);
+    if (!match) {
+      return null;
+    }
+    const [, prefix, major, minor, patch, suffix] = match;
+    const newPatch = parseInt(patch, 10) + 1;
+    return `${prefix}${major}.${minor}.${newPatch}${suffix}`;
+  }
+
   private resolveAIConfig(options: TagOptions): AIServiceConfig {
     const storedConfig = ConfigService.getConfig();
 
@@ -52,27 +63,58 @@ export class TagCommand {
     };
   }
 
-  private async handleTag(tagName: string, options: TagOptions): Promise<void> {
-    const trimmedName = tagName?.trim();
+  private async handleTag(tagName: string | undefined, options: TagOptions): Promise<void> {
+    const storedConfig = ConfigService.getConfig();
+    const mergedModel = options.model || storedConfig.model;
 
+    let trimmedName = tagName?.trim();
+
+    // If no tag name provided, auto-increment from latest tag
     if (!trimmedName) {
-      console.error('Tag name is required.');
-      await LogService.append({
-        command: 'tag',
-        args: { name: tagName, ...options, apiKey: options.apiKey ? '***' : undefined },
-        status: 'failure',
-        details: 'missing tag name'
-      });
-      process.exit(1);
-      return;
+      const latestTagResult = await GitService.getLatestTag();
+      
+      if (!latestTagResult.success || !latestTagResult.tag) {
+        console.error('No existing tags found. Please provide a tag name explicitly.');
+        await LogService.append({
+          command: 'tag',
+          args: { ...options, apiKey: options.apiKey ? '***' : undefined },
+          status: 'failure',
+          details: 'no existing tags found for auto-increment',
+          model: mergedModel
+        });
+        process.exit(1);
+        return;
+      }
+
+      const newVersion = this.incrementPatchVersion(latestTagResult.tag);
+      
+      if (!newVersion) {
+        console.error(`Cannot parse version from tag "${latestTagResult.tag}". Please provide a tag name explicitly.`);
+        await LogService.append({
+          command: 'tag',
+          args: { ...options, apiKey: options.apiKey ? '***' : undefined },
+          status: 'failure',
+          details: `cannot parse version from tag: ${latestTagResult.tag}`,
+          model: mergedModel
+        });
+        process.exit(1);
+        return;
+      }
+
+      console.log(`Latest tag: ${latestTagResult.tag}`);
+      console.log(`New tag: ${newVersion}`);
+      trimmedName = newVersion;
     }
 
     // Check if tag already exists locally
     const localTagExists = await GitService.tagExists(trimmedName);
     let remoteTagExists = false;
-    let wasTagReplaced = false;
+    let previousTagMessage: string | null = null;
 
     if (localTagExists) {
+      // Get existing tag message before deletion for reference
+      previousTagMessage = await GitService.getTagMessage(trimmedName);
+      
       console.log(`⚠️  Tag ${trimmedName} already exists locally.`);
       const shouldDelete = await this.confirmTagDelete(trimmedName);
 
@@ -82,7 +124,8 @@ export class TagCommand {
           command: 'tag',
           args: { name: trimmedName, ...options, apiKey: options.apiKey ? '***' : undefined },
           status: 'cancelled',
-          details: 'user declined to replace existing tag'
+          details: 'user declined to replace existing tag',
+          model: mergedModel
         });
         return;
       }
@@ -103,7 +146,8 @@ export class TagCommand {
               command: 'tag',
               args: { name: trimmedName, ...options, apiKey: options.apiKey ? '***' : undefined },
               status: 'failure',
-              details: 'remote tag deletion failed'
+              details: 'remote tag deletion failed',
+              model: mergedModel
             });
             process.exit(1);
             return;
@@ -122,13 +166,13 @@ export class TagCommand {
           command: 'tag',
           args: { name: trimmedName, ...options, apiKey: options.apiKey ? '***' : undefined },
           status: 'failure',
-          details: 'local tag deletion failed'
+          details: 'local tag deletion failed',
+          model: mergedModel
         });
         process.exit(1);
         return;
       }
       console.log(`✅ Local tag ${trimmedName} deleted`);
-      wasTagReplaced = true;
     }
 
     let tagMessage = options.message?.trim();
@@ -147,6 +191,15 @@ export class TagCommand {
         }
       }
 
+      // Get style reference from base tag (if different from current tag being replaced)
+      let styleReferenceMessage: string | null = null;
+      if (baseTag && baseTag !== trimmedName) {
+        styleReferenceMessage = await GitService.getTagMessage(baseTag);
+        if (styleReferenceMessage) {
+          console.log(`Using ${baseTag} message as style reference.`);
+        }
+      }
+
       const historyResult = await GitService.getCommitSummariesSince(baseTag);
       if (!historyResult.success || !historyResult.log) {
         console.error('Error:', historyResult.error ?? 'Unable to read commit history.');
@@ -154,7 +207,8 @@ export class TagCommand {
           command: 'tag',
           args: { name: trimmedName, ...options, apiKey: options.apiKey ? '***' : undefined },
           status: 'failure',
-          details: historyResult.error ?? 'Unable to read commit history.'
+          details: historyResult.error ?? 'Unable to read commit history.',
+          model: mergedModel
         });
         process.exit(1);
         return;
@@ -171,14 +225,21 @@ export class TagCommand {
           command: 'tag',
           args: { name: trimmedName, ...options, apiKey: options.apiKey ? '***' : undefined },
           status: 'failure',
-          details: message
+          details: message,
+          model: mergedModel
         });
         process.exit(1);
         return;
       }
 
       const aiService = new AIService(aiConfig);
-      const aiResult = await aiService.generateTagNotes(trimmedName, historyResult.log, options.prompt);
+      const aiResult = await aiService.generateTagNotes(
+        trimmedName, 
+        historyResult.log, 
+        options.prompt, 
+        previousTagMessage,
+        styleReferenceMessage
+      );
 
       if (!aiResult.success || !aiResult.notes) {
         console.error('Error:', aiResult.error ?? 'Failed to generate tag notes.');
@@ -186,7 +247,8 @@ export class TagCommand {
           command: 'tag',
           args: { name: trimmedName, ...options, apiKey: options.apiKey ? '***' : undefined },
           status: 'failure',
-          details: aiResult.error ?? 'Failed to generate tag notes.'
+          details: aiResult.error ?? 'Failed to generate tag notes.',
+          model: mergedModel
         });
         process.exit(1);
         return;
@@ -207,7 +269,8 @@ export class TagCommand {
         command: 'tag',
         args: { name: trimmedName, ...options, apiKey: options.apiKey ? '***' : undefined },
         status: 'cancelled',
-        details: 'user declined tag creation'
+        details: 'user declined tag creation',
+        model: mergedModel
       });
       return;
     }
@@ -221,7 +284,8 @@ export class TagCommand {
         command: 'tag',
         args: { name: trimmedName, ...options, apiKey: options.apiKey ? '***' : undefined },
         status: 'failure',
-        details: 'git tag creation failed'
+        details: 'git tag creation failed',
+        model: mergedModel
       });
       process.exit(1);
       return;
@@ -238,8 +302,8 @@ export class TagCommand {
       const selectedRemotes = await this.selectRemotesForPush(trimmedName, remotes);
 
       if (selectedRemotes && selectedRemotes.length > 0) {
-        // If tag was replaced or remote tag still exists, use force push
-        const needsForcePush = wasTagReplaced || remoteTagExists;
+        // If remote tag still exists (user declined to delete), use force push
+        const needsForcePush = remoteTagExists;
 
         if (needsForcePush) {
           console.log(`\n⚠️  Tag ${trimmedName} may exist on remote. Force push is required.`);
@@ -251,7 +315,8 @@ export class TagCommand {
               command: 'tag',
               args: { name: trimmedName, ...options, apiKey: options.apiKey ? '***' : undefined },
               status: 'cancelled',
-              details: 'user declined force push'
+              details: 'user declined force push',
+              model: mergedModel
             });
             return;
           }
@@ -268,7 +333,8 @@ export class TagCommand {
                 command: 'tag',
                 args: { name: trimmedName, ...options, apiKey: options.apiKey ? '***' : undefined },
                 status: 'failure',
-                details: `tag force push to ${remote} failed`
+                details: `tag force push to ${remote} failed`,
+                model: mergedModel
               });
             }
           }
@@ -285,7 +351,8 @@ export class TagCommand {
                 command: 'tag',
                 args: { name: trimmedName, ...options, apiKey: options.apiKey ? '***' : undefined },
                 status: 'failure',
-                details: `tag push to ${remote} failed`
+                details: `tag push to ${remote} failed`,
+                model: mergedModel
               });
             }
           }
@@ -296,7 +363,8 @@ export class TagCommand {
     await LogService.append({
       command: 'tag',
       args: { name: trimmedName, ...options, apiKey: options.apiKey ? '***' : undefined },
-      status: 'success'
+      status: 'success',
+      model: mergedModel
     });
   }
 

package/src/prompts/tag.ts

@@ -3,7 +3,9 @@ export type TagPromptLanguage = 'ko' | 'en';
 export const generateTagPrompt = (
   tagName: string,
   customInstructions = '',
-  language: TagPromptLanguage = 'ko'
+  language: TagPromptLanguage = 'ko',
+  isImprovement = false,
+  hasStyleReference = false
 ): string => {
   const titleInstruction = language === 'ko'
     ? `첫 줄에 버전 "${tagName}"을 제목으로 작성하세요.`
@@ -51,15 +53,49 @@ export const generateTagPrompt = (
     ? '릴리즈 노트를 한국어로 작성하세요.'
     : 'Write the release notes in English.';
 
+  const improvementInstruction = isImprovement
+    ? language === 'ko'
+      ? `\n## 개선 모드
+이전 릴리즈 노트가 제공됩니다. 이를 참고하여:
+- 기존 내용의 구조와 스타일을 유지하면서 개선하세요.
+- 누락된 변경사항이 있으면 추가하세요.
+- 불필요하거나 중복된 내용은 제거하세요.
+- 더 명확하고 사용자 친화적인 표현으로 다듬으세요.\n`
+      : `\n## Improvement Mode
+Previous release notes are provided. Use them as reference to:
+- Maintain the structure and style while improving the content.
+- Add any missing changes from the commit log.
+- Remove unnecessary or redundant content.
+- Refine the language to be clearer and more user-friendly.\n`
+    : '';
+
+  const styleReferenceInstruction = hasStyleReference && !isImprovement
+    ? language === 'ko'
+      ? `\n## 스타일 참조
+이전 태그의 릴리즈 노트가 스타일 참조용으로 제공됩니다.
+- 제공된 형식과 구조를 따르세요.
+- 제목, 카테고리, 항목 스타일을 일관되게 유지하세요.
+- 언어 톤과 상세도 수준을 맞추세요.\n`
+      : `\n## Style Reference
+A previous tag's release notes are provided as style reference.
+- Follow the provided format and structure.
+- Maintain consistency in title, categories, and item styles.
+- Match the language tone and level of detail.\n`
+    : '';
+
   return `You are an experienced release manager. Produce clear, user-facing release notes in GitHub Release style.
 
 ## Objective
-Create release notes for ${tagName} that describe the meaningful changes since the previous release.
+${isImprovement 
+  ? `Improve the existing release notes for ${tagName} based on the commit history and previous notes.`
+  : `Create release notes for ${tagName} that describe the meaningful changes since the previous release.`}
 
 ## Input Context
 - Target tag to publish: ${tagName}
 - Commit history between the previous tag and ${tagName} will be supplied in the user message.
-
+${isImprovement ? '- Previous release notes are provided for improvement.' : ''}
+${hasStyleReference && !isImprovement ? '- Style reference from previous tag is provided.' : ''}
+${improvementInstruction}${styleReferenceInstruction}
 ${customInstructions ? `## Additional Instructions\n${customInstructions}\n` : ''}
 ## Output Format (GitHub Release Style)
 ${titleInstruction}