📦 更新(package.json): 升级版本号至"0.0.5"，添加新的devDependencies和dependencies

🐛 修复(src/git-utils.ts): 接收参数repo并使用其对应的rootPath，修复多个 Git 无法识别的问题

Author: Sitoi

package.json

@@ -2,7 +2,7 @@
   "name": "ai-commit",
   "displayName": "AI Commit",
   "description": "Use Azure/OpenAI API to review Git changes, generate conventional commit messages that meet the conventions, simplify the commit process, and keep the commit conventions consistent.",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "engines": {
     "node": ">=16",
     "vscode": "^1.77.0"
@@ -146,6 +146,7 @@
     "watch-tests": "tsc -p . -w --outDir out"
   },
   "devDependencies": {
+    "@types/fs-extra": "^11.0.4",
     "@types/glob": "^8.1.0",
     "@types/mocha": "^10.0.1",
     "@types/node": "16.x",
@@ -163,10 +164,11 @@
   },
   "dependencies": {
     "openai": "^4.14.2",
-    "simple-git": "^3.17.0"
+    "simple-git": "^3.17.0",
+    "fs-extra": "^11.0.4"
   },
   "resolutions": {
     "@types/node": "16.x"
   },
   "license": "MIT"
-}
+}

src/ai-commit-controller.ts

@@ -1,9 +1,9 @@
 import { errMsg, infoMsg } from './utils';
 import { generateCommitMsg } from './generate-commit-msg';
-export default async function aiCommitController() {
+export default async function aiCommitController(arg) {
   try {
     infoMsg('Generating commit message...');
-    await generateCommitMsg();
+    await generateCommitMsg(arg);
   } catch (error) {
     errMsg('Generate commit message failed', error);
   }

src/extension.ts

@@ -4,8 +4,8 @@ import aiCommitController from './ai-commit-controller';
 
 export async function activate(context: vscode.ExtensionContext) {
   context.subscriptions.push(
-    vscode.commands.registerCommand('extension.ai-commit', async () => {
-      await aiCommitController();
+    vscode.commands.registerCommand('extension.ai-commit', async (arg) => {
+      await aiCommitController(arg);
     })
   );
 }

src/generate-commit-msg.ts

@@ -1,6 +1,7 @@
 import { getDiffStaged } from './git-utils';
 import { ConfigKeys, getConfig } from './config';
 import * as vscode from 'vscode';
+import * as fs from 'fs-extra';
 import { errMsg, infoMsg } from './utils';
 import { ChatGPTAPI } from './openai-utils';
 import { getMainCommitPrompt } from './prompts';
@@ -16,22 +17,38 @@ const generateCommitMessageChatCompletionPrompt = async (diff: string) => {
   return chatContextAsCompletionRequest;
 };
 
-export async function generateCommitMsg() {
-  const diff = await getDiffStaged();
+export async function getRepo(arg) {
+  const gitApi = vscode.extensions.getExtension('vscode.git').exports.getAPI(1);
+  if (typeof arg === 'object' && arg.rootUri) {
+    const resourceUri = arg.rootUri;
+    const realResourcePath: string = fs.realpathSync(resourceUri!.fsPath);
+    let i = 0;
+    for (const x of gitApi.repositories) {
+      if (
+        realResourcePath.startsWith(x.rootUri.fsPath) &&
+        x.rootUri.fsPath === gitApi.repositories[i].rootUri.fsPath
+      ) {
+        return gitApi.repositories[i];
+      }
+      i++;
+    }
+  }
+  return gitApi.repositories[0];
+}
+
+export async function generateCommitMsg(arg) {
+  const repo = await getRepo(arg);
   const apiKey = getConfig<string>(ConfigKeys.OPENAI_API_KEY);
+  const diff = await getDiffStaged(repo);
 
   if (!apiKey) {
     infoMsg('OpenAI API Key Not Set');
     return;
   }
 
-  const sourceControlView = vscode.extensions
-    .getExtension('vscode.git')
-    .exports.getAPI(1).repositories[0];
-
-  const scmInputBox = sourceControlView.inputBox as vscode.SourceControlInputBox;
+  infoMsg('gitRootPath: ' + repo.rootUri.fsPath);
+  const scmInputBox = repo.inputBox as vscode.SourceControlInputBox;
   const messages = await generateCommitMessageChatCompletionPrompt(diff);
-
   if (scmInputBox) {
     const edit = new vscode.WorkspaceEdit();
 
@@ -43,9 +60,8 @@ export async function generateCommitMsg() {
       .catch((err) => {
         errMsg('API ERROR: ', err);
       });
-
     await vscode.workspace.applyEdit(edit);
   } else {
-    vscode.window.showErrorMessage('Unable to find the SCM input box.');
+    errMsg('Unable to find the SCM input box.', '');
   }
 }

src/git-utils.ts

@@ -1,13 +1,16 @@
 import simpleGit, { SimpleGit } from 'simple-git';
 import * as vscode from 'vscode';
 
-const rootPath = vscode.workspace.workspaceFolders
-  ? vscode.workspace.workspaceFolders[0].uri.fsPath
-  : null;
-
-const git: SimpleGit = simpleGit(rootPath);
-
-export async function getDiffStaged(): Promise<string> {
+export async function getDiffStaged(repo): Promise<string> {
+  let rootPath = null;
+  if (typeof repo === 'object' && repo.rootUri) {
+    rootPath = repo.rootUri.fsPath;
+  } else {
+    rootPath = vscode.workspace.workspaceFolders
+      ? vscode.workspace.workspaceFolders[0].uri.fsPath
+      : null;
+  }
+  const git: SimpleGit = simpleGit(rootPath);
   try {
     const diff = await git.diff(['--staged']);
     return diff;