lalph 0.1.25 → 0.1.26

package/dist/cli.mjs

@@ -140235,7 +140235,7 @@ var Worktree = class extends Service()("lalph/Worktree", { make: gen(function* (
 	}));
 	yield* make$21`git worktree add ${directory} -d HEAD`.pipe(exitCode);
 	yield* fs.makeDirectory(pathService.join(directory, ".lalph"), { recursive: true });
-	const setupPath = pathService.resolve(pathService.join(".lalph-setup.sh"));
+	const setupPath = pathService.resolve(".lalph-setup.sh");
 	if (yield* fs.exists(setupPath)) yield* make$21({
 		cwd: directory,
 		extendEnv: true,
@@ -140376,7 +140376,12 @@ const run = fnUntraced(function* (options) {
 	const promptGen = yield* PromptGen;
 	const cliAgent = yield* getOrSelectCliAgent;
 	const prd = yield* Prd;
-	if (isSome(options.targetBranch)) yield* make$21`git checkout ${`origin/${options.targetBranch.value}`}`.pipe(exitCode);
+	const exec = (template, ...args$1) => make$21({
+		cwd: worktree.directory,
+		extendEnv: true,
+		env: cliAgent.env
+	})(template, ...args$1).pipe(exitCode);
+	if (isSome(options.targetBranch)) yield* exec`git checkout ${`origin/${options.targetBranch.value}`}`;
 	const chooseCommand = cliAgent.command({
 		prompt: promptGen.promptChoose,
 		prdFilePath: pathService.join(".lalph", "prd.yml")
@@ -140431,8 +140436,8 @@ const run = fnUntraced(function* (options) {
 		issueId: task.id
 	});
 	else if (options.autoMerge) for (const pr of prs) {
-		if (isSome(options.targetBranch)) yield* make$21`gh pr edit ${pr.prNumber} --base ${options.targetBranch.value}`.pipe(exitCode);
-		if ((yield* make$21`gh pr merge ${pr.prNumber} -sd`.pipe(exitCode)) !== 0) yield* prd.flagUnmergable({ issueId: pr.issueId });
+		if (isSome(options.targetBranch)) yield* exec`gh pr edit ${pr.prNumber} --base ${options.targetBranch.value}`;
+		if ((yield* exec`gh pr merge ${pr.prNumber} -sd`) !== 0) yield* prd.flagUnmergable({ issueId: pr.issueId });
 	}
 }, onError(fnUntraced(function* () {
 	const prd = yield* Prd;

package/package.json

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

package/src/Runner.ts

@@ -30,10 +30,18 @@ export const run = Effect.fnUntraced(
     const cliAgent = yield* getOrSelectCliAgent
     const prd = yield* Prd
 
+    const exec = (
+      template: TemplateStringsArray,
+      ...args: Array<string | number | boolean>
+    ) =>
+      ChildProcess.make({
+        cwd: worktree.directory,
+        extendEnv: true,
+        env: cliAgent.env,
+      })(template, ...args).pipe(ChildProcess.exitCode)
+
     if (Option.isSome(options.targetBranch)) {
-      yield* ChildProcess.make`git checkout ${`origin/${options.targetBranch.value}`}`.pipe(
-        ChildProcess.exitCode,
-      )
+      yield* exec`git checkout ${`origin/${options.targetBranch.value}`}`
     }
 
     const chooseCommand = cliAgent.command({
@@ -120,15 +128,10 @@ export const run = Effect.fnUntraced(
     } else if (options.autoMerge) {
       for (const pr of prs) {
         if (Option.isSome(options.targetBranch)) {
-          yield* ChildProcess.make`gh pr edit ${pr.prNumber} --base ${options.targetBranch.value}`.pipe(
-            ChildProcess.exitCode,
-          )
+          yield* exec`gh pr edit ${pr.prNumber} --base ${options.targetBranch.value}`
         }
 
-        const exitCode =
-          yield* ChildProcess.make`gh pr merge ${pr.prNumber} -sd`.pipe(
-            ChildProcess.exitCode,
-          )
+        const exitCode = yield* exec`gh pr merge ${pr.prNumber} -sd`
         if (exitCode !== 0) {
           yield* prd.flagUnmergable({ issueId: pr.issueId })
         }

package/src/Worktree.ts

@@ -23,7 +23,7 @@ export class Worktree extends ServiceMap.Service<Worktree>()("lalph/Worktree", {
       recursive: true,
     })
 
-    const setupPath = pathService.resolve(pathService.join(".lalph-setup.sh"))
+    const setupPath = pathService.resolve(".lalph-setup.sh")
     if (yield* fs.exists(setupPath)) {
       yield* ChildProcess.make({
         cwd: directory,