lalph 0.3.108 → 0.3.109

package/dist/cli.mjs

@@ -241362,7 +241362,7 @@ var Prd = class extends Service$1()("lalph/Prd", { make: gen(function* () {
 	const getCurrentIssues = get$5(issuesRef).pipe(map$10((i) => i.issues));
 	const syncSemaphore = makeUnsafe$9(1);
 	const maybeRevertIssue = fnUntraced(function* (options) {
-		const issue = (yield* readPrd).find((i) => i.id === options.issueId);
+		const issue = yield* source.findById(projectId, options.issueId);
 		if (!issue || issue.state === "in-review") return;
 		yield* source.updateIssue({
 			projectId,
@@ -241459,9 +241459,6 @@ var Prd = class extends Service$1()("lalph/Prd", { make: gen(function* () {
 	}, scoped$1, withSpan$1("Prd.updateSync"), run$4(updateSyncHandle, { onlyIfMissing: true }), syncSemaphore.withPermitsIfAvailable(1));
 	yield* fs.watch(lalphDir).pipe(filter$3((event) => event.path.endsWith("prd.yml")), debounce(50), runForEach((_) => clear(updateSyncHandle).pipe(andThen(ignore$1(sync$3)))), retry$1(forever$1), forkScoped);
 	yield* changes(issuesRef).pipe(filter$3((change) => change._tag === "External"), runForEach((s) => updateSync(s.issues)), forkScoped);
-	const findById = fnUntraced(function* (issueId) {
-		return (yield* getCurrentIssues).find((i) => i.id === issueId) ?? null;
-	});
 	return {
 		path: prdFile,
 		maybeRevertIssue,
@@ -241476,7 +241473,6 @@ var Prd = class extends Service$1()("lalph/Prd", { make: gen(function* () {
 			}
 		})),
 		flagUnmergable,
-		findById,
 		setChosenIssueId,
 		setAutoMerge
 	};
@@ -241491,7 +241487,6 @@ var Prd = class extends Service$1()("lalph/Prd", { make: gen(function* () {
 		maybeRevertIssue: () => void_$2,
 		revertUpdatedIssues: void_$2,
 		flagUnmergable: () => void_$2,
-		findById: () => succeed$4(null),
 		setChosenIssueId: () => void_$2,
 		setAutoMerge: () => void_$2
 	});
@@ -241760,7 +241755,7 @@ After making any changes, commit and push them to the same pull request.
 		prState = yield* worktree.viewPrState(prState.value.number);
 		yield* log$1("PR state after merge", prState);
 		if (isSome(prState) && prState.value.state === "MERGED") {
-			const issue = yield* prd.findById(options.issueId);
+			const issue = yield* source.findById(projectId, options.issueId);
 			if (issue && issue.state !== "done") yield* source.updateIssue({
 				projectId,
 				issueId: options.issueId,
@@ -241805,11 +241800,11 @@ But you **do not** need to git push your changes or switch branches.
 			}
 		}),
 		autoMerge: fnUntraced(function* (options) {
-			const prd = yield* Prd;
+			const source = yield* IssueSource;
 			const projectId = yield* CurrentProjectId;
-			const issue = yield* prd.findById(options.issueId);
+			const issue = yield* source.findById(projectId, options.issueId);
 			if (!issue || issue.state !== "in-review") return;
-			yield* (yield* IssueSource).updateIssue({
+			yield* source.updateIssue({
 				projectId,
 				issueId: options.issueId,
 				state: "done"
@@ -241846,11 +241841,12 @@ var GitFlowError = class extends TaggedError("GitFlowError") {};
 //#endregion
 //#region src/Agents/chooser.ts
 const agentChooser = fnUntraced(function* (options) {
+	const projectId = yield* CurrentProjectId;
 	const fs = yield* FileSystem;
 	const pathService = yield* Path$1;
 	const worktree = yield* Worktree;
 	const promptGen = yield* PromptGen;
-	const prd = yield* Prd;
+	const source = yield* IssueSource;
 	const gitFlow = yield* GitFlow;
 	const waitForFile = yield* makeWaitForFile;
 	if (!options.preset.cliAgent.command) {
@@ -241862,7 +241858,7 @@ const agentChooser = fnUntraced(function* (options) {
 			stallTimeout: options.stallTimeout,
 			mode: "choose"
 		}).pipe(provideService$2(ChosenTaskDeferred, deferred), flatMap$5(() => fail$6(new ChosenTaskNotFound$1())), raceFirst(_await(deferred)));
-		const prdTask = yield* prd.findById(result.taskId);
+		const prdTask = yield* source.findById(projectId, result.taskId);
 		if (!prdTask) return yield* new ChosenTaskNotFound$1();
 		return {
 			id: result.taskId,
@@ -241880,7 +241876,7 @@ const agentChooser = fnUntraced(function* (options) {
 		onTimeout: () => fail$6(new RunnerStalled())
 	}), raceFirst(taskJsonCreated));
 	return yield* pipe$1(fs.readFileString(pathService.join(worktree.directory, ".lalph", "task.json")), flatMap$5(decodeEffect(ChosenTask)), mapError$2((_) => new ChosenTaskNotFound$1()), flatMap$5(fnUntraced(function* (task) {
-		const prdTask = yield* prd.findById(task.id);
+		const prdTask = yield* source.findById(projectId, task.id);
 		if (prdTask) return {
 			...task,
 			prd: prdTask
@@ -242092,7 +242088,7 @@ const run = fnUntraced(function* (options) {
 	}
 	const taskPreset = getOrElse$2(yield* source.issueCliAgentPreset(chosenTask.prd), () => preset);
 	const catchStallInReview = (effect) => catchIf$2(effect, (u) => u instanceof RunnerStalled, fnUntraced(function* (e) {
-		if ((yield* prd.findById(taskId))?.state === "in-review") return;
+		if ((yield* source.findById(projectId, taskId))?.state === "in-review") return;
 		return yield* e;
 	}));
 	if (yield* gen(function* () {
@@ -242163,7 +242159,7 @@ const run = fnUntraced(function* (options) {
 		targetBranch: getOrUndefined$2(options.targetBranch),
 		issueId: taskId
 	});
-	if ((yield* prd.findById(taskId))?.autoMerge) yield* gitFlow.autoMerge({
+	if ((yield* source.findById(projectId, taskId))?.autoMerge) yield* gitFlow.autoMerge({
 		targetBranch: getOrUndefined$2(options.targetBranch),
 		issueId: taskId,
 		worktree
@@ -242688,7 +242684,7 @@ const commandEdit = make$60("edit").pipe(withDescription("Open the selected proj
 const commandSource = make$60("source").pipe(withDescription("Select the issue source to use (e.g. GitHub Issues or Linear). This applies to all projects."), withHandler(() => selectIssueSource), provide(Settings.layer));
 //#endregion
 //#region package.json
-var version = "0.3.108";
+var version = "0.3.109";
 //#endregion
 //#region src/Tracing.ts
 const TracingLayer = unwrap$3(gen(function* () {

package/package.json

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

package/src/Agents/chooser.ts

@@ -9,7 +9,6 @@ import {
   Schema,
 } from "effect"
 import { PromptGen } from "../PromptGen.ts"
-import { Prd } from "../Prd.ts"
 import { ChildProcess } from "effect/unstable/process"
 import { Worktree } from "../Worktree.ts"
 import { RunnerStalled } from "../domain/Errors.ts"
@@ -18,16 +17,19 @@ import { GitFlow } from "../GitFlow.ts"
 import type { CliAgentPreset } from "../domain/CliAgentPreset.ts"
 import { runClanka } from "../Clanka.ts"
 import { ChosenTaskDeferred } from "../TaskTools.ts"
+import { IssueSource } from "../IssueSource.ts"
+import { CurrentProjectId } from "../Settings.ts"
 
 export const agentChooser = Effect.fnUntraced(function* (options: {
   readonly stallTimeout: Duration.Duration
   readonly preset: CliAgentPreset
 }) {
+  const projectId = yield* CurrentProjectId
   const fs = yield* FileSystem.FileSystem
   const pathService = yield* Path.Path
   const worktree = yield* Worktree
   const promptGen = yield* PromptGen
-  const prd = yield* Prd
+  const source = yield* IssueSource
   const gitFlow = yield* GitFlow
   const waitForFile = yield* makeWaitForFile
 
@@ -45,7 +47,7 @@ export const agentChooser = Effect.fnUntraced(function* (options: {
       Effect.flatMap(() => Effect.fail(new ChosenTaskNotFound())),
       Effect.raceFirst(Deferred.await(deferred)),
     )
-    const prdTask = yield* prd.findById(result.taskId)
+    const prdTask = yield* source.findById(projectId, result.taskId)
     if (!prdTask) return yield* new ChosenTaskNotFound()
     return {
       id: result.taskId,
@@ -85,7 +87,7 @@ export const agentChooser = Effect.fnUntraced(function* (options: {
     Effect.mapError((_) => new ChosenTaskNotFound()),
     Effect.flatMap(
       Effect.fnUntraced(function* (task) {
-        const prdTask = yield* prd.findById(task.id)
+        const prdTask = yield* source.findById(projectId, task.id)
         if (prdTask) return { ...task, prd: prdTask }
         return yield* new ChosenTaskNotFound()
       }),

package/src/GitFlow.ts

@@ -103,7 +103,7 @@ After making any changes, commit and push them to the same pull request.
       prState = yield* worktree.viewPrState(prState.value.number)
       yield* Effect.log("PR state after merge", prState)
       if (Option.isSome(prState) && prState.value.state === "MERGED") {
-        const issue = yield* prd.findById(options.issueId)
+        const issue = yield* source.findById(projectId, options.issueId)
         if (issue && issue.state !== "done") {
           yield* source.updateIssue({
             projectId,
@@ -182,13 +182,12 @@ But you **do not** need to git push your changes or switch branches.
         }
       }),
       autoMerge: Effect.fnUntraced(function* (options) {
-        const prd = yield* Prd
+        const source = yield* IssueSource
         const projectId = yield* CurrentProjectId
-        const issue = yield* prd.findById(options.issueId)
+        const issue = yield* source.findById(projectId, options.issueId)
         if (!issue || issue.state !== "in-review") {
           return
         }
-        const source = yield* IssueSource
         yield* source.updateIssue({
           projectId,
           issueId: options.issueId,

package/src/Prd.ts

@@ -32,12 +32,6 @@ export class Prd extends ServiceMap.Service<
     readonly flagUnmergable: (options: {
       readonly issueId: string
     }) => Effect.Effect<void, IssueSourceError>
-    readonly findById: (
-      issueId: string,
-    ) => Effect.Effect<
-      PrdIssue | null,
-      PlatformError.PlatformError | IssueSourceError
-    >
     readonly setChosenIssueId: (issueId: string | null) => Effect.Effect<void>
     readonly setAutoMerge: (enabled: boolean) => Effect.Effect<void>
   }
@@ -68,8 +62,7 @@ export class Prd extends ServiceMap.Service<
     const maybeRevertIssue = Effect.fnUntraced(function* (options: {
       readonly issueId: string
     }) {
-      const updated = yield* readPrd
-      const issue = updated.find((i) => i.id === options.issueId)
+      const issue = yield* source.findById(projectId, options.issueId)
       if (!issue || issue.state === "in-review") return
       yield* source.updateIssue({
         projectId,
@@ -244,11 +237,6 @@ export class Prd extends ServiceMap.Service<
       Effect.forkScoped,
     )
 
-    const findById = Effect.fnUntraced(function* (issueId: string) {
-      const current = yield* getCurrentIssues
-      return current.find((i) => i.id === issueId) ?? null
-    })
-
     return {
       path: prdFile,
       maybeRevertIssue,
@@ -265,7 +253,6 @@ export class Prd extends ServiceMap.Service<
         }),
       ),
       flagUnmergable,
-      findById,
       setChosenIssueId,
       setAutoMerge,
     }
@@ -287,7 +274,6 @@ export class Prd extends ServiceMap.Service<
     maybeRevertIssue: () => Effect.void,
     revertUpdatedIssues: Effect.void,
     flagUnmergable: () => Effect.void,
-    findById: () => Effect.succeed(null),
     setChosenIssueId: () => Effect.void,
     setAutoMerge: () => Effect.void,
   })

package/src/commands/root.ts

@@ -200,7 +200,7 @@ const run = Effect.fnUntraced(
         effect,
         (u): u is RunnerStalled => u instanceof RunnerStalled,
         Effect.fnUntraced(function* (e) {
-          const task = yield* prd.findById(taskId!)
+          const task = yield* source.findById(projectId, taskId!)
           const inReview = task?.state === "in-review"
           if (inReview) return
           return yield* e
@@ -315,7 +315,7 @@ const run = Effect.fnUntraced(
       issueId: taskId,
     })
 
-    const task = yield* prd.findById(taskId)
+    const task = yield* source.findById(projectId, taskId)
     if (task?.autoMerge) {
       yield* gitFlow.autoMerge({
         targetBranch: Option.getOrUndefined(options.targetBranch),