lalph 0.3.85 → 0.3.87

package/src/commands/plan.ts

@@ -14,7 +14,7 @@ import { Worktree } from "../Worktree.ts"
 import { Command, Flag } from "effect/unstable/cli"
 import { CurrentIssueSource } from "../CurrentIssueSource.ts"
 import { commandRoot } from "./root.ts"
-import { CurrentProjectId, Settings } from "../Settings.ts"
+import { allProjects, CurrentProjectId, Settings } from "../Settings.ts"
 import { addOrUpdateProject, selectProject } from "../Projects.ts"
 import { agentPlanner } from "../Agents/planner.ts"
 import { agentTasker } from "../Agents/tasker.ts"
@@ -82,7 +82,7 @@ export const commandPlan = Command.make("plan", {
         // possible
         yield* Effect.gen(function* () {
           const project = withNewProject
-            ? yield* addOrUpdateProject()
+            ? yield* addOrUpdateProject(undefined, true)
             : yield* selectProject
           const { specsDirectory } = yield* commandRoot
           const preset = yield* selectCliAgentPreset
@@ -93,6 +93,7 @@ export const commandPlan = Command.make("plan", {
             targetBranch: project.targetBranch,
             dangerous,
             preset,
+            ralph: project.gitFlow === "ralph",
           }).pipe(Effect.provideService(CurrentProjectId, project.id))
         }).pipe(
           Effect.provide([
@@ -116,16 +117,19 @@ const plan = Effect.fnUntraced(
     readonly targetBranch: Option.Option<string>
     readonly dangerous: boolean
     readonly preset: CliAgentPreset
+    readonly ralph: boolean
   }) {
     const fs = yield* FileSystem.FileSystem
     const pathService = yield* Path.Path
     const worktree = yield* Worktree
+    const projectId = yield* CurrentProjectId
 
     yield* agentPlanner({
       plan: options.plan,
       specsDirectory: options.specsDirectory,
       dangerous: options.dangerous,
       preset: options.preset,
+      ralph: options.ralph,
     })
 
     const planDetails = yield* pipe(
@@ -136,6 +140,19 @@ const plan = Effect.fnUntraced(
       Effect.mapError(() => new SpecNotFound()),
     )
 
+    if (options.ralph) {
+      yield* Settings.update(
+        allProjects,
+        Option.map((projects) =>
+          projects.map((p) =>
+            p.id === projectId
+              ? p.update({ ralphSpec: planDetails.specification })
+              : p,
+          ),
+        ),
+      )
+    }
+
     if (Option.isSome(options.targetBranch)) {
       yield* commitAndPushSpecification({
         specsDirectory: options.specsDirectory,
@@ -143,13 +160,15 @@ const plan = Effect.fnUntraced(
       })
     }
 
-    yield* Effect.log("Converting specification into tasks")
+    if (!options.ralph) {
+      yield* Effect.log("Converting specification into tasks")
 
-    yield* agentTasker({
-      specificationPath: planDetails.specification,
-      specsDirectory: options.specsDirectory,
-      preset: options.preset,
-    })
+      yield* agentTasker({
+        specificationPath: planDetails.specification,
+        specsDirectory: options.specsDirectory,
+        preset: options.preset,
+      })
+    }
 
     if (!worktree.inExisting) {
       yield* pipe(
@@ -163,13 +182,14 @@ const plan = Effect.fnUntraced(
     }
   },
   Effect.scoped,
-  Effect.provide([
-    PromptGen.layer,
-    Prd.layerProvided,
-    Worktree.layer,
-    Settings.layer,
-    CurrentIssueSource.layer,
-  ]),
+  (effect, options) =>
+    Effect.provide(effect, [
+      PromptGen.layer,
+      options.ralph ? Prd.layerNoop : Prd.layerProvided,
+      Worktree.layer,
+      Settings.layer,
+      CurrentIssueSource.layer,
+    ]),
 )
 
 export class SpecNotFound extends Data.TaggedError("SpecNotFound") {

package/src/commands/projects/rm.ts

@@ -1,7 +1,7 @@
 import { Effect, FileSystem, Option, Path } from "effect"
 import { Command } from "effect/unstable/cli"
-import { allProjects, getAllProjects, selectProject } from "../../Projects.ts"
-import { Settings } from "../../Settings.ts"
+import { getAllProjects, selectProject } from "../../Projects.ts"
+import { allProjects, Settings } from "../../Settings.ts"
 import { CurrentIssueSource } from "../../CurrentIssueSource.ts"
 
 export const commandProjectsRm = Command.make("rm").pipe(

package/src/commands/projects/toggle.ts

@@ -1,7 +1,7 @@
 import { Array, Effect, Option } from "effect"
 import { Command, Prompt } from "effect/unstable/cli"
-import { allProjects, getAllProjects } from "../../Projects.ts"
-import { Settings } from "../../Settings.ts"
+import { getAllProjects } from "../../Projects.ts"
+import { allProjects, Settings } from "../../Settings.ts"
 import { Project } from "../../domain/Project.ts"
 
 export const commandProjectsToggle = Command.make("toggle").pipe(

package/src/commands/root.ts

@@ -3,6 +3,7 @@ import {
   Deferred,
   Duration,
   Effect,
+  Fiber,
   FiberSet,
   FileSystem,
   Iterable,
@@ -17,6 +18,7 @@ import {
   Scope,
   Semaphore,
   Stream,
+  Unify,
 } from "effect"
 import { PromptGen } from "../PromptGen.ts"
 import { Prd } from "../Prd.ts"
@@ -35,7 +37,7 @@ import { agentChooser, ChosenTaskNotFound } from "../Agents/chooser.ts"
 import { RunnerStalled, TaskStateChanged } from "../domain/Errors.ts"
 import { agentReviewer } from "../Agents/reviewer.ts"
 import { agentTimeout } from "../Agents/timeout.ts"
-import { CurrentProjectId, Settings } from "../Settings.ts"
+import { allProjects, CurrentProjectId, Settings } from "../Settings.ts"
 import { Atom, AtomRegistry, Reactivity } from "effect/unstable/reactivity"
 import {
   activeWorkerLoggingAtom,
@@ -43,7 +45,13 @@ import {
   withWorkerState,
 } from "../Workers.ts"
 import { WorkerStatus } from "../domain/WorkerState.ts"
-import { GitFlow, GitFlowCommit, GitFlowError, GitFlowPR } from "../GitFlow.ts"
+import {
+  GitFlow,
+  GitFlowCommit,
+  GitFlowError,
+  GitFlowPR,
+  GitFlowRalph,
+} from "../GitFlow.ts"
 import { getAllProjects, welcomeWizard } from "../Projects.ts"
 import type { Project } from "../domain/Project.ts"
 import { getDefaultCliAgentPreset } from "../Presets.ts"
@@ -57,6 +65,7 @@ import { CurrentTaskRef } from "../TaskTools.ts"
 import type { OutputFormatter } from "clanka"
 import { ClankaMuxerLayer, SemanticSearchLayer } from "../Clanka.ts"
 import { agentResearcher } from "../Agents/researcher.ts"
+import { agentChooserRalph } from "../Agents/chooserRalph.ts"
 
 // Main iteration run logic
 
@@ -254,10 +263,12 @@ const run = Effect.fnUntraced(
 
       const exitCode = yield* agentWorker({
         stallTimeout: options.stallTimeout,
+        system: promptGen.systemClanka(options),
         preset: taskPreset,
         prompt: instructions,
         research: researchResult,
         steer,
+        ralph: false,
       }).pipe(
         Effect.provideService(CurrentTaskRef, issueRef),
         catchStallInReview,
@@ -284,6 +295,7 @@ const run = Effect.fnUntraced(
           stallTimeout: options.stallTimeout,
           preset: taskPreset,
           instructions,
+          ralph: false,
         }).pipe(catchStallInReview, Effect.withSpan("Main.agentReviewer"))
 
         yield* source.updateIssue({
@@ -299,7 +311,7 @@ const run = Effect.fnUntraced(
           specsDirectory: options.specsDirectory,
           stallTimeout: options.stallTimeout,
           preset: taskPreset,
-          task: chosenTask.prd,
+          task: { _tag: "task", task: chosenTask.prd },
         }),
       ),
       Effect.raceFirst(watchTaskState({ issueId: taskId })),
@@ -336,6 +348,173 @@ const run = Effect.fnUntraced(
   }),
 )
 
+const runRalph = Effect.fnUntraced(
+  function* (options: {
+    readonly targetBranch: Option.Option<string>
+    readonly stallTimeout: Duration.Duration
+    readonly runTimeout: Duration.Duration
+    readonly research: boolean
+    readonly review: boolean
+    readonly specFile: string
+  }): Effect.fn.Return<
+    void,
+    | PlatformError.PlatformError
+    | Schema.SchemaError
+    | IssueSourceError
+    | QuitError
+    | GitFlowError
+    | ChosenTaskNotFound
+    | RunnerStalled
+    | TimeoutError
+    | AiError,
+    | CurrentProjectId
+    | ChildProcessSpawner.ChildProcessSpawner
+    | Settings
+    | Reactivity.Reactivity
+    | GithubCli
+    | IssueSource
+    | Prompt.Environment
+    | AtomRegistry.AtomRegistry
+    | GitFlow
+    | CurrentWorkerState
+    | PromptGen
+    | Prd
+    | Worktree
+    | ClankaModels
+    | OutputFormatter.Muxer
+    | Scope.Scope
+  > {
+    const worktree = yield* Worktree
+    const gitFlow = yield* GitFlow
+    const currentWorker = yield* CurrentWorkerState
+    const registry = yield* AtomRegistry.AtomRegistry
+    const projectId = yield* CurrentProjectId
+
+    const preset = yield* getDefaultCliAgentPreset
+
+    // ensure cleanup of branch after run
+    yield* Effect.addFinalizer(
+      Effect.fnUntraced(function* () {
+        const currentBranchName = yield* worktree
+          .currentBranch(worktree.directory)
+          .pipe(Effect.option, Effect.map(Option.getOrUndefined))
+        if (!currentBranchName) return
+
+        // enter detached state
+        yield* worktree.exec`git checkout --detach ${currentBranchName}`
+        // delete the branch
+        yield* worktree.exec`git branch -D ${currentBranchName}`
+      }, Effect.ignore()),
+    )
+
+    // 1. Choose task
+    // --------------
+
+    registry.update(currentWorker.state, (s) =>
+      s.transitionTo(WorkerStatus.ChoosingTask()),
+    )
+
+    const chosenTask = yield* agentChooserRalph({
+      stallTimeout: options.stallTimeout,
+      preset,
+      specFile: options.specFile,
+    }).pipe(
+      Effect.tapErrorTag(
+        "ChosenTaskNotFound",
+        Effect.fnUntraced(function* () {
+          // Disable project when all tasks are done
+          yield* Settings.update(
+            allProjects,
+            Option.map((projects) =>
+              projects.map((p) =>
+                p.id === projectId ? p.update({ enabled: false }) : p,
+              ),
+            ),
+          )
+        }),
+      ),
+      Effect.withSpan("Main.chooser"),
+    )
+
+    yield* Effect.gen(function* () {
+      //
+      // 2. Work on task
+      // -----------------------
+
+      registry.update(currentWorker.state, (s) =>
+        s.transitionTo(WorkerStatus.Working({ issueId: "ralph" })),
+      )
+
+      let researchResult = Option.none<string>()
+      // if (options.research) {
+      //   researchResult = yield* agentResearcher({
+      //     task: chosenTask.prd,
+      //     specsDirectory: options.specsDirectory,
+      //     stallTimeout: options.stallTimeout,
+      //     preset: taskPreset,
+      //   })
+      // }
+
+      const promptGen = yield* PromptGen
+      const instructions = promptGen.promptRalph({
+        task: chosenTask,
+        specFile: options.specFile,
+        targetBranch: Option.getOrUndefined(options.targetBranch),
+        gitFlow,
+      })
+
+      const exitCode = yield* agentWorker({
+        stallTimeout: options.stallTimeout,
+        preset,
+        prompt: instructions,
+        research: researchResult,
+        ralph: true,
+      }).pipe(Effect.withSpan("Main.worker"))
+      yield* Effect.log(`Agent exited with code: ${exitCode}`)
+
+      // 3. Review task
+      // -----------------------
+
+      if (options.review) {
+        registry.update(currentWorker.state, (s) =>
+          s.transitionTo(WorkerStatus.Reviewing({ issueId: "ralph" })),
+        )
+
+        yield* agentReviewer({
+          specsDirectory: "",
+          stallTimeout: options.stallTimeout,
+          preset,
+          instructions,
+          ralph: true,
+        }).pipe(Effect.withSpan("Main.review"))
+      }
+    }).pipe(
+      Effect.timeout(options.runTimeout),
+      Effect.tapErrorTag("TimeoutError", () =>
+        agentTimeout({
+          specsDirectory: "",
+          stallTimeout: options.stallTimeout,
+          preset,
+          task: { _tag: "ralph", task: chosenTask, specFile: options.specFile },
+        }),
+      ),
+    )
+
+    yield* gitFlow.postWork({
+      worktree,
+      targetBranch: Option.getOrUndefined(options.targetBranch),
+      issueId: "",
+    })
+  },
+  Effect.scoped,
+  Effect.provide(
+    SemanticSearchLayer.pipe(
+      Layer.provideMerge([Prd.layerNoop, Worktree.layer]),
+    ),
+    { local: true },
+  ),
+)
+
 const runProject = Effect.fnUntraced(
   function* (options: {
     readonly iterations: number
@@ -370,26 +549,52 @@ const runProject = Effect.fnUntraced(
       const currentIteration = iteration
 
       const startedDeferred = yield* Deferred.make<void>()
-
-      yield* checkForWork.pipe(
+      let ralphDone = false
+
+      const gitFlow = options.project.gitFlow
+      const isRalph = gitFlow === "ralph"
+      const gitFlowLayer =
+        gitFlow === "commit"
+          ? GitFlowCommit
+          : gitFlow === "ralph"
+            ? GitFlowRalph
+            : GitFlowPR
+      const fiber = yield* checkForWork(options.project).pipe(
         Effect.andThen(
-          run({
-            startedDeferred,
-            targetBranch: options.project.targetBranch,
-            specsDirectory: options.specsDirectory,
-            stallTimeout: options.stallTimeout,
-            runTimeout: options.runTimeout,
-            review: options.project.reviewAgent,
-            research: options.project.researchAgent,
-          }).pipe(
-            Effect.provide(
-              options.project.gitFlow === "commit" ? GitFlowCommit : GitFlowPR,
-              { local: true },
-            ),
+          Unify.unify(
+            isRalph
+              ? runRalph({
+                  targetBranch: options.project.targetBranch,
+                  stallTimeout: options.stallTimeout,
+                  runTimeout: options.runTimeout,
+                  review: options.project.reviewAgent,
+                  research: options.project.researchAgent,
+                  specFile: options.project.ralphSpec!,
+                })
+              : run({
+                  startedDeferred,
+                  targetBranch: options.project.targetBranch,
+                  specsDirectory: options.specsDirectory,
+                  stallTimeout: options.stallTimeout,
+                  runTimeout: options.runTimeout,
+                  review: options.project.reviewAgent,
+                  research: options.project.researchAgent,
+                }),
+          ).pipe(
+            Effect.provide(gitFlowLayer, { local: true }),
             withWorkerState(options.project.id),
           ),
         ),
         Effect.catchTags({
+          ChosenTaskNotFound(_error) {
+            if (isRalph) {
+              ralphDone = true
+              return Effect.log(
+                `No more work to process for Ralph, ending after ${currentIteration + 1} iteration(s).`,
+              )
+            }
+            return Effect.void
+          },
           NoMoreWork(_error) {
             if (isFinite) {
               // If we have a finite number of iterations, we exit when no more
@@ -419,9 +624,12 @@ const runProject = Effect.fnUntraced(
         Effect.ensuring(Deferred.completeWith(startedDeferred, Effect.void)),
         FiberSet.run(fibers),
       )
-
-      yield* Deferred.await(startedDeferred)
-
+      if (isRalph) {
+        yield* Fiber.await(fiber)
+        if (ralphDone) break
+      } else {
+        yield* Deferred.await(startedDeferred)
+      }
       iteration++
     }
 

package/src/domain/CliAgent.ts

@@ -14,12 +14,12 @@ export class CliAgent<const Id extends string> extends Data.Class<{
   outputTransformer?: OutputTransformer | undefined
   command?: (options: {
     readonly prompt: string
-    readonly prdFilePath: string
+    readonly prdFilePath: string | undefined
     readonly extraArgs: ReadonlyArray<string>
   }) => ChildProcess.Command
   commandPlan: (options: {
     readonly prompt: string
-    readonly prdFilePath: string
+    readonly prdFilePath: string | undefined
     readonly dangerous: boolean
   }) => ChildProcess.Command
 }> {}
@@ -36,9 +36,11 @@ const clanka = new CliAgent({
       "opencode",
       [
         "--prompt",
-        `@${prdFilePath}
+        prdFilePath
+          ? `@${prdFilePath}
 
-${prompt}`,
+${prompt}`
+          : prompt,
       ],
       {
         extendEnv: true,
@@ -62,7 +64,13 @@ const opencode = new CliAgent({
   command: ({ prompt, prdFilePath, extraArgs }) =>
     ChildProcess.make(
       "opencode",
-      ["run", prompt, "--thinking", ...extraArgs, "-f", prdFilePath],
+      [
+        "run",
+        prompt,
+        "--thinking",
+        ...extraArgs,
+        ...(prdFilePath ? ["-f", prdFilePath] : []),
+      ],
       {
         extendEnv: true,
         env: {
@@ -78,9 +86,11 @@ const opencode = new CliAgent({
       "opencode",
       [
         "--prompt",
-        `@${prdFilePath}
+        prdFilePath
+          ? `@${prdFilePath}
 
-${prompt}`,
+${prompt}`
+          : prompt,
       ],
       {
         extendEnv: true,
@@ -113,9 +123,11 @@ const claude = new CliAgent({
         "AskUserQuestion",
         ...extraArgs,
         "--",
-        `@${prdFilePath}
+        prdFilePath
+          ? `@${prdFilePath}
 
-${prompt}`,
+${prompt}`
+          : prompt,
       ],
       {
         stdout: "pipe",
@@ -151,9 +163,11 @@ const codex = new CliAgent({
         "exec",
         "--dangerously-bypass-approvals-and-sandbox",
         ...extraArgs,
-        `@${prdFilePath}
+        prdFilePath
+          ? `@${prdFilePath}
 
-${prompt}`,
+${prompt}`
+          : prompt,
       ],
       {
         stdout: "pipe",
@@ -166,9 +180,11 @@ ${prompt}`,
       "codex",
       [
         ...(dangerous ? ["--dangerously-bypass-approvals-and-sandbox"] : []),
-        `@${prdFilePath}
+        prdFilePath
+          ? `@${prdFilePath}
 
-${prompt}`,
+${prompt}`
+          : prompt,
       ],
       {
         stdout: "inherit",
@@ -188,9 +204,11 @@ const amp = new CliAgent({
         "--dangerously-allow-all",
         "--stream-json-thinking",
         ...extraArgs,
-        `@${prdFilePath}
+        prdFilePath
+          ? `@${prdFilePath}
 
-${prompt}`,
+${prompt}`
+          : prompt,
       ],
       {
         stdout: "pipe",

package/src/domain/Project.ts

@@ -8,7 +8,15 @@ export class Project extends Schema.Class<Project>("lalph/Project")({
   enabled: Schema.Boolean,
   targetBranch: Schema.Option(Schema.String),
   concurrency: Schema.Int.check(Schema.isGreaterThanOrEqualTo(1)),
-  gitFlow: Schema.Literals(["pr", "commit"]),
+  gitFlow: Schema.Literals(["pr", "commit", "ralph"]),
+  ralphSpec: Schema.optional(Schema.String),
   researchAgent: Schema.Boolean.pipe(Schema.withDecodingDefault(() => false)),
   reviewAgent: Schema.Boolean,
-}) {}
+}) {
+  update(updates: Partial<Project>): Project {
+    return new Project({
+      ...this,
+      ...updates,
+    })
+  }
+}