@tarcisiopgs/lisa 1.26.0 → 1.26.1

package/dist/index.js

@@ -1406,6 +1406,9 @@ async function jiraPost(path, body) {
 async function jiraPut(path, body) {
   return jiraFetch("PUT", path, body);
 }
+async function jiraSearchJql(jql, fields, maxResults) {
+  return jiraPost("/search/jql", { jql, fields: fields.split(","), maxResults });
+}
 function priorityRank(issue2) {
   const name = issue2.fields.priority?.name?.toLowerCase() ?? "";
   return PRIORITY_RANK[name] ?? Number.MAX_SAFE_INTEGER;
@@ -1432,6 +1435,21 @@ function extractAdfText(node) {
 function escapeJql(value) {
   return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
 }
+async function resolveStatusId(scope, statusName) {
+  try {
+    const data = await jiraGet(
+      `/project/${encodeURIComponent(scope)}/statuses`
+    );
+    for (const issueType of data) {
+      const match = issueType.statuses.find(
+        (s) => s.name.toLowerCase() === statusName.toLowerCase()
+      );
+      if (match) return match.id;
+    }
+  } catch {
+  }
+  return null;
+}
 function issueUrl(baseUrl, key) {
   return `${baseUrl}/browse/${key}`;
 }
@@ -1440,13 +1458,11 @@ var JiraSource = class {
   async fetchNextIssue(config2) {
     const labels = Array.isArray(config2.label) ? config2.label : [config2.label];
     const labelClause = labels.map((l) => `labels = "${escapeJql(l)}"`).join(" AND ");
-    const jql = encodeURIComponent(
-      `project = "${escapeJql(config2.scope)}" AND ${labelClause} AND status = "${escapeJql(config2.pick_from)}" ORDER BY priority ASC, created ASC`
-    );
+    const statusId = await resolveStatusId(config2.scope, config2.pick_from);
+    const statusClause = statusId ? `status = ${statusId}` : `status = "${escapeJql(config2.pick_from)}"`;
+    const jql = `project = "${escapeJql(config2.scope)}" AND ${labelClause} AND ${statusClause} ORDER BY priority ASC, created ASC`;
     const fields = "summary,description,priority,status,labels,issuelinks";
-    const data = await jiraGet(
-      `/search/jql?jql=${jql}&fields=${fields}&maxResults=50`
-    );
+    const data = await jiraSearchJql(jql, fields, 50);
     const issues = data.issues ?? [];
     if (issues.length === 0) return null;
     const unblocked = [];
@@ -1504,11 +1520,10 @@ var JiraSource = class {
   async updateStatus(issueId, statusName) {
     const key = parseJiraIdentifier(issueId);
     const data = await jiraGet(`/issue/${key}/transitions`);
-    const transition = data.transitions.find(
-      (t) => t.name.toLowerCase() === statusName.toLowerCase()
-    );
+    const lowerName = statusName.toLowerCase();
+    const transition = data.transitions.find((t) => t.to.name.toLowerCase() === lowerName) ?? data.transitions.find((t) => t.name.toLowerCase() === lowerName);
     if (!transition) {
-      const available = data.transitions.map((t) => t.name).join(", ");
+      const available = data.transitions.map((t) => `${t.name} \u2192 ${t.to.name}`).join(", ");
       throw new Error(`Jira transition "${statusName}" not found. Available: ${available}`);
     }
     await jiraPost(`/issue/${key}/transitions`, { transition: { id: transition.id } });
@@ -1535,13 +1550,11 @@ var JiraSource = class {
   async listIssues(config2) {
     const labels = Array.isArray(config2.label) ? config2.label : [config2.label];
     const labelClause = labels.map((l) => `labels = "${escapeJql(l)}"`).join(" AND ");
-    const jql = encodeURIComponent(
-      `project = "${escapeJql(config2.scope)}" AND ${labelClause} AND status = "${escapeJql(config2.pick_from)}" ORDER BY priority ASC, created ASC`
-    );
+    const statusId = await resolveStatusId(config2.scope, config2.pick_from);
+    const statusClause = statusId ? `status = ${statusId}` : `status = "${escapeJql(config2.pick_from)}"`;
+    const jql = `project = "${escapeJql(config2.scope)}" AND ${labelClause} AND ${statusClause} ORDER BY priority ASC, created ASC`;
     const fields = "summary,description,priority,status,labels";
-    const data = await jiraGet(
-      `/search/jql?jql=${jql}&fields=${fields}&maxResults=100`
-    );
+    const data = await jiraSearchJql(jql, fields, 100);
     const baseUrl = getBaseUrl();
     return (data.issues ?? []).map((issue2) => ({
       id: issue2.key,
@@ -2552,14 +2565,15 @@ var ShortcutSource = class {
   }
   async removeLabel(storyId, labelName) {
     const story = await shortcutGet(`/api/v3/stories/${storyId}`);
-    const labels = await shortcutGet("/api/v3/labels");
-    const label = labels.find(
+    const allLabels = await shortcutGet("/api/v3/labels");
+    const labelToRemove = allLabels.find(
       (l) => l.name.toLowerCase() === labelName.toLowerCase() && !l.archived
     );
-    if (!label || !story.label_ids.includes(label.id)) return;
-    const updatedLabelIds = story.label_ids.filter((lid) => lid !== label.id);
+    if (!labelToRemove || !story.label_ids.includes(labelToRemove.id)) return;
+    const remainingIds = story.label_ids.filter((lid) => lid !== labelToRemove.id);
+    const labelNames = remainingIds.map((lid) => allLabels.find((l) => l.id === lid)).filter((l) => l !== void 0).map((l) => ({ name: l.name }));
     await shortcutPut(`/api/v3/stories/${storyId}`, {
-      label_ids: updatedLabelIds
+      labels: labelNames
     });
   }
 };
@@ -4663,17 +4677,14 @@ function formatProviderName(providerUsed) {
 function getAuthHeader2() {
   const token = process.env.BITBUCKET_TOKEN;
   if (!token) throw new Error("BITBUCKET_TOKEN is not set");
-  const username = process.env.BITBUCKET_USERNAME;
-  if (!username) throw new Error("BITBUCKET_USERNAME is not set");
-  const credentials = Buffer.from(`${username}:${token}`).toString("base64");
-  return `Basic ${credentials}`;
+  return `Bearer ${token}`;
 }
 async function appendPrAttribution2(prUrl, providerUsed) {
   try {
     const match = prUrl.match(/bitbucket\.org\/([^/]+)\/([^/]+)\/pull-requests\/(\d+)/);
     if (!match) return;
     const [, workspace, repoSlug, prId] = match;
-    if (!process.env.BITBUCKET_TOKEN || !process.env.BITBUCKET_USERNAME) return;
+    if (!process.env.BITBUCKET_TOKEN) return;
     const authHeader = getAuthHeader2();
     const getRes = await fetch(
       `${API_URL3}/repositories/${workspace}/${repoSlug}/pullrequests/${prId}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarcisiopgs/lisa",
-  "version": "1.26.0",
+  "version": "1.26.1",
   "description": "Autonomous issue resolver",
   "keywords": [
     "loop",