@dami_deleon/rikudo 2.0.1 → 2.0.2

package/dist/mcp/server.js

@@ -117,11 +117,18 @@ server.registerTool("shift_left_start", {
     }),
 }, async ({ ticketId, branchName, targetBranch, isWip }) => {
     try {
-        await git.checkout(targetBranch);
-        await git.pull("origin", targetBranch);
-        await git.checkoutLocalBranch(branchName);
-        await git.commit("chore: init #" + ticketId, ["--allow-empty"]);
-        await git.push(["-u", "origin", branchName]);
+        const branches = await git.branchLocal();
+        const branchExists = branches.all.includes(branchName);
+        if (branchExists) {
+            await git.checkout(branchName);
+        }
+        else {
+            await git.checkout(targetBranch);
+            await git.pull("origin", targetBranch);
+            await git.checkoutLocalBranch(branchName);
+            await git.commit("chore: init #" + ticketId, ["--allow-empty"]);
+            await git.push(["-u", "origin", branchName]);
+        }
         const ticket = await getIssueDetails(ticketId);
         const prTitle = isWip
             ? `WIP: ${ticket?.subject || `Ticket #${ticketId}`}`
@@ -136,7 +143,7 @@ server.registerTool("shift_left_start", {
         });
         if (!prResult.success) {
             return {
-                content: [{ type: "text", text: `Rama '${branchName}' creada y empujada a origin. Error al crear PR: ${prResult.error}` }],
+                content: [{ type: "text", text: `Rama '${branchName}' lista. Error al crear PR: ${prResult.error}` }],
                 isError: true,
             };
         }
@@ -148,9 +155,12 @@ server.registerTool("shift_left_start", {
                         success: true,
                         branch: branchName,
                         targetBranch,
+                        branchCreated: !branchExists,
                         prUrl: prResult.url,
                         prNumber: prResult.number,
-                        message: `Entorno preparado en rama '${branchName}'. Draft PR creado: ${prResult.url}`,
+                        message: branchExists
+                            ? `Rama '${branchName}' verificada. Draft PR creado: ${prResult.url}`
+                            : `Rama '${branchName}' creada. Draft PR creado: ${prResult.url}`,
                     }, null, 2),
                 },
             ],

package/dist/services/git.js

@@ -44,3 +44,18 @@ export async function getProjectId() {
     }
     return projectId;
 }
+export async function getGitRemoteInfo() {
+    const remote = await git.remote(["get-url", "origin"]);
+    if (!remote) {
+        throw new Error("No se pudo obtener el remote de Git");
+    }
+    const cleanRemote = remote.trim().replace(".git", "");
+    const url = new URL(cleanRemote);
+    const pathParts = url.pathname.split("/").filter(Boolean);
+    if (pathParts.length < 2) {
+        throw new Error("Formato de remote no válido. Expected: https://gitea.host/owner/repo.git");
+    }
+    const owner = pathParts[pathParts.length - 2];
+    const repo = pathParts[pathParts.length - 1];
+    return { owner, repo };
+}

package/dist/services/gitea.js

@@ -1,32 +1,41 @@
 import axios, { AxiosError } from "axios";
-const getGiteaConfig = () => {
-    return {
-        url: process.env.RIKUDO_GITEA_URL || "",
-        token: process.env.RIKUDO_GITEA_TOKEN || "",
-        owner: process.env.RIKUDO_GITEA_OWNER || "",
-        repo: process.env.RIKUDO_GITEA_REPO || "",
-    };
+import { getGitRemoteInfo } from "./git.js";
+const getGiteaConfig = async () => {
+    const url = process.env.RIKUDO_GITEA_URL || "";
+    const token = process.env.RIKUDO_GITEA_TOKEN || "";
+    let owner = process.env.RIKUDO_GITEA_OWNER || "";
+    let repo = process.env.RIKUDO_GITEA_REPO || "";
+    if (!owner || !repo) {
+        try {
+            const remoteInfo = await getGitRemoteInfo();
+            owner = owner || remoteInfo.owner;
+            repo = repo || remoteInfo.repo;
+        }
+        catch {
+            // Remote info not available, will be validated later
+        }
+    }
+    return { url, token, owner, repo };
 };
-const getGiteaClient = () => {
-    const config = getGiteaConfig();
+const getGiteaClient = (url, token) => {
     return axios.create({
-        baseURL: config.url,
+        baseURL: url,
         headers: {
-            Authorization: `token ${config.token}`,
+            Authorization: `token ${token}`,
             "Content-Type": "application/json",
         },
     });
 };
 export const createPullRequest = async (payload) => {
-    const config = getGiteaConfig();
+    const config = await getGiteaConfig();
     if (!config.url || !config.token || !config.owner || !config.repo) {
         return {
             success: false,
-            error: "Faltan variables de entorno de Gitea (RIKUDO_GITEA_URL, RIKUDO_GITEA_TOKEN, RIKUDO_GITEA_OWNER, RIKUDO_GITEA_REPO)",
+            error: "Faltan variables de entorno de Gitea (RIKUDO_GITEA_URL, RIKUDO_GITEA_TOKEN, RIKUDO_GITEA_OWNER, RIKUDO_GITEA_REPO) o no se pudo obtener el remote de Git",
         };
     }
     try {
-        const client = getGiteaClient();
+        const client = getGiteaClient(config.url, config.token);
         const endpoint = `/api/v1/repos/${config.owner}/${config.repo}/pulls`;
         const response = await client.post(endpoint, {
             title: payload.title,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dami_deleon/rikudo",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "El Sabio de los Commits: AI Assistant con integración a Redmine",
   "main": "dist/index.js",
   "type": "module",