lalph 0.3.54 → 0.3.55

package/dist/cli.mjs

@@ -17455,12 +17455,12 @@ function set$10(self, key, value) {
 //#endregion
 //#region node_modules/.pnpm/effect@4.0.0-beta.31/node_modules/effect/dist/internal/schema/annotations.js
 /** @internal */
-function resolve$3(ast) {
+function resolve$4(ast) {
 	return ast.checks ? ast.checks[ast.checks.length - 1].annotations : ast.annotations;
 }
 /** @internal */
 function resolveAt$1(key) {
-	return (ast) => resolve$3(ast)?.[key];
+	return (ast) => resolve$4(ast)?.[key];
 }
 /** @internal */
 const resolveIdentifier$1 = /* @__PURE__ */ resolveAt$1("identifier");
@@ -31552,7 +31552,7 @@ function fromFileUrl$1(url) {
 	}
 	return succeed$3(decodeURIComponent(pathname));
 }
-const resolve$1 = function resolve() {
+const resolve$2 = function resolve() {
 	let resolvedPath = "";
 	let resolvedAbsolute = false;
 	let cwd = void 0;
@@ -31577,7 +31577,7 @@ const resolve$1 = function resolve() {
 const CHAR_FORWARD_SLASH = 47;
 function toFileUrl$1(filepath) {
 	const outURL = new URL("file://");
-	let resolved = resolve$1(filepath);
+	let resolved = resolve$2(filepath);
 	if (filepath.charCodeAt(filepath.length - 1) === CHAR_FORWARD_SLASH && resolved[resolved.length - 1] !== "/") resolved += "/";
 	outURL.pathname = encodePathChars(resolved);
 	return succeed$3(outURL);
@@ -31597,7 +31597,7 @@ function encodePathChars(filepath) {
 }
 const posixImpl = /* @__PURE__ */ Path$1.of({
 	[TypeId$44]: TypeId$44,
-	resolve: resolve$1,
+	resolve: resolve$2,
 	normalize(path) {
 		if (path.length === 0) return ".";
 		const isAbsolute = path.charCodeAt(0) === 47;
@@ -32947,11 +32947,11 @@ const recur$1 = /* @__PURE__ */ memoize((ast) => {
 	let parser;
 	if (!ast.context && !ast.encoding && !ast.checks) return (ou, options) => {
 		parser ??= ast.getParser(recur$1);
-		return parser(ou, resolve$3(ast)?.["parseOptions"] ?? options);
+		return parser(ou, resolve$4(ast)?.["parseOptions"] ?? options);
 	};
 	const isStructural = isArrays(ast) || isObjects(ast) || isDeclaration(ast) && ast.typeParameters.length > 0;
 	return (ou, options) => {
-		options = resolve$3(ast)?.["parseOptions"] ?? options;
+		options = resolve$4(ast)?.["parseOptions"] ?? options;
 		const encoding = ast.encoding;
 		let srou;
 		if (encoding) {
@@ -76481,7 +76481,7 @@ var require_snapshot_utils = /* @__PURE__ */ __commonJSMin$1(((exports, module)
 //#region node_modules/.pnpm/undici@7.22.0/node_modules/undici/lib/mock/snapshot-recorder.js
 var require_snapshot_recorder = /* @__PURE__ */ __commonJSMin$1(((exports, module) => {
 	const { writeFile, readFile, mkdir } = __require("node:fs/promises");
-	const { dirname, resolve } = __require("node:path");
+	const { dirname, resolve: resolve$1 } = __require("node:path");
 	const { setTimeout: setTimeout$1, clearTimeout: clearTimeout$1 } = __require("node:timers");
 	const { InvalidArgumentError, UndiciError } = require_errors$1();
 	const { hashId, isUrlExcludedFactory, normalizeHeaders, createHeaderFilters } = require_snapshot_utils();
@@ -76746,7 +76746,7 @@ var require_snapshot_recorder = /* @__PURE__ */ __commonJSMin$1(((exports, modul
 			const path = filePath || this.#snapshotPath;
 			if (!path) throw new InvalidArgumentError("Snapshot path is required");
 			try {
-				const data = await readFile(resolve(path), "utf8");
+				const data = await readFile(resolve$1(path), "utf8");
 				const parsed = JSON.parse(data);
 				if (Array.isArray(parsed)) {
 					this.#snapshots.clear();
@@ -76766,7 +76766,7 @@ var require_snapshot_recorder = /* @__PURE__ */ __commonJSMin$1(((exports, modul
 		async saveSnapshots(filePath) {
 			const path = filePath || this.#snapshotPath;
 			if (!path) throw new InvalidArgumentError("Snapshot path is required");
-			const resolvedPath = resolve(path);
+			const resolvedPath = resolve$1(path);
 			await mkdir(dirname(resolvedPath), { recursive: true });
 			const data = Array.from(this.#snapshots.entries()).map(([hash, snapshot]) => ({
 				hash,
@@ -225446,20 +225446,21 @@ const parseInput = flow(decodeUnknownEffect(Tuple([
 	String$1,
 	Reasoning
 ])), orDie$2);
-const clankaSubagent = fnUntraced(function* (models, input) {
-	const [provider, model] = yield* parseInput(input.split("/"));
-	return models.get(`${provider}/${model}/low`);
-}, unwrap$3);
 var ClankaModels = class extends Service()("lalph/ClankaModels", {
 	dependencies: [ModelServices],
 	lookup: fnUntraced(function* (input) {
-		const [provider, model$2, reasoning] = yield* parseInput(input.split("/"));
-		switch (provider) {
-			case "openai": return model$1(model$2, { reasoning: { effort: reasoning } });
-			case "copilot": return model(model$2, { ...reasoningToCopilotConfig(model$2, reasoning) });
-		}
+		const [provider, model, reasoning] = yield* parseInput(input.split("/"));
+		const layer = resolve(provider, model, reasoning);
+		if (reasoning === "low" || reasoning === "medium") return layer;
+		return merge$6(layer, layerSubagentModel(resolve(provider, model, "medium")));
 	}, unwrap$3)
 }) {};
+const resolve = (provider, model$2, reasoning) => {
+	switch (provider) {
+		case "openai": return model$1(model$2, { reasoning: { effort: reasoning } });
+		case "copilot": return model(model$2, { ...reasoningToCopilotConfig(model$2, reasoning) });
+	}
+};
 const reasoningToCopilotConfig = (model, reasoning) => {
 	if (model.startsWith("claude")) switch (reasoning) {
 		case "low": return {};
@@ -233867,7 +233868,7 @@ const runClanka = fnUntraced(function* (options) {
 	const output = yield* pipe$1(agent.send({
 		prompt: options.prompt,
 		system: options.system
-	}), provide$1([models.get(options.model), layerSubagentModel(clankaSubagent(models, options.model))]));
+	}), provide$1(models.get(options.model)));
 	yield* muxer.add(output);
 	let stream = options.stallTimeout ? withStallTimeout(options.stallTimeout)(output) : output;
 	if (options.steer) yield* options.steer.pipe(switchMap(fnUntraced(function* (message) {
@@ -234627,7 +234628,7 @@ const commandEdit = make$46("edit").pipe(withDescription("Open the selected proj
 const commandSource = make$46("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.54";
+var version = "0.3.55";
 //#endregion
 //#region src/commands/projects/ls.ts
 const commandProjectsLs = make$46("ls").pipe(withDescription("List configured projects and how they run (enabled state, concurrency, branch, git flow, review agent)."), withHandler(fnUntraced(function* () {

package/package.json

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

package/src/Clanka.ts

@@ -1,7 +1,7 @@
 import { Agent, OutputFormatter } from "clanka"
 import { Duration, Effect, Layer, pipe, Stdio, Stream } from "effect"
 import { TaskChooseTools, TaskTools, TaskToolsHandlers } from "./TaskTools.ts"
-import { ClankaModels, clankaSubagent } from "./ClankaModels.ts"
+import { ClankaModels } from "./ClankaModels.ts"
 import { withStallTimeout } from "./shared/stream.ts"
 import { NodeHttpClient } from "@effect/platform-node"
 
@@ -32,10 +32,7 @@ export const runClanka = Effect.fnUntraced(
         prompt: options.prompt,
         system: options.system,
       }),
-      Effect.provide([
-        models.get(options.model),
-        Agent.layerSubagentModel(clankaSubagent(models, options.model)),
-      ]),
+      Effect.provide(models.get(options.model)),
     )
 
     yield* muxer.add(output)

package/src/ClankaModels.ts

@@ -1,6 +1,6 @@
 // oxlint-disable typescript/no-explicit-any
 import { NodeHttpClient } from "@effect/platform-node"
-import { Codex, Copilot } from "clanka"
+import { Agent, Codex, Copilot } from "clanka"
 import { Effect, flow, Layer, LayerMap, Schema } from "effect"
 import { layerKvs } from "./Kvs.ts"
 
@@ -20,38 +20,45 @@ const parseInput = flow(
   Effect.orDie,
 )
 
-export const clankaSubagent = Effect.fnUntraced(function* (
-  models: ClankaModels["Service"],
-  input: string,
-) {
-  const [provider, model] = yield* parseInput(input.split("/"))
-  return models.get(`${provider}/${model}/low`)
-}, Layer.unwrap)
-
 export class ClankaModels extends LayerMap.Service<ClankaModels>()(
   "lalph/ClankaModels",
   {
     dependencies: [ModelServices],
     lookup: Effect.fnUntraced(function* (input: string) {
       const [provider, model, reasoning] = yield* parseInput(input.split("/"))
-      switch (provider) {
-        case "openai": {
-          return Codex.model(model, {
-            reasoning: {
-              effort: reasoning,
-            },
-          })
-        }
-        case "copilot": {
-          return Copilot.model(model, {
-            ...reasoningToCopilotConfig(model, reasoning),
-          })
-        }
+      const layer = resolve(provider, model, reasoning)
+      if (reasoning === "low" || reasoning === "medium") {
+        return layer
       }
+      return Layer.merge(
+        layer,
+        Agent.layerSubagentModel(resolve(provider, model, "medium")),
+      )
     }, Layer.unwrap),
   },
 ) {}
 
+const resolve = (
+  provider: "openai" | "copilot",
+  model: string,
+  reasoning: typeof Reasoning.Type,
+) => {
+  switch (provider) {
+    case "openai": {
+      return Codex.model(model, {
+        reasoning: {
+          effort: reasoning,
+        },
+      })
+    }
+    case "copilot": {
+      return Copilot.model(model, {
+        ...reasoningToCopilotConfig(model, reasoning),
+      })
+    }
+  }
+}
+
 const reasoningToCopilotConfig = (
   model: string,
   reasoning: typeof Reasoning.Type,