@tarcisiopgs/lisa 1.12.3 → 1.13.0

package/dist/{chunk-UKRCQYHM.js → chunk-JSRHJYX2.js}

@@ -229,8 +229,10 @@ var GitHubIssuesSource = class {
   name = "github-issues";
   async fetchNextIssue(config) {
     const { owner, repo } = parseOwnerRepo(config.team);
-    const labels = Array.isArray(config.label) ? config.label : [config.label];
-    const label = labels.map((l) => encodeURIComponent(l)).join(",");
+    const validStates = ["open", "closed", "all"];
+    const isOrphanDetection = !!config.pick_from && !validStates.includes(config.pick_from);
+    const filterLabels = isOrphanDetection ? [config.pick_from] : Array.isArray(config.label) ? config.label : [config.label];
+    const label = filterLabels.map((l) => encodeURIComponent(l)).join(",");
     const path = `/repos/${owner}/${repo}/issues?labels=${label}&state=open&sort=created&direction=asc&per_page=100`;
     const issues = await githubGet(path);
     if (issues.length === 0) return null;
@@ -310,8 +312,36 @@ var GitHubIssuesSource = class {
       return null;
     }
   }
-  async updateStatus(issueId, labelToAdd) {
+  async updateStatus(issueId, labelToAdd, config) {
     const ref = parseGitHubIssueNumber(issueId);
+    if (config && config.in_progress !== config.pick_from) {
+      const filterLabels = Array.isArray(config.label) ? config.label : [config.label];
+      const isMovingToInProgress = labelToAdd === config.in_progress;
+      if (isMovingToInProgress) {
+        await githubPost(`/repos/${ref.owner}/${ref.repo}/issues/${ref.number}/labels`, {
+          labels: [labelToAdd]
+        });
+        for (const label of filterLabels) {
+          try {
+            await githubDelete(
+              `/repos/${ref.owner}/${ref.repo}/issues/${ref.number}/labels/${encodeURIComponent(label)}`
+            );
+          } catch {
+          }
+        }
+        return;
+      }
+      await githubPost(`/repos/${ref.owner}/${ref.repo}/issues/${ref.number}/labels`, {
+        labels: filterLabels
+      });
+      try {
+        await githubDelete(
+          `/repos/${ref.owner}/${ref.repo}/issues/${ref.number}/labels/${encodeURIComponent(config.in_progress)}`
+        );
+      } catch {
+      }
+      return;
+    }
     await githubPost(`/repos/${ref.owner}/${ref.repo}/issues/${ref.number}/labels`, {
       labels: [labelToAdd]
     });
@@ -322,7 +352,7 @@ var GitHubIssuesSource = class {
       body: `Pull request: ${prUrl}`
     });
   }
-  async completeIssue(issueId, _status, labelToRemove) {
+  async completeIssue(issueId, _status, labelToRemove, config) {
     const ref = parseGitHubIssueNumber(issueId);
     await githubPatch(`/repos/${ref.owner}/${ref.repo}/issues/${ref.number}`, {
       state: "closed"
@@ -330,6 +360,14 @@ var GitHubIssuesSource = class {
     if (labelToRemove) {
       await this.removeLabel(issueId, labelToRemove);
     }
+    if (config && config.in_progress !== config.pick_from) {
+      try {
+        await githubDelete(
+          `/repos/${ref.owner}/${ref.repo}/issues/${ref.number}/labels/${encodeURIComponent(config.in_progress)}`
+        );
+      } catch {
+      }
+    }
   }
   async listIssues(config) {
     const { owner, repo } = parseOwnerRepo(config.team);
@@ -436,8 +474,10 @@ var GitLabIssuesSource = class {
   name = "gitlab-issues";
   async fetchNextIssue(config) {
     const project = parseGitLabProject(config.team);
-    const labelsArr = Array.isArray(config.label) ? config.label : [config.label];
-    const label = labelsArr.map((l) => encodeURIComponent(l)).join(",");
+    const validStates = ["opened", "closed", "all"];
+    const isOrphanDetection = !!config.pick_from && !validStates.includes(config.pick_from);
+    const filterLabels = isOrphanDetection ? [config.pick_from] : Array.isArray(config.label) ? config.label : [config.label];
+    const label = filterLabels.map((l) => encodeURIComponent(l)).join(",");
     const path = `/projects/${project}/issues?labels=${label}&state=opened&per_page=100`;
     const issues = await gitlabGet(path);
     if (issues.length === 0) return null;
@@ -500,10 +540,30 @@ var GitLabIssuesSource = class {
       return null;
     }
   }
-  async updateStatus(issueId, labelToAdd) {
+  async updateStatus(issueId, labelToAdd, config) {
     const { project, iid } = splitIssueId(issueId);
     const encodedProject = parseGitLabProject(project);
     const issue = await gitlabGet(`/projects/${encodedProject}/issues/${iid}`);
+    if (config && config.in_progress !== config.pick_from) {
+      const filterLabels = Array.isArray(config.label) ? config.label : [config.label];
+      const isMovingToInProgress = labelToAdd === config.in_progress;
+      if (isMovingToInProgress) {
+        const updated2 = [.../* @__PURE__ */ new Set([...issue.labels, labelToAdd])].filter(
+          (l) => !filterLabels.includes(l)
+        );
+        await gitlabPut(`/projects/${encodedProject}/issues/${iid}`, {
+          labels: updated2.join(",")
+        });
+        return;
+      }
+      const updated = [.../* @__PURE__ */ new Set([...issue.labels, ...filterLabels])].filter(
+        (l) => l !== config.in_progress
+      );
+      await gitlabPut(`/projects/${encodedProject}/issues/${iid}`, {
+        labels: updated.join(",")
+      });
+      return;
+    }
     const labels = [.../* @__PURE__ */ new Set([...issue.labels, labelToAdd])];
     await gitlabPut(`/projects/${encodedProject}/issues/${iid}`, { labels: labels.join(",") });
   }
@@ -514,11 +574,14 @@ var GitLabIssuesSource = class {
       body: `Pull request: ${prUrl}`
     });
   }
-  async completeIssue(issueId, _status, labelToRemove) {
+  async completeIssue(issueId, _status, labelToRemove, config) {
     const { project, iid } = splitIssueId(issueId);
     const encodedProject = parseGitLabProject(project);
     const issue = await gitlabGet(`/projects/${encodedProject}/issues/${iid}`);
-    const labels = labelToRemove ? issue.labels.filter((l) => l.toLowerCase() !== labelToRemove.toLowerCase()) : issue.labels;
+    let labels = labelToRemove ? issue.labels.filter((l) => l.toLowerCase() !== labelToRemove.toLowerCase()) : issue.labels;
+    if (config && config.in_progress !== config.pick_from) {
+      labels = labels.filter((l) => l !== config.in_progress);
+    }
     await gitlabPut(`/projects/${encodedProject}/issues/${iid}`, {
       state_event: "close",
       labels: labels.join(",")

package/dist/index.js

@@ -37,7 +37,7 @@ import {
   startSpinner,
   stopSpinner,
   warn
-} from "./chunk-UKRCQYHM.js";
+} from "./chunk-JSRHJYX2.js";
 
 // src/telemetry.ts
 import { readFileSync } from "fs";
@@ -404,7 +404,8 @@ import { execa as execa2 } from "execa";
 var WORKTREES_DIR = ".worktrees";
 function generateBranchName(issueId, title) {
   const slug = title.toLowerCase().replace(/[^a-z0-9]+/g, "-").substring(0, 40).replace(/^-|-$/g, "");
-  return `feat/${issueId.toLowerCase()}-${slug}`;
+  const safeId = issueId.toLowerCase().replace(/[^a-z0-9-]/g, "-");
+  return `feat/${safeId}-${slug}`;
 }
 async function cleanupOrphanedWorktree(repoRoot, branchName) {
   const { stdout: branchList } = await execa2("git", ["branch", "--list", branchName], {
@@ -3652,7 +3653,7 @@ var PlaneSource = class {
     const data = await planeGet(
       `/workspaces/${workspaceSlug}/projects/${projectId}/issues/?state=${stateId}&per_page=100`
     );
-    const matching = data.results.filter((i) => labelIds.every((lid) => i.labels.includes(lid)));
+    const matching = data.results.filter((i) => i.state === stateId).filter((i) => labelIds.every((lid) => i.labels.includes(lid)));
     if (matching.length === 0) return null;
     const allStates = await fetchAll(
       `/workspaces/${workspaceSlug}/projects/${projectId}/states/`
@@ -3756,7 +3757,7 @@ var PlaneSource = class {
     const data = await planeGet(
       `/workspaces/${workspaceSlug}/projects/${projectId}/issues/?state=${stateId}&per_page=100`
     );
-    return data.results.filter((i) => labelIds.every((lid) => i.labels.includes(lid))).map((i) => {
+    return data.results.filter((i) => i.state === stateId).filter((i) => labelIds.every((lid) => i.labels.includes(lid))).map((i) => {
       const webUrl = `${getAppUrl()}/${workspaceSlug}/projects/${projectId}/issues/${i.id}`;
       return {
         id: makeIssueId(workspaceSlug, projectId, i.id),
@@ -3814,6 +3815,10 @@ async function shortcutPost(path, body) {
 async function shortcutPut(path, body) {
   return shortcutFetch("PUT", path, body);
 }
+function extractStories(result) {
+  if (Array.isArray(result)) return result;
+  return result.data ?? [];
+}
 async function resolveWorkflowStateId(stateName) {
   const workflows = await shortcutGet("/api/v3/workflows");
   for (const workflow of workflows) {
@@ -3875,12 +3880,15 @@ var ShortcutSource = class {
     const seen = /* @__PURE__ */ new Set();
     const allStories = [];
     for (const stateId of stateIds) {
-      const searchResult = await shortcutPost("/api/v3/stories/search", {
-        workflow_state_id: stateId,
-        label_name: primaryLabel,
-        archived: false
-      });
-      for (const story2 of searchResult.data ?? []) {
+      const searchResult = await shortcutPost(
+        "/api/v3/stories/search",
+        {
+          workflow_state_id: stateId,
+          label_name: primaryLabel,
+          archived: false
+        }
+      );
+      for (const story2 of extractStories(searchResult)) {
         if (!seen.has(story2.id)) {
           seen.add(story2.id);
           allStories.push(story2);
@@ -3976,12 +3984,15 @@ var ShortcutSource = class {
     const seen = /* @__PURE__ */ new Set();
     const allStories = [];
     for (const stateId of stateIds) {
-      const searchResult = await shortcutPost("/api/v3/stories/search", {
-        workflow_state_id: stateId,
-        label_name: primaryLabel,
-        archived: false
-      });
-      for (const story of searchResult.data ?? []) {
+      const searchResult = await shortcutPost(
+        "/api/v3/stories/search",
+        {
+          workflow_state_id: stateId,
+          label_name: primaryLabel,
+          archived: false
+        }
+      );
+      for (const story of extractStories(searchResult)) {
         if (!seen.has(story.id)) {
           seen.add(story.id);
           allStories.push(story);
@@ -4410,10 +4421,10 @@ function installSignalHandlers() {
       }
     }
     const revertPromises = [...activeCleanups.entries()].map(
-      async ([issueId, { previousStatus, source }]) => {
+      async ([issueId, { previousStatus, source, sourceConfig }]) => {
         try {
           await Promise.race([
-            source.updateStatus(issueId, previousStatus),
+            source.updateStatus(issueId, previousStatus, sourceConfig),
             new Promise(
               (_, reject) => setTimeout(() => reject(new Error("Revert timed out")), 5e3)
             )
@@ -4483,7 +4494,7 @@ async function recoverOrphanIssues(source, config2) {
       `Found orphan issue ${orphan.id} stuck in "${config2.source_config.in_progress}". Reverting to "${config2.source_config.pick_from}".`
     );
     try {
-      await source.updateStatus(orphan.id, config2.source_config.pick_from);
+      await source.updateStatus(orphan.id, config2.source_config.pick_from, config2.source_config);
       ok(`Recovered orphan ${orphan.id}`);
     } catch (err) {
       error(
@@ -4643,12 +4654,12 @@ async function runSequentialLoop(config2, source, models, workspace, opts) {
     try {
       const inProgress = config2.source_config.in_progress;
       kanbanEmitter.emit("issue:started", issue2.id);
-      await source.updateStatus(issue2.id, inProgress);
+      await source.updateStatus(issue2.id, inProgress, config2.source_config);
       ok(`Moved ${issue2.id} to "${inProgress}"`);
     } catch (err) {
       warn(`Failed to update status: ${err instanceof Error ? err.message : String(err)}`);
     }
-    activeCleanups.set(issue2.id, { previousStatus, source });
+    activeCleanups.set(issue2.id, { previousStatus, source, sourceConfig: config2.source_config });
     let sessionResult;
     try {
       sessionResult = config2.workflow === "worktree" ? await runWorktreeSession(config2, issue2, logFile, session, models) : await runBranchSession(config2, issue2, logFile, session, models);
@@ -4658,7 +4669,7 @@ async function runSequentialLoop(config2, source, models, workspace, opts) {
         `Unhandled error in session for ${issue2.id}: ${err instanceof Error ? err.message : String(err)}`
       );
       try {
-        await source.updateStatus(issue2.id, previousStatus);
+        await source.updateStatus(issue2.id, previousStatus, config2.source_config);
         ok(`Reverted ${issue2.id} to "${previousStatus}"`);
       } catch (revertErr) {
         error(
@@ -4753,12 +4764,12 @@ async function runConcurrentLoop(config2, source, models, workspace, opts) {
     const previousStatus = config2.source_config.pick_from;
     try {
       kanbanEmitter.emit("issue:started", issue2.id);
-      await source.updateStatus(issue2.id, config2.source_config.in_progress);
+      await source.updateStatus(issue2.id, config2.source_config.in_progress, config2.source_config);
       ok(`Moved ${issue2.id} to "${config2.source_config.in_progress}"`);
     } catch (err) {
       warn(`Failed to update status: ${err instanceof Error ? err.message : String(err)}`);
     }
-    activeCleanups.set(issue2.id, { previousStatus, source });
+    activeCleanups.set(issue2.id, { previousStatus, source, sourceConfig: config2.source_config });
     let sessionResult;
     try {
       sessionResult = await runWorktreeSession(config2, issue2, logFile, session, models);
@@ -4767,7 +4778,7 @@ async function runConcurrentLoop(config2, source, models, workspace, opts) {
         `Unhandled error in session for ${issue2.id}: ${err instanceof Error ? err.message : String(err)}`
       );
       try {
-        await source.updateStatus(issue2.id, previousStatus);
+        await source.updateStatus(issue2.id, previousStatus, config2.source_config);
         ok(`Reverted ${issue2.id} to "${previousStatus}"`);
       } catch (revertErr) {
         error(
@@ -4882,7 +4893,7 @@ async function handleSessionResult(sessionResult, issue2, previousStatus, source
       providerPausedSet.delete(issue2.id);
       warn(`Issue ${issue2.id} killed by user.`);
       try {
-        await source.updateStatus(issue2.id, previousStatus);
+        await source.updateStatus(issue2.id, previousStatus, config2.source_config);
         ok(`Reverted ${issue2.id} to "${previousStatus}"`);
       } catch (err) {
         error(
@@ -4898,7 +4909,7 @@ async function handleSessionResult(sessionResult, issue2, previousStatus, source
       providerPausedSet.delete(issue2.id);
       warn(`Issue ${issue2.id} skipped by user.`);
       try {
-        await source.updateStatus(issue2.id, previousStatus);
+        await source.updateStatus(issue2.id, previousStatus, config2.source_config);
         ok(`Reverted ${issue2.id} to "${previousStatus}"`);
       } catch (err) {
         error(
@@ -4913,7 +4924,7 @@ async function handleSessionResult(sessionResult, issue2, previousStatus, source
     error(`All models failed for ${issue2.id}. Reverting to "${previousStatus}".`);
     logAttemptHistory(sessionResult);
     try {
-      await source.updateStatus(issue2.id, previousStatus);
+      await source.updateStatus(issue2.id, previousStatus, config2.source_config);
       ok(`Reverted ${issue2.id} to "${previousStatus}"`);
       kanbanEmitter.emit("issue:reverted", issue2.id);
     } catch (err) {
@@ -4928,7 +4939,7 @@ async function handleSessionResult(sessionResult, issue2, previousStatus, source
       `Session succeeded but no PRs created for ${issue2.id}. Reverting to "${previousStatus}".`
     );
     try {
-      await source.updateStatus(issue2.id, previousStatus);
+      await source.updateStatus(issue2.id, previousStatus, config2.source_config);
       ok(`Reverted ${issue2.id} to "${previousStatus}"`);
       kanbanEmitter.emit("issue:reverted", issue2.id);
     } catch (err) {
@@ -4956,7 +4967,7 @@ async function handleSessionResult(sessionResult, issue2, previousStatus, source
   try {
     const doneStatus = config2.source_config.done;
     const labelToRemove = opts.issueId ? void 0 : getRemoveLabel(config2.source_config);
-    await source.completeIssue(issue2.id, doneStatus, labelToRemove);
+    await source.completeIssue(issue2.id, doneStatus, labelToRemove, config2.source_config);
     ok(`Updated ${issue2.id} status to "${doneStatus}"`);
     if (labelToRemove) {
       ok(`Removed label "${labelToRemove}" from ${issue2.id}`);
@@ -5760,7 +5771,7 @@ Add them to your ${shell} and run: source ${shell}`));
     if (isTTY) {
       const { render } = await import("ink");
       const { createElement } = await import("react");
-      const { KanbanApp } = await import("./kanban-THY72UON.js");
+      const { KanbanApp } = await import("./kanban-MJCCS3ZP.js");
       render(createElement(KanbanApp, { config: merged }), { exitOnCtrlC: false });
     }
     await runLoop(merged, {

package/dist/{kanban-THY72UON.js → kanban-MJCCS3ZP.js}

@@ -5,7 +5,7 @@ import {
   startSpinner,
   stopSpinner,
   useKanbanState
-} from "./chunk-UKRCQYHM.js";
+} from "./chunk-JSRHJYX2.js";
 
 // src/ui/kanban.tsx
 import { Box as Box7, useApp, useInput as useInput2 } from "ink";

package/package.json

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