lalph 0.1.54 → 0.1.56

package/dist/cli.mjs

@@ -60374,39 +60374,70 @@ var CliAgent = class extends Class$1 {};
 const opencode = new CliAgent({
 	id: "opencode",
 	name: "opencode",
-	env: { OPENCODE_PERMISSION: "{\"*\":\"allow\"}" },
-	command: ({ prompt, prdFilePath }) => [
-		"opencode",
-		"run",
-		prompt,
-		"-f",
-		prdFilePath
-	],
-	commandPlan: ({ prompt, prdFilePath }) => [
-		"opencode",
-		"--prompt",
-		`@${prdFilePath}
+	command: ({ outputMode, prompt, prdFilePath, worktree }) => make$21({
+		cwd: worktree.directory,
+		extendEnv: true,
+		env: { OPENCODE_PERMISSION: "{\"*\":\"allow\"}" },
+		stdout: outputMode,
+		stderr: outputMode,
+		stdin: "inherit"
+	})`opencode run ${prompt} -f ${prdFilePath}`,
+	commandPlan: ({ outputMode, prompt, prdFilePath, worktree }) => make$21({
+		cwd: worktree.directory,
+		extendEnv: true,
+		env: { OPENCODE_PERMISSION: "{\"*\":\"allow\"}" },
+		stdout: outputMode,
+		stderr: outputMode,
+		stdin: "inherit"
+	})`opencode --prompt ${`@${prdFilePath}
 
-${prompt}`
-	]
+${prompt}`}`
 });
 const claude = new CliAgent({
 	id: "claude",
 	name: "Claude Code",
-	env: {},
-	command: ({ prompt, prdFilePath }) => [
-		"claude",
-		"--dangerously-skip-permissions",
-		"-p",
-		`@${prdFilePath}
+	command: ({ outputMode, prompt, prdFilePath, worktree }) => make$21({
+		cwd: worktree.directory,
+		stdout: outputMode,
+		stderr: outputMode,
+		stdin: "inherit"
+	})`claude --dangerously-skip-permissions -p ${`@${prdFilePath}
 
-${prompt}`
-	],
-	commandPlan: ({ prompt, prdFilePath }) => ["claude", `@${prdFilePath}
+${prompt}`}`,
+	commandPlan: ({ outputMode, prompt, prdFilePath, worktree }) => make$21({
+		cwd: worktree.directory,
+		stdout: outputMode,
+		stderr: outputMode,
+		stdin: "inherit"
+	})`claude ${`@${prdFilePath}
 
-${prompt}`]
+${prompt}`}`
 });
-const allCliAgents = [opencode, claude];
+const codex = new CliAgent({
+	id: "codex",
+	name: "codex cli",
+	command: ({ outputMode, prompt, prdFilePath, worktree }) => make$21({
+		cwd: worktree.directory,
+		stdout: outputMode,
+		stderr: outputMode,
+		stdin: "inherit"
+	})`codex exec --dangerously-bypass-approvals-and-sandbox ${`@${prdFilePath}
+
+${prompt}`}`,
+	commandPlan: ({ outputMode, prompt, prdFilePath, worktree }) => make$21({
+		cwd: worktree.directory,
+		stdout: outputMode,
+		stderr: outputMode,
+		stdin: "inherit"
+	})`codex ${`@${prdFilePath}
+
+${prompt}`}`
+});
+const allCliAgents = [
+	opencode,
+	claude,
+	codex
+];
 
 //#endregion
 //#region src/Settings.ts
@@ -60466,7 +60497,6 @@ var PrdIssue = class PrdIssue extends Class("PrdIssue")({
 		"done"
 	]).annotate({ description: "The state of the issue." }),
 	blockedBy: Array$1(String$1).annotate({ description: "An array of issue IDs that block this issue. These issues must be completed before this issue can be worked on." }),
-	complete: Boolean$2.annotate({ description: "Whether the issue is complete." }),
 	autoMerge: Boolean$2.annotate({ description: "Whether the issue should be auto-merged when complete. Read-only field" }),
 	githubPrNumber: NullOr(Finite).annotate({ description: "The created or updated Github pull request number for this task." })
 }) {
@@ -134784,7 +134814,6 @@ const LinearIssueSource = effect(IssueSource, gen(function* () {
 			priority: issue.priority,
 			estimate: issue.estimate ?? null,
 			state,
-			complete: state === "in-review" || state === "done",
 			blockedBy: blockedBy.map((i) => i.identifier),
 			autoMerge: autoMergeLabelId.pipe(map$11((labelId$1) => issue.labelIds.includes(labelId$1)), getOrElse(() => false)),
 			githubPrNumber: null
@@ -141091,7 +141120,6 @@ const GithubIssueSource = effect(IssueSource, gen(function* () {
 			priority: 0,
 			estimate: null,
 			state,
-			complete: state === "done" || state === "in-review",
 			blockedBy: dependencies.map((dep) => `#${dep.number}`),
 			autoMerge: autoMergeLabelName.pipe(map$11((labelName) => hasLabel(issue.labels, labelName)), getOrElse(() => false)),
 			githubPrNumber: null
@@ -141708,14 +141736,7 @@ const run = fnUntraced(function* (options) {
 			const timeUntilDeadline = distanceDuration(deadline, now$2);
 			return flatMap(sleep(timeUntilDeadline), loop);
 		});
-		const handle = yield* make$21(command[0], command.slice(1), {
-			cwd: worktree.directory,
-			extendEnv: true,
-			env: cliAgent.env,
-			stdout: "pipe",
-			stderr: "pipe",
-			stdin: "inherit"
-		});
+		const handle = yield* command;
 		yield* handle.all.pipe(runForEachArray((output) => {
 			lastOutputAt = nowUnsafe();
 			for (const chunk of output) process.stdout.write(chunk);
@@ -141726,17 +141747,11 @@ 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* () {
-		const chooseCommand = cliAgent.command({
+		yield* cliAgent.command({
+			worktree,
 			prompt: promptGen.promptChoose,
-			prdFilePath: pathService.join(".lalph", "prd.yml")
-		});
-		yield* make$21(chooseCommand[0], chooseCommand.slice(1), {
-			cwd: worktree.directory,
-			extendEnv: true,
-			env: cliAgent.env,
-			stdout: "inherit",
-			stderr: "inherit",
-			stdin: "inherit"
+			prdFilePath: pathService.join(".lalph", "prd.yml"),
+			outputMode: "inherit"
 		}).pipe(exitCode, timeoutOrElse({
 			duration: options.stallTimeout,
 			onTimeout: () => fail$4(new RunnerStalled())
@@ -141750,6 +141765,8 @@ const run = fnUntraced(function* (options) {
 		}));
 		yield* completeWith(options.startedDeferred, void_$1);
 		const exitCode$1 = yield* execWithStallTimeout(cliAgent.command({
+			worktree,
+			outputMode: "pipe",
 			prompt: promptGen.prompt({
 				taskId,
 				targetBranch: getOrUndefined(options.targetBranch),
@@ -141758,6 +141775,8 @@ const run = fnUntraced(function* (options) {
 			prdFilePath: pathService.join(".lalph", "prd.yml")
 		})).pipe(timeout(options.runTimeout), catchTag("TimeoutError", fnUntraced(function* (error$1) {
 			yield* execWithStallTimeout(cliAgent.command({
+				worktree,
+				outputMode: "pipe",
 				prompt: promptGen.promptTimeout({ taskId }),
 				prdFilePath: pathService.join(".lalph", "prd.yml")
 			}));
@@ -141786,8 +141805,7 @@ const ChosenTask = fromJsonString(Struct({ id: String$1 }));
 //#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 { reset: reset$2, specsDirectory: specsDirectory$1, targetBranch: targetBranch$1 } = yield* commandRoot;
-	if (reset$2) yield* resetCurrentIssueSource;
+	const { specsDirectory: specsDirectory$1, targetBranch: targetBranch$1 } = yield* commandRoot;
 	yield* plan({
 		specsDirectory: specsDirectory$1,
 		targetBranch: targetBranch$1
@@ -141804,17 +141822,11 @@ const plan = fnUntraced(function* (options) {
 		extendEnv: true
 	})(template, ...args$1).pipe(exitCode);
 	if (isSome(options.targetBranch)) yield* exec`git checkout ${`origin/${options.targetBranch.value}`}`;
-	const cliCommand = cliAgent.commandPlan({
+	const exitCode$1 = yield* cliAgent.commandPlan({
+		worktree,
+		outputMode: "inherit",
 		prompt: promptGen.planPrompt(options),
 		prdFilePath: pathService.join(worktree.directory, ".lalph", "prd.yml")
-	});
-	const exitCode$1 = yield* make$21(cliCommand[0], cliCommand.slice(1), {
-		cwd: worktree.directory,
-		extendEnv: true,
-		env: cliAgent.env,
-		stdout: "inherit",
-		stderr: "inherit",
-		stdin: "inherit"
 	}).pipe(exitCode);
 	yield* log$1(`Agent exited with code: ${exitCode$1}`);
 	if (!worktree.inExisting) yield* fs.copy(pathService.join(worktree.directory, options.specsDirectory), options.specsDirectory, { overwrite: true }).pipe(ignore);
@@ -141876,7 +141888,6 @@ const commandIssue = make$27("issue").pipe(withDescription("Create a new issue i
 		...frontMatter,
 		description,
 		state: "todo",
-		complete: false,
 		githubPrNumber: null
 	}));
 	console.log(`Created issue with ID: ${issueId}`);
@@ -141920,7 +141931,7 @@ const commandAgent = make$27("agent").pipe(withDescription("Select the CLI agent
 
 //#endregion
 //#region package.json
-var version = "0.1.54";
+var version = "0.1.56";
 
 //#endregion
 //#region src/cli.ts

package/package.json

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

package/src/Github.ts

@@ -189,7 +189,6 @@ export const GithubIssueSource = Layer.effect(
               priority: 0,
               estimate: null,
               state,
-              complete: state === "done" || state === "in-review",
               blockedBy: dependencies.map((dep) => `#${dep.number}`),
               autoMerge: autoMergeLabelName.pipe(
                 Option.map((labelName) => hasLabel(issue.labels, labelName)),

package/src/Linear.ts

@@ -230,7 +230,6 @@ export const LinearIssueSource = Layer.effect(
               priority: issue.priority,
               estimate: issue.estimate ?? null,
               state,
-              complete: state === "in-review" || state === "done",
               blockedBy: blockedBy.map((i) => i.identifier),
               autoMerge: autoMergeLabelId.pipe(
                 Option.map((labelId) => issue.labelIds.includes(labelId)),

package/src/commands/issue.ts

@@ -82,7 +82,6 @@ export const commandIssue = Command.make("issue").pipe(
           ...frontMatter,
           description,
           state: "todo",
-          complete: false,
           githubPrNumber: null,
         }),
       )

package/src/commands/plan.ts

@@ -5,17 +5,14 @@ import { ChildProcess } from "effect/unstable/process"
 import { Worktree } from "../Worktree.ts"
 import { getOrSelectCliAgent } from "../CliAgent.ts"
 import { Command } from "effect/unstable/cli"
-import { resetCurrentIssueSource, CurrentIssueSource } from "../IssueSources.ts"
+import { CurrentIssueSource } from "../IssueSources.ts"
 import { commandRoot } from "./root.ts"
 
 export const commandPlan = Command.make("plan").pipe(
   Command.withDescription("Iterate on an issue plan and create PRD tasks"),
   Command.withHandler(
     Effect.fnUntraced(function* () {
-      const { reset, specsDirectory, targetBranch } = yield* commandRoot
-      if (reset) {
-        yield* resetCurrentIssueSource
-      }
+      const { specsDirectory, targetBranch } = yield* commandRoot
       yield* plan({ specsDirectory, targetBranch }).pipe(
         Effect.provide(CurrentIssueSource.layer),
       )
@@ -47,22 +44,14 @@ const plan = Effect.fnUntraced(
       yield* exec`git checkout ${`origin/${options.targetBranch.value}`}`
     }
 
-    const cliCommand = cliAgent.commandPlan({
-      prompt: promptGen.planPrompt(options),
-      prdFilePath: pathService.join(worktree.directory, ".lalph", "prd.yml"),
-    })
-    const exitCode = yield* ChildProcess.make(
-      cliCommand[0]!,
-      cliCommand.slice(1),
-      {
-        cwd: worktree.directory,
-        extendEnv: true,
-        env: cliAgent.env,
-        stdout: "inherit",
-        stderr: "inherit",
-        stdin: "inherit",
-      },
-    ).pipe(ChildProcess.exitCode)
+    const exitCode = yield* cliAgent
+      .commandPlan({
+        worktree,
+        outputMode: "inherit",
+        prompt: promptGen.planPrompt(options),
+        prdFilePath: pathService.join(worktree.directory, ".lalph", "prd.yml"),
+      })
+      .pipe(ChildProcess.exitCode)
 
     yield* Effect.log(`Agent exited with code: ${exitCode}`)
 

package/src/commands/root.ts

@@ -22,7 +22,7 @@ import { Worktree } from "../Worktree.ts"
 import { getOrSelectCliAgent } from "../CliAgent.ts"
 import { Flag, CliError, Command } from "effect/unstable/cli"
 import { checkForWork } from "../IssueSource.ts"
-import { resetCurrentIssueSource, CurrentIssueSource } from "../IssueSources.ts"
+import { CurrentIssueSource } from "../IssueSources.ts"
 
 const iterations = Flag.integer("iterations").pipe(
   Flag.withDescription("Number of iterations to run, defaults to unlimited"),
@@ -215,7 +215,7 @@ const run = Effect.fnUntraced(
       })(template, ...args).pipe(ChildProcess.exitCode)
 
     const execWithStallTimeout = Effect.fnUntraced(function* (
-      command: ReadonlyArray<string>,
+      command: ChildProcess.Command,
     ) {
       let lastOutputAt = yield* DateTime.now
 
@@ -235,14 +235,7 @@ const run = Effect.fnUntraced(
         return Effect.flatMap(Effect.sleep(timeUntilDeadline), loop)
       })
 
-      const handle = yield* ChildProcess.make(command[0]!, command.slice(1), {
-        cwd: worktree.directory,
-        extendEnv: true,
-        env: cliAgent.env,
-        stdout: "pipe",
-        stderr: "pipe",
-        stdin: "inherit",
-      })
+      const handle = yield* command
 
       yield* handle.all.pipe(
         Stream.runForEachArray((output) => {
@@ -275,25 +268,20 @@ const run = Effect.fnUntraced(
     }
 
     yield* Effect.gen(function* () {
-      const chooseCommand = cliAgent.command({
-        prompt: promptGen.promptChoose,
-        prdFilePath: pathService.join(".lalph", "prd.yml"),
-      })
-
-      yield* ChildProcess.make(chooseCommand[0]!, chooseCommand.slice(1), {
-        cwd: worktree.directory,
-        extendEnv: true,
-        env: cliAgent.env,
-        stdout: "inherit",
-        stderr: "inherit",
-        stdin: "inherit",
-      }).pipe(
-        ChildProcess.exitCode,
-        Effect.timeoutOrElse({
-          duration: options.stallTimeout,
-          onTimeout: () => Effect.fail(new RunnerStalled()),
-        }),
-      )
+      yield* cliAgent
+        .command({
+          worktree,
+          prompt: promptGen.promptChoose,
+          prdFilePath: pathService.join(".lalph", "prd.yml"),
+          outputMode: "inherit",
+        })
+        .pipe(
+          ChildProcess.exitCode,
+          Effect.timeoutOrElse({
+            duration: options.stallTimeout,
+            onTimeout: () => Effect.fail(new RunnerStalled()),
+          }),
+        )
 
       const taskJson = yield* fs.readFileString(
         pathService.join(worktree.directory, ".lalph", "task.json"),
@@ -314,6 +302,8 @@ const run = Effect.fnUntraced(
       yield* Deferred.completeWith(options.startedDeferred, Effect.void)
 
       const cliCommand = cliAgent.command({
+        worktree,
+        outputMode: "pipe",
         prompt: promptGen.prompt({
           taskId,
           targetBranch: Option.getOrUndefined(options.targetBranch),
@@ -328,6 +318,8 @@ const run = Effect.fnUntraced(
           "TimeoutError",
           Effect.fnUntraced(function* (error) {
             const timeoutCommand = cliAgent.command({
+              worktree,
+              outputMode: "pipe",
               prompt: promptGen.promptTimeout({
                 taskId,
               }),
@@ -373,7 +365,6 @@ const run = Effect.fnUntraced(
     )
   },
   Effect.scoped,
-  // on interrupt or error, revert any state changes made in the PRD
   Effect.provide([PromptGen.layer, Prd.layer]),
 )
 

package/src/domain/CliAgent.ts

@@ -1,59 +1,97 @@
 import { Data } from "effect"
+import type { Worktree } from "../Worktree.ts"
+import { ChildProcess } from "effect/unstable/process"
 
 export class CliAgent extends Data.Class<{
   id: string
   name: string
   command: (options: {
+    readonly worktree: Worktree["Service"]
+    readonly outputMode: "pipe" | "inherit"
     readonly prompt: string
     readonly prdFilePath: string
-  }) => ReadonlyArray<string>
+  }) => ChildProcess.Command
   commandPlan: (options: {
+    readonly worktree: Worktree["Service"]
+    readonly outputMode: "pipe" | "inherit"
     readonly prompt: string
     readonly prdFilePath: string
-  }) => ReadonlyArray<string>
-  env: Record<string, string>
+  }) => ChildProcess.Command
 }> {}
 
 export const opencode = new CliAgent({
   id: "opencode",
   name: "opencode",
-  env: {
-    OPENCODE_PERMISSION: '{"*":"allow"}',
-  },
-  command: ({ prompt, prdFilePath }) => [
-    "opencode",
-    "run",
-    prompt,
-    "-f",
-    prdFilePath,
-  ],
-  commandPlan: ({ prompt, prdFilePath }) => [
-    "opencode",
-    "--prompt",
-    `@${prdFilePath}
-
-${prompt}`,
-  ],
+  command: ({ outputMode, prompt, prdFilePath, worktree }) =>
+    ChildProcess.make({
+      cwd: worktree.directory,
+      extendEnv: true,
+      env: {
+        OPENCODE_PERMISSION: '{"*":"allow"}',
+      },
+      stdout: outputMode,
+      stderr: outputMode,
+      stdin: "inherit",
+    })`opencode run ${prompt} -f ${prdFilePath}`,
+  commandPlan: ({ outputMode, prompt, prdFilePath, worktree }) =>
+    ChildProcess.make({
+      cwd: worktree.directory,
+      extendEnv: true,
+      env: {
+        OPENCODE_PERMISSION: '{"*":"allow"}',
+      },
+      stdout: outputMode,
+      stderr: outputMode,
+      stdin: "inherit",
+    })`opencode --prompt ${`@${prdFilePath}
+
+${prompt}`}`,
 })
 
 export const claude = new CliAgent({
   id: "claude",
   name: "Claude Code",
-  env: {},
-  command: ({ prompt, prdFilePath }) => [
-    "claude",
-    "--dangerously-skip-permissions",
-    "-p",
-    `@${prdFilePath}
-
-${prompt}`,
-  ],
-  commandPlan: ({ prompt, prdFilePath }) => [
-    "claude",
-    `@${prdFilePath}
-
-${prompt}`,
-  ],
+  command: ({ outputMode, prompt, prdFilePath, worktree }) =>
+    ChildProcess.make({
+      cwd: worktree.directory,
+      stdout: outputMode,
+      stderr: outputMode,
+      stdin: "inherit",
+    })`claude --dangerously-skip-permissions -p ${`@${prdFilePath}
+
+${prompt}`}`,
+  commandPlan: ({ outputMode, prompt, prdFilePath, worktree }) =>
+    ChildProcess.make({
+      cwd: worktree.directory,
+      stdout: outputMode,
+      stderr: outputMode,
+      stdin: "inherit",
+    })`claude ${`@${prdFilePath}
+
+${prompt}`}`,
+})
+
+export const codex = new CliAgent({
+  id: "codex",
+  name: "codex cli",
+  command: ({ outputMode, prompt, prdFilePath, worktree }) =>
+    ChildProcess.make({
+      cwd: worktree.directory,
+      stdout: outputMode,
+      stderr: outputMode,
+      stdin: "inherit",
+    })`codex exec --dangerously-bypass-approvals-and-sandbox ${`@${prdFilePath}
+
+${prompt}`}`,
+  commandPlan: ({ outputMode, prompt, prdFilePath, worktree }) =>
+    ChildProcess.make({
+      cwd: worktree.directory,
+      stdout: outputMode,
+      stderr: outputMode,
+      stdin: "inherit",
+    })`codex ${`@${prdFilePath}
+
+${prompt}`}`,
 })
 
-export const allCliAgents = [opencode, claude]
+export const allCliAgents = [opencode, claude, codex]

package/src/domain/PrdIssue.ts

@@ -33,9 +33,6 @@ export class PrdIssue extends Schema.Class<PrdIssue>("PrdIssue")({
     description:
       "An array of issue IDs that block this issue. These issues must be completed before this issue can be worked on.",
   }),
-  complete: Schema.Boolean.annotate({
-    description: "Whether the issue is complete.",
-  }),
   autoMerge: Schema.Boolean.annotate({
     description:
       "Whether the issue should be auto-merged when complete. Read-only field",