@andre.buzeli/git-mcp 16.0.4 → 16.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andre.buzeli/git-mcp",
-  "version": "16.0.4",
+  "version": "16.0.6",
   "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' });
       }
@@ -313,6 +318,19 @@ EXEMPLOS DE USO:
 
         const organization = args.organization || undefined;
 
+        // Ensure repos exist and set correct remote URLs (handles GitHub org fallback)
+        if (organization) {
+          const repo = getRepoNameFromPath(projectPath);
+          const isPublic = args.isPublic === true;
+          const ensured = await pm.ensureRepos({ repoName: repo, createIfMissing: true, isPublic, organization });
+          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 });
+        }
+
         // Retry logic for push (often fails due to network or concurrent updates)
         const result = await withRetry(
           () => git.pushParallel(projectPath, branch, force, organization),
@@ -396,9 +414,15 @@ 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