@cnwenf/occ 2.1.320 → 2.1.321

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env bun
-globalThis.MACRO={"VERSION":"2.1.320","BINARY_NAME":"occ","BUILD_TIME":"2026-09-03T01:30:46.452Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
+globalThis.MACRO={"VERSION":"2.1.321","BINARY_NAME":"occ","BUILD_TIME":"2026-09-03T19:19:08.554Z","FEEDBACK_CHANNEL":"","ISSUES_EXPLAINER":"","NATIVE_PACKAGE_URL":"","PACKAGE_URL":"@cnwenf/occ","VERSION_CHANGELOG":""};
 // @bun
 var __create = Object.create;
 var __getProtoOf = Object.getPrototypeOf;
@@ -367290,8 +367290,33 @@ ${content}` : stdout;
 function gitCmdRe(subcmd, suffix = "") {
   return new RegExp(`\\bgit(?:\\s+-[cC]\\s+\\S+|\\s+--\\S+=\\S+)*\\s+${subcmd}\\b${suffix}`);
 }
+function resolvePrAction(command4) {
+  const ghAction = GH_PR_ACTIONS.find((a5) => a5.re.test(command4))?.action;
+  const unquoted = command4.replace(QUOTED_ARGS_RE, " ");
+  if (ghAction === "merged") {
+    if (/--disable-auto\b/.test(unquoted))
+      return "auto-merge-disabled";
+    if (/--auto\b/.test(unquoted))
+      return "auto-merge-enabled";
+  } else if (ghAction === "ready" && /--undo\b/.test(unquoted)) {
+    return "draft";
+  }
+  if (ghAction)
+    return ghAction;
+  const glabAction = GLAB_MR_ACTIONS.find((a5) => a5.re.test(command4))?.action;
+  if (glabAction === "edited") {
+    if (/--ready\b/.test(unquoted))
+      return "ready";
+    if (/--draft\b/.test(unquoted))
+      return "draft";
+  }
+  return glabAction;
+}
+function isMrUrl(url3) {
+  return /\/-\/merge_requests\/\d/.test(url3);
+}
 function parsePrUrl(url3) {
-  const match = url3.match(/https:\/\/github\.com\/([^/]+\/[^/]+)\/pull\/(\d+)/);
+  const match = url3.match(PR_URL_RE);
   if (match?.[1] && match?.[2]) {
     return {
       prNumber: parseInt(match[2], 10),
@@ -367302,8 +367327,11 @@ function parsePrUrl(url3) {
   return null;
 }
 function findPrInStdout(stdout) {
-  const m5 = stdout.match(/https:\/\/github\.com\/[^/\s]+\/[^/\s]+\/pull\/\d+/);
-  return m5 ? parsePrUrl(m5[0]) : null;
+  const matches = stdout.match(new RegExp(PR_URL_RE.source, "g"));
+  if (!matches)
+    return null;
+  const last2 = matches.at(-1);
+  return last2 !== undefined ? parsePrUrl(last2) : null;
 }
 function parseGitCommitId(stdout) {
   const match = stdout.match(/\[[\w./-]+(?: \(root-commit\))? ([0-9a-f]+)\]/);
@@ -367357,12 +367385,12 @@ function detectGitOperation(command4, output) {
     if (ref)
       result.branch = { ref, action: "rebased" };
   }
-  const prAction = GH_PR_ACTIONS.find((a5) => a5.re.test(command4))?.action;
+  const prAction = resolvePrAction(command4);
   if (prAction) {
     const pr = findPrInStdout(output);
     if (pr) {
       result.pr = { number: pr.prNumber, url: pr.prUrl, action: prAction };
-    } else {
+    } else if (GH_PR_ACTIONS.some((a5) => a5.re.test(command4))) {
       const num = parsePrNumberFromText(output);
       if (num)
         result.pr = { number: num, action: prAction };
@@ -367391,13 +367419,15 @@ function trackGitOperations(command4, exitCode, stdout) {
       operation: "push"
     });
   }
-  const prHit = GH_PR_ACTIONS.find((a5) => a5.re.test(command4));
+  const ghHit = GH_PR_ACTIONS.find((a5) => a5.re.test(command4));
+  const glabHit = GLAB_MR_ACTIONS.find((a5) => a5.re.test(command4));
+  const prHit = ghHit ?? glabHit;
   if (prHit) {
     logEvent2("tengu_git_operation", {
       operation: prHit.op
     });
   }
-  if (prHit?.action === "created") {
+  if (ghHit?.action === "created" || glabHit?.action === "created") {
     getPrCounter()?.add(1);
     if (stdout) {
       const prInfo = findPrInStdout(stdout);
@@ -367413,12 +367443,6 @@ function trackGitOperations(command4, exitCode, stdout) {
       }
     }
   }
-  if (command4.match(/\bglab\s+mr\s+create\b/)) {
-    logEvent2("tengu_git_operation", {
-      operation: "pr_create"
-    });
-    getPrCounter()?.add(1);
-  }
   const isCurlPost = command4.match(/\bcurl\b/) && (command4.match(/-X\s*POST\b/i) || command4.match(/--request\s*=?\s*POST\b/i) || command4.match(/\s-d\s/));
   const isPrEndpoint = command4.match(/https?:\/\/[^\s'"]*\/(pulls|pull-requests|merge[-_]requests)(?!\/\d)/i);
   if (isCurlPost && isPrEndpoint) {
@@ -367428,7 +367452,7 @@ function trackGitOperations(command4, exitCode, stdout) {
     getPrCounter()?.add(1);
   }
 }
-var GIT_OUTPUT_TAIL_BYTES = 8192, GIT_COMMIT_RE, GIT_PUSH_RE, GIT_CHERRY_PICK_RE, GIT_MERGE_RE, GIT_REBASE_RE, GH_PR_ACTIONS;
+var GIT_OUTPUT_TAIL_BYTES = 8192, GIT_COMMIT_RE, GIT_PUSH_RE, GIT_CHERRY_PICK_RE, GIT_MERGE_RE, GIT_REBASE_RE, GH_PR_ACTIONS, GLAB_MR_ACTIONS, QUOTED_ARGS_RE, PR_URL_RE, PR_BADGE_URL_MAX_LENGTH = 2048;
 var init_gitOperationTracking = __esm(() => {
   init_state();
   init_analytics();
@@ -367444,8 +367468,19 @@ var init_gitOperationTracking = __esm(() => {
     { re: /\bgh\s+pr\s+merge\b/, action: "merged", op: "pr_merge" },
     { re: /\bgh\s+pr\s+comment\b/, action: "commented", op: "pr_comment" },
     { re: /\bgh\s+pr\s+close\b/, action: "closed", op: "pr_close" },
+    { re: /\bgh\s+pr\s+reopen\b/, action: "reopened", op: "pr_reopen" },
     { re: /\bgh\s+pr\s+ready\b/, action: "ready", op: "pr_ready" }
   ];
+  GLAB_MR_ACTIONS = [
+    { re: /\bglab\s+mr\s+create\b/, action: "created", op: "pr_create" },
+    { re: /\bglab\s+mr\s+update\b/, action: "edited", op: "pr_edit" },
+    { re: /\bglab\s+mr\s+merge\b/, action: "merged", op: "pr_merge" },
+    { re: /\bglab\s+mr\s+note\b/, action: "commented", op: "pr_comment" },
+    { re: /\bglab\s+mr\s+close\b/, action: "closed", op: "pr_close" },
+    { re: /\bglab\s+mr\s+reopen\b/, action: "reopened", op: "pr_reopen" }
+  ];
+  QUOTED_ARGS_RE = /"(?:[^"\\]|\\.)*"|'[^']*'/g;
+  PR_URL_RE = /https?:\/\/[^/\s"]+\/([^\s"]+?)\/(?:pull|pull-requests|-\/merge_requests)\/(\d+)/;
 });
 
 // src/tools/BashTool/commandSemantics.ts
@@ -467618,17 +467653,24 @@ function CollapsedReadSearchContent({
       merged: "merged",
       commented: "commented on",
       closed: "closed",
-      ready: "marked ready"
+      reopened: "reopened",
+      ready: "marked ready",
+      draft: "marked draft",
+      "auto-merge-enabled": "enabled auto-merge on",
+      "auto-merge-disabled": "disabled auto-merge on"
     };
     for (const pr of message.prs) {
-      pushPart(`pr-${pr.action}-${pr.number}`, verbs[pr.action], pr.url ? /* @__PURE__ */ jsx_runtime116.jsx(PrBadge, {
+      const isMr = pr.url !== undefined && isMrUrl(pr.url);
+      const badgeEligible = pr.url !== undefined && pr.url.length <= PR_BADGE_URL_MAX_LENGTH;
+      pushPart(`pr-${pr.action}-${pr.number}`, verbs[pr.action], badgeEligible ? /* @__PURE__ */ jsx_runtime116.jsx(PrBadge, {
         number: pr.number,
         url: pr.url,
-        bold: true
+        bold: true,
+        kind: isMr ? "mr" : undefined
       }) : /* @__PURE__ */ jsx_runtime116.jsxs(ThemedText, {
         bold: true,
         children: [
-          "PR #",
+          isMr ? "MR !" : "PR #",
           pr.number
         ]
       }));
@@ -467910,6 +467952,7 @@ var init_CollapsedReadSearchContent = __esm(() => {
   init_Tool();
   init_primitiveTools();
   init_collapseReadSearch();
+  init_gitOperationTracking();
   init_file();
   init_format();
   init_fullscreen();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cnwenf/occ",
-  "version": "2.1.320",
+  "version": "2.1.321",
   "license": "MIT",
   "type": "module",
   "bin": {