feat: add full advanced managers (Stash, Tag, Merge, Rebase, Conflict)

Author: prakashaditya13

src/config/commandsList.ts

@@ -446,4 +446,210 @@ export const COMMANDS_LIST: PlainGitCommand[] = [
     description: 'Select reset type interactively from a menu.',
     handler: 'ResetManager.interactiveReset',
   },
+
+  // 🎒 Stash Operations
+  {
+    category: 'Stash',
+    name: '🎒 Stash current changes',
+    command: 'git stash push',
+    description: 'Save current uncommitted changes into a stash.',
+    handler: 'StashManager.createStash',
+  },
+  {
+    category: 'Stash',
+    name: '📜 List all stashes',
+    command: 'git stash list',
+    description: 'Show saved stash entries.',
+    handler: 'StashManager.listStashes',
+  },
+  {
+    category: 'Stash',
+    name: '◀️ Apply a stash',
+    command: 'git stash apply <stash>',
+    description: 'Apply a stash but keep it.',
+    handler: 'StashManager.applyStash',
+  },
+  {
+    category: 'Stash',
+    name: '⬆️ Pop a stash (apply + delete)',
+    command: 'git stash pop <stash>',
+    description: 'Apply and remove a stash entry.',
+    handler: 'StashManager.popStash',
+  },
+  {
+    category: 'Stash',
+    name: '❌ Drop a stash',
+    command: 'git stash drop <stash>',
+    description: 'Delete a specific stash entry.',
+    handler: 'StashManager.dropStash',
+  },
+  {
+    category: 'Stash',
+    name: '🧹 Clear all stashes',
+    command: 'git stash clear',
+    description: 'Remove all stash entries.',
+    handler: 'StashManager.clearStashes',
+  },
+
+  // 🏷️ Tag Operations
+  {
+    category: 'Tag',
+    name: '📜 List all tags',
+    command: 'git tag --list',
+    description: 'Show all tags in the repository.',
+    handler: 'TagManager.listTags',
+  },
+  {
+    category: 'Tag',
+    name: '🏷️ Create a tag',
+    command: 'git tag <tag>',
+    description: 'Create a lightweight tag.',
+    handler: 'TagManager.createTag',
+  },
+  {
+    category: 'Tag',
+    name: '📝 Create an annotated tag',
+    command: "git tag -a <tag> -m '<message>'",
+    description: 'Create a tag with a message and metadata.',
+    handler: 'TagManager.createAnnotatedTag',
+  },
+  {
+    category: 'Tag',
+    name: '🔍 Show tag details',
+    command: 'git show <tag>',
+    description: 'Show commit details behind a tag.',
+    handler: 'TagManager.showTagDetails',
+  },
+  {
+    category: 'Tag',
+    name: '❌ Delete a tag',
+    command: 'git tag -d <tag>',
+    description: 'Delete a tag locally.',
+    handler: 'TagManager.deleteTag',
+  },
+  {
+    category: 'Tag',
+    name: '☁️ Push all tags',
+    command: 'git push --tags',
+    description: 'Push all local tags to the remote repository.',
+    handler: 'TagManager.pushTags',
+  },
+  {
+    category: 'Tag',
+    name: '☁️ Push a specific tag',
+    command: 'git push origin <tag>',
+    description: 'Push only the selected tag to the remote.',
+    handler: 'TagManager.pushSingleTag',
+  },
+
+  // 🔀 Merge Operations
+  {
+    category: 'Merge',
+    name: '🔀 Merge a branch into current',
+    command: 'git merge <branch>',
+    description: 'Merge another branch into the current branch.',
+    handler: 'MergeManager.mergeBranch',
+  },
+  {
+    category: 'Merge',
+    name: '⚠️ Show merge conflicts',
+    command: 'git diff --name-only --diff-filter=U',
+    description: 'List files that have merge conflicts.',
+    handler: 'MergeManager.showConflicts',
+  },
+  {
+    category: 'Merge',
+    name: '🛑 Abort the current merge',
+    command: 'git merge --abort',
+    description: 'Abort the merge process due to conflicts.',
+    handler: 'MergeManager.abortMerge',
+  },
+  {
+    category: 'Merge',
+    name: '▶️ Continue merge',
+    command: 'git merge --continue',
+    description: 'Continue the merge after resolving conflicts.',
+    handler: 'MergeManager.continueMerge',
+  },
+
+  // 🔁 Rebase Operations
+  {
+    category: 'Rebase',
+    name: '🔁 Rebase current branch onto another',
+    command: 'git rebase <branch>',
+    description: 'Replay current branch commits on top of another branch.',
+    handler: 'RebaseManager.startRebase',
+  },
+  {
+    category: 'Rebase',
+    name: '✏️ Interactive rebase (edit history)',
+    command: 'git rebase -i HEAD~<n>',
+    description: 'Interactively edit, squash, or reorder commits.',
+    handler: 'RebaseManager.interactiveRebase',
+  },
+  {
+    category: 'Rebase',
+    name: '▶️ Continue rebase',
+    command: 'git rebase --continue',
+    description: 'Continue rebase after conflicts are resolved.',
+    handler: 'RebaseManager.continueRebase',
+  },
+  {
+    category: 'Rebase',
+    name: '⏭ Skip current commit',
+    command: 'git rebase --skip',
+    description: 'Skip the commit that is causing merge conflicts.',
+    handler: 'RebaseManager.skipCommit',
+  },
+  {
+    category: 'Rebase',
+    name: '🛑 Abort rebase',
+    command: 'git rebase --abort',
+    description: 'Abort the entire rebase process.',
+    handler: 'RebaseManager.abortRebase',
+  },
+  {
+    category: 'Rebase',
+    name: '⚠️ Show rebase conflicts',
+    command: 'git diff --name-only --diff-filter=U',
+    description: 'Show files with conflicts during rebase.',
+    handler: 'RebaseManager.showConflicts',
+  },
+
+  // ⚔️ Conflict Operations
+  {
+    category: 'Conflict',
+    name: '⚠️ List conflicting files',
+    command: 'git diff --name-only --diff-filter=U',
+    description: 'Show files that currently contain merge conflicts.',
+    handler: 'ConflictManager.listConflicts',
+  },
+  {
+    category: 'Conflict',
+    name: '📄 Inspect conflict markers',
+    command: 'Open file and inspect conflict markers',
+    description: 'Show HEAD and incoming changes inside a file.',
+    handler: 'ConflictManager.inspectConflict',
+  },
+  {
+    category: 'Conflict',
+    name: '🧭 Open conflict in VS Code',
+    command: 'code <file>',
+    description: 'Open conflicting file directly in VSCode.',
+    handler: 'ConflictManager.openInEditor',
+  },
+  {
+    category: 'Conflict',
+    name: '🔍 Show diff of a conflict file',
+    command: 'git diff <file>',
+    description: 'View what changed inside the conflict.',
+    handler: 'ConflictManager.showConflictDiff',
+  },
+  {
+    category: 'Conflict',
+    name: 'ℹ️ How to resolve conflicts (guide)',
+    command: 'Explain how to resolve Git conflicts',
+    description: 'Shows a step-by-step guide for resolving conflicts.',
+    handler: 'ConflictManager.conflictHelp',
+  },
 ];

src/core/registry/ManagerMap.ts

@@ -6,7 +6,7 @@
  * -------------------------------------------------------------
  */
 
-import {RepositoryManager, BranchManager, CommitManager, RemoteManager, HistoryManager, ResetManager} from '../../managers'
+import {RepositoryManager, BranchManager, CommitManager, RemoteManager, HistoryManager, ResetManager, StashManager, TagManager, MergeManager, RebaseManager, ConflictManager} from '../../managers'
 
 export const managerMap: Record<string, any> = {
   RepositoryManager,
@@ -15,4 +15,9 @@ export const managerMap: Record<string, any> = {
   RemoteManager,
   HistoryManager,
   ResetManager,
+  StashManager,
+  TagManager,
+  MergeManager,
+  RebaseManager,
+  ConflictManager
 };