lalph 0.2.2 → 0.2.4

package/dist/cli.mjs

@@ -7188,7 +7188,7 @@ const getOption = /* @__PURE__ */ dual(2, (self, service) => {
 * @since 4.0.0
 * @category Utils
 */
-const merge$5 = /* @__PURE__ */ dual(2, (self, that) => {
+const merge$6 = /* @__PURE__ */ dual(2, (self, that) => {
 	if (self.mapUnsafe.size === 0) return that;
 	if (that.mapUnsafe.size === 0) return self;
 	const map = new Map(self.mapUnsafe);
@@ -9159,7 +9159,7 @@ const servicesWith$1 = (f) => withFiber$1((fiber) => f(fiber.services));
 /** @internal */
 const provideServices$1 = /* @__PURE__ */ dual(2, (self, services) => {
 	if (effectIsExit(self)) return self;
-	return updateServices$1(self, merge$5(services));
+	return updateServices$1(self, merge$6(services));
 });
 /** @internal */
 const provideService$1 = function() {
@@ -11960,6 +11960,38 @@ const mergeAllEffect = (layers, memoMap, scope) => {
 * @category zipping
 */
 const mergeAll = (...layers) => fromBuild((memoMap, scope) => mergeAllEffect(layers, memoMap, scope));
+/**
+* Merges this layer with the specified layer concurrently, producing a new layer with combined input and output types.
+*
+* This is a binary version of `mergeAll` that merges exactly two layers or one layer with an array of layers.
+* The layers are built concurrently and their outputs are combined.
+*
+* @example
+* ```ts
+* import { Effect, Layer, ServiceMap } from "effect"
+*
+* class Database extends ServiceMap.Service<Database, {
+*   readonly query: (sql: string) => Effect.Effect<string>
+* }>()("Database") {}
+*
+* class Logger extends ServiceMap.Service<Logger, {
+*   readonly log: (msg: string) => Effect.Effect<void>
+* }>()("Logger") {}
+*
+* const dbLayer = Layer.succeed(Database)({
+*   query: (sql: string) => Effect.succeed("result")
+* })
+* const loggerLayer = Layer.succeed(Logger)({
+*   log: (msg: string) => Effect.sync(() => console.log(msg))
+* })
+*
+* const mergedLayer = Layer.merge(dbLayer, loggerLayer)
+* ```
+*
+* @since 2.0.0
+* @category zipping
+*/
+const merge$5 = /* @__PURE__ */ dual(2, (self, that) => mergeAll(self, ...Array.isArray(that) ? that : [that]));
 const provideWith = (self, that, f) => fromBuild((memoMap, scope) => flatMap$4(Array.isArray(that) ? mergeAllEffect(that, memoMap, scope) : that.build(memoMap, scope), (context) => self.build(memoMap, scope).pipe(provideServices$1(context), map$11((merged) => f(merged, context)))));
 /**
 * Feeds the output services of this builder into the input of the specified
@@ -12102,7 +12134,7 @@ const provide$3 = /* @__PURE__ */ dual(2, (self, that) => provideWith(self, that
 * @since 2.0.0
 * @category utils
 */
-const provideMerge = /* @__PURE__ */ dual(2, (self, that) => provideWith(self, that, (self, that) => merge$5(that, self)));
+const provideMerge = /* @__PURE__ */ dual(2, (self, that) => provideWith(self, that, (self, that) => merge$6(that, self)));
 /**
 * Constructs a layer dynamically based on the output of this layer.
 *
@@ -50856,7 +50888,7 @@ const TypeId$27 = "~effect/Cache";
 */
 const makeWith$1 = (options) => servicesWith$1((services) => {
 	const self = Object.create(Proto$12);
-	self.lookup = (key) => updateServices$1(options.lookup(key), (input) => merge$5(services, input));
+	self.lookup = (key) => updateServices$1(options.lookup(key), (input) => merge$6(services, input));
 	self.map = make$45();
 	self.capacity = options.capacity;
 	self.timeToLive = options.timeToLive ? (exit, key) => fromDurationInputUnsafe(options.timeToLive(exit, key)) : defaultTimeToLive;
@@ -58544,7 +58576,7 @@ const SpanNameGenerator$1 = /* @__PURE__ */ Reference("effect/http/HttpClient/Sp
 /**
 * @since 4.0.0
 */
-const layerMergedServices = (effect) => effect$1(HttpClient)(servicesWith((services) => map$8(effect, (client) => transformResponse(client, updateServices((input) => merge$5(services, input))))));
+const layerMergedServices = (effect) => effect$1(HttpClient)(servicesWith((services) => map$8(effect, (client) => transformResponse(client, updateServices((input) => merge$6(services, input))))));
 const responseRegistry = /* @__PURE__ */ (() => {
 	if ("FinalizationRegistry" in globalThis && globalThis.FinalizationRegistry) {
 		const registry = /* @__PURE__ */ new FinalizationRegistry((controller) => {
@@ -59849,7 +59881,7 @@ const fromWebSocket = (acquire, options) => withFiber((fiber) => {
 		latch.openUnsafe();
 		if (opts?.onOpen) yield* opts.onOpen;
 		return yield* join(fiberSet).pipe(catchFilter(SocketCloseError.filterClean((_) => !closeCodeIsError(_)), (_) => void_$1));
-	})).pipe(updateServices((input) => merge$5(acquireContext, input)), ensuring$2(sync(() => {
+	})).pipe(updateServices((input) => merge$6(acquireContext, input)), ensuring$2(sync(() => {
 		latch.closeUnsafe();
 		currentWS = void 0;
 	})));
@@ -151176,7 +151208,7 @@ const agentTimeout = fnUntraced(function* (options) {
 //#region src/Projects.ts
 const layerProjectIdPrompt = effect$1(CurrentProjectId, gen(function* () {
 	return (yield* selectProject).id;
-})).pipe(provide$3(Settings.layer));
+})).pipe(provide$3(Settings.layer), provide$3(CurrentIssueSource.layer));
 const allProjects = new Setting("projects", Array$1(Project$1));
 const getAllProjects = Settings.get(allProjects).pipe(map$8(getOrElse$1(() => [])));
 const projectById = fnUntraced(function* (projectId) {
@@ -151242,17 +151274,16 @@ const welcomeWizard = gen(function* () {
 		"  '--'",
 		"",
 		"Welcome! Let's add your first project.",
-		"Projects let you configure how lalph runs tasks and integrations",
-		"(like issue filters, concurrency, and git flow).",
+		"Projects let you configure how lalph runs tasks.",
 		""
 	].join("\n");
 	console.log(welcome);
-	return yield* addProject;
+	return yield* addOrUpdateProject();
 });
-const addProject = gen(function* () {
+const addOrUpdateProject = fnUntraced(function* (existing) {
 	const projects = yield* getAllProjects;
-	const id = yield* text$2({
-		message: "Name",
+	const id = existing ? existing.id : yield* text$2({
+		message: "Project name",
 		validate(input) {
 			input = input.trim();
 			if (input.length === 0) return fail$4("Project name cannot be empty");
@@ -151261,7 +151292,7 @@ const addProject = gen(function* () {
 		}
 	});
 	const concurrency = yield* integer$2({
-		message: "Concurrency",
+		message: "Concurrency (number of tasks to run in parallel)",
 		min: 1
 	});
 	const targetBranch = pipe(yield* text$2({ message: "Target branch (leave empty to use HEAD)" }), trim, liftPredicate(isNonEmpty));
@@ -151269,22 +151300,27 @@ const addProject = gen(function* () {
 		message: "Git flow",
 		choices: [{
 			title: "Pull Request",
+			description: "Create a pull request for each task",
 			value: "pr"
 		}, {
 			title: "Commit",
+			description: "Tasks are committed directly to the target branch",
 			value: "commit"
 		}]
 	});
 	const reviewAgent = yield* toggle({ message: "Enable review agent?" });
 	const project = new Project$1({
 		id: ProjectId.makeUnsafe(id),
-		enabled: true,
+		enabled: existing ? existing.enabled : true,
 		concurrency,
 		targetBranch,
 		gitFlow,
 		reviewAgent
 	});
-	yield* Settings.set(allProjects, some$2([...projects, project]));
+	yield* Settings.set(allProjects, some$2(existing ? projects.map((p) => p.id === project.id ? project : p) : [...projects, project]));
+	const source = yield* IssueSource;
+	yield* source.reset.pipe(provideService(CurrentProjectId, project.id));
+	yield* source.settings(project.id);
 	return project;
 });
 
@@ -151477,8 +151513,12 @@ const commandRoot = make$35("lalph", {
 //#endregion
 //#region src/commands/plan.ts
 const dangerous = boolean("dangerous").pipe(withAlias("d"), withDescription$1("Enable dangerous mode (skip permission prompts) during plan generation"));
-const commandPlan = make$35("plan", { dangerous }).pipe(withDescription("Iterate on an issue plan and create PRD tasks"), withHandler(fnUntraced(function* ({ dangerous }) {
-	const project = yield* selectProject;
+const withNewProject = boolean("new").pipe(withAlias("n"), withDescription$1("Create a new project before starting plan mode"));
+const commandPlan = make$35("plan", {
+	dangerous,
+	withNewProject
+}).pipe(withDescription("Iterate on an issue plan and create PRD tasks"), withHandler(fnUntraced(function* ({ dangerous, withNewProject }) {
+	const project = withNewProject ? yield* addOrUpdateProject() : yield* selectProject;
 	const { specsDirectory } = yield* commandRoot;
 	const commandPrefix = yield* getCommandPrefix;
 	yield* plan({
@@ -151487,7 +151527,7 @@ const commandPlan = make$35("plan", { dangerous }).pipe(withDescription("Iterate
 		commandPrefix,
 		dangerous
 	}).pipe(provideService(CurrentProjectId, project.id));
-}, provide$1(Settings.layer))));
+}, provide$1([Settings.layer, CurrentIssueSource.layer]))));
 const plan = fnUntraced(function* (options) {
 	const fs = yield* FileSystem;
 	const pathService = yield* Path$1;
@@ -151573,7 +151613,7 @@ const handler$1 = flow(withHandler(fnUntraced(function* () {
 	}));
 	console.log(`Created issue with ID: ${created.id}`);
 	console.log(`URL: ${created.url}`);
-}, scoped$1)), provide(mergeAll(CurrentIssueSource.layer).pipe(provideMerge(layerProjectIdPrompt))));
+}, scoped$1)), provide(merge$5(layerProjectIdPrompt, CurrentIssueSource.layer)));
 const commandIssue = make$35("issue").pipe(withDescription("Create a new issue in the selected issue source"), handler$1);
 const commandIssueAlias = make$35("i").pipe(withDescription("Alias for 'issue' command"), handler$1);
 
@@ -151598,7 +151638,7 @@ const commandSource = make$35("source").pipe(withDescription("Select the issue s
 
 //#endregion
 //#region package.json
-var version = "0.2.2";
+var version = "0.2.4";
 
 //#endregion
 //#region src/commands/projects/ls.ts
@@ -151626,10 +151666,7 @@ const commandProjectsLs = make$35("ls").pipe(withDescription("List all configure
 
 //#endregion
 //#region src/commands/projects/add.ts
-const commandProjectsAdd = make$35("add").pipe(withDescription("Add a new project"), withHandler(fnUntraced(function* () {
-	const project = yield* addProject;
-	yield* (yield* IssueSource).settings(project.id);
-})), provide(Settings.layer), provide(CurrentIssueSource.layer));
+const commandProjectsAdd = make$35("add").pipe(withDescription("Add a new project"), withHandler(() => addOrUpdateProject()), provide(Settings.layer), provide(CurrentIssueSource.layer));
 
 //#endregion
 //#region src/commands/projects/rm.ts
@@ -151639,41 +151676,13 @@ const commandProjectsRm = make$35("rm").pipe(withDescription("Remove a project")
 	const project = yield* selectProject;
 	const newProjects = projects.filter((p) => p.id !== project.id);
 	yield* Settings.set(allProjects, some$2(newProjects));
-})), provide(Settings.layer));
+})), provide(Settings.layer), provide(CurrentIssueSource.layer));
 
 //#endregion
 //#region src/commands/projects/edit.ts
 const commandProjectsEdit = make$35("edit").pipe(withDescription("Modify a project"), withHandler(fnUntraced(function* () {
-	const projects = yield* getAllProjects;
-	if (projects.length === 0) return yield* log$1("No projects available to edit.");
-	const project = yield* selectProject;
-	const concurrency = yield* integer$2({
-		message: "Concurrency",
-		min: 1
-	});
-	const targetBranch = pipe(yield* text$2({ message: "Target branch (leave empty to use HEAD)" }), trim, liftPredicate(isNonEmpty));
-	const gitFlow = yield* select({
-		message: "Git flow",
-		choices: [{
-			title: "Pull Request",
-			value: "pr"
-		}, {
-			title: "Commit",
-			value: "commit"
-		}]
-	});
-	const reviewAgent = yield* toggle({ message: "Enable review agent?" });
-	const nextProject = new Project$1({
-		...project,
-		concurrency,
-		targetBranch,
-		gitFlow,
-		reviewAgent
-	});
-	yield* Settings.set(allProjects, some$2(map$12(projects, (p) => p.id === nextProject.id ? nextProject : p)));
-	const source = yield* IssueSource;
-	yield* source.reset.pipe(provideService(CurrentProjectId, nextProject.id));
-	yield* source.settings(project.id);
+	if ((yield* getAllProjects).length === 0) return yield* log$1("No projects available to edit.");
+	yield* addOrUpdateProject(yield* selectProject);
 })), provide(Settings.layer), provide(CurrentIssueSource.layer));
 
 //#endregion

package/package.json

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

package/src/Projects.ts

@@ -13,6 +13,8 @@ import { Project, ProjectId } from "./domain/Project.ts"
 import { AsyncResult, Atom } from "effect/unstable/reactivity"
 import { CurrentProjectId, Setting, Settings } from "./Settings.ts"
 import { Prompt } from "effect/unstable/cli"
+import { IssueSource } from "./IssueSource.ts"
+import { CurrentIssueSource } from "./IssueSources.ts"
 
 export const layerProjectIdPrompt = Layer.effect(
   CurrentProjectId,
@@ -20,7 +22,7 @@ export const layerProjectIdPrompt = Layer.effect(
     const project = yield* selectProject
     return project.id
   }),
-).pipe(Layer.provide(Settings.layer))
+).pipe(Layer.provide(Settings.layer), Layer.provide(CurrentIssueSource.layer))
 
 export const allProjects = new Setting("projects", Schema.Array(Project))
 
@@ -134,30 +136,33 @@ export const welcomeWizard = Effect.gen(function* () {
     "  '--'",
     "",
     "Welcome! Let's add your first project.",
-    "Projects let you configure how lalph runs tasks and integrations",
-    "(like issue filters, concurrency, and git flow).",
+    "Projects let you configure how lalph runs tasks.",
     "",
   ].join("\n")
   console.log(welcome)
-  return yield* addProject
+  return yield* addOrUpdateProject()
 })
 
-export const addProject = Effect.gen(function* () {
+export const addOrUpdateProject = Effect.fnUntraced(function* (
+  existing?: Project,
+) {
   const projects = yield* getAllProjects
-  const id = yield* Prompt.text({
-    message: "Name",
-    validate(input) {
-      input = input.trim()
-      if (input.length === 0) {
-        return Effect.fail("Project name cannot be empty")
-      } else if (projects.some((p) => p.id === input)) {
-        return Effect.fail("Project already exists")
-      }
-      return Effect.succeed(input)
-    },
-  })
+  const id = existing
+    ? existing.id
+    : yield* Prompt.text({
+        message: "Project name",
+        validate(input) {
+          input = input.trim()
+          if (input.length === 0) {
+            return Effect.fail("Project name cannot be empty")
+          } else if (projects.some((p) => p.id === input)) {
+            return Effect.fail("Project already exists")
+          }
+          return Effect.succeed(input)
+        },
+      })
   const concurrency = yield* Prompt.integer({
-    message: "Concurrency",
+    message: "Concurrency (number of tasks to run in parallel)",
     min: 1,
   })
   const targetBranch = pipe(
@@ -170,8 +175,16 @@ export const addProject = Effect.gen(function* () {
   const gitFlow = yield* Prompt.select({
     message: "Git flow",
     choices: [
-      { title: "Pull Request", value: "pr" },
-      { title: "Commit", value: "commit" },
+      {
+        title: "Pull Request",
+        description: "Create a pull request for each task",
+        value: "pr",
+      },
+      {
+        title: "Commit",
+        description: "Tasks are committed directly to the target branch",
+        value: "commit",
+      },
     ] as const,
   })
   const reviewAgent = yield* Prompt.toggle({
@@ -180,12 +193,24 @@ export const addProject = Effect.gen(function* () {
 
   const project = new Project({
     id: ProjectId.makeUnsafe(id),
-    enabled: true,
+    enabled: existing ? existing.enabled : true,
     concurrency,
     targetBranch,
     gitFlow,
     reviewAgent,
   })
-  yield* Settings.set(allProjects, Option.some([...projects, project]))
+  yield* Settings.set(
+    allProjects,
+    Option.some(
+      existing
+        ? projects.map((p) => (p.id === project.id ? project : p))
+        : [...projects, project],
+    ),
+  )
+
+  const source = yield* IssueSource
+  yield* source.reset.pipe(Effect.provideService(CurrentProjectId, project.id))
+  yield* source.settings(project.id)
+
   return project
 })

package/src/commands/issue.ts

@@ -93,11 +93,7 @@ const handler = flow(
       console.log(`URL: ${created.url}`)
     }, Effect.scoped),
   ),
-  Command.provide(
-    Layer.mergeAll(CurrentIssueSource.layer).pipe(
-      Layer.provideMerge(layerProjectIdPrompt),
-    ),
-  ),
+  Command.provide(Layer.merge(layerProjectIdPrompt, CurrentIssueSource.layer)),
 )
 
 export const commandIssue = Command.make("issue").pipe(

package/src/commands/plan.ts

@@ -8,7 +8,7 @@ import { Command, Flag } from "effect/unstable/cli"
 import { CurrentIssueSource } from "../IssueSources.ts"
 import { commandRoot } from "./root.ts"
 import { CurrentProjectId, Settings } from "../Settings.ts"
-import { selectProject } from "../Projects.ts"
+import { addOrUpdateProject, selectProject } from "../Projects.ts"
 
 const dangerous = Flag.boolean("dangerous").pipe(
   Flag.withAlias("d"),
@@ -17,20 +17,33 @@ const dangerous = Flag.boolean("dangerous").pipe(
   ),
 )
 
-export const commandPlan = Command.make("plan", { dangerous }).pipe(
+const withNewProject = Flag.boolean("new").pipe(
+  Flag.withAlias("n"),
+  Flag.withDescription("Create a new project before starting plan mode"),
+)
+
+export const commandPlan = Command.make("plan", {
+  dangerous,
+  withNewProject,
+}).pipe(
   Command.withDescription("Iterate on an issue plan and create PRD tasks"),
   Command.withHandler(
-    Effect.fnUntraced(function* ({ dangerous }) {
-      const project = yield* selectProject
-      const { specsDirectory } = yield* commandRoot
-      const commandPrefix = yield* getCommandPrefix
-      yield* plan({
-        specsDirectory,
-        targetBranch: project.targetBranch,
-        commandPrefix,
-        dangerous,
-      }).pipe(Effect.provideService(CurrentProjectId, project.id))
-    }, Effect.provide(Settings.layer)),
+    Effect.fnUntraced(
+      function* ({ dangerous, withNewProject }) {
+        const project = withNewProject
+          ? yield* addOrUpdateProject()
+          : yield* selectProject
+        const { specsDirectory } = yield* commandRoot
+        const commandPrefix = yield* getCommandPrefix
+        yield* plan({
+          specsDirectory,
+          targetBranch: project.targetBranch,
+          commandPrefix,
+          dangerous,
+        }).pipe(Effect.provideService(CurrentProjectId, project.id))
+      },
+      Effect.provide([Settings.layer, CurrentIssueSource.layer]),
+    ),
   ),
 )
 const plan = Effect.fnUntraced(

package/src/commands/projects/add.ts

@@ -1,19 +1,11 @@
-import { Effect } from "effect"
 import { Command } from "effect/unstable/cli"
-import { addProject } from "../../Projects.ts"
+import { addOrUpdateProject } from "../../Projects.ts"
 import { CurrentIssueSource } from "../../IssueSources.ts"
-import { IssueSource } from "../../IssueSource.ts"
 import { Settings } from "../../Settings.ts"
 
 export const commandProjectsAdd = Command.make("add").pipe(
   Command.withDescription("Add a new project"),
-  Command.withHandler(
-    Effect.fnUntraced(function* () {
-      const project = yield* addProject
-      const source = yield* IssueSource
-      yield* source.settings(project.id)
-    }),
-  ),
+  Command.withHandler(() => addOrUpdateProject()),
   Command.provide(Settings.layer),
   Command.provide(CurrentIssueSource.layer),
 )

package/src/commands/projects/edit.ts

@@ -1,9 +1,11 @@
-import { Array, Effect, Option, pipe, String } from "effect"
-import { Command, Prompt } from "effect/unstable/cli"
-import { allProjects, getAllProjects, selectProject } from "../../Projects.ts"
-import { CurrentProjectId, Settings } from "../../Settings.ts"
-import { Project } from "../../domain/Project.ts"
-import { IssueSource } from "../../IssueSource.ts"
+import { Effect } from "effect"
+import { Command } from "effect/unstable/cli"
+import {
+  addOrUpdateProject,
+  getAllProjects,
+  selectProject,
+} from "../../Projects.ts"
+import { Settings } from "../../Settings.ts"
 import { CurrentIssueSource } from "../../IssueSources.ts"
 
 export const commandProjectsEdit = Command.make("edit").pipe(
@@ -15,49 +17,7 @@ export const commandProjectsEdit = Command.make("edit").pipe(
         return yield* Effect.log("No projects available to edit.")
       }
       const project = yield* selectProject
-      const concurrency = yield* Prompt.integer({
-        message: "Concurrency",
-        min: 1,
-      })
-      const targetBranch = pipe(
-        yield* Prompt.text({
-          message: "Target branch (leave empty to use HEAD)",
-        }),
-        String.trim,
-        Option.liftPredicate(String.isNonEmpty),
-      )
-      const gitFlow = yield* Prompt.select({
-        message: "Git flow",
-        choices: [
-          { title: "Pull Request", value: "pr" },
-          { title: "Commit", value: "commit" },
-        ] as const,
-      })
-      const reviewAgent = yield* Prompt.toggle({
-        message: "Enable review agent?",
-      })
-
-      const nextProject = new Project({
-        ...project,
-        concurrency,
-        targetBranch,
-        gitFlow,
-        reviewAgent,
-      })
-      yield* Settings.set(
-        allProjects,
-        Option.some(
-          Array.map(projects, (p) =>
-            p.id === nextProject.id ? nextProject : p,
-          ),
-        ),
-      )
-
-      const source = yield* IssueSource
-      yield* source.reset.pipe(
-        Effect.provideService(CurrentProjectId, nextProject.id),
-      )
-      yield* source.settings(project.id)
+      yield* addOrUpdateProject(project)
     }),
   ),
   Command.provide(Settings.layer),

package/src/commands/projects/rm.ts

@@ -2,6 +2,7 @@ import { Effect, Option } from "effect"
 import { Command } from "effect/unstable/cli"
 import { allProjects, getAllProjects, selectProject } from "../../Projects.ts"
 import { Settings } from "../../Settings.ts"
+import { CurrentIssueSource } from "../../IssueSources.ts"
 
 export const commandProjectsRm = Command.make("rm").pipe(
   Command.withDescription("Remove a project"),
@@ -17,4 +18,5 @@ export const commandProjectsRm = Command.make("rm").pipe(
     }),
   ),
   Command.provide(Settings.layer),
+  Command.provide(CurrentIssueSource.layer),
 )