lalph 0.1.61 → 0.1.63

package/dist/cli.mjs

@@ -141367,6 +141367,9 @@ are:
 To add a new task, append a new item to the prd.yml file with the id set to
 \`null\`, a title, state set to "todo", and a concise description that includes
 a short summary of the task and a brief list of steps to complete it.
+When creating tasks, make sure each task is independently shippable without
+failing validation checks (typechecks, linting, tests). If a task would only
+pass validations when combined with another, combine the work into one task.
 
 When adding a new task, it will take about 5 seconds for the system to update the
 prd.yml file with a new id for the task.
@@ -141541,7 +141544,8 @@ var Worktree = class extends Service()("lalph/Worktree", { make: gen(function* (
 	}));
 	yield* make$21`git worktree add ${directory$2} -d HEAD`.pipe(exitCode);
 	yield* fs.makeDirectory(pathService.join(directory$2, ".lalph"), { recursive: true });
-	const setupPath = pathService.resolve(pathService.join("scripts", "worktree-setup.sh"));
+	const setupPath = pathService.resolve("scripts", "worktree-setup.sh");
+	yield* seedSetupScript(setupPath);
 	if (yield* fs.exists(setupPath)) yield* make$21({
 		cwd: directory$2,
 		extendEnv: true,
@@ -141563,6 +141567,29 @@ var Worktree = class extends Service()("lalph/Worktree", { make: gen(function* (
 	}));
 };
 const execIgnore = (command) => command.pipe(exitCode, catchCause$1(logWarning));
+const seedSetupScript = fnUntraced(function* (setupPath) {
+	const fs = yield* FileSystem;
+	const pathService = yield* Path$1;
+	if (yield* fs.exists(setupPath)) return;
+	const baseBranch = yield* discoverBaseBranch;
+	yield* fs.makeDirectory(pathService.dirname(setupPath), { recursive: true });
+	yield* fs.writeFileString(setupPath, setupScriptTemplate(baseBranch));
+	yield* fs.chmod(setupPath, 493);
+});
+const discoverBaseBranch = gen(function* () {
+	const originHead = yield* make$21`git symbolic-ref --short refs/remotes/origin/HEAD`.pipe(string, catch_$1((_) => succeed$1("")), map$5((output) => output.trim()));
+	if (originHead !== "") return originHead.startsWith("origin/") ? originHead.slice(7) : originHead;
+	const currentBranch = yield* make$21`git branch --show-current`.pipe(string, catch_$1((_) => succeed$1("")), map$5((output) => output.trim()));
+	return currentBranch === "" ? "main" : currentBranch;
+});
+const setupScriptTemplate = (baseBranch) => `#!/usr/bin/env bash
+set -euo pipefail
+
+git fetch origin
+git checkout origin/${baseBranch}
+
+# Seeded by lalph. Customize this to prepare new worktrees.
+`;
 
 //#endregion
 //#region src/Prd.ts
@@ -142004,7 +142031,7 @@ const commandAgent = make$27("agent").pipe(withDescription("Select the CLI agent
 
 //#endregion
 //#region package.json
-var version = "0.1.61";
+var version = "0.1.63";
 
 //#endregion
 //#region src/cli.ts

package/package.json

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

package/src/PromptGen.ts

@@ -28,6 +28,9 @@ are:
 To add a new task, append a new item to the prd.yml file with the id set to
 \`null\`, a title, state set to "todo", and a concise description that includes
 a short summary of the task and a brief list of steps to complete it.
+When creating tasks, make sure each task is independently shippable without
+failing validation checks (typechecks, linting, tests). If a task would only
+pass validations when combined with another, combine the work into one task.
 
 When adding a new task, it will take about 5 seconds for the system to update the
 prd.yml file with a new id for the task.

package/src/Worktree.ts

@@ -30,9 +30,8 @@ export class Worktree extends ServiceMap.Service<Worktree>()("lalph/Worktree", {
       recursive: true,
     })
 
-    const setupPath = pathService.resolve(
-      pathService.join("scripts", "worktree-setup.sh"),
-    )
+    const setupPath = pathService.resolve("scripts", "worktree-setup.sh")
+    yield* seedSetupScript(setupPath)
     if (yield* fs.exists(setupPath)) {
       yield* ChildProcess.make({
         cwd: directory,
@@ -61,3 +60,53 @@ export class Worktree extends ServiceMap.Service<Worktree>()("lalph/Worktree", {
 
 const execIgnore = (command: ChildProcess.Command) =>
   command.pipe(ChildProcess.exitCode, Effect.catchCause(Effect.logWarning))
+
+const seedSetupScript = Effect.fnUntraced(function* (setupPath: string) {
+  const fs = yield* FileSystem.FileSystem
+  const pathService = yield* Path.Path
+
+  if (yield* fs.exists(setupPath)) {
+    return
+  }
+
+  const baseBranch = yield* discoverBaseBranch
+
+  yield* fs.makeDirectory(pathService.dirname(setupPath), {
+    recursive: true,
+  })
+  yield* fs.writeFileString(setupPath, setupScriptTemplate(baseBranch))
+  yield* fs.chmod(setupPath, 0o755)
+})
+
+const discoverBaseBranch = Effect.gen(function* () {
+  const originHead =
+    yield* ChildProcess.make`git symbolic-ref --short refs/remotes/origin/HEAD`.pipe(
+      ChildProcess.string,
+      Effect.catch((_) => Effect.succeed("")),
+      Effect.map((output) => output.trim()),
+    )
+
+  if (originHead !== "") {
+    return originHead.startsWith("origin/")
+      ? originHead.slice("origin/".length)
+      : originHead
+  }
+
+  const currentBranch =
+    yield* ChildProcess.make`git branch --show-current`.pipe(
+      ChildProcess.string,
+      Effect.catch((_) => Effect.succeed("")),
+      Effect.map((output) => output.trim()),
+    )
+
+  return currentBranch === "" ? "main" : currentBranch
+})
+
+const setupScriptTemplate = (baseBranch: string) => `#!/usr/bin/env bash
+set -euo pipefail
+
+git fetch origin
+git checkout origin/${baseBranch}
+
+# Seeded by lalph. Customize this to prepare new worktrees.
+`