lalph 0.3.54 → 0.3.56

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 {};
@@ -233025,24 +233026,18 @@ If for any reason you get stuck on a task, mark the task back as "todo" by updat
 challenges faced.
 
 ${taskGuidelines(options)}`;
-	const prompt = (options) => `# The task
+	const prompt = (options) => `# ${options.task.title}
 
-ID: ${options.task.id}
-Task: ${options.task.title}
-Description:
+Task ID: ${options.task.id}
 
 ${options.task.description}
 
-# Instructions
+### Instructions
 
-Your job is to implement the task described above.
+Your job is to implement the task described above.${options.task.description.includes(options.specsDirectory) ? `\nMake sure to review the prd.yml for any key information that may help you with this task.` : ""}
 
-1. Carefully study the prd.yml file to understand the context of the task, and
-   discover any key learnings from previous work.
-   Also read the ${options.specsDirectory}/README.md file (if available), to see
-   if any previous specifications could assist you.
-2. ${options.gitFlow.setupInstructions(options)}
-3. Implement the task.
+1. ${options.gitFlow.setupInstructions(options)}
+2. Implement the task.
    - If this task is a research task, **do not** make any code changes yet.
    - If this task is a research task and you add follow-up tasks, include (at least) "${options.task.id}" in the new task's \`blockedBy\` field.
    - **If at any point** you discover something that needs fixing, or another task
@@ -233050,15 +233045,14 @@ Your job is to implement the task described above.
      you plan to fix it as part of this task.
    - Add important discoveries about the codebase, or challenges faced to the task's
      \`description\`. More details below.
-4. Run any checks / feedback loops, such as type checks, unit tests, or linting.
-5. ${options.gitFlow.commitInstructions({
+3. Run any checks / feedback loops, such as type checks, unit tests, or linting.
+4. ${options.gitFlow.commitInstructions({
 		githubPrInstructions: sourceMeta.githubPrInstructions,
 		githubPrNumber: options.githubPrNumber,
 		taskId: options.task.id ?? "unknown",
 		targetBranch: options.targetBranch
 	})}
-6. **After ${options.gitFlow.requiresGithubPr ? "pushing" : "committing"}**
-   your changes, update the prd.yml to reflect any changes in the task state.
+5. **After ${options.gitFlow.requiresGithubPr ? "pushing" : "committing"}** your changes, update the prd.yml to reflect any changes in the task state.
    - Rewrite the notes in the description to include only the key discoveries and information that could speed up future work on other tasks. Make sure to preserve important information such as specification file references.
    - If you believe the task is complete, update the \`state\` to "in-review".
 
@@ -233069,16 +233063,12 @@ Task ID: ${options.task.id}
 
 ${options.task.description}
 
-# Workflow
+### Instructions
 
-All steps must be done before the task can be considered complete.
+All steps must be done before the task can be considered complete.${options.task.description.includes(options.specsDirectory) ? `\nMake sure to review the previous tasks (using "listTasks") for any key information that may help you with this task.` : ""}
 
-1. Carefully study the current task list to understand the context of the task, and
-   discover any key learnings from previous work.
-   Also read the ${options.specsDirectory}/README.md file (if available), to see
-   if any previous specifications could assist you.
-2. ${options.gitFlow.setupInstructions(options)}
-3. Implement the task.
+1. ${options.gitFlow.setupInstructions(options)}
+2. Implement the task.
    - If this task is a research task, **do not** make any code changes yet.
    - If this task is a research task and you add follow-up tasks, include (at least) "${options.task.id}" in the new task's \`blockedBy\` field.
    - **If at any point** you discover something that needs fixing, or another task
@@ -233086,15 +233076,14 @@ All steps must be done before the task can be considered complete.
      as part of this task.
    - Add important discoveries about the codebase, or challenges faced to the task's
      \`description\`. More details below.
-4. Run any checks / feedback loops, such as type checks, unit tests, or linting.
-5. ${options.gitFlow.commitInstructions({
+3. Run any checks / feedback loops, such as type checks, unit tests, or linting.
+4. ${options.gitFlow.commitInstructions({
 		githubPrInstructions: sourceMeta.githubPrInstructions,
 		githubPrNumber: options.githubPrNumber,
 		taskId: options.task.id ?? "unknown",
 		targetBranch: options.targetBranch
 	})}
-6. **After ${options.gitFlow.requiresGithubPr ? "pushing" : "committing"}**
-   your changes, update current task to reflect any changes in the task state.
+5. **After ${options.gitFlow.requiresGithubPr ? "pushing" : "committing"}** your changes, update current task to reflect any changes in the task state.
    - Rewrite the notes in the description to include only the key discoveries and information that could speed up future work on other tasks. Make sure to preserve important information such as specification file references.
    - If you believe the task is complete, update the \`state\` to "in-review".`;
 	const promptReview = (options) => `A previous engineer has completed a task from the instructions below.
@@ -233867,7 +233856,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) {
@@ -233918,7 +233907,7 @@ const GitFlowPR = succeed$4(GitFlow, GitFlow.of({
 	requiresGithubPr: true,
 	branch: void 0,
 	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.` : `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).`,
+   - **REVIEW ALL FEEDBACK** in the .lalph/feedback.md file.` : `You are currently on a new branch for this task. You do not need to checkout any other branches.`,
 	commitInstructions: (options) => `${!options.githubPrNumber ? `Create a pull request for this task. If the target branch does not exist, create it first.` : "Commit and push your changes to the pull request."}
    ${options.githubPrInstructions}
    The PR description should include a summary of the changes made.${options.targetBranch ? `\n   - The target branch for the PR should be \`${options.targetBranch}\`.` : ""}
@@ -234185,6 +234174,10 @@ const run = fnUntraced(function* (options) {
 		yield* worktree.exec`gh pr checkout ${chosenTask.githubPrNumber}`;
 		const feedback = yield* gh.prFeedbackMd(chosenTask.githubPrNumber);
 		yield* fs.writeFileString(pathService.join(worktree.directory, ".lalph", "feedback.md"), feedback);
+	} else if (gitFlow.requiresGithubPr) {
+		const branchName = `lalph/${taskId.replace(/#/g, "").replace(/[^a-zA-Z0-9-_]/g, "-")}`;
+		yield* worktree.exec`git branch -D ${branchName}`;
+		yield* worktree.exec`git checkout -b ${branchName}`;
 	}
 	const taskPreset = getOrElse$2(yield* source.issueCliAgentPreset(chosenTask.prd), () => preset);
 	const catchStallInReview = (effect) => catchIf$2(effect, (u) => u instanceof RunnerStalled, fnUntraced(function* (e) {
@@ -234627,7 +234620,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.56";
 //#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.56",
   "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,

package/src/GitFlow.ts

@@ -61,8 +61,8 @@ 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.`
-        : `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).`,
+   - **REVIEW ALL FEEDBACK** in the .lalph/feedback.md file.`
+        : `You are currently on a new branch for this task. You do not need to checkout any other branches.`,
 
     commitInstructions: (
       options,

package/src/PromptGen.ts

@@ -178,24 +178,22 @@ ${taskGuidelines(options)}`
         readonly specsDirectory: string
         readonly githubPrNumber: number | undefined
         readonly gitFlow: GitFlow["Service"]
-      }) => `# The task
+      }) => `# ${options.task.title}
 
-ID: ${options.task.id}
-Task: ${options.task.title}
-Description:
+Task ID: ${options.task.id}
 
 ${options.task.description}
 
-# Instructions
+### Instructions
 
-Your job is to implement the task described above.
+Your job is to implement the task described above.${
+        options.task.description.includes(options.specsDirectory)
+          ? `\nMake sure to review the prd.yml for any key information that may help you with this task.`
+          : ""
+      }
 
-1. Carefully study the prd.yml file to understand the context of the task, and
-   discover any key learnings from previous work.
-   Also read the ${options.specsDirectory}/README.md file (if available), to see
-   if any previous specifications could assist you.
-2. ${options.gitFlow.setupInstructions(options)}
-3. Implement the task.
+1. ${options.gitFlow.setupInstructions(options)}
+2. Implement the task.
    - If this task is a research task, **do not** make any code changes yet.
    - If this task is a research task and you add follow-up tasks, include (at least) "${options.task.id}" in the new task's \`blockedBy\` field.
    - **If at any point** you discover something that needs fixing, or another task
@@ -203,15 +201,14 @@ Your job is to implement the task described above.
      you plan to fix it as part of this task.
    - Add important discoveries about the codebase, or challenges faced to the task's
      \`description\`. More details below.
-4. Run any checks / feedback loops, such as type checks, unit tests, or linting.
-5. ${options.gitFlow.commitInstructions({
+3. Run any checks / feedback loops, such as type checks, unit tests, or linting.
+4. ${options.gitFlow.commitInstructions({
         githubPrInstructions: sourceMeta.githubPrInstructions,
         githubPrNumber: options.githubPrNumber,
         taskId: options.task.id ?? "unknown",
         targetBranch: options.targetBranch,
       })}
-6. **After ${options.gitFlow.requiresGithubPr ? "pushing" : "committing"}**
-   your changes, update the prd.yml to reflect any changes in the task state.
+5. **After ${options.gitFlow.requiresGithubPr ? "pushing" : "committing"}** your changes, update the prd.yml to reflect any changes in the task state.
    - Rewrite the notes in the description to include only the key discoveries and information that could speed up future work on other tasks. Make sure to preserve important information such as specification file references.
    - If you believe the task is complete, update the \`state\` to "in-review".
 
@@ -229,16 +226,16 @@ Task ID: ${options.task.id}
 
 ${options.task.description}
 
-# Workflow
+### Instructions
 
-All steps must be done before the task can be considered complete.
+All steps must be done before the task can be considered complete.${
+        options.task.description.includes(options.specsDirectory)
+          ? `\nMake sure to review the previous tasks (using "listTasks") for any key information that may help you with this task.`
+          : ""
+      }
 
-1. Carefully study the current task list to understand the context of the task, and
-   discover any key learnings from previous work.
-   Also read the ${options.specsDirectory}/README.md file (if available), to see
-   if any previous specifications could assist you.
-2. ${options.gitFlow.setupInstructions(options)}
-3. Implement the task.
+1. ${options.gitFlow.setupInstructions(options)}
+2. Implement the task.
    - If this task is a research task, **do not** make any code changes yet.
    - If this task is a research task and you add follow-up tasks, include (at least) "${options.task.id}" in the new task's \`blockedBy\` field.
    - **If at any point** you discover something that needs fixing, or another task
@@ -246,15 +243,14 @@ All steps must be done before the task can be considered complete.
      as part of this task.
    - Add important discoveries about the codebase, or challenges faced to the task's
      \`description\`. More details below.
-4. Run any checks / feedback loops, such as type checks, unit tests, or linting.
-5. ${options.gitFlow.commitInstructions({
+3. Run any checks / feedback loops, such as type checks, unit tests, or linting.
+4. ${options.gitFlow.commitInstructions({
         githubPrInstructions: sourceMeta.githubPrInstructions,
         githubPrNumber: options.githubPrNumber,
         taskId: options.task.id ?? "unknown",
         targetBranch: options.targetBranch,
       })}
-6. **After ${options.gitFlow.requiresGithubPr ? "pushing" : "committing"}**
-   your changes, update current task to reflect any changes in the task state.
+5. **After ${options.gitFlow.requiresGithubPr ? "pushing" : "committing"}** your changes, update current task to reflect any changes in the task state.
    - Rewrite the notes in the description to include only the key discoveries and information that could speed up future work on other tasks. Make sure to preserve important information such as specification file references.
    - If you believe the task is complete, update the \`state\` to "in-review".`
 

package/src/commands/root.ts

@@ -178,6 +178,10 @@ const run = Effect.fnUntraced(
         pathService.join(worktree.directory, ".lalph", "feedback.md"),
         feedback,
       )
+    } else if (gitFlow.requiresGithubPr) {
+      const branchName = `lalph/${taskId.replace(/#/g, "").replace(/[^a-zA-Z0-9-_]/g, "-")}`
+      yield* worktree.exec`git branch -D ${branchName}`
+      yield* worktree.exec`git checkout -b ${branchName}`
     }
 
     const taskPreset = Option.getOrElse(