lalph 0.3.25 → 0.3.26

package/dist/cli.mjs

@@ -68841,6 +68841,7 @@ const claude = new CliAgent({
 		"--disallowed-tools",
 		"AskUserQuestion",
 		...extraArgs,
+		"--",
 		`@${prdFilePath}
 
 ${prompt}`
@@ -154317,22 +154318,29 @@ const GithubIssueSource = effect$1(IssueSource, gen(function* () {
 		updateIssue: fnUntraced(function* (options) {
 			const { labelFilter, autoMergeLabelName } = yield* get$7(projectSettings, options.projectId);
 			const issueNumber = Number(options.issueId.slice(1));
+			const currentIssue = yield* github.request((rest) => rest.issues.get({
+				owner: cli.owner,
+				repo: cli.repo,
+				issue_number: issueNumber
+			}));
+			const labels = Array.from(new Set([...currentIssue.data.labels.flatMap((label) => typeof label === "string" ? [label] : label.name ? [label.name] : []), ...toArray(labelFilter)]));
 			const update = {
 				owner: cli.owner,
 				repo: cli.repo,
 				issue_number: issueNumber,
-				labels: toArray(labelFilter)
+				labels
 			};
 			if (options.title) update.title = options.title;
 			if (options.description) update.body = options.description;
 			if (options.state) {
 				update.state = options.state === "done" ? "closed" : "open";
+				update.labels = update.labels.filter((label) => label !== "in-review" && label !== "in-progress");
 				if (options.state === "in-review") update.labels.push("in-review");
 				else if (options.state === "in-progress") update.labels.push("in-progress");
 			}
-			if (options.autoMerge !== void 0) {
-				if (options.autoMerge) update.labels.push(...toArray(autoMergeLabelName));
-			}
+			if (options.autoMerge !== void 0 && isSome(autoMergeLabelName)) if (options.autoMerge) {
+				if (!update.labels.includes(autoMergeLabelName.value)) update.labels.push(autoMergeLabelName.value);
+			} else update.labels = update.labels.filter((label) => label !== autoMergeLabelName.value);
 			yield* updateIssue(update);
 			if (options.blockedBy !== void 0) {
 				const desiredBlockedBy = options.blockedBy;
@@ -155972,7 +155980,7 @@ const commandSource = make$36("source").pipe(withDescription("Select the issue s
 
 //#endregion
 //#region package.json
-var version = "0.3.25";
+var version = "0.3.26";
 
 //#endregion
 //#region src/commands/projects/ls.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lalph",
   "type": "module",
-  "version": "0.3.25",
+  "version": "0.3.26",
   "publishConfig": {
     "access": "public"
   },

package/src/Github.ts

@@ -325,6 +325,25 @@ export const GithubIssueSource = Layer.effect(
             options.projectId,
           )
           const issueNumber = Number(options.issueId.slice(1))
+          const currentIssue = yield* github.request((rest) =>
+            rest.issues.get({
+              owner: cli.owner,
+              repo: cli.repo,
+              issue_number: issueNumber,
+            }),
+          )
+          const labels = Array.from(
+            new Set([
+              ...currentIssue.data.labels.flatMap((label) =>
+                typeof label === "string"
+                  ? [label]
+                  : label.name
+                    ? [label.name]
+                    : [],
+              ),
+              ...Option.toArray(labelFilter),
+            ]),
+          )
           const update: {
             owner: string
             repo: string
@@ -337,7 +356,7 @@ export const GithubIssueSource = Layer.effect(
             owner: cli.owner,
             repo: cli.repo,
             issue_number: issueNumber,
-            labels: Option.toArray(labelFilter),
+            labels,
           }
 
           if (options.title) {
@@ -349,15 +368,28 @@ export const GithubIssueSource = Layer.effect(
           if (options.state) {
             update.state = options.state === "done" ? "closed" : "open"
 
+            update.labels = update.labels.filter(
+              (label) => label !== "in-review" && label !== "in-progress",
+            )
+
             if (options.state === "in-review") {
               update.labels.push("in-review")
             } else if (options.state === "in-progress") {
               update.labels.push("in-progress")
             }
           }
-          if (options.autoMerge !== undefined) {
+          if (
+            options.autoMerge !== undefined &&
+            Option.isSome(autoMergeLabelName)
+          ) {
             if (options.autoMerge) {
-              update.labels.push(...Option.toArray(autoMergeLabelName))
+              if (!update.labels.includes(autoMergeLabelName.value)) {
+                update.labels.push(autoMergeLabelName.value)
+              }
+            } else {
+              update.labels = update.labels.filter(
+                (label) => label !== autoMergeLabelName.value,
+              )
             }
           }
 

package/src/domain/CliAgent.ts

@@ -84,6 +84,7 @@ const claude = new CliAgent({
         "--disallowed-tools",
         "AskUserQuestion",
         ...extraArgs,
+        "--",
         `@${prdFilePath}
 
 ${prompt}`,