@andre.buzeli/git-mcp 16.0.3 → 16.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andre.buzeli/git-mcp",
-  "version": "16.0.3",
+  "version": "16.0.5",
   "private": false,
   "description": "MCP server para Git com operações locais e sincronização paralela GitHub/Gitea",
   "license": "MIT",

package/src/tools/git-workflow.js

@@ -292,8 +292,13 @@ EXEMPLOS DE USO:
         }
 
         const ensured = await pm.ensureRepos({ repoName: repo, createIfMissing: true, isPublic, organization });
-        const urls = await pm.getRemoteUrls(repo, organization);
-        await git.ensureRemotes(projectPath, { githubUrl: urls.github || "", giteaUrl: urls.gitea || "" });
+        // Build URLs from actual ensureRepos results (handles GitHub fallback to personal account)
+        const githubUrl = ensured.github?.ok && ensured.github.repo
+          ? `https://github.com/${ensured.github.repo}.git` : "";
+        const giteaBase = pm.giteaUrl?.replace(/\/$/, "");
+        const giteaUrl = ensured.gitea?.ok && ensured.gitea.repo && giteaBase
+          ? `${giteaBase}/${ensured.gitea.repo}.git` : "";
+        await git.ensureRemotes(projectPath, { githubUrl, giteaUrl, organization });
         const remotes = await git.listRemotes(projectPath);
         return asToolResult({ success: true, ensured, remotes, isPrivate: !isPublic, organization: organization || undefined }, { tool: 'workflow', action: 'ensure-remotes' });
       }
@@ -311,9 +316,11 @@ EXEMPLOS DE USO:
           });
         }
 
+        const organization = args.organization || undefined;
+
         // Retry logic for push (often fails due to network or concurrent updates)
         const result = await withRetry(
-          () => git.pushParallel(projectPath, branch, force),
+          () => git.pushParallel(projectPath, branch, force, organization),
           3,
           "push"
         );
@@ -394,15 +401,21 @@ EXEMPLOS DE USO:
         const organization = args.organization || undefined;
         if (organization) {
           const repo = getRepoNameFromPath(projectPath);
-          await pm.ensureRepos({ repoName: repo, createIfMissing: true, organization });
-          const urls = await pm.getRemoteUrls(repo, organization);
-          await git.ensureRemotes(projectPath, { githubUrl: urls.github || "", giteaUrl: urls.gitea || "" });
+          const isPublic = args.isPublic === true;
+          const ensured = await pm.ensureRepos({ repoName: repo, createIfMissing: true, isPublic, organization });
+          // Build URLs from actual ensureRepos results (handles GitHub fallback to personal account)
+          const githubUrl = ensured.github?.ok && ensured.github.repo
+            ? `https://github.com/${ensured.github.repo}.git` : "";
+          const giteaBase = pm.giteaUrl?.replace(/\/$/, "");
+          const giteaUrl = ensured.gitea?.ok && ensured.gitea.repo && giteaBase
+            ? `${giteaBase}/${ensured.gitea.repo}.git` : "";
+          await git.ensureRemotes(projectPath, { githubUrl, giteaUrl, organization });
         }
 
         // 4. Push
         const branch = await git.getCurrentBranch(projectPath);
         const pushResult = await withRetry(
-          () => git.pushParallel(projectPath, branch, force),
+          () => git.pushParallel(projectPath, branch, force, organization),
           3,
           "push"
         );

package/src/utils/gitAdapter.js

@@ -536,14 +536,14 @@ export class GitAdapter {
     }
 
     // ============ REMOTES ============
-    async ensureRemotes(dir, { githubUrl, giteaUrl }) {
+    async ensureRemotes(dir, { githubUrl, giteaUrl, organization } = {}) {
         const remotesOutput = await this._exec(dir, ["remote", "-v"]);
         const remotes = new Set(remotesOutput.split("\n").map(l => l.split("\t")[0]).filter(Boolean));
 
         const repoName = getRepoNameFromPath(dir);
-        const calcUrls = await this.pm.getRemoteUrls(repoName);
-        const targetGithub = calcUrls.github || githubUrl;
-        const targetGitea = calcUrls.gitea || giteaUrl;
+        const calcUrls = await this.pm.getRemoteUrls(repoName, organization);
+        const targetGithub = githubUrl || calcUrls.github;
+        const targetGitea = giteaUrl || calcUrls.gitea;
 
         const setRemote = async (name, url) => {
             if (!url) return;
@@ -615,8 +615,8 @@ export class GitAdapter {
         }
     }
 
-    async pushParallel(dir, branch, force = false) {
-        await this.ensureRemotes(dir, {});
+    async pushParallel(dir, branch, force = false, organization) {
+        await this.ensureRemotes(dir, { organization });
         const remotesStr = await this._exec(dir, ["remote"]);
         const remotes = remotesStr.split("\n").filter(r => ["github", "gitea"].includes(r.trim()));