npm - lalph - Versions diffs - 0.1.65 → 0.1.67 - Mend

lalph 0.1.65 → 0.1.67

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/dist/cli.mjs CHANGED Viewed

@@ -4851,6 +4851,40 @@ const as$2 = /* @__PURE__ */ dual(2, (self$1, b) => map$11(self$1, () => b));
 */
 const flatMap$3 = /* @__PURE__ */ dual(2, (self$1, f) => isNone(self$1) ? none$3() : f(self$1.value));
 /**
+* Flattens an `Option` of `Option` into a single `Option`.
+*
+* **Details**
+*
+* This function takes an `Option` that wraps another `Option` and flattens it
+* into a single `Option`. If the outer `Option` is `Some`, the function
+* extracts the inner `Option`. If the outer `Option` is `None`, the result
+* remains `None`.
+*
+* This is useful for simplifying nested `Option` structures that may arise
+* during functional operations.
+*
+* @example
+* ```ts
+* import { Option } from "effect"
+*
+* const nested = Option.some(Option.some("value"))
+* console.log(Option.flatten(nested))
+* // Output: { _id: 'Option', _tag: 'Some', value: 'value' }
+*
+* const nestedNone = Option.some(Option.none())
+* console.log(Option.flatten(nestedNone))
+* // Output: { _id: 'Option', _tag: 'None' }
+*
+* const outerNone = Option.none<Option.Option<string>>()
+* console.log(Option.flatten(outerNone))
+* // Output: { _id: 'Option', _tag: 'None' }
+* ```
+*
+* @category Sequencing
+* @since 2.0.0
+*/
+const flatten$2 = /* @__PURE__ */ flatMap$3(identity);
+/**
 * Converts an `Option` into an `Array`.
 *
 * **Details**
@@ -50898,19 +50932,19 @@ const layer$15 = /* @__PURE__ */ effect(ChildProcessSpawner, make$20);
 const flattenCommand = (command) => {
 	const commands = [];
 	const pipeOptions = [];
-	const flatten$2 = (cmd) => {
+	const flatten$3 = (cmd) => {
 		switch (cmd._tag) {
 			case "StandardCommand":
 				commands.push(cmd);
 				break;
 			case "PipedCommand":
-				flatten$2(cmd.left);
+				flatten$3(cmd.left);
 				pipeOptions.push(cmd.options);
-				flatten$2(cmd.right);
+				flatten$3(cmd.right);
 				break;
 		}
 	};
-	flatten$2(command);
+	flatten$3(command);
 	if (commands.length === 0) throw new Error("flattenCommand produced empty commands array");
 	const [first, ...rest] = commands;
 	return {
@@ -141347,7 +141381,10 @@ var ReviewThreads = class extends Class("github/ReviewThreads")({ edges: Array$1
 //#region src/Github/Cli.ts
 var GithubCli = class extends Service()("lalph/Github/Cli", { make: gen(function* () {
 	const spawner = yield* ChildProcessSpawner;
-	const [owner, repo] = (yield* make$21`gh repo view --json nameWithOwner -q ${".nameWithOwner"}`.pipe(string, option$1, flatMap((o) => o.pipe(map$11(trim), filter$5(isNonEmpty), fromOption)))).split("/");
+	const [owner, repo] = (yield* make$21`gh repo view --json nameWithOwner -q ${".nameWithOwner"}`.pipe(string, option$1, flatMap((o) => {
+		const candidate = o.pipe(map$11(trim), filter$5(isNonEmpty));
+		return isSome(candidate) ? succeed$1(candidate.value) : fail$4(new GithubCliRepoNotFound());
+	}))).split("/");
 	const reviewComments = (pr) => make$21`gh api graphql -f owner=${owner} -f repo=${repo} -F pr=${pr} -f query=${githubReviewCommentsQuery}`.pipe(string, flatMap(decodeEffect(CommentsFromJson)), map$5((data) => {
 		return {
 			comments: data.data.repository.pullRequest.comments.edges.map((edge) => edge.node),
@@ -141389,6 +141426,9 @@ ${generalCommentsXml}
 }) }) {
 	static layer = effect(this, this.make);
 };
+var GithubCliRepoNotFound = class extends TaggedError("GithubCliRepoNotFound") {
+	message = "GitHub repository not found. Ensure the current directory is inside a git repo with a GitHub remote.";
+};
 const renderReviewComments = (comment, followup) => `<comment author="${comment.author.login}" path="${comment.path}"${comment.originalLine ? ` originalLine="${comment.originalLine}"` : ""}>
   <diffHunk><![CDATA[${comment.diffHunk}]]></diffHunk>
   <body><![CDATA[${comment.body}]]></body>${followup.length > 0 ? `
@@ -142080,7 +142120,25 @@ var Prd = class extends Service()("lalph/Prd", { make: gen(function* () {
 };
 //#endregion
-//#region src/CliAgent.ts
+//#region src/commands/agent.ts
+const commandPrefixSetting = new Setting("commandPrefix", Option(String$1));
+const parseCommandPrefix = (value) => {
+	const parts = value.trim().split(/\s+/).filter((part) => part.length > 0);
+	return isArrayNonEmpty(parts) ? prefix(parts[0], parts.slice(1)) : identity;
+};
+const normalizePrefix = (value) => some(value.trim()).pipe(filter$5(isNonEmpty));
+const promptForCommandPrefix = gen(function* () {
+	const prefixOption = normalizePrefix(yield* text$2({ message: "Command prefix for agent commands? (leave empty for none)" }));
+	yield* commandPrefixSetting.set(some(prefixOption));
+	return prefixOption;
+});
+const getCommandPrefix = gen(function* () {
+	const stored = yield* commandPrefixSetting.get;
+	return match$7(flatten$2(stored), {
+		onNone: () => identity,
+		onSome: parseCommandPrefix
+	});
+});
 const selectCliAgent = gen(function* () {
 	const agent = yield* select({
 		message: "Select the CLI agent to use",
@@ -142090,6 +142148,7 @@ const selectCliAgent = gen(function* () {
 		}))
 	});
 	yield* selectedCliAgentId.set(some(agent.id));
+	yield* promptForCommandPrefix;
 	return agent;
 });
 const getOrSelectCliAgent = gen(function* () {
@@ -142097,6 +142156,7 @@ const getOrSelectCliAgent = gen(function* () {
 	if (isSome(selectedAgent)) return selectedAgent.value;
 	return yield* selectCliAgent;
 });
+const commandAgent = make$27("agent").pipe(withDescription("Select the CLI agent to use"), withHandler(() => selectCliAgent));
 //#endregion
 //#region src/commands/root.ts
@@ -142109,10 +142169,6 @@ const targetBranch = string$1("target-branch").pipe(withDescription$1("Target br
 const maxIterationMinutes = integer("max-minutes").pipe(withDescription$1("Maximum number of minutes to allow an iteration to run. Defaults to 90 minutes. Env variable: LALPH_MAX_MINUTES"), withFallbackConfig(int("LALPH_MAX_MINUTES")), withDefault(90));
 const stallMinutes = integer("stall-minutes").pipe(withDescription$1("If no activity occurs for this many minutes, the iteration will be stopped. Defaults to 5 minutes. Env variable: LALPH_STALL_MINUTES"), withFallbackConfig(int("LALPH_STALL_MINUTES")), withDefault(5));
 const specsDirectory = directory("specs").pipe(withDescription$1("Directory to store plan specifications. Env variable: LALPH_SPECS"), withAlias("s"), withFallbackConfig(string$4("LALPH_SPECS")), withDefault(".specs"));
-const commandPrefix = string$1("command-prefix").pipe(withDescription$1(`Prefix to add before the agent command (i.e. "docker sandbox run"). Env variable: LALPH_COMMAND_PREFIX`), withAlias("p"), withFallbackConfig(string$4("LALPH_COMMAND_PREFIX")), map((s) => {
-	const parts = s.trim().split(/\s+/).filter((part) => part.length > 0);
-	return isArrayNonEmpty(parts) ? prefix(parts[0], parts.slice(1)) : identity;
-}), withDefault(identity));
 const reset = boolean("reset").pipe(withDescription$1("Reset the current issue source before running"), withAlias("r"));
 const commandRoot = make$27("lalph", {
 	iterations,
@@ -142121,10 +142177,10 @@ const commandRoot = make$27("lalph", {
 	maxIterationMinutes,
 	stallMinutes,
 	reset,
-	specsDirectory,
-	commandPrefix
-}).pipe(withHandler(fnUntraced(function* ({ iterations: iterations$1, concurrency: concurrency$1, targetBranch: targetBranch$1, maxIterationMinutes: maxIterationMinutes$1, stallMinutes: stallMinutes$1, specsDirectory: specsDirectory$1, commandPrefix: commandPrefix$1 }) {
+	specsDirectory
+}).pipe(withHandler(fnUntraced(function* ({ iterations: iterations$1, concurrency: concurrency$1, targetBranch: targetBranch$1, maxIterationMinutes: maxIterationMinutes$1, stallMinutes: stallMinutes$1, specsDirectory: specsDirectory$1 }) {
 	const source = yield* build(CurrentIssueSource.layer);
+	const commandPrefix = yield* getCommandPrefix;
 	yield* getOrSelectCliAgent;
 	const isFinite$3 = Number.isFinite(iterations$1);
 	const iterationsDisplay = isFinite$3 ? iterations$1 : "unlimited";
@@ -142145,7 +142201,7 @@ const commandRoot = make$27("lalph", {
 			specsDirectory: specsDirectory$1,
 			stallTimeout: minutes(stallMinutes$1),
 			runTimeout: minutes(maxIterationMinutes$1),
-			commandPrefix: commandPrefix$1
+			commandPrefix
 		})), catchFilter((e) => e._tag === "NoMoreWork" || e._tag === "QuitError" ? fail$8(e) : e, (e) => logWarning(fail$5(e))), catchTags({
 			NoMoreWork(_) {
 				if (isFinite$3) {
@@ -142264,11 +142320,11 @@ const ChosenTask = fromJsonString(Struct({
 //#endregion
 //#region src/commands/plan.ts
 const commandPlan = make$27("plan").pipe(withDescription("Iterate on an issue plan and create PRD tasks"), withHandler(fnUntraced(function* () {
-	const { specsDirectory: specsDirectory$1, targetBranch: targetBranch$1, commandPrefix: commandPrefix$1 } = yield* commandRoot;
+	const { specsDirectory: specsDirectory$1, targetBranch: targetBranch$1 } = yield* commandRoot;
 	yield* plan({
 		specsDirectory: specsDirectory$1,
 		targetBranch: targetBranch$1,
-		commandPrefix: commandPrefix$1
+		commandPrefix: yield* getCommandPrefix
 	}).pipe(provide$1(CurrentIssueSource.layer));
 })));
 const plan = fnUntraced(function* (options) {
@@ -142384,13 +142440,9 @@ const commandShell = make$27("shell").pipe(withDescription("Enter an interactive
 //#region src/commands/source.ts
 const commandSource = make$27("source").pipe(withDescription("Select the issue source to use"), withHandler(() => selectIssueSource));
-//#endregion
-//#region src/commands/agent.ts
-const commandAgent = make$27("agent").pipe(withDescription("Select the CLI agent to use"), withHandler(() => selectCliAgent));
 //#endregion
 //#region package.json
-var version = "0.1.65";
+var version = "0.1.67";
 //#endregion
 //#region src/cli.ts

package/package.json CHANGED Viewed

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

package/src/Github/Cli.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Effect, Layer, Option, Schema, ServiceMap, String } from "effect"
+import { Data, Effect, Layer, Option, Schema, ServiceMap, String } from "effect"
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
 import {
   CommentsData,
@@ -16,13 +16,15 @@ export class GithubCli extends ServiceMap.Service<GithubCli>()(
         yield* ChildProcess.make`gh repo view --json nameWithOwner -q ${".nameWithOwner"}`.pipe(
           ChildProcess.string,
           Effect.option,
-          Effect.flatMap((o) =>
-            o.pipe(
+          Effect.flatMap((o) => {
+            const candidate = o.pipe(
               Option.map(String.trim),
               Option.filter(String.isNonEmpty),
-              Effect.fromOption,
-            ),
-          ),
+            )
+            return Option.isSome(candidate)
+              ? Effect.succeed(candidate.value)
+              : Effect.fail(new GithubCliRepoNotFound())
+          }),
         )
       const [owner, repo] = nameWithOwner.split("/") as [string, string]
@@ -102,6 +104,13 @@ ${generalCommentsXml}
   static layer = Layer.effect(this, this.make)
 }
+export class GithubCliRepoNotFound extends Data.TaggedError(
+  "GithubCliRepoNotFound",
+) {
+  readonly message =
+    "GitHub repository not found. Ensure the current directory is inside a git repo with a GitHub remote."
+}
 // markdown helper functions
 const renderReviewComments = (

package/src/commands/agent.ts CHANGED Viewed

@@ -1,5 +1,68 @@
-import { Command } from "effect/unstable/cli"
-import { selectCliAgent } from "../CliAgent.ts"
+import { Array, Effect, Option, Schema, String, identity } from "effect"
+import { Command, Prompt } from "effect/unstable/cli"
+import { ChildProcess } from "effect/unstable/process"
+import { allCliAgents } from "../domain/CliAgent.ts"
+import { Setting, selectedCliAgentId } from "../Settings.ts"
+const commandPrefixSetting = new Setting(
+  "commandPrefix",
+  Schema.Option(Schema.String),
+)
+const parseCommandPrefix = (value: string) => {
+  const parts = value
+    .trim()
+    .split(/\s+/)
+    .filter((part) => part.length > 0)
+  return Array.isArrayNonEmpty(parts)
+    ? ChildProcess.prefix(parts[0], parts.slice(1))
+    : identity<ChildProcess.Command>
+}
+const normalizePrefix = (value: string) =>
+  Option.some(value.trim()).pipe(Option.filter(String.isNonEmpty))
+export const promptForCommandPrefix = Effect.gen(function* () {
+  const prefix = yield* Prompt.text({
+    message: "Command prefix for agent commands? (leave empty for none)",
+  })
+  const prefixOption = normalizePrefix(prefix)
+  yield* commandPrefixSetting.set(Option.some(prefixOption))
+  return prefixOption
+})
+export const getCommandPrefix = Effect.gen(function* () {
+  const stored = yield* commandPrefixSetting.get
+  return Option.match(Option.flatten(stored), {
+    onNone: () => identity<ChildProcess.Command>,
+    onSome: parseCommandPrefix,
+  })
+})
+export const selectCliAgent = Effect.gen(function* () {
+  const agent = yield* Prompt.select({
+    message: "Select the CLI agent to use",
+    choices: allCliAgents.map((agent) => ({
+      title: agent.name,
+      value: agent,
+    })),
+  })
+  yield* selectedCliAgentId.set(Option.some(agent.id))
+  yield* promptForCommandPrefix
+  return agent
+})
+export const getOrSelectCliAgent = Effect.gen(function* () {
+  const selectedAgent = (yield* selectedCliAgentId.get).pipe(
+    Option.filterMap((id) =>
+      Array.findFirst(allCliAgents, (agent) => agent.id === id),
+    ),
+  )
+  if (Option.isSome(selectedAgent)) {
+    return selectedAgent.value
+  }
+  return yield* selectCliAgent
+})
 export const commandAgent = Command.make("agent").pipe(
   Command.withDescription("Select the CLI agent to use"),

package/src/commands/plan.ts CHANGED Viewed

@@ -3,7 +3,7 @@ import { PromptGen } from "../PromptGen.ts"
 import { Prd } from "../Prd.ts"
 import { ChildProcess } from "effect/unstable/process"
 import { Worktree } from "../Worktree.ts"
-import { getOrSelectCliAgent } from "../CliAgent.ts"
+import { getCommandPrefix, getOrSelectCliAgent } from "./agent.ts"
 import { Command } from "effect/unstable/cli"
 import { CurrentIssueSource } from "../IssueSources.ts"
 import { commandRoot } from "./root.ts"
@@ -12,7 +12,8 @@ export const commandPlan = Command.make("plan").pipe(
   Command.withDescription("Iterate on an issue plan and create PRD tasks"),
   Command.withHandler(
     Effect.fnUntraced(function* () {
-      const { specsDirectory, targetBranch, commandPrefix } = yield* commandRoot
+      const { specsDirectory, targetBranch } = yield* commandRoot
+      const commandPrefix = yield* getCommandPrefix
       yield* plan({ specsDirectory, targetBranch, commandPrefix }).pipe(
         Effect.provide(CurrentIssueSource.layer),
       )

package/src/commands/root.ts CHANGED Viewed

@@ -1,5 +1,4 @@
 import {
-  Array,
   Cause,
   Config,
   Data,
@@ -10,7 +9,6 @@ import {
   FiberSet,
   FileSystem,
   Filter,
-  identity,
   Iterable,
   Layer,
   Option,
@@ -23,7 +21,7 @@ import { PromptGen } from "../PromptGen.ts"
 import { Prd } from "../Prd.ts"
 import { ChildProcess } from "effect/unstable/process"
 import { Worktree } from "../Worktree.ts"
-import { getOrSelectCliAgent } from "../CliAgent.ts"
+import { getCommandPrefix, getOrSelectCliAgent } from "./agent.ts"
 import { Flag, CliError, Command } from "effect/unstable/cli"
 import { checkForWork } from "../IssueSource.ts"
 import { CurrentIssueSource } from "../IssueSources.ts"
@@ -91,24 +89,6 @@ const specsDirectory = Flag.directory("specs").pipe(
   Flag.withDefault(".specs"),
 )
-const commandPrefix = Flag.string("command-prefix").pipe(
-  Flag.withDescription(
-    `Prefix to add before the agent command (i.e. "docker sandbox run"). Env variable: LALPH_COMMAND_PREFIX`,
-  ),
-  Flag.withAlias("p"),
-  Flag.withFallbackConfig(Config.string("LALPH_COMMAND_PREFIX")),
-  Flag.map((s) => {
-    const parts = s
-      .trim()
-      .split(/\s+/)
-      .filter((part) => part.length > 0)
-    return Array.isArrayNonEmpty(parts)
-      ? ChildProcess.prefix(parts[0], parts.slice(1))
-      : identity
-  }),
-  Flag.withDefault(identity<ChildProcess.Command>),
-)
 // handled in cli.ts
 const reset = Flag.boolean("reset").pipe(
   Flag.withDescription("Reset the current issue source before running"),
@@ -123,7 +103,6 @@ export const commandRoot = Command.make("lalph", {
   stallMinutes,
   reset,
   specsDirectory,
-  commandPrefix,
 }).pipe(
   Command.withHandler(
     Effect.fnUntraced(function* ({
@@ -133,9 +112,9 @@ export const commandRoot = Command.make("lalph", {
       maxIterationMinutes,
       stallMinutes,
       specsDirectory,
-      commandPrefix,
     }) {
       const source = yield* Layer.build(CurrentIssueSource.layer)
+      const commandPrefix = yield* getCommandPrefix
       yield* getOrSelectCliAgent
       const isFinite = Number.isFinite(iterations)

package/src/CliAgent.ts DELETED Viewed

@@ -1,28 +0,0 @@
-import { Array, Effect, Option } from "effect"
-import { Prompt } from "effect/unstable/cli"
-import { allCliAgents } from "./domain/CliAgent.ts"
-import { selectedCliAgentId } from "./Settings.ts"
-export const selectCliAgent = Effect.gen(function* () {
-  const agent = yield* Prompt.select({
-    message: "Select the CLI agent to use",
-    choices: allCliAgents.map((agent) => ({
-      title: agent.name,
-      value: agent,
-    })),
-  })
-  yield* selectedCliAgentId.set(Option.some(agent.id))
-  return agent
-})
-export const getOrSelectCliAgent = Effect.gen(function* () {
-  const selectedAgent = (yield* selectedCliAgentId.get).pipe(
-    Option.filterMap((id) =>
-      Array.findFirst(allCliAgents, (agent) => agent.id === id),
-    ),
-  )
-  if (Option.isSome(selectedAgent)) {
-    return selectedAgent.value
-  }
-  return yield* selectCliAgent
-})