lalph 0.3.44 → 0.3.46

package/src/commands/plan.ts

@@ -15,6 +15,7 @@ import { selectCliAgentPreset } from "../Presets.ts"
 import { ChildProcess, ChildProcessSpawner } from "effect/unstable/process"
 import { parseBranch } from "../shared/git.ts"
 import type { CliAgentPreset } from "../domain/CliAgentPreset.ts"
+import { ClankaModels } from "../ClankaModels.ts"
 
 const dangerous = Flag.boolean("dangerous").pipe(
   Flag.withAlias("d"),
@@ -74,7 +75,13 @@ export const commandPlan = Command.make("plan", {
           dangerous,
           preset,
         }).pipe(Effect.provideService(CurrentProjectId, project.id))
-      }).pipe(Effect.provide([Settings.layer, CurrentIssueSource.layer]))
+      }).pipe(
+        Effect.provide([
+          Settings.layer,
+          CurrentIssueSource.layer,
+          ClankaModels.layer,
+        ]),
+      )
     }, Effect.provide(Editor.layer)),
   ),
   Command.withSubcommands([commandPlanTasks]),

package/src/commands/root.ts

@@ -5,7 +5,6 @@ import {
   Effect,
   FiberSet,
   FileSystem,
-  identity,
   Iterable,
   Option,
   Path,
@@ -44,13 +43,11 @@ import { GitFlow, GitFlowCommit, GitFlowError, GitFlowPR } from "../GitFlow.ts"
 import { getAllProjects, welcomeWizard } from "../Projects.ts"
 import type { Project } from "../domain/Project.ts"
 import { getDefaultCliAgentPreset } from "../Presets.ts"
-import { ChosenTaskDeferred } from "../TaskTools.ts"
-import { ClankaModels, type ClankaModel } from "../ClankaModels.ts"
-import { runClanka } from "../Clanka.ts"
 import type { QuitError } from "effect/Terminal"
 import type { TimeoutError } from "effect/Cause"
 import type { ChildProcessSpawner } from "effect/unstable/process"
-import type { AiError } from "effect/unstable/ai"
+import { ClankaModels } from "../ClankaModels.ts"
+import type { AiError } from "effect/unstable/ai/AiError"
 
 // Main iteration run logic
 
@@ -71,7 +68,8 @@ const run = Effect.fnUntraced(
     | GitFlowError
     | ChosenTaskNotFound
     | RunnerStalled
-    | TimeoutError,
+    | TimeoutError
+    | AiError,
     | CurrentProjectId
     | ChildProcessSpawner.ChildProcessSpawner
     | Settings
@@ -85,6 +83,7 @@ const run = Effect.fnUntraced(
     | PromptGen
     | Prd
     | Worktree
+    | ClankaModels
     | Scope.Scope
   > {
     const projectId = yield* CurrentProjectId
@@ -202,13 +201,21 @@ const run = Effect.fnUntraced(
       )
 
       const promptGen = yield* PromptGen
-      const instructions = promptGen.prompt({
-        specsDirectory: options.specsDirectory,
-        targetBranch: Option.getOrUndefined(options.targetBranch),
-        task: chosenTask.prd,
-        githubPrNumber: chosenTask.githubPrNumber ?? undefined,
-        gitFlow,
-      })
+      const instructions = taskPreset.cliAgent.command
+        ? promptGen.prompt({
+            specsDirectory: options.specsDirectory,
+            targetBranch: Option.getOrUndefined(options.targetBranch),
+            task: chosenTask.prd,
+            githubPrNumber: chosenTask.githubPrNumber ?? undefined,
+            gitFlow,
+          })
+        : promptGen.promptClanka({
+            specsDirectory: options.specsDirectory,
+            targetBranch: Option.getOrUndefined(options.targetBranch),
+            task: chosenTask.prd,
+            githubPrNumber: chosenTask.githubPrNumber ?? undefined,
+            gitFlow,
+          })
 
       const exitCode = yield* agentWorker({
         stallTimeout: options.stallTimeout,
@@ -274,252 +281,6 @@ const run = Effect.fnUntraced(
   Effect.provide(Prd.layer, { local: true }),
 )
 
-const runWithClanka = Effect.fnUntraced(
-  function* (options: {
-    readonly startedDeferred: Deferred.Deferred<void>
-    readonly targetBranch: Option.Option<string>
-    readonly specsDirectory: string
-    readonly stallTimeout: Duration.Duration
-    readonly runTimeout: Duration.Duration
-    readonly review: boolean
-    readonly clankaModel: ClankaModel
-  }): Effect.fn.Return<
-    void,
-    | PlatformError.PlatformError
-    | Schema.SchemaError
-    | IssueSourceError
-    | GitFlowError
-    | ChosenTaskNotFound
-    | RunnerStalled
-    | TimeoutError
-    | AiError.AiError,
-    | CurrentProjectId
-    | FileSystem.FileSystem
-    | Path.Path
-    | Worktree
-    | ChildProcessSpawner.ChildProcessSpawner
-    | GithubCli
-    | IssueSource
-    | AtomRegistry.AtomRegistry
-    | GitFlow
-    | CurrentWorkerState
-    | PromptGen
-    | ClankaModels
-    | Scope.Scope
-    | Prd
-  > {
-    const projectId = yield* CurrentProjectId
-    const fs = yield* FileSystem.FileSystem
-    const pathService = yield* Path.Path
-    const worktree = yield* Worktree
-    const gh = yield* GithubCli
-    const source = yield* IssueSource
-    const gitFlow = yield* GitFlow
-    const currentWorker = yield* CurrentWorkerState
-    const registry = yield* AtomRegistry.AtomRegistry
-    const promptGen = yield* PromptGen
-    const models = yield* ClankaModels
-    const model = models.get(options.clankaModel)
-
-    // 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()),
-    )
-
-    let taskId: string | undefined = undefined
-
-    // setup finalizer to revert issue if we fail
-    yield* Effect.addFinalizer(
-      Effect.fnUntraced(function* (exit) {
-        if (exit._tag === "Success") return
-        if (taskId) {
-          yield* source.updateIssue({
-            projectId,
-            issueId: taskId,
-            state: "todo",
-          })
-        }
-      }, Effect.ignore()),
-    )
-
-    const taskById = (taskId: string) =>
-      AtomRegistry.getResult(registry, currentIssuesAtom(projectId)).pipe(
-        Effect.map((issues) => issues.find((entry) => entry.id === taskId)),
-      )
-
-    // 1. Choose task
-    // --------------
-
-    registry.update(currentWorker.state, (s) =>
-      s.transitionTo(WorkerStatus.ChoosingTask()),
-    )
-
-    const deferred = ChosenTaskDeferred.of(Deferred.makeUnsafe())
-    const chooseResult = yield* runClanka({
-      directory: worktree.directory,
-      prompt: promptGen.promptChooseClanka({ gitFlow }),
-      stallTimeout: options.stallTimeout,
-      withChoose: true,
-    }).pipe(
-      Effect.andThen(Effect.fail(new ChosenTaskNotFound())),
-      Effect.provideService(ChosenTaskDeferred, deferred),
-      Effect.provide(model),
-      Effect.raceFirst(Deferred.await(deferred)),
-      Effect.withSpan("Main.choose"),
-    )
-
-    const chosenTask = yield* taskById(chooseResult.taskId)
-    if (!chosenTask) {
-      return yield* new ChosenTaskNotFound()
-    }
-    taskId = chooseResult.taskId
-    yield* source.updateIssue({
-      projectId,
-      issueId: taskId,
-      state: "in-progress",
-    })
-
-    yield* source.ensureInProgress(projectId, taskId).pipe(
-      Effect.timeoutOrElse({
-        duration: "1 minute",
-        onTimeout: () => Effect.fail(new RunnerStalled()),
-      }),
-    )
-
-    yield* Deferred.completeWith(options.startedDeferred, Effect.void)
-
-    if (gitFlow.requiresGithubPr && chooseResult.githubPrNumber) {
-      yield* worktree.exec`gh pr checkout ${chooseResult.githubPrNumber}`
-      const feedback = yield* gh.prFeedbackMd(chooseResult.githubPrNumber)
-      yield* fs.writeFileString(
-        pathService.join(worktree.directory, ".lalph", "feedback.md"),
-        feedback,
-      )
-    }
-
-    const catchStallInReview = <A, E, R>(
-      effect: Effect.Effect<A, E | RunnerStalled, R>,
-    ) =>
-      Effect.catchIf(
-        effect,
-        (u): u is RunnerStalled => u instanceof RunnerStalled,
-        Effect.fnUntraced(function* (e) {
-          const issues = yield* AtomRegistry.getResult(
-            registry,
-            currentIssuesAtom(projectId),
-          )
-          const task = issues.find((entry) => entry.id === taskId)
-          const inReview = task?.state === "in-review"
-          if (inReview) return
-          return yield* e
-        }),
-      )
-
-    const cancelled = yield* Effect.gen(function* () {
-      //
-      // 2. Work on task
-      // -----------------------
-
-      registry.update(currentWorker.state, (s) =>
-        s.transitionTo(WorkerStatus.Working({ issueId: taskId })),
-      )
-
-      const instructions = promptGen.promptClanka({
-        specsDirectory: options.specsDirectory,
-        targetBranch: Option.getOrUndefined(options.targetBranch),
-        task: chosenTask,
-        githubPrNumber: chooseResult.githubPrNumber ?? undefined,
-        gitFlow,
-      })
-
-      yield* runClanka({
-        directory: worktree.directory,
-        system: promptGen.systemClanka(options),
-        prompt: instructions,
-        stallTimeout: options.stallTimeout,
-      }).pipe(Effect.provide(model), Effect.withSpan("Main.worker"))
-
-      // 3. Review task
-      // -----------------------
-
-      if (options.review) {
-        registry.update(currentWorker.state, (s) =>
-          s.transitionTo(WorkerStatus.Reviewing({ issueId: taskId })),
-        )
-
-        yield* runClanka({
-          directory: worktree.directory,
-          system: promptGen.systemClanka(options),
-          prompt: promptGen.promptReview({
-            prompt: instructions,
-            gitFlow,
-          }),
-        }).pipe(
-          Effect.provide(model),
-          catchStallInReview,
-          Effect.withSpan("Main.review"),
-        )
-      }
-    }).pipe(
-      Effect.timeout(options.runTimeout),
-      Effect.tapErrorTag("TimeoutError", () =>
-        runClanka({
-          directory: worktree.directory,
-          system: promptGen.systemClanka(options),
-          prompt: promptGen.promptTimeoutClanka({
-            taskId,
-            specsDirectory: options.specsDirectory,
-          }),
-          stallTimeout: options.stallTimeout,
-        }).pipe(Effect.provide(model), Effect.withSpan("Main.timeout")),
-      ),
-      Effect.raceFirst(watchTaskState({ issueId: taskId })),
-      Effect.as(false),
-      Effect.catchTag("TaskStateChanged", (error) =>
-        Effect.log(
-          `Task ${error.issueId} moved to ${error.state}; cancelling run.`,
-        ).pipe(Effect.as(true)),
-      ),
-    )
-
-    if (cancelled) return
-
-    yield* gitFlow.postWork({
-      worktree,
-      targetBranch: Option.getOrUndefined(options.targetBranch),
-      issueId: taskId,
-    })
-
-    const task = yield* taskById(taskId)
-    if (task?.autoMerge) {
-      yield* gitFlow.autoMerge({
-        targetBranch: Option.getOrUndefined(options.targetBranch),
-        issueId: taskId,
-        worktree,
-      })
-    }
-  },
-  Effect.scoped,
-  Effect.provide(Prd.layer, { local: true }),
-)
-
-type RunEffects = ReturnType<typeof run> | ReturnType<typeof runWithClanka>
-type RunEffect = Effect.Effect<
-  void,
-  Effect.Error<RunEffects>,
-  Effect.Services<RunEffects>
->
-
 const runProject = Effect.fnUntraced(
   function* (options: {
     readonly iterations: number
@@ -527,7 +288,6 @@ const runProject = Effect.fnUntraced(
     readonly specsDirectory: string
     readonly stallTimeout: Duration.Duration
     readonly runTimeout: Duration.Duration
-    readonly clankaModel: ClankaModel | undefined
   }) {
     const isFinite = Number.isFinite(options.iterations)
     const iterationsDisplay = isFinite ? options.iterations : "unlimited"
@@ -558,26 +318,14 @@ const runProject = Effect.fnUntraced(
 
       yield* checkForWork.pipe(
         Effect.andThen(
-          identity<RunEffect>(
-            options.clankaModel
-              ? runWithClanka({
-                  startedDeferred,
-                  targetBranch: options.project.targetBranch,
-                  specsDirectory: options.specsDirectory,
-                  stallTimeout: options.stallTimeout,
-                  runTimeout: options.runTimeout,
-                  review: options.project.reviewAgent,
-                  clankaModel: options.clankaModel,
-                })
-              : run({
-                  startedDeferred,
-                  targetBranch: options.project.targetBranch,
-                  specsDirectory: options.specsDirectory,
-                  stallTimeout: options.stallTimeout,
-                  runTimeout: options.runTimeout,
-                  review: options.project.reviewAgent,
-                }),
-          ).pipe(
+          run({
+            startedDeferred,
+            targetBranch: options.project.targetBranch,
+            specsDirectory: options.specsDirectory,
+            stallTimeout: options.stallTimeout,
+            runTimeout: options.runTimeout,
+            review: options.project.reviewAgent,
+          }).pipe(
             Effect.provide(
               options.project.gitFlow === "commit" ? GitFlowCommit : GitFlowPR,
               { local: true },
@@ -585,7 +333,6 @@ const runProject = Effect.fnUntraced(
             withWorkerState(options.project.id),
           ),
         ),
-        (_) => _,
         Effect.catchTags({
           NoMoreWork(_error) {
             if (isFinite) {
@@ -692,7 +439,7 @@ export const commandRoot = Command.make("lalph", {
         stallMinutes,
         specsDirectory,
       }) {
-        const preset = yield* getDefaultCliAgentPreset
+        yield* getDefaultCliAgentPreset
 
         let allProjects = yield* getAllProjects
         if (allProjects.length === 0) {
@@ -715,7 +462,6 @@ export const commandRoot = Command.make("lalph", {
               specsDirectory,
               stallTimeout: Duration.minutes(stallMinutes),
               runTimeout: Duration.minutes(maxIterationMinutes),
-              clankaModel: preset.clankaModel,
             }).pipe(Effect.provideService(CurrentProjectId, project.id)),
           { concurrency: "unbounded", discard: true },
         )

package/src/domain/CliAgent.ts

@@ -12,7 +12,7 @@ export class CliAgent<const Id extends string> extends Data.Class<{
   id: Id
   name: string
   outputTransformer?: OutputTransformer | undefined
-  command: (options: {
+  command?: (options: {
     readonly prompt: string
     readonly prdFilePath: string
     readonly extraArgs: ReadonlyArray<string>
@@ -28,6 +28,34 @@ export type OutputTransformer = (
   stream: Stream.Stream<string, PlatformError.PlatformError>,
 ) => Stream.Stream<string, PlatformError.PlatformError>
 
+const clanka = new CliAgent({
+  id: "clanka",
+  name: "clanka",
+  commandPlan: ({ prompt, prdFilePath, dangerous }) =>
+    ChildProcess.make(
+      "opencode",
+      [
+        "--prompt",
+        `@${prdFilePath}
+
+${prompt}`,
+      ],
+      {
+        extendEnv: true,
+        ...(dangerous
+          ? {
+              env: {
+                OPENCODE_PERMISSION: '{"*":"allow"}',
+              },
+            }
+          : {}),
+        stdout: "inherit",
+        stderr: "inherit",
+        stdin: "inherit",
+      },
+    ),
+})
+
 const opencode = new CliAgent({
   id: "opencode",
   name: "opencode",
@@ -178,7 +206,7 @@ ${prompt}`,
     })`echo ${"Plan mode is not supported for amp."}`,
 })
 
-export const allCliAgents = [opencode, claude, codex, amp] as const
+export const allCliAgents = [clanka, opencode, claude, codex, amp] as const
 export type AnyCliAgent = (typeof allCliAgents)[number]
 
 export const CliAgentFromId = Schema.Literals(

package/src/domain/CliAgentPreset.ts

@@ -1,7 +1,6 @@
 import { Array, Effect, identity, Option, Schema } from "effect"
 import { CliAgentFromId } from "./CliAgent.ts"
 import { ChildProcess } from "effect/unstable/process"
-import { ClankaModel } from "../ClankaModels.ts"
 
 export const CliAgentPresetId = Schema.NonEmptyString.pipe(
   Schema.brand("lalph/CliAgentPresetId"),
@@ -16,7 +15,6 @@ export class CliAgentPreset extends Schema.Class<CliAgentPreset>(
   commandPrefix: Schema.Array(Schema.String),
   extraArgs: Schema.Array(Schema.String),
   sourceMetadata: Schema.Record(Schema.String, Schema.Any),
-  clankaModel: Schema.optionalKey(ClankaModel),
 }) {
   static defaultId = CliAgentPresetId.makeUnsafe("default")