lalph 0.2.20 → 0.3.0

package/src/Presets.ts

@@ -0,0 +1,165 @@
+import { Array, Effect, Option, Schema } from "effect"
+import { Setting, Settings } from "./Settings.ts"
+import { CliAgentPreset, CliAgentPresetId } from "./domain/CliAgentPreset.ts"
+import { Prompt } from "effect/unstable/cli"
+import { allCliAgents, type AnyCliAgent } from "./domain/CliAgent.ts"
+import { parseCommand } from "./shared/child-process.ts"
+import { IssueSource } from "./IssueSource.ts"
+
+export const allCliAgentPresets = new Setting(
+  "cliAgentPresets",
+  Schema.Array(CliAgentPreset),
+)
+
+export const getAllCliAgentPresets = Settings.get(allCliAgentPresets).pipe(
+  Effect.map(Option.getOrElse((): ReadonlyArray<CliAgentPreset> => [])),
+)
+
+export const getPresetsWithMetadata = <S extends Schema.Top>(
+  source: string,
+  schema: S,
+) =>
+  getAllCliAgentPresets.pipe(
+    Effect.flatMap(
+      Effect.forEach((preset) =>
+        preset.decodeMetadata(source, schema).pipe(
+          Effect.map(
+            Option.map((metadata) => ({
+              preset,
+              metadata,
+            })),
+          ),
+        ),
+      ),
+    ),
+    Effect.map(Array.getSomes),
+  )
+
+export const cliAgentPresetById = Effect.fnUntraced(function* (
+  presetId: CliAgentPresetId,
+) {
+  const presets = yield* getAllCliAgentPresets
+  return Array.findFirst(presets, (p) => p.id === presetId)
+})
+
+export const getDefaultCliAgentPreset = Effect.gen(function* () {
+  const presets = yield* getAllCliAgentPresets
+  const preset = presets.find((p) => p.id === CliAgentPreset.defaultId)
+  return preset ?? (yield* welcomeWizard)
+})
+
+export const welcomeWizard = Effect.gen(function* () {
+  const welcome = [
+    "  .--.",
+    " |^()^|  lalph",
+    "  '--'",
+    "",
+    "Let's setup your default AI agent preset.",
+    "AI agent presets let you configure what cli agent lalph",
+    "uses to run tasks.",
+    "",
+  ].join("\n")
+  console.log(welcome)
+  return yield* addOrUpdatePreset({
+    idOverride: CliAgentPreset.defaultId,
+  })
+})
+
+export const selectCliAgentPreset = Effect.gen(function* () {
+  const presets = yield* getAllCliAgentPresets
+  if (presets.length === 0) {
+    return yield* welcomeWizard
+  } else if (presets.length === 1) {
+    const preset = presets[0]!
+    yield* Effect.log(`Using agent preset: ${preset.id}`)
+    return preset
+  }
+  const selection = yield* Prompt.autoComplete({
+    message: "Select a preset:",
+    choices: presets.map((p) => ({
+      title: p.id,
+      value: p,
+    })),
+  })
+  return selection!
+})
+
+export const addOrUpdatePreset = Effect.fnUntraced(function* (options?: {
+  readonly existing?: CliAgentPreset
+  readonly idOverride?: CliAgentPresetId
+}) {
+  const presets = yield* getAllCliAgentPresets
+
+  const id = options?.existing
+    ? options.existing.id
+    : (options?.idOverride ??
+      CliAgentPresetId.makeUnsafe(
+        yield* Prompt.text({
+          message: "Preset name",
+          validate(input) {
+            input = input.trim()
+            if (input.length === 0) {
+              return Effect.fail("Preset name cannot be empty")
+            } else if (presets.some((p) => p.id === input)) {
+              return Effect.fail("Preset already exists")
+            }
+            return Effect.succeed(input)
+          },
+        }),
+      ))
+
+  const cliAgent = yield* selectCliAgent(options?.existing?.cliAgent.id)
+  const extraArgs = yield* Prompt.text({
+    message: "Extra arguments? (leave empty for none)",
+    default: options?.existing?.extraArgs.join(" ") ?? "",
+  })
+    .asEffect()
+    .pipe(Effect.map(parseCommand))
+  const commandPrefix = yield* promptForCommandPrefix(
+    options?.existing?.commandPrefix,
+  )
+
+  let preset = new CliAgentPreset({
+    id,
+    cliAgent,
+    commandPrefix,
+    extraArgs,
+    sourceMetadata: {},
+  })
+
+  if (id !== CliAgentPreset.defaultId) {
+    const source = yield* IssueSource
+    preset = yield* source.updateCliAgentPreset(preset)
+  }
+
+  yield* Settings.set(
+    allCliAgentPresets,
+    Option.some(
+      options?.existing
+        ? presets.map((p) => (p.id === preset.id ? preset : p))
+        : [...presets, preset],
+    ),
+  )
+
+  return preset
+})
+
+const selectCliAgent = (initial?: AnyCliAgent["id"]) =>
+  Prompt.select({
+    message: "Select the CLI agent to use",
+    choices: allCliAgents.map((agent) => ({
+      title: agent.name,
+      value: agent,
+      selected: agent.id === initial,
+    })),
+  })
+
+const promptForCommandPrefix = Effect.fnUntraced(function* (
+  initial?: ReadonlyArray<string>,
+) {
+  const prefix = yield* Prompt.text({
+    message: "Command prefix? (leave empty for none)",
+    default: initial ? initial.join(" ") : "",
+  })
+  return parseCommand(prefix)
+})

package/src/Projects.ts

@@ -135,7 +135,7 @@ export const welcomeWizard = Effect.gen(function* () {
     " |^()^|  lalph",
     "  '--'",
     "",
-    "Welcome! Let's add your first project.",
+    "Let's add your first project.",
     "Projects let you configure how lalph runs tasks.",
     "",
   ].join("\n")
@@ -168,6 +168,9 @@ export const addOrUpdateProject = Effect.fnUntraced(function* (
   const targetBranch = pipe(
     yield* Prompt.text({
       message: "Target branch (leave empty to use HEAD)",
+      default: existing
+        ? Option.getOrElse(existing.targetBranch, () => "")
+        : "",
     }),
     String.trim,
     Option.liftPredicate(String.isNonEmpty),
@@ -179,16 +182,19 @@ export const addOrUpdateProject = Effect.fnUntraced(function* (
         title: "Pull Request",
         description: "Create a pull request for each task",
         value: "pr",
+        selected: existing ? existing.gitFlow === "pr" : false,
       },
       {
         title: "Commit",
         description: "Tasks are committed directly to the target branch",
         value: "commit",
+        selected: existing ? existing.gitFlow === "pr" : false,
       },
     ] as const,
   })
   const reviewAgent = yield* Prompt.toggle({
     message: "Enable review agent?",
+    initial: existing ? existing.reviewAgent : true,
   })
 
   const project = new Project({

package/src/PromptGen.ts

@@ -156,9 +156,12 @@ ${options.task.description}
 
 # Instructions
 
-1. Study the ${options.specsDirectory}/README.md file (if available), and read
-   the entire prd.yml file to understand the context of the task and any key
-   learnings from previous work.
+Your job is to implement the task described above.
+
+1. Carefully study the prd.yml file to understand the context of the task, and
+   discover any key learnings from previous work.
+   Also read the ${options.specsDirectory}/README.md file (if available), to see
+   if any previous specifications could assist you.
 2. ${options.gitFlow.setupInstructions(options)}
 3. Implement the task.
    - If this task is a research task, **do not** make any code changes yet.
@@ -172,6 +175,7 @@ ${options.task.description}
 5. ${options.gitFlow.commitInstructions({
         githubPrInstructions: sourceMeta.githubPrInstructions,
         githubPrNumber: options.githubPrNumber,
+        taskId: options.task.id ?? "unknown",
         targetBranch: options.targetBranch,
       })}
 6. **After ${options.gitFlow.requiresGithubPr ? "pushing" : "committing"}**
@@ -235,9 +239,9 @@ ${prdNotes(options)}`
       const planPrompt = (options: {
         readonly plan: string
         readonly specsDirectory: string
-      }) => `<request><![CDATA[
+      }) => `<request>
 ${options.plan}
-]]></request>
+</request>
 
 ## Instructions
 
@@ -260,7 +264,6 @@ ${options.plan}
    }
    \`\`\`
 5. Present the saved specification for review (include the full text in your response).
-   If any corrections are needed, update the specification and adjust the plan tasks accordingly.
 
 **Important:** You are only creating or updating a plan, not implementing any tasks yet.
 

package/src/Worktree.ts

@@ -16,7 +16,7 @@ import {
 } from "effect"
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
 import { RunnerStalled } from "./domain/Errors.ts"
-import type { CliAgent } from "./domain/CliAgent.ts"
+import type { AnyCliAgent } from "./domain/CliAgent.ts"
 import { constWorkerMaxOutputChunks, CurrentWorkerState } from "./Workers.ts"
 import { AtomRegistry } from "effect/unstable/reactivity"
 import { CurrentProjectId } from "./Settings.ts"
@@ -194,7 +194,7 @@ const makeExecHelpers = Effect.fnUntraced(function* (options: {
       provide,
     )
 
-  const execWithOutput = (options: { readonly cliAgent: CliAgent }) =>
+  const execWithOutput = (options: { readonly cliAgent: AnyCliAgent }) =>
     Effect.fnUntraced(function* (command: ChildProcess.Command) {
       const handle = yield* provide(command.asEffect())
 
@@ -213,7 +213,7 @@ const makeExecHelpers = Effect.fnUntraced(function* (options: {
       return yield* handle.exitCode
     }, Effect.scoped)
 
-  const execWithWorkerOutput = (options: { readonly cliAgent: CliAgent }) =>
+  const execWithWorkerOutput = (options: { readonly cliAgent: AnyCliAgent }) =>
     Effect.fnUntraced(function* (command: ChildProcess.Command) {
       const registry = yield* AtomRegistry.AtomRegistry
       const worker = yield* CurrentWorkerState
@@ -244,7 +244,7 @@ const makeExecHelpers = Effect.fnUntraced(function* (options: {
 
   const execWithStallTimeout = (options: {
     readonly stallTimeout: Duration.Duration
-    readonly cliAgent: CliAgent
+    readonly cliAgent: AnyCliAgent
   }) =>
     Effect.fnUntraced(function* (command: ChildProcess.Command) {
       const registry = yield* AtomRegistry.AtomRegistry

package/src/cli.ts

@@ -9,7 +9,6 @@ import { commandPlan } from "./commands/plan.ts"
 import { commandIssue, commandIssueAlias } from "./commands/issue.ts"
 import { commandEdit, commandEditAlias } from "./commands/edit.ts"
 import { commandSource } from "./commands/source.ts"
-import { commandAgent } from "./commands/agent.ts"
 import PackageJson from "../package.json" with { type: "json" }
 import { TracingLayer } from "./Tracing.ts"
 import { MinimumLogLevel } from "effect/References"
@@ -17,6 +16,7 @@ import { atomRuntime, lalphMemoMap } from "./shared/runtime.ts"
 import { PlatformServices } from "./shared/platform.ts"
 import { commandProjects, commandProjectsAlias } from "./commands/projects.ts"
 import { commandSh } from "./commands/sh.ts"
+import { commandAgents, commandAgentsAlias } from "./commands/agents.ts"
 
 commandRoot.pipe(
   Command.withSubcommands([
@@ -25,10 +25,11 @@ commandRoot.pipe(
     commandEdit,
     commandSh,
     commandSource,
-    commandAgent,
+    commandAgents,
     commandProjects,
-    commandIssueAlias,
+    commandAgentsAlias,
     commandEditAlias,
+    commandIssueAlias,
     commandProjectsAlias,
   ]),
   Command.provide(Settings.layer),

package/src/commands/agents/add.ts

@@ -0,0 +1,11 @@
+import { Command } from "effect/unstable/cli"
+import { CurrentIssueSource } from "../../CurrentIssueSource.ts"
+import { Settings } from "../../Settings.ts"
+import { addOrUpdatePreset } from "../../Presets.ts"
+
+export const commandAgentsAdd = Command.make("add").pipe(
+  Command.withDescription("Add a new CLI agent preset"),
+  Command.withHandler(() => addOrUpdatePreset()),
+  Command.provide(Settings.layer),
+  Command.provide(CurrentIssueSource.layer),
+)

package/src/commands/agents/edit.ts

@@ -0,0 +1,25 @@
+import { Effect } from "effect"
+import { Command } from "effect/unstable/cli"
+import { Settings } from "../../Settings.ts"
+import { CurrentIssueSource } from "../../CurrentIssueSource.ts"
+import {
+  addOrUpdatePreset,
+  getAllCliAgentPresets,
+  selectCliAgentPreset,
+} from "../../Presets.ts"
+
+export const commandAgentsEdit = Command.make("edit").pipe(
+  Command.withDescription("Modify a CLI agent preset"),
+  Command.withHandler(
+    Effect.fnUntraced(function* () {
+      const projects = yield* getAllCliAgentPresets
+      if (projects.length === 0) {
+        return yield* Effect.log("No presets available to edit.")
+      }
+      const preset = yield* selectCliAgentPreset
+      yield* addOrUpdatePreset({ existing: preset })
+    }),
+  ),
+  Command.provide(Settings.layer),
+  Command.provide(CurrentIssueSource.layer),
+)

package/src/commands/agents/ls.ts

@@ -0,0 +1,43 @@
+import { Effect } from "effect"
+import { Command } from "effect/unstable/cli"
+import { IssueSource } from "../../IssueSource.ts"
+import { CurrentIssueSource } from "../../CurrentIssueSource.ts"
+import { Settings } from "../../Settings.ts"
+import { getAllCliAgentPresets } from "../../Presets.ts"
+
+export const commandAgentsLs = Command.make("ls").pipe(
+  Command.withDescription("List all configured CLI agent presets"),
+  Command.withHandler(
+    Effect.fnUntraced(function* () {
+      const meta = yield* CurrentIssueSource
+      const source = yield* IssueSource
+
+      console.log("Issue source:", meta.name)
+      console.log("")
+
+      const presets = yield* getAllCliAgentPresets
+
+      if (presets.length === 0) {
+        console.log(
+          "No presets configured yet. Run 'lalph agents add' to get started.",
+        )
+        return
+      }
+
+      for (const preset of presets) {
+        console.log(`Preset: ${preset.id}`)
+        yield* source.cliAgentPresetInfo(preset)
+        console.log(`  CLI agent: ${preset.cliAgent.name}`)
+        if (preset.extraArgs.length > 0) {
+          console.log(`  Extra args: ${preset.extraArgs.join(" ")}`)
+        }
+        if (preset.commandPrefix.length > 0) {
+          console.log(`  Command prefix: ${preset.commandPrefix.join(" ")}`)
+        }
+        console.log("")
+      }
+    }),
+  ),
+  Command.provide(Settings.layer),
+  Command.provide(CurrentIssueSource.layer),
+)

package/src/commands/agents/rm.ts

@@ -0,0 +1,26 @@
+import { Effect, Option } from "effect"
+import { Command } from "effect/unstable/cli"
+import { Settings } from "../../Settings.ts"
+import { CurrentIssueSource } from "../../CurrentIssueSource.ts"
+import {
+  allCliAgentPresets,
+  getAllCliAgentPresets,
+  selectCliAgentPreset,
+} from "../../Presets.ts"
+
+export const commandAgentsRm = Command.make("rm").pipe(
+  Command.withDescription("Remove a CLI agent preset"),
+  Command.withHandler(
+    Effect.fnUntraced(function* () {
+      const presets = yield* getAllCliAgentPresets
+      if (presets.length === 0) {
+        return yield* Effect.log("There are no presets to remove.")
+      }
+      const preset = yield* selectCliAgentPreset
+      const newPresets = presets.filter((p) => p.id !== preset.id)
+      yield* Settings.set(allCliAgentPresets, Option.some(newPresets))
+    }),
+  ),
+  Command.provide(Settings.layer),
+  Command.provide(CurrentIssueSource.layer),
+)

package/src/commands/agents.ts

@@ -0,0 +1,22 @@
+import { Command } from "effect/unstable/cli"
+import { commandAgentsLs } from "./agents/ls.ts"
+import { commandAgentsAdd } from "./agents/add.ts"
+import { commandAgentsRm } from "./agents/rm.ts"
+import { commandAgentsEdit } from "./agents/edit.ts"
+
+const subcommands = Command.withSubcommands([
+  commandAgentsLs,
+  commandAgentsAdd,
+  commandAgentsEdit,
+  commandAgentsRm,
+])
+
+export const commandAgents = Command.make("agents").pipe(
+  Command.withDescription("Manage CLI agent presets"),
+  subcommands,
+)
+
+export const commandAgentsAlias = Command.make("a").pipe(
+  Command.withDescription("Alias for 'agents' command"),
+  subcommands,
+)

package/src/commands/issue.ts

@@ -1,6 +1,6 @@
 import { Command } from "effect/unstable/cli"
 import { CurrentIssueSource } from "../CurrentIssueSource.ts"
-import { Effect, flow, Layer, Option, Schema } from "effect"
+import { Effect, flow, Option, Schema } from "effect"
 import { IssueSource } from "../IssueSource.ts"
 import { PrdIssue } from "../domain/PrdIssue.ts"
 import * as Yaml from "yaml"
@@ -31,8 +31,6 @@ const FrontMatterSchema = Schema.toCodecJson(
 const handler = flow(
   Command.withHandler(
     Effect.fnUntraced(function* () {
-      const source = yield* IssueSource
-      const projectId = yield* CurrentProjectId
       const editor = yield* Editor
 
       const content = yield* editor.editTemp({
@@ -66,26 +64,24 @@ const handler = flow(
       )
       const description = lines.slice(descriptionStartIndex).join("\n").trim()
 
-      const created = yield* source.createIssue(
-        projectId,
-        new PrdIssue({
-          id: null,
-          ...frontMatter,
-          description,
-          state: "todo",
-        }),
-      )
-      console.log(`Created issue with ID: ${created.id}`)
-      console.log(`URL: ${created.url}`)
-    }, Effect.scoped),
-  ),
-  Command.provide(
-    Layer.mergeAll(
-      layerProjectIdPrompt,
-      CurrentIssueSource.layer,
-      Editor.layer,
-    ),
+      yield* Effect.gen(function* () {
+        const source = yield* IssueSource
+        const projectId = yield* CurrentProjectId
+        const created = yield* source.createIssue(
+          projectId,
+          new PrdIssue({
+            id: null,
+            ...frontMatter,
+            description,
+            state: "todo",
+          }),
+        )
+        console.log(`Created issue with ID: ${created.id}`)
+        console.log(`URL: ${created.url}`)
+      }).pipe(Effect.provide([layerProjectIdPrompt, CurrentIssueSource.layer]))
+    }),
   ),
+  Command.provide(Editor.layer),
 )
 
 export const commandIssue = Command.make("issue").pipe(

package/src/commands/plan/tasks.ts

@@ -6,8 +6,9 @@ import { layerProjectIdPrompt } from "../../Projects.ts"
 import { PromptGen } from "../../PromptGen.ts"
 import { Settings } from "../../Settings.ts"
 import { Worktree } from "../../Worktree.ts"
-import { getCommandPrefix, getOrSelectCliAgent } from "../agent.ts"
 import { commandRoot } from "../root.ts"
+import { getDefaultCliAgentPreset } from "../../Presets.ts"
+import { CurrentIssueSource } from "../../CurrentIssueSource.ts"
 
 const specificationPath = Argument.path("spec", {
   pathType: "file",
@@ -29,8 +30,7 @@ export const commandPlanTasks = Command.make("tasks", {
         const fs = yield* FileSystem.FileSystem
         const pathService = yield* Path.Path
         const worktree = yield* Worktree
-        const cliAgent = yield* getOrSelectCliAgent
-        const commandPrefix = yield* getCommandPrefix
+        const preset = yield* getDefaultCliAgentPreset
 
         const content = yield* fs.readFileString(specificationPath)
         const relative = pathService.relative(
@@ -46,15 +46,15 @@ export const commandPlanTasks = Command.make("tasks", {
         yield* agentTasker({
           specsDirectory,
           specificationPath: relative,
-          commandPrefix,
-          cliAgent,
+          preset,
         })
       },
       Effect.provide([
         Settings.layer,
         PromptGen.layer,
         Prd.layerProvided.pipe(Layer.provide(layerProjectIdPrompt)),
-        Worktree.layer.pipe(Layer.provide(layerProjectIdPrompt)),
+        CurrentIssueSource.layer,
+        Settings.layer,
       ]),
     ),
   ),

package/src/commands/plan.ts

@@ -2,8 +2,6 @@ import { Data, Effect, FileSystem, Option, Path, pipe, Schema } from "effect"
 import { PromptGen } from "../PromptGen.ts"
 import { Prd } from "../Prd.ts"
 import { Worktree } from "../Worktree.ts"
-import type { ChildProcess } from "effect/unstable/process"
-import { getCommandPrefix, getOrSelectCliAgent } from "./agent.ts"
 import { Command, Flag } from "effect/unstable/cli"
 import { CurrentIssueSource } from "../CurrentIssueSource.ts"
 import { commandRoot } from "./root.ts"
@@ -13,6 +11,7 @@ import { agentPlanner } from "../Agents/planner.ts"
 import { agentTasker } from "../Agents/tasker.ts"
 import { commandPlanTasks } from "./plan/tasks.ts"
 import { Editor } from "../Editor.ts"
+import { getDefaultCliAgentPreset } from "../Presets.ts"
 
 const dangerous = Flag.boolean("dangerous").pipe(
   Flag.withAlias("d"),
@@ -45,13 +44,11 @@ export const commandPlan = Command.make("plan", {
           ? yield* addOrUpdateProject()
           : yield* selectProject
         const { specsDirectory } = yield* commandRoot
-        const commandPrefix = yield* getCommandPrefix
 
         yield* plan({
           plan: thePlan.value,
           specsDirectory,
           targetBranch: project.targetBranch,
-          commandPrefix,
           dangerous,
         }).pipe(Effect.provideService(CurrentProjectId, project.id))
       },
@@ -66,23 +63,18 @@ const plan = Effect.fnUntraced(
     readonly plan: string
     readonly specsDirectory: string
     readonly targetBranch: Option.Option<string>
-    readonly commandPrefix: (
-      command: ChildProcess.Command,
-    ) => ChildProcess.Command
     readonly dangerous: boolean
   }) {
     const fs = yield* FileSystem.FileSystem
     const pathService = yield* Path.Path
     const worktree = yield* Worktree
-
-    const cliAgent = yield* getOrSelectCliAgent
+    const preset = yield* getDefaultCliAgentPreset
 
     yield* agentPlanner({
       plan: options.plan,
       specsDirectory: options.specsDirectory,
-      commandPrefix: options.commandPrefix,
       dangerous: options.dangerous,
-      cliAgent,
+      preset,
     })
 
     const planDetails = yield* pipe(
@@ -98,8 +90,7 @@ const plan = Effect.fnUntraced(
     yield* agentTasker({
       specificationPath: planDetails.specification,
       specsDirectory: options.specsDirectory,
-      commandPrefix: options.commandPrefix,
-      cliAgent,
+      preset,
     })
 
     if (!worktree.inExisting) {