lalph 0.2.21 → 0.3.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lalph",
   "type": "module",
-  "version": "0.2.21",
+  "version": "0.3.0",
   "publishConfig": {
     "access": "public"
   },
@@ -23,11 +23,11 @@
     "@changesets/changelog-github": "^0.5.2",
     "@changesets/cli": "^2.29.8",
     "@effect/language-service": "^0.72.0",
-    "@effect/platform-node": "https://pkg.pr.new/Effect-TS/effect-smol/@effect/platform-node@a5fa8be",
+    "@effect/platform-node": "https://pkg.pr.new/Effect-TS/effect-smol/@effect/platform-node@39ecde9",
     "@linear/sdk": "^72.0.0",
     "@octokit/plugin-rest-endpoint-methods": "^17.0.0",
     "@octokit/types": "^16.0.0",
-    "effect": "https://pkg.pr.new/Effect-TS/effect-smol/effect@a5fa8be",
+    "effect": "https://pkg.pr.new/Effect-TS/effect-smol/effect@39ecde9",
     "husky": "^9.1.7",
     "lint-staged": "^16.2.7",
     "octokit": "^5.0.5",

package/src/Agents/chooser.ts

@@ -4,16 +4,13 @@ import { Prd } from "../Prd.ts"
 import { ChildProcess } from "effect/unstable/process"
 import { Worktree } from "../Worktree.ts"
 import { RunnerStalled } from "../domain/Errors.ts"
-import type { CliAgent } from "../domain/CliAgent.ts"
 import { makeWaitForFile } from "../shared/fs.ts"
 import { GitFlow } from "../GitFlow.ts"
+import type { CliAgentPreset } from "../domain/CliAgentPreset.ts"
 
 export const agentChooser = Effect.fnUntraced(function* (options: {
   readonly stallTimeout: Duration.Duration
-  readonly commandPrefix: (
-    command: ChildProcess.Command,
-  ) => ChildProcess.Command
-  readonly cliAgent: CliAgent
+  readonly preset: CliAgentPreset
 }) {
   const fs = yield* FileSystem.FileSystem
   const pathService = yield* Path.Path
@@ -29,13 +26,16 @@ export const agentChooser = Effect.fnUntraced(function* (options: {
   )
 
   yield* pipe(
-    options.cliAgent.command({
+    options.preset.cliAgent.command({
       prompt: promptGen.promptChoose({ gitFlow }),
       prdFilePath: pathService.join(".lalph", "prd.yml"),
+      extraArgs: options.preset.extraArgs,
     }),
     ChildProcess.setCwd(worktree.directory),
-    options.commandPrefix,
-    worktree.execWithWorkerOutput({ cliAgent: options.cliAgent }),
+    options.preset.withCommandPrefix,
+    worktree.execWithWorkerOutput({
+      cliAgent: options.preset.cliAgent,
+    }),
     Effect.timeoutOrElse({
       duration: options.stallTimeout,
       onTimeout: () => Effect.fail(new RunnerStalled()),

package/src/Agents/planner.ts

@@ -2,29 +2,27 @@ import { Effect, Path, pipe } from "effect"
 import { PromptGen } from "../PromptGen.ts"
 import { ChildProcess } from "effect/unstable/process"
 import { Worktree } from "../Worktree.ts"
-import type { CliAgent } from "../domain/CliAgent.ts"
+import type { CliAgentPreset } from "../domain/CliAgentPreset.ts"
 
 export const agentPlanner = Effect.fnUntraced(function* (options: {
   readonly plan: string
   readonly specsDirectory: string
-  readonly commandPrefix: (
-    command: ChildProcess.Command,
-  ) => ChildProcess.Command
   readonly dangerous: boolean
-  readonly cliAgent: CliAgent
+  readonly preset: CliAgentPreset
 }) {
   const pathService = yield* Path.Path
   const worktree = yield* Worktree
   const promptGen = yield* PromptGen
 
   yield* pipe(
-    options.cliAgent.commandPlan({
+    options.preset.cliAgent.commandPlan({
       prompt: promptGen.planPrompt(options),
       prdFilePath: pathService.join(".lalph", "prd.yml"),
       dangerous: options.dangerous,
+      extraArgs: options.preset.extraArgs,
     }),
     ChildProcess.setCwd(worktree.directory),
-    options.commandPrefix,
+    options.preset.withCommandPrefix,
     ChildProcess.exitCode,
   )
 })

package/src/Agents/reviewer.ts

@@ -2,16 +2,13 @@ import { Duration, Effect, FileSystem, Option, Path, pipe } from "effect"
 import { PromptGen } from "../PromptGen.ts"
 import { ChildProcess } from "effect/unstable/process"
 import { Worktree } from "../Worktree.ts"
-import type { CliAgent } from "../domain/CliAgent.ts"
 import { GitFlow } from "../GitFlow.ts"
+import type { CliAgentPreset } from "../domain/CliAgentPreset.ts"
 
 export const agentReviewer = Effect.fnUntraced(function* (options: {
   readonly specsDirectory: string
   readonly stallTimeout: Duration.Duration
-  readonly cliAgent: CliAgent
-  readonly commandPrefix: (
-    command: ChildProcess.Command,
-  ) => ChildProcess.Command
+  readonly preset: CliAgentPreset
   readonly instructions: string
 }) {
   const fs = yield* FileSystem.FileSystem
@@ -26,7 +23,7 @@ export const agentReviewer = Effect.fnUntraced(function* (options: {
   )
 
   const cliCommand = pipe(
-    options.cliAgent.command({
+    options.preset.cliAgent.command({
       prompt: Option.match(customInstructions, {
         onNone: () =>
           promptGen.promptReview({
@@ -40,14 +37,15 @@ export const agentReviewer = Effect.fnUntraced(function* (options: {
           }),
       }),
       prdFilePath: pathService.join(".lalph", "prd.yml"),
+      extraArgs: options.preset.extraArgs,
     }),
     ChildProcess.setCwd(worktree.directory),
-    options.commandPrefix,
+    options.preset.withCommandPrefix,
   )
 
   return yield* cliCommand.pipe(
     worktree.execWithStallTimeout({
-      cliAgent: options.cliAgent,
+      cliAgent: options.preset.cliAgent,
       stallTimeout: options.stallTimeout,
     }),
   )

package/src/Agents/tasker.ts

@@ -2,30 +2,28 @@ import { Effect, Path, pipe } from "effect"
 import { PromptGen } from "../PromptGen.ts"
 import { ChildProcess } from "effect/unstable/process"
 import { Worktree } from "../Worktree.ts"
-import type { CliAgent } from "../domain/CliAgent.ts"
+import type { CliAgentPreset } from "../domain/CliAgentPreset.ts"
 
 export const agentTasker = Effect.fnUntraced(function* (options: {
   readonly specsDirectory: string
   readonly specificationPath: string
-  readonly commandPrefix: (
-    command: ChildProcess.Command,
-  ) => ChildProcess.Command
-  readonly cliAgent: CliAgent
+  readonly preset: CliAgentPreset
 }) {
   const pathService = yield* Path.Path
   const worktree = yield* Worktree
   const promptGen = yield* PromptGen
 
   return yield* pipe(
-    options.cliAgent.command({
+    options.preset.cliAgent.command({
       prompt: promptGen.promptPlanTasks({
         specsDirectory: options.specsDirectory,
         specificationPath: options.specificationPath,
       }),
       prdFilePath: pathService.join(".lalph", "prd.yml"),
+      extraArgs: options.preset.extraArgs,
     }),
     ChildProcess.setCwd(worktree.directory),
-    options.commandPrefix,
-    worktree.execWithOutput(options),
+    options.preset.withCommandPrefix,
+    worktree.execWithOutput({ cliAgent: options.preset.cliAgent }),
   )
 })

package/src/Agents/timeout.ts

@@ -2,16 +2,13 @@ import { Duration, Effect, Path, pipe } from "effect"
 import { PromptGen } from "../PromptGen.ts"
 import { ChildProcess } from "effect/unstable/process"
 import { Worktree } from "../Worktree.ts"
-import type { CliAgent } from "../domain/CliAgent.ts"
 import type { PrdIssue } from "../domain/PrdIssue.ts"
+import type { CliAgentPreset } from "../domain/CliAgentPreset.ts"
 
 export const agentTimeout = Effect.fnUntraced(function* (options: {
   readonly specsDirectory: string
   readonly stallTimeout: Duration.Duration
-  readonly cliAgent: CliAgent
-  readonly commandPrefix: (
-    command: ChildProcess.Command,
-  ) => ChildProcess.Command
+  readonly preset: CliAgentPreset
   readonly task: PrdIssue
 }) {
   const pathService = yield* Path.Path
@@ -19,19 +16,20 @@ export const agentTimeout = Effect.fnUntraced(function* (options: {
   const promptGen = yield* PromptGen
 
   const timeoutCommand = pipe(
-    options.cliAgent.command({
+    options.preset.cliAgent.command({
       prompt: promptGen.promptTimeout({
         taskId: options.task.id!,
         specsDirectory: options.specsDirectory,
       }),
       prdFilePath: pathService.join(".lalph", "prd.yml"),
+      extraArgs: options.preset.extraArgs,
     }),
     ChildProcess.setCwd(worktree.directory),
-    options.commandPrefix,
+    options.preset.withCommandPrefix,
   )
   return yield* timeoutCommand.pipe(
     worktree.execWithStallTimeout({
-      cliAgent: options.cliAgent,
+      cliAgent: options.preset.cliAgent,
       stallTimeout: options.stallTimeout,
     }),
   )

package/src/Agents/worker.ts

@@ -1,31 +1,29 @@
 import { Duration, Effect, Path, pipe } from "effect"
 import { ChildProcess } from "effect/unstable/process"
 import { Worktree } from "../Worktree.ts"
-import type { CliAgent } from "../domain/CliAgent.ts"
+import type { CliAgentPreset } from "../domain/CliAgentPreset.ts"
 
 export const agentWorker = Effect.fnUntraced(function* (options: {
   readonly stallTimeout: Duration.Duration
-  readonly cliAgent: CliAgent
-  readonly commandPrefix: (
-    command: ChildProcess.Command,
-  ) => ChildProcess.Command
+  readonly preset: CliAgentPreset
   readonly prompt: string
 }) {
   const pathService = yield* Path.Path
   const worktree = yield* Worktree
 
   const cliCommand = pipe(
-    options.cliAgent.command({
+    options.preset.cliAgent.command({
       prompt: options.prompt,
       prdFilePath: pathService.join(".lalph", "prd.yml"),
+      extraArgs: [],
     }),
     ChildProcess.setCwd(worktree.directory),
-    options.commandPrefix,
+    options.preset.withCommandPrefix,
   )
 
   return yield* cliCommand.pipe(
     worktree.execWithStallTimeout({
-      cliAgent: options.cliAgent,
+      cliAgent: options.preset.cliAgent,
       stallTimeout: options.stallTimeout,
     }),
   )

package/src/CurrentIssueSource.ts

@@ -124,6 +124,18 @@ export class CurrentIssueSource extends ServiceMap.Service<
           ScopedRef.get(ref).pipe(
             Effect.flatMap((source) => source.info(projectId)),
           ),
+        issueCliAgentPreset: (issue) =>
+          ScopedRef.get(ref).pipe(
+            Effect.flatMap((source) => source.issueCliAgentPreset(issue)),
+          ),
+        updateCliAgentPreset: (preset) =>
+          ScopedRef.get(ref).pipe(
+            Effect.flatMap((source) => source.updateCliAgentPreset(preset)),
+          ),
+        cliAgentPresetInfo: (preset) =>
+          ScopedRef.get(ref).pipe(
+            Effect.flatMap((source) => source.cliAgentPresetInfo(preset)),
+          ),
         ensureInProgress: (projectId, issueId) =>
           ScopedRef.get(ref).pipe(
             Effect.flatMap((source) =>

package/src/Github/Cli.ts

@@ -100,7 +100,7 @@ ${reviewCommentsMd}`
               const reviewsXml = reviews
                 .map(
                   (review) => `<review author="${review.author.login}">
-  <body><![CDATA[${review.body}]]></body>
+  <body>${review.body}</body>
 </review>`,
                 )
                 .join("\n")
@@ -152,8 +152,8 @@ const renderReviewComments = (
 ) => `<comment author="${comment.author.login}" path="${comment.path}"${
   comment.originalLine ? ` originalLine="${comment.originalLine}"` : ""
 }>
-  <diffHunk><![CDATA[${comment.diffHunk}]]></diffHunk>
-  <body><![CDATA[${comment.body}]]></body>${
+  <diffHunk>${comment.diffHunk}</diffHunk>
+  <body>${comment.body}</body>${
     followup.length > 0
       ? `
 
@@ -161,7 +161,7 @@ const renderReviewComments = (
     .map(
       (fc) => `
     <comment author="${fc.author.login}">
-      <body><![CDATA[${fc.body}]]></body>
+      <body>${fc.body}</body>
     </comment>`,
     )
     .join("")}
@@ -173,7 +173,7 @@ const renderReviewComments = (
 const renderGeneralComment = (
   comment: Comment,
 ) => `  <comment author="${comment.author.login}">
-    <body><![CDATA[${comment.body}]]></body>
+    <body>${comment.body}</body>
   </comment>`
 
 // Schema definitions and GraphQL query

package/src/Github.ts

@@ -24,6 +24,8 @@ import { TokenManager } from "./Github/TokenManager.ts"
 import { GithubCli } from "./Github/Cli.ts"
 import { Reactivity } from "effect/unstable/reactivity"
 import type { ProjectId } from "./domain/Project.ts"
+import type { CliAgentPreset } from "./domain/CliAgentPreset.ts"
+import { getPresetsWithMetadata } from "./Presets.ts"
 
 export class GithubError extends Data.TaggedError("GithubError")<{
   readonly cause: unknown
@@ -158,6 +160,9 @@ export const GithubIssueSource = Layer.effect(
       Stream.filter((issue) => issue.state_reason !== "not_planned"),
     )
 
+    const presets = yield* getPresetsWithMetadata("github", PresetMetadata)
+    const issuePresetMap = new Map<string, CliAgentPreset>()
+
     const issues = (options: {
       readonly labelFilter: Option.Option<string>
       readonly autoMergeLabelName: Option.Option<string>
@@ -177,6 +182,7 @@ export const GithubIssueSource = Layer.effect(
         Stream.filter((issue) => issue.pull_request === undefined),
         Stream.mapEffect(
           Effect.fnUntraced(function* (issue) {
+            const id = `#${issue.number}`
             const dependencies = yield* listOpenBlockedBy(issue.number).pipe(
               Stream.runCollect,
             )
@@ -188,8 +194,16 @@ export const GithubIssueSource = Layer.effect(
                   : hasLabel(issue.labels, "in-review")
                     ? "in-review"
                     : "todo"
+
+            const preset = presets.find(({ metadata }) =>
+              hasLabel(issue.labels, metadata.label),
+            )
+            if (preset) {
+              issuePresetMap.set(id, preset.preset)
+            }
+
             return new PrdIssue({
-              id: `#${issue.number}`,
+              id,
               title: issue.title,
               description: issue.body ?? "",
               priority: 0,
@@ -436,6 +450,28 @@ export const GithubIssueSource = Layer.effect(
           })}`,
         )
       }),
+      issueCliAgentPreset: (issue) =>
+        Effect.sync(() =>
+          Option.fromUndefinedOr(issuePresetMap.get(issue.id!)),
+        ),
+      updateCliAgentPreset: Effect.fnUntraced(function* (preset) {
+        const label = yield* Prompt.text({
+          message: "Enter a label for this preset",
+          validate(value) {
+            value = value.trim()
+            if (value.length === 0) {
+              return Effect.fail("Label cannot be empty")
+            }
+            return Effect.succeed(value)
+          },
+        })
+        return yield* preset.addMetadata("github", PresetMetadata, { label })
+      }),
+      cliAgentPresetInfo: Effect.fnUntraced(function* (preset) {
+        const metadata = yield* preset.decodeMetadata("github", PresetMetadata)
+        if (Option.isNone(metadata)) return
+        console.log(`  Label: ${metadata.value.label}`)
+      }),
       ensureInProgress: Effect.fnUntraced(
         function* (_project, issueId) {
           const issueNumber = Number(issueId.slice(1))
@@ -520,6 +556,12 @@ const getOrSelectAutoMergeLabel = Effect.gen(function* () {
   return yield* autoMergeLabelSelect
 })
 
+// == preset metadata
+
+const PresetMetadata = Schema.Struct({
+  label: Schema.NonEmptyString,
+})
+
 // == helpers
 
 const maybeNextPage = (page: number, linkHeader?: string) =>

package/src/IssueSource.ts

@@ -1,8 +1,11 @@
-import { Effect, Schema, ServiceMap } from "effect"
+import { Effect, Option, Schema, ServiceMap } from "effect"
 import type { PrdIssue } from "./domain/PrdIssue.ts"
 import { Reactivity } from "effect/unstable/reactivity"
 import type { ProjectId } from "./domain/Project.ts"
 import type { CurrentProjectId, Settings } from "./Settings.ts"
+import type { CliAgentPreset } from "./domain/CliAgentPreset.ts"
+import type { Environment } from "effect/unstable/cli/Prompt"
+import type { QuitError } from "effect/Terminal"
 
 export class IssueSource extends ServiceMap.Service<
   IssueSource,
@@ -43,6 +46,20 @@ export class IssueSource extends ServiceMap.Service<
       projectId: ProjectId,
     ) => Effect.Effect<void, IssueSourceError>
 
+    readonly issueCliAgentPreset: (
+      issue: PrdIssue,
+    ) => Effect.Effect<Option.Option<CliAgentPreset>, IssueSourceError>
+    readonly updateCliAgentPreset: (
+      preset: CliAgentPreset,
+    ) => Effect.Effect<
+      CliAgentPreset,
+      IssueSourceError | QuitError,
+      Environment
+    >
+    readonly cliAgentPresetInfo: (
+      preset: CliAgentPreset,
+    ) => Effect.Effect<void, IssueSourceError>
+
     readonly ensureInProgress: (
       projectId: ProjectId,
       issueId: string,

package/src/Linear.ts

@@ -29,6 +29,8 @@ import {
 } from "./domain/LinearIssues.ts"
 import { Reactivity } from "effect/unstable/reactivity"
 import type { ProjectId } from "./domain/Project.ts"
+import { getPresetsWithMetadata } from "./Presets.ts"
+import type { CliAgentPreset } from "./domain/CliAgentPreset.ts"
 
 class Linear extends ServiceMap.Service<Linear>()("lalph/Linear", {
   make: Effect.gen(function* () {
@@ -174,8 +176,11 @@ export const LinearIssueSource = Layer.effect(
       capacity: Number.POSITIVE_INFINITY,
     })
 
+    const presets = yield* getPresetsWithMetadata("linear", PresetMetadata)
+
     // Map of linear identifier to issue id
     const identifierMap = new Map<string, string>()
+    const presetMap = new Map<string, CliAgentPreset>()
 
     const backlogState =
       linear.states.find(
@@ -258,6 +263,13 @@ export const LinearIssueSource = Layer.effect(
           return pipe(
             Array.filter(issues, (issue) => {
               identifierMap.set(issue.identifier, issue.id)
+              const preset = presets.find((p) =>
+                issue.labelIds.includes(p.metadata.labelId),
+              )
+              if (preset) {
+                presetMap.set(issue.identifier, preset.preset)
+              }
+
               const completedAt = issue.completedAt
               if (!completedAt) return true
               return DateTime.isGreaterThanOrEqualTo(completedAt, threeDaysAgo)
@@ -477,11 +489,44 @@ export const LinearIssueSource = Layer.effect(
         },
         Effect.mapError((cause) => new IssueSourceError({ cause })),
       ),
+      issueCliAgentPreset: (_issue) =>
+        Effect.sync(() => Option.fromUndefinedOr(presetMap.get(_issue.id!))),
+      updateCliAgentPreset: Effect.fnUntraced(function* (preset) {
+        const labels = yield* Stream.runCollect(linear.labels).pipe(
+          Effect.mapError((cause) => new IssueSourceError({ cause })),
+        )
+        const labelId = yield* Prompt.autoComplete({
+          message: "Select a label for this preset",
+          choices: labels.map((label) => ({
+            title: label.name,
+            value: label.id,
+          })),
+        })
+        return yield* preset.addMetadata("linear", PresetMetadata, {
+          labelId,
+        })
+      }),
+      cliAgentPresetInfo: Effect.fnUntraced(
+        function* (preset) {
+          const metadata = yield* preset.decodeMetadata(
+            "linear",
+            PresetMetadata,
+          )
+          if (Option.isNone(metadata)) return
+          const label = yield* linear.labels.pipe(
+            Stream.filter((label) => label.id === metadata.value.labelId),
+            Stream.runHead,
+          )
+          if (Option.isNone(label)) return
+          console.log(`  Label: ${label.value.name}`)
+        },
+        Effect.mapError((cause) => new IssueSourceError({ cause })),
+      ),
       // linear api writes and reflected immediately in reads, so no-op
       ensureInProgress: () => Effect.void,
     })
   }),
-).pipe(Layer.provide([Linear.layer, Reactivity.layer]))
+).pipe(Layer.provide([Linear.layer, Reactivity.layer, Settings.layer]))
 
 export class LinearError extends Schema.ErrorClass("lalph/LinearError")({
   _tag: Schema.tag("LinearError"),
@@ -615,6 +660,12 @@ const getOrSelectAutoMergeLabel = Effect.gen(function* () {
   return yield* autoMergeLabelIdSelect
 })
 
+// preset metadata schema
+
+const PresetMetadata = Schema.Struct({
+  labelId: Schema.String,
+})
+
 // graphql queries
 const issueQueryFields = `
   id