mobbdev 1.4.51 → 1.4.56

package/dist/args/commands/upload_ai_blame.mjs

@@ -4891,6 +4891,12 @@ var GitlabAuthResultZ = z20.object({
 
 // src/features/analysis/scm/gitlab/gitlab.ts
 var debug6 = Debug5("scm:gitlab");
+var GITLAB_HEADERS_TIMEOUT_MS = 3e4;
+var GITLAB_BODY_TIMEOUT_MS = 6e4;
+var gitlabDirectAgent = new Agent({
+  headersTimeout: GITLAB_HEADERS_TIMEOUT_MS,
+  bodyTimeout: GITLAB_BODY_TIMEOUT_MS
+});
 
 // src/features/analysis/scm/gitlab/GitlabSCMLib.ts
 init_client_generates();

package/dist/index.mjs

@@ -9258,16 +9258,63 @@ async function createMergeRequest(options) {
     url: options.repoUrl,
     gitlabAuthToken: options.accessToken
   });
-  const res = await api2.MergeRequests.create(
-    projectPath,
-    options.sourceBranchName,
-    options.targetBranchName,
-    options.title,
-    {
-      description: safeBody(options.body, MAX_GITLAB_PR_BODY_LENGTH)
+  try {
+    const res = await api2.MergeRequests.create(
+      projectPath,
+      options.sourceBranchName,
+      options.targetBranchName,
+      options.title,
+      {
+        description: safeBody(options.body, MAX_GITLAB_PR_BODY_LENGTH)
+      }
+    );
+    return res.iid;
+  } catch (e) {
+    if (!isGitlabDuplicateMergeRequest(e)) {
+      throw e;
+    }
+    const existingIid = await findOpenGitlabMergeRequestIid({
+      api: api2,
+      projectPath,
+      sourceBranchName: options.sourceBranchName,
+      targetBranchName: options.targetBranchName
+    });
+    if (existingIid === void 0) {
+      throw e;
     }
+    contextLogger.warn(
+      "[createMergeRequest] adopted existing MR after duplicate conflict",
+      {
+        projectPath,
+        sourceBranch: options.sourceBranchName,
+        targetBranch: options.targetBranchName,
+        iid: existingIid
+      }
+    );
+    return existingIid;
+  }
+}
+function isGitlabDuplicateMergeRequest(e) {
+  const status = e?.status;
+  const msg = (e instanceof Error ? e.message : String(e)).toLowerCase();
+  return status === 409 || /another open merge request already exists|merge request already exists/.test(
+    msg
   );
-  return res.iid;
+}
+async function findOpenGitlabMergeRequestIid({
+  api: api2,
+  projectPath,
+  sourceBranchName,
+  targetBranchName
+}) {
+  const open6 = await api2.MergeRequests.all({
+    projectId: projectPath,
+    sourceBranch: sourceBranchName,
+    targetBranch: targetBranchName,
+    state: "opened",
+    perPage: 1
+  });
+  return open6[0]?.iid;
 }
 async function getGitlabMergeRequest({
   url,
@@ -9681,9 +9728,65 @@ async function processBody(response) {
   }
   return await response.text();
 }
-var GITLAB_RETRYABLE_STATUSES = /* @__PURE__ */ new Set([429, 502, 503, 504]);
-var GITLAB_REQUEST_MAX_ATTEMPTS = 4;
+var GITLAB_RETRYABLE_STATUSES = /* @__PURE__ */ new Set([
+  408,
+  429,
+  500,
+  502,
+  503,
+  504,
+  520,
+  522,
+  524
+]);
+var GITLAB_REQUEST_MAX_ATTEMPTS = 5;
 var GITLAB_REQUEST_BASE_BACKOFF_MS = 1e3;
+var GITLAB_REQUEST_MAX_BACKOFF_MS = 8e3;
+var GITLAB_RETRY_AFTER_CAP_MS = 3e4;
+var GITLAB_REQUEST_JITTER_MS = 1e3;
+var GITLAB_HEADERS_TIMEOUT_MS = 3e4;
+var GITLAB_BODY_TIMEOUT_MS = 6e4;
+var gitlabDirectAgent = new Agent({
+  headersTimeout: GITLAB_HEADERS_TIMEOUT_MS,
+  bodyTimeout: GITLAB_BODY_TIMEOUT_MS
+});
+function isRetryableGitlabStatus(status) {
+  return GITLAB_RETRYABLE_STATUSES.has(status);
+}
+var TRANSIENT_UNDICI_CODES = /* @__PURE__ */ new Set([
+  "UND_ERR_HEADERS_TIMEOUT",
+  "UND_ERR_BODY_TIMEOUT",
+  "UND_ERR_CONNECT_TIMEOUT",
+  "UND_ERR_SOCKET"
+]);
+function isTransientNetworkError(e) {
+  if (!(e instanceof Error)) return false;
+  if (e.name === "TimeoutError" || e.name === "AbortError") return true;
+  const cause = e.cause;
+  if (cause && typeof cause.code === "string") {
+    return TRANSIENT_UNDICI_CODES.has(cause.code);
+  }
+  return false;
+}
+function getGitlabRetryDelayMs({
+  attempt,
+  retryAfterHeader
+}) {
+  const retryAfterSec = Number(retryAfterHeader);
+  if (Number.isFinite(retryAfterSec) && retryAfterSec > 0) {
+    return Math.min(retryAfterSec * 1e3, GITLAB_RETRY_AFTER_CAP_MS);
+  }
+  const backoffMs = Math.min(
+    GITLAB_REQUEST_BASE_BACKOFF_MS * 2 ** (attempt - 1),
+    GITLAB_REQUEST_MAX_BACKOFF_MS
+  );
+  return backoffMs + Math.floor(Math.random() * GITLAB_REQUEST_JITTER_MS);
+}
+function gitlabResponseError(response) {
+  const error = new Error(`gitbeaker: ${response.statusText}`);
+  error.status = response.status;
+  return error;
+}
 async function brokerRequestHandler(endpoint, options) {
   const { prefixUrl, searchParams } = options || {};
   let baseUrl;
@@ -9694,8 +9797,10 @@ async function brokerRequestHandler(endpoint, options) {
     uri: GIT_PROXY_HOST,
     requestTls: {
       rejectUnauthorized: false
-    }
-  }) : void 0;
+    },
+    headersTimeout: GITLAB_HEADERS_TIMEOUT_MS,
+    bodyTimeout: GITLAB_BODY_TIMEOUT_MS
+  }) : gitlabDirectAgent;
   let lastError;
   for (let attempt = 1; attempt <= GITLAB_REQUEST_MAX_ATTEMPTS; attempt++) {
     let response;
@@ -9707,7 +9812,7 @@ async function brokerRequestHandler(endpoint, options) {
         dispatcher
       });
     } catch (e) {
-      if (e.name === "TimeoutError" || e.name === "AbortError") {
+      if (isTransientNetworkError(e)) {
         lastError = new Error("Query timeout was reached");
       } else {
         throw e;
@@ -9721,14 +9826,25 @@ async function brokerRequestHandler(endpoint, options) {
           status: response.status
         };
       }
-      if (!GITLAB_RETRYABLE_STATUSES.has(response.status)) {
-        throw new Error(`gitbeaker: ${response.statusText}`);
+      if (!isRetryableGitlabStatus(response.status)) {
+        throw gitlabResponseError(response);
       }
-      lastError = new Error(`gitbeaker: ${response.statusText}`);
+      lastError = gitlabResponseError(response);
     }
     if (attempt === GITLAB_REQUEST_MAX_ATTEMPTS) break;
-    const retryAfter = Number(response?.headers.get("retry-after"));
-    const waitMs = Number.isFinite(retryAfter) && retryAfter > 0 ? retryAfter * 1e3 : GITLAB_REQUEST_BASE_BACKOFF_MS * 2 ** (attempt - 1);
+    const waitMs = getGitlabRetryDelayMs({
+      attempt,
+      retryAfterHeader: response?.headers.get("retry-after")
+    });
+    contextLogger.warn("[brokerRequestHandler] retrying GitLab request", {
+      method: options?.method ?? "GET",
+      pathname: url.pathname,
+      status: response?.status,
+      attempt,
+      maxAttempts: GITLAB_REQUEST_MAX_ATTEMPTS,
+      waitMs,
+      error: lastError?.message
+    });
     await delay(waitMs);
   }
   throw lastError ?? new Error("gitbeaker: request failed");
@@ -18442,7 +18558,7 @@ function createLogger(config2) {
 
 // src/features/claude_code/hook_logger.ts
 var DD_RUM_TOKEN = true ? "pubf59c0182545bfb4c299175119f1abf9b" : "";
-var CLI_VERSION = true ? "1.4.51" : "unknown";
+var CLI_VERSION = true ? "1.4.56" : "unknown";
 var NAMESPACE = "mobbdev-claude-code-hook-logs";
 var claudeCodeVersion;
 function buildDdTags() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobbdev",
-  "version": "1.4.51",
+  "version": "1.4.56",
   "description": "Automated secure code remediation tool",
   "repository": "git+https://github.com/mobb-dev/bugsy.git",
   "main": "dist/index.mjs",