lalph 0.3.91 → 0.3.92

package/dist/cli.mjs

@@ -232437,14 +232437,11 @@ const parseInput = flow(decodeUnknownEffect(Tuple([
 	String$1,
 	Reasoning
 ])), orDie$2);
-var ClankaModels = class extends Service()("lalph/ClankaModels", {
-	dependencies: [ModelServices],
-	lookup: fnUntraced(function* (input) {
-		const [provider, model, reasoning] = yield* parseInput(input.split("/"));
-		const layer = resolve$1(provider, model, reasoning);
-		return merge$6(layer, layerSubagentModel(reasoning === "low" ? layer : resolveSubagent(provider, model, reasoning === "medium" ? "low" : "medium")));
-	}, unwrap$3)
-}) {};
+const layerClankaModel = (input) => unwrap$3(gen(function* () {
+	const [provider, model, reasoning] = yield* parseInput(input.split("/"));
+	const layer = resolve$1(provider, model, reasoning);
+	return merge$6(layer, layerSubagentModel(reasoning === "low" ? layer : resolveSubagent(provider, model, reasoning === "medium" ? "low" : "medium")));
+}));
 const resolve$1 = (provider, model$3, reasoning) => {
 	switch (provider) {
 		case "openai": return modelWebSocket(model$3, { reasoning: { effort: reasoning } }).pipe(provide$3(layerWebSocketConstructorWS), provide$3(layerClient$1));
@@ -232536,7 +232533,7 @@ const addOrUpdatePreset = fnUntraced(function* (options) {
 	});
 	if (cliAgent.id === "clanka") {
 		yield* log$1("Verifying Clanka model configuration...");
-		yield* generateText({ prompt: "say hello" }).pipe(ignore$1, provide$1(ClankaModels.get(preset.extraArgs.join(" "))));
+		yield* generateText({ prompt: "say hello" }).pipe(ignore$1, provide$1(layerClankaModel(preset.extraArgs.join(" ")), { local: true }), provide$1(ModelServices));
 	}
 	if (id !== CliAgentPreset.defaultId) preset = yield* (yield* IssueSource).updateCliAgentPreset(preset);
 	yield* Settings.set(allCliAgentPresets, some$2(options?.existing ? presets.map((p) => p.id === preset.id ? preset : p) : [...presets, preset]));
@@ -240975,7 +240972,7 @@ const runClanka = fnUntraced(function* (options) {
 }, scoped$1, (effect, options) => provide$1(effect, layerLocal({
 	directory: options.directory,
 	tools: options.mode === "ralph" ? void 0 : options.mode === "choose" ? TaskChooseTools : TaskTools
-}).pipe(merge$6(ClankaModels.get(options.model))), { local: true }), provide$1([layerUndici, TaskToolsHandlers]));
+}).pipe(merge$6(layerClankaModel(options.model))), { local: true }), provide$1([ModelServices, TaskToolsHandlers]));
 //#endregion
 //#region src/domain/CurrentTask.ts
 const CurrentTask = taggedEnum();
@@ -241992,7 +241989,7 @@ const commandEdit = make$58("edit").pipe(withDescription("Open the selected proj
 const commandSource = make$58("source").pipe(withDescription("Select the issue source to use (e.g. GitHub Issues or Linear). This applies to all projects."), withHandler(() => selectIssueSource), provide(Settings.layer));
 //#endregion
 //#region package.json
-var version = "0.3.91";
+var version = "0.3.92";
 //#endregion
 //#region src/commands/projects/ls.ts
 const commandProjectsLs = make$58("ls").pipe(withDescription("List configured projects and how they run (enabled state, concurrency, branch, git flow, review agent)."), withHandler(fnUntraced(function* () {
@@ -242138,6 +242135,6 @@ commandRoot.pipe(withSubcommands([
 	const logLevel = succeed$4(MinimumLogLevel, "All");
 	atomRuntime.addGlobalLayer(logLevel);
 	return logLevel;
-}), run$5({ version }), provide$1([ClankaModels.layer, PlatformServices]), provideService$2(CurrentMemoMap, lalphMemoMap), runMain);
+}), run$5({ version }), provide$1(PlatformServices), provideService$2(CurrentMemoMap, lalphMemoMap), runMain);
 //#endregion
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lalph",
   "type": "module",
-  "version": "0.3.91",
+  "version": "0.3.92",
   "publishConfig": {
     "access": "public"
   },

package/src/Clanka.ts

@@ -12,7 +12,7 @@ import {
   Stream,
 } from "effect"
 import { TaskChooseTools, TaskTools, TaskToolsHandlers } from "./TaskTools.ts"
-import { ClankaModels } from "./ClankaModels.ts"
+import { layerClankaModel, ModelServices } from "./ClankaModels.ts"
 import { withStallTimeout } from "./shared/stream.ts"
 import { NodeHttpClient } from "@effect/platform-node"
 import type { Prompt } from "effect/unstable/ai"
@@ -129,8 +129,8 @@ export const runClanka = Effect.fnUntraced(
             : options.mode === "choose"
               ? TaskChooseTools
               : TaskTools,
-      }).pipe(Layer.merge(ClankaModels.get(options.model))),
+      }).pipe(Layer.merge(layerClankaModel(options.model))),
       { local: true },
     ),
-  Effect.provide([NodeHttpClient.layerUndici, TaskToolsHandlers]),
+  Effect.provide([ModelServices, TaskToolsHandlers]),
 )

package/src/ClankaModels.ts

@@ -1,7 +1,7 @@
 // oxlint-disable typescript/no-explicit-any
 import { NodeHttpClient, NodeSocket } from "@effect/platform-node"
 import { Agent, Codex, Copilot } from "clanka"
-import { Effect, flow, Layer, LayerMap, Schema } from "effect"
+import { Effect, flow, Layer, Schema } from "effect"
 import { layerKvs } from "./Kvs.ts"
 
 export const ModelServices = NodeHttpClient.layerUndici.pipe(
@@ -20,11 +20,9 @@ const parseInput = flow(
   Effect.orDie,
 )
 
-export class ClankaModels extends LayerMap.Service<ClankaModels>()(
-  "lalph/ClankaModels",
-  {
-    dependencies: [ModelServices],
-    lookup: Effect.fnUntraced(function* (input: string) {
+export const layerClankaModel = (input: string) =>
+  Layer.unwrap(
+    Effect.gen(function* () {
       const [provider, model, reasoning] = yield* parseInput(input.split("/"))
       const layer = resolve(provider, model, reasoning)
       return Layer.merge(
@@ -39,9 +37,8 @@ export class ClankaModels extends LayerMap.Service<ClankaModels>()(
               ),
         ),
       )
-    }, Layer.unwrap),
-  },
-) {}
+    }),
+  )
 
 const resolve = (
   provider: "openai" | "copilot",

package/src/Presets.ts

@@ -5,7 +5,7 @@ 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 { layerClankaModel, ModelServices } from "./ClankaModels.ts"
 import { LanguageModel } from "effect/unstable/ai"
 
 export const allCliAgentPresets = new Setting(
@@ -131,9 +131,13 @@ export const addOrUpdatePreset = Effect.fnUntraced(function* (options?: {
 
   if (cliAgent.id === "clanka") {
     yield* Effect.log("Verifying Clanka model configuration...")
+    // @effect-diagnostics-next-line multipleEffectProvide:off
     yield* LanguageModel.generateText({ prompt: "say hello" }).pipe(
       Effect.ignore,
-      Effect.provide(ClankaModels.get(preset.extraArgs.join(" "))),
+      Effect.provide(layerClankaModel(preset.extraArgs.join(" ")), {
+        local: true,
+      }),
+      Effect.provide(ModelServices),
     )
   }
 

package/src/cli.ts

@@ -17,7 +17,6 @@ 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([
@@ -40,7 +39,7 @@ commandRoot.pipe(
   Command.run({
     version: PackageJson.version,
   }),
-  Effect.provide([ClankaModels.layer, PlatformServices]),
+  Effect.provide(PlatformServices),
   Effect.provideService(Layer.CurrentMemoMap, lalphMemoMap),
   NodeRuntime.runMain,
 )

package/src/commands/root.ts

@@ -58,7 +58,6 @@ import { getDefaultCliAgentPreset } from "../Presets.ts"
 import type { QuitError } from "effect/Terminal"
 import type { TimeoutError } from "effect/Cause"
 import type { ChildProcessSpawner } from "effect/unstable/process"
-import { ClankaModels } from "../ClankaModels.ts"
 import type { AiError } from "effect/unstable/ai/AiError"
 import type { PrdIssue } from "../domain/PrdIssue.ts"
 import { CurrentTaskRef } from "../TaskTools.ts"
@@ -103,7 +102,6 @@ const run = Effect.fnUntraced(
     | PromptGen
     | Prd
     | Worktree
-    | ClankaModels
     | OutputFormatter.Muxer
     | Scope.Scope
   > {
@@ -382,7 +380,6 @@ const runRalph = Effect.fnUntraced(
     | PromptGen
     | Prd
     | Worktree
-    | ClankaModels
     | OutputFormatter.Muxer
     | Scope.Scope
   > {