lalph 0.3.52 → 0.3.54

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lalph",
   "type": "module",
-  "version": "0.3.52",
+  "version": "0.3.54",
   "publishConfig": {
     "access": "public"
   },
@@ -22,23 +22,23 @@
   "devDependencies": {
     "@changesets/changelog-github": "^0.6.0",
     "@changesets/cli": "^2.30.0",
-    "@effect/ai-openai": "4.0.0-beta.30",
-    "@effect/ai-openai-compat": "4.0.0-beta.30",
-    "@effect/language-service": "^0.79.0",
-    "@effect/platform-node": "4.0.0-beta.30",
+    "@effect/ai-openai": "4.0.0-beta.31",
+    "@effect/ai-openai-compat": "4.0.0-beta.31",
+    "@effect/language-service": "^0.80.0",
+    "@effect/platform-node": "4.0.0-beta.31",
     "@linear/sdk": "^77.0.0",
     "@octokit/plugin-rest-endpoint-methods": "^17.0.0",
     "@octokit/types": "^16.0.0",
-    "@typescript/native-preview": "7.0.0-dev.20260310.1",
-    "clanka": "^0.0.26",
+    "@typescript/native-preview": "7.0.0-dev.20260312.1",
+    "clanka": "^0.1.1",
     "concurrently": "^9.2.1",
-    "effect": "4.0.0-beta.30",
+    "effect": "4.0.0-beta.31",
     "husky": "^9.1.7",
     "lint-staged": "^16.3.3",
     "octokit": "^5.0.5",
-    "oxlint": "^1.53.0",
+    "oxlint": "^1.55.0",
     "prettier": "^3.8.1",
-    "tsdown": "^0.21.1",
+    "tsdown": "^0.21.2",
     "typescript": "^5.9.3",
     "yaml": "^2.8.2"
   },

package/src/Clanka.ts

@@ -1,13 +1,9 @@
 import { Agent, OutputFormatter } from "clanka"
-import { Duration, Effect, Layer, Stdio, Stream } from "effect"
-import {
-  TaskChooseTools,
-  TaskTools,
-  TaskToolsHandlers,
-  TaskToolsWithChoose,
-} from "./TaskTools.ts"
+import { Duration, Effect, Layer, pipe, Stdio, Stream } from "effect"
+import { TaskChooseTools, TaskTools, TaskToolsHandlers } from "./TaskTools.ts"
 import { ClankaModels, clankaSubagent } from "./ClankaModels.ts"
 import { withStallTimeout } from "./shared/stream.ts"
+import { NodeHttpClient } from "@effect/platform-node"
 
 export const ClankaMuxerLayer = Layer.effectDiscard(
   Effect.gen(function* () {
@@ -29,20 +25,24 @@ export const runClanka = Effect.fnUntraced(
   }) {
     const models = yield* ClankaModels
     const muxer = yield* OutputFormatter.Muxer
+    const agent = yield* Agent.Agent
 
-    const agent = yield* Agent.make({
-      ...options,
-      tools: (options.withChoose
-        ? TaskChooseTools
-        : TaskTools) as unknown as typeof TaskToolsWithChoose,
-      subagentModel: clankaSubagent(models, options.model),
-    }).pipe(Effect.provide(models.get(options.model)))
+    const output = yield* pipe(
+      agent.send({
+        prompt: options.prompt,
+        system: options.system,
+      }),
+      Effect.provide([
+        models.get(options.model),
+        Agent.layerSubagentModel(clankaSubagent(models, options.model)),
+      ]),
+    )
 
-    yield* muxer.add(agent.output)
+    yield* muxer.add(output)
 
     let stream = options.stallTimeout
-      ? withStallTimeout(options.stallTimeout)(agent.output)
-      : agent.output
+      ? withStallTimeout(options.stallTimeout)(output)
+      : output
 
     if (options.steer) {
       yield* options.steer.pipe(
@@ -63,5 +63,14 @@ export const runClanka = Effect.fnUntraced(
     )
   },
   Effect.scoped,
-  Effect.provide([Agent.layerServices, TaskToolsHandlers]),
+  (effect, options) =>
+    Effect.provide(
+      effect,
+      Agent.layerLocal({
+        directory: options.directory,
+        tools: options.withChoose ? TaskChooseTools : TaskTools,
+      }),
+      { local: true },
+    ),
+  Effect.provide([NodeHttpClient.layerUndici, TaskToolsHandlers]),
 )

package/src/GitFlow.ts

@@ -61,7 +61,7 @@ export const GitFlowPR = Layer.succeed(
     setupInstructions: ({ githubPrNumber }) =>
       githubPrNumber
         ? `The Github PR #${githubPrNumber} has been detected for this task and the branch has been checked out.
-   - Review feedback in the .lalph/feedback.md file.`
+   - **REVIEW FEEDBACK** in the .lalph/feedback.md file.`
         : `Create a new branch for the task using the format \`{task id}/description\`, using the current HEAD as the base (don't checkout any other branches first).`,
 
     commitInstructions: (

package/src/Linear.ts

@@ -61,9 +61,9 @@ class Linear extends ServiceMap.Service<Linear>()("lalph/Linear", {
       readonly schema: S
     }) => {
       const decode: (
-        input: S["Encoded"],
+        input: unknown,
       ) => Effect.Effect<S["Type"], Schema.SchemaError, S["DecodingServices"]> =
-        Schema.decodeEffect(Schema.toCodecJson(options.schema))
+        Schema.decodeUnknownEffect(Schema.toCodecJson(options.schema))
       return use((c) =>
         c.client.rawRequest(options.query, options.variables),
       ).pipe(Effect.flatMap((r) => decode(r.data)))

package/src/Presets.ts

@@ -5,6 +5,8 @@ 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"
+import { ClankaModels } from "./ClankaModels.ts"
+import { LanguageModel } from "effect/unstable/ai"
 
 export const allCliAgentPresets = new Setting(
   "cliAgentPresets",
@@ -127,6 +129,14 @@ export const addOrUpdatePreset = Effect.fnUntraced(function* (options?: {
     sourceMetadata: {},
   })
 
+  if (cliAgent.id === "clanka") {
+    yield* Effect.log("Verifying Clanka model configuration...")
+    yield* LanguageModel.generateText({ prompt: "say hello" }).pipe(
+      Effect.ignore,
+      Effect.provide(ClankaModels.get(preset.extraArgs.join(" "))),
+    )
+  }
+
   if (id !== CliAgentPreset.defaultId) {
     const source = yield* IssueSource
     preset = yield* source.updateCliAgentPreset(preset)

package/src/PromptGen.ts

@@ -66,8 +66,9 @@ The following instructions should be done without interaction or asking for perm
     options.gitFlow.requiresGithubPr
       ? `
 - Check if there is an open Github PR for the chosen task. If there is, note the PR number for inclusion in the task.json file.
-   - Only include "open" PRs that are not yet merged.
-   - The pull request will contain the task id in the title or description.`
+  - If the task mentions a pull request, then use that instead
+  - Only include "open" PRs that are not yet merged.
+  - The pull request will contain the task id in the title or description.`
       : ""
   }
 - Once you have chosen a task, save its information in a "task.json" file alongside
@@ -100,19 +101,17 @@ Set \`githubPrNumber\` to the PR number if one exists, otherwise use \`null\`.
     options.gitFlow.requiresGithubPr
       ? `
 - Check if there is an open Github PR for the chosen task. If there is, note the PR number for inclusion when calling "chooseTask".
-   - Only include "open" PRs that are not yet merged.
-   - The pull request will contain the task id in the title or description.`
+  - If the task mentions a pull request, then use that instead
+  - Only include "open" PRs that are not yet merged.
+  - The pull request will contain the task id in the title or description.`
       : ""
   }
 - Use the "chooseTask" function to select the task you have chosen.
-\`\`\`${
-        options.gitFlow.requiresGithubPr
-          ? `
-
-Set \`githubPrNumber\` to the PR number if one exists, otherwise use \`null\`.
-`
-          : "\n\nLeave `githubPrNumber` as null."
-      }
+${
+  options.gitFlow.requiresGithubPr
+    ? `\n  - Set \`githubPrNumber\` to the PR number if one exists, otherwise use \`null\`.`
+    : "\n  Leave `githubPrNumber` as null."
+}
 `
 
       const keyInformation = (options: {

package/src/cli.ts

@@ -17,6 +17,7 @@ import { PlatformServices } from "./shared/platform.ts"
 import { commandProjects } from "./commands/projects.ts"
 import { commandSh } from "./commands/sh.ts"
 import { commandAgents } from "./commands/agents.ts"
+import { ClankaModels } from "./ClankaModels.ts"
 
 commandRoot.pipe(
   Command.withSubcommands([
@@ -39,7 +40,7 @@ commandRoot.pipe(
   Command.run({
     version: PackageJson.version,
   }),
-  Effect.provide(PlatformServices),
+  Effect.provide([ClankaModels.layer, PlatformServices]),
   Effect.provideService(Layer.CurrentMemoMap, lalphMemoMap),
   NodeRuntime.runMain,
 )

package/src/commands/plan/tasks.ts

@@ -10,7 +10,6 @@ import { commandRoot } from "../root.ts"
 import { selectCliAgentPreset } from "../../Presets.ts"
 import { CurrentIssueSource } from "../../CurrentIssueSource.ts"
 import type { CliAgentPreset } from "../../domain/CliAgentPreset.ts"
-import { ClankaModels } from "../../ClankaModels.ts"
 import { ClankaMuxerLayer } from "../../Clanka.ts"
 
 const specificationPath = Argument.path("spec", {
@@ -72,7 +71,6 @@ const generateTasks = Effect.fnUntraced(
     })
   },
   Effect.provide([
-    ClankaModels.layer,
     ClankaMuxerLayer,
     Settings.layer,
     PromptGen.layer,

package/src/commands/plan.ts

@@ -24,7 +24,6 @@ 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"
 import { ClankaMuxerLayer } from "../Clanka.ts"
 
 const dangerous = Flag.boolean("dangerous").pipe(
@@ -99,7 +98,6 @@ export const commandPlan = Command.make("plan", {
           Effect.provide([
             Settings.layer,
             CurrentIssueSource.layer,
-            ClankaModels.layer,
             ClankaMuxerLayer,
           ]),
         )

package/src/commands/root.ts

@@ -491,7 +491,6 @@ export const commandRoot = Command.make("lalph", {
       },
       Effect.scoped,
       Effect.provide([
-        ClankaModels.layer,
         ClankaMuxerLayer,
         PromptGen.layer,
         GithubCli.layer,