lalph 0.1.57 → 0.1.58

package/dist/cli.mjs

@@ -5579,6 +5579,24 @@ const makeOrder$2 = Tuple$2;
 //#endregion
 //#region node_modules/.pnpm/effect@https+++pkg.pr.new+Effect-TS+effect-smol+effect@ebe9823_c0f064f881620a0abcd6a2c2ac2ce9e8/node_modules/effect/dist/Iterable.js
 /**
+* Determine if an `Iterable` is empty
+*
+* @example
+* ```ts
+* import { isEmpty } from "effect/Iterable"
+* import * as assert from "node:assert"
+*
+* assert.deepStrictEqual(isEmpty([]), true)
+* assert.deepStrictEqual(isEmpty([1, 2, 3]), false)
+* ```
+*
+* @category guards
+* @since 2.0.0
+*/
+const isEmpty$1 = (self$1) => {
+	return self$1[Symbol.iterator]().next().done === true;
+};
+/**
 * Get the first element of a `Iterable`, or throw an error if the `Iterable` is empty.
 *
 * @example
@@ -134730,7 +134748,7 @@ var Linear = class extends Service()("lalph/Linear", { make: gen(function* () {
 		}) : use$2(f);
 		return [connection.nodes, some(connection).pipe(filter$5((c) => c.pageInfo.hasNextPage))];
 	}));
-	const projects = stream$3((client) => client.projects());
+	const projects = stream$3((client) => client.projects({ filter: { status: { type: { nin: ["canceled", "completed"] } } } }));
 	const labels = stream$3((client) => client.issueLabels());
 	const states = yield* runCollect(stream$3((client) => client.workflowStates()));
 	const viewer = yield* use$2((client) => client.viewer);
@@ -141566,15 +141584,30 @@ var Prd = class extends Service()("lalph/Prd", { make: gen(function* () {
 			state: "todo"
 		});
 	});
-	if (worktree.inExisting) return {
-		path: prdFile,
-		mergableGithubPrs,
-		maybeRevertIssue,
-		flagUnmergable,
-		findById: fnUntraced(function* (issueId) {
-			return (yield* readPrd).find((i) => i.id === issueId) ?? null;
-		})
-	};
+	if (worktree.inExisting) {
+		const initialPrdIssues = yield* readPrd;
+		return {
+			path: prdFile,
+			mergableGithubPrs,
+			maybeRevertIssue,
+			revertUpdatedIssues: gen(function* () {
+				const updated = yield* readPrd;
+				for (const issue of updated) {
+					if (issue.state !== "in-progress") continue;
+					const prevIssue = initialPrdIssues.find((i) => i.id === issue.id);
+					if (!prevIssue || prevIssue.state === "in-progress") continue;
+					yield* source.updateIssue({
+						issueId: issue.id,
+						state: prevIssue.state
+					});
+				}
+			}),
+			flagUnmergable,
+			findById: fnUntraced(function* (issueId) {
+				return (yield* readPrd).find((i) => i.id === issueId) ?? null;
+			})
+		};
+	}
 	yield* addFinalizer(() => ignore(fs.remove(prdFile)));
 	let current = yield* source.issues;
 	yield* fs.writeFileString(prdFile, PrdIssue.arrayToYaml(current));
@@ -141632,6 +141665,15 @@ var Prd = class extends Service()("lalph/Prd", { make: gen(function* () {
 		path: prdFile,
 		mergableGithubPrs,
 		maybeRevertIssue,
+		revertUpdatedIssues: gen(function* () {
+			for (const issue of updatedIssues.values()) {
+				if (issue.state !== "done") continue;
+				yield* source.updateIssue({
+					issueId: issue.id,
+					state: "todo"
+				});
+			}
+		}),
 		flagUnmergable,
 		findById
 	};
@@ -141708,7 +141750,8 @@ const commandRoot = make$27("lalph", {
 					iterations$1 = currentIteration;
 					return log$1(`No more work to process, ending after ${currentIteration} iteration(s).`);
 				}
-				return log$1("No more work to process, waiting 30 seconds...").pipe(andThen(sleep("30 seconds")));
+				const log$2 = isEmpty$1(fibers) ? log$1("No more work to process, waiting 30 seconds...") : void_$1;
+				return andThen(log$2, sleep(seconds(30)));
 			},
 			QuitError(_) {
 				quit = true;
@@ -141748,6 +141791,13 @@ const run = fnUntraced(function* (options) {
 	const currentBranch = (dir) => make$21({ cwd: dir })`git branch --show-current`.pipe(string, flatMap((output) => some(output.trim()).pipe(filter$5((b) => b.length > 0), fromOption)));
 	if (isSome(options.targetBranch)) yield* exec`git checkout ${`origin/${options.targetBranch.value}`}`;
 	yield* gen(function* () {
+		let taskId = void 0;
+		yield* addFinalizer(fnUntraced(function* (exit$2) {
+			if (exit$2._tag === "Success") return;
+			const prd$1 = yield* Prd;
+			if (taskId) yield* prd$1.maybeRevertIssue({ issueId: taskId });
+			else yield* prd$1.revertUpdatedIssues;
+		}, ignore));
 		yield* cliAgent.command({
 			worktree,
 			prompt: promptGen.promptChoose,
@@ -141758,12 +141808,7 @@ const run = fnUntraced(function* (options) {
 			onTimeout: () => fail$4(new RunnerStalled())
 		}));
 		const taskJson = yield* fs.readFileString(pathService.join(worktree.directory, ".lalph", "task.json"));
-		const taskId = (yield* decodeEffect(ChosenTask)(taskJson)).id;
-		yield* addFinalizer(fnUntraced(function* (exit$2) {
-			if (exit$2._tag === "Success") return;
-			const prd$1 = yield* Prd;
-			yield* ignore(prd$1.maybeRevertIssue({ issueId: taskId }));
-		}));
+		taskId = (yield* decodeEffect(ChosenTask)(taskJson)).id;
 		yield* completeWith(options.startedDeferred, void_$1);
 		const exitCode$1 = yield* execWithStallTimeout(cliAgent.command({
 			worktree,
@@ -141932,7 +141977,7 @@ const commandAgent = make$27("agent").pipe(withDescription("Select the CLI agent
 
 //#endregion
 //#region package.json
-var version = "0.1.57";
+var version = "0.1.58";
 
 //#endregion
 //#region src/cli.ts

package/package.json

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

package/src/Linear.ts

@@ -68,7 +68,15 @@ class Linear extends ServiceMap.Service<Linear>()("lalph/Linear", {
         }),
       )
 
-    const projects = stream((client) => client.projects())
+    const projects = stream((client) =>
+      client.projects({
+        filter: {
+          status: {
+            type: { nin: ["canceled", "completed"] },
+          },
+        },
+      }),
+    )
     const labels = stream((client) => client.issueLabels())
     const states = yield* Stream.runCollect(
       stream((client) => client.workflowStates()),

package/src/Prd.ts

@@ -28,6 +28,10 @@ export class Prd extends ServiceMap.Service<
     readonly maybeRevertIssue: (options: {
       readonly issueId: string
     }) => Effect.Effect<void, PlatformError.PlatformError | IssueSourceError>
+    readonly revertUpdatedIssues: Effect.Effect<
+      void,
+      PlatformError.PlatformError | IssueSourceError
+    >
     readonly flagUnmergable: (options: {
       readonly issueId: string
     }) => Effect.Effect<void, IssueSourceError>
@@ -98,10 +102,23 @@ export class Prd extends ServiceMap.Service<
     })
 
     if (worktree.inExisting) {
+      const initialPrdIssues = yield* readPrd
       return {
         path: prdFile,
         mergableGithubPrs,
         maybeRevertIssue,
+        revertUpdatedIssues: Effect.gen(function* () {
+          const updated = yield* readPrd
+          for (const issue of updated) {
+            if (issue.state !== "in-progress") continue
+            const prevIssue = initialPrdIssues.find((i) => i.id === issue.id)
+            if (!prevIssue || prevIssue.state === "in-progress") continue
+            yield* source.updateIssue({
+              issueId: issue.id!,
+              state: prevIssue.state,
+            })
+          }
+        }),
         flagUnmergable,
         findById: Effect.fnUntraced(function* (issueId: string) {
           const prdIssues = yield* readPrd
@@ -222,6 +239,15 @@ export class Prd extends ServiceMap.Service<
       path: prdFile,
       mergableGithubPrs,
       maybeRevertIssue,
+      revertUpdatedIssues: Effect.gen(function* () {
+        for (const issue of updatedIssues.values()) {
+          if (issue.state !== "done") continue
+          yield* source.updateIssue({
+            issueId: issue.id!,
+            state: "todo",
+          })
+        }
+      }),
       flagUnmergable,
       findById,
     }

package/src/commands/root.ts

@@ -9,6 +9,7 @@ import {
   FiberSet,
   FileSystem,
   Filter,
+  Iterable,
   Layer,
   Option,
   Path,
@@ -163,9 +164,10 @@ export const commandRoot = Command.make("lalph", {
                   `No more work to process, ending after ${currentIteration} iteration(s).`,
                 )
               }
-              return Effect.log(
-                "No more work to process, waiting 30 seconds...",
-              ).pipe(Effect.andThen(Effect.sleep("30 seconds")))
+              const log = Iterable.isEmpty(fibers)
+                ? Effect.log("No more work to process, waiting 30 seconds...")
+                : Effect.void
+              return Effect.andThen(log, Effect.sleep(Duration.seconds(30)))
             },
             QuitError(_) {
               quit = true
@@ -268,6 +270,21 @@ const run = Effect.fnUntraced(
     }
 
     yield* Effect.gen(function* () {
+      let taskId: string | undefined = undefined
+      yield* Effect.addFinalizer(
+        Effect.fnUntraced(function* (exit) {
+          if (exit._tag === "Success") return
+          const prd = yield* Prd
+          if (taskId) {
+            yield* prd.maybeRevertIssue({
+              issueId: taskId,
+            })
+          } else {
+            yield* prd.revertUpdatedIssues
+          }
+        }, Effect.ignore),
+      )
+
       yield* cliAgent
         .command({
           worktree,
@@ -286,18 +303,7 @@ const run = Effect.fnUntraced(
       const taskJson = yield* fs.readFileString(
         pathService.join(worktree.directory, ".lalph", "task.json"),
       )
-      const taskId = (yield* Schema.decodeEffect(ChosenTask)(taskJson)).id
-      yield* Effect.addFinalizer(
-        Effect.fnUntraced(function* (exit) {
-          if (exit._tag === "Success") return
-          const prd = yield* Prd
-          yield* Effect.ignore(
-            prd.maybeRevertIssue({
-              issueId: taskId,
-            }),
-          )
-        }),
-      )
+      taskId = (yield* Schema.decodeEffect(ChosenTask)(taskJson)).id
 
       yield* Deferred.completeWith(options.startedDeferred, Effect.void)